From fb6ee4a8495b064e6a64e1abec212941ce7c96f9 Mon Sep 17 00:00:00 2001 From: rafael-g Date: Sun, 5 Jun 2016 08:32:58 +0200 Subject: [Bug #1550178] Inkscape crashed with segfault in ExpressionEvaluator on OpenBSD. Fixed bugs: - https://launchpad.net/bugs/1550178 (bzr r14951) --- src/util/expression-evaluator.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/expression-evaluator.cpp b/src/util/expression-evaluator.cpp index 48064e647..b0b8e6036 100644 --- a/src/util/expression-evaluator.cpp +++ b/src/util/expression-evaluator.cpp @@ -28,6 +28,8 @@ #include "util/expression-evaluator.h" #include "util/units.h" +#include + #include #include @@ -49,7 +51,7 @@ EvaluatorToken::EvaluatorToken() } ExpressionEvaluator::ExpressionEvaluator(const char *string, Unit const *unit) : - string(string), + string(g_locale_to_utf8(string,-1,0,0,0)), unit(unit) { current_token.type = TOKEN_END; -- cgit v1.2.3 From 8e79c58572bac72489bde00c15d092bce02e850a Mon Sep 17 00:00:00 2001 From: rafael-g Date: Sun, 5 Jun 2016 08:43:06 +0200 Subject: [Bug #1587311] Entering + into stroke width dialog crashes Inkscape. Fixed bugs: - https://launchpad.net/bugs/1587311 (bzr r14952) --- src/util/expression-evaluator.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/util/expression-evaluator.cpp b/src/util/expression-evaluator.cpp index b0b8e6036..dd7ce97f7 100644 --- a/src/util/expression-evaluator.cpp +++ b/src/util/expression-evaluator.cpp @@ -208,8 +208,11 @@ EvaluatorQuantity ExpressionEvaluator::evaluateFactor() { EvaluatorQuantity evaluated_factor = EvaluatorQuantity(); EvaluatorToken consumed_token = EvaluatorToken(); - - if (acceptToken(TOKEN_NUM, &consumed_token)) { + + if (acceptToken(TOKEN_END, &consumed_token)) { + return evaluated_factor; + } + else if (acceptToken(TOKEN_NUM, &consumed_token)) { evaluated_factor.value = consumed_token.value.fl; } else if (acceptToken('(', NULL)) { evaluated_factor = evaluateExpression(); -- cgit v1.2.3 From 6dc993e102ad8667b46bc32db6869efde3688507 Mon Sep 17 00:00:00 2001 From: suv-lp <> Date: Sun, 5 Jun 2016 09:13:26 +0200 Subject: [Bug #1545333] Remove obsolete poppler entries from cmake's template for config.h Fixed bugs: - https://launchpad.net/bugs/1545333 (bzr r14953) --- config.h.cmake | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/config.h.cmake b/config.h.cmake index 3471caadf..eae54fd03 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -143,24 +143,12 @@ /* Use libpoppler-glib and Cairo-SVG for PDF import */ #cmakedefine HAVE_POPPLER_GLIB 1 -/* Use GfxFont from Poppler >= 0.8.3 */ -#cmakedefine POPPLER_NEW_GFXFONT 1 - -/* Use color space API from Poppler >= 0.12.2 */ -#cmakedefine POPPLER_NEW_COLOR_SPACE_API 1 - /* Use color space API from Poppler >= 0.26.0 */ #cmakedefine POPPLER_EVEN_NEWER_COLOR_SPACE_API 1 /* Use color space API from Poppler >= 0.29.0 */ #cmakedefine POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API 1 -/* Use new error API from Poppler >= 0.20.0 */ -#cmakedefine POPPLER_NEW_ERRORAPI - -/* GfxPatch no longer uses GfxColor in >= 0.15.1 */ -#cmakedefine POPPLER_NEW_GFXPATCH 1 - /* Define to 1 if you have the `pow' function. */ #cmakedefine HAVE_POW 1 -- cgit v1.2.3 From fec6b1b18c55d40409dec7b2504c9ec111a45295 Mon Sep 17 00:00:00 2001 From: suv-lp <> Date: Sun, 5 Jun 2016 09:15:29 +0200 Subject: [Bug #1545333] Convenience option (default: ON) for cmake builds to enable SVG2 and experimental LPEs Fixed bugs: - https://launchpad.net/bugs/1545333 (bzr r14954) --- CMakeLists.txt | 2 ++ CMakeScripts/DefineDependsandFlags.cmake | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a68b678c1..91a090371 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,6 +87,8 @@ endif() option(WITH_DBUS "Compile with support for DBus interface" OFF) option(ENABLE_LCMS "Compile with LCMS support" ON) option(WITH_GNOME_VFS "Compile with support for Gnome VFS" ON) +option(WITH_SVG2 "Compile with support for new SVG2 features" ON) +option(WITH_LPETOOL "Compile with LPE Tool and experimental LPEs enabled" ON) #option(WITH_INKJAR "Enable support for openoffice files (SVG jars)" ON) option(WITH_GTEST "Compile with Google Test support" ${GMOCK_PRESENT}) option(WITH_OPENMP "Compile with OpenMP support" ON) diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index f2a6b5670..0f4ba46c6 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -262,6 +262,18 @@ if(WITH_DBUS) endif() endif() +if(WITH_SVG2) + add_definitions(-DWITH_MESH -DWITH_CSSBLEND -DWITH_CSSCOMPOSITE -DWITH_SVG2) +else() + add_definitions(-UWITH_MESH -UWITH_CSSBLEND -UWITH_CSSCOMPOSITE -UWITH_SVG2) +endif() + +if(WITH_LPETOOL) + add_definitions(-DWITH_LPETOOL -DLPE_ENABLE_TEST_EFFECTS) +else() + add_definitions(-UWITH_LPETOOL -ULPE_ENABLE_TEST_EFFECTS) +endif() + if(WITH_GTEST) if(EXISTS "${GMOCK_DIR}" AND IS_DIRECTORY "${GMOCK_DIR}") -- cgit v1.2.3 From 6f15692726681034391d42c58aa870e9dbba642f Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sun, 5 Jun 2016 19:35:39 +0200 Subject: Extensions: Fixes and improvements for "gui-text" parameter attribute - "gui-text" was always translated (as opposed to only "_gui-text") - This made it impossible to have parameters without label (since the empty string returns the whole .po file header when translated), which caused an issue in restack extension - Added possibility to specify "msgctxt" for "gui-text" (bzr r14955) --- share/extensions/restack.inx | 4 ++-- src/extension/param/bool.cpp | 2 +- src/extension/param/enum.cpp | 2 +- src/extension/param/float.cpp | 4 ++-- src/extension/param/int.cpp | 4 ++-- src/extension/param/parameter.cpp | 11 +++++++++++ src/extension/param/radiobutton.cpp | 2 +- src/extension/param/string.cpp | 2 +- 8 files changed, 21 insertions(+), 10 deletions(-) diff --git a/share/extensions/restack.inx b/share/extensions/restack.inx index 4f5f577cb..e14d2d5d5 100644 --- a/share/extensions/restack.inx +++ b/share/extensions/restack.inx @@ -9,7 +9,7 @@ <_param name="desc_dir" type="description" appearance="header">Restack Direction - + <_item value="lr">Left to Right (0) <_item value="bt">Bottom to Top (90) <_item value="rl">Right to Left (180) @@ -36,7 +36,7 @@ <_param name="desc_zsort" type="description" appearance="header">Restack Mode - + <_item value="rev">Reverse Z-Order <_item value="rand">Shuffle Z-Order diff --git a/src/extension/param/bool.cpp b/src/extension/param/bool.cpp index de9b1c586..87364d80f 100644 --- a/src/extension/param/bool.cpp +++ b/src/extension/param/bool.cpp @@ -137,7 +137,7 @@ Gtk::Widget *ParamBool::get_widget(SPDocument * doc, Inkscape::XML::Node * node, Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4)); #endif - Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START)); + Gtk::Label * label = Gtk::manage(new Gtk::Label(_text, Gtk::ALIGN_START)); label->show(); hbox->pack_end(*label, true, true); diff --git a/src/extension/param/enum.cpp b/src/extension/param/enum.cpp index 8bc0fbda7..4e7420807 100644 --- a/src/extension/param/enum.cpp +++ b/src/extension/param/enum.cpp @@ -251,7 +251,7 @@ Gtk::Widget *ParamComboBox::get_widget(SPDocument * doc, Inkscape::XML::Node * n } Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4)); - Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START)); + Gtk::Label * label = Gtk::manage(new Gtk::Label(_text, Gtk::ALIGN_START)); label->show(); hbox->pack_start(*label, false, false, _indent); diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp index 81508f6c0..4e3cbfedc 100644 --- a/src/extension/param/float.cpp +++ b/src/extension/param/float.cpp @@ -186,7 +186,7 @@ Gtk::Widget * ParamFloat::get_widget(SPDocument * doc, Inkscape::XML::Node * nod if (_mode == FULL) { - UI::Widget::SpinScale *scale = new UI::Widget::SpinScale(_(_text), fadjust, _precision); + UI::Widget::SpinScale *scale = new UI::Widget::SpinScale(_text, fadjust, _precision); scale->set_size_request(400, -1); scale->show(); hbox->pack_start(*scale, false, false); @@ -194,7 +194,7 @@ Gtk::Widget * ParamFloat::get_widget(SPDocument * doc, Inkscape::XML::Node * nod } else if (_mode == MINIMAL) { - Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START)); + Gtk::Label * label = Gtk::manage(new Gtk::Label(_text, Gtk::ALIGN_START)); label->show(); hbox->pack_start(*label, true, true, _indent); diff --git a/src/extension/param/int.cpp b/src/extension/param/int.cpp index c286018fd..605aab5ad 100644 --- a/src/extension/param/int.cpp +++ b/src/extension/param/int.cpp @@ -168,14 +168,14 @@ ParamInt::get_widget (SPDocument * doc, Inkscape::XML::Node * node, sigc::signal if (_mode == FULL) { - UI::Widget::SpinScale *scale = new UI::Widget::SpinScale(_(_text), fadjust, 0); + UI::Widget::SpinScale *scale = new UI::Widget::SpinScale(_text, fadjust, 0); scale->set_size_request(400, -1); scale->show(); hbox->pack_start(*scale, false, false); } else if (_mode == MINIMAL) { - Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START)); + Gtk::Label * label = Gtk::manage(new Gtk::Label(_text, Gtk::ALIGN_START)); label->show(); hbox->pack_start(*label, true, true, _indent); diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp index 10029893f..27d9bdf9b 100644 --- a/src/extension/param/parameter.cpp +++ b/src/extension/param/parameter.cpp @@ -20,6 +20,7 @@ #endif #include +#include #include "ui/widget/color-notebook.h" #include @@ -56,6 +57,16 @@ Parameter *Parameter::make(Inkscape::XML::Node *in_repr, Inkscape::Extension::Ex const char *guitext = in_repr->attribute("gui-text"); if (guitext == NULL) { guitext = in_repr->attribute("_gui-text"); + if (guitext == NULL) { + // guitext = ""; // propably better to require devs to explicitly set an empty gui-text if this is what they want + } else { + const char *context = in_repr->attribute("msgctxt"); + if (context != NULL) { + guitext = g_dpgettext2(NULL, context, guitext); + } else { + guitext = _(guitext); + } + } } const char *gui_tip = in_repr->attribute("gui-tip"); if (gui_tip == NULL) { diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp index 8181c6f51..1d1b860c6 100644 --- a/src/extension/param/radiobutton.cpp +++ b/src/extension/param/radiobutton.cpp @@ -313,7 +313,7 @@ Gtk::Widget * ParamRadioButton::get_widget(SPDocument * doc, Inkscape::XML::Node Gtk::VBox * vbox = Gtk::manage(new Gtk::VBox(false, 0)); #endif - Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START, Gtk::ALIGN_START)); + Gtk::Label * label = Gtk::manage(new Gtk::Label(_text, Gtk::ALIGN_START, Gtk::ALIGN_START)); label->show(); hbox->pack_start(*label, false, false, _indent); diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp index 1d9205502..6b082b133 100644 --- a/src/extension/param/string.cpp +++ b/src/extension/param/string.cpp @@ -166,7 +166,7 @@ Gtk::Widget * ParamString::get_widget(SPDocument * doc, Inkscape::XML::Node * no } Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4)); - Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START)); + Gtk::Label * label = Gtk::manage(new Gtk::Label(_text, Gtk::ALIGN_START)); label->show(); hbox->pack_start(*label, false, false, _indent); -- cgit v1.2.3 From 7709660f49a058a8cafa66422932f13938a266f6 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Mon, 6 Jun 2016 08:54:06 +0200 Subject: Documentation. French tutorials and man update. (bzr r14956) --- inkscape.fr.pod | 637 +++++++++++----------- share/tutorials/tutorial-advanced.fr.svg | 300 +++++------ share/tutorials/tutorial-basic.fr.svg | 518 +++++++++--------- share/tutorials/tutorial-calligraphy.fr.svg | 656 +++++++++++------------ share/tutorials/tutorial-elements.fr.svg | 324 +++++------ share/tutorials/tutorial-interpolate.fr.svg | 150 +++--- share/tutorials/tutorial-shapes.fr.svg | 620 ++++++++++----------- share/tutorials/tutorial-tips.fr.svg | 624 ++++++++++----------- share/tutorials/tutorial-tracing-pixelart.fr.svg | 74 +-- share/tutorials/tutorial-tracing.fr.svg | 102 ++-- 10 files changed, 2006 insertions(+), 1999 deletions(-) diff --git a/inkscape.fr.pod b/inkscape.fr.pod index 294130658..55f60d9a5 100644 --- a/inkscape.fr.pod +++ b/inkscape.fr.pod @@ -14,38 +14,38 @@ If the PO get lost, keeping this translation up-to-date will be harder. =head1 NOM -Inkscape - programme d'édition SVG (Scalable Vector Graphics). +Inkscape — programme d'édition de SVG (Scalable Vector Graphics). =head1 SYNOPSIS C -options: +S - -?, --help - --usage + -?, --help + --usage -V, --version - -f, --file=NOMDEFICHIER + -f, --file=NOM_DE_FICHIER - -e, --export-png=NOMDEFICHIER - -a, --export-area=x0:y0:x1:y1 + -e, --export-png=NOM_DE_FICHIER + -a, --export-area=x0:y0:x1:y1 -C, --export-area-page -D, --export-area-drawing --export-area-snap - -i, --export-id=ID - -j, --export-id-only + -i, --export-id=ID + -j, --export-id-only -t, --export-use-hints - -b, --export-background=COULEUR - -y, --export-background-opacity=VALEUR - -d, --export-dpi=DPI - -w, --export-width=LARGEUR - -h, --export-height=HAUTEUR - - -P, --export-ps=NOMDEFICHIER - -E, --export-eps=NOMDEFICHIER - -A, --export-pdf=NOMDEFICHIER - --export-pdf-version=NUMERODEVERSION + -b, --export-background=COULEUR + -y, --export-background-opacity=VALEUR + -d, --export-dpi=PPP + -w, --export-width=LARGEUR + -h, --export-height=HAUTEUR + + -P, --export-ps=NOM_DE_FICHIER + -E, --export-eps=NOM_DE_FICHIER + -A, --export-pdf=NOM_DE_FICHIER + --export-pdf-version=NUMÉRO_DE_VERSION --export-latex --export-ps-level {2,3} @@ -53,11 +53,11 @@ options: -T, --export-text-to-path --export-ignore-filters - -l, --export-plain-svg=NOMDEFICHIER + -l, --export-plain-svg=NOM_DE_FICHIER -p, --print=IMPRIMANTE - -I, --query-id=ID + -I, --query-id=ID -X, --query-x -Y, --query-y -W, --query-width @@ -67,13 +67,13 @@ options: -x, --extension-directory --verb-list - --verb=VERB-ID - --select=OBJECT-ID + --verb=ID_ACTION + --select=ID_OBJET --shell - -g, --with-gui - -z, --without-gui + -g, --with-gui + -z, --without-gui --vacuum-defs @@ -86,24 +86,25 @@ B est un éditeur de dessin au format B, B, B, etc. Les fonctionnalités d'Inkscape comprennent une gestion versatile des formes, le dessin à main levée et les courbes de Bézier, le texte multiligne, le texte suivant un -chemin, la transparence, les transformations affines, les remplissages par -motif ou dégradé, l'édition de nœuds, l'export SVG vers PNG, le groupement, -les calques, les clones interactifs et bien plus encore. L'interface est -conçue pour être confortable et efficace pour les utilisateurs expérimentés -tout en restant conforme aux spécifications de B permettant ainsi aux -utilisateurs d'applications GNOME de s'y habituer rapidement. +chemin, la transparence alpha, les transformations affines, les remplissages +par motif ou dégradé, l'édition de nœuds, l'import et l'export avec de +nombreux formats incluant PNG et PDF, le groupement, les calques, les clones +interactifs, et bien plus encore. L'interface est conçue pour être agréable +et efficace pour les utilisateurs expérimentés, tout en restant conforme aux +spécifications de B de sorte que les utilisateurs familiers avec +d'autres applications GNOME puissent rapidement prendre en main l'interface. -Le format B est un format XML standard pour le dessin vectoriel 2D. Il -permet de définir des objets sur un dessin par l'utilisation de points, -chemins et formes primitives. Les couleurs, fontes, largeur de contour et -autres sont spécifiés en tant qu'attributs de 'style' de ces objets. Le but -est de rendre possible l'utilisation de fichiers SVG pour un grand nombre de -programmes et d'utilisation, SVG étant un standard et ses fichiers du type -texte/xml. +Le format B est un format XML normalisé par le W3C pour le dessin +vectoriel en 2D. Il permet de définir des objets sur un dessin en utilisant +des points, des chemins et des formes primitives. Les couleurs, les polices +de caractères, l'épaisseur du contour et autres sont spécifiés comme +attributs du style de ces objets. Le but, SVG étant un standard et ses +fichiers du texte/XML, est de rendre possible l'utilisation de fichiers SVG +pour un grand nombre de programmes et de pratiques. -B utilise le SVG comme format natif de ses documents, et a pour -but de devenir le plus conforme des programmes de dessin SVG, disponible -pour la communauté du logiciel libre. +B utilise le SVG comme format de document natif, et vise à devenir +le programme de dessin vectoriel le plus respectueux du format SVG, +disponible dans la communauté du logiciel libre. @@ -113,299 +114,304 @@ pour la communauté du logiciel libre. =item B<-?>, B<--help> -Affiche un message d'aide. +Afficher un message d'aide. =item B<-V>, B<--version> -Affiche la version d'Inkscape et la date de compilation. +Afficher la version d'Inkscape et la date de compilation. =item B<-a> I, B<--export-area>=I -Pour l'export en PNG, définit la zone à exporter en pixels SVG (unité -anonyme de longueur utilisée normalement par le format SVG Inkscape). Le -comportement par défaut est d'exporter la page du document. Le point (0,0) -est le coin inférieur gauche. +Pour l'export en PNG, définit la zone à exporter en unités utilisateur SVG +(unité anonyme de longueur utilisée normalement par le format SVG +d'Inkscape). Le comportement par défaut est d'exporter la page complète du +document. Le point S<(0 ; 0)> correspond au coin inférieur gauche. =item B<-C>, B<--export-area-page> -Pour l'export en PNG, PDF, PS et EPS, la zone exportée est la page. C'est -habituellement le comportement par défaut pour les formats PNG, PDF et PS, -aussi spécifier cette option n'est pas nécessaire pour ces formats sauf si -l'option --export-id est utilisée pour exporter un objet spécifique. En EPS, -cependant, il ne s'agit pas du comportement par défaut. De plus, pour l'EPS, -la spécification du format n'autorise pas sa boîte englobante à s'étendre -au-delà de son contenu, ce qui signifie que lorsque l'option ---export-area-page est utilisée pour l'export EPS, la boîte englobante de la -page sera redimensionnée pour s'adapter à la boîte englobante de son contenu -si elle est plus petite. +Pour l'export en PNG, PDF, PS et EPS, définit la page comme zone à +exporter. C'est le comportement par défaut pour les formats PNG, PDF et PS, +et vous n'avez donc pas besoin de spécifier cette option pour ces formats à +moins que vous utilisiez l'option --export-id pour exporter un objet +spécifique. En EPS, cependant, il ne s'agit pas du comportement par S +de plus, la spécification du format EPS n'autorise pas son cadre englobant à +s'étendre au-delà de son contenu. Cela signifie que lorsque l'option +--export-area-page est utilisée pour l'export en EPS, la boîte englobante de +la page sera redimensionnée pour s'adapter à la taille de son contenu si +elle est plus petite. =item B<-D>, B<--export-area-drawing> -Pour l'export en PNG, PDF, PS et EPS, la zone à exporter est le dessin -entier (pas la page), c'est à dire la boîte englobante de l'ensemble des -objets du document (ou des objets exportés lorsque l'option --export-id est +Pour l'export en PNG, PDF, PS et EPS, définit le dessin entier (pas la page) +comme zone à exporter, c'est-à-dire le cadre englobant l'ensemble des objets +du document (ou des objets exportés lorsque l'option --export-id est utilisée). Avec cette option, l'image exportée n'affichera que les objets visibles du document sans marge ni massicotage. Il s'agit de l'option par -défaut pour l'export au format EPS. Peut être combiné, lors de l'export en -PNG, avec --export-use-hints. +défaut pour l'export au format EPS. Lors de l'export en PNG, elle peut être +combinée avec --export-use-hints. =item B<--export-area-snap> -Arrondi les dimensions de la zone à exporter aux valeurs entières -supérieures en unités SVG utilisateur (px). Si vous utilisez une résolution -d'export de 96 ppp et que vos objets sont alignés aux pixels afin de -minimiser l'anti-crénelage, cette option permet de préserver cet alignement -même si l'export se fait selon des boîtes de contour (avec --export-id ou ---export-area-drawing) qui ne sont pas correctement alignées sur les pixels. +Pour l'export en PNG, arrondir les dimensions de la zone à exporter aux +valeurs entières supérieures en unités SVG utilisateur (px). Si vous +utilisez une résolution d'export de 96 ppp et que vos objets sont alignés +aux pixels afin de minimiser l'anti-crénelage, cette option permet de +préserver cet alignement même si l'export se fait selon des boîtes de +contour (avec --export-id ou --export-area-drawing) qui ne sont pas +correctement alignées sur les pixels. =item B<-b> I, B<--export-background>=I -Couleur de fond du PNG exporté. Cette valeur peut être n'importe quelle -chaîne de couleur supportée par le format SVG, par exemple "#ff007f" ou -"rgb(255, 0, 128)". Si cette couleur n'est pas définie, la couleur de page -définie dans Inkscape via la boîte de dialogue Préférences du document sera -utilisée (enregistrée dans l'attribut pagecolor= de sodipodi:namedview). +Définit la couleur d'arrière-plan du PNG exporté. La couleur peut être +décrite de toutes les manières supportées par le format SVG, par exemple +"#ff007f" ou "rgb(255, 0, 128)". Si cette couleur n'est pas définie, la +couleur de page définie dans Inkscape via la boîte de dialogue Préférences +du document sera utilisée (enregistrée dans l'attribut pagecolor= de +sodipodi:namedview). =item B<-d> I, B<--export-dpi>=I -La résolution utilisée pour l'export en PNG. Elle est également utilisée -pour définir le niveau de rastérisation des objets filtrés lors de l'export -en PS, EPS ou PDF (sauf si l'option --export-ignore-filters est +Définit la résolution utilisée pour l'export en PNG. Elle est également +utilisée pour définir le niveau de rastérisation des objets filtrés lors de +l'export en PS, EPS ou PDF (sauf si l'option --export-ignore-filters est utilisée). Elle est de 96 par défaut, correspondant à 1 pixel SVG (px, aussi appelé « unité utilisateur ») s'exportant vers 1 pixel bitmap. Cette valeur préempte la PPP enregistrée avec le document si la commande est utilisée avec --export-use-hints. -=item B<-e> I, B<--export-png>=I +=item B<-e> I, B<--export-png>=I -Spécifie le nom de fichier pour l'export en PNG. S'il existe déjà, il sera -écrasé sans demande de confirmation. +Exporter au format PNG sous le nom I. Si un fichier portant +ce nom existe déjà, il sera écrasé sans demande de confirmation. -=item B<-f> I, B<--file>=I +=item B<-f> I, B<--file>=I -Ouvre le(s) document(s) spécifié(s). La chaîne d'option peut être omise, -c'est à dire que vous pouvez lister les noms de fichier sans -f. +Ouvrir le(s) document(s) spécifié(s). La chaîne d'option peut être omise, +c'est-à-dire que vous pouvez lister les fichiers sans -f. =item B<-g>, B<--with-gui> -Tente d'utiliser l'interface graphique (sous Unix, utilise le serveur X, +Essayer d'utiliser l'interface graphique (sous Unix, utiliser le serveur X, même si $DISPLAY n'est pas défini). =item B<-h> I, B<--export-height>=I -Hauteur du bitmap généré en pixels. Cette valeur préempte l'option ---export-dpi (ou la PPP enregistrée avec le document si --export-use-hints -est aussi utilisé). +Définit la hauteur de l'image matricielle générée en pixels. Cette valeur +écrase le paramètre --export-dpi (ou la PPP enregistrée avec le document si +--export-use-hints est aussi utilisé). =item B<-i> I, B<--export-id>=I -Lors des exportations PNG, PS, EPS, PDF et SVG simple, valeur de l'attribut -id de l'objet que vous voulez exporter depuis le document (aucun autre objet -n'est exporté). Par défaut la zone exportée est la boîte englobante de -l'objet ; vous pouvez préempter ce comportement en utilisant --export-area -(pour le PNG seulement) ou --export-area-page. +Pour l'export en PNG, PS, EPS, PDF et SVG simple, exporter l'objet portant +l'identifiant (valeur de l'attribut id) S ;> les autres objets du +document ne seront pas exportés. Par défaut, la zone exportée est le cadre +englobant l'objet ; vous pouvez changer ce comportement en utilisant +--export-area (PNG seulement) ou --export-area-page. =item B<-j>, B<--export-id-only> -Pour les formats PNG et SVG simple, n'exporte que l'objet dont l'id est -spécifiée avec avec l'option --export-id. Tout les autres objets seront -cachés et n'apparaîtront pas dans le fichier exporté même s'ils chevauchent -l'objet effectivement exporté. Cette option est ignorée si --export-id n'est -pas aussi utilisé. +Pour les formats PNG et SVG simple, n'exporter que l'objet dont +l'identifiant est spécifié avec avec l'option --export-id. Tous les autres +objets seront cachés et n'apparaîtront pas dans l'export même s'ils +chevauchent l'objet exporté. Si --export-id n'est pas spécifié, cette option +est ignorée. Pour l'export au format PDF, il s'agit du comportement par +défaut, et cette option n'a donc pas d'effet. -=item B<-l>, B<--export-plain-svg>=I +=item B<-l>, B<--export-plain-svg>=I -Exporte le(s) document(s) en SVG brut, sans espace de nom sodipodi: ou -inkscape: et sans métadonnées RDF. +Exporter le(s) document(s) au format SVG simple, sans espace de noms +sodipodi: ou inkscape: et sans métadonnées RDF. =item B<-x>, B<--extension-directory> -Liste le contenu du répertoire d'extensions configuré en tant que tel par -Inkscape, puis sort. Cette option est utilisée afin que les extensions -externes utilisent la configuration originale générée à l'installation -d'Inkscape. +Lister le contenu du répertoire d'extensions utilisé par Inkscape et +quitter. Cela permet aux extensions externes d'utiliser la même +configuration que l'installation originale d'Inkscape. =item B<--verb-list> -Liste tous les verbes disponibles dans Inkscape par identifiant. Cet +Lister toutes les actions disponibles dans Inkscape par identifiant. Cet identifiant peut être utilisé pour définir les actions du clavier ou les menus. Il peut également être utilisé avec l'option de ligne de commande --verb. -=item B<--verb>=I, B<--select>=I +=item B<--verb>=I, B<--select>=I -Ces deux options fonctionnent de concert pour offrir la possibilité d'écrire -des scripts simples pour Inkscape depuis la ligne de commande. Il peuvent -apparaître sur la ligne de commande aussi souvent que nécessaire et sont -exécutés dans l'ordre pour tous les documents spécifiés. +Ces deux options fonctionnent de concert pour permettre aux scripts +d'utiliser Inkscape en ligne de commande. Elles peuvent apparaître sur la +ligne de commande aussi souvent que nécessaire et sont exécutées dans +l'ordre pour tous les documents spécifiés. La commande --verb exécute une action spécifique comme si elle était appelée -depuis un menu ou un bouton. Un boîte de dialogue apparaît lorsqu'elle fait +depuis un menu ou un bouton. Une boîte de dialogue apparaîtra si elle fait partie de l'action. Utilisez l'option --verb-list pour lister les identifiants d'action disponibles. -La commande --select sélectionne les objects correspondants à l'identifiant -spécifié. Les actions suivantes ne s'appliquent alors qu'à cette +La commande --select sélectionne les objets correspondant aux identifiants +spécifiés. Les actions suivantes ne s'appliquent alors qu'à cette sélection. Pour désélectionner tous les objets, utilisez --verb=EditDeselect. Les identifiants d'objet disponibles dépendent du document ouvert. =item B<-p> I, B<--print>=I -Imprime le(s) document(s) vers l'imprimante spécifiée en utilisant `lpr -P -IMPRIMANTE'. Vous pouvez aussi utiliser `| COMMANDE' pour spécifier un tube -de commande différent, ou utiliser `> NOMDEFICHIER' pour écrire le résultat -PostScript dans un fichier au lieu de l'imprimer. N'oubliez pas d'utiliser -les guillemets appropriés pour votre shell, par S +Imprimer le(s) document(s) avec l'imprimante spécifiée en utilisant `lpr -P +IMPRIMANTE'. Vous pouvez également utiliser `| COMMANDE' pour envoyer la +sortie vers une autre commande, ou `> NOMDEFICHIER' pour écrire la sortie +PostScript dans un fichier au lieu de l'imprimer. Faites attention à placer +les guillemets correctement pour votre shell, par S -inkscape --print='| ps2pdf - mondoc.pdf' mondoc.svg +inkscape --print='| ps2pdf - mon_doc.pdf' mon_doc.svg =item B<-t>, B<--export-use-hints> -Utilise le nom de fichier et la PPP enregistrés avec l'objet exporté -(uniquement si --export-id est spécifié). Ces valeurs sont automatiquement -spécifiées si vous exportez la sélection depuis Inkscape. Donc, si par -exemple, vous exportez la forme id="path231" en tant que /home/me/shape.png -avec une résolution de 300 ppp depuis document.svg en utilisant l'interface -graphique d'Inkscape, et sauvez le document, vous pourrez réexporter plus -tard cette forme vers le même fichier et avec la même résolution en -utilisant simplement la S +Utiliser le nom de fichier et la résolution enregistrés avec l'objet exporté +(uniquement si --export-id est spécifié). Ces valeurs sont configurées +automatiquement lorsque vous exportez la sélection depuis Inkscape. Donc, +par exemple, si vous exportez une forme avec id="path231" sous +/home/me/shape.png avec une résolution de 300 ppp depuis document.svg en +utilisant l'interface graphique d'Inkscape, et enregistrez le document, vous +pourrez réexporter plus tard cette forme vers le même fichier et avec la +même résolution en utilisant simplement la S inkscape -i path231 -t document.svg Si vous utilisez --export-dpi, --export-width, ou --export-height avec cette -option, la PPP enregistrée avec le document sera ignorée et la valeur -fournie à la ligne de commande utilisée. Si vous utilisez --export-png avec +option, alors la résolution enregistrée sera ignorée et la valeur fournie +sur la ligne de commande sera utilisée. Si vous utilisez --export-png avec cette option, le nom de fichier enregistré avec le document sera ignoré et -le nom de fichier fourni à la ligne de commande utilisé. +le nom de fichier fourni sur la ligne de commande utilisé. =item B<-w> I, B<--export-width>=I -Largeur du bitmap généré en pixels. Cette valeur préempte l'option ---export-dpi setting (ou la PPP enregistrée avec le document si ---export-use-hints est aussi utilisé). +Définit la largeur de l'image matricielle générée en pixels. Cette valeur +écrase l'option --export-dpi (ou la résolution enregistrée avec le document +si --export-use-hints est aussi utilisé). =item B<-y> I, B<--export-background-opacity>=I -Opacité du fond du PNG exporté. Cela peut être une valeur entre 0.0 et 1.0 -S<(0.0 :> complètement transparent, 1.0 complètement opaque) ou supérieure à 1 -et inférieure à 255 S<(255 :> complètement opaque). Si cette valeur n'est pas -spécifiée et si l'option -b n'est pas utilisée, l'opacité de la page -enregistrée avec le document (dans l'attribut inkscape:pageopacity= de -sodipodi:namedview) sera utilisée. Si cette valeur n'est pas spécifiée mais -que l'option -b est utilisée, la valeur 255 (opacité complète) sera -utilisée. +Définit l'opacité de l'arrière-plan du PNG exporté. Cela peut être une +valeur entre 0.0 et 1.0 (0.0 signifiant la transparence complète, 1.0 +l'opacité complète) ou supérieure à 1 et inférieure à 255 S<(255 :> +complètement opaque). Si cette valeur n'est pas spécifiée et si l'option -b +n'est pas utilisée, l'opacité de la page enregistrée avec le document (dans +l'attribut inkscape:pageopacity= de sodipodi:namedview) sera utilisée. Si +cette valeur n'est pas spécifiée mais que l'option -b est utilisée, la +valeur 255 (opacité complète) sera utilisée. -=item B<-P> I, B<--export-ps>=I +=item B<-P> I, B<--export-ps>=I -Exporte le ou les documents au format PostScript. Notez que PostScript ne +Exporter le(s) document(s) au format PostScript. Notez que PostScript ne supporte pas la transparence, et que tout objet transparent dans le SVG -original sera automatiquement rastérisé. Les polices utilisés sont +original sera automatiquement rastérisé. Les polices utilisées sont incorporées en tant que sous-ensemble. La zone d'exportation par défaut est -la page, mais vous pouvez choisir de limiter cette zone au dessin avec -l'option --export-area-drawing. Il est également possible de n'exporter -qu'un objet en spécifiant --export-id (tous les autres objets sont -cachés). Dans ce cas, la zone d'exportation correspond à celle de l'objet -choisi, à moins que vous n'ajoutiez l'option --export-area-page pour que -cette zone prenne la taille de la page. +la S vous pouvez la configurer comme étant le dessin avec l'option +--export-area-drawing. Vous pouvez spécifier --export-id pour exporter un +unique objet (tous les autres objets seront S dans ce cas, la zone +d'exportation correspond au cadre englobant l'objet choisi, à moins que vous +n'ajoutiez l'option --export-area-page pour qu'il s'agisse de la page. -=item B<-E> I, B<--export-eps>=I +=item B<-E> I, B<--export-eps>=I -Exporte le ou les documents au format Encapsulated PostScript. Notez que +Exporter le(s) document(s) au format PostScript encapsulé. Notez que PostScript ne supporte pas la transparence, et que tout objet transparent -dans le SVG original sera automatiquement rastérisé. Les polices utilisés +dans le SVG original sera automatiquement rastérisé. Les polices utilisées sont incorporées en tant que sous-ensemble. La zone d'exportation par défaut -est la page, mais vous pouvez choisir de limiter cette zone au dessin avec -l'option --export-area-drawing. Il est également possible de n'exporter -qu'un objet en spécifiant --export-id (tous les autres objets sont cachés). +est le S vous pouvez la configurer comme étant la page, mais +consultez --export-area-page pour la limitation applicable. Vous pouvez +spécifier --export-id pour exporter un unique objet (tous les autres objets +seront cachés). -=item B<-A> I, B<--export-pdf>=I +=item B<-A> I, B<--export-pdf>=I -Exporte le ou les documents au format PDF. Ce format préserve la -transparence des objets présents dans le SVG original. Les polices utilisés -sont incorporées en tant que sous-ensemble. La zone d'exportation par défaut -est la page, mais vous pouvez choisir de limiter cette zone au dessin avec -l'option --export-area-drawing. Il est également possible de n'exporter -qu'un objet en spécifiant --export-id (tous les autres objets sont -cachés). Dans ce cas, la zone d'exportation correspond à celle de l'objet -choisi, à moins que vous n'ajoutiez l'option --export-area-page pour que -cette zone prenne la taille de la page. +Exporter le(s) document(s) au format PDF. Ce format préserve la transparence +des objets présents dans le SVG original. Les polices utilisées sont +incorporées en tant que sous-ensemble. La zone d'exportation par défaut est +la S vous pouvez la configurer comme étant le dessin avec l'option +--export-area-drawing. Vous pouvez spécifier --export-id pour exporter un +unique objet (tous les autres objets seront S dans ce cas, la zone +d'exportation correspond au cadre englobant l'objet choisi, à moins que vous +n'ajoutiez l'option --export-area-page pour qu'il s'agisse de la page. -=item B<--export-pdf-version>=I +=item B<--export-pdf-version>=I -Sélectionne la version PDF utilisée pour exporter le fichier. Cette option -ne fait que réutiliser le sélecteur de version PDF présent dans la boîte de -dialogue d'exportation en PDF de l'interface graphique. Vous devez donc -fournir une des versions proposées par ce sélecteur (par exemple « 1.4 ». La -version par défaut est « 1.4 ». +Sélectionne la version du format PDF utilisée pour exporter le +fichier. Cette option correspond au sélecteur de version PDF présent dans la +boîte de dialogue d'exportation en PDF de l'interface graphique. Vous devez +indiquer une des versions proposées par ce sélecteur, par exemple « 1.4 +». La version par défaut est « 1.4 ». =item B<--export-latex> -Pour l'exportation en PS, EPS ou PDF. Utilisé pour créer des images pour les -documents LaTeX, pour lesquels les textes sont composés par LaTeX. Lors de -l'exportation PS, EPS ou PDF, cette option sépare la sortie en un fichier -PS, EPS ou PDF (lorsque, par exemple, l'option --export-pdf est positionnée) -et en un fichier LaTeX. Le text n'est pas enregistré dans le PS, EPS ou PDF, -mais apparaît dans le fichier LaTex, qui lui-même inclut le PS, EPS ou -PDF. Inclure le fichier LaTeX (\input{image.tex}) dans un document LaTeX -fait alors apparaître l'image, et tout le texte composé par LaTeX. Se -référer au document LaTeX généré pour de plus amples informations (voir -également la sortie terminal de la commande GNUPlot `epslatex'). +Pour l'export en PS, EPS ou PDF, crée des images pour les documents LaTeX, +dans lesquels les textes de l'image sont composés par LaTeX. Lors de +l'export au format PDF/PS/EPS, cette option divise la sortie en un fichier +PDF/PS/EPS (lorsque, par exemple, l'option --export-pdf est spécifiée) et un +fichier LaTeX. Le texte ne sera pas enregistré dans le fichier PDF/PS/EPS, +mais apparaîtra à la place dans le fichier LaTeX. Ce fichier LaTeX inclut le +PDF/PS/EPS. Inclure le fichier LaTeX (\input{image.tex}) dans un document +LaTeX fait alors apparaître l'image, et tout le texte sera composé par +LaTeX. Consultez le document LaTeX généré pour en savoir plus. Consultez +également la sortie de la commande `epslatex' de GNUPlot dans un terminal. =item B<-T>, B<--export-text-to-path> -Convertit les objets texte en chemins lors de l'export, si applicable (pour -l'exportation en PS, EPS, PDF ou SVG). +Convertir les objets texte en chemins lors de l'export, si applicable (pour +l'export en PS, EPS, PDF ou SVG). =item B<--export-ignore-filters> -Exporte les objets filtrés (avec du flou, par exemple) comme des vecteurs, -en ignorant les filtres (pour l'exportation en PS, EPS ou PDF). Par défaut, -tous les objets filtrés sont rastérisés à une définition choisie par ---export-dpi (par défaut 96 ppp), en préservant son apparence. +Exporter les objets filtrés (avec du flou, par exemple) comme des vecteurs, +en ignorant les filtres (pour l'export en PS, EPS ou PDF). Par défaut, tous +les objets filtrés sont rastérisés à une résolution choisie par --export-dpi +(par défaut 96 ppp), ce qui préserve leur apparence. =item B<-I>, B<--query-id> -Identifiant de l'objet dont les dimensions sont demandées. Si cette option -n'est pas utilisée, la commande retournera les dimensions du dessin, pas de -la page ou de la zone affichée. +Définit l'identifiant de l'objet dont les dimensions sont demandées. Si +cette option n'est pas utilisée, la commande retournera les dimensions du +dessin (c'est-à-dire de tous les objets du document), pas de la page ou de +la zone affichée. =item B<-X>, B<--query-x> -Demande l'abscisse (coordonnée X) du dessin ou, si spécifié avec --query-id, -de l'objet. La valeur retournée est en pixels (unité utilisateur SVG). +Demander l'abscisse (coordonnée X) du dessin ou, si spécifié avec +--query-id, de l'objet. La valeur retournée est en px (unités utilisateur +SVG). =item B<-Y>, B<--query-y> -Demande l'ordonnée (coordonnée Y) du dessin ou, si spécifié avec --query-id -de l'objet. La valeur retournée est en pixels (unité utilisateur SVG). +Demande l'ordonnée (coordonnée Y) du dessin ou, si spécifié avec --query-id, +de l'objet. La valeur retournée est en px (unités utilisateur SVG). =item B<-W>, B<--query-width> Demande la largeur du dessin ou, si spécifié avec --query-id, de l'objet. La -valeur retournée est en pixels (unité utilisateur SVG). +valeur retournée est en px (unités utilisateur SVG). =item B<-H>, B<--query-height> Demande la hauteur du dessin ou, si spécifié avec --query-id, de l'objet. La -valeur retournée est en pixels (unité utilisateur SVG). +valeur retournée est en px (unités utilisateur SVG). =item B<-S>, B<--query-all> -Affiche un liste délimitée par des virgules des tous les objets du document -SVG comprenant leur identifiant, et les valeurs x, y, largeur et hauteur. +Affiche une liste de tous les objets du document SVG avec leur identifiant, +et les valeurs x, y, largeur et hauteur, en utilisant la virgule comme +séparateur. =item B<--shell> -Avec ce paramètre, Inkscape entre en mode de ligne de commande -interactif. Dans ce mode, vous pouvez envoyer des commandes à Inkscape par -le prompt, sans avoir à lancer une nouvelle instance du logiciel à chaque -commande. Cette fonctionnalité est particulièrement utile pour une -utilisation en scripts et en serveur. Elle permet d'améliorer la vitesse -d'exécution et l'occupation en mémoire des scripts utilisés de façon -répétée. Chaque commande, dans ce mode, doit contenir tous les paramètres -d'une ligne de commande classique, à l'exception du nom du programme -(inkscape), comme dans l'exemple S "fichier.svg +Utiliser Inkscape en mode ligne de commande interactif. Dans ce mode, vous +pouvez entrer des commandes sur l'invite et Inkscape les exécute, sans que +vous ayez à lancer une nouvelle instance du logiciel à chaque +commande. Cette fonctionnalité est principalement utile pour les scripts et +l'exécution à S elle n'ajoute aucune fonctionnalité mais permet +d'améliorer la vitesse et l'occupation en mémoire des scripts qui appellent +Inkscape de façon répétée pour effectuer des tâches en ligne de commande +(telles que des exports ou des conversions). Chaque commande, en mode +interactif, doit contenir tous les paramètres d'une ligne de commande +classique sans le nom du programme (inkscape), par S "fichier.svg --export-pdf=fichier.pdf". =item B<--vacuum-defs> @@ -417,38 +423,37 @@ spécifié sera modifié. =item B<-z>, B<--without-gui> -Ne lance pas l'interface graphique (sous Unix, n'utilise pas le server S -ne traite les fichiers que depuis la console. Ceci est présupposé pour les -options -p, -e, -l et --vacuum-defs. +Ne pas ouvrir l'interface graphique (sous Unix, ne pas utiliser le serveur +S ne traiter les fichiers que depuis la console. Ceci est présupposé pour +les options -p, -e, -l et --vacuum-defs. =item B<--g-fatal-warnings> Cette option GTK standard force l'arrêt d'Inkscape dès qu'un message -d'avertssement (généralement sans gravité) est envoyé (utilisée à des fins -de déboggage). +d'avertissement (généralement sans gravité) est envoyé (utile pour le +débogage). =item B<--usage> -Affiche un bref message sur l'utilisation d'Inkscape. +Afficher un bref message sur d'usage. =back =head1 CONFIGURATION -Le fichier de configuration principal est placé dans -~/.config/Inkscape/preferences.xml. Il contient plusieurs types de +Le fichier de configuration principal se trouve dans +S<~/.config/Inkscape/preferences.xml ;> il contient de nombreux types de paramétrages dont vous pouvez changer la valeur dans Inkscape (la plupart -dans la boîte de dialogue Préférences d'Inkscape). Vous pouvez ajouter des -configurations spécifiques dans les sous-répertoires S +dans la boîte de dialogue Préférences d'Inkscape). Vous pouvez également +ajouter des configurations spécifiques dans les sous-répertoires S -B<$HOME>/.config/Inkscape/extensions/ - extensions. +B<$HOME>/.config/Inkscape/extensions/ — extensions. -B<$HOME>/.config/Inkscape/icons/ - icônes. +B<$HOME>/.config/Inkscape/icons/ — icônes. -B<$HOME>/.config/Inkscape/keys/ - association des touches du clavier aux -commandes. +B<$HOME>/.config/Inkscape/keys/ — configuration des raccourcis clavier. -B<$HOME>/.config/Inkscape/templates/ - modèles de fichiers. +B<$HOME>/.config/Inkscape/templates/ — modèles de document. =head1 DIAGNOSTICS @@ -456,73 +461,74 @@ Le programme retourne la valeur zéro après une utilisation réussie ou différente de zéro après un problème. Des messages d'erreur et des avertissements divers peuvent être envoyés vers -STDERR ou STDOUT. Si le programme se comporte de façon erratique avec un -fichier SVG particulier, ou se plante, il est utile de chercher des indices -dans ces messages. +STDERR ou STDOUT. Si le programme se comporte de façon inconsistante avec un +fichier SVG particulier ou plante, ces messages peuvent comporter des +indices. =head1 EXEMPLES Bien qu'B soit principalement conçu comme une application graphique, il peut aussi être utilisé depuis la ligne de commande pour -certaines opérations SVG. +effectuer des opérations SVG. Ouvrir un fichier SVG avec l'interface S - inkscape nomdefichier.svg + inkscape fichier.svg Imprimer un fichier S - inkscape nomdefichier.svg -p '| lpr' + inkscape fichier.svg -p '| lpr' -Exporter un fichier SVG en PNG avec la résolution par défaut de 96 ppp (un -pixel bitmap correspondant à une unité utilisateur S +Exporter un fichier SVG en PNG avec la résolution par défaut de 96 ppp (une +unité utilisateur SVG devient un pixel de l'image S - inkscape nomdefichier.svg --export-png=nomdefichier.png + inkscape fichier.svg --export-png=fichier.png -Idem, mais en forçant les dimensions du fichier à 600x400 S +Idem, mais en forçant les dimensions du fichier à 600×400 S - inkscape nomdefichier.svg --export-png=nomdefichier.png -w600 -h400 + inkscape fichier.svg --export-png=fichier.png -w600 -h400 Idem, mais en exportant le dessin (la boîte englobante de tous les objets), et pas la S - inkscape nomdefichier.svg --export-png=nomdefichier.png --export-area-drawing + inkscape fichier.svg --export-png=fichier.png --export-area-drawing -Exporter en PNG l'objet id="text1555", en utilisant le nom de fichier et la -résolution utilisés la dernière fois qu'il a été exporté depuis l'interface -S +Exporter en PNG l'objet avec id="text1555", en utilisant le nom de fichier +et la résolution utilisés la dernière fois qu'il a été exporté depuis +l'interface S - inkscape nomdefichier.svg --export-id=text1555 --export-use-hints + inkscape fichier.svg --export-id=text1555 --export-use-hints Idem, mais en utilisant une résolution de 96 ppp, en spécifiant un nom de -fichier et en arrondissant la zone à exporter aux valeurs entières juste -supérieures en unités utilisateur SVG (afin de préserver l'alignement des -objets sur des pixels et minimiser S +fichier et en arrondissant la zone à exporter aux valeurs entières les plus +proches en unités utilisateur SVG (afin de préserver l'alignement des objets +sur des pixels et minimiser S - inkscape nomdefichier.svg --export-id=text1555 --export-png=text.png --export-area-snap + inkscape fichier.svg --export-id=text1555 --export-png=text.png --export-area-snap -Convertir un document du format SVG Inkscape au format SVG S +Convertir un document du format SVG Inkscape au format SVG S - inkscape nomdefichier1.svg --export-plain-svg=nomdefichier2.svg + inkscape fichier1.svg --export-plain-svg=fichier2.svg Convertir un document SVG en EPS, en convertissant les textes en S - inkscape nomdefichier.svg --export-eps=nomdefichier.eps --export-text-to-path + inkscape fichier.svg --export-eps=fichier.eps --export-text-to-path -Demander la largeur de l'objet avec un S +Demander la largeur de l'objet avec S - inkscape nomdefichier.svg --query-width --query-id text1555 + inkscape fichier.svg --query-width --query-id text1555 -Dupliquer l'objet ayant pour identifiant id="path1555", puis appliquer une -rotation de 90 degrés sur le duplicat, enregistrer le SVG et S +Dupliquer l'objet avec id="path1555", appliquer une rotation de 90 degrés +sur le duplicata, enregistrer le SVG et S - inkscape nomdefichier.svg --select=path1555 --verb=EditDuplicate --verb=ObjectRotate90 --verb=FileSave --verb=FileClose + inkscape fichier.svg --select=path1555 --verb=EditDuplicate --verb=ObjectRotate90 --verb=FileSave --verb=FileClose -=head1 ENVIRONEMENT +=head1 ENVIRONNEMENT -B pour obtenir l'hôte par défaut et le numéro d'affichage. +B pour obtenir l'hôte par défaut et le numéro de la session +graphique. B pour définir le chemin par défaut du répertoire à utiliser pour stocker les fichier temporaires. Le répertoire doit exister. @@ -539,11 +545,11 @@ I) ou, si elles sont introuvables, depuis le fichier I. Si une icône n'est pas trouvée dans l'un de ces emplacements, elle est chargée depuis l'emplacement par défaut du système. -Les icônes nécessaires sont chargées depuis les fichiers SVG par recherche -de l'id SVG correspondant (Par exemple, pour charger l'icône "fill_none" -depuis un fichier, le contenu identifié par l'id SVG "fill_none" est rendu -en tant que cette icône, qu'il vienne du fichier I ou du -fichier I). +Les icônes nécessaires sont chargées depuis les fichiers SVG en cherchant +l'identifiant SVG correspondant (par exemple, pour charger l'icône +S<« fill_none »> depuis un fichier, le contenu identifié par l'identifiant SVG +S<« fill_none »> est rendu en tant que cette icône, qu'il vienne du fichier +I ou du fichier I). @@ -551,20 +557,20 @@ fichier I). =head1 AUTRES INFORMATIONS -L'endroit principal pour trouver des informations sur B est -http://www.inkscape.org/. Le site web contient des liens vers d'autres -éléments S documentation, didacticiels, manuel de l'utilisateur, -exemples, archives des listes de diffusion, la dernière version d'Inkscape, -les bases contenant les défauts et les demandes d'évolution, et bien -d'autres choses. +La référence principale où trouver des informations sur B est +http://www.inkscape.org/. Le site web comporte des actualités, de la +documentation, des didacticiels, des exemples, des archives des listes de +diffusion, la dernière version du programme, les bases de données contenant +les bogues et les demandes de fonctionnalité, des forums, et encore +davantage. =head1 VOIR AUSSI potrace, cairo, rsvg(1), batik, ghostscript, pstoedit. -Suite de tests de conformité S http://www.w3.org/Graphics/SVG/Test/ +Suite de tests de conformité S http://www.w3.org/Graphics/SVG/Test/ -Validation de S http://jiggles.w3.org/svgvalidator/ +Validation de S http://jiggles.w3.org/svgvalidator/ I I L @@ -585,49 +591,49 @@ W3C> L Pour vous familiariser avec l'utilisation de l'interface graphique d'Inkscape, consultez les didacticiels dans Aide > Didacticiels. -Inkscape permet d'importer (Fichier > Importer) la plupart des formats -bitmaps PNG, BMP, JPG, XPM, GIF, etc.), du texte brut (nécessite Perl), PS -et EPS (nécessite Ghostscript) et les formats PDF et AI (documents Adobe -Illustrato 9.0 ou plus récent). +En plus du SVG, Inkscape peut importer (Fichier > Importer) la plupart des +formats d'images matricielles (PNG, BMP, JPG, XPM, GIF, etc.), du texte brut +(nécessite Perl), les formats PS et EPS (nécessite Ghostscript) et les +formats PDF et AI (AI version 9.0 ou ultérieur). -Inkscape permet d'exporter (Fichier > Exporter une image PNG) des images PNG -32-bits, mais aussi aux formats AI, PS, EPS, PDF, DXF et plusieurs autres -formats (via Fichier > Enregistrer sous). +Inkscape peut exporter (Fichier > Exporter une image PNG) des images PNG 32 +bits, mais aussi aux formats AI, PS, EPS, PDF, DXF et plusieurs autres +formats via Fichier > Enregistrer sous. Inkscape supporte la pression et l'inclinaison du stylet d'une tablette -graphique pour la largeur, la force et l'angle de plusieurs outils dont la -plume calligraphique. +graphique pour la largeur, l'angle et la force d'action de plusieurs outils, +dont la plume calligraphique. -Inkscape comporte une interface graphique pour le moteur de vectorisation de -bitmaps Potrace (http://potrace.sf.net) qui est inclus dans Inkscape. +Inkscape comporte une interface graphique pour le moteur de vectorisation +d'image matricielle Potrace (http://potrace.sf.net) qui est inclus dans +Inkscape. Inkscape peut utiliser des scripts externes (filtres de stdin vers stdout) -représentés par des commandes dans le menu Effets. Un script peut avoir une -interface graphique, sous forme de boîte de dialogue, permettant de définir -différents paramètres et peut obtenir les IDs des objets sélectionnés sur -lesquels agir depuis la ligne de commande. Inkscape est livré avec un -assortiment d'effets écrits en Python dédiés principalement à la -manipulation de chemin. +représentés par des commandes dans le menu Effets. Un script peut faire +intervenir les boîtes de dialogue de l'interface graphique pour définir +différents paramètres et peut obtenir les identifiants des objets +sélectionnés sur lesquels agir depuis la ligne de commande. Inkscape est +livré avec un assortiment d'effets écrits en Python. =head1 RACCOURCIS CLAVIER Pour obtenir une liste complète des raccourcis clavier et souris, consultez le fichier doc/keys.html, ou utilisez la commande Clavier et souris dans le -menu d'aide de l'interface graphique. +menu Aide. -=head1 DÉFAUTS +=head1 BOGUES -Beaucoup de bugs sont S veuillez s'il vous plaît consulter le site -web pour vérifier ceux qui ont déjà été rapportés et pour soumettre de -nouveaux problèmes. Consultez aussi la section "Known Issues" des notes de -votre version (dans le fichier `NEWS'). +Beaucoup de bogues sont S veuillez vous référer au site web +(inkscape.org) pour vérifier ceux qui ont déjà été rapportés et pour +soumettre de nouveaux problèmes. Consultez aussi la section S<« Known> S +des notes de livraison de votre version (dans le fichier `NEWS'). =head1 AUTEURS Ce code doit son existence à un grand nombre de contributeurs tout au long de ses différentes incarnations. La liste qui suit est certainement incomplète mais permet de reconnaître les nombreuses épaules sur lesquelles -cette application s'est S +cette application S [% INCLUDE "AUTHORS" %] @@ -638,7 +644,7 @@ Ebrycehar@bryceharrington.orgE. Le code qui allait devenir Inkscape est né en 1999, avec le programme Gill, GNOME Illustrator, créé par Raph Levien. L'objectif défini pour Gill était -de supporter complètement le format SVG. Raph a codé le modèle Postcript de +de supporter complètement le format SVG. Raph a codé le modèle PostScript de courbes de Bézier, incluant le remplissage et le contour, les coiffes et raccords de lignes, le texte, etc. La page de Raph consacrée à Gill se trouve sur http://www.levien.com/svg/. Le travail sur Gill semble avoir @@ -648,44 +654,45 @@ L'incarnation suivante du code allait devenir le très populaire Sodipodi, mené par Lauris Kaplinski. Le code est devenu un outil d'illustration puissant après plusieurs années de travail, ajoutant plusieurs nouvelles fonctionnalités, le support multilingue, le portage sous Windows et d'autres -systèmes d'exploitation et éliminant certaines dépendances. - -Inkscape a été lancé en 2003 par quatre développeurs actifs de Sodipodi -(Bryce Harrington, MenTaLguY, Nathan Hurst et Ted Gould), qui voulaient -faire prendre une orientation différente au code en termes de focalisation -sur la conformité SVG, aspect et fonctionnement de l'interface, et -d'opportunités de développement ouvertes à plus de participants. Le projet a -progressé rapidement, gagnant de nombreux contributeurs et une multitude de +systèmes d'exploitation, et éliminant certaines dépendances. + +Inkscape a été lancé en 2003 par quatre développeurs actifs de Sodipodi, +Bryce Harrington, MenTaLguY, Nathan Hurst et Ted Gould, qui voulaient faire +prendre une orientation différente au code en termes de focalisation sur la +conformité SVG, d'aspect et de fonctionnement de l'interface, et d'ouverture +du développement à plus de participants. Le projet a progressé rapidement, +gagnant de nombreux contributeurs très actifs et une multitude de fonctionnalités. Beaucoup de travail a été depuis consacré à la stabilisation du code et à l'internationalisation. Le moteur de rendu hérité de Sodipodi comportait de -nombreuses spécificités qui entrainaient de plantages lorsque l'utilisation -du programme sortait des sentiers battus. Ce moteur a alors été remplacé par -Livarot qui, bien qu'imparfait, générait moins d'erreurs. Le projet a -également adopté la bonne habitude de publier son code régulièrement, et -encouragé les utilisateurs à tester des versions en développement du -logiciel, ce qui a bien aidé dans l'identification des nouveaux défauts, et -donné les moyens aux utilisateurs de vérifier que les anciens étaient bien -corrigés. Inkscape a ainsi acquis une réputation de programme robuste et -fiable. +nombreux cas limites mathématiques qui entraînaient des plantages lorsque le +programme était utilisé à des fins S ce moteur a alors été +remplacé par Livarot qui, bien qu'imparfait, générait moins d'erreurs. Le +projet a également adopté la bonne habitude de publier son code +régulièrement, et encouragé les utilisateurs à tester des versions en +développement du S cela a aidé à identifier les nouveaux bogues +rapidement, et à assurer qu'il était facile pour les utilisateurs de +vérifier les correctifs. Inkscape a ainsi acquis une réputation de programme +robuste et fiable. En parallèle, des efforts ont été faits pour améliorer l'internationalisation et la localisation de l'interface, ce qui a apporté -au projet de nouveaux contributeurs tout autour du monde. +au projet de nouveaux contributeurs du monde entier. Inkscape a eu un impact positif sur l'attractivité visuelle de l'Open Source -en général, en offrant un outil pour créer et partager des icônes, écrans -d'accueil, art pour le web, etc. D'une certaine façon, bien que n'étant -qu'un "simple outil de dessin", Inkscape a joué un rôle important en rendant -l'Open Source plus stimulant visuellement parlant pour un plus large public. +en général, en offrant un outil pour créer et partager des icônes, des +écrans d'accueil, de l'art pour le web, etc. D'une certaine façon, bien que +n'étant qu'un S<« simple> outil de S Inkscape a joué un rôle important +en rendant l'Open Source plus stimulant visuellement pour un plus large +public. -=head1 COPYRIGHT ET LICENSE +=head1 COPYRIGHT ET LICENCE B 1999-2015 par les auteurs. -B est un logiciel libre; vous pouvez le redistribuer et/ou le -modifier selon les termes de la license GPL. +B est un logiciel S vous pouvez le redistribuer et/ou le +modifier selon les conditions de la licence GPL. diff --git a/share/tutorials/tutorial-advanced.fr.svg b/share/tutorials/tutorial-advanced.fr.svg index 758b9a750..695d40790 100644 --- a/share/tutorials/tutorial-advanced.fr.svg +++ b/share/tutorials/tutorial-advanced.fr.svg @@ -40,440 +40,440 @@ - + ::AVANCÉ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + - Ce didacticiel couvre le copier-coller, l'édition de nœuds, le dessin à main levée, le tracé de courbes de Bézier, la manipulation de chemins, les opérations booléennes, les objets offset, la simplification et l'outil texte. + Ce didacticiel couvre le copier-coller, l'édition de nœuds, le dessin à main levée, le tracé de courbes de Bézier, la manipulation de chemins, les opérations booléennes, les morphologies dynamiques, la simplification et l'outil texte. - + Faites défiler la page avec Ctrl+flèche, ou avec la souris (molette ou bouton du milieu). Pour les bases de la création, sélection et transformation d'objets, voyez le didacticiel basique du menu Aide > Didacticiels. - - Techniques de collage + + Techniques de collage - + Après avoir copié (Ctrl+C) ou coupé (Ctrl+X) des objets, la commande coller (Ctrl+V) permet de coller les objets copiés juste sous le curseur de la souris (ou au centre de la fenêtre du document si le curseur est en dehors de la fenêtre). Toutefois, les objets du presse-papiers mémorisent l'emplacement qu'ils avaient au moment d'être copiés, et vous pouvez les recoller à ce même emplacement avec coller sur place (Ctrl+Alt+V). - + En appuyant sur Maj+Ctrl+V, vous pouvez coller le style, c'est-à-dire appliquer le style du premier objet du presse-papiers à la sélection courante. Le « style » ainsi collé inclut le fond, le contour et les paramètres de la police, mais pas la forme, la taille ou les paramètres spécifiques à un type de forme (comme le nombre de sommets d'une étoile). - + Un autre groupe de commandes de collage, Coller les dimensions, change l'échelle de la sélection, afin d'obtenir la taille du ou des objets contenu dans le presse-papiers. Il y a de nombreuses commandes pour coller les dimensions qui sont les suivantes : Coller les dimensions, Coller la largeur, Coller la hauteur, Coller les dimensions séparément, Coller la largeur séparément et Coller la hauteur séparément. - + - Coller les dimensions change l'échelle de l'entière sélection jusqu'à l'obtention de la taille du ou des objets du presse-papiers. Coller la largeur/Coller la hauteur change l'échelle de l'entière sélection horizontalement/verticalement afin d'obtenir la même largeur/hauteur que le ou les objets du presse-papiers. Ces commandes respectent le verrou des proportions sur la barre de contrôle de l'outil Sélection (entre les champs L et H), de façon à ce que lorsque le verrou est actif, l'autre dimension de l'objet sélectionné soit transformée dans les mêmes proportions ; dans le cas contraire, l'autre dimension ne sera pas modifiée. La commande « Séparément » fonctionne de la même façon que les commandes précédemment décrites, à l'exception près que chaque objet sélectionné change d'échelle séparément, afin que chacun ait la taille/largeur/hauteur du ou des objets du presse-papiers. + Coller les dimensions change l'échelle de la sélection entière jusqu'à l'obtention de la taille du ou des objets du presse-papiers. Coller la largeur/Coller la hauteur change l'échelle de la sélection entière horizontalement/verticalement afin d'obtenir la même largeur/hauteur que le ou les objets du presse-papiers. Ces commandes respectent le verrou des proportions sur la barre de contrôle de l'outil Sélection (entre les champs L et H), de sorte que lorsque le verrou est actif, l'autre dimension de l'objet sélectionné soit transformée dans les mêmes proportions ; dans le cas contraire, l'autre dimension ne sera pas modifiée. Les commandes contenant « séparément » fonctionnent de la même façon que les commandes précédemment décrites, à l'exception près que chaque objet sélectionné change d'échelle séparément, afin que chacun ait la taille/largeur/hauteur du ou des objets du presse-papiers. - + Inkscape utilise le presse-papiers du système d'exploitation. Vous pouvez copier et coller entre différentes instances d'Inkscape, ou entre Inkscape et une autre application (à condition que celle-ci soit capable de manipuler le SVG déposé dans le presse-papiers). - - Dessiner à main levée et tracer des chemins + + Dessiner à main levée et tracer des chemins - + La façon la plus simple de dessiner une forme quelconque est d'utiliser l'outil Dessin à main levée (crayon — F6) : - - - - - - - - - - + + + + + + + + + + Pour obtenir des formes plus régulières, utilisez plutôt les courbes de Bézier (stylo — Maj+F6) : - - - - - - - - - - + + + + + + + + + + Avec l'outil stylo, chaque clic crée un nœud dur sans poignée d'incurvation, et donc une série de clics produit une séquence de segments de droite. Cliquer-déplacer crée un nœud de Bézier doux, avec deux poignées de contrôles colinéaires opposées. Appuyez sur Maj tout en déplaçant une poignée de contrôle pour la faire tourner en gardant l'autre fixe. Comme d'habitude, Ctrl limite la modification de la direction d'un segment ou des poignées de contrôle par incréments de 15 degrés. Appuyer sur Entrée finalise le tracé, Échap l'annule. Pour annuler uniquement le dernier segment d'une ligne non finalisée, appuyez sur Retour arrière. - + Dans les outils Dessin à main levée et Courbes de Bézier, tout chemin sélectionné affiche des petites ancres carrées à ses extrémités. Ces ancres vous permettent de prolonger ce chemin (en dessinant en partant de ces ancres) ou de le fermer (en dessinant d'une ancre - - Éditer des chemins + + Éditer des chemins - + Contrairement aux formes créées par les outils Forme, les outils Dessin à main levée et Courbes de Bézier créent ce que l'on appelle des chemins. Un chemin est une séquence de segments et/ou de courbes de Bézier qui, comme tout autre objet d'Inkscape, peut avoir des propriétés de fond et de contour. Mais contrairement à une forme, un chemin peut être modifié en déplaçant indépendamment n'importe lequel de ses nœuds (et pas seulement des poignées prédéfinies) ou en déplaçant un segment du chemin. Sélectionnez ce chemin et utilisez l'outil Nœuds (F2) : - - + + Vous devez voir un certain nombre de nœuds carrés gris sur le chemin. Ces nœuds peuvent être sélectionnés avec un clic, Maj+clic ou avec une bande étirable — exactement comme les objets avec le sélecteur. Vous pouvez également cliquer sur un segment de chemin pour sélectionner automatiquement les nœuds adjacents. Les nœuds sélectionnés sont mis en valeur et affichent leurs poignées de contrôle — un ou deux petits cercles connectés à chacun des nœuds sélectionnés par des segments de droite. La touche ! inverse la sélection des nœuds dans les sous-chemins actuels (par exemple les sous-chemins avec au moins un nœud de sélectionné) ; Alt+! inverse dans tout le chemin. - + Les chemins peuvent être édités en déplaçant leurs nœuds, les poignées de contrôle de ces nœuds ou directement en déplaçant un de ses segments (essayez de déplacer certains nœuds, poignées de contrôle et segments du chemin ci-dessus). Ctrl permet comme d'habitude de restreindre les déplacements et rotations. Les touches flèche, Tab, [, ], <, > et les combinaisons qui y sont associées fonctionnent comme dans le sélecteur mais s'appliquent aux nœuds au lieu des objets. Vous pouvez ajouter des nœuds n'importe où sur les chemins en double-cliquant ou avec Ctrl+Alt+clic à l'endroit désiré. - + Vous pouvez supprimer les nœuds avec (Suppr) ou à l'aide de Ctrl+Alt+clic. Lorsque des nœuds sont effacés, Inkscape va tenter de conserver la forme du chemin ; si vous souhaitez que les poignées de contrôle des nœuds adjacents rétrécissent (ne pas conserver la forme), vous pouvez effacer avec Ctrl+Suppr. De plus, vous pouvez dupliquer (Maj+D) les nœuds sélectionnés. Un chemin peut être brisé (Maj+B) aux nœuds sélectionnés ; ou si vous sélectionnez deux nœuds terminaux, vous pouvez les joindre (Maj+J). - + Un nœud peut être rendu dur (Maj+C), ses poignées de contrôle pouvant alors être déplacées indépendamment avec un angle différent pour chacun ; doux (Maj+S), les poignées restant alignées (colinéaires) ; symétrique (Maj+Y), ce qui donne les même résultats que doux, mais les poignées de contrôle ayant la même longueur (poignées alignées et équidistantes) ; ou automatique (Maj+A), un nœud spécial qui ajuste automatiquement les poignées des nœuds et les nœuds automatiques voisins pour maintenir une courbe douce. Lorsque vous passez à ce type de nœuds, vous pouvez préserver la position d'une, des deux poignées en déplaçant la souris par-dessus, de façon à ce que seule l'autre poignée de contrôle tourne ou change d'échelle jusqu'à obtenir le même résultat. - + Vous pouvez aussi rétracter les poignées de contrôle d'un nœud en effectuant un Ctrl+clic sur ce dernier. Si deux nœuds adjacents ont leurs poignées rétractées, le chemin entre ces deux nœuds devient un segment de droite. Pour faire ressortir les poignées rétractées d'un nœud, effectuer un Maj+déplacer depuis ce nœud. - - Sous-chemins et combinaisons + + Sous-chemins et combinaisons - + Un objet chemin peut contenir plus d'un sous-chemin. Un sous-chemin est une séquence de nœuds connectés les uns aux autres (donc, si un chemin a plusieurs sous-chemins, tous ses nœuds ne sont pas interconnectés). Ci-dessous à gauche, les trois sous-chemins appartiennent à un même chemin composé ; les trois mêmes sous-chemins à droite sont des objets chemins indépendants : - - - - - + + + + + Notez qu'un chemin composé est différent d'un groupe. C'est un objet unique qui n'est sélectionnable que comme un tout. Si vous sélectionnez l'objet de gauche, ci-dessus, et utilisez l'outil Nœuds, vous verrez les nœuds des trois sous-chemins affichés simultanément. À droite, vous ne pouvez éditer que les nœuds d'un sous-chemin à la fois. - + Inkscape peut combiner des chemins en un chemin composé (Ctrl+K) et séparer un chemin composé en sous-chemins (Maj+Ctrl+K). Essayez ces commandes sur les exemples ci-dessus. Comme un objet ne peut avoir qu'un fond et contour, un chemin combiné reçoit le style du premier objet (le plus bas dans l'ordre z) de la combinaison. - + Si vous combinez des chemins avec fond qui se chevauchent, le fond disparaîtra dans les zones de chevauchement : - - + + Ceci est la façon la plus facile de créer des objets troués. Pour des opérations encore plus puissantes sur des chemins, utilisez les opérations booléennes (voir plus bas). - - Convertir en chemin + + Convertir en chemin - + Tout objet texte ou forme peut être converti en chemin (Maj+Ctrl+C). Cette opération ne modifie pas son apparence mais lui enlève les capacités liées à son type (par exemple, vous ne pouvez plus modifier l'arrondi des coins d'un rectangle ou éditer un texte) ; par contre, cela vous permet d'en éditer les nœuds. Voici deux étoiles ; celle de gauche est une forme et la même à droite a été convertie en chemin. Passez en mode Nœuds et comparez leurs possibilités d'édition : - - - + + + De plus, vous pouvez convertir en chemin (ou détourer — Ctrl+Alt+C) le contour de n'importe quel objet. Ci-dessous, le premier objet est le chemin original (pas de fond, contour noir), tandis que le second est le résultat d'une commande Contour en chemin (fond noir, pas de contour) : - - - - Opérations booléennes + + + + Opérations booléennes - + Les commandes du menu Chemin vous permettent de combiner deux objets ou plus en utilisant des opérations booléennes : - Formes originales - Union (Ctrl++) - Différence (Ctrl+-) - Intersection(Ctrl+*) - Exclusion(Ctrl+^) - Division(Ctrl+/) - Découper le chemin(Ctrl+Alt+/) - - - - - - - - - - - (dessous moins dessus) - + Formes originales + Union (Ctrl++) + Différence (Ctrl+-) + Intersection(Ctrl+*) + Exclusion(Ctrl+^) + Division(Ctrl+/) + Découper le chemin(Ctrl+Alt+/) + + + + + + + + + + + (dessous moins dessus) + Les raccourcis clavier de ces commandes correspondent aux opérateurs arithmétiques booléens analogues (union pour addition, différence pour soustraction, etc.). Les commandes Différence et Exclusion ne peuvent s'appliquer qu'à deux objets sélectionnés, les autres opérations à un nombre quelconque. Le résultat reçoit toujours le style de l'objet du fond dans l'ordre z. - + Le résultat d'une commande Exclure ressemble à celui d'une Combinaison (voir plus haut), mais ajoute des nœuds aux intersections des chemins. Dans la Division le chemin de l'objet du dessus coupe celui du dessous tandis que Découper le chemin se limite à utiliser l'objet du dessus pour couper le contour de celui du dessous et à en supprimer les fonds (ceci est pratique pour découper en morceaux des tracés sans fond). - - Éroder et dilater + + Éroder et dilater - + - Inkscape peut étendre et contracter des objets par une modification de leurs dimensions, mais aussi par offset du chemin, c'est-à-dire par un déplacement perpendiculaire en tout point du chemin. Les commandes correspondantes sont Éroder (Ctrl+() et Dilater (Ctrl+)). Par exemple, ci-dessous, voyez le chemin original (en rouge) et des érosions et dilatations de celui-ci : + Inkscape peut étirer et contracter les formes non seulement par une modification de leurs dimensions, mais aussi par morphose du chemin, c'est-à-dire par un déplacement perpendiculaire au chemin en tout point. Les commandes correspondantes sont Éroder (Ctrl+() et Dilater (Ctrl+)). Par exemple, ci-dessous, voyez le chemin original (en rouge) et des érosions et dilatations de celui-ci : - - - - - - - - + + + + + + + + - Les commandes éroder et dilater produisent des chemins (si nécessaire en convertissant l'objet original en chemin). Un offset dynamique (Ctrl+J) sera souvent plus pratique : il crée un objet avec une poignée déplaçable qui contrôle le rayon d'offset. Voyez avec l'objet ci-dessous ; sélectionnez-le et passez en édition de nœuds pour vous faire une idée : + Les commandes Éroder et Dilater brutes produisent des chemins (si nécessaire en convertissant l'objet original en chemin). Une morphose dynamique (Ctrl+J) sera souvent plus pratique : elle crée un objet avec une poignée déplaçable qui contrôle le rayon de morphose. Voyez avec l'objet ci-dessous ; sélectionnez-le et passez en édition de nœuds pour vous faire une idée : - - + + - Un tel objet offset dynamique retient le chemin d'origine, et ainsi ne se « dégrade » pas quand vous modifiez un grand nombre de fois la distance d'offset. Quand vous n'avez plus besoin de l'ajuster, vous pouvez toujours le convertir de nouveau en chemin. + Un tel objet de morphose dynamique garde le chemin d'origine en mémoire, et ainsi ne se « dégrade » pas lorsque vous modifiez la distance de morphose un grand nombre de fois. Quand vous n'avez plus besoin de l'ajuster, vous pouvez toujours le convertir de nouveau en chemin. - + - Encore plus pratique : l'offset lié, similaire à un offset dynamique mais connecté au chemin qui reste éditable. Vous pouvez en créer autant que vous voulez à partir d'un chemin source. Ci-dessous, le chemin source est en rouge, le premier offset lié à celui-ci a un contour noir et pas de fond, l'autre un fond noir et pas de contour. + Encore plus pratique : la morphose liée, similaire à une morphose dynamique mais connectée au chemin qui reste éditable. Vous pouvez en créer autant que vous voulez à partir d'un chemin source. Ci-dessous, le chemin source est en rouge, la première morphose liée à celui-ci a un contour noir et pas de fond, l'autre un fond noir et pas de contour. - + - Sélectionnez l'objet rouge et éditez ses nœuds ; voyez le comportement des offsets liés. Maintenant sélectionnez un des offsets et déplacez sa poignée pour ajuster le rayon d'offset. Enfin, observez la façon dont le déplacement ou la transformation de l'objet source affecte les offsets qui lui sont liés et le fait que vous pouvez déplacer et transformer les offsets liés indépendamment sans perdre leur lien avec l'objet source. + Sélectionnez l'objet rouge et éditez ses nœuds ; regardez comment réagissent les deux morphoses liées. Maintenant, sélectionnez une des morphose et déplacez sa poignée pour ajuster le rayon de la morphose. Enfin, observez comment vous pouvez déplacer et transformer les objets de morphose indépendamment sans perdre leur lien avec la source. - + - - Simplification + + Simplification - + - L'usage le plus courant de la commande simplifier (Ctrl+L) est la réduction du nombre de nœuds d'un chemin tout en préservant au maximum son aspect. Cela peut être utile pour les chemins tracés à main levée car cet outil crée parfois plus de nœuds que nécessaire. Ci-dessous, le dessin de gauche a été créé à main levée et celui de droite est une copie qui a été quelque peu simplifiée. Le chemin original comporte 28 nœuds, tandis que le simplifié n'en a que 17 (et est donc bien plus facile à retravailler avec l'outil Nœuds) et est plus lisse. + L'usage le plus courant de la commande Simplifier (Ctrl+L) est la réduction du nombre de nœuds d'un chemin tout en préservant au maximum son aspect. Cela peut être utile pour les chemins tracés à main levée car cet outil crée parfois plus de nœuds que nécessaire. Ci-dessous, le dessin de gauche a été créé à main levée et celui de droite est une copie qui a été quelque peu simplifiée. Le chemin original comporte 28 nœuds, tandis que le simplifié n'en a que 17 (et est donc bien plus facile à retravailler avec l'outil Nœuds) et est plus lisse. - - - + + + - L'importance de la simplification (appelée seuil) dépend de la taille de la sélection. Ainsi, si vous sélectionnez simultanément un chemin et un autre objet plus important, la simplification sera plus agressive que pour le chemin seul. De plus, la commande simplifier est accélérée : si vous appuyez sur Ctrl+L plusieurs fois de suite rapidement (avec moins de 0,5 s entre deux appuis consécutifs), le seuil est incrémenté à chaque pression. Après une pause, le seuil de simplification revient à sa valeur par défaut. Grâce à cette accélération, il est facile d'ajuster précisément la simplification dont vous avez besoin pour chaque cas. + L'importance de la simplification (appelée seuil) dépend de la taille de la sélection. Ainsi, si vous sélectionnez simultanément un chemin et un autre objet plus important, la simplification sera plus agressive que pour le chemin seul. De plus, la commande Simplifier est accélérée : si vous appuyez sur Ctrl+L plusieurs fois de suite rapidement (avec moins de 0,5 s entre deux appuis consécutifs), le seuil est incrémenté à chaque pression. Après une pause, le seuil de simplification revient à sa valeur par défaut. Grâce à cette accélération, il est facile d'ajuster précisément la simplification dont vous avez besoin pour chaque cas. - + - En plus d'adoucir les tracés à main, simplifier peut être utilisé pour générer différents effets créatifs et originaux. Une forme plutôt rigide et géométrique bénéficiera souvent d'un brin de simplification qui lui donnera un peu de vie — adoucissant certains coins et introduisant des distorsions très naturelles, parfois très stylées et d'autres fois plutôt amusantes. Voici un exemple de dessin (clipart) bien plus réussi après avoir été simplifié : + En plus d'adoucir les tracés à main, Simplifier peut être utilisé pour générer différents effets créatifs et originaux. Une forme plutôt rigide et géométrique bénéficiera souvent d'un brin de simplification qui lui donnera un peu de vie — adoucissant certains coins et introduisant des distorsions très naturelles, parfois très stylées et d'autres fois plutôt amusantes. Voici un exemple de dessin (clipart) bien plus réussi après avoir été simplifié : - Original - Simplification légère - Simplification agressive - - - - - Créer du texte + Original + Simplification légère + Simplification agressive + + + + + Créer du texte - + Inkscape permet la composition de textes longs et complexes. Cependant, il convient aussi assez bien pour la création de petits textes comme des titres, bannières, logos, étiquettes et légendes de diagrammes, etc. Cette section est une introduction très basique aux possibilités de création de textes avec Inkscape. - + Créer un objet texte se fait tout simplement en passant à l'outil Texte (F8), en cliquant quelque part sur le canevas et en tapant votre texte. Pour changer la police, le style, la taille ou l'alignement d'un texte, ouvrez la boîte de dialogue texte et police (Maj+Ctrl+T). Cette boîte de dialogue a aussi un onglet de saisie de texte que vous pouvez utiliser afin d'éditer l'objet texte sélectionné — dans certaines situations, il peut être plus pratique que l'édition directement sur le canevas (notamment, cet onglet supporte la vérification orthographique à la volée). - + Comme les autres outils, l'outil Texte peut sélectionner des objets de son propre type — les objets texte donc — de sorte que vous pouvez cliquer sur tout objet texte existant (comme ce paragraphe) afin de le sélectionner ou d'y positionner votre curseur. - + Une des opérations les plus courantes sur la mise en page des textes est l'ajustement de l'espacement entre des lettres ou des lignes. Comme toujours, Inkscape fournit des raccourcis clavier dans ce but. Les combinaisons Alt+< et Alt+> modifient l'inter-lettrage de la ligne courante d'un objet texte, de sorte que la longueur de cette ligne change d'1 pixel au zoom actuel (à comparer avec le comportement du sélecteur où les mêmes touches permettent de modifier les dimensions d'un objet au pixel près). Généralement, si la taille de la police est plus grande que celle par défaut dans un objet texte, elle présente un meilleur rendu après en avoir légèrement resserré les lettres. Voici un exemple : - Original - Inter-lettrage diminué - Inspiration - Inspiration - + Original + Inter-lettrage diminué + Inspiration + Inspiration + La version remaniée rend un peu mieux, mais n'est toujours pas parfaite : les distances entre les lettres ne sont pas uniformes ; par exemple, le « a » et le « t » sont trop éloignés tandis que le « t » et le « i » sont trop proches. L'imperfection des crénages (particulièrement visible avec des grandes tailles de police) est plus importante dans des fontes de mauvaise qualité ; toutefois, vous trouverez probablement, dans toutes les chaînes de texte et toutes les polices, des paires de lettres qui bénéficieront d'un ajustement de crénage. - + Inkscape facilite ces ajustements ; vous n'avez qu'à positionner votre curseur d'édition de texte entre les caractères qui posent problème et à utiliser Alt+flèche pour déplacer les lettres à droite du curseur. Vous trouverez encore ci-dessous le même exemple, mais cette fois avec des ajustements manuels, de sorte que les lettres sont positionnées uniformément. - Inter-lettrage diminué et crénage manuel de certaines paires de lettres - Inspiration - + Inter-lettrage diminué et crénage manuel de certaines paires de lettres + Inspiration + En plus de pouvoir déplacer les lettres horizontalement avec Alt+Gauche ou Alt+Droite, vous pouvez aussi les déplacer verticalement en utilisant Alt+Haut or Alt+Bas : - Inspiration - + Inspiration + Bien sûr, vous pourriez convertir votre texte en chemin (Maj+Ctrl+C) et déplacer les lettres comme un objet chemin classique. Cependant, il est bien plus pratique de conserver ses propriétés de texte : il reste éditable, vous pouvez essayer différentes fontes tout en préservant vos crénages et espacements, et la taille du fichier enregistré reste plus petite. Le seul désavantage de conserver le « texte en texte » est que vous devrez avoir sa fonte originale installée sur tout système où vous voudriez ouvrir votre document SVG. - + De la même façon, vous pouvez ajuster l'inter-lignage des objets texte de plusieurs lignes. Essayez les raccourcis Ctrl+Alt+< et Ctrl+Alt+> sur n'importe quel paragraphe de ce didacticiel pour faire varier la hauteur globale de l'objet texte de 1 pixel au zoom courant. Comme dans le sélecteur, combiner un raccourci d'espacement ou de crénage avec la touche Maj multipliera son action par 10. - - Éditeur XML + + Éditeur XML - + L'outil le plus puissant d'Inkscape est l'éditeur XML (Maj+Ctrl+X). Affichant l'arborescence XML complète du document, il en reflète en permanence l'état courant. Vous pouvez modifier votre dessin et observer les changements correspondants dans l'arborescence XML. De plus, vous pouvez éditer tout texte, élément ou attribut dans l'éditeur XML et voir le résultat sur le canevas. C'est le meilleur outil imaginable pour apprendre le SVG interactivement et il vous permet d'appliquer des astuces qui seraient impossibles avec des outils d'édition standard. - - Conclusion + + Conclusion - + Ce didacticiel ne montre qu'une petite partie des possibilités d'Inkscape. Nous espérons que vous l'avez apprécié. N'ayez pas peur d'expérimenter et de partager vos créations. Veuillez consulter www.inkscape.org pour avoir accès à plus d'information, aux dernières versions et à l'aide des communautés de développeurs et utilisateurs. - + diff --git a/share/tutorials/tutorial-basic.fr.svg b/share/tutorials/tutorial-basic.fr.svg index ad199d833..f9eea1f98 100644 --- a/share/tutorials/tutorial-basic.fr.svg +++ b/share/tutorials/tutorial-basic.fr.svg @@ -40,411 +40,411 @@ - + ::BASIQUE - + Ce didacticiel présente les opérations de base d'Inkscape. Il se présente sous la forme d'un document Inkscape que vous pouvez visionner, éditer et éventuellement sauvegarder. - + Le didacticiel basique aborde la navigation sur le canevas, la gestion des documents, les bases des outils de formes, la transformation d'objets à l'aide du sélecteur, les techniques de sélection, le groupement, le paramétrage du fond et du contour, l'alignement et la superposition. Pour des sujets plus avancés, consultez les autres didacticiels dans le menu Aide. - - Se déplacer sur le canevas + + Se déplacer sur le canevas - + Il y a plusieurs façons de se déplacer sur le canevas. Utilisez le raccourci Ctrl+flèche pour vous déplacer avec le clavier (essayez donc dès maintenant de faire défiler ce document vers le bas). Vous pouvez aussi faire glisser le canevas en enfonçant le bouton du milieu de la souris. Ou bien, vous pouvez utiliser les barres de défilement (Ctrl+B permet de les afficher/masquer). La molette de la souris permet les déplacements verticaux, et même horizontaux en combinaison avec la touche Maj. - - Zoomer et dézoomer + + Zoomer et dézoomer - + Le moyen le plus simple est d'utiliser les touches - et + (ou =). Vous pouvez aussi zoomer avec Ctrl+clic-milieu ou Ctrl+clic-droit, et dézoomer avec Maj+clic-milieu ou Maj+clic-droit, ou bien faire tourner la molette de la souris tout en appuyant sur Ctrl. Vous pouvez aussi cliquer sur le champ de saisie (dans le coin en bas à droite de la fenêtre), y saisir une valeur de zoom, et la valider en appuyant sur la touche Entrée. Enfin, il reste l'outil de zoom (dans la barre d'outils à gauche) qui vous permet de définir une région sur laquelle zoomer à l'aide de la souris. - + Inkscape garde aussi en mémoire un historique des niveaux de zoom. Appuyez sur la touche ` pour revenir au niveau de zoom précédent et utilisez Maj+` pour retourner au suivant. - - Les outils d'Inkscape + + Les outils d'Inkscape - + La barre d'outils verticale à gauche affiche les outils de dessin et d'édition d'Inkscape. En haut de la fenêtre, juste en dessous des menus, la barre de commandes affiche les boutons des commandes générales tandis que la barre de contrôle des outils montre les contrôles spécifiques à chaque outil. La barre d'état en bas de la fenêtre affiche des indications et des messages qui peuvent vous aider dans votre travail. - + De nombreuses opérations peuvent être effectuées avec des raccourcis clavier. Pour consulter tous les raccourcis disponibles, ouvrez le menu Aide > Clavier et souris. - - Créer et gérer des documents + + Créer et gérer des documents - + - Pour créer un nouveau document vide, utilisez Fichier > Nouveau > Défaut ou appuyez sur Ctrl+N. Pour créer un nouveau document à partir d'un des nombreux modèles d'Inkscape, utilisez Fichier > Nouveau > Modèles ou appuyez sur Ctrl+Alt+N. + Pour créer un nouveau document vide, utilisez Fichier > Nouveau ou appuyez sur Ctrl+N. Pour créer un nouveau document à partir d'un des nombreux modèles d'Inkscape, utilisez Fichier > Nouveau à partir d'un modèle… ou appuyez sur Ctrl+Alt+N. - + Pour ouvrir un fichier SVG existant, utilisez Fichier > Ouvrir (Ctrl+O). Pour enregistrer, utilisez Fichier > Enregistrer (Ctrl+S), ou Enregistrer sous… (Maj+Ctrl+S) pour sauver sous un nouveau nom (Inkscape est encore assez instable, donc pensez à enregistrer votre travail fréquemment !). - + Inkscape utilise le format SVG (Scalable Vector Graphics) pour ses fichiers. Le format SVG est un standard ouvert largement utilisé par les logiciels de graphisme. Les fichiers SVG sont basés sur le format XML et peuvent être édités à l'aide de n'importe quel éditeur de texte ou XML (ou avec Inkscape, bien sûr). En plus du SVG, Inkscape peut importer et exporter des documents dans d'autres formats (EPS, PNG…). - + Inkscape ouvre une nouvelle fenêtre pour chaque document. Naviguez entre elles avec votre gestionnaire de fenêtres (avec le raccourci Alt+Tab par exemple), ou utilisez le raccourci Ctrl+Tab, qui permet de circuler parmi les documents ouverts (créez dès maintenant un nouveau document pour tester la navigation entre le tutoriel et le nouveau document). Note : Inkscape traite ces fenêtres comme les onglets dans un navigateur web, ce qui signifie que le raccourci Ctrl+Tab ne fonctionne qu'avec des documents s'exécutant dans la même instance. Si vous ouvrez plusieurs fichiers depuis un navigateur de fichiers ou exécutez plusieurs instances d'Inkscape, cela ne fonctionnera pas. - - Créer des formes + + Créer des formes - + Il est temps de passer aux formes ! Cliquez sur l'outil Rectangle dans la barre d'outils (ou appuyez sur F4) et avec un cliquer-déplacer, créez un rectangle, soit dans un nouveau document vide, soit dans celui-ci : - - - - - - - - - - - - + + + + + + + + + + + + Comme vous pouvez le voir, par défaut, les rectangles sont bleus, avec un contour noir, et complètement opaques. Nous allons voir comment changer cela ci-dessous. Avec les autres outils, vous pouvez aussi créer des ellipses, des étoiles et des spirales : - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Ces outils sont les outils de formes. Chaque forme créée affiche une ou plusieurs poignées en forme de diamant ; essayez de les déplacer pour voir comment la forme réagit. Pour chacun des outils de formes, la barre de contrôle fournit une façon supplémentaire de modifier la forme ; ces contrôles affectent la forme sélectionnée (c'est-à-dire celle qui a ses poignées affichées) et définissent les paramètres par défaut qui s'appliqueront lors de la création de toute nouvelle forme. - + Pour annuler votre dernière action, appuyez sur Ctrl+Z (ou si vous changez d'avis, vous pouvez restaurer l'action annulée avec Maj+Ctrl+Z). - - Déplacer, redimensionner et tourner + + Déplacer, redimensionner et tourner - + L'outil d'Inkscape le plus utilisé est le sélecteur. Cliquez sur le bouton tout en haut (celui avec la flèche) dans la barre d'outils (ou appuyez sur F1 ou sur la barre d'espace). Vous pouvez alors sélectionner n'importe quel objet sur le canevas. Ainsi, sélectionnez le rectangle ci-dessous. - - + + Vous devriez voir apparaître huit poignées en forme de flèche autour des bords de l'objet. Vous pouvez maintenant : - - + + Déplacer l'objet à la souris avec un cliquer-déplacer (appuyez sur Ctrl pour restreindre le mouvement à l'horizontale et à la verticale). - - + + Redimensionner l'objet, en déplaçant une poignée (appuyez sur Ctrl pour préserver ses proportions). - + Cliquez à nouveau sur le rectangle. Les poignées changent de forme. Vous pouvez maintenant : - - + + Tourner l'objet en déplaçant une poignée de coin (appuyez sur Ctrl pour forcer une rotation par incréments de 15 degrés ; déplacez la croix pour définir le centre de rotation). - - + + Incliner l'objet en déplaçant une poignée autre que celle d'un coin (appuyez sur Ctrl pour forcer une inclinaison par incréments de 15 degrés). - + Toujours avec le sélecteur, dans les champs numériques de la barre supérieure, vous pouvez définir précisément les coordonnées (X et Y) et la taille (L et H) de la sélection. - - Transformer à l'aide des raccourcis clavier + + Transformer à l'aide des raccourcis clavier - + Une des capacités d'Inkscape le distinguant d'autres éditeurs vectoriels est la possibilité d'utiliser le clavier de façon intensive. Il n'y a pratiquement pas d'action ou de commande qui ne soit pas accessible depuis le clavier, et la transformation d'objet ne fait pas exception. - + Vous pouvez utiliser le clavier pour déplacer (flèches), redimensionner (< et >) et tourner ([ et ]) les objets. L'incrément par défaut de modification des dimensions et de déplacement est de 2 px ; avec la touche Maj, le déplacement est multiplié par 10. Ctrl+> et Ctrl+< redimensionnent respectivement de 200 % et 50 % par rapport à l'original. L'incrément de rotation par défaut est de 15 degrés ; ou de 90 degrés si vous appuyez sur Ctrl. - + Mais les transformations à l'échelle du pixel sont peut-être les plus utiles, obtenues par la combinaison de la touche Alt avec un raccourci. Par exemple, Alt+flèche déplace la sélection d'1 pixel, au zoom courant (c'est-à-dire d'un pixel sur l'écran, à ne pas confondre avec l'unité px qui est une unité SVG de longueur indépendante du zoom). Ceci implique que si vous zoomez plus, un raccourci Alt+flèche provoquera un mouvement absolu plus petit, correspondant toujours à un pixel à l'écran. Il est ainsi possible de positionner des objets avec une précision arbitraire simplement en zoomant ou dézoommant selon les besoins. - + De même, Alt+> et Alt+< changent les dimensions de la sélection d'1 pixel à l'écran, et Alt+[ et Alt+] la tournent de telle façon que le point le plus éloigné du centre bouge d'un seul pixel à l'écran. - + Note : il se peut que les utilisateurs de Linux n'obtiennent pas les résultats attendus avec Alt+flèche et d'autres combinaisons si leur gestionnaire de fenêtres récupère les événements des touches avant qu'elles n'atteignent l'application Inkscape. Une des solutions consiste à changer la configuration du gestionnaire de fenêtres pour éviter cela. - - Sélections multiples + + Sélections multiples - + Avec Maj+clic, vous pouvez simultanément sélectionner plusieurs objets. Avec un cliquer-déplacer, vous pouvez aussi définir une zone autour des objets ; on appelle ceci une sélection par bande étirable (le sélecteur crée une bande étirable quand on commence un cliquer-déplacer sur une zone vide ; mais si vous appuyez sur Maj avant de cliquer, Inkscape forcera la création d'une bande étirable). Entraînez-vous avec les trois formes ci-dessous : - - - - + + + + Maintenant, utilisez la bande étirable (déplacer ou Maj+déplacer) à titre d'exemple pour sélectionner les deux ellipses mais pas le rectangle : - - - - + + + + Tout objet sélectionné affiche une marque de sélection — par défaut, un cadre en pointillés. Ceci permet de distinguer facilement ce qui est sélectionné de ce qui ne l'est pas. Si, par exemple, vous sélectionnez les deux ellipses et le rectangle ci-dessus, sans ces indications, il vous sera difficile de savoir si les ellipses sont bien sélectionnées ou non. - + Maj+clic sur un objet sélectionné l'exclut de la sélection. Sélectionnez les trois objets ci-dessus, puis utilisez Maj+clic pour exclure les deux ellipses de la sélection, en n'y conservant que le rectangle. - + Appuyer sur Échap désélectionne tous les objets. Ctrl+A sélectionne tous les objets du calque courant (si vous n'avez pas créé de calque, vous sélectionnerez tous les objets du document). - - Grouper + + Grouper - + Plusieurs objets peuvent être réunis dans un groupe. Un groupe se comporte comme un simple objet quand vous le déplacez ou le transformez. Ci-dessous, les trois objets de gauche sont indépendants ; les trois mêmes objets de droite sont groupés. Essayez de les déplacer. - - - - + + + + - + Pour créer un groupe, sélectionnez un ou plusieurs objets et appuyez sur Ctrl+G. Pour dégrouper un ou plusieurs groupes, sélectionnez-les et appuyez sur Ctrl+U. Les groupes peuvent eux-mêmes être groupés, comme n'importe quels autres objets ; de tels groupes récursifs peuvent avoir une profondeur quelconque. Cependant, Ctrl+U ne dégroupe que le dernier niveau de groupe de la sélection ; vous devrez répéter Ctrl+U si vous voulez dégrouper complètement des groupes de groupes. - + Cependant, vous n'avez pas nécessairement besoin de dégrouper pour éditer un objet au sein d'un groupe. Un simple Ctrl+clic sur un objet permet de le sélectionner seul et de l'éditer, et Maj+Ctrl+clic sur plusieurs objets (inclus ou non dans des groupes quelconques) permet d'effectuer une sélection multiple. Essayez de déplacer ou transformer sans les dégrouper les formes du groupe ci-dessus à droite, puis de les désélectionner, et resélectionnez le groupe normalement pour vérifier qu'elles sont toujours groupées. - - Fond et contour + + Fond et contour - + - Beaucoup de fonctions d'Inkscape sont accessibles via des boîtes de dialogues. La façon la plus simple d'attribuer une couleur à un objet est probablement d'ouvrir la boîte de dialogue Palettes depuis le menu Affichage, de sélectionner un objet et de cliquer sur un motif pour le peindre (modifier sa couleur de remplissage). + La façon la plus simple de donner une couleur à un objet est probablement de sélectionner un objet, puis de cliquer sur une couleur dans la palette en bas afin de le peindre (changer sa couleur de fond). Vous pouvez également ouvrir la boîte de dialogue Palettes depuis le menu Affichage (ou appuyer sur Maj+Ctrl+W), sélectionner un objet, et cliquer sur une couleur pour le peindre. - + La boîte de dialogue Fond et contour du menu Objet (ou accessible avec Maj+Ctrl+F) est plus puissante. Sélectionnez la forme ci-dessous et ouvrez la boîte de dialogue Fond et contour. - - + + Vous constatez que la boîte de dialogue a trois onglets : Fond, Contour et Style du contour. L'onglet Fond permet d'éditer le remplissage (l'intérieur) du ou des objet(s) sélectionné(s). L'utilisation des boutons juste sous l'onglet vous permet de choisir le type de remplissage, incluant sans remplissage (le bouton avec un X), couleur de remplissage uniforme, ou encore dégradé linéaire ou radial. Pour la forme ci-dessus, le bouton Couleur uniforme devrait être sélectionné. - + Plus bas, vous pouvez voir la collection de sélecteurs de couleur chacun dans un onglet : RVB, TSL, CMJN, et Roue. Le plus pratique est peut-être la roue, dans laquelle vous pouvez tourner un triangle pour choisir une teinte sur la roue, puis une nuance dans le triangle. Tous les sélecteurs de couleur comportent une réglette pour définir l'alpha (opacité) de(s) objet(s) sélectionné(s). - + Quand vous sélectionnez un objet, la boîte de dialogue Fond et contour est mise à jour pour afficher ses fond et contour actuels (quand plusieurs objets sont sélectionnés, elle affiche la moyenne de leurs couleurs). Jouez avec les exemples ci-dessous ou créez les vôtres : - - - - - - - - + + + + + + + + En utilisant l'onglet Contour, vous pouvez enlever le contour d'un objet ou lui attribuer n'importe quelle couleur ou transparence : - - - - - - - - - + + + + + + + + + Le dernier onglet, Style de contour, vous permet de définir la largeur et les autres paramètres du contour : - - - - - - - - + + + + + + + + @@ -488,39 +488,39 @@ - - - - - - - - + + + + + + + + Quand vous passez d'une couleur uniforme à un dégradé, le dégradé nouvellement créé utilise cette même couleur, allant d'opaque à transparente. Utilisez l'outil de Dégradé (Ctrl+F1) pour déplacer les poignées de dégradé — les poignées de contrôle connectées par des lignes qui définissent la direction et la longueur du dégradé. Quand l'une de ces poignées est sélectionnée (surlignée en bleu), la boîte de dialogue Fond et contour permet de définir la couleur liée à cette poignée à la place de la couleur de l'objet sélectionné. - + Une autre manière pratique de changer la couleur d'un objet est d'utiliser l'outil Pipette (F7). Un simple clic n'importe où sur le dessin avec cet outil permet d'attribuer la couleur ainsi capturée au fond de l'objet sélectionné (Maj+clic l'attribuera à son contour). - - Duplication, alignement, distribution + + Duplication, alignement, distribution - + Une des opérations les plus courantes est la duplication d'un objet (Ctrl+D). Le dupliqué est placé juste au-dessus de l'original et est sélectionné, vous permettant ainsi de le déplacer à la souris ou avec des raccourcis. Pour vous exercer, essayez de remplir la ligne avec des copies du carré noir ci-dessous : - - + + @@ -542,187 +542,187 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ordre z (ou superposition) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ordre d'empilement - + - Le terme ordre z désigne l'ordre d'empilement des objets sur un dessin, les objets du dessus masquant les autres. Les deux commandes du menu Objet, Monter au premier plan (touche Début) et Descendre à l'arrière plan (touche Fin), feront passer les objets sélectionnés tout au dessus ou tout au fond dans la superposition des objets du calque actuel. Deux autres commandes, Monter (Page précédente) et Descendre (Page suivante), les déplaceront d'un cran seulement, c'est-à-dire juste au-delà d'un objet non sélectionné (seuls les objets chevauchant la sélection comptent ; si rien ne chevauche la sélection, Monter et Descendre la déplacent tout au-dessus ou tout au fond respectivement. + Lorsque plusieurs objets se recouvrent, il est possible de définir l'ordre dans lequel ils sont empilés, c'est-à-dire quels objets sont en haut et masquent les autres (paramètre z-order). Les deux commandes du menu Objet, Monter au premier plan (touche Origine) et Descendre à l'arrière-plan (touche Fin), feront passer les objets sélectionnés tout au-dessus ou tout au fond de l'empilement du calque actuel. Deux autres commandes, Monter (Page précédente) et Descendre (Page suivante), les enfouiront ou émergeront d'un cran seulement, c'est-à-dire juste au-delà d'un objet non sélectionné dans l'empilement (seuls les objets chevauchant la sélection comptent, en fonction de leur boîte englobante). - + Exercez-vous à l'utilisation de ces commandes en inversant la superposition des objets ci-dessous, de telle sorte que l'ellipse la plus à gauche soit tout au-dessus et la plus à droite tout au fond : - - - - - - - + + + + + + + - Un raccourci de sélection très utile est la touche Tab. Si rien n'est sélectionné, il sélectionne l'objet le plus au fond ; sinon, il sélectionne l'objet juste au-dessus de l'objet sélectionné dans l'ordre z. Maj+Tab fait l'inverse, commençant par l'objet tout au-dessus en allant vers le fond. Comme les objets que vous créez sont ajoutés au-dessus de la superposition, appuyer sur Maj+Tab quand aucun objet n'est sélectionné vous permettra de retrouver facilement le dernier objet que vous avez créé. Essayez Tab et Maj+Tab sur les ellipses superposées ci-dessus. + Un raccourci de sélection très utile est la touche Tab. Si rien n'est sélectionné, il sélectionne l'objet le plus au fond ; sinon, il sélectionne l'objet juste au-dessus de l'objet sélectionné dans l'empilement. Maj+Tab fait l'inverse, commençant par l'objet tout au-dessus en allant vers le fond. Comme les objets que vous créez sont ajoutés au-dessus de la superposition, appuyer sur Maj+Tab quand aucun objet n'est sélectionné vous permettra de retrouver facilement le dernier objet que vous avez créé. Essayez Tab et Maj+Tab sur les ellipses superposées ci-dessus. - - Sélectionner et déplacer des objets couverts + + Sélectionner et déplacer des objets couverts - + Que faire si l'objet dont vous avez besoin est caché derrière un autre objet ? Vous pouvez encore voir l'objet en dessous si celui du dessus est (partiellement) transparent, mais en cliquant dessus, vous sélectionnerez l'objet du dessus, pas celui dont vous avez besoin. - + Pour cela, il faut utiliser Alt+clic. Alt+clic sélectionne d'abord l'objet du dessus, comme un clic normal ; mais le Alt+clic suivant au même endroit sélectionne l'objet juste en dessous ; et ainsi de suite. Donc, plusieurs Alt+clic à la suite vous permettront de naviguer du dessus vers le fond à travers la superposition de différents objets sous le pointeur de la souris. Quand l'objet du fond est sélectionné, un Alt+clic de plus sélectionne de nouveau l'objet du dessus. - + [Si vous êtes sous Linux, vous pourriez éventuellement vous apercevoir que Alt+clic ne fonctionne pas correctement, mais déplace la fenêtre Inkscape en totalité. C'est parce que votre gestionnaire de fenêtres a réservé le raccourci Alt+clic pour une autre action. Pour corriger cela, il faut trouver l'option de configuration du comportement des fenêtres de votre gestionnaire de fenêtres, puis la désactiver ou bien lui associer une autre touche (par exemple Super — aussi appelée « Windows »), afin qu'Inkscape et les autres applications puissent librement utiliser la touche Alt.] - + Bien, mais une fois l'objet recouvert sélectionné, qu'en faire ? Vous pouvez le transformer grâce aux raccourcis et déplacer ses poignées de sélection. Cependant, déplacer l'objet lui-même resélectionnera l'objet tout au dessus à nouveau (le cliquer-déplacer est conçu comme cela : d'abord sélectionner l'objet le plus haut juste sous le curseur puis déplacer la sélection). Pour demander à Inkscape de déplacer la sélection présente (éventuellement en dessous d'autres objets) sans rien sélectionner d'autre, utilisez Alt+déplacer. Cela vous permettra de déplacer la sélection actuelle où que vous placiez la souris. - + Essayez Alt+clic et Alt+déplacer sur les deux formes brunes sous le rectangle vert transparent : - - - - - Sélectionner des objets similaires + + + + + Sélectionner des objets similaires - + Inkscape peut sélectionner automatiquement tous les objets ayant un point commun. Par exemple, si vous souhaitez sélectionner tous les carrés bleus ci-dessous, sélectionnez tout d'abord l'un d'entre eux, puis utilisez Édition > Sélectionner même > Couleur de fond dans le menu. Tous les objets avec la même teinte de bleu seront alors sélectionnés. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Vous pouvez non seulement sélectionner par couleur de fond, mais également par couleur de contour, style de contour, fond et contour, et type d'objet. - - Conclusion + + Conclusion - + Ceci conclut le didacticiel basique. Inkscape offre beaucoup d'autres fonctionnalités, mais les techniques décrites ci-dessus vous permettront déjà de créer des dessins simples mais utiles. Pour un usage plus avancé, consultez le didacticiel avancé dans Aide > Didacticiels. - + diff --git a/share/tutorials/tutorial-calligraphy.fr.svg b/share/tutorials/tutorial-calligraphy.fr.svg index e9b16455d..99a38c538 100644 --- a/share/tutorials/tutorial-calligraphy.fr.svg +++ b/share/tutorials/tutorial-calligraphy.fr.svg @@ -40,195 +40,195 @@ - + ::CALLIGRAPHIE bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + L'outil Calligraphie est l'un des nombreux bons outils proposés par Inkscape. Ce didacticiel vous aidera à découvrir le fonctionnement de cet outil, ainsi que les bases et techniques de l'art de la calligraphie. - + Utiliser Ctrl+flèche, la molette de la souris ou le glisser avec le bouton du milieu pour faire défiler la page vers le bas. Pour les bases de création, sélection et transformation d'objet, lisez le didacticiel basique dans Aide > Didacticiels. - - Histoire et styles + + Histoire et styles - + Par définition, la calligraphie signifie « belle écriture » ou « faculté d'écrire élégamment ». La calligraphie est essentiellement l'art de former à la main de beaux caractères d'écriture. Cela peut sembler intimidant, mais avec un peu de pratique, n'importe qui peut maîtriser les bases de cet art. - + Les premières formes de calligraphie apparaissent avec les peintures des hommes des cavernes. Et jusqu'à l'apparition de l'imprimerie, en 1440 environ, les livres et autres publications étaient calligraphiés. Un scribe devait transcrire à la main toute copie de livre ou publication. L'écriture se faisait avec une plume (d'oie) et de l'encre sur des matériaux tels que du parchemin ou du vélin. Les styles de lettrage utilisés au cours des âges incluent le Rustique, la minuscule Caroline, le Blackletter, etc. Aujourd'hui, l'emplacement le plus commun où une personne classique trouvera de la calligraphie est probablement le faire-part d'un mariage. - + Il existe trois principales familles de calligraphie : - - + + Occidentale ou romane - - + + Arabe - - + + Chinoise ou orientale - + Ce didacticiel se focalise principalement sur la calligraphie occidentale, étant donné que les deux autres styles nécessitent généralement un pinceau (au lieu d'une plume), qui ne fait pas encore partie des fonctions de notre outil Calligraphie. - + Un des grands avantages que nous avons sur les scribes du passé est la commande Annuler. Si vous faites une erreur, la page entière n'est pas perdue. L'outil Calligraphie d'Inkscape permet aussi des techniques qui ne seraient pas possible avec les plumes et encres traditionnelles. - - Matériel + + Matériel - + Vous obtiendrez de meilleurs résultats si vous utilisez une tablette graphique avec stylet (ex. : une Wacom). Mais grâce à la flexibilité de notre outil, vous pouvez également obtenir des résultats décents avec une souris, même s'il vous sera plus difficile de produire des tracés rapides réguliers. - + Inkscape est capable d'utiliser les sensibilités à la pression et à l'inclinaison d'un stylet de tablette qui prend en charge ces fonctions. Les fonctions de sensibilité sont désactivées par défaut parce qu'elles nécessitent de la configuration. Souvenez-vous par ailleurs que la calligraphie avec une plume ou un stylo avec pointe ne sont pas vraiment sensibles à la pression, contrairement à un pinceau. - + Si vous avez une tablette et désirez utiliser les fonctions de sensibilité, vous devez configurer votre périphérique. Cette configuration n'a besoin d'être effectuée qu'une seule fois, les réglages seront sauvegardés. Pour en activer le support, vous devez avoir la tablette graphique branchée avant de démarrer Inkscape, puis, ouvrir la boîte de dialogue Périphériques de saisie…, via le menu Édition. Lorsque cette boîte de dialogue est ouverte, vous pouvez sélectionner le périphérique et les réglages que vous désirez pour le stylet de votre tablette. Enfin, après avoir choisi ces réglages, passez à l'outil Calligraphie et commutez les boutons de la barre d'outils pour la pression et l'inclinaison. Inkscape se souviendra de ces réglages au prochain démarrage. - + Le stylo calligraphique d'Inkscape peut être sensible à la vélocité du tracé (voir « Amincissement » plus bas), donc, si vous utilisez une souris, vous désirerez probablement mettre ce paramètre à zéro. - - Options de l'outil Calligraphie + + Options de l'outil Calligraphie - + Passez à l'outil Calligraphie en appuyant sur Ctrl+F6 ou sur C, ou encore en cliquant sur son bouton dans la barre d'outils. Vous remarquerez alors, dans la barre d'outils du haut, huit options : largeur & amincissement ; angle & fixité ; terminaisons ; tremblement, agitation & inertie. Il y a également deux autres boutons pour activer ou désactiver la pression de la tablette et la sensibilité à l'inclinaison (pour les tablettes graphiques). - - Largeur et amincissement + + Largeur et amincissement - + Cette paire d'options contrôle la largeur de votre plume. La largeur peut varier entre 1 et 100 et est (par défaut) mesurée selon une unité relative à la taille de votre fenêtre d'édition, mais indépendante du zoom. En effet, l'« unité de mesure » naturelle en calligraphie est l'amplitude du mouvement de votre main et il est donc pratique d'avoir votre largeur de plume en rapport constant par rapport à votre « planche d'écriture » et non pas en unités réelles, ce qui la ferait dépendre du zoom. Ce comportement est toutefois optionnel, et peut donc être modifié pour ceux qui préféreraient une unité absolue peu importe le zoom. Pour passer à ce mode, utilisez la case à cocher sur la page de Préférences de l'outil (vous pouvez l'ouvrir en double-cliquant sur le bouton de l'outil). - + Comme la largeur de plume varie souvent, vous pouvez l'ajuster sans avoir à retourner à la barre d'outils, en utilisant les touches fléchées gauche et droite ou avec une tablette qui supporte la sensibilité à la pression. L'avantage de ces raccourcis est qu'ils fonctionnent même pendant que vous dessinez, de sorte que vous pouvez faire varier la largeur de votre plume progressivement pendant un tracé : - largeur=1, augmentant… atteignant 47, diminuant… de nouveau à 0 - - + largeur=1, augmentant… atteignant 47, diminuant… de nouveau à 0 + + La largeur de la plume peut aussi dépendre de la vélocité, et ceci est contrôlé par le paramètre d'amincissement. Ce paramètre peut prendre une valeur entre -100 et 100 ; zéro signifie que la largeur est indépendante de la vélocité, des valeurs positives font que des tracés plus rapides sont plus fins, des valeurs négatives font que des tracés plus rapides deviennent plus épais. La valeur par défaut de 10 implique un amincissement modéré des tracés rapides. Voici quelques exemples, tous tracés avec une largeur de 20 et un angle de 90° : - amincissement = 0 (largeur uniforme) - amincissement = 10 - amincissement = 40 - amincissement = -20 - amincissement = -60 - - - - - - - - - - - - - - - - - - - - - + amincissement = 0 (largeur uniforme) + amincissement = 10 + amincissement = 40 + amincissement = -20 + amincissement = -60 + + + + + + + + + + + + + + + + + + + + + Pour vous amuser, donnez une valeur de 100 (le maximum) à la largeur et à l'amincissement puis dessinez avec des mouvements brusques pour obtenir des formes étrangement naturalistes, ressemblant à des neurones. - - - - - - - - Angle et fixité + + + + + + + + Angle et fixité - + @@ -243,15 +243,15 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - - - - angle = 90° - angle = 30° (par défaut) - angle = 0° - angle = -90° - - + + + + angle = 90° + angle = 30° (par défaut) + angle = 0° + angle = -90° + + @@ -260,34 +260,34 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - - + + Chaque style de calligraphie traditionnelle possède son propre angle prédominant. L'écriture onciale, par exemple, utilise un angle de 25 degrés. Les styles plus complexes et les calligraphes plus expérimentés feront souvent varier cet angle pendant le tracé, ce qu'Inkscape permet par pression sur les touches fléchées haut et bas ou avec une tablette qui supporte la sensibilité à l'inclinaison. Néanmoins, pour l'exercice des débutants en calligraphie, conserver un angle constant fonctionnera mieux. Voici des exemples de tracés dessinés selon différents angles (fixité = 100) : - angle = 30° - angle = 60° - angle = 90° - angle = 0° - angle = 15° - angle = -45° - - - - - - - + angle = 30° + angle = 60° + angle = 90° + angle = 0° + angle = 15° + angle = -45° + + + + + + + Comme vous pouvez le voir, le tracé est plus fin quand il est parallèle à l'angle, et plus épais quand il est perpendiculaire. Des angles positifs sont plus naturels et traditionnels pour une calligraphie tracée de la main droite. - + @@ -299,19 +299,19 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - angle = 30°fixité = 100 - angle = 30°fixité = 80 - angle = 30°fixité = 0 - - - - - - - - - - + angle = 30°fixité = 100 + angle = 30°fixité = 80 + angle = 30°fixité = 0 + + + + + + + + + + @@ -320,7 +320,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -329,7 +329,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -338,7 +338,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -347,7 +347,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -356,7 +356,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -365,7 +365,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -374,7 +374,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -383,7 +383,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -392,7 +392,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -401,7 +401,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -410,7 +410,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -419,7 +419,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -428,7 +428,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -437,7 +437,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -446,7 +446,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -455,7 +455,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -464,24 +464,24 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + Typographiquement parlant, une fixité maximale et donc un contraste maximal de largeur de tracé (ci-dessus à gauche) sont les caractéristiques des antiques fontes serif, comme Times ou Bodoni (parce que ces fontes étaient historiquement une imitation d'une calligraphie effectuée avec une plume orientée de façon fixe). D'un autre côté, une fixité nulle et donc un contraste de largeur nulle (ci-dessus à droite) font plutôt penser à une fonte sans serif moderne, comme Helvetica. - - Tremblement + + Tremblement - + Le tremblement est conçu pour donner une apparence plus naturelle aux tracés calligraphiques. Le tremblement est ajustable dans la barre de contrôle, avec des valeurs comprises entre 0 et 100. Ceci influencera vos tracés, produisant différents effets pouvant aller des légères inégalités aux bavures et tâches. Cela augmente significativement les possibilités de l'outil. - + lent intermédiaire rapide @@ -495,289 +495,289 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - tremblement = 0 - tremblement = 10 - tremblement = 30 - tremblement = 50 - tremblement = 70 - tremblement = 90 - tremblement = 20 - tremblement = 40 - tremblement = 60 - tremblement = 80 - tremblement = 100 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Agitation et inertie + tremblement = 0 + tremblement = 10 + tremblement = 30 + tremblement = 50 + tremblement = 70 + tremblement = 90 + tremblement = 20 + tremblement = 40 + tremblement = 60 + tremblement = 80 + tremblement = 100 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Agitation et inertie - + Contrairement à la largeur et à l'angle, ces deux derniers paramètres définissent la « sensation » laissée par l'outil plutôt qu'affecter son rendu visuel. Il n'y aura donc pas d'illustration dans cette section ; à la place, effectuez simplement des tests par vous-même pour vous faire une idée du fonctionnement. - + L'agitation est la résistance du papier au mouvement de la plume. La valeur par défaut est au minimum (0), et augmenter ce paramètre rend le papier glissant : si la masse est forte, la plume a tendance à partir dans des changements de directions brusques ; si la masse est nulle, une agitation forte provoquera des tortillements incontrôlables de la plume. - + En physique, la masse est ce qui génère l'inertie ; plus la masse de l'outil Calligraphie d'Inkscape est importante, et plus celui-ci traîne derrière votre stylet (ou pointeur de souris) et lisse les changements de direction et mouvements brusques de votre tracé. Par défaut cette valeur est assez faible (2) de façon à ce que l'outil soit rapide et réactif, mais vous pouvez augmenter la masse pour obtenir une plume plus lente et douce. - - Exemples de calligraphies + + Exemples de calligraphies - + Maintenant que vous connaissez les possibilités de base de l'outil, vous pouvez essayer de produire de vraies calligraphies. Si vous êtes débutant dans cette discipline, procurez-vous un bon livre sur la calligraphie et étudiez-le avec Inkscape. Cette section vous montrera juste quelques exemples simples. - + Tout d'abord pour tracer des lettres, vous avez besoin d'une paire de règles pour vous guider. Si vous devez avoir une écriture inclinée ou cursive, ajoutez aussi des guides inclinés en travers des deux règles horizontales. Par exemple : - - - - - - - - - + + + + + + + + + Ensuite le zoom devra être réglé de telle sorte que la hauteur entre les règles corresponde à votre amplitude naturelle de mouvement de main. Ajustez les paramètres largeur et angle, et c'est parti ! - + La première chose que vous devriez faire en tant que calligraphe débutant est probablement de vous entraîner à dessiner les éléments de base des lettres — des traits horizontaux et verticaux, des tracés ronds et des traits inclinés. Voici quelques éléments de lettres pour l'écriture onciale : - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + Plusieurs astuces utiles : - - + + Si votre main est confortablement installée sur la tablette, ne la déplacez pas. Faites plutôt défiler le canevas (touches Ctrl+flèche) avec votre main gauche après avoir fini chaque lettre. - - + + Si votre dernier coup de plume est mauvais, annulez-le (Ctrl+Z). Cependant, si sa forme est bonne, mais que la position et la taille doivent être légèrement rectifiées, il vaut mieux utiliser le Sélecteur temporairement (espace) et opérer les déplacement/redimensionnement/rotation nécessaires (en utilisant la souris ou le clavier), puis appuyer sur espace de nouveau pour reprendre l'outil Calligraphie. - - + + Quand vous avez fini un mot, passez de nouveau au Sélecteur pour ajuster l'uniformité des traits et l'inter-lettrage. N'en faites pas trop cependant ; une belle calligraphie doit garder le côté légèrement irrégulier d'une écriture manuscrite. Résistez à la tentation de dupliquer des lettres et des morceaux de lettres ; chaque coup de plume doit être original. - + Et voici quelques exemples de lettrages complets : - - - - - - - - - Écriture onciale - Écriture carolingienne (minuscule Caroline) - Écriture gothique - Écriture bâtarde - - - Écriture italique florissante - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Conclusion + + + + + + + + + Écriture onciale + Écriture carolingienne (minuscule Caroline) + Écriture gothique + Écriture bâtarde + + + Écriture italique florissante + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Conclusion - + La calligraphie n'est pas seulement amusante ; c'est un art profondément spirituel qui peut transformer votre regard sur tout ce que vous faites et voyez. L'outil Calligraphie d'Inkscape ne peut servir que d'introduction modeste. Et pourtant, il est très amusant de jouer avec et il peut servir à des travaux concrets. Faites-vous plaisir ! - + diff --git a/share/tutorials/tutorial-elements.fr.svg b/share/tutorials/tutorial-elements.fr.svg index 06be155d4..a0b9ca9f7 100644 --- a/share/tutorials/tutorial-elements.fr.svg +++ b/share/tutorials/tutorial-elements.fr.svg @@ -40,57 +40,57 @@ - - ::RUDIMENTS + + ::RUDIMENTS DE DESIGN - + Ce didacticiel s'attache à montrer les éléments et principes de design habituellement enseignés aux étudiants débutants en art afin de comprendre les différentes notions impliquées dans une création. Cette liste n'est pas exhaustive, aussi n'hésitez pas à enrichir (modifier, ajouter, supprimer, combiner des paragraphes) ce didacticiel pour le rendre plus complet. - - - - Rudiments - Principes - Couleur - Ligne - Forme - Espace - Texture - Valeur - Taille - Équilibre - Contraste - Emphase - Proportion - Motif - Gradation - Composition - Vue d'ensemble - - Rudiments de design + + + + Rudiments + Principes + Couleur + Ligne + Forme + Espace + Texture + Valeur + Taille + Équilibre + Contraste + Emphase + Proportion + Motif + Gradation + Composition + Vue d'ensemble + + Rudiments de design - + Les éléments suivants forment les bases de l'élaboration d'un design. - - Ligne + + Ligne - + Une ligne est définie comme une marque avec une longueur et une direction, créée par un point se déplaçant sur une surface. Une ligne peut varier en longueur, largeur, direction, courbure et en couleur. Une ligne peut être bidimensionnelle (un trait de crayon sur du papier) ou tridimensionnelle. - + @@ -102,53 +102,53 @@ - - Forme + + Forme - + Une forme est créée par la rencontre ou l'intersection de signes entourant un espace. Une variation de couleur ou une ombre peuvent définir une forme. Les formes peuvent être classées en deux catégories : géométriques (un carré, un triangle, un cercle) et organiques (contour irrégulier). - + - - Taille + + Taille - + La taille se réfère aux proportions des objets, lignes ou formes. Les variations de taille entre des objets peuvent être réelles ou imaginaires. - - GRAND - petit - - Espace + + GRAND + petit + + Espace - + L'espace est l'aire vide (ou ouverte) entre, autour, au-dessus, en dessous, devant ou dans des objets. Les formes peuvent être définies par l'espace qu'elles contiennent et qui les entoure. L'espace est souvent qualifié de tri- ou bi-dimensionnel. L'espace positif est celui rempli par une forme. L'espace négatif est celui qui entoure une forme. - - - - - - Couleur + + + + + + Couleur - + @@ -166,11 +166,11 @@ - - - Texture + + + Texture - + @@ -188,14 +188,14 @@ - - - - - - Valeur + + + + + + Valeur - + @@ -222,70 +222,70 @@ - - - - - - - Principes de design + + + + + + + Principes de design - + Les principes combinent les éléments de design pour produire une composition. - - Équilibre + + Équilibre - + L'équilibre est une impression visuelle de parité dans la forme, la valeur, la couleur… L'équilibre peut être symétrique (équilibré) ou asymétrique (déséquilibré). Les objets, luminosités, couleurs, textures, formes, etc., peuvent être mis à contribution pour créer un équilibre dans la composition. - - - - - - - - Contraste + + + + + + + + Contraste - + Le contraste est la juxtaposition d'éléments qui s'opposent. - - - - - - Emphase + + + + + + Emphase - + L'emphase est utilisée pour accentuer certaines parties d'une œuvre et attirer l'attention. Le centre d'intérêt ou le point focal est l'endroit qui attire l'œil en premier. - - - - - - - Proportion + + + + + + + Proportion - + @@ -342,9 +342,9 @@ - - - + + + @@ -381,9 +381,9 @@ - Fourmi & 4×4 au hasard - Image SVG créée par Andrew FitzsimonAutorisation de la bibliothèque Open Clip Arthttp://www.openclipart.org/ - + Fourmi & 4×4 au hasard + Image SVG créée par Andrew FitzsimonAutorisation de la bibliothèque Open Clip Arthttp://www.openclipart.org/ + @@ -403,12 +403,12 @@ - - - - Motif + + + + Motif - + @@ -425,13 +425,13 @@ - - - - - Gradation + + + + + Gradation - + @@ -448,16 +448,16 @@ - - - - - - - - Composition + + + + + + + + Composition - + @@ -544,48 +544,48 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - Bibliographie + + + Bibliographie - + Voici une bibliographie (partielle) utilisée pour la réalisation de ce document : - - + + @@ -593,8 +593,8 @@ http://www.makart.com/resources/artclass/EPlist.html - - + + @@ -602,8 +602,8 @@ http://www.princetonol.com/groups/iad/Files/elements2.htm - - + + @@ -611,8 +611,8 @@ http://www.johnlovett.com/test.htm - - + + @@ -620,8 +620,8 @@ http://digital-web.com/articles/elements_of_design/ - - + + @@ -629,14 +629,14 @@ http://digital-web.com/articles/principles_of_design/ - + Remerciements spéciaux à Linda Kim (http://www.coroflot.com/redlucite/) qui m'a (http://www.rejon.org/) bien aidé sur ce didacticiel. Merci également à l'Open Clip Art Library (http://www.openclipart.org/) et aux gens qui ont soumis des dessins pour ce projet. - + diff --git a/share/tutorials/tutorial-interpolate.fr.svg b/share/tutorials/tutorial-interpolate.fr.svg index 6b5572b66..d2c088351 100644 --- a/share/tutorials/tutorial-interpolate.fr.svg +++ b/share/tutorials/tutorial-interpolate.fr.svg @@ -40,70 +40,70 @@ - + ::INTERPOLATION Ryan Lerch, ryanlerch at gmail dot com - + Ce document explique comment utiliser l'extension d'interpolation d'Inkscape. - - Introduction + + Introduction - + L'effet de cette extension consiste en une interpolation linéaire entre deux (ou plus) chemins sélectionnés. Cela signifie essentiellement qu'elle « comble les vides » entre les chemins et les transforme en fonction du nombre d'étapes demandées. - + Pour utiliser l'extension Interpoler, sélectionnez les chemins que vous souhaitez transformer, et choisissez la commande Extensions > Générer à partir du chemin > Interpoler. - + Avant d'exécuter cette extension, les objets que vous souhaitez transformer doivent être des chemins. Pour transformer un objet en chemin, utilisez la commande Chemin > Objet en chemin ou Maj+Ctrl+C. Si vos objets ne sont pas des chemins, l'extension n'aura pas d'effet. - - Interpolation entre deux chemins identiques + + Interpolation entre deux chemins identiques - + L'utilisation la plus simple de l'extension Interpoler consiste à l'appliquer entre deux chemins identiques. Lorsque l'extension est appelée, elle a pour effet de remplir l'espace entre les deux chemins avec des copies des chemins originaux. Le nombre d'étapes définit combien de copies seront utilisées. - + Prenons par exemple les deux chemins suivants : - + - + Sélectionnez maintenant les deux chemins et exécutez l'extension Interpoler avec les paramètres proposés dans l'image suivante. - + @@ -116,42 +116,42 @@ Ryan Lerch, ryanlerch at gmail dot com Exposant : 0,0Étapes d'interpolation : 6Méthode d'interpolation : 2Dupliquer les extrémités : décochéInterpoler le style : décoché - + Comme vous pouvez le voir ci-dessus, l'espace entre les deux chemins en forme de cercle a été rempli par six (le nombre d'étapes d'interpolation) autres chemins de même forme. Notez également que l'extension groupe toutes les formes. - - Interpolation entre deux différents chemins + + Interpolation entre deux chemins différents - + Lorsque l'interpolation est effectuée entre deux chemins différents, le programme interpole la forme du chemin du premier vers le second. En résultat, vous obtenez une séquence fondue entre les chemins, toujours avec la régularité définie par la valeur du paramètre Étapes d'interpolation. - + Prenons par exemple les deux chemins suivants : - + - + Sélectionnez maintenant les deux chemins et lancez l'extension Interpoler. Le résultat devrait ressembler à ceci : - + @@ -164,28 +164,28 @@ Ryan Lerch, ryanlerch at gmail dot com Exposant : 0,0Étapes d'interpolation : 6Méthode d'interpolation : 2Dupliquer les extrémités : décochéInterpoler le style : décoché - + Comme vous pouvez le constater avec le résultat précédent, l'espace entre le chemin en forme de cercle et celui en forme de triangle a été rempli par six chemins qui passent progressivement de la forme du premier chemin à celle du second. - + Lorsque vous utilisez l'extension Interpoler entre deux chemins différents, la position du nœud de départ de chaque chemin est importante. Pour trouver ce nœud particulier, sélectionnez le chemin, puis l'outil Nœud pour faire apparaître les nœuds, et appuyez sur la touche Tab. Le premier nœud apparaissant sélectionné est le nœud de départ. - + Examinez l'image ci-dessous, identique à l'exemple précédent, à l'exception des nœuds ici affichés. Le nœud vert, sur chaque chemin, est le nœud de départ. - + @@ -196,14 +196,14 @@ Ryan Lerch, ryanlerch at gmail dot com - + L'exemple précédent (affiché à nouveau ci-dessous) a été réalisé avec ces nœuds de départ. - + @@ -216,14 +216,14 @@ Ryan Lerch, ryanlerch at gmail dot com Exposant : 0,0Étapes d'interpolation : 6Méthode d'interpolation : 2Dupliquer les extrémités : décochéInterpoler le style : décoché - + Notez maintenant les changements, dans le résultat de l'interpolation, lorsque le chemin triangle a été inversé (par miroir) de façon à ce que le nœud de départ soit dans un position différente : - + @@ -236,7 +236,7 @@ Ryan Lerch, ryanlerch at gmail dot com - + @@ -248,24 +248,24 @@ Ryan Lerch, ryanlerch at gmail dot com - - Méthode d'interpolation + + Méthode d'interpolation - + Un des paramètres de l'extension Interpoler est la méthode d'interpolation. Deux méthodes ont été implémentées ; elles se différencient dans la façon dont sont calculées les courbes des nouvelles formes. Ces choix prennent la valeur 1 ou 2. - + Dans l'exemple ci-dessus, nous avons utilisé la méthode d'interpolation 2, et le résultat était : - + @@ -277,14 +277,14 @@ Ryan Lerch, ryanlerch at gmail dot com - + Comparez maintenant avec la méthode d'interpolation 1 : - + @@ -296,31 +296,31 @@ Ryan Lerch, ryanlerch at gmail dot com - + Les différences dans la manière dont ces méthodes calculent les nombres dépassent le cadre de ce document. Essayez donc simplement les deux méthodes, et utilisez celle qui donne le résultat le plus proche de ce que vous souhaitez. - - Exposant + + Exposant - + Le paramètre Exposant contrôle l'espacement entre les étapes successives de l'interpolation. Avec un exposant à 0, l'espacement entre les copies est partout identique. - + Voici le résultat d'un autre exemple élémentaire avec un exposant de 0. - + @@ -333,14 +333,14 @@ Ryan Lerch, ryanlerch at gmail dot com Exposant : 0,0Étapes d'interpolation : 6Méthode d'interpolation : 2Dupliquer les extrémités : décochéInterpoler le style : décoché - + Même exemple avec un exposant de 1 : - + @@ -352,14 +352,14 @@ Ryan Lerch, ryanlerch at gmail dot com - + avec un exposant de 2 : - + @@ -371,14 +371,14 @@ Ryan Lerch, ryanlerch at gmail dot com - + et avec un exposant de -1 : - + @@ -390,21 +390,21 @@ Ryan Lerch, ryanlerch at gmail dot com - + Lorsque vous utilisez l'exposant, l'ordre de sélection des objets est important. Dans l'exemple précédent, le chemin en forme d'étoile sur la gauche a été sélectionné en premier, et le chemin en forme d'hexagone sur la droite sélectionné en second. - + Voici le résultat d'une interpolation avec le chemin de droite sélectionné en premier. L'exposant, dans cet exemple, a été positionné à 1 : - + @@ -416,34 +416,34 @@ Ryan Lerch, ryanlerch at gmail dot com - - Dupliquer les extrémités + + Dupliquer les extrémités - + Ce paramètre détermine si le groupe de chemins généré par l'extension inclut une copie des chemins originaux sur lesquels l'interpolation est appliquée. - - Interpoler le style + + Interpoler le style - + Ce paramètre est un des plus astucieux de l'extension. Il fait en sorte que l'extension essaie de changer le style des chemins à chaque étape. Ainsi, si le chemin original et le chemin final ont une couleur différente, les chemins générés changeront de couleur progressivement à chaque étape. - + Voici un exemple où la fonction Interpoler le style est utilisée sur le fond d'un chemin : - + @@ -455,14 +455,14 @@ Ryan Lerch, ryanlerch at gmail dot com - + Interpoler le style affecte également le contour d'un chemin : - + @@ -474,14 +474,14 @@ Ryan Lerch, ryanlerch at gmail dot com - + Bien sûr, les chemins de départ et de fin n'ont pas besoin d'être identiques : - + @@ -503,28 +503,28 @@ Ryan Lerch, ryanlerch at gmail dot com - - Utiliser l'interpolation pour imiter des dégradés de forme irrégulière + + Utiliser l'interpolation pour imiter des dégradés de forme irrégulière - + Il n'est pas (encore) possible avec Inkscape de créer un dégradé d'une forme autre que linéaire (en ligne droite) ou radiale (circulaire). Toutefois, l'interpolation du style, dans cette extension, permet d'imiter un gradient irrégulier. Voici un exemple simple — dessinez deux lignes de contours différents : - + - + Et lancez une interpolation entre les deux lignes pour créer votre dégradé : - + @@ -546,17 +546,17 @@ Ryan Lerch, ryanlerch at gmail dot com - - Conclusion + + Conclusion - + Comme démontré ci-dessus, l'extension Interpoler est un outil puissant. Ce tutoriel en couvre les bases, mais l'expérimentation est la clé pour explorer l'interpolation plus profondément. - + diff --git a/share/tutorials/tutorial-shapes.fr.svg b/share/tutorials/tutorial-shapes.fr.svg index ea2926cd9..7a8965d72 100644 --- a/share/tutorials/tutorial-shapes.fr.svg +++ b/share/tutorials/tutorial-shapes.fr.svg @@ -49,7 +49,7 @@ - Ce didacticiel aborde les quatre outils de formes : rectangle, ellipse, étoile et spirale. Nous verrons des exemples montrant les possibilités des formes d'Inkscape et suggérerons quand et comment les utiliser. + Ce didacticiel aborde les quatre outils de formes : Rectangle, Ellipse, Étoile et Spirale. Nous verrons des exemples montrant les possibilités des formes d'Inkscape et suggérerons quand et comment les utiliser. @@ -141,7 +141,7 @@ - Puis, sans quitter l'outil rectangle, passez d'un rectangle à l'autre en cliquant dessus. + Puis, sans quitter l'outil Rectangle, passez d'un rectangle à l'autre en cliquant dessus. @@ -214,7 +214,7 @@ Ici par exemple, le rectangle original rouge a été dupliqué et ses dimensions changées (augmentées et diminuées) plusieurs fois selon différentes proportions, le bouton « préserver l'échelle des arrondis » étant désactivé : - Redimensionner des rectangles arrondis avec « préserver l'échelle des arrondis » désactivé + Redimensionner des rectangles arrondis avec « Préserver l'échelle des arrondis » désactivé @@ -223,164 +223,164 @@ - + Notez que la taille et la forme des coins arrondis restent les mêmes pour tous les rectangles, de sorte que les coins arrondis se superposent exactement en haut à droite de la figure. Tous les rectangles bleus en pointillés ont été obtenus après un redimensionnement de l'original dans le sélecteur, sans avoir réajusté les poignées d'arrondi. - + Pour comparer, voici la même composition, mais créée cette fois-ci le bouton « préserver l'échelle des arrondis » étant activé : - Redimensionner des rectangles arrondis avec « préserver l'échelle des arrondis » activé - - - - - - - - - + Redimensionner des rectangles arrondis avec « Préserver l'échelle des arrondis » activé + + + + + + + + + Maintenant, les rectangles ont tous des coins arrondis différemment, et il n'y a plus aucune superposition en haut à droite (zoomez pour le vérifier). Ce résultat (visible) est le même que celui que vous auriez obtenu en convertissant le rectangle original en chemin (Ctrl+Maj+C) puis en modifiant les dimensions de ce chemin. - + Voici les raccourcis permettant de manipuler les poignées d'arrondi d'un rectangle : - - + + Déplacez-les en appuyant sur Ctrl pour garder égaux les deux rayons (arrondi circulaire). - - + + Ctrl+clic sur une poignée rendra son rayon égal à celui de la deuxième sans avoir à la déplacer. - - + + Maj+clic permet de supprimer l'arrondi. - + Vous avez peut-être remarqué que la barre de contrôle de l'outil Rectangle affiche deux champs pour les rayons horizontal (Rx) et vertical (Ry) d'arrondi pour le rectangle sélectionné , vous permettant ainsi de modifier précisément ces rayons dans l'unité de votre choix. Le bouton Rendre les coins pointus fait simplement ce qu'il indique : il supprime l'arrondi des rectangles sélectionnés. - + Un avantage important de ces contrôles est qu'ils peuvent affecter plusieurs rectangles en même temps. Par exemple, si vous voulez modifier tous les rectangles d'un calque, vous n'avez qu'à appuyer sur Ctrl+A (tout sélectionner) et définir les paramètres voulus dans la barre de contrôle. Si des objets autres que des rectangles sont sélectionnés, ils seront ignorés — seuls les rectangles seront modifiés. - + Maintenant, observons les poignées de redimensionnement d'un rectangle. Vous vous demandez peut-être à quoi elles servent puisqu'il est possible de redimensionner un rectangle avec le sélecteur ? - + Le problème avec le sélecteur est que pour lui, les notions d'horizontale et de verticale sont celles de la page. En revanche, les poignées de redimensionnement d'un rectangle agissent parallèlement à ses côtés, même si le rectangle a été tourné ou incliné. Par exemple, essayez de redimensionner ce rectangle d'abord avec le sélecteur puis avec ses poignées de redimensionnement dans l'outil Rectangle : - - + + Comme il y a deux poignées de redimensionnement, vous pouvez modifier les dimensions du rectangle selon n'importe quelle direction et même parallèlement à ses côtés. Le redimensionnement préserve les rayons d'arrondi des coins. - + Voici les raccourcis permettant de manipuler les poignées de redimensionnement d'un rectangle : - - + + Déplacez-les en appuyant sur Ctrl pour forcer leur déplacement parallèlement aux côtés du rectangle ou à sa diagonale. Autrement dit, Ctrl permet de préserver la largeur ou la hauteur ou encore le ratio largeur/hauteur du rectangle (dans son propre système de coordonnées qui peut être tourné ou incliné). - + Voici le même rectangle, entouré de lignes pointillées grises indiquant les directions dans lesquelles vous pouvez déplacer ses poignées de redimensionnement en appuyant sur Ctrl (essayez) : - + - - Faire coller le rectangle — redimensionner les poignées avec Ctrl - + + Faire coller le rectangle — redimensionner les poignées avec Ctrl + En inclinant et en tournant un rectangle, puis en le dupliquant et en modifiant ses dimensions avec ses poignées de redimensionnement, vous pouvez facilement créer des dessins en 3D : - - - - - - - - - - - - - - - - - - - - - 3 rectangles originaux - Différents rectangles copiés et redimensionnés à l'aide les poignées, la plupart avec Ctrl - + + + + + + + + + + + + + + + + + + + + + 3 rectangles originaux + Différents rectangles copiés et redimensionnés à l'aide les poignées, la plupart avec Ctrl + @@ -451,615 +451,615 @@ - - - - - - - - - - - - - - - - - - - - - - - - Ellipses + + + + + + + + + + + + + + + + + + + + + + + + Ellipses - + L'outil Ellipse (F5) permet de créer des ellipses et des cercles, que vous pouvez transformer en camemberts ou en arcs. Les raccourcis sont les mêmes que ceux de l'outil Rectangle : - - + + En appuyant sur Ctrl, vous pouvez dessiner un cercle ou une ellipse de ratio entier (2:1, 3:1, etc.). - - + + En appuyant sur Maj, vous pouvez dessiner autour du point de départ. - + Intéressons-nous aux poignées d'une ellipse. Sélectionnez l'ellipse suivante : - - + + Une fois de plus, vous ne voyez d'abord que trois poignées, mais il y en a quatre. À droite, il y a en fait deux poignées qui se superposent et qui permettent « d'ouvrir » l'ellipse. En déplaçant la première de ces poignées, la deuxième devient visible ; déplacer ces poignées vous permet d'obtenir toutes sortes d'arcs ou de camemberts (portions d'ellipse en forme de parts de tarte) : - - - - - - - - + + + + + + + + Pour obtenir un camembert (un arc avec ses deux rayons), déplacez la poignée vers l'extérieur de l'ellipse ; pour obtenir un arc, déplacez-la vers l'intérieur. Ci-dessus, vous pouvez voir 4 camemberts à gauche et 3 arcs à droite. Notez que les arcs sont des formes ouvertes, c'est-à-dire que le contour court le long de l'ellipse mais ne relie pas les extrémités de l'arc. Ceci devient évident si vous supprimez le fond, ne gardant visible que le contour : - + 15 - Segments - Arcs - - - - - - - - - - - - - - - - - - - - + Segments + Arcs + + + + + + + + + + + + + + + + + + + + Voyez le groupe de camemberts ressemblant à un ventilateur sur la gauche. Le créer a été facile, en déplaçant les poignées par incréments d'angle avec la touche Ctrl. Voici les raccourcis des poignées arc/camembert : - - + + En appuyant sur Ctrl, forcez des modifications d'angle par incréments de 15 degrés lors des déplacements de ces poignées. - - + + Maj+clic sur ces poignées permet de refermer ces arcs/camemberts pour en refaire des ellipses. - + L'incrément d'angle par défaut peut être modifié dans les préférences d'Inkscape (dans l'onglet Comportement > Incréments). - + Les deux autres poignées d'une ellipse sont utilisées pour la redimensionner autour de son centre. Les raccourcis qui y sont associés sont similaires à ceux des poignées d'arrondi d'un rectangle : - - + + Déplacez-les tout en appuyant sur Ctrl pour faire un cercle (garder les deux rayons égaux). - - + + Ctrl+clic sur une de ces poignées permet de transformer l'ellipse en cercle sans déplacer de poignée. - + Et, tout comme les poignées de redimensionnement d'un rectangle, ces poignées permettent d'ajuster la largeur et la hauteur d'une ellipse dans son propre système de coordonnées. Ce qui signifie qu'une ellipse qui a été tournée ou inclinée peut facilement être redimensionnée parallèlement à ses axes. Essayez de modifier les dimensions de ces ellipses en utilisant leurs poignées de redimensionnement : - - - - - - - - Étoiles + + + + + + + + Étoiles - + Les étoiles sont les formes les plus complexes et les plus intéressantes. Si vous voulez épater vos amis avec Inkscape, laissez-les s'amuser un peu avec l'outil Étoile. Il est particulièrement amusant — presque addictif ! - + L'outil Étoile permet de créer deux types de formes similaires : des étoiles et des polygones. Une étoile a deux poignées dont les positions définissent la longueur et la forme de ses branches ; un polygone n'a qu'une poignée qui permet en la déplaçant de redimensionner et tourner ce polygone : - + Étoile - + Polygone - + Dans la barre de contrôle de l'outil Étoile, les deux premiers boutons déterminent si l'objet prend la forme d'une étoile ou d'un polygone régulier. Puis un champ numérique permet de définir le nombre de sommets d'une étoile ou d'un polygone. Ce paramètre n'est modifiable que depuis cette barre de contrôle, et peut varier de 3 (évidemment) à 1024, mais vous devriez éviter d'entrer un trop grand nombre (disons, plus de 200) si votre ordinateur n'est pas très puissant. - + Quand vous dessinez une nouvelle étoile ou un nouveau polygone, - - + + Déplacez une poignée en appuyant sur Ctrl pour forcer des modifications d'angle par incréments de 15 degrés. - + Par nature, une étoile est une des formes les plus intéressantes (bien qu'en pratique les polygones soient souvent plus utiles). Les deux poignées d'une étoile ont des fonctions légèrement différentes. La première poignée (lors de la création de l'étoile, elle se trouve sur une pointe, c'est-à-dire un coin convexe de l'étoile) permet d'allonger ou raccourcir les branches de l'étoile, et si vous la tournez (relativement au centre de la forme), l'autre poignée accompagne cette rotation. Ceci implique que vous ne pouvez pas incliner les branches de l'étoile avec cette poignée. - + Par contre, l'autre poignée (située initialement sur un coin concave entre deux pointes) est libre de se déplacer radialement et tangentiellement, sans affecter la poignée au bout d'une pointe (en fait cette poignée peut devenir à son tour la poignée de pointe si elle est déplacée plus loin du centre que l'autre poignée). Avec cette poignée, vous pouvez incliner les branches de l'étoile pour obtenir toutes sortes de cristaux, mandalas et flocons : - - - - - - - - - - + + + + + + + + + + Si vous voulez juste obtenir une étoile simple, sans de telles dentelles, vous pouvez restreindre le comportement de cette poignée de façon à éviter toute inclinaison : - - + + Déplacer la poignée en appuyant sur Ctrl permet de garder l'étoile strictement radiale (sans inclinaison). - - + + Ctrl+clic sur la poignée permet de supprimer l'inclinaison sans la déplacer. - + En complément utile des possibilités de déplacement des poignées sur le canevas, la barre de contrôle comprend un champ Ratio des rayons qui définit le rapport entre les distances séparant chacune des poignée du centre. - + Les étoiles d'Inkscape ont deux astuces de plus dans leur sac. En géométrie, un polygone est une forme composée de segments de droites avec des coins anguleux. Dans le monde réel, un certain degré de courbure est parfois présent — et Inkscape peut gérer cela aussi. Cependant, arrondir une étoile ou un polygone est un peu différent d'arrondir un rectangle. Vous n'avez pas de poignée dédiée à cette opération, mais, - - + + Maj+cliquer-déplacer tangentiellement une poignée permet d'arrondir une étoile ou un polygone. - - + + Maj+clic sur une poignée permet de supprimer l'arrondi. - + « Tangentiellement » signifie dans une direction perpendiculaire à celle d'un rayon. Si vous tournez une poignée en sens anti-horaire, vous augmentez l'arrondi ; en sens horaire, vous le diminuez (voyez plus loin ci-dessous pour des exemples d'arrondi négatif). - + Voici une comparaison entre un carré arrondi (issu de l'outil Rectangle) et un quadrilatère arrondi (issu de l'outil Étoile) : - + Polygone arrondi - + Rectangle arrondi - + Comme vous pouvez le voir, alors qu'un rectangle arrondi a des côtés droits et des coins arrondis (circulairement ou elliptiquement), un polygone ou une étoile arrondi n'a aucun segment rectiligne ; ses courbures varient régulièrement entre un maximum (dans les coins) et un minimum (entre deux coins). Inkscape opère ceci en ajoutant deux tangentes de Bézier colinéaires à chaque nœud de la forme (vous pouvez les voir en convertissant la forme en chemin et en l'examinant avec l'outil Nœud). - + Le paramètre d'arrondi que vous pouvez ajuster dans la barre de contrôle est le rapport entre la longueur de ces tangentes et celle du côté adjacent de l'étoile/polygone. Ce paramètre peut être négatif, inversant ainsi la direction des tangentes. Des valeurs de 0,2 à 0,4 donnent une courbure normale (assez courante) ; des valeurs plus importantes conduisent à des formes superbes, inextricables et totalement imprévisibles. Une étoile avec une grande valeur d'arrondi peut facilement dépasser les limites fixées habituellement par ses poignées. Voici quelques exemples, indiquant chacun sa valeur d'arrondi : - - - - - - - - - - - - - - 0,25 - 0,25 - 0,25 - 0,37 - - 0,43 - 3,00 - -3,00 - - 0,41 - 5,43 - 1,85 - 0,21 - -3,00 - - -0,43 - - -8,94 - - 0,39 - + + + + + + + + + + + + + + 0,25 + 0,25 + 0,25 + 0,37 + + 0,43 + 3,00 + -3,00 + + 0,41 + 5,43 + 1,85 + 0,21 + -3,00 + + -0,43 + + -8,94 + + 0,39 + Si vous voulez que les pointes d'une étoile soient pointues et que les creux soient arrondis ou l'inverse, il suffit simplement de créer un offset (Ctrl+J) de cette étoile : - - - - Étoile originale - Offset lié, érodé - Offset lié, dilaté - + + + + Étoile originale + Offset lié, érodé + Offset lié, dilaté + Maj+cliquer-déplacer les poignées d'une étoile dans Inkscape est une des plus merveilleuses activités connues de l'être humain. Mais on peut faire encore mieux. - + Afin d'imiter encore mieux les formes du monde réel, Inkscape peut rendre aléatoires (c'est-à-dire déformer aléatoirement) ses étoiles et polygones. Un peu de hasard rend une étoile moins régulière, plus « humaine », souvent amusante ; un hasard plus important est une façon distrayante d'obtenir toute une variété de formes complètement imprédictibles. Une étoile arrondie garde des courbures douces quand elle est rendue aléatoire. Voici les raccourcis : - - + + Alt+cliquer-déplacer tangentiellement une poignée permet de rendre une étoile ou un polygone aléatoire. - - + + Alt+clic sur une poignée permet de supprimer le hasard. - + Lors de l'édition (avec les poignées) d'une étoile aléatoire, celle-ci « tremblera » car chaque position précise de ses poignées correspond à une unique quantité de hasard. Donc, déplacer une poignée sans appuyer sur Alt réinitialise ce hasard en conservant son niveau, tandis que Alt+cliquer-déplacer préserve ce hasard mais ajuste son niveau. Voici des étoiles dont les paramètres sont identiques, mais chacune d'entre elles a vu sa quantité de hasard mise à jour en déplaçant très légèrement sa poignée (la quantité de hasard varie de 0,1 tout au long de la figure suivante) : - - - - - - + + + + + + Et voici l'étoile du milieu de la figure ci-dessus, avec une quantité de hasard variant entre -0,2 et 0,2 : - +0,2 - +0,1 - 0 - -0,1 - -0,2 - - - - - - + +0,2 + +0,1 + 0 + -0,1 + -0,2 + + + + + + Essayez de Alt+cliquer-déplacer une poignée de l'étoile du milieu de la figure ci-dessus et observez comment elle passe de la forme de celle de gauche à la forme de celle de droite — et même au-delà. - + Vous trouverez probablement vos propres applications aux étoiles aléatoires, mais j'avoue aimer particulièrement les éclaboussures en forme d'amibes et les grandes planètes irrégulières aux paysages fantastiques : - - - - - - - - - - - Spirales + + + + + + + + + + + Spirales - + Les spirales d'Inkscape sont des formes versatiles, et bien qu'elles ne soient pas aussi captivantes que les étoiles, elles sont parfois utiles. Une spirale, comme une étoile, est dessinée autour de son centre ; lors de sa création tout comme lors de son édition, - - + + Déplacez une poignée en appuyant sur Ctrl pour forcer des modifications d'angle par incréments de 15 degrés. - + Une fois créée, une spirale possède deux poignées, intérieure et extérieure. Les deux poignées peuvent être simplement déplacées pour enrouler ou dérouler la spirale (c'est-à-dire la prolonger, en modifiant le nombre de ses tours). Voici les autres raccourcis : - + Poignée extérieure : - - + + Maj+cliquer-déplacer pour redimensionner/tourner la spirale autour de son centre (sans l'enrouler ou la dérouler). - - + + Alt+cliquer-déplacer pour verrouiller le rayon de la spirale pendant que vous l'enroulez ou la déroulez. - + Poignée intérieure : - - + + Alt+cliquer-déplacer verticalement pour faire converger/diverger la spirale. - - + + Alt+clic pour remettre la divergence à zéro. - - + + Maj+clic pour déplacer la poignée intérieure au centre. - + La divergence d'une spirale est la mesure de la non-linéarité de ses enroulements. Quand la divergence vaut 1, la spirale est uniforme ; inférieure à 1 (Alt+cliquer-déplacer vers le haut), la spirale devient plus dense à sa périphérie ; supérieure à 1 (Alt+cliquer-déplacer vers le bas), la spirale est plus dense en son centre : - 0,2 - 0,5 - 6 - 2 - 1 - - - - - - + 0,2 + 0,5 + 6 + 2 + 1 + + + + + + Le nombre maximum de tours d'une spirale est 1024. - + Tout comme l'outil Ellipse ne se limite pas aux ellipses, mais permet de créer des arcs (des lignes à la courbure constante), l'outil spirale permet de créer des lignes à la courbure variant régulièrement. Comparé à une courbe de Bézier, un arc de spirale est souvent plus pratique car vous pouvez l'allonger ou le raccourcir en déplaçant une poignée le long de la courbe sans modifier sa forme. De plus, alors qu'une spirale est habituellement dessinée sans fond, vous pouvez en ajouter un et retirer le contour afin d'obtenir des effets intéressants. - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + Les spirales avec des contours en pointillés sont particulièrement intéressantes — elles combinent la concentration naturelle de la forme avec l'espacement régulier des pointillés pour fournir de superbes effets de moiré : - - - - - Conclusion + + + + + Conclusion - + Les outils de formes d'Inkscape sont particulièrement puissants. Initiez-vous à leurs astuces à loisir — cela vous servira pour tout travail de design, car utiliser des formes plutôt que des chemins rend la création d'un dessin vectoriel plus rapide et sa modification plus facile. Si vous avez des idées pour améliorer d'une façon quelconque les outils de formes, n'hésitez pas à contacter les développeurs. - + diff --git a/share/tutorials/tutorial-tips.fr.svg b/share/tutorials/tutorial-tips.fr.svg index 07adc75c5..49bc535a4 100644 --- a/share/tutorials/tutorial-tips.fr.svg +++ b/share/tutorials/tutorial-tips.fr.svg @@ -40,286 +40,286 @@ - + ::TRUCS ET ASTUCES - + Ce didacticiel présente divers trucs et astuces trouvés par des utilisateurs au cours de leur utilisation d'Inkscape, ainsi que quelques fonctionnalités cachées qui peuvent vous aider à accélérer votre production. - - Disposition radiale grâce au pavage de clones + + Disposition radiale avec un pavage de clones - + - Il est facile de comprendre comment se servir de la boîte de dialogue Créer un pavage avec des clones pour créer des motifs ou des grilles rectangulaires. Mais que faire si vous voulez un placement radial, où les objets partagent un même centre de rotation ? C'est possible aussi ! + Il est facile de comprendre comment se servir de la boîte de dialogue Créer un pavage de clones pour créer des motifs ou des grilles rectangulaires. Mais comment créer une disposition radiale, où les objets partagent un même centre de rotation ? C'est possible aussi ! - + - Si votre motif radial ne doit comporter que 3, 4, 6, 8 ou 12 éléments, vous pouvez alors essayer les symétries P3, P31M, P3M1, P4, P4M, P6, ou P6M. Celles-ci offrent de bons résultats pour obtenir des flocons ou des formes similaires. Voici une méthode plus générale : + Si votre motif radial ne doit comporter que 3, 4, 6, 8 ou 12 éléments, vous pouvez alors essayer les symétries P3, P31M, P3M1, P4, P4M, P6 ou P6M. Celles-ci fonctionnent bien pour obtenir des flocons ou des formes similaires. Voici toutefois une méthode plus générale. - + - Choisissez la symétrie P1 (translation simple) puis compensez cette translation en allant dans l'onglet Translation et définissez Par ligne/Translation Y et Par colonne/Translation X à -100 %. Les clones seront alors empilés juste au-dessus de l'original. Tout ce qu'il reste à faire est d'aller dans l'onglet Rotation et définir un angle par colonne, puis créer le motif avec une ligne et plusieurs colonnes. Par exemple, voici un motif fait d'une ligne horizontale et de 30 colonnes, chacune de ces colonnes étant tournée de 6 degrés : - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Choisissez la symétrie P1 (translation simple) puis compensez cette translation en allant dans l'onglet Translation et en définissant Par ligne/Translation Y et Par colonne/Translation X à -100 %. Les clones seront alors empilés juste au-dessus de l'original. Tout ce qu'il reste à faire est d'aller dans l'onglet Rotation et de définir un angle par colonne, puis de créer le motif avec une ligne et plusieurs colonnes. Par exemple, voici un motif fait d'une ligne horizontale et de 30 colonnes, chacune de ces colonnes étant tournée de 6 degrés : + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Pour en faire un cadran, il suffit de découper ce motif ou recouvrir sa partie par un disque blanc (pour effectuer des opérations booléennes sur des clones, déliez-les d'abord). - + Des effets plus intéressants peuvent être créés en utilisant à la fois les lignes et les colonnes. Voici un motif de 10 colonnes et 8 lignes, avec une rotation de 2 degrés par lignes et 18 par colonne. Chaque groupe de segments ici est « une colonne », donc les groupes sont séparés entre eux de 18 degrés ; en sein de chaque « colonne », les segments sont séparés de 2 degrés : - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - Dans les exemples ci-dessus, le segment a été tourné autour de son centre. Et au cas où vous voudriez que le centre soit en dehors de votre forme ? Il suffit de créer un rectangle invisible (sans fond ni contour) recouvrant votre forme et dont le centre est à l'emplacement désiré ; groupez la forme et le rectangle puis utilisez Créer un pavage avec des clones sur ce groupe. Vous pouvez maintenant créer des belles explosions ou éclaboussures en rendant aléatoire le redimensionnement, la rotation ou l'opacité : + Dans les exemples ci-dessus, le segment a été tourné autour de son centre. Mais comment faire si vous voulez que le centre soit en dehors de votre forme ? Cliquez deux fois sur l'objet avec l'outil Sélecteur pour entrer en mode rotation, puis déplacez le centre de rotation de l'objet (représenté par une petite poignée en forme de croix) vers le centre de rotation souhaité pour le pavage. Utilisez ensuite Créer un pavage de clones sur l'objet. C'est ainsi que vous pouvez créer de belles explosions et éclaboussures avec une échelle, une rotation et éventuellement une opacité aléatoires : - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Trancher plusieurs zones d'export rectangulaires + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Exporter des zones rectangulaires multiples - + - Créez un nouveau calque, et dans ce calque, créez des rectangles invisibles recouvrant des parties de votre image. Assurez-vous que votre document adopte le px (défini par défaut) comme unité, affichez la grille et faites coller les rectangles à cette grille de sorte que chacun d'entre eux comporte un nombre entier de px. Assignez des ids significatifs aux rectangles, et exportez chacun d'entre eux dans un fichier différent (Fichier > Exporter une image PNG — Maj+Ctrl+E). Chacun des rectangles se « souviendra » ainsi de son nom de fichier d'export. Après cela, il est facile de réexporter certains de ces rectangles : passez dans le calque d'export, utilisez Tab pour sélectionner celui dont vous avez besoin (ou utilisez une Recherche par id), et enfin cliquez sur Exporter dans la boîte de dialogue. Vous pouvez aussi écrire un script shell (ou un fichier batch) pour exporter ces zones avec une commande telle que : + Créez un nouveau calque, et dans ce calque, créez des rectangles invisibles recouvrant des parties de votre image. Assurez-vous que votre document adopte le px comme unité (cas par défaut), affichez la grille et faites coller les rectangles à cette grille de sorte que chacun d'entre eux aient des coordonnées en px entières. Donnez des identifiants significatifs aux rectangles, et exportez chacun d'entre eux dans un fichier différent (Fichier > Exporter une image PNG — Maj+Ctrl+E). Chacun des rectangles se « souviendra » ainsi de son nom de fichier d'export. Après cela, il est facile de réexporter certains de ces rectangles : passez dans le calque d'export, utilisez Tab pour sélectionner celui dont vous avez besoin (ou faites une Recherche par identifiant), et enfin cliquez sur Exporter dans la boîte de dialogue. Vous pouvez aussi écrire un script shell ou un fichier batch pour exporter ces zones avec une commande telle que : - + inkscape -i area-id -t nomdefichier.svg - + - pour chaque zone. L'option -t rappelle à Inkscape d'utiliser le nom de fichier enregistré avec la zone ; sinon vous pouvez fournir un autre nom pour l'export avec l'option -e. Une autre possibilité est d'utiliser les extensions Extensions > Web > Découpe, ou Extensions > Exporter > Guillotine permettant d'automatiser l'export depuis des documents SVG Inkscape, en utilisant au choix des guides ou un calque de découpage. + pour chaque zone. L'option -t indique à Inkscape d'utiliser le nom de fichier enregistré avec la zone ; vous pouvez aussi fournir un autre nom pour l'export avec l'option -e. Une autre possibilité est d'utiliser les extensions Extensions > Web > Découpe, ou Extensions > Exporter > Guillotine qui permettent d'automatiser l'export depuis des documents SVG Inkscape, en utilisant au choix des guides ou un calque de découpage. - - Dégradés non linéaires + + Dégradés non linéaires - + La version 1.1 du SVG ne supporte pas les dégradés non linéaires (c'est-à-dire ayant des transitions non linéaires entre les couleurs). Vous pouvez cependant les émuler grâce à des dégradés multi-stops. - + - Commencez par créer un dégradé avec deux stops, et ouvrez l'éditeur de dégradés (par exemple, en double-cliquant sur une poignée du dégradé dans l'outil dégradé). Ajoutez un nouveau stop au milieu du dégradé, et déplacez-le légèrement. Puis, ajoutez d'autres stops de part et d'autre celui du milieu et déplacez-les aussi de sorte que le dégradé soit régulier. Plus vous ajoutez de stops, plus vous pouvez rendre le dégradé résultant régulier. Voici le dégradé initial avec deux stops (noir et blanc) : + Commencez par créer un dégradé avec deux stops (vous pouvez le définir dans la boîte de dialogue Remplissage et contour ou utiliser l'outil Dégradé). À présent, avec l'outil Dégradé, ajoutez un nouveau stop au milieu du dégradé, soit en double-cliquant sur la ligne du dégradé, soit en sélectionnant le stop de forme carrée et en cliquant sur le bouton Insérer un nouveau stop dans la barre des contrôles de l'outil Dégradé ; puis déplacez légèrement ce nouveau stop. Ensuite, ajoutez d'autres stops de part et d'autre de celui du milieu et déplacez-les aussi de sorte que le dégradé ait l'air lisse. Plus vous ajoutez de stops, plus vous pouvez rendre le dégradé résultant soyeux. Voici le dégradé initial avec deux stops (noir et blanc) : @@ -327,11 +327,11 @@ - - + + - + Et voici quelques dégradés multi-stops non-linéaires (examinez-les dans l'éditeur de dégradés) : @@ -416,23 +416,23 @@ - - - - - - - - - - Dégradés radiaux excentriques + + + + + + + + + + Dégradés radiaux excentriques - + - + - Les dégradés radiaux ne sont pas nécessairement symétriques. Dans l'outil Dégradé, déplacez la poignée centrale d'un dégradé elliptique tout en appuyant sur Maj. Cela vous permettra de déplacer la poignée du foyer (en forme de « x ») du dégradé et de la séparer du centre. Si vous n'en avez plus besoin, vous pouvez déplacer à nouveau la poignée de foyer près du centre. + Les dégradés radiaux ne sont pas nécessairement symétriques. Dans l'outil Dégradé, déplacez la poignée centrale d'un dégradé elliptique tout en appuyant sur Maj. Cela vous permettra de déplacer la poignée du foyer (en forme de « X ») du dégradé en la séparant du centre. Si vous n'en avez plus besoin, vous pouvez replacer la poignée de foyer au centre. @@ -444,216 +444,216 @@ - - - - Alignement au centre de la page + + + + Alignement au centre de la page - + - + Pour aligner quelque chose au centre ou le long d'un côté de la page, sélectionnez l'objet ou le groupe à aligner puis ouvrez la boîte de dialogue Aligner et distribuer (Maj+Ctrl+A). Vous pouvez alors choisir la Page dans la liste relativement à et enfin aligner votre sélection comme vous le désirez. - - Nettoyage du document + + Nettoyage du document - + - + Quand ils ne sont plus utilisés, beaucoup de dégradés, motifs et marqueurs (plus précisément, ceux que vous avez édités manuellement) restent dans les palettes correspondantes et peuvent être utilisés dans de nouveaux objets. Cependant, si vous voulez optimiser votre document, utilisez la commande Nettoyer le document du menu Fichier. Elle supprimera tout dégradé, motif ou marqueur qui n'est plus utilisé par aucun objet du document, réduisant ainsi la taille du fichier. - - Fonctionnalités cachées et éditeur XML + + Fonctionnalités cachées et éditeur XML - + - + L'éditeur XML (Maj+Ctrl+X) vous permet de modifier la plupart des aspects du document sans avoir à utiliser un éditeur de texte externe. De plus, Inkscape supporte souvent des fonctionnalités SVG pas encore accessibles depuis l'interface graphique. L'éditeur XML offre la possibilité d'accéder à ces fonctionnalités (à condition de connaître le SVG). - - Changer l'unité de mesure des règles + + Changer l'unité de mesure des règles - + - + - Dans le modèle par défaut, l'unité de mesure utilisée par les règles est le px (« unité utilisateur SVG », égale à 0,8 pt ou 1/90 de pouce dans Inkscape). C'est aussi l'unité utilisée pour l'affichage des coordonnées dans le coin inférieur gauche, et celle présélectionnée dans les menus qui font intervenir des unités (vous pouvez déplacer votre souris au-dessus d'une règle pour voir un indicateur affichant l'unité utilisée). Pour modifier ceci, ouvrez les Propriétés du document (Maj+Ctrl+D) et changez les Unités par défaut dans l'onglet Page. + Dans le modèle par défaut, l'unité de mesure utilisée par les règles est le px (« unité utilisateur SVG », égale à 0,75 pt ou 1/96 de pouce dans Inkscape). C'est aussi l'unité utilisée pour l'affichage des coordonnées dans le coin inférieur gauche, et celle présélectionnée dans les menus qui font intervenir des unités (vous pouvez placer votre souris sur une règle pour faire apparaître une bulle indiquant l'unité utilisée). Pour modifier cela, ouvrez les Propriétés du document (Maj+Ctrl+D) et changez l'Unité par défaut dans l'onglet Page. - - Appliquer des coups de tampon + + Appliquer des coups de tampon - + - + Pour créer rapidement plusieurs copies d'un objet, utilisez le coup de tampon. Déplacez simplement un objet (ou redimensionnez/tournez-le) et, alors que le bouton de la souris est toujours pressé, appuyez sur Espace. Ceci appose un « tampon » de l'objet courant. Vous pouvez répéter ce coup de tampon autant de fois que vous le voulez. - - Astuces du stylo + + Astuces du stylo - + - + - Dans l'outil courbes de Bézier (stylo), vous pouvez terminer la ligne courante de plusieurs façons : + Avec l'outil Stylo (courbes de Bézier), vous pouvez achever votre ligne de plusieurs façons : - - + + - + Appuyer sur Entrée - - + + - + Effectuer un double-clic avec le bouton gauche de la souris - - + + - + - Sélectionner à nouveau le stylo dans la barre d'outils + Cliquer avec le bouton droit - - + + - + Sélectionner un autre outil - + - + Notez que tant que le chemin n'est pas terminé (c'est-à-dire qu'il est affiché en vert, avec le segment actuel en rouge), il n'existe pas encore en tant qu'objet dans le document. Pour l'annuler, vous pouvez donc utiliser les raccourcis Échap (abandonner complètement le chemin) ou Retour arrière (supprimer le dernier segment du chemin non terminé) à la place d'Annuler. - + - + Pour ajouter un nouveau sous-chemin à un chemin existant, sélectionnez ce chemin et commencez à dessiner (d'où vous voulez) tout en appuyant sur Maj. Cependant, si vous voulez simplement prolonger un chemin existant, Maj n'est pas nécessaire ; commencez simplement à dessiner depuis l'une des ancres situées aux extrémités du chemin sélectionné. - - Entrer des valeurs Unicode + + Entrer des valeurs Unicode - + - + Quand vous êtes dans l'outil Texte, appuyer sur Ctrl+U permet d'alterner les modes Normal et Unicode. En mode Unicode, chaque groupe de 4 chiffres hexadécimaux que vous tapez devient un caractère Unicode, vous permettant ainsi de taper les symboles que vous voulez (si vous connaissez leur numéro Unicode, et si la police les supporte). Pour valider un caractère Unicode, appuyez sur Entrée. Par exemple, Ctrl+U 2 0 1 4 Entrée insère un tiret long (—). Pour quitter le mode Unicode sans insérer quoi que ce soit, appuyez sur la touche Échap. - + - + Vous pouvez également utiliser la boîte de dialogue Texte > Glyphes pour rechercher et insérer des glyphes dans votre document. - - Utilisation de la grille pour dessiner des icônes + + Utilisation de la grille pour dessiner des icônes - + - + - Supposons que vous vouliez créer une icône de 24×24 pixels. Créez un canevas de 24×24 px (utilisez les Préférences du document) et définissez la taille de la grille à 0,5 px (48×48 lignes de grille, donc). Maintenant, si vous alignez les fonds d'objets sur les lignes paires de grille et les contours sur les lignes impaires, avec un nombre pair (en px) comme largeur de contour, en exportant le document à la résolution par défaut de 90 ppp (de sorte qu'1 px corresponde à 1 pixel matriciel), vous obtiendrez une icône matricielle nette ne nécessitant pas d'anticrénelage. + Supposons que vous vouliez créer une icône de 24×24 pixels. Créez un canevas de 24×24 px (utilisez les Préférences du document) et créez une grille avec un espacement de 0,5 px (48×48 lignes de grille, donc). Maintenant, si vous alignez des objets avec un fond sur les lignes paires de la grille et les contours sur les lignes impaires, avec un nombre pair (en px) comme largeur de contour, en exportant le document à la résolution par défaut de 96 ppp (de sorte qu'1 px corresponde à 1 pixel matriciel), vous obtiendrez une icône matricielle nette ne nécessitant pas d'anticrénelage. - - Rotation d'objets + + Rotation d'objets - + - + - Dans le sélecteur, le clic sur un objet permet d'afficher les flèches de redimensionnement, et un clic de plus sur l'objet permet d'afficher les flèches d'inclinaison et de rotation. Si vous déplacez les flèches des coins, l'objet tournera autour du centre (marqué d'une croix). Si vous appuyez sur Maj pendant cette opération, la rotation se fera autour du coin opposé. Vous pouvez aussi déplacer le centre de rotation (la croix) où vous le désirez. + Avec l'outil Sélecteur, le clic sur un objet permet d'afficher les flèches de redimensionnement, et un clic de plus sur l'objet permet d'afficher les flèches d'inclinaison et de rotation. Si vous déplacez les flèches des coins, l'objet tournera autour du centre (représenté par une croix). Si vous appuyez sur Maj pendant cette opération, la rotation se fera autour du coin opposé. Vous pouvez aussi déplacer le centre de rotation (la croix) où vous le désirez. - + - + Ou bien, vous pouvez effectuer une rotation en utilisant les raccourcis clavier : [ et ] (de 15 degrés) ou Ctrl+[ et Ctrl+] (de 90 degrés). Ces mêmes raccourcis [] combinés avec Alt permettent des rotations lentes à l'échelle du pixel. - - Ombres portées + + Ombres portées - + - + Pour créer rapidement une ombre portée sur des objets, utilisez la fonctionnalité Filtres > Ombres et lueurs > Ombre portée…. - + - + Vous pouvez aussi facilement créer des ombres portées manuellement avec le paramètre de flou de la boîte de dialogue Fond et contour. Sélectionnez un objet, dupliquez-le avec Ctrl+D, appuyez sur la touche Page suivante pour déplacer le duplicata sous l'objet original, puis déplacez-le légèrement vers le bas et la droite par rapport à l'original. Ouvrez maintenant la boîte de dialogue Fond et contour et changez la valeur du flou à 5. Le tour est joué ! - - Placement d'un texte le long d'un chemin + + Placement d'un texte le long d'un chemin - + - + Pour placer du texte le long d'une courbe, sélectionnez le texte et la courbe puis utilisez la commande Mettre suivant un chemin du menu Texte. Le texte commencera au début du chemin. En général, il vaut mieux créer un chemin auquel vous voulez que le texte s'adapte plutôt que d'adapter ce texte à un autre élément (préexistant) du dessin — cela vous autorisera un meilleur contrôle sans avoir à « bricoler » votre dessin. - - Sélection de l'original + + Sélection de l'original - + - + Quand vous avez affaire à un texte suivant un chemin, un offset lié ou un clone, leur objet/chemin source peut être difficile à sélectionner (caché sous d'autres objets, rendu invisible et/ou verrouillé). Le raccourci magique Maj+D peut alors vous aider ; sélectionnez le texte, l'offset lié ou le clone et appuyez sur Maj+D pour sélectionner alors le chemin correspondant, la source de l'offset ou l'original du clone. - - Au cas où la fenêtre serait hors de l'écran + + Au cas où la fenêtre serait hors de l'écran - + - + Quand vous transférez des documents entre des systèmes avec des résolutions ou un nombre d'écrans différents, vous pouvez être confronté au problème suivant : Inkscape a enregistré une position de fenêtre qui fait que vous ne pouvez plus atteindre Inkscape sur votre écran. Il suffit de maximiser la fenêtre (ce qui devrait la rendre de nouveau visible à l'écran ; utilisez la barre des tâches), d'enregistrer le document et de le recharger. Vous pouvez éviter tout cela en désactivant l'option « enregistrer la taille et la position des fenêtres » (dans l'onglet Interface > Fenêtres des Préférences d'Inkscape). - - Transparence, dégradés et export en Postscript + + Transparence, dégradés et export en Postscript - + - + - Les formats PostScript ou EPS ne supportent pas la transparence, aussi vous ne devriez pas utiliser cette fonctionnalité si vous comptez exporter en PS/EPS. Dans le cas d'une transparence uniforme chevauchant une couleur uniforme, il est facile d'y remédier : sélectionnez l'un des objets transparents et passez à l'outil Pipette (F7) ; assurez-vous qu'il est en mode « capturer la couleur visible sans alpha » et cliquez sur ce même objet. La couleur visible sera capturée et réassignée à l'objet mais cette fois, sans transparence. Répétez cette opération pour tous les objets transparents. Si votre objet transparent chevauche plusieurs zones de différentes couleurs uniformes, vous devrez le découper en morceaux (un morceau par zone) puis appliquer la procédure ci-dessus à chacun des morceaux. + Les formats PostScript et EPS ne supportent pas la transparence, aussi vous ne devriez pas en utiliser si vous comptez exporter en PS/EPS. Dans le cas d'une transparence uniforme couvrant une couleur uniforme, il est facile d'y remédier : sélectionnez l'un des objets transparents, prenez l'outil Pipette (F7), assurez-vous que le bouton Opacité : Capturer est désactivé dans la barre des contrôles de la pipette et cliquez sur ce même objet. La couleur visible sera capturée et réassignée à l'objet mais cette fois, sans transparence. Répétez cette opération pour tous les objets transparents. Si votre objet transparent chevauche plusieurs zones de différentes couleurs uniformes, vous devrez le découper en morceaux (un morceau par zone) puis appliquer cette procédure à chacun des morceaux. Notez que l'outil Pipette ne change pas la valeur d'opacité de l'objet, mais seulement la valeur alpha de sa couleur de fond ou de contour ; assurez-vous donc que tous les objets ont une opacité de 100 % avant de commencer. - + diff --git a/share/tutorials/tutorial-tracing-pixelart.fr.svg b/share/tutorials/tutorial-tracing-pixelart.fr.svg index 1bc503511..706a136a8 100644 --- a/share/tutorials/tutorial-tracing-pixelart.fr.svg +++ b/share/tutorials/tutorial-tracing-pixelart.fr.svg @@ -40,52 +40,52 @@ - + ::VECTORISER DU PIXEL ART - + - Avant que nous ayons accès à un logiciel d'édition de graphismes vectoriels aussi puissant… + Avant que nous ayons accès à des logiciels d'édition vectorielle aussi puissants… - + Avant même que nous ayons des moniteurs en 640×480… - + Jouer à des jeux vidéo réalisés avec des pixels savamment assemblés sur des écrans à basse résolution était pratique courante. - + Ce type d'art imaginé à cette époque est ce que nous appelons « pixel art ». - + Inkscape s'appuie sur la bibliothèque libdepixelize, ce qui lui permet de vectoriser automatiquement ces images pixel art un peu spéciales. Vous pouvez utiliser cette fonctionnalité avec d'autres types d'images, mais gardez à l'esprit que le résultat ne sera sans doute pas aussi bon qu'avec l'autre outil de vectorisation d'Inkscape, potrace. - + Commençons avec un exemple montrant les possibilités du moteur de vectorisation. Nous avons à gauche une image matricielle (extraite du concours Liberated Pixel Cup) et à droite sa version vectorisée. - + @@ -327,14 +327,14 @@ - + libdepixelize s'appuie sur l'algorithme Kopf-Lischinski pour vectoriser les images. Cet algorithme utilise les idées de plusieurs techniques informatiques et plusieurs concepts mathématiques pour produire un résultat satisfaisant avec les images pixel art. Détail d'importance, le canal alpha est complètement ignoré par l'algorithme, et il n'existe pas pour l'instant d'extensions permettant ce traitement. Cependant, la vectorisation des images pixel art contenant un canal alpha donne un résultat similaire à celle des images reconnues par Kopf-Lischinski. - + @@ -698,52 +698,52 @@ - + L'image ci-dessus contient un canal alpha et sa vectorisation est convenable. Si malgré tout vous trouvez ce résultat insatisfaisant et que vous pensez que la cause en est le canal alpha, contactez le gestionnaire de la bibliothèque libdepixelize (en saisissant un rapport de défaut sur la page du projet) qui se fera un plaisir d'améliorer son algorithme (ce qu'il ne peut pas faire en l'absence de retour sur d'éventuelles images donnant un mauvais résultat). - + L'image ci-dessous est une capture d'écran de la boîte de dialogue Vectoriser du pixel art que vous pouvez ouvrir avec le menu Chemin > Vectoriser du pixel art… ou en cliquant avec le bouton droit de la souris sur une image puis en sélectionnant l'entrée Vectoriser du pixel art. - + - + La boîte de dialogue propose deux sections : Heuristique et Résultat. Heuristique cible les usages avancés, mais comme les paramètres par défaut sont bien choisis vous ne devriez pas avoir besoin d'y toucher. Nous y reviendrons plus tard après avoir abordé la section Résultat. - + L'algorithme Kopf-Lischinski fonctionne (en nous plaçant à un haut niveau) comme un compilateur convertissant les données parmi plusieurs types de représentations. À chaque étape, l'algorithme a le choix d'explorer les opérations que cette représentation propose. Certaines de ces représentations intermédiaires ont un aspect visuel correct (comme une cellule remodelée dans un graphe de Voronoï), d'autres pas (comme un graphe de similitude). Pendant le développement de libdepixelize, les utilisateurs n'ont eu de cesse de demander à ce qu'il soit possible d'exporter ces étapes intermédiaires à partir de la bibliothèque, et l'auteur original a exaucé leurs vœux. - + Le paramétrage par défaut devrait donner le résultat le plus lisse possible, ce qui est probablement l'effet désiré. Vous avez déjà vu ce type de résultat dans le premier exemple de ce tutoriel. Pour l'expérimenter vous-même, ouvrez la boîte de dialogue Vectoriser du pixel art et cliquez sur Valider après avoir sélectionné une image. - + Le résultat de type Voronoï ci-dessous est une image de pixels remodelée, dans laquelle les cellules (précédemment des pixels) ont été remodelées pour connecter les pixels faisant partie d'une même fonction. Aucune courbe n'est créée et l'image est toujours composée de lignes droites. La différence peut être observée en agrandissant l'image. Précédemment, les pixels ne pouvaient pas partager de bord avec un voisin en diagonale, même si il ce voisin faisait partie de la même fonction. Mais maintenant (grâce à un graphe de similitude de couleur et l'heuristique que vous pouvez ajuster pour obtenir un meilleur résultat), il est possible de faire en sorte que deux cellules diagonales partagent un bord (auparavant seul un sommet pouvait être partagé entre deux voisins de ce type). - + @@ -15084,42 +15084,42 @@ - + La conversion B-spline standard apporte un résultat plus doux car l'image obtenue précédemment avec Voronoï est convertie en courbes de Bézier quadratiques. La conversion n'est cependant pas en 1:1 car elle nécessite un travail heuristique plus conséquent pour décider des courbes qui seront fusionnées lorsque l'algorithme atteint une jonction en T dans les couleurs visibles. Sachez qu'à cette étape, vous ne pouvez pas adapter l'heuristique. - + L'étape finale de libdepixelize (actuellement non exportable dans l'interface d'Inkscape du fait de son statut expérimental et incomplet) est l'optimisation des courbes, pour supprimer l'effet d'escalier des courbes B-spline. Cette étape effectue également une détection de bord pour empêcher certaines fonctions d'être lissées ainsi qu'une triangulation pour ajuster la position des nœuds après l'optimisation. Il devrait être possible de désactiver chacune de ces fonctionnalités une fois qu'elles auront quitté leur statut expérimental dans la bibliothèque (bientôt, avec un peu de chance). - + La section Heuristique de l'interface vous permet d'ajuster l'heuristique utilisée par libdepixelize pour décider, lorsqu'elle rencontre un bloc de 2×2 pixels ayant deux diagonales de couleurs similaires, de la connexion à conserver. L'algorithme essaie d'appliquer l'heuristique aux diagonales en conflit puis conserve la connexion du vainqueur. En cas d'égalité, les deux connexions sont supprimées. - + Si vous souhaitez analyser l'effet de chaque heuristique et jouer avec le paramétrage, le meilleur résultat est obtenu avec un diagramme de Voronoï, qui vous permettra de visualiser facilement le rendu engendré par les valeurs choisies. Une fois satisfait de vos paramètres, vous pouvez modifier le type de résultat à votre convenance. - + L'exemple ci-dessous montre une image et sa sortie B-spline avec seulement une des heuristiques activée à chaque essai. Les différences apportées par chaque heuristique sont mises en valeur par un cercle violet. - + @@ -15500,72 +15500,72 @@ - + Au premier essai (image du haut), nous avons seulement activé l'heuristique Courbes. Cette heuristique tente de conserver les longues courbes connectées. Notez qu'un résultat identique est obtenu avec la dernière image, qui utilise pour sa part l'heuristique Pixels clairsemés. Une différence vient du fait que sa force est plus modérée et qu'elle ne donne de fortes valeurs à son vote que si la conservation des connexions est vraiment importante. La définition de modéré est ici basée sur l'intuition humaine, vue la base de pixels analysée. Une autre différence est que cette heuristique ne peut pas prendre de décision lorsque les connexions assemblent de grands blocs plutôt que des longues courbes (imaginez un jeu d'échecs). - + Le deuxième essai (image du milieu) active seulement l'heuristique Îles. Sa seule action consiste à tenter de conserver la connexion entre plusieurs pixels autrement isolés (îles) avec un vote de poids constant. Ce type de situation n'est pas aussi courant que ceux traités par les autres heuristiques, mais cette heuristique amène tout de même une amélioration. - + Pour le troisième essai (image du bas), nous avons activé l'heuristique Pixels clairsemés. Cette heuristique tente de converser les courbes avec une couleur de premier plan connectées. Pour déterminer cette couleur, l'heuristique analyse une fenêtre contenant les pixels voisins de la courbe conflictuelle. Vous pouvez ainsi non seulement ajuster sa force, mais également la taille de la fenêtre de pixels à analyser. Gardez à l'esprit que l'augmentation de cette fenêtre augmente aussi la force du vote, et qu'il sera peut-être nécessaire de rééquilibrer en modifiant le multiplicateur. L'auteur original de libdepixelize estime cette heuristique trop gourmande et conseille une valeur de 0,25 pour le multiplicateur. - + Même si les heuristiques Courbes et Pixels clairsemés donnent des résultats similaires, il peut être judicieux de les conserver toutes les deux actives pour s'assurer que des pixels nécessaires aux courbes de contour ne seront pas supprimés. Par ailleurs, l'heuristique Pixels clairsemés est dans certains cas la seule solution possible. - + Astuce : vous pouvez désactiver l'heuristique en positionnant ses valeurs de multiplicateur et de poids à zéro. Vous pouvez faire en sorte que l'heuristique fonctionne à l'encontre de ses principes en utilisant des valeurs négatives pour ces mêmes paramètres. Mais pourquoi donc dégrader la qualité de l'image avec un tel choix ? Et bien, parce que c'est possible, ou parce que vous pourriez vouloir un résultat « artistique ». Quoi qu'il en soit, vous le pouvez, c'est tout. - + Et voilà ! Nous avons fait le tour de toutes les options disponibles avec la version initiale de libdepixelize. Mais si les recherches de l'auteur de cette bibliothèque et de son mentor réussissent, vous pourriez bien recevoir dans le futur de nouvelles options pour élargir le champ des images pour lesquelles le résultat est satisfaisant. Souhaitons-leur bonne chance ! - + Les images utilisées dans ce tutoriel sont issues du concours Liberated Pixel Cup (pour éviter tout problème de droit). Les liens sont les suivants : - - + + http://opengameart.org/content/memento - - + + http://opengameart.org/content/rpg-enemies-bathroom-tiles - + diff --git a/share/tutorials/tutorial-tracing.fr.svg b/share/tutorials/tutorial-tracing.fr.svg index 4164c792b..49accc44c 100644 --- a/share/tutorials/tutorial-tracing.fr.svg +++ b/share/tutorials/tutorial-tracing.fr.svg @@ -40,160 +40,160 @@ - - ::VECTORISATION + + ::VECTORISER UNE IMAGE MATRICIELLE - + Inkscape permet de vectoriser des images matricielles, pour en faire un <chemin> inséré dans votre dessin SVG. Ce didacticiel devrait vous aider à comprendre le fonctionnement de cet outil. - + À l'heure actuelle, Inkscape utilise le moteur de vectorisation de bitmap Potrace (potrace.sourceforge.net) créé par Peter Selinger. Dans le futur, nous espérons permettre l'utilisation d'autres programmes/moteurs de vectorisation ; pour le moment, cependant, cet excellent outil est plus que suffisant pour nos besoins. - + Gardez à l'esprit que le but de la vectorisation avec cet outil n'est pas de produire une duplication exacte de l'image originale, ni de produire un résultat finalisé. Aucun outil de vectorisation automatique ne peut produire cela. Vous obtiendrez un ensemble de courbes que vous pourrez utiliser comme ressources dans votre dessin. - + Potrace interprète une image matricielle en noir et blanc, et produit un ensemble de courbes. Nous avons trois types de filtres d'entrée pour Potrace, afin de convertir les images brutes en quelque chose que Potrace peut exploiter. - + En général, plus il y a de pixels sombres dans l'image intermédiaire, plus la vectorisation générée par Potrace sera importante. Plus la vectorisation est importante, et plus le temps du processus sera grand et plus le chemin résultant sera important. Nous vous suggérons d'expérimenter cela avec des images intermédiaires plutôt claires, en les assombrissant autant que nécessaire afin d'obtenir les taille et complexité désirées pour le chemin résultant. - + Pour utiliser l'outil de vectorisation, ouvrez ou importez une image, sélectionnez-la, et lancez la commande Chemin > Vectoriser le bitmap ou appuyez sur Maj+Alt+B. - Options principales de vectorisation - - + Options principales de vectorisation + + Vous voyez trois options de filtrage disponibles : - - + + Seuil de luminosité - + Cette option utilise simplement la somme des composantes rouge, bleue et verte (ou la nuance de gris) d'un pixel pour déterminer s'il doit être considéré comme blanc ou noir. Le seuil peut être réglé entre 0,0 (noir) et 1,0 (blanc). Plus ce seuil est grand, moins les pixels considérés comme « blancs » seront nombreux et plus l'image intermédiaire sera sombre. - Image originale - Seuil de luminositéRempli, sans contour - Seuil de luminositéContour, non rempli - - - - - + Image originale + Seuil de luminositéRempli, sans contour + Seuil de luminositéContour, non rempli + + + + + Détection de contour - + Cette option utilise l'algorithme de détection des arêtes énoncé par J. Canny, afin de trouver rapidement des isoclines de contraste similaire. Cela produit une image intermédiaire qui ressemble moins à l'image originale que le résultat d'un seuil de luminosité mais qui contient souvent des courbes qui seraient ignorées autrement. Le seuil à régler ici (de 0,0 à 1,0) ajuste le seuil de luminosité afin de déterminer si un pixel adjacent à une courbe de contraste doit être inclus dans le résultat. Le réglage permet d'ajuster l'obscurité ou l'épaisseur des arêtes du résultat. - Image originale - Arêtes détectéesRempli, sans contour - Arêtes détectéesContour, non rempli - - - - - + Image originale + Arêtes détectéesRempli, sans contour + Arêtes détectéesContour, non rempli + + + + + Quantification des couleurs - + Le résultat de ce filtre produira une image intermédiaire très différente de celle produite avec les deux autres, mais pouvant être aussi très utile. Au lieu de chercher les isoclines de contraste ou de luminosité, il cherche les limites des changements de couleur, même à contraste ou luminosité constants. Le réglage ici, nombre de couleurs, permet de déterminer le nombre de couleurs que l'image intermédiaire devrait avoir si elle était en couleurs. Il exécute ensuite la détermination blanc/noir d'après l'indice pair ou impair des couleurs. - Image originale - Quantification (12 coul.)Rempli, sans contour - Quantification (12 coul.)Contour, non rempli - - - - + Image originale + Quantification (12 coul.)Rempli, sans contour + Quantification (12 coul.)Contour, non rempli + + + + Vous devriez essayer ces trois filtres et observer les résultats différents qu'ils produisent pour différents types d'images. Pour une image donnée, il y en aura un qui donnera de meilleurs résultats que les autres. - + Après la vectorisation, vous devriez essayer d'appliquer la commande Chemin > Simplifier (Ctrl+L) au chemin résultant, afin de diminuer le nombre de nœuds. Cela peut rendre l'édition du résultat de Potrace bien plus facile. Par exemple, voici un exemple typique de vectorisation du « Vieil homme jouant de la guitare » : - Image originale - Image vectorisée / Chemin résultant(1 551 nœuds) - - - + Image originale + Image vectorisée / Chemin résultant(1 551 nœuds) + + + Notez le très grand nombre de nœuds du chemin. Après avoir appuyé sur Ctrl+L, voici un résultat typique : - Image originale - Image vectorisée / Chemin résultant — Simplifié(384 nœuds) - - - + Image originale + Image vectorisée / Chemin résultant — Simplifié(384 nœuds) + + + La représentation est un peu plus approximative et grossière, mais le dessin est plus simple et plus facile à éditer. Gardez à l'esprit que ce que vous devez obtenir n'est pas un rendu exact de l'image mais un ensemble de courbes que vous pourrez utiliser dans votre dessin. - + -- cgit v1.2.3 From c45db7894c277c306d827e353cbf46cafcf14d21 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Mon, 6 Jun 2016 09:09:23 +0200 Subject: [Bug #1588983] Finish up German tutorials for 0.92. Fixed bugs: - https://launchpad.net/bugs/1588983 (bzr r14957) --- share/tutorials/tutorial-advanced.de.svg | 2 +- share/tutorials/tutorial-basic.de.svg | 480 +++++++++++++++---------------- share/tutorials/tutorial-shapes.de.svg | 16 +- share/tutorials/tutorial-tips.de.svg | 372 ++++++++++++------------ 4 files changed, 435 insertions(+), 435 deletions(-) diff --git a/share/tutorials/tutorial-advanced.de.svg b/share/tutorials/tutorial-advanced.de.svg index beff5e51e..4137908eb 100644 --- a/share/tutorials/tutorial-advanced.de.svg +++ b/share/tutorials/tutorial-advanced.de.svg @@ -341,7 +341,7 @@ Bulia Byak (buliabyak@users.sf.net) und Josh Andler (scislac@users.sf.net) - Wählen Sie das rote Objekt und bearbeiten Sie seine Knoten. Sehen Sie, wie sich beide verbundene Versätze anpassen? Jetzt wählen Sie einen Versatz und ziehen an seinem Anfasser, um den Versatzabstand anzupassen. Beobachten Sie, wie ein Verschieben des Ursprungspfades alle seine verbundenen Versatzobjekte bewegt, und wie Sie die Versatzobjekte unabhängig bewegen oder verändern können, ohne dass sie ihre Verbindung zum Ursprungspfad verlieren. + Wählen Sie das rote Objekt und bearbeiten Sie es mit dem Knotenwerkzeug. Achten Sie dabei darauf, wie sich die beiden verbundene Versatzobjekte verhalten. Jetzt wählen Sie ein Versatzobjekt aus und ziehen an seinem Anfasser, um den Versatzabstand anzupassen. Beachten Sie, dass Sie die Versatzobjekte unabhängig bewegen oder verändern können, ohne dass sie ihre Verbindung zum Ursprungspfad verlieren. diff --git a/share/tutorials/tutorial-basic.de.svg b/share/tutorials/tutorial-basic.de.svg index fc7299de9..56dce768c 100644 --- a/share/tutorials/tutorial-basic.de.svg +++ b/share/tutorials/tutorial-basic.de.svg @@ -110,36 +110,36 @@ - Um ein neues, leeres Dokument zu erzeugen, benutzt man Datei > Neu > Standard oder drückt Strg+N. Um ein neues Dokument aus einer der vielen verfügbaren Vorlagen für Inkscape zu erstellen, verwendet man Datei > Neu > Vorlagen... oder drückt Strg+Alt+N + Um ein neues, leeres Dokument zu erzeugen, benutzt man Datei > Neu oder drückt Strg+N. Um ein neues Dokument aus einer der vielen verfügbaren Vorlagen für Inkscape zu erstellen, verwendet man Datei > Neu aus Vorlage oder drückt Strg+Alt+N. - + - + Ein bestehendes SVG-Dokument öffnet man mit Datei > Öffnen... (Strg+O). Zum Speichern wählt man Datei > Speichern (Strg+S), oder Speichern unter… (Umschalt+Strg+S), um das Dokument unter einem neuen Namen zu speichern (Inkscape kann gelegentlich noch abstürzen, daher besser öfter speichern!). - + - + Inkscape verwendet das SVG-Format (Scalable Vector Graphics) für seine Dateien. SVG ist ein offener Standard, der von vielen Zeichenprogrammen unterstützt wird. SVG-Dateien basieren auf dem XML-Standard und können mit jedem Text- oder XML-Editor (zusätzlich zu dem in Inkscape, natürlich) verändert werden. Neben SVG kann Inkscape auch einige andere Formate importieren und exportieren (z. B. EPS und PNG). - + - + Inkscape öffnet ein separates Programmfenster für jedes einzelne Dokument. Man kann mit dem Fenster-Manager dazwischen wechseln (z. B. durch Alt+Tab) oder auch mit dem Inkscape-eigenen Kurzbefehl Strg+Tab, der durch alle geöffneten Dokument-Fenster wandert (erstellen Sie jetzt ein neues Dokument und schalten Sie zur Übung zwischen diesem und dem Tutorial hin und her). Hinweis: Inkscape behandelt diese Fenster wie Reiter in einem Webbrowser. Das bedeutet, dass der Kurzbefehl Formen erstellen - + - + Nun ist es Zeit, ein paar schicke Formen zu erstellen! Klicken Sie auf das Rechteckwerkzeug in der Werkzeugleiste links (oder drücken Sie F4) und klicken und ziehen Sie, entweder in einem neuen, leeren Dokument oder gleich hier: @@ -154,10 +154,10 @@ - + - + Wie Sie sehen können, sind Standard-Rechtecke blau gefüllt, mit einer schwarzen Kontur (der Umrandung), und vollständig deckend. Wir werden noch sehen, wie man das ändern kann. Mit anderen Werkzeugen lassen sich auch Ellipsen, Sterne und Spiralen erstellen: @@ -177,173 +177,173 @@ - + - + Diese Werkzeuge werden unter dem Begriff Form-Werkzeuge zusammengefasst. Jede erzeugte Form zeigt einen oder mehrere rautenförmige Anfasser. Ziehen Sie mit der Maus daran, um zu sehen wie sich die Form dadurch verändert. Die Werkzeugeinstellungsleiste für Formen bietet ebenfalls die Möglichkeit, die Form zu verändern. Die Einstellungen verändern die aktuell ausgewählten Objekte (die, die die entsprechenden Anfasser haben) und setzt den Standard für alle neuen Objekte. - + - + Um die letzte Aktion rückgängig zu machen, drückt man Strg+Z. (Oder, wenn Sie es sich wieder anders überlegen, benutzen Sie Wiederherstellen durch Umschalt+Strg+Z.) Bewegen, Größe ändern, Drehen - + - + Das am häufigsten verwendete Werkzeug in Inkscape ist das Auswahlwerkzeug. Klicken Sie den obersten Knopf (mit dem Pfeil) in der Werkzeugleiste, oder drücken Sie F1 oder Leertaste. Nun können Sie jedes Objekt auf der Seite auswählen. Probieren Sie das an dem Rechteck unten. - + - + Sie sehen jetzt acht pfeilförmige Anfasser um das markierte Objekt. Jetzt haben Sie mehrere Möglichkeiten: - + - + Verschieben des Objekts durch Ziehen mit gedrückter linker Maustaste. (Drücken Sie Strg, um die Bewegung auf horizontale oder vertikale Richtung zu beschränken.) - + - + Ändern Sie die Größe des Objektes durch Klicken und Ziehen an einem Anfasser. (Drücken Sie Strg zum Beibehalten des Seitenverhältnisses.) - + - + Nun klicken Sie noch einmal auf das Rechteck. Die Anfasser sehen jetzt anders aus. Jetzt gibt es folgende Möglichkeiten: - + - + Drehen des Objektes durch Klicken und Ziehen an den Eck-Anfassern. (Zum stufenweisen Drehen in Schritten von 15° halten Sie Strg gedrückt. Verschieben Sie das Kreuz, um den Drehmittelpunkt festzulegen.) - + - + Scheren Sie das Objekt durch Klicken und Ziehen an den Anfassern an den Längsseiten. (Drücken Sie Strg zum stufenweisen Scheren in Schritten von 15°.) - + - + Wenn man das Auswahlwerkzeug verwendet und das Objekt ausgewählt ist, kann man auch die Eingabefelder (über der Zeichenfläche) benutzen, um genaue Werte für die Koordinaten (X und Y) und die Größe (B und H) einzugeben. Verändern mit der Tastatur - + - + Eine der Eigenschaften von Inkscape, die es von vielen anderen Vektorzeichenprogrammen unterscheidet, ist die gute Tastaturbedienbarkeit. Es gibt fast keinen Befehl oder keine Aktion, die nicht mit der Tastatur ausführbar sind, und Objektmanipulation ist da keine Ausnahme. - + - + Man kann Objekte mit der Tastatur verschieben (Pfeil-Tasten), ihre Größe ändern (<- und >-Tasten) und sie drehen ([- und ]-Tasten). Die Standardschrittweite für Bewegung und Größenänderung mit der Tastatur ist 2 px, mit Umschalt das Zehnfache davon. Strg+< und Strg+> vergrößern auf 200% oder verkleinern auf 50% der Originalgröße. Standardmäßig werden Objekte in Schritten von 15° gedreht, mit gedrückter Strg-Taste in 90°-Schritten. - + - + Besonders nützlich sind pixelgenaue Manipulationen durch gleichzeitiges Drücken von Alt mit den entsprechenden Tasten. Mit Alt+Pfeiltaste verschiebt man das markierte Objekt um 1 Pixel bei gewähltem Zoomfaktor (also 1 Bildschirm-Pixel, nicht zu verwechseln mit der px-Einheit, welche eine SVG-Längeneinheit unabhängig vom Zoomfaktor ist). Das bedeutet, wenn man hineinzoomt, dann entspricht ein einmaliger Druck auf Alt+Pfeil einer kleineren absoluten Bewegung, obwohl es auf dem Bildschirm immer noch eine Bewegung um 1 Pixel ist. So ist es möglich, Objekte mit einer beliebig hohen Präzision zu positionieren, einfach indem man hinein- oder herauszoomt. - + - + Genauso ändern Alt+< und Alt+> die Objektgröße so, das die sichtbare Größe um jeweils ein Bildschirm-Pixel verändert wird. Die Tasten Alt+[ und Alt+] drehen den Punkt, der am weitesten vom Zentrum entfernt ist, um ein Bildschirm-Pixel weiter. - + - + Anmerkung: Linux-Benutzer erhalten möglicherweise nicht den gewünschten Effekt mit Alt+Pfeiltaste und ein paar anderen Tastenkombinationen, wenn ihr Fenstermanager diese Tastendrücke abfängt, bevor sie zu Inkscape gelangen. Eine Lösung ist es, die Einstellungen des Fenstermanagers entsprechend zu ändern. Mehrfachauswahl - + - + Man kann mehrere Objekte gleichzeitig durch Umschalt+Klick, oder durch Ziehen um die Objekte herum auswählen. Letzteres wird Gummibandauswahl genannt. (Das Auswahlwerkzeug erzeugt das Gummiband durch Ziehen über einem leeren Teil der Seite, aber immer auch, wenn vor dem Ziehen Umschalt gedrückt wird.) Üben Sie das Markieren aller drei Formen hier unten: - + - + Jetzt benutzen Sie das Gummiband (durch Ziehen oder Umschalt+Ziehen), um beide Ellipsen, aber nicht das Rechteck zu markieren: - + - + Jedes einzelne Objekt einer Auswahl zeigt einen Objektrahmen – normalerweise einen gestrichelten, rechteckigen Rahmen. So kann man ganz einfach sehen, was ausgewählt ist und was nicht. Wenn man zum Beispiel beide Ellipsen und das Rechteck auswählt, dann hätte man es ohne diese Hinweise schwer zu sagen, ob die Ellipsen markiert sind oder nicht. - + - + Umschalt+Klick auf ein markiertes Objekt entfernt es aus der Auswahl. Wählen Sie alle drei Objekte oben aus, dann benutzen Sie Umschalt+Klick, um beide Ellipsen aus der Auswahl herauszunehmen und nur das Rechteck ausgewählt zu lassen. - + - + Nach einem Druck auf Esc sind keine Objekte mehr ausgewählt. Strg+A wählt dagegen alle Objekte der momentan aktivierten Ebene aus. (Wenn Sie keine weiteren Ebenen erstellt haben, entspricht das allen Objekten im Dokument). Gruppieren - + - + Mehrere Objekte können zu einer Gruppe zusammengefasst werden. Eine Gruppe verhält sich wie ein einzelnes Objekt, wenn man sie verschiebt oder mit den Anfassern verformt. Die drei Objekte unten links sind alle noch einzeln; die gleichen drei Objekte auf der rechten Seite sind gruppiert. Versuchen Sie, die Gruppe zu verschieben. @@ -355,99 +355,99 @@ - + - + Um eine Gruppe zu erzeugen, wählt man ein oder mehrere Objekte aus und drückt Strg+G. Um die Gruppierung bei einer oder mehreren Gruppen aufzuheben, markiert man diese und drückt Strg+U. Gruppierungen können selbst auch gruppiert werden, wie jedes andere Objekt auch. Solche verschachtelten Gruppierungen können beliebig tief weitergeführt werden. Einmaliges Strg+U hebt nur die oberste (letzte) Gruppierung einer ausgewählten Gruppe auf. Um alle Gruppierungen der Auswahl aufzuheben, müssen Sie Strg+U mehrfach drücken. - + - + Es ist nicht unbedingt nötig, alle Gruppierungen aufzuheben, wenn man ein Objekt in einer Gruppe bearbeiten will. Strg+Klick auf ein solches Objekt wählt es aus und erlaubt, es zu bearbeiten. Um mehrere Objekte innerhalb oder außerhalb einer Gruppe auszuwählen, drücken Sie Umschalt+Strg+Klick. Versuchen Sie, einzelne Objekte in der Gruppe (oben rechts) zu verschieben oder zu verändern, ohne die Gruppierung aufzuheben. Anschließend heben Sie die Markierung wieder auf und markieren die Gruppe normal, um zu sehen, dass die Gruppierung erhalten geblieben ist. Füllung und Kontur - + - + - Viele der Funktionen von Inkscape sind durch Dialoge verfügbar. Der wahrscheinlich einfachste Weg, einem Objekt eine Farbe zuzuweisen, ist es, den Farbfelder-Dialog im Ansicht-Menü zu öffnen (oder mittels Shift+Ctrl+W), das Objekt zu markieren, und ein Farbfeld zu wählen. Dies ändert die Füllfarbe. + Die wohl einfachste Möglichkeit, wie man ein Objekt einfärben kann, ist es auszuwählen und dann auf eines der farbigen Kästchen unterhalb der Zeichenfläche zu klicken (dies ändert die Füllfarbe). Alternativ kann der Farbmuster-Dialog vom Ansicht-Menü aus geöffnet werden (oder mittels Shift+Ctrl+W), das Objekt markiert werden, und ein Farbfeld angeklickt werden (auch dies ändert die Füllfarbe). - + - + Viel leistungsfähiger ist der Dialog »Füllung und Kontur« aus dem Objekt-Menü (Umschalt+Strg+F). Wählen Sie das Objekt unten aus und öffnen Sie den Dialog. - - + + - + Sie werden sehen, dass der Dialog drei Reiter hat: Füllung, Farbe der Kontur, und Muster der Kontur. Im Reiter »Füllung« ändert man die Füllfarbe (Innenfarbe) des markierten Objekts. Mit den Knöpfen direkt unter dem Reiter kann man die Füllungsart verändern: die Füllung ganz ausschalten (mit dem Knopf mit dem X), einfach (einfarbig) füllen, oder einen Linear- und Radialverlauf auswählen. Bei dem Objekt oben ist der Knopf »Einfache Farbe« aktiviert. - + - + Weiter unten sieht man verschiedene Farbwahlmöglichkeiten. Jede hat einen eigenen Reiter: RGB, HSL, CMYK und Farbrad. Wahrscheinlich am praktischsten ist das Farbrad, bei dem man das Dreieck verdrehen kann, um den Farbton zu wählen und dann die gewünschte Helligkeit im Dreieck auswählt. Alle Farbwähler besitzen einen Schieberegler, um den Alpha-Kanal (die Deckkraft) der Objektfarbe einzustellen. - + - + Immer, wenn Sie ein Objekt auswählen, zeigt der Farbwähler dessen aktuelle Farbe und Kontur. Bei mehr als einem markierten Objekt wird die Durchschnittsfarbe angezeigt. Üben Sie an diesen Beispielobjekten oder erzeugen Sie selbst welche: - - - - - - - - + + + + + + + + - + Mit dem Reiter »Farbe der Kontur« kann man die Kontur (Außenlinie) des Objektes entfernen, oder ihr eine beliebige Farbe und Deckkraft zuordnen: - - - - - - - - - + + + + + + + + + - + Der letzte Reiter »Muster der Kontur« dient zum Einstellen der Breite und anderer Eigenschaften der Kontur: - - - - - - - - + + + + + + + + - + Statt einer einfachen Farbe kann man auch Farbverläufe für Füllung und/oder Kontur benutzen: @@ -488,42 +488,42 @@ - - - - - - - - + + + + + + + + - + Wenn man von einer einfachen Farbe auf einen Farbverlauf umschaltet, hat der neue Farbverlauf an beiden Enden zunächst die zuvor eingestellte Farbe - an einem Ende ist diese voll deckend, am anderen komplett transparent. Schalten Sie zum Farbverlaufswerkzeug (Strg+F1), um die Verlaufs-Anfasser zu verschieben – das sind durch Linien verbundene Anfasser, mit denen man Richtung und Länge des Verlaufs einstellen kann. Wenn einer der Verlaufs-Anfasser ausgewählt ist (blau hervorgehoben), dann setzt der Dialog »Füllung und Kontur« nur die Farbe dieses einen Anfassers statt der Farbe des ganzen Objekts. - + - + Eine andere praktische Möglichkeit, die Farbe eines Objektes zu ändern, ist die Pipette (F7). Klicken Sie einfach mit der Pipette auf die Zeichnung, und die dort gewählte Farbe wird automatisch als Füllfarbe für das aktuelle Objekt benutzt. (Umschalt+Klick ändert die Farbe der Kontur.) - - Duplizieren, Ausrichten, Verteilen + + Duplizieren, Ausrichten, Verteilen - + - + Einer der häufigsten Arbeitsschritte ist das Duplizieren eines Objekts (Strg+D). Die Kopie des Objektes liegt danach direkt über dem kopierten Objekt und ist ausgewählt, so dass es sofort mit der Maus oder den Pfeiltasten verschoben werden kann. Versuchen Sie doch einmal zur Übung, Kopien des schwarzen Quadrats in einer Linie nebeneinander anzuordnen: - - + + - + Es ist gut möglich, dass Ihre Quadrate jetzt einigermaßen zufällig platziert sind. Hier hilft der Dialog »Ausrichten und Verteilen« (Strg+Umschalt+A). Wählen Sie alle Quadrate aus (mit Umschalt+Klick oder dem Gummiband), öffnen Sie dann den Dialog und drücken »Zentren horizontal ausrichten«. Danach benutzen Sie »Horizontale Abstände zwischen Objekten ausgleichen« (lesen Sie die Tooltips der Schaltflächen). Die Objekte sind jetzt gleichmäßig ausgerichtet und verteilt. Hier sind weitere Übungsmöglichkeiten für Sie: @@ -542,187 +542,187 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Z-Ordnung + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Z-Ordnung - + - + - Der Begriff Z-Ordnung beschreibt die Stapelordnung von Objekten in einer Zeichnung – d.h. welche Objekte oben liegen und dadurch andere, darunterliegende, Objekte verdecken. Die zwei Befehle im Objektmenü, »Nach ganz oben anheben« (die Pos 1-Taste) und »Nach ganz unten absenken« (die Ende-Taste), bringen das ausgewählte Objekt nach ganz oben oder ganz unten in der Z-Ordnung der aktuellen Ebene. Zwei weitere Befehle, »Anheben« (Bild hoch) und »Absenken« (Bild runter), heben oder senken das ausgewählte Objekt nur um eine Stufe; das heißt, sie bewegen das Objekt an einem einzigen, nicht ausgewählten, Objekt in der Z-Ordnung vorbei. (Dazu zählen nur Objekte, die die Auswahl überdecken. Wenn nichts die Auswahl überdeckt, dann bewirken Bild hoch und Bild runter das gleiche wie die Tasten Pos1 und Ende). + Der Begriff Z-Ordnung beschreibt die Stapelordnung von Objekten in einer Zeichnung – d.h. welche Objekte oben liegen und dadurch andere, darunterliegende, Objekte verdecken. Die zwei Befehle im Objektmenü, »Nach ganz oben anheben« (die Pos 1-Taste) und »Nach ganz unten absenken« (die Ende-Taste), bringen das ausgewählte Objekt nach ganz oben oder ganz unten in der Z-Ordnung der aktuellen Ebene. Zwei weitere Befehle, »Anheben« (Bild hoch) und »Absenken« (Bild runter), heben oder senken das ausgewählte Objekt nur um eine Stufe; das heißt, sie bewegen das Objekt an einem einzigen, nicht ausgewählten, Objekt in der Z-Ordnung vorbei. (Dazu zählen nur Objekte, die mit ihrem Begrenzungsrahmen die Auswahl überdecken). - + - + Üben Sie diese Befehle, indem Sie die Z-Ordnung der Objekte unten umkehren, so dass am Ende die ganz linke Ellipse oben und die ganz rechte Ellipse unten liegt: - - - - - - - + + + + + + + - + Eine sehr nützliche Auswahlhilfe ist die Tab-Taste. Wenn nichts ausgewählt ist, dann wählt sie das unterste Objekt; andernfalls wählt sie das Objekt über den markierten Objekten in Z-Ordnung. Umschalt+Tab arbeitet genau anders herum – man beginnt beim obersten Objekt und arbeitet sich dann nach unten. Objekte, die man neu erzeugt, liegen zuoberst auf dem Stapel, und so wählt Umschalt+Tab praktischerweise das zuletzt erzeugte Objekt, solange nichts anderes markiert ist. Üben Sie Tab und Umschalt+Tab ein wenig an dem Stapel Ellipsen oben. - - Verdeckte Objekte auswählen und verschieben + + Verdeckte Objekte auswählen und verschieben - + - + Wie kommt man an ein Objekt heran, das von einem anderen verdeckt wird? Es kann sein, das man das untere Objekt zwar sehen kann, wenn das obere Objekt (teilweise) durchsichtig ist. Doch bei dem Versuch, es auszuwählen, markiert man das obere Objekt und nicht das, das man haben möchte. - + - + Dafür gibt es Alt+Klick. Mit dem ersten Alt+Klick wählt man das oberste Objekt, genau wie mit einem gewöhnlichen Klick. Das nächste Mal Alt+Klick an der gleichen Stelle wählt jedoch das Objekt unter dem obersten; dann das nächste darunter, noch eines tiefer u.s.w. Auf diese Weise kommt man durch mehrere Alt+Klicks nacheinander von ganz oben nach ganz unten, durch den ganzen Z-Ordnungsstapel von Objekten an der Stelle des Klicks. Wenn das unterste Objekt erreicht ist, wird durch das nächste Alt+Klick natürlich wieder das oberste Objekt markiert. - + - + [Wenn Sie unter Linux arbeiten, dann könnte es sein, dass Alt+Klick nicht korrekt funktioniert und stattdessen z.B. das ganze Inkscape-Fenster verschiebt. Dies passiert, wenn Ihr Fenstermanager Alt+Klick für eine andere Aktion reserviert hat. Sie können in diesem Fall im Einstellungsdialog für Ihren Fenstermanager das Fensterverhalten anders einstellen, indem Sie die Aktion für diese Tastenkombination abschalten, oder sie auf die Meta-Taste (meist gleichbedeutend mit der Windows-Taste) umstellen. Dies erlaubt es Inkscape und anderen Anwendungen, die Alt-Taste frei zu verwenden.] - + - + Das ist zwar schön, aber was kann man mit einem markierten und verdeckten Objekt anfangen? Man kann es durch Tastaturbefehle verändern, und man kann die Anfasser benutzen. Aber beim Versuch, das Objekt selbst mit der Maus zu verschieben, wird automatisch wieder das oberste Objekt markiert. (So funktioniert »Klicken und Ziehen« nunmal – es wählt das (oberste) Objekt unter dem Mauszeiger, dann verschiebt es das gewählte Objekt). Um Inkscape mitzuteilen, das man das gerade gewählte Objekt verschieben will, und nicht etwa ein anderes auswählen möchte, benutzt man Alt+Ziehen. Das verschiebt das aktuell markierte Objekt, egal wo man mit der Maus hinklickt. - + - + Üben Sie Alt+Klick und Alt+Ziehen an den zwei braunen Objekten unter dem transparent-grünen Rechteck: - - - - - Ähnliche Objekte auswählen + + + + + Ähnliche Objekte auswählen - + - + Inkscape kann Objekte auswählen, die dem aktuell gewählten Objekt ähneln. Wenn man z.B. alle blauen Quadrate unten auswählen möchte, kann man einfach eines davon auswählen, und dann über das Menü Bearbeiten > Das Gleiche auswählen > Füllfarbe verwenden. Alle Objekte mit derselben blauen Füllfarbe sind nun ausgewählt. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Man kann ähnliche Objekte nicht nur nach deren Füllfarbe, sondern auch nach Konturfarbe, Konturstil, Füllung und Kontur zusammen und nach Objekttyp auswählen. - - Schlusswort + + Schlusswort - + - + Dies ist das Ende des Grundlagen-Tutorials. Das waren längst noch nicht alle Funktionen in Inkscape, aber mit den hier vermittelten Techniken können Sie schon einfache, aber nützliche Grafiken erstellen. Um kompliziertere Techniken zu erlernen, schauen Sie sich das Tutorial »Inkscape: Fortgeschrittene Benutzung« und die anderen Tutorials in Hilfe > Einführungen an. - + diff --git a/share/tutorials/tutorial-shapes.de.svg b/share/tutorials/tutorial-shapes.de.svg index 90de85b93..5ba8912e7 100644 --- a/share/tutorials/tutorial-shapes.de.svg +++ b/share/tutorials/tutorial-shapes.de.svg @@ -473,8 +473,8 @@ - - Ellipsen + + Ellipsen @@ -622,8 +622,8 @@ - - Sterne + + Sterne @@ -909,8 +909,8 @@ - - Spiralen + + Spiralen @@ -1049,8 +1049,8 @@ - - Fazit + + Fazit diff --git a/share/tutorials/tutorial-tips.de.svg b/share/tutorials/tutorial-tips.de.svg index 0aa3ac5d7..58ea7df92 100644 --- a/share/tutorials/tutorial-tips.de.svg +++ b/share/tutorials/tutorial-tips.de.svg @@ -58,14 +58,14 @@ - Es ist einfach zu verstehen, wie der Dialog Gekachelte Klone erzeugen für rechteckige Gitter und Muster funktioniert. Aber was tun, wenn Sie eine radiale Ausrichtung benötigen, wobei die Objekte ein gemeinsames Rotationszentrum besitzen? Das ist jedoch auch möglich! + Es ist einfach zu verstehen, wie der Dialog Gekachelte Klone erzeugen für gitterförmige Anordnungen und Muster funktioniert. Aber was tun, wenn Sie eine radiale Ausrichtung benötigen, wobei die Objekte ein gemeinsames Rotationszentrum besitzen? Das ist natürlichauch möglich! - Wenn Ihr kreisförmiges Muster nur 3, 4, 6, 8 oder 12 Elemente benötigt, können Sie die P3-, P31M-, P3M1-, P4-, P4M-, P6- oder P6M-Symmetrien benutzen. Diese würden zum Beispiel sehr schön für Schneeflocken und ähnliche Dinge funktionieren. Eine allgemeinere Methode funktioniert jedoch wie folgt: + Wenn Ihr kreisförmiges Muster nur 3, 4, 6, 8 oder 12 Elemente benötigt, können Sie die P3-, P31M-, P3M1-, P4-, P4M-, P6- oder P6M-Symmetrien benutzen. Diese eignen sich zum Beispiel sehr schön für Schneeflocken und ähnliche Objekte. Eine allgemeinere Methode funktioniert jedoch wie folgt: @@ -203,123 +203,123 @@ - In den obigen Beispielen wurde die Linie um ihr Zentrum herum rotiert. Aber was tun, wenn Sie das Drehzentrum außerhalb Ihres Objektes liegen haben möchten? Erzeugen Sie einfach ein unsichtbares Rechteck (ohne Füllung und ohne Umrisslinie), welches Ihr Objekt umfasst, und dessen Zentrum an dem von Ihnen gewünschten Drehzentrum liegt. Dann gruppieren Sie Ihr Objekt und das Rechteck und benutzen Sie den Dialog Klone kacheln... auf diese Gruppe. Auf diese Art können Sie nette »Explosionen« erzeugen, wenn Sie in die Skalierung, Rotation und Deckkraft noch ein wenig Zufall hineinbringen: + In den obigen Beispielen wurde die Linie um ihr Zentrum herum rotiert. Aber was tun, wenn Sie das Drehzentrum außerhalb Ihres Objektes liegen haben möchten? Klicken Sie einfach langsam zweimal mit dem Auswahlwerkzeug auf das Objekt, um in den Drehmodus zu wechseln. Jetzt verschieben Sie das Rotationszentrum des Objektes (dargestellt durch einen kleinen, kreuzförmigen Anfasser) an den Punkt der das Zentrum für die Drehung bei der Erzeugung gekachelter Klone sein soll. Dann benutzen Sie den Dialog Gekachelte Klone... mit diesem Objekt. Auf diese Art können Sie nette »Explosionen« erzeugen, wenn Sie in die Skalierung, Rotation und Deckkraft noch ein wenig Zufall hineinbringen: - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Wie erzeugt man Scheibchen (mehrere rechteckige Exportflächen)? + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Wie erzeugt man Scheibchen (mehrere rechteckige Exportflächen)? - + Erzeugen Sie eine neue Ebene, in der Sie unsichtbare Rechtecke zeichnen, die Teile Ihrer Zeichnung bedecken. Vergewissern Sie sich, dass Ihr Dokument Pixel als Einheiten benutzt (was die Standardeinstellung ist), schalten Sie das Raster an und lassen die Rechtecke am Raster einrasten. Jedes Rechteck sollte eine ganzzahlige Länge und Breite in Pixel besitzen. Geben Sie den Rechtecken sinnvolle Kennungen (IDs) und exportieren Sie jedes Rechteck in eine eigene Datei (Datei > PNG-Bild exportieren oder Umschalt+Strg+E). Nun werden die Rechtecke ihre Export-Dateinamen behalten. Ab jetzt ist es sehr einfach, einzelne Rechtecke neu zu exportieren: Schalten Sie zur Export-Ebene um, benutzen Sie die Tabulator-Taste, um das Rechteck auszuwählen, welches Sie benötigen (oder benutzen Sie die »Suche«-Funktion) und exportieren Sie es erneut. Wenn Sie den Vorgang noch weiter automatisieren wollen, können Sie ein Shellskript oder eine Batchdatei schreiben, um alle Ihre Rechtecke zu exportieren. Das Kommando dazu sieht für jedes Rechteck wie folgt aus: - + inkscape -i ID_des_Rechtecks -t dateiname.svg - + Das Argument »-t« weist Inkscape an, den gespeicherten Dateinamen zu verwenden. Sie können aber auch einen Dateinamen für den Export angeben, wenn sie im Befehl den Parameter »-e« benutzen. Alternativ können Sie auch die Erweiterungen Erweiterungen > Internet > Schneider oder auch Erweiterungen > Exportieren > Guillotine verwenden, um ähnliche Ergebnisse zu erzielen. - - Nichtlineare Verläufe + + Nichtlineare Verläufe - + Die Version 1.1 von SVG unterstützt keine nichtlinearen Verläufe, das bedeutet, es lassen sich keine Verläufe erzeugen, die nichtlineare Übergänge zwischen den Farben besitzen. Sie können solche Verläufe aber annähern, indem Sie Verläufe mit mehreren Stopps (Verlaufsschritten) verwenden. - + - Als Beispiel soll ein einfacher Verlauf mit zwei Stopps dienen. Öffnen Sie den Farbverlaufs-Editor (zum Beispiel indem Sie auf einen der Anfasser für den Verlauf doppelklicken). Fügen Sie einen neuen Verlaufsschritt in der Mitte hinzu und ziehen Sie ihn ein wenig. Fügen Sie weitere Verlaufsschritte vor und nach dem mittleren Schritt und ziehen Sie sie auch ein wenig, sodass der Verlauf gleichmäßig wirkt. Je mehr Schritte sie hinzufügen, desto gleichmäßiger wird der entstehende Verlauf. So sieht der anfängliche Schwarz-Weiß-Verlauf mit zwei Schritten aus: + Als Beispiel soll ein einfacher Verlauf mit zwei Farben dienen (diesen können Sie entweder über den Füllung-und-Kontur-Dialog zuweisen oder mit dem Verlaufswerkzeug erzeugen). Jetzt fügen Sie mit dem Verlaufswerkzeug eine neue Farbe in der Mitte hinzu; entweder, indem Sie auf die Verlaufslinie doppelklicken, oder indem sie den quadratischen Anfasser auswählen und oben in der Werkzeugleiste des Verlaufswerkzeuges auf die Schaltfläche Zwischenfarbe einfügen klicken.Ziehen Sie ein wenig an dem neuen Anfasser. Fügen Sie weitere Verlaufsschritte vor und nach dem mittleren Schritt ein und verschieben Sie auch diese ein wenig, sodass der Verlauf gleichmäßig wirkt. Je mehr Schritte Sie hinzufügen, desto gleichmäßiger wird der entstehende Verlauf. So sieht danach der anfängliche Schwarz-Weiß-Verlauf mit den zwei Schritten aus: @@ -327,11 +327,11 @@ - - + + - + Und hier sehen Sie einige nichtlineare, mehrschrittige Verläufe (Sie können Sie im Farbverlaufs-Editor untersuchen): @@ -416,21 +416,21 @@ - - - - - - - - - - Asymmetrische radiale Verläufe + + + + + + + + + + Asymmetrische radiale Verläufe - + - + Radiale Verläufe müssen nicht immer symmetrisch sein. Sie können im Farbverlaufswerkzeug am mittleren Anfasser eines kreisförmigen Farbverlaufs zusammen mit der Umschalttaste ziehen. Dadurch wird der X-förmige Fokus-Anfasser des Farbverlaufs von seinem Zentrum wegbewegt. Wenn Sie ihn nicht benötigen, können Sie den Fokus zurückstellen, indem Sie ihn nahe ans Zentrum ziehen. @@ -444,216 +444,216 @@ - - - - An der Seitenmitte ausrichten + + + + An der Seitenmitte ausrichten - + - + Um etwas an der Seitenmitte oder am Rand einer Seite auszurichten, wählen Sie das Objekt oder die Gruppe aus und wählen Sie Seiteaus der mit Relativ zu: bezeichneten Liste im »Ausrichten und Verteilen«-Dialog (Strg+Umschalt+A). - - Ein Dokument aufräumen + + Ein Dokument aufräumen - + - + Viele der nicht mehr verwendeten Farbverläufe, Muster und Markierungen (genauer: diejenigen, welche von Ihnen verändert wurden) verbleiben in den zugehörigen Auswahldialogen und können für neue Objekte wiederverwendet werden. Wenn Sie jedoch Ihr Dokument »entrümpeln« wollen, benutzen Sie den Befehl Dokument säubern aus dem »Datei«-Menü. Er wird für Sie alle Farbverläufe, Muster oder Markierungen löschen, die in Ihrem Dokument von keinem Objekt verwendet werden, wodurch Ihre Datei kleiner wird. - - Versteckte Funktionen und der XML-Editor + + Versteckte Funktionen und der XML-Editor - + - + Der XML-Editor (Umschalt+Strg+X) ermöglicht Ihnen, fast alles an einem Dokument zu verändern, ohne einen externen Texteditor verwenden zu müssen. Auch unterstützt Inkscape normalerweise mehr SVG-Merkmale als von der Benutzeroberfläche aus zugänglich sind. Der XML-Editor ist ein nützliches Hilfsmittel, um an diese Funktionen heranzukommen (wenn Sie sich mit SVG auskennen). - - Maßeinheit für Lineale ändern + + Maßeinheit für Lineale ändern - + - + - In der Standardvorlage für ein neues Dokument sind die Maßeinheiten für die Lineale immer px (»SVG-Benutzereinheit«, was in Inkscape gleich 0,8pt oder 1/90 Zoll ist). Dies ist auch die Einheit, in der die Koordinaten unten links angezeigt werden, und die als Vorauswahl in allen Menüs erscheint, die Einheiten benutzen. (Sie können immer mit dem Mauszeiger über ein Lineal fahren. Ein kleines Infofenster wird Ihnen anzeigen, welche Einheit das Lineal benutzt.) Um die Standard-Einheit zu verändern, öffnen Sie die Dokumenteneinstellungen (Umschalt+Strg+D) und ändern Sie die Standard-Einheiten im Reiter Seite. + In der Standardvorlage für ein neues Dokument sind die Maßeinheiten für die Lineale immer px (»SVG-Benutzereinheit«, was in Inkscape ungefähr 0,75pt oder 1/96 Zoll ist). Dies ist auch die Einheit, in der die Koordinaten unten links angezeigt werden, und die als Vorauswahl in allen Menüs erscheint, die Einheiten benutzen. (Sie können immer mit dem Mauszeiger über ein Lineal fahren. Ein kleines Infofenster wird Ihnen anzeigen, welche Einheit das Lineal benutzt.) Um die Anzeigeeinheit zu verändern, öffnen Sie die Dokumenteneinstellungen (Umschalt+Strg+D) und ändern Sie die Anzeigeeinheit im Reiter Seite. - - Stempeln + + Stempeln - + - + Um schnell mal eben viele Kopien eines Objekts zu erzeugen, benutzen Sie die Funktion Stempeln. Verschieben Sie einfach ein Objekt (oder skalieren oder drehen Sie es), und noch während Sie die Maustaste gedrückt halten, drücken Sie die Leertaste. Auf diese Art wird ein »Stempelabdruck« des aktuellen Objekts hinterlassen. Sie können stempeln, so oft Sie wollen. - - Tricks mit dem Zeichenwerkzeug + + Tricks mit dem Zeichenwerkzeug - + - + Beim Benutzen des Zeichenwerkzeugs (Bézier) können Sie das Zeichnen einer Linie auf folgende Arten beenden: - - + + - + Drücken Sie die Eingabetaste - - + + - + Machen Sie einen Doppelklick mit der linken Maustaste - - + + - + - Wählen Sie erneut das Zeichenwerkzeug aus + Machen Sie einen Rechtsklick mit der Maus - - + + - + Wählen Sie ein anderes Werkzeug - + - + Beachten Sie, dass der Pfad noch nicht als Objekt im Dokument existiert, solange er noch nicht beendet wurde (das heißt, solange er grün angezeigt wird, und das aktuelle Segment rot). Deshalb sollten Sie entweder die Taste Esc (um den ganzen Pfad zu verwerfen) oder die Rückschritttaste (um das letzte Segment des noch nicht beendeten Pfads zu verwerfen) statt der Rückgängig-Funktion verwenden. - + - + Um einen neuen Unterpfad zu einem existierenden Pfad hinzuzufügen, wählen Sie den Pfad aus und drücken Sie die Umschalttaste, dann fangen Sie von einem beliebigen Punkt aus an, zu zeichnen. Wenn Sie jedoch einen bestehenden Pfad nur weiterführen möchten, ist der Tastendruck nicht notwendig; fangen Sie einfach an einem der Endknoten des ausgewählten Pfades mit dem Weiterzeichnen an. - - Unicode-Zeichen eingeben + + Unicode-Zeichen eingeben - + - + Während Sie mit dem Textwerkzeug arbeiten, schaltet die Tastenkombination Strg+U zwischen Unicode- und normalem Modus um. Im Unicode-Modus wird jede Gruppe von vier Hexadezimalzahlen, die Sie eingeben, zu einem einzelnen Unicode-Zeichen. Auf diese Weise können Sie beliebige Symbole erzeugen (wenn Sie den Unicode-Code dazu wissen und wenn die gewählte Schriftart sie enthält). Um den Unicode-Modus wieder zu verlassen, drücken Sie die Eingabetaste. Ein Beispiel: die Tastenfolge Strg+U 2 0 1 4 Eingabe fügt einen betonten Bindestrich (em-dash) ein (—). Um den Unicode-Modus zu verlassen, ohne irgendein Zeichen in den Text einzufügen, drücken Sie Esc. - + - + Sie können auch den Dialog unter Text > Glyphen verwenden, um bestimmte Zeichen zu suchen und in Ihr Dokument einzufügen. - - Das Seitengitter zum Zeichnen von Icons verwenden + + Das Seitengitter zum Zeichnen von Icons verwenden - + - + - Nehmen wir einmal an, Sie wollen ein 24×24 Pixel großes Icon erstellen. Erzeugen Sie dazu zunächst eine Leinwand der Größe 24×24 Pixel (benutzen Sie dazu die Dokumenteneinstellungen) und setzen Sie das Gitter auf 0,5 Pixel (ergibt 48×48 Rasterlinien). Wenn Sie nun gefüllte Objekte an geradzahligen Rasterlinien und gerahmte Objekte an ungeradzahligen Rasterlinien ausrichten, darauf achten, dass die Strichstärke eine gerade Pixelanzahl ist und Ihr Bild mit der Standardeinstellung von 90dpi exportieren (sodass aus einem Pixel ein Bitmap-Pixel wird), bekommen Sie ein schönes knackiges Bitmap-Bild ohne unerwünschtes Antialiasing. + Nehmen wir einmal an, Sie wollen ein 24×24 Pixel großes Icon erstellen. Erzeugen Sie dazu zunächst eine Leinwand der Größe 24×24 Pixel (benutzen Sie dazu die Dokumenteneinstellungen) und setzen Sie das Gitter auf 0,5 Pixel (ergibt 48×48 Rasterlinien). Wenn Sie nun gefüllte Objekte an geradzahligen Rasterlinien und gerahmte Objekte an ungeradzahligen Rasterlinien ausrichten, darauf achten, dass die Strichstärke eine gerade Pixelanzahl ist und Ihr Bild mit der Standardeinstellung von 96dpi exportieren (sodass aus einem Pixel ein Bitmap-Pixel wird), bekommen Sie ein schönes gestochen scharfes Bitmap-Bild ohne unerwünschtes Antialiasing. - - Objekte drehen + + Objekte drehen - + - + - Wenn Sie mit dem Auswahlwerkzeug arbeiten, klicken Sie einmal auf ein Objekt, um die Skalierungspfeile zu sehen. Dann klicken Sie nochmals auf das Objekt, um die Rotations- und Scherpfeile zu sehen. Wenn Sie auf die Pfeile an den Ecken klicken und sie verschieben, wird sich das Objekt um das Zentrum (welches als Fadenkreuz angezeigt wird) drehen. Wenn Sie nun noch während des Rotierens die Umschalttaste gedrückt halten, wird das Objekt um die gegenüberliegende Ecke gedreht. Sie können aber auch das Rotationszentrum auf eine beliebige Stelle verschieben. + Wenn Sie mit dem Auswahlwerkzeug arbeiten, klicken Sie einmal auf ein Objekt, um die Skalierungspfeile zu sehen. Dann klicken Sie nochmals auf das Objekt, um die Rotations- und Scherpfeile zu sehen. Wenn Sie auf die Pfeile an den Ecken klicken und sie verschieben, dreht sich das Objekt um sein Zentrum (welches als Fadenkreuz angezeigt wird). Wenn Sie nun noch während des Drehens die Umschalttaste gedrückt halten, wird das Objekt um die gegenüberliegende Ecke gedreht. Sie können aber auch das Rotationszentrum an eine beliebige andere Stelle verschieben. - + - + Oder Sie rotieren das Objekt mit Hilfe der Tastatur durch Drücken der Tasten [ und ] (um jeweils 15°) oder Strg+[ and Strg+] (um jeweils 90°). Die gleichen []-Tasten zusammen mit der Alt-Taste ermöglichen eine langsame Rotation um je einen Pixel (leider nicht mit deutscher Tastatur). - - Schattenwurf + + Schattenwurf - + - + Um schnell mal eben einen Schatten für ein Objekt zu erstellen, verwenden Sie die Funktion Filter > Schatten und Lichter > Abgesetzter Schattend>. - + - + Sie können auch ganz leicht einen unscharfen Schatten für ein Objekt erstellen, indem Sie »Unschärfe« im »Füllung und Kontur«-Dialog nutzen. Wählen Sie ein Objekt, duplizieren Sie es mit Strg+D, drücken Sie Bild runter, um es unter das originale Objekt abzusenken, und verschieben Sie es etwas nach rechts unten vom originalen Objekt. Öffnen Sie nun den Dialog »Füllung und Kontur« und ändern Sie den Weichzeichner-Wert auf z.B. 5,0. Das war es schon! - - Text auf einen Pfad platzieren + + Text auf einen Pfad platzieren - + - + Um Text an einem Pfad auszurichten, wählen Sie den Text und den Pfad zusammen aus und benutzen Sie den Befehl An Pfad ausrichten aus dem Text-Menü. Der Text wird ab dem Anfang des Pfades ausgerichtet. Normalerweise ist es besser, für den Text einen eigenen Pfad zu erstellen, als den Text an irgendeinem Zeichnungselement auszurichten – auf diese Art haben Sie mehr Kontrolle über den Text, ohne dass Sie an Ihrer eigentlichen Zeichnung herumändern müssen. - - Das Original auswählen + + Das Original auswählen - + - + Bei Text, der an einem Pfad ausgerichtet ist, einen verbundenen Versatz oder einem Klon kann es schwierig sein, das Quellobjekt oder den Quellpfad auszuwählen, weil die Quelle direkt unterhalb, unsichtbar und/oder gesperrt sein könnte. In so einem Fall hilft Ihnen die Tastenkombination Umschalt+D. Wählen Sie den Text, den verbundenen Versatz oder den Klon aus und drücken Sie Umschalt+D, um den dazugehörigen Pfad, das Quellobjekt des Versatzes oder das Original des Klons auszuwählen. - - Programmfenster außerhalb des Bildschirms + + Programmfenster außerhalb des Bildschirms - + - + Wenn Sie Dokumente auf verschiedenen Systemen bearbeiten, die entweder unterschiedliche Auflösungen besitzen oder unterschiedlich viele Bildschirme, kann es Ihnen passieren, dass Inkscape eine Fensterposition mit abgespeichert hat, welche dazu führt, dass Sie das Fenster an Ihrem Monitor nicht mehr erreichen können. In diesem Fall maximieren Sie das Fenster einfach (das bringt das Fenster wieder in Ihren Anzeigebereich; benutzen Sie die Taskleiste dazu), speichern Sie das Dokument und öffnen Sie es erneut. Sie können dieses Verhalten auch komplett abstellen, indem Sie die globale Einstellung, die Fenstergeometrie mit abzuspeichern, abschalten (in den Inkscape-Einstellungen, im Abschnitt Benutzeroberfläche > Fenster). - - Transparenz, Farbverläufe und PostScript-Export + + Transparenz, Farbverläufe und PostScript-Export - + - + - PostScript- oder EPS-Formate unterstützen keine Transparenz, deshalb sollten Sie auch keine Transparenz benutzen, wenn Sie etwas nach PS oder EPS exportieren wollen. Wenn Sie Teiltransparenz benutzen wollen, die etwas einfarbiges überdeckt, dann können Sie dieses Problem leicht lösen: Wählen Sie eines der transparenten Objekte aus, wechseln Sie zur Farbpipette (F7). Stellen Sie sicher, dass diese den »sichtbaren Farbwert ohne Transparenz« ermittelt, und klicken Sie auf Ihr Objekt. Das übernimmt die sichtbare Farbe und weist sie dem Objekt zu, aber diesmal ohne Transparenz. Wiederholen Sie diesen Schritt für alle teiltransparenten Objekte. Wenn Ihr teiltransparentes Objekt mehrere einfarbigen Flächen überdeckt, müssen Sie es entsprechend in einzelne Teile auftrennen und für jeden einzelnen Teil wie oben beschrieben vorgehen. + PostScript- oder EPS-Formate unterstützen keine Transparenz, deshalb sollten Sie auch keine Transparenz verwenden, wenn Sie etwas nach PS oder EPS exportieren wollen. Wenn Sie Teiltransparenz benutzen wollen, die etwas einfarbiges überdeckt, dann können Sie dieses Problem leicht lösen: Wählen Sie eines der transparenten Objekte aus, wechseln Sie zur Farbpipette (F7 oder d). Stellen Sie sicher, dass die Schaltfläche Deckkraft: Aufnehmen in der Werkzeugleiste der Farbpipette deaktiviert ist. Klicken Sie nun auf das Objekt. Das Werkzeug nimmt jetzt die sichtbare Farbe auf und weist sie demselben Objekt zu, aber diesmal ohne Transparenz. Wiederholen Sie diesen Schritt für alle teiltransparenten Objekte. Wenn Ihr teiltransparentes Objekt mehrere einfarbigen Flächen überdeckt, müssen Sie es entsprechend in einzelne Teile auftrennen und für jeden einzelnen Teil wie oben beschrieben vorgehen. Beachten Sie, dass die Farbpipette nicht den Deckkraft-Wert des Objektes verändert, sondern lediglich den Alpha-Wert seiner Füllung oder Kontur. Stellen Sie daher sicher, dass die Deckkraft aller Objekte auf 100% gesetzt ist, bevor Sie loslegen. - + -- cgit v1.2.3 From 9ebfb8cc2d11d95fdc97bc525a219170b6cf0fa5 Mon Sep 17 00:00:00 2001 From: firashanife Date: Tue, 7 Jun 2016 16:24:08 +0200 Subject: [Bug #1574561] Italian translation updates for 0.92.x. Fixed bugs: - https://launchpad.net/bugs/1574561 (bzr r14958) --- po/it.po | 1783 ++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 864 insertions(+), 919 deletions(-) diff --git a/po/it.po b/po/it.po index dbdcaf945..5ac892cef 100644 --- a/po/it.po +++ b/po/it.po @@ -7,13 +7,12 @@ # Luca Bruno , 2005-2009. # Firas Hanife , 2014-2016. # -#: ../src/ui/dialog/clonetiler.cpp:1010 msgid "" msgstr "" -"Project-Id-Version: Inkscape 0.91+devel\n" +"Project-Id-Version: Inkscape 0.92\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2016-06-02 12:12+0200\n" -"PO-Revision-Date: 2016-04-24 19:00+0100\n" +"POT-Creation-Date: 2016-06-06 20:00+0200\n" +"PO-Revision-Date: 2016-06-07 15:20+0100\n" "Last-Translator: Firas Hanife \n" "Language-Team: \n" "Language: it\n" @@ -36,6 +35,9 @@ msgid "" "Illustrator, CorelDraw, or Xara X, using the W3C standard Scalable Vector " "Graphics (SVG) file format." msgstr "" +"Un editor di grafiche vettoriali, con funzionalità simili a Illustrator, " +"CorelDraw o Xara X. Utilizza il formato file standard W3C Scalable Vector " +"Graphics (SVG)." #: ../inkscape.appdata.xml.in.h:4 msgid "" @@ -693,7 +695,8 @@ msgstr "Buco nero" #: ../share/filters/filters.svg.h:279 ../share/filters/filters.svg.h:835 #: ../share/filters/filters.svg.h:839 ../share/filters/filters.svg.h:843 #: ../src/extension/internal/filter/morphology.h:76 -#: ../src/extension/internal/filter/morphology.h:203 ../src/filter-enums.cpp:32 +#: ../src/extension/internal/filter/morphology.h:203 +#: ../src/filter-enums.cpp:32 msgid "Morphology" msgstr "Morfologia" @@ -3377,1037 +3380,1037 @@ msgstr "Tessuto (bitmap)" msgid "Old paint (bitmap)" msgstr "Dipinto antico (bitmap)" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:2 msgctxt "Symbol" -msgid "AIGA Symbol Signs" -msgstr "Segni simboli AIGA" +msgid "United States National Park Service Map Symbols" +msgstr "Simboli mappa parchi nazionali Stati Uniti" -#. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:3 ../share/symbols/symbols.h:4 -#: ../share/symbols/symbols.h:281 ../share/symbols/symbols.h:282 msgctxt "Symbol" -msgid "Telephone" -msgstr "Telefono" +msgid "Airport" +msgstr "Aereoporto" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:5 ../share/symbols/symbols.h:6 msgctxt "Symbol" -msgid "Mail" -msgstr "Posta" +msgid "Amphitheatre" +msgstr "Anfiteatro" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:7 ../share/symbols/symbols.h:8 msgctxt "Symbol" -msgid "Currency Exchange" -msgstr "Cambiavalute" +msgid "Bicycle Trail" +msgstr "Pista ciclabile" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:9 ../share/symbols/symbols.h:10 msgctxt "Symbol" -msgid "Currency Exchange - Euro" -msgstr "Cambiavalute - Euro" +msgid "Boat Launch" +msgstr "Rampa di alaggio barca" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:11 ../share/symbols/symbols.h:12 msgctxt "Symbol" -msgid "Cashier" -msgstr "Cassiere" +msgid "Boat Tour" +msgstr "Viaggio in barca" -#. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:13 ../share/symbols/symbols.h:14 -#: ../share/symbols/symbols.h:213 ../share/symbols/symbols.h:214 msgctxt "Symbol" -msgid "First Aid" -msgstr "Primo soccorso" +msgid "Bus Stop" +msgstr "Fermata dell'autobus" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:15 ../share/symbols/symbols.h:16 msgctxt "Symbol" -msgid "Lost and Found" -msgstr "Oggetti smarriti" +msgid "Campfire" +msgstr "Fuoco da campo" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:17 ../share/symbols/symbols.h:18 msgctxt "Symbol" -msgid "Coat Check" -msgstr "Guardaroba" +msgid "Campground" +msgstr "Campeggio" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:19 ../share/symbols/symbols.h:20 msgctxt "Symbol" -msgid "Baggage Lockers" -msgstr "Armadietti per bagaglio" +msgid "CanoeAccess" +msgstr "Accesso canoa" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:21 ../share/symbols/symbols.h:22 msgctxt "Symbol" -msgid "Escalator" -msgstr "Scala mobile" +msgid "Crosscountry Ski Trail" +msgstr "Pista di sci di fondo" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:23 ../share/symbols/symbols.h:24 msgctxt "Symbol" -msgid "Escalator Down" -msgstr "Scala mobile giù" +msgid "Downhill Skiing" +msgstr "Discesa libera" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:25 ../share/symbols/symbols.h:26 msgctxt "Symbol" -msgid "Escalator Up" -msgstr "Scala mobile su" +msgid "Drinking Water" +msgstr "Acqua potabile" +#. Symbols: ./MapSymbolsNPS.svg #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:27 ../share/symbols/symbols.h:28 +#: ../share/symbols/symbols.h:172 ../share/symbols/symbols.h:173 msgctxt "Symbol" -msgid "Stairs" -msgstr "Scale" +msgid "First Aid" +msgstr "Primo soccorso" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:29 ../share/symbols/symbols.h:30 msgctxt "Symbol" -msgid "Stairs Down" -msgstr "Scale giù" +msgid "Fishing" +msgstr "Pesca" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:31 ../share/symbols/symbols.h:32 msgctxt "Symbol" -msgid "Stairs Up" -msgstr "Scale su" +msgid "Food Service" +msgstr "Servizio di ristorazione" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:33 ../share/symbols/symbols.h:34 msgctxt "Symbol" -msgid "Elevator" -msgstr "Ascensore" +msgid "Four Wheel Drive Road" +msgstr "Strada per veicoli a quattro ruote motrici" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:35 ../share/symbols/symbols.h:36 msgctxt "Symbol" -msgid "Toilets - Men" -msgstr "Servizi - Uomo" +msgid "Gas Station" +msgstr "Distributore di benzina" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:37 ../share/symbols/symbols.h:38 msgctxt "Symbol" -msgid "Toilets - Women" -msgstr "Servizi - Donna" +msgid "Golfing" +msgstr "Golf" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:39 ../share/symbols/symbols.h:40 msgctxt "Symbol" -msgid "Toilets" -msgstr "Servizi" +msgid "Horseback Riding" +msgstr "Equitazione" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:41 ../share/symbols/symbols.h:42 msgctxt "Symbol" -msgid "Nursery" -msgstr "Asilo nido" +msgid "Hospital" +msgstr "Ospedale" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:43 ../share/symbols/symbols.h:44 msgctxt "Symbol" -msgid "Drinking Fountain" -msgstr "Fontanella" +msgid "Ice Skating" +msgstr "Pattinaggio sul ghiaccio" +#. Symbols: ./MapSymbolsNPS.svg #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:45 ../share/symbols/symbols.h:46 +#: ../share/symbols/symbols.h:206 ../share/symbols/symbols.h:207 msgctxt "Symbol" -msgid "Waiting Room" -msgstr "Sala di attesa" +msgid "Information" +msgstr "Informazioni" -#. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:47 ../share/symbols/symbols.h:48 -#: ../share/symbols/symbols.h:231 ../share/symbols/symbols.h:232 msgctxt "Symbol" -msgid "Information" -msgstr "Informazioni" +msgid "Litter Receptacle" +msgstr "Cestino dei rifiuti" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:49 ../share/symbols/symbols.h:50 msgctxt "Symbol" -msgid "Hotel Information" -msgstr "Informazioni hotel" +msgid "Lodging" +msgstr "Alloggio" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:51 ../share/symbols/symbols.h:52 msgctxt "Symbol" -msgid "Air Transportation" -msgstr "Trasporto aereo" +msgid "Marina" +msgstr "Marina" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:53 ../share/symbols/symbols.h:54 msgctxt "Symbol" -msgid "Heliport" -msgstr "Eliporto" +msgid "Motorbike Trail" +msgstr "Sentiero motocicli" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:55 ../share/symbols/symbols.h:56 msgctxt "Symbol" -msgid "Taxi" -msgstr "Taxi" +msgid "Radiator Water" +msgstr "Acqua radiatore" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:57 ../share/symbols/symbols.h:58 msgctxt "Symbol" -msgid "Bus" -msgstr "Autobus" +msgid "Recycling" +msgstr "Riciclaggio" +#. Symbols: ./MapSymbolsNPS.svg #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:59 ../share/symbols/symbols.h:60 +#: ../share/symbols/symbols.h:258 ../share/symbols/symbols.h:259 msgctxt "Symbol" -msgid "Ground Transportation" -msgstr "Trasporto via terra" +msgid "Parking" +msgstr "Parcheggio" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:61 ../share/symbols/symbols.h:62 msgctxt "Symbol" -msgid "Rail Transportation" -msgstr "Trasporto ferroviario" +msgid "Pets On Leash" +msgstr "Animali al guinzaglio" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:63 ../share/symbols/symbols.h:64 msgctxt "Symbol" -msgid "Water Transportation" -msgstr "Trasporto via mare" +msgid "Picnic Area" +msgstr "Area picnic" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:65 ../share/symbols/symbols.h:66 msgctxt "Symbol" -msgid "Car Rental" -msgstr "Autonoleggio" +msgid "Post Office" +msgstr "Ufficio postale" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:67 ../share/symbols/symbols.h:68 msgctxt "Symbol" -msgid "Restaurant" -msgstr "Ristorante" +msgid "Ranger Station" +msgstr "Stazione dei ranger" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:69 ../share/symbols/symbols.h:70 msgctxt "Symbol" -msgid "Coffeeshop" -msgstr "Caffè" +msgid "RV Campground" +msgstr "Campeggio camper" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:71 ../share/symbols/symbols.h:72 msgctxt "Symbol" -msgid "Bar" -msgstr "Bar" +msgid "Restrooms" +msgstr "Servizi" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:73 ../share/symbols/symbols.h:74 msgctxt "Symbol" -msgid "Shops" -msgstr "Negozi" +msgid "Sailing" +msgstr "Vela" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:75 ../share/symbols/symbols.h:76 msgctxt "Symbol" -msgid "Barber Shop - Beauty Salon" -msgstr "Barbiere - Salone di bellezza" +msgid "Sanitary Disposal Station" +msgstr "Stazione di smaltimento sanitario" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:77 ../share/symbols/symbols.h:78 msgctxt "Symbol" -msgid "Barber Shop" -msgstr "Barbiere" +msgid "Scuba Diving" +msgstr "Immersione subacquea" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:79 ../share/symbols/symbols.h:80 msgctxt "Symbol" -msgid "Beauty Salon" -msgstr "Salone di bellezza" +msgid "Self Guided Trail" +msgstr "Sentiero guidato" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:81 ../share/symbols/symbols.h:82 msgctxt "Symbol" -msgid "Ticket Purchase" -msgstr "Acquisto biglietti" +msgid "Shelter" +msgstr "Rifugio" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:83 ../share/symbols/symbols.h:84 msgctxt "Symbol" -msgid "Baggage Check In" -msgstr "Check in bagagli" +msgid "Showers" +msgstr "Docce" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:85 ../share/symbols/symbols.h:86 msgctxt "Symbol" -msgid "Baggage Claim" -msgstr "Ritiro bagagli" +msgid "Sledding" +msgstr "Slitta" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:87 ../share/symbols/symbols.h:88 msgctxt "Symbol" -msgid "Customs" -msgstr "Dogana" +msgid "SnowmobileTrail" +msgstr "Sentiero motoslitta" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:89 ../share/symbols/symbols.h:90 msgctxt "Symbol" -msgid "Immigration" -msgstr "Immigrazione" +msgid "Stable" +msgstr "Stalla" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:91 ../share/symbols/symbols.h:92 msgctxt "Symbol" -msgid "Departing Flights" -msgstr "Voli in partenza" +msgid "Store" +msgstr "Negozio" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:93 ../share/symbols/symbols.h:94 msgctxt "Symbol" -msgid "Arriving Flights" -msgstr "Voli in arrivo" +msgid "Swimming" +msgstr "Nuoto" +#. Symbols: ./MapSymbolsNPS.svg #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:95 ../share/symbols/symbols.h:96 +#: ../share/symbols/symbols.h:162 ../share/symbols/symbols.h:163 msgctxt "Symbol" -msgid "Smoking" -msgstr "Fumare" +msgid "Telephone" +msgstr "Telefono" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:97 ../share/symbols/symbols.h:98 msgctxt "Symbol" -msgid "No Smoking" -msgstr "Vietato fumare" +msgid "Emergency Telephone" +msgstr "Telefono di emergenza" -#. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:99 ../share/symbols/symbols.h:100 -#: ../share/symbols/symbols.h:245 ../share/symbols/symbols.h:246 msgctxt "Symbol" -msgid "Parking" -msgstr "Parcheggio" +msgid "Trailhead" +msgstr "Sentiero" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:101 ../share/symbols/symbols.h:102 msgctxt "Symbol" -msgid "No Parking" -msgstr "Divieto di parcheggio" +msgid "Wheelchair Accessible" +msgstr "Accessibile alle sedie a rotelle" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:103 ../share/symbols/symbols.h:104 msgctxt "Symbol" -msgid "No Dogs" -msgstr "Divieto per i cani" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:105 ../share/symbols/symbols.h:106 -msgctxt "Symbol" -msgid "No Entry" -msgstr "Divieto di ingresso" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:107 ../share/symbols/symbols.h:108 -msgctxt "Symbol" -msgid "Exit" -msgstr "Uscita" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:109 ../share/symbols/symbols.h:110 -msgctxt "Symbol" -msgid "Fire Extinguisher" -msgstr "Estintore" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:111 ../share/symbols/symbols.h:112 -msgctxt "Symbol" -msgid "Right Arrow" -msgstr "Freccia destra" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:113 ../share/symbols/symbols.h:114 -msgctxt "Symbol" -msgid "Forward and Right Arrow" -msgstr "Freccia avanti e destra" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:115 ../share/symbols/symbols.h:116 -msgctxt "Symbol" -msgid "Up Arrow" -msgstr "Freccia su" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:117 ../share/symbols/symbols.h:118 -msgctxt "Symbol" -msgid "Forward and Left Arrow" -msgstr "Freccia avanti e sinistra" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:119 ../share/symbols/symbols.h:120 -msgctxt "Symbol" -msgid "Left Arrow" -msgstr "Freccia sinistra" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:121 ../share/symbols/symbols.h:122 -msgctxt "Symbol" -msgid "Left and Down Arrow" -msgstr "Freccia sinistra e giù" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:123 ../share/symbols/symbols.h:124 -msgctxt "Symbol" -msgid "Down Arrow" -msgstr "Freccia giù" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:125 ../share/symbols/symbols.h:126 -msgctxt "Symbol" -msgid "Right and Down Arrow" -msgstr "Freccia destra e giù" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:127 ../share/symbols/symbols.h:128 -msgctxt "Symbol" -msgid "NPS Wheelchair Accessible - 1996" -msgstr "NPS Accessibile alle sedie a rotelle - 1996" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:129 ../share/symbols/symbols.h:130 -msgctxt "Symbol" -msgid "NPS Wheelchair Accessible" -msgstr "NPS Accessibile alle sedie a rotelle" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:131 ../share/symbols/symbols.h:132 -msgctxt "Symbol" -msgid "New Wheelchair Accessible" -msgstr "Nuovo Accessibile alle sedie a rotelle" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:133 -msgctxt "Symbol" -msgid "Word Balloons" -msgstr "Nuvolette" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:134 -msgctxt "Symbol" -msgid "Thought Balloon" -msgstr "Nuvoletta di pensiero" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:135 -msgctxt "Symbol" -msgid "Dream Speaking" -msgstr "Discorso sognante" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:136 -msgctxt "Symbol" -msgid "Rounded Balloon" -msgstr "Nuvoletta arrotondata" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:137 -msgctxt "Symbol" -msgid "Squared Balloon" -msgstr "Nuvoletta squadrata" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:138 -msgctxt "Symbol" -msgid "Over the Phone" -msgstr "Al telefono" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:139 -msgctxt "Symbol" -msgid "Hip Balloon" -msgstr "Nuvoletta sfiancata" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:140 -msgctxt "Symbol" -msgid "Circle Balloon" -msgstr "Nuvoletta rotonda" +msgid "Wind Surfing" +msgstr "Windsurf" -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:141 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:105 msgctxt "Symbol" -msgid "Exclaim Balloon" -msgstr "Nuvoletta di esclamazione" +msgid "Blank" +msgstr "Bianco" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:142 +#: ../share/symbols/symbols.h:106 msgctxt "Symbol" msgid "Flow Chart Shapes" msgstr "Diagramma di flusso" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:143 +#: ../share/symbols/symbols.h:107 msgctxt "Symbol" msgid "Process" msgstr "Processo" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:144 +#: ../share/symbols/symbols.h:108 msgctxt "Symbol" msgid "Input/Output" msgstr "Input/Output" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:145 +#: ../share/symbols/symbols.h:109 msgctxt "Symbol" msgid "Document" msgstr "Documento" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:146 +#: ../share/symbols/symbols.h:110 msgctxt "Symbol" msgid "Manual Operation" msgstr "Operazione manuale" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:147 +#: ../share/symbols/symbols.h:111 msgctxt "Symbol" msgid "Preparation" msgstr "Preparazione" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:148 +#: ../share/symbols/symbols.h:112 msgctxt "Symbol" msgid "Merge" msgstr "Fusione" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:149 +#: ../share/symbols/symbols.h:113 msgctxt "Symbol" msgid "Decision" msgstr "Decisione" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:150 +#: ../share/symbols/symbols.h:114 msgctxt "Symbol" msgid "Magnetic Tape" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:151 +#: ../share/symbols/symbols.h:115 #, fuzzy msgctxt "Symbol" msgid "Display" msgstr "Modalità visualizzazione" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:152 +#: ../share/symbols/symbols.h:116 msgctxt "Symbol" msgid "Auxiliary Operation" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:153 +#: ../share/symbols/symbols.h:117 msgctxt "Symbol" msgid "Manual Input" msgstr "Input manuale" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:154 +#: ../share/symbols/symbols.h:118 msgctxt "Symbol" msgid "Extract" msgstr "Estrai" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:155 +#: ../share/symbols/symbols.h:119 msgctxt "Symbol" msgid "Terminal/Interrupt" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:156 +#: ../share/symbols/symbols.h:120 msgctxt "Symbol" msgid "Punched Card" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:157 +#: ../share/symbols/symbols.h:121 #, fuzzy msgctxt "Symbol" msgid "Punch Tape" msgstr "Buca" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:158 +#: ../share/symbols/symbols.h:122 msgctxt "Symbol" msgid "Online Storage" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:159 +#: ../share/symbols/symbols.h:123 msgctxt "Symbol" msgid "Keying" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:160 +#: ../share/symbols/symbols.h:124 msgctxt "Symbol" msgid "Sort" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:161 +#: ../share/symbols/symbols.h:125 msgctxt "Symbol" msgid "Connector" msgstr "Connettore" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:162 +#: ../share/symbols/symbols.h:126 #, fuzzy msgctxt "Symbol" msgid "Off-Page Connector" msgstr "Connettore" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:163 +#: ../share/symbols/symbols.h:127 msgctxt "Symbol" msgid "Transmittal Tape" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:164 +#: ../share/symbols/symbols.h:128 msgctxt "Symbol" msgid "Communication Link" msgstr "Collegamento di comunicazione" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:165 +#: ../share/symbols/symbols.h:129 #, fuzzy msgctxt "Symbol" msgid "Collate" msgstr "Modula" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:166 +#: ../share/symbols/symbols.h:130 msgctxt "Symbol" msgid "Comment/Annotation" msgstr "Commento/Annotazione" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:167 +#: ../share/symbols/symbols.h:131 msgctxt "Symbol" msgid "Core" msgstr "Nucleo" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:168 +#: ../share/symbols/symbols.h:132 msgctxt "Symbol" msgid "Predefined Process" msgstr "Processo predefinito" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:169 +#: ../share/symbols/symbols.h:133 msgctxt "Symbol" msgid "Magnetic Disk (Database)" msgstr "Disco magnetico (Database)" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:170 +#: ../share/symbols/symbols.h:134 msgctxt "Symbol" msgid "Magnetic Drum (Direct Access)" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:171 +#: ../share/symbols/symbols.h:135 msgctxt "Symbol" msgid "Offline Storage" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:172 +#: ../share/symbols/symbols.h:136 msgctxt "Symbol" msgid "Logical Or" msgstr "Or logico" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:173 +#: ../share/symbols/symbols.h:137 msgctxt "Symbol" msgid "Logical And" msgstr "And logico" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:174 +#: ../share/symbols/symbols.h:138 msgctxt "Symbol" msgid "Delay" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:175 +#: ../share/symbols/symbols.h:139 msgctxt "Symbol" msgid "Loop Limit Begin" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:176 +#: ../share/symbols/symbols.h:140 msgctxt "Symbol" msgid "Loop Limit End" msgstr "" +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:141 +msgctxt "Symbol" +msgid "Word Balloons" +msgstr "Nuvolette" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:142 +msgctxt "Symbol" +msgid "Thought Balloon" +msgstr "Nuvoletta di pensiero" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:143 +msgctxt "Symbol" +msgid "Dream Speaking" +msgstr "Discorso sognante" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:144 +msgctxt "Symbol" +msgid "Rounded Balloon" +msgstr "Nuvoletta arrotondata" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:145 +msgctxt "Symbol" +msgid "Squared Balloon" +msgstr "Nuvoletta squadrata" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:146 +msgctxt "Symbol" +msgid "Over the Phone" +msgstr "Al telefono" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:147 +msgctxt "Symbol" +msgid "Hip Balloon" +msgstr "Nuvoletta sfiancata" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:148 +msgctxt "Symbol" +msgid "Circle Balloon" +msgstr "Nuvoletta rotonda" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:149 +msgctxt "Symbol" +msgid "Exclaim Balloon" +msgstr "Nuvoletta di esclamazione" + #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:177 +#: ../share/symbols/symbols.h:150 msgctxt "Symbol" msgid "Logic Symbols" msgstr "Simboli logici" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:178 +#: ../share/symbols/symbols.h:151 msgctxt "Symbol" msgid "Xnor Gate" msgstr "Xnor Gate" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:179 +#: ../share/symbols/symbols.h:152 msgctxt "Symbol" msgid "Xor Gate" msgstr "Xor Gate" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:180 +#: ../share/symbols/symbols.h:153 msgctxt "Symbol" msgid "Nor Gate" msgstr "Nor Gate" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:181 +#: ../share/symbols/symbols.h:154 msgctxt "Symbol" msgid "Or Gate" msgstr "Or Gate" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:182 +#: ../share/symbols/symbols.h:155 msgctxt "Symbol" msgid "Nand Gate" msgstr "Nand Gate" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:183 +#: ../share/symbols/symbols.h:156 msgctxt "Symbol" msgid "And Gate" msgstr "And Gate" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:184 +#: ../share/symbols/symbols.h:157 msgctxt "Symbol" msgid "Buffer" msgstr "Buffer" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:185 +#: ../share/symbols/symbols.h:158 msgctxt "Symbol" msgid "Not Gate" msgstr "Not Gate" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:186 +#: ../share/symbols/symbols.h:159 msgctxt "Symbol" msgid "Buffer Small" msgstr "Buffer piccolo" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:187 +#: ../share/symbols/symbols.h:160 msgctxt "Symbol" msgid "Not Gate Small" msgstr "Not Gate piccolo" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:188 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:161 msgctxt "Symbol" -msgid "United States National Park Service Map Symbols" -msgstr "Simboli mappa parchi nazionali Stati Uniti" +msgid "AIGA Symbol Signs" +msgstr "Segni simboli AIGA" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:189 ../share/symbols/symbols.h:190 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:164 ../share/symbols/symbols.h:165 msgctxt "Symbol" -msgid "Airport" -msgstr "Aereoporto" +msgid "Mail" +msgstr "Posta" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:191 ../share/symbols/symbols.h:192 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:166 ../share/symbols/symbols.h:167 msgctxt "Symbol" -msgid "Amphitheatre" -msgstr "Anfiteatro" +msgid "Currency Exchange" +msgstr "Cambiavalute" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:193 ../share/symbols/symbols.h:194 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:168 ../share/symbols/symbols.h:169 msgctxt "Symbol" -msgid "Bicycle Trail" -msgstr "Pista ciclabile" +msgid "Currency Exchange - Euro" +msgstr "Cambiavalute - Euro" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:195 ../share/symbols/symbols.h:196 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:170 ../share/symbols/symbols.h:171 msgctxt "Symbol" -msgid "Boat Launch" -msgstr "Rampa di alaggio barca" +msgid "Cashier" +msgstr "Cassiere" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:197 ../share/symbols/symbols.h:198 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:174 ../share/symbols/symbols.h:175 msgctxt "Symbol" -msgid "Boat Tour" -msgstr "Viaggio in barca" +msgid "Lost and Found" +msgstr "Oggetti smarriti" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:199 ../share/symbols/symbols.h:200 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:176 ../share/symbols/symbols.h:177 msgctxt "Symbol" -msgid "Bus Stop" -msgstr "Fermata dell'autobus" +msgid "Coat Check" +msgstr "Guardaroba" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:201 ../share/symbols/symbols.h:202 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:178 ../share/symbols/symbols.h:179 msgctxt "Symbol" -msgid "Campfire" -msgstr "Fuoco da campo" +msgid "Baggage Lockers" +msgstr "Armadietti per bagaglio" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:203 ../share/symbols/symbols.h:204 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:180 ../share/symbols/symbols.h:181 msgctxt "Symbol" -msgid "Campground" -msgstr "Campeggio" +msgid "Escalator" +msgstr "Scala mobile" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:205 ../share/symbols/symbols.h:206 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:182 ../share/symbols/symbols.h:183 msgctxt "Symbol" -msgid "CanoeAccess" -msgstr "Accesso canoa" +msgid "Escalator Down" +msgstr "Scala mobile giù" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:207 ../share/symbols/symbols.h:208 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:184 ../share/symbols/symbols.h:185 msgctxt "Symbol" -msgid "Crosscountry Ski Trail" -msgstr "Pista di sci di fondo" +msgid "Escalator Up" +msgstr "Scala mobile su" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:209 ../share/symbols/symbols.h:210 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:186 ../share/symbols/symbols.h:187 msgctxt "Symbol" -msgid "Downhill Skiing" -msgstr "Discesa libera" +msgid "Stairs" +msgstr "Scale" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:211 ../share/symbols/symbols.h:212 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:188 ../share/symbols/symbols.h:189 msgctxt "Symbol" -msgid "Drinking Water" -msgstr "Acqua potabile" +msgid "Stairs Down" +msgstr "Scale giù" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:215 ../share/symbols/symbols.h:216 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:190 ../share/symbols/symbols.h:191 msgctxt "Symbol" -msgid "Fishing" -msgstr "Pesca" +msgid "Stairs Up" +msgstr "Scale su" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:217 ../share/symbols/symbols.h:218 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:192 ../share/symbols/symbols.h:193 msgctxt "Symbol" -msgid "Food Service" -msgstr "Servizio di ristorazione" +msgid "Elevator" +msgstr "Ascensore" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:219 ../share/symbols/symbols.h:220 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:194 ../share/symbols/symbols.h:195 msgctxt "Symbol" -msgid "Four Wheel Drive Road" -msgstr "Strada per veicoli a quattro ruote motrici" +msgid "Toilets - Men" +msgstr "Servizi - Uomo" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:221 ../share/symbols/symbols.h:222 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:196 ../share/symbols/symbols.h:197 msgctxt "Symbol" -msgid "Gas Station" -msgstr "Distributore di benzina" +msgid "Toilets - Women" +msgstr "Servizi - Donna" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:223 ../share/symbols/symbols.h:224 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:198 ../share/symbols/symbols.h:199 msgctxt "Symbol" -msgid "Golfing" -msgstr "Golf" +msgid "Toilets" +msgstr "Servizi" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:225 ../share/symbols/symbols.h:226 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:200 ../share/symbols/symbols.h:201 msgctxt "Symbol" -msgid "Horseback Riding" -msgstr "Equitazione" +msgid "Nursery" +msgstr "Asilo nido" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:227 ../share/symbols/symbols.h:228 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:202 ../share/symbols/symbols.h:203 msgctxt "Symbol" -msgid "Hospital" -msgstr "Ospedale" +msgid "Drinking Fountain" +msgstr "Fontanella" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:229 ../share/symbols/symbols.h:230 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:204 ../share/symbols/symbols.h:205 msgctxt "Symbol" -msgid "Ice Skating" -msgstr "Pattinaggio sul ghiaccio" +msgid "Waiting Room" +msgstr "Sala di attesa" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:233 ../share/symbols/symbols.h:234 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:208 ../share/symbols/symbols.h:209 msgctxt "Symbol" -msgid "Litter Receptacle" -msgstr "Cestino dei rifiuti" +msgid "Hotel Information" +msgstr "Informazioni hotel" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:235 ../share/symbols/symbols.h:236 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:210 ../share/symbols/symbols.h:211 msgctxt "Symbol" -msgid "Lodging" -msgstr "Alloggio" +msgid "Air Transportation" +msgstr "Trasporto aereo" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:237 ../share/symbols/symbols.h:238 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:212 ../share/symbols/symbols.h:213 msgctxt "Symbol" -msgid "Marina" -msgstr "Marina" +msgid "Heliport" +msgstr "Eliporto" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:239 ../share/symbols/symbols.h:240 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:214 ../share/symbols/symbols.h:215 msgctxt "Symbol" -msgid "Motorbike Trail" -msgstr "Sentiero motocicli" +msgid "Taxi" +msgstr "Taxi" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:241 ../share/symbols/symbols.h:242 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:216 ../share/symbols/symbols.h:217 msgctxt "Symbol" -msgid "Radiator Water" -msgstr "Acqua radiatore" +msgid "Bus" +msgstr "Autobus" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:243 ../share/symbols/symbols.h:244 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:218 ../share/symbols/symbols.h:219 msgctxt "Symbol" -msgid "Recycling" -msgstr "Riciclaggio" +msgid "Ground Transportation" +msgstr "Trasporto via terra" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:247 ../share/symbols/symbols.h:248 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:220 ../share/symbols/symbols.h:221 msgctxt "Symbol" -msgid "Pets On Leash" -msgstr "Animali al guinzaglio" +msgid "Rail Transportation" +msgstr "Trasporto ferroviario" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:249 ../share/symbols/symbols.h:250 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:222 ../share/symbols/symbols.h:223 msgctxt "Symbol" -msgid "Picnic Area" -msgstr "Area picnic" +msgid "Water Transportation" +msgstr "Trasporto via mare" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:251 ../share/symbols/symbols.h:252 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:224 ../share/symbols/symbols.h:225 msgctxt "Symbol" -msgid "Post Office" -msgstr "Ufficio postale" +msgid "Car Rental" +msgstr "Autonoleggio" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:253 ../share/symbols/symbols.h:254 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:226 ../share/symbols/symbols.h:227 msgctxt "Symbol" -msgid "Ranger Station" -msgstr "Stazione dei ranger" +msgid "Restaurant" +msgstr "Ristorante" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:255 ../share/symbols/symbols.h:256 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:228 ../share/symbols/symbols.h:229 msgctxt "Symbol" -msgid "RV Campground" -msgstr "Campeggio camper" +msgid "Coffeeshop" +msgstr "Caffè" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:257 ../share/symbols/symbols.h:258 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:230 ../share/symbols/symbols.h:231 msgctxt "Symbol" -msgid "Restrooms" -msgstr "Servizi" +msgid "Bar" +msgstr "Bar" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:259 ../share/symbols/symbols.h:260 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:232 ../share/symbols/symbols.h:233 msgctxt "Symbol" -msgid "Sailing" -msgstr "Vela" +msgid "Shops" +msgstr "Negozi" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:261 ../share/symbols/symbols.h:262 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:234 ../share/symbols/symbols.h:235 msgctxt "Symbol" -msgid "Sanitary Disposal Station" -msgstr "Stazione di smaltimento sanitario" +msgid "Barber Shop - Beauty Salon" +msgstr "Barbiere - Salone di bellezza" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:263 ../share/symbols/symbols.h:264 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:236 ../share/symbols/symbols.h:237 msgctxt "Symbol" -msgid "Scuba Diving" -msgstr "Immersione subacquea" +msgid "Barber Shop" +msgstr "Barbiere" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:265 ../share/symbols/symbols.h:266 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:238 ../share/symbols/symbols.h:239 msgctxt "Symbol" -msgid "Self Guided Trail" -msgstr "Sentiero guidato" +msgid "Beauty Salon" +msgstr "Salone di bellezza" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:267 ../share/symbols/symbols.h:268 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:240 ../share/symbols/symbols.h:241 msgctxt "Symbol" -msgid "Shelter" -msgstr "Rifugio" +msgid "Ticket Purchase" +msgstr "Acquisto biglietti" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:269 ../share/symbols/symbols.h:270 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:242 ../share/symbols/symbols.h:243 msgctxt "Symbol" -msgid "Showers" -msgstr "Docce" +msgid "Baggage Check In" +msgstr "Check in bagagli" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:271 ../share/symbols/symbols.h:272 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:244 ../share/symbols/symbols.h:245 msgctxt "Symbol" -msgid "Sledding" -msgstr "Slitta" +msgid "Baggage Claim" +msgstr "Ritiro bagagli" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:273 ../share/symbols/symbols.h:274 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:246 ../share/symbols/symbols.h:247 msgctxt "Symbol" -msgid "SnowmobileTrail" -msgstr "Sentiero motoslitta" +msgid "Customs" +msgstr "Dogana" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:275 ../share/symbols/symbols.h:276 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:248 ../share/symbols/symbols.h:249 msgctxt "Symbol" -msgid "Stable" -msgstr "Stalla" +msgid "Immigration" +msgstr "Immigrazione" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:277 ../share/symbols/symbols.h:278 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:250 ../share/symbols/symbols.h:251 msgctxt "Symbol" -msgid "Store" -msgstr "Negozio" +msgid "Departing Flights" +msgstr "Voli in partenza" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:279 ../share/symbols/symbols.h:280 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:252 ../share/symbols/symbols.h:253 msgctxt "Symbol" -msgid "Swimming" -msgstr "Nuoto" +msgid "Arriving Flights" +msgstr "Voli in arrivo" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:283 ../share/symbols/symbols.h:284 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:254 ../share/symbols/symbols.h:255 msgctxt "Symbol" -msgid "Emergency Telephone" -msgstr "Telefono di emergenza" +msgid "Smoking" +msgstr "Fumare" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:285 ../share/symbols/symbols.h:286 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:256 ../share/symbols/symbols.h:257 msgctxt "Symbol" -msgid "Trailhead" -msgstr "Sentiero" +msgid "No Smoking" +msgstr "Vietato fumare" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:287 ../share/symbols/symbols.h:288 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:260 ../share/symbols/symbols.h:261 msgctxt "Symbol" -msgid "Wheelchair Accessible" -msgstr "Accessibile alle sedie a rotelle" +msgid "No Parking" +msgstr "Divieto di parcheggio" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:289 ../share/symbols/symbols.h:290 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:262 ../share/symbols/symbols.h:263 msgctxt "Symbol" -msgid "Wind Surfing" -msgstr "Windsurf" +msgid "No Dogs" +msgstr "Divieto per i cani" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:291 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:264 ../share/symbols/symbols.h:265 msgctxt "Symbol" -msgid "Blank" -msgstr "Bianco" +msgid "No Entry" +msgstr "Divieto di ingresso" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:266 ../share/symbols/symbols.h:267 +msgctxt "Symbol" +msgid "Exit" +msgstr "Uscita" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:268 ../share/symbols/symbols.h:269 +msgctxt "Symbol" +msgid "Fire Extinguisher" +msgstr "Estintore" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:270 ../share/symbols/symbols.h:271 +msgctxt "Symbol" +msgid "Right Arrow" +msgstr "Freccia destra" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:272 ../share/symbols/symbols.h:273 +msgctxt "Symbol" +msgid "Forward and Right Arrow" +msgstr "Freccia avanti e destra" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:274 ../share/symbols/symbols.h:275 +msgctxt "Symbol" +msgid "Up Arrow" +msgstr "Freccia su" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:276 ../share/symbols/symbols.h:277 +msgctxt "Symbol" +msgid "Forward and Left Arrow" +msgstr "Freccia avanti e sinistra" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:278 ../share/symbols/symbols.h:279 +msgctxt "Symbol" +msgid "Left Arrow" +msgstr "Freccia sinistra" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:280 ../share/symbols/symbols.h:281 +msgctxt "Symbol" +msgid "Left and Down Arrow" +msgstr "Freccia sinistra e giù" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:282 ../share/symbols/symbols.h:283 +msgctxt "Symbol" +msgid "Down Arrow" +msgstr "Freccia giù" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:284 ../share/symbols/symbols.h:285 +msgctxt "Symbol" +msgid "Right and Down Arrow" +msgstr "Freccia destra e giù" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:286 ../share/symbols/symbols.h:287 +msgctxt "Symbol" +msgid "NPS Wheelchair Accessible - 1996" +msgstr "NPS Accessibile alle sedie a rotelle - 1996" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:288 ../share/symbols/symbols.h:289 +msgctxt "Symbol" +msgid "NPS Wheelchair Accessible" +msgstr "NPS Accessibile alle sedie a rotelle" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:290 ../share/symbols/symbols.h:291 +msgctxt "Symbol" +msgid "New Wheelchair Accessible" +msgstr "Nuovo Accessibile alle sedie a rotelle" #: ../share/templates/templates.h:1 msgid "CD Label 120mmx120mm " @@ -4463,16 +4466,16 @@ msgstr "guide tipografia tipografico canvas" msgid "3D Box" msgstr "Solido 3D" -#: ../src/color-profile.cpp:842 +#: ../src/color-profile.cpp:856 #, c-format msgid "Color profiles directory (%s) is unavailable." msgstr "La cartella dei profili colore (%s) non è disponibile." -#: ../src/color-profile.cpp:901 ../src/color-profile.cpp:918 +#: ../src/color-profile.cpp:928 ../src/color-profile.cpp:945 msgid "(invalid UTF-8 string)" msgstr "(stringa UTF-8 non valida)" -#: ../src/color-profile.cpp:903 +#: ../src/color-profile.cpp:930 msgctxt "Profile name" msgid "None" msgstr "Nessuno" @@ -5057,7 +5060,7 @@ msgstr "" "informazioni, consultare il sito web di Inkscape o rivolgersi alle mailing " "list." -#: ../src/extension/implementation/script.cpp:1108 +#: ../src/extension/implementation/script.cpp:1111 msgid "" "Inkscape has received additional data from the script executed. The script " "did not return an error, but this may indicate the results will not be as " @@ -5097,7 +5100,8 @@ msgstr "Soglia adattiva" #: ../src/ui/widget/page-sizer.cpp:249 #: ../src/widgets/calligraphy-toolbar.cpp:430 #: ../src/widgets/eraser-toolbar.cpp:154 ../src/widgets/spray-toolbar.cpp:297 -#: ../src/widgets/tweak-toolbar.cpp:128 ../share/extensions/foldablebox.inx.h:2 +#: ../src/widgets/tweak-toolbar.cpp:128 +#: ../share/extensions/foldablebox.inx.h:2 msgid "Width:" msgstr "Larghezza:" @@ -5766,7 +5770,7 @@ msgstr "Orientamento testo" #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:251 #, fuzzy msgid "Embed fonts" -msgstr "Incorpora immagini" +msgstr "Incorpora caratteri" #: ../src/extension/internal/cairo-ps-out.cpp:335 #: ../src/extension/internal/cairo-ps-out.cpp:377 @@ -5780,7 +5784,7 @@ msgstr "Converti testo in tracciato" #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:253 #, fuzzy msgid "Omit text in PDF and create LaTeX file" -msgstr "PDF+LaTeX: ometti testo nel file PDF, e crea un file LaTeX" +msgstr "Ometti testo nel file PDF e crea un file LaTeX" #: ../src/extension/internal/cairo-ps-out.cpp:338 #: ../src/extension/internal/cairo-ps-out.cpp:380 @@ -6562,13 +6566,15 @@ msgid "Transparency type:" msgstr "Tipo trasparenza:" #: ../src/extension/internal/filter/bumps.h:353 -#: ../src/extension/internal/filter/morphology.h:176 ../src/filter-enums.cpp:91 +#: ../src/extension/internal/filter/morphology.h:176 +#: ../src/filter-enums.cpp:91 msgid "Atop" msgstr "In cima" #: ../src/extension/internal/filter/bumps.h:354 #: ../src/extension/internal/filter/distort.h:70 -#: ../src/extension/internal/filter/morphology.h:174 ../src/filter-enums.cpp:89 +#: ../src/extension/internal/filter/morphology.h:174 +#: ../src/filter-enums.cpp:89 msgid "In" msgstr "In" @@ -6628,12 +6634,12 @@ msgstr "Rimpiazza RGB con qualsiasi colore" #: ../src/extension/internal/filter/color.h:254 #, fuzzy msgid "Color Blindness" -msgstr "Contorno colorato" +msgstr "Cecità colori" #: ../src/extension/internal/filter/color.h:258 #, fuzzy msgid "Blindness type:" -msgstr "Tipo miscela:" +msgstr "Tipo cecità:" #: ../src/extension/internal/filter/color.h:259 msgid "Rod monochromacy (atypical achromatopsia)" @@ -6670,7 +6676,7 @@ msgstr "" #: ../src/extension/internal/filter/color.h:286 #, fuzzy msgid "Simulate color blindness" -msgstr "Simula lo stile dei dipinti ad olio" +msgstr "Simula cecità colori" #: ../src/extension/internal/filter/color.h:329 msgid "Color Shift" @@ -7087,7 +7093,8 @@ msgid "Felt Feather" msgstr "Piuma" #: ../src/extension/internal/filter/distort.h:71 -#: ../src/extension/internal/filter/morphology.h:175 ../src/filter-enums.cpp:90 +#: ../src/extension/internal/filter/morphology.h:175 +#: ../src/filter-enums.cpp:90 msgid "Out" msgstr "Out" @@ -7283,11 +7290,13 @@ msgstr "Nascondi immagine" msgid "Composite type:" msgstr "Tipo composizione:" -#: ../src/extension/internal/filter/morphology.h:173 ../src/filter-enums.cpp:88 +#: ../src/extension/internal/filter/morphology.h:173 +#: ../src/filter-enums.cpp:88 msgid "Over" msgstr "Sovrapposizione" -#: ../src/extension/internal/filter/morphology.h:177 ../src/filter-enums.cpp:92 +#: ../src/extension/internal/filter/morphology.h:177 +#: ../src/filter-enums.cpp:92 msgid "XOR" msgstr "XOR" @@ -7361,8 +7370,8 @@ msgstr "Riempimento rumoroso" #: ../src/ui/dialog/tracedialog.cpp:747 #: ../share/extensions/color_HSL_adjust.inx.h:2 #: ../share/extensions/color_custom.inx.h:2 -#: ../share/extensions/color_randomize.inx.h:2 ../share/extensions/dots.inx.h:2 -#: ../share/extensions/dxf_input.inx.h:2 +#: ../share/extensions/color_randomize.inx.h:2 +#: ../share/extensions/dots.inx.h:2 ../share/extensions/dxf_input.inx.h:2 #: ../share/extensions/dxf_outlines.inx.h:2 #: ../share/extensions/gcodetools_area.inx.h:29 #: ../share/extensions/gcodetools_engraving.inx.h:7 @@ -7962,13 +7971,15 @@ msgstr "Spostamento verticale:" #: ../src/extension/internal/grid.cpp:209 #: ../src/ui/dialog/inkscape-preferences.cpp:1532 #: ../share/extensions/draw_from_triangle.inx.h:58 -#: ../share/extensions/eqtexsvg.inx.h:4 ../share/extensions/foldablebox.inx.h:9 +#: ../share/extensions/eqtexsvg.inx.h:4 +#: ../share/extensions/foldablebox.inx.h:9 #: ../share/extensions/funcplot.inx.h:38 #: ../share/extensions/grid_cartesian.inx.h:23 #: ../share/extensions/grid_isometric.inx.h:11 #: ../share/extensions/grid_polar.inx.h:22 #: ../share/extensions/guides_creator.inx.h:25 -#: ../share/extensions/hershey.inx.h:52 ../share/extensions/layout_nup.inx.h:35 +#: ../share/extensions/hershey.inx.h:52 +#: ../share/extensions/layout_nup.inx.h:35 #: ../share/extensions/lindenmayer.inx.h:34 #: ../share/extensions/nicechart.inx.h:45 #: ../share/extensions/param_curves.inx.h:30 @@ -8319,7 +8330,8 @@ msgid "Map all fill patterns to standard WMF hatches" msgstr "" #: ../src/extension/internal/wmf-inout.cpp:3208 -#: ../share/extensions/wmf_input.inx.h:2 ../share/extensions/wmf_output.inx.h:2 +#: ../share/extensions/wmf_input.inx.h:2 +#: ../share/extensions/wmf_output.inx.h:2 msgid "Windows Metafile (*.wmf)" msgstr "Windows Metafile (*.wmf)" @@ -8596,7 +8608,8 @@ msgstr "Ruota luminosità" msgid "Luminance to Alpha" msgstr "Da luminanza a trasparenza" -#: ../src/filter-enums.cpp:87 ../share/extensions/jessyInk_mouseHandler.inx.h:3 +#: ../src/filter-enums.cpp:87 +#: ../share/extensions/jessyInk_mouseHandler.inx.h:3 #: ../share/extensions/jessyInk_transitions.inx.h:7 #: ../share/extensions/measure.inx.h:20 ../share/extensions/nicechart.inx.h:33 msgid "Default" @@ -8740,7 +8753,7 @@ msgstr "Maniglia del gradiente a maglia" #: ../src/gradient-drag.cpp:108 ../src/ui/tools/mesh-tool.cpp:95 #, fuzzy msgid "Mesh gradient tensor" -msgstr "Fine del gradiente lineare" +msgstr "Fine del gradiente a maglia" #: ../src/gradient-drag.cpp:565 msgid "Added patch row or column" @@ -8920,7 +8933,8 @@ msgstr "Riduce a icona questo pannello" msgid "Close this dock" msgstr "Chiude questo pannello" -#: ../src/libgdl/gdl-dock-item-grip.c:723 ../src/libgdl/gdl-dock-tablabel.c:125 +#: ../src/libgdl/gdl-dock-item-grip.c:723 +#: ../src/libgdl/gdl-dock-tablabel.c:125 msgid "Controlling dock item" msgstr "Pannello atto al controllo" @@ -9088,7 +9102,8 @@ msgstr "L'indice della pagina attuale" #: ../src/libgdl/gdl-dock-object.c:125 #: ../src/live_effects/parameter/originalpatharray.cpp:82 #: ../src/ui/dialog/inkscape-preferences.cpp:1566 -#: ../src/ui/widget/page-sizer.cpp:285 ../src/widgets/gradient-selector.cpp:150 +#: ../src/ui/widget/page-sizer.cpp:285 +#: ../src/widgets/gradient-selector.cpp:150 #: ../src/widgets/sp-xmlview-attr-list.cpp:49 msgid "Name" msgstr "Nome" @@ -9458,9 +9473,8 @@ msgid "Show handles" msgstr "Mostra maniglie" #: ../src/live_effects/effect.cpp:143 ../src/widgets/pencil-toolbar.cpp:118 -#, fuzzy msgid "BSpline" -msgstr "Opalino" +msgstr "BSpline" #: ../src/live_effects/effect.cpp:144 #, fuzzy @@ -10781,9 +10795,8 @@ msgid "Type" msgstr "Tipo" #: ../src/live_effects/lpe-perspective-envelope.cpp:46 -#, fuzzy msgid "Select the type of deformation" -msgstr "Duplica il motivo prima della deformazione" +msgstr "Seleziona il tipo di deformazione" #: ../src/live_effects/lpe-perspective-envelope.cpp:47 #, fuzzy @@ -10839,9 +10852,8 @@ msgid "Handles:" msgstr "Maniglia" #: ../src/live_effects/lpe-powerstroke.cpp:132 -#, fuzzy msgid "CubicBezierSmooth" -msgstr "CubicBezierJohan" +msgstr "CubicBezierSmooth" #: ../src/live_effects/lpe-powerstroke.cpp:151 #: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:13 @@ -11246,7 +11258,8 @@ msgstr "Distanza _tacche:" msgid "Distance between successive ruler marks" msgstr "Distanza tra le tacche del righello" -#: ../src/live_effects/lpe-ruler.cpp:42 ../share/extensions/foldablebox.inx.h:7 +#: ../src/live_effects/lpe-ruler.cpp:42 +#: ../share/extensions/foldablebox.inx.h:7 #: ../share/extensions/interp_att_g.inx.h:9 #: ../share/extensions/layout_nup.inx.h:3 #: ../share/extensions/printing_marks.inx.h:11 @@ -11815,15 +11828,13 @@ msgstr "_Rimuovi dal tracciato" #: ../src/live_effects/parameter/originalpatharray.cpp:179 #: ../src/ui/dialog/objects.cpp:1854 -#, fuzzy msgid "Move Down" -msgstr "Sposta a:" +msgstr "Sposta in basso" #: ../src/live_effects/parameter/originalpatharray.cpp:191 #: ../src/ui/dialog/objects.cpp:1862 -#, fuzzy msgid "Move Up" -msgstr "Muovi motivi" +msgstr "Sposta in alto" #: ../src/live_effects/parameter/originalpatharray.cpp:231 #, fuzzy @@ -12671,7 +12682,8 @@ msgstr "Niente da eliminare." #: ../src/widgets/eraser-toolbar.cpp:120 #: ../src/widgets/gradient-toolbar.cpp:1181 #: ../src/widgets/gradient-toolbar.cpp:1195 -#: ../src/widgets/gradient-toolbar.cpp:1209 ../src/widgets/node-toolbar.cpp:401 +#: ../src/widgets/gradient-toolbar.cpp:1209 +#: ../src/widgets/node-toolbar.cpp:401 msgid "Delete" msgstr "Elimina" @@ -13360,20 +13372,20 @@ msgid_plural "(%d characters%s)" msgstr[0] "(%d carattere%s)" msgstr[1] "(%d caratteri%s)" -#: ../src/sp-guide.cpp:261 +#: ../src/sp-guide.cpp:262 msgid "Create Guides Around the Page" msgstr "Crea guide attorno alla pagina" -#: ../src/sp-guide.cpp:274 ../src/verbs.cpp:2544 +#: ../src/sp-guide.cpp:275 ../src/verbs.cpp:2544 msgid "Delete All Guides" msgstr "Cancella tutte le guide" #. Guide has probably been deleted and no longer has an attached namedview. -#: ../src/sp-guide.cpp:485 +#: ../src/sp-guide.cpp:486 msgid "Deleted" msgstr "Cancellata" -#: ../src/sp-guide.cpp:494 +#: ../src/sp-guide.cpp:495 msgid "" "Shift+drag to rotate, Ctrl+drag to move origin, Del to " "delete" @@ -13381,17 +13393,17 @@ msgstr "" "Maiusc+trascina per ruotare, Ctrl+trascina per spostare " "l'origine, Canc per cancellare" -#: ../src/sp-guide.cpp:498 +#: ../src/sp-guide.cpp:499 #, c-format msgid "vertical, at %s" msgstr "verticale, a %s" -#: ../src/sp-guide.cpp:501 +#: ../src/sp-guide.cpp:502 #, c-format msgid "horizontal, at %s" msgstr "orizzontale, a %s" -#: ../src/sp-guide.cpp:506 +#: ../src/sp-guide.cpp:507 #, c-format msgid "at %d degrees, through (%s,%s)" msgstr "a %d gradi, intersecante (%s,%s)" @@ -13553,8 +13565,8 @@ msgstr "" #: ../src/sp-text.cpp:361 ../src/verbs.cpp:347 #: ../share/extensions/lorem_ipsum.inx.h:8 -#: ../share/extensions/replace_font.inx.h:11 ../share/extensions/split.inx.h:10 -#: ../share/extensions/text_braille.inx.h:2 +#: ../share/extensions/replace_font.inx.h:11 +#: ../share/extensions/split.inx.h:10 ../share/extensions/text_braille.inx.h:2 #: ../share/extensions/text_extract.inx.h:14 #: ../share/extensions/text_flipcase.inx.h:2 #: ../share/extensions/text_lowercase.inx.h:2 @@ -15046,12 +15058,12 @@ msgid "License" msgstr "Licenza" #: ../src/ui/dialog/document-metadata.cpp:126 -#: ../src/ui/dialog/document-properties.cpp:994 +#: ../src/ui/dialog/document-properties.cpp:1037 msgid "Dublin Core Entities" msgstr "Entità Dublin Core" #: ../src/ui/dialog/document-metadata.cpp:168 -#: ../src/ui/dialog/document-properties.cpp:1056 +#: ../src/ui/dialog/document-properties.cpp:1099 msgid "License" msgstr "Licenza" @@ -15065,15 +15077,16 @@ msgid "If unset, no antialiasing will be done on the drawing" msgstr "Se attivo, l'antialias verrà abilitato per il disegno" #: ../src/ui/dialog/document-properties.cpp:119 -#, fuzzy msgid "Checkerboard background" -msgstr "Vettorizza sfondo" +msgstr "Sfondo a scacchiera" #: ../src/ui/dialog/document-properties.cpp:119 msgid "" "If set, use checkerboard for background, otherwise use background color at " "full opacity." msgstr "" +"Se attivo, usa una scacchiera come sfondo, altrimenti usa il colore di " +"sfondo opaco." #: ../src/ui/dialog/document-properties.cpp:120 msgid "Show page _border" @@ -15302,7 +15315,8 @@ msgstr "_Rimuovi" msgid "Remove selected grid." msgstr "Rimuove la griglia selezionata." -#: ../src/ui/dialog/document-properties.cpp:162 ../src/widgets/toolbox.cpp:1903 +#: ../src/ui/dialog/document-properties.cpp:162 +#: ../src/widgets/toolbox.cpp:1903 msgid "Guides" msgstr "Guide" @@ -15358,136 +15372,136 @@ msgstr "Varie" #. Inkscape::GC::release(defsRepr); #. inform the document, so we can undo #. Color Management -#: ../src/ui/dialog/document-properties.cpp:526 ../src/verbs.cpp:3020 +#: ../src/ui/dialog/document-properties.cpp:542 ../src/verbs.cpp:3020 msgid "Link Color Profile" msgstr "Collega profilo colore" -#: ../src/ui/dialog/document-properties.cpp:623 +#: ../src/ui/dialog/document-properties.cpp:654 msgid "Remove linked color profile" msgstr "Rimuovi profilo colore collegato" -#: ../src/ui/dialog/document-properties.cpp:636 +#: ../src/ui/dialog/document-properties.cpp:673 msgid "Linked Color Profiles:" msgstr "Profili colore collegati:" -#: ../src/ui/dialog/document-properties.cpp:638 +#: ../src/ui/dialog/document-properties.cpp:675 msgid "Available Color Profiles:" msgstr "Profili colore disponibili:" -#: ../src/ui/dialog/document-properties.cpp:640 +#: ../src/ui/dialog/document-properties.cpp:677 msgid "Link Profile" msgstr "Collega profilo" -#: ../src/ui/dialog/document-properties.cpp:643 +#: ../src/ui/dialog/document-properties.cpp:680 msgid "Unlink Profile" msgstr "Scollega profilo" -#: ../src/ui/dialog/document-properties.cpp:721 +#: ../src/ui/dialog/document-properties.cpp:764 msgid "Profile Name" msgstr "Nome profilo" -#: ../src/ui/dialog/document-properties.cpp:757 +#: ../src/ui/dialog/document-properties.cpp:800 msgid "External scripts" msgstr "Script esterni" -#: ../src/ui/dialog/document-properties.cpp:758 +#: ../src/ui/dialog/document-properties.cpp:801 msgid "Embedded scripts" msgstr "Script incorporati" -#: ../src/ui/dialog/document-properties.cpp:763 +#: ../src/ui/dialog/document-properties.cpp:806 msgid "External script files:" msgstr "File di script esterni:" -#: ../src/ui/dialog/document-properties.cpp:765 +#: ../src/ui/dialog/document-properties.cpp:808 msgid "Add the current file name or browse for a file" msgstr "Aggiunge il nome file attuale o cerca un file" -#: ../src/ui/dialog/document-properties.cpp:768 -#: ../src/ui/dialog/document-properties.cpp:845 +#: ../src/ui/dialog/document-properties.cpp:811 +#: ../src/ui/dialog/document-properties.cpp:888 #: ../src/ui/widget/selected-style.cpp:357 msgid "Remove" msgstr "Rimuovi" -#: ../src/ui/dialog/document-properties.cpp:832 +#: ../src/ui/dialog/document-properties.cpp:875 msgid "Filename" msgstr "Nome file" -#: ../src/ui/dialog/document-properties.cpp:840 +#: ../src/ui/dialog/document-properties.cpp:883 msgid "Embedded script files:" msgstr "File di script incorporati:" -#: ../src/ui/dialog/document-properties.cpp:842 +#: ../src/ui/dialog/document-properties.cpp:885 #: ../src/ui/dialog/objects.cpp:1894 msgid "New" msgstr "Nuovo" -#: ../src/ui/dialog/document-properties.cpp:909 +#: ../src/ui/dialog/document-properties.cpp:952 msgid "Script id" msgstr "id script" -#: ../src/ui/dialog/document-properties.cpp:915 +#: ../src/ui/dialog/document-properties.cpp:958 msgid "Content:" msgstr "Contenuto:" -#: ../src/ui/dialog/document-properties.cpp:1032 +#: ../src/ui/dialog/document-properties.cpp:1075 msgid "_Save as default" msgstr "_Salva come predefinito" -#: ../src/ui/dialog/document-properties.cpp:1033 +#: ../src/ui/dialog/document-properties.cpp:1076 msgid "Save this metadata as the default metadata" msgstr "Salva questi metadati come predefiniti" -#: ../src/ui/dialog/document-properties.cpp:1034 +#: ../src/ui/dialog/document-properties.cpp:1077 msgid "Use _default" msgstr "Usa impostazioni pre_definite" -#: ../src/ui/dialog/document-properties.cpp:1035 +#: ../src/ui/dialog/document-properties.cpp:1078 msgid "Use the previously saved default metadata here" msgstr "Usa i metadati precedentemente salvati come predefiniti" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1108 +#: ../src/ui/dialog/document-properties.cpp:1151 msgid "Add external script..." msgstr "Aggiungi script esterno..." -#: ../src/ui/dialog/document-properties.cpp:1147 +#: ../src/ui/dialog/document-properties.cpp:1190 msgid "Select a script to load" msgstr "Seleziona uno script da caricare" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1175 +#: ../src/ui/dialog/document-properties.cpp:1218 msgid "Add embedded script..." msgstr "Aggiungi script incorporato..." #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1206 +#: ../src/ui/dialog/document-properties.cpp:1249 msgid "Remove external script" msgstr "Rimuovi script esterno" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1235 +#: ../src/ui/dialog/document-properties.cpp:1278 msgid "Remove embedded script" msgstr "Rimuovi script incorporato" #. TODO repr->set_content(_EmbeddedContent.get_buffer()->get_text()); #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1331 +#: ../src/ui/dialog/document-properties.cpp:1374 msgid "Edit embedded script" msgstr "Modifica script incorporato" -#: ../src/ui/dialog/document-properties.cpp:1415 +#: ../src/ui/dialog/document-properties.cpp:1458 msgid "Creation" msgstr "Creazione" -#: ../src/ui/dialog/document-properties.cpp:1416 +#: ../src/ui/dialog/document-properties.cpp:1459 msgid "Defined grids" msgstr "Griglie definite" -#: ../src/ui/dialog/document-properties.cpp:1660 +#: ../src/ui/dialog/document-properties.cpp:1703 msgid "Remove grid" msgstr "Rimuovi griglia" -#: ../src/ui/dialog/document-properties.cpp:1752 +#: ../src/ui/dialog/document-properties.cpp:1795 msgid "Changed default display unit" msgstr "Cambiata unità visualizzata" @@ -15742,7 +15756,8 @@ msgstr "Informazioni" #: ../share/extensions/jitternodes.inx.h:12 #: ../share/extensions/layout_nup.inx.h:24 #: ../share/extensions/lindenmayer.inx.h:13 -#: ../share/extensions/lorem_ipsum.inx.h:6 ../share/extensions/measure.inx.h:33 +#: ../share/extensions/lorem_ipsum.inx.h:6 +#: ../share/extensions/measure.inx.h:33 #: ../share/extensions/pathalongpath.inx.h:16 #: ../share/extensions/pathscatter.inx.h:18 #: ../share/extensions/restack.inx.h:25 ../share/extensions/split.inx.h:8 @@ -17795,7 +17810,7 @@ msgstr "_Bloccata" #: ../src/ui/dialog/guides.cpp:47 msgid "Lock the movement of guides" -msgstr "" +msgstr "Blocca il movimento della linea guida" #: ../src/ui/dialog/guides.cpp:48 msgid "Rela_tive change" @@ -17821,7 +17836,7 @@ msgstr "Etichet_ta:" #: ../src/ui/dialog/guides.cpp:51 msgid "Optionally give this guideline a name" -msgstr "Assegna un nome a questa guida" +msgstr "Assegna un nome a questa linea guida" #: ../src/ui/dialog/guides.cpp:52 msgid "_Angle:" @@ -17829,7 +17844,7 @@ msgstr "_Angolo:" #: ../src/ui/dialog/guides.cpp:139 msgid "Set guide properties" -msgstr "Imposta proprietà della guida" +msgstr "Imposta proprietà linea guida" #: ../src/ui/dialog/guides.cpp:169 msgid "Guideline" @@ -18550,7 +18565,7 @@ msgstr "Danese (da)" #: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Dogri (doi)" -msgstr "" +msgstr "Dogri (doi)" #: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Dutch (nl)" @@ -18654,11 +18669,11 @@ msgstr "Kannada (kn)" #: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Kashmiri in Peso-Arabic script (ks@aran)" -msgstr "" +msgstr "Kashmiri in caratteri (ks@aran)" #: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Kashmiri in Devanagari script (ks@deva)" -msgstr "" +msgstr "Kashmiri in caratteri devanagari (ks@deva)" #: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Khmer (km)" @@ -18673,9 +18688,8 @@ msgid "Konkani (kok)" msgstr "Konkani (kok)" #: ../src/ui/dialog/inkscape-preferences.cpp:549 -#, fuzzy msgid "Konkani in Latin script (kok@latin)" -msgstr "Serbo in caratteri latini (sr@latin)" +msgstr "Konkani in caratteri latini (kok@latin)" #: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Korean (ko)" @@ -18695,24 +18709,23 @@ msgstr "Macedone (mk)" #: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Maithili (mai)" -msgstr "" +msgstr "Maithili (mai)" #: ../src/ui/dialog/inkscape-preferences.cpp:551 -#, fuzzy msgid "Malayalam (ml)" -msgstr "Malayalam" +msgstr "Malayalam (ml)" #: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Manipuri (mni)" -msgstr "" +msgstr "Manipuri (mni)" #: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Manipuri in Bengali script (mni@beng)" -msgstr "" +msgstr "Manipuri in caratteri bengalesi (mni@beng)" #: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Marathi (mr)" -msgstr "" +msgstr "Marathi (mr)" #: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Mongolian (mn)" @@ -18732,7 +18745,7 @@ msgstr "Norvegese Nynorsk (nn)" #: ../src/ui/dialog/inkscape-preferences.cpp:553 msgid "Odia (or)" -msgstr "" +msgstr "Odia (or)" #: ../src/ui/dialog/inkscape-preferences.cpp:554 msgid "Panjabi (pa)" @@ -18748,7 +18761,7 @@ msgstr "Portoghese (pt)" #: ../src/ui/dialog/inkscape-preferences.cpp:554 msgid "Portuguese/Brazil (pt_BR)" -msgstr "Portoghese Brasiliano (pt_BR)" +msgstr "Portoghese/Brasiliano (pt_BR)" #: ../src/ui/dialog/inkscape-preferences.cpp:555 msgid "Romanian (ro)" @@ -18760,17 +18773,15 @@ msgstr "Russo (ru)" #: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Sanskrit (sa)" -msgstr "" +msgstr "Sanscrito (sa)" #: ../src/ui/dialog/inkscape-preferences.cpp:556 -#, fuzzy msgid "Santali (sat)" -msgstr "Italiano (it)" +msgstr "Santali (sat)" #: ../src/ui/dialog/inkscape-preferences.cpp:556 -#, fuzzy msgid "Santali in Devanagari script (sat@deva)" -msgstr "Serbo in caratteri latini (sr@latin)" +msgstr "Santali in caratteri devanagari (sat@deva)" #: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Serbian (sr)" @@ -18782,12 +18793,11 @@ msgstr "Serbo in caratteri latini (sr@latin)" #: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Sindhi (sd)" -msgstr "" +msgstr "Sindhi (sd)" #: ../src/ui/dialog/inkscape-preferences.cpp:557 -#, fuzzy msgid "Sindhi in Devanagari script (sd@deva)" -msgstr "Serbo in caratteri latini (sr@latin)" +msgstr "Sindhi in caratteri devanagari (sd@deva)" #: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Slovak (sk)" @@ -18803,16 +18813,15 @@ msgstr "Spagnolo (es)" #: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Spanish/Mexico (es_MX)" -msgstr "Spagnolo messicano (es_MX)" +msgstr "Spagnolo/Messicano (es_MX)" #: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Swedish (sv)" msgstr "Svedese (sv)" #: ../src/ui/dialog/inkscape-preferences.cpp:558 -#, fuzzy msgid "Tamil (ta)" -msgstr "Tamil" +msgstr "Tamil (ta)" #: ../src/ui/dialog/inkscape-preferences.cpp:558 msgid "Telugu (te)" @@ -18832,7 +18841,7 @@ msgstr "Ucraino (uk)" #: ../src/ui/dialog/inkscape-preferences.cpp:559 msgid "Urdu (ur)" -msgstr "" +msgstr "Urdu (ur)" #: ../src/ui/dialog/inkscape-preferences.cpp:560 msgid "Vietnamese (vi)" @@ -18840,7 +18849,7 @@ msgstr "Vietnamita (vi)" #: ../src/ui/dialog/inkscape-preferences.cpp:612 msgid "Language (requires restart):" -msgstr "Lingua (richiede riapertura):" +msgstr "Lingua (richiede riavvio):" #: ../src/ui/dialog/inkscape-preferences.cpp:613 msgid "Set the language for menus and number formats" @@ -19069,19 +19078,16 @@ msgid "Aggressive" msgstr "Aggressivo" #: ../src/ui/dialog/inkscape-preferences.cpp:702 -#, fuzzy msgctxt "Window size" msgid "Small" msgstr "Piccola" #: ../src/ui/dialog/inkscape-preferences.cpp:702 -#, fuzzy msgctxt "Window size" msgid "Large" msgstr "Grande" #: ../src/ui/dialog/inkscape-preferences.cpp:702 -#, fuzzy msgctxt "Window size" msgid "Maximized" msgstr "Massimizzata" @@ -19308,7 +19314,6 @@ msgid "Use current directory for \"Save As ...\"" msgstr "Usa la cartella attuale per \"Salva come...\"" #: ../src/ui/dialog/inkscape-preferences.cpp:893 -#, fuzzy msgid "" "When this option is on, the \"Save as...\" and \"Save a Copy...\" dialogs " "will always open in the directory where the currently open document is; when " @@ -19759,7 +19764,7 @@ msgstr "Preserva il canale K nelle trasformazioni CMYK -> CMYK" #: ../src/ui/dialog/inkscape-preferences.cpp:1091 #: ../src/ui/widget/color-icc-selector.cpp:394 -#: ../src/ui/widget/color-icc-selector.cpp:685 +#: ../src/ui/widget/color-icc-selector.cpp:699 msgid "" msgstr "" @@ -20117,13 +20122,14 @@ msgstr "" "negativo l'interno" #: ../src/ui/dialog/inkscape-preferences.cpp:1266 -#, fuzzy msgid "Mouse move pans when Space is pressed" -msgstr "Tasto sinistro del mouse sposta la tela quando Spazio è premuto" +msgstr "Il mouse muove l'area di lavoro quando la barra spaziatrice è premuta" #: ../src/ui/dialog/inkscape-preferences.cpp:1268 msgid "When on, pressing and holding Space and dragging pans canvas" msgstr "" +"Quando attivo, tenendo premuta la barra spaziatrice e muovendo il mouse " +"l'area di canvas visualizzata viene spostata concordemente" #: ../src/ui/dialog/inkscape-preferences.cpp:1269 msgid "Mouse wheel zooms by default" @@ -20164,7 +20170,7 @@ msgstr "Durata indicatore di aggancio (in secondi):" msgid "" "Controls how long the snap indicator message will be shown, before it " "disappears" -msgstr "" +msgstr "Controlla la durata di visualizzazione dell'indicatore di aggancio" #: ../src/ui/dialog/inkscape-preferences.cpp:1287 msgid "What should snap" @@ -20473,7 +20479,7 @@ msgstr "Dividi gruppi creati automaticamente" #: ../src/ui/dialog/inkscape-preferences.cpp:1400 msgid "Ungroup groups created when setting clip/mask" -msgstr "" +msgstr "Dividi gruppi creati quando viene impostato un fissaggio/maschera" #: ../src/ui/dialog/inkscape-preferences.cpp:1402 msgid "Clippaths and masks" @@ -21032,7 +21038,8 @@ msgstr "" msgid "Y tilt" msgstr "" -#: ../src/ui/dialog/input.cpp:1616 ../src/ui/widget/color-wheel-selector.cpp:29 +#: ../src/ui/dialog/input.cpp:1616 +#: ../src/ui/widget/color-wheel-selector.cpp:29 msgid "Wheel" msgstr "Ruota" @@ -21299,12 +21306,11 @@ msgstr "Distanza di aggancio" #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:213 #, fuzzy msgid "Position (%):" -msgstr "Posizione:" +msgstr "Posizione (%):" #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:216 -#, fuzzy msgid "%1:" -msgstr "k1:" +msgstr "%1:" #: ../src/ui/dialog/lpe-powerstroke-properties.cpp:122 msgid "Modify Node Position" @@ -21528,93 +21534,78 @@ msgid "Unhide object" msgstr "Mostra oggetto" #: ../src/ui/dialog/objects.cpp:874 -#, fuzzy msgid "Unhide objects" -msgstr "Mostra oggetto" +msgstr "Mostra oggetti" #: ../src/ui/dialog/objects.cpp:874 -#, fuzzy msgid "Hide objects" -msgstr "Nascondi oggetto" +msgstr "Nascondi oggetti" #: ../src/ui/dialog/objects.cpp:894 -#, fuzzy msgid "Lock objects" -msgstr "Blocca oggetto" +msgstr "Blocca oggetti" #: ../src/ui/dialog/objects.cpp:894 -#, fuzzy msgid "Unlock objects" -msgstr "Sblocca oggetto" +msgstr "Sblocca oggetti" #: ../src/ui/dialog/objects.cpp:906 -#, fuzzy msgid "Layer to group" -msgstr "Sposta livello in cima" +msgstr "Livello a gruppo" #: ../src/ui/dialog/objects.cpp:906 -#, fuzzy msgid "Group to layer" -msgstr "Gruppo a simbolo" +msgstr "Gruppo a livello" #: ../src/ui/dialog/objects.cpp:1104 -#, fuzzy msgid "Moved objects" -msgstr "Nessun oggetto" +msgstr "Sposta oggetti" #: ../src/ui/dialog/objects.cpp:1353 ../src/ui/dialog/tags.cpp:853 #: ../src/ui/dialog/tags.cpp:860 -#, fuzzy msgid "Rename object" -msgstr "Ruota oggetti" +msgstr "Rinomina oggetto" #: ../src/ui/dialog/objects.cpp:1459 -#, fuzzy msgid "Set object highlight color" -msgstr "Imposta titolo oggetto" +msgstr "Imposta colore di evidenziazione" #: ../src/ui/dialog/objects.cpp:1469 -#, fuzzy msgid "Set object opacity" -msgstr "Imposta titolo oggetto" +msgstr "Imposta opacità oggetto" #: ../src/ui/dialog/objects.cpp:1502 -#, fuzzy msgid "Set object blend mode" -msgstr "Imposta etichetta oggetto" +msgstr "Imposta modalità miscela oggetto" #: ../src/ui/dialog/objects.cpp:1558 -#, fuzzy msgid "Set object blur" -msgstr "Imposta etichetta oggetto" +msgstr "Imposta sfocatura oggetto" #: ../src/ui/dialog/objects.cpp:1621 msgctxt "Visibility" msgid "V" -msgstr "" +msgstr "V" #: ../src/ui/dialog/objects.cpp:1622 -#, fuzzy msgctxt "Lock" msgid "L" -msgstr "L" +msgstr "B" #: ../src/ui/dialog/objects.cpp:1623 msgctxt "Type" msgid "T" -msgstr "" +msgstr "T" #: ../src/ui/dialog/objects.cpp:1624 -#, fuzzy msgctxt "Clip and mask" msgid "CM" -msgstr "CMS" +msgstr "FM" #: ../src/ui/dialog/objects.cpp:1625 -#, fuzzy msgctxt "Highlight" msgid "HL" -msgstr "HSL" +msgstr "CS" #: ../src/ui/dialog/objects.cpp:1626 msgid "Label" @@ -21622,116 +21613,108 @@ msgstr "Etichetta" #. In order to get tooltips on header, we must create our own label. #: ../src/ui/dialog/objects.cpp:1668 -#, fuzzy msgid "Toggle visibility of Layer, Group, or Object." -msgstr "Imposta la visibilità del livello attuale" +msgstr "Imposta la visibilità del livello, gruppo o oggetto." #: ../src/ui/dialog/objects.cpp:1681 msgid "Toggle lock of Layer, Group, or Object." -msgstr "" +msgstr "Imposta il blocco del livello, gruppo o oggetto." #: ../src/ui/dialog/objects.cpp:1693 msgid "" "Type: Layer, Group, or Object. Clicking on Layer or Group icon, toggles " "between the two types." msgstr "" +"Tipo: Livello, Gruppo o Oggetto. Cliccando sull'icona di Livello o Gruppo si " +"commuta tra i due tipi." #: ../src/ui/dialog/objects.cpp:1712 msgid "Is object clipped and/or masked?" -msgstr "" +msgstr "Oggetto con fissaggio e/o maschera" #: ../src/ui/dialog/objects.cpp:1723 msgid "" "Highlight color of outline in Node tool. Click to set. If alpha is zero, use " "inherited color." msgstr "" +"Colore di evidenziazione dello scheletro del tracciato con lo strumento di " +"modifica nodi. Clicca per impostare. Se alpha è zero, utilizza il colore " +"predefinito." #: ../src/ui/dialog/objects.cpp:1734 msgid "" "Layer/Group/Object label (inkscape:label). Double-click to set. Default " "value is object 'id'." msgstr "" +"Etichetta del Livello/Gruppo/Oggetto (inkscape:label). Fai doppio clic per " +"impostarla. Il valore predefinito è l''id' dell'oggetto." #: ../src/ui/dialog/objects.cpp:1831 -#, fuzzy msgid "Add layer..." -msgstr "_Aggiungi livello..." +msgstr "Aggiungi livello..." #: ../src/ui/dialog/objects.cpp:1838 -#, fuzzy msgid "Remove object" -msgstr "Rimuovi font" +msgstr "Rimuovi oggetto" #: ../src/ui/dialog/objects.cpp:1846 -#, fuzzy msgid "Move To Bottom" msgstr "Sposta in fondo" #: ../src/ui/dialog/objects.cpp:1870 -#, fuzzy msgid "Move To Top" -msgstr "Sposta a:" +msgstr "Sposta in cima" #: ../src/ui/dialog/objects.cpp:1878 -#, fuzzy msgid "Collapse All" -msgstr "Elimina tu_tto" +msgstr "Comprimi tutto" #: ../src/ui/dialog/objects.cpp:1892 -#, fuzzy msgid "Rename" -msgstr "_Rinomina" +msgstr "Rinomina" #: ../src/ui/dialog/objects.cpp:1898 msgid "Solo" -msgstr "" +msgstr "Solo" #: ../src/ui/dialog/objects.cpp:1899 -#, fuzzy msgid "Show All" -msgstr "Mostra:" +msgstr "Mostra tutti" #: ../src/ui/dialog/objects.cpp:1900 -#, fuzzy msgid "Hide All" -msgstr "Mostra tutto" +msgstr "Nascondi tutti" #: ../src/ui/dialog/objects.cpp:1904 -#, fuzzy msgid "Lock Others" -msgstr "Blocca altri livelli" +msgstr "Blocca altri" #: ../src/ui/dialog/objects.cpp:1905 -#, fuzzy msgid "Lock All" -msgstr "Sblocca tutto" +msgstr "Blocca tutti" #. LockAndHide #: ../src/ui/dialog/objects.cpp:1906 ../src/verbs.cpp:3011 msgid "Unlock All" -msgstr "Sblocca tutto" +msgstr "Sblocca tutti" #: ../src/ui/dialog/objects.cpp:1910 -#, fuzzy msgid "Up" msgstr "Alza" #: ../src/ui/dialog/objects.cpp:1911 -#, fuzzy msgid "Down" -msgstr "Contrario" +msgstr "Abbassa" #: ../src/ui/dialog/objects.cpp:1920 -#, fuzzy msgid "Set Clip" -msgstr "Imposta fi_ssaggio" +msgstr "Imposta fissaggio" #. will never be implemented #. _watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_OBJECT_SET_INVERSE_CLIPPATH, 0, "Set Inverse Clip", (int)BUTTON_SETINVCLIP ) ); #: ../src/ui/dialog/objects.cpp:1926 -#, fuzzy msgid "Unset Clip" -msgstr "Imposta fi_ssaggio" +msgstr "Rimuovi fissaggio" #. Set mask #: ../src/ui/dialog/objects.cpp:1930 ../src/ui/interface.cpp:1754 @@ -21739,14 +21722,12 @@ msgid "Set Mask" msgstr "Imposta maschera" #: ../src/ui/dialog/objects.cpp:1931 -#, fuzzy msgid "Unset Mask" -msgstr "Imposta maschera" +msgstr "Rimuovi maschera" #: ../src/ui/dialog/objects.cpp:1953 -#, fuzzy msgid "Select Highlight Color" -msgstr "Colore di e_videnziazione:" +msgstr "Seleziona colore di evidenziazione" #: ../src/ui/dialog/ocaldialogs.cpp:715 msgid "Clipart found" @@ -21879,15 +21860,18 @@ msgstr "Algoritmo Kopf-Lischinski" msgid "Output" msgstr "Output" -#: ../src/ui/dialog/pixelartdialog.cpp:297 ../src/ui/dialog/tracedialog.cpp:814 +#: ../src/ui/dialog/pixelartdialog.cpp:297 +#: ../src/ui/dialog/tracedialog.cpp:814 msgid "Reset all settings to defaults" msgstr "Reimposta tutti i valori ai predefiniti" -#: ../src/ui/dialog/pixelartdialog.cpp:302 ../src/ui/dialog/tracedialog.cpp:819 +#: ../src/ui/dialog/pixelartdialog.cpp:302 +#: ../src/ui/dialog/tracedialog.cpp:819 msgid "Abort a trace in progress" msgstr "Annulla una vettorizzazione in corso" -#: ../src/ui/dialog/pixelartdialog.cpp:306 ../src/ui/dialog/tracedialog.cpp:823 +#: ../src/ui/dialog/pixelartdialog.cpp:306 +#: ../src/ui/dialog/tracedialog.cpp:823 msgid "Execute the trace" msgstr "Esegue la vettorizzazione" @@ -22266,7 +22250,8 @@ msgid "Preview Text:" msgstr "Anteprima testo:" #: ../src/ui/dialog/swatches.cpp:202 ../src/ui/tools/gradient-tool.cpp:360 -#: ../src/ui/tools/gradient-tool.cpp:458 ../src/widgets/gradient-vector.cpp:801 +#: ../src/ui/tools/gradient-tool.cpp:458 +#: ../src/widgets/gradient-vector.cpp:801 msgid "Add gradient stop" msgstr "Aggiungi passaggio del gradiente" @@ -22337,18 +22322,16 @@ msgstr "Simboli senza nome" #: ../src/ui/dialog/tags.cpp:270 ../src/ui/dialog/tags.cpp:569 #: ../src/ui/dialog/tags.cpp:683 ../src/ui/dialog/tags.cpp:946 -#, fuzzy msgid "Remove from selection set" -msgstr "Rimuovi la maschera dalla selezione" +msgstr "Rimuove selezione dal set" #: ../src/ui/dialog/tags.cpp:427 msgid "Items" -msgstr "" +msgstr "Oggetti" #: ../src/ui/dialog/tags.cpp:666 ../src/ui/dialog/tags.cpp:944 -#, fuzzy msgid "Add selection to set" -msgstr "Sposta la selezione in cima" +msgstr "Aggiunge selezione al set" #: ../src/ui/dialog/tags.cpp:824 #, fuzzy @@ -22356,14 +22339,12 @@ msgid "Moved sets" msgstr "Muovi gradiente" #: ../src/ui/dialog/tags.cpp:1004 -#, fuzzy msgid "Add a new selection set" -msgstr "Cambia spaziatura connettori" +msgstr "Aggiungi un nuovo set di selezione" #: ../src/ui/dialog/tags.cpp:1013 -#, fuzzy msgid "Remove Item/Set" -msgstr "Rimuovi effetti" +msgstr "Rimuovi oggetto/set" #: ../src/ui/dialog/template-widget.cpp:37 msgid "More info" @@ -22399,8 +22380,7 @@ msgid "Set as _default" msgstr "Imposta come _predefinito" #: ../src/ui/dialog/text-edit.cpp:87 -#, fuzzy -msgid "AaBbCcIiPpQq12369$€¢?.;/()" +msgid "AaBbCcIiPpQq12369$ےے?.;/()" msgstr "AaBbCcIiPpQq12369$€¢?.;/()" #. Align buttons @@ -22433,9 +22413,9 @@ msgid "Vertical text" msgstr "Testo verticale" #: ../src/ui/dialog/text-edit.cpp:130 ../src/ui/dialog/text-edit.cpp:131 -#, fuzzy msgid "Spacing between baselines (percent of font size)" -msgstr "Spaziatura tra le linee (percentuale dimensione carattere)" +msgstr "" +"Spaziatura tra le linee tipografiche (percentuale dimensione carattere)" #: ../src/ui/dialog/text-edit.cpp:147 msgid "Text path offset" @@ -23082,7 +23062,7 @@ msgstr "Modifica gruppo #%1" #: ../src/ui/interface.cpp:1528 #, fuzzy msgid "_Pop selection out of group" -msgstr "_Tratta selezione come gruppo: " +msgstr "_Estrai selezione dal gruppo" #. Item dialog #: ../src/ui/interface.cpp:1656 ../src/verbs.cpp:2940 @@ -23708,7 +23688,8 @@ msgid "Rotate handle" msgstr "Ruota maniglia" #. We need to call MPM's method because it could have been our last node -#: ../src/ui/tool/path-manipulator.cpp:1555 ../src/widgets/node-toolbar.cpp:397 +#: ../src/ui/tool/path-manipulator.cpp:1555 +#: ../src/widgets/node-toolbar.cpp:397 msgid "Delete node" msgstr "Cancella nodo" @@ -25635,9 +25616,8 @@ msgid "MetadataLicence|Other" msgstr "Altro" #: ../src/ui/widget/licensor.cpp:72 -#, fuzzy msgid "Document license updated" -msgstr "Pulisci documento" +msgstr "Licenza documento aggiornata" #: ../src/ui/widget/object-composite-settings.cpp:47 #: ../src/ui/widget/selected-style.cpp:1118 @@ -25700,24 +25680,20 @@ msgid "Bottom margin" msgstr "Margine inferiore" #: ../src/ui/widget/page-sizer.cpp:244 -#, fuzzy msgid "Scale _x:" -msgstr "Ridimensionamento x" +msgstr "Scala _x:" #: ../src/ui/widget/page-sizer.cpp:244 -#, fuzzy msgid "Scale X" -msgstr "Ridimensionamento x" +msgstr "Scala X" #: ../src/ui/widget/page-sizer.cpp:245 -#, fuzzy msgid "Scale _y:" -msgstr "Ridimensionamento y" +msgstr "Scala _y:" #: ../src/ui/widget/page-sizer.cpp:245 -#, fuzzy msgid "Scale Y" -msgstr "Ridimensionamento x" +msgstr "Scala Y" #: ../src/ui/widget/page-sizer.cpp:323 msgid "Orientation:" @@ -25760,9 +25736,8 @@ msgid "" msgstr "" #: ../src/ui/widget/page-sizer.cpp:483 -#, fuzzy msgid "_Viewbox..." -msgstr "_Visualizza" +msgstr "_Viewbox..." #: ../src/ui/widget/page-sizer.cpp:590 msgid "Set page size" @@ -25773,13 +25748,12 @@ msgid "User units per " msgstr "" #: ../src/ui/widget/page-sizer.cpp:932 -#, fuzzy msgid "Set page scale" -msgstr "Imposta dimensione pagina" +msgstr "Imposta scala pagina" #: ../src/ui/widget/page-sizer.cpp:958 msgid "Set 'viewBox'" -msgstr "" +msgstr "Imposta 'viewBox'" #: ../src/ui/widget/panel.cpp:116 msgid "List" @@ -26015,7 +25989,7 @@ msgstr "Gradiente radiale di contorno" #: ../src/ui/widget/selected-style.cpp:219 #, fuzzy msgid "M" -msgstr "L" +msgstr "M" #: ../src/ui/widget/selected-style.cpp:222 #, fuzzy @@ -26508,14 +26482,13 @@ msgid "Flip vertically" msgstr "Rifletti verticalmente" #: ../src/verbs.cpp:1590 -#, fuzzy, c-format +#, c-format msgid "Set %d" -msgstr "Imposta ritardo" +msgstr "Set %d" #: ../src/verbs.cpp:1599 ../src/verbs.cpp:2729 -#, fuzzy msgid "Create new selection set" -msgstr "Crea nuovo elemento nodo" +msgstr "Crea nuovo set di selezione" #. 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 @@ -27096,7 +27069,7 @@ msgstr "Imposta il blocco di tutte le guide nel documento" #: ../src/verbs.cpp:2547 msgid "Create _Guides Around the Page" -msgstr "Crea _guide intorno alla pagina" +msgstr "Crea _guide attorno alla pagina" #: ../src/verbs.cpp:2548 msgid "Create four guides aligned with the page borders" @@ -28498,9 +28471,8 @@ msgid "View Layers" msgstr "Mostra i livelli" #: ../src/verbs.cpp:2948 -#, fuzzy msgid "Object_s..." -msgstr "Oggetti" +msgstr "Ogge_tti..." #: ../src/verbs.cpp:2949 #, fuzzy @@ -28508,9 +28480,8 @@ msgid "View Objects" msgstr "Oggetti" #: ../src/verbs.cpp:2950 -#, fuzzy msgid "Selection se_ts..." -msgstr "Area selezione" +msgstr "Set di selezione..." #: ../src/verbs.cpp:2951 #, fuzzy @@ -29287,7 +29258,7 @@ msgstr "" #: ../src/widgets/connector-toolbar.cpp:406 msgid "Do not allow overlapping shapes" -msgstr "Non permettere la sovrapposizione delle forme" +msgstr "Non permette la sovrapposizione delle forme" #: ../src/widgets/dash-selector.cpp:59 msgid "Dash pattern" @@ -29373,14 +29344,12 @@ msgid "%s%s - Inkscape" msgstr "%s%s - Inkscape" #: ../src/widgets/desktop-widget.cpp:1111 -#, fuzzy msgid "Locked all guides" -msgstr "Blocca tutti i livelli" +msgstr "Tutte le guide sono bloccate" #: ../src/widgets/desktop-widget.cpp:1113 -#, fuzzy msgid "Unlocked all guides" -msgstr "Sblocca tutti i livelli" +msgstr "Tutte le guide sono sbloccate" #: ../src/widgets/desktop-widget.cpp:1130 #, fuzzy @@ -29496,16 +29465,14 @@ msgid "Eraser Mass" msgstr "Gomma" #: ../src/widgets/eraser-toolbar.cpp:172 -#, fuzzy msgid "Increase to make the eraser drag behind, as if slowed by inertia" msgstr "" -"Aumentare il valore per impostare il ritardo al pennino, come se fosse " +"Aumenta il valore per impostare il ritardo al pennino, come se fosse " "rallentato per inerzia" #: ../src/widgets/eraser-toolbar.cpp:186 ../src/widgets/eraser-toolbar.cpp:187 -#, fuzzy msgid "Break apart cut items" -msgstr "Separa il percorso nel nodo selezionato" +msgstr "Separa gli oggetti tagliati" #: ../src/widgets/fill-style.cpp:356 msgid "Change fill rule" @@ -29553,7 +29520,7 @@ msgstr "Stile" #: ../src/widgets/font-selector.cpp:226 msgid "Face" -msgstr "Face" +msgstr "Stile" #: ../src/widgets/font-selector.cpp:255 ../share/extensions/dots.inx.h:3 #: ../share/extensions/nicechart.inx.h:17 @@ -29626,27 +29593,33 @@ msgstr "radiale" msgid "Create radial (elliptic or circular) gradient" msgstr "Crea un gradiente radiale (ellittico o circolare)" -#: ../src/widgets/gradient-toolbar.cpp:1044 ../src/widgets/mesh-toolbar.cpp:387 +#: ../src/widgets/gradient-toolbar.cpp:1044 +#: ../src/widgets/mesh-toolbar.cpp:387 msgid "New:" msgstr "Nuovo:" -#: ../src/widgets/gradient-toolbar.cpp:1067 ../src/widgets/mesh-toolbar.cpp:410 +#: ../src/widgets/gradient-toolbar.cpp:1067 +#: ../src/widgets/mesh-toolbar.cpp:410 msgid "fill" msgstr "riempimento" -#: ../src/widgets/gradient-toolbar.cpp:1067 ../src/widgets/mesh-toolbar.cpp:410 +#: ../src/widgets/gradient-toolbar.cpp:1067 +#: ../src/widgets/mesh-toolbar.cpp:410 msgid "Create gradient in the fill" msgstr "Crea gradiente per il riempimento" -#: ../src/widgets/gradient-toolbar.cpp:1071 ../src/widgets/mesh-toolbar.cpp:414 +#: ../src/widgets/gradient-toolbar.cpp:1071 +#: ../src/widgets/mesh-toolbar.cpp:414 msgid "stroke" msgstr "contorno" -#: ../src/widgets/gradient-toolbar.cpp:1071 ../src/widgets/mesh-toolbar.cpp:414 +#: ../src/widgets/gradient-toolbar.cpp:1071 +#: ../src/widgets/mesh-toolbar.cpp:414 msgid "Create gradient in the stroke" msgstr "Crea gradiente per il contorno" -#: ../src/widgets/gradient-toolbar.cpp:1074 ../src/widgets/mesh-toolbar.cpp:417 +#: ../src/widgets/gradient-toolbar.cpp:1074 +#: ../src/widgets/mesh-toolbar.cpp:417 msgid "on:" msgstr "su:" @@ -29746,7 +29719,8 @@ msgstr "Collega gradienti" msgid "Link gradients to change all related gradients" msgstr "Collega i gradienti per modificare tutti i gradienti correlati" -#: ../src/widgets/gradient-vector.cpp:317 ../src/widgets/paint-selector.cpp:965 +#: ../src/widgets/gradient-vector.cpp:317 +#: ../src/widgets/paint-selector.cpp:965 #: ../src/widgets/stroke-marker-selector.cpp:154 msgid "No document selected" msgstr "Nessun documento selezionato" @@ -29951,13 +29925,12 @@ msgid "Scale %" msgstr "Ridimensionamento x" #: ../src/widgets/measure-toolbar.cpp:315 -#, fuzzy msgid "Scale %:" -msgstr "Ridimensiona:" +msgstr "Scala %:" #: ../src/widgets/measure-toolbar.cpp:316 msgid "Scale the results" -msgstr "" +msgstr "Scala i risultati della misurazione" #: ../src/widgets/measure-toolbar.cpp:329 #, fuzzy @@ -30418,9 +30391,8 @@ msgid "Radial gradient" msgstr "Gradiente radiale" #: ../src/widgets/paint-selector.cpp:799 -#, fuzzy msgid "Mesh gradient" -msgstr "Gradiente lineare" +msgstr "Gradiente a maglia" #: ../src/widgets/paint-selector.cpp:1098 msgid "" @@ -30503,16 +30475,15 @@ msgstr "Bezier" #: ../src/widgets/pencil-toolbar.cpp:106 msgid "Create regular Bezier path" -msgstr "Crea tracciati Bezier normali" +msgstr "Crea tracciato Bezier normalr" #: ../src/widgets/pencil-toolbar.cpp:113 msgid "Create Spiro path" msgstr "Crea tracciato Spiro" #: ../src/widgets/pencil-toolbar.cpp:119 -#, fuzzy msgid "Create BSpline path" -msgstr "Crea tracciato Spiro" +msgstr "Crea tracciato BSpline" #: ../src/widgets/pencil-toolbar.cpp:125 msgid "Zigzag" @@ -30557,9 +30528,8 @@ msgid "Bend from clipboard" msgstr "Dagli appunti" #: ../src/widgets/pencil-toolbar.cpp:182 -#, fuzzy msgid "Last applied" -msgstr "Ultima diapositiva:" +msgstr "Ultima applicata" #: ../src/widgets/pencil-toolbar.cpp:207 ../src/widgets/pencil-toolbar.cpp:208 msgid "Shape:" @@ -30977,11 +30947,10 @@ msgstr "" "La larghezza dell'area di spruzzo (relativa all'area della tela visibile)" #: ../src/widgets/spray-toolbar.cpp:312 -#, fuzzy msgid "Use the pressure of the input device to alter the width of spray area" msgstr "" -"Usa la pressione del dispositivo di input per alterare la larghezza della " -"penna" +"Usa la pressione del dispositivo di input per alterare la larghezza " +"dell'area di spruzzo" #: ../src/widgets/spray-toolbar.cpp:323 msgid "(maximum mean)" @@ -31039,14 +31008,12 @@ msgid "Spray objects in a single path" msgstr "Spruzza oggetti in un singolo tracciato" #: ../src/widgets/spray-toolbar.cpp:383 -#, fuzzy msgid "Delete sprayed items" -msgstr "Cancella passaggio del gradiente" +msgstr "Cancella oggetti spruzzati" #: ../src/widgets/spray-toolbar.cpp:384 -#, fuzzy msgid "Delete sprayed items from selection" -msgstr "Prendi forma dalla selezione..." +msgstr "Cancella oggetti spruzzati dalla selezione" #: ../src/widgets/spray-toolbar.cpp:388 ../src/widgets/tweak-toolbar.cpp:253 msgid "Mode" @@ -31121,11 +31088,10 @@ msgstr "" "dell'oggetto originale" #: ../src/widgets/spray-toolbar.cpp:477 -#, fuzzy msgid "Use the pressure of the input device to alter the scale of new items" msgstr "" -"Usa la pressione del dispositivo di input per alterare la larghezza della " -"penna" +"Usa la pressione del dispositivo di input per alterare la scala dei nuovi " +"oggetti" #: ../src/widgets/spray-toolbar.cpp:489 ../src/widgets/spray-toolbar.cpp:490 msgid "" @@ -31164,29 +31130,24 @@ msgid "Apply over no transparent areas" msgstr "" #: ../src/widgets/spray-toolbar.cpp:593 ../src/widgets/spray-toolbar.cpp:594 -#, fuzzy msgid "Prevent overlapping objects" -msgstr "Seleziona un oggetto" +msgstr "Evita la sovrapposizione di oggetti" #: ../src/widgets/spray-toolbar.cpp:605 -#, fuzzy msgid "(minimum offset)" -msgstr "(forza minima)" +msgstr "(scostamento minimo)" #: ../src/widgets/spray-toolbar.cpp:605 -#, fuzzy msgid "(maximum offset)" -msgstr "(forza massima)" +msgstr "(scostamento massimo)" #: ../src/widgets/spray-toolbar.cpp:608 -#, fuzzy msgid "Offset %" -msgstr "Scostamento y" +msgstr "Scostamento %" #: ../src/widgets/spray-toolbar.cpp:608 -#, fuzzy msgid "Offset %:" -msgstr "Posizione:" +msgstr "Scostamento %:" #: ../src/widgets/spray-toolbar.cpp:609 msgid "Increase to segregate objects more (value in percent)" @@ -31455,33 +31416,28 @@ msgid "Square cap" msgstr "Estremo squadrato" #: ../src/widgets/stroke-style.cpp:392 -#, fuzzy msgid "Fill, Stroke, Markers" -msgstr "Stile delimitatori contorno" +msgstr "Riempimento, Contorno, Delimitatori" #: ../src/widgets/stroke-style.cpp:396 -#, fuzzy msgid "Stroke, Fill, Markers" -msgstr "Stile delimitatori contorno" +msgstr "Contorno, Riempimento, Delimitatori" #: ../src/widgets/stroke-style.cpp:400 -#, fuzzy msgid "Fill, Markers, Stroke" -msgstr "Riempimento e contorni" +msgstr "Riempimento, Delimitatori, Contorno" #: ../src/widgets/stroke-style.cpp:408 -#, fuzzy msgid "Markers, Fill, Stroke" -msgstr "Riempimento e contorni" +msgstr "Delimitatori, Riempimento, Contorno" #: ../src/widgets/stroke-style.cpp:412 -#, fuzzy msgid "Stroke, Markers, Fill" -msgstr "Stile delimitatori contorno" +msgstr "Contorno, Delimitatori, Riempimento" #: ../src/widgets/stroke-style.cpp:416 msgid "Markers, Stroke, Fill" -msgstr "" +msgstr "Delimitatori, Contorno, Riempimento" #: ../src/widgets/stroke-style.cpp:534 msgid "Set markers" @@ -31524,9 +31480,8 @@ msgid "Text: Change line-height" msgstr "Testo: Cambia spaziatura linee" #: ../src/widgets/text-toolbar.cpp:728 -#, fuzzy msgid "Text: Change line-height unit" -msgstr "Testo: Cambia spaziatura linee" +msgstr "Testo: Cambia unità spaziatura linee" #: ../src/widgets/text-toolbar.cpp:777 msgid "Text: Change word-spacing" @@ -31549,9 +31504,8 @@ msgid "Text: Change rotate" msgstr "Testo: Cambia rotazione" #: ../src/widgets/text-toolbar.cpp:977 -#, fuzzy msgid "Text: Change writing mode" -msgstr "Testo: Cambia orientamento" +msgstr "Testo: Cambia modalità scrittura" #: ../src/widgets/text-toolbar.cpp:1031 msgid "Text: Change orientation" @@ -31622,28 +31576,25 @@ msgid "Horizontal" msgstr "Orizzontale" #: ../src/widgets/text-toolbar.cpp:1746 -#, fuzzy msgid "Vertical — RL" -msgstr "Verticale" +msgstr "Verticale - DS" #: ../src/widgets/text-toolbar.cpp:1747 msgid "Vertical text — lines: right to left" -msgstr "" +msgstr "Testo verticale - righe da destra a sinistra" #: ../src/widgets/text-toolbar.cpp:1753 -#, fuzzy msgid "Vertical — LR" -msgstr "Verticale" +msgstr "Verticale - SD" #: ../src/widgets/text-toolbar.cpp:1754 msgid "Vertical text — lines: left to right" -msgstr "" +msgstr "Testo verticale - righe da sinistra a destra" #. Name #: ../src/widgets/text-toolbar.cpp:1759 -#, fuzzy msgid "Writing mode" -msgstr "Modalità disegno" +msgstr "Modalità scrittura" #. Label #: ../src/widgets/text-toolbar.cpp:1760 @@ -31651,28 +31602,24 @@ msgid "Block progression" msgstr "" #: ../src/widgets/text-toolbar.cpp:1789 -#, fuzzy msgid "Auto glyph orientation" -msgstr "Segui orientamento tracciato" +msgstr "Orientazione glifi automatica" #: ../src/widgets/text-toolbar.cpp:1796 -#, fuzzy msgid "Upright" -msgstr "Schiarisci" +msgstr "Verticale" #: ../src/widgets/text-toolbar.cpp:1797 -#, fuzzy msgid "Upright glyph orientation" -msgstr "Orientamento testo" +msgstr "Orientazione glifi verticale" #: ../src/widgets/text-toolbar.cpp:1804 msgid "Sideways" -msgstr "" +msgstr "Orizzontale" #: ../src/widgets/text-toolbar.cpp:1805 -#, fuzzy msgid "Sideways glyph orientation" -msgstr "Segui orientamento tracciato" +msgstr "Orientazione glifi orizzontale" #. Name #: ../src/widgets/text-toolbar.cpp:1811 @@ -31682,7 +31629,7 @@ msgstr "Orientamento testo" #. Label #: ../src/widgets/text-toolbar.cpp:1812 msgid "Text (glyph) orientation in vertical text." -msgstr "" +msgstr "Orientazione testo (glifi) nel testo verticale." #. Drop down menu #: ../src/widgets/text-toolbar.cpp:1845 @@ -31711,9 +31658,8 @@ msgstr "Linea:" #. short label #: ../src/widgets/text-toolbar.cpp:1852 -#, fuzzy msgid "Spacing between baselines (times font size)" -msgstr "Spaziatura tra le linee (volte dimensione carattere)" +msgstr "Spaziatura tra le linee tipografiche (volte dimensione carattere)" #. Drop down menu #: ../src/widgets/text-toolbar.cpp:1884 ../src/widgets/text-toolbar.cpp:1915 @@ -32548,7 +32494,7 @@ msgstr "Seleziona un oggetto" #: ../share/extensions/gimp_xcf.py:37 #, fuzzy msgid "Inkscape must be installed and set in your path variable." -msgstr "Gimp deve essere installato e impostato nei percorsi." +msgstr "Inkscape deve essere installato e impostato nei percorsi." #: ../share/extensions/gimp_xcf.py:41 msgid "Gimp must be installed and set in your path variable." @@ -32859,7 +32805,8 @@ msgid "Area is zero, cannot calculate Center of Mass" msgstr "" #: ../share/extensions/pathalongpath.py:207 -#: ../share/extensions/pathscatter.py:226 ../share/extensions/perspective.py:50 +#: ../share/extensions/pathscatter.py:226 +#: ../share/extensions/perspective.py:50 msgid "This extension requires two selected paths." msgstr "Questa estensione richiede che vengan selezionati due tracciati." @@ -32892,7 +32839,8 @@ msgstr "" "derivati Debian questo può essere fatto col comando `sudo apt-get install " "python-numpy`." -#: ../share/extensions/perspective.py:58 ../share/extensions/summersnight.py:49 +#: ../share/extensions/perspective.py:58 +#: ../share/extensions/summersnight.py:49 #, python-format msgid "" "The first selected object is of type '%s'.\n" @@ -32901,14 +32849,16 @@ msgstr "" "Il primo elemento selezionato è del tipo '%s'.\n" "Provare prima il procedimento Tracciato->Da oggetto a tracciato." -#: ../share/extensions/perspective.py:65 ../share/extensions/summersnight.py:57 +#: ../share/extensions/perspective.py:65 +#: ../share/extensions/summersnight.py:57 msgid "" "This extension requires that the second selected path be four nodes long." msgstr "" "Questa estensione richiede che il secondo tracciato selezionato sia lungo " "esattamente quattro nodi." -#: ../share/extensions/perspective.py:91 ../share/extensions/summersnight.py:90 +#: ../share/extensions/perspective.py:91 +#: ../share/extensions/summersnight.py:90 msgid "" "The second selected object is a group, not a path.\n" "Try using the procedure Object->Ungroup." @@ -32916,7 +32866,8 @@ msgstr "" "Il secondo elemento selezionato è un gruppo, non un tracciato.\n" "Provare prima il procedimento Oggetto->Dividi." -#: ../share/extensions/perspective.py:93 ../share/extensions/summersnight.py:92 +#: ../share/extensions/perspective.py:93 +#: ../share/extensions/summersnight.py:92 msgid "" "The second selected object is not a path.\n" "Try using the procedure Path->Object to Path." @@ -32924,7 +32875,8 @@ msgstr "" "Il secondo elemento selezionato non è un tracciato.\n" "Provare prima il procedimento Tracciato->Da oggetto a tracciato." -#: ../share/extensions/perspective.py:96 ../share/extensions/summersnight.py:95 +#: ../share/extensions/perspective.py:96 +#: ../share/extensions/summersnight.py:95 msgid "" "The first selected object is not a path.\n" "Try using the procedure Path->Object to Path." @@ -34093,84 +34045,70 @@ msgid "Embed Selected Images" msgstr "Incorpora immagini selezionate" #: ../share/extensions/empty_business_card.inx.h:1 -#, fuzzy msgid "Business Card" -msgstr "Biglietto da visita 85x54mm" +msgstr "Biglietto da visita" #: ../share/extensions/empty_business_card.inx.h:2 -#, fuzzy msgid "Business card size:" -msgstr "Biglietto da visita 85x54mm" +msgstr "Dimensione biglietto da visita:" #: ../share/extensions/empty_desktop.inx.h:1 -#, fuzzy msgid "Desktop" -msgstr "Desktop 640x480" +msgstr "Desktop" #: ../share/extensions/empty_desktop.inx.h:2 -#, fuzzy msgid "Desktop size:" -msgstr "Dimensione punto:" +msgstr "Dimensione desktop:" #. Maximum size is '16k' #: ../share/extensions/empty_desktop.inx.h:4 #: ../share/extensions/empty_generic.inx.h:2 #: ../share/extensions/empty_video.inx.h:4 -#, fuzzy msgid "Custom Width:" -msgstr "Personalizzata" +msgstr "Larghezza personalizzata:" #: ../share/extensions/empty_desktop.inx.h:5 #: ../share/extensions/empty_generic.inx.h:3 #: ../share/extensions/empty_video.inx.h:5 -#, fuzzy msgid "Custom Height:" -msgstr "Altezza della maiuscola:" +msgstr "Altezza personalizzata:" #: ../share/extensions/empty_dvd_cover.inx.h:1 -#, fuzzy msgid "DVD Cover" -msgstr "Copertina" +msgstr "Copertina DVD" #: ../share/extensions/empty_dvd_cover.inx.h:2 -#, fuzzy msgid "DVD spine width:" -msgstr "Larghezza linea" +msgstr "Spessore cover DVD:" #: ../share/extensions/empty_dvd_cover.inx.h:3 msgid "DVD cover bleed (mm):" -msgstr "" +msgstr "Margine aggiuntivo cover DVD (mm):" #: ../share/extensions/empty_generic.inx.h:1 -#, fuzzy msgid "Generic Canvas" -msgstr "Tela di lino" +msgstr "Canvas generico" #: ../share/extensions/empty_generic.inx.h:4 -#, fuzzy msgid "SVG Unit:" -msgstr "Unità:" +msgstr "Unità SVG:" #: ../share/extensions/empty_generic.inx.h:5 -#, fuzzy msgid "Canvas background:" -msgstr "Vettorizza sfondo" +msgstr "Sfondo canvas:" #: ../share/extensions/empty_generic.inx.h:6 #: ../share/extensions/empty_page.inx.h:5 -#, fuzzy msgid "Hide border" -msgstr "Bordo con cresta" +msgstr "Nascondi bordi" #: ../share/extensions/empty_icon.inx.h:1 -#, fuzzy msgid "Icon" -msgstr "Iconifica" +msgstr "Icona" #: ../share/extensions/empty_icon.inx.h:2 -#, fuzzy msgid "Icon size:" -msgstr "Dimensione carattere:" +msgstr "Dimensione icona:" #: ../share/extensions/empty_page.inx.h:2 msgid "Page size:" @@ -34181,19 +34119,16 @@ msgid "Page orientation:" msgstr "Orientamento della pagina:" #: ../share/extensions/empty_page.inx.h:4 -#, fuzzy msgid "Page background:" -msgstr "Vettorizza sfondo" +msgstr "Sfondo pagina:" #: ../share/extensions/empty_video.inx.h:1 -#, fuzzy msgid "Video Screen" -msgstr "Scherma" +msgstr "Video screen" #: ../share/extensions/empty_video.inx.h:2 -#, fuzzy msgid "Video size:" -msgstr "Dimensione punto:" +msgstr "Dimensione video:" #: ../share/extensions/eps_input.inx.h:1 msgid "EPS Input" @@ -35713,24 +35648,28 @@ msgid "" msgstr "" #: ../share/extensions/hpgl_input.inx.h:3 -#: ../share/extensions/hpgl_output.inx.h:4 ../share/extensions/plotter.inx.h:32 +#: ../share/extensions/hpgl_output.inx.h:4 +#: ../share/extensions/plotter.inx.h:32 msgid "Resolution X (dpi):" msgstr "Risoluzione X (dpi):" #: ../share/extensions/hpgl_input.inx.h:4 -#: ../share/extensions/hpgl_output.inx.h:5 ../share/extensions/plotter.inx.h:33 +#: ../share/extensions/hpgl_output.inx.h:5 +#: ../share/extensions/plotter.inx.h:33 msgid "" "The amount of steps the plotter moves if it moves for 1 inch on the X axis " "(Default: 1016.0)" msgstr "" #: ../share/extensions/hpgl_input.inx.h:5 -#: ../share/extensions/hpgl_output.inx.h:6 ../share/extensions/plotter.inx.h:34 +#: ../share/extensions/hpgl_output.inx.h:6 +#: ../share/extensions/plotter.inx.h:34 msgid "Resolution Y (dpi):" msgstr "Risoluzione Y (dpi):" #: ../share/extensions/hpgl_input.inx.h:6 -#: ../share/extensions/hpgl_output.inx.h:7 ../share/extensions/plotter.inx.h:35 +#: ../share/extensions/hpgl_output.inx.h:7 +#: ../share/extensions/plotter.inx.h:35 msgid "" "The amount of steps the plotter moves if it moves for 1 inch on the Y axis " "(Default: 1016.0)" @@ -35765,17 +35704,20 @@ msgid "" "serial connection." msgstr "" -#: ../share/extensions/hpgl_output.inx.h:3 ../share/extensions/plotter.inx.h:31 +#: ../share/extensions/hpgl_output.inx.h:3 +#: ../share/extensions/plotter.inx.h:31 #, fuzzy msgid "Plotter Settings " msgstr "Impostazioni importazione PDF" -#: ../share/extensions/hpgl_output.inx.h:8 ../share/extensions/plotter.inx.h:36 +#: ../share/extensions/hpgl_output.inx.h:8 +#: ../share/extensions/plotter.inx.h:36 #, fuzzy msgid "Pen number:" msgstr "Angolo de" -#: ../share/extensions/hpgl_output.inx.h:9 ../share/extensions/plotter.inx.h:37 +#: ../share/extensions/hpgl_output.inx.h:9 +#: ../share/extensions/plotter.inx.h:37 msgid "The number of the pen (tool) to use (Standard: '1')" msgstr "" @@ -36069,9 +36011,8 @@ msgstr "Scorciatoie con mouse e tastiera" #. i18n. Please don't translate it unless a page exists in your language #: ../share/extensions/inkscape_help_keys.inx.h:3 -#, fuzzy msgid "http://inkscape.org/doc/keys092.html" -msgstr "http://inkscape.org/doc/keys048.html" +msgstr "http://inkscape.org/doc/keys092.html" #: ../share/extensions/inkscape_help_manual.inx.h:1 msgid "Inkscape Manual" @@ -36088,9 +36029,8 @@ msgstr "Novità di questa versione" #. i18n. Please don't translate it unless a page exists in your language #: ../share/extensions/inkscape_help_relnotes.inx.h:3 -#, fuzzy msgid "http://wiki.inkscape.org/wiki/index.php/Release_notes/0.92" -msgstr "http://wiki.inkscape.org/wiki/index.php/Release_notes/0.91" +msgstr "http://wiki.inkscape.org/wiki/index.php/Release_notes/0.92" #: ../share/extensions/inkscape_help_reportabug.inx.h:1 msgid "Report a Bug" @@ -36120,12 +36060,14 @@ msgstr "Duplica nodi finale" msgid "Interpolate style" msgstr "Stile d'interpolazione" -#: ../share/extensions/interp.inx.h:7 ../share/extensions/interp_att_g.inx.h:10 +#: ../share/extensions/interp.inx.h:7 +#: ../share/extensions/interp_att_g.inx.h:10 #, fuzzy msgid "Use Z-order" msgstr "Bordo rialzato" -#: ../share/extensions/interp.inx.h:8 ../share/extensions/interp_att_g.inx.h:11 +#: ../share/extensions/interp.inx.h:8 +#: ../share/extensions/interp_att_g.inx.h:11 msgid "Workaround for reversed selection order in Live Preview cycles" msgstr "" @@ -37068,9 +37010,8 @@ msgid "Fixed Text" msgstr "Testo dinamico" #: ../share/extensions/measure.inx.h:11 -#, fuzzy msgid "Angle (°):" -msgstr "Angolo X:" +msgstr "Angolo (°):" #: ../share/extensions/measure.inx.h:12 msgid "Font size (px):" @@ -37794,7 +37735,8 @@ msgstr "" msgid "AutoCAD Plot Input" msgstr "Input AutoCAD Plot" -#: ../share/extensions/plt_input.inx.h:2 ../share/extensions/plt_output.inx.h:2 +#: ../share/extensions/plt_input.inx.h:2 +#: ../share/extensions/plt_output.inx.h:2 msgid "HP Graphics Language Plot file [AutoCAD] (*.plt)" msgstr "File HP Graphics Language Plot [AutoCAD] (*.plt)" @@ -38726,7 +38668,8 @@ msgstr "Discendente:" msgid "sK1 vector graphics files input" msgstr "Input file grafico vettoriale sK1" -#: ../share/extensions/sk1_input.inx.h:2 ../share/extensions/sk1_output.inx.h:2 +#: ../share/extensions/sk1_input.inx.h:2 +#: ../share/extensions/sk1_output.inx.h:2 msgid "sK1 vector graphics files (*.sk1)" msgstr "File grafico vettoriale sK1 (*.sk1)" @@ -39714,11 +39657,13 @@ msgstr "Inclinazione (gradi):" msgid "Hide lines behind the sphere" msgstr "Nascondi linee dietro alla sfera" -#: ../share/extensions/wmf_input.inx.h:1 ../share/extensions/wmf_output.inx.h:1 +#: ../share/extensions/wmf_input.inx.h:1 +#: ../share/extensions/wmf_output.inx.h:1 msgid "Windows Metafile Input" msgstr "Input Windows Metafile" -#: ../share/extensions/wmf_input.inx.h:3 ../share/extensions/wmf_output.inx.h:3 +#: ../share/extensions/wmf_input.inx.h:3 +#: ../share/extensions/wmf_output.inx.h:3 msgid "A popular graphics file format for clipart" msgstr "Un formato grafico molto diffuso per clipart" -- cgit v1.2.3 From 78f92b4e7ad3d0448f90584fa57070dfbc17916c Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Wed, 8 Jun 2016 09:01:39 +0200 Subject: Fix wrong string in measure code. Noticed to translators. Thanks CRogers fro the text (bzr r14959) --- src/ui/tools/measure-tool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp index 287828d32..5900a2359 100644 --- a/src/ui/tools/measure-tool.cpp +++ b/src/ui/tools/measure-tool.cpp @@ -778,7 +778,7 @@ void MeasureTool::toPhantom() measure_tmp_items.clear(); showCanvasItems(false, false, true); doc->ensureUpToDate(); - DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MEASURE,_("Add Stored to measure tool")); + DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MEASURE,_("Keep last measure on the canvas, for reference")); } void MeasureTool::toItem() -- cgit v1.2.3 From fe77182372c47e5fcd9a11629f75de8304a97726 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Wed, 8 Jun 2016 09:05:19 +0200 Subject: [Bug #1590171] Fill and Stroke dialog shows wrong label for Radial gradient. Fixed bugs: - https://launchpad.net/bugs/1590171 (bzr r14960) --- src/widgets/paint-selector.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp index aafa6bd1e..58a178aec 100644 --- a/src/widgets/paint-selector.cpp +++ b/src/widgets/paint-selector.cpp @@ -789,7 +789,7 @@ static void sp_paint_selector_set_mode_gradient(SPPaintSelector *psel, SPPaintSe SP_GRADIENT_SELECTOR(gsel)->setMode(SPGradientSelector::MODE_LINEAR); //sp_gradient_selector_set_mode(SP_GRADIENT_SELECTOR(gsel), SP_GRADIENT_SELECTOR_MODE_LINEAR); gtk_label_set_markup(GTK_LABEL(psel->label), _("Linear gradient")); - } else if (mode == SPPaintSelector::MODE_GRADIENT_LINEAR) { + } else if (mode == SPPaintSelector::MODE_GRADIENT_RADIAL) { SP_GRADIENT_SELECTOR(gsel)->setMode(SPGradientSelector::MODE_RADIAL); gtk_label_set_markup(GTK_LABEL(psel->label), _("Radial gradient")); } -- cgit v1.2.3 From c442f9cc01dba6f5678cca892dd91239a405c24e Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Wed, 8 Jun 2016 09:06:56 +0200 Subject: Translations. PO template update. (bzr r14961) --- po/inkscape.pot | 96 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/po/inkscape.pot b/po/inkscape.pot index 9f3b749d3..b68c06f64 100644 --- a/po/inkscape.pot +++ b/po/inkscape.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2016-06-02 12:12+0200\n" +"POT-Creation-Date: 2016-06-08 09:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4414,16 +4414,16 @@ msgstr "" msgid "3D Box" msgstr "" -#: ../src/color-profile.cpp:842 +#: ../src/color-profile.cpp:856 #, c-format msgid "Color profiles directory (%s) is unavailable." msgstr "" -#: ../src/color-profile.cpp:901 ../src/color-profile.cpp:918 +#: ../src/color-profile.cpp:928 ../src/color-profile.cpp:945 msgid "(invalid UTF-8 string)" msgstr "" -#: ../src/color-profile.cpp:903 +#: ../src/color-profile.cpp:930 msgctxt "Profile name" msgid "None" msgstr "" @@ -4980,7 +4980,7 @@ msgid "" "this extension." msgstr "" -#: ../src/extension/implementation/script.cpp:1108 +#: ../src/extension/implementation/script.cpp:1111 msgid "" "Inkscape has received additional data from the script executed. The script " "did not return an error, but this may indicate the results will not be as " @@ -12729,36 +12729,36 @@ msgid_plural "(%d characters%s)" msgstr[0] "" msgstr[1] "" -#: ../src/sp-guide.cpp:261 +#: ../src/sp-guide.cpp:262 msgid "Create Guides Around the Page" msgstr "" -#: ../src/sp-guide.cpp:274 ../src/verbs.cpp:2544 +#: ../src/sp-guide.cpp:275 ../src/verbs.cpp:2544 msgid "Delete All Guides" msgstr "" #. Guide has probably been deleted and no longer has an attached namedview. -#: ../src/sp-guide.cpp:485 +#: ../src/sp-guide.cpp:486 msgid "Deleted" msgstr "" -#: ../src/sp-guide.cpp:494 +#: ../src/sp-guide.cpp:495 msgid "" "Shift+drag to rotate, Ctrl+drag to move origin, Del to " "delete" msgstr "" -#: ../src/sp-guide.cpp:498 +#: ../src/sp-guide.cpp:499 #, c-format msgid "vertical, at %s" msgstr "" -#: ../src/sp-guide.cpp:501 +#: ../src/sp-guide.cpp:502 #, c-format msgid "horizontal, at %s" msgstr "" -#: ../src/sp-guide.cpp:506 +#: ../src/sp-guide.cpp:507 #, c-format msgid "at %d degrees, through (%s,%s)" msgstr "" @@ -14338,12 +14338,12 @@ msgid "License" msgstr "" #: ../src/ui/dialog/document-metadata.cpp:126 -#: ../src/ui/dialog/document-properties.cpp:994 +#: ../src/ui/dialog/document-properties.cpp:1037 msgid "Dublin Core Entities" msgstr "" #: ../src/ui/dialog/document-metadata.cpp:168 -#: ../src/ui/dialog/document-properties.cpp:1056 +#: ../src/ui/dialog/document-properties.cpp:1099 msgid "License" msgstr "" @@ -14634,136 +14634,136 @@ msgstr "" #. Inkscape::GC::release(defsRepr); #. inform the document, so we can undo #. Color Management -#: ../src/ui/dialog/document-properties.cpp:526 ../src/verbs.cpp:3020 +#: ../src/ui/dialog/document-properties.cpp:542 ../src/verbs.cpp:3020 msgid "Link Color Profile" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:623 +#: ../src/ui/dialog/document-properties.cpp:654 msgid "Remove linked color profile" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:636 +#: ../src/ui/dialog/document-properties.cpp:673 msgid "Linked Color Profiles:" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:638 +#: ../src/ui/dialog/document-properties.cpp:675 msgid "Available Color Profiles:" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:640 +#: ../src/ui/dialog/document-properties.cpp:677 msgid "Link Profile" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:643 +#: ../src/ui/dialog/document-properties.cpp:680 msgid "Unlink Profile" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:721 +#: ../src/ui/dialog/document-properties.cpp:764 msgid "Profile Name" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:757 +#: ../src/ui/dialog/document-properties.cpp:800 msgid "External scripts" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:758 +#: ../src/ui/dialog/document-properties.cpp:801 msgid "Embedded scripts" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:763 +#: ../src/ui/dialog/document-properties.cpp:806 msgid "External script files:" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:765 +#: ../src/ui/dialog/document-properties.cpp:808 msgid "Add the current file name or browse for a file" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:768 -#: ../src/ui/dialog/document-properties.cpp:845 +#: ../src/ui/dialog/document-properties.cpp:811 +#: ../src/ui/dialog/document-properties.cpp:888 #: ../src/ui/widget/selected-style.cpp:357 msgid "Remove" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:832 +#: ../src/ui/dialog/document-properties.cpp:875 msgid "Filename" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:840 +#: ../src/ui/dialog/document-properties.cpp:883 msgid "Embedded script files:" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:842 +#: ../src/ui/dialog/document-properties.cpp:885 #: ../src/ui/dialog/objects.cpp:1894 msgid "New" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:909 +#: ../src/ui/dialog/document-properties.cpp:952 msgid "Script id" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:915 +#: ../src/ui/dialog/document-properties.cpp:958 msgid "Content:" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:1032 +#: ../src/ui/dialog/document-properties.cpp:1075 msgid "_Save as default" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:1033 +#: ../src/ui/dialog/document-properties.cpp:1076 msgid "Save this metadata as the default metadata" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:1034 +#: ../src/ui/dialog/document-properties.cpp:1077 msgid "Use _default" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:1035 +#: ../src/ui/dialog/document-properties.cpp:1078 msgid "Use the previously saved default metadata here" msgstr "" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1108 +#: ../src/ui/dialog/document-properties.cpp:1151 msgid "Add external script..." msgstr "" -#: ../src/ui/dialog/document-properties.cpp:1147 +#: ../src/ui/dialog/document-properties.cpp:1190 msgid "Select a script to load" msgstr "" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1175 +#: ../src/ui/dialog/document-properties.cpp:1218 msgid "Add embedded script..." msgstr "" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1206 +#: ../src/ui/dialog/document-properties.cpp:1249 msgid "Remove external script" msgstr "" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1235 +#: ../src/ui/dialog/document-properties.cpp:1278 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:1331 +#: ../src/ui/dialog/document-properties.cpp:1374 msgid "Edit embedded script" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:1415 +#: ../src/ui/dialog/document-properties.cpp:1458 msgid "Creation" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:1416 +#: ../src/ui/dialog/document-properties.cpp:1459 msgid "Defined grids" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:1660 +#: ../src/ui/dialog/document-properties.cpp:1703 msgid "Remove grid" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:1752 +#: ../src/ui/dialog/document-properties.cpp:1795 msgid "Changed default display unit" msgstr "" @@ -18743,7 +18743,7 @@ msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1091 #: ../src/ui/widget/color-icc-selector.cpp:394 -#: ../src/ui/widget/color-icc-selector.cpp:685 +#: ../src/ui/widget/color-icc-selector.cpp:699 msgid "" msgstr "" @@ -22985,7 +22985,7 @@ msgid "Add guides from measure tool" msgstr "" #: ../src/ui/tools/measure-tool.cpp:781 -msgid "Add Stored to measure tool" +msgid "Keep last measure on the canvas, for reference" msgstr "" #: ../src/ui/tools/measure-tool.cpp:801 -- cgit v1.2.3 From 2546a959c920d3df18271f9a9aed42bf574df3c1 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 8 Jun 2016 10:27:17 +0200 Subject: Store rest of string in Inkscape version ('pre' 'devel'). Fix try/catch blocks by really throwing errors. (stringstream doesn't throw errors by default.) (bzr r14962) --- src/version.cpp | 12 ++++++++++-- src/version.h | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/version.cpp b/src/version.cpp index abe855ee7..7610cd8e7 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -21,28 +21,36 @@ bool sp_version_from_string(const char *string, Inkscape::Version *version) if (!string) { return false; } - + try { std::stringstream ss; + + // Throw exception if error. + ss.exceptions(std::ios::failbit | std::ios::badbit); ss << string; ss >> version->_major; char tmp=0; ss >> tmp; ss >>version->_minor; + + // Don't throw exception if failbit gets set (empty string OK). + ss.exceptions(std::ios::goodbit); + getline(ss, version->_tail); return true; } catch(...) { version->_major = 0; version->_minor = 0; + version->_tail.clear(); return false; } } char *sp_version_to_string(Inkscape::Version version) { - return g_strdup_printf("%u.%u", version._major, version._minor); + return g_strdup_printf("%u.%u%s", version._major, version._minor, version._tail.c_str()); } bool sp_version_inside_range(Inkscape::Version version, diff --git a/src/version.h b/src/version.h index e17688b6d..f6221f6a6 100644 --- a/src/version.h +++ b/src/version.h @@ -13,6 +13,8 @@ #define SVG_VERSION "1.1" +#include + namespace Inkscape { class Version { @@ -43,6 +45,7 @@ public: unsigned int _major; unsigned int _minor; + std::string _tail; // Development version }; } -- cgit v1.2.3 From 2120743f09f27892a714a6cfdc162a59a4ad0f0a Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 8 Jun 2016 10:35:36 +0200 Subject: Remove unused svg-units variable. (bzr r14963) --- src/sp-namedview.cpp | 36 ++++++++++++++++++------------------ src/sp-namedview.h | 1 - 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp index 06e068c42..850163720 100644 --- a/src/sp-namedview.cpp +++ b/src/sp-namedview.cpp @@ -59,25 +59,25 @@ static gboolean sp_str_to_bool(const gchar *str); static gboolean sp_nv_read_opacity(const gchar *str, guint32 *color); SPNamedView::SPNamedView() : SPObjectGroup(), snap_manager(this) { - this->zoom = 0; - this->guidecolor = 0; - this->guidehicolor = 0; - this->views.clear(); - this->borderlayer = 0; - this->page_size_units = NULL; - this->window_x = 0; - this->cy = 0; - this->window_y = 0; - this->svg_units = unit_table.getUnit("px"); // legacy behavior: if no viewbox present, default to 'px' units + + this->zoom = 0; + this->guidecolor = 0; + this->guidehicolor = 0; + this->views.clear(); + this->borderlayer = 0; + this->page_size_units = NULL; + this->window_x = 0; + this->cy = 0; + this->window_y = 0; this->display_units = NULL; - this->page_size_units = NULL; - this->pagecolor = 0; - this->cx = 0; - this->pageshadow = 0; - this->window_width = 0; - this->window_height = 0; - this->window_maximized = 0; - this->bordercolor = 0; + this->page_size_units = NULL; + this->pagecolor = 0; + this->cx = 0; + this->pageshadow = 0; + this->window_width = 0; + this->window_height = 0; + this->window_maximized = 0; + this->bordercolor = 0; this->editable = TRUE; this->showguides = TRUE; diff --git a/src/sp-namedview.h b/src/sp-namedview.h index ca85153b4..d8ac1a77e 100644 --- a/src/sp-namedview.h +++ b/src/sp-namedview.h @@ -64,7 +64,6 @@ public: std::vector grids; bool grids_visible; - Inkscape::Util::Unit const *svg_units; // Units used for the values in SVG Inkscape::Util::Unit const *display_units; // Units used for the UI (*not* the same as units of SVG coordinates) Inkscape::Util::Unit const *page_size_units; // Only used in "Custom size" part of Document Properties dialog -- cgit v1.2.3 From 1a5073c6fe3981ff0645490f28777d35bcb3b25b Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 8 Jun 2016 10:40:39 +0200 Subject: Really remove last of svg_units. (bzr r14964) --- src/sp-namedview.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp index 850163720..616ec3921 100644 --- a/src/sp-namedview.cpp +++ b/src/sp-namedview.cpp @@ -261,16 +261,6 @@ void SPNamedView::build(SPDocument *document, Inkscape::XML::Node *repr) { // backwards compatibility with grid settings (pre 0.46) sp_namedview_generate_old_grid(this, document, repr); - - // If viewbox defined: try to calculate the SVG unit from document width and viewbox - if (document->getRoot()->viewBox_set) { - Inkscape::Util::Quantity svgwidth = document->getWidth(); - Geom::Rect viewbox = document->getRoot()->viewBox; - double factor = svgwidth.value(unit_table.primary(Inkscape::Util::UNIT_TYPE_LINEAR)) / viewbox.width(); - svg_units = unit_table.findUnit(factor, Inkscape::Util::UNIT_TYPE_LINEAR); - } else { // force the document units to be px - repr->setAttribute("inkscape:document-units", "px"); - } } void SPNamedView::release() { -- cgit v1.2.3 From 5401a129da2f319316221727fef5c516c3a72906 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 8 Jun 2016 11:16:29 +0200 Subject: Only update inkscape.version on successful file write. (bzr r14965) --- src/document.cpp | 5 ----- src/file.cpp | 16 +++++++++++++++- src/sp-root.cpp | 8 +++++--- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/document.cpp b/src/document.cpp index e9388893e..d8c3f1269 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -369,11 +369,6 @@ SPDocument *SPDocument::createDoc(Inkscape::XML::Document *rdoc, // Recursively build object tree document->root->invoke_build(document, rroot, false); - /* fixme: Not sure about this, but lets assume ::build updates */ - rroot->setAttribute("inkscape:version", Inkscape::version_string); - /* fixme: Again, I moved these here to allow version determining in ::build (Lauris) */ - - /* Eliminate obsolete sodipodi:docbase, for privacy reasons */ rroot->setAttribute("sodipodi:docbase", NULL); diff --git a/src/file.cpp b/src/file.cpp index 9d390908e..650ce5d0f 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -45,7 +45,7 @@ #include "helper/png-write.h" #include "id-clash.h" #include "inkscape.h" -#include "inkscape.h" +#include "inkscape-version.h" #include "ui/interface.h" #include "io/sys.h" #include "message.h" @@ -318,6 +318,12 @@ bool sp_file_open(const Glib::ustring &uri, // everyone who cares now has a reference, get rid of our`s doc->doUnref(); + SPRoot *root = doc->getRoot(); + + // This is the only place original values should be set. + root->original.inkscape = root->version.inkscape; + root->original.svg = root->version.svg; + // resize the window to match the document properties sp_namedview_window_from_document(desktop); sp_namedview_update_layers_from_document(desktop); @@ -669,6 +675,8 @@ file_save(Gtk::Window &parentWindow, SPDocument *doc, const Glib::ustring &uri, if (!doc || uri.size()<1) //Safety check return false; + Inkscape::Version save = doc->getRoot()->version.inkscape; + doc->getReprRoot()->setAttribute("inkscape:version", Inkscape::version_string); try { Inkscape::Extension::save(key, doc, uri.c_str(), false, @@ -681,6 +689,8 @@ file_save(Gtk::Window &parentWindow, SPDocument *doc, const Glib::ustring &uri, sp_ui_error_dialog(text); g_free(text); g_free(safeUri); + // Restore Inkscape version + doc->getReprRoot()->setAttribute("inkscape:version", sp_version_to_string( save )); return false; } catch (Inkscape::Extension::Output::file_read_only &e) { gchar *safeUri = Inkscape::IO::sanitizeString(uri.c_str()); @@ -689,6 +699,7 @@ file_save(Gtk::Window &parentWindow, SPDocument *doc, const Glib::ustring &uri, sp_ui_error_dialog(text); g_free(text); g_free(safeUri); + doc->getReprRoot()->setAttribute("inkscape:version", sp_version_to_string( save )); return false; } catch (Inkscape::Extension::Output::save_failed &e) { gchar *safeUri = Inkscape::IO::sanitizeString(uri.c_str()); @@ -697,14 +708,17 @@ file_save(Gtk::Window &parentWindow, SPDocument *doc, const Glib::ustring &uri, sp_ui_error_dialog(text); g_free(text); g_free(safeUri); + doc->getReprRoot()->setAttribute("inkscape:version", sp_version_to_string( save )); return false; } catch (Inkscape::Extension::Output::save_cancelled &e) { SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("Document not saved.")); + doc->getReprRoot()->setAttribute("inkscape:version", sp_version_to_string( save )); return false; } catch (Inkscape::Extension::Output::no_overwrite &e) { return sp_file_save_dialog(parentWindow, doc, save_method); } catch (...) { SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("Document not saved.")); + doc->getReprRoot()->setAttribute("inkscape:version", sp_version_to_string( save )); return false; } diff --git a/src/sp-root.cpp b/src/sp-root.cpp index 8bedec0a5..98eae2159 100644 --- a/src/sp-root.cpp +++ b/src/sp-root.cpp @@ -313,9 +313,11 @@ Inkscape::XML::Node *SPRoot::write(Inkscape::XML::Document *xml_doc, Inkscape::X repr = xml_doc->createElement("svg:svg"); } - if (flags & SP_OBJECT_WRITE_EXT) { - repr->setAttribute("inkscape:version", Inkscape::version_string); - } + /* Only update version string on successful write to file. This is handled by 'file_save()'. + * if (flags & SP_OBJECT_WRITE_EXT) { + * repr->setAttribute("inkscape:version", Inkscape::version_string); + * } + */ if (!repr->attribute("version")) { gchar *myversion = sp_version_to_string(this->version.svg); -- cgit v1.2.3 From 8eb4b627284bbf7b7c3ecf39355eb8bbed96f79a Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Wed, 8 Jun 2016 22:19:57 +0200 Subject: Dutch translation update (bzr r14966) --- po/nl.po | 550 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 269 insertions(+), 281 deletions(-) diff --git a/po/nl.po b/po/nl.po index 087314655..2178d10dc 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,4 +1,5 @@ # Dutch translations for Inkscape. +# Dutch translations for Inkscape. # This file is distributed under the same license as the Inkscape package. # # Vincent van Adrighem , 2003. @@ -54,13 +55,12 @@ # to tweak / tweak context - retoucheren # Tool Controls bar - Gereedschapsdetailsbalk # (toevoegingen welkom) -#: ../src/ui/dialog/clonetiler.cpp:1010 msgid "" msgstr "" "Project-Id-Version: inkscape 0.92\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2016-06-02 12:12+0200\n" -"PO-Revision-Date: 2016-05-24 22:49+0100\n" +"POT-Creation-Date: 2016-06-08 09:06+0200\n" +"PO-Revision-Date: 2016-06-08 22:16+0100\n" "Last-Translator: Kris De Gussem \n" "Language-Team: Dutch\n" "Language: nl\n" @@ -84,6 +84,9 @@ msgid "" "Illustrator, CorelDraw, or Xara X, using the W3C standard Scalable Vector " "Graphics (SVG) file format." msgstr "" +"Een open source vectorafbeeldingprogramma met vergelijkbare mogelijkheden " +"als Illustrator, CorelDraw, of Xara X gebruik makend van het standaard W3C " +"Scalable Vector Graphics (SVG) bestandsformaat." #: ../inkscape.appdata.xml.in.h:4 msgid "" @@ -93,6 +96,12 @@ msgid "" "trace bitmaps and much more. We also aim to maintain a thriving user and " "developer community by using open, community-oriented development." msgstr "" +"Inkscape ondersteunt veel geavanceerde SVG features (markeringen, klonen, " +"alfa blending, etc.). Veel zorg ging naar het ontwerp van een gestroomlijnde " +"interface. Het is zeer eenvoudig om knooppunten te bewerken, complexe " +"padoperaties uit te voeren, bitmaps over te trekken, ... We beogen een " +"actieve gebruikers- en ontwikkelgemeenschap door middel van open, " +"gemeenschapsgerichte ontwikkeling." #: ../inkscape.appdata.xml.in.h:5 msgid "Main application window" @@ -739,7 +748,8 @@ msgstr "Zwart gat" #: ../share/filters/filters.svg.h:279 ../share/filters/filters.svg.h:835 #: ../share/filters/filters.svg.h:839 ../share/filters/filters.svg.h:843 #: ../src/extension/internal/filter/morphology.h:76 -#: ../src/extension/internal/filter/morphology.h:203 ../src/filter-enums.cpp:32 +#: ../src/extension/internal/filter/morphology.h:203 +#: ../src/filter-enums.cpp:32 msgid "Morphology" msgstr "Morfologie" @@ -4500,16 +4510,16 @@ msgstr "typografiecanvas met hulplijnen" msgid "3D Box" msgstr "3D-kubus" -#: ../src/color-profile.cpp:842 +#: ../src/color-profile.cpp:856 #, c-format msgid "Color profiles directory (%s) is unavailable." msgstr "Kleurprofielenmap (%s) is niet beschikbaar." -#: ../src/color-profile.cpp:901 ../src/color-profile.cpp:918 +#: ../src/color-profile.cpp:928 ../src/color-profile.cpp:945 msgid "(invalid UTF-8 string)" msgstr "(ongeldige UTF-8 string)" -#: ../src/color-profile.cpp:903 +#: ../src/color-profile.cpp:930 msgctxt "Profile name" msgid "None" msgstr "Geen" @@ -5090,7 +5100,7 @@ msgstr "" "Inkscape website of vraag op de mailinglijsten indien je vragen hebt over " "deze uitbreiding." -#: ../src/extension/implementation/script.cpp:1108 +#: ../src/extension/implementation/script.cpp:1111 msgid "" "Inkscape has received additional data from the script executed. The script " "did not return an error, but this may indicate the results will not be as " @@ -5130,7 +5140,8 @@ msgstr "Aanpassende drempelwaarde" #: ../src/ui/widget/page-sizer.cpp:249 #: ../src/widgets/calligraphy-toolbar.cpp:430 #: ../src/widgets/eraser-toolbar.cpp:154 ../src/widgets/spray-toolbar.cpp:297 -#: ../src/widgets/tweak-toolbar.cpp:128 ../share/extensions/foldablebox.inx.h:2 +#: ../src/widgets/tweak-toolbar.cpp:128 +#: ../share/extensions/foldablebox.inx.h:2 msgid "Width:" msgstr "Breedte:" @@ -6597,13 +6608,15 @@ msgid "Transparency type:" msgstr "Type transparantie:" #: ../src/extension/internal/filter/bumps.h:353 -#: ../src/extension/internal/filter/morphology.h:176 ../src/filter-enums.cpp:91 +#: ../src/extension/internal/filter/morphology.h:176 +#: ../src/filter-enums.cpp:91 msgid "Atop" msgstr "Bovenop" #: ../src/extension/internal/filter/bumps.h:354 #: ../src/extension/internal/filter/distort.h:70 -#: ../src/extension/internal/filter/morphology.h:174 ../src/filter-enums.cpp:89 +#: ../src/extension/internal/filter/morphology.h:174 +#: ../src/filter-enums.cpp:89 msgid "In" msgstr "In" @@ -7120,7 +7133,8 @@ msgid "Felt Feather" msgstr "Veren vilt" #: ../src/extension/internal/filter/distort.h:71 -#: ../src/extension/internal/filter/morphology.h:175 ../src/filter-enums.cpp:90 +#: ../src/extension/internal/filter/morphology.h:175 +#: ../src/filter-enums.cpp:90 msgid "Out" msgstr "Uit" @@ -7315,11 +7329,13 @@ msgstr "Afbeelding verbergen" msgid "Composite type:" msgstr "Composiettype:" -#: ../src/extension/internal/filter/morphology.h:173 ../src/filter-enums.cpp:88 +#: ../src/extension/internal/filter/morphology.h:173 +#: ../src/filter-enums.cpp:88 msgid "Over" msgstr "Erover" -#: ../src/extension/internal/filter/morphology.h:177 ../src/filter-enums.cpp:92 +#: ../src/extension/internal/filter/morphology.h:177 +#: ../src/filter-enums.cpp:92 msgid "XOR" msgstr "XOR" @@ -7393,8 +7409,8 @@ msgstr "Ruis opvulling" #: ../src/ui/dialog/tracedialog.cpp:747 #: ../share/extensions/color_HSL_adjust.inx.h:2 #: ../share/extensions/color_custom.inx.h:2 -#: ../share/extensions/color_randomize.inx.h:2 ../share/extensions/dots.inx.h:2 -#: ../share/extensions/dxf_input.inx.h:2 +#: ../share/extensions/color_randomize.inx.h:2 +#: ../share/extensions/dots.inx.h:2 ../share/extensions/dxf_input.inx.h:2 #: ../share/extensions/dxf_outlines.inx.h:2 #: ../share/extensions/gcodetools_area.inx.h:29 #: ../share/extensions/gcodetools_engraving.inx.h:7 @@ -7993,13 +8009,15 @@ msgstr "Verticale inspringing:" #: ../src/extension/internal/grid.cpp:209 #: ../src/ui/dialog/inkscape-preferences.cpp:1532 #: ../share/extensions/draw_from_triangle.inx.h:58 -#: ../share/extensions/eqtexsvg.inx.h:4 ../share/extensions/foldablebox.inx.h:9 +#: ../share/extensions/eqtexsvg.inx.h:4 +#: ../share/extensions/foldablebox.inx.h:9 #: ../share/extensions/funcplot.inx.h:38 #: ../share/extensions/grid_cartesian.inx.h:23 #: ../share/extensions/grid_isometric.inx.h:11 #: ../share/extensions/grid_polar.inx.h:22 #: ../share/extensions/guides_creator.inx.h:25 -#: ../share/extensions/hershey.inx.h:52 ../share/extensions/layout_nup.inx.h:35 +#: ../share/extensions/hershey.inx.h:52 +#: ../share/extensions/layout_nup.inx.h:35 #: ../share/extensions/lindenmayer.inx.h:34 #: ../share/extensions/nicechart.inx.h:45 #: ../share/extensions/param_curves.inx.h:30 @@ -8359,7 +8377,8 @@ msgid "Map all fill patterns to standard WMF hatches" msgstr "Alle vulpatronen naar standaard WMF-hatches mappen" #: ../src/extension/internal/wmf-inout.cpp:3208 -#: ../share/extensions/wmf_input.inx.h:2 ../share/extensions/wmf_output.inx.h:2 +#: ../share/extensions/wmf_input.inx.h:2 +#: ../share/extensions/wmf_output.inx.h:2 msgid "Windows Metafile (*.wmf)" msgstr "Windows Metafile (*.wmf)" @@ -8632,7 +8651,8 @@ msgstr "Tintrotatie" msgid "Luminance to Alpha" msgstr "Luminantie naar alfa" -#: ../src/filter-enums.cpp:87 ../share/extensions/jessyInk_mouseHandler.inx.h:3 +#: ../src/filter-enums.cpp:87 +#: ../share/extensions/jessyInk_mouseHandler.inx.h:3 #: ../share/extensions/jessyInk_transitions.inx.h:7 #: ../share/extensions/measure.inx.h:20 ../share/extensions/nicechart.inx.h:33 msgid "Default" @@ -8946,7 +8966,8 @@ msgstr "Dit paneel inklappen" msgid "Close this dock" msgstr "Dit paneel sluiten" -#: ../src/libgdl/gdl-dock-item-grip.c:723 ../src/libgdl/gdl-dock-tablabel.c:125 +#: ../src/libgdl/gdl-dock-item-grip.c:723 +#: ../src/libgdl/gdl-dock-tablabel.c:125 msgid "Controlling dock item" msgstr "Aansturend paneelitem" @@ -9114,7 +9135,8 @@ msgstr "De index van de huidige pagina" #: ../src/libgdl/gdl-dock-object.c:125 #: ../src/live_effects/parameter/originalpatharray.cpp:82 #: ../src/ui/dialog/inkscape-preferences.cpp:1566 -#: ../src/ui/widget/page-sizer.cpp:285 ../src/widgets/gradient-selector.cpp:150 +#: ../src/ui/widget/page-sizer.cpp:285 +#: ../src/widgets/gradient-selector.cpp:150 #: ../src/widgets/sp-xmlview-attr-list.cpp:49 msgid "Name" msgstr "Naam" @@ -9702,11 +9724,11 @@ msgstr "Handvatgrootte" #: ../src/live_effects/lpe-bspline.cpp:32 msgid "Apply changes if weight = 0%" -msgstr "" +msgstr "Wijzigingen toepassen indien gewicht = 0%" #: ../src/live_effects/lpe-bspline.cpp:33 msgid "Apply changes if weight > 0%" -msgstr "" +msgstr "Wijzigingen toepassen indien gewicht > 0%" #: ../src/live_effects/lpe-bspline.cpp:34 #: ../src/live_effects/lpe-fillet-chamfer.cpp:56 @@ -9842,7 +9864,7 @@ msgstr "Schaal de breedte van het naaipad relatief tov zijn lengte" #: ../src/live_effects/lpe-ellipse_5pts.cpp:77 msgid "Five points required for constructing an ellipse" -msgstr "" +msgstr "Vijf punten nodig om een ellips te maken." #: ../src/live_effects/lpe-ellipse_5pts.cpp:162 msgid "No ellipse found for specified points" @@ -9874,7 +9896,7 @@ msgstr "Pad onderzijde langswaar het origineel pad gebogen wordt" #: ../src/live_effects/lpe-envelope.cpp:34 msgid "Left bend path:" -msgstr "Pad linkerzijde vervormen:" +msgstr "Pad linkerzijde:" #: ../src/live_effects/lpe-envelope.cpp:34 msgid "Left path along which to bend the original path" @@ -9992,11 +10014,11 @@ msgstr "Handvatgrootte met richting" #: ../src/live_effects/lpe-fillet-chamfer.cpp:103 msgid "IMPORTANT! New version soon..." -msgstr "" +msgstr "BELANGRIJK! Binnenkort nieuwe versie..." #: ../src/live_effects/lpe-fillet-chamfer.cpp:107 msgid "Not compatible. Convert to path after." -msgstr "" +msgstr "Niet compatibel. Nadien naar pad omzetten." #: ../src/live_effects/lpe-fillet-chamfer.cpp:165 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:72 @@ -10679,9 +10701,8 @@ msgid "Envelope deformation" msgstr "Omslagvervorming" #: ../src/live_effects/lpe-perspective-envelope.cpp:45 -#, fuzzy msgid "Overflow perspective" -msgstr "Perspectief" +msgstr "Overloopperspectief" #: ../src/live_effects/lpe-perspective-envelope.cpp:46 msgid "Type" @@ -11124,7 +11145,8 @@ msgstr "Inter_val markeringen:" msgid "Distance between successive ruler marks" msgstr "Afstand tussen opeenvolgende markeringen" -#: ../src/live_effects/lpe-ruler.cpp:42 ../share/extensions/foldablebox.inx.h:7 +#: ../src/live_effects/lpe-ruler.cpp:42 +#: ../share/extensions/foldablebox.inx.h:7 #: ../share/extensions/interp_att_g.inx.h:9 #: ../share/extensions/layout_nup.inx.h:3 #: ../share/extensions/printing_marks.inx.h:11 @@ -11411,7 +11433,7 @@ msgstr "" #: ../src/live_effects/lpe-taperstroke.cpp:74 msgid "Start offset:" -msgstr "" +msgstr "Begin verplaatsing:" #: ../src/live_effects/lpe-taperstroke.cpp:74 msgid "Taper distance from path start" @@ -11419,7 +11441,7 @@ msgstr "" #: ../src/live_effects/lpe-taperstroke.cpp:75 msgid "End offset:" -msgstr "" +msgstr "Einde verplaatsing:" #: ../src/live_effects/lpe-taperstroke.cpp:75 msgid "The ending position of the taper" @@ -11714,7 +11736,7 @@ msgstr "Tekstparameter aanpassen" #: ../src/live_effects/parameter/togglebutton.cpp:112 msgid "Change togglebutton parameter" -msgstr "" +msgstr "Schakelknop veranderen" #: ../src/live_effects/parameter/transformedpoint.cpp:98 #: ../src/live_effects/parameter/vector.cpp:99 @@ -12493,7 +12515,8 @@ msgstr "Er is niets verwijderd." #: ../src/widgets/eraser-toolbar.cpp:120 #: ../src/widgets/gradient-toolbar.cpp:1181 #: ../src/widgets/gradient-toolbar.cpp:1195 -#: ../src/widgets/gradient-toolbar.cpp:1209 ../src/widgets/node-toolbar.cpp:401 +#: ../src/widgets/gradient-toolbar.cpp:1209 +#: ../src/widgets/node-toolbar.cpp:401 msgid "Delete" msgstr "Verwijderen" @@ -12520,20 +12543,16 @@ msgid "Group" msgstr "Groeperen" #: ../src/selection-chemistry.cpp:798 -#, fuzzy msgid "No objects selected to pop out of group." -msgstr "" -"Er zijn geen objecten geselecteerd om de stijl van over te nemen." +msgstr "Geen objecten geselecteerd om uit de group te halen." #: ../src/selection-chemistry.cpp:808 -#, fuzzy msgid "Selection not in a group." -msgstr "Selecteer een groep om op te heffen" +msgstr "Selectie niet in een groep." #: ../src/selection-chemistry.cpp:822 -#, fuzzy msgid "Pop selection from group" -msgstr "_Selectie als groep behandelen: " +msgstr "Selectie uit groep halen" #: ../src/selection-chemistry.cpp:830 msgid "Select a group to ungroup." @@ -13186,20 +13205,20 @@ msgid_plural "(%d characters%s)" msgstr[0] "(%d karakter%s)" msgstr[1] "(%d karakters%s)" -#: ../src/sp-guide.cpp:261 +#: ../src/sp-guide.cpp:262 msgid "Create Guides Around the Page" msgstr "Hulplijnen rond pagina maken" -#: ../src/sp-guide.cpp:274 ../src/verbs.cpp:2544 +#: ../src/sp-guide.cpp:275 ../src/verbs.cpp:2544 msgid "Delete All Guides" msgstr "Alle hulplijnen verwijderen" #. Guide has probably been deleted and no longer has an attached namedview. -#: ../src/sp-guide.cpp:485 +#: ../src/sp-guide.cpp:486 msgid "Deleted" msgstr "Verwijderd" -#: ../src/sp-guide.cpp:494 +#: ../src/sp-guide.cpp:495 msgid "" "Shift+drag to rotate, Ctrl+drag to move origin, Del to " "delete" @@ -13207,17 +13226,17 @@ msgstr "" "Shift+sleep om te draaien, Ctrl+sleep om de oorsprong te " "verplaatsen, Del om te verwijderen" -#: ../src/sp-guide.cpp:498 +#: ../src/sp-guide.cpp:499 #, c-format msgid "vertical, at %s" msgstr "verticaal, op %s" -#: ../src/sp-guide.cpp:501 +#: ../src/sp-guide.cpp:502 #, c-format msgid "horizontal, at %s" msgstr "horizontaal, op %s" -#: ../src/sp-guide.cpp:506 +#: ../src/sp-guide.cpp:507 #, c-format msgid "at %d degrees, through (%s,%s)" msgstr "op %d graden, door (%s,%s)" @@ -13378,8 +13397,8 @@ msgstr "Voorwaardelijke groep" #: ../src/sp-text.cpp:361 ../src/verbs.cpp:347 #: ../share/extensions/lorem_ipsum.inx.h:8 -#: ../share/extensions/replace_font.inx.h:11 ../share/extensions/split.inx.h:10 -#: ../share/extensions/text_braille.inx.h:2 +#: ../share/extensions/replace_font.inx.h:11 +#: ../share/extensions/split.inx.h:10 ../share/extensions/text_braille.inx.h:2 #: ../share/extensions/text_extract.inx.h:14 #: ../share/extensions/text_flipcase.inx.h:2 #: ../share/extensions/text_lowercase.inx.h:2 @@ -14871,12 +14890,12 @@ msgid "License" msgstr "Licentie" #: ../src/ui/dialog/document-metadata.cpp:126 -#: ../src/ui/dialog/document-properties.cpp:994 +#: ../src/ui/dialog/document-properties.cpp:1037 msgid "Dublin Core Entities" msgstr "Dublin Core-elementen" #: ../src/ui/dialog/document-metadata.cpp:168 -#: ../src/ui/dialog/document-properties.cpp:1056 +#: ../src/ui/dialog/document-properties.cpp:1099 msgid "License" msgstr "Licentie" @@ -14930,7 +14949,6 @@ msgid "Back_ground color:" msgstr "_Achtergrondkleur:" #: ../src/ui/dialog/document-properties.cpp:123 -#, fuzzy msgid "" "Color of the page background. Note: transparency setting ignored while " "editing if 'Checkerboard background' unset (but used when exporting to " @@ -15124,7 +15142,8 @@ msgstr "Ve_rwijderen" msgid "Remove selected grid." msgstr "Geselecteerd raster verwijderen." -#: ../src/ui/dialog/document-properties.cpp:162 ../src/widgets/toolbox.cpp:1903 +#: ../src/ui/dialog/document-properties.cpp:162 +#: ../src/widgets/toolbox.cpp:1903 msgid "Guides" msgstr "Hulplijnen" @@ -15180,138 +15199,138 @@ msgstr "Diversen" #. Inkscape::GC::release(defsRepr); #. inform the document, so we can undo #. Color Management -#: ../src/ui/dialog/document-properties.cpp:526 ../src/verbs.cpp:3020 +#: ../src/ui/dialog/document-properties.cpp:542 ../src/verbs.cpp:3020 msgid "Link Color Profile" msgstr "Kleurprofiel linken" -#: ../src/ui/dialog/document-properties.cpp:623 +#: ../src/ui/dialog/document-properties.cpp:654 msgid "Remove linked color profile" msgstr "Gelinkt kleurprofiel verwijderen" -#: ../src/ui/dialog/document-properties.cpp:636 +#: ../src/ui/dialog/document-properties.cpp:673 msgid "Linked Color Profiles:" msgstr "Gelinkte kleurprofielen:" -#: ../src/ui/dialog/document-properties.cpp:638 +#: ../src/ui/dialog/document-properties.cpp:675 msgid "Available Color Profiles:" msgstr "Beschikbare kleurprofielen:" -#: ../src/ui/dialog/document-properties.cpp:640 +#: ../src/ui/dialog/document-properties.cpp:677 msgid "Link Profile" msgstr "Kleurprofiel linken" -#: ../src/ui/dialog/document-properties.cpp:643 +#: ../src/ui/dialog/document-properties.cpp:680 msgid "Unlink Profile" msgstr "Kleurprofiel ontlinken" -#: ../src/ui/dialog/document-properties.cpp:721 +#: ../src/ui/dialog/document-properties.cpp:764 msgid "Profile Name" msgstr "Naam profiel" -#: ../src/ui/dialog/document-properties.cpp:757 +#: ../src/ui/dialog/document-properties.cpp:800 msgid "External scripts" msgstr "Externe scripts" -#: ../src/ui/dialog/document-properties.cpp:758 +#: ../src/ui/dialog/document-properties.cpp:801 msgid "Embedded scripts" msgstr "Ingevoegde scripts" # zijn dit de uitbreidingen (Engels: external modules)? -#: ../src/ui/dialog/document-properties.cpp:763 +#: ../src/ui/dialog/document-properties.cpp:806 msgid "External script files:" msgstr "Externe scriptbestanden:" -#: ../src/ui/dialog/document-properties.cpp:765 +#: ../src/ui/dialog/document-properties.cpp:808 msgid "Add the current file name or browse for a file" msgstr "Deze bestandsnaam toevoegen of naar bestand browsen" -#: ../src/ui/dialog/document-properties.cpp:768 -#: ../src/ui/dialog/document-properties.cpp:845 +#: ../src/ui/dialog/document-properties.cpp:811 +#: ../src/ui/dialog/document-properties.cpp:888 #: ../src/ui/widget/selected-style.cpp:357 msgid "Remove" msgstr "Verwijderen" -#: ../src/ui/dialog/document-properties.cpp:832 +#: ../src/ui/dialog/document-properties.cpp:875 msgid "Filename" msgstr "Bestand" # zijn dit de uitbreidingen (Engels: external modules)? -#: ../src/ui/dialog/document-properties.cpp:840 +#: ../src/ui/dialog/document-properties.cpp:883 msgid "Embedded script files:" msgstr "Ingevoegde scriptbestanden:" -#: ../src/ui/dialog/document-properties.cpp:842 +#: ../src/ui/dialog/document-properties.cpp:885 #: ../src/ui/dialog/objects.cpp:1894 msgid "New" msgstr "Nieuw" -#: ../src/ui/dialog/document-properties.cpp:909 +#: ../src/ui/dialog/document-properties.cpp:952 msgid "Script id" msgstr "Script id" -#: ../src/ui/dialog/document-properties.cpp:915 +#: ../src/ui/dialog/document-properties.cpp:958 msgid "Content:" msgstr "Inhoud:" -#: ../src/ui/dialog/document-properties.cpp:1032 +#: ../src/ui/dialog/document-properties.cpp:1075 msgid "_Save as default" msgstr "_Instellen als standaard" -#: ../src/ui/dialog/document-properties.cpp:1033 +#: ../src/ui/dialog/document-properties.cpp:1076 msgid "Save this metadata as the default metadata" msgstr "Deze metadata als standaardwaarde bewaren" -#: ../src/ui/dialog/document-properties.cpp:1034 +#: ../src/ui/dialog/document-properties.cpp:1077 msgid "Use _default" msgstr "_Standaard gebruiken" -#: ../src/ui/dialog/document-properties.cpp:1035 +#: ../src/ui/dialog/document-properties.cpp:1078 msgid "Use the previously saved default metadata here" msgstr "_Bewaarde standaardmetadata gebruiken" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1108 +#: ../src/ui/dialog/document-properties.cpp:1151 msgid "Add external script..." msgstr "Extern script toevoegen..." -#: ../src/ui/dialog/document-properties.cpp:1147 +#: ../src/ui/dialog/document-properties.cpp:1190 msgid "Select a script to load" msgstr "Selecteer een script om te laden" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1175 +#: ../src/ui/dialog/document-properties.cpp:1218 msgid "Add embedded script..." msgstr "Ingevoegd script toevoegen..." #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1206 +#: ../src/ui/dialog/document-properties.cpp:1249 msgid "Remove external script" msgstr "Extern script verwijderen" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1235 +#: ../src/ui/dialog/document-properties.cpp:1278 msgid "Remove embedded script" msgstr "Ingevoegd script verwijderen" #. TODO repr->set_content(_EmbeddedContent.get_buffer()->get_text()); #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1331 +#: ../src/ui/dialog/document-properties.cpp:1374 msgid "Edit embedded script" msgstr "Ingevoegd script bewerken" -#: ../src/ui/dialog/document-properties.cpp:1415 +#: ../src/ui/dialog/document-properties.cpp:1458 msgid "Creation" msgstr "Aanmaken" -#: ../src/ui/dialog/document-properties.cpp:1416 +#: ../src/ui/dialog/document-properties.cpp:1459 msgid "Defined grids" msgstr "Bestaande rasters" -#: ../src/ui/dialog/document-properties.cpp:1660 +#: ../src/ui/dialog/document-properties.cpp:1703 msgid "Remove grid" msgstr "Raster verwijderen" -#: ../src/ui/dialog/document-properties.cpp:1752 +#: ../src/ui/dialog/document-properties.cpp:1795 msgid "Changed default display unit" msgstr "Documenteenheid aangepast" @@ -15567,7 +15586,8 @@ msgstr "Informatie" #: ../share/extensions/jitternodes.inx.h:12 #: ../share/extensions/layout_nup.inx.h:24 #: ../share/extensions/lindenmayer.inx.h:13 -#: ../share/extensions/lorem_ipsum.inx.h:6 ../share/extensions/measure.inx.h:33 +#: ../share/extensions/lorem_ipsum.inx.h:6 +#: ../share/extensions/measure.inx.h:33 #: ../share/extensions/pathalongpath.inx.h:16 #: ../share/extensions/pathscatter.inx.h:18 #: ../share/extensions/restack.inx.h:25 ../share/extensions/split.inx.h:8 @@ -17727,17 +17747,16 @@ msgstr "" "omlijningsdikte)" #: ../src/ui/dialog/inkscape-preferences.cpp:213 -#, fuzzy msgid "Base simplify:" -msgstr "Vereenvoudigen" +msgstr "Basis vereenvoudiging:" #: ../src/ui/dialog/inkscape-preferences.cpp:213 msgid "on dynamic LPE simplify" -msgstr "" +msgstr "bij dynamisch padeffect vereenvoudigen" #: ../src/ui/dialog/inkscape-preferences.cpp:214 msgid "Base simplify of dynamic LPE based simplify" -msgstr "" +msgstr "Basis vereenvoudiging van het dynamisch padeffect vereenvoudigen" #: ../src/ui/dialog/inkscape-preferences.cpp:229 msgid "No objects selected to take the style from." @@ -18179,7 +18198,7 @@ msgstr "Teksteenheid" #: ../src/ui/dialog/inkscape-preferences.cpp:475 msgid "Text size unit type:" -msgstr "Teskteenheid:" +msgstr "Eenheid tekstgrootte:" #: ../src/ui/dialog/inkscape-preferences.cpp:476 msgid "Set the type of unit used in the text toolbar and text dialogs" @@ -19538,7 +19557,7 @@ msgstr "K-kanaal behouden in CMYK->CMYK-transformaties" #: ../src/ui/dialog/inkscape-preferences.cpp:1091 #: ../src/ui/widget/color-icc-selector.cpp:394 -#: ../src/ui/widget/color-icc-selector.cpp:685 +#: ../src/ui/widget/color-icc-selector.cpp:699 msgid "" msgstr "" @@ -19896,11 +19915,13 @@ msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1266 msgid "Mouse move pans when Space is pressed" -msgstr "" +msgstr "Muisverplaatsing geeft verplaatsing bij indrukken spatiebalk" #: ../src/ui/dialog/inkscape-preferences.cpp:1268 msgid "When on, pressing and holding Space and dragging pans canvas" msgstr "" +"Indien ingeschakelt, zal ingedrukt houden van de spatiebalk en slepen het " +"canvas verplaatsen" #: ../src/ui/dialog/inkscape-preferences.cpp:1269 msgid "Mouse wheel zooms by default" @@ -20791,7 +20812,8 @@ msgstr "X-helling" msgid "Y tilt" msgstr "Y-helling" -#: ../src/ui/dialog/input.cpp:1616 ../src/ui/widget/color-wheel-selector.cpp:29 +#: ../src/ui/dialog/input.cpp:1616 +#: ../src/ui/widget/color-wheel-selector.cpp:29 msgid "Wheel" msgstr "Wiel" @@ -21597,15 +21619,18 @@ msgstr "Kopf-Lischinski" msgid "Output" msgstr "Uitvoer" -#: ../src/ui/dialog/pixelartdialog.cpp:297 ../src/ui/dialog/tracedialog.cpp:814 +#: ../src/ui/dialog/pixelartdialog.cpp:297 +#: ../src/ui/dialog/tracedialog.cpp:814 msgid "Reset all settings to defaults" msgstr "Alle instellingen naar de standaarwaarden terugzetten" -#: ../src/ui/dialog/pixelartdialog.cpp:302 ../src/ui/dialog/tracedialog.cpp:819 +#: ../src/ui/dialog/pixelartdialog.cpp:302 +#: ../src/ui/dialog/tracedialog.cpp:819 msgid "Abort a trace in progress" msgstr "Het overtrekken afbreken" -#: ../src/ui/dialog/pixelartdialog.cpp:306 ../src/ui/dialog/tracedialog.cpp:823 +#: ../src/ui/dialog/pixelartdialog.cpp:306 +#: ../src/ui/dialog/tracedialog.cpp:823 msgid "Execute the trace" msgstr "Het overtrekken starten" @@ -21978,7 +22003,8 @@ msgid "Preview Text:" msgstr "Voorbeeldtekst:" #: ../src/ui/dialog/swatches.cpp:202 ../src/ui/tools/gradient-tool.cpp:360 -#: ../src/ui/tools/gradient-tool.cpp:458 ../src/widgets/gradient-vector.cpp:801 +#: ../src/ui/tools/gradient-tool.cpp:458 +#: ../src/widgets/gradient-vector.cpp:801 msgid "Add gradient stop" msgstr "Kleurverloopovergang toevoegen" @@ -22138,9 +22164,8 @@ msgid "Vertical text" msgstr "Verticale tekst" #: ../src/ui/dialog/text-edit.cpp:130 ../src/ui/dialog/text-edit.cpp:131 -#, fuzzy msgid "Spacing between baselines (percent of font size)" -msgstr "Ruimte tussen lijnen (percentage van lettertypegrootte)" +msgstr "Ruimte tussen basislijnen (percentage van lettertypegrootte)" #: ../src/ui/dialog/text-edit.cpp:147 msgid "Text path offset" @@ -22788,9 +22813,8 @@ msgstr "Groep #%1 binnengaan" #. Pop selection out of group #: ../src/ui/interface.cpp:1528 -#, fuzzy msgid "_Pop selection out of group" -msgstr "_Selectie als groep behandelen: " +msgstr "_Selectie uit groep halen" #. Item dialog #: ../src/ui/interface.cpp:1656 ../src/verbs.cpp:2940 @@ -23268,12 +23292,10 @@ msgstr "" "roteren" #: ../src/ui/tool/node.cpp:529 -#, fuzzy msgctxt "Path handle tip" msgid "Ctrl: Snap handle to steps defined in BSpline Live Path Effect" msgstr "" -"Ctrl: handvat met dit aantal stappen verplaaten in het BSpline Live " -"Effect" +"Ctrl: handvat met dit aantal stappen kleven in het BSpline padeffect" #: ../src/ui/tool/node.cpp:532 #, c-format @@ -23417,7 +23439,8 @@ msgid "Rotate handle" msgstr "Roteerhandvat" #. We need to call MPM's method because it could have been our last node -#: ../src/ui/tool/path-manipulator.cpp:1555 ../src/widgets/node-toolbar.cpp:397 +#: ../src/ui/tool/path-manipulator.cpp:1555 +#: ../src/widgets/node-toolbar.cpp:397 msgid "Delete node" msgstr "Item verwijderen" @@ -24083,9 +24106,8 @@ msgid "Add guides from measure tool" msgstr "Hulplijnen van meetlat toevoegen" #: ../src/ui/tools/measure-tool.cpp:781 -#, fuzzy -msgid "Add Stored to measure tool" -msgstr "Hulplijnen van meetlat toevoegen" +msgid "Keep last measure on the canvas, for reference" +msgstr "" #: ../src/ui/tools/measure-tool.cpp:801 msgid "Convert measure to items" @@ -24268,40 +24290,42 @@ msgstr "" "zetten. Shift+klik om een hoekig knooppunt te maken." #: ../src/ui/tools/pen-tool.cpp:1797 -#, fuzzy, c-format +#, c-format msgid "" "Curve segment: angle %3.2f°, distance %s; with Ctrl to " "snap angle, Enter or Shift+Enter to finish the path" msgstr "" -"Segment curve: hoek %3.2f°, afstand %s; gebruik Ctrl om " -"in stappen te draaien, Enter om het pad af te maken" +"Curve: hoek %3.2f°, afstand %s; gebruik Ctrl om hoek te " +"kleven, Enter of Shift+Enter om het pad af te maken" #: ../src/ui/tools/pen-tool.cpp:1798 -#, fuzzy, c-format +#, c-format msgid "" "Line segment: angle %3.2f°, distance %s; with Ctrl to " "snap angle, Enter or Shift+Enter to finish the path" msgstr "" -"Segment lijn: hoek %3.2f°, afstand %s; gebruik Ctrl om in " -"stappen te draaien, Enter om het pad af te maken" +"Lijnsegment: hoek %3.2f°, afstand %s; gebruik Ctrl om " +"hoek te kleven, Enter of Shift+Enter om het pad af te maken" #: ../src/ui/tools/pen-tool.cpp:1801 -#, fuzzy, c-format +#, c-format msgid "" "Curve segment: angle %3.2f°, distance %s; with Shift+Click make a cusp node, Enter or Shift+Enter to finish the path" msgstr "" -"Segment curve: hoek %3.2f°, afstand %s; gebruik Shit+Klik " -"om een hoekig knooppunt te maken, Enter om het pad af te maken" +"Curve: hoek %3.2f°, afstand %s; gebruik Shit+Klik om een " +"hoekig knooppunt te maken, Enter of Shift+Enter om het pad af " +"te maken" #: ../src/ui/tools/pen-tool.cpp:1802 -#, fuzzy, c-format +#, c-format msgid "" "Line segment: angle %3.2f°, distance %s; with Shift+Click " "make a cusp node, Enter or Shift+Enter to finish the path" msgstr "" -"Segment lijn: hoek %3.2f°, afstand %s; gebruik Shit+Klik " -"om een hoekig knooppunt te maken, Enter om het pad af te maken" +"Lijnsegment: hoek %3.2f°, afstand %s; gebruik Shit+Klik " +"om een hoekig knooppunt te maken, Enter of Shift+Enter om het " +"pad af te maken" #: ../src/ui/tools/pen-tool.cpp:1819 #, c-format @@ -25008,9 +25032,8 @@ msgid "CMYK" msgstr "CMYK" #: ../src/ui/widget/filter-effect-chooser.cpp:26 -#, fuzzy msgid "_Blur:" -msgstr "Vervagen" +msgstr "_Vervagen:" #: ../src/ui/widget/filter-effect-chooser.cpp:29 msgid "Blur (%)" @@ -25413,7 +25436,7 @@ msgstr "_Pagina schalen naar inhoud..." #: ../src/ui/widget/page-sizer.cpp:447 msgid "_Resize page to drawing or selection" -msgstr "Pagina _schalen naar tekening of selectie" +msgstr "Pagina h_erschalen naar tekening of selectie" #: ../src/ui/widget/page-sizer.cpp:448 msgid "" @@ -26375,9 +26398,8 @@ msgid "Quit Inkscape" msgstr "Inkscape afsluiten" #: ../src/verbs.cpp:2456 -#, fuzzy msgid "New from _Template..." -msgstr "Nieuw van sjabloon..." +msgstr "Nieuw van s_jabloon..." #: ../src/verbs.cpp:2457 msgid "Create new project from template" @@ -26565,7 +26587,7 @@ msgstr "Het object waaraan de kloon gekoppeld is selecteren" #: ../src/verbs.cpp:2504 msgid "Clone original path (LPE)" -msgstr "Origineel pad klonen (LPE)" +msgstr "Origineel pad klonen (padeffect)" #: ../src/verbs.cpp:2505 msgid "" @@ -26811,14 +26833,12 @@ msgid "Ungroup selected groups" msgstr "Geselecteerde groepen opheffen" #: ../src/verbs.cpp:2565 -#, fuzzy msgid "_Pop selected objects out of group" -msgstr "Geselecteerde objecten groeperen" +msgstr "Geselecteerde objecten uit groep _halen" #: ../src/verbs.cpp:2566 -#, fuzzy msgid "Pop selected objects out of group" -msgstr "Geselecteerde objecten groeperen" +msgstr "Geselecteerde objecten uit groep halen" #: ../src/verbs.cpp:2568 msgid "_Put on Path" @@ -27308,9 +27328,8 @@ msgid "" msgstr "Maskerpad toepassen op selectie (met bovenste object als maskerpad)" #: ../src/verbs.cpp:2721 -#, fuzzy msgid "Create Cl_ip Group" -msgstr "_Klonen" +msgstr "_Afsnijgroep maken" #: ../src/verbs.cpp:2722 msgid "Creates a clip group using the selected objects as a base" @@ -28047,7 +28066,7 @@ msgstr "Enkele opties voor de verstuiver" #: ../src/verbs.cpp:2920 msgid "Undo _History..." -msgstr "Gesc_hiedenis..." +msgstr "G_eschiedenis..." #: ../src/verbs.cpp:2921 msgid "Undo History" @@ -28153,9 +28172,8 @@ msgid "View Layers" msgstr "Informatie over de aanwezige lagen tonen" #: ../src/verbs.cpp:2948 -#, fuzzy msgid "Object_s..." -msgstr "Objecten tonen" +msgstr "Ob_jecten..." #: ../src/verbs.cpp:2949 msgid "View Objects" @@ -28163,7 +28181,7 @@ msgstr "Objecten tonen" #: ../src/verbs.cpp:2950 msgid "Selection se_ts..." -msgstr "" +msgstr "_Selectiesets..." #: ../src/verbs.cpp:2951 msgid "View Tags" @@ -28342,9 +28360,8 @@ msgid "Fit the page to the drawing" msgstr "Paginaformaat aan tekening aanpassen" #: ../src/verbs.cpp:3008 -#, fuzzy msgid "_Resize Page to Selection" -msgstr "Pagina naar selectie schalen" +msgstr "Pagina h_erschalen naar selectie" #: ../src/verbs.cpp:3009 msgid "" @@ -29137,21 +29154,18 @@ msgid "The width of the eraser pen (relative to the visible canvas area)" msgstr "De breedte van de gom (relatief tov het zichtbare canvasoppervlak)" #: ../src/widgets/eraser-toolbar.cpp:171 -#, fuzzy msgid "Eraser Mass" -msgstr "Gom" +msgstr "Gomgewicht" #: ../src/widgets/eraser-toolbar.cpp:172 -#, fuzzy msgid "Increase to make the eraser drag behind, as if slowed by inertia" msgstr "" -"Verhoog dit om de pen langzamer te laten reageren, alsof vertraagd door " +"Verhoog dit om de gom langzamer te laten reageren, alsof vertraagd door " "inertie" #: ../src/widgets/eraser-toolbar.cpp:186 ../src/widgets/eraser-toolbar.cpp:187 -#, fuzzy msgid "Break apart cut items" -msgstr "Opdelen" +msgstr "Gesneden items opdelen" #: ../src/widgets/fill-style.cpp:356 msgid "Change fill rule" @@ -29272,27 +29286,33 @@ msgstr "radiaal" msgid "Create radial (elliptic or circular) gradient" msgstr "Radiaal kleurverloop (eliptisch of cirkelvormig) maken" -#: ../src/widgets/gradient-toolbar.cpp:1044 ../src/widgets/mesh-toolbar.cpp:387 +#: ../src/widgets/gradient-toolbar.cpp:1044 +#: ../src/widgets/mesh-toolbar.cpp:387 msgid "New:" msgstr "Nieuw:" -#: ../src/widgets/gradient-toolbar.cpp:1067 ../src/widgets/mesh-toolbar.cpp:410 +#: ../src/widgets/gradient-toolbar.cpp:1067 +#: ../src/widgets/mesh-toolbar.cpp:410 msgid "fill" msgstr "vulling" -#: ../src/widgets/gradient-toolbar.cpp:1067 ../src/widgets/mesh-toolbar.cpp:410 +#: ../src/widgets/gradient-toolbar.cpp:1067 +#: ../src/widgets/mesh-toolbar.cpp:410 msgid "Create gradient in the fill" msgstr "Kleurverloop maken voor vulling" -#: ../src/widgets/gradient-toolbar.cpp:1071 ../src/widgets/mesh-toolbar.cpp:414 +#: ../src/widgets/gradient-toolbar.cpp:1071 +#: ../src/widgets/mesh-toolbar.cpp:414 msgid "stroke" msgstr "lijn" -#: ../src/widgets/gradient-toolbar.cpp:1071 ../src/widgets/mesh-toolbar.cpp:414 +#: ../src/widgets/gradient-toolbar.cpp:1071 +#: ../src/widgets/mesh-toolbar.cpp:414 msgid "Create gradient in the stroke" msgstr "Kleurverloop maken voor lijn" -#: ../src/widgets/gradient-toolbar.cpp:1074 ../src/widgets/mesh-toolbar.cpp:417 +#: ../src/widgets/gradient-toolbar.cpp:1074 +#: ../src/widgets/mesh-toolbar.cpp:417 msgid "on:" msgstr "Op:" @@ -29392,7 +29412,8 @@ msgstr "Kleurverlopen linken" msgid "Link gradients to change all related gradients" msgstr "Kleurverlopen linken om alle gerelateerde kleurverlopen te veranderen" -#: ../src/widgets/gradient-vector.cpp:317 ../src/widgets/paint-selector.cpp:965 +#: ../src/widgets/gradient-vector.cpp:317 +#: ../src/widgets/paint-selector.cpp:965 #: ../src/widgets/stroke-marker-selector.cpp:154 msgid "No document selected" msgstr "Geen document geselecteerd" @@ -29440,18 +29461,16 @@ msgid "Child widget to appear next to the menu text" msgstr "" #: ../src/widgets/image-menu-item.c:167 -#, fuzzy msgid "Use stock" -msgstr "Lijn plakken" +msgstr "" #: ../src/widgets/image-menu-item.c:168 msgid "Whether to use the label text to create a stock menu item" msgstr "" #: ../src/widgets/image-menu-item.c:183 -#, fuzzy msgid "Accel Group" -msgstr "Groep" +msgstr "" #: ../src/widgets/image-menu-item.c:184 msgid "The Accel Group to use for stock accelerator keys" @@ -30179,9 +30198,8 @@ msgid "From clipboard" msgstr "Van klembord" #: ../src/widgets/pencil-toolbar.cpp:181 -#, fuzzy msgid "Bend from clipboard" -msgstr "Van klembord" +msgstr "Buiging van klembord" #: ../src/widgets/pencil-toolbar.cpp:182 msgid "Last applied" @@ -30193,7 +30211,7 @@ msgstr "Vorm:" #: ../src/widgets/pencil-toolbar.cpp:207 msgid "Shape of new paths drawn by this tool" -msgstr "Vorm van nieuwe paden getekend met dit gereedschap" +msgstr "Vorm van nieuwe paden met dit gereedschap" #: ../src/widgets/pencil-toolbar.cpp:372 msgid "(many nodes, rough)" @@ -30221,11 +30239,11 @@ msgstr "" #: ../src/widgets/pencil-toolbar.cpp:407 ../src/widgets/pencil-toolbar.cpp:408 msgid "LPE based interactive simplify" -msgstr "" +msgstr "Padeffect-gebaseerde interactieve vereenvoudiging" #: ../src/widgets/pencil-toolbar.cpp:418 ../src/widgets/pencil-toolbar.cpp:419 msgid "LPE simplify flatten" -msgstr "" +msgstr "Vereenvoudiging padeffect uitvlakken" #: ../src/widgets/rect-toolbar.cpp:125 msgid "Change rectangle" @@ -30599,11 +30617,9 @@ msgid "The width of the spray area (relative to the visible canvas area)" msgstr "De breedte van het verstuivingsgebied (relatief tov het canvas)" #: ../src/widgets/spray-toolbar.cpp:312 -#, fuzzy msgid "Use the pressure of the input device to alter the width of spray area" msgstr "" -"De op het invoerapparaat uitgeoefende druk gebruiken om de penbreedte te " -"variëren" +"Druk op het invoerapparaat gebruiken om het verstuivingsgebied aan te passen" #: ../src/widgets/spray-toolbar.cpp:323 msgid "(maximum mean)" @@ -31069,29 +31085,24 @@ msgid "Square cap" msgstr "Vierkant uiteinde" #: ../src/widgets/stroke-style.cpp:392 -#, fuzzy msgid "Fill, Stroke, Markers" -msgstr "Lijnstijl" +msgstr "" #: ../src/widgets/stroke-style.cpp:396 -#, fuzzy msgid "Stroke, Fill, Markers" -msgstr "Lijnstijl" +msgstr "" #: ../src/widgets/stroke-style.cpp:400 -#, fuzzy msgid "Fill, Markers, Stroke" -msgstr "Vulling en lijn" +msgstr "" #: ../src/widgets/stroke-style.cpp:408 -#, fuzzy msgid "Markers, Fill, Stroke" -msgstr "Vulling en lijn" +msgstr "" #: ../src/widgets/stroke-style.cpp:412 -#, fuzzy msgid "Stroke, Markers, Fill" -msgstr "Lijnstijl" +msgstr "" #: ../src/widgets/stroke-style.cpp:416 msgid "Markers, Stroke, Fill" @@ -31138,9 +31149,8 @@ msgid "Text: Change line-height" msgstr "Tekst: lijnhoogte veranderen" #: ../src/widgets/text-toolbar.cpp:728 -#, fuzzy msgid "Text: Change line-height unit" -msgstr "Tekst: lijnhoogte veranderen" +msgstr "Tekst: eenheid lijnhoogte veranderen" #: ../src/widgets/text-toolbar.cpp:777 msgid "Text: Change word-spacing" @@ -31163,9 +31173,8 @@ msgid "Text: Change rotate" msgstr "Tekst: draaiing veranderen" #: ../src/widgets/text-toolbar.cpp:977 -#, fuzzy msgid "Text: Change writing mode" -msgstr "Tekst: oriëntatie veranderen" +msgstr "Tekst: schrijfmodus veranderen" #: ../src/widgets/text-toolbar.cpp:1031 msgid "Text: Change orientation" @@ -31183,7 +31192,7 @@ msgstr "Selecteer lettertypefamilie (Alt+X voor dialoog)" #. Enable entry completion #: ../src/widgets/text-toolbar.cpp:1550 msgid "Select all text with this font-family" -msgstr "Alle teskt met deze font-family selecteren" +msgstr "Alle tekst met deze lettertypefamilie selecteren" #: ../src/widgets/text-toolbar.cpp:1554 msgid "Font not found on system" @@ -31259,30 +31268,27 @@ msgstr "Schrijfmodus" #. Label #: ../src/widgets/text-toolbar.cpp:1760 msgid "Block progression" -msgstr "" +msgstr "Blokprogressie" #: ../src/widgets/text-toolbar.cpp:1789 -#, fuzzy msgid "Auto glyph orientation" -msgstr "Padoriëntatie volgen" +msgstr "Automatische karakteroriëntatie" #: ../src/widgets/text-toolbar.cpp:1796 msgid "Upright" -msgstr "" +msgstr "Staand" #: ../src/widgets/text-toolbar.cpp:1797 -#, fuzzy msgid "Upright glyph orientation" -msgstr "Tekstoriëntatie" +msgstr "Staande karakteroriëntatie" #: ../src/widgets/text-toolbar.cpp:1804 msgid "Sideways" -msgstr "" +msgstr "Zijwaarts" #: ../src/widgets/text-toolbar.cpp:1805 -#, fuzzy msgid "Sideways glyph orientation" -msgstr "Padoriëntatie volgen" +msgstr "Zijwaartse karakteroriëntatie" #. Name #: ../src/widgets/text-toolbar.cpp:1811 @@ -31321,9 +31327,8 @@ msgstr "Lijn:" #. short label #: ../src/widgets/text-toolbar.cpp:1852 -#, fuzzy msgid "Spacing between baselines (times font size)" -msgstr "Ruimte tussen lijnen (maal lettertypegrootte)" +msgstr "Ruimte tussen basislijnen (maal lettertypegrootte)" #. Drop down menu #: ../src/widgets/text-toolbar.cpp:1884 ../src/widgets/text-toolbar.cpp:1915 @@ -32269,7 +32274,7 @@ msgstr "" "paden." #: ../share/extensions/inkex.py:116 -#, fuzzy, python-format +#, python-format msgid "" "The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore " "this extension.Please download and install the latest version from http://" @@ -32282,7 +32287,7 @@ msgstr "" "De lxml wrapper voor libxml2 is nodig voor inkex.py en dus ook voor deze " "uitbreiding. Download en installeer alstublief de laatste versie van http://" "cheeseshop.python.org/pypi/lxml/ of installeer het met uw package manager " -"via de commandolijn: sudo apt-get install python-lxml\n" +"via de commandolijn (bijvoorbeeld): sudo apt-get install python-lxml\n" "\n" "Technische details:\n" "%s" @@ -32540,7 +32545,8 @@ msgid "Area is zero, cannot calculate Center of Mass" msgstr "Oppervlak is gelijk aan nul, kan massacentrum niet berekenen" #: ../share/extensions/pathalongpath.py:207 -#: ../share/extensions/pathscatter.py:226 ../share/extensions/perspective.py:50 +#: ../share/extensions/pathscatter.py:226 +#: ../share/extensions/perspective.py:50 msgid "This extension requires two selected paths." msgstr "Deze uitbreiding vereist twee geselecteerde paden." @@ -32577,7 +32583,8 @@ msgstr "" "Debian-gebaseerd systeem kan dit gedaan worden met het commando, sudo apt-" "get install python-numpy." -#: ../share/extensions/perspective.py:58 ../share/extensions/summersnight.py:49 +#: ../share/extensions/perspective.py:58 +#: ../share/extensions/summersnight.py:49 #, python-format msgid "" "The first selected object is of type '%s'.\n" @@ -32586,14 +32593,16 @@ msgstr "" "Het eerste geselecteerde object is van het type '%s'.\n" "Probeer de procedure Paden->Object naar Pad." -#: ../share/extensions/perspective.py:65 ../share/extensions/summersnight.py:57 +#: ../share/extensions/perspective.py:65 +#: ../share/extensions/summersnight.py:57 msgid "" "This extension requires that the second selected path be four nodes long." msgstr "" "Deze uitbreiding vereist dat het tweede geselecteerde pad vier knooppunten " "lang is." -#: ../share/extensions/perspective.py:91 ../share/extensions/summersnight.py:90 +#: ../share/extensions/perspective.py:91 +#: ../share/extensions/summersnight.py:90 msgid "" "The second selected object is a group, not a path.\n" "Try using the procedure Object->Ungroup." @@ -32601,7 +32610,8 @@ msgstr "" "Het tweede geselecteerde object is een groep en geen pad.\n" "Probeer de procedure Object->Groep opheffen." -#: ../share/extensions/perspective.py:93 ../share/extensions/summersnight.py:92 +#: ../share/extensions/perspective.py:93 +#: ../share/extensions/summersnight.py:92 msgid "" "The second selected object is not a path.\n" "Try using the procedure Path->Object to Path." @@ -32609,7 +32619,8 @@ msgstr "" "Het tweede geselecteerde object is geen pad.\n" "Probeer de procedure Paden->Object naar Pad." -#: ../share/extensions/perspective.py:96 ../share/extensions/summersnight.py:95 +#: ../share/extensions/perspective.py:96 +#: ../share/extensions/summersnight.py:95 msgid "" "The first selected object is not a path.\n" "Try using the procedure Path->Object to Path." @@ -33907,7 +33918,7 @@ msgid "" "* A relative path (or a filename without path) is relative to the user's " "home directory." msgstr "" -"* Type de bestandsextensie niet. Deze wordt automatisch toegevoegd.\n" +"* Typ de bestandsextensie niet. Deze wordt automatisch toegevoegd.\n" "* Een relatief pad (of bestand zonder pad) is relatief tov de homedirectory." #: ../share/extensions/extrude.inx.h:3 @@ -35422,12 +35433,14 @@ msgstr "" "UniConverter geïnstalleerd hebben en opnieuw openen." #: ../share/extensions/hpgl_input.inx.h:3 -#: ../share/extensions/hpgl_output.inx.h:4 ../share/extensions/plotter.inx.h:32 +#: ../share/extensions/hpgl_output.inx.h:4 +#: ../share/extensions/plotter.inx.h:32 msgid "Resolution X (dpi):" msgstr "X-resolutie (ppi):" #: ../share/extensions/hpgl_input.inx.h:4 -#: ../share/extensions/hpgl_output.inx.h:5 ../share/extensions/plotter.inx.h:33 +#: ../share/extensions/hpgl_output.inx.h:5 +#: ../share/extensions/plotter.inx.h:33 msgid "" "The amount of steps the plotter moves if it moves for 1 inch on the X axis " "(Default: 1016.0)" @@ -35436,12 +35449,14 @@ msgstr "" "(standaard 1016.0)" #: ../share/extensions/hpgl_input.inx.h:5 -#: ../share/extensions/hpgl_output.inx.h:6 ../share/extensions/plotter.inx.h:34 +#: ../share/extensions/hpgl_output.inx.h:6 +#: ../share/extensions/plotter.inx.h:34 msgid "Resolution Y (dpi):" msgstr "Y-resolutie (ppi):" #: ../share/extensions/hpgl_input.inx.h:6 -#: ../share/extensions/hpgl_output.inx.h:7 ../share/extensions/plotter.inx.h:35 +#: ../share/extensions/hpgl_output.inx.h:7 +#: ../share/extensions/plotter.inx.h:35 msgid "" "The amount of steps the plotter moves if it moves for 1 inch on the Y axis " "(Default: 1016.0)" @@ -35481,15 +35496,18 @@ msgstr "" "de plotteruitbreiding (menu Uitbreidingen) om onmiddellijk over een seriële " "verbinding te plotten." -#: ../share/extensions/hpgl_output.inx.h:3 ../share/extensions/plotter.inx.h:31 +#: ../share/extensions/hpgl_output.inx.h:3 +#: ../share/extensions/plotter.inx.h:31 msgid "Plotter Settings " msgstr "Plotterinstellingen" -#: ../share/extensions/hpgl_output.inx.h:8 ../share/extensions/plotter.inx.h:36 +#: ../share/extensions/hpgl_output.inx.h:8 +#: ../share/extensions/plotter.inx.h:36 msgid "Pen number:" msgstr "Nummer pen:" -#: ../share/extensions/hpgl_output.inx.h:9 ../share/extensions/plotter.inx.h:37 +#: ../share/extensions/hpgl_output.inx.h:9 +#: ../share/extensions/plotter.inx.h:37 msgid "The number of the pen (tool) to use (Standard: '1')" msgstr "Te gebruiken pennummer (gereedschap) (Standaard: '1')" @@ -35786,9 +35804,8 @@ msgstr "Bedieningsoverzicht" #. i18n. Please don't translate it unless a page exists in your language #: ../share/extensions/inkscape_help_keys.inx.h:3 -#, fuzzy msgid "http://inkscape.org/doc/keys092.html" -msgstr "http://inkscape.org/doc/keys091.html" +msgstr "http://inkscape.org/doc/keys092.html" #: ../share/extensions/inkscape_help_manual.inx.h:1 msgid "Inkscape Manual" @@ -35805,9 +35822,8 @@ msgstr "Nieuw in deze versie" #. i18n. Please don't translate it unless a page exists in your language #: ../share/extensions/inkscape_help_relnotes.inx.h:3 -#, fuzzy msgid "http://wiki.inkscape.org/wiki/index.php/Release_notes/0.92" -msgstr "http://wiki.inkscape.org/wiki/index.php/Release_notes/0.91" +msgstr "http://wiki.inkscape.org/wiki/index.php/Release_notes/0.92" #: ../share/extensions/inkscape_help_reportabug.inx.h:1 msgid "Report a Bug" @@ -35837,11 +35853,13 @@ msgstr "Eindpaden dupliceren" msgid "Interpolate style" msgstr "Stijl interpoleren" -#: ../share/extensions/interp.inx.h:7 ../share/extensions/interp_att_g.inx.h:10 +#: ../share/extensions/interp.inx.h:7 +#: ../share/extensions/interp_att_g.inx.h:10 msgid "Use Z-order" msgstr "Z-orde gebruiken" -#: ../share/extensions/interp.inx.h:8 ../share/extensions/interp_att_g.inx.h:11 +#: ../share/extensions/interp.inx.h:8 +#: ../share/extensions/interp_att_g.inx.h:11 msgid "Workaround for reversed selection order in Live Preview cycles" msgstr "" @@ -36774,9 +36792,8 @@ msgid "Text anchor:" msgstr "Tekstanker:" #: ../share/extensions/measure.inx.h:10 -#, fuzzy msgid "Fixed Text" -msgstr "Ingekaderde tekst" +msgstr "Vaste tekst" #: ../share/extensions/measure.inx.h:11 msgid "Angle (°):" @@ -36936,23 +36953,20 @@ msgid "Data" msgstr "" #: ../share/extensions/nicechart.inx.h:3 -#, fuzzy msgid "Data from file" -msgstr "Uit bestand laden" +msgstr "Data uit bestand" #: ../share/extensions/nicechart.inx.h:5 -#, fuzzy msgid "Delimiter:" -msgstr "Versteklimiet:" +msgstr "Scheidingsteken:" #: ../share/extensions/nicechart.inx.h:6 msgid "Column that contains the keys:" msgstr "" #: ../share/extensions/nicechart.inx.h:7 -#, fuzzy msgid "Column that contains the values:" -msgstr "Een constante sterkte" +msgstr "Kolom met de waarden:" #: ../share/extensions/nicechart.inx.h:8 msgid "File encoding (e.g. utf-8):" @@ -36963,18 +36977,16 @@ msgid "First line contains headings" msgstr "" #: ../share/extensions/nicechart.inx.h:10 -#, fuzzy msgid "Direct input" -msgstr "Richting" +msgstr "Directe invoer" #: ../share/extensions/nicechart.inx.h:11 msgid "Data:" msgstr "" #: ../share/extensions/nicechart.inx.h:12 -#, fuzzy msgid "Enter the full path to a CSV file:" -msgstr "Volledig pad naar logbestand:" +msgstr "Volledig pad naar csv-bestand:" #: ../share/extensions/nicechart.inx.h:13 msgid "Type in comma separated values:" @@ -36985,28 +36997,24 @@ msgid "(format like this: apples:3,bananas:5)" msgstr "" #: ../share/extensions/nicechart.inx.h:15 -#, fuzzy msgid "Labels" -msgstr "_Label" +msgstr "Labels" #: ../share/extensions/nicechart.inx.h:16 -#, fuzzy msgid "Font:" -msgstr "_Lettertype" +msgstr "Lettertype:" #: ../share/extensions/nicechart.inx.h:18 -#, fuzzy msgid "Font color:" -msgstr "Kleur maand:" +msgstr "Tekstkleur:" #: ../share/extensions/nicechart.inx.h:19 msgid "Charts" msgstr "" #: ../share/extensions/nicechart.inx.h:20 -#, fuzzy msgid "Draw horizontally" -msgstr "Horizontaal verplaatsen" +msgstr "Horizontaal tekenen" #: ../share/extensions/nicechart.inx.h:21 #, fuzzy @@ -37041,14 +37049,12 @@ msgid "Work around aliasing effects (creates overlapping segments)" msgstr "" #: ../share/extensions/nicechart.inx.h:29 -#, fuzzy msgid "Color scheme:" -msgstr "K_leuren:" +msgstr "Kleurschema:" #: ../share/extensions/nicechart.inx.h:30 -#, fuzzy msgid "Custom colors:" -msgstr "Kleur reliëf" +msgstr "Aangepaste kleuren:" #: ../share/extensions/nicechart.inx.h:31 #, fuzzy @@ -37065,24 +37071,20 @@ msgid "SAP" msgstr "" #: ../share/extensions/nicechart.inx.h:38 -#, fuzzy msgid "Values" -msgstr "Waarde" +msgstr "Waarden" #: ../share/extensions/nicechart.inx.h:39 -#, fuzzy msgid "Show values" -msgstr "Handvatten tonen" +msgstr "Waarden tonen" #: ../share/extensions/nicechart.inx.h:40 -#, fuzzy msgid "Chart type:" -msgstr "Schaduwtype:" +msgstr "Grafiektype:" #: ../share/extensions/nicechart.inx.h:41 -#, fuzzy msgid "Bar chart" -msgstr "Hoogte van streepjes:" +msgstr "Bargrafiek" #: ../share/extensions/nicechart.inx.h:42 msgid "Pie chart" @@ -37511,7 +37513,8 @@ msgstr "" msgid "AutoCAD Plot Input" msgstr "AutoCAD Plot invoer" -#: ../share/extensions/plt_input.inx.h:2 ../share/extensions/plt_output.inx.h:2 +#: ../share/extensions/plt_input.inx.h:2 +#: ../share/extensions/plt_output.inx.h:2 msgid "HP Graphics Language Plot file [AutoCAD] (*.plt)" msgstr "HP Graphics Language Plot bestand [AutoCAD] (*.plt)" @@ -38178,7 +38181,6 @@ msgid "" msgstr "" #: ../share/extensions/scour.inx.h:20 -#, fuzzy msgid "Remove the XML declaration" msgstr "Xml-declaratie verwijderen" @@ -38209,7 +38211,6 @@ msgid "Remove all XML comments from output." msgstr "" #: ../share/extensions/scour.inx.h:26 -#, fuzzy msgid "Embed raster images" msgstr "Rasterafbeeldingen invoegen" @@ -38276,14 +38277,12 @@ msgid "" msgstr "" #: ../share/extensions/scour.inx.h:39 -#, fuzzy msgid "Document options" -msgstr "Document_eigenschappen..." +msgstr "Documenteigenschappen" #: ../share/extensions/scour.inx.h:40 -#, fuzzy msgid "Pretty-printing" -msgstr "Schilderij" +msgstr "" #: ../share/extensions/scour.inx.h:41 msgid "Space" @@ -38299,14 +38298,12 @@ msgid "None" msgstr "Geen" #: ../share/extensions/scour.inx.h:44 -#, fuzzy msgid "IDs" -msgstr "ID" +msgstr "ID's" #: ../share/extensions/scour.inx.h:45 -#, fuzzy msgid "Remove unused IDs" -msgstr "Rood verwijderen" +msgstr "Ongebruikte ID's verwijderen" #: ../share/extensions/scour.inx.h:46 msgid "" @@ -38428,7 +38425,8 @@ msgstr "Staarthoogte:" msgid "sK1 vector graphics files input" msgstr "sK1 vector graphics invoer" -#: ../share/extensions/sk1_input.inx.h:2 ../share/extensions/sk1_output.inx.h:2 +#: ../share/extensions/sk1_input.inx.h:2 +#: ../share/extensions/sk1_output.inx.h:2 msgid "sK1 vector graphics files (*.sk1)" msgstr "sK1 vector graphics bestanden (*.sk1)" @@ -38903,23 +38901,20 @@ msgid "Deep Ungroup" msgstr "Groep opheffen" #: ../share/extensions/ungroup_deep.inx.h:2 -#, fuzzy msgid "Ungroup all groups in the selected object." -msgstr "Een afsnijgroep op basis van de geselecteerde objecten maken" +msgstr "Alle groepen degroeperen in het geselecteerde object." #: ../share/extensions/ungroup_deep.inx.h:3 -#, fuzzy msgid "Starting Depth" -msgstr "Startpad:" +msgstr "Startdiepte" #: ../share/extensions/ungroup_deep.inx.h:4 -#, fuzzy msgid "Stopping Depth (from top)" -msgstr "Maskerpad uitschakelen" +msgstr "Stopdiepte (van top)" #: ../share/extensions/ungroup_deep.inx.h:5 msgid "Depth to Keep (from bottom)" -msgstr "" +msgstr "Diepte houden (van bodem)" #: ../share/extensions/voronoi2svg.inx.h:1 msgid "Voronoi Diagram" @@ -38938,9 +38933,8 @@ msgid "Show the bounding box" msgstr "Omvattend vak tonen" #: ../share/extensions/voronoi2svg.inx.h:6 -#, fuzzy msgid "Triangles color" -msgstr "Oplopende driehoek" +msgstr "Kleur driehoek" #: ../share/extensions/voronoi2svg.inx.h:7 msgid "Delaunay Triangulation" @@ -38959,22 +38953,20 @@ msgid "Automatic from selected objects" msgstr "Automatisch van geselecteerde objecten" #: ../share/extensions/voronoi2svg.inx.h:12 -#, fuzzy msgid "Options for Delaunay Triangulation" -msgstr "Delaunay triangulatie" +msgstr "Opties voor Delaunay triangulatie" #: ../share/extensions/voronoi2svg.inx.h:13 msgid "Default (Stroke black and no fill)" -msgstr "" +msgstr "Standaard (lijn zwart, zonder vulling)" #: ../share/extensions/voronoi2svg.inx.h:14 -#, fuzzy msgid "Triangles with item color" -msgstr "Paletkleur aanpassen" +msgstr "Driehoeken met itemkleur" #: ../share/extensions/voronoi2svg.inx.h:15 msgid "Triangles with item color (random on apply)" -msgstr "" +msgstr "Driehoeken met itemkleur (random bij toepassen)" #: ../share/extensions/voronoi2svg.inx.h:17 msgid "" @@ -39403,11 +39395,13 @@ msgstr "Helling (graden):" msgid "Hide lines behind the sphere" msgstr "Lijnen achter de sfeer verbergen" -#: ../share/extensions/wmf_input.inx.h:1 ../share/extensions/wmf_output.inx.h:1 +#: ../share/extensions/wmf_input.inx.h:1 +#: ../share/extensions/wmf_output.inx.h:1 msgid "Windows Metafile Input" msgstr "Windows Metafile-invoer" -#: ../share/extensions/wmf_input.inx.h:3 ../share/extensions/wmf_output.inx.h:3 +#: ../share/extensions/wmf_input.inx.h:3 +#: ../share/extensions/wmf_output.inx.h:3 msgid "A popular graphics file format for clipart" msgstr "Een populair bestandsformaat voor clipart" @@ -39757,7 +39751,6 @@ msgstr "XAML-invoer" #~ msgid "School" #~ msgstr "School" -#, fuzzy #~ msgctxt "Symbol" #~ msgid "Kindergarten" #~ msgstr "Kindertuin" @@ -39766,11 +39759,6 @@ msgstr "XAML-invoer" #~ msgid "Pub" #~ msgstr "Café" -#, fuzzy -#~ msgctxt "Symbol" -#~ msgid "Desserts/Cakes Shop" -#~ msgstr "Lekkernijen" - #~ msgctxt "Symbol" #~ msgid "Fast Food" #~ msgstr "Fast Food" -- cgit v1.2.3 From 0acb41136a1f5d745bf41215f64bd2258fa5fedf Mon Sep 17 00:00:00 2001 From: firashanife Date: Thu, 9 Jun 2016 07:20:51 +0200 Subject: [Bug #1574561] Italian translation updates for 0.92.x. Fixed bugs: - https://launchpad.net/bugs/1574561 (bzr r14967) --- po/it.po | 491 +++++++++++++++++++++++++++------------------------------------ 1 file changed, 208 insertions(+), 283 deletions(-) diff --git a/po/it.po b/po/it.po index 5ac892cef..828f7eafe 100644 --- a/po/it.po +++ b/po/it.po @@ -7,12 +7,13 @@ # Luca Bruno , 2005-2009. # Firas Hanife , 2014-2016. # +#: ../src/ui/dialog/clonetiler.cpp:1010 msgid "" msgstr "" "Project-Id-Version: Inkscape 0.92\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2016-06-06 20:00+0200\n" -"PO-Revision-Date: 2016-06-07 15:20+0100\n" +"POT-Creation-Date: 2016-06-08 20:26+0200\n" +"PO-Revision-Date: 2016-06-08 15:48+0100\n" "Last-Translator: Firas Hanife \n" "Language-Team: \n" "Language: it\n" @@ -20,6 +21,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.5.4\n" #: ../inkscape.appdata.xml.in.h:1 ../inkscape.desktop.in.h:1 msgid "Inkscape" @@ -35,9 +37,9 @@ msgid "" "Illustrator, CorelDraw, or Xara X, using the W3C standard Scalable Vector " "Graphics (SVG) file format." msgstr "" -"Un editor di grafiche vettoriali, con funzionalità simili a Illustrator, " -"CorelDraw o Xara X. Utilizza il formato file standard W3C Scalable Vector " -"Graphics (SVG)." +"Un editor di grafiche vettoriali open source, con funzionalità simili a " +"Illustrator, CorelDraw o Xara X. Utilizza il formato file standard W3C " +"Scalable Vector Graphics (SVG)." #: ../inkscape.appdata.xml.in.h:4 msgid "" @@ -47,11 +49,14 @@ msgid "" "trace bitmaps and much more. We also aim to maintain a thriving user and " "developer community by using open, community-oriented development." msgstr "" +"Inkscape supporta molte funzionalità avanzate del formato SVG e offre una " +"semplice interfaccia di uso. Si possono modificare nodi, eseguire complesse " +"operazioni su tracciati, tracciare bitmap e molto altro. Inoltre Inkscape " +"supporta un'attiva comunità di utenti e sviluppatori." #: ../inkscape.appdata.xml.in.h:5 -#, fuzzy msgid "Main application window" -msgstr "Duplic_a finestra" +msgstr "Finestra applicazione" #: ../inkscape.desktop.in.h:3 msgid "Inkscape Vector Graphics Editor" @@ -63,7 +68,7 @@ msgstr "Crea e modifica immagini Scalable Vector Graphics" #: ../inkscape.desktop.in.h:5 msgid "image;editor;vector;drawing;" -msgstr "" +msgstr "immagine;editor;vettoriale;disegno;" #: ../inkscape.desktop.in.h:6 msgid "New Drawing" @@ -4887,21 +4892,21 @@ msgstr "Multiplo spaziatura griglia" msgid " to " msgstr " a " -#: ../src/document.cpp:531 +#: ../src/document.cpp:526 #, c-format msgid "New document %d" msgstr "Nuovo documento %d" -#: ../src/document.cpp:536 +#: ../src/document.cpp:531 #, c-format msgid "Memory document %d" msgstr "Documento memoria %d" -#: ../src/document.cpp:565 +#: ../src/document.cpp:560 msgid "Memory document %1" msgstr "Documento memoria %1" -#: ../src/document.cpp:864 +#: ../src/document.cpp:859 #, c-format msgid "Unnamed document %d" msgstr "Documento senza nome %d" @@ -5761,28 +5766,24 @@ msgstr "PostScript livello 2" #: ../src/extension/internal/cairo-ps-out.cpp:333 #: ../src/extension/internal/cairo-ps-out.cpp:375 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:250 -#, fuzzy msgid "Text output options:" -msgstr "Orientamento testo" +msgstr "Opzioni testo:" #: ../src/extension/internal/cairo-ps-out.cpp:334 #: ../src/extension/internal/cairo-ps-out.cpp:376 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:251 -#, fuzzy msgid "Embed fonts" msgstr "Incorpora caratteri" #: ../src/extension/internal/cairo-ps-out.cpp:335 #: ../src/extension/internal/cairo-ps-out.cpp:377 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:252 -#, fuzzy msgid "Convert text to paths" -msgstr "Converti testo in tracciato" +msgstr "Converti testo in tracciati" #: ../src/extension/internal/cairo-ps-out.cpp:336 #: ../src/extension/internal/cairo-ps-out.cpp:378 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:253 -#, fuzzy msgid "Omit text in PDF and create LaTeX file" msgstr "Ometti testo nel file PDF e crea un file LaTeX" @@ -8096,19 +8097,19 @@ msgstr "" #: ../src/extension/internal/pdfinput/pdf-input.cpp:134 msgid "Poppler/Cairo import" -msgstr "" +msgstr "Importa con Poppler/Cairo" #: ../src/extension/internal/pdfinput/pdf-input.cpp:135 +#, fuzzy msgid "" "Import via external library. Text consists of groups containing cloned " "glyphs where each glyph is a path. Images are stored internally. Meshes " "cause entire document to be rendered as a raster image." -msgstr "" +msgstr "Importa con una libreria esterna" #: ../src/extension/internal/pdfinput/pdf-input.cpp:136 -#, fuzzy msgid "Internal import" -msgstr "Punto verticale:" +msgstr "Importa con libreria interna" #: ../src/extension/internal/pdfinput/pdf-input.cpp:137 msgid "" @@ -8369,52 +8370,52 @@ msgstr "" msgid "default.svg" msgstr "default.it.svg" -#: ../src/file.cpp:332 +#: ../src/file.cpp:338 msgid "Broken links have been changed to point to existing files." msgstr "" -#: ../src/file.cpp:343 ../src/file.cpp:1278 +#: ../src/file.cpp:349 ../src/file.cpp:1292 #, c-format msgid "Failed to load the requested file %s" msgstr "Impossibile caricare il file %s" -#: ../src/file.cpp:369 +#: ../src/file.cpp:375 msgid "Document not saved yet. Cannot revert." msgstr "Documento non ancora salvato. Impossibile ricaricarlo." -#: ../src/file.cpp:375 +#: ../src/file.cpp:381 msgid "Changes will be lost! Are you sure you want to reload document %1?" msgstr "" "Le modifiche andranno perdute! Sicuri di voler ricaricare il documento %1?" -#: ../src/file.cpp:401 +#: ../src/file.cpp:407 msgid "Document reverted." msgstr "Documento ricaricato." -#: ../src/file.cpp:403 +#: ../src/file.cpp:409 msgid "Document not reverted." msgstr "Documento non ricaricato." -#: ../src/file.cpp:553 +#: ../src/file.cpp:559 msgid "Select file to open" msgstr "Seleziona il file da aprire" -#: ../src/file.cpp:635 +#: ../src/file.cpp:641 msgid "Clean up document" msgstr "Pulisci documento" -#: ../src/file.cpp:642 +#: ../src/file.cpp:648 #, c-format msgid "Removed %i unused definition in <defs>." msgid_plural "Removed %i unused definitions in <defs>." msgstr[0] "Rimossa %i definizione inutilizzata in <defs>." msgstr[1] "Rimosse %i definizioni inutilizzate in <defs>." -#: ../src/file.cpp:647 +#: ../src/file.cpp:653 msgid "No unused definitions in <defs>." msgstr "Nessuna definizione inutilizzata in <defs>." -#: ../src/file.cpp:679 +#: ../src/file.cpp:687 #, c-format msgid "" "No Inkscape extension found to save document (%s). This may have been " @@ -8424,66 +8425,66 @@ msgstr "" "(%s). Ciò potrebbe esser stato causato da un'estensione del nome del file " "sconosciuta." -#: ../src/file.cpp:680 ../src/file.cpp:688 ../src/file.cpp:696 -#: ../src/file.cpp:702 ../src/file.cpp:707 +#: ../src/file.cpp:688 ../src/file.cpp:698 ../src/file.cpp:707 +#: ../src/file.cpp:714 ../src/file.cpp:720 msgid "Document not saved." msgstr "Documento non salvato." -#: ../src/file.cpp:687 +#: ../src/file.cpp:697 #, c-format msgid "" "File %s is write protected. Please remove write protection and try again." msgstr "" "Il file %s è protetto dalla scrittura. Rimuovere la protezione e riprovare." -#: ../src/file.cpp:695 +#: ../src/file.cpp:706 #, c-format msgid "File %s could not be saved." msgstr "Impossibile salvare il file %s." -#: ../src/file.cpp:725 ../src/file.cpp:727 +#: ../src/file.cpp:739 ../src/file.cpp:741 msgid "Document saved." msgstr "Documento salvato." #. We are saving for the first time; create a unique default filename -#: ../src/file.cpp:870 ../src/file.cpp:1437 +#: ../src/file.cpp:884 ../src/file.cpp:1451 msgid "drawing" msgstr "disegno" -#: ../src/file.cpp:875 +#: ../src/file.cpp:889 msgid "drawing-%1" msgstr "disegno-%1" -#: ../src/file.cpp:892 +#: ../src/file.cpp:906 msgid "Select file to save a copy to" msgstr "Seleziona il file in cui salvare una copia" -#: ../src/file.cpp:894 +#: ../src/file.cpp:908 msgid "Select file to save to" msgstr "Seleziona il file da salvare" -#: ../src/file.cpp:999 ../src/file.cpp:1001 +#: ../src/file.cpp:1013 ../src/file.cpp:1015 msgid "No changes need to be saved." msgstr "Nessuna modifica da salvare." -#: ../src/file.cpp:1020 +#: ../src/file.cpp:1034 msgid "Saving document..." msgstr "Salvataggio del documento..." -#: ../src/file.cpp:1275 ../src/ui/dialog/inkscape-preferences.cpp:1505 +#: ../src/file.cpp:1289 ../src/ui/dialog/inkscape-preferences.cpp:1505 #: ../src/ui/dialog/ocaldialogs.cpp:1244 msgid "Import" msgstr "Importa" -#: ../src/file.cpp:1325 +#: ../src/file.cpp:1339 msgid "Select file to import" msgstr "Seleziona il file da importare" -#: ../src/file.cpp:1458 +#: ../src/file.cpp:1472 msgid "Select file to export to" msgstr "Seleziona il file su cui esportare" -#: ../src/file.cpp:1711 +#: ../src/file.cpp:1725 msgid "Import Clip Art" msgstr "Importa Clip Art" @@ -9902,7 +9903,6 @@ msgid "Left path along which to bend the original path" msgstr "Tracciato del lato sinistro usato per deformare il tracciato originale" #: ../src/live_effects/lpe-envelope.cpp:35 -#, fuzzy msgid "_Enable left & right paths" msgstr "A_bilita tracciati sinistro e destro" @@ -10341,341 +10341,290 @@ msgstr "Cambia intersezione nodo" #: ../src/live_effects/lpe-lattice2.cpp:47 #: ../src/live_effects/lpe-perspective-envelope.cpp:43 -#, fuzzy msgid "Mirror movements in horizontal" -msgstr "Muove i nodi verticalmente" +msgstr "Rispecchia i movimenti orizzontalmente" #: ../src/live_effects/lpe-lattice2.cpp:48 #: ../src/live_effects/lpe-perspective-envelope.cpp:44 -#, fuzzy msgid "Mirror movements in vertical" -msgstr "Muove i nodi verticalmente" +msgstr "Rispecchia i movimenti verticalmente" #: ../src/live_effects/lpe-lattice2.cpp:49 msgid "Update while moving knots (maybe slow)" msgstr "" #: ../src/live_effects/lpe-lattice2.cpp:50 -#, fuzzy msgid "Control 0:" -msgstr "Maniglia di controllo 0" +msgstr "Controllo 0:" #: ../src/live_effects/lpe-lattice2.cpp:50 -#, fuzzy msgid "Control 0 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 0 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo gli " +"assi" #: ../src/live_effects/lpe-lattice2.cpp:51 -#, fuzzy msgid "Control 1:" -msgstr "Maniglia di controllo 1" +msgstr "Controllo 1:" #: ../src/live_effects/lpe-lattice2.cpp:51 -#, fuzzy msgid "Control 1 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 1 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo gli " +"assi" #: ../src/live_effects/lpe-lattice2.cpp:52 -#, fuzzy msgid "Control 2:" -msgstr "Maniglia di controllo 3" +msgstr "Controllo 2:" #: ../src/live_effects/lpe-lattice2.cpp:52 -#, fuzzy msgid "Control 2 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 2 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo gli " +"assi" #: ../src/live_effects/lpe-lattice2.cpp:53 -#, fuzzy msgid "Control 3:" -msgstr "Maniglia di controllo 3" +msgstr "Controllo 3:" #: ../src/live_effects/lpe-lattice2.cpp:53 -#, fuzzy msgid "Control 3 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 3 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo gli " +"assi" #: ../src/live_effects/lpe-lattice2.cpp:54 -#, fuzzy msgid "Control 4:" -msgstr "Maniglia di controllo 4" +msgstr "Controllo 4:" #: ../src/live_effects/lpe-lattice2.cpp:54 -#, fuzzy msgid "Control 4 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 4 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo gli " +"assi" #: ../src/live_effects/lpe-lattice2.cpp:55 -#, fuzzy msgid "Control 5:" -msgstr "Maniglia di controllo 5" +msgstr "Controllo 5:" #: ../src/live_effects/lpe-lattice2.cpp:55 -#, fuzzy msgid "Control 5 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 5 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo gli " +"assi" #: ../src/live_effects/lpe-lattice2.cpp:56 -#, fuzzy msgid "Control 6:" -msgstr "Maniglia di controllo 6" +msgstr "Controllo 6:" #: ../src/live_effects/lpe-lattice2.cpp:56 -#, fuzzy msgid "Control 6 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 6 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo gli " +"assi" #: ../src/live_effects/lpe-lattice2.cpp:57 -#, fuzzy msgid "Control 7:" -msgstr "Maniglia di controllo 7" +msgstr "Controllo 7:" #: ../src/live_effects/lpe-lattice2.cpp:57 -#, fuzzy msgid "Control 7 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 7 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo gli " +"assi" #: ../src/live_effects/lpe-lattice2.cpp:58 -#, fuzzy msgid "Control 8x9:" -msgstr "Maniglia di controllo 8" +msgstr "Controllo 8x9:" #: ../src/live_effects/lpe-lattice2.cpp:58 -#, fuzzy msgid "" "Control 8x9 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 8x9 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo " +"gli assi" #: ../src/live_effects/lpe-lattice2.cpp:59 -#, fuzzy msgid "Control 10x11:" -msgstr "Maniglia di controllo 10" +msgstr "Controllo 10x11:" #: ../src/live_effects/lpe-lattice2.cpp:59 -#, fuzzy msgid "" "Control 10x11 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 10x11 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo " +"gli assi" #: ../src/live_effects/lpe-lattice2.cpp:60 -#, fuzzy msgid "Control 12:" -msgstr "Maniglia di controllo 12" +msgstr "Controllo 12:" #: ../src/live_effects/lpe-lattice2.cpp:60 -#, fuzzy msgid "Control 12 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 12 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo gli " +"assi" #: ../src/live_effects/lpe-lattice2.cpp:61 -#, fuzzy msgid "Control 13:" -msgstr "Maniglia di controllo 13" +msgstr "Controllo 13:" #: ../src/live_effects/lpe-lattice2.cpp:61 -#, fuzzy msgid "Control 13 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 13 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo gli " +"assi" #: ../src/live_effects/lpe-lattice2.cpp:62 -#, fuzzy msgid "Control 14:" -msgstr "Maniglia di controllo 14" +msgstr "Controllo 14:" #: ../src/live_effects/lpe-lattice2.cpp:62 -#, fuzzy msgid "Control 14 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 14 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo gli " +"assi" #: ../src/live_effects/lpe-lattice2.cpp:63 -#, fuzzy msgid "Control 15:" -msgstr "Maniglia di controllo 15" +msgstr "Controllo 15:" #: ../src/live_effects/lpe-lattice2.cpp:63 -#, fuzzy msgid "Control 15 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 15- Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo gli " +"assi" #: ../src/live_effects/lpe-lattice2.cpp:64 -#, fuzzy msgid "Control 16:" -msgstr "Maniglia di controllo 1" +msgstr "Controllo 16:" #: ../src/live_effects/lpe-lattice2.cpp:64 -#, fuzzy msgid "Control 16 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 16 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo gli " +"assi" #: ../src/live_effects/lpe-lattice2.cpp:65 -#, fuzzy msgid "Control 17:" -msgstr "Maniglia di controllo 1" +msgstr "Controllo 17:" #: ../src/live_effects/lpe-lattice2.cpp:65 -#, fuzzy msgid "Control 17 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 17 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo gli " +"assi" #: ../src/live_effects/lpe-lattice2.cpp:66 -#, fuzzy msgid "Control 18:" -msgstr "Maniglia di controllo 1" +msgstr "Controllo 18:" #: ../src/live_effects/lpe-lattice2.cpp:66 -#, fuzzy msgid "Control 18 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 18 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo gli " +"assi" #: ../src/live_effects/lpe-lattice2.cpp:67 -#, fuzzy msgid "Control 19:" -msgstr "Maniglia di controllo 1" +msgstr "Controllo 19:" #: ../src/live_effects/lpe-lattice2.cpp:67 -#, fuzzy msgid "Control 19 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 19 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo gli " +"assi" #: ../src/live_effects/lpe-lattice2.cpp:68 -#, fuzzy msgid "Control 20x21:" -msgstr "Maniglia di controllo 0" +msgstr "Controllo 20x21:" #: ../src/live_effects/lpe-lattice2.cpp:68 -#, fuzzy msgid "" "Control 20x21 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 20x21 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo " +"gli assi" #: ../src/live_effects/lpe-lattice2.cpp:69 -#, fuzzy msgid "Control 22x23:" -msgstr "Maniglia di controllo 3" +msgstr "Controllo 22x23:" #: ../src/live_effects/lpe-lattice2.cpp:69 -#, fuzzy msgid "" "Control 22x23 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 22x23 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo " +"gli assi" #: ../src/live_effects/lpe-lattice2.cpp:70 -#, fuzzy msgid "Control 24x26:" -msgstr "Maniglia di controllo 3" +msgstr "Controllo 24x26:" #: ../src/live_effects/lpe-lattice2.cpp:70 -#, fuzzy msgid "" "Control 24x26 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 24x26 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo " +"gli assi" #: ../src/live_effects/lpe-lattice2.cpp:71 -#, fuzzy msgid "Control 25x27:" -msgstr "Maniglia di controllo 3" +msgstr "Controllo 25x27:" #: ../src/live_effects/lpe-lattice2.cpp:71 -#, fuzzy msgid "" "Control 25x27 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 25x27 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo " +"gli assi" #: ../src/live_effects/lpe-lattice2.cpp:72 -#, fuzzy msgid "Control 28x30:" -msgstr "Maniglia di controllo 0" +msgstr "Controllo 28x30:" #: ../src/live_effects/lpe-lattice2.cpp:72 -#, fuzzy msgid "" "Control 28x30 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 28x30 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo " +"gli assi" #: ../src/live_effects/lpe-lattice2.cpp:73 -#, fuzzy msgid "Control 29x31:" -msgstr "Maniglia di controllo 1" +msgstr "Controllo 29x31:" #: ../src/live_effects/lpe-lattice2.cpp:73 -#, fuzzy msgid "" "Control 29x31 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Controllo 29x31 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo " +"gli assi" #: ../src/live_effects/lpe-lattice2.cpp:74 msgid "Control 32x33x34x35:" -msgstr "" +msgstr "Controllo 32x33x34x35:" #: ../src/live_effects/lpe-lattice2.cpp:74 msgid "" "Control 32x33x34x35 - Ctrl+Alt+Click: reset, Ctrl: move along " "axes" msgstr "" +"Controllo 32x33x34x35 - Ctrl+Alt+Clic: reimposta, Ctrl: muovi " +"lungo gli assi" #: ../src/live_effects/lpe-lattice2.cpp:239 -#, fuzzy msgid "Reset grid" -msgstr "Rimuovi griglia" +msgstr "Reimposta griglia" #: ../src/live_effects/lpe-lattice2.cpp:271 #: ../src/live_effects/lpe-lattice2.cpp:286 -#, fuzzy msgid "Show Points" -msgstr "Ordina punti" +msgstr "Mostra punti di controllo" #: ../src/live_effects/lpe-lattice2.cpp:284 -#, fuzzy msgid "Hide Points" -msgstr "Punti" +msgstr "Nascondi punti" #: ../src/live_effects/lpe-patternalongpath.cpp:63 #: ../share/extensions/pathalongpath.inx.h:10 @@ -10781,7 +10730,6 @@ msgid "Perspective" msgstr "Prospettiva" #: ../src/live_effects/lpe-perspective-envelope.cpp:36 -#, fuzzy msgid "Envelope deformation" msgstr "Deformazione a busta" @@ -10799,57 +10747,48 @@ msgid "Select the type of deformation" msgstr "Seleziona il tipo di deformazione" #: ../src/live_effects/lpe-perspective-envelope.cpp:47 -#, fuzzy msgid "Top Left" -msgstr "Tracciato lato superiore" +msgstr "Superiore sinistra" #: ../src/live_effects/lpe-perspective-envelope.cpp:47 -#, fuzzy msgid "Top Left - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Superiore sinistra - Ctrl+Alt+Clic: reimposta, Ctrl: muovi " +"lungo gli assi" #: ../src/live_effects/lpe-perspective-envelope.cpp:48 -#, fuzzy msgid "Top Right" -msgstr "_Trucchi" +msgstr "Superiore destra" #: ../src/live_effects/lpe-perspective-envelope.cpp:48 -#, fuzzy msgid "Top Right - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Superiore destra - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo " +"gli assi" #: ../src/live_effects/lpe-perspective-envelope.cpp:49 -#, fuzzy msgid "Down Left" -msgstr "Tracciato lato superiore" +msgstr "Inferiore sinistra" #: ../src/live_effects/lpe-perspective-envelope.cpp:49 -#, fuzzy msgid "Down Left - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Inferiore sinistra - Ctrl+Alt+Clic: reimposta, Ctrl: muovi " +"lungo gli assi" #: ../src/live_effects/lpe-perspective-envelope.cpp:50 -#, fuzzy msgid "Down Right" -msgstr "Destra" +msgstr "Inferiore destra" #: ../src/live_effects/lpe-perspective-envelope.cpp:50 -#, fuzzy msgid "Down Right - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " -"le maniglie" +"Inferiore destra - Ctrl+Alt+Clic: reimposta, Ctrl: muovi lungo " +"gli assi" #: ../src/live_effects/lpe-perspective-envelope.cpp:367 -#, fuzzy msgid "Handles:" -msgstr "Maniglia" +msgstr "Maniglie:" #: ../src/live_effects/lpe-powerstroke.cpp:132 msgid "CubicBezierSmooth" @@ -11877,15 +11816,14 @@ msgstr "Modifica parametri del punto" #: ../src/live_effects/parameter/powerstrokepointarray.cpp:239 #: ../src/live_effects/parameter/powerstrokepointarray.cpp:256 -#, fuzzy msgid "" "Stroke width control point: drag to alter the stroke width. Ctrl" "+click adds a control point, Ctrl+Alt+click deletes it, Shift" "+click launches width dialog." msgstr "" "Punto di controllo: trascina per modificare la larghezza del " -"contorno. Ctrl+clic aggiunge un punto di controllo, Ctrl-Alt+clic lo elimina." +"contorno. Ctrl+Clic aggiunge un punto di controllo, Ctrl+Alt+Clic lo elimina, Maiusc+Clic apre la finestra di controllo." #: ../src/live_effects/parameter/random.cpp:134 msgid "Change random parameter" @@ -13062,9 +13000,8 @@ msgid "Select object(s) to create clippath or mask from." msgstr "Seleziona l'oggetto da cui creare la maschera o il fissaggio." #: ../src/selection-chemistry.cpp:3850 ../src/ui/dialog/objects.cpp:1922 -#, fuzzy msgid "Create Clip Group" -msgstr "Crea clo_ne" +msgstr "Crea gruppo di ritaglio" #: ../src/selection-chemistry.cpp:3879 msgid "Select mask object and object(s) to apply clippath or mask to." @@ -13154,7 +13091,7 @@ msgid " in unnamed group (%s)" msgstr " nel gruppo senza nome (%s)" #: ../src/selection-describer.cpp:183 -#, fuzzy, c-format +#, c-format msgid " in %i parent (%s)" msgid_plural " in %i parents (%s)" msgstr[0] " in %i genitore (%s)" @@ -15001,7 +14938,7 @@ msgid "" "Color: %s; Click to set fill, Shift+click to set stroke" msgstr "" "Colore: %s; Clicca per impostare il riempimento, Maiusc" -"+clic per impostare il contorno" +"+Clic per impostare il contorno" #: ../src/ui/dialog/color-item.cpp:505 msgid "Change color definition" @@ -17917,7 +17854,7 @@ msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:204 msgid "Ctrl+click _dot size:" -msgstr "Dimensione _punto con Ctrl+clic:" +msgstr "Dimensione _punto con Ctrl+Clic:" #: ../src/ui/dialog/inkscape-preferences.cpp:204 msgid "times current stroke width" @@ -17926,7 +17863,7 @@ msgstr "volte la larghezza attuale del contorno" #: ../src/ui/dialog/inkscape-preferences.cpp:205 msgid "Size of dots created with Ctrl+click (relative to current stroke width)" msgstr "" -"Dimensione dei punti creati con Ctrl+clic (relativi alla larghezza del " +"Dimensione dei punti creati con Ctrl+Clic (relativi alla larghezza del " "contorno attuale)" #: ../src/ui/dialog/inkscape-preferences.cpp:213 @@ -18856,25 +18793,21 @@ msgid "Set the language for menus and number formats" msgstr "Imposta la lingua per i menu e il formato dei numeri" #: ../src/ui/dialog/inkscape-preferences.cpp:616 -#, fuzzy msgctxt "Icon size" msgid "Larger" -msgstr "Grande" +msgstr "Più grande" #: ../src/ui/dialog/inkscape-preferences.cpp:616 -#, fuzzy msgctxt "Icon size" msgid "Large" msgstr "Grande" #: ../src/ui/dialog/inkscape-preferences.cpp:616 -#, fuzzy msgctxt "Icon size" msgid "Small" msgstr "Piccola" #: ../src/ui/dialog/inkscape-preferences.cpp:616 -#, fuzzy msgctxt "Icon size" msgid "Smaller" msgstr "Più piccola" @@ -21049,19 +20982,16 @@ msgid "None" msgstr "Nessuno" #: ../src/ui/dialog/knot-properties.cpp:59 -#, fuzzy msgid "Position X:" -msgstr "Posizione:" +msgstr "Posizione X:" #: ../src/ui/dialog/knot-properties.cpp:66 -#, fuzzy msgid "Position Y:" -msgstr "Posizione:" +msgstr "Posizione Y:" #: ../src/ui/dialog/knot-properties.cpp:120 -#, fuzzy msgid "Modify Knot Position" -msgstr "Posizione x dell'illuminazione" +msgstr "Modifica posizione nodo" #: ../src/ui/dialog/knot-properties.cpp:121 #: ../src/ui/dialog/layer-properties.cpp:411 @@ -21071,14 +21001,14 @@ msgid "_Move" msgstr "_Muovi" #: ../src/ui/dialog/knot-properties.cpp:180 -#, fuzzy, c-format +#, c-format msgid "Position X (%s):" -msgstr "Posizione:" +msgstr "Posizione X (%s):" #: ../src/ui/dialog/knot-properties.cpp:181 -#, fuzzy, c-format +#, c-format msgid "Position Y (%s):" -msgstr "Posizione:" +msgstr "Posizione Y (%s):" #: ../src/ui/dialog/layer-properties.cpp:55 msgid "Layer name:" @@ -21167,7 +21097,6 @@ msgid "Lock other layers" msgstr "Blocca altri livelli" #: ../src/ui/dialog/layers.cpp:730 -#, fuzzy msgid "Move layer" msgstr "Sposta livello" @@ -22334,9 +22263,8 @@ msgid "Add selection to set" msgstr "Aggiunge selezione al set" #: ../src/ui/dialog/tags.cpp:824 -#, fuzzy msgid "Moved sets" -msgstr "Muovi gradiente" +msgstr "Sposta set" #: ../src/ui/dialog/tags.cpp:1004 msgid "Add a new selection set" @@ -23060,7 +22988,6 @@ msgstr "Modifica gruppo #%1" #. Pop selection out of group #: ../src/ui/interface.cpp:1528 -#, fuzzy msgid "_Pop selection out of group" msgstr "_Estrai selezione dal gruppo" @@ -23119,9 +23046,8 @@ msgstr "Rimuovi maschera" #. SSet Clip Group #: ../src/ui/interface.cpp:1776 -#, fuzzy msgid "Create Clip G_roup" -msgstr "Crea clo_ne" +msgstr "Crea gruppo di _ritaglio" #. Set Clip #: ../src/ui/interface.cpp:1783 @@ -23355,14 +23281,13 @@ msgid "Ctrl+Alt: click to insert a node" msgstr "Ctrl+Alt: clicca per inserire un nodo" #: ../src/ui/tool/curve-drag-point.cpp:204 -#, fuzzy msgctxt "Path segment tip" msgid "" "BSpline segment: drag to shape the segment, doubleclick to insert " "node, click to select (more: Shift, Ctrl+Alt)" msgstr "" -"Segmento di Bezier: trascina per formare il segmento, doppio clic per " -"inserire un nodo, clicca per selezionare (altro: Maiusc, Ctrl+Alt)" +"Segmento di BSpline: trascina per formare il segmento, doppio Clic " +"per inserire un nodo, clicca per selezionare (altro: Maiusc, Ctrl+Alt)" #: ../src/ui/tool/curve-drag-point.cpp:209 msgctxt "Path segment tip" @@ -23371,7 +23296,7 @@ msgid "" "insert node, click to select (more: Shift, Ctrl+Alt)" msgstr "" "Segmento lineare: trascina per convertire in un segmento di Bezier, " -"doppio clic per inserire un nodo, clicca per selezionare (altro: Maiusc, Ctrl" +"doppio Clic per inserire un nodo, clicca per selezionare (altro: Maiusc, Ctrl" "+Alt)" #: ../src/ui/tool/curve-drag-point.cpp:213 @@ -23380,7 +23305,7 @@ msgid "" "Bezier segment: drag to shape the segment, doubleclick to insert " "node, click to select (more: Shift, Ctrl+Alt)" msgstr "" -"Segmento di Bezier: trascina per formare il segmento, doppio clic per " +"Segmento di Bezier: trascina per formare il segmento, doppio Clic per " "inserire un nodo, clicca per selezionare (altro: Maiusc, Ctrl+Alt)" #: ../src/ui/tool/multi-path-manipulator.cpp:315 @@ -23493,10 +23418,9 @@ msgid "more: Shift, Ctrl, Alt" msgstr "altro: Maiusc, Ctrl, Alt" #: ../src/ui/tool/node.cpp:496 -#, fuzzy msgctxt "Path handle tip" msgid "more: Ctrl" -msgstr "altro: Ctrl, Alt" +msgstr "altro: Ctrl" #: ../src/ui/tool/node.cpp:498 msgctxt "Path handle tip" @@ -23561,10 +23485,9 @@ msgid "Shift: rotate both handles by the same angle" msgstr "Maiusc: ruota entrambe le maniglie dello stesso angolo" #: ../src/ui/tool/node.cpp:540 -#, fuzzy msgctxt "Path hande tip" msgid "Shift: move handle" -msgstr "Sposta maniglie dei nodi" +msgstr "Maiusc: muovi maniglia" #: ../src/ui/tool/node.cpp:547 ../src/ui/tool/node.cpp:551 #, c-format @@ -23580,6 +23503,8 @@ msgid "" "BSpline node handle: Shift to drag, double click to reset (%s). %g " "power" msgstr "" +"Maniglia nodo BSpline: Maiusc per trascinare, doppio Clic per " +"reimpostare (%s). Forza %g" #: ../src/ui/tool/node.cpp:574 #, c-format @@ -23623,13 +23548,14 @@ msgstr "" "%s: trascina per formare il tracciato (altro: Maiusc, Ctrl, Alt)" #: ../src/ui/tool/node.cpp:1451 -#, fuzzy, c-format +#, c-format msgctxt "Path node tip" msgid "" "BSpline node: drag to shape the path (more: Shift, Ctrl, Alt). %g " "power" msgstr "" -"%s: trascina per formare il tracciato (altro: Maiusc, Ctrl, Alt)" +"Nodo BSpline: trascina per formare il tracciato (altro: Maiusc, Ctrl, " +"Alt). Forza %g" #: ../src/ui/tool/node.cpp:1454 #, c-format @@ -23652,14 +23578,14 @@ msgstr "" "questo nodo (altro: Maiusc, Ctrl, Alt)" #: ../src/ui/tool/node.cpp:1461 -#, fuzzy, c-format +#, c-format msgctxt "Path node tip" msgid "" "BSpline node: drag to shape the path, click to select only this node " "(more: Shift, Ctrl, Alt). %g power" msgstr "" -"%s: trascina per formare il tracciato, clicca per selezionare solo " -"questo nodo (altro: Maiusc, Ctrl, Alt)" +"Nodo BSpline: trascina per formare il tracciato, clicca per " +"selezionare solo questo nodo (altro: Maiusc, Ctrl, Alt). Forza %g" #: ../src/ui/tool/node.cpp:1474 #, c-format @@ -23915,7 +23841,7 @@ msgid "" "line modes only)." msgstr "" "Clicca o clicca e trascina per iniziare un percorso; con " -"Maiusc per accodare al percorso selezionato. Ctrl+clic per " +"Maiusc per accodare al percorso selezionato. Ctrl+Clic per " "creare punti singoli (solo in modalità linea semplice)." #: ../src/ui/tools-switch.cpp:112 @@ -23940,7 +23866,7 @@ msgid "" "Drag or double click to create a gradient on selected objects, " "drag handles to adjust gradients." msgstr "" -"Trascina o doppio clic per creare un gradiente sull'oggetto " +"Trascina o doppio Clic per creare un gradiente sull'oggetto " "selezionato; trascina le maniglie per modificare il gradiente." #: ../src/ui/tools-switch.cpp:115 @@ -23948,7 +23874,7 @@ msgid "" "Drag or double click to create a mesh on selected objects, " "drag handles to adjust meshes." msgstr "" -"Trascina o doppio clic per creare un gradiente a maglia " +"Trascina o doppio Clic per creare un gradiente a maglia " "sull'oggetto selezionato, trascina le maniglie per modificare il " "gradiente." @@ -23957,7 +23883,7 @@ msgid "" "Click or drag around an area to zoom in, Shift+click to " "zoom out." msgstr "" -"Clicca o seleziona una zona per ingrandire, Maiusc+clic " +"Clicca o seleziona una zona per ingrandire, Maiusc+Clic " "per rimpicciolire." #: ../src/ui/tools-switch.cpp:117 @@ -23970,7 +23896,7 @@ msgid "" "average color in area; with Alt to pick inverse color; Ctrl+C " "to copy the color under mouse to clipboard" msgstr "" -"Clicca per impostare il colore di riempimento, Maiusc+clic per " +"Clicca per impostare il colore di riempimento, Maiusc+Clic per " "impostare il colore del contorno; trascina per prelevare il colore " "medio di un'area; con Alt per prelevare il colore inverso; Ctrl+C per copiare negli appunti il colore sotto al mouse" @@ -23985,8 +23911,8 @@ msgid "" "fill with the current selection, Ctrl+click to change the clicked " "object's fill and stroke to the current setting." msgstr "" -"Clicca per riempire un'area delimitata, Maiusc+clic per unire " -"il nuovo riempimento alla selezione attuale, Ctrl+clic per applicare " +"Clicca per riempire un'area delimitata, Maiusc+Clic per unire " +"il nuovo riempimento alla selezione attuale, Ctrl+Clic per applicare " "al riempimento e al contorno dell'oggetto le impostazioni attuali." #: ../src/ui/tools-switch.cpp:123 @@ -24341,10 +24267,13 @@ msgstr "Scegliere uno strumento di costruzione dalla barra degli strumenti." #: ../src/ui/tools/measure-tool.cpp:349 msgid "Measure start, Shift+Click for position dialog" msgstr "" +"Inizio misurazione, Maiusc+Clic per aprire la finestra di " +"posizionamento" #: ../src/ui/tools/measure-tool.cpp:355 msgid "Measure end, Shift+Click for position dialog" msgstr "" +"Fine misurazione, Maiusc+Clic per aprire la finestra di posizionamento" #: ../src/ui/tools/measure-tool.cpp:747 ../share/extensions/measure.inx.h:2 msgid "Measure" @@ -24359,7 +24288,7 @@ msgid "Add guides from measure tool" msgstr "Aggiungi guide dallo strumento di misurazione" #: ../src/ui/tools/measure-tool.cpp:781 -msgid "Add Stored to measure tool" +msgid "Keep last measure on the canvas, for reference" msgstr "" #: ../src/ui/tools/measure-tool.cpp:801 @@ -24527,13 +24456,12 @@ msgstr "" "tracciato." #: ../src/ui/tools/pen-tool.cpp:642 -#, fuzzy msgid "" "Click or click and drag to close and finish the path. Shift" "+Click make a cusp node" msgstr "" -"Clicca o clicca e trascina per chiudere e terminare il " -"tracciato." +"Clicca o Clicca e trascina per chiudere e terminare il " +"tracciato. Maiusc+Clic per creare un nodo angolare" #: ../src/ui/tools/pen-tool.cpp:654 msgid "" @@ -24543,49 +24471,52 @@ msgstr "" "questo punto." #: ../src/ui/tools/pen-tool.cpp:656 -#, fuzzy msgid "" "Click or click and drag to continue the path from this point. " "Shift+Click make a cusp node" msgstr "" -"Clicca o clicca e trascina per continuare il tracciato da " -"questo punto." +"Clicca o Clicca e trascina per continuare il tracciato da " +"questo punto. Maiusc+Clic per creare un nodo angolare" #: ../src/ui/tools/pen-tool.cpp:1797 -#, fuzzy, c-format +#, c-format msgid "" "Curve segment: angle %3.2f°, distance %s; with Ctrl to " "snap angle, Enter or Shift+Enter to finish the path" msgstr "" "Segmento di curva: angolo %3.2f°, distanza %s; con Ctrl " -"angoli a scatti; Invio per terminare il tracciato" +"angoli a scatti; Invio o Maiusc+Invio per terminare il " +"tracciato" #: ../src/ui/tools/pen-tool.cpp:1798 -#, fuzzy, c-format +#, c-format msgid "" "Line segment: angle %3.2f°, distance %s; with Ctrl to " "snap angle, Enter or Shift+Enter to finish the path" msgstr "" "Segmento di linea: angolo %3.2f°, distanza %s; con Ctrl " -"angoli a scatti; Invio per terminare il tracciato" +"angoli a scatti; Invio o Maiusc+Invio per terminare il " +"tracciato" #: ../src/ui/tools/pen-tool.cpp:1801 -#, fuzzy, c-format +#, c-format msgid "" "Curve segment: angle %3.2f°, distance %s; with Shift+Click make a cusp node, Enter or Shift+Enter to finish the path" msgstr "" "Segmento di curva: angolo %3.2f°, distanza %s; con Ctrl " -"angoli a scatti; Invio per terminare il tracciato" +"angoli a scatti; Invio o Maiusc+Invio per terminare il " +"tracciato" #: ../src/ui/tools/pen-tool.cpp:1802 -#, fuzzy, c-format +#, c-format msgid "" "Line segment: angle %3.2f°, distance %s; with Shift+Click " "make a cusp node, Enter or Shift+Enter to finish the path" msgstr "" "Segmento di linea: angolo %3.2f°, distanza %s; con Ctrl " -"angoli a scatti; Invio per terminare il tracciato" +"angoli a scatti; Invio o Maiusc+Invio per terminare il " +"tracciato" #: ../src/ui/tools/pen-tool.cpp:1819 #, c-format @@ -24706,7 +24637,7 @@ msgid "" "No objects selected. Click, Shift+click, Alt+scroll mouse on top of objects, " "or drag around objects to select." msgstr "" -"Nessun oggetto selezionato. Clicca, Maiusc+clic, Alt+scorrimento mouse sugli " +"Nessun oggetto selezionato. Clicca, Maiusc+Clic, Alt+scorrimento mouse sugli " "oggetti, o trascina attorno agli oggetti per selezionare." #: ../src/ui/tools/select-tool.cpp:210 @@ -27622,15 +27553,12 @@ msgstr "" "tracciato di fissaggio)" #: ../src/verbs.cpp:2721 -#, fuzzy msgid "Create Cl_ip Group" -msgstr "Crea clo_ne" +msgstr "Crea gruppo di _ritaglio" #: ../src/verbs.cpp:2722 -#, fuzzy msgid "Creates a clip group using the selected objects as a base" -msgstr "" -"Crea un clone dell'oggetto selezionato (una copia collegata all'originale)" +msgstr "Crea un gruppo di ritaglio utilizzando gli oggetti selezionati" #: ../src/verbs.cpp:2724 msgid "Edit clipping path" @@ -29352,13 +29280,11 @@ msgid "Unlocked all guides" msgstr "Tutte le guide sono sbloccate" #: ../src/widgets/desktop-widget.cpp:1130 -#, fuzzy msgid "Color-managed display is enabled in this window" msgstr "" "La gestione del colore del display è abilitata in questa finestra" #: ../src/widgets/desktop-widget.cpp:1132 -#, fuzzy msgid "Color-managed display is disabled in this window" msgstr "" "La gestione del colore del display è disabilitata in questa finestra" @@ -30336,9 +30262,8 @@ msgid "Radial gradient" msgstr "Gradiente radiale" #: ../src/widgets/paint-selector.cpp:228 -#, fuzzy msgid "Mesh gradient" -msgstr "Muovi gradiente" +msgstr "Gradiente a maglia" #: ../src/widgets/paint-selector.cpp:235 msgid "Unset paint (make it undefined so it can be inherited)" @@ -30491,7 +30416,7 @@ msgstr "Zigzag" #: ../src/widgets/pencil-toolbar.cpp:126 msgid "Create a sequence of straight line segments" -msgstr "Crea una sequenza di segmenti diritti" +msgstr "Crea una sequenza di segmenti lineari" #: ../src/widgets/pencil-toolbar.cpp:132 msgid "Paraxial" @@ -31119,15 +31044,15 @@ msgstr "Imposta l'ultimo colore selezionato come contorno" #: ../src/widgets/spray-toolbar.cpp:554 ../src/widgets/spray-toolbar.cpp:555 msgid "No overlap between colors" -msgstr "" +msgstr "Non sovrapporre colori differenti" #: ../src/widgets/spray-toolbar.cpp:567 ../src/widgets/spray-toolbar.cpp:568 msgid "Apply over transparent areas" -msgstr "" +msgstr "Applica su aree trasparenti" #: ../src/widgets/spray-toolbar.cpp:580 ../src/widgets/spray-toolbar.cpp:581 msgid "Apply over no transparent areas" -msgstr "" +msgstr "Applica su aree non trasparenti" #: ../src/widgets/spray-toolbar.cpp:593 ../src/widgets/spray-toolbar.cpp:594 msgid "Prevent overlapping objects" -- cgit v1.2.3 From 2f6f66fc8e4c21d0bd9f3d8dc15197fb945727c0 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 9 Jun 2016 08:42:03 +0100 Subject: Rename test->testfiles folder to avoid naming conflict (bzr r14967.1.1) --- CMakeLists.txt | 4 +- test/CMakeLists.txt | 67 ---- test/doc-per-case-test.cpp | 52 --- test/doc-per-case-test.h | 43 --- test/src/attributes-test.cpp | 633 ----------------------------------- test/src/color-profile-test.cpp | 126 ------- test/src/dir-util-test.cpp | 63 ---- test/unittest.cpp | 58 ---- testfiles/CMakeLists.txt | 67 ++++ testfiles/doc-per-case-test.cpp | 52 +++ testfiles/doc-per-case-test.h | 43 +++ testfiles/src/attributes-test.cpp | 633 +++++++++++++++++++++++++++++++++++ testfiles/src/color-profile-test.cpp | 126 +++++++ testfiles/src/dir-util-test.cpp | 63 ++++ testfiles/unittest.cpp | 58 ++++ 15 files changed, 1044 insertions(+), 1044 deletions(-) delete mode 100644 test/CMakeLists.txt delete mode 100644 test/doc-per-case-test.cpp delete mode 100644 test/doc-per-case-test.h delete mode 100644 test/src/attributes-test.cpp delete mode 100644 test/src/color-profile-test.cpp delete mode 100644 test/src/dir-util-test.cpp delete mode 100644 test/unittest.cpp create mode 100644 testfiles/CMakeLists.txt create mode 100644 testfiles/doc-per-case-test.cpp create mode 100644 testfiles/doc-per-case-test.h create mode 100644 testfiles/src/attributes-test.cpp create mode 100644 testfiles/src/color-profile-test.cpp create mode 100644 testfiles/src/dir-util-test.cpp create mode 100644 testfiles/unittest.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 91a090371..5f3d1aac0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -211,11 +211,11 @@ add_custom_target(clean-all #----------------------------------------------------------------------------- -add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) +#add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) if(WITH_GTEST) enable_testing() - add_subdirectory(test EXCLUDE_FROM_ALL) + add_subdirectory(testfiles EXCLUDE_FROM_ALL) endif() # Canonicalize the flags to speed up recompilation using ccache/etc. diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt deleted file mode 100644 index 8da39d627..000000000 --- a/test/CMakeLists.txt +++ /dev/null @@ -1,67 +0,0 @@ -# ----------------------------------------------------------------------------- -# -# ----------------------------------------------------------------------------- - -set(CMAKE_CTEST_COMMAND ctest -V) - -add_subdirectory(${GMOCK_DIR} ${CMAKE_BINARY_DIR}/gmock) - -include_directories(SYSTEM ${GMOCK_DIR}/gtest/include - ${GMOCK_DIR}/include - ${CMAKE_SOURCE_DIR}/gtest/gtest/include) - -set_source_files_properties( - ${CMAKE_BINARY_DIR}/src/inkscape-version.cpp - PROPERTIES GENERATED TRUE) - -# include_directories(${CMAKE_CURRENT_BINARY_DIR}/__/src) -include_directories(${CMAKE_BINARY_DIR}/src) - -add_executable(unittest - unittest.cpp - doc-per-case-test.cpp - src/attributes-test.cpp - src/color-profile-test.cpp - src/dir-util-test.cpp -) - -target_link_libraries(unittest inkscape_base) - -add_dependencies(unittest inkscape_version) - -set (_optional_unittest_libs ) - -if (NOT "${WITH_EXT_GDL}") - list (APPEND _optional_unittest_libs "gdl_LIB") -endif() - -target_link_libraries(unittest - gmock_main - - # order from automake - #sp_LIB - - #inkscape_LIB - #sp_LIB # annoying, we need both! - nrtype_LIB # annoying, we need both! - - croco_LIB - avoid_LIB - ${_optional_unittest_libs} - cola_LIB - vpsc_LIB - livarot_LIB - uemf_LIB - 2geom_LIB - depixelize_LIB - util_LIB - gc_LIB - - ${INKSCAPE_LIBS} -) - -add_test(BaseTest ${EXECUTABLE_OUTPUT_PATH}/unittest) - -add_dependencies(check unittest) - -# diff --git a/test/doc-per-case-test.cpp b/test/doc-per-case-test.cpp deleted file mode 100644 index da75b1e65..000000000 --- a/test/doc-per-case-test.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Test fixture with SPDocument per entire test case. - * - * Author: - * Jon A. Cruz - * - * Copyright (C) 2015 Authors - * - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -#include "doc-per-case-test.h" - -#include "inkscape.h" - -SPDocument *DocPerCaseTest::_doc = 0; - -DocPerCaseTest::DocPerCaseTest() : - ::testing::Test() -{ -} - -void DocPerCaseTest::SetUpTestCase() -{ - if ( !Inkscape::Application::exists() ) - { - // Create the global inkscape object. - Inkscape::Application::create("", false); - } - - _doc = SPDocument::createNewDoc( NULL, TRUE, true ); - ASSERT_TRUE( _doc != NULL ); -} - -void DocPerCaseTest::TearDownTestCase() -{ - if (_doc) { - _doc->doUnref(); - _doc = NULL; - } -} - -/* - Local Variables: - mode:c++ - c-file-style:"stroustrup" - c-file-offsets:((innamespace . 0)(inline-open . 0)) - indent-tabs-mode:nil - fill-column:99 - End: -*/ -// vim: expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/test/doc-per-case-test.h b/test/doc-per-case-test.h deleted file mode 100644 index b6f01403a..000000000 --- a/test/doc-per-case-test.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Test fixture with SPDocument per entire test case. - * - * Author: - * Jon A. Cruz - * - * Copyright (C) 2015 Authors - * - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -#include "gtest/gtest.h" - -#include "document.h" - - -/** - * Simple fixture that creates a single SPDocument to be shared between all tests - * in this test case. - */ -class DocPerCaseTest : public ::testing::Test -{ -public: - DocPerCaseTest(); - -protected: - static void SetUpTestCase(); - - static void TearDownTestCase(); - - static SPDocument *_doc; -}; - -/* - Local Variables: - mode:c++ - c-file-style:"stroustrup" - c-file-offsets:((innamespace . 0)(inline-open . 0)) - indent-tabs-mode:nil - fill-column:99 - End: -*/ -// vim: expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/test/src/attributes-test.cpp b/test/src/attributes-test.cpp deleted file mode 100644 index 41c0274ec..000000000 --- a/test/src/attributes-test.cpp +++ /dev/null @@ -1,633 +0,0 @@ -/* - * Unit tests for attributes. - * - * Author: - * Jon A. Cruz - * - * Copyright (C) 2015 Authors - * - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -#include -#include - -#include "gtest/gtest.h" - -#include "attributes.h" - -namespace { - -static const unsigned int FIRST_VALID_ID = 1; - -class AttributeInfo -{ -public: - AttributeInfo(std::string const &attr, bool supported) : - attr(attr), - supported(supported) - { - } - - std::string attr; - bool supported; -}; - -typedef std::vector::iterator AttrItr; - -std::vector getKnownAttrs() -{ -/* Extracted mechanically from http://www.w3.org/TR/SVG11/attindex.html: - - tidy -wrap 999 -asxml < attindex.html 2>/dev/null | - tr -d \\n | - sed 's,,@,g' | - tr @ \\n | - sed 's,.*,,;s,^,,;1,/^%/d;/^%/d;s,^, {",;s/$/", false},/' | - uniq - - attindex.html lacks attributeName, begin, additive, font, marker; - I've added these manually. - - SVG 2: white-space, shape-inside, shape-outside, shape-padding, shape-margin -*/ - AttributeInfo all_attrs[] = { - AttributeInfo("attributeName", true), - AttributeInfo("begin", true), - AttributeInfo("additive", true), - AttributeInfo("font", true), - AttributeInfo("-inkscape-font-specification", true), // TODO look into this attribute's name - AttributeInfo("marker", true), - AttributeInfo("line-height", true), - - AttributeInfo("accent-height", true), - AttributeInfo("accumulate", true), - AttributeInfo("alignment-baseline", true), - AttributeInfo("alphabetic", true), - AttributeInfo("amplitude", true), - AttributeInfo("animate", false), - AttributeInfo("arabic-form", true), - AttributeInfo("ascent", true), - AttributeInfo("attributeType", true), - AttributeInfo("azimuth", true), - AttributeInfo("baseFrequency", true), - AttributeInfo("baseline-shift", true), - AttributeInfo("baseProfile", false), - AttributeInfo("bbox", true), - AttributeInfo("bias", true), - AttributeInfo("by", true), - AttributeInfo("calcMode", true), - AttributeInfo("cap-height", true), - AttributeInfo("class", false), - AttributeInfo("clip", true), - AttributeInfo("clip-path", true), - AttributeInfo("clip-rule", true), - AttributeInfo("clipPathUnits", true), - AttributeInfo("color", true), - AttributeInfo("color-interpolation", true), - AttributeInfo("color-interpolation-filters", true), - AttributeInfo("color-profile", true), - AttributeInfo("color-rendering", true), - AttributeInfo("contentScriptType", false), - AttributeInfo("contentStyleType", false), - AttributeInfo("cursor", true), - AttributeInfo("cx", true), - AttributeInfo("cy", true), - AttributeInfo("d", true), - AttributeInfo("descent", true), - AttributeInfo("diffuseConstant", true), - AttributeInfo("direction", true), - AttributeInfo("display", true), - AttributeInfo("divisor", true), - AttributeInfo("dominant-baseline", true), - AttributeInfo("dur", true), - AttributeInfo("dx", true), - AttributeInfo("dy", true), - AttributeInfo("edgeMode", true), - AttributeInfo("elevation", true), - AttributeInfo("enable-background", true), - AttributeInfo("end", true), - AttributeInfo("exponent", true), - AttributeInfo("externalResourcesRequired", false), - AttributeInfo("feBlend", false), - AttributeInfo("feColorMatrix", false), - AttributeInfo("feComponentTransfer", false), - AttributeInfo("feComposite", false), - AttributeInfo("feConvolveMatrix", false), - AttributeInfo("feDiffuseLighting", false), - AttributeInfo("feDisplacementMap", false), - AttributeInfo("feFlood", false), - AttributeInfo("feGaussianBlur", false), - AttributeInfo("feImage", false), - AttributeInfo("feMerge", false), - AttributeInfo("feMorphology", false), - AttributeInfo("feOffset", false), - AttributeInfo("feSpecularLighting", false), - AttributeInfo("feTile", false), - AttributeInfo("fill", true), - AttributeInfo("fill-opacity", true), - AttributeInfo("fill-rule", true), - AttributeInfo("filter", true), - AttributeInfo("filterRes", true), - AttributeInfo("filterUnits", true), - AttributeInfo("flood-color", true), - AttributeInfo("flood-opacity", true), - AttributeInfo("font-family", true), - AttributeInfo("font-feature-settings", true), - AttributeInfo("font-size", true), - AttributeInfo("font-size-adjust", true), - AttributeInfo("font-stretch", true), - AttributeInfo("font-style", true), - AttributeInfo("font-variant", true), - AttributeInfo("font-variant-ligatures", true), - AttributeInfo("font-variant-position", true), - AttributeInfo("font-variant-caps", true), - AttributeInfo("font-variant-numeric", true), - AttributeInfo("font-variant-east-asian", true), - AttributeInfo("font-variant-alternates", true), - AttributeInfo("font-weight", true), - AttributeInfo("format", false), - AttributeInfo("from", true), - AttributeInfo("fx", true), - AttributeInfo("fr", true), - AttributeInfo("fy", true), - AttributeInfo("g1", true), - AttributeInfo("g2", true), - AttributeInfo("glyph-name", true), - AttributeInfo("glyph-orientation-horizontal", true), - AttributeInfo("glyph-orientation-vertical", true), - AttributeInfo("glyphRef", false), - AttributeInfo("gradientTransform", true), - AttributeInfo("gradientUnits", true), - AttributeInfo("hanging", true), - AttributeInfo("hatchContentUnits", true), // SVG 2.0 - AttributeInfo("hatchTransform", true), // SVG 2.0 TODO renamed to transform - AttributeInfo("hatchUnits", true), // SVG 2.0 - AttributeInfo("height", true), - AttributeInfo("horiz-adv-x", true), - AttributeInfo("horiz-origin-x", true), - AttributeInfo("horiz-origin-y", true), - AttributeInfo("ideographic", true), - AttributeInfo("image-rendering", true), - AttributeInfo("in", true), - AttributeInfo("in2", true), - AttributeInfo("intercept", true), - AttributeInfo("isolation", true), - AttributeInfo("k", true), - AttributeInfo("k1", true), - AttributeInfo("k2", true), - AttributeInfo("k3", true), - AttributeInfo("k4", true), - AttributeInfo("kernelMatrix", true), - AttributeInfo("kernelUnitLength", true), - AttributeInfo("kerning", true), - AttributeInfo("keyPoints", false), - AttributeInfo("keySplines", true), - AttributeInfo("keyTimes", true), - AttributeInfo("lang", true), - AttributeInfo("lengthAdjust", true), - AttributeInfo("letter-spacing", true), - AttributeInfo("lighting-color", true), - AttributeInfo("limitingConeAngle", true), - AttributeInfo("local", true), - AttributeInfo("marker-end", true), - AttributeInfo("marker-mid", true), - AttributeInfo("marker-start", true), - AttributeInfo("markerHeight", true), - AttributeInfo("markerUnits", true), - AttributeInfo("markerWidth", true), - AttributeInfo("mask", true), - AttributeInfo("maskContentUnits", true), - AttributeInfo("maskUnits", true), - AttributeInfo("mathematical", true), - AttributeInfo("max", true), - AttributeInfo("media", false), - AttributeInfo("method", false), - AttributeInfo("min", true), - AttributeInfo("mix-blend-mode", true), - AttributeInfo("mode", true), - AttributeInfo("name", true), - AttributeInfo("numOctaves", true), - AttributeInfo("offset", true), - AttributeInfo("onabort", false), - AttributeInfo("onactivate", false), - AttributeInfo("onbegin", false), - AttributeInfo("onclick", false), - AttributeInfo("onend", false), - AttributeInfo("onerror", false), - AttributeInfo("onfocusin", false), - AttributeInfo("onfocusout", false), - AttributeInfo("onload", true), - AttributeInfo("onmousedown", false), - AttributeInfo("onmousemove", false), - AttributeInfo("onmouseout", false), - AttributeInfo("onmouseover", false), - AttributeInfo("onmouseup", false), - AttributeInfo("onrepeat", false), - AttributeInfo("onresize", false), - AttributeInfo("onscroll", false), - AttributeInfo("onunload", false), - AttributeInfo("onzoom", false), - AttributeInfo("opacity", true), - AttributeInfo("operator", true), - AttributeInfo("order", true), - AttributeInfo("orient", true), - AttributeInfo("orientation", true), - AttributeInfo("origin", false), - AttributeInfo("overflow", true), - AttributeInfo("overline-position", true), - AttributeInfo("overline-thickness", true), - AttributeInfo("paint-order", true), - AttributeInfo("panose-1", true), - AttributeInfo("path", true), - AttributeInfo("pathLength", false), - AttributeInfo("patternContentUnits", true), - AttributeInfo("patternTransform", true), - AttributeInfo("patternUnits", true), - AttributeInfo("pitch", true), // SVG 2.- - AttributeInfo("pointer-events", true), - AttributeInfo("points", true), - AttributeInfo("pointsAtX", true), - AttributeInfo("pointsAtY", true), - AttributeInfo("pointsAtZ", true), - AttributeInfo("preserveAlpha", true), - AttributeInfo("preserveAspectRatio", true), - AttributeInfo("primitiveUnits", true), - AttributeInfo("r", true), - AttributeInfo("radius", true), - AttributeInfo("refX", true), - AttributeInfo("refY", true), - AttributeInfo("rendering-intent", true), - AttributeInfo("repeatCount", true), - AttributeInfo("repeatDur", true), - AttributeInfo("requiredFeatures", true), - AttributeInfo("requiredExtensions", true), - AttributeInfo("restart", true), - AttributeInfo("result", true), - AttributeInfo("rotate", true), - AttributeInfo("rx", true), - AttributeInfo("ry", true), - AttributeInfo("scale", true), - AttributeInfo("seed", true), - AttributeInfo("shape-inside", true), - AttributeInfo("shape-margin", true), - AttributeInfo("shape-outside", true), - AttributeInfo("shape-padding", true), - AttributeInfo("shape-rendering", true), - AttributeInfo("slope", true), - AttributeInfo("solid-color", true), // SVG 2.0 - AttributeInfo("solid-opacity", true), // SVG 2.0 - AttributeInfo("spacing", false), - AttributeInfo("specularConstant", true), - AttributeInfo("specularExponent", true), - AttributeInfo("spreadMethod", true), - AttributeInfo("startOffset", true), - AttributeInfo("stdDeviation", true), - AttributeInfo("stemh", true), - AttributeInfo("stemv", true), - AttributeInfo("stitchTiles", true), - AttributeInfo("stop-color", true), - AttributeInfo("stop-opacity", true), - AttributeInfo("strikethrough-position", true), - AttributeInfo("strikethrough-thickness", true), - AttributeInfo("stroke", true), - AttributeInfo("stroke-dasharray", true), - AttributeInfo("stroke-dashoffset", true), - AttributeInfo("stroke-linecap", true), - AttributeInfo("stroke-linejoin", true), - AttributeInfo("stroke-miterlimit", true), - AttributeInfo("stroke-opacity", true), - AttributeInfo("stroke-width", true), - AttributeInfo("style", true), - AttributeInfo("surfaceScale", true), - AttributeInfo("systemLanguage", true), - AttributeInfo("tableValues", true), - AttributeInfo("target", true), - AttributeInfo("targetX", true), - AttributeInfo("targetY", true), - AttributeInfo("text-align", true), - AttributeInfo("text-anchor", true), - AttributeInfo("text-decoration", true), - AttributeInfo("text-decoration-color", true), - AttributeInfo("text-decoration-fill", true), - AttributeInfo("text-decoration-line", true), - AttributeInfo("text-decoration-stroke", true), - AttributeInfo("text-decoration-style", true), - AttributeInfo("text-indent", true), - AttributeInfo("text-orientation", true), - AttributeInfo("text-rendering", true), - AttributeInfo("text-transform", true), - AttributeInfo("textLength", true), - AttributeInfo("title", false), - AttributeInfo("to", true), - AttributeInfo("transform", true), - AttributeInfo("type", true), - AttributeInfo("u1", true), - AttributeInfo("u2", true), - AttributeInfo("underline-position", true), - AttributeInfo("underline-thickness", true), - AttributeInfo("unicode", true), - AttributeInfo("unicode-bidi", true), - AttributeInfo("unicode-range", true), - AttributeInfo("units-per-em", true), - AttributeInfo("v-alphabetic", true), - AttributeInfo("v-hanging", true), - AttributeInfo("v-ideographic", true), - AttributeInfo("v-mathematical", true), - AttributeInfo("values", true), - AttributeInfo("version", true), - AttributeInfo("vert-adv-y", true), - AttributeInfo("vert-origin-x", true), - AttributeInfo("vert-origin-y", true), - AttributeInfo("viewBox", true), - AttributeInfo("viewTarget", false), - AttributeInfo("visibility", true), - AttributeInfo("white-space", true), - AttributeInfo("width", true), - AttributeInfo("widths", true), - AttributeInfo("word-spacing", true), - AttributeInfo("writing-mode", true), - AttributeInfo("x", true), - AttributeInfo("x-height", true), - AttributeInfo("x1", true), - AttributeInfo("x2", true), - AttributeInfo("xChannelSelector", true), - AttributeInfo("xlink:actuate", true), - AttributeInfo("xlink:arcrole", true), - AttributeInfo("xlink:href", true), - AttributeInfo("xlink:role", true), - AttributeInfo("xlink:show", true), - AttributeInfo("xlink:title", true), - AttributeInfo("xlink:type", true), - AttributeInfo("xml:base", false), - AttributeInfo("xml:space", true), - AttributeInfo("xmlns", false), - AttributeInfo("xmlns:xlink", false), - AttributeInfo("y", true), - AttributeInfo("y1", true), - AttributeInfo("y2", true), - AttributeInfo("yChannelSelector", true), - AttributeInfo("z", true), - AttributeInfo("zoomAndPan", false), - - // Extra attributes. - AttributeInfo("id", true), - AttributeInfo("inkscape:bbox-nodes", true), - AttributeInfo("inkscape:bbox-paths", true), - AttributeInfo("inkscape:box3dsidetype", true), - AttributeInfo("inkscape:collect", true), - AttributeInfo("inkscape:color", true), - AttributeInfo("inkscape:connection-end", true), - AttributeInfo("inkscape:connection-end-point", true), - AttributeInfo("inkscape:connection-points", true), - AttributeInfo("inkscape:connection-start", true), - AttributeInfo("inkscape:connection-start-point", true), - AttributeInfo("inkscape:connector-avoid", true), - AttributeInfo("inkscape:connector-curvature", true), - AttributeInfo("inkscape:connector-spacing", true), - AttributeInfo("inkscape:connector-type", true), - AttributeInfo("inkscape:corner0", true), - AttributeInfo("inkscape:corner7", true), - AttributeInfo("inkscape:current-layer", true), - AttributeInfo("inkscape:cx", true), - AttributeInfo("inkscape:cy", true), - AttributeInfo("inkscape:document-units", true), - AttributeInfo("inkscape:dstBox", true), - AttributeInfo("inkscape:dstColumn", true), - AttributeInfo("inkscape:dstPath", true), - AttributeInfo("inkscape:dstShape", true), - AttributeInfo("inkscape:excludeShape", true), - AttributeInfo("inkscape:expanded", true), - AttributeInfo("inkscape:flatsided", true), - AttributeInfo("inkscape:groupmode", true), - AttributeInfo("inkscape:highlight-color", true), - AttributeInfo("inkscape:href", true), - AttributeInfo("inkscape:label", true), - AttributeInfo("inkscape:layoutOptions", true), - AttributeInfo("inkscape:lockguides", true), - AttributeInfo("inkscape:locked", true), - AttributeInfo("inkscape:object-nodes", true), - AttributeInfo("inkscape:object-paths", true), - AttributeInfo("inkscape:original", true), - AttributeInfo("inkscape:original-d", true), - AttributeInfo("inkscape:pagecheckerboard", true), - AttributeInfo("inkscape:pageopacity", true), - AttributeInfo("inkscape:pageshadow", true), - AttributeInfo("inkscape:path-effect", true), - AttributeInfo("inkscape:persp3d", true), - AttributeInfo("inkscape:persp3d-origin", true), - AttributeInfo("inkscape:perspectiveID", true), - AttributeInfo("inkscape:radius", true), - AttributeInfo("inkscape:randomized", true), - AttributeInfo("inkscape:rounded", true), - AttributeInfo("inkscape:snap-bbox", true), - AttributeInfo("inkscape:snap-bbox-edge-midpoints", true), - AttributeInfo("inkscape:snap-bbox-midpoints", true), - AttributeInfo("inkscape:snap-center", true), - AttributeInfo("inkscape:snap-global", true), - AttributeInfo("inkscape:snap-grids", true), - AttributeInfo("inkscape:snap-intersection-paths", true), - AttributeInfo("inkscape:snap-midpoints", true), - AttributeInfo("inkscape:snap-nodes", true), - AttributeInfo("inkscape:snap-object-midpoints", true), - AttributeInfo("inkscape:snap-others", true), - AttributeInfo("inkscape:snap-page", true), - AttributeInfo("inkscape:snap-path-clip", true), - AttributeInfo("inkscape:snap-path-mask", true), - AttributeInfo("inkscape:snap-perpendicular", true), - AttributeInfo("inkscape:snap-smooth-nodes", true), - AttributeInfo("inkscape:snap-tangential", true), - AttributeInfo("inkscape:snap-text-baseline", true), - AttributeInfo("inkscape:snap-to-guides", true), - AttributeInfo("inkscape:spray-origin", true), - AttributeInfo("inkscape:srcNoMarkup", true), - AttributeInfo("inkscape:srcPango", true), - AttributeInfo("inkscape:transform-center-x", true), - AttributeInfo("inkscape:transform-center-y", true), - AttributeInfo("inkscape:version", true), - AttributeInfo("inkscape:vp_x", true), - AttributeInfo("inkscape:vp_y", true), - AttributeInfo("inkscape:vp_z", true), - AttributeInfo("inkscape:window-height", true), - AttributeInfo("inkscape:window-maximized", true), - AttributeInfo("inkscape:window-width", true), - AttributeInfo("inkscape:window-x", true), - AttributeInfo("inkscape:window-y", true), - AttributeInfo("inkscape:zoom", true), - AttributeInfo("osb:paint", true), - AttributeInfo("sodipodi:arg1", true), - AttributeInfo("sodipodi:arg2", true), - AttributeInfo("sodipodi:argument", true), - AttributeInfo("sodipodi:cx", true), - AttributeInfo("sodipodi:cy", true), - AttributeInfo("sodipodi:end", true), - AttributeInfo("sodipodi:expansion", true), - AttributeInfo("sodipodi:insensitive", true), - AttributeInfo("sodipodi:linespacing", true), - AttributeInfo("sodipodi:nonprintable", true), - AttributeInfo("sodipodi:open", true), - AttributeInfo("sodipodi:original", true), - AttributeInfo("sodipodi:r1", true), - AttributeInfo("sodipodi:r2", true), - AttributeInfo("sodipodi:radius", true), - AttributeInfo("sodipodi:revolution", true), - AttributeInfo("sodipodi:role", true), - AttributeInfo("sodipodi:rx", true), - AttributeInfo("sodipodi:ry", true), - AttributeInfo("sodipodi:sides", true), - AttributeInfo("sodipodi:start", true), - AttributeInfo("sodipodi:t0", true), - AttributeInfo("sodipodi:version", false), - - // SPMeshPatch - AttributeInfo("tensor", true), - - // SPNamedView - AttributeInfo("fit-margin-top", true), - AttributeInfo("fit-margin-left", true), - AttributeInfo("fit-margin-right", true), - AttributeInfo("fit-margin-bottom", true), - AttributeInfo("units", true), - AttributeInfo("viewonly", true), - AttributeInfo("showgrid", true), -// AttributeInfo("gridtype", true), - AttributeInfo("showguides", true), - AttributeInfo("gridtolerance", true), - AttributeInfo("guidetolerance", true), - AttributeInfo("objecttolerance", true), -/* AttributeInfo("gridoriginx", true), - AttributeInfo("gridoriginy", true), - AttributeInfo("gridspacingx", true), - AttributeInfo("gridspacingy", true), - AttributeInfo("gridanglex", true), - AttributeInfo("gridanglez", true), - AttributeInfo("gridcolor", true), - AttributeInfo("gridopacity", true), - AttributeInfo("gridempcolor", true), - AttributeInfo("gridempopacity", true), - AttributeInfo("gridempspacing", true), */ - AttributeInfo("guidecolor", true), - AttributeInfo("guideopacity", true), - AttributeInfo("guidehicolor", true), - AttributeInfo("guidehiopacity", true), - AttributeInfo("showborder", true), - AttributeInfo("inkscape:showpageshadow", true), - AttributeInfo("borderlayer", true), - AttributeInfo("bordercolor", true), - AttributeInfo("borderopacity", true), - AttributeInfo("pagecolor", true), - - // SPGuide - AttributeInfo("position", true) - }; - - size_t count = sizeof(all_attrs) / sizeof(all_attrs[0]); - std::vector vect(all_attrs, all_attrs + count); - EXPECT_GT(vect.size(), size_t(100)); // should be more than - return vect; -} - -/** - * Returns a vector with counts for all IDs up to the highest known value. - * - * The index is the ID, and the value is the number of times that ID is seen. - */ -std::vector getIdIds() -{ - std::vector ids; - std::vector all_attrs = getKnownAttrs(); - ids.reserve(all_attrs.size()); // minimize memory thrashing - for (AttrItr it(all_attrs.begin()); it != all_attrs.end(); ++it) { - unsigned int id = sp_attribute_lookup(it->attr.c_str()); - if (id >= ids.size()) { - ids.resize(id + 1); - } - ids[id]++; - } - - return ids; -} - -// Ensure 'supported' value for each known attribute is correct. -TEST(AttributesTest, SupportedKnown) -{ - std::vector all_attrs = getKnownAttrs(); - for (AttrItr it(all_attrs.begin()); it != all_attrs.end(); ++it) { - unsigned int id = sp_attribute_lookup(it->attr.c_str()); - EXPECT_EQ(it->supported, id != 0u) << "Matching for attribute '" << it->attr << "'"; - } -} - -// Ensure names of known attributes are preserved when converted to id and back. -TEST(AttributesTest, NameRoundTrip) -{ - std::vector all_attrs = getKnownAttrs(); - for (AttrItr it(all_attrs.begin()); it != all_attrs.end(); ++it) { - if (it->supported) { - unsigned int id = sp_attribute_lookup(it->attr.c_str()); - char const *redoneName = reinterpret_cast(sp_attribute_name(id)); - EXPECT_TRUE(redoneName != NULL) << "For attribute '" << it->attr << "'"; - if (redoneName) { - EXPECT_EQ(it->attr, redoneName); - } - } - } -} - -/* Test for any attributes that this test program doesn't know about. - * - * If any are found, then: - * - * If it is in the `inkscape:' namespace then simply add it to all_attrs with - * `true' as the second field (`supported'). - * - * If it is in the `sodipodi:' namespace then check the spelling against sodipodi - * sources. If you don't have sodipodi sources, then don't add it: leave to someone - * else. - * - * Otherwise, it's probably a bug: ~all SVG 1.1 attributes should already be - * in the all_attrs table. However, the comment above all_attrs does mention - * some things missing from attindex.html, so there may be more. Check the SVG - * spec. Another possibility is that the attribute is new in SVG 1.2. In this case, - * check the spelling against the [draft] SVG 1.2 spec before adding to all_attrs. - * (If you can't be bothered checking the spec, then don't update all_attrs.) - * - * If the attribute isn't in either SVG 1.1 or 1.2 then it's probably a mistake - * for it not to be in the inkscape namespace. (Not sure about attributes used only - * on elements in the inkscape namespace though.) - * - * In any case, make sure that the attribute's source is documented accordingly. - */ -TEST(AttributesTest, ValuesAreKnown) -{ - std::vector ids = getIdIds(); - for (size_t i = FIRST_VALID_ID; i < ids.size(); ++i) { - if (!ids[i]) { - unsigned char const *name = sp_attribute_name(i); - EXPECT_TRUE(ids[i] > 0) << "Attribute string with enum " << i << " {" << name << "} not handled"; - } - } -} - -// Ensure two different names aren't mapped to the same enum value. -TEST(AttributesTest, ValuesUnique) -{ - std::vector ids = getIdIds(); - for (size_t i = FIRST_VALID_ID; i < ids.size(); ++i) { - EXPECT_LE(ids[i], size_t(1)) << "Attribute enum " << i << " used for multiple strings" - << " including {" << sp_attribute_name(i) << "}"; - } -} - -} // namespace - -/* - Local Variables: - mode:c++ - c-file-style:"stroustrup" - c-file-offsets:((innamespace . 0)(inline-open . 0)) - indent-tabs-mode:nil - fill-column:99 - End: -*/ -// vim: expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/test/src/color-profile-test.cpp b/test/src/color-profile-test.cpp deleted file mode 100644 index 365be687a..000000000 --- a/test/src/color-profile-test.cpp +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Unit tests for color profile. - * - * Author: - * Jon A. Cruz - * - * Copyright (C) 2015 Authors - * - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -#include "gtest/gtest.h" - -#include "attributes.h" -#include "cms-system.h" -#include "color-profile.h" -#include "doc-per-case-test.h" - -namespace { - -/** - * Test fixture to inherit a shared doc and create a color profile instance per test. - */ -class ProfTest : public DocPerCaseTest -{ -public: - ProfTest() : - DocPerCaseTest(), - _prof(0) - { - } - -protected: - virtual void SetUp() - { - DocPerCaseTest::SetUp(); - _prof = new Inkscape::ColorProfile(); - ASSERT_TRUE( _prof != NULL ); - _prof->document = _doc; - } - - virtual void TearDown() - { - if (_prof) { - delete _prof; - _prof = NULL; - } - DocPerCaseTest::TearDown(); - } - - Inkscape::ColorProfile *_prof; -}; - -typedef ProfTest ColorProfileTest; - -TEST_F(ColorProfileTest, SetRenderingIntent) -{ - struct { - gchar const *attr; - guint intVal; - } - const cases[] = { - {"auto", (guint)Inkscape::RENDERING_INTENT_AUTO}, - {"perceptual", (guint)Inkscape::RENDERING_INTENT_PERCEPTUAL}, - {"relative-colorimetric", (guint)Inkscape::RENDERING_INTENT_RELATIVE_COLORIMETRIC}, - {"saturation", (guint)Inkscape::RENDERING_INTENT_SATURATION}, - {"absolute-colorimetric", (guint)Inkscape::RENDERING_INTENT_ABSOLUTE_COLORIMETRIC}, - {"something-else", (guint)Inkscape::RENDERING_INTENT_UNKNOWN}, - {"auto2", (guint)Inkscape::RENDERING_INTENT_UNKNOWN}, - }; - - for ( size_t i = 0; i < G_N_ELEMENTS( cases ); i++ ) { - _prof->setKeyValue( SP_ATTR_RENDERING_INTENT, cases[i].attr); - ASSERT_EQ( (guint)cases[i].intVal, _prof->rendering_intent ) << cases[i].attr; - } -} - -TEST_F(ColorProfileTest, SetLocal) -{ - gchar const* cases[] = { - "local", - "something", - }; - - for ( size_t i = 0; i < G_N_ELEMENTS( cases ); i++ ) { - _prof->setKeyValue( SP_ATTR_LOCAL, cases[i]); - ASSERT_TRUE( _prof->local != NULL ); - if ( _prof->local ) { - ASSERT_EQ( std::string(cases[i]), _prof->local ); - } - } - _prof->setKeyValue( SP_ATTR_LOCAL, NULL); - ASSERT_EQ( (gchar*)0, _prof->local ); -} - -TEST_F(ColorProfileTest, SetName) -{ - gchar const* cases[] = { - "name", - "something", - }; - - for ( size_t i = 0; i < G_N_ELEMENTS( cases ); i++ ) { - _prof->setKeyValue( SP_ATTR_NAME, cases[i]); - ASSERT_TRUE( _prof->name != NULL ); - if ( _prof->name ) { - ASSERT_EQ( std::string(cases[i]), _prof->name ); - } - } - _prof->setKeyValue( SP_ATTR_NAME, NULL ); - ASSERT_EQ( (gchar*)0, _prof->name ); -} - - -} // namespace - -/* - Local Variables: - mode:c++ - c-file-style:"stroustrup" - c-file-offsets:((innamespace . 0)(inline-open . 0)) - indent-tabs-mode:nil - fill-column:99 - End: -*/ -// vim: expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/test/src/dir-util-test.cpp b/test/src/dir-util-test.cpp deleted file mode 100644 index 32b3fce74..000000000 --- a/test/src/dir-util-test.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Unit tests for dir utils. - * - * Author: - * Jon A. Cruz - * - * Copyright (C) 2015 Authors - * - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -#include "gtest/gtest.h" - -#include - -#include "dir-util.h" - -namespace { - - -TEST(DirUtilTest, Base) -{ - char const* cases[][3] = { -#if defined(WIN32) || defined(__WIN32__) - {"\\foo\\bar", "\\foo", "bar"}, - {"\\foo\\barney", "\\foo\\bar", "\\foo\\barney"}, - {"\\foo\\bar\\baz", "\\foo\\", "bar\\baz"}, - {"\\foo\\bar\\baz", "\\", "foo\\bar\\baz"}, - {"\\foo\\bar\\baz", "\\foo\\qux", "\\foo\\bar\\baz"}, -#else - {"/foo/bar", "/foo", "bar"}, - {"/foo/barney", "/foo/bar", "/foo/barney"}, - {"/foo/bar/baz", "/foo/", "bar/baz"}, - {"/foo/bar/baz", "/", "foo/bar/baz"}, - {"/foo/bar/baz", "/foo/qux", "/foo/bar/baz"}, -#endif - }; - - for ( size_t i = 0; i < G_N_ELEMENTS(cases); i++ ) - { - if ( cases[i][0] && cases[i][1] ) { // std::string can't use null. - std::string result = sp_relative_path_from_path( cases[i][0], cases[i][1] ); - ASSERT_FALSE( result.empty() ); - if ( !result.empty() ) - { - ASSERT_EQ( std::string(cases[i][2]), result ); - } - } - } -} - -} // namespace - -/* - Local Variables: - mode:c++ - c-file-style:"stroustrup" - c-file-offsets:((innamespace . 0)(inline-open . 0)) - indent-tabs-mode:nil - fill-column:99 - End: -*/ -// vim: expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/test/unittest.cpp b/test/unittest.cpp deleted file mode 100644 index 0ec8f0383..000000000 --- a/test/unittest.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Unit test main. - * - * Author: - * Jon A. Cruz - * - * Copyright (C) 2015 Authors - * - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -#include "gtest/gtest.h" - -#include - -#include "inkgc/gc-core.h" -#include "inkscape.h" - -namespace { - -// Ensure that a known positive test works -TEST(PreTest, WorldIsSane) -{ - EXPECT_EQ(4, 2 + 2); -} - -// Example of type casting to avoid compile warnings. - - -} // namespace - -int main(int argc, char **argv) { - - // setup general environment -#if !GLIB_CHECK_VERSION(2,36,0) - g_type_init(); -#endif - int tmpArgc = 1; - char const *tmp[] = {"foo", ""}; - char **tmpArgv = const_cast(tmp); - Gtk::Main(tmpArgc, tmpArgv); - - Inkscape::GC::init(); - - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} - -/* - Local Variables: - mode:c++ - c-file-style:"stroustrup" - c-file-offsets:((innamespace . 0)(inline-open . 0)) - indent-tabs-mode:nil - fill-column:99 - End: -*/ -// vim: expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/testfiles/CMakeLists.txt b/testfiles/CMakeLists.txt new file mode 100644 index 000000000..8da39d627 --- /dev/null +++ b/testfiles/CMakeLists.txt @@ -0,0 +1,67 @@ +# ----------------------------------------------------------------------------- +# +# ----------------------------------------------------------------------------- + +set(CMAKE_CTEST_COMMAND ctest -V) + +add_subdirectory(${GMOCK_DIR} ${CMAKE_BINARY_DIR}/gmock) + +include_directories(SYSTEM ${GMOCK_DIR}/gtest/include + ${GMOCK_DIR}/include + ${CMAKE_SOURCE_DIR}/gtest/gtest/include) + +set_source_files_properties( + ${CMAKE_BINARY_DIR}/src/inkscape-version.cpp + PROPERTIES GENERATED TRUE) + +# include_directories(${CMAKE_CURRENT_BINARY_DIR}/__/src) +include_directories(${CMAKE_BINARY_DIR}/src) + +add_executable(unittest + unittest.cpp + doc-per-case-test.cpp + src/attributes-test.cpp + src/color-profile-test.cpp + src/dir-util-test.cpp +) + +target_link_libraries(unittest inkscape_base) + +add_dependencies(unittest inkscape_version) + +set (_optional_unittest_libs ) + +if (NOT "${WITH_EXT_GDL}") + list (APPEND _optional_unittest_libs "gdl_LIB") +endif() + +target_link_libraries(unittest + gmock_main + + # order from automake + #sp_LIB + + #inkscape_LIB + #sp_LIB # annoying, we need both! + nrtype_LIB # annoying, we need both! + + croco_LIB + avoid_LIB + ${_optional_unittest_libs} + cola_LIB + vpsc_LIB + livarot_LIB + uemf_LIB + 2geom_LIB + depixelize_LIB + util_LIB + gc_LIB + + ${INKSCAPE_LIBS} +) + +add_test(BaseTest ${EXECUTABLE_OUTPUT_PATH}/unittest) + +add_dependencies(check unittest) + +# diff --git a/testfiles/doc-per-case-test.cpp b/testfiles/doc-per-case-test.cpp new file mode 100644 index 000000000..da75b1e65 --- /dev/null +++ b/testfiles/doc-per-case-test.cpp @@ -0,0 +1,52 @@ +/* + * Test fixture with SPDocument per entire test case. + * + * Author: + * Jon A. Cruz + * + * Copyright (C) 2015 Authors + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#include "doc-per-case-test.h" + +#include "inkscape.h" + +SPDocument *DocPerCaseTest::_doc = 0; + +DocPerCaseTest::DocPerCaseTest() : + ::testing::Test() +{ +} + +void DocPerCaseTest::SetUpTestCase() +{ + if ( !Inkscape::Application::exists() ) + { + // Create the global inkscape object. + Inkscape::Application::create("", false); + } + + _doc = SPDocument::createNewDoc( NULL, TRUE, true ); + ASSERT_TRUE( _doc != NULL ); +} + +void DocPerCaseTest::TearDownTestCase() +{ + if (_doc) { + _doc->doUnref(); + _doc = NULL; + } +} + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/testfiles/doc-per-case-test.h b/testfiles/doc-per-case-test.h new file mode 100644 index 000000000..b6f01403a --- /dev/null +++ b/testfiles/doc-per-case-test.h @@ -0,0 +1,43 @@ +/* + * Test fixture with SPDocument per entire test case. + * + * Author: + * Jon A. Cruz + * + * Copyright (C) 2015 Authors + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#include "gtest/gtest.h" + +#include "document.h" + + +/** + * Simple fixture that creates a single SPDocument to be shared between all tests + * in this test case. + */ +class DocPerCaseTest : public ::testing::Test +{ +public: + DocPerCaseTest(); + +protected: + static void SetUpTestCase(); + + static void TearDownTestCase(); + + static SPDocument *_doc; +}; + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/testfiles/src/attributes-test.cpp b/testfiles/src/attributes-test.cpp new file mode 100644 index 000000000..41c0274ec --- /dev/null +++ b/testfiles/src/attributes-test.cpp @@ -0,0 +1,633 @@ +/* + * Unit tests for attributes. + * + * Author: + * Jon A. Cruz + * + * Copyright (C) 2015 Authors + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#include +#include + +#include "gtest/gtest.h" + +#include "attributes.h" + +namespace { + +static const unsigned int FIRST_VALID_ID = 1; + +class AttributeInfo +{ +public: + AttributeInfo(std::string const &attr, bool supported) : + attr(attr), + supported(supported) + { + } + + std::string attr; + bool supported; +}; + +typedef std::vector::iterator AttrItr; + +std::vector getKnownAttrs() +{ +/* Extracted mechanically from http://www.w3.org/TR/SVG11/attindex.html: + + tidy -wrap 999 -asxml < attindex.html 2>/dev/null | + tr -d \\n | + sed 's,,@,g' | + tr @ \\n | + sed 's,.*,,;s,^,,;1,/^%/d;/^%/d;s,^, {",;s/$/", false},/' | + uniq + + attindex.html lacks attributeName, begin, additive, font, marker; + I've added these manually. + + SVG 2: white-space, shape-inside, shape-outside, shape-padding, shape-margin +*/ + AttributeInfo all_attrs[] = { + AttributeInfo("attributeName", true), + AttributeInfo("begin", true), + AttributeInfo("additive", true), + AttributeInfo("font", true), + AttributeInfo("-inkscape-font-specification", true), // TODO look into this attribute's name + AttributeInfo("marker", true), + AttributeInfo("line-height", true), + + AttributeInfo("accent-height", true), + AttributeInfo("accumulate", true), + AttributeInfo("alignment-baseline", true), + AttributeInfo("alphabetic", true), + AttributeInfo("amplitude", true), + AttributeInfo("animate", false), + AttributeInfo("arabic-form", true), + AttributeInfo("ascent", true), + AttributeInfo("attributeType", true), + AttributeInfo("azimuth", true), + AttributeInfo("baseFrequency", true), + AttributeInfo("baseline-shift", true), + AttributeInfo("baseProfile", false), + AttributeInfo("bbox", true), + AttributeInfo("bias", true), + AttributeInfo("by", true), + AttributeInfo("calcMode", true), + AttributeInfo("cap-height", true), + AttributeInfo("class", false), + AttributeInfo("clip", true), + AttributeInfo("clip-path", true), + AttributeInfo("clip-rule", true), + AttributeInfo("clipPathUnits", true), + AttributeInfo("color", true), + AttributeInfo("color-interpolation", true), + AttributeInfo("color-interpolation-filters", true), + AttributeInfo("color-profile", true), + AttributeInfo("color-rendering", true), + AttributeInfo("contentScriptType", false), + AttributeInfo("contentStyleType", false), + AttributeInfo("cursor", true), + AttributeInfo("cx", true), + AttributeInfo("cy", true), + AttributeInfo("d", true), + AttributeInfo("descent", true), + AttributeInfo("diffuseConstant", true), + AttributeInfo("direction", true), + AttributeInfo("display", true), + AttributeInfo("divisor", true), + AttributeInfo("dominant-baseline", true), + AttributeInfo("dur", true), + AttributeInfo("dx", true), + AttributeInfo("dy", true), + AttributeInfo("edgeMode", true), + AttributeInfo("elevation", true), + AttributeInfo("enable-background", true), + AttributeInfo("end", true), + AttributeInfo("exponent", true), + AttributeInfo("externalResourcesRequired", false), + AttributeInfo("feBlend", false), + AttributeInfo("feColorMatrix", false), + AttributeInfo("feComponentTransfer", false), + AttributeInfo("feComposite", false), + AttributeInfo("feConvolveMatrix", false), + AttributeInfo("feDiffuseLighting", false), + AttributeInfo("feDisplacementMap", false), + AttributeInfo("feFlood", false), + AttributeInfo("feGaussianBlur", false), + AttributeInfo("feImage", false), + AttributeInfo("feMerge", false), + AttributeInfo("feMorphology", false), + AttributeInfo("feOffset", false), + AttributeInfo("feSpecularLighting", false), + AttributeInfo("feTile", false), + AttributeInfo("fill", true), + AttributeInfo("fill-opacity", true), + AttributeInfo("fill-rule", true), + AttributeInfo("filter", true), + AttributeInfo("filterRes", true), + AttributeInfo("filterUnits", true), + AttributeInfo("flood-color", true), + AttributeInfo("flood-opacity", true), + AttributeInfo("font-family", true), + AttributeInfo("font-feature-settings", true), + AttributeInfo("font-size", true), + AttributeInfo("font-size-adjust", true), + AttributeInfo("font-stretch", true), + AttributeInfo("font-style", true), + AttributeInfo("font-variant", true), + AttributeInfo("font-variant-ligatures", true), + AttributeInfo("font-variant-position", true), + AttributeInfo("font-variant-caps", true), + AttributeInfo("font-variant-numeric", true), + AttributeInfo("font-variant-east-asian", true), + AttributeInfo("font-variant-alternates", true), + AttributeInfo("font-weight", true), + AttributeInfo("format", false), + AttributeInfo("from", true), + AttributeInfo("fx", true), + AttributeInfo("fr", true), + AttributeInfo("fy", true), + AttributeInfo("g1", true), + AttributeInfo("g2", true), + AttributeInfo("glyph-name", true), + AttributeInfo("glyph-orientation-horizontal", true), + AttributeInfo("glyph-orientation-vertical", true), + AttributeInfo("glyphRef", false), + AttributeInfo("gradientTransform", true), + AttributeInfo("gradientUnits", true), + AttributeInfo("hanging", true), + AttributeInfo("hatchContentUnits", true), // SVG 2.0 + AttributeInfo("hatchTransform", true), // SVG 2.0 TODO renamed to transform + AttributeInfo("hatchUnits", true), // SVG 2.0 + AttributeInfo("height", true), + AttributeInfo("horiz-adv-x", true), + AttributeInfo("horiz-origin-x", true), + AttributeInfo("horiz-origin-y", true), + AttributeInfo("ideographic", true), + AttributeInfo("image-rendering", true), + AttributeInfo("in", true), + AttributeInfo("in2", true), + AttributeInfo("intercept", true), + AttributeInfo("isolation", true), + AttributeInfo("k", true), + AttributeInfo("k1", true), + AttributeInfo("k2", true), + AttributeInfo("k3", true), + AttributeInfo("k4", true), + AttributeInfo("kernelMatrix", true), + AttributeInfo("kernelUnitLength", true), + AttributeInfo("kerning", true), + AttributeInfo("keyPoints", false), + AttributeInfo("keySplines", true), + AttributeInfo("keyTimes", true), + AttributeInfo("lang", true), + AttributeInfo("lengthAdjust", true), + AttributeInfo("letter-spacing", true), + AttributeInfo("lighting-color", true), + AttributeInfo("limitingConeAngle", true), + AttributeInfo("local", true), + AttributeInfo("marker-end", true), + AttributeInfo("marker-mid", true), + AttributeInfo("marker-start", true), + AttributeInfo("markerHeight", true), + AttributeInfo("markerUnits", true), + AttributeInfo("markerWidth", true), + AttributeInfo("mask", true), + AttributeInfo("maskContentUnits", true), + AttributeInfo("maskUnits", true), + AttributeInfo("mathematical", true), + AttributeInfo("max", true), + AttributeInfo("media", false), + AttributeInfo("method", false), + AttributeInfo("min", true), + AttributeInfo("mix-blend-mode", true), + AttributeInfo("mode", true), + AttributeInfo("name", true), + AttributeInfo("numOctaves", true), + AttributeInfo("offset", true), + AttributeInfo("onabort", false), + AttributeInfo("onactivate", false), + AttributeInfo("onbegin", false), + AttributeInfo("onclick", false), + AttributeInfo("onend", false), + AttributeInfo("onerror", false), + AttributeInfo("onfocusin", false), + AttributeInfo("onfocusout", false), + AttributeInfo("onload", true), + AttributeInfo("onmousedown", false), + AttributeInfo("onmousemove", false), + AttributeInfo("onmouseout", false), + AttributeInfo("onmouseover", false), + AttributeInfo("onmouseup", false), + AttributeInfo("onrepeat", false), + AttributeInfo("onresize", false), + AttributeInfo("onscroll", false), + AttributeInfo("onunload", false), + AttributeInfo("onzoom", false), + AttributeInfo("opacity", true), + AttributeInfo("operator", true), + AttributeInfo("order", true), + AttributeInfo("orient", true), + AttributeInfo("orientation", true), + AttributeInfo("origin", false), + AttributeInfo("overflow", true), + AttributeInfo("overline-position", true), + AttributeInfo("overline-thickness", true), + AttributeInfo("paint-order", true), + AttributeInfo("panose-1", true), + AttributeInfo("path", true), + AttributeInfo("pathLength", false), + AttributeInfo("patternContentUnits", true), + AttributeInfo("patternTransform", true), + AttributeInfo("patternUnits", true), + AttributeInfo("pitch", true), // SVG 2.- + AttributeInfo("pointer-events", true), + AttributeInfo("points", true), + AttributeInfo("pointsAtX", true), + AttributeInfo("pointsAtY", true), + AttributeInfo("pointsAtZ", true), + AttributeInfo("preserveAlpha", true), + AttributeInfo("preserveAspectRatio", true), + AttributeInfo("primitiveUnits", true), + AttributeInfo("r", true), + AttributeInfo("radius", true), + AttributeInfo("refX", true), + AttributeInfo("refY", true), + AttributeInfo("rendering-intent", true), + AttributeInfo("repeatCount", true), + AttributeInfo("repeatDur", true), + AttributeInfo("requiredFeatures", true), + AttributeInfo("requiredExtensions", true), + AttributeInfo("restart", true), + AttributeInfo("result", true), + AttributeInfo("rotate", true), + AttributeInfo("rx", true), + AttributeInfo("ry", true), + AttributeInfo("scale", true), + AttributeInfo("seed", true), + AttributeInfo("shape-inside", true), + AttributeInfo("shape-margin", true), + AttributeInfo("shape-outside", true), + AttributeInfo("shape-padding", true), + AttributeInfo("shape-rendering", true), + AttributeInfo("slope", true), + AttributeInfo("solid-color", true), // SVG 2.0 + AttributeInfo("solid-opacity", true), // SVG 2.0 + AttributeInfo("spacing", false), + AttributeInfo("specularConstant", true), + AttributeInfo("specularExponent", true), + AttributeInfo("spreadMethod", true), + AttributeInfo("startOffset", true), + AttributeInfo("stdDeviation", true), + AttributeInfo("stemh", true), + AttributeInfo("stemv", true), + AttributeInfo("stitchTiles", true), + AttributeInfo("stop-color", true), + AttributeInfo("stop-opacity", true), + AttributeInfo("strikethrough-position", true), + AttributeInfo("strikethrough-thickness", true), + AttributeInfo("stroke", true), + AttributeInfo("stroke-dasharray", true), + AttributeInfo("stroke-dashoffset", true), + AttributeInfo("stroke-linecap", true), + AttributeInfo("stroke-linejoin", true), + AttributeInfo("stroke-miterlimit", true), + AttributeInfo("stroke-opacity", true), + AttributeInfo("stroke-width", true), + AttributeInfo("style", true), + AttributeInfo("surfaceScale", true), + AttributeInfo("systemLanguage", true), + AttributeInfo("tableValues", true), + AttributeInfo("target", true), + AttributeInfo("targetX", true), + AttributeInfo("targetY", true), + AttributeInfo("text-align", true), + AttributeInfo("text-anchor", true), + AttributeInfo("text-decoration", true), + AttributeInfo("text-decoration-color", true), + AttributeInfo("text-decoration-fill", true), + AttributeInfo("text-decoration-line", true), + AttributeInfo("text-decoration-stroke", true), + AttributeInfo("text-decoration-style", true), + AttributeInfo("text-indent", true), + AttributeInfo("text-orientation", true), + AttributeInfo("text-rendering", true), + AttributeInfo("text-transform", true), + AttributeInfo("textLength", true), + AttributeInfo("title", false), + AttributeInfo("to", true), + AttributeInfo("transform", true), + AttributeInfo("type", true), + AttributeInfo("u1", true), + AttributeInfo("u2", true), + AttributeInfo("underline-position", true), + AttributeInfo("underline-thickness", true), + AttributeInfo("unicode", true), + AttributeInfo("unicode-bidi", true), + AttributeInfo("unicode-range", true), + AttributeInfo("units-per-em", true), + AttributeInfo("v-alphabetic", true), + AttributeInfo("v-hanging", true), + AttributeInfo("v-ideographic", true), + AttributeInfo("v-mathematical", true), + AttributeInfo("values", true), + AttributeInfo("version", true), + AttributeInfo("vert-adv-y", true), + AttributeInfo("vert-origin-x", true), + AttributeInfo("vert-origin-y", true), + AttributeInfo("viewBox", true), + AttributeInfo("viewTarget", false), + AttributeInfo("visibility", true), + AttributeInfo("white-space", true), + AttributeInfo("width", true), + AttributeInfo("widths", true), + AttributeInfo("word-spacing", true), + AttributeInfo("writing-mode", true), + AttributeInfo("x", true), + AttributeInfo("x-height", true), + AttributeInfo("x1", true), + AttributeInfo("x2", true), + AttributeInfo("xChannelSelector", true), + AttributeInfo("xlink:actuate", true), + AttributeInfo("xlink:arcrole", true), + AttributeInfo("xlink:href", true), + AttributeInfo("xlink:role", true), + AttributeInfo("xlink:show", true), + AttributeInfo("xlink:title", true), + AttributeInfo("xlink:type", true), + AttributeInfo("xml:base", false), + AttributeInfo("xml:space", true), + AttributeInfo("xmlns", false), + AttributeInfo("xmlns:xlink", false), + AttributeInfo("y", true), + AttributeInfo("y1", true), + AttributeInfo("y2", true), + AttributeInfo("yChannelSelector", true), + AttributeInfo("z", true), + AttributeInfo("zoomAndPan", false), + + // Extra attributes. + AttributeInfo("id", true), + AttributeInfo("inkscape:bbox-nodes", true), + AttributeInfo("inkscape:bbox-paths", true), + AttributeInfo("inkscape:box3dsidetype", true), + AttributeInfo("inkscape:collect", true), + AttributeInfo("inkscape:color", true), + AttributeInfo("inkscape:connection-end", true), + AttributeInfo("inkscape:connection-end-point", true), + AttributeInfo("inkscape:connection-points", true), + AttributeInfo("inkscape:connection-start", true), + AttributeInfo("inkscape:connection-start-point", true), + AttributeInfo("inkscape:connector-avoid", true), + AttributeInfo("inkscape:connector-curvature", true), + AttributeInfo("inkscape:connector-spacing", true), + AttributeInfo("inkscape:connector-type", true), + AttributeInfo("inkscape:corner0", true), + AttributeInfo("inkscape:corner7", true), + AttributeInfo("inkscape:current-layer", true), + AttributeInfo("inkscape:cx", true), + AttributeInfo("inkscape:cy", true), + AttributeInfo("inkscape:document-units", true), + AttributeInfo("inkscape:dstBox", true), + AttributeInfo("inkscape:dstColumn", true), + AttributeInfo("inkscape:dstPath", true), + AttributeInfo("inkscape:dstShape", true), + AttributeInfo("inkscape:excludeShape", true), + AttributeInfo("inkscape:expanded", true), + AttributeInfo("inkscape:flatsided", true), + AttributeInfo("inkscape:groupmode", true), + AttributeInfo("inkscape:highlight-color", true), + AttributeInfo("inkscape:href", true), + AttributeInfo("inkscape:label", true), + AttributeInfo("inkscape:layoutOptions", true), + AttributeInfo("inkscape:lockguides", true), + AttributeInfo("inkscape:locked", true), + AttributeInfo("inkscape:object-nodes", true), + AttributeInfo("inkscape:object-paths", true), + AttributeInfo("inkscape:original", true), + AttributeInfo("inkscape:original-d", true), + AttributeInfo("inkscape:pagecheckerboard", true), + AttributeInfo("inkscape:pageopacity", true), + AttributeInfo("inkscape:pageshadow", true), + AttributeInfo("inkscape:path-effect", true), + AttributeInfo("inkscape:persp3d", true), + AttributeInfo("inkscape:persp3d-origin", true), + AttributeInfo("inkscape:perspectiveID", true), + AttributeInfo("inkscape:radius", true), + AttributeInfo("inkscape:randomized", true), + AttributeInfo("inkscape:rounded", true), + AttributeInfo("inkscape:snap-bbox", true), + AttributeInfo("inkscape:snap-bbox-edge-midpoints", true), + AttributeInfo("inkscape:snap-bbox-midpoints", true), + AttributeInfo("inkscape:snap-center", true), + AttributeInfo("inkscape:snap-global", true), + AttributeInfo("inkscape:snap-grids", true), + AttributeInfo("inkscape:snap-intersection-paths", true), + AttributeInfo("inkscape:snap-midpoints", true), + AttributeInfo("inkscape:snap-nodes", true), + AttributeInfo("inkscape:snap-object-midpoints", true), + AttributeInfo("inkscape:snap-others", true), + AttributeInfo("inkscape:snap-page", true), + AttributeInfo("inkscape:snap-path-clip", true), + AttributeInfo("inkscape:snap-path-mask", true), + AttributeInfo("inkscape:snap-perpendicular", true), + AttributeInfo("inkscape:snap-smooth-nodes", true), + AttributeInfo("inkscape:snap-tangential", true), + AttributeInfo("inkscape:snap-text-baseline", true), + AttributeInfo("inkscape:snap-to-guides", true), + AttributeInfo("inkscape:spray-origin", true), + AttributeInfo("inkscape:srcNoMarkup", true), + AttributeInfo("inkscape:srcPango", true), + AttributeInfo("inkscape:transform-center-x", true), + AttributeInfo("inkscape:transform-center-y", true), + AttributeInfo("inkscape:version", true), + AttributeInfo("inkscape:vp_x", true), + AttributeInfo("inkscape:vp_y", true), + AttributeInfo("inkscape:vp_z", true), + AttributeInfo("inkscape:window-height", true), + AttributeInfo("inkscape:window-maximized", true), + AttributeInfo("inkscape:window-width", true), + AttributeInfo("inkscape:window-x", true), + AttributeInfo("inkscape:window-y", true), + AttributeInfo("inkscape:zoom", true), + AttributeInfo("osb:paint", true), + AttributeInfo("sodipodi:arg1", true), + AttributeInfo("sodipodi:arg2", true), + AttributeInfo("sodipodi:argument", true), + AttributeInfo("sodipodi:cx", true), + AttributeInfo("sodipodi:cy", true), + AttributeInfo("sodipodi:end", true), + AttributeInfo("sodipodi:expansion", true), + AttributeInfo("sodipodi:insensitive", true), + AttributeInfo("sodipodi:linespacing", true), + AttributeInfo("sodipodi:nonprintable", true), + AttributeInfo("sodipodi:open", true), + AttributeInfo("sodipodi:original", true), + AttributeInfo("sodipodi:r1", true), + AttributeInfo("sodipodi:r2", true), + AttributeInfo("sodipodi:radius", true), + AttributeInfo("sodipodi:revolution", true), + AttributeInfo("sodipodi:role", true), + AttributeInfo("sodipodi:rx", true), + AttributeInfo("sodipodi:ry", true), + AttributeInfo("sodipodi:sides", true), + AttributeInfo("sodipodi:start", true), + AttributeInfo("sodipodi:t0", true), + AttributeInfo("sodipodi:version", false), + + // SPMeshPatch + AttributeInfo("tensor", true), + + // SPNamedView + AttributeInfo("fit-margin-top", true), + AttributeInfo("fit-margin-left", true), + AttributeInfo("fit-margin-right", true), + AttributeInfo("fit-margin-bottom", true), + AttributeInfo("units", true), + AttributeInfo("viewonly", true), + AttributeInfo("showgrid", true), +// AttributeInfo("gridtype", true), + AttributeInfo("showguides", true), + AttributeInfo("gridtolerance", true), + AttributeInfo("guidetolerance", true), + AttributeInfo("objecttolerance", true), +/* AttributeInfo("gridoriginx", true), + AttributeInfo("gridoriginy", true), + AttributeInfo("gridspacingx", true), + AttributeInfo("gridspacingy", true), + AttributeInfo("gridanglex", true), + AttributeInfo("gridanglez", true), + AttributeInfo("gridcolor", true), + AttributeInfo("gridopacity", true), + AttributeInfo("gridempcolor", true), + AttributeInfo("gridempopacity", true), + AttributeInfo("gridempspacing", true), */ + AttributeInfo("guidecolor", true), + AttributeInfo("guideopacity", true), + AttributeInfo("guidehicolor", true), + AttributeInfo("guidehiopacity", true), + AttributeInfo("showborder", true), + AttributeInfo("inkscape:showpageshadow", true), + AttributeInfo("borderlayer", true), + AttributeInfo("bordercolor", true), + AttributeInfo("borderopacity", true), + AttributeInfo("pagecolor", true), + + // SPGuide + AttributeInfo("position", true) + }; + + size_t count = sizeof(all_attrs) / sizeof(all_attrs[0]); + std::vector vect(all_attrs, all_attrs + count); + EXPECT_GT(vect.size(), size_t(100)); // should be more than + return vect; +} + +/** + * Returns a vector with counts for all IDs up to the highest known value. + * + * The index is the ID, and the value is the number of times that ID is seen. + */ +std::vector getIdIds() +{ + std::vector ids; + std::vector all_attrs = getKnownAttrs(); + ids.reserve(all_attrs.size()); // minimize memory thrashing + for (AttrItr it(all_attrs.begin()); it != all_attrs.end(); ++it) { + unsigned int id = sp_attribute_lookup(it->attr.c_str()); + if (id >= ids.size()) { + ids.resize(id + 1); + } + ids[id]++; + } + + return ids; +} + +// Ensure 'supported' value for each known attribute is correct. +TEST(AttributesTest, SupportedKnown) +{ + std::vector all_attrs = getKnownAttrs(); + for (AttrItr it(all_attrs.begin()); it != all_attrs.end(); ++it) { + unsigned int id = sp_attribute_lookup(it->attr.c_str()); + EXPECT_EQ(it->supported, id != 0u) << "Matching for attribute '" << it->attr << "'"; + } +} + +// Ensure names of known attributes are preserved when converted to id and back. +TEST(AttributesTest, NameRoundTrip) +{ + std::vector all_attrs = getKnownAttrs(); + for (AttrItr it(all_attrs.begin()); it != all_attrs.end(); ++it) { + if (it->supported) { + unsigned int id = sp_attribute_lookup(it->attr.c_str()); + char const *redoneName = reinterpret_cast(sp_attribute_name(id)); + EXPECT_TRUE(redoneName != NULL) << "For attribute '" << it->attr << "'"; + if (redoneName) { + EXPECT_EQ(it->attr, redoneName); + } + } + } +} + +/* Test for any attributes that this test program doesn't know about. + * + * If any are found, then: + * + * If it is in the `inkscape:' namespace then simply add it to all_attrs with + * `true' as the second field (`supported'). + * + * If it is in the `sodipodi:' namespace then check the spelling against sodipodi + * sources. If you don't have sodipodi sources, then don't add it: leave to someone + * else. + * + * Otherwise, it's probably a bug: ~all SVG 1.1 attributes should already be + * in the all_attrs table. However, the comment above all_attrs does mention + * some things missing from attindex.html, so there may be more. Check the SVG + * spec. Another possibility is that the attribute is new in SVG 1.2. In this case, + * check the spelling against the [draft] SVG 1.2 spec before adding to all_attrs. + * (If you can't be bothered checking the spec, then don't update all_attrs.) + * + * If the attribute isn't in either SVG 1.1 or 1.2 then it's probably a mistake + * for it not to be in the inkscape namespace. (Not sure about attributes used only + * on elements in the inkscape namespace though.) + * + * In any case, make sure that the attribute's source is documented accordingly. + */ +TEST(AttributesTest, ValuesAreKnown) +{ + std::vector ids = getIdIds(); + for (size_t i = FIRST_VALID_ID; i < ids.size(); ++i) { + if (!ids[i]) { + unsigned char const *name = sp_attribute_name(i); + EXPECT_TRUE(ids[i] > 0) << "Attribute string with enum " << i << " {" << name << "} not handled"; + } + } +} + +// Ensure two different names aren't mapped to the same enum value. +TEST(AttributesTest, ValuesUnique) +{ + std::vector ids = getIdIds(); + for (size_t i = FIRST_VALID_ID; i < ids.size(); ++i) { + EXPECT_LE(ids[i], size_t(1)) << "Attribute enum " << i << " used for multiple strings" + << " including {" << sp_attribute_name(i) << "}"; + } +} + +} // namespace + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/testfiles/src/color-profile-test.cpp b/testfiles/src/color-profile-test.cpp new file mode 100644 index 000000000..365be687a --- /dev/null +++ b/testfiles/src/color-profile-test.cpp @@ -0,0 +1,126 @@ +/* + * Unit tests for color profile. + * + * Author: + * Jon A. Cruz + * + * Copyright (C) 2015 Authors + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#include "gtest/gtest.h" + +#include "attributes.h" +#include "cms-system.h" +#include "color-profile.h" +#include "doc-per-case-test.h" + +namespace { + +/** + * Test fixture to inherit a shared doc and create a color profile instance per test. + */ +class ProfTest : public DocPerCaseTest +{ +public: + ProfTest() : + DocPerCaseTest(), + _prof(0) + { + } + +protected: + virtual void SetUp() + { + DocPerCaseTest::SetUp(); + _prof = new Inkscape::ColorProfile(); + ASSERT_TRUE( _prof != NULL ); + _prof->document = _doc; + } + + virtual void TearDown() + { + if (_prof) { + delete _prof; + _prof = NULL; + } + DocPerCaseTest::TearDown(); + } + + Inkscape::ColorProfile *_prof; +}; + +typedef ProfTest ColorProfileTest; + +TEST_F(ColorProfileTest, SetRenderingIntent) +{ + struct { + gchar const *attr; + guint intVal; + } + const cases[] = { + {"auto", (guint)Inkscape::RENDERING_INTENT_AUTO}, + {"perceptual", (guint)Inkscape::RENDERING_INTENT_PERCEPTUAL}, + {"relative-colorimetric", (guint)Inkscape::RENDERING_INTENT_RELATIVE_COLORIMETRIC}, + {"saturation", (guint)Inkscape::RENDERING_INTENT_SATURATION}, + {"absolute-colorimetric", (guint)Inkscape::RENDERING_INTENT_ABSOLUTE_COLORIMETRIC}, + {"something-else", (guint)Inkscape::RENDERING_INTENT_UNKNOWN}, + {"auto2", (guint)Inkscape::RENDERING_INTENT_UNKNOWN}, + }; + + for ( size_t i = 0; i < G_N_ELEMENTS( cases ); i++ ) { + _prof->setKeyValue( SP_ATTR_RENDERING_INTENT, cases[i].attr); + ASSERT_EQ( (guint)cases[i].intVal, _prof->rendering_intent ) << cases[i].attr; + } +} + +TEST_F(ColorProfileTest, SetLocal) +{ + gchar const* cases[] = { + "local", + "something", + }; + + for ( size_t i = 0; i < G_N_ELEMENTS( cases ); i++ ) { + _prof->setKeyValue( SP_ATTR_LOCAL, cases[i]); + ASSERT_TRUE( _prof->local != NULL ); + if ( _prof->local ) { + ASSERT_EQ( std::string(cases[i]), _prof->local ); + } + } + _prof->setKeyValue( SP_ATTR_LOCAL, NULL); + ASSERT_EQ( (gchar*)0, _prof->local ); +} + +TEST_F(ColorProfileTest, SetName) +{ + gchar const* cases[] = { + "name", + "something", + }; + + for ( size_t i = 0; i < G_N_ELEMENTS( cases ); i++ ) { + _prof->setKeyValue( SP_ATTR_NAME, cases[i]); + ASSERT_TRUE( _prof->name != NULL ); + if ( _prof->name ) { + ASSERT_EQ( std::string(cases[i]), _prof->name ); + } + } + _prof->setKeyValue( SP_ATTR_NAME, NULL ); + ASSERT_EQ( (gchar*)0, _prof->name ); +} + + +} // namespace + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/testfiles/src/dir-util-test.cpp b/testfiles/src/dir-util-test.cpp new file mode 100644 index 000000000..32b3fce74 --- /dev/null +++ b/testfiles/src/dir-util-test.cpp @@ -0,0 +1,63 @@ +/* + * Unit tests for dir utils. + * + * Author: + * Jon A. Cruz + * + * Copyright (C) 2015 Authors + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#include "gtest/gtest.h" + +#include + +#include "dir-util.h" + +namespace { + + +TEST(DirUtilTest, Base) +{ + char const* cases[][3] = { +#if defined(WIN32) || defined(__WIN32__) + {"\\foo\\bar", "\\foo", "bar"}, + {"\\foo\\barney", "\\foo\\bar", "\\foo\\barney"}, + {"\\foo\\bar\\baz", "\\foo\\", "bar\\baz"}, + {"\\foo\\bar\\baz", "\\", "foo\\bar\\baz"}, + {"\\foo\\bar\\baz", "\\foo\\qux", "\\foo\\bar\\baz"}, +#else + {"/foo/bar", "/foo", "bar"}, + {"/foo/barney", "/foo/bar", "/foo/barney"}, + {"/foo/bar/baz", "/foo/", "bar/baz"}, + {"/foo/bar/baz", "/", "foo/bar/baz"}, + {"/foo/bar/baz", "/foo/qux", "/foo/bar/baz"}, +#endif + }; + + for ( size_t i = 0; i < G_N_ELEMENTS(cases); i++ ) + { + if ( cases[i][0] && cases[i][1] ) { // std::string can't use null. + std::string result = sp_relative_path_from_path( cases[i][0], cases[i][1] ); + ASSERT_FALSE( result.empty() ); + if ( !result.empty() ) + { + ASSERT_EQ( std::string(cases[i][2]), result ); + } + } + } +} + +} // namespace + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/testfiles/unittest.cpp b/testfiles/unittest.cpp new file mode 100644 index 000000000..0ec8f0383 --- /dev/null +++ b/testfiles/unittest.cpp @@ -0,0 +1,58 @@ +/* + * Unit test main. + * + * Author: + * Jon A. Cruz + * + * Copyright (C) 2015 Authors + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#include "gtest/gtest.h" + +#include + +#include "inkgc/gc-core.h" +#include "inkscape.h" + +namespace { + +// Ensure that a known positive test works +TEST(PreTest, WorldIsSane) +{ + EXPECT_EQ(4, 2 + 2); +} + +// Example of type casting to avoid compile warnings. + + +} // namespace + +int main(int argc, char **argv) { + + // setup general environment +#if !GLIB_CHECK_VERSION(2,36,0) + g_type_init(); +#endif + int tmpArgc = 1; + char const *tmp[] = {"foo", ""}; + char **tmpArgv = const_cast(tmp); + Gtk::Main(tmpArgc, tmpArgv); + + Inkscape::GC::init(); + + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : -- cgit v1.2.3 From c8fb84faf249ce3f7d7bc8837fd47c16813f09d3 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 9 Jun 2016 10:03:26 +0100 Subject: Fix testing dependencies (bzr r14967.1.2) --- CMakeLists.txt | 35 ++++++++++++++++---------------- CMakeScripts/DefineDependsandFlags.cmake | 8 -------- testfiles/CMakeLists.txt | 5 +---- 3 files changed, 18 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f3d1aac0..9d7b15dfe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,18 +69,6 @@ endif(APPLE) set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" ) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" ) -# ----------------------------------------------------------------------------- -# Test Harness -# ----------------------------------------------------------------------------- -set(GMOCK_DIR "${CMAKE_SOURCE_DIR}/gtest/gmock-1.7.0" - CACHE PATH "The path to the GoogleMock test framework.") - -if(EXISTS "${GMOCK_DIR}" AND IS_DIRECTORY "${GMOCK_DIR}") - set(GMOCK_PRESENT ON) -else() - message("No gmock/gtest found! Perhaps you wish to run 'bash download-gtest.sh' to download it.") -endif() - # ----------------------------------------------------------------------------- # Options # ----------------------------------------------------------------------------- @@ -90,7 +78,6 @@ option(WITH_GNOME_VFS "Compile with support for Gnome VFS" ON) option(WITH_SVG2 "Compile with support for new SVG2 features" ON) option(WITH_LPETOOL "Compile with LPE Tool and experimental LPEs enabled" ON) #option(WITH_INKJAR "Enable support for openoffice files (SVG jars)" ON) -option(WITH_GTEST "Compile with Google Test support" ${GMOCK_PRESENT}) option(WITH_OPENMP "Compile with OpenMP support" ON) option(WITH_PROFILING "Turn on profiling" OFF) # Set to true if compiler/linker should enable profiling @@ -104,6 +91,19 @@ option(WITH_LIBWPG "Compile with support of libwpg for WordPerfect Graphics" ON) option(WITH_NLS "Compile with Native Language Support (using gettext)" ON) option(WITH_GTK3_EXPERIMENTAL "Enable compilation with GTK+3 (EXPERIMENTAL!)" OFF) +# ----------------------------------------------------------------------------- +# Test Harness +# ----------------------------------------------------------------------------- +set(GMOCK_DIR "${CMAKE_SOURCE_DIR}/gtest/gmock-1.7.0" + CACHE PATH "The path to the GoogleMock test framework.") + +if(EXISTS "${GMOCK_DIR}" AND IS_DIRECTORY "${GMOCK_DIR}") + set(GMOCK_PRESENT ON) +else() + set(GMOCK_PRESENT OFF) + message("No gmock/gtest found! Perhaps you wish to run 'bash download-gtest.sh' to download it.") +endif() + include(CMakeScripts/ConfigPaths.cmake) # Installation Paths include(CMakeScripts/DefineDependsandFlags.cmake) # Includes, Compiler Flags, and Link Libraries include(CMakeScripts/HelperMacros.cmake) # Misc Utility Macros @@ -210,12 +210,11 @@ add_custom_target(clean-all ) #----------------------------------------------------------------------------- - -#add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) - -if(WITH_GTEST) +if(GMOCK_PRESENT) + set(CMAKE_CTEST_COMMAND ctest -V) enable_testing() - add_subdirectory(testfiles EXCLUDE_FROM_ALL) + add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) + add_subdirectory(testfiles) endif() # Canonicalize the flags to speed up recompilation using ccache/etc. diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 0f4ba46c6..706860a00 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -274,14 +274,6 @@ else() add_definitions(-UWITH_LPETOOL -ULPE_ENABLE_TEST_EFFECTS) endif() -if(WITH_GTEST) - if(EXISTS "${GMOCK_DIR}" AND IS_DIRECTORY "${GMOCK_DIR}") - - else() - set(WITH_GTEST off) - endif() -endif() - # ---------------------------------------------------------------------------- # CMake's builtin # ---------------------------------------------------------------------------- diff --git a/testfiles/CMakeLists.txt b/testfiles/CMakeLists.txt index 8da39d627..ad022d21e 100644 --- a/testfiles/CMakeLists.txt +++ b/testfiles/CMakeLists.txt @@ -1,9 +1,6 @@ # ----------------------------------------------------------------------------- # # ----------------------------------------------------------------------------- - -set(CMAKE_CTEST_COMMAND ctest -V) - add_subdirectory(${GMOCK_DIR} ${CMAKE_BINARY_DIR}/gmock) include_directories(SYSTEM ${GMOCK_DIR}/gtest/include @@ -60,8 +57,8 @@ target_link_libraries(unittest ${INKSCAPE_LIBS} ) -add_test(BaseTest ${EXECUTABLE_OUTPUT_PATH}/unittest) +add_test(BaseTest ${EXECUTABLE_OUTPUT_PATH}/unittest) add_dependencies(check unittest) # -- cgit v1.2.3 From 83d31ec5c59c811dae369b67f2f52258c4182406 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Fri, 10 Jun 2016 14:42:18 +0100 Subject: Remove unit test dependency on GUI session to allow auto-build in PPA (bzr r14969) --- testfiles/unittest.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/testfiles/unittest.cpp b/testfiles/unittest.cpp index 0ec8f0383..79e240e06 100644 --- a/testfiles/unittest.cpp +++ b/testfiles/unittest.cpp @@ -35,10 +35,13 @@ int main(int argc, char **argv) { #if !GLIB_CHECK_VERSION(2,36,0) g_type_init(); #endif - int tmpArgc = 1; - char const *tmp[] = {"foo", ""}; - char **tmpArgv = const_cast(tmp); - Gtk::Main(tmpArgc, tmpArgv); + + // If possible, unit tests shouldn't require a GUI session + // since this won't generally be available in auto-builders + // int tmpArgc = 1; + // char const *tmp[] = {"foo", ""}; + // char **tmpArgv = const_cast(tmp); + // Gtk::Main(tmpArgc, tmpArgv); Inkscape::GC::init(); -- cgit v1.2.3 From 528228b2803595a29f618d84303de502eaff0674 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Fri, 10 Jun 2016 16:41:08 +0100 Subject: Rm unnecessary/incorrect post-build message Fixed bugs: - https://launchpad.net/bugs/1591251 (bzr r14970) --- src/CMakeLists.txt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index df25728f4..cf5130317 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -513,17 +513,6 @@ add_library(inkscape_base SHARED ${inkscape_SRC} ${sp_SRC}) add_executable(inkscape ${main_SRC} ) add_executable(inkview inkview.cpp ) - - -if(UNIX) -# message after building. -add_custom_command( - TARGET inkscape - POST_BUILD MAIN_DEPENDENCY inkscape - COMMAND ${CMAKE_COMMAND} -E echo 'now run: \"make install\" to copy runtime files & scripts to ${CMAKE_INSTALL_PREFIX}' -) -endif() - add_dependencies(inkscape inkscape_version) if(WITH_DBUS) -- cgit v1.2.3 From fd06eecba4692291aa6b876810c9a22db28f8e9e Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Fri, 10 Jun 2016 16:45:22 +0100 Subject: Rm unused WITH_GTEST pseudo-option (bzr r14971) --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d7b15dfe..94dbf60df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -254,7 +254,6 @@ message("ENABLE_POPPLER_CAIRO: ${ENABLE_POPPLER_CAIRO}") message("GMOCK_PRESENT: ${GMOCK_PRESENT}") message("WITH_DBUS: ${WITH_DBUS}") message("WITH_GNOME_VFS: ${WITH_GNOME_VFS}") -message("WITH_GTEST: ${WITH_GTEST}") message("WITH_GTK3_EXPERIMENTAL: ${WITH_GTK3_EXPERIMENTAL}") message("WITH_GTKSPELL: ${WITH_GTKSPELL}") message("WITH_IMAGE_MAGICK: ${WITH_IMAGE_MAGICK}") -- cgit v1.2.3 From 8046d6c37682b4abd660ddee3e3922fb75d31f54 Mon Sep 17 00:00:00 2001 From: h-h Date: Fri, 10 Jun 2016 18:36:53 +0200 Subject: Added "call" for running a .bat file from a .bat file, as it should be (bzr r14971.2.1) --- configure.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.bat b/configure.bat index 503b47b84..11adb9445 100644 --- a/configure.bat +++ b/configure.bat @@ -1,5 +1,5 @@ REM Set the MinGW environment variables. -if "%MINGW_BIN%"=="" mingwenv.bat +if "%MINGW_BIN%"=="" call mingwenv.bat REM Delete the CMake cache. Needed when changes on the CMakeLists should be applied in a consistent way. del CMakeCache.txt -- cgit v1.2.3 From 9f192127563535946ef58cc1b3cfef248bb1af5d Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Fri, 10 Jun 2016 20:10:18 +0200 Subject: Add 'transform' to list of allowed properties for . (bzr r14972) --- share/attributes/cssprops | 48 +++++++++++++++++++-------------------- share/attributes/genMapDataCSS.pl | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/share/attributes/cssprops b/share/attributes/cssprops index ee8c74843..1b7776284 100644 --- a/share/attributes/cssprops +++ b/share/attributes/cssprops @@ -1,30 +1,30 @@ "alignment-baseline" - "tspan","tref","altGlyph","textPath" -"backface-visibility" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use" +"backface-visibility" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use" "baseline-shift" - "tspan","tref","altGlyph","textPath" "clip" - "svg","symbol","foreignObject","pattern","marker" -"clip-path" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use" +"clip-path" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use" -"clip-rule" - "circle","ellipse","image","line","path","polygon","polyline","rect","text","use","clip-path","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use" +"clip-rule" - "circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use","clip-path","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use" "color" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan","path","rect","circle","ellipse","line","polyline","polygon","stop","feFlood","feDiffuseLighting","feSpecularLighting","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use" -"color-interpolation" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use","animateColor" +"color-interpolation" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use","animateColor" "color-interpolation-filters" - "feBlend","feColorMatrix","feComponentTransfer","feComposite","feConvolveMatrix","feDiffuseLighting","feDisplacementMap","feFlood","feGaussianBlur","feImage","feMerge","feMorphology","feOffset","feSpecularLighting","feTile","feTurbulence","filter","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use" "color-profile" - "image","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use" -"color-rendering" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use","animateColor" +"color-rendering" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use","animateColor" -"cursor" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use" +"cursor" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use" "direction" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use" -"display" - "svg","g","switch","a","foreignObject","text","tspan","tref","altGlyph","textPath","circle","ellipse","image","line","path","polygon","polyline","rect","text","use" +"display" - "svg","g","switch","a","foreignObject","text","tspan","tref","altGlyph","textPath","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use" "dominant-baseline" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan" @@ -36,7 +36,7 @@ "fill-rule" - "path","rect","circle","ellipse","line","polyline","polygon","altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use" -"filter" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use" +"filter" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use" "flood-color" - "feFlood" @@ -64,7 +64,7 @@ "image-rendering" - "pattern","image","feImage","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use" -"isolation" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use" +"isolation" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use" "kerning" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use" @@ -82,21 +82,21 @@ "marker-start" - "path","line","polyline","polygon","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use" -"mask" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use" +"mask" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use" -"mix-blend-mode" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use" +"mix-blend-mode" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use" -"opacity" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use" +"opacity" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use" "overflow" - "svg","symbol","foreignObject","pattern","marker" -"paint-order" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use" +"paint-order" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use" -"perspective" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use" +"perspective" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use" -"perspective-origin" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use" +"perspective-origin" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use" -"pointer-events" - "circle","ellipse","image","line","path","polygon","polyline","rect","text","use","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use" +"pointer-events" - "circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use" "shape-inside" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan" @@ -108,9 +108,9 @@ "shape-rendering" - "path","rect","circle","ellipse","line","polyline","polygon","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use" -"solid-color" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use" +"solid-color" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use" -"solid-opacity" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use" +"solid-opacity" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use" "stop-color" - "stop" @@ -152,19 +152,19 @@ "text-rendering" - "text","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use" -"title" - "circle","ellipse","image","line","path","polygon","polyline","rect","text","use","g" +"title" - "circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use","g" -"transform" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use" +"transform" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use" -"transform-box" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use" +"transform-box" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use" -"transform-origin" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use" +"transform-origin" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use" -"transform-style" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use" +"transform-style" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use" "unicode-bidi" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan" -"visibility" - "text","tspan","tref","altGlyph","textPath","a","circle","ellipse","image","line","path","polygon","polyline","rect","text","use","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use" +"visibility" - "text","tspan","tref","altGlyph","textPath","a","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use" "white-space" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use" diff --git a/share/attributes/genMapDataCSS.pl b/share/attributes/genMapDataCSS.pl index f5f14e1e6..c025a68ec 100755 --- a/share/attributes/genMapDataCSS.pl +++ b/share/attributes/genMapDataCSS.pl @@ -19,7 +19,7 @@ use HTML::TokeParser; # Note "flowRoot, flowPara, flowSpan, flowRegion, and flowRect are Inkscape # specific (failed SVG1.2 items) my @container_elements = ("a", "defs", "glyph", "g", "marker", "mask", "missing-glyph", "pattern", "svg", "switch", "symbol", "use"); -my @graphics_elements = ("circle", "ellipse", "image", "line", "path", "polygon", "polyline", "rect", "text", "use"); +my @graphics_elements = ("circle", "ellipse", "image", "line", "path", "polygon", "polyline", "rect", "text", "flowRoot", "use"); my @filter_primitives = ("feBlend", "feColorMatrix", "feComponentTransfer", "feComposite", "feConvolveMatrix", "feDiffuseLighting", "feDisplacementMap", "feFlood", "feGaussianBlur", "feImage", "feMerge", "feMorphology", "feOffset", "feSpecularLighting", "feTile", "feTurbulence" ); -- cgit v1.2.3 From 3079ce20475a82fa7dcf5c4f9b67d9c09cff427b Mon Sep 17 00:00:00 2001 From: h-h-h Date: Fri, 10 Jun 2016 23:23:58 +0200 Subject: Enabled using the context menu key additionally to the already working Shift+F10 key combination to show the context menu ("tool-base.cpp") (bzr r14971.1.1) --- src/ui/tools/tool-base.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp index abac2c091..36fe26e76 100644 --- a/src/ui/tools/tool-base.cpp +++ b/src/ui/tools/tool-base.cpp @@ -683,6 +683,11 @@ bool ToolBase::root_handler(GdkEvent* event) { } break; + case GDK_KEY_Menu: + sp_event_root_menu_popup(desktop, NULL, event); + ret = TRUE; + break; + case GDK_KEY_F10: if (MOD__SHIFT_ONLY(event)) { sp_event_root_menu_popup(desktop, NULL, event); -- cgit v1.2.3 From a26b91d13f7e1a05281019c3760e2707dde97f20 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Sat, 11 Jun 2016 07:35:42 +0200 Subject: [Bug 1588983] Finish up German tutorials for 0.92 - part 3. Fixed bugs: - https://launchpad.net/bugs/1588983 (bzr r14974) --- share/tutorials/tutorial-tips.de.svg | 90 ++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/share/tutorials/tutorial-tips.de.svg b/share/tutorials/tutorial-tips.de.svg index 58ea7df92..cb2475bdb 100644 --- a/share/tutorials/tutorial-tips.de.svg +++ b/share/tutorials/tutorial-tips.de.svg @@ -484,176 +484,176 @@ - In der Standardvorlage für ein neues Dokument sind die Maßeinheiten für die Lineale immer px (»SVG-Benutzereinheit«, was in Inkscape ungefähr 0,75pt oder 1/96 Zoll ist). Dies ist auch die Einheit, in der die Koordinaten unten links angezeigt werden, und die als Vorauswahl in allen Menüs erscheint, die Einheiten benutzen. (Sie können immer mit dem Mauszeiger über ein Lineal fahren. Ein kleines Infofenster wird Ihnen anzeigen, welche Einheit das Lineal benutzt.) Um die Anzeigeeinheit zu verändern, öffnen Sie die Dokumenteneinstellungen (Umschalt+Strg+D) und ändern Sie die Anzeigeeinheit im Reiter Seite. + In der Standardvorlage für ein neues Dokument ist die Maßeinheit für die Lineale immer mm. Dies ist auch die Einheit, in der die Koordinaten unten links angezeigt werden, und die als Vorauswahl in allen Menüs erscheint, die Einheiten benutzen. (Sie können immer mit dem Mauszeiger über ein Lineal fahren. Ein kleines Infofenster wird Ihnen anzeigen, welche Einheit das Lineal benutzt.) Um die Anzeigeeinheit zu verändern, öffnen Sie die Dokumenteneinstellungen (Umschalt+Strg+D) und ändern Sie die Anzeigeeinheit im Reiter Seite. - - Stempeln + + Stempeln - + Um schnell mal eben viele Kopien eines Objekts zu erzeugen, benutzen Sie die Funktion Stempeln. Verschieben Sie einfach ein Objekt (oder skalieren oder drehen Sie es), und noch während Sie die Maustaste gedrückt halten, drücken Sie die Leertaste. Auf diese Art wird ein »Stempelabdruck« des aktuellen Objekts hinterlassen. Sie können stempeln, so oft Sie wollen. - - Tricks mit dem Zeichenwerkzeug + + Tricks mit dem Zeichenwerkzeug - + Beim Benutzen des Zeichenwerkzeugs (Bézier) können Sie das Zeichnen einer Linie auf folgende Arten beenden: - - + + Drücken Sie die Eingabetaste - - + + Machen Sie einen Doppelklick mit der linken Maustaste - - + + Machen Sie einen Rechtsklick mit der Maus - - + + Wählen Sie ein anderes Werkzeug - + Beachten Sie, dass der Pfad noch nicht als Objekt im Dokument existiert, solange er noch nicht beendet wurde (das heißt, solange er grün angezeigt wird, und das aktuelle Segment rot). Deshalb sollten Sie entweder die Taste Esc (um den ganzen Pfad zu verwerfen) oder die Rückschritttaste (um das letzte Segment des noch nicht beendeten Pfads zu verwerfen) statt der Rückgängig-Funktion verwenden. - + Um einen neuen Unterpfad zu einem existierenden Pfad hinzuzufügen, wählen Sie den Pfad aus und drücken Sie die Umschalttaste, dann fangen Sie von einem beliebigen Punkt aus an, zu zeichnen. Wenn Sie jedoch einen bestehenden Pfad nur weiterführen möchten, ist der Tastendruck nicht notwendig; fangen Sie einfach an einem der Endknoten des ausgewählten Pfades mit dem Weiterzeichnen an. - - Unicode-Zeichen eingeben + + Unicode-Zeichen eingeben - + Während Sie mit dem Textwerkzeug arbeiten, schaltet die Tastenkombination Strg+U zwischen Unicode- und normalem Modus um. Im Unicode-Modus wird jede Gruppe von vier Hexadezimalzahlen, die Sie eingeben, zu einem einzelnen Unicode-Zeichen. Auf diese Weise können Sie beliebige Symbole erzeugen (wenn Sie den Unicode-Code dazu wissen und wenn die gewählte Schriftart sie enthält). Um den Unicode-Modus wieder zu verlassen, drücken Sie die Eingabetaste. Ein Beispiel: die Tastenfolge Strg+U 2 0 1 4 Eingabe fügt einen betonten Bindestrich (em-dash) ein (—). Um den Unicode-Modus zu verlassen, ohne irgendein Zeichen in den Text einzufügen, drücken Sie Esc. - + Sie können auch den Dialog unter Text > Glyphen verwenden, um bestimmte Zeichen zu suchen und in Ihr Dokument einzufügen. - - Das Seitengitter zum Zeichnen von Icons verwenden + + Das Seitengitter zum Zeichnen von Icons verwenden - + Nehmen wir einmal an, Sie wollen ein 24×24 Pixel großes Icon erstellen. Erzeugen Sie dazu zunächst eine Leinwand der Größe 24×24 Pixel (benutzen Sie dazu die Dokumenteneinstellungen) und setzen Sie das Gitter auf 0,5 Pixel (ergibt 48×48 Rasterlinien). Wenn Sie nun gefüllte Objekte an geradzahligen Rasterlinien und gerahmte Objekte an ungeradzahligen Rasterlinien ausrichten, darauf achten, dass die Strichstärke eine gerade Pixelanzahl ist und Ihr Bild mit der Standardeinstellung von 96dpi exportieren (sodass aus einem Pixel ein Bitmap-Pixel wird), bekommen Sie ein schönes gestochen scharfes Bitmap-Bild ohne unerwünschtes Antialiasing. - - Objekte drehen + + Objekte drehen - + Wenn Sie mit dem Auswahlwerkzeug arbeiten, klicken Sie einmal auf ein Objekt, um die Skalierungspfeile zu sehen. Dann klicken Sie nochmals auf das Objekt, um die Rotations- und Scherpfeile zu sehen. Wenn Sie auf die Pfeile an den Ecken klicken und sie verschieben, dreht sich das Objekt um sein Zentrum (welches als Fadenkreuz angezeigt wird). Wenn Sie nun noch während des Drehens die Umschalttaste gedrückt halten, wird das Objekt um die gegenüberliegende Ecke gedreht. Sie können aber auch das Rotationszentrum an eine beliebige andere Stelle verschieben. - + Oder Sie rotieren das Objekt mit Hilfe der Tastatur durch Drücken der Tasten [ und ] (um jeweils 15°) oder Strg+[ and Strg+] (um jeweils 90°). Die gleichen []-Tasten zusammen mit der Alt-Taste ermöglichen eine langsame Rotation um je einen Pixel (leider nicht mit deutscher Tastatur). - - Schattenwurf + + Schattenwurf - + Um schnell mal eben einen Schatten für ein Objekt zu erstellen, verwenden Sie die Funktion Filter > Schatten und Lichter > Abgesetzter Schattend>. - + Sie können auch ganz leicht einen unscharfen Schatten für ein Objekt erstellen, indem Sie »Unschärfe« im »Füllung und Kontur«-Dialog nutzen. Wählen Sie ein Objekt, duplizieren Sie es mit Strg+D, drücken Sie Bild runter, um es unter das originale Objekt abzusenken, und verschieben Sie es etwas nach rechts unten vom originalen Objekt. Öffnen Sie nun den Dialog »Füllung und Kontur« und ändern Sie den Weichzeichner-Wert auf z.B. 5,0. Das war es schon! - - Text auf einen Pfad platzieren + + Text auf einen Pfad platzieren - + Um Text an einem Pfad auszurichten, wählen Sie den Text und den Pfad zusammen aus und benutzen Sie den Befehl An Pfad ausrichten aus dem Text-Menü. Der Text wird ab dem Anfang des Pfades ausgerichtet. Normalerweise ist es besser, für den Text einen eigenen Pfad zu erstellen, als den Text an irgendeinem Zeichnungselement auszurichten – auf diese Art haben Sie mehr Kontrolle über den Text, ohne dass Sie an Ihrer eigentlichen Zeichnung herumändern müssen. - - Das Original auswählen + + Das Original auswählen - + Bei Text, der an einem Pfad ausgerichtet ist, einen verbundenen Versatz oder einem Klon kann es schwierig sein, das Quellobjekt oder den Quellpfad auszuwählen, weil die Quelle direkt unterhalb, unsichtbar und/oder gesperrt sein könnte. In so einem Fall hilft Ihnen die Tastenkombination Umschalt+D. Wählen Sie den Text, den verbundenen Versatz oder den Klon aus und drücken Sie Umschalt+D, um den dazugehörigen Pfad, das Quellobjekt des Versatzes oder das Original des Klons auszuwählen. - - Programmfenster außerhalb des Bildschirms + + Programmfenster außerhalb des Bildschirms - + Wenn Sie Dokumente auf verschiedenen Systemen bearbeiten, die entweder unterschiedliche Auflösungen besitzen oder unterschiedlich viele Bildschirme, kann es Ihnen passieren, dass Inkscape eine Fensterposition mit abgespeichert hat, welche dazu führt, dass Sie das Fenster an Ihrem Monitor nicht mehr erreichen können. In diesem Fall maximieren Sie das Fenster einfach (das bringt das Fenster wieder in Ihren Anzeigebereich; benutzen Sie die Taskleiste dazu), speichern Sie das Dokument und öffnen Sie es erneut. Sie können dieses Verhalten auch komplett abstellen, indem Sie die globale Einstellung, die Fenstergeometrie mit abzuspeichern, abschalten (in den Inkscape-Einstellungen, im Abschnitt Benutzeroberfläche > Fenster). - - Transparenz, Farbverläufe und PostScript-Export + + Transparenz, Farbverläufe und PostScript-Export - + PostScript- oder EPS-Formate unterstützen keine Transparenz, deshalb sollten Sie auch keine Transparenz verwenden, wenn Sie etwas nach PS oder EPS exportieren wollen. Wenn Sie Teiltransparenz benutzen wollen, die etwas einfarbiges überdeckt, dann können Sie dieses Problem leicht lösen: Wählen Sie eines der transparenten Objekte aus, wechseln Sie zur Farbpipette (F7 oder d). Stellen Sie sicher, dass die Schaltfläche Deckkraft: Aufnehmen in der Werkzeugleiste der Farbpipette deaktiviert ist. Klicken Sie nun auf das Objekt. Das Werkzeug nimmt jetzt die sichtbare Farbe auf und weist sie demselben Objekt zu, aber diesmal ohne Transparenz. Wiederholen Sie diesen Schritt für alle teiltransparenten Objekte. Wenn Ihr teiltransparentes Objekt mehrere einfarbigen Flächen überdeckt, müssen Sie es entsprechend in einzelne Teile auftrennen und für jeden einzelnen Teil wie oben beschrieben vorgehen. Beachten Sie, dass die Farbpipette nicht den Deckkraft-Wert des Objektes verändert, sondern lediglich den Alpha-Wert seiner Füllung oder Kontur. Stellen Sie daher sicher, dass die Deckkraft aller Objekte auf 100% gesetzt ist, bevor Sie loslegen. - + -- cgit v1.2.3 From 0a08d7714145c5fc355d086ed7d45dd285bd5d59 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 11 Jun 2016 13:51:02 +0200 Subject: fix-bugs #540591 #1287996 and #456503 related to undo in path parameters of LPE Fixed bugs: - https://launchpad.net/bugs/540591 - https://launchpad.net/bugs/1287996 - https://launchpad.net/bugs/456503 (bzr r14975) --- src/live_effects/effect.cpp | 1 + src/live_effects/parameter/path.cpp | 28 ++++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 732c67304..1868ca43b 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -714,6 +714,7 @@ Effect::getParameter(const char * key) { Glib::ustring stringkey(key); + if (param_vector.empty()) return NULL; std::vector::iterator it = param_vector.begin(); while (it != param_vector.end()) { Parameter * param = *it; diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp index 7ea1d465c..bed191e83 100644 --- a/src/live_effects/parameter/path.cpp +++ b/src/live_effects/parameter/path.cpp @@ -73,7 +73,21 @@ PathParam::PathParam( const Glib::ustring& label, const Glib::ustring& tip, PathParam::~PathParam() { remove_link(); - + using namespace Inkscape::UI; + SPDesktop *desktop = SP_ACTIVE_DESKTOP; + if (desktop) { + if (tools_isactive(desktop, TOOLS_NODES)) { + SPItem * item = SP_ACTIVE_DESKTOP->getSelection()->singleItem(); + if (item != NULL) { + Inkscape::UI::Tools::NodeTool *nt = static_cast(desktop->event_context); + std::set shapes; + ShapeRecord r; + r.item = item; + shapes.insert(r); + nt->_multipath->setItems(shapes); + } + } + } g_free(defvalue); } @@ -207,6 +221,9 @@ PathParam::param_newWidget() void PathParam::param_editOncanvas(SPItem *item, SPDesktop * dt) { + SPDocument *document = dt->getDocument(); + bool saved = DocumentUndo::getUndoSensitive(document); + DocumentUndo::setUndoSensitive(document, false); using namespace Inkscape::UI; // TODO remove the tools_switch atrocity. @@ -220,14 +237,20 @@ PathParam::param_editOncanvas(SPItem *item, SPDesktop * dt) r.role = SHAPE_ROLE_LPE_PARAM; r.edit_transform = item->i2dt_affine(); // TODO is it right? + r.edit_transform *= item->transform.inverse(); if (!href) { r.item = reinterpret_cast(param_effect->getLPEObj()); r.lpe_key = param_key; + Geom::PathVector stored_pv = _pathvector; + param_write_to_repr("M0,0 L1,0"); + const char *svgd = sp_svg_write_path(stored_pv); + param_write_to_repr(svgd); } else { r.item = ref.getObject(); } shapes.insert(r); nt->_multipath->setItems(shapes); + DocumentUndo::setUndoSensitive(document, saved); } void @@ -435,7 +458,8 @@ PathParam::paste_param_path(const char *svgd) SPItem * item = SP_ACTIVE_DESKTOP->getSelection()->singleItem(); if (item != NULL) { Geom::PathVector path_clipboard = sp_svg_read_pathv(svgd); - path_clipboard *= item->i2doc_affine().inverse(); + path_clipboard *= item->i2doc_affine().inverse() * item->transform; + path_clipboard *= Geom::Translate(path_clipboard.initialPoint() - _pathvector.initialPoint()).inverse(); svgd = sp_svg_write_path( path_clipboard ); } -- cgit v1.2.3 From 14a7a0151889e00ad60ebf6b613674e0c5f5b27e Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sat, 11 Jun 2016 15:05:53 +0200 Subject: Fix a typo that spawned a lot of "unused parameter" warnings when compiling (bzr r14976) --- src/style-internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/style-internal.h b/src/style-internal.h index 767552784..6cc8c6c4e 100644 --- a/src/style-internal.h +++ b/src/style-internal.h @@ -520,7 +520,7 @@ public: {} SPIEnumBits( Glib::ustring const &name, SPStyleEnum const *enums, unsigned value = 0, bool inherits = true ) : - SPIEnum( name, enums, value, inherit ) + SPIEnum( name, enums, value, inherits ) {} virtual ~SPIEnumBits() -- cgit v1.2.3 From 3b39f6fb0fac1eb0457de170a9af7b7ad629bc71 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sat, 11 Jun 2016 16:25:52 +0200 Subject: A little cleaning up of attributes. (bzr r14977) --- src/attributes-test.h | 105 ++++++++++++++++++++++++++------------------------ src/attributes.cpp | 30 +++++++++------ src/attributes.h | 31 ++++++++------- src/sp-item.cpp | 1 - 4 files changed, 92 insertions(+), 75 deletions(-) diff --git a/src/attributes-test.h b/src/attributes-test.h index b8d5d98a5..bfb67064b 100644 --- a/src/attributes-test.h +++ b/src/attributes-test.h @@ -104,21 +104,6 @@ struct {char const *attr; bool supported;} const all_attrs[] = { {"end", true}, {"exponent", true}, {"externalResourcesRequired", false}, - {"feBlend", false}, - {"feColorMatrix", false}, - {"feComponentTransfer", false}, - {"feComposite", false}, - {"feConvolveMatrix", false}, - {"feDiffuseLighting", false}, - {"feDisplacementMap", false}, - {"feFlood", false}, - {"feGaussianBlur", false}, - {"feImage", false}, - {"feMerge", false}, - {"feMorphology", false}, - {"feOffset", false}, - {"feSpecularLighting", false}, - {"feTile", false}, {"fill", true}, {"fill-opacity", true}, {"fill-rule", true}, @@ -361,55 +346,33 @@ struct {char const *attr; bool supported;} const all_attrs[] = { /* Extra attributes. */ {"id", true}, + {"sodipodi:docname", true}, + {"sodipodi:insensitive", true}, + {"sodipodi:type", true}, {"inkscape:collect", true}, {"inkscape:document-units", true}, {"inkscape:label", true}, - {"sodipodi:insensitive", true}, - {"sodipodi:nonprintable", true}, {"inkscape:groupmode", true}, - {"sodipodi:version", false}, {"inkscape:version", true}, {"inkscape:object-paths", true}, - {"inkscape:snap-perpendicular", true}, - {"inkscape:snap-tangential", true}, - {"inkscape:snap-path-clip", true}, - {"inkscape:snap-path-mask", true}, - {"inkscape:object-nodes", true}, - {"inkscape:bbox-paths", true}, - {"inkscape:bbox-nodes", true}, - {"inkscape:snap-page", true}, - {"inkscape:snap-global", true}, - {"inkscape:snap-bbox", true}, - {"inkscape:snap-nodes", true}, - {"inkscape:snap-others", true}, - {"inkscape:snap-center", true}, - {"inkscape:snap-smooth-nodes", true}, - {"inkscape:snap-midpoints", true}, - {"inkscape:snap-object-midpoints", true}, - {"inkscape:snap-text-baseline", true}, - {"inkscape:snap-bbox-edge-midpoints", true}, - {"inkscape:snap-bbox-midpoints", true}, - {"inkscape:snap-grids", true}, - {"inkscape:snap-to-guides", true}, - {"inkscape:snap-intersection-paths", true}, + {"inkscape:original-d", true}, {"inkscape:pageopacity", true}, {"inkscape:pageshadow", true}, {"inkscape:path-effect", true}, + // SPItem {"inkscape:transform-center-x", true}, {"inkscape:transform-center-y", true}, {"inkscape:highlight-color", true}, - // Namedview - {"inkscape:zoom", true}, - {"inkscape:cx", true}, - {"inkscape:cy", true}, - {"inkscape:window-width", true}, - {"inkscape:window-height", true}, - {"inkscape:window-x", true}, - {"inkscape:window-y", true}, - {"inkscape:window-maximized", true}, - {"inkscape:current-layer", true}, + + // Measure tool + {"inkscape:measure-start", true}, + {"inkscape:measure-end", true}, + + // Spray tool + {"inkscape:spray-origin", true}, + // Connector tool {"inkscape:connector-type", true}, {"inkscape:connection-start", true}, @@ -420,11 +383,13 @@ struct {char const *attr; bool supported;} const all_attrs[] = { {"inkscape:connector-curvature", true}, {"inkscape:connector-avoid", true}, {"inkscape:connector-spacing", true}, + // Ellipse, Spiral, Star {"sodipodi:cx", true}, {"sodipodi:cy", true}, {"sodipodi:rx", true}, {"sodipodi:ry", true}, + // Box tool {"inkscape:perspectiveID", true}, {"inkscape:corner0", true}, @@ -435,6 +400,7 @@ struct {char const *attr; bool supported;} const all_attrs[] = { {"inkscape:vp_y", true}, {"inkscape:vp_z", true}, {"inkscape:persp3d-origin", true}, + // Star tool {"sodipodi:start", true}, {"sodipodi:end", true}, @@ -517,8 +483,47 @@ struct {char const *attr; bool supported;} const all_attrs[] = { {"borderopacity", true}, {"pagecolor", true}, + {"inkscape:zoom", true}, + {"inkscape:cx", true}, + {"inkscape:cy", true}, + {"inkscape:window-width", true}, + {"inkscape:window-height", true}, + {"inkscape:window-x", true}, + {"inkscape:window-y", true}, + {"inkscape:window-maximized", true}, + {"inkscape:current-layer", true}, + {"inkscape:pagecheckerboard", true}, + /* SPGuide */ {"position", true}, + {"inkscape:color", true}, + {"inkscape:lockguides", true}, + {"inkscape:locked", true}, + + /* Snapping */ + {"inkscape:snap-perpendicular", true}, + {"inkscape:snap-tangential", true}, + {"inkscape:snap-path-clip", true}, + {"inkscape:snap-path-mask", true}, + {"inkscape:object-nodes", true}, + {"inkscape:bbox-paths", true}, + {"inkscape:bbox-nodes", true}, + {"inkscape:snap-page", true}, + {"inkscape:snap-global", true}, + {"inkscape:snap-bbox", true}, + {"inkscape:snap-nodes", true}, + {"inkscape:snap-others", true}, + {"inkscape:snap-from-guide", true}, + {"inkscape:snap-center", true}, + {"inkscape:snap-smooth-nodes", true}, + {"inkscape:snap-midpoints", true}, + {"inkscape:snap-object-midpoints", true}, + {"inkscape:snap-text-baseline", true}, + {"inkscape:snap-bbox-edge-midpoints", true}, + {"inkscape:snap-bbox-midpoints", true}, + {"inkscape:snap-grids", true}, + {"inkscape:snap-to-guides", true}, + {"inkscape:snap-intersection-paths", true}, /* SPTag */ {"inkscape:expanded", true} diff --git a/src/attributes.cpp b/src/attributes.cpp index 646c2ab0c..24c16d5fc 100644 --- a/src/attributes.cpp +++ b/src/attributes.cpp @@ -14,6 +14,7 @@ #include // g_assert() #include "attributes.h" +#include typedef struct { gint code; @@ -28,15 +29,24 @@ static SPStyleProp const props[] = { {SP_ATTR_INVALID, NULL}, /* SPObject */ {SP_ATTR_ID, "id"}, + {SP_ATTR_STYLE, "style"}, {SP_ATTR_INKSCAPE_COLLECT, "inkscape:collect"}, {SP_ATTR_INKSCAPE_LABEL, "inkscape:label"}, + /* SPRoot */ + {SP_ATTR_VERSION, "version"}, + {SP_ATTR_INKSCAPE_VERSION, "inkscape:version"}, + {SP_ATTR_WIDTH, "width"}, + {SP_ATTR_HEIGHT, "height"}, + {SP_ATTR_VIEWBOX, "viewBox"}, + {SP_ATTR_PRESERVEASPECTRATIO, "preserveAspectRatio"}, + {SP_ATTR_ONLOAD, "onload"}, + {SP_ATTR_SODIPODI_DOCNAME, "sodipodi:docname"}, /* SPItem */ {SP_ATTR_TRANSFORM, "transform"}, + {SP_ATTR_SODIPODI_TYPE, "sodipodi:type"}, {SP_ATTR_SODIPODI_INSENSITIVE, "sodipodi:insensitive"}, - {SP_ATTR_SODIPODI_NONPRINTABLE, "sodipodi:nonprintable"}, {SP_ATTR_CONNECTOR_AVOID, "inkscape:connector-avoid"}, {SP_ATTR_CONNECTION_POINTS, "inkscape:connection-points"}, - {SP_ATTR_STYLE, "style"}, {SP_ATTR_TRANSFORM_CENTER_X, "inkscape:transform-center-x"}, {SP_ATTR_TRANSFORM_CENTER_Y, "inkscape:transform-center-y"}, {SP_ATTR_INKSCAPE_PATH_EFFECT, "inkscape:path-effect"}, @@ -53,14 +63,6 @@ static SPStyleProp const props[] = { {SP_ATTR_TARGET, "target"}, {SP_ATTR_INKSCAPE_GROUPMODE, "inkscape:groupmode"}, {SP_ATTR_INKSCAPE_EXPANDED, "inkscape:expanded"}, - /* SPRoot */ - {SP_ATTR_VERSION, "version"}, - {SP_ATTR_WIDTH, "width"}, - {SP_ATTR_HEIGHT, "height"}, - {SP_ATTR_VIEWBOX, "viewBox"}, - {SP_ATTR_PRESERVEASPECTRATIO, "preserveAspectRatio"}, - {SP_ATTR_INKSCAPE_VERSION, "inkscape:version"}, - {SP_ATTR_ONLOAD, "onload"}, /* SPNamedView */ {SP_ATTR_VIEWONLY, "viewonly"}, {SP_ATTR_SHOWGUIDES, "showguides"}, @@ -99,6 +101,7 @@ static SPStyleProp const props[] = { {SP_ATTR_INKSCAPE_SNAP_BBOX, "inkscape:snap-bbox"}, {SP_ATTR_INKSCAPE_SNAP_NODE, "inkscape:snap-nodes"}, {SP_ATTR_INKSCAPE_SNAP_OTHERS, "inkscape:snap-others"}, + {SP_ATTR_INKSCAPE_SNAP_FROM_GUIDE, "inkscape:snap-from-guide"}, {SP_ATTR_INKSCAPE_SNAP_ROTATION_CENTER, "inkscape:snap-center"}, {SP_ATTR_INKSCAPE_SNAP_GRID, "inkscape:snap-grids"}, {SP_ATTR_INKSCAPE_SNAP_GUIDE, "inkscape:snap-to-guides"}, @@ -120,7 +123,6 @@ static SPStyleProp const props[] = { {SP_ATTR_INKSCAPE_DOCUMENT_UNITS, "inkscape:document-units"}, // This setting sets the Display units, *not* the units used in SVG {SP_ATTR_INKSCAPE_LOCKGUIDES, "inkscape:lockguides"}, {SP_ATTR_UNITS, "units"}, - {SP_ATTR_INKSCAPE_CONNECTOR_SPACING, "inkscape:connector-spacing"}, /* SPColorProfile */ {SP_ATTR_LOCAL, "local"}, {SP_ATTR_NAME, "name"}, @@ -130,6 +132,9 @@ static SPStyleProp const props[] = { {SP_ATTR_POSITION, "position"}, {SP_ATTR_INKSCAPE_COLOR, "inkscape:color"}, {SP_ATTR_INKSCAPE_LOCKED, "inkscape:locked"}, + /* Measure tool */ + {SP_ATTR_INKSCAPE_MEASURE_START, "inkscape:measure-start"}, + {SP_ATTR_INKSCAPE_MEASURE_END, "inkscape:measure-end"}, /* SPImage */ {SP_ATTR_X, "x"}, {SP_ATTR_Y, "y"}, @@ -139,6 +144,7 @@ static SPStyleProp const props[] = { /* (Note: XML representation of connectors may change in future.) */ {SP_ATTR_CONNECTOR_TYPE, "inkscape:connector-type"}, {SP_ATTR_CONNECTOR_CURVATURE, "inkscape:connector-curvature"}, + {SP_ATTR_INKSCAPE_CONNECTOR_SPACING, "inkscape:connector-spacing"}, {SP_ATTR_CONNECTION_START, "inkscape:connection-start"}, {SP_ATTR_CONNECTION_END, "inkscape:connection-end"}, {SP_ATTR_CONNECTION_START_POINT, "inkscape:connection-start-point"}, @@ -544,6 +550,8 @@ sp_attribute_lookup(gchar const *key) if(g_str_equal(const_cast(static_cast(props[i].name)), key)) return GPOINTER_TO_UINT(GINT_TO_POINTER(props[i].code)); } + // std::cerr << "sp_attribute_lookup: invalid attribute: " + // << (key?key:"Null") << std::endl; return SP_ATTR_INVALID; } diff --git a/src/attributes.h b/src/attributes.h index f5544d0a1..e82db5f2a 100644 --- a/src/attributes.h +++ b/src/attributes.h @@ -28,15 +28,24 @@ enum SPAttributeEnum { SP_ATTR_INVALID, ///< Must have value 0. /* SPObject */ SP_ATTR_ID, + SP_ATTR_STYLE, SP_ATTR_INKSCAPE_COLLECT, SP_ATTR_INKSCAPE_LABEL, + /* SPRoot Put these near top as the apply to the entire SVG */ + SP_ATTR_VERSION, + SP_ATTR_INKSCAPE_VERSION, + SP_ATTR_WIDTH, + SP_ATTR_HEIGHT, + SP_ATTR_VIEWBOX, + SP_ATTR_PRESERVEASPECTRATIO, + SP_ATTR_ONLOAD, + SP_ATTR_SODIPODI_DOCNAME, /* SPItem */ SP_ATTR_TRANSFORM, + SP_ATTR_SODIPODI_TYPE, SP_ATTR_SODIPODI_INSENSITIVE, - SP_ATTR_SODIPODI_NONPRINTABLE, SP_ATTR_CONNECTOR_AVOID, SP_ATTR_CONNECTION_POINTS, - SP_ATTR_STYLE, SP_ATTR_TRANSFORM_CENTER_X, SP_ATTR_TRANSFORM_CENTER_Y, SP_ATTR_INKSCAPE_PATH_EFFECT, @@ -54,14 +63,6 @@ enum SPAttributeEnum { /* SPGroup */ SP_ATTR_INKSCAPE_GROUPMODE, SP_ATTR_INKSCAPE_EXPANDED, - /* SPRoot */ - SP_ATTR_VERSION, - SP_ATTR_WIDTH, - SP_ATTR_HEIGHT, - SP_ATTR_VIEWBOX, - SP_ATTR_PRESERVEASPECTRATIO, - SP_ATTR_INKSCAPE_VERSION, - SP_ATTR_ONLOAD, /* SPNamedView */ SP_ATTR_VIEWONLY, SP_ATTR_SHOWGUIDES, @@ -100,7 +101,7 @@ enum SPAttributeEnum { SP_ATTR_INKSCAPE_SNAP_BBOX, SP_ATTR_INKSCAPE_SNAP_NODE, SP_ATTR_INKSCAPE_SNAP_OTHERS, - //SP_ATTR_INKSCAPE_SNAP_FROM_GUIDE, + SP_ATTR_INKSCAPE_SNAP_FROM_GUIDE, SP_ATTR_INKSCAPE_SNAP_ROTATION_CENTER, SP_ATTR_INKSCAPE_SNAP_GRID, SP_ATTR_INKSCAPE_SNAP_GUIDE, @@ -122,7 +123,6 @@ enum SPAttributeEnum { SP_ATTR_INKSCAPE_DOCUMENT_UNITS, SP_ATTR_INKSCAPE_LOCKGUIDES, SP_ATTR_UNITS, - SP_ATTR_INKSCAPE_CONNECTOR_SPACING, /* SPColorProfile */ SP_ATTR_LOCAL, SP_ATTR_NAME, @@ -132,7 +132,10 @@ enum SPAttributeEnum { SP_ATTR_POSITION, SP_ATTR_INKSCAPE_COLOR, SP_ATTR_INKSCAPE_LOCKED, - /* SPImage */ + /* Measure tool */ + SP_ATTR_INKSCAPE_MEASURE_START, + SP_ATTR_INKSCAPE_MEASURE_END, + /* SPImage, SPRect, etc. */ SP_ATTR_X, SP_ATTR_Y, /* SPPath */ @@ -140,6 +143,7 @@ enum SPAttributeEnum { SP_ATTR_INKSCAPE_ORIGINAL_D, SP_ATTR_CONNECTOR_TYPE, SP_ATTR_CONNECTOR_CURVATURE, + SP_ATTR_INKSCAPE_CONNECTOR_SPACING, SP_ATTR_CONNECTION_START, SP_ATTR_CONNECTION_END, SP_ATTR_CONNECTION_START_POINT, @@ -334,6 +338,7 @@ enum SPAttributeEnum { SP_ATTR_RESTART, SP_ATTR_REPEATCOUNT, SP_ATTR_REPEATDUR, + /* Interpolating animations */ SP_ATTR_CALCMODE, //SP_ATTR_VALUES, diff --git a/src/sp-item.cpp b/src/sp-item.cpp index af81194c2..9fd6e8ecc 100644 --- a/src/sp-item.cpp +++ b/src/sp-item.cpp @@ -399,7 +399,6 @@ void SPItem::build(SPDocument *document, Inkscape::XML::Node *repr) { object->readAttr( "clip-path" ); object->readAttr( "mask" ); object->readAttr( "sodipodi:insensitive" ); - object->readAttr( "sodipodi:nonprintable" ); object->readAttr( "inkscape:transform-center-x" ); object->readAttr( "inkscape:transform-center-y" ); object->readAttr( "inkscape:connector-avoid" ); -- cgit v1.2.3 From 64b7a2d79f1e160e9e4ee723fd89f8aadd177924 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sat, 11 Jun 2016 19:20:13 +0200 Subject: Clean up includes after r14955 Fixed bugs: - https://launchpad.net/bugs/1589300 (bzr r14978) --- src/extension/param/bool.cpp | 1 - src/extension/param/float.cpp | 1 - src/extension/param/int.cpp | 1 - src/extension/param/parameter.cpp | 3 ++- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/extension/param/bool.cpp b/src/extension/param/bool.cpp index 87364d80f..d64f798ba 100644 --- a/src/extension/param/bool.cpp +++ b/src/extension/param/bool.cpp @@ -19,7 +19,6 @@ #include "../extension.h" #include "bool.h" #include "preferences.h" -#include namespace Inkscape { namespace Extension { diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp index 4e3cbfedc..dff7cbf46 100644 --- a/src/extension/param/float.cpp +++ b/src/extension/param/float.cpp @@ -20,7 +20,6 @@ #include "extension/extension.h" #include "preferences.h" #include "float.h" -#include namespace Inkscape { namespace Extension { diff --git a/src/extension/param/int.cpp b/src/extension/param/int.cpp index 605aab5ad..dda801282 100644 --- a/src/extension/param/int.cpp +++ b/src/extension/param/int.cpp @@ -20,7 +20,6 @@ #include "extension/extension.h" #include "preferences.h" #include "int.h" -#include namespace Inkscape { namespace Extension { diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp index 27d9bdf9b..e4a614667 100644 --- a/src/extension/param/parameter.cpp +++ b/src/extension/param/parameter.cpp @@ -20,7 +20,6 @@ #endif #include -#include #include "ui/widget/color-notebook.h" #include @@ -41,6 +40,8 @@ #include "radiobutton.h" #include "string.h" +#include + namespace Inkscape { namespace Extension { -- cgit v1.2.3 From 381c20f462265052cd320a26fb779b1d07a7dffc Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sat, 11 Jun 2016 19:25:23 +0200 Subject: Extensions: Use underscored variants of parameters / attribute names in internal extensions where translation via gettext is desired. Fixed bugs: - https://launchpad.net/bugs/1591230 (bzr r14979) --- .../internal/bitmap/adaptiveThreshold.cpp | 6 +- src/extension/internal/bitmap/addNoise.cpp | 2 +- src/extension/internal/bitmap/blur.cpp | 4 +- src/extension/internal/bitmap/channel.cpp | 2 +- src/extension/internal/bitmap/charcoal.cpp | 4 +- src/extension/internal/bitmap/colorize.cpp | 2 +- src/extension/internal/bitmap/contrast.cpp | 2 +- src/extension/internal/bitmap/crop.cpp | 8 +- src/extension/internal/bitmap/cycleColormap.cpp | 2 +- src/extension/internal/bitmap/edge.cpp | 2 +- src/extension/internal/bitmap/emboss.cpp | 4 +- src/extension/internal/bitmap/gaussianBlur.cpp | 4 +- src/extension/internal/bitmap/implode.cpp | 2 +- src/extension/internal/bitmap/level.cpp | 6 +- src/extension/internal/bitmap/levelChannel.cpp | 8 +- src/extension/internal/bitmap/medianFilter.cpp | 2 +- src/extension/internal/bitmap/modulate.cpp | 6 +- src/extension/internal/bitmap/oilPaint.cpp | 2 +- src/extension/internal/bitmap/opacity.cpp | 2 +- src/extension/internal/bitmap/raise.cpp | 6 +- src/extension/internal/bitmap/reduceNoise.cpp | 2 +- src/extension/internal/bitmap/sample.cpp | 4 +- src/extension/internal/bitmap/shade.cpp | 6 +- src/extension/internal/bitmap/sharpen.cpp | 4 +- src/extension/internal/bitmap/solarize.cpp | 2 +- src/extension/internal/bitmap/spread.cpp | 2 +- src/extension/internal/bitmap/swirl.cpp | 2 +- src/extension/internal/bitmap/threshold.cpp | 2 +- src/extension/internal/bitmap/unsharpmask.cpp | 8 +- src/extension/internal/bitmap/wave.cpp | 4 +- src/extension/internal/bluredge.cpp | 4 +- src/extension/internal/cairo-ps-out.cpp | 40 +++--- src/extension/internal/cairo-renderer-pdf-out.cpp | 20 +-- src/extension/internal/emf-inout.cpp | 22 +-- src/extension/internal/filter/bevels.h | 28 ++-- src/extension/internal/filter/blurs.h | 36 ++--- src/extension/internal/filter/bumps.h | 96 ++++++------- src/extension/internal/filter/color.h | 148 ++++++++++----------- src/extension/internal/filter/distort.h | 36 ++--- src/extension/internal/filter/image.h | 6 +- src/extension/internal/filter/morphology.h | 44 +++--- src/extension/internal/filter/overlays.h | 18 +-- src/extension/internal/filter/paint.h | 148 ++++++++++----------- src/extension/internal/filter/protrusions.h | 2 +- src/extension/internal/filter/shadows.h | 12 +- src/extension/internal/filter/textures.h | 24 ++-- src/extension/internal/filter/transparency.h | 34 ++--- src/extension/internal/gdkpixbuf-input.cpp | 2 +- src/extension/internal/grid.cpp | 10 +- src/extension/internal/wmf-inout.cpp | 18 +-- src/extension/prefdialog.cpp | 2 +- 51 files changed, 431 insertions(+), 431 deletions(-) diff --git a/src/extension/internal/bitmap/adaptiveThreshold.cpp b/src/extension/internal/bitmap/adaptiveThreshold.cpp index 9c9d6796b..3d7475cb3 100644 --- a/src/extension/internal/bitmap/adaptiveThreshold.cpp +++ b/src/extension/internal/bitmap/adaptiveThreshold.cpp @@ -38,9 +38,9 @@ AdaptiveThreshold::init(void) "\n" "" N_("Adaptive Threshold") "\n" "org.inkscape.effect.bitmap.adaptiveThreshold\n" - "5\n" - "5\n" - "0\n" + "5\n" + "5\n" + "0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/addNoise.cpp b/src/extension/internal/bitmap/addNoise.cpp index 0322dec0c..02bb877b7 100644 --- a/src/extension/internal/bitmap/addNoise.cpp +++ b/src/extension/internal/bitmap/addNoise.cpp @@ -44,7 +44,7 @@ AddNoise::init(void) "\n" "" N_("Add Noise") "\n" "org.inkscape.effect.bitmap.addNoise\n" - "\n" + "\n" "<_item value='Uniform Noise'>" N_("Uniform Noise") "\n" "<_item value='Gaussian Noise'>" N_("Gaussian Noise") "\n" "<_item value='Multiplicative Gaussian Noise'>" N_("Multiplicative Gaussian Noise") "\n" diff --git a/src/extension/internal/bitmap/blur.cpp b/src/extension/internal/bitmap/blur.cpp index cc44994ec..37a56b8a9 100644 --- a/src/extension/internal/bitmap/blur.cpp +++ b/src/extension/internal/bitmap/blur.cpp @@ -37,8 +37,8 @@ Blur::init(void) "\n" "" N_("Blur") "\n" "org.inkscape.effect.bitmap.blur\n" - "1\n" - "0.5\n" + "1\n" + "0.5\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/channel.cpp b/src/extension/internal/bitmap/channel.cpp index 372e7456b..57ef0421b 100644 --- a/src/extension/internal/bitmap/channel.cpp +++ b/src/extension/internal/bitmap/channel.cpp @@ -47,7 +47,7 @@ Channel::init(void) "\n" "" N_("Channel") "\n" "org.inkscape.effect.bitmap.channel\n" - "\n" + "\n" "<_item value='Red Channel'>" N_("Red Channel") "\n" "<_item value='Green Channel'>" N_("Green Channel") "\n" "<_item value='Blue Channel'>" N_("Blue Channel") "\n" diff --git a/src/extension/internal/bitmap/charcoal.cpp b/src/extension/internal/bitmap/charcoal.cpp index f647f8711..2cfd741d1 100644 --- a/src/extension/internal/bitmap/charcoal.cpp +++ b/src/extension/internal/bitmap/charcoal.cpp @@ -37,8 +37,8 @@ Charcoal::init(void) "\n" "" N_("Charcoal") "\n" "org.inkscape.effect.bitmap.charcoal\n" - "1\n" - "0.5\n" + "1\n" + "0.5\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/colorize.cpp b/src/extension/internal/bitmap/colorize.cpp index 0b3b95420..1c4b8a696 100644 --- a/src/extension/internal/bitmap/colorize.cpp +++ b/src/extension/internal/bitmap/colorize.cpp @@ -49,7 +49,7 @@ Colorize::init(void) "\n" "" N_("Colorize") "\n" "org.inkscape.effect.bitmap.colorize\n" - "0\n" + "0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/contrast.cpp b/src/extension/internal/bitmap/contrast.cpp index c527536d9..a3be77808 100644 --- a/src/extension/internal/bitmap/contrast.cpp +++ b/src/extension/internal/bitmap/contrast.cpp @@ -39,7 +39,7 @@ Contrast::init(void) "\n" "" N_("Contrast") "\n" "org.inkscape.effect.bitmap.contrast\n" - "0\n" + "0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/crop.cpp b/src/extension/internal/bitmap/crop.cpp index 02d92668b..8f6c503ca 100644 --- a/src/extension/internal/bitmap/crop.cpp +++ b/src/extension/internal/bitmap/crop.cpp @@ -65,10 +65,10 @@ Crop::init(void) "\n" "" N_("Crop") "\n" "org.inkscape.effect.bitmap.crop\n" - "0\n" - "0\n" - "0\n" - "0\n" + "0\n" + "0\n" + "0\n" + "0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/cycleColormap.cpp b/src/extension/internal/bitmap/cycleColormap.cpp index 349b6d9f5..8d55087a6 100644 --- a/src/extension/internal/bitmap/cycleColormap.cpp +++ b/src/extension/internal/bitmap/cycleColormap.cpp @@ -36,7 +36,7 @@ CycleColormap::init(void) "\n" "" N_("Cycle Colormap") "\n" "org.inkscape.effect.bitmap.cycleColormap\n" - "180\n" + "180\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/edge.cpp b/src/extension/internal/bitmap/edge.cpp index 2d165331f..486ce0e4e 100644 --- a/src/extension/internal/bitmap/edge.cpp +++ b/src/extension/internal/bitmap/edge.cpp @@ -36,7 +36,7 @@ Edge::init(void) "\n" "" N_("Edge") "\n" "org.inkscape.effect.bitmap.edge\n" - "0\n" + "0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/emboss.cpp b/src/extension/internal/bitmap/emboss.cpp index 634c71a98..9518cf320 100644 --- a/src/extension/internal/bitmap/emboss.cpp +++ b/src/extension/internal/bitmap/emboss.cpp @@ -37,8 +37,8 @@ Emboss::init(void) "\n" "" N_("Emboss") "\n" "org.inkscape.effect.bitmap.emboss\n" - "1.0\n" - "0.5\n" + "1.0\n" + "0.5\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/gaussianBlur.cpp b/src/extension/internal/bitmap/gaussianBlur.cpp index 7d93ef66a..d68cd59bc 100644 --- a/src/extension/internal/bitmap/gaussianBlur.cpp +++ b/src/extension/internal/bitmap/gaussianBlur.cpp @@ -37,8 +37,8 @@ GaussianBlur::init(void) "\n" "" N_("Gaussian Blur") "\n" "org.inkscape.effect.bitmap.gaussianBlur\n" - "5.0\n" - "5.0\n" + "5.0\n" + "5.0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/implode.cpp b/src/extension/internal/bitmap/implode.cpp index 15f92f5f6..c24fb7bf5 100644 --- a/src/extension/internal/bitmap/implode.cpp +++ b/src/extension/internal/bitmap/implode.cpp @@ -36,7 +36,7 @@ Implode::init(void) "\n" "" N_("Implode") "\n" "org.inkscape.effect.bitmap.implode\n" - "10\n" + "10\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/level.cpp b/src/extension/internal/bitmap/level.cpp index 9c266eb11..168328e8f 100644 --- a/src/extension/internal/bitmap/level.cpp +++ b/src/extension/internal/bitmap/level.cpp @@ -40,9 +40,9 @@ Level::init(void) "\n" "" N_("Level") "\n" "org.inkscape.effect.bitmap.level\n" - "0\n" - "100\n" - "1\n" + "0\n" + "100\n" + "1\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/levelChannel.cpp b/src/extension/internal/bitmap/levelChannel.cpp index 3e39657c3..d5c636059 100644 --- a/src/extension/internal/bitmap/levelChannel.cpp +++ b/src/extension/internal/bitmap/levelChannel.cpp @@ -51,7 +51,7 @@ LevelChannel::init(void) "\n" "" N_("Level (with Channel)") "\n" "org.inkscape.effect.bitmap.levelChannel\n" - "\n" + "\n" "<_item value='Red Channel'>" N_("Red Channel") "\n" "<_item value='Green Channel'>" N_("Green Channel") "\n" "<_item value='Blue Channel'>" N_("Blue Channel") "\n" @@ -62,9 +62,9 @@ LevelChannel::init(void) "<_item value='Opacity Channel'>" N_("Opacity Channel") "\n" "<_item value='Matte Channel'>" N_("Matte Channel") "\n" "\n" - "0.0\n" - "100.0\n" - "1.0\n" + "0.0\n" + "100.0\n" + "1.0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/medianFilter.cpp b/src/extension/internal/bitmap/medianFilter.cpp index 44ff9e543..64837850d 100644 --- a/src/extension/internal/bitmap/medianFilter.cpp +++ b/src/extension/internal/bitmap/medianFilter.cpp @@ -36,7 +36,7 @@ MedianFilter::init(void) "\n" "" N_("Median") "\n" "org.inkscape.effect.bitmap.medianFilter\n" - "0\n" + "0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/modulate.cpp b/src/extension/internal/bitmap/modulate.cpp index d123a5c15..3b3a2495c 100644 --- a/src/extension/internal/bitmap/modulate.cpp +++ b/src/extension/internal/bitmap/modulate.cpp @@ -39,9 +39,9 @@ Modulate::init(void) "\n" "" N_("HSB Adjust") "\n" "org.inkscape.effect.bitmap.modulate\n" - "0\n" - "0\n" - "0\n" + "0\n" + "0\n" + "0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/oilPaint.cpp b/src/extension/internal/bitmap/oilPaint.cpp index 5377ab2b1..88c85a590 100644 --- a/src/extension/internal/bitmap/oilPaint.cpp +++ b/src/extension/internal/bitmap/oilPaint.cpp @@ -36,7 +36,7 @@ OilPaint::init(void) "\n" "" N_("Oil Paint") "\n" "org.inkscape.effect.bitmap.oilPaint\n" - "3\n" + "3\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/opacity.cpp b/src/extension/internal/bitmap/opacity.cpp index f9b4bbc27..a25e99543 100644 --- a/src/extension/internal/bitmap/opacity.cpp +++ b/src/extension/internal/bitmap/opacity.cpp @@ -37,7 +37,7 @@ Opacity::init(void) "\n" "" N_("Opacity") "\n" "org.inkscape.effect.bitmap.opacity\n" - "80.0\n" + "80.0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/raise.cpp b/src/extension/internal/bitmap/raise.cpp index 9ca832c30..e85cc747a 100644 --- a/src/extension/internal/bitmap/raise.cpp +++ b/src/extension/internal/bitmap/raise.cpp @@ -39,9 +39,9 @@ Raise::init(void) "\n" "" N_("Raise") "\n" "org.inkscape.effect.bitmap.raise\n" - "6\n" - "6\n" - "0\n" + "6\n" + "6\n" + "0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/reduceNoise.cpp b/src/extension/internal/bitmap/reduceNoise.cpp index db227ec41..b0d8b9c2d 100644 --- a/src/extension/internal/bitmap/reduceNoise.cpp +++ b/src/extension/internal/bitmap/reduceNoise.cpp @@ -39,7 +39,7 @@ ReduceNoise::init(void) "\n" "" N_("Reduce Noise") "\n" "org.inkscape.effect.bitmap.reduceNoise\n" - "-1\n" + "-1\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/sample.cpp b/src/extension/internal/bitmap/sample.cpp index 706ae1d5b..081303b73 100644 --- a/src/extension/internal/bitmap/sample.cpp +++ b/src/extension/internal/bitmap/sample.cpp @@ -38,8 +38,8 @@ Sample::init(void) "\n" "" N_("Resample") "\n" "org.inkscape.effect.bitmap.sample\n" - "100\n" - "100\n" + "100\n" + "100\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/shade.cpp b/src/extension/internal/bitmap/shade.cpp index de7c9d669..927a3a578 100644 --- a/src/extension/internal/bitmap/shade.cpp +++ b/src/extension/internal/bitmap/shade.cpp @@ -39,9 +39,9 @@ Shade::init(void) "\n" "" N_("Shade") "\n" "org.inkscape.effect.bitmap.shade\n" - "30\n" - "30\n" - "false\n" + "30\n" + "30\n" + "false\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/sharpen.cpp b/src/extension/internal/bitmap/sharpen.cpp index 89181abad..d397d46c8 100644 --- a/src/extension/internal/bitmap/sharpen.cpp +++ b/src/extension/internal/bitmap/sharpen.cpp @@ -37,8 +37,8 @@ Sharpen::init(void) "\n" "" N_("Sharpen") "\n" "org.inkscape.effect.bitmap.sharpen\n" - "1.0\n" - "0.5\n" + "1.0\n" + "0.5\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/solarize.cpp b/src/extension/internal/bitmap/solarize.cpp index d333d2ae8..5f8cdd17c 100644 --- a/src/extension/internal/bitmap/solarize.cpp +++ b/src/extension/internal/bitmap/solarize.cpp @@ -38,7 +38,7 @@ Solarize::init(void) "\n" "" N_("Solarize") "\n" "org.inkscape.effect.bitmap.solarize\n" - "50\n" + "50\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/spread.cpp b/src/extension/internal/bitmap/spread.cpp index 3e9110dd7..e38e2a927 100644 --- a/src/extension/internal/bitmap/spread.cpp +++ b/src/extension/internal/bitmap/spread.cpp @@ -36,7 +36,7 @@ Spread::init(void) "\n" "" N_("Dither") "\n" "org.inkscape.effect.bitmap.spread\n" - "3\n" + "3\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/swirl.cpp b/src/extension/internal/bitmap/swirl.cpp index 1f2776031..98efa6238 100644 --- a/src/extension/internal/bitmap/swirl.cpp +++ b/src/extension/internal/bitmap/swirl.cpp @@ -36,7 +36,7 @@ Swirl::init(void) "\n" "" N_("Swirl") "\n" "org.inkscape.effect.bitmap.swirl\n" - "30\n" + "30\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/threshold.cpp b/src/extension/internal/bitmap/threshold.cpp index 0db0f7749..9f10b2c42 100644 --- a/src/extension/internal/bitmap/threshold.cpp +++ b/src/extension/internal/bitmap/threshold.cpp @@ -37,7 +37,7 @@ Threshold::init(void) // TRANSLATORS: see http://docs.gimp.org/en/gimp-tool-threshold.html "" N_("Threshold") "\n" "org.inkscape.effect.bitmap.threshold\n" - "\n" + "\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/unsharpmask.cpp b/src/extension/internal/bitmap/unsharpmask.cpp index 222feae8d..c5a7e9291 100644 --- a/src/extension/internal/bitmap/unsharpmask.cpp +++ b/src/extension/internal/bitmap/unsharpmask.cpp @@ -40,10 +40,10 @@ Unsharpmask::init(void) "\n" "" N_("Unsharp Mask") "\n" "org.inkscape.effect.bitmap.unsharpmask\n" - "5.0\n" - "5.0\n" - "50.0\n" - "5.0\n" + "5.0\n" + "5.0\n" + "50.0\n" + "5.0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/wave.cpp b/src/extension/internal/bitmap/wave.cpp index 158ae7e64..1ccaa1d5e 100644 --- a/src/extension/internal/bitmap/wave.cpp +++ b/src/extension/internal/bitmap/wave.cpp @@ -37,8 +37,8 @@ Wave::init(void) "\n" "" N_("Wave") "\n" "org.inkscape.effect.bitmap.wave\n" - "25\n" - "150\n" + "25\n" + "150\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bluredge.cpp b/src/extension/internal/bluredge.cpp index 0e3aa98ce..4a04e3c33 100644 --- a/src/extension/internal/bluredge.cpp +++ b/src/extension/internal/bluredge.cpp @@ -131,8 +131,8 @@ BlurEdge::init (void) "\n" "" N_("Inset/Outset Halo") "\n" "org.inkscape.effect.bluredge\n" - "1.0\n" - "11\n" + "1.0\n" + "11\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp index 5dc412301..e8f47e79e 100644 --- a/src/extension/internal/cairo-ps-out.cpp +++ b/src/extension/internal/cairo-ps-out.cpp @@ -326,23 +326,23 @@ CairoPsOutput::init (void) "\n" "" N_("PostScript") "\n" "" SP_MODULE_KEY_PRINT_CAIRO_PS "\n" - "\n" + "\n" "<_item value='PS3'>" N_("PostScript level 3") "\n" "<_item value='PS2'>" N_("PostScript level 2") "\n" "\n" - "\n" - "\n" - "\n" - "\n" + "\n" + "<_option value=\"embed\">" N_("Embed fonts") "\n" + "<_option value=\"paths\">" N_("Convert text to paths") "\n" + "<_option value=\"LaTeX\">" N_("Omit text in PDF and create LaTeX file") "\n" "\n" - "true\n" - "96\n" - "\n" + "true\n" + "96\n" + "\n" "<_option value=\"page\">" N_("Use document's page size") "" "<_option value=\"drawing\">" N_("Use exported object's size") "" "" - "0\n" - "\n" + "0\n" + "\n" "\n" ".ps\n" "image/x-postscript\n" @@ -368,23 +368,23 @@ CairoEpsOutput::init (void) "\n" "" N_("Encapsulated PostScript") "\n" "" SP_MODULE_KEY_PRINT_CAIRO_EPS "\n" - "\n" + "\n" "<_item value='PS3'>" N_("PostScript level 3") "\n" "<_item value='PS2'>" N_("PostScript level 2") "\n" "\n" - "\n" - "\n" - "\n" - "\n" + "\n" + "<_option value=\"embed\">" N_("Embed fonts") "\n" + "<_option value=\"paths\">" N_("Convert text to paths") "\n" + "<_option value=\"LaTeX\">" N_("Omit text in PDF and create LaTeX file") "\n" "\n" - "true\n" - "96\n" - "\n" + "true\n" + "96\n" + "\n" "<_option value=\"page\">" N_("Use document's page size") "" "<_option value=\"drawing\">" N_("Use exported object's size") "" "" - "0\n" - "\n" + "0\n" + "\n" "\n" ".eps\n" "image/x-e-postscript\n" diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp index e5c9406c9..5576676b2 100644 --- a/src/extension/internal/cairo-renderer-pdf-out.cpp +++ b/src/extension/internal/cairo-renderer-pdf-out.cpp @@ -241,25 +241,25 @@ CairoRendererPdfOutput::init (void) "\n" "Portable Document Format\n" "org.inkscape.output.pdf.cairorenderer\n" - "\n" + "\n" #if (CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)) "<_item value='PDF-1.5'>" N_("PDF 1.5") "\n" #endif "<_item value='PDF-1.4'>" N_("PDF 1.4") "\n" "\n" - "\n" - "\n" - "\n" - "\n" + "\n" + "<_option value=\"embed\">" N_("Embed fonts") "\n" + "<_option value=\"paths\">" N_("Convert text to paths") "\n" + "<_option value=\"LaTeX\">" N_("Omit text in PDF and create LaTeX file") "\n" "\n" - "true\n" - "96\n" - "\n" + "true\n" + "96\n" + "\n" "<_option value=\"page\">" N_("Use document's page size") "" "<_option value=\"drawing\">" N_("Use exported object's size") "" "" - "0\n" - "\n" + "0\n" + "\n" "\n" ".pdf\n" "application/pdf\n" diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp index 13520c40b..12751c5ec 100644 --- a/src/extension/internal/emf-inout.cpp +++ b/src/extension/internal/emf-inout.cpp @@ -3614,17 +3614,17 @@ Emf::init (void) "\n" "" N_("EMF Output") "\n" "org.inkscape.output.emf\n" - "true\n" - "true\n" - "true\n" - "true\n" - "false\n" - "false\n" - "false\n" - "false\n" - "false\n" - "false\n" - "false\n" + "true\n" + "true\n" + "true\n" + "true\n" + "false\n" + "false\n" + "false\n" + "false\n" + "false\n" + "false\n" + "false\n" "\n" ".emf\n" "image/x-emf\n" diff --git a/src/extension/internal/filter/bevels.h b/src/extension/internal/filter/bevels.h index ea9d537ad..68e94ad3d 100644 --- a/src/extension/internal/filter/bevels.h +++ b/src/extension/internal/filter/bevels.h @@ -52,10 +52,10 @@ public: "\n" "" N_("Diffuse Light") "\n" "org.inkscape.effect.filter.DiffuseLight\n" - "6\n" - "25\n" - "235\n" - "-1\n" + "6\n" + "25\n" + "235\n" + "-1\n" "\n" "all\n" "\n" @@ -132,11 +132,11 @@ public: "\n" "" N_("Matte Jelly") "\n" "org.inkscape.effect.filter.MatteJelly\n" - "7\n" - "0.9\n" - "60\n" - "225\n" - "-1\n" + "7\n" + "0.9\n" + "60\n" + "225\n" + "-1\n" "\n" "all\n" "\n" @@ -216,11 +216,11 @@ public: "\n" "" N_("Specular Light") "\n" "org.inkscape.effect.filter.SpecularLight\n" - "6\n" - "1\n" - "45\n" - "235\n" - "-1\n" + "6\n" + "1\n" + "45\n" + "235\n" + "-1\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/filter/blurs.h b/src/extension/internal/filter/blurs.h index fe1b9c930..77581ed96 100644 --- a/src/extension/internal/filter/blurs.h +++ b/src/extension/internal/filter/blurs.h @@ -53,9 +53,9 @@ public: "\n" "" N_("Blur") "\n" "org.inkscape.effect.filter.Blur\n" - "2\n" - "2\n" - "False\n" + "2\n" + "2\n" + "False\n" "\n" "all\n" "\n" @@ -124,7 +124,7 @@ public: "\n" "" N_("Clean Edges") "\n" "org.inkscape.effect.filter.CleanEdges\n" - "0.4\n" + "0.4\n" "\n" "all\n" "\n" @@ -184,11 +184,11 @@ public: "\n" "" N_("Cross Blur") "\n" "org.inkscape.effect.filter.CrossBlur\n" - "0\n" - "0\n" - "5\n" - "5\n" - "\n" + "0\n" + "0\n" + "5\n" + "5\n" + "\n" "<_item value=\"darken\">" N_("Darken") "\n" "<_item value=\"screen\">" N_("Screen") "\n" "<_item value=\"multiply\">" N_("Multiply") "\n" @@ -259,7 +259,7 @@ public: "\n" "" N_("Feather") "\n" "org.inkscape.effect.filter.Feather\n" - "5\n" + "5\n" "\n" "all\n" "\n" @@ -326,22 +326,22 @@ public: "org.inkscape.effect.filter.ImageBlur\n" "\n" "\n" - "3\n" - "3\n" - "6\n" - "2\n" - "1\n" + "3\n" + "3\n" + "6\n" + "2\n" + "1\n" "\n" "\n" - "-1\n" - "\n" + "-1\n" + "\n" "<_item value=\"normal\">" N_("Normal") "\n" "<_item value=\"darken\">" N_("Darken") "\n" "<_item value=\"screen\">" N_("Screen") "\n" "<_item value=\"multiply\">" N_("Multiply") "\n" "<_item value=\"lighten\">" N_("Lighten") "\n" "\n" - "false\n" + "false\n" "\n" "\n" "\n" diff --git a/src/extension/internal/filter/bumps.h b/src/extension/internal/filter/bumps.h index b59b1ef50..cbda5ea35 100644 --- a/src/extension/internal/filter/bumps.h +++ b/src/extension/internal/filter/bumps.h @@ -81,52 +81,52 @@ public: "org.inkscape.effect.filter.Bump\n" "\n" "\n" - "0.01\n" - "0.01\n" - "0\n" + "0.01\n" + "0.01\n" + "0\n" "<_param name=\"sourceHeader\" type=\"description\" appearance=\"header\">" N_("Bump source") "\n" - "0\n" - "0\n" - "0\n" - "false\n" + "0\n" + "0\n" + "0\n" + "false\n" "\n" "\n" - "\n" + "\n" "<_item value=\"specular\">" N_("Specular") "\n" "<_item value=\"diffuse\">" N_("Diffuse") "\n" "\n" - "5\n" - "1\n" - "15\n" - "-1\n" + "5\n" + "1\n" + "15\n" + "-1\n" "\n" "\n" - "\n" + "\n" "<_item value=\"distant\">" N_("Distant") "\n" "<_item value=\"point\">" N_("Point") "\n" "<_item value=\"spot\">" N_("Spot") "\n" "\n" "<_param name=\"distantHeader\" type=\"description\" appearance=\"header\">" N_("Distant light options") "\n" - "225\n" - "45\n" + "225\n" + "45\n" "<_param name=\"pointHeader\" type=\"description\" appearance=\"header\">" N_("Point light options") "\n" - "526\n" - "372\n" - "150\n" + "526\n" + "372\n" + "150\n" "<_param name=\"spotHeader\" type=\"description\" appearance=\"header\">" N_("Spot light options") "\n" - "526\n" - "372\n" - "150\n" - "0\n" - "0\n" - "-1000\n" - "1\n" - "50\n" + "526\n" + "372\n" + "150\n" + "0\n" + "0\n" + "-1000\n" + "1\n" + "50\n" "\n" "\n" - "-987158017\n" - "false\n" - "\n" + "-987158017\n" + "false\n" + "\n" "<_item value=\"normal\">" N_("Normal") "\n" "<_item value=\"darken\">" N_("Darken") "\n" "<_item value=\"screen\">" N_("Screen") "\n" @@ -310,35 +310,35 @@ public: "org.inkscape.effect.filter.WaxBump\n" "\n" "\n" - "1.5\n" - "1\n" - "1\n" + "1.5\n" + "1\n" + "1\n" "<_param name=\"sourceHeader\" type=\"description\" appearance=\"header\">" N_("Bump source") "\n" - "0\n" - "0\n" - "0\n" - "\n" + "0\n" + "0\n" + "0\n" + "\n" "<_item value=\"flood1\">" N_("Color") "\n" "<_item value=\"SourceGraphic\">" N_("Image") "\n" "<_item value=\"blur1\">" N_("Blurred image") "\n" "\n" - "0\n" + "0\n" "\n" "\n" - "-1\n" - "5\n" - "1.4\n" - "35\n" - "225\n" - "60\n" - "\n" + "-1\n" + "5\n" + "1.4\n" + "35\n" + "225\n" + "60\n" + "\n" "<_item value=\"screen\">" N_("Screen") "\n" "<_item value=\"normal\">" N_("Normal") "\n" "<_item value=\"darken\">" N_("Darken") "\n" "<_item value=\"multiply\">" N_("Multiply") "\n" "<_item value=\"lighten\">" N_("Lighten") "\n" "\n" - "\n" + "\n" "<_item value=\"screen\">" N_("Screen") "\n" "<_item value=\"normal\">" N_("Normal") "\n" "<_item value=\"darken\">" N_("Darken") "\n" @@ -347,9 +347,9 @@ public: "\n" "\n" "\n" - "-520083713\n" - "false\n" - "\n" + "-520083713\n" + "false\n" + "\n" "<_item value=\"atop\">" N_("Atop") "\n" "<_item value=\"in\">" N_("In") "\n" "\n" diff --git a/src/extension/internal/filter/color.h b/src/extension/internal/filter/color.h index b9c76615c..a6b777d20 100644 --- a/src/extension/internal/filter/color.h +++ b/src/extension/internal/filter/color.h @@ -72,10 +72,10 @@ public: "\n" "" N_("Brilliance") "\n" "org.inkscape.effect.filter.Brilliance\n" - "2\n" - "0.5\n" - "0\n" - "false\n" + "2\n" + "0.5\n" + "0\n" + "false\n" "\n" "all\n" "\n" @@ -154,15 +154,15 @@ public: "org.inkscape.effect.filter.ChannelPaint\n" "\n" "\n" - "1\n" - "-1\n" - "0.5\n" - "0.5\n" - "1\n" - "false\n" + "1\n" + "-1\n" + "0.5\n" + "0.5\n" + "1\n" + "false\n" "\n" "\n" - "16777215\n" + "16777215\n" "\n" "\n" "\n" @@ -255,7 +255,7 @@ public: "org.inkscape.effect.filter.ColorBlindness\n" "\n" "\n" - "\n" + "\n" "<_item value=\"0.618 0.32 0.062 0 0 0.163 0.775 0.062 0 0 0.163 0.32 0.516 0 0 0 0 0 1 0 \">" N_("Rod monochromacy (atypical achromatopsia)") "\n" "<_item value=\"0.299 0.587 0.114 0 0 0.299 0.587 0.114 0 0 0.299 0.587 0.114 0 0 0 0 0 1 0 \">" N_("Cone monochromacy (typical achromatopsia)") "\n" "<_item value=\"0.8 0.2 0 0 0 0.2583 0.74167 0 0 0 0 0.14167 0.85833 0 0 0 0 0 1 0 \">" N_("Green weak (deuteranomaly)") "\n" @@ -328,8 +328,8 @@ public: "\n" "" N_("Color Shift") "\n" "org.inkscape.effect.filter.ColorShift\n" - "330\n" - "0.6\n" + "330\n" + "0.6\n" "\n" "all\n" "\n" @@ -393,17 +393,17 @@ public: "org.inkscape.effect.filter.Colorize\n" "\n" "\n" - "0\n" - "1\n" - "false\n" - "\n" + "0\n" + "1\n" + "false\n" + "\n" "<_item value=\"multiply\">" N_("Multiply") "\n" "<_item value=\"normal\">" N_("Normal") "\n" "<_item value=\"screen\">" N_("Screen") "\n" "<_item value=\"lighten\">" N_("Lighten") "\n" "<_item value=\"darken\">" N_("Darken") "\n" "\n" - "\n" + "\n" "<_item value=\"screen\">" N_("Screen") "\n" "<_item value=\"multiply\">" N_("Multiply") "\n" "<_item value=\"normal\">" N_("Normal") "\n" @@ -412,7 +412,7 @@ public: "\n" "\n" "\n" - "-1639776001\n" + "-1639776001\n" "\n" "\n" "\n" @@ -498,7 +498,7 @@ public: "\n" "" N_("Component Transfer") "\n" "org.inkscape.effect.filter.ComponentTransfer\n" - "\n" + "\n" "<_item value=\"identity\">" N_("Identity") "\n" "<_item value=\"table\">" N_("Table") "\n" "<_item value=\"discrete\">" N_("Discrete") "\n" @@ -585,8 +585,8 @@ public: "org.inkscape.effect.filter.Duochrome\n" "\n" "\n" - "0\n" - "\n" + "0\n" + "\n" "<_item value=\"none\">" N_("No swap") "\n" "<_item value=\"full\">" N_("Color and alpha") "\n" "<_item value=\"color\">" N_("Color only") "\n" @@ -594,10 +594,10 @@ public: "\n" "\n" "\n" - "1364325887\n" + "1364325887\n" "\n" "\n" - "-65281\n" + "-65281\n" "\n" "\n" "\n" @@ -708,7 +708,7 @@ public: "\n" "" N_("Extract Channel") "\n" "org.inkscape.effect.filter.ExtractChannel\n" - "\n" + "\n" "<_item value=\"r\">" N_("Red") "\n" "<_item value=\"g\">" N_("Green") "\n" "<_item value=\"b\">" N_("Blue") "\n" @@ -716,12 +716,12 @@ public: "<_item value=\"m\">" N_("Magenta") "\n" "<_item value=\"y\">" N_("Yellow") "\n" "\n" - "\n" + "\n" "<_item value=\"multiply\">" N_("Multiply") "\n" "<_item value=\"normal\">" N_("Normal") "\n" "<_item value=\"screen\">" N_("Screen") "\n" "\n" - "false\n" + "false\n" "\n" "all\n" "\n" @@ -814,8 +814,8 @@ public: "\n" "" N_("Fade to Black or White") "\n" "org.inkscape.effect.filter.FadeToBW\n" - "1\n" - "\n" + "1\n" + "\n" "<_item value=\"black\">" N_("Black") "\n" "<_item value=\"white\">" N_("White") "\n" "\n" @@ -893,11 +893,11 @@ public: "\n" "" N_("Greyscale") "\n" "org.inkscape.effect.filter.Greyscale\n" - "0.21\n" - "0.72\n" - "0.072\n" - "0\n" - "false\n" + "0.21\n" + "0.72\n" + "0.072\n" + "0\n" + "false\n" "\n" "all\n" "\n" @@ -979,16 +979,16 @@ public: "\n" "" N_("Invert") "\n" "org.inkscape.effect.filter.Invert\n" - "\n" + "\n" "<_item value=\"0\">" N_("No inversion") "\n" "<_item value=\"1\">" N_("Red and blue") "\n" "<_item value=\"2\">" N_("Red and green") "\n" "<_item value=\"3\">" N_("Green and blue") "\n" "\n" - "0\n" - "false\n" - "false\n" - "false\n" + "0\n" + "false\n" + "false\n" + "false\n" "\n" "all\n" "\n" @@ -1114,9 +1114,9 @@ public: "\n" "" N_("Lighting") "\n" "org.inkscape.effect.filter.Lighting\n" - "1\n" - "1\n" - "0\n" + "1\n" + "1\n" + "0\n" "\n" "all\n" "\n" @@ -1185,8 +1185,8 @@ public: "\n" "" N_("Lightness-Contrast") "\n" "org.inkscape.effect.filter.LightnessContrast\n" - "0\n" - "0\n" + "0\n" + "0\n" "\n" "all\n" "\n" @@ -1267,17 +1267,17 @@ public: "\n" "\n" "<_param name=\"redOffset\" type=\"description\" appearance=\"header\">" N_("Red offset") "\n" - "-6\n" - "-6\n" + "-6\n" + "-6\n" "<_param name=\"greenOffset\" type=\"description\" appearance=\"header\">" N_("Green offset") "\n" - "6\n" - "7\n" + "6\n" + "7\n" "<_param name=\"redOffset\" type=\"description\" appearance=\"header\">" N_("Blue offset") "\n" - "1\n" - "-16\n" + "1\n" + "-16\n" "\n" "\n" - "255\n" + "255\n" "\n" "\n" "\n" @@ -1379,17 +1379,17 @@ public: "\n" "\n" "<_param name=\"cyanOffset\" type=\"description\" appearance=\"header\">" N_("Cyan offset") "\n" - "-6\n" - "-6\n" + "-6\n" + "-6\n" "<_param name=\"magentaOffset\" type=\"description\" appearance=\"header\">" N_("Magenta offset") "\n" - "6\n" - "7\n" + "6\n" + "7\n" "<_param name=\"yellowOffset\" type=\"description\" appearance=\"header\">" N_("Yellow offset") "\n" - "1\n" - "-16\n" + "1\n" + "-16\n" "\n" "\n" - "-1\n" + "-1\n" "\n" "\n" "\n" @@ -1482,15 +1482,15 @@ public: "\n" "" N_("Quadritone fantasy") "\n" "org.inkscape.effect.filter.Quadritone\n" - "280\n" - "100\n" - "\n" + "280\n" + "100\n" + "\n" "<_item value=\"normal\">" N_("Normal") "\n" "<_item value=\"multiply\">" N_("Multiply") "\n" "<_item value=\"screen\">" N_("Screen") "\n" "\n" - "0\n" - "\n" + "0\n" + "\n" "<_item value=\"normal\">" N_("Normal") "\n" "<_item value=\"screen\">" N_("Screen") "\n" "<_item value=\"multiply\">" N_("Multiply") "\n" @@ -1568,8 +1568,8 @@ public: "\n" "" N_("Solarize") "\n" "org.inkscape.effect.filter.Solarize\n" - "0\n" - "\n" + "0\n" + "\n" "<_item value=\"solarize\">" N_("Solarize") "\n" "<_item value=\"moonarize\">" N_("Moonarize") "\n" "\n" @@ -1657,31 +1657,31 @@ public: "org.inkscape.effect.filter.Tritone\n" "\n" "\n" - "\n" + "\n" "<_item value=\"normal\">" N_("Normal") "\n" "<_item value=\"enhue\">" N_("Enhance hue") "\n" "<_item value=\"phospho\">" N_("Phosphorescence") "\n" "<_item value=\"phosphoB\">" N_("Colored nights") "\n" "<_item value=\"htb\">" N_("Hue to background") "\n" "\n" - "\n" + "\n" "<_item value=\"lighten\">" N_("Lighten") "\n" "<_item value=\"screen\">" N_("Screen") "\n" "<_item value=\"multiply\">" N_("Multiply") "\n" "<_item value=\"darken\">" N_("Darken") "\n" "\n" - "0.01\n" - "\n" + "0.01\n" + "\n" "<_item value=\"normal\">" N_("Normal") "\n" "<_item value=\"multiply\">" N_("Multiply") "\n" "<_item value=\"darken\">" N_("Darken") "\n" "\n" - "0\n" - "1\n" + "0\n" + "1\n" "\n" "\n" - "0\n" - "-73203457\n" + "0\n" + "-73203457\n" "\n" "\n" "\n" diff --git a/src/extension/internal/filter/distort.h b/src/extension/internal/filter/distort.h index 586d34226..56aab51f5 100644 --- a/src/extension/internal/filter/distort.h +++ b/src/extension/internal/filter/distort.h @@ -66,29 +66,29 @@ public: "\n" "" N_("Felt Feather") "\n" "org.inkscape.effect.filter.FeltFeather\n" - "\n" + "\n" "<_item value=\"in\">" N_("In") "\n" "<_item value=\"out\">" N_("Out") "\n" "\n" - "15\n" - "15\n" - "1\n" - "0\n" - "\n" + "15\n" + "15\n" + "1\n" + "0\n" + "\n" "<_item value=\"atop\">" N_("Normal") "\n" "<_item value=\"over\">" N_("Wide") "\n" "<_item value=\"in\">" N_("Narrow") "\n" "<_item value=\"xor\">" N_("No fill") "\n" "\n" - "\n" + "\n" "<_item value=\"fractalNoise\">" N_("Fractal noise") "\n" "<_item value=\"turbulence\">" N_("Turbulence") "\n" "\n" - "5\n" - "5\n" - "3\n" - "0\n" - "30\n" + "5\n" + "5\n" + "3\n" + "0\n" + "30\n" "\n" "all\n" "\n" @@ -189,15 +189,15 @@ public: "\n" "" N_("Roughen") "\n" "org.inkscape.effect.filter.Roughen\n" - "\n" + "\n" "<_item value=\"fractalNoise\">" N_("Fractal noise") "\n" "<_item value=\"turbulence\">" N_("Turbulence") "\n" "\n" - "1.3\n" - "1.3\n" - "5\n" - "0\n" - "6.6\n" + "1.3\n" + "1.3\n" + "5\n" + "0\n" + "6.6\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/filter/image.h b/src/extension/internal/filter/image.h index 00cd2cf21..868588f80 100644 --- a/src/extension/internal/filter/image.h +++ b/src/extension/internal/filter/image.h @@ -48,13 +48,13 @@ public: "\n" "" N_("Edge Detect") "\n" "org.inkscape.effect.filter.EdgeDetect\n" - "\n" + "\n" "<_item value=\"all\">" N_("All") "\n" "<_item value=\"vertical\">" N_("Vertical lines") "\n" "<_item value=\"horizontal\">" N_("Horizontal lines") "\n" "\n" - "1.0\n" - "false\n" + "1.0\n" + "false\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/filter/morphology.h b/src/extension/internal/filter/morphology.h index 7e10884a1..e1785f7d3 100644 --- a/src/extension/internal/filter/morphology.h +++ b/src/extension/internal/filter/morphology.h @@ -57,17 +57,17 @@ public: "\n" "" N_("Cross-smooth") "\n" "org.inkscape.effect.filter.crosssmooth\n" - "\n" + "\n" "<_item value=\"in\">" N_("Inner") "\n" "<_item value=\"over\">" N_("Outer") "\n" "<_item value=\"xor\">" N_("Open") "\n" "\n" - "10\n" - "1\n" - "10\n" - "1\n" - "1\n" - "false\n" + "10\n" + "1\n" + "10\n" + "1\n" + "1\n" + "false\n" "\n" "all\n" @@ -167,33 +167,33 @@ public: "org.inkscape.effect.filter.Outline\n" "\n" "\n" - "false\n" - "false\n" - "\n" + "false\n" + "false\n" + "\n" "<_item value=\"over\">" N_("Over") "\n" "<_item value=\"in\">" N_("In") "\n" "<_item value=\"out\">" N_("Out") "\n" "<_item value=\"atop\">" N_("Atop") "\n" "<_item value=\"xor\">" N_("XOR") "\n" "\n" - "\n" + "\n" "<_item value=\"inside\">" N_("Inside") "\n" "<_item value=\"outside\">" N_("Outside") "\n" "<_item value=\"overlayed\">" N_("Overlayed") "\n" "\n" - "4\n" - "100\n" - "1\n" - "0.5\n" - "50\n" - "5\n" - "1\n" - "false\n" + "4\n" + "100\n" + "1\n" + "0.5\n" + "50\n" + "5\n" + "1\n" + "false\n" "\n" "\n" - "255\n" - "1\n" - "1\n" + "255\n" + "1\n" + "1\n" "\n" "\n" "\n" diff --git a/src/extension/internal/filter/overlays.h b/src/extension/internal/filter/overlays.h index 1ca745166..f6c0509c8 100644 --- a/src/extension/internal/filter/overlays.h +++ b/src/extension/internal/filter/overlays.h @@ -57,20 +57,20 @@ public: "org.inkscape.effect.filter.NoiseFill\n" "\n" "\n" - "\n" + "\n" "<_item value=\"fractalNoise\">" N_("Fractal noise") "\n" "<_item value=\"turbulence\">" N_("Turbulence") "\n" "\n" - "20\n" - "40\n" - "5\n" - "0\n" - "3\n" - "1\n" - "false\n" + "20\n" + "40\n" + "5\n" + "0\n" + "3\n" + "1\n" + "false\n" "\n" "\n" - "354957823\n" + "354957823\n" "\n" "\n" "\n" diff --git a/src/extension/internal/filter/paint.h b/src/extension/internal/filter/paint.h index 941177f39..43f4b6c90 100644 --- a/src/extension/internal/filter/paint.h +++ b/src/extension/internal/filter/paint.h @@ -72,32 +72,32 @@ public: "org.inkscape.effect.filter.Chromolitho\n" "\n" "\n" - "true\n" - "\n" + "true\n" + "\n" "<_item value=\"darken\">Darken\n" "<_item value=\"normal\">Normal\n" "<_item value=\"multiply\">Multiply\n" "<_item value=\"screen\">Screen\n" "<_item value=\"lighten\">Lighten\n" "\n" - "false\n" - "false\n" - "false\n" - "0\n" - "1\n" - "10\n" - "1\n" + "false\n" + "false\n" + "false\n" + "0\n" + "1\n" + "10\n" + "1\n" "\n" "\n" - "true\n" - "1000\n" - "1000\n" - "1\n" - "0\n" - "1\n" - "0\n" - "true\n" - "\n" + "true\n" + "1000\n" + "1000\n" + "1\n" + "0\n" + "1\n" + "0\n" + "true\n" + "\n" "<_item value=\"normal\">Normal\n" "<_item value=\"multiply\">Multiply\n" "<_item value=\"screen\">Screen\n" @@ -231,12 +231,12 @@ public: "\n" "" N_("Cross Engraving") "\n" "org.inkscape.effect.filter.CrossEngraving\n" - "30\n" - "1\n" - "0\n" - "0.5\n" - "4\n" - "false\n" + "30\n" + "1\n" + "0\n" + "0.5\n" + "4\n" + "false\n" "\n" "all\n" "\n" @@ -333,27 +333,27 @@ public: "\n" "\n" "<_param name=\"simplifyheader\" type=\"description\" appearance=\"header\">" N_("Simplify") "\n" - "0.6\n" - "10\n" - "0\n" - "false\n" + "0.6\n" + "10\n" + "0\n" + "false\n" "<_param name=\"smoothheader\" type=\"description\" appearance=\"header\">" N_("Smoothness") "\n" - "0.6\n" - "6\n" - "2\n" + "0.6\n" + "6\n" + "2\n" "<_param name=\"meltheader\" type=\"description\" appearance=\"header\">" N_("Melt") "\n" - "1\n" - "6\n" - "2\n" + "1\n" + "6\n" + "2\n" "\n" "\n" - "-1515870721\n" - "false\n" + "-1515870721\n" + "false\n" "\n" "\n" - "589505535\n" - "false\n" - "0\n" + "589505535\n" + "false\n" + "0\n" "\n" "\n" "\n" @@ -493,13 +493,13 @@ public: "\n" "" N_("Electrize") "\n" "org.inkscape.effect.filter.Electrize\n" - "2.0\n" - "\n" + "2.0\n" + "\n" "<_item value=\"table\">" N_("Table") "\n" "<_item value=\"discrete\">" N_("Discrete") "\n" "\n" - "3\n" - "false\n" + "3\n" + "false\n" "\n" "all\n" "\n" @@ -583,14 +583,14 @@ public: "\n" "" N_("Neon Draw") "\n" "org.inkscape.effect.filter.NeonDraw\n" - "\n" + "\n" "<_item value=\"table\">" N_("Smoothed") "\n" "<_item value=\"discrete\">" N_("Contrasted") "\n" "\n" - "3\n" - "3\n" - "1\n" - "\n" + "3\n" + "3\n" + "1\n" + "\n" "<_item value=\"normal\">Normal\n" "<_item value=\"multiply\">Multiply\n" "<_item value=\"screen\">Screen\n" @@ -688,34 +688,34 @@ public: "org.inkscape.effect.filter.PointEngraving\n" "\n" "\n" - "\n" + "\n" "<_item value=\"fractalNoise\">" N_("Fractal noise") "\n" "<_item value=\"turbulence\">" N_("Turbulence") "\n" "\n" - "100\n" - "100\n" - "1\n" - "0\n" - "45\n" - "\n" + "100\n" + "100\n" + "1\n" + "0\n" + "45\n" + "\n" "<_item value=\"multiply\">" N_("Multiply") "\n" "<_item value=\"normal\">" N_("Normal") "\n" "<_item value=\"screen\">" N_("Screen") "\n" "<_item value=\"lighten\">" N_("Lighten") "\n" "<_item value=\"darken\">" N_("Darken") "\n" "\n" - "2.5\n" - "1.3\n" - "0\n" - "0.5\n" + "2.5\n" + "1.3\n" + "0\n" + "0.5\n" "\n" "\n" - "-1\n" - "false\n" + "-1\n" + "false\n" "\n" "\n" - "1666789119\n" - "false\n" + "1666789119\n" + "false\n" "\n" "\n" "\n" @@ -849,27 +849,27 @@ public: "\n" "" N_("Poster Paint") "\n" "org.inkscape.effect.filter.Posterize\n" - "\n" + "\n" "<_item value=\"normal\">Normal\n" "<_item value=\"dented\">Dented\n" "\n" - "\n" + "\n" "<_item value=\"discrete\">" N_("Poster") "\n" "<_item value=\"table\">" N_("Painting") "\n" "\n" - "5\n" - "\n" + "5\n" + "\n" "<_item value=\"lighten\">Lighten\n" "<_item value=\"normal\">Normal\n" "<_item value=\"darken\">Darken\n" "<_item value=\"multiply\">Multiply\n" "<_item value=\"screen\">Screen\n" "\n" - "4.0\n" - "0.5\n" - "1.00\n" - "1.00\n" - "false\n" + "4.0\n" + "0.5\n" + "1.00\n" + "1.00\n" + "false\n" "\n" "all\n" "\n" @@ -972,8 +972,8 @@ public: "\n" "" N_("Posterize Basic") "\n" "org.inkscape.effect.filter.PosterizeBasic\n" - "5\n" - "4.0\n" + "5\n" + "4.0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/filter/protrusions.h b/src/extension/internal/filter/protrusions.h index 965a1bdc5..ad75d8896 100644 --- a/src/extension/internal/filter/protrusions.h +++ b/src/extension/internal/filter/protrusions.h @@ -47,7 +47,7 @@ public: "\n" "" N_("Snow crest") "\n" "org.inkscape.effect.filter.snow\n" - "3.5\n" + "3.5\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/filter/shadows.h b/src/extension/internal/filter/shadows.h index 0d54950bf..e69e05669 100644 --- a/src/extension/internal/filter/shadows.h +++ b/src/extension/internal/filter/shadows.h @@ -58,10 +58,10 @@ public: "org.inkscape.effect.filter.ColorDropShadow\n" "\n" "\n" - "3.0\n" - "6.0\n" - "6.0\n" - "\n" + "3.0\n" + "6.0\n" + "6.0\n" + "\n" "<_item value=\"outer\">" N_("Outer") "\n" "<_item value=\"inner\">" N_("Inner") "\n" "<_item value=\"outercut\">" N_("Outer cutout") "\n" @@ -70,8 +70,8 @@ public: "\n" "\n" "\n" - "127\n" - "false\n" + "127\n" + "false\n" "\n" "\n" "\n" diff --git a/src/extension/internal/filter/textures.h b/src/extension/internal/filter/textures.h index 32eef6054..a2584c627 100644 --- a/src/extension/internal/filter/textures.h +++ b/src/extension/internal/filter/textures.h @@ -61,18 +61,18 @@ public: "\n" "" N_("Ink Blot") "\n" "org.inkscape.effect.filter.InkBlot\n" - "\n" + "\n" "<_item value=\"fractalNoise\">Fractal noise\n" "<_item value=\"turbulence\">Turbulence\n" "\n" - "4\n" - "3\n" - "0\n" - "10\n" - "10\n" - "50\n" - "5\n" - "\n" + "4\n" + "3\n" + "0\n" + "10\n" + "10\n" + "50\n" + "5\n" + "\n" "<_item value=\"over\">" N_("Wide") "\n" "<_item value=\"atop\">" N_("Normal") "\n" "<_item value=\"in\">" N_("Narrow") "\n" @@ -81,9 +81,9 @@ public: "<_item value=\"arithmetic\">" N_("Custom") "\n" "\n" "<_param name=\"customHeader\" type=\"description\" appearance=\"header\">" N_("Custom stroke options") "\n" - "1.5\n" - "-0.25\n" - "0.5\n" + "1.5\n" + "-0.25\n" + "0.5\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/filter/transparency.h b/src/extension/internal/filter/transparency.h index dcbae26b5..da89498bb 100644 --- a/src/extension/internal/filter/transparency.h +++ b/src/extension/internal/filter/transparency.h @@ -52,11 +52,11 @@ public: "\n" "" N_("Blend") "\n" "org.inkscape.effect.filter.Blend\n" - "\n" + "\n" "<_item value=\"BackgroundImage\">" N_("Background") "\n" "<_item value=\"SourceGraphic\">" N_("Image") "\n" "\n" - "\n" + "\n" "<_item value=\"multiply\">" N_("Multiply") "\n" "<_item value=\"normal\">" N_("Normal") "\n" "<_item value=\"screen\">" N_("Screen") "\n" @@ -129,11 +129,11 @@ public: "\n" "" N_("Channel Transparency") "\n" "org.inkscape.effect.filter.ChannelTransparency\n" - "-1\n" - "0.5\n" - "0.5\n" - "1\n" - "false\n" + "-1\n" + "0.5\n" + "0.5\n" + "1\n" + "false\n" "\n" "all\n" "\n" @@ -204,10 +204,10 @@ public: "\n" "" N_("Light Eraser") "\n" "org.inkscape.effect.filter.LightEraser\n" - "50\n" - "100\n" - "1\n" - "false\n" + "50\n" + "100\n" + "1\n" + "false\n" "\n" "all\n" "\n" @@ -278,9 +278,9 @@ public: "\n" "" N_("Opacity") "\n" "org.inkscape.effect.filter.Opacity\n" - "5\n" - "1\n" - "1\n" + "5\n" + "1\n" + "1\n" "\n" "all\n" "\n" @@ -340,9 +340,9 @@ public: "\n" "" N_("Silhouette") "\n" "org.inkscape.effect.filter.Silhouette\n" - "0.01\n" - "false\n" - "255\n" + "0.01\n" + "false\n" + "255\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp index c15e28854..b30c67a4d 100644 --- a/src/extension/internal/gdkpixbuf-input.cpp +++ b/src/extension/internal/gdkpixbuf-input.cpp @@ -208,7 +208,7 @@ GdkpixbufInput::init(void) "<_option value='optimizeSpeed' >" N_("Blocky (optimizeSpeed)") "\n" "\n" - "false\n" + "false\n" "\n" ".%s\n" "%s\n" diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp index e6938b9e2..c766bd828 100644 --- a/src/extension/internal/grid.cpp +++ b/src/extension/internal/grid.cpp @@ -198,11 +198,11 @@ Grid::init (void) "\n" "" N_("Grid") "\n" "org.inkscape.effect.grid\n" - "1.0\n" - "10.0\n" - "10.0\n" - "0.0\n" - "0.0\n" + "1.0\n" + "10.0\n" + "10.0\n" + "0.0\n" + "0.0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp index b8b0c73de..c7226a58a 100644 --- a/src/extension/internal/wmf-inout.cpp +++ b/src/extension/internal/wmf-inout.cpp @@ -3193,15 +3193,15 @@ Wmf::init (void) "\n" "" N_("WMF Output") "\n" "org.inkscape.output.wmf\n" - "true\n" - "true\n" - "true\n" - "true\n" - "false\n" - "false\n" - "false\n" - "false\n" - "false\n" + "true\n" + "true\n" + "true\n" + "true\n" + "false\n" + "false\n" + "false\n" + "false\n" + "false\n" "\n" ".wmf\n" "image/x-wmf\n" diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp index 0ea15a5cd..2521dc1de 100644 --- a/src/extension/prefdialog.cpp +++ b/src/extension/prefdialog.cpp @@ -273,7 +273,7 @@ PrefDialog::on_response (int signal) { #include "internal/clear-n_.h" -const char * PrefDialog::live_param_xml = "false"; +const char * PrefDialog::live_param_xml = "false"; }; }; /* namespace Inkscape, Extension */ -- cgit v1.2.3 From 6ed2673499ca548767bb7d2edb453a228ece86fd Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sun, 12 Jun 2016 10:25:42 +0200 Subject: Optionally sort attributes and properties into a canonical order. Useful for comparing different versions of an SVG file. (bzr r14980) --- src/CMakeLists.txt | 2 + src/Makefile_insert | 1 + src/attribute-sort-util.cpp | 206 ++++++++++++++++++++++++++++++++++++++++++++ src/attribute-sort-util.h | 62 +++++++++++++ src/attributes.cpp | 91 ++++++++++--------- src/attributes.h | 101 ++++++++++++---------- src/preferences-skeleton.h | 3 +- src/xml/repr-io.cpp | 5 ++ 8 files changed, 383 insertions(+), 88 deletions(-) create mode 100644 src/attribute-sort-util.cpp create mode 100644 src/attribute-sort-util.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cf5130317..66f16b7fb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -10,6 +10,7 @@ set(sp_SRC attribute-rel-css.cpp attribute-rel-svg.cpp attribute-rel-util.cpp + attribute-sort-util.cpp sp-anchor.cpp sp-clippath.cpp sp-conn-end-pair.cpp @@ -92,6 +93,7 @@ set(sp_SRC attribute-rel-css.h attribute-rel-svg.h attribute-rel-util.h + attribute-sort-util.h sp-anchor.h sp-clippath.h sp-conn-end-pair.h diff --git a/src/Makefile_insert b/src/Makefile_insert index b9723ac42..55fde4dd2 100644 --- a/src/Makefile_insert +++ b/src/Makefile_insert @@ -8,6 +8,7 @@ ink_common_sources += \ attribute-rel-svg.cpp attribute-rel-svg.h \ attribute-rel-css.cpp attribute-rel-css.h \ attribute-rel-util.cpp attribute-rel-util.h \ + attribute-sort-util.cpp attribute-sort-util.h \ axis-manip.cpp axis-manip.h \ bad-uri-exception.h \ box3d.cpp box3d.h \ diff --git a/src/attribute-sort-util.cpp b/src/attribute-sort-util.cpp new file mode 100644 index 000000000..ef08a142f --- /dev/null +++ b/src/attribute-sort-util.cpp @@ -0,0 +1,206 @@ +/* + * attribute-sort-util.cpp + * + * Created on: Jun 10, 2016 + * Author: Tavmjong Bah + */ + +/** + * Utility functions for sorting attributes by name. + */ + +#include +#include +#include +#include +#include +#include // std::pair +#include // std::sort + +#include "attribute-sort-util.h" + +#include "xml/repr.h" +#include "xml/attribute-record.h" +#include "xml/sp-css-attr.h" + +#include "attributes.h" + +using Inkscape::XML::Node; +using Inkscape::XML::AttributeRecord; +using Inkscape::Util::List; + +/** + * Sort attributes by name. + */ +void sp_attribute_sort_tree(Node *repr) { + + g_return_if_fail (repr != NULL); + + sp_attribute_sort_recursive( repr ); +} + +/** + * Sort recursively over all elements. + */ +void sp_attribute_sort_recursive(Node *repr) { + + g_return_if_fail (repr != NULL); + + if( repr->type() == Inkscape::XML::ELEMENT_NODE ) { + Glib::ustring element = repr->name(); + + // Only sort elements in svg namespace + if( element.substr(0,4) == "svg:" ) { + sp_attribute_sort_element( repr ); + } + } + + for(Node *child=repr->firstChild() ; child ; child = child->next()) { + sp_attribute_sort_recursive( child ); + } +} + +/** + * Compare function + */ +bool cmp(std::pair< Glib::ustring, Glib::ustring > const &a, + std::pair< Glib::ustring, Glib::ustring > const &b) { + unsigned val_b = sp_attribute_lookup(b.first.c_str()); + if (val_b == 0) return true; // Unknown attributes at end. + return sp_attribute_lookup(a.first.c_str()) < val_b; +} + +/** + * Sort attributes on an element + */ +void sp_attribute_sort_element(Node *repr) { + + g_return_if_fail (repr != NULL); + g_return_if_fail (repr->type() == Inkscape::XML::ELEMENT_NODE); + + // Glib::ustring element = repr->name(); + // Glib::ustring id = (repr->attribute( "id" )==NULL ? "" : repr->attribute( "id" )); + + sp_attribute_sort_style(repr); + + // Sort attributes: + + // It doesn't seem possible to sort a List directly so we dump the list into + // a std::list and sort that. Not very efficient. Sad. + List attributes = repr->attributeList(); + + std::vector > my_list; + for ( List iter = attributes ; iter ; ++iter ) { + + Glib::ustring attribute = g_quark_to_string(iter->key); + Glib::ustring value = (const char*)iter->value; + + // C++11 my_list.emlace_back(attribute, value); + my_list.push_back(std::make_pair(attribute,value)); + } + std::sort(my_list.begin(), my_list.end(), cmp); + // Delete all attributes. + //for (auto it: my_list) { + for (std::vector >::iterator it = my_list.begin(); + it != my_list.end(); ++it) { + repr->setAttribute( it->first.c_str(), NULL, false ); + } + // Insert all attributes in proper order + for (std::vector >::iterator it = my_list.begin(); + it != my_list.end(); ++it) { + repr->setAttribute( it->first.c_str(), it->second.c_str(), false ); + } +} + + +/** + * Sort CSS style on an element. + */ +void sp_attribute_sort_style(Node *repr) { + + g_return_if_fail (repr != NULL); + g_return_if_fail (repr->type() == Inkscape::XML::ELEMENT_NODE); + + // Find element's style + SPCSSAttr *css = sp_repr_css_attr( repr, "style" ); + sp_attribute_sort_style(repr, css); + + // Convert css node's properties data to string and set repr node's attribute "style" to that string. + // sp_repr_css_set( repr, css, "style"); // Don't use as it will cause loop. + Glib::ustring value; + sp_repr_css_write_string(css, value); + if( value.empty() ) { + repr->setAttribute("style", NULL ); + } else { + repr->setAttribute("style", value.c_str()); + } + + sp_repr_css_attr_unref( css ); +} + + +/** + * Sort CSS style on an element. + */ +Glib::ustring sp_attribute_sort_style(Node *repr, gchar const *string) { + + g_return_val_if_fail (repr != NULL, NULL); + g_return_val_if_fail (repr->type() == Inkscape::XML::ELEMENT_NODE, NULL); + + SPCSSAttr *css = sp_repr_css_attr_new(); + sp_repr_css_attr_add_from_string( css, string ); + sp_attribute_sort_style(repr, css); + Glib::ustring string_cleaned; + sp_repr_css_write_string (css, string_cleaned); + + sp_repr_css_attr_unref( css ); + + return string_cleaned; +} + + +/** + * Sort CSS style on an element. + */ +void sp_attribute_sort_style(Node* repr, SPCSSAttr *css) { + + g_return_if_fail (repr != NULL); + g_return_if_fail (css != NULL); + + Glib::ustring element = repr->name(); + Glib::ustring id = (repr->attribute( "id" )==NULL ? "" : repr->attribute( "id" )); + + // Loop over all properties in "style" node. + std::vector > my_list; + for ( List iter = css->attributeList() ; iter ; ++iter ) { + + Glib::ustring property = g_quark_to_string(iter->key); + Glib::ustring value = (const char*)iter->value; + + // C++11 my_list.emlace_back(property, value); + my_list.push_back(std::make_pair(property,value)); + } + std::sort(my_list.begin(), my_list.end(), cmp); + // Delete all attributes. + //for (auto it: my_list) { + for (std::vector >::iterator it = my_list.begin(); + it != my_list.end(); ++it) { + sp_repr_css_set_property( css, it->first.c_str(), NULL ); + } + // Insert all attributes in proper order + for (std::vector >::iterator it = my_list.begin(); + it != my_list.end(); ++it) { + sp_repr_css_set_property( css, it->first.c_str(), it->second.c_str() ); + } +} + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/src/attribute-sort-util.h b/src/attribute-sort-util.h new file mode 100644 index 000000000..0b2f81ed9 --- /dev/null +++ b/src/attribute-sort-util.h @@ -0,0 +1,62 @@ +#ifndef __SP_ATTRIBUTE_SORT_UTIL_H__ +#define __SP_ATTRIBUTE_SORT_UTIL_H__ + +/* + * attribute-sort-util.h + * + * Created on: Jun 10, 2016 + * Author: Tavmjong Bah + */ + +#include +#include "xml/sp-css-attr.h" + +using Inkscape::XML::Node; + +/** + * Utility functions for sorting attributes. + */ + +/** + * Sort attributes by name. + */ +void sp_attribute_sort_tree(Node *repr); + +/** + * Recursively sort. + * repr: the root node in a document or any other node. + */ +void sp_attribute_sort_recursive(Node *repr); + +/** + * Sort one element (attributes). + */ +void sp_attribute_sort_element(Node *repr); + +/** + * Sort style properties for one element. + */ +void sp_attribute_sort_style(Node *repr); + +/** + * Sort style_property for a style string + */ +Glib::ustring sp_attribute_sort_style(Node *repr, gchar const *string); + +/** + * Sort style properties for one CSS. + */ +void sp_attribute_sort_style(Node* repr, SPCSSAttr *css); + +#endif /* __SP_ATTRIBUTE_SORT_UTIL_H__ */ + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : diff --git a/src/attributes.cpp b/src/attributes.cpp index 24c16d5fc..e281dad65 100644 --- a/src/attributes.cpp +++ b/src/attributes.cpp @@ -420,11 +420,49 @@ static SPStyleProp const props[] = { {SP_ATTR_TEXT_EXCLUDE,"inkscape:excludeShape"}, {SP_ATTR_LAYOUT_OPTIONS,"inkscape:layoutOptions"}, - /* CSS2 */ - {SP_PROP_INKSCAPE_FONT_SPEC, "-inkscape-font-specification"}, + /* CSS & SVG Properites */ + + /* Paint */ + {SP_PROP_COLOR, "color"}, + {SP_PROP_OPACITY, "opacity"}, + {SP_PROP_FILL, "fill"}, + {SP_PROP_FILL_OPACITY, "fill-opacity"}, + {SP_PROP_FILL_RULE, "fill-rule"}, + {SP_PROP_STROKE, "stroke"}, + {SP_PROP_STROKE_OPACITY, "stroke-opacity"}, + {SP_PROP_STROKE_WIDTH, "stroke-width"}, + {SP_PROP_STROKE_LINECAP, "stroke-linecap"}, + {SP_PROP_STROKE_LINEJOIN, "stroke-linejoin"}, + {SP_PROP_STROKE_MITERLIMIT, "stroke-miterlimit"}, + {SP_PROP_STROKE_DASHARRAY, "stroke-dasharray"}, + {SP_PROP_STROKE_DASHOFFSET, "stroke-dashoffset"}, + {SP_PROP_MARKER, "marker"}, + {SP_PROP_MARKER_END, "marker-end"}, + {SP_PROP_MARKER_MID, "marker-mid"}, + {SP_PROP_MARKER_START, "marker-start"}, + {SP_PROP_PAINT_ORDER, "paint-order" }, + {SP_PROP_SOLID_COLOR, "solid-color"}, + {SP_PROP_SOLID_OPACITY, "solid-opacity"}, + + /* CSS Blending/Compositing */ + {SP_PROP_MIX_BLEND_MODE, "mix-blend-mode"}, + {SP_PROP_ISOLATION, "isolation"}, + + /* Misc. Display */ + {SP_PROP_DISPLAY, "display"}, + {SP_PROP_OVERFLOW, "overflow"}, + {SP_PROP_VISIBILITY, "visibility"}, + + /* Clip/Mask */ + {SP_PROP_CLIP, "clip"}, + {SP_PROP_CLIP_PATH, "clip-path"}, + {SP_PROP_CLIP_RULE, "clip-rule"}, + {SP_PROP_MASK, "mask"}, + /* Font */ {SP_PROP_FONT, "font"}, {SP_PROP_FONT_FAMILY, "font-family"}, + {SP_PROP_INKSCAPE_FONT_SPEC, "-inkscape-font-specification"}, {SP_PROP_FONT_SIZE, "font-size"}, {SP_PROP_FONT_SIZE_ADJUST, "font-size-adjust"}, {SP_PROP_FONT_STRETCH, "font-stretch"}, @@ -449,7 +487,7 @@ static SPStyleProp const props[] = { {SP_PROP_WORD_SPACING, "word-spacing"}, {SP_PROP_TEXT_TRANSFORM, "text-transform"}, - /* Text (css3) */ + /* Text (CSS3) */ {SP_PROP_DIRECTION, "direction"}, {SP_PROP_WRITING_MODE, "writing-mode"}, {SP_PROP_TEXT_ORIENTATION, "text-orientation"}, @@ -470,70 +508,43 @@ static SPStyleProp const props[] = { {SP_PROP_SHAPE_MARGIN, "shape-margin"}, /* Text Decoration */ - {SP_PROP_TEXT_DECORATION, "text-decoration"}, + {SP_PROP_TEXT_DECORATION, "text-decoration"}, // CSS 2/CSS3-Shorthand {SP_PROP_TEXT_DECORATION_LINE, "text-decoration-line"}, {SP_PROP_TEXT_DECORATION_STYLE, "text-decoration-style"}, {SP_PROP_TEXT_DECORATION_COLOR, "text-decoration-color"}, {SP_PROP_TEXT_DECORATION_FILL, "text-decoration-fill"}, {SP_PROP_TEXT_DECORATION_STROKE,"text-decoration-stroke"}, - /* Misc */ - {SP_PROP_CLIP, "clip"}, - {SP_PROP_COLOR, "color"}, - {SP_PROP_CURSOR, "cursor"}, - {SP_PROP_DISPLAY, "display"}, - {SP_PROP_OVERFLOW, "overflow"}, - {SP_PROP_VISIBILITY, "visibility"}, - {SP_PROP_MIX_BLEND_MODE, "mix-blend-mode"}, // CSS Blending and Compositing - {SP_PROP_ISOLATION, "isolation"}, - /* SVG */ - /* Clip/Mask */ - {SP_PROP_CLIP_PATH, "clip-path"}, - {SP_PROP_CLIP_RULE, "clip-rule"}, - {SP_PROP_MASK, "mask"}, - {SP_PROP_OPACITY, "opacity"}, /* Filter */ {SP_PROP_ENABLE_BACKGROUND, "enable-background"}, {SP_PROP_FILTER, "filter"}, {SP_PROP_FLOOD_COLOR, "flood-color"}, {SP_PROP_FLOOD_OPACITY, "flood-opacity"}, {SP_PROP_LIGHTING_COLOR, "lighting-color"}, + /* Gradient */ {SP_PROP_STOP_COLOR, "stop-color"}, {SP_PROP_STOP_OPACITY, "stop-opacity"}, {SP_PROP_STOP_PATH, "path"}, - /* Interactivity */ - {SP_PROP_POINTER_EVENTS, "pointer-events"}, - /* Paint */ + + /* Rendering */ {SP_PROP_COLOR_INTERPOLATION, "color-interpolation"}, {SP_PROP_COLOR_INTERPOLATION_FILTERS, "color-interpolation-filters"}, {SP_PROP_COLOR_PROFILE, "color-profile"}, {SP_PROP_COLOR_RENDERING, "color-rendering"}, - {SP_PROP_FILL, "fill"}, - {SP_PROP_FILL_OPACITY, "fill-opacity"}, - {SP_PROP_FILL_RULE, "fill-rule"}, {SP_PROP_IMAGE_RENDERING, "image-rendering"}, - {SP_PROP_MARKER, "marker"}, - {SP_PROP_MARKER_END, "marker-end"}, - {SP_PROP_MARKER_MID, "marker-mid"}, - {SP_PROP_MARKER_START, "marker-start"}, - {SP_PROP_PAINT_ORDER, "paint-order" }, {SP_PROP_SHAPE_RENDERING, "shape-rendering"}, - {SP_PROP_SOLID_COLOR, "solid-color"}, - {SP_PROP_SOLID_OPACITY, "solid-opacity"}, - {SP_PROP_STROKE, "stroke"}, - {SP_PROP_STROKE_DASHARRAY, "stroke-dasharray"}, - {SP_PROP_STROKE_DASHOFFSET, "stroke-dashoffset"}, - {SP_PROP_STROKE_LINECAP, "stroke-linecap"}, - {SP_PROP_STROKE_LINEJOIN, "stroke-linejoin"}, - {SP_PROP_STROKE_MITERLIMIT, "stroke-miterlimit"}, - {SP_PROP_STROKE_OPACITY, "stroke-opacity"}, - {SP_PROP_STROKE_WIDTH, "stroke-width"}, {SP_PROP_TEXT_RENDERING, "text-rendering"}, + + /* Interactivity */ + {SP_PROP_POINTER_EVENTS, "pointer-events"}, + {SP_PROP_CURSOR, "cursor"}, + /* Conditional */ {SP_PROP_SYSTEM_LANGUAGE, "systemLanguage"}, {SP_PROP_REQUIRED_FEATURES, "requiredFeatures"}, {SP_PROP_REQUIRED_EXTENSIONS, "requiredExtensions"}, + /* LivePathEffect */ {SP_PROP_PATH_EFFECT, "effect"}, }; diff --git a/src/attributes.h b/src/attributes.h index e82db5f2a..ff426e8cf 100644 --- a/src/attributes.h +++ b/src/attributes.h @@ -24,6 +24,13 @@ unsigned char const *sp_attribute_name(unsigned int id); */ #define SP_ATTRIBUTE_IS_CSS(k) (((k) >= SP_PROP_INKSCAPE_FONT_SPEC) && ((k) <= SP_PROP_TEXT_RENDERING)) +/* + * Do not change order of attributes and properties. Attribute and + * order in an SVG file is (optionally) determined by the order here. + * This makes comparing different versions of a drawing easier using + * line-by-line comparison. Also, inorder for proper parsing, some + * properites must be before others (e.g. 'font' before 'font-family'). + */ enum SPAttributeEnum { SP_ATTR_INVALID, ///< Must have value 0. /* SPObject */ @@ -420,14 +427,49 @@ enum SPAttributeEnum { SP_ATTR_TEXT_EXCLUDE, SP_ATTR_LAYOUT_OPTIONS, - /* CSS & SVG Properties */ + /* CSS & SVG Properties KEEP ORDER */ - /* Custom full font name because Font stuff below is inadequate REMOVE ME */ - SP_PROP_INKSCAPE_FONT_SPEC, + /* Paint */ + SP_PROP_COLOR, + SP_PROP_OPACITY, + SP_PROP_FILL, + SP_PROP_FILL_OPACITY, + SP_PROP_FILL_RULE, + SP_PROP_STROKE, + SP_PROP_STROKE_OPACITY, + SP_PROP_STROKE_WIDTH, + SP_PROP_STROKE_LINECAP, + SP_PROP_STROKE_LINEJOIN, + SP_PROP_STROKE_MITERLIMIT, + SP_PROP_STROKE_DASHARRAY, + SP_PROP_STROKE_DASHOFFSET, + SP_PROP_MARKER, + SP_PROP_MARKER_END, + SP_PROP_MARKER_MID, + SP_PROP_MARKER_START, + SP_PROP_PAINT_ORDER, /* SVG2 */ + SP_PROP_SOLID_COLOR, + SP_PROP_SOLID_OPACITY, + + /* CSS Blending/Compositing */ + SP_PROP_MIX_BLEND_MODE, + SP_PROP_ISOLATION, + + /* Misc. Display */ + SP_PROP_DISPLAY, + SP_PROP_OVERFLOW, + SP_PROP_VISIBILITY, - /* Font */ + /* Clip/Mask */ + SP_PROP_CLIP, + SP_PROP_CLIP_PATH, + SP_PROP_CLIP_RULE, + SP_PROP_MASK, + + /* Font: Order is important! */ SP_PROP_FONT, SP_PROP_FONT_FAMILY, + SP_PROP_INKSCAPE_FONT_SPEC, // Remove me SP_PROP_FONT_SIZE, SP_PROP_FONT_SIZE_ADJUST, SP_PROP_FONT_STRETCH, @@ -447,12 +489,12 @@ enum SPAttributeEnum { /* Text Layout */ SP_PROP_TEXT_INDENT, SP_PROP_TEXT_ALIGN, - SP_PROP_LINE_HEIGHT, SP_PROP_LETTER_SPACING, SP_PROP_WORD_SPACING, SP_PROP_TEXT_TRANSFORM, + /* Text (CSS3) */ SP_PROP_DIRECTION, SP_PROP_WRITING_MODE, SP_PROP_TEXT_ORIENTATION, @@ -472,32 +514,14 @@ enum SPAttributeEnum { SP_PROP_SHAPE_PADDING, SP_PROP_SHAPE_MARGIN, - /* Text Decoration CSS 2/CSS 3 Shorthand */ - SP_PROP_TEXT_DECORATION, - /* Text Decoration CSS 3/SVG 2 */ + /* Text Decoration */ + SP_PROP_TEXT_DECORATION, // CSS 2/CSS3-Shorthand SP_PROP_TEXT_DECORATION_LINE, SP_PROP_TEXT_DECORATION_STYLE, SP_PROP_TEXT_DECORATION_COLOR, SP_PROP_TEXT_DECORATION_FILL, SP_PROP_TEXT_DECORATION_STROKE, - /* Misc */ - SP_PROP_CLIP, - SP_PROP_COLOR, - SP_PROP_CURSOR, - SP_PROP_DISPLAY, - SP_PROP_OVERFLOW, - SP_PROP_VISIBILITY, - SP_PROP_MIX_BLEND_MODE, - SP_PROP_ISOLATION, - - /* SVG */ - /* Clip/Mask */ - SP_PROP_CLIP_PATH, - SP_PROP_CLIP_RULE, - SP_PROP_MASK, - SP_PROP_OPACITY, - /* Filter */ SP_PROP_ENABLE_BACKGROUND, SP_PROP_FILTER, @@ -510,36 +534,19 @@ enum SPAttributeEnum { SP_PROP_STOP_OPACITY, SP_PROP_STOP_PATH, - /* Interactivity */ - SP_PROP_POINTER_EVENTS, - - /* Paint */ + /* Rendering */ SP_PROP_COLOR_INTERPOLATION, SP_PROP_COLOR_INTERPOLATION_FILTERS, SP_PROP_COLOR_PROFILE, SP_PROP_COLOR_RENDERING, - SP_PROP_FILL, - SP_PROP_FILL_OPACITY, - SP_PROP_FILL_RULE, SP_PROP_IMAGE_RENDERING, - SP_PROP_MARKER, - SP_PROP_MARKER_END, - SP_PROP_MARKER_MID, - SP_PROP_MARKER_START, - SP_PROP_PAINT_ORDER, /* SVG2 */ SP_PROP_SHAPE_RENDERING, - SP_PROP_SOLID_COLOR, - SP_PROP_SOLID_OPACITY, - SP_PROP_STROKE, - SP_PROP_STROKE_DASHARRAY, - SP_PROP_STROKE_DASHOFFSET, - SP_PROP_STROKE_LINECAP, - SP_PROP_STROKE_LINEJOIN, - SP_PROP_STROKE_MITERLIMIT, - SP_PROP_STROKE_OPACITY, - SP_PROP_STROKE_WIDTH, SP_PROP_TEXT_RENDERING, + /* Interactivity */ + SP_PROP_POINTER_EVENTS, + SP_PROP_CURSOR, + /* Conditional */ SP_PROP_SYSTEM_LANGUAGE, SP_PROP_REQUIRED_FEATURES, diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h index 5ccc4d729..38196a58e 100644 --- a/src/preferences-skeleton.h +++ b/src/preferences-skeleton.h @@ -338,7 +338,8 @@ static char const preferences_skeleton[] = " style_defaults_remove=\"0\" " " check_on_reading=\"0\" " " check_on_editing=\"0\" " -" check_on_writing=\"0\"/>\n" +" check_on_writing=\"0\" " +" sort_attributes=\"0\"/>\n" " \n" " \n" diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp index 4a6f59b43..6977bc1e2 100644 --- a/src/xml/repr-io.cpp +++ b/src/xml/repr-io.cpp @@ -34,6 +34,7 @@ #include "extension/extension.h" #include "attribute-rel-util.h" +#include "attribute-sort-util.h" #include "preferences.h" @@ -882,6 +883,10 @@ static void sp_repr_write_stream_root_element(Node *repr, Writer &out, bool clean = prefs->getBool("/options/svgoutput/check_on_writing"); if (clean) sp_attribute_clean_tree( repr ); + // Sort attributes in a canonical order (helps with "diffing" SVG files). + bool sort = prefs->getBool("/options/svgoutput/sort_attributes"); + if (sort) sp_attribute_sort_tree( repr ); + Glib::QueryQuark xml_prefix=g_quark_from_static_string("xml"); NSMap ns_map; -- cgit v1.2.3 From e11ce77d83deacc72bdd785670f2b756c570e374 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sun, 12 Jun 2016 15:01:22 +0200 Subject: Fix errors do to previous commit. (We have two attribute-test files.) (bzr r14981) --- testfiles/src/attributes-test.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testfiles/src/attributes-test.cpp b/testfiles/src/attributes-test.cpp index 41c0274ec..e53eb9aef 100644 --- a/testfiles/src/attributes-test.cpp +++ b/testfiles/src/attributes-test.cpp @@ -1,3 +1,4 @@ + /* * Unit tests for attributes. * @@ -406,6 +407,8 @@ std::vector getKnownAttrs() AttributeInfo("inkscape:layoutOptions", true), AttributeInfo("inkscape:lockguides", true), AttributeInfo("inkscape:locked", true), + AttributeInfo("inkscape:measure-end", true), + AttributeInfo("inkscape:measure-start", true), AttributeInfo("inkscape:object-nodes", true), AttributeInfo("inkscape:object-paths", true), AttributeInfo("inkscape:original", true), @@ -431,6 +434,7 @@ std::vector getKnownAttrs() AttributeInfo("inkscape:snap-nodes", true), AttributeInfo("inkscape:snap-object-midpoints", true), AttributeInfo("inkscape:snap-others", true), + AttributeInfo("inkscape:snap-from-guide", true), AttributeInfo("inkscape:snap-page", true), AttributeInfo("inkscape:snap-path-clip", true), AttributeInfo("inkscape:snap-path-mask", true), @@ -460,11 +464,11 @@ std::vector getKnownAttrs() AttributeInfo("sodipodi:argument", true), AttributeInfo("sodipodi:cx", true), AttributeInfo("sodipodi:cy", true), + AttributeInfo("sodipodi:docname", true), AttributeInfo("sodipodi:end", true), AttributeInfo("sodipodi:expansion", true), AttributeInfo("sodipodi:insensitive", true), AttributeInfo("sodipodi:linespacing", true), - AttributeInfo("sodipodi:nonprintable", true), AttributeInfo("sodipodi:open", true), AttributeInfo("sodipodi:original", true), AttributeInfo("sodipodi:r1", true), @@ -477,6 +481,7 @@ std::vector getKnownAttrs() AttributeInfo("sodipodi:sides", true), AttributeInfo("sodipodi:start", true), AttributeInfo("sodipodi:t0", true), + AttributeInfo("sodipodi:type", true), AttributeInfo("sodipodi:version", false), // SPMeshPatch -- cgit v1.2.3 From edc19028160caa0d92b943232483ba76fa8ea75b Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sun, 12 Jun 2016 18:27:42 +0200 Subject: Fix bug 'Persistent measure repositions on middle click' Fixed bugs: - https://launchpad.net/bugs/1591662 (bzr r14982) --- src/ui/tools/measure-tool.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp index 5900a2359..0977729ae 100644 --- a/src/ui/tools/measure-tool.cpp +++ b/src/ui/tools/measure-tool.cpp @@ -565,7 +565,6 @@ bool MeasureTool::root_handler(GdkEvent* event) explicit_base = boost::none; explicit_base_tmp = boost::none; last_end = boost::none; - start_p = desktop->w2d(button_w); if (event->button.button == 1 && !this->space_panning) { // save drag origin -- cgit v1.2.3 From 51cd1dfb720642e51b811558ddead6cd47ceee0f Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sun, 12 Jun 2016 20:08:22 +0200 Subject: Fix faulty comparison function. (bzr r14983) --- src/attribute-sort-util.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/attribute-sort-util.cpp b/src/attribute-sort-util.cpp index ef08a142f..d0f45c418 100644 --- a/src/attribute-sort-util.cpp +++ b/src/attribute-sort-util.cpp @@ -65,9 +65,11 @@ void sp_attribute_sort_recursive(Node *repr) { */ bool cmp(std::pair< Glib::ustring, Glib::ustring > const &a, std::pair< Glib::ustring, Glib::ustring > const &b) { + unsigned val_a = sp_attribute_lookup(a.first.c_str()); unsigned val_b = sp_attribute_lookup(b.first.c_str()); - if (val_b == 0) return true; // Unknown attributes at end. - return sp_attribute_lookup(a.first.c_str()) < val_b; + if (val_a == 0) return false; // Unknown attributes at end. + if (val_b == 0) return true; // Unknown attributes at end. + return val_a < val_b; } /** -- cgit v1.2.3 From 35fc5dc7a7667ad3e79b409fb588c1cc56e2ab57 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Mon, 13 Jun 2016 00:10:49 +0200 Subject: Fix a helper path data (bzr r14984) --- src/live_effects/lpe-transform_2pts.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/live_effects/lpe-transform_2pts.cpp b/src/live_effects/lpe-transform_2pts.cpp index 1cd59b7fa..3c4ce0708 100644 --- a/src/live_effects/lpe-transform_2pts.cpp +++ b/src/live_effects/lpe-transform_2pts.cpp @@ -434,7 +434,7 @@ LPETransform2Pts::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector< } if(!lock_angle && lock_lenght) { char const * svgd; - svgd = "m 7.07,7.07 c -3.9,3.91 -10.24,3.91 -14.14,0 -3.91,-3.9 -3.91,-10.24 0,-14.14 3.9,-3.91 10.24,-3.91 14.14,0 l -2.83,-4.24 -0.7,2.12"; + svgd = "M 0,9.94 C -2.56,9.91 -5.17,8.98 -7.07,7.07 c -3.91,-3.9 -3.91,-10.24 0,-14.14 1.97,-1.97 4.51,-3.02 7.07,-3.04 2.56,0.02 5.1,1.07 7.07,3.04 3.91,3.9 3.91,10.24 0,14.14 C 5.17,8.98 2.56,9.91 0,9.94 Z"; PathVector pathv_turn = sp_svg_read_pathv(svgd); pathv_turn *= Geom::Rotate(previous_angle); pathv_turn *= Affine(r,0,0,r,0,0) * Translate(Geom::Point(end)); -- cgit v1.2.3 From f7d5ac2dec231e37eca5e23ab32144dd0a12bf63 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Tue, 14 Jun 2016 07:24:40 +0200 Subject: [Bug #1407331] Ukrainian translation update for 0.92. Fixed bugs: - https://launchpad.net/bugs/1407331 (bzr r14985) --- po/uk.po | 1460 ++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 752 insertions(+), 708 deletions(-) diff --git a/po/uk.po b/po/uk.po index 0b49b31dc..32df22f9e 100644 --- a/po/uk.po +++ b/po/uk.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: uk\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2016-06-02 12:12+0200\n" -"PO-Revision-Date: 2016-05-29 11:47+0300\n" +"POT-Creation-Date: 2016-06-13 13:39+0300\n" +"PO-Revision-Date: 2016-06-13 13:50+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -706,7 +706,8 @@ msgstr "Чорна діра" #: ../share/filters/filters.svg.h:279 ../share/filters/filters.svg.h:835 #: ../share/filters/filters.svg.h:839 ../share/filters/filters.svg.h:843 #: ../src/extension/internal/filter/morphology.h:76 -#: ../src/extension/internal/filter/morphology.h:203 ../src/filter-enums.cpp:32 +#: ../src/extension/internal/filter/morphology.h:203 +#: ../src/filter-enums.cpp:32 msgid "Morphology" msgstr "Морфологія" @@ -3418,1033 +3419,1033 @@ msgstr "Сукно (растр)" msgid "Old paint (bitmap)" msgstr "Стара картина (растр)" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:2 msgctxt "Symbol" -msgid "AIGA Symbol Signs" -msgstr "Знаки-символи AIGA" +msgid "United States National Park Service Map Symbols" +msgstr "Символи карт служб національних парків США" -#. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:3 ../share/symbols/symbols.h:4 -#: ../share/symbols/symbols.h:281 ../share/symbols/symbols.h:282 msgctxt "Symbol" -msgid "Telephone" -msgstr "Телефон" +msgid "Airport" +msgstr "Аеропорт" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:5 ../share/symbols/symbols.h:6 msgctxt "Symbol" -msgid "Mail" -msgstr "Пошта" +msgid "Amphitheatre" +msgstr "Амфітеатр" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:7 ../share/symbols/symbols.h:8 msgctxt "Symbol" -msgid "Currency Exchange" -msgstr "Обмін валют" +msgid "Bicycle Trail" +msgstr "Велосипедна траса" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:9 ../share/symbols/symbols.h:10 msgctxt "Symbol" -msgid "Currency Exchange - Euro" -msgstr "Обмін валют — євро" +msgid "Boat Launch" +msgstr "Місце спуску човнів" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:11 ../share/symbols/symbols.h:12 msgctxt "Symbol" -msgid "Cashier" -msgstr "Каса" +msgid "Boat Tour" +msgstr "Човновий маршрут" -#. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:13 ../share/symbols/symbols.h:14 -#: ../share/symbols/symbols.h:213 ../share/symbols/symbols.h:214 msgctxt "Symbol" -msgid "First Aid" -msgstr "Перша допомога" +msgid "Bus Stop" +msgstr "Автобусна зупинка" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:15 ../share/symbols/symbols.h:16 msgctxt "Symbol" -msgid "Lost and Found" -msgstr "Втрачено і знайдено" +msgid "Campfire" +msgstr "Місце для багаття" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:17 ../share/symbols/symbols.h:18 msgctxt "Symbol" -msgid "Coat Check" -msgstr "Гардероб" +msgid "Campground" +msgstr "Майданчик для табору" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:19 ../share/symbols/symbols.h:20 msgctxt "Symbol" -msgid "Baggage Lockers" -msgstr "Шафи для зберігання речей" +msgid "CanoeAccess" +msgstr "Доступ до каное" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:21 ../share/symbols/symbols.h:22 msgctxt "Symbol" -msgid "Escalator" -msgstr "Ескалатор" +msgid "Crosscountry Ski Trail" +msgstr "Траса для лижного кросу" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:23 ../share/symbols/symbols.h:24 msgctxt "Symbol" -msgid "Escalator Down" -msgstr "Ескалатор вниз" +msgid "Downhill Skiing" +msgstr "Лижний спуск" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:25 ../share/symbols/symbols.h:26 msgctxt "Symbol" -msgid "Escalator Up" -msgstr "Ескалатор вгору" +msgid "Drinking Water" +msgstr "Питна вода" +#. Symbols: ./MapSymbolsNPS.svg #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:27 ../share/symbols/symbols.h:28 +#: ../share/symbols/symbols.h:172 ../share/symbols/symbols.h:173 msgctxt "Symbol" -msgid "Stairs" -msgstr "Сходи" +msgid "First Aid" +msgstr "Перша допомога" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:29 ../share/symbols/symbols.h:30 msgctxt "Symbol" -msgid "Stairs Down" -msgstr "Сходи вниз" +msgid "Fishing" +msgstr "Риболовля" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:31 ../share/symbols/symbols.h:32 msgctxt "Symbol" -msgid "Stairs Up" -msgstr "Сходи вгору" +msgid "Food Service" +msgstr "Служба харчування" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:33 ../share/symbols/symbols.h:34 msgctxt "Symbol" -msgid "Elevator" -msgstr "Ліфт" +msgid "Four Wheel Drive Road" +msgstr "Дорога для чотириколісних машин" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:35 ../share/symbols/symbols.h:36 msgctxt "Symbol" -msgid "Toilets - Men" -msgstr "Чоловічий туалет" +msgid "Gas Station" +msgstr "Автозаправка" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:37 ../share/symbols/symbols.h:38 msgctxt "Symbol" -msgid "Toilets - Women" -msgstr "Жіночий туалет" +msgid "Golfing" +msgstr "Гольф" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:39 ../share/symbols/symbols.h:40 msgctxt "Symbol" -msgid "Toilets" -msgstr "Туалети" +msgid "Horseback Riding" +msgstr "Траса для кінської їзди" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:41 ../share/symbols/symbols.h:42 msgctxt "Symbol" -msgid "Nursery" -msgstr "Ясла" +msgid "Hospital" +msgstr "Лікарня" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:43 ../share/symbols/symbols.h:44 msgctxt "Symbol" -msgid "Drinking Fountain" -msgstr "Питний фонтанчик" +msgid "Ice Skating" +msgstr "Катання на ковзанах" +#. Symbols: ./MapSymbolsNPS.svg #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:45 ../share/symbols/symbols.h:46 +#: ../share/symbols/symbols.h:206 ../share/symbols/symbols.h:207 msgctxt "Symbol" -msgid "Waiting Room" -msgstr "Зала очікування" +msgid "Information" +msgstr "Довідкова служба" -#. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:47 ../share/symbols/symbols.h:48 -#: ../share/symbols/symbols.h:231 ../share/symbols/symbols.h:232 msgctxt "Symbol" -msgid "Information" -msgstr "Довідкова служба" +msgid "Litter Receptacle" +msgstr "Сховище нош" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:49 ../share/symbols/symbols.h:50 msgctxt "Symbol" -msgid "Hotel Information" -msgstr "Інформація щодо готелів" +msgid "Lodging" +msgstr "Кімнати" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:51 ../share/symbols/symbols.h:52 msgctxt "Symbol" -msgid "Air Transportation" -msgstr "Повітряний транспорт" +msgid "Marina" +msgstr "Пристань" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:53 ../share/symbols/symbols.h:54 msgctxt "Symbol" -msgid "Heliport" -msgstr "Вертодром" +msgid "Motorbike Trail" +msgstr "Траса для мотоциклів" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:55 ../share/symbols/symbols.h:56 msgctxt "Symbol" -msgid "Taxi" -msgstr "Таксі" +msgid "Radiator Water" +msgstr "Вода для опалювання" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:57 ../share/symbols/symbols.h:58 msgctxt "Symbol" -msgid "Bus" -msgstr "Автобус" +msgid "Recycling" +msgstr "Пункт переробки" +#. Symbols: ./MapSymbolsNPS.svg #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:59 ../share/symbols/symbols.h:60 +#: ../share/symbols/symbols.h:258 ../share/symbols/symbols.h:259 msgctxt "Symbol" -msgid "Ground Transportation" -msgstr "Наземний транспорт" +msgid "Parking" +msgstr "Паркувальний майданчик" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:61 ../share/symbols/symbols.h:62 msgctxt "Symbol" -msgid "Rail Transportation" -msgstr "Залізничний транспорт" +msgid "Pets On Leash" +msgstr "Домашні тварини на повідді" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:63 ../share/symbols/symbols.h:64 msgctxt "Symbol" -msgid "Water Transportation" -msgstr "Водний транспорт" +msgid "Picnic Area" +msgstr "Місце для пікніків" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:65 ../share/symbols/symbols.h:66 msgctxt "Symbol" -msgid "Car Rental" -msgstr "Оренда автомобілів" +msgid "Post Office" +msgstr "Поштове відділення" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:67 ../share/symbols/symbols.h:68 msgctxt "Symbol" -msgid "Restaurant" -msgstr "Ресторан" +msgid "Ranger Station" +msgstr "Станція рейнджерів" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:69 ../share/symbols/symbols.h:70 msgctxt "Symbol" -msgid "Coffeeshop" -msgstr "Кав’ярня" +msgid "RV Campground" +msgstr "Майданчик для трейлерів" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:71 ../share/symbols/symbols.h:72 msgctxt "Symbol" -msgid "Bar" -msgstr "Бар" +msgid "Restrooms" +msgstr "Туалети" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:73 ../share/symbols/symbols.h:74 msgctxt "Symbol" -msgid "Shops" -msgstr "Крамниці" +msgid "Sailing" +msgstr "Парусний спорт" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:75 ../share/symbols/symbols.h:76 msgctxt "Symbol" -msgid "Barber Shop - Beauty Salon" -msgstr "Перукарня і салон краси" +msgid "Sanitary Disposal Station" +msgstr "Станція утилізації відходів" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:77 ../share/symbols/symbols.h:78 msgctxt "Symbol" -msgid "Barber Shop" -msgstr "Перукарня" +msgid "Scuba Diving" +msgstr "Пірнання з аквалангом" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:79 ../share/symbols/symbols.h:80 msgctxt "Symbol" -msgid "Beauty Salon" -msgstr "Салон краси" +msgid "Self Guided Trail" +msgstr "Стежка для самостійного огляду" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:81 ../share/symbols/symbols.h:82 msgctxt "Symbol" -msgid "Ticket Purchase" -msgstr "Придбання квитків" +msgid "Shelter" +msgstr "Притулок" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:83 ../share/symbols/symbols.h:84 msgctxt "Symbol" -msgid "Baggage Check In" -msgstr "Приймання багажу" +msgid "Showers" +msgstr "Душові" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:85 ../share/symbols/symbols.h:86 msgctxt "Symbol" -msgid "Baggage Claim" -msgstr "Видача багажу" +msgid "Sledding" +msgstr "Катання на санях" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:87 ../share/symbols/symbols.h:88 msgctxt "Symbol" -msgid "Customs" -msgstr "Митні послуги" +msgid "SnowmobileTrail" +msgstr "Траса для снігоходів" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:89 ../share/symbols/symbols.h:90 msgctxt "Symbol" -msgid "Immigration" -msgstr "Міграційна служба" +msgid "Stable" +msgstr "Стайня" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:91 ../share/symbols/symbols.h:92 msgctxt "Symbol" -msgid "Departing Flights" -msgstr "Відправлення" +msgid "Store" +msgstr "Склад" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:93 ../share/symbols/symbols.h:94 msgctxt "Symbol" -msgid "Arriving Flights" -msgstr "Прибуття" +msgid "Swimming" +msgstr "Плавання" +#. Symbols: ./MapSymbolsNPS.svg #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:95 ../share/symbols/symbols.h:96 +#: ../share/symbols/symbols.h:162 ../share/symbols/symbols.h:163 msgctxt "Symbol" -msgid "Smoking" -msgstr "Місце для куріння" +msgid "Telephone" +msgstr "Телефон" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:97 ../share/symbols/symbols.h:98 msgctxt "Symbol" -msgid "No Smoking" -msgstr "Куріння заборонено" +msgid "Emergency Telephone" +msgstr "Телефон виклику служб надзвичайних ситуацій" -#. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:99 ../share/symbols/symbols.h:100 -#: ../share/symbols/symbols.h:245 ../share/symbols/symbols.h:246 msgctxt "Symbol" -msgid "Parking" -msgstr "Паркувальний майданчик" +msgid "Trailhead" +msgstr "Початок маршруту" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:101 ../share/symbols/symbols.h:102 msgctxt "Symbol" -msgid "No Parking" -msgstr "Паркування заборонено" +msgid "Wheelchair Accessible" +msgstr "Візок" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:103 ../share/symbols/symbols.h:104 msgctxt "Symbol" -msgid "No Dogs" -msgstr "Вигулювання собак заборонено" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:105 ../share/symbols/symbols.h:106 -msgctxt "Symbol" -msgid "No Entry" -msgstr "Вхід заборонено" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:107 ../share/symbols/symbols.h:108 -msgctxt "Symbol" -msgid "Exit" -msgstr "Вихід" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:109 ../share/symbols/symbols.h:110 -msgctxt "Symbol" -msgid "Fire Extinguisher" -msgstr "Вогнегасник" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:111 ../share/symbols/symbols.h:112 -msgctxt "Symbol" -msgid "Right Arrow" -msgstr "Стрілка праворуч" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:113 ../share/symbols/symbols.h:114 -msgctxt "Symbol" -msgid "Forward and Right Arrow" -msgstr "Стрілка вперед і праворуч" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:115 ../share/symbols/symbols.h:116 -msgctxt "Symbol" -msgid "Up Arrow" -msgstr "Стрілка вгору" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:117 ../share/symbols/symbols.h:118 -msgctxt "Symbol" -msgid "Forward and Left Arrow" -msgstr "Стрілка вперед і ліворуч" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:119 ../share/symbols/symbols.h:120 -msgctxt "Symbol" -msgid "Left Arrow" -msgstr "Стрілка ліворуч" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:121 ../share/symbols/symbols.h:122 -msgctxt "Symbol" -msgid "Left and Down Arrow" -msgstr "Стрілка ліворуч і вниз" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:123 ../share/symbols/symbols.h:124 -msgctxt "Symbol" -msgid "Down Arrow" -msgstr "Стрілка вниз" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:125 ../share/symbols/symbols.h:126 -msgctxt "Symbol" -msgid "Right and Down Arrow" -msgstr "Стрілка праворуч і вниз" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:127 ../share/symbols/symbols.h:128 -msgctxt "Symbol" -msgid "NPS Wheelchair Accessible - 1996" -msgstr "Візок NPS — 1996" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:129 ../share/symbols/symbols.h:130 -msgctxt "Symbol" -msgid "NPS Wheelchair Accessible" -msgstr "Візок NPS" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:131 ../share/symbols/symbols.h:132 -msgctxt "Symbol" -msgid "New Wheelchair Accessible" -msgstr "Новий візок" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:133 -msgctxt "Symbol" -msgid "Word Balloons" -msgstr "Мовні бульки" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:134 -msgctxt "Symbol" -msgid "Thought Balloon" -msgstr "Булька думок" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:135 -msgctxt "Symbol" -msgid "Dream Speaking" -msgstr "Висловлення мрій" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:136 -msgctxt "Symbol" -msgid "Rounded Balloon" -msgstr "Заокруглена булька" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:137 -msgctxt "Symbol" -msgid "Squared Balloon" -msgstr "Квадрата булька" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:138 -msgctxt "Symbol" -msgid "Over the Phone" -msgstr "Телефоном" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:139 -msgctxt "Symbol" -msgid "Hip Balloon" -msgstr "Булька смутку" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:140 -msgctxt "Symbol" -msgid "Circle Balloon" -msgstr "Кругова булька" +msgid "Wind Surfing" +msgstr "Віндсерфінг" -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:141 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:105 msgctxt "Symbol" -msgid "Exclaim Balloon" -msgstr "Булька вигуку" +msgid "Blank" +msgstr "Порожньо" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:142 +#: ../share/symbols/symbols.h:106 msgctxt "Symbol" msgid "Flow Chart Shapes" msgstr "Форми блок-схем" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:143 +#: ../share/symbols/symbols.h:107 msgctxt "Symbol" msgid "Process" msgstr "Обробляти" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:144 +#: ../share/symbols/symbols.h:108 msgctxt "Symbol" msgid "Input/Output" msgstr "Вхід/Вихід" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:145 +#: ../share/symbols/symbols.h:109 msgctxt "Symbol" msgid "Document" msgstr "Документ" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:146 +#: ../share/symbols/symbols.h:110 msgctxt "Symbol" msgid "Manual Operation" msgstr "Ручна дія" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:147 +#: ../share/symbols/symbols.h:111 msgctxt "Symbol" msgid "Preparation" msgstr "Підготовка" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:148 +#: ../share/symbols/symbols.h:112 msgctxt "Symbol" msgid "Merge" msgstr "Об’єднання" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:149 +#: ../share/symbols/symbols.h:113 msgctxt "Symbol" msgid "Decision" msgstr "Рішення" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:150 +#: ../share/symbols/symbols.h:114 msgctxt "Symbol" msgid "Magnetic Tape" msgstr "Магнітна стрічка" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:151 +#: ../share/symbols/symbols.h:115 msgctxt "Symbol" msgid "Display" msgstr "Показ" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:152 +#: ../share/symbols/symbols.h:116 msgctxt "Symbol" msgid "Auxiliary Operation" msgstr "Допоміжна операція" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:153 +#: ../share/symbols/symbols.h:117 msgctxt "Symbol" msgid "Manual Input" msgstr "Ручний ввід" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:154 +#: ../share/symbols/symbols.h:118 msgctxt "Symbol" msgid "Extract" msgstr "Видобування" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:155 +#: ../share/symbols/symbols.h:119 msgctxt "Symbol" msgid "Terminal/Interrupt" msgstr "Завершення/Переривання" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:156 +#: ../share/symbols/symbols.h:120 msgctxt "Symbol" msgid "Punched Card" msgstr "Перфокартка" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:157 +#: ../share/symbols/symbols.h:121 msgctxt "Symbol" msgid "Punch Tape" msgstr "Перфострічка" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:158 +#: ../share/symbols/symbols.h:122 msgctxt "Symbol" msgid "Online Storage" msgstr "Сховище даних у мережі" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:159 +#: ../share/symbols/symbols.h:123 msgctxt "Symbol" msgid "Keying" msgstr "Набір" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:160 +#: ../share/symbols/symbols.h:124 msgctxt "Symbol" msgid "Sort" msgstr "Упорядкування" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:161 +#: ../share/symbols/symbols.h:125 msgctxt "Symbol" msgid "Connector" msgstr "З’єднання" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:162 +#: ../share/symbols/symbols.h:126 msgctxt "Symbol" msgid "Off-Page Connector" msgstr "З'єднання поза сторінкою" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:163 +#: ../share/symbols/symbols.h:127 msgctxt "Symbol" msgid "Transmittal Tape" msgstr "Передавальна стрічка" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:164 +#: ../share/symbols/symbols.h:128 msgctxt "Symbol" msgid "Communication Link" msgstr "З’єднання для обміну даними" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:165 +#: ../share/symbols/symbols.h:129 msgctxt "Symbol" msgid "Collate" msgstr "Об’єднання" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:166 +#: ../share/symbols/symbols.h:130 msgctxt "Symbol" msgid "Comment/Annotation" msgstr "Коментар/Анотація" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:167 +#: ../share/symbols/symbols.h:131 msgctxt "Symbol" msgid "Core" msgstr "Ядро" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:168 +#: ../share/symbols/symbols.h:132 msgctxt "Symbol" msgid "Predefined Process" msgstr "Наперед визначений процес" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:169 +#: ../share/symbols/symbols.h:133 msgctxt "Symbol" msgid "Magnetic Disk (Database)" msgstr "Магнітний диск (база даних)" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:170 +#: ../share/symbols/symbols.h:134 msgctxt "Symbol" msgid "Magnetic Drum (Direct Access)" msgstr "Магнітний барабан (безпосередній доступ)" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:171 +#: ../share/symbols/symbols.h:135 msgctxt "Symbol" msgid "Offline Storage" msgstr "Автономне сховище даних" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:172 +#: ../share/symbols/symbols.h:136 msgctxt "Symbol" msgid "Logical Or" msgstr "Логічне «АБО»" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:173 +#: ../share/symbols/symbols.h:137 msgctxt "Symbol" msgid "Logical And" msgstr "Логічне «ТА»" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:174 +#: ../share/symbols/symbols.h:138 msgctxt "Symbol" msgid "Delay" msgstr "Затримка" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:175 +#: ../share/symbols/symbols.h:139 msgctxt "Symbol" msgid "Loop Limit Begin" msgstr "Початок циклу" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:176 +#: ../share/symbols/symbols.h:140 msgctxt "Symbol" msgid "Loop Limit End" msgstr "Кінець циклу" +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:141 +msgctxt "Symbol" +msgid "Word Balloons" +msgstr "Мовні бульки" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:142 +msgctxt "Symbol" +msgid "Thought Balloon" +msgstr "Булька думок" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:143 +msgctxt "Symbol" +msgid "Dream Speaking" +msgstr "Висловлення мрій" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:144 +msgctxt "Symbol" +msgid "Rounded Balloon" +msgstr "Заокруглена булька" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:145 +msgctxt "Symbol" +msgid "Squared Balloon" +msgstr "Квадрата булька" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:146 +msgctxt "Symbol" +msgid "Over the Phone" +msgstr "Телефоном" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:147 +msgctxt "Symbol" +msgid "Hip Balloon" +msgstr "Булька смутку" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:148 +msgctxt "Symbol" +msgid "Circle Balloon" +msgstr "Кругова булька" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:149 +msgctxt "Symbol" +msgid "Exclaim Balloon" +msgstr "Булька вигуку" + #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:177 +#: ../share/symbols/symbols.h:150 msgctxt "Symbol" msgid "Logic Symbols" msgstr "Символи логіки" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:178 +#: ../share/symbols/symbols.h:151 msgctxt "Symbol" msgid "Xnor Gate" msgstr "Ключ виключне заперечувальне АБО»" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:179 +#: ../share/symbols/symbols.h:152 msgctxt "Symbol" msgid "Xor Gate" msgstr "Ключ виключне І" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:180 +#: ../share/symbols/symbols.h:153 msgctxt "Symbol" msgid "Nor Gate" msgstr "Ключ АБО-НІ" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:181 +#: ../share/symbols/symbols.h:154 msgctxt "Symbol" msgid "Or Gate" msgstr "Ключ АБО" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:182 +#: ../share/symbols/symbols.h:155 msgctxt "Symbol" msgid "Nand Gate" msgstr "Ключ І-НІ" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:183 +#: ../share/symbols/symbols.h:156 msgctxt "Symbol" msgid "And Gate" msgstr "Ключ І" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:184 +#: ../share/symbols/symbols.h:157 msgctxt "Symbol" msgid "Buffer" msgstr "Буфер" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:185 +#: ../share/symbols/symbols.h:158 msgctxt "Symbol" msgid "Not Gate" msgstr "Ключ НІ" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:186 +#: ../share/symbols/symbols.h:159 msgctxt "Symbol" msgid "Buffer Small" msgstr "Малий буфер" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:187 +#: ../share/symbols/symbols.h:160 msgctxt "Symbol" msgid "Not Gate Small" msgstr "Малий ключ НІ" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:188 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:161 msgctxt "Symbol" -msgid "United States National Park Service Map Symbols" -msgstr "Символи карт служб національних парків США" +msgid "AIGA Symbol Signs" +msgstr "Знаки-символи AIGA" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:189 ../share/symbols/symbols.h:190 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:164 ../share/symbols/symbols.h:165 msgctxt "Symbol" -msgid "Airport" -msgstr "Аеропорт" +msgid "Mail" +msgstr "Пошта" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:191 ../share/symbols/symbols.h:192 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:166 ../share/symbols/symbols.h:167 msgctxt "Symbol" -msgid "Amphitheatre" -msgstr "Амфітеатр" +msgid "Currency Exchange" +msgstr "Обмін валют" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:193 ../share/symbols/symbols.h:194 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:168 ../share/symbols/symbols.h:169 msgctxt "Symbol" -msgid "Bicycle Trail" -msgstr "Велосипедна траса" +msgid "Currency Exchange - Euro" +msgstr "Обмін валют — євро" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:195 ../share/symbols/symbols.h:196 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:170 ../share/symbols/symbols.h:171 msgctxt "Symbol" -msgid "Boat Launch" -msgstr "Місце спуску човнів" +msgid "Cashier" +msgstr "Каса" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:197 ../share/symbols/symbols.h:198 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:174 ../share/symbols/symbols.h:175 msgctxt "Symbol" -msgid "Boat Tour" -msgstr "Човновий маршрут" +msgid "Lost and Found" +msgstr "Втрачено і знайдено" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:199 ../share/symbols/symbols.h:200 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:176 ../share/symbols/symbols.h:177 msgctxt "Symbol" -msgid "Bus Stop" -msgstr "Автобусна зупинка" +msgid "Coat Check" +msgstr "Гардероб" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:201 ../share/symbols/symbols.h:202 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:178 ../share/symbols/symbols.h:179 msgctxt "Symbol" -msgid "Campfire" -msgstr "Місце для багаття" +msgid "Baggage Lockers" +msgstr "Шафи для зберігання речей" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:203 ../share/symbols/symbols.h:204 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:180 ../share/symbols/symbols.h:181 msgctxt "Symbol" -msgid "Campground" -msgstr "Майданчик для табору" +msgid "Escalator" +msgstr "Ескалатор" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:205 ../share/symbols/symbols.h:206 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:182 ../share/symbols/symbols.h:183 msgctxt "Symbol" -msgid "CanoeAccess" -msgstr "Доступ до каное" +msgid "Escalator Down" +msgstr "Ескалатор вниз" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:207 ../share/symbols/symbols.h:208 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:184 ../share/symbols/symbols.h:185 msgctxt "Symbol" -msgid "Crosscountry Ski Trail" -msgstr "Траса для лижного кросу" +msgid "Escalator Up" +msgstr "Ескалатор вгору" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:209 ../share/symbols/symbols.h:210 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:186 ../share/symbols/symbols.h:187 msgctxt "Symbol" -msgid "Downhill Skiing" -msgstr "Лижний спуск" +msgid "Stairs" +msgstr "Сходи" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:211 ../share/symbols/symbols.h:212 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:188 ../share/symbols/symbols.h:189 msgctxt "Symbol" -msgid "Drinking Water" -msgstr "Питна вода" +msgid "Stairs Down" +msgstr "Сходи вниз" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:215 ../share/symbols/symbols.h:216 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:190 ../share/symbols/symbols.h:191 msgctxt "Symbol" -msgid "Fishing" -msgstr "Риболовля" +msgid "Stairs Up" +msgstr "Сходи вгору" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:217 ../share/symbols/symbols.h:218 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:192 ../share/symbols/symbols.h:193 msgctxt "Symbol" -msgid "Food Service" -msgstr "Служба харчування" +msgid "Elevator" +msgstr "Ліфт" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:219 ../share/symbols/symbols.h:220 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:194 ../share/symbols/symbols.h:195 msgctxt "Symbol" -msgid "Four Wheel Drive Road" -msgstr "Дорога для чотириколісних машин" +msgid "Toilets - Men" +msgstr "Чоловічий туалет" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:221 ../share/symbols/symbols.h:222 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:196 ../share/symbols/symbols.h:197 msgctxt "Symbol" -msgid "Gas Station" -msgstr "Автозаправка" +msgid "Toilets - Women" +msgstr "Жіночий туалет" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:223 ../share/symbols/symbols.h:224 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:198 ../share/symbols/symbols.h:199 msgctxt "Symbol" -msgid "Golfing" -msgstr "Гольф" +msgid "Toilets" +msgstr "Туалети" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:225 ../share/symbols/symbols.h:226 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:200 ../share/symbols/symbols.h:201 msgctxt "Symbol" -msgid "Horseback Riding" -msgstr "Траса для кінської їзди" +msgid "Nursery" +msgstr "Ясла" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:227 ../share/symbols/symbols.h:228 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:202 ../share/symbols/symbols.h:203 msgctxt "Symbol" -msgid "Hospital" -msgstr "Лікарня" +msgid "Drinking Fountain" +msgstr "Питний фонтанчик" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:229 ../share/symbols/symbols.h:230 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:204 ../share/symbols/symbols.h:205 msgctxt "Symbol" -msgid "Ice Skating" -msgstr "Катання на ковзанах" +msgid "Waiting Room" +msgstr "Зала очікування" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:233 ../share/symbols/symbols.h:234 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:208 ../share/symbols/symbols.h:209 msgctxt "Symbol" -msgid "Litter Receptacle" -msgstr "Сховище нош" +msgid "Hotel Information" +msgstr "Інформація щодо готелів" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:235 ../share/symbols/symbols.h:236 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:210 ../share/symbols/symbols.h:211 msgctxt "Symbol" -msgid "Lodging" -msgstr "Кімнати" +msgid "Air Transportation" +msgstr "Повітряний транспорт" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:237 ../share/symbols/symbols.h:238 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:212 ../share/symbols/symbols.h:213 msgctxt "Symbol" -msgid "Marina" -msgstr "Пристань" +msgid "Heliport" +msgstr "Вертодром" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:239 ../share/symbols/symbols.h:240 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:214 ../share/symbols/symbols.h:215 msgctxt "Symbol" -msgid "Motorbike Trail" -msgstr "Траса для мотоциклів" +msgid "Taxi" +msgstr "Таксі" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:241 ../share/symbols/symbols.h:242 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:216 ../share/symbols/symbols.h:217 msgctxt "Symbol" -msgid "Radiator Water" -msgstr "Вода для опалювання" +msgid "Bus" +msgstr "Автобус" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:243 ../share/symbols/symbols.h:244 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:218 ../share/symbols/symbols.h:219 msgctxt "Symbol" -msgid "Recycling" -msgstr "Пункт переробки" +msgid "Ground Transportation" +msgstr "Наземний транспорт" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:247 ../share/symbols/symbols.h:248 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:220 ../share/symbols/symbols.h:221 msgctxt "Symbol" -msgid "Pets On Leash" -msgstr "Домашні тварини на повідді" +msgid "Rail Transportation" +msgstr "Залізничний транспорт" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:249 ../share/symbols/symbols.h:250 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:222 ../share/symbols/symbols.h:223 msgctxt "Symbol" -msgid "Picnic Area" -msgstr "Місце для пікніків" +msgid "Water Transportation" +msgstr "Водний транспорт" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:251 ../share/symbols/symbols.h:252 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:224 ../share/symbols/symbols.h:225 msgctxt "Symbol" -msgid "Post Office" -msgstr "Поштове відділення" +msgid "Car Rental" +msgstr "Оренда автомобілів" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:253 ../share/symbols/symbols.h:254 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:226 ../share/symbols/symbols.h:227 msgctxt "Symbol" -msgid "Ranger Station" -msgstr "Станція рейнджерів" +msgid "Restaurant" +msgstr "Ресторан" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:255 ../share/symbols/symbols.h:256 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:228 ../share/symbols/symbols.h:229 msgctxt "Symbol" -msgid "RV Campground" -msgstr "Майданчик для трейлерів" +msgid "Coffeeshop" +msgstr "Кав’ярня" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:257 ../share/symbols/symbols.h:258 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:230 ../share/symbols/symbols.h:231 msgctxt "Symbol" -msgid "Restrooms" -msgstr "Туалети" +msgid "Bar" +msgstr "Бар" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:259 ../share/symbols/symbols.h:260 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:232 ../share/symbols/symbols.h:233 msgctxt "Symbol" -msgid "Sailing" -msgstr "Парусний спорт" +msgid "Shops" +msgstr "Крамниці" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:261 ../share/symbols/symbols.h:262 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:234 ../share/symbols/symbols.h:235 msgctxt "Symbol" -msgid "Sanitary Disposal Station" -msgstr "Станція утилізації відходів" +msgid "Barber Shop - Beauty Salon" +msgstr "Перукарня і салон краси" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:263 ../share/symbols/symbols.h:264 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:236 ../share/symbols/symbols.h:237 msgctxt "Symbol" -msgid "Scuba Diving" -msgstr "Пірнання з аквалангом" +msgid "Barber Shop" +msgstr "Перукарня" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:265 ../share/symbols/symbols.h:266 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:238 ../share/symbols/symbols.h:239 msgctxt "Symbol" -msgid "Self Guided Trail" -msgstr "Стежка для самостійного огляду" +msgid "Beauty Salon" +msgstr "Салон краси" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:267 ../share/symbols/symbols.h:268 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:240 ../share/symbols/symbols.h:241 msgctxt "Symbol" -msgid "Shelter" -msgstr "Притулок" +msgid "Ticket Purchase" +msgstr "Придбання квитків" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:269 ../share/symbols/symbols.h:270 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:242 ../share/symbols/symbols.h:243 msgctxt "Symbol" -msgid "Showers" -msgstr "Душові" +msgid "Baggage Check In" +msgstr "Приймання багажу" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:271 ../share/symbols/symbols.h:272 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:244 ../share/symbols/symbols.h:245 msgctxt "Symbol" -msgid "Sledding" -msgstr "Катання на санях" +msgid "Baggage Claim" +msgstr "Видача багажу" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:273 ../share/symbols/symbols.h:274 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:246 ../share/symbols/symbols.h:247 msgctxt "Symbol" -msgid "SnowmobileTrail" -msgstr "Траса для снігоходів" +msgid "Customs" +msgstr "Митні послуги" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:275 ../share/symbols/symbols.h:276 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:248 ../share/symbols/symbols.h:249 msgctxt "Symbol" -msgid "Stable" -msgstr "Стайня" +msgid "Immigration" +msgstr "Міграційна служба" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:277 ../share/symbols/symbols.h:278 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:250 ../share/symbols/symbols.h:251 msgctxt "Symbol" -msgid "Store" -msgstr "Склад" +msgid "Departing Flights" +msgstr "Відправлення" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:279 ../share/symbols/symbols.h:280 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:252 ../share/symbols/symbols.h:253 msgctxt "Symbol" -msgid "Swimming" -msgstr "Плавання" +msgid "Arriving Flights" +msgstr "Прибуття" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:283 ../share/symbols/symbols.h:284 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:254 ../share/symbols/symbols.h:255 msgctxt "Symbol" -msgid "Emergency Telephone" -msgstr "Телефон виклику служб надзвичайних ситуацій" +msgid "Smoking" +msgstr "Місце для куріння" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:285 ../share/symbols/symbols.h:286 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:256 ../share/symbols/symbols.h:257 msgctxt "Symbol" -msgid "Trailhead" -msgstr "Початок маршруту" +msgid "No Smoking" +msgstr "Куріння заборонено" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:287 ../share/symbols/symbols.h:288 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:260 ../share/symbols/symbols.h:261 msgctxt "Symbol" -msgid "Wheelchair Accessible" -msgstr "Візок" +msgid "No Parking" +msgstr "Паркування заборонено" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:289 ../share/symbols/symbols.h:290 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:262 ../share/symbols/symbols.h:263 msgctxt "Symbol" -msgid "Wind Surfing" -msgstr "Віндсерфінг" +msgid "No Dogs" +msgstr "Вигулювання собак заборонено" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:291 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:264 ../share/symbols/symbols.h:265 msgctxt "Symbol" -msgid "Blank" -msgstr "Порожньо" +msgid "No Entry" +msgstr "Вхід заборонено" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:266 ../share/symbols/symbols.h:267 +msgctxt "Symbol" +msgid "Exit" +msgstr "Вихід" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:268 ../share/symbols/symbols.h:269 +msgctxt "Symbol" +msgid "Fire Extinguisher" +msgstr "Вогнегасник" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:270 ../share/symbols/symbols.h:271 +msgctxt "Symbol" +msgid "Right Arrow" +msgstr "Стрілка праворуч" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:272 ../share/symbols/symbols.h:273 +msgctxt "Symbol" +msgid "Forward and Right Arrow" +msgstr "Стрілка вперед і праворуч" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:274 ../share/symbols/symbols.h:275 +msgctxt "Symbol" +msgid "Up Arrow" +msgstr "Стрілка вгору" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:276 ../share/symbols/symbols.h:277 +msgctxt "Symbol" +msgid "Forward and Left Arrow" +msgstr "Стрілка вперед і ліворуч" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:278 ../share/symbols/symbols.h:279 +msgctxt "Symbol" +msgid "Left Arrow" +msgstr "Стрілка ліворуч" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:280 ../share/symbols/symbols.h:281 +msgctxt "Symbol" +msgid "Left and Down Arrow" +msgstr "Стрілка ліворуч і вниз" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:282 ../share/symbols/symbols.h:283 +msgctxt "Symbol" +msgid "Down Arrow" +msgstr "Стрілка вниз" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:284 ../share/symbols/symbols.h:285 +msgctxt "Symbol" +msgid "Right and Down Arrow" +msgstr "Стрілка праворуч і вниз" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:286 ../share/symbols/symbols.h:287 +msgctxt "Symbol" +msgid "NPS Wheelchair Accessible - 1996" +msgstr "Візок NPS — 1996" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:288 ../share/symbols/symbols.h:289 +msgctxt "Symbol" +msgid "NPS Wheelchair Accessible" +msgstr "Візок NPS" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:290 ../share/symbols/symbols.h:291 +msgctxt "Symbol" +msgid "New Wheelchair Accessible" +msgstr "Новий візок" #: ../share/templates/templates.h:1 msgid "CD Label 120mmx120mm " @@ -4500,16 +4501,16 @@ msgstr "типографічне полотно з напрямними" msgid "3D Box" msgstr "Просторовий об'єкт" -#: ../src/color-profile.cpp:842 +#: ../src/color-profile.cpp:856 #, c-format msgid "Color profiles directory (%s) is unavailable." msgstr "Каталог з профілями кольорів (%s) недоступний." -#: ../src/color-profile.cpp:901 ../src/color-profile.cpp:918 +#: ../src/color-profile.cpp:928 ../src/color-profile.cpp:945 msgid "(invalid UTF-8 string)" msgstr "(некоректний рядок UTF-8)" -#: ../src/color-profile.cpp:903 +#: ../src/color-profile.cpp:930 msgctxt "Profile name" msgid "None" msgstr "Немає" @@ -4917,21 +4918,21 @@ msgstr "Кратність проміжку між лініями сітки" msgid " to " msgstr " у " -#: ../src/document.cpp:531 +#: ../src/document.cpp:526 #, c-format msgid "New document %d" msgstr "Новий документ %d" -#: ../src/document.cpp:536 +#: ../src/document.cpp:531 #, c-format msgid "Memory document %d" msgstr "Документ у пам'яті %d" -#: ../src/document.cpp:565 +#: ../src/document.cpp:560 msgid "Memory document %1" msgstr "Документ у пам'яті %1" -#: ../src/document.cpp:864 +#: ../src/document.cpp:859 #, c-format msgid "Unnamed document %d" msgstr "Документ без назви %d" @@ -5087,7 +5088,7 @@ msgstr "" "відвідайте сайт Inkscape або запитайте у списках листування, якщо у вас " "виникли питання, що стосуються цього додатка." -#: ../src/extension/implementation/script.cpp:1108 +#: ../src/extension/implementation/script.cpp:1111 msgid "" "Inkscape has received additional data from the script executed. The script " "did not return an error, but this may indicate the results will not be as " @@ -5127,7 +5128,8 @@ msgstr "Адаптивна постеризація" #: ../src/ui/widget/page-sizer.cpp:249 #: ../src/widgets/calligraphy-toolbar.cpp:430 #: ../src/widgets/eraser-toolbar.cpp:154 ../src/widgets/spray-toolbar.cpp:297 -#: ../src/widgets/tweak-toolbar.cpp:128 ../share/extensions/foldablebox.inx.h:2 +#: ../src/widgets/tweak-toolbar.cpp:128 +#: ../share/extensions/foldablebox.inx.h:2 msgid "Width:" msgstr "Ширина:" @@ -6590,13 +6592,15 @@ msgid "Transparency type:" msgstr "Тип прозорості:" #: ../src/extension/internal/filter/bumps.h:353 -#: ../src/extension/internal/filter/morphology.h:176 ../src/filter-enums.cpp:91 +#: ../src/extension/internal/filter/morphology.h:176 +#: ../src/filter-enums.cpp:91 msgid "Atop" msgstr "Згори (Atop)" #: ../src/extension/internal/filter/bumps.h:354 #: ../src/extension/internal/filter/distort.h:70 -#: ../src/extension/internal/filter/morphology.h:174 ../src/filter-enums.cpp:89 +#: ../src/extension/internal/filter/morphology.h:174 +#: ../src/filter-enums.cpp:89 msgid "In" msgstr "Вхід" @@ -7110,7 +7114,8 @@ msgid "Felt Feather" msgstr "Фетрове розтушування" #: ../src/extension/internal/filter/distort.h:71 -#: ../src/extension/internal/filter/morphology.h:175 ../src/filter-enums.cpp:90 +#: ../src/extension/internal/filter/morphology.h:175 +#: ../src/filter-enums.cpp:90 msgid "Out" msgstr "Вихід" @@ -7306,11 +7311,13 @@ msgstr "Приховати зображення" msgid "Composite type:" msgstr "Тип суміщення:" -#: ../src/extension/internal/filter/morphology.h:173 ../src/filter-enums.cpp:88 +#: ../src/extension/internal/filter/morphology.h:173 +#: ../src/filter-enums.cpp:88 msgid "Over" msgstr "Накладання" -#: ../src/extension/internal/filter/morphology.h:177 ../src/filter-enums.cpp:92 +#: ../src/extension/internal/filter/morphology.h:177 +#: ../src/filter-enums.cpp:92 msgid "XOR" msgstr "Виключне АБО (XOR)" @@ -7384,8 +7391,8 @@ msgstr "Заливання шумом" #: ../src/ui/dialog/tracedialog.cpp:747 #: ../share/extensions/color_HSL_adjust.inx.h:2 #: ../share/extensions/color_custom.inx.h:2 -#: ../share/extensions/color_randomize.inx.h:2 ../share/extensions/dots.inx.h:2 -#: ../share/extensions/dxf_input.inx.h:2 +#: ../share/extensions/color_randomize.inx.h:2 +#: ../share/extensions/dots.inx.h:2 ../share/extensions/dxf_input.inx.h:2 #: ../share/extensions/dxf_outlines.inx.h:2 #: ../share/extensions/gcodetools_area.inx.h:29 #: ../share/extensions/gcodetools_engraving.inx.h:7 @@ -7988,13 +7995,15 @@ msgstr "Вертикальний зсув:" #: ../src/extension/internal/grid.cpp:209 #: ../src/ui/dialog/inkscape-preferences.cpp:1532 #: ../share/extensions/draw_from_triangle.inx.h:58 -#: ../share/extensions/eqtexsvg.inx.h:4 ../share/extensions/foldablebox.inx.h:9 +#: ../share/extensions/eqtexsvg.inx.h:4 +#: ../share/extensions/foldablebox.inx.h:9 #: ../share/extensions/funcplot.inx.h:38 #: ../share/extensions/grid_cartesian.inx.h:23 #: ../share/extensions/grid_isometric.inx.h:11 #: ../share/extensions/grid_polar.inx.h:22 #: ../share/extensions/guides_creator.inx.h:25 -#: ../share/extensions/hershey.inx.h:52 ../share/extensions/layout_nup.inx.h:35 +#: ../share/extensions/hershey.inx.h:52 +#: ../share/extensions/layout_nup.inx.h:35 #: ../share/extensions/lindenmayer.inx.h:34 #: ../share/extensions/nicechart.inx.h:45 #: ../share/extensions/param_curves.inx.h:30 @@ -8354,7 +8363,8 @@ msgid "Map all fill patterns to standard WMF hatches" msgstr "Пов’язати усі заповнення візерунками зі стандартними шаблонами WMF" #: ../src/extension/internal/wmf-inout.cpp:3208 -#: ../share/extensions/wmf_input.inx.h:2 ../share/extensions/wmf_output.inx.h:2 +#: ../share/extensions/wmf_input.inx.h:2 +#: ../share/extensions/wmf_output.inx.h:2 msgid "Windows Metafile (*.wmf)" msgstr "Метафайл Windows (*.wmf)" @@ -8390,42 +8400,42 @@ msgstr "Не вдається визначити формат файла. Фай msgid "default.svg" msgstr "типовий.svg" -#: ../src/file.cpp:332 +#: ../src/file.cpp:338 msgid "Broken links have been changed to point to existing files." msgstr "Помилкові посилання змінено так, щоб вони вказували на поточні файли." -#: ../src/file.cpp:343 ../src/file.cpp:1278 +#: ../src/file.cpp:349 ../src/file.cpp:1292 #, c-format msgid "Failed to load the requested file %s" msgstr "Не вдається завантажити потрібний файл %s" -#: ../src/file.cpp:369 +#: ../src/file.cpp:375 msgid "Document not saved yet. Cannot revert." msgstr "" "Документ ще не був збережений. Неможливо повернутись до попереднього стану." -#: ../src/file.cpp:375 +#: ../src/file.cpp:381 msgid "Changes will be lost! Are you sure you want to reload document %1?" msgstr "" "Зміни буде втрачено! Ви впевнені, що бажаєте перезавантажити документ %1?" -#: ../src/file.cpp:401 +#: ../src/file.cpp:407 msgid "Document reverted." msgstr "Документ повернутий до попереднього стану." -#: ../src/file.cpp:403 +#: ../src/file.cpp:409 msgid "Document not reverted." msgstr "Документ не повернутий до попереднього стану." -#: ../src/file.cpp:553 +#: ../src/file.cpp:559 msgid "Select file to open" msgstr "Виберіть файл" -#: ../src/file.cpp:635 +#: ../src/file.cpp:641 msgid "Clean up document" msgstr "Очистити документ" -#: ../src/file.cpp:642 +#: ../src/file.cpp:648 #, c-format msgid "Removed %i unused definition in <defs>." msgid_plural "Removed %i unused definitions in <defs>." @@ -8433,11 +8443,11 @@ msgstr[0] "Вилучено %i непотрібний елемент у & msgstr[1] "Вилучено %i непотрібні елементи у <defs>." msgstr[2] "Вилучено %i непотрібних елементів у <defs>." -#: ../src/file.cpp:647 +#: ../src/file.cpp:653 msgid "No unused definitions in <defs>." msgstr "Немає непотрібних елементів у <defs>." -#: ../src/file.cpp:679 +#: ../src/file.cpp:687 #, c-format msgid "" "No Inkscape extension found to save document (%s). This may have been " @@ -8446,12 +8456,12 @@ msgstr "" "Не знайдено модуль збереження документа (%s). Можливо, невідомий суфікс " "назви файла." -#: ../src/file.cpp:680 ../src/file.cpp:688 ../src/file.cpp:696 -#: ../src/file.cpp:702 ../src/file.cpp:707 +#: ../src/file.cpp:688 ../src/file.cpp:698 ../src/file.cpp:707 +#: ../src/file.cpp:714 ../src/file.cpp:720 msgid "Document not saved." msgstr "Документ не збережено." -#: ../src/file.cpp:687 +#: ../src/file.cpp:697 #, c-format msgid "" "File %s is write protected. Please remove write protection and try again." @@ -8459,54 +8469,54 @@ msgstr "" "Файл %s захищено від запису. Будь ласка, зніміть захист від запису і " "повторіть спробу." -#: ../src/file.cpp:695 +#: ../src/file.cpp:706 #, c-format msgid "File %s could not be saved." msgstr "Файл %s неможливо зберегти." -#: ../src/file.cpp:725 ../src/file.cpp:727 +#: ../src/file.cpp:739 ../src/file.cpp:741 msgid "Document saved." msgstr "Документ збережено." #. We are saving for the first time; create a unique default filename -#: ../src/file.cpp:870 ../src/file.cpp:1437 +#: ../src/file.cpp:884 ../src/file.cpp:1451 msgid "drawing" msgstr "рисунок" -#: ../src/file.cpp:875 +#: ../src/file.cpp:889 msgid "drawing-%1" msgstr "рисунок-%1" -#: ../src/file.cpp:892 +#: ../src/file.cpp:906 msgid "Select file to save a copy to" msgstr "Оберіть файл для збереження копії" -#: ../src/file.cpp:894 +#: ../src/file.cpp:908 msgid "Select file to save to" msgstr "Виберіть файл для збереження" -#: ../src/file.cpp:999 ../src/file.cpp:1001 +#: ../src/file.cpp:1013 ../src/file.cpp:1015 msgid "No changes need to be saved." msgstr "Файл не було змінено. Збереження непотрібне." -#: ../src/file.cpp:1020 +#: ../src/file.cpp:1034 msgid "Saving document..." msgstr "Збереження документа…" -#: ../src/file.cpp:1275 ../src/ui/dialog/inkscape-preferences.cpp:1505 +#: ../src/file.cpp:1289 ../src/ui/dialog/inkscape-preferences.cpp:1505 #: ../src/ui/dialog/ocaldialogs.cpp:1244 msgid "Import" msgstr "Імпорт" -#: ../src/file.cpp:1325 +#: ../src/file.cpp:1339 msgid "Select file to import" msgstr "Виберіть файл для імпорту" -#: ../src/file.cpp:1458 +#: ../src/file.cpp:1472 msgid "Select file to export to" msgstr "Оберіть файл для експорту" -#: ../src/file.cpp:1711 +#: ../src/file.cpp:1725 msgid "Import Clip Art" msgstr "Імпортування шаблонів" @@ -8627,7 +8637,8 @@ msgstr "Обертання відтінку" msgid "Luminance to Alpha" msgstr "Освітленість до прозорості" -#: ../src/filter-enums.cpp:87 ../share/extensions/jessyInk_mouseHandler.inx.h:3 +#: ../src/filter-enums.cpp:87 +#: ../share/extensions/jessyInk_mouseHandler.inx.h:3 #: ../share/extensions/jessyInk_transitions.inx.h:7 #: ../share/extensions/measure.inx.h:20 ../share/extensions/nicechart.inx.h:33 msgid "Default" @@ -8944,7 +8955,8 @@ msgstr "Згорнути цю панель" msgid "Close this dock" msgstr "Закрити цю панель" -#: ../src/libgdl/gdl-dock-item-grip.c:723 ../src/libgdl/gdl-dock-tablabel.c:125 +#: ../src/libgdl/gdl-dock-item-grip.c:723 +#: ../src/libgdl/gdl-dock-tablabel.c:125 msgid "Controlling dock item" msgstr "Контролюючий елемент панелі" @@ -9114,7 +9126,8 @@ msgstr "Індекс поточної сторінки" #: ../src/libgdl/gdl-dock-object.c:125 #: ../src/live_effects/parameter/originalpatharray.cpp:82 #: ../src/ui/dialog/inkscape-preferences.cpp:1566 -#: ../src/ui/widget/page-sizer.cpp:285 ../src/widgets/gradient-selector.cpp:150 +#: ../src/ui/widget/page-sizer.cpp:285 +#: ../src/widgets/gradient-selector.cpp:150 #: ../src/widgets/sp-xmlview-attr-list.cpp:49 msgid "Name" msgstr "Назва" @@ -9542,12 +9555,12 @@ msgstr "" "Будь ласка, вкажіть параметр контуру для геометричних побудов «%s» за " "допомогою %d клацань мишею" -#: ../src/live_effects/effect.cpp:765 +#: ../src/live_effects/effect.cpp:766 #, c-format msgid "Editing parameter %s." msgstr "Редагування параметра %s." -#: ../src/live_effects/effect.cpp:770 +#: ../src/live_effects/effect.cpp:771 msgid "None of the applied path effect's parameters can be edited on-canvas." msgstr "" "Жоден із застосованих параметрів ефекту контуру не можна редагувати на " @@ -11099,13 +11112,13 @@ msgstr "Немає" #: ../src/live_effects/lpe-ruler.cpp:33 #: ../src/live_effects/lpe-transform_2pts.cpp:37 -#: ../src/ui/tools/measure-tool.cpp:756 ../src/widgets/arc-toolbar.cpp:319 +#: ../src/ui/tools/measure-tool.cpp:755 ../src/widgets/arc-toolbar.cpp:319 msgid "Start" msgstr "Початок" #: ../src/live_effects/lpe-ruler.cpp:34 #: ../src/live_effects/lpe-transform_2pts.cpp:38 -#: ../src/ui/tools/measure-tool.cpp:757 ../src/widgets/arc-toolbar.cpp:332 +#: ../src/ui/tools/measure-tool.cpp:756 ../src/widgets/arc-toolbar.cpp:332 msgid "End" msgstr "Кінець" @@ -11117,7 +11130,8 @@ msgstr "Ві_дстань між позначками:" msgid "Distance between successive ruler marks" msgstr "Відстань між послідовними позначками на лінійці" -#: ../src/live_effects/lpe-ruler.cpp:42 ../share/extensions/foldablebox.inx.h:7 +#: ../src/live_effects/lpe-ruler.cpp:42 +#: ../share/extensions/foldablebox.inx.h:7 #: ../share/extensions/interp_att_g.inx.h:9 #: ../share/extensions/layout_nup.inx.h:3 #: ../share/extensions/printing_marks.inx.h:11 @@ -11642,7 +11656,7 @@ msgstr "Обернути" #: ../src/live_effects/parameter/originalpatharray.cpp:130 #: ../src/live_effects/parameter/originalpatharray.cpp:315 -#: ../src/live_effects/parameter/path.cpp:486 +#: ../src/live_effects/parameter/path.cpp:510 msgid "Link path parameter to path" msgstr "Пов'язати параметр контуру з контуром" @@ -11672,23 +11686,23 @@ msgstr "Пересунути контур нижче" msgid "Remove path" msgstr "Вилучити контур" -#: ../src/live_effects/parameter/path.cpp:170 +#: ../src/live_effects/parameter/path.cpp:184 msgid "Edit on-canvas" msgstr "Редагувати на полотні" -#: ../src/live_effects/parameter/path.cpp:180 +#: ../src/live_effects/parameter/path.cpp:194 msgid "Copy path" msgstr "Копіювати контур" -#: ../src/live_effects/parameter/path.cpp:190 +#: ../src/live_effects/parameter/path.cpp:204 msgid "Paste path" msgstr "Вставити контур" -#: ../src/live_effects/parameter/path.cpp:200 +#: ../src/live_effects/parameter/path.cpp:214 msgid "Link to path on clipboard" msgstr "Пов’язати з контуром у буфері обміну" -#: ../src/live_effects/parameter/path.cpp:454 +#: ../src/live_effects/parameter/path.cpp:478 msgid "Paste path parameter" msgstr "Вставити параметр контуру" @@ -12493,7 +12507,8 @@ msgstr "Нічого не було вилучено." #: ../src/widgets/eraser-toolbar.cpp:120 #: ../src/widgets/gradient-toolbar.cpp:1181 #: ../src/widgets/gradient-toolbar.cpp:1195 -#: ../src/widgets/gradient-toolbar.cpp:1209 ../src/widgets/node-toolbar.cpp:401 +#: ../src/widgets/gradient-toolbar.cpp:1209 +#: ../src/widgets/node-toolbar.cpp:401 msgid "Delete" msgstr "Вилучити" @@ -13180,20 +13195,20 @@ msgstr[0] "(%d символ%s)" msgstr[1] "(%d символи%s)" msgstr[2] "(%d символів%s)" -#: ../src/sp-guide.cpp:261 +#: ../src/sp-guide.cpp:262 msgid "Create Guides Around the Page" msgstr "Створити напрямні навколо сторінки" -#: ../src/sp-guide.cpp:274 ../src/verbs.cpp:2544 +#: ../src/sp-guide.cpp:275 ../src/verbs.cpp:2544 msgid "Delete All Guides" msgstr "Вилучити всі напрямні" #. Guide has probably been deleted and no longer has an attached namedview. -#: ../src/sp-guide.cpp:485 +#: ../src/sp-guide.cpp:486 msgid "Deleted" msgstr "Вилучено" -#: ../src/sp-guide.cpp:494 +#: ../src/sp-guide.cpp:495 msgid "" "Shift+drag to rotate, Ctrl+drag to move origin, Del to " "delete" @@ -13201,17 +13216,17 @@ msgstr "" "Shift+Перетягування починає обертання. Ctrl+Перетягування " "пересуває центр обертання. Del вилучає." -#: ../src/sp-guide.cpp:498 +#: ../src/sp-guide.cpp:499 #, c-format msgid "vertical, at %s" msgstr "вертикальна, на %s" -#: ../src/sp-guide.cpp:501 +#: ../src/sp-guide.cpp:502 #, c-format msgid "horizontal, at %s" msgstr "горизонтальна, на %s" -#: ../src/sp-guide.cpp:506 +#: ../src/sp-guide.cpp:507 #, c-format msgid "at %d degrees, through (%s,%s)" msgstr "на %d градусів, через (%s,%s)" @@ -13244,26 +13259,26 @@ msgstr "з %d об'єкта" msgid "of %d objects" msgstr "з %d об'єкта" -#: ../src/sp-item.cpp:1031 ../src/verbs.cpp:213 +#: ../src/sp-item.cpp:1030 ../src/verbs.cpp:213 msgid "Object" msgstr "Об'єкт" -#: ../src/sp-item.cpp:1043 +#: ../src/sp-item.cpp:1042 #, c-format msgid "%s; clipped" msgstr "%s; закріплено" -#: ../src/sp-item.cpp:1049 +#: ../src/sp-item.cpp:1048 #, c-format msgid "%s; masked" msgstr "%s; масковано" -#: ../src/sp-item.cpp:1059 +#: ../src/sp-item.cpp:1058 #, c-format msgid "%s; filtered (%s)" msgstr "%s; відфільтровано (%s)" -#: ../src/sp-item.cpp:1061 +#: ../src/sp-item.cpp:1060 #, c-format msgid "%s; filtered" msgstr "%s; відфільтровано" @@ -13372,8 +13387,8 @@ msgstr "Умовна група" #: ../src/sp-text.cpp:361 ../src/verbs.cpp:347 #: ../share/extensions/lorem_ipsum.inx.h:8 -#: ../share/extensions/replace_font.inx.h:11 ../share/extensions/split.inx.h:10 -#: ../share/extensions/text_braille.inx.h:2 +#: ../share/extensions/replace_font.inx.h:11 +#: ../share/extensions/split.inx.h:10 ../share/extensions/text_braille.inx.h:2 #: ../share/extensions/text_extract.inx.h:14 #: ../share/extensions/text_flipcase.inx.h:2 #: ../share/extensions/text_lowercase.inx.h:2 @@ -14841,12 +14856,12 @@ msgid "License" msgstr "Ліцензія" #: ../src/ui/dialog/document-metadata.cpp:126 -#: ../src/ui/dialog/document-properties.cpp:994 +#: ../src/ui/dialog/document-properties.cpp:1037 msgid "Dublin Core Entities" msgstr "Пункти Dublin Core" #: ../src/ui/dialog/document-metadata.cpp:168 -#: ../src/ui/dialog/document-properties.cpp:1056 +#: ../src/ui/dialog/document-properties.cpp:1099 msgid "License" msgstr "Ліцензія" @@ -15099,7 +15114,8 @@ msgstr "Ви_лучити" msgid "Remove selected grid." msgstr "Вилучити вибрану сітку." -#: ../src/ui/dialog/document-properties.cpp:162 ../src/widgets/toolbox.cpp:1903 +#: ../src/ui/dialog/document-properties.cpp:162 +#: ../src/widgets/toolbox.cpp:1903 msgid "Guides" msgstr "Напрямні" @@ -15155,136 +15171,136 @@ msgstr "Інше" #. Inkscape::GC::release(defsRepr); #. inform the document, so we can undo #. Color Management -#: ../src/ui/dialog/document-properties.cpp:526 ../src/verbs.cpp:3020 +#: ../src/ui/dialog/document-properties.cpp:542 ../src/verbs.cpp:3020 msgid "Link Color Profile" msgstr "Пов'язати профіль кольорів" -#: ../src/ui/dialog/document-properties.cpp:623 +#: ../src/ui/dialog/document-properties.cpp:654 msgid "Remove linked color profile" msgstr "Вилучити пов'язаний профіль кольорів" -#: ../src/ui/dialog/document-properties.cpp:636 +#: ../src/ui/dialog/document-properties.cpp:673 msgid "Linked Color Profiles:" msgstr "Пов'язані профілі кольорів:" -#: ../src/ui/dialog/document-properties.cpp:638 +#: ../src/ui/dialog/document-properties.cpp:675 msgid "Available Color Profiles:" msgstr "Доступні профілі кольорів:" -#: ../src/ui/dialog/document-properties.cpp:640 +#: ../src/ui/dialog/document-properties.cpp:677 msgid "Link Profile" msgstr "Пов'язати з профілем" -#: ../src/ui/dialog/document-properties.cpp:643 +#: ../src/ui/dialog/document-properties.cpp:680 msgid "Unlink Profile" msgstr "Від'єднати від профілю" -#: ../src/ui/dialog/document-properties.cpp:721 +#: ../src/ui/dialog/document-properties.cpp:764 msgid "Profile Name" msgstr "Назва профілю" -#: ../src/ui/dialog/document-properties.cpp:757 +#: ../src/ui/dialog/document-properties.cpp:800 msgid "External scripts" msgstr "Зовнішні скрипти" -#: ../src/ui/dialog/document-properties.cpp:758 +#: ../src/ui/dialog/document-properties.cpp:801 msgid "Embedded scripts" msgstr "Вбудовані скрипти" -#: ../src/ui/dialog/document-properties.cpp:763 +#: ../src/ui/dialog/document-properties.cpp:806 msgid "External script files:" msgstr "Файли зовнішніх скриптів:" -#: ../src/ui/dialog/document-properties.cpp:765 +#: ../src/ui/dialog/document-properties.cpp:808 msgid "Add the current file name or browse for a file" msgstr "Додайте назву поточного файла або вкажіть якийсь файл" -#: ../src/ui/dialog/document-properties.cpp:768 -#: ../src/ui/dialog/document-properties.cpp:845 +#: ../src/ui/dialog/document-properties.cpp:811 +#: ../src/ui/dialog/document-properties.cpp:888 #: ../src/ui/widget/selected-style.cpp:357 msgid "Remove" msgstr "Вилучити" -#: ../src/ui/dialog/document-properties.cpp:832 +#: ../src/ui/dialog/document-properties.cpp:875 msgid "Filename" msgstr "Назва файла" -#: ../src/ui/dialog/document-properties.cpp:840 +#: ../src/ui/dialog/document-properties.cpp:883 msgid "Embedded script files:" msgstr "Файли вбудованих скриптів:" -#: ../src/ui/dialog/document-properties.cpp:842 +#: ../src/ui/dialog/document-properties.cpp:885 #: ../src/ui/dialog/objects.cpp:1894 msgid "New" msgstr "Створити" -#: ../src/ui/dialog/document-properties.cpp:909 +#: ../src/ui/dialog/document-properties.cpp:952 msgid "Script id" msgstr "Ід. скрипту" -#: ../src/ui/dialog/document-properties.cpp:915 +#: ../src/ui/dialog/document-properties.cpp:958 msgid "Content:" msgstr "Вміст:" -#: ../src/ui/dialog/document-properties.cpp:1032 +#: ../src/ui/dialog/document-properties.cpp:1075 msgid "_Save as default" msgstr "З_берегти як типові" -#: ../src/ui/dialog/document-properties.cpp:1033 +#: ../src/ui/dialog/document-properties.cpp:1076 msgid "Save this metadata as the default metadata" msgstr "Зберегти ці метадані як типові метадані" -#: ../src/ui/dialog/document-properties.cpp:1034 +#: ../src/ui/dialog/document-properties.cpp:1077 msgid "Use _default" msgstr "Використовувати _типові" -#: ../src/ui/dialog/document-properties.cpp:1035 +#: ../src/ui/dialog/document-properties.cpp:1078 msgid "Use the previously saved default metadata here" msgstr "Скористатися тут раніше збереженими типовими метаданими" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1108 +#: ../src/ui/dialog/document-properties.cpp:1151 msgid "Add external script..." msgstr "Додати зовнішній скрипт…" -#: ../src/ui/dialog/document-properties.cpp:1147 +#: ../src/ui/dialog/document-properties.cpp:1190 msgid "Select a script to load" msgstr "Виберіть скрипт для завантаження" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1175 +#: ../src/ui/dialog/document-properties.cpp:1218 msgid "Add embedded script..." msgstr "Додати вбудований скрипт…" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1206 +#: ../src/ui/dialog/document-properties.cpp:1249 msgid "Remove external script" msgstr "Вилучити зовнішній скрипт" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1235 +#: ../src/ui/dialog/document-properties.cpp:1278 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:1331 +#: ../src/ui/dialog/document-properties.cpp:1374 msgid "Edit embedded script" msgstr "Редагувати вбудований скрипт" -#: ../src/ui/dialog/document-properties.cpp:1415 +#: ../src/ui/dialog/document-properties.cpp:1458 msgid "Creation" msgstr "Створення" -#: ../src/ui/dialog/document-properties.cpp:1416 +#: ../src/ui/dialog/document-properties.cpp:1459 msgid "Defined grids" msgstr "Визначені сітки" -#: ../src/ui/dialog/document-properties.cpp:1660 +#: ../src/ui/dialog/document-properties.cpp:1703 msgid "Remove grid" msgstr "Вилучити сітку" -#: ../src/ui/dialog/document-properties.cpp:1752 +#: ../src/ui/dialog/document-properties.cpp:1795 msgid "Changed default display unit" msgstr "Змінено типову одиницю виміру" @@ -15539,7 +15555,8 @@ msgstr "Інформація" #: ../share/extensions/jitternodes.inx.h:12 #: ../share/extensions/layout_nup.inx.h:24 #: ../share/extensions/lindenmayer.inx.h:13 -#: ../share/extensions/lorem_ipsum.inx.h:6 ../share/extensions/measure.inx.h:33 +#: ../share/extensions/lorem_ipsum.inx.h:6 +#: ../share/extensions/measure.inx.h:33 #: ../share/extensions/pathalongpath.inx.h:16 #: ../share/extensions/pathscatter.inx.h:18 #: ../share/extensions/restack.inx.h:25 ../share/extensions/split.inx.h:8 @@ -19518,7 +19535,7 @@ msgstr "Зберігати канал K під час перетворень CMY #: ../src/ui/dialog/inkscape-preferences.cpp:1091 #: ../src/ui/widget/color-icc-selector.cpp:394 -#: ../src/ui/widget/color-icc-selector.cpp:685 +#: ../src/ui/widget/color-icc-selector.cpp:699 msgid "" msgstr "<немає>" @@ -20778,7 +20795,8 @@ msgstr "Нахил за X" msgid "Y tilt" msgstr "Нахил за Y" -#: ../src/ui/dialog/input.cpp:1616 ../src/ui/widget/color-wheel-selector.cpp:29 +#: ../src/ui/dialog/input.cpp:1616 +#: ../src/ui/widget/color-wheel-selector.cpp:29 msgid "Wheel" msgstr "Колесо" @@ -21585,15 +21603,18 @@ msgstr "Алгоритм Копфа-Ліщинського" msgid "Output" msgstr "Вивід" -#: ../src/ui/dialog/pixelartdialog.cpp:297 ../src/ui/dialog/tracedialog.cpp:814 +#: ../src/ui/dialog/pixelartdialog.cpp:297 +#: ../src/ui/dialog/tracedialog.cpp:814 msgid "Reset all settings to defaults" msgstr "Скинути значення всіх параметрів до типових" -#: ../src/ui/dialog/pixelartdialog.cpp:302 ../src/ui/dialog/tracedialog.cpp:819 +#: ../src/ui/dialog/pixelartdialog.cpp:302 +#: ../src/ui/dialog/tracedialog.cpp:819 msgid "Abort a trace in progress" msgstr "Перервати векторизацію" -#: ../src/ui/dialog/pixelartdialog.cpp:306 ../src/ui/dialog/tracedialog.cpp:823 +#: ../src/ui/dialog/pixelartdialog.cpp:306 +#: ../src/ui/dialog/tracedialog.cpp:823 msgid "Execute the trace" msgstr "Провести векторизацію" @@ -21964,7 +21985,8 @@ msgid "Preview Text:" msgstr "Перегляд тексту:" #: ../src/ui/dialog/swatches.cpp:202 ../src/ui/tools/gradient-tool.cpp:360 -#: ../src/ui/tools/gradient-tool.cpp:458 ../src/widgets/gradient-vector.cpp:801 +#: ../src/ui/tools/gradient-tool.cpp:458 +#: ../src/widgets/gradient-vector.cpp:801 msgid "Add gradient stop" msgstr "Додавання опорної точки градієнта" @@ -23245,12 +23267,11 @@ msgstr "" "елементи керування" #: ../src/ui/tool/node.cpp:529 -#, fuzzy msgctxt "Path handle tip" msgid "Ctrl: Snap handle to steps defined in BSpline Live Path Effect" msgstr "" -"Ctrl: пересунути вус за його справжніми кроками у інтерактивному " -"ефекті B-сплайнів" +"Ctrl: приліпити елемент керування за кроками, визначеним у " +"інтерактивному ефекті B-сплайнів" #: ../src/ui/tool/node.cpp:532 #, c-format @@ -23398,7 +23419,8 @@ msgid "Rotate handle" msgstr "Обертати вус" #. We need to call MPM's method because it could have been our last node -#: ../src/ui/tool/path-manipulator.cpp:1555 ../src/widgets/node-toolbar.cpp:397 +#: ../src/ui/tool/path-manipulator.cpp:1555 +#: ../src/widgets/node-toolbar.cpp:397 msgid "Delete node" msgstr "Вилучити вузол" @@ -24058,31 +24080,31 @@ msgstr "Початкова точка вимірювання, Shift+клац msgid "Measure end, Shift+Click for position dialog" msgstr "Кінцева точка вимірювання, Shift+клацання — вікно позиції" -#: ../src/ui/tools/measure-tool.cpp:747 ../share/extensions/measure.inx.h:2 +#: ../src/ui/tools/measure-tool.cpp:746 ../share/extensions/measure.inx.h:2 msgid "Measure" msgstr "Міра" -#: ../src/ui/tools/measure-tool.cpp:752 +#: ../src/ui/tools/measure-tool.cpp:751 msgid "Base" msgstr "Основа" -#: ../src/ui/tools/measure-tool.cpp:761 +#: ../src/ui/tools/measure-tool.cpp:760 msgid "Add guides from measure tool" msgstr "Додати напрямні з інструмента вимірювання" -#: ../src/ui/tools/measure-tool.cpp:781 -msgid "Add Stored to measure tool" -msgstr "Додати збережене до інструмента вимірювання" +#: ../src/ui/tools/measure-tool.cpp:780 +msgid "Keep last measure on the canvas, for reference" +msgstr "Зберігати останнє вимірювання на полотні для порівняння" -#: ../src/ui/tools/measure-tool.cpp:801 +#: ../src/ui/tools/measure-tool.cpp:800 msgid "Convert measure to items" msgstr "Перетворити вимірювання на об’єкти" -#: ../src/ui/tools/measure-tool.cpp:839 +#: ../src/ui/tools/measure-tool.cpp:838 msgid "Add global measure line" msgstr "Додати загальну лінію вимірювання" -#: ../src/ui/tools/measure-tool.cpp:1290 ../src/ui/tools/measure-tool.cpp:1292 +#: ../src/ui/tools/measure-tool.cpp:1289 ../src/ui/tools/measure-tool.cpp:1291 #, c-format msgid "Crossing %lu" msgstr "Перетин %lu" @@ -24721,7 +24743,7 @@ msgstr[2] "" msgid "Type text" msgstr "Друк тексту" -#: ../src/ui/tools/tool-base.cpp:700 +#: ../src/ui/tools/tool-base.cpp:705 msgid "Space+mouse move to pan canvas" msgstr "Пробіл+пересування миші для переміщення полотна" @@ -29262,27 +29284,33 @@ msgstr "радіальний" msgid "Create radial (elliptic or circular) gradient" msgstr "Створити радіальний (еліптичний чи круговий) градієнт" -#: ../src/widgets/gradient-toolbar.cpp:1044 ../src/widgets/mesh-toolbar.cpp:387 +#: ../src/widgets/gradient-toolbar.cpp:1044 +#: ../src/widgets/mesh-toolbar.cpp:387 msgid "New:" msgstr "Створити:" -#: ../src/widgets/gradient-toolbar.cpp:1067 ../src/widgets/mesh-toolbar.cpp:410 +#: ../src/widgets/gradient-toolbar.cpp:1067 +#: ../src/widgets/mesh-toolbar.cpp:410 msgid "fill" msgstr "заповнення" -#: ../src/widgets/gradient-toolbar.cpp:1067 ../src/widgets/mesh-toolbar.cpp:410 +#: ../src/widgets/gradient-toolbar.cpp:1067 +#: ../src/widgets/mesh-toolbar.cpp:410 msgid "Create gradient in the fill" msgstr "Створити градієнт у заповненні" -#: ../src/widgets/gradient-toolbar.cpp:1071 ../src/widgets/mesh-toolbar.cpp:414 +#: ../src/widgets/gradient-toolbar.cpp:1071 +#: ../src/widgets/mesh-toolbar.cpp:414 msgid "stroke" msgstr "штрих" -#: ../src/widgets/gradient-toolbar.cpp:1071 ../src/widgets/mesh-toolbar.cpp:414 +#: ../src/widgets/gradient-toolbar.cpp:1071 +#: ../src/widgets/mesh-toolbar.cpp:414 msgid "Create gradient in the stroke" msgstr "Створити градієнт у штриху" -#: ../src/widgets/gradient-toolbar.cpp:1074 ../src/widgets/mesh-toolbar.cpp:417 +#: ../src/widgets/gradient-toolbar.cpp:1074 +#: ../src/widgets/mesh-toolbar.cpp:417 msgid "on:" msgstr "на:" @@ -29381,7 +29409,8 @@ msgstr "Зв'язати градієнти" msgid "Link gradients to change all related gradients" msgstr "Зв'язати градієнти, щоб вони змінювалися у всіх пов'язаних градієнтів" -#: ../src/widgets/gradient-vector.cpp:317 ../src/widgets/paint-selector.cpp:965 +#: ../src/widgets/gradient-vector.cpp:317 +#: ../src/widgets/paint-selector.cpp:965 #: ../src/widgets/stroke-marker-selector.cpp:154 msgid "No document selected" msgstr "Документ не вибрано" @@ -31790,7 +31819,7 @@ msgstr "" #: ../share/extensions/convert2dashes.py:56 msgid "Total number of objects not converted: {}\n" -msgstr "" +msgstr "Загальна кількість неперетворених об’єктів: {}\n" #: ../share/extensions/dimension.py:108 msgid "Please select an object." @@ -32531,7 +32560,8 @@ msgid "Area is zero, cannot calculate Center of Mass" msgstr "Площа дорівнює нулю. Визначення центра мас позбавлене сенсу." #: ../share/extensions/pathalongpath.py:207 -#: ../share/extensions/pathscatter.py:226 ../share/extensions/perspective.py:50 +#: ../share/extensions/pathscatter.py:226 +#: ../share/extensions/perspective.py:50 msgid "This extension requires two selected paths." msgstr "Для роботи цього додатка потрібно вибрати два контури." @@ -32569,7 +32599,8 @@ msgstr "" "системах, заснованих на Debian, цю операцію можна виконати командою sudo apt-" "get install python-numpy." -#: ../share/extensions/perspective.py:58 ../share/extensions/summersnight.py:49 +#: ../share/extensions/perspective.py:58 +#: ../share/extensions/summersnight.py:49 #, python-format msgid "" "The first selected object is of type '%s'.\n" @@ -32578,14 +32609,16 @@ msgstr "" "Перший вибраний об'єкт належить до типу «%s».\n" "Спробуйте скористатися пунктом меню Контур -> Об'єкт у контур." -#: ../share/extensions/perspective.py:65 ../share/extensions/summersnight.py:57 +#: ../share/extensions/perspective.py:65 +#: ../share/extensions/summersnight.py:57 msgid "" "This extension requires that the second selected path be four nodes long." msgstr "" "Для роботи цього додатка потрібно, щоб другий вибраний контур складався " "принаймні з чотирьох вузлів." -#: ../share/extensions/perspective.py:91 ../share/extensions/summersnight.py:90 +#: ../share/extensions/perspective.py:91 +#: ../share/extensions/summersnight.py:90 msgid "" "The second selected object is a group, not a path.\n" "Try using the procedure Object->Ungroup." @@ -32593,7 +32626,8 @@ msgstr "" "Другий з вибраних об'єктів є групою, а не контуром.\n" "Спробуйте скористатися пунктом меню Контур -> Розділити." -#: ../share/extensions/perspective.py:93 ../share/extensions/summersnight.py:92 +#: ../share/extensions/perspective.py:93 +#: ../share/extensions/summersnight.py:92 msgid "" "The second selected object is not a path.\n" "Try using the procedure Path->Object to Path." @@ -32601,7 +32635,8 @@ msgstr "" "Другий з вибраних об'єктів не є контуром.\n" "Спробуйте скористатися пунктом меню Контур -> Об'єкт у контур." -#: ../share/extensions/perspective.py:96 ../share/extensions/summersnight.py:95 +#: ../share/extensions/perspective.py:96 +#: ../share/extensions/summersnight.py:95 msgid "" "The first selected object is not a path.\n" "Try using the procedure Path->Object to Path." @@ -35448,12 +35483,14 @@ msgstr "" "спробу відкриття." #: ../share/extensions/hpgl_input.inx.h:3 -#: ../share/extensions/hpgl_output.inx.h:4 ../share/extensions/plotter.inx.h:32 +#: ../share/extensions/hpgl_output.inx.h:4 +#: ../share/extensions/plotter.inx.h:32 msgid "Resolution X (dpi):" msgstr "Роздільна здатність за X (у т/дюйм):" #: ../share/extensions/hpgl_input.inx.h:4 -#: ../share/extensions/hpgl_output.inx.h:5 ../share/extensions/plotter.inx.h:33 +#: ../share/extensions/hpgl_output.inx.h:5 +#: ../share/extensions/plotter.inx.h:33 msgid "" "The amount of steps the plotter moves if it moves for 1 inch on the X axis " "(Default: 1016.0)" @@ -35461,12 +35498,14 @@ msgstr "" "Кількість кроків різця у одному дюймі за віссю X (типове значення — 1016.0)" #: ../share/extensions/hpgl_input.inx.h:5 -#: ../share/extensions/hpgl_output.inx.h:6 ../share/extensions/plotter.inx.h:34 +#: ../share/extensions/hpgl_output.inx.h:6 +#: ../share/extensions/plotter.inx.h:34 msgid "Resolution Y (dpi):" msgstr "Роздільна здатність за Y (у т/дюйм):" #: ../share/extensions/hpgl_input.inx.h:6 -#: ../share/extensions/hpgl_output.inx.h:7 ../share/extensions/plotter.inx.h:35 +#: ../share/extensions/hpgl_output.inx.h:7 +#: ../share/extensions/plotter.inx.h:35 msgid "" "The amount of steps the plotter moves if it moves for 1 inch on the Y axis " "(Default: 1016.0)" @@ -35506,15 +35545,18 @@ msgstr "" "контури. Скористайтеся додатком плотера (меню «Додатки»), щоб виконати " "вирізання безпосередньо за допомогою послідовного з’єднання." -#: ../share/extensions/hpgl_output.inx.h:3 ../share/extensions/plotter.inx.h:31 +#: ../share/extensions/hpgl_output.inx.h:3 +#: ../share/extensions/plotter.inx.h:31 msgid "Plotter Settings " msgstr "Параметри вирізання " -#: ../share/extensions/hpgl_output.inx.h:8 ../share/extensions/plotter.inx.h:36 +#: ../share/extensions/hpgl_output.inx.h:8 +#: ../share/extensions/plotter.inx.h:36 msgid "Pen number:" msgstr "Номер різця:" -#: ../share/extensions/hpgl_output.inx.h:9 ../share/extensions/plotter.inx.h:37 +#: ../share/extensions/hpgl_output.inx.h:9 +#: ../share/extensions/plotter.inx.h:37 msgid "The number of the pen (tool) to use (Standard: '1')" msgstr "" "Номер різця (інструмента), яким слід скористатися. (Типове значення: 1)" @@ -35822,9 +35864,8 @@ msgstr "Довідка з використання клавіатури та м #. i18n. Please don't translate it unless a page exists in your language #: ../share/extensions/inkscape_help_keys.inx.h:3 -#, fuzzy msgid "http://inkscape.org/doc/keys092.html" -msgstr "http://inkscape.org/doc/keys091.html" +msgstr "http://inkscape.org/doc/keys092.html" #: ../share/extensions/inkscape_help_manual.inx.h:1 msgid "Inkscape Manual" @@ -35841,9 +35882,8 @@ msgstr "Нове у поточній версії" #. i18n. Please don't translate it unless a page exists in your language #: ../share/extensions/inkscape_help_relnotes.inx.h:3 -#, fuzzy msgid "http://wiki.inkscape.org/wiki/index.php/Release_notes/0.92" -msgstr "http://wiki.inkscape.org/wiki/index.php/Release_notes/0.91" +msgstr "http://wiki.inkscape.org/wiki/index.php/Release_notes/0.92" #: ../share/extensions/inkscape_help_reportabug.inx.h:1 msgid "Report a Bug" @@ -35873,11 +35913,13 @@ msgstr "Дублювати кінцеві контури" msgid "Interpolate style" msgstr "Інтерполяція стилю" -#: ../share/extensions/interp.inx.h:7 ../share/extensions/interp_att_g.inx.h:10 +#: ../share/extensions/interp.inx.h:7 +#: ../share/extensions/interp_att_g.inx.h:10 msgid "Use Z-order" msgstr "Використати порядок за Z" -#: ../share/extensions/interp.inx.h:8 ../share/extensions/interp_att_g.inx.h:11 +#: ../share/extensions/interp.inx.h:8 +#: ../share/extensions/interp_att_g.inx.h:11 msgid "Workaround for reversed selection order in Live Preview cycles" msgstr "" "Обхідний захід для зворотного порядку позначення у циклах інтерактивного " @@ -37534,7 +37576,8 @@ msgstr "" msgid "AutoCAD Plot Input" msgstr "Імпорт з креслення AutoCAD" -#: ../share/extensions/plt_input.inx.h:2 ../share/extensions/plt_output.inx.h:2 +#: ../share/extensions/plt_input.inx.h:2 +#: ../share/extensions/plt_output.inx.h:2 msgid "HP Graphics Language Plot file [AutoCAD] (*.plt)" msgstr "Файл креслення графічною мовою HP [AutoCAD] (*.plt)" @@ -38460,7 +38503,6 @@ msgid "Custom Height (px):" msgstr "Нетипова висота (у пк):" #: ../share/extensions/seamless_pattern.inx.h:4 -#, fuzzy msgid "This extension overwrites the current document" msgstr "Це розширення перезапише поточний документ" @@ -38496,7 +38538,8 @@ msgstr "Нижній елемент:" msgid "sK1 vector graphics files input" msgstr "Імпорт файлів векторної графіки sK1" -#: ../share/extensions/sk1_input.inx.h:2 ../share/extensions/sk1_output.inx.h:2 +#: ../share/extensions/sk1_input.inx.h:2 +#: ../share/extensions/sk1_output.inx.h:2 msgid "sK1 vector graphics files (*.sk1)" msgstr "Файли векторної графіки sK1 (*.sk1)" @@ -38969,28 +39012,24 @@ msgid "From Side c and Angles a, b" msgstr "За стороною c і кутами a, b" #: ../share/extensions/ungroup_deep.inx.h:1 -#, fuzzy msgid "Deep Ungroup" -msgstr "Розгрупувати" +msgstr "Глибинне розгрупування" #: ../share/extensions/ungroup_deep.inx.h:2 -#, fuzzy msgid "Ungroup all groups in the selected object." -msgstr "Створити групу-обгортку на основі позначених об’єктів" +msgstr "Розгрупувати усі групи у позначеному об’єкті." #: ../share/extensions/ungroup_deep.inx.h:3 -#, fuzzy msgid "Starting Depth" -msgstr "Початковий контур:" +msgstr "Початкова глибина" #: ../share/extensions/ungroup_deep.inx.h:4 -#, fuzzy msgid "Stopping Depth (from top)" -msgstr "Вилучити контур-обгортку з позначених об'єктів'" +msgstr "Кінцева глибина (згори)" #: ../share/extensions/ungroup_deep.inx.h:5 msgid "Depth to Keep (from bottom)" -msgstr "" +msgstr "Глибина зберігання (знизу)" #: ../share/extensions/voronoi2svg.inx.h:1 msgid "Voronoi Diagram" @@ -39472,11 +39511,13 @@ msgstr "Нахил (у градусах):" msgid "Hide lines behind the sphere" msgstr "Ховати лінії за сферою" -#: ../share/extensions/wmf_input.inx.h:1 ../share/extensions/wmf_output.inx.h:1 +#: ../share/extensions/wmf_input.inx.h:1 +#: ../share/extensions/wmf_output.inx.h:1 msgid "Windows Metafile Input" msgstr "Імпорт метафайла Windows" -#: ../share/extensions/wmf_input.inx.h:3 ../share/extensions/wmf_output.inx.h:3 +#: ../share/extensions/wmf_input.inx.h:3 +#: ../share/extensions/wmf_output.inx.h:3 msgid "A popular graphics file format for clipart" msgstr "Популярний графічний формат для кліпарту" @@ -39484,6 +39525,9 @@ msgstr "Популярний графічний формат для кліпар msgid "XAML Input" msgstr "Імпорт з XAML" +#~ msgid "Add Stored to measure tool" +#~ msgstr "Додати збережене до інструмента вимірювання" + #~ msgid "Vertical Page Center" #~ msgstr "Центр сторінки за вертикаллю" -- cgit v1.2.3 From 3e173aedbe72ba21d33eaec804bf4c9f8e9fa158 Mon Sep 17 00:00:00 2001 From: brock-alexander Date: Tue, 14 Jun 2016 12:26:58 +0200 Subject: Merging lp:~inkscape+alexander/inkscape/comments into lp:inkscape. (bzr r14986) --- src/document.cpp | 22 ++++++++++++++++++++++ src/document.h | 2 +- src/sp-object.cpp | 15 ++++++++++++++- 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/src/document.cpp b/src/document.cpp index d8c3f1269..902dabbc3 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -1602,11 +1602,22 @@ static unsigned int count_objects_recursive(SPObject *obj, unsigned int count) return count; } +/** + * Count the number of objects in a given document recursively using the count_objects_recursive helper function + * + * @param[in] document Pointer to the document for counting objects + * @return Numer of objects in the document + */ static unsigned int objects_in_document(SPDocument *document) { return count_objects_recursive(document->getRoot(), 0); } +/** + * Remove unused definitions etc. recursively from an object and its siblings + * + * @param[inout] obj Object which shall be "cleaned" + */ static void vacuum_document_recursive(SPObject *obj) { if (SP_IS_DEFS(obj)) { @@ -1621,6 +1632,11 @@ static void vacuum_document_recursive(SPObject *obj) } } +/** + * Remove unused definitions etc. recursively from an entire document. + * + * @return Number of removed objects + */ unsigned int SPDocument::vacuumDocument() { unsigned int start = objects_in_document(this); @@ -1639,6 +1655,7 @@ unsigned int SPDocument::vacuumDocument() newend = objects_in_document(this); } while (iterations < 100 && newend < end); + // We stop if vacuum_document_recursive doesn't remove any more objects or after 100 iterations, whichever occurs first. return start - newend; } @@ -1647,6 +1664,11 @@ bool SPDocument::isSeeking() const { return priv->seeking; } +/** + * Indicate to the user if the document has been modified since the last save by displaying a "*" in front of the name of the file in the window title. + * + * @param[in] modified True if the document has been modified. + */ void SPDocument::setModifiedSinceSave(bool modified) { this->modified_since_save = modified; if (SP_ACTIVE_DESKTOP) { diff --git a/src/document.h b/src/document.h index e95042155..813d4ae49 100644 --- a/src/document.h +++ b/src/document.h @@ -198,7 +198,7 @@ public: bool isSeeking() const; bool isModifiedSinceSave() const { return modified_since_save; } - void setModifiedSinceSave(bool modified = true); + void setModifiedSinceSave(bool const modified = true); private: SPDocument(SPDocument const &); // no copy diff --git a/src/sp-object.cpp b/src/sp-object.cpp index db66eb3e6..d1659eedc 100644 --- a/src/sp-object.cpp +++ b/src/sp-object.cpp @@ -71,13 +71,17 @@ Inkscape::XML::NodeEventVector object_event_vector = { SPObject::repr_order_changed }; -// A friend class used to set internal members on SPObject so as to not expose settors in SPObject's public API +/** + * A friend class used to set internal members on SPObject so as to not expose settors in SPObject's public API + */ class SPObjectImpl { public: /** * Null's the id member of an SPObject without attempting to free prior contents. + * + * @param[inout] obj Pointer to the object which's id shall be nulled. */ static void setIdNull( SPObject* obj ) { if (obj) { @@ -87,6 +91,9 @@ public: /** * Sets the id member of an object, freeing any prior content. + * + * @param[inout] obj Pointer to the object which's id shall be set. + * @param[in] id New id */ static void setId( SPObject* obj, gchar const* id ) { if (obj && (id != obj->id) ) { @@ -104,6 +111,9 @@ public: static gchar *sp_object_get_unique_id(SPObject *object, gchar const *defid); +/** + * Constructor, sets all attributes to default values. + */ SPObject::SPObject() : cloned(0), uflags(0), mflags(0), hrefcount(0), _total_hrefcount(0), document(NULL), parent(NULL), children(NULL), _last_child(NULL), @@ -126,6 +136,9 @@ SPObject::SPObject() this->context_style = NULL; } +/** + * Destructor, frees the used memory and unreferences a potential successor of the object. + */ SPObject::~SPObject() { g_free(this->_label); g_free(this->_default_label); -- cgit v1.2.3 From 41c854edad820e281097f6ba8f17ea89521155ea Mon Sep 17 00:00:00 2001 From: Mark Harmer Date: Tue, 14 Jun 2016 14:33:17 +0200 Subject: [Bug #1300865] lcms2: crash in Fill and Stroke if linked color profile is missing on local system. Fixed bugs: - https://launchpad.net/bugs/1300865 (bzr r14987) --- src/color-profile.cpp | 6 +++++- src/ui/widget/color-icc-selector.cpp | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/color-profile.cpp b/src/color-profile.cpp index 9e545df03..aea9ccab0 100644 --- a/src/color-profile.cpp +++ b/src/color-profile.cpp @@ -588,7 +588,11 @@ bool ColorProfile::GamutCheck(SPColor color) static_cast(SP_RGBA32_G_U(val)), static_cast(SP_RGBA32_B_U(val)), 255}; - cmsDoTransform(ColorProfile::getTransfGamutCheck(), &check_color, &outofgamut, 1); + + cmsHTRANSFORM gamutCheck = ColorProfile::getTransfGamutCheck(); + if (gamutCheck) { + cmsDoTransform(gamutCheck, &check_color, &outofgamut, 1); + } #if HAVE_LIBLCMS1 cmsSetAlarmCodes(alarm_r, alarm_g, alarm_b); diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp index b422892fe..e4f58fe8a 100644 --- a/src/ui/widget/color-icc-selector.cpp +++ b/src/ui/widget/color-icc-selector.cpp @@ -633,9 +633,10 @@ void ColorICCSelectorImpl::_switchToProfile(gchar const *name) #endif // DEBUG_LCMS tmp.set(SP_RGBA32_U_COMPOSE(pre[0], pre[1], pre[2], 0xff)); } + + dirty = true; } } - dirty = true; } } else { -- cgit v1.2.3 From 425108aeb0731b11a5751b04f8e029b7a48ad0ab Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Thu, 16 Jun 2016 14:01:16 +0200 Subject: Fix z-cycling (alt+mousewheel) behavior Fixed bugs: - https://launchpad.net/bugs/1589420 (bzr r14988) --- src/ui/tools/select-tool.cpp | 199 ++++++++++++++++++------------------------- src/ui/tools/select-tool.h | 3 +- 2 files changed, 84 insertions(+), 118 deletions(-) diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp index 905e38f2b..5b48d65be 100644 --- a/src/ui/tools/select-tool.cpp +++ b/src/ui/tools/select-tool.cpp @@ -111,7 +111,6 @@ SelectTool::SelectTool() //static gint tolerance = 0; //static bool within_tolerance = false; static bool is_cycling = false; -static bool moved_while_cycling = false; SelectTool::~SelectTool() { @@ -386,54 +385,68 @@ bool SelectTool::item_handler(SPItem* item, GdkEvent* event) { } void SelectTool::sp_select_context_cycle_through_items(Inkscape::Selection *selection, GdkEventScroll *scroll_event, bool shift_pressed) { - if (this->cycling_cur_item == this->cycling_items.end()) { + if ( this->cycling_items.empty() ) return; - } Inkscape::DrawingItem *arenaitem; - SPItem *item = *cycling_cur_item; - g_assert(item != NULL); - // Deactivate current item - if (std::find(cycling_items_selected_before.begin(), cycling_items_selected_before.end(), item) == cycling_items_selected_before.end() && selection->includes(item)) { - selection->remove(item); + if(cycling_cur_item) { + arenaitem = cycling_cur_item->get_arenaitem(desktop->dkey); + arenaitem->setOpacity(0.3); } - arenaitem = item->get_arenaitem(desktop->dkey); - arenaitem->setOpacity(0.3); - // Find next item and activate it - std::vector::iterator next = this->cycling_cur_item; + + + std::vector::iterator next = cycling_items.end(); + if (scroll_event->direction == GDK_SCROLL_UP) { - ++next; - if (next == this->cycling_items.end() && this->cycling_wrap) { - next = this->cycling_items.begin(); + if (! cycling_cur_item) { + next = cycling_items.begin(); + } else { + next = std::find( cycling_items.begin(), cycling_items.end(), cycling_cur_item ); + g_assert (next != cycling_items.end()); + next++; + if (next == cycling_items.end()) + if ( cycling_wrap ) + next = cycling_items.begin(); + else + next--; } - } else { - if(next == this->cycling_items.begin()) { - next = this->cycling_items.end(); + } else { + if (! cycling_cur_item) { + next = cycling_items.end(); + next--; + } else { + next = std::find( cycling_items.begin(), cycling_items.end(), cycling_cur_item ); + g_assert (next != cycling_items.end()); + if (next == cycling_items.begin()){ + if ( cycling_wrap ) { + next = cycling_items.end(); + next--; + } + } else { + next--; + } } - --next; } - if (next!=this->cycling_items.end()) { - this->cycling_cur_item = next; - item = *next; - g_assert(item != NULL); - } + this->cycling_cur_item = *next; + g_assert(next != cycling_items.end()); + g_assert(cycling_cur_item != NULL); - arenaitem = item->get_arenaitem(desktop->dkey); + arenaitem = cycling_cur_item->get_arenaitem(desktop->dkey); arenaitem->setOpacity(1.0); if (shift_pressed) { - selection->add(item); + selection->add(cycling_cur_item); } else { - selection->set(item); + selection->set(cycling_cur_item); } } void SelectTool::sp_select_context_reset_opacities() { - for (std::vector::const_iterator l = this->cycling_items.begin(); l != this->cycling_items.end(); ++l ) { + for (std::vector::const_iterator l = this->cycling_items_cmp.begin(); l != this->cycling_items_cmp.end(); ++l ) { SPItem *item = *l; if (item) { Inkscape::DrawingItem *arenaitem = item->get_arenaitem(desktop->dkey); @@ -443,10 +456,8 @@ void SelectTool::sp_select_context_reset_opacities() { } } - this->cycling_items.clear(); - this->cycling_items_selected_before.clear(); - this->cycling_cur_item = this->cycling_items.end(); this->cycling_items_cmp.clear(); + this->cycling_cur_item = NULL; } bool SelectTool::root_handler(GdkEvent* event) { @@ -533,11 +544,7 @@ bool SelectTool::root_handler(GdkEvent* event) { case GDK_MOTION_NOTIFY: { - if (is_cycling) { - moved_while_cycling = true; - } - - tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); + tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); if ((event->motion.state & GDK_BUTTON1_MASK) && !this->space_panning) { Geom::Point const motion_pt(event->motion.x, event->motion.y); @@ -796,98 +803,58 @@ bool SelectTool::root_handler(GdkEvent* event) { break; case GDK_SCROLL: { - GdkEventScroll *scroll_event = (GdkEventScroll*) event; - - if (scroll_event->state & GDK_MOD1_MASK) { // alt modified pressed - if (moved_while_cycling) { - moved_while_cycling = false; - this->sp_select_context_reset_opacities(); - } - is_cycling = true; - - bool shift_pressed = scroll_event->state & GDK_SHIFT_MASK; - - /* Rebuild list of items underneath the mouse pointer */ - Geom::Point p = desktop->d2w(desktop->point()); - SPItem *item = desktop->getItemAtPoint(p, true, NULL); - - // Save pointer to current cycle-item so that we can find it again later, in the freshly built list - SPItem *tmp_cur_item = this->cycling_cur_item!=this->cycling_items.end() ? (*(this->cycling_cur_item)) : NULL; - this->cycling_items.clear(); - this->cycling_cur_item = this->cycling_items.end(); - while(item != NULL) { - this->cycling_items.push_back(item); - item = desktop->getItemAtPoint(p, true, item); - } - - /* Compare current item list with item list during previous scroll ... */ - bool item_lists_differ = this->cycling_items != this->cycling_items_cmp; - - /* If list of items under mouse pointer hasn't changed ... */ - if (!item_lists_differ) { - // ... find current item in the freshly built list and continue cycling ... - // TODO: This wouldn't be necessary if cycling_cur_item pointed to an element of cycling_items_cmp instead - this->cycling_cur_item = std::find(this->cycling_items.begin(), this->cycling_items.end(), tmp_cur_item); - g_assert(this->cycling_cur_item != this->cycling_items.end() || this->cycling_items.empty()); - } else { - // ... otherwise reset opacities for outdated items ... - Inkscape::DrawingItem *arenaitem; - - for (std::vector::const_iterator l = this->cycling_items_cmp.begin(); l != this->cycling_items_cmp.end(); ++l) { - SPItem *item = *l; - if (item) { - arenaitem = item->get_arenaitem(desktop->dkey); - arenaitem->setOpacity(1.0); - //if (!shift_pressed && !g_list_find(this->cycling_items_selected_before, item) && selection->includes(item)) - if (std::find(this->cycling_items_selected_before.begin(),this->cycling_items_selected_before.end(), item)==this->cycling_items_selected_before.end() && selection->includes(item)) { - selection->remove(item); - } - } - } + GdkEventScroll *scroll_event = (GdkEventScroll*) event; - // ... clear the lists ... + if ( ! (scroll_event->state & GDK_MOD1_MASK)) // do nothing specific if alt was not pressed + break; - this->cycling_items_cmp.clear(); - this->cycling_items_selected_before.clear(); - this->cycling_cur_item = this->cycling_items.end(); + bool shift_pressed = scroll_event->state & GDK_SHIFT_MASK; + is_cycling = true; - // ... and rebuild them with the new items. - this->cycling_items_cmp = (this->cycling_items); + /* Rebuild list of items underneath the mouse pointer */ + Geom::Point p = desktop->d2w(desktop->point()); + SPItem *item = desktop->getItemAtPoint(p, true, NULL); + this->cycling_items.clear(); - for(std::vector::const_iterator l = this->cycling_items.begin(); l != this->cycling_items.end(); ++l) { - SPItem *item =*l; - if (item) { - arenaitem = item->get_arenaitem(desktop->dkey); - arenaitem->setOpacity(0.3); + SPItem *tmp = NULL; + while(item != NULL) { + this->cycling_items.push_back(item); + item = desktop->getItemAtPoint(p, true, item); + if (selection->includes(item)) tmp = item; + } - if (selection->includes(item)) { - // already selected items are stored separately, too - this->cycling_items_selected_before.push_back(item); - } - } else { - g_assert_not_reached(); - } + /* Compare current item list with item list during previous scroll ... */ + bool item_lists_differ = this->cycling_items != this->cycling_items_cmp; + + if(item_lists_differ) { + this->sp_select_context_reset_opacities(); + for (std::vector::const_iterator l = this->cycling_items_cmp.begin(); l != this->cycling_items_cmp.end(); ++l) + selection->remove(*l); // deselects the previous content of the cycling loop + this->cycling_items_cmp = (this->cycling_items); + + // set opacities in new stack + for(std::vector::const_iterator l = this->cycling_items.begin(); l != this->cycling_items.end(); ++l) { + SPItem *item =*l; + if (item) { + Inkscape::DrawingItem *arenaitem = item->get_arenaitem(desktop->dkey); + arenaitem->setOpacity(0.3); } - - // set the current item to the bottommost one so that the cycling step below re-starts at the top - this->cycling_cur_item = this->cycling_items.end(); - this->cycling_cur_item--; } + } + if(!cycling_cur_item) cycling_cur_item = tmp; - this->cycling_wrap = prefs->getBool("/options/selection/cycleWrap", true); + this->cycling_wrap = prefs->getBool("/options/selection/cycleWrap", true); - // Cycle through the items underneath the mouse pointer, one-by-one - this->sp_select_context_cycle_through_items(selection, scroll_event, shift_pressed); + // Cycle through the items underneath the mouse pointer, one-by-one + this->sp_select_context_cycle_through_items(selection, scroll_event, shift_pressed); - ret = TRUE; + ret = TRUE; - GtkWindow *w =GTK_WINDOW(gtk_widget_get_toplevel( GTK_WIDGET(desktop->canvas) )); - if (w) - { - gtk_window_present(w); - gtk_widget_grab_focus (GTK_WIDGET(desktop->canvas)); - } + GtkWindow *w =GTK_WINDOW(gtk_widget_get_toplevel( GTK_WIDGET(desktop->canvas) )); + if (w) { + gtk_window_present(w); + gtk_widget_grab_focus (GTK_WIDGET(desktop->canvas)); } break; } diff --git a/src/ui/tools/select-tool.h b/src/ui/tools/select-tool.h index af183b1ca..420374661 100644 --- a/src/ui/tools/select-tool.h +++ b/src/ui/tools/select-tool.h @@ -42,8 +42,7 @@ public: std::vector cycling_items; std::vector cycling_items_cmp; - std::vector cycling_items_selected_before; - std::vector::iterator cycling_cur_item; + SPItem *cycling_cur_item; bool cycling_wrap; SPItem *item; -- cgit v1.2.3 From f5eb74652e628b4424647e798da1d0c05d6f4b2f Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Thu, 16 Jun 2016 14:07:58 +0200 Subject: remove tabs (bzr r14989) --- src/ui/tools/select-tool.cpp | 58 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp index 5b48d65be..b5ec3d88e 100644 --- a/src/ui/tools/select-tool.cpp +++ b/src/ui/tools/select-tool.cpp @@ -65,7 +65,7 @@ static gint rb_escaped = 0; // if non-zero, rubberband was canceled by esc, so t static gint drag_escaped = 0; // if non-zero, drag was canceled by esc const std::string& SelectTool::getPrefsPath() { - return SelectTool::prefsPath; + return SelectTool::prefsPath; } const std::string SelectTool::prefsPath = "/tools/select"; @@ -296,7 +296,7 @@ bool SelectTool::item_handler(SPItem* item, GdkEvent* event) { } else { GdkWindow* window = gtk_widget_get_window (GTK_WIDGET (desktop->getCanvas())); - this->dragging = TRUE; + this->dragging = TRUE; this->moved = FALSE; gdk_window_set_cursor(window, CursorSelectDragging); @@ -346,11 +346,11 @@ bool SelectTool::item_handler(SPItem* item, GdkEvent* event) { break; } case GDK_LEAVE_NOTIFY: - if (!desktop->isWaitingCursor() && !this->dragging) { + if (!desktop->isWaitingCursor() && !this->dragging) { GdkWindow* window = gtk_widget_get_window (GTK_WIDGET (desktop->getCanvas())); gdk_window_set_cursor(window, this->cursor); - } + } break; case GDK_KEY_PRESS: @@ -378,7 +378,7 @@ bool SelectTool::item_handler(SPItem* item, GdkEvent* event) { } if (!ret) { - ret = ToolBase::item_handler(item, event); + ret = ToolBase::item_handler(item, event); } return ret; @@ -710,7 +710,7 @@ bool SelectTool::root_handler(GdkEvent* event) { if (r->is_started() && !within_tolerance) { // this was a rubberband drag - std::vector items; + std::vector items; if (r->getMode() == RUBBERBAND_MODE_RECT) { Geom::OptRect const b = r->getRectangle(); @@ -860,10 +860,10 @@ bool SelectTool::root_handler(GdkEvent* event) { } case GDK_KEY_PRESS: // keybindings for select context - { - { - guint keyval = get_group0_keyval(&event->key); - + { + { + guint keyval = get_group0_keyval(&event->key); + bool alt = ( MOD__ALT(event) || (keyval == GDK_KEY_Alt_L) || (keyval == GDK_KEY_Alt_R) @@ -891,7 +891,7 @@ bool SelectTool::root_handler(GdkEvent* event) { // if Alt and nonempty selection, show moving cursor ("move selected"): if (alt && !selection->isEmpty() && !desktop->isWaitingCursor()) { - GdkWindow* window = gtk_widget_get_window (GTK_WIDGET (desktop->getCanvas())); + GdkWindow* window = gtk_widget_get_window (GTK_WIDGET (desktop->getCanvas())); gdk_window_set_cursor(window, CursorSelectDragging); } @@ -912,15 +912,15 @@ bool SelectTool::root_handler(GdkEvent* event) { if (MOD__ALT(event)) { // alt if (MOD__SHIFT(event)) { - sp_selection_move_screen(desktop->getSelection(), mul*-10, 0); // shift + sp_selection_move_screen(desktop->getSelection(), mul*-10, 0); // shift } else { - sp_selection_move_screen(desktop->getSelection(), mul*-1, 0); // no shift + sp_selection_move_screen(desktop->getSelection(), mul*-1, 0); // no shift } } else { // no alt if (MOD__SHIFT(event)) { - sp_selection_move(desktop->getSelection(), mul*-10*nudge, 0); // shift + sp_selection_move(desktop->getSelection(), mul*-10*nudge, 0); // shift } else { - sp_selection_move(desktop->getSelection(), mul*-nudge, 0); // no shift + sp_selection_move(desktop->getSelection(), mul*-nudge, 0); // no shift } } @@ -935,15 +935,15 @@ bool SelectTool::root_handler(GdkEvent* event) { if (MOD__ALT(event)) { // alt if (MOD__SHIFT(event)) { - sp_selection_move_screen(desktop->getSelection(), 0, mul*10); // shift + sp_selection_move_screen(desktop->getSelection(), 0, mul*10); // shift } else { - sp_selection_move_screen(desktop->getSelection(), 0, mul*1); // no shift + sp_selection_move_screen(desktop->getSelection(), 0, mul*1); // no shift } } else { // no alt if (MOD__SHIFT(event)) { - sp_selection_move(desktop->getSelection(), 0, mul*10*nudge); // shift + sp_selection_move(desktop->getSelection(), 0, mul*10*nudge); // shift } else { - sp_selection_move(desktop->getSelection(), 0, mul*nudge); // no shift + sp_selection_move(desktop->getSelection(), 0, mul*nudge); // no shift } } @@ -958,15 +958,15 @@ bool SelectTool::root_handler(GdkEvent* event) { if (MOD__ALT(event)) { // alt if (MOD__SHIFT(event)) { - sp_selection_move_screen(desktop->getSelection(), mul*10, 0); // shift + sp_selection_move_screen(desktop->getSelection(), mul*10, 0); // shift } else { - sp_selection_move_screen(desktop->getSelection(), mul*1, 0); // no shift + sp_selection_move_screen(desktop->getSelection(), mul*1, 0); // no shift } } else { // no alt if (MOD__SHIFT(event)) { - sp_selection_move(desktop->getSelection(), mul*10*nudge, 0); // shift + sp_selection_move(desktop->getSelection(), mul*10*nudge, 0); // shift } else { - sp_selection_move(desktop->getSelection(), mul*nudge, 0); // no shift + sp_selection_move(desktop->getSelection(), mul*nudge, 0); // no shift } } @@ -981,15 +981,15 @@ bool SelectTool::root_handler(GdkEvent* event) { if (MOD__ALT(event)) { // alt if (MOD__SHIFT(event)) { - sp_selection_move_screen(desktop->getSelection(), 0, mul*-10); // shift + sp_selection_move_screen(desktop->getSelection(), 0, mul*-10); // shift } else { - sp_selection_move_screen(desktop->getSelection(), 0, mul*-1); // no shift + sp_selection_move_screen(desktop->getSelection(), 0, mul*-1); // no shift } } else { // no alt if (MOD__SHIFT(event)) { - sp_selection_move(desktop->getSelection(), 0, mul*-10*nudge); // shift + sp_selection_move(desktop->getSelection(), 0, mul*-10*nudge); // shift } else { - sp_selection_move(desktop->getSelection(), 0, mul*-nudge); // no shift + sp_selection_move(desktop->getSelection(), 0, mul*-nudge); // no shift } } @@ -1133,7 +1133,7 @@ bool SelectTool::root_handler(GdkEvent* event) { break; } break; - } + } case GDK_KEY_RELEASE: { guint keyval = get_group0_keyval(&event->key); if (key_is_a_modifier (keyval)) { @@ -1174,7 +1174,7 @@ bool SelectTool::root_handler(GdkEvent* event) { } if (!ret) { - ret = ToolBase::root_handler(event); + ret = ToolBase::root_handler(event); } return ret; -- cgit v1.2.3 From 5d388f13644b59e355e0980c74695247b2191562 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Thu, 16 Jun 2016 22:29:40 +0200 Subject: Fixes some bugs related to powerstroke 'Powerstroke infinite loop' Fixed bugs: - https://launchpad.net/bugs/1535444 - https://launchpad.net/bugs/1236320 - https://launchpad.net/bugs/1586973 (bzr r14991) --- src/2geom/sbasis-geometric.cpp | 9 ++++---- src/live_effects/lpe-powerstroke.cpp | 25 ++++++++-------------- src/ui/tools/freehand-base.cpp | 40 +++++++++--------------------------- 3 files changed, 23 insertions(+), 51 deletions(-) diff --git a/src/2geom/sbasis-geometric.cpp b/src/2geom/sbasis-geometric.cpp index 8aaa15144..19eccc451 100644 --- a/src/2geom/sbasis-geometric.cpp +++ b/src/2geom/sbasis-geometric.cpp @@ -101,7 +101,7 @@ static SBasis divide_by_t1k(SBasis const &a, int k) { static D2 RescaleForNonVanishingEnds(D2 const &MM, double ZERO=1.e-4){ D2 M = MM; //TODO: divide by all the s at once!!! - while ((M[0].size()>0||M[1].size()>0) && + while ((M[0].size()>1||M[1].size()>1) && fabs(M[0].at0()) RescaleForNonVanishingEnds(D2 const &MM, double ZERO=1 M[0] = divide_by_sk(M[0],1); M[1] = divide_by_sk(M[1],1); } - while ((M[0].size()>0||M[1].size()>0) && + while ((M[0].size()>1||M[1].size()>1) && fabs(M[0].at0())0||M[1].size()>0) && + while ((M[0].size()>1||M[1].size()>1) && fabs(M[0].at1()) const &V_in, double tol, unsigned order){ // -This approach is numerically bad. Find a stable way to rescale V_in to have non vanishing ends. // -This done, unitVector will have jumps at zeros: fill the gaps with arcs of circles. D2 V = RescaleForNonVanishingEnds(V_in); - if (V[0].isZero(0) && V[1].isZero(0)) return Piecewise >(D2(Linear(1),SBasis())); + SBasis x = V[0], y = V[1]; SBasis r_eqn1, r_eqn2; @@ -242,7 +242,6 @@ Geom::unitVector(D2 const &V_in, double tol, unsigned order){ r_eqn1 = -(a*x+b*y); r_eqn2 = Linear(1.)-(a*a+b*b); - for (unsigned k=1; k<=order; k++){ double r0 = (k #include <2geom/circle.h> #include <2geom/math-utils.h> +#include "helper/geom.h" #include #include "spiro.h" @@ -205,14 +206,13 @@ LPEPowerStroke::~LPEPowerStroke() } - void LPEPowerStroke::doOnApply(SPLPEItem const* lpeitem) { - if (SP_IS_SHAPE(lpeitem)) { + if (SP_IS_SHAPE(lpeitem) && offset_points.data().empty()) { SPLPEItem* item = const_cast(lpeitem); std::vector points; - Geom::PathVector const &pathv = SP_SHAPE(lpeitem)->_curve->get_pathvector(); + Geom::PathVector const &pathv = pathv_to_linear_and_cubic_beziers(SP_SHAPE(lpeitem)->_curve->get_pathvector()); double width = (lpeitem && lpeitem->style) ? lpeitem->style->stroke_width.computed / 2 : 1.; SPCSSAttr *css = sp_repr_css_attr_new (); @@ -565,12 +565,11 @@ LPEPowerStroke::doEffect_path (Geom::PathVector const & path_in) if (path_in.empty()) { return path_out; } - - // for now, only regard first subpath and ignore the rest - Geom::Piecewise > pwd2_in = path_in[0].toPwSb(); - + Geom::PathVector pathv = pathv_to_linear_and_cubic_beziers(path_in); + Geom::Piecewise > pwd2_in = pathv[0].toPwSb(); Piecewise > der = derivative(pwd2_in); - Piecewise > n = rot90(unitVector(der)); + Piecewise > n = unitVector(der,0.0001); + n = rot90(n); offset_points.set_pwd2(pwd2_in, n); LineCapType end_linecap = static_cast(end_linecap_type.get_value()); @@ -583,7 +582,7 @@ LPEPowerStroke::doEffect_path (Geom::PathVector const & path_in) if (sort_points) { sort(ts.begin(), ts.end(), compare_offsets); } - if (path_in[0].closed()) { + if (pathv[0].closed()) { // add extra points for interpolation between first and last point Point first_point = ts.front(); Point last_point = ts.back(); @@ -605,7 +604,6 @@ LPEPowerStroke::doEffect_path (Geom::PathVector const & path_in) for (std::size_t i = 0, e = ts.size(); i < e; ++i) { ts[i][Geom::X] *= xcoord_scaling; } - // create stroke path where points (x,y) := (t, offset) Geom::Interpolate::Interpolator *interpolator = Geom::Interpolate::Interpolator::create(static_cast(interpolator_type.get_value())); if (Geom::Interpolate::CubicBezierJohan *johan = dynamic_cast(interpolator)) { @@ -631,7 +629,6 @@ LPEPowerStroke::doEffect_path (Geom::PathVector const & path_in) x = portion(x, rtsmin.at(0), rtsmax.at(0)); y = portion(y, rtsmin.at(0), rtsmax.at(0)); } - LineJoinType jointype = static_cast(linejoin_type.get_value()); Piecewise > pwd2_out = compose(pwd2_in,x) + y*compose(n,x); @@ -639,8 +636,7 @@ LPEPowerStroke::doEffect_path (Geom::PathVector const & path_in) Geom::Path fixed_path = path_from_piecewise_fix_cusps( pwd2_out, y, jointype, miter_limit, LPE_CONVERSION_TOLERANCE); Geom::Path fixed_mirrorpath = path_from_piecewise_fix_cusps( mirrorpath, reverse(y), jointype, miter_limit, LPE_CONVERSION_TOLERANCE); - - if (path_in[0].closed()) { + if (pathv[0].closed()) { fixed_path.close(true); path_out.push_back(fixed_path); fixed_mirrorpath.close(true); @@ -684,7 +680,6 @@ LPEPowerStroke::doEffect_path (Geom::PathVector const & path_in) } fixed_path.append(fixed_mirrorpath); - switch (start_linecap) { case LINECAP_ZERO_WIDTH: // do nothing @@ -720,11 +715,9 @@ LPEPowerStroke::doEffect_path (Geom::PathVector const & path_in) break; } } - fixed_path.close(true); path_out.push_back(fixed_path); } - return path_out; } diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp index c98ecb686..7697cd59c 100644 --- a/src/ui/tools/freehand-base.cpp +++ b/src/ui/tools/freehand-base.cpp @@ -236,38 +236,14 @@ static void spdc_apply_powerstroke_shape(const std::vector & points Effect* lpe = SP_LPE_ITEM(item)->getCurrentLPE(); static_cast(lpe)->offset_points.param_set_and_write_new_value(points); - // find out stroke width (TODO: is there an easier way??) - SPDesktop *desktop = dc->desktop; - Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc(); - Inkscape::XML::Node *repr = xml_doc->createElement("svg:path"); - Inkscape::GC::release(repr); - - char const* tool = SP_IS_PEN_CONTEXT(dc) ? "/tools/freehand/pen" : "/tools/freehand/pencil"; - - // apply the tool's current style - sp_desktop_apply_style_tool(desktop, repr, tool, false); - - double stroke_width = 1.0; - char const *style_str = NULL; - style_str = repr->attribute("style"); - if (style_str) { - SPStyle style(SP_ACTIVE_DOCUMENT); - style.mergeString(style_str); - stroke_width = style.stroke_width.computed; - } - - std::ostringstream s; - s.imbue(std::locale::classic()); - s << points[0][Geom::X] << "," << stroke_width / 2.; - // write powerstroke parameters: lpe->getRepr()->setAttribute("start_linecap_type", "zerowidth"); lpe->getRepr()->setAttribute("end_linecap_type", "zerowidth"); - lpe->getRepr()->setAttribute("cusp_linecap_type", "round"); lpe->getRepr()->setAttribute("sort_points", "true"); lpe->getRepr()->setAttribute("interpolator_type", "CubicBezierJohan"); lpe->getRepr()->setAttribute("interpolator_beta", "0.2"); - lpe->getRepr()->setAttribute("offset_points", s.str().c_str()); + lpe->getRepr()->setAttribute("miter_limit", "4"); + lpe->getRepr()->setAttribute("linejoin_type", "extrp_arc"); } static void spdc_apply_bend_shape(gchar const *svgd, FreehandBase *dc, SPItem *item) @@ -341,12 +317,14 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item, bool shape_applied = false; SPCSSAttr *css_item = sp_css_attr_from_object(item, SP_STYLE_FLAG_ALWAYS); const char *cstroke = sp_repr_css_property(css_item, "stroke", "none"); + const char *stroke_width = sp_repr_css_property(css_item, "stroke-width", "0"); + double swidth; + sp_svg_number_read_d(stroke_width, &swidth); static SPItem *bend_item; #define SHAPE_LENGTH 10 #define SHAPE_HEIGHT 10 - if(shape == LAST_APPLIED){ shape = previous_shape_type; @@ -363,7 +341,8 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item, { // "triangle in" std::vector points(1); - points[0] = Geom::Point(0., SHAPE_HEIGHT/2); + points[0] = Geom::Point(0., swidth/2); + points[0] *= i2anc_affine(static_cast(item->parent), NULL).inverse(); spdc_apply_powerstroke_shape(points, dc, item); shape_applied = true; @@ -374,7 +353,9 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item, // "triangle out" guint curve_length = curve->get_segment_count(); std::vector points(1); - points[0] = Geom::Point((double)curve_length, SHAPE_HEIGHT/2); + points[0] = Geom::Point(0, swidth/2); + points[0] *= i2anc_affine(static_cast(item->parent), NULL).inverse(); + points[0][Geom::X] = (double)curve_length; spdc_apply_powerstroke_shape(points, dc, item); shape_applied = true; @@ -455,7 +436,6 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item, if(previous_shape_type == CLIPBOARD){ if(previous_shape_pathv.size() != 0){ spdc_paste_curve_as_freehand_shape(previous_shape_pathv, dc, item); - shape_applied = true; shape = CLIPBOARD; } else{ -- cgit v1.2.3 From 027da41d7212e9ecaf19439f91266d4888ae96e3 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Fri, 17 Jun 2016 08:14:16 +0200 Subject: Fixing wrong gettext keyword preventing translations from being used. (bzr r14992) --- src/ui/tools/measure-tool.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp index 0977729ae..63e2460ec 100644 --- a/src/ui/tools/measure-tool.cpp +++ b/src/ui/tools/measure-tool.cpp @@ -346,13 +346,13 @@ MeasureTool::MeasureTool() end_p = readMeasurePoint(false); dimension_offset = 35; // create the knots - this->knot_start = new SPKnot(desktop, N_("Measure start, Shift+Click for position dialog")); + this->knot_start = new SPKnot(desktop, _("Measure start, Shift+Click for position dialog")); this->knot_start->setMode(SP_KNOT_MODE_XOR); this->knot_start->setFill(MT_KNOT_COLOR_NORMAL, MT_KNOT_COLOR_MOUSEOVER, MT_KNOT_COLOR_MOUSEOVER); this->knot_start->setStroke(0x0000007f, 0x0000007f, 0x0000007f); this->knot_start->setShape(SP_KNOT_SHAPE_CIRCLE); this->knot_start->updateCtrl(); - this->knot_end = new SPKnot(desktop, N_("Measure end, Shift+Click for position dialog")); + this->knot_end = new SPKnot(desktop, _("Measure end, Shift+Click for position dialog")); this->knot_end->setMode(SP_KNOT_MODE_XOR); this->knot_end->setFill(MT_KNOT_COLOR_NORMAL, MT_KNOT_COLOR_MOUSEOVER, MT_KNOT_COLOR_MOUSEOVER); this->knot_end->setStroke(0x0000007f, 0x0000007f, 0x0000007f); -- cgit v1.2.3 From 7537a26541649aa3ab884841b9dd410beff76ac7 Mon Sep 17 00:00:00 2001 From: firashanife Date: Fri, 17 Jun 2016 08:30:33 +0200 Subject: [Bug #1574561] Italian translation updates for 0.92.x. Fixed bugs: - https://launchpad.net/bugs/1574561 (bzr r14993) --- po/it.po | 303 +++++++++++++++++++++++++++++---------------------------------- 1 file changed, 139 insertions(+), 164 deletions(-) diff --git a/po/it.po b/po/it.po index 828f7eafe..f071dbced 100644 --- a/po/it.po +++ b/po/it.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Inkscape 0.92\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2016-06-08 20:26+0200\n" -"PO-Revision-Date: 2016-06-08 15:48+0100\n" +"POT-Creation-Date: 2016-06-16 23:22+0200\n" +"PO-Revision-Date: 2016-06-10 15:31+0100\n" "Last-Translator: Firas Hanife \n" "Language-Team: \n" "Language: it\n" @@ -4471,16 +4471,16 @@ msgstr "guide tipografia tipografico canvas" msgid "3D Box" msgstr "Solido 3D" -#: ../src/color-profile.cpp:856 +#: ../src/color-profile.cpp:860 #, c-format msgid "Color profiles directory (%s) is unavailable." msgstr "La cartella dei profili colore (%s) non è disponibile." -#: ../src/color-profile.cpp:928 ../src/color-profile.cpp:945 +#: ../src/color-profile.cpp:932 ../src/color-profile.cpp:949 msgid "(invalid UTF-8 string)" msgstr "(stringa UTF-8 non valida)" -#: ../src/color-profile.cpp:930 +#: ../src/color-profile.cpp:934 msgctxt "Profile name" msgid "None" msgstr "Nessuno" @@ -6739,7 +6739,7 @@ msgstr "Discreto" #: ../src/extension/internal/filter/color.h:505 ../src/filter-enums.cpp:113 #: ../src/live_effects/lpe-interpolate_points.cpp:25 -#: ../src/live_effects/lpe-powerstroke.cpp:133 +#: ../src/live_effects/lpe-powerstroke.cpp:134 msgid "Linear" msgstr "Lineare" @@ -8550,28 +8550,24 @@ msgstr "Colore contorno" #. New in Compositing and Blending Level 1 #: ../src/filter-enums.cpp:58 -#, fuzzy msgid "Overlay" -msgstr "Sovrapposizione" +msgstr "Sovrapponi" #: ../src/filter-enums.cpp:59 -#, fuzzy msgid "Color Dodge" -msgstr "Colore delle linee guida" +msgstr "Scherma colore" #: ../src/filter-enums.cpp:60 -#, fuzzy msgid "Color Burn" -msgstr "Barra colori" +msgstr "Brucia colore" #: ../src/filter-enums.cpp:61 msgid "Hard Light" -msgstr "" +msgstr "Luce forte" #: ../src/filter-enums.cpp:62 -#, fuzzy msgid "Soft Light" -msgstr "Punto luce" +msgstr "Luce leggera" #: ../src/filter-enums.cpp:63 ../src/splivarot.cpp:89 ../src/splivarot.cpp:95 msgid "Difference" @@ -8591,7 +8587,7 @@ msgstr "Tonalità" #: ../src/filter-enums.cpp:68 msgid "Luminosity" -msgstr "" +msgstr "Luminosità" #: ../src/filter-enums.cpp:78 msgid "Matrix" @@ -9541,12 +9537,12 @@ msgstr "Nessun effetto" msgid "Please specify a parameter path for the LPE '%s' with %d mouse clicks" msgstr "Specificare un tracciato parametro per l'effetto '%s' con %d clic" -#: ../src/live_effects/effect.cpp:765 +#: ../src/live_effects/effect.cpp:766 #, c-format msgid "Editing parameter %s." msgstr "Modifica del parametro %s." -#: ../src/live_effects/effect.cpp:770 +#: ../src/live_effects/effect.cpp:771 msgid "None of the applied path effect's parameters can be edited on-canvas." msgstr "" "Nessuno dei parametri dell'effetto su tracciato applicato può essere " @@ -10132,32 +10128,32 @@ msgstr "" "posizione dei nodi del tracciato di sostegno." #: ../src/live_effects/lpe-interpolate_points.cpp:26 -#: ../src/live_effects/lpe-powerstroke.cpp:134 +#: ../src/live_effects/lpe-powerstroke.cpp:135 msgid "CubicBezierFit" msgstr "CubicBezierFit" #: ../src/live_effects/lpe-interpolate_points.cpp:27 -#: ../src/live_effects/lpe-powerstroke.cpp:135 +#: ../src/live_effects/lpe-powerstroke.cpp:136 msgid "CubicBezierJohan" msgstr "CubicBezierJohan" #: ../src/live_effects/lpe-interpolate_points.cpp:28 -#: ../src/live_effects/lpe-powerstroke.cpp:136 +#: ../src/live_effects/lpe-powerstroke.cpp:137 msgid "SpiroInterpolator" msgstr "SpiroInterpolator" #: ../src/live_effects/lpe-interpolate_points.cpp:29 -#: ../src/live_effects/lpe-powerstroke.cpp:137 +#: ../src/live_effects/lpe-powerstroke.cpp:138 msgid "Centripetal Catmull-Rom" msgstr "" #: ../src/live_effects/lpe-interpolate_points.cpp:37 -#: ../src/live_effects/lpe-powerstroke.cpp:179 +#: ../src/live_effects/lpe-powerstroke.cpp:180 msgid "Interpolator type:" msgstr "Tipo interpolazione:" #: ../src/live_effects/lpe-interpolate_points.cpp:38 -#: ../src/live_effects/lpe-powerstroke.cpp:179 +#: ../src/live_effects/lpe-powerstroke.cpp:180 msgid "" "Determines which kind of interpolator will be used to interpolate between " "stroke width along the path" @@ -10166,21 +10162,21 @@ msgstr "" "larghezza del contorno lungo il tracciato" #: ../src/live_effects/lpe-jointype.cpp:31 -#: ../src/live_effects/lpe-powerstroke.cpp:166 +#: ../src/live_effects/lpe-powerstroke.cpp:167 #: ../src/live_effects/lpe-taperstroke.cpp:63 msgid "Beveled" msgstr "Tagliati" #: ../src/live_effects/lpe-jointype.cpp:32 #: ../src/live_effects/lpe-jointype.cpp:43 -#: ../src/live_effects/lpe-powerstroke.cpp:167 +#: ../src/live_effects/lpe-powerstroke.cpp:168 #: ../src/live_effects/lpe-taperstroke.cpp:64 #: ../src/widgets/star-toolbar.cpp:534 msgid "Rounded" msgstr "Arrotondati" #: ../src/live_effects/lpe-jointype.cpp:33 -#: ../src/live_effects/lpe-powerstroke.cpp:170 +#: ../src/live_effects/lpe-powerstroke.cpp:171 #: ../src/live_effects/lpe-taperstroke.cpp:65 msgid "Miter" msgstr "Vivi" @@ -10192,7 +10188,7 @@ msgstr "Spigolosità:" #. {LINEJOIN_EXTRP_MITER, N_("Extrapolated"), "extrapolated"}, // disabled because doesn't work well #: ../src/live_effects/lpe-jointype.cpp:35 -#: ../src/live_effects/lpe-powerstroke.cpp:169 +#: ../src/live_effects/lpe-powerstroke.cpp:170 msgid "Extrapolated arc" msgstr "Arco estrapolato" @@ -10212,17 +10208,17 @@ msgid "Extrapolated arc Alt3" msgstr "Arco estrapolato" #: ../src/live_effects/lpe-jointype.cpp:42 -#: ../src/live_effects/lpe-powerstroke.cpp:149 +#: ../src/live_effects/lpe-powerstroke.cpp:150 msgid "Butt" msgstr "Geometrica" #: ../src/live_effects/lpe-jointype.cpp:44 -#: ../src/live_effects/lpe-powerstroke.cpp:150 +#: ../src/live_effects/lpe-powerstroke.cpp:151 msgid "Square" msgstr "Quadrata" #: ../src/live_effects/lpe-jointype.cpp:45 -#: ../src/live_effects/lpe-powerstroke.cpp:152 +#: ../src/live_effects/lpe-powerstroke.cpp:153 msgid "Peak" msgstr "Punta" @@ -10245,20 +10241,20 @@ msgstr "Orientazione del righello" #. TRANSLATORS: The line join style specifies the shape to be used at the #. corners of paths. It can be "miter", "round" or "bevel". #: ../src/live_effects/lpe-jointype.cpp:56 -#: ../src/live_effects/lpe-powerstroke.cpp:182 +#: ../src/live_effects/lpe-powerstroke.cpp:183 #: ../src/widgets/stroke-style.cpp:288 msgid "Join:" msgstr "Spigoli:" #: ../src/live_effects/lpe-jointype.cpp:56 -#: ../src/live_effects/lpe-powerstroke.cpp:182 +#: ../src/live_effects/lpe-powerstroke.cpp:183 msgid "Determines the shape of the path's corners" msgstr "Determina la forma degli spigoli del tracciato" #. start_lean(_("Start path lean"), _("Start path lean"), "start_lean", &wr, this, 0.), #. end_lean(_("End path lean"), _("End path lean"), "end_lean", &wr, this, 0.), #: ../src/live_effects/lpe-jointype.cpp:59 -#: ../src/live_effects/lpe-powerstroke.cpp:183 +#: ../src/live_effects/lpe-powerstroke.cpp:184 #: ../src/live_effects/lpe-taperstroke.cpp:78 msgid "Miter limit:" msgstr "Spigolosità:" @@ -10790,43 +10786,43 @@ msgstr "" msgid "Handles:" msgstr "Maniglie:" -#: ../src/live_effects/lpe-powerstroke.cpp:132 +#: ../src/live_effects/lpe-powerstroke.cpp:133 msgid "CubicBezierSmooth" msgstr "CubicBezierSmooth" -#: ../src/live_effects/lpe-powerstroke.cpp:151 +#: ../src/live_effects/lpe-powerstroke.cpp:152 #: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:13 msgid "Round" msgstr "Arrotondata" -#: ../src/live_effects/lpe-powerstroke.cpp:153 +#: ../src/live_effects/lpe-powerstroke.cpp:154 msgid "Zero width" msgstr "Larghezza zero" -#: ../src/live_effects/lpe-powerstroke.cpp:171 +#: ../src/live_effects/lpe-powerstroke.cpp:172 #: ../src/widgets/pencil-toolbar.cpp:112 msgid "Spiro" msgstr "Spiro" -#: ../src/live_effects/lpe-powerstroke.cpp:177 +#: ../src/live_effects/lpe-powerstroke.cpp:178 msgid "Offset points" msgstr "Punti proiezione" -#: ../src/live_effects/lpe-powerstroke.cpp:178 +#: ../src/live_effects/lpe-powerstroke.cpp:179 msgid "Sort points" msgstr "Ordina punti" -#: ../src/live_effects/lpe-powerstroke.cpp:178 +#: ../src/live_effects/lpe-powerstroke.cpp:179 msgid "Sort offset points according to their time value along the curve" msgstr "" "Ordina i punti della proiezione secondo la loro posizione lungo la curva" -#: ../src/live_effects/lpe-powerstroke.cpp:180 +#: ../src/live_effects/lpe-powerstroke.cpp:181 #: ../share/extensions/fractalize.inx.h:3 msgid "Smoothness:" msgstr "Curvatura:" -#: ../src/live_effects/lpe-powerstroke.cpp:180 +#: ../src/live_effects/lpe-powerstroke.cpp:181 msgid "" "Sets the smoothness for the CubicBezierJohan interpolator; 0 = linear " "interpolation, 1 = smooth" @@ -10834,25 +10830,25 @@ msgstr "" "Imposta la curvatura per l'interpolazione CubicBezierJohan; 0 = lineare, 1 = " "morbida" -#: ../src/live_effects/lpe-powerstroke.cpp:181 +#: ../src/live_effects/lpe-powerstroke.cpp:182 msgid "Start cap:" msgstr "Estremità iniziale:" -#: ../src/live_effects/lpe-powerstroke.cpp:181 +#: ../src/live_effects/lpe-powerstroke.cpp:182 msgid "Determines the shape of the path's start" msgstr "Determina la forma dell'estremità iniziale del tracciato" -#: ../src/live_effects/lpe-powerstroke.cpp:183 +#: ../src/live_effects/lpe-powerstroke.cpp:184 #: ../src/widgets/stroke-style.cpp:335 msgid "Maximum length of the miter (in units of stroke width)" msgstr "" "Lunghezza massima dello spigolo (in unità della larghezza del contorno)" -#: ../src/live_effects/lpe-powerstroke.cpp:184 +#: ../src/live_effects/lpe-powerstroke.cpp:185 msgid "End cap:" msgstr "Estremità finale:" -#: ../src/live_effects/lpe-powerstroke.cpp:184 +#: ../src/live_effects/lpe-powerstroke.cpp:185 msgid "Determines the shape of the path's end" msgstr "Determina la forma dell'estremità finale del tracciato" @@ -11179,13 +11175,13 @@ msgstr "Nessuno" #: ../src/live_effects/lpe-ruler.cpp:33 #: ../src/live_effects/lpe-transform_2pts.cpp:37 -#: ../src/ui/tools/measure-tool.cpp:756 ../src/widgets/arc-toolbar.cpp:319 +#: ../src/ui/tools/measure-tool.cpp:755 ../src/widgets/arc-toolbar.cpp:319 msgid "Start" msgstr "Inizio" #: ../src/live_effects/lpe-ruler.cpp:34 #: ../src/live_effects/lpe-transform_2pts.cpp:38 -#: ../src/ui/tools/measure-tool.cpp:757 ../src/widgets/arc-toolbar.cpp:332 +#: ../src/ui/tools/measure-tool.cpp:756 ../src/widgets/arc-toolbar.cpp:332 msgid "End" msgstr "Fine" @@ -11756,7 +11752,7 @@ msgstr "Inverti" #: ../src/live_effects/parameter/originalpatharray.cpp:130 #: ../src/live_effects/parameter/originalpatharray.cpp:315 -#: ../src/live_effects/parameter/path.cpp:486 +#: ../src/live_effects/parameter/path.cpp:510 msgid "Link path parameter to path" msgstr "Lega il parametro del tracciato al parametro" @@ -11790,23 +11786,23 @@ msgstr "Sposta in basso effetto su tracciato" msgid "Remove path" msgstr "Muovi motivi" -#: ../src/live_effects/parameter/path.cpp:170 +#: ../src/live_effects/parameter/path.cpp:184 msgid "Edit on-canvas" msgstr "Modifica sul disegno" -#: ../src/live_effects/parameter/path.cpp:180 +#: ../src/live_effects/parameter/path.cpp:194 msgid "Copy path" msgstr "Copia tracciato" -#: ../src/live_effects/parameter/path.cpp:190 +#: ../src/live_effects/parameter/path.cpp:204 msgid "Paste path" msgstr "Incolla tracciato" -#: ../src/live_effects/parameter/path.cpp:200 +#: ../src/live_effects/parameter/path.cpp:214 msgid "Link to path on clipboard" msgstr "Collega a tracciato negli appunti" -#: ../src/live_effects/parameter/path.cpp:454 +#: ../src/live_effects/parameter/path.cpp:478 msgid "Paste path parameter" msgstr "Incolla parametri tracciato" @@ -13373,26 +13369,26 @@ msgstr "di %d oggetto" msgid "of %d objects" msgstr "di %d oggetti" -#: ../src/sp-item.cpp:1031 ../src/verbs.cpp:213 +#: ../src/sp-item.cpp:1030 ../src/verbs.cpp:213 msgid "Object" msgstr "Oggetto" -#: ../src/sp-item.cpp:1043 +#: ../src/sp-item.cpp:1042 #, c-format msgid "%s; clipped" msgstr "%s; con fissaggio" -#: ../src/sp-item.cpp:1049 +#: ../src/sp-item.cpp:1048 #, c-format msgid "%s; masked" msgstr "%s; con maschera" -#: ../src/sp-item.cpp:1059 +#: ../src/sp-item.cpp:1058 #, c-format msgid "%s; filtered (%s)" msgstr "%s; con filtro (%s)" -#: ../src/sp-item.cpp:1061 +#: ../src/sp-item.cpp:1060 #, c-format msgid "%s; filtered" msgstr "%s; con filtro" @@ -15056,14 +15052,14 @@ msgid "Back_ground color:" msgstr "Colore di sfo_ndo:" #: ../src/ui/dialog/document-properties.cpp:123 -#, fuzzy msgid "" "Color of the page background. Note: transparency setting ignored while " "editing if 'Checkerboard background' unset (but used when exporting to " "bitmap)." msgstr "" "Colore di sfondo della pagina. Nota: l'impostazione della trasparenza è " -"ignorata durante la modifica ma utilizzata nell'esportazione bitmap." +"ignorata durante la modifica se 'Sfondo a scacchiera' non è selezionato, ma " +"utilizzata nell'esportazione bitmap." #: ../src/ui/dialog/document-properties.cpp:124 msgid "Border _color:" @@ -19697,7 +19693,7 @@ msgstr "Preserva il canale K nelle trasformazioni CMYK -> CMYK" #: ../src/ui/dialog/inkscape-preferences.cpp:1091 #: ../src/ui/widget/color-icc-selector.cpp:394 -#: ../src/ui/widget/color-icc-selector.cpp:699 +#: ../src/ui/widget/color-icc-selector.cpp:700 msgid "" msgstr "" @@ -20428,6 +20424,8 @@ msgid "" "Stroke color same as object, fill color either object fill color or marker " "fill color" msgstr "" +"Colore di contorno uguale all'oggetto, colore di riempimento uguale " +"all'oggetto o al colore di riempimento del delimitatore" #: ../src/ui/dialog/inkscape-preferences.cpp:1413 #: ../share/extensions/hershey.inx.h:27 @@ -20654,7 +20652,6 @@ msgid "Bitmaps" msgstr "Bitmap" #: ../src/ui/dialog/inkscape-preferences.cpp:1549 -#, fuzzy msgid "" "Select a file of predefined shortcuts to use. Any customized shortcuts you " "create will be added separately to " @@ -22299,15 +22296,15 @@ msgid "By: " msgstr "By: " #: ../src/ui/dialog/text-edit.cpp:72 -#, fuzzy msgid "_Variants" -msgstr "Variazione" +msgstr "_Varianti" #: ../src/ui/dialog/text-edit.cpp:73 msgid "Set as _default" msgstr "Imposta come _predefinito" #: ../src/ui/dialog/text-edit.cpp:87 +#, fuzzy msgid "AaBbCcIiPpQq12369$ےے?.;/()" msgstr "AaBbCcIiPpQq12369$€¢?.;/()" @@ -23996,7 +23993,7 @@ msgstr "Creazione di una linea calligrafica" #: ../src/ui/tools/calligraphic-tool.cpp:966 msgid "Draw calligraphic stroke" -msgstr "Crea linea calligrafiche" +msgstr "Crea linea calligrafica" #: ../src/ui/tools/connector-tool.cpp:489 msgid "Creating new connector" @@ -24146,24 +24143,24 @@ msgstr "" "b> per riempire al tocco" #. We hit green anchor, closing Green-Blue-Red -#: ../src/ui/tools/freehand-base.cpp:677 +#: ../src/ui/tools/freehand-base.cpp:657 msgid "Path is closed." msgstr "Il tracciato è chiuso." #. We hit bot start and end of single curve, closing paths -#: ../src/ui/tools/freehand-base.cpp:692 +#: ../src/ui/tools/freehand-base.cpp:672 msgid "Closing path." msgstr "Chiusura tracciato." -#: ../src/ui/tools/freehand-base.cpp:831 +#: ../src/ui/tools/freehand-base.cpp:811 msgid "Draw path" msgstr "Disegna tracciato" -#: ../src/ui/tools/freehand-base.cpp:984 +#: ../src/ui/tools/freehand-base.cpp:964 msgid "Creating single dot" msgstr "Creazione singolo punto" -#: ../src/ui/tools/freehand-base.cpp:985 +#: ../src/ui/tools/freehand-base.cpp:965 msgid "Create single dot" msgstr "Crea singolo punto" @@ -24275,31 +24272,31 @@ msgid "Measure end, Shift+Click for position dialog" msgstr "" "Fine misurazione, Maiusc+Clic per aprire la finestra di posizionamento" -#: ../src/ui/tools/measure-tool.cpp:747 ../share/extensions/measure.inx.h:2 +#: ../src/ui/tools/measure-tool.cpp:746 ../share/extensions/measure.inx.h:2 msgid "Measure" msgstr "Misura" -#: ../src/ui/tools/measure-tool.cpp:752 +#: ../src/ui/tools/measure-tool.cpp:751 msgid "Base" msgstr "" -#: ../src/ui/tools/measure-tool.cpp:761 +#: ../src/ui/tools/measure-tool.cpp:760 msgid "Add guides from measure tool" msgstr "Aggiungi guide dallo strumento di misurazione" -#: ../src/ui/tools/measure-tool.cpp:781 +#: ../src/ui/tools/measure-tool.cpp:780 msgid "Keep last measure on the canvas, for reference" -msgstr "" +msgstr "Mantieni ultima misura fantasma sullo spazio di lavoro" -#: ../src/ui/tools/measure-tool.cpp:801 +#: ../src/ui/tools/measure-tool.cpp:800 msgid "Convert measure to items" msgstr "Converti misura in oggetto" -#: ../src/ui/tools/measure-tool.cpp:839 +#: ../src/ui/tools/measure-tool.cpp:838 msgid "Add global measure line" -msgstr "" +msgstr "Aggiungi misurazione complessiva" -#: ../src/ui/tools/measure-tool.cpp:1290 ../src/ui/tools/measure-tool.cpp:1292 +#: ../src/ui/tools/measure-tool.cpp:1289 ../src/ui/tools/measure-tool.cpp:1291 #, c-format msgid "Crossing %lu" msgstr "Intersezione %lu" @@ -24627,12 +24624,12 @@ msgstr "" msgid "Create rectangle" msgstr "Crea rettangolo" -#: ../src/ui/tools/select-tool.cpp:156 +#: ../src/ui/tools/select-tool.cpp:155 msgid "Click selection to toggle scale/rotation handles" msgstr "" "Clicca la selezione per alternare le maniglie di ridimensionamento/rotazione" -#: ../src/ui/tools/select-tool.cpp:157 +#: ../src/ui/tools/select-tool.cpp:156 msgid "" "No objects selected. Click, Shift+click, Alt+scroll mouse on top of objects, " "or drag around objects to select." @@ -24640,15 +24637,15 @@ msgstr "" "Nessun oggetto selezionato. Clicca, Maiusc+Clic, Alt+scorrimento mouse sugli " "oggetti, o trascina attorno agli oggetti per selezionare." -#: ../src/ui/tools/select-tool.cpp:210 +#: ../src/ui/tools/select-tool.cpp:209 msgid "Move canceled." msgstr "Spostamento cancellato." -#: ../src/ui/tools/select-tool.cpp:218 +#: ../src/ui/tools/select-tool.cpp:217 msgid "Selection canceled." msgstr "Selezione cancellata." -#: ../src/ui/tools/select-tool.cpp:638 +#: ../src/ui/tools/select-tool.cpp:645 msgid "" "Draw over objects to select them; release Alt to switch to " "rubberband selection" @@ -24656,7 +24653,7 @@ msgstr "" "Disegna sugli oggetti per selezionarli; rilascia Alt per " "passare alla selezione ad elastico" -#: ../src/ui/tools/select-tool.cpp:640 +#: ../src/ui/tools/select-tool.cpp:647 msgid "" "Drag around objects to select them; press Alt to switch to " "touch selection" @@ -24664,19 +24661,19 @@ msgstr "" "Trascina attorno agli oggetti per selezionarli; premi Alt per " "passare alla selezione col tocco" -#: ../src/ui/tools/select-tool.cpp:921 +#: ../src/ui/tools/select-tool.cpp:888 msgid "Ctrl: click to select in groups; drag to move hor/vert" msgstr "" "Ctrl: clicca per selezionare nei gruppi, trascina per muovere in " "orizzontale o verticale" -#: ../src/ui/tools/select-tool.cpp:922 +#: ../src/ui/tools/select-tool.cpp:889 msgid "Shift: click to toggle select; drag for rubberband selection" msgstr "" "Maiusc: clicca per commutare la selezione, trascina per usare la " "selezione ad elastico" -#: ../src/ui/tools/select-tool.cpp:923 +#: ../src/ui/tools/select-tool.cpp:890 msgid "" "Alt: click to select under; scroll mouse-wheel to cycle-select; drag " "to move selected or select by touch" @@ -24684,7 +24681,7 @@ msgstr "" "Alt: clicca per selezionare sotto, scorri con il mouse per " "selezionare in ciclo, trascina per muovere la selezione o seleziona col tocco" -#: ../src/ui/tools/select-tool.cpp:1131 +#: ../src/ui/tools/select-tool.cpp:1098 msgid "Selected object is not a group. Cannot enter." msgstr "L'oggetto selezionato non è un gruppo, impossibile entrarvi." @@ -24943,7 +24940,7 @@ msgstr[1] "" msgid "Type text" msgstr "Inserimento testo" -#: ../src/ui/tools/tool-base.cpp:700 +#: ../src/ui/tools/tool-base.cpp:705 msgid "Space+mouse move to pan canvas" msgstr "Spazio+spostamento puntatore per muovere la tela" @@ -25229,7 +25226,7 @@ msgstr "Sfocatura (%)" #: ../src/ui/widget/font-variants.cpp:38 msgctxt "Font variant" msgid "Ligatures" -msgstr "" +msgstr "Legature" #: ../src/ui/widget/font-variants.cpp:39 #, fuzzy @@ -25256,46 +25253,41 @@ msgid "Contextual" msgstr "Contesto" #: ../src/ui/widget/font-variants.cpp:44 -#, fuzzy msgctxt "Font variant" msgid "Position" msgstr "Posizione" #: ../src/ui/widget/font-variants.cpp:45 ../src/ui/widget/font-variants.cpp:50 -#, fuzzy msgctxt "Font variant" msgid "Normal" msgstr "Normale" #: ../src/ui/widget/font-variants.cpp:46 -#, fuzzy msgctxt "Font variant" msgid "Subscript" -msgstr "Script" +msgstr "Pedice" #: ../src/ui/widget/font-variants.cpp:47 -#, fuzzy msgctxt "Font variant" msgid "Superscript" -msgstr "Abilita apice" +msgstr "Apice" #: ../src/ui/widget/font-variants.cpp:49 -#, fuzzy msgctxt "Font variant" msgid "Capitals" -msgstr "Ospedale" +msgstr "Maiuscole" #: ../src/ui/widget/font-variants.cpp:51 #, fuzzy msgctxt "Font variant" msgid "Small" -msgstr "Piccola" +msgstr "Piccole" #: ../src/ui/widget/font-variants.cpp:52 #, fuzzy msgctxt "Font variant" msgid "All small" -msgstr "piccola" +msgstr "Tutte piccole" #: ../src/ui/widget/font-variants.cpp:53 msgctxt "Font variant" @@ -25323,31 +25315,27 @@ msgstr "Vela" #: ../src/ui/widget/font-variants.cpp:58 msgctxt "Font variant" msgid "Numeric" -msgstr "" +msgstr "Numeri" #: ../src/ui/widget/font-variants.cpp:59 -#, fuzzy msgctxt "Font variant" msgid "Lining" -msgstr "Diradamento:" +msgstr "Maiuscoli" #: ../src/ui/widget/font-variants.cpp:60 -#, fuzzy msgctxt "Font variant" msgid "Old Style" -msgstr "Stile" +msgstr "Elzeviriani" #: ../src/ui/widget/font-variants.cpp:61 -#, fuzzy msgctxt "Font variant" msgid "Default Style" -msgstr "Titolo predefinito" +msgstr "Stile predefinito" #: ../src/ui/widget/font-variants.cpp:62 -#, fuzzy msgctxt "Font variant" msgid "Proportional" -msgstr "Proporzione schede:" +msgstr "Proporzionale" #: ../src/ui/widget/font-variants.cpp:63 msgctxt "Font variant" @@ -25355,28 +25343,24 @@ msgid "Tabular" msgstr "" #: ../src/ui/widget/font-variants.cpp:64 -#, fuzzy msgctxt "Font variant" msgid "Default Width" -msgstr "Titolo predefinito" +msgstr "Larghezza predefinita" #: ../src/ui/widget/font-variants.cpp:65 -#, fuzzy msgctxt "Font variant" msgid "Diagonal" -msgstr "Guide diagonali" +msgstr "Diagonali" #: ../src/ui/widget/font-variants.cpp:66 -#, fuzzy msgctxt "Font variant" msgid "Stacked" -msgstr "Terminale" +msgstr "Impilate" #: ../src/ui/widget/font-variants.cpp:67 -#, fuzzy msgctxt "Font variant" msgid "Default Fractions" -msgstr "Impostazioni predefinite griglia" +msgstr "Frazioni predefinite" #: ../src/ui/widget/font-variants.cpp:68 msgctxt "Font variant" @@ -25386,7 +25370,7 @@ msgstr "" #: ../src/ui/widget/font-variants.cpp:69 msgctxt "Font variant" msgid "Slashed Zero" -msgstr "" +msgstr "Zero barrato" #: ../src/ui/widget/font-variants.cpp:71 #, fuzzy @@ -25418,33 +25402,35 @@ msgstr "" #. Position ---------------------------------- #. Add tooltips #: ../src/ui/widget/font-variants.cpp:112 -#, fuzzy msgid "Normal position." -msgstr "Posizione X" +msgstr "Posizione normale." #: ../src/ui/widget/font-variants.cpp:113 msgid "Subscript. OpenType table: 'subs'" -msgstr "" +msgstr "Apice. OpenType table: 'subs'" #: ../src/ui/widget/font-variants.cpp:114 msgid "Superscript. OpenType table: 'sups'" -msgstr "" +msgstr "Pedice. OpenType table: 'sups'" #. Caps ---------------------------------- #. Add tooltips #: ../src/ui/widget/font-variants.cpp:138 -#, fuzzy msgid "Normal capitalization." -msgstr "Localizzazione" +msgstr "Maiuscole normali." #: ../src/ui/widget/font-variants.cpp:139 +#, fuzzy msgid "Small-caps (lowercase). OpenType table: 'smcp'" -msgstr "" +msgstr "Maiuscole piccole (minuscole). OpenType table: 'smcp'" #: ../src/ui/widget/font-variants.cpp:140 +#, fuzzy msgid "" "All small-caps (uppercase and lowercase). OpenType tables: 'c2sc' and 'smcp'" msgstr "" +"Tutte maiuscole piccole (maiuscole e minuscole). OpenType table: 'c2sc' e " +"'smcp'" #: ../src/ui/widget/font-variants.cpp:141 msgid "Petite-caps (lowercase). OpenType table: 'pcap'" @@ -25470,43 +25456,40 @@ msgstr "" #. Numeric ------------------------------ #. Add tooltips #: ../src/ui/widget/font-variants.cpp:180 -#, fuzzy msgid "Normal style." -msgstr "Proiezione normale:" +msgstr "Stile normale." #: ../src/ui/widget/font-variants.cpp:181 msgid "Lining numerals. OpenType table: 'lnum'" -msgstr "" +msgstr "Numeri maiuscoli. OpenType table: 'lnum'" #: ../src/ui/widget/font-variants.cpp:182 msgid "Old style numerals. OpenType table: 'onum'" -msgstr "" +msgstr "Numeri elzeviriani. OpenType table: 'onum'" #: ../src/ui/widget/font-variants.cpp:183 -#, fuzzy msgid "Normal widths." -msgstr "Luce normale" +msgstr "Larghezze normali." #: ../src/ui/widget/font-variants.cpp:184 msgid "Proportional width numerals. OpenType table: 'pnum'" -msgstr "" +msgstr "Larghezza numeri proporzionale. OpenType table: 'pnum'" #: ../src/ui/widget/font-variants.cpp:185 msgid "Same width numerals. OpenType table: 'tnum'" -msgstr "" +msgstr "Larghezza numeri fissa. OpenType table: 'tnum'" #: ../src/ui/widget/font-variants.cpp:186 -#, fuzzy msgid "Normal fractions." -msgstr "Ignora rotazione immagini" +msgstr "Frazioni normali." #: ../src/ui/widget/font-variants.cpp:187 msgid "Diagonal fractions. OpenType table: 'frac'" -msgstr "" +msgstr "Frazioni diagonali. OpenType table: 'frac'" #: ../src/ui/widget/font-variants.cpp:188 msgid "Stacked fractions. OpenType table: 'afrc'" -msgstr "" +msgstr "Frazioni impilate. OpenType table: 'afrc'" #: ../src/ui/widget/font-variants.cpp:189 msgid "Ordinals (raised 'th', etc.). OpenType table: 'ordn'" @@ -25514,7 +25497,7 @@ msgstr "" #: ../src/ui/widget/font-variants.cpp:190 msgid "Slashed zeros. OpenType table: 'zero'" -msgstr "" +msgstr "Zeri barrati. OpenType table: 'zero'" #. Feature settings --------------------- #. Add tooltips @@ -28403,18 +28386,16 @@ msgid "Object_s..." msgstr "Ogge_tti..." #: ../src/verbs.cpp:2949 -#, fuzzy msgid "View Objects" -msgstr "Oggetti" +msgstr "Visualizza oggetti" #: ../src/verbs.cpp:2950 msgid "Selection se_ts..." msgstr "Set di selezione..." #: ../src/verbs.cpp:2951 -#, fuzzy msgid "View Tags" -msgstr "Mostra i livelli" +msgstr "Visualizza set di selezione" #: ../src/verbs.cpp:2952 msgid "Path E_ffects ..." @@ -29786,39 +29767,35 @@ msgstr "Apri finestra LPE (per la modifica dei parametri numerici)" #: ../src/widgets/measure-toolbar.cpp:157 msgid "Start and end measures inactive." -msgstr "" +msgstr "Misura del primo e ultimo punto disattivata." #: ../src/widgets/measure-toolbar.cpp:159 msgid "Start and end measures active." -msgstr "" +msgstr "Misura del primo e ultimo punto attivata." #: ../src/widgets/measure-toolbar.cpp:175 -#, fuzzy msgid "Show all crossings." -msgstr "Mostra tutti i livelli" +msgstr "Mostra tutte le intersezioni." #: ../src/widgets/measure-toolbar.cpp:177 msgid "Show visible crossings." -msgstr "" +msgstr "Mostra le intersezioni visibili." #: ../src/widgets/measure-toolbar.cpp:193 msgid "Use all layers in the measure." -msgstr "" +msgstr "Usa tutti i livelli nella misurazione." #: ../src/widgets/measure-toolbar.cpp:195 -#, fuzzy msgid "Use current layer in the measure." -msgstr "Sposta il livello attuale in cima" +msgstr "Usa il livello attuale nella misurazione." #: ../src/widgets/measure-toolbar.cpp:211 -#, fuzzy msgid "Compute all elements." -msgstr "tutorial-elements.svg" +msgstr "Calcola tutti gli oggetti." #: ../src/widgets/measure-toolbar.cpp:213 -#, fuzzy msgid "Compute max length." -msgstr "Lunghezza tracciato" +msgstr "Calcola la lunghezza massima." #: ../src/widgets/measure-toolbar.cpp:274 ../src/widgets/text-toolbar.cpp:1609 msgid "Font Size" @@ -29846,9 +29823,8 @@ msgid "Decimal precision of measure" msgstr "Precisione decimale della misura" #: ../src/widgets/measure-toolbar.cpp:315 -#, fuzzy msgid "Scale %" -msgstr "Ridimensionamento x" +msgstr "Scala %" #: ../src/widgets/measure-toolbar.cpp:315 msgid "Scale %:" @@ -29870,9 +29846,8 @@ msgstr "Ignora primo e ultimo punto" #: ../src/widgets/measure-toolbar.cpp:352 #: ../src/widgets/measure-toolbar.cpp:353 -#, fuzzy msgid "Show hidden intersections" -msgstr "intersezione guide" +msgstr "Mostra intersezioni nascoste" #: ../src/widgets/measure-toolbar.cpp:363 #: ../src/widgets/measure-toolbar.cpp:364 @@ -30530,7 +30505,7 @@ msgstr "Rx:" #: ../src/widgets/rect-toolbar.cpp:351 msgid "Horizontal radius of rounded corners" -msgstr "Raggio orizzontale di un angolo arrotondato" +msgstr "Raggio orizzontale dell'angolo arrotondato" #: ../src/widgets/rect-toolbar.cpp:366 msgid "Vertical radius" @@ -30542,7 +30517,7 @@ msgstr "Ry:" #: ../src/widgets/rect-toolbar.cpp:366 msgid "Vertical radius of rounded corners" -msgstr "Raggio verticale di un angolo arrotondato" +msgstr "Raggio verticale dell'angolo arrotondato" #: ../src/widgets/rect-toolbar.cpp:385 msgid "Not rounded" -- cgit v1.2.3 From a97bf3449ea2ce909a3d77f5d528bac1813b46c6 Mon Sep 17 00:00:00 2001 From: lohanandrade Date: Fri, 17 Jun 2016 08:39:34 +0200 Subject: [Bug #1580583] update corel draw x8 shortcut. Fixed bugs: - https://launchpad.net/bugs/1580583 (bzr r14994) --- share/keys/Makefile.am | 1 + share/keys/corel-draw-x8.xml | 175 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 176 insertions(+) create mode 100644 share/keys/corel-draw-x8.xml diff --git a/share/keys/Makefile.am b/share/keys/Makefile.am index f4a08d595..98b720c2b 100644 --- a/share/keys/Makefile.am +++ b/share/keys/Makefile.am @@ -9,6 +9,7 @@ keys_DATA = \ adobe-illustrator-cs2.xml \ right-handed-illustration.xml \ corel-draw-x4.xml \ + corel-draw-x8.xml \ zoner-draw.xml \ acd-canvas.xml diff --git a/share/keys/corel-draw-x8.xml b/share/keys/corel-draw-x8.xml new file mode 100644 index 000000000..cd4cf4304 --- /dev/null +++ b/share/keys/corel-draw-x8.xml @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 19f956f4e808c2c97dfeee599266c6d9680c2f3d Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Fri, 17 Jun 2016 08:44:20 +0200 Subject: [Bug #1454910] Compressed SVG with media error. Fixed bugs: - https://launchpad.net/bugs/1454910 (bzr r14995) --- share/extensions/svg_and_media_zip_output.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/extensions/svg_and_media_zip_output.py b/share/extensions/svg_and_media_zip_output.py index fb1ddd823..e021bfd4e 100755 --- a/share/extensions/svg_and_media_zip_output.py +++ b/share/extensions/svg_and_media_zip_output.py @@ -111,7 +111,7 @@ class CompressedMediaOutput(inkex.Effect): url = urlparse.urlparse(xlink) href = urllib.url2pathname(url.path) - if (href != None): + if (href != None and os.path.isfile(href)): absref = os.path.realpath(href) absref = unicode(absref, "utf-8") -- cgit v1.2.3 From 9eef6434d111fe97e15cfa635c431d97db021df0 Mon Sep 17 00:00:00 2001 From: firashanife Date: Mon, 20 Jun 2016 07:10:08 +0200 Subject: [Bug #1574561] Italian translation updates for 0.92.x. Fixed bugs: - https://launchpad.net/bugs/1574561 (bzr r14996) --- po/it.po | 72 ++++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 38 insertions(+), 34 deletions(-) diff --git a/po/it.po b/po/it.po index f071dbced..0011c90f7 100644 --- a/po/it.po +++ b/po/it.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Inkscape 0.92\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2016-06-16 23:22+0200\n" +"POT-Creation-Date: 2016-06-17 15:11+0200\n" "PO-Revision-Date: 2016-06-10 15:31+0100\n" "Last-Translator: Firas Hanife \n" "Language-Team: \n" @@ -1010,7 +1010,7 @@ msgstr "Arcobaleno tinto" #: ../share/filters/filters.svg.h:380 msgid "Smooth rainbow colors melted along the edges and colorizable" -msgstr "Arcobaleno di colori, fuso lungo i bordi e colorabile" +msgstr "Arcobaleno colorato fuso lungo i bordi e colorabile" #: ../share/filters/filters.svg.h:382 msgid "Melted Rainbow" @@ -1018,7 +1018,7 @@ msgstr "Arcobaleno fuso" #: ../share/filters/filters.svg.h:384 msgid "Smooth rainbow colors slightly melted along the edges" -msgstr "Arcobaleno di colori, leggermente fuso lungo i bordi" +msgstr "Arcobaleno colorato leggermente fuso lungo i bordi" #: ../share/filters/filters.svg.h:386 msgid "Flex Metal" @@ -6324,7 +6324,7 @@ msgstr "Miscela a sfondo" #: ../src/extension/internal/filter/blurs.h:354 msgid "Blur eroded by white or transparency" -msgstr "" +msgstr "Sfocatura graduale al bianco o al trasparente" #: ../src/extension/internal/filter/bumps.h:80 msgid "Bump" @@ -6777,7 +6777,7 @@ msgstr "Solo colore" #: ../src/extension/internal/filter/color.h:593 msgid "Alpha only" -msgstr "Solo alfa" +msgstr "Solo alpha" #: ../src/extension/internal/filter/color.h:597 msgid "Color 1" @@ -9465,7 +9465,6 @@ msgstr "Trasforma gradienti" #: ../src/live_effects/effect.cpp:141 #: ../src/live_effects/lpe-show_handles.cpp:26 -#, fuzzy msgid "Show handles" msgstr "Mostra maniglie" @@ -11262,19 +11261,16 @@ msgid "Choose whether to draw marks at the beginning and end of the path" msgstr "Disegna o meno le tacche all'inizio e alla fine del tracciato" #: ../src/live_effects/lpe-show_handles.cpp:25 -#, fuzzy msgid "Show nodes" -msgstr "Mostra maniglie" +msgstr "Mostra nodi" #: ../src/live_effects/lpe-show_handles.cpp:27 -#, fuzzy msgid "Show path" -msgstr "Disegna tracciato" +msgstr "Mostra tracciato" #: ../src/live_effects/lpe-show_handles.cpp:28 -#, fuzzy msgid "Scale nodes and handles" -msgstr "Aggancia nodi, tracciati e maniglie" +msgstr "Scala nodi e maniglie" #: ../src/live_effects/lpe-show_handles.cpp:29 #: ../src/ui/tool/multi-path-manipulator.cpp:788 @@ -16850,7 +16846,7 @@ msgstr "_Sostituisci tutti" #: ../src/ui/dialog/find.cpp:116 msgid "Replace all matches" -msgstr "Sostituisci tutte le occorrenze" +msgstr "Sostituisce tutte le occorrenze" #: ../src/ui/dialog/find.cpp:801 msgid "Nothing to replace" @@ -17272,11 +17268,12 @@ msgstr "Estensioni IPA" #: ../src/ui/dialog/glyphs.cpp:158 #, fuzzy msgid "Spacing Modifier Letters" -msgstr "Spaziatura tra le lettere" +msgstr "Spacing Modifier Letters" #: ../src/ui/dialog/glyphs.cpp:159 +#, fuzzy msgid "Combining Diacritical Marks" -msgstr "" +msgstr "Combining Diacritical Marks" #: ../src/ui/dialog/glyphs.cpp:160 msgid "Greek and Coptic" @@ -17335,8 +17332,9 @@ msgid "Phonetic Extensions Supplement" msgstr "Supplemento Estensioni Fonetico" #: ../src/ui/dialog/glyphs.cpp:213 +#, fuzzy msgid "Combining Diacritical Marks Supplement" -msgstr "" +msgstr "Combining Diacritical Marks Supplement" #: ../src/ui/dialog/glyphs.cpp:214 msgid "Latin Extended Additional" @@ -17359,12 +17357,14 @@ msgid "Currency Symbols" msgstr "Simboli di valuta" #: ../src/ui/dialog/glyphs.cpp:219 +#, fuzzy msgid "Combining Diacritical Marks for Symbols" -msgstr "" +msgstr "Combining Diacritical Marks for Symbols" #: ../src/ui/dialog/glyphs.cpp:220 +#, fuzzy msgid "Letterlike Symbols" -msgstr "" +msgstr "Letterlike Symbols" #: ../src/ui/dialog/glyphs.cpp:221 msgid "Number Forms" @@ -17388,7 +17388,7 @@ msgstr "Immagini controllo" #: ../src/ui/dialog/glyphs.cpp:226 msgid "Optical Character Recognition" -msgstr "" +msgstr "Riconoscimento ottico dei caratteri OCR" #: ../src/ui/dialog/glyphs.cpp:227 msgid "Enclosed Alphanumerics" @@ -17471,8 +17471,9 @@ msgid "Kangxi Radicals" msgstr "Radicali Kangxi" #: ../src/ui/dialog/glyphs.cpp:250 +#, fuzzy msgid "Ideographic Description Characters" -msgstr "" +msgstr "Ideographic Description Characters" #: ../src/ui/dialog/glyphs.cpp:251 msgid "CJK Symbols and Punctuation" @@ -17539,8 +17540,9 @@ msgid "Bamum" msgstr "Bamum" #: ../src/ui/dialog/glyphs.cpp:271 +#, fuzzy msgid "Modifier Tone Letters" -msgstr "" +msgstr "Modifier Tone Letters" #: ../src/ui/dialog/glyphs.cpp:272 msgid "Latin Extended-D" @@ -17863,17 +17865,16 @@ msgstr "" "contorno attuale)" #: ../src/ui/dialog/inkscape-preferences.cpp:213 -#, fuzzy msgid "Base simplify:" -msgstr "Semplifica" +msgstr "Semplificazione base:" #: ../src/ui/dialog/inkscape-preferences.cpp:213 msgid "on dynamic LPE simplify" -msgstr "" +msgstr "con la semplificazione interattiva LPE" #: ../src/ui/dialog/inkscape-preferences.cpp:214 msgid "Base simplify of dynamic LPE based simplify" -msgstr "" +msgstr "Semplificazione base della semplificazione dinamica LPE" #: ../src/ui/dialog/inkscape-preferences.cpp:229 msgid "No objects selected to take the style from." @@ -22304,7 +22305,6 @@ msgid "Set as _default" msgstr "Imposta come _predefinito" #: ../src/ui/dialog/text-edit.cpp:87 -#, fuzzy msgid "AaBbCcIiPpQq12369$ےے?.;/()" msgstr "AaBbCcIiPpQq12369$€¢?.;/()" @@ -25648,6 +25648,9 @@ msgid "" "scaling in Inkscape. To set a non-uniform scaling, set the 'viewBox' " "directly." msgstr "" +"SVG permette un ridimensionamento non uniforme, ma si consiglia di " +"utilizzare solo l'uniforme in Inkscape. Per impostarlo come non uniforme " +"modifica direttamente la 'viewBox'." #: ../src/ui/widget/page-sizer.cpp:483 msgid "_Viewbox..." @@ -25659,7 +25662,7 @@ msgstr "Imposta dimensione pagina" #: ../src/ui/widget/page-sizer.cpp:836 msgid "User units per " -msgstr "" +msgstr "Unità utente per " #: ../src/ui/widget/page-sizer.cpp:932 msgid "Set page scale" @@ -27514,7 +27517,7 @@ msgstr "Riflette verticalmente gli oggetti selezionati" #: ../src/verbs.cpp:2714 msgid "Apply mask to selection (using the topmost object as mask)" msgstr "" -"Applica la maschera alla selezione (usando come maschera l'oggetto superiore)" +"Applica la maschera alla selezione (usando l'oggetto più alto come maschera)" #: ../src/verbs.cpp:2716 msgid "Edit mask" @@ -28671,7 +28674,7 @@ msgstr "Nuovo:" #: ../src/widgets/spiral-toolbar.cpp:212 ../src/widgets/spiral-toolbar.cpp:223 #: ../src/widgets/star-toolbar.cpp:384 msgid "Change:" -msgstr "Cambia:" +msgstr "Modifica:" #: ../src/widgets/arc-toolbar.cpp:319 msgid "Start:" @@ -29179,7 +29182,8 @@ msgstr "Spostamento del motivo" #: ../src/widgets/desktop-widget.cpp:499 msgid "Zoom drawing if window size changes" -msgstr "Aggiusta l'ingrandimento se cambia la dimensione della finestra" +msgstr "" +"Aggiusta l'ingrandimento al cambiamento della dimensione della finestra" #. Display the initial welcome message in the statusbar #: ../src/widgets/desktop-widget.cpp:701 @@ -29763,7 +29767,7 @@ msgstr "Apri finestra LPE" #: ../src/widgets/lpe-toolbar.cpp:398 msgid "Open LPE dialog (to adapt parameters numerically)" -msgstr "Apri finestra LPE (per la modifica dei parametri numerici)" +msgstr "Apre la finestra LPE (per la modifica dei parametri numerici)" #: ../src/widgets/measure-toolbar.cpp:157 msgid "Start and end measures inactive." @@ -30465,11 +30469,11 @@ msgstr "" #: ../src/widgets/pencil-toolbar.cpp:407 ../src/widgets/pencil-toolbar.cpp:408 msgid "LPE based interactive simplify" -msgstr "" +msgstr "Semplificazione interattiva LPE" #: ../src/widgets/pencil-toolbar.cpp:418 ../src/widgets/pencil-toolbar.cpp:419 msgid "LPE simplify flatten" -msgstr "" +msgstr "Semplifica tracciato LPE" #: ../src/widgets/rect-toolbar.cpp:125 msgid "Change rectangle" @@ -31647,7 +31651,7 @@ msgstr "Rotazione carattere (gradi)" #: ../src/widgets/toolbox.cpp:186 msgid "Color/opacity used for color tweaking" -msgstr "Colore/opacità usato per il ritocco del colore" +msgstr "Colore/Opacità usato per il ritocco del colore" #: ../src/widgets/toolbox.cpp:194 msgid "Style of new stars" -- cgit v1.2.3 From b65581bd7a768c78115a8a0a807e79a2ee91e80e Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Mon, 20 Jun 2016 18:57:07 +0200 Subject: Fixing missing gettext keyword (regression introduced rev. 14057). (bzr r14997) --- src/widgets/paintbucket-toolbar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widgets/paintbucket-toolbar.cpp b/src/widgets/paintbucket-toolbar.cpp index eb55287c4..5cb2dd58b 100644 --- a/src/widgets/paintbucket-toolbar.cpp +++ b/src/widgets/paintbucket-toolbar.cpp @@ -127,7 +127,7 @@ void sp_paintbucket_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions iterator != channel_list.end(); ++iterator ) { GtkTreeIter iter; gtk_list_store_append( model, &iter ); - gtk_list_store_set( model, &iter, 0, (*iterator).c_str(), 1, count, -1 ); + gtk_list_store_set( model, &iter, 0, _((*iterator).c_str()), 1, count, -1 ); count++; } @@ -193,7 +193,7 @@ void sp_paintbucket_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions iterator != gap_list.end(); ++iterator ) { GtkTreeIter iter; gtk_list_store_append( model, &iter ); - gtk_list_store_set( model, &iter, 0, (*iterator).c_str(), 1, count, -1 ); + gtk_list_store_set( model, &iter, 0, _((*iterator).c_str()), 1, count, -1 ); count++; } EgeSelectOneAction* act2 = ege_select_one_action_new( "AutoGapAction", _("Close gaps"), (""), NULL, GTK_TREE_MODEL(model) ); -- cgit v1.2.3 From f0726870f87935e2081bfc08cafad3a6c82ac7ca Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Tue, 21 Jun 2016 13:22:57 +0200 Subject: [Bug #1594113] New extension Deep Ungroup includes hard-coded unit conversion based on 90dpi. Fixed bugs: - https://launchpad.net/bugs/1594113 (bzr r14998) --- share/extensions/ungroup_deep.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share/extensions/ungroup_deep.py b/share/extensions/ungroup_deep.py index d27bb8a69..359232007 100644 --- a/share/extensions/ungroup_deep.py +++ b/share/extensions/ungroup_deep.py @@ -63,17 +63,17 @@ class Ungroup(inkex.Effect): elif s[-2:] == "px": return float(s[:-2]) elif s[-2:] == "pt": - return float(s[:-2]) * 1.25 + return float(s[:-2]) * 1.33 elif s[-2:] == "em": return float(s[:-2]) * 16 elif s[-2:] == "mm": - return float(s[:-2]) * 3.54 + return float(s[:-2]) * 3.779 elif s[-2:] == "pc": - return float(s[:-2]) * 15 + return float(s[:-2]) * 16 elif s[-2:] == "cm": - return float(s[:-2]) * 35.43 + return float(s[:-2]) * 37.79 elif s[-2:] == "in": - return float(s[:-2]) * 90 + return float(s[:-2]) * 96 else: return 1024 -- cgit v1.2.3 From 941554a2d73d7ec28262fd8a878810b1a78ff39f Mon Sep 17 00:00:00 2001 From: tghs <> Date: Thu, 23 Jun 2016 07:05:34 +0200 Subject: Translation. en_GB translation update. (bzr r14999) --- TRANSLATORS | 2 +- po/en_GB.po | 3323 +++++++++++++++++++++++++---------------------------------- 2 files changed, 1378 insertions(+), 1947 deletions(-) diff --git a/TRANSLATORS b/TRANSLATORS index e38f1f2d0..90954c4b1 100644 --- a/TRANSLATORS +++ b/TRANSLATORS @@ -123,7 +123,7 @@ Supranee Thirawatthanasuk , 2006. Sushma Joshi , 2011. Sveinn í Felli , 2014-2015. Takeshi Aihana , 2000, 2001. -Tim Sheridan , 2007-2014. +Tim Sheridan , 2007-2016. Theppitak Karoonboonyanan , 2006. Thiago Pimentel , 2006. Toshifumi Sato , 2005. diff --git a/po/en_GB.po b/po/en_GB.po index 631995a35..0e81d9193 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,16 +1,15 @@ # British English translation for Inkscape. # Copyright (C) 2000-2003, 2006 Free Software Foundation, Inc. # This file is distributed under the same license as the Inkscape package. -# Tim Sheridan , 2007-2014. +# Tim Sheridan , 2007-2016. # Bruce Cowan , 2010. # Kingsley Turner , 2006. -#: ../src/ui/dialog/clonetiler.cpp:1010 msgid "" msgstr "" "Project-Id-Version: inkscape\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2016-06-02 12:12+0200\n" -"PO-Revision-Date: 2014-11-16 18:02-0000\n" +"POT-Creation-Date: 2016-06-08 09:06+0200\n" +"PO-Revision-Date: 2016-06-21 10:54-0000\n" "Last-Translator: Tim Sheridan \n" "Language-Team: British English \n" "Language: en_GB\n" @@ -18,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.7beta2\n" +"X-Generator: Poedit 1.6.10\n" #: ../inkscape.appdata.xml.in.h:1 ../inkscape.desktop.in.h:1 msgid "Inkscape" @@ -34,6 +33,9 @@ msgid "" "Illustrator, CorelDraw, or Xara X, using the W3C standard Scalable Vector " "Graphics (SVG) file format." msgstr "" +"An Open Source vector graphics editor, with capabilities similar to " +"Illustrator, CorelDraw, or Xara X, using the W3C standard Scalable Vector " +"Graphics (SVG) file format." #: ../inkscape.appdata.xml.in.h:4 msgid "" @@ -43,11 +45,15 @@ msgid "" "trace bitmaps and much more. We also aim to maintain a thriving user and " "developer community by using open, community-oriented development." msgstr "" +"Inkscape supports many advanced SVG features (markers, clones, alpha " +"blending, etc.) and great care is taken in designing a streamlined " +"interface. It is very easy to edit nodes, perform complex path operations, " +"trace bitmaps and much more. We also aim to maintain a thriving user and " +"developer community by using open, community-oriented development." #: ../inkscape.appdata.xml.in.h:5 -#, fuzzy msgid "Main application window" -msgstr "Duplic_ate Window" +msgstr "Main application window" #: ../inkscape.desktop.in.h:3 msgid "Inkscape Vector Graphics Editor" @@ -59,16 +65,15 @@ msgstr "Create and edit Scalable Vector Graphics images" #: ../inkscape.desktop.in.h:5 msgid "image;editor;vector;drawing;" -msgstr "" +msgstr "image;editor;vector;drawing;" #: ../inkscape.desktop.in.h:6 msgid "New Drawing" msgstr "New Drawing" #: ../share/filters/filters.svg.h:2 -#, fuzzy msgid "Smart Jelly" -msgstr "Smart jelly" +msgstr "Smart Jelly" #: ../share/filters/filters.svg.h:3 ../share/filters/filters.svg.h:7 #: ../share/filters/filters.svg.h:15 ../share/filters/filters.svg.h:31 @@ -92,9 +97,8 @@ msgid "Same as Matte jelly but with more controls" msgstr "Same as Matte jelly but with more controls" #: ../share/filters/filters.svg.h:6 -#, fuzzy msgid "Metal Casting" -msgstr "Metal casting" +msgstr "Metal Casting" #: ../share/filters/filters.svg.h:8 msgid "Smooth drop-like bevel with metallic finish" @@ -119,18 +123,16 @@ msgid "Edges are partly feathered out" msgstr "Edges are partly feathered out" #: ../share/filters/filters.svg.h:14 -#, fuzzy msgid "Jigsaw Piece" -msgstr "Jigsaw piece" +msgstr "Jigsaw Piece" #: ../share/filters/filters.svg.h:16 msgid "Low, sharp bevel" msgstr "Low, sharp bevel" #: ../share/filters/filters.svg.h:18 -#, fuzzy msgid "Rubber Stamp" -msgstr "Rubber stamp" +msgstr "Rubber Stamp" #: ../share/filters/filters.svg.h:19 ../share/filters/filters.svg.h:43 #: ../share/filters/filters.svg.h:47 ../share/filters/filters.svg.h:51 @@ -158,9 +160,8 @@ msgid "Random whiteouts inside" msgstr "Random whiteouts inside" #: ../share/filters/filters.svg.h:22 -#, fuzzy msgid "Ink Bleed" -msgstr "Ink bleed" +msgstr "Ink Bleed" #: ../share/filters/filters.svg.h:23 ../share/filters/filters.svg.h:27 #: ../share/filters/filters.svg.h:115 ../share/filters/filters.svg.h:431 @@ -188,9 +189,8 @@ msgid "Soft, cushion-like bevel with matte highlights" msgstr "Soft, cushion-like bevel with matte highlights" #: ../share/filters/filters.svg.h:34 -#, fuzzy msgid "Ridged Border" -msgstr "Ridged border" +msgstr "Ridged Border" #: ../share/filters/filters.svg.h:36 msgid "Ridged border with inner bevel" @@ -223,9 +223,8 @@ msgid "Fill object with sparse translucent specks" msgstr "Fill object with sparse translucent specks" #: ../share/filters/filters.svg.h:46 -#, fuzzy msgid "Oil Slick" -msgstr "Oil slick" +msgstr "Oil Slick" #: ../share/filters/filters.svg.h:48 msgid "Rainbow-colored semitransparent oily splotches" @@ -240,9 +239,8 @@ msgid "Flake-like white splotches" msgstr "Flake-like white splotches" #: ../share/filters/filters.svg.h:54 -#, fuzzy msgid "Leopard Fur" -msgstr "Leopard fur" +msgstr "Leopard Fur" #: ../share/filters/filters.svg.h:55 ../share/filters/filters.svg.h:175 #: ../share/filters/filters.svg.h:179 ../share/filters/filters.svg.h:183 @@ -291,9 +289,8 @@ msgid "Sharpen edges and boundaries within the object, force=0.15" msgstr "Sharpen edges and boundaries within the object, force=0.15" #: ../share/filters/filters.svg.h:70 -#, fuzzy msgid "Sharpen More" -msgstr "Sharpen more" +msgstr "Sharpen More" #: ../share/filters/filters.svg.h:72 msgid "Sharpen edges and boundaries within the object, force=0.3" @@ -375,27 +372,24 @@ msgid "Bulging, knotty, slick 3D surface" msgstr "Bulging, knotty, slick 3D surface" #: ../share/filters/filters.svg.h:94 -#, fuzzy msgid "Barbed Wire" -msgstr "Barbed wire" +msgstr "Barbed Wire" #: ../share/filters/filters.svg.h:96 msgid "Gray bevelled wires with drop shadows" msgstr "Grey bevelled wires with drop shadows" #: ../share/filters/filters.svg.h:98 -#, fuzzy msgid "Swiss Cheese" -msgstr "Swiss cheese" +msgstr "Swiss Cheese" #: ../share/filters/filters.svg.h:100 msgid "Random inner-bevel holes" msgstr "Random inner-bevel holes" #: ../share/filters/filters.svg.h:102 -#, fuzzy msgid "Blue Cheese" -msgstr "Blue cheese" +msgstr "Blue Cheese" #: ../share/filters/filters.svg.h:104 msgid "Marble-like bluish speckles" @@ -425,36 +419,32 @@ msgid "Shadowy outer bevel" msgstr "Shadowy outer bevel" #: ../share/filters/filters.svg.h:114 -#, fuzzy msgid "Dripping" -msgstr "Shipping" +msgstr "Dripping" #: ../share/filters/filters.svg.h:116 msgid "Random paint streaks downwards" msgstr "Random paint streaks downwards" #: ../share/filters/filters.svg.h:118 -#, fuzzy msgid "Jam Spread" -msgstr "Jam spread" +msgstr "Jam Spread" #: ../share/filters/filters.svg.h:120 msgid "Glossy clumpy jam spread" msgstr "Glossy clumpy jam spread" #: ../share/filters/filters.svg.h:122 -#, fuzzy msgid "Pixel Smear" -msgstr "Pixel smear" +msgstr "Pixel Smear" #: ../share/filters/filters.svg.h:124 msgid "Van Gogh painting effect for bitmaps" msgstr "Van Gogh painting effect for bitmaps" #: ../share/filters/filters.svg.h:126 -#, fuzzy msgid "Cracked Glass" -msgstr "Cracked glass" +msgstr "Cracked Glass" #: ../share/filters/filters.svg.h:128 msgid "Under a cracked glass" @@ -488,9 +478,8 @@ msgid "Flexible bubbles effect with some displacement" msgstr "Flexible bubbles effect with some displacement" #: ../share/filters/filters.svg.h:134 -#, fuzzy msgid "Glowing Bubble" -msgstr "Glowing bubble" +msgstr "Glowing Bubble" #: ../share/filters/filters.svg.h:135 ../share/filters/filters.svg.h:155 #: ../share/filters/filters.svg.h:159 ../share/filters/filters.svg.h:203 @@ -512,27 +501,24 @@ msgid "Neon light effect" msgstr "Neon light effect" #: ../share/filters/filters.svg.h:142 -#, fuzzy msgid "Molten Metal" -msgstr "Molten metal" +msgstr "Molten Metal" #: ../share/filters/filters.svg.h:144 msgid "Melting parts of object together, with a glossy bevel and a glow" msgstr "Melting parts of object together, with a glossy bevel and a glow" #: ../share/filters/filters.svg.h:146 -#, fuzzy msgid "Pressed Steel" -msgstr "Pressed steel" +msgstr "Pressed Steel" #: ../share/filters/filters.svg.h:148 msgid "Pressed metal with a rolled edge" msgstr "Pressed metal with a rolled edge" #: ../share/filters/filters.svg.h:150 -#, fuzzy msgid "Matte Bevel" -msgstr "Matte bevel" +msgstr "Matte Bevel" #: ../share/filters/filters.svg.h:152 msgid "Soft, pastel-colored, blurry bevel" @@ -547,18 +533,16 @@ msgid "Thin like a soap membrane" msgstr "Thin like a soap membrane" #: ../share/filters/filters.svg.h:158 -#, fuzzy msgid "Matte Ridge" -msgstr "Matte ridge" +msgstr "Matte Ridge" #: ../share/filters/filters.svg.h:160 msgid "Soft pastel ridge" msgstr "Soft pastel ridge" #: ../share/filters/filters.svg.h:162 -#, fuzzy msgid "Glowing Metal" -msgstr "Glowing metal" +msgstr "Glowing Metal" #: ../share/filters/filters.svg.h:164 msgid "Glowing metal texture" @@ -588,18 +572,16 @@ msgid "Illuminated translucent plastic or glass effect" msgstr "Illuminated translucent plastic or glass effect" #: ../share/filters/filters.svg.h:174 -#, fuzzy msgid "Iridescent Beeswax" -msgstr "Iridescent beeswax" +msgstr "Iridescent Beeswax" #: ../share/filters/filters.svg.h:176 msgid "Waxy texture which keeps its iridescence through color fill change" msgstr "Waxy texture which keeps its iridescence through colour fill change" #: ../share/filters/filters.svg.h:178 -#, fuzzy msgid "Eroded Metal" -msgstr "Eroded metal" +msgstr "Eroded Metal" #: ../share/filters/filters.svg.h:180 msgid "Eroded metal texture with ridges, grooves, holes and bumps" @@ -615,61 +597,55 @@ msgstr "A volcanic texture, a little like leather" #: ../share/filters/filters.svg.h:186 msgid "Bark" -msgstr "" +msgstr "Bark" #: ../share/filters/filters.svg.h:188 msgid "Bark texture, vertical; use with deep colors" msgstr "Bark texture, vertical; use with deep colours" #: ../share/filters/filters.svg.h:190 -#, fuzzy msgid "Lizard Skin" -msgstr "Lizard skin" +msgstr "Lizard Skin" #: ../share/filters/filters.svg.h:192 msgid "Stylized reptile skin texture" msgstr "Stylised reptile skin texture" #: ../share/filters/filters.svg.h:194 -#, fuzzy msgid "Stone Wall" -msgstr "Stone wall" +msgstr "Stone Wall" #: ../share/filters/filters.svg.h:196 msgid "Stone wall texture to use with not too saturated colors" msgstr "Stone wall texture to use with not too saturated colours" #: ../share/filters/filters.svg.h:198 -#, fuzzy msgid "Silk Carpet" -msgstr "Silk carpet" +msgstr "Silk Carpet" #: ../share/filters/filters.svg.h:200 msgid "Silk carpet texture, horizontal stripes" msgstr "Silk carpet texture, horizontal stripes" #: ../share/filters/filters.svg.h:202 -#, fuzzy msgid "Refractive Gel A" -msgstr "Refractive gel A" +msgstr "Refractive Gel A" #: ../share/filters/filters.svg.h:204 msgid "Gel effect with light refraction" msgstr "Gel effect with light refraction" #: ../share/filters/filters.svg.h:206 -#, fuzzy msgid "Refractive Gel B" -msgstr "Refractive gel B" +msgstr "Refractive Gel B" #: ../share/filters/filters.svg.h:208 msgid "Gel effect with strong refraction" msgstr "Gel effect with strong refraction" #: ../share/filters/filters.svg.h:210 -#, fuzzy msgid "Metallized Paint" -msgstr "Metallised paint" +msgstr "Metallised Paint" #: ../share/filters/filters.svg.h:212 msgid "" @@ -686,42 +662,39 @@ msgid "Gel Ridge with a pearlescent look" msgstr "Gel Ridge with a pearlescent look" #: ../share/filters/filters.svg.h:218 -#, fuzzy msgid "Raised Border" -msgstr "Raised border" +msgstr "Raised Border" #: ../share/filters/filters.svg.h:220 msgid "Strongly raised border around a flat surface" msgstr "Strongly raised border around a flat surface" #: ../share/filters/filters.svg.h:222 -#, fuzzy msgid "Metallized Ridge" -msgstr "Metallised ridge" +msgstr "Metallised Ridge" #: ../share/filters/filters.svg.h:224 msgid "Gel Ridge metallized at its top" msgstr "Gel Ridge metallised at its top" #: ../share/filters/filters.svg.h:226 -#, fuzzy msgid "Fat Oil" -msgstr "Fat oil" +msgstr "Fat Oil" #: ../share/filters/filters.svg.h:228 msgid "Fat oil with some adjustable turbulence" msgstr "Fat oil with some adjustable turbulence" #: ../share/filters/filters.svg.h:230 -#, fuzzy msgid "Black Hole" -msgstr "Black hole" +msgstr "Black Hole" #: ../share/filters/filters.svg.h:231 ../share/filters/filters.svg.h:275 #: ../share/filters/filters.svg.h:279 ../share/filters/filters.svg.h:835 #: ../share/filters/filters.svg.h:839 ../share/filters/filters.svg.h:843 #: ../src/extension/internal/filter/morphology.h:76 -#: ../src/extension/internal/filter/morphology.h:203 ../src/filter-enums.cpp:32 +#: ../src/extension/internal/filter/morphology.h:203 +#: ../src/filter-enums.cpp:32 msgid "Morphology" msgstr "Morphology" @@ -738,63 +711,56 @@ msgid "Scattered cubes; adjust the Morphology primitive to vary size" msgstr "Scattered cubes; adjust the Morphology primitive to vary size" #: ../share/filters/filters.svg.h:238 -#, fuzzy msgid "Peel Off" -msgstr "Peel off" +msgstr "Peel Off" #: ../share/filters/filters.svg.h:240 msgid "Peeling painting on a wall" msgstr "Peeling painting on a wall" #: ../share/filters/filters.svg.h:242 -#, fuzzy msgid "Gold Splatter" -msgstr "Gold splatter" +msgstr "Gold Splatter" #: ../share/filters/filters.svg.h:244 msgid "Splattered cast metal, with golden highlights" msgstr "Splattered cast metal, with golden highlights" #: ../share/filters/filters.svg.h:246 -#, fuzzy msgid "Gold Paste" -msgstr "Gold paste" +msgstr "Gold Paste" #: ../share/filters/filters.svg.h:248 msgid "Fat pasted cast metal, with golden highlights" msgstr "Fat pasted cast metal, with golden highlights" #: ../share/filters/filters.svg.h:250 -#, fuzzy msgid "Crumpled Plastic" -msgstr "Crumpled plastic" +msgstr "Crumpled Plastic" #: ../share/filters/filters.svg.h:252 msgid "Crumpled matte plastic, with melted edge" msgstr "Crumpled matte plastic, with melted edge" #: ../share/filters/filters.svg.h:254 -#, fuzzy msgid "Enamel Jewelry" -msgstr "Enamel jewelry" +msgstr "Enamel Jewelry" #: ../share/filters/filters.svg.h:256 msgid "Slightly cracked enameled texture" msgstr "Slightly cracked enameled texture" #: ../share/filters/filters.svg.h:258 -#, fuzzy msgid "Rough Paper" -msgstr "Rough paper" +msgstr "Rough Paper" #: ../share/filters/filters.svg.h:260 msgid "Aquarelle paper effect which can be used for pictures as for objects" msgstr "Aquarelle paper effect which can be used for pictures as for objects" #: ../share/filters/filters.svg.h:262 -#, fuzzy msgid "Rough and Glossy" -msgstr "Rough and glossy" +msgstr "Rough and Glossy" #: ../share/filters/filters.svg.h:264 msgid "" @@ -803,45 +769,40 @@ msgstr "" "Crumpled glossy paper effect which can be used for pictures as for objects" #: ../share/filters/filters.svg.h:266 -#, fuzzy msgid "In and Out" -msgstr "Icons and text" +msgstr "In and Out" #: ../share/filters/filters.svg.h:268 msgid "Inner colorized shadow, outer black shadow" msgstr "Inner colourised shadow, outer black shadow" #: ../share/filters/filters.svg.h:270 -#, fuzzy msgid "Air Spray" -msgstr "Air spray" +msgstr "Air Spray" #: ../share/filters/filters.svg.h:272 msgid "Convert to small scattered particles with some thickness" msgstr "Convert to small scattered particles with some thickness" #: ../share/filters/filters.svg.h:274 -#, fuzzy msgid "Warm Inside" -msgstr "Warm inside" +msgstr "Warm Inside" #: ../share/filters/filters.svg.h:276 msgid "Blurred colorized contour, filled inside" msgstr "Blurred colourised contour, filled inside" #: ../share/filters/filters.svg.h:278 -#, fuzzy msgid "Cool Outside" -msgstr "Cool outside" +msgstr "Cool Outside" #: ../share/filters/filters.svg.h:280 msgid "Blurred colorized contour, empty inside" msgstr "Blurred colourised contour, empty inside" #: ../share/filters/filters.svg.h:282 -#, fuzzy msgid "Electronic Microscopy" -msgstr "Electronic microscopy" +msgstr "Electronic Microscopy" #: ../share/filters/filters.svg.h:284 msgid "" @@ -858,63 +819,56 @@ msgid "Checkered tartan pattern" msgstr "Checkered tartan pattern" #: ../share/filters/filters.svg.h:290 -#, fuzzy msgid "Shaken Liquid" -msgstr "Shaken liquid" +msgstr "Shaken Liquid" #: ../share/filters/filters.svg.h:292 msgid "Colorizable filling with flow inside like transparency" msgstr "Colourisable filling with flow inside like transparency" #: ../share/filters/filters.svg.h:294 -#, fuzzy msgid "Soft Focus Lens" -msgstr "Soft focus lens" +msgstr "Soft Focus Lens" #: ../share/filters/filters.svg.h:296 msgid "Glowing image content without blurring it" msgstr "Glowing image content without blurring it" #: ../share/filters/filters.svg.h:298 -#, fuzzy msgid "Stained Glass" -msgstr "Cracked glass" +msgstr "Stained Glass" #: ../share/filters/filters.svg.h:300 msgid "Illuminated stained glass effect" msgstr "Illuminated stained glass effect" #: ../share/filters/filters.svg.h:302 -#, fuzzy msgid "Dark Glass" -msgstr "Dark glass" +msgstr "Dark Glass" #: ../share/filters/filters.svg.h:304 msgid "Illuminated glass effect with light coming from beneath" msgstr "Illuminated glass effect with light coming from beneath" #: ../share/filters/filters.svg.h:306 -#, fuzzy msgid "HSL Bumps Alpha" -msgstr "HSL Bumps alpha" +msgstr "HSL Bumps Alpha" #: ../share/filters/filters.svg.h:308 msgid "Same as HSL Bumps but with transparent highlights" msgstr "Same as HSL Bumps but with transparent highlights" #: ../share/filters/filters.svg.h:310 -#, fuzzy msgid "Bubbly Bumps Alpha" -msgstr "Bubbly Bumps alpha" +msgstr "Bubbly Bumps Alpha" #: ../share/filters/filters.svg.h:312 msgid "Same as Bubbly Bumps but with transparent highlights" msgstr "Same as Bubbly Bumps but with transparent highlights" #: ../share/filters/filters.svg.h:314 ../share/filters/filters.svg.h:362 -#, fuzzy msgid "Torn Edges" -msgstr "Torn edges" +msgstr "Torn Edges" #: ../share/filters/filters.svg.h:316 ../share/filters/filters.svg.h:364 msgid "" @@ -923,9 +877,8 @@ msgstr "" "Displace the outside of shapes and pictures without altering their content" #: ../share/filters/filters.svg.h:318 -#, fuzzy msgid "Roughen Inside" -msgstr "Roughen inside" +msgstr "Roughen Inside" #: ../share/filters/filters.svg.h:320 msgid "Roughen all inside shapes" @@ -944,9 +897,8 @@ msgstr "" "transparency at edges" #: ../share/filters/filters.svg.h:326 -#, fuzzy msgid "Chalk and Sponge" -msgstr "Chalk and sponge" +msgstr "Chalk and Sponge" #: ../share/filters/filters.svg.h:328 msgid "Low turbulence gives sponge look and high turbulence chalk" @@ -995,9 +947,8 @@ msgid "Emboss effect : 3D relief where white is replaced by black" msgstr "Emboss effect : 3D relief where white is replaced by black" #: ../share/filters/filters.svg.h:350 -#, fuzzy msgid "Bubbly Bumps Matte" -msgstr "Bubbly Bumps, matte" +msgstr "Bubbly Bumps Matte" #: ../share/filters/filters.svg.h:352 msgid "Same as Bubbly Bumps but with a diffuse light instead of a specular one" @@ -1005,18 +956,16 @@ msgstr "" "Same as Bubbly Bumps but with a diffuse light instead of a specular one" #: ../share/filters/filters.svg.h:354 -#, fuzzy msgid "Blotting Paper" -msgstr "Blotting paper" +msgstr "Blotting Paper" #: ../share/filters/filters.svg.h:356 msgid "Inkblot on blotting paper" msgstr "Inkblot on blotting paper" #: ../share/filters/filters.svg.h:358 -#, fuzzy msgid "Wax Print" -msgstr "Wax print" +msgstr "Wax Print" #: ../share/filters/filters.svg.h:360 msgid "Wax print on tissue texture" @@ -1041,54 +990,48 @@ msgstr "" "Felt like texture with colour turbulence and slightly darker at the edges" #: ../share/filters/filters.svg.h:374 -#, fuzzy msgid "Ink Paint" -msgstr "Ink paint" +msgstr "Ink Paint" #: ../share/filters/filters.svg.h:376 msgid "Ink paint on paper with some turbulent color shift" msgstr "Ink paint on paper with some turbulent colour shift" #: ../share/filters/filters.svg.h:378 -#, fuzzy msgid "Tinted Rainbow" -msgstr "Tinted rainbow" +msgstr "Tinted Rainbow" #: ../share/filters/filters.svg.h:380 msgid "Smooth rainbow colors melted along the edges and colorizable" msgstr "Smooth rainbow colours melted along the edges and colourisable" #: ../share/filters/filters.svg.h:382 -#, fuzzy msgid "Melted Rainbow" -msgstr "Melted rainbow" +msgstr "Melted Rainbow" #: ../share/filters/filters.svg.h:384 msgid "Smooth rainbow colors slightly melted along the edges" msgstr "Smooth rainbow colours slightly melted along the edges" #: ../share/filters/filters.svg.h:386 -#, fuzzy msgid "Flex Metal" -msgstr "Flex metal" +msgstr "Flex Metal" #: ../share/filters/filters.svg.h:388 msgid "Bright, polished uneven metal casting, colorizable" msgstr "Bright, polished uneven metal casting, colourisable" #: ../share/filters/filters.svg.h:390 -#, fuzzy msgid "Wavy Tartan" -msgstr "Wavy tartan" +msgstr "Wavy Tartan" #: ../share/filters/filters.svg.h:392 msgid "Tartan pattern with a wavy displacement and bevel around the edges" msgstr "Tartan pattern with a wavy displacement and bevel around the edges" #: ../share/filters/filters.svg.h:394 -#, fuzzy msgid "3D Marble" -msgstr "3D marble" +msgstr "3D Marble" #: ../share/filters/filters.svg.h:396 msgid "3D warped marble texture" @@ -1096,25 +1039,23 @@ msgstr "3D warped marble texture" #: ../share/filters/filters.svg.h:398 msgid "3D Wood" -msgstr "" +msgstr "3D Wood" #: ../share/filters/filters.svg.h:400 msgid "3D warped, fibered wood texture" msgstr "3D warped, fibered wood texture" #: ../share/filters/filters.svg.h:402 -#, fuzzy msgid "3D Mother of Pearl" -msgstr "3D mother of pearl" +msgstr "3D Mother of Pearl" #: ../share/filters/filters.svg.h:404 msgid "3D warped, iridescent pearly shell texture" msgstr "3D warped, iridescent pearly shell texture" #: ../share/filters/filters.svg.h:406 -#, fuzzy msgid "Tiger Fur" -msgstr "Tiger fur" +msgstr "Tiger Fur" #: ../share/filters/filters.svg.h:408 msgid "Tiger fur pattern with folds and bevel around the edges" @@ -1192,23 +1133,20 @@ msgid "Light areas turn to black" msgstr "Light areas turn to black" #: ../share/filters/filters.svg.h:414 -#, fuzzy msgid "Film Grain" -msgstr "Film grain" +msgstr "Film Grain" #: ../share/filters/filters.svg.h:416 msgid "Adds a small scale graininess" msgstr "Adds a small scale graininess" #: ../share/filters/filters.svg.h:418 -#, fuzzy msgid "Plaster Color" -msgstr "Paste colour" +msgstr "Plaster Color" #: ../share/filters/filters.svg.h:420 -#, fuzzy msgid "Colored plaster emboss effect" -msgstr "Cloudy watercolour effect" +msgstr "Coloured plaster emboss effect" #: ../share/filters/filters.svg.h:422 msgid "Velvet Bumps" @@ -1219,9 +1157,8 @@ msgid "Gives Smooth Bumps velvet like" msgstr "Gives Smooth Bumps velvet like" #: ../share/filters/filters.svg.h:426 -#, fuzzy msgid "Comics Cream" -msgstr "Comics cream" +msgstr "Comics Cream" #: ../share/filters/filters.svg.h:427 ../share/filters/filters.svg.h:727 #: ../share/filters/filters.svg.h:731 ../share/filters/filters.svg.h:735 @@ -1241,9 +1178,8 @@ msgid "Comics shader with creamy waves transparency" msgstr "Comics shader with creamy waves transparency" #: ../share/filters/filters.svg.h:430 -#, fuzzy msgid "Chewing Gum" -msgstr "Chewing gum" +msgstr "Chewing Gum" #: ../share/filters/filters.svg.h:432 msgid "" @@ -1254,64 +1190,56 @@ msgstr "" "lines at their crossings" #: ../share/filters/filters.svg.h:434 -#, fuzzy msgid "Dark And Glow" -msgstr "Dark and Glow" +msgstr "Dark And Glow" #: ../share/filters/filters.svg.h:436 msgid "Darkens the edge with an inner blur and adds a flexible glow" msgstr "Darkens the edge with an inner blur and adds a flexible glow" #: ../share/filters/filters.svg.h:438 -#, fuzzy msgid "Warped Rainbow" -msgstr "Warped rainbow" +msgstr "Warped Rainbow" #: ../share/filters/filters.svg.h:440 msgid "Smooth rainbow colors warped along the edges and colorizable" msgstr "Smooth rainbow colours warped along the edges and colourisable" #: ../share/filters/filters.svg.h:442 -#, fuzzy msgid "Rough and Dilate" -msgstr "Rough and dilate" +msgstr "Rough and Dilate" #: ../share/filters/filters.svg.h:444 msgid "Create a turbulent contour around" msgstr "Create a turbulent contour around" #: ../share/filters/filters.svg.h:446 -#, fuzzy msgid "Old Postcard" -msgstr "Old postcard" +msgstr "Old Postcard" #: ../share/filters/filters.svg.h:448 msgid "Slightly posterize and draw edges like on old printed postcards" msgstr "Slightly posterise and draw edges like on old printed postcards" #: ../share/filters/filters.svg.h:450 -#, fuzzy msgid "Dots Transparency" -msgstr "Dots transparency" +msgstr "Dots Transparency" #: ../share/filters/filters.svg.h:452 msgid "Gives a pointillist HSL sensitive transparency" msgstr "Gives a pointillist HSL sensitive transparency" #: ../share/filters/filters.svg.h:454 -#, fuzzy msgid "Canvas Transparency" -msgstr "Canvas transparency" +msgstr "Canvas Transparency" #: ../share/filters/filters.svg.h:456 -#, fuzzy msgid "Gives a canvas like HSL sensitive transparency." -msgstr "Gives a canvas like HSL sensitive transparency" +msgstr "Gives a canvas like HSL sensitive transparency." #: ../share/filters/filters.svg.h:458 -#, fuzzy msgid "Smear Transparency" -msgstr "Smear transparency" +msgstr "Smear Transparency" #: ../share/filters/filters.svg.h:460 msgid "" @@ -1320,9 +1248,8 @@ msgstr "" "Paint objects with a transparent turbulence which turns around colour edges" #: ../share/filters/filters.svg.h:462 -#, fuzzy msgid "Thick Paint" -msgstr "Thick paint" +msgstr "Thick Paint" #: ../share/filters/filters.svg.h:464 msgid "Thick painting effect with turbulence" @@ -1337,9 +1264,8 @@ msgid "Burst balloon texture crumpled and with holes" msgstr "Burst balloon texture crumpled and with holes" #: ../share/filters/filters.svg.h:470 -#, fuzzy msgid "Embossed Leather" -msgstr "Embossed leather" +msgstr "Embossed Leather" #: ../share/filters/filters.svg.h:472 msgid "" @@ -1380,9 +1306,8 @@ msgstr "" "Combine a HSL edges detection bump with a matte and crumpled surface effect" #: ../share/filters/filters.svg.h:486 -#, fuzzy msgid "Rough Transparency" -msgstr "Rough transparency" +msgstr "Rough Transparency" #: ../share/filters/filters.svg.h:488 msgid "Adds a turbulent transparency which displaces pixels at the same time" @@ -1397,54 +1322,48 @@ msgid "Partly opaque water color effect with bleed" msgstr "Partly opaque water colour effect with bleed" #: ../share/filters/filters.svg.h:494 -#, fuzzy msgid "Alpha Engraving" -msgstr "Alpha engraving" +msgstr "Alpha Engraving" #: ../share/filters/filters.svg.h:496 msgid "Gives a transparent engraving effect with rough line and filling" msgstr "Gives a transparent engraving effect with rough line and filling" #: ../share/filters/filters.svg.h:498 -#, fuzzy msgid "Alpha Draw Liquid" -msgstr "Alpha draw, liquid" +msgstr "Alpha Draw Liquid" #: ../share/filters/filters.svg.h:500 msgid "Gives a transparent fluid drawing effect with rough line and filling" msgstr "Gives a transparent fluid drawing effect with rough line and filling" #: ../share/filters/filters.svg.h:502 -#, fuzzy msgid "Liquid Drawing" -msgstr "Liquid drawing" +msgstr "Liquid Drawing" #: ../share/filters/filters.svg.h:504 msgid "Gives a fluid and wavy expressionist drawing effect to images" msgstr "Gives a fluid and wavy expressionist drawing effect to images" #: ../share/filters/filters.svg.h:506 -#, fuzzy msgid "Marbled Ink" -msgstr "Marbled ink" +msgstr "Marbled Ink" #: ../share/filters/filters.svg.h:508 msgid "Marbled transparency effect which conforms to image detected edges" msgstr "Marbled transparency effect which conforms to image detected edges" #: ../share/filters/filters.svg.h:510 -#, fuzzy msgid "Thick Acrylic" -msgstr "Thick acrylic" +msgstr "Thick Acrylic" #: ../share/filters/filters.svg.h:512 msgid "Thick acrylic paint texture with high texture depth" msgstr "Thick acrylic paint texture with high texture depth" #: ../share/filters/filters.svg.h:514 -#, fuzzy msgid "Alpha Engraving B" -msgstr "Alpha engraving B" +msgstr "Alpha Engraving B" #: ../share/filters/filters.svg.h:516 msgid "" @@ -1461,9 +1380,8 @@ msgid "Something like a water noise" msgstr "Something like a water noise" #: ../share/filters/filters.svg.h:522 -#, fuzzy msgid "Monochrome Transparency" -msgstr "Monochrome transparency" +msgstr "Monochrome Transparency" #: ../share/filters/filters.svg.h:523 ../share/filters/filters.svg.h:527 #: ../share/filters/filters.svg.h:647 ../share/filters/filters.svg.h:651 @@ -1481,9 +1399,8 @@ msgid "Convert to a colorizable transparent positive or negative" msgstr "Convert to a colourisable transparent positive or negative" #: ../share/filters/filters.svg.h:526 -#, fuzzy msgid "Saturation Map" -msgstr "Saturation map" +msgstr "Saturation Map" #: ../share/filters/filters.svg.h:528 msgid "" @@ -1502,9 +1419,8 @@ msgid "Riddle the surface and add bump to images" msgstr "Riddle the surface and add bump to images" #: ../share/filters/filters.svg.h:534 -#, fuzzy msgid "Wrinkled Varnish" -msgstr "Wrinkled varnish" +msgstr "Wrinkled Varnish" #: ../share/filters/filters.svg.h:536 msgid "Thick glossy and translucent paint texture with high depth" @@ -1519,9 +1435,8 @@ msgid "Canvas texture with an HSL sensitive height map" msgstr "Canvas texture with an HSL sensitive height map" #: ../share/filters/filters.svg.h:542 -#, fuzzy msgid "Canvas Bumps Matte" -msgstr "Canvas Bumps, matte" +msgstr "Canvas Bumps Matte" #: ../share/filters/filters.svg.h:544 msgid "Same as Canvas Bumps but with a diffuse light instead of a specular one" @@ -1529,54 +1444,48 @@ msgstr "" "Same as Canvas Bumps but with a diffuse light instead of a specular one" #: ../share/filters/filters.svg.h:546 -#, fuzzy msgid "Canvas Bumps Alpha" -msgstr "Canvas Bumps alpha" +msgstr "Canvas Bumps Alpha" #: ../share/filters/filters.svg.h:548 msgid "Same as Canvas Bumps but with transparent highlights" msgstr "Same as Canvas Bumps but with transparent highlights" #: ../share/filters/filters.svg.h:550 -#, fuzzy msgid "Bright Metal" -msgstr "Bright metal" +msgstr "Bright Metal" #: ../share/filters/filters.svg.h:552 msgid "Bright metallic effect for any color" msgstr "Bright metallic effect for any colour" #: ../share/filters/filters.svg.h:554 -#, fuzzy msgid "Deep Colors Plastic" -msgstr "Deep colours plastic" +msgstr "Deep Colours Plastic" #: ../share/filters/filters.svg.h:556 msgid "Transparent plastic with deep colors" msgstr "Transparent plastic with deep colours" #: ../share/filters/filters.svg.h:558 -#, fuzzy msgid "Melted Jelly Matte" -msgstr "Melted jelly, matte" +msgstr "Melted Jelly Matte" #: ../share/filters/filters.svg.h:560 msgid "Matte bevel with blurred edges" msgstr "Matte bevel with blurred edges" #: ../share/filters/filters.svg.h:562 -#, fuzzy msgid "Melted Jelly" -msgstr "Melted jelly" +msgstr "Melted Jelly" #: ../share/filters/filters.svg.h:564 msgid "Glossy bevel with blurred edges" msgstr "Glossy bevel with blurred edges" #: ../share/filters/filters.svg.h:566 -#, fuzzy msgid "Combined Lighting" -msgstr "Combined lighting" +msgstr "Combined Lighting" #: ../share/filters/filters.svg.h:568 #: ../src/extension/internal/filter/bevels.h:231 @@ -1592,27 +1501,24 @@ msgid "Metallic foil effect combining two lighting types and variable crumple" msgstr "Metallic foil effect combining two lighting types and variable crumple" #: ../share/filters/filters.svg.h:574 -#, fuzzy msgid "Soft Colors" -msgstr "Soft colours" +msgstr "Soft Colours" #: ../share/filters/filters.svg.h:576 msgid "Adds a colorizable edges glow inside objects and pictures" msgstr "Adds a colourisable edges glow inside objects and pictures" #: ../share/filters/filters.svg.h:578 -#, fuzzy msgid "Relief Print" -msgstr "Relief print" +msgstr "Relief Print" #: ../share/filters/filters.svg.h:580 msgid "Bumps effect with a bevel, color flood and complex lighting" msgstr "Bumps effect with a bevel, colour flood and complex lighting" #: ../share/filters/filters.svg.h:582 -#, fuzzy msgid "Growing Cells" -msgstr "Growing cells" +msgstr "Growing Cells" #: ../share/filters/filters.svg.h:584 msgid "Random rounded living cells like fill" @@ -1627,110 +1533,92 @@ msgid "Oversaturate colors which can be fluorescent in real world" msgstr "Oversaturate colours which can be fluorescent in real world" #: ../share/filters/filters.svg.h:590 -#, fuzzy msgid "Pixellize" -msgstr "Pixel" +msgstr "Pixellise" #: ../share/filters/filters.svg.h:591 -#, fuzzy msgid "Pixel tools" -msgstr "Pixels" +msgstr "Pixel tools" #: ../share/filters/filters.svg.h:592 msgid "Reduce or remove antialiasing around shapes" -msgstr "" +msgstr "Reduce or remove antialiasing around shapes" #: ../share/filters/filters.svg.h:594 -#, fuzzy msgid "Basic Diffuse Bump" -msgstr "Specular Exponent" +msgstr "Basic Diffuse Bump" #: ../share/filters/filters.svg.h:596 -#, fuzzy msgid "Matte emboss effect" -msgstr "Emboss effect" +msgstr "Matte emboss effect" #: ../share/filters/filters.svg.h:598 -#, fuzzy msgid "Basic Specular Bump" -msgstr "Specular Exponent" +msgstr "Basic Specular Bump" #: ../share/filters/filters.svg.h:600 -#, fuzzy msgid "Specular emboss effect" -msgstr "Emboss effect" +msgstr "Specular emboss effect" #: ../share/filters/filters.svg.h:602 msgid "Basic Two Lights Bump" -msgstr "" +msgstr "Basic Two Lights Bump" #: ../share/filters/filters.svg.h:604 -#, fuzzy msgid "Two types of lighting emboss effect" -msgstr "Paste live path effect" +msgstr "Two types of lighting emboss effect" #: ../share/filters/filters.svg.h:606 -#, fuzzy msgid "Linen Canvas" -msgstr "Canvas" +msgstr "Linen Canvas" #: ../share/filters/filters.svg.h:608 ../share/filters/filters.svg.h:616 -#, fuzzy msgid "Painting canvas emboss effect" -msgstr "Paste live path effect" +msgstr "Painting canvas emboss effect" #: ../share/filters/filters.svg.h:610 -#, fuzzy msgid "Plasticine" -msgstr "Plaster" +msgstr "Plasticine" #: ../share/filters/filters.svg.h:612 -#, fuzzy msgid "Matte modeling paste emboss effect" -msgstr "Paste live path effect" +msgstr "Matte modeling paste emboss effect" #: ../share/filters/filters.svg.h:614 -#, fuzzy msgid "Rough Canvas Painting" -msgstr "Channel Painting" +msgstr "Rough Canvas Painting" #: ../share/filters/filters.svg.h:618 -#, fuzzy msgid "Paper Bump" -msgstr "Wax Bump" +msgstr "Paper Bump" #: ../share/filters/filters.svg.h:620 -#, fuzzy msgid "Paper like emboss effect" -msgstr "Paste live path effect" +msgstr "Paper like emboss effect" #: ../share/filters/filters.svg.h:622 -#, fuzzy msgid "Jelly Bump" -msgstr "Jelly Bean" +msgstr "Jelly Bump" #: ../share/filters/filters.svg.h:624 -#, fuzzy msgid "Convert pictures to thick jelly" -msgstr "Convert texts to paths" +msgstr "Convert pictures to thick jelly" #: ../share/filters/filters.svg.h:626 -#, fuzzy msgid "Blend Opposites" -msgstr "Blend mode:" +msgstr "Blend Opposites" #: ../share/filters/filters.svg.h:628 msgid "Blend an image with its hue opposite" -msgstr "" +msgstr "Blend an image with its hue opposite" #: ../share/filters/filters.svg.h:630 -#, fuzzy msgid "Hue to White" -msgstr "Hue Rotate" +msgstr "Hue to White" #: ../share/filters/filters.svg.h:632 msgid "Fades hue progressively to white" -msgstr "" +msgstr "Fades hue progressively to white" #: ../share/filters/filters.svg.h:634 #: ../src/extension/internal/bitmap/swirl.cpp:37 @@ -1738,119 +1626,102 @@ msgid "Swirl" msgstr "Swirl" #: ../share/filters/filters.svg.h:636 -#, fuzzy msgid "" "Paint objects with a transparent turbulence which wraps around color edges" msgstr "" -"Paint objects with a transparent turbulence which turns around colour edges" +"Paint objects with a transparent turbulence which wraps around colour edges" #: ../share/filters/filters.svg.h:638 -#, fuzzy msgid "Pointillism" -msgstr "Points" +msgstr "Pointillism" #: ../share/filters/filters.svg.h:640 -#, fuzzy msgid "Gives a turbulent pointillist HSL sensitive transparency" -msgstr "Gives a pointillist HSL sensitive transparency" +msgstr "Gives a turbulent pointillist HSL sensitive transparency" #: ../share/filters/filters.svg.h:642 -#, fuzzy msgid "Silhouette Marbled" -msgstr "Silhouette" +msgstr "Silhouette Marbled" #: ../share/filters/filters.svg.h:644 msgid "Basic noise transparency texture" msgstr "Basic noise transparency texture" #: ../share/filters/filters.svg.h:646 -#, fuzzy msgid "Fill Background" -msgstr "Background" +msgstr "Fill Background" #: ../share/filters/filters.svg.h:648 -#, fuzzy msgid "Adds a colorizable opaque background" -msgstr "Adds a colourisable drop shadow inside" +msgstr "Adds a colorisable opaque background" #: ../share/filters/filters.svg.h:650 -#, fuzzy msgid "Flatten Transparency" -msgstr "Dialog Transparency" +msgstr "Flatten Transparency" #: ../share/filters/filters.svg.h:652 -#, fuzzy msgid "Adds a white opaque background" -msgstr "Remove background" +msgstr "Adds a white opaque background" #: ../share/filters/filters.svg.h:654 -#, fuzzy msgid "Blur Double" -msgstr "Blur mode" +msgstr "Blur Double" #: ../share/filters/filters.svg.h:656 msgid "" "Overlays two copies with different blur amounts and modifiable blend and " "composite" msgstr "" +"Overlays two copies with different blur amounts and modifiable blend and " +"composite" #: ../share/filters/filters.svg.h:658 -#, fuzzy msgid "Image Drawing Basic" -msgstr "New Drawing" +msgstr "Image Drawing Basic" #: ../share/filters/filters.svg.h:660 -#, fuzzy msgid "Enhance and redraw color edges in 1 bit black and white" -msgstr "Only black and white" +msgstr "Enhance and redraw colour edges in 1 bit black and white" #: ../share/filters/filters.svg.h:662 -#, fuzzy msgid "Poster Draw" -msgstr "Poster" +msgstr "Poster Draw" #: ../share/filters/filters.svg.h:664 -#, fuzzy msgid "Enhance and redraw edges around posterized areas" -msgstr "Only black and white" +msgstr "Enhance and redraw edges around posterised areas" #: ../share/filters/filters.svg.h:666 -#, fuzzy msgid "Cross Noise Poster" -msgstr "Poisson Noise" +msgstr "Cross Noise Poster" #: ../share/filters/filters.svg.h:668 -#, fuzzy msgid "Overlay with a small scale screen like noise" -msgstr "Adds a small scale graininess" +msgstr "Overlay with a small scale screen like noise" #: ../share/filters/filters.svg.h:670 -#, fuzzy msgid "Cross Noise Poster B" -msgstr "Poisson Noise" +msgstr "Cross Noise Poster B" #: ../share/filters/filters.svg.h:672 -#, fuzzy msgid "Adds a small scale screen like noise locally" -msgstr "Adds a small scale graininess" +msgstr "Adds a small scale screen like noise locally" #: ../share/filters/filters.svg.h:674 -#, fuzzy msgid "Poster Color Fun" -msgstr "Paste colour" +msgstr "Poster Colour Fun" #: ../share/filters/filters.svg.h:678 -#, fuzzy msgid "Poster Rough" -msgstr "Poster" +msgstr "Poster Rough" #: ../share/filters/filters.svg.h:680 msgid "Adds roughness to one of the two channels of the Poster paint filter" -msgstr "" +msgstr "Adds roughness to one of the two channels of the Poster paint filter" #: ../share/filters/filters.svg.h:682 msgid "Alpha Monochrome Cracked" -msgstr "" +msgstr "Alpha Monochrome Cracked" #: ../share/filters/filters.svg.h:684 ../share/filters/filters.svg.h:688 #: ../share/filters/filters.svg.h:692 ../share/filters/filters.svg.h:704 @@ -1859,68 +1730,56 @@ msgid "Basic noise fill texture; adjust color in Flood" msgstr "Basic noise fill texture; adjust colour in Flood" #: ../share/filters/filters.svg.h:686 -#, fuzzy msgid "Alpha Turbulent" -msgstr "Alpha repaint" +msgstr "Alpha Turbulent" #: ../share/filters/filters.svg.h:690 -#, fuzzy msgid "Colorize Turbulent" -msgstr "Colourise" +msgstr "Colorise Turbulent" #: ../share/filters/filters.svg.h:694 -#, fuzzy msgid "Cross Noise B" -msgstr "Poisson Noise" +msgstr "Cross Noise B" #: ../share/filters/filters.svg.h:696 -#, fuzzy msgid "Adds a small scale crossy graininess" -msgstr "Adds a small scale graininess" +msgstr "Adds a small scale crossy graininess" #: ../share/filters/filters.svg.h:698 -#, fuzzy msgid "Cross Noise" -msgstr "Poisson Noise" +msgstr "Cross Noise" #: ../share/filters/filters.svg.h:700 -#, fuzzy msgid "Adds a small scale screen like graininess" -msgstr "Adds a small scale graininess" +msgstr "Adds a small scale screen like graininess" #: ../share/filters/filters.svg.h:702 -#, fuzzy msgid "Duotone Turbulent" -msgstr "Turbulence" +msgstr "Duotone Turbulent" #: ../share/filters/filters.svg.h:706 -#, fuzzy msgid "Light Eraser Cracked" -msgstr "Light eraser" +msgstr "Light Eraser Cracked" #: ../share/filters/filters.svg.h:710 -#, fuzzy msgid "Poster Turbulent" -msgstr "Turbulence" +msgstr "Poster Turbulent" #: ../share/filters/filters.svg.h:714 -#, fuzzy msgid "Tartan Smart" -msgstr "Tartan" +msgstr "Tartan Smart" #: ../share/filters/filters.svg.h:716 -#, fuzzy msgid "Highly configurable checkered tartan pattern" -msgstr "Checkered tartan pattern" +msgstr "Highly configurable chequered tartan pattern" #: ../share/filters/filters.svg.h:718 -#, fuzzy msgid "Light Contour" -msgstr "Light Source:" +msgstr "Light Contour" #: ../share/filters/filters.svg.h:720 msgid "Uses vertical specular light to draw lines" -msgstr "" +msgstr "Uses vertical specular light to draw lines" #: ../share/filters/filters.svg.h:722 msgid "Liquid" @@ -1935,51 +1794,44 @@ msgid "Aluminium" msgstr "Aluminium" #: ../share/filters/filters.svg.h:728 -#, fuzzy msgid "Aluminium effect with sharp brushed reflections" -msgstr "Gel effect with strong refraction" +msgstr "Aluminium effect with sharp brushed reflections" #: ../share/filters/filters.svg.h:730 msgid "Comics" msgstr "Comics" #: ../share/filters/filters.svg.h:732 -#, fuzzy msgid "Comics cartoon drawing effect" -msgstr "Fluid brushed cartoon drawing" +msgstr "Comics cartoon drawing effect" #: ../share/filters/filters.svg.h:734 -#, fuzzy msgid "Comics Draft" -msgstr "Comics draft" +msgstr "Comics Draft" #: ../share/filters/filters.svg.h:736 ../share/filters/filters.svg.h:768 msgid "Draft painted cartoon shading with a glassy look" msgstr "Draft painted cartoon shading with a glassy look" #: ../share/filters/filters.svg.h:738 -#, fuzzy msgid "Comics Fading" -msgstr "Comics fading" +msgstr "Comics Fading" #: ../share/filters/filters.svg.h:740 msgid "Cartoon paint style with some fading at the edges" msgstr "Cartoon paint style with some fading at the edges" #: ../share/filters/filters.svg.h:742 -#, fuzzy msgid "Brushed Metal" -msgstr "Eroded metal" +msgstr "Brushed Metal" #: ../share/filters/filters.svg.h:744 -#, fuzzy msgid "Satiny metal surface effect" -msgstr "Illuminated stained glass effect" +msgstr "Satiny metal surface effect" #: ../share/filters/filters.svg.h:746 -#, fuzzy msgid "Opaline" -msgstr "Outline" +msgstr "Opaline" #: ../share/filters/filters.svg.h:748 msgid "Contouring version of smooth shader" @@ -1990,224 +1842,189 @@ msgid "Chrome" msgstr "Chrome" #: ../share/filters/filters.svg.h:752 -#, fuzzy msgid "Bright chrome effect" -msgstr "Bright metal" +msgstr "Bright chrome effect" #: ../share/filters/filters.svg.h:754 -#, fuzzy msgid "Deep Chrome" -msgstr "Chrome" +msgstr "Deep Chrome" #: ../share/filters/filters.svg.h:756 -#, fuzzy msgid "Dark chrome effect" -msgstr "Current effect" +msgstr "Dark chrome effect" #: ../share/filters/filters.svg.h:758 -#, fuzzy msgid "Emboss Shader" -msgstr "Emboss shader" +msgstr "Emboss Shader" #: ../share/filters/filters.svg.h:760 -#, fuzzy msgid "Combination of satiny and emboss effect" -msgstr "Combination of smooth shading and embossing" +msgstr "Combination of satiny and emboss effect" #: ../share/filters/filters.svg.h:762 -#, fuzzy msgid "Sharp Metal" -msgstr "Sharpen" +msgstr "Sharp Metal" #: ../share/filters/filters.svg.h:764 -#, fuzzy msgid "Chrome effect with darkened edges" -msgstr "Pressed metal with a rolled edge" +msgstr "Chrome effect with darkened edges" #: ../share/filters/filters.svg.h:766 -#, fuzzy msgid "Brush Draw" -msgstr "Brush" +msgstr "Brush Draw" #: ../share/filters/filters.svg.h:770 -#, fuzzy msgid "Chrome Emboss" -msgstr "Dark Emboss" +msgstr "Chrome Emboss" #: ../share/filters/filters.svg.h:772 -#, fuzzy msgid "Embossed chrome effect" -msgstr "Emboss effect" +msgstr "Embossed chrome effect" #: ../share/filters/filters.svg.h:774 -#, fuzzy msgid "Contour Emboss" -msgstr "Colour emboss" +msgstr "Contour Emboss" #: ../share/filters/filters.svg.h:776 -#, fuzzy msgid "Satiny and embossed contour effect" -msgstr "Illuminated stained glass effect" +msgstr "Satiny and embossed contour effect" #: ../share/filters/filters.svg.h:778 -#, fuzzy msgid "Sharp Deco" -msgstr "Sharpen" +msgstr "Sharp Deco" #: ../share/filters/filters.svg.h:780 -#, fuzzy msgid "Unrealistic reflections with sharp edges" -msgstr "Pressed metal with a rolled edge" +msgstr "Unrealistic reflections with sharp edges" #: ../share/filters/filters.svg.h:782 -#, fuzzy msgid "Deep Metal" -msgstr "Flex metal" +msgstr "Deep Metal" #: ../share/filters/filters.svg.h:784 msgid "Deep and dark metal shading" -msgstr "" +msgstr "Deep and dark metal shading" #: ../share/filters/filters.svg.h:786 -#, fuzzy msgid "Aluminium Emboss" -msgstr "Aluminium 1" +msgstr "Aluminium Emboss" #: ../share/filters/filters.svg.h:788 msgid "Satiny aluminium effect with embossing" -msgstr "" +msgstr "Satiny aluminium effect with embossing" #: ../share/filters/filters.svg.h:790 -#, fuzzy msgid "Refractive Glass" -msgstr "Refractive gel A" +msgstr "Refractive Glass" #: ../share/filters/filters.svg.h:792 -#, fuzzy msgid "Double reflection through glass with some refraction" -msgstr "Gel effect with strong refraction" +msgstr "Double reflection through glass with some refraction" #: ../share/filters/filters.svg.h:794 -#, fuzzy msgid "Frosted Glass" -msgstr "Frosted glass" +msgstr "Frosted Glass" #: ../share/filters/filters.svg.h:796 -#, fuzzy msgid "Satiny glass effect" -msgstr "Illuminated stained glass effect" +msgstr "Satiny glass effect" #: ../share/filters/filters.svg.h:798 -#, fuzzy msgid "Bump Engraving" -msgstr "Engraving" +msgstr "Bump Engraving" #: ../share/filters/filters.svg.h:800 -#, fuzzy msgid "Carving emboss effect" -msgstr "Paste live path effect" +msgstr "Carving emboss effect" #: ../share/filters/filters.svg.h:802 -#, fuzzy msgid "Chromolitho Alternate" -msgstr "Chromolitho, custom" +msgstr "Chromolitho Alternate" #: ../share/filters/filters.svg.h:804 -#, fuzzy msgid "Old chromolithographic effect" -msgstr "Create and apply path effect" +msgstr "Old chromolithographic effect" #: ../share/filters/filters.svg.h:806 -#, fuzzy msgid "Convoluted Bump" -msgstr "Convolve" +msgstr "Convoluted Bump" #: ../share/filters/filters.svg.h:808 -#, fuzzy msgid "Convoluted emboss effect" -msgstr "Cloudy watercolour effect" +msgstr "Convoluted emboss effect" #: ../share/filters/filters.svg.h:810 -#, fuzzy msgid "Emergence" -msgstr "Divergence" +msgstr "Emergence" #: ../share/filters/filters.svg.h:812 msgid "Cut out, add inner shadow and colorize some parts of an image" -msgstr "" +msgstr "Cut out, add inner shadow and colourise some parts of an image" #: ../share/filters/filters.svg.h:814 msgid "Litho" -msgstr "" +msgstr "Litho" #: ../share/filters/filters.svg.h:816 -#, fuzzy msgid "Create a two colors lithographic effect" -msgstr "Create and apply path effect" +msgstr "Create a two colours lithographic effect" #: ../share/filters/filters.svg.h:818 -#, fuzzy msgid "Paint Channels" -msgstr "Cyan Channel" +msgstr "Paint Channels" #: ../share/filters/filters.svg.h:820 msgid "Colorize separately the three color channels" -msgstr "" +msgstr "Colourise separately the three colour channels" #: ../share/filters/filters.svg.h:822 -#, fuzzy msgid "Posterized Light Eraser" -msgstr "Light eraser" +msgstr "Posterised Light Eraser" #: ../share/filters/filters.svg.h:824 msgid "Create a semi transparent posterized image" -msgstr "" +msgstr "Create a semi transparent posterised image" #: ../share/filters/filters.svg.h:826 -#, fuzzy msgid "Trichrome" -msgstr "Chrome" +msgstr "Trichrome" #: ../share/filters/filters.svg.h:828 msgid "Like Duochrome but with three colors" -msgstr "" +msgstr "Like Duochrome but with three colours" #: ../share/filters/filters.svg.h:830 msgid "Simulate CMY" -msgstr "" +msgstr "Simulate CMY" #: ../share/filters/filters.svg.h:832 msgid "Render Cyan, Magenta and Yellow channels with a colorizable background" msgstr "" +"Render Cyan, Magenta and Yellow channels with a colourisable background" #: ../share/filters/filters.svg.h:834 -#, fuzzy msgid "Contouring table" -msgstr "Contact Triangle" +msgstr "Contouring table" #: ../share/filters/filters.svg.h:836 -#, fuzzy msgid "Blurred multiple contours for objects" -msgstr "Blurred colourised contour, empty inside" +msgstr "Blurred multiple contours for objects" #: ../share/filters/filters.svg.h:838 -#, fuzzy msgid "Posterized Blur" -msgstr "Posterise basic, custom" +msgstr "Posterised Blur" #: ../share/filters/filters.svg.h:840 msgid "Converts blurred contour to posterized steps" -msgstr "" +msgstr "Converts blurred contour to posterised steps" #: ../share/filters/filters.svg.h:842 -#, fuzzy msgid "Contouring discrete" -msgstr "Controlling dock item" +msgstr "Contouring discrete" #: ../share/filters/filters.svg.h:844 -#, fuzzy msgid "Sharp multiple contour for objects" -msgstr "Snap from and to centres of objects" +msgstr "Sharp multiple contour for objects" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:2 @@ -4287,7 +4104,7 @@ msgstr "Not Gate Small" #: ../share/symbols/symbols.h:188 msgctxt "Symbol" msgid "United States National Park Service Map Symbols" -msgstr "" +msgstr "United States National Park Service Map Symbols" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:189 ../share/symbols/symbols.h:190 @@ -4299,26 +4116,25 @@ msgstr "Airport" #: ../share/symbols/symbols.h:191 ../share/symbols/symbols.h:192 msgctxt "Symbol" msgid "Amphitheatre" -msgstr "" +msgstr "Amphitheatre" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:193 ../share/symbols/symbols.h:194 -#, fuzzy msgctxt "Symbol" msgid "Bicycle Trail" -msgstr "Bicycle Shop" +msgstr "Bicycle Trail" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:195 ../share/symbols/symbols.h:196 msgctxt "Symbol" msgid "Boat Launch" -msgstr "" +msgstr "Boat Launch" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:197 ../share/symbols/symbols.h:198 msgctxt "Symbol" msgid "Boat Tour" -msgstr "" +msgstr "Boat Tour" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:199 ../share/symbols/symbols.h:200 @@ -4328,81 +4144,75 @@ msgstr "Bus Stop" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:201 ../share/symbols/symbols.h:202 -#, fuzzy msgctxt "Symbol" msgid "Campfire" -msgstr "Camping" +msgstr "Campfire" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:203 ../share/symbols/symbols.h:204 -#, fuzzy msgctxt "Symbol" msgid "Campground" -msgstr "Cap rounding" +msgstr "Campground" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:205 ../share/symbols/symbols.h:206 msgctxt "Symbol" msgid "CanoeAccess" -msgstr "" +msgstr "CanoeAccess" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:207 ../share/symbols/symbols.h:208 msgctxt "Symbol" msgid "Crosscountry Ski Trail" -msgstr "" +msgstr "Crosscountry Ski Trail" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:209 ../share/symbols/symbols.h:210 msgctxt "Symbol" msgid "Downhill Skiing" -msgstr "" +msgstr "Downhill Skiing" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:211 ../share/symbols/symbols.h:212 -#, fuzzy msgctxt "Symbol" msgid "Drinking Water" -msgstr "Water Fountain" +msgstr "Drinking Water" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:215 ../share/symbols/symbols.h:216 -#, fuzzy msgctxt "Symbol" msgid "Fishing" -msgstr "Fish Monger" +msgstr "Fishing" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:217 ../share/symbols/symbols.h:218 msgctxt "Symbol" msgid "Food Service" -msgstr "" +msgstr "Food Service" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:219 ../share/symbols/symbols.h:220 msgctxt "Symbol" msgid "Four Wheel Drive Road" -msgstr "" +msgstr "Four Wheel Drive Road" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:221 ../share/symbols/symbols.h:222 -#, fuzzy msgctxt "Symbol" msgid "Gas Station" -msgstr "Bus Station" +msgstr "Gas Station" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:223 ../share/symbols/symbols.h:224 -#, fuzzy msgctxt "Symbol" msgid "Golfing" -msgstr "Golf" +msgstr "Golfing" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:225 ../share/symbols/symbols.h:226 msgctxt "Symbol" msgid "Horseback Riding" -msgstr "" +msgstr "Horseback Riding" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:227 ../share/symbols/symbols.h:228 @@ -4420,13 +4230,13 @@ msgstr "Ice Skating" #: ../share/symbols/symbols.h:233 ../share/symbols/symbols.h:234 msgctxt "Symbol" msgid "Litter Receptacle" -msgstr "" +msgstr "Litter Receptacle" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:235 ../share/symbols/symbols.h:236 msgctxt "Symbol" msgid "Lodging" -msgstr "" +msgstr "Lodging" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:237 ../share/symbols/symbols.h:238 @@ -4438,14 +4248,13 @@ msgstr "Marina" #: ../share/symbols/symbols.h:239 ../share/symbols/symbols.h:240 msgctxt "Symbol" msgid "Motorbike Trail" -msgstr "" +msgstr "Motorbike Trail" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:241 ../share/symbols/symbols.h:242 -#, fuzzy msgctxt "Symbol" msgid "Radiator Water" -msgstr "Radiation" +msgstr "Radiator Water" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:243 ../share/symbols/symbols.h:244 @@ -4455,17 +4264,15 @@ msgstr "Recycling" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:247 ../share/symbols/symbols.h:248 -#, fuzzy msgctxt "Symbol" msgid "Pets On Leash" -msgstr "Text On Path" +msgstr "Pets On Leash" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:249 ../share/symbols/symbols.h:250 -#, fuzzy msgctxt "Symbol" msgid "Picnic Area" -msgstr "Park / Picnic Area" +msgstr "Picnic Area" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:251 ../share/symbols/symbols.h:252 @@ -4475,23 +4282,21 @@ msgstr "Post Office" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:253 ../share/symbols/symbols.h:254 -#, fuzzy msgctxt "Symbol" msgid "Ranger Station" -msgstr "Fuel Station" +msgstr "Ranger Station" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:255 ../share/symbols/symbols.h:256 -#, fuzzy msgctxt "Symbol" msgid "RV Campground" -msgstr "Cap rounding" +msgstr "RV Campground" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:257 ../share/symbols/symbols.h:258 msgctxt "Symbol" msgid "Restrooms" -msgstr "" +msgstr "Restrooms" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:259 ../share/symbols/symbols.h:260 @@ -4503,20 +4308,19 @@ msgstr "Sailing" #: ../share/symbols/symbols.h:261 ../share/symbols/symbols.h:262 msgctxt "Symbol" msgid "Sanitary Disposal Station" -msgstr "" +msgstr "Sanitary Disposal Station" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:263 ../share/symbols/symbols.h:264 -#, fuzzy msgctxt "Symbol" msgid "Scuba Diving" -msgstr "Diving" +msgstr "Scuba Diving" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:265 ../share/symbols/symbols.h:266 msgctxt "Symbol" msgid "Self Guided Trail" -msgstr "" +msgstr "Self Guided Trail" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:267 ../share/symbols/symbols.h:268 @@ -4526,63 +4330,57 @@ msgstr "Shelter" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:269 ../share/symbols/symbols.h:270 -#, fuzzy msgctxt "Symbol" msgid "Showers" -msgstr "Show:" +msgstr "Showers" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:271 ../share/symbols/symbols.h:272 -#, fuzzy msgctxt "Symbol" msgid "Sledding" -msgstr "Reading" +msgstr "Sledding" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:273 ../share/symbols/symbols.h:274 msgctxt "Symbol" msgid "SnowmobileTrail" -msgstr "" +msgstr "SnowmobileTrail" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:275 ../share/symbols/symbols.h:276 -#, fuzzy msgctxt "Symbol" msgid "Stable" -msgstr "Table" +msgstr "Stable" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:277 ../share/symbols/symbols.h:278 msgctxt "Symbol" msgid "Store" -msgstr "" +msgstr "Store" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:279 ../share/symbols/symbols.h:280 msgctxt "Symbol" msgid "Swimming" -msgstr "" +msgstr "Swimming" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:283 ../share/symbols/symbols.h:284 -#, fuzzy msgctxt "Symbol" msgid "Emergency Telephone" -msgstr "Telephone" +msgstr "Emergency Telephone" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:285 ../share/symbols/symbols.h:286 -#, fuzzy msgctxt "Symbol" msgid "Trailhead" -msgstr "Braille" +msgstr "Trailhead" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:287 ../share/symbols/symbols.h:288 -#, fuzzy msgctxt "Symbol" msgid "Wheelchair Accessible" -msgstr "NPS Wheelchair Accessible" +msgstr "Wheelchair Accessible" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:289 ../share/symbols/symbols.h:290 @@ -4594,12 +4392,11 @@ msgstr "Wind Surfing" #: ../share/symbols/symbols.h:291 msgctxt "Symbol" msgid "Blank" -msgstr "" +msgstr "Blank" #: ../share/templates/templates.h:1 -#, fuzzy msgid "CD Label 120mmx120mm " -msgstr "CD Label 120x120 " +msgstr "CD Label 120mmx120mm " #: ../share/templates/templates.h:1 msgid "Simple CD Label template with disc's pattern." @@ -4651,17 +4448,16 @@ msgstr "guidelines typography canvas" msgid "3D Box" msgstr "3D Box" -#: ../src/color-profile.cpp:842 +#: ../src/color-profile.cpp:856 #, c-format msgid "Color profiles directory (%s) is unavailable." msgstr "Colour profiles directory (%s) is unavailable." -#: ../src/color-profile.cpp:901 ../src/color-profile.cpp:918 +#: ../src/color-profile.cpp:928 ../src/color-profile.cpp:945 msgid "(invalid UTF-8 string)" msgstr "(invalid UTF-8 string)" -#: ../src/color-profile.cpp:903 -#, fuzzy +#: ../src/color-profile.cpp:930 msgctxt "Profile name" msgid "None" msgstr "None" @@ -5235,7 +5031,7 @@ msgstr "" "Inkscape website or ask on the mailing lists if you have questions regarding " "this extension." -#: ../src/extension/implementation/script.cpp:1108 +#: ../src/extension/implementation/script.cpp:1111 msgid "" "Inkscape has received additional data from the script executed. The script " "did not return an error, but this may indicate the results will not be as " @@ -5273,7 +5069,8 @@ msgstr "Adaptive Threshold" #: ../src/ui/widget/page-sizer.cpp:249 #: ../src/widgets/calligraphy-toolbar.cpp:430 #: ../src/widgets/eraser-toolbar.cpp:154 ../src/widgets/spray-toolbar.cpp:297 -#: ../src/widgets/tweak-toolbar.cpp:128 ../share/extensions/foldablebox.inx.h:2 +#: ../src/widgets/tweak-toolbar.cpp:128 +#: ../share/extensions/foldablebox.inx.h:2 msgid "Width:" msgstr "Width:" @@ -5526,9 +5323,8 @@ msgid "Right (px):" msgstr "Right (px):" #: ../src/extension/internal/bitmap/crop.cpp:77 -#, fuzzy msgid "Crop selected bitmap(s)" -msgstr "Crop selected bitmap(s)." +msgstr "Crop selected bitmap(s)" #: ../src/extension/internal/bitmap/cycleColormap.cpp:37 msgid "Cycle Colormap" @@ -5733,9 +5529,8 @@ msgid "Opacity:" msgstr "Opacity:" #: ../src/extension/internal/bitmap/opacity.cpp:46 -#, fuzzy msgid "Modify opacity channel(s) of selected bitmap(s)" -msgstr "Modify opacity channel(s) of selected bitmap(s)." +msgstr "Modify opacity channel(s) of selected bitmap(s)" #: ../src/extension/internal/bitmap/raise.cpp:40 msgid "Raise" @@ -5923,30 +5718,26 @@ msgstr "PostScript level 2" #: ../src/extension/internal/cairo-ps-out.cpp:333 #: ../src/extension/internal/cairo-ps-out.cpp:375 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:250 -#, fuzzy msgid "Text output options:" -msgstr "Text orientation" +msgstr "Text output options:" #: ../src/extension/internal/cairo-ps-out.cpp:334 #: ../src/extension/internal/cairo-ps-out.cpp:376 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:251 -#, fuzzy msgid "Embed fonts" -msgstr "Embed rasters" +msgstr "Embed fonts" #: ../src/extension/internal/cairo-ps-out.cpp:335 #: ../src/extension/internal/cairo-ps-out.cpp:377 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:252 -#, fuzzy msgid "Convert text to paths" -msgstr "Convert texts to paths" +msgstr "Convert text to paths" #: ../src/extension/internal/cairo-ps-out.cpp:336 #: ../src/extension/internal/cairo-ps-out.cpp:378 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:253 -#, fuzzy msgid "Omit text in PDF and create LaTeX file" -msgstr "PDF+LaTeX: Omit text in PDF, and create LaTeX file" +msgstr "Omit text in PDF and create LaTeX file" #: ../src/extension/internal/cairo-ps-out.cpp:338 #: ../src/extension/internal/cairo-ps-out.cpp:380 @@ -6724,13 +6515,15 @@ msgid "Transparency type:" msgstr "Transparency type:" #: ../src/extension/internal/filter/bumps.h:353 -#: ../src/extension/internal/filter/morphology.h:176 ../src/filter-enums.cpp:91 +#: ../src/extension/internal/filter/morphology.h:176 +#: ../src/filter-enums.cpp:91 msgid "Atop" msgstr "Atop" #: ../src/extension/internal/filter/bumps.h:354 #: ../src/extension/internal/filter/distort.h:70 -#: ../src/extension/internal/filter/morphology.h:174 ../src/filter-enums.cpp:89 +#: ../src/extension/internal/filter/morphology.h:174 +#: ../src/filter-enums.cpp:89 msgid "In" msgstr "In" @@ -6788,51 +6581,48 @@ msgid "Replace RGB by any color" msgstr "Replace RGB by any colour" #: ../src/extension/internal/filter/color.h:254 -#, fuzzy msgid "Color Blindness" -msgstr "Colour outline" +msgstr "Colour Blindness" #: ../src/extension/internal/filter/color.h:258 -#, fuzzy msgid "Blindness type:" -msgstr "Blend type:" +msgstr "Blindness type:" #: ../src/extension/internal/filter/color.h:259 msgid "Rod monochromacy (atypical achromatopsia)" -msgstr "" +msgstr "Rod monochromacy (atypical achromatopsia)" #: ../src/extension/internal/filter/color.h:260 msgid "Cone monochromacy (typical achromatopsia)" -msgstr "" +msgstr "Cone monochromacy (typical achromatopsia)" #: ../src/extension/internal/filter/color.h:261 msgid "Green weak (deuteranomaly)" -msgstr "" +msgstr "Green weak (deuteranomaly)" #: ../src/extension/internal/filter/color.h:262 msgid "Green blind (deuteranopia)" -msgstr "" +msgstr "Green blind (deuteranopia)" #: ../src/extension/internal/filter/color.h:263 msgid "Red weak (protanomaly)" -msgstr "" +msgstr "Red weak (protanomaly)" #: ../src/extension/internal/filter/color.h:264 msgid "Red blind (protanopia)" -msgstr "" +msgstr "Red blind (protanopia)" #: ../src/extension/internal/filter/color.h:265 msgid "Blue weak (tritanomaly)" -msgstr "" +msgstr "Blue weak (tritanomaly)" #: ../src/extension/internal/filter/color.h:266 msgid "Blue blind (tritanopia)" -msgstr "" +msgstr "Blue blind (tritanopia)" #: ../src/extension/internal/filter/color.h:286 -#, fuzzy msgid "Simulate color blindness" -msgstr "Simulate oil painting style" +msgstr "Simulate colour blindness" #: ../src/extension/internal/filter/color.h:329 msgid "Color Shift" @@ -7251,7 +7041,8 @@ msgid "Felt Feather" msgstr "Felt Feather" #: ../src/extension/internal/filter/distort.h:71 -#: ../src/extension/internal/filter/morphology.h:175 ../src/filter-enums.cpp:90 +#: ../src/extension/internal/filter/morphology.h:175 +#: ../src/filter-enums.cpp:90 msgid "Out" msgstr "Out" @@ -7445,11 +7236,13 @@ msgstr "Hide image" msgid "Composite type:" msgstr "Composite type:" -#: ../src/extension/internal/filter/morphology.h:173 ../src/filter-enums.cpp:88 +#: ../src/extension/internal/filter/morphology.h:173 +#: ../src/filter-enums.cpp:88 msgid "Over" msgstr "Over" -#: ../src/extension/internal/filter/morphology.h:177 ../src/filter-enums.cpp:92 +#: ../src/extension/internal/filter/morphology.h:177 +#: ../src/filter-enums.cpp:92 msgid "XOR" msgstr "XOR" @@ -7523,8 +7316,8 @@ msgstr "Noise Fill" #: ../src/ui/dialog/tracedialog.cpp:747 #: ../share/extensions/color_HSL_adjust.inx.h:2 #: ../share/extensions/color_custom.inx.h:2 -#: ../share/extensions/color_randomize.inx.h:2 ../share/extensions/dots.inx.h:2 -#: ../share/extensions/dxf_input.inx.h:2 +#: ../share/extensions/color_randomize.inx.h:2 +#: ../share/extensions/dots.inx.h:2 ../share/extensions/dxf_input.inx.h:2 #: ../share/extensions/dxf_outlines.inx.h:2 #: ../share/extensions/gcodetools_area.inx.h:29 #: ../share/extensions/gcodetools_engraving.inx.h:7 @@ -8121,13 +7914,15 @@ msgstr "Vertical Offset:" #: ../src/extension/internal/grid.cpp:209 #: ../src/ui/dialog/inkscape-preferences.cpp:1532 #: ../share/extensions/draw_from_triangle.inx.h:58 -#: ../share/extensions/eqtexsvg.inx.h:4 ../share/extensions/foldablebox.inx.h:9 +#: ../share/extensions/eqtexsvg.inx.h:4 +#: ../share/extensions/foldablebox.inx.h:9 #: ../share/extensions/funcplot.inx.h:38 #: ../share/extensions/grid_cartesian.inx.h:23 #: ../share/extensions/grid_isometric.inx.h:11 #: ../share/extensions/grid_polar.inx.h:22 #: ../share/extensions/guides_creator.inx.h:25 -#: ../share/extensions/hershey.inx.h:52 ../share/extensions/layout_nup.inx.h:35 +#: ../share/extensions/hershey.inx.h:52 +#: ../share/extensions/layout_nup.inx.h:35 #: ../share/extensions/lindenmayer.inx.h:34 #: ../share/extensions/nicechart.inx.h:45 #: ../share/extensions/param_curves.inx.h:30 @@ -8244,7 +8039,7 @@ msgstr "" #: ../src/extension/internal/pdfinput/pdf-input.cpp:134 msgid "Poppler/Cairo import" -msgstr "" +msgstr "Poppler/Cairo import" #: ../src/extension/internal/pdfinput/pdf-input.cpp:135 msgid "" @@ -8252,11 +8047,13 @@ msgid "" "glyphs where each glyph is a path. Images are stored internally. Meshes " "cause entire document to be rendered as a raster image." msgstr "" +"Import via external library. Text consists of groups containing cloned " +"glyphs where each glyph is a path. Images are stored internally. Meshes " +"cause entire document to be rendered as a raster image." #: ../src/extension/internal/pdfinput/pdf-input.cpp:136 -#, fuzzy msgid "Internal import" -msgstr "Serial port:" +msgstr "Internal import" #: ../src/extension/internal/pdfinput/pdf-input.cpp:137 msgid "" @@ -8264,6 +8061,9 @@ msgid "" "white space is missing. Meshes are converted to tiles, the number depends on " "the precision set below." msgstr "" +"Import via internal (Poppler derived) library. Text is stored as text but " +"white space is missing. Meshes are converted to tiles, the number depends on " +"the precision set below." #: ../src/extension/internal/pdfinput/pdf-input.cpp:148 msgid "rough" @@ -8478,7 +8278,8 @@ msgid "Map all fill patterns to standard WMF hatches" msgstr "Map all fill patterns to standard WMF hatches" #: ../src/extension/internal/wmf-inout.cpp:3208 -#: ../share/extensions/wmf_input.inx.h:2 ../share/extensions/wmf_output.inx.h:2 +#: ../share/extensions/wmf_input.inx.h:2 +#: ../share/extensions/wmf_output.inx.h:2 msgid "Windows Metafile (*.wmf)" msgstr "Windows Metafile (*.wmf)" @@ -8747,7 +8548,8 @@ msgstr "Hue Rotate" msgid "Luminance to Alpha" msgstr "Luminance to Alpha" -#: ../src/filter-enums.cpp:87 ../share/extensions/jessyInk_mouseHandler.inx.h:3 +#: ../src/filter-enums.cpp:87 +#: ../share/extensions/jessyInk_mouseHandler.inx.h:3 #: ../share/extensions/jessyInk_transitions.inx.h:7 #: ../share/extensions/measure.inx.h:20 ../share/extensions/nicechart.inx.h:33 msgid "Default" @@ -8800,7 +8602,6 @@ msgid "Wrap" msgstr "Wrap" #: ../src/filter-enums.cpp:122 -#, fuzzy msgctxt "Convolve matrix, edge mode" msgid "None" msgstr "None" @@ -9054,7 +8855,8 @@ msgstr "Iconify this dock" msgid "Close this dock" msgstr "Close this dock" -#: ../src/libgdl/gdl-dock-item-grip.c:723 ../src/libgdl/gdl-dock-tablabel.c:125 +#: ../src/libgdl/gdl-dock-item-grip.c:723 +#: ../src/libgdl/gdl-dock-tablabel.c:125 msgid "Controlling dock item" msgstr "Controlling dock item" @@ -9220,7 +9022,8 @@ msgstr "The index of the current page" #: ../src/libgdl/gdl-dock-object.c:125 #: ../src/live_effects/parameter/originalpatharray.cpp:82 #: ../src/ui/dialog/inkscape-preferences.cpp:1566 -#: ../src/ui/widget/page-sizer.cpp:285 ../src/widgets/gradient-selector.cpp:150 +#: ../src/ui/widget/page-sizer.cpp:285 +#: ../src/widgets/gradient-selector.cpp:150 #: ../src/widgets/sp-xmlview-attr-list.cpp:49 msgid "Name" msgstr "Name" @@ -9493,7 +9296,7 @@ msgstr "Text label" #: ../src/live_effects/effect.cpp:115 msgid "Fillet/Chamfer" -msgstr "" +msgstr "Fillet/Chamfer" #. 0.46 #: ../src/live_effects/effect.cpp:118 @@ -9560,45 +9363,37 @@ msgid "Clone original path" msgstr "Clone original path" #: ../src/live_effects/effect.cpp:137 -#, fuzzy msgid "Lattice Deformation 2" -msgstr "Lattice Deformation" +msgstr "Lattice Deformation 2" #: ../src/live_effects/effect.cpp:138 -#, fuzzy msgid "Perspective/Envelope" -msgstr "Perspective" +msgstr "Perspective/Envelope" #: ../src/live_effects/effect.cpp:139 -#, fuzzy msgid "Interpolate points" -msgstr "Interpolate" +msgstr "Interpolate points" #: ../src/live_effects/effect.cpp:140 -#, fuzzy msgid "Transform by 2 points" -msgstr "Transform gradients" +msgstr "Transform by 2 points" #: ../src/live_effects/effect.cpp:141 #: ../src/live_effects/lpe-show_handles.cpp:26 -#, fuzzy msgid "Show handles" -msgstr "Show Handles" +msgstr "Show handles" #: ../src/live_effects/effect.cpp:143 ../src/widgets/pencil-toolbar.cpp:118 -#, fuzzy msgid "BSpline" -msgstr "Outline" +msgstr "BSpline" #: ../src/live_effects/effect.cpp:144 -#, fuzzy msgid "Join type" -msgstr "Line type:" +msgstr "Join type" #: ../src/live_effects/effect.cpp:145 -#, fuzzy msgid "Taper stroke" -msgstr "Pattern stroke" +msgstr "Taper stroke" #: ../src/live_effects/effect.cpp:146 msgid "Mirror symmetry" @@ -9610,28 +9405,24 @@ msgstr "Rotate copies" #. Ponyscape -> Inkscape 0.92 #: ../src/live_effects/effect.cpp:149 -#, fuzzy msgid "Attach path" -msgstr "Stitch path:" +msgstr "Attach path" #: ../src/live_effects/effect.cpp:150 -#, fuzzy msgid "Fill between strokes" -msgstr "Fill and Stroke" +msgstr "Fill between strokes" #: ../src/live_effects/effect.cpp:151 ../src/selection-chemistry.cpp:2906 msgid "Fill between many" -msgstr "" +msgstr "Fill between many" #: ../src/live_effects/effect.cpp:152 -#, fuzzy msgid "Ellipse by 5 points" -msgstr "Circle by 3 points" +msgstr "Ellipse by 5 points" #: ../src/live_effects/effect.cpp:153 -#, fuzzy msgid "Bounding Box" -msgstr "Bounding box" +msgstr "Bounding Box" #: ../src/live_effects/effect.cpp:361 msgid "Is visible?" @@ -9664,75 +9455,65 @@ msgid "None of the applied path effect's parameters can be edited on-canvas." msgstr "None of the applied path effect's parameters can be edited on-canvas." #: ../src/live_effects/lpe-attach-path.cpp:29 -#, fuzzy msgid "Start path:" -msgstr "Stitch path:" +msgstr "Start path:" #: ../src/live_effects/lpe-attach-path.cpp:29 -#, fuzzy msgid "Path to attach to the start of this path" -msgstr "Path to put along the skeleton path" +msgstr "Path to attach to the start of this path" #: ../src/live_effects/lpe-attach-path.cpp:30 -#, fuzzy msgid "Start path position:" -msgstr "Start position (x;y):" +msgstr "Start path position:" #: ../src/live_effects/lpe-attach-path.cpp:30 msgid "Position to attach path start to" -msgstr "" +msgstr "Position to attach path start to" #: ../src/live_effects/lpe-attach-path.cpp:31 -#, fuzzy msgid "Start path curve start:" -msgstr "Set path colour to red:" +msgstr "Start path curve start:" #: ../src/live_effects/lpe-attach-path.cpp:31 #: ../src/live_effects/lpe-attach-path.cpp:35 -#, fuzzy msgid "Starting curve" -msgstr "Drag curve" +msgstr "Starting curve" #. , true #: ../src/live_effects/lpe-attach-path.cpp:32 -#, fuzzy msgid "Start path curve end:" -msgstr "Set path colour to red:" +msgstr "Start path curve end:" #: ../src/live_effects/lpe-attach-path.cpp:32 #: ../src/live_effects/lpe-attach-path.cpp:36 -#, fuzzy msgid "Ending curve" -msgstr "min curvature" +msgstr "Ending curve" #. , true #: ../src/live_effects/lpe-attach-path.cpp:33 -#, fuzzy msgid "End path:" -msgstr "Bend path:" +msgstr "End path:" #: ../src/live_effects/lpe-attach-path.cpp:33 -#, fuzzy msgid "Path to attach to the end of this path" -msgstr "Path to put along the skeleton path" +msgstr "Path to attach to the end of this path" #: ../src/live_effects/lpe-attach-path.cpp:34 -#, fuzzy msgid "End path position:" -msgstr "Layout disposition:" +msgstr "End path position:" #: ../src/live_effects/lpe-attach-path.cpp:34 msgid "Position to attach path end to" -msgstr "" +msgstr "Position to attach path end to" #: ../src/live_effects/lpe-attach-path.cpp:35 msgid "End path curve start:" -msgstr "" +msgstr "End path curve start:" #. , true #: ../src/live_effects/lpe-attach-path.cpp:36 msgid "End path curve end:" -msgstr "" +msgstr "End path curve end:" #: ../src/live_effects/lpe-bendpath.cpp:69 msgid "Bend path:" @@ -9771,9 +9552,8 @@ msgstr "Rotates the original 90 degrees, before bending it along the bend path" #: ../src/live_effects/lpe-bendpath.cpp:178 #: ../src/live_effects/lpe-patternalongpath.cpp:285 -#, fuzzy msgid "Change the width" -msgstr "Change stroke width" +msgstr "Change the width" #: ../src/live_effects/lpe-bounding-box.cpp:24 #: ../src/live_effects/lpe-clone-original.cpp:18 @@ -9789,79 +9569,68 @@ msgid "Path from which to take the original path data" msgstr "Path from which to take the original path data" #: ../src/live_effects/lpe-bounding-box.cpp:25 -#, fuzzy msgid "Visual Bounds" -msgstr "Visual bounding box" +msgstr "Visual Bounds" #: ../src/live_effects/lpe-bounding-box.cpp:25 -#, fuzzy msgid "Uses the visual bounding box" -msgstr "Visual bounding box" +msgstr "Uses the visual bounding box" #: ../src/live_effects/lpe-bspline.cpp:30 msgid "Steps with CTRL:" -msgstr "" +msgstr "Steps with CTRL:" #: ../src/live_effects/lpe-bspline.cpp:30 msgid "Change number of steps with CTRL pressed" -msgstr "" +msgstr "Change number of steps with CTRL pressed" #: ../src/live_effects/lpe-bspline.cpp:31 #: ../src/live_effects/lpe-simplify.cpp:33 #: ../src/live_effects/lpe-transform_2pts.cpp:43 -#, fuzzy msgid "Helper size:" -msgstr "_Handle size:" +msgstr "Helper size:" #: ../src/live_effects/lpe-bspline.cpp:31 #: ../src/live_effects/lpe-simplify.cpp:33 -#, fuzzy msgid "Helper size" -msgstr "_Handle size:" +msgstr "Helper size" #: ../src/live_effects/lpe-bspline.cpp:32 msgid "Apply changes if weight = 0%" -msgstr "" +msgstr "Apply changes if weight = 0%" #: ../src/live_effects/lpe-bspline.cpp:33 msgid "Apply changes if weight > 0%" -msgstr "" +msgstr "Apply changes if weight > 0%" #: ../src/live_effects/lpe-bspline.cpp:34 #: ../src/live_effects/lpe-fillet-chamfer.cpp:56 -#, fuzzy msgid "Change only selected nodes" -msgstr "Join selected nodes" +msgstr "Change only selected nodes" #: ../src/live_effects/lpe-bspline.cpp:35 -#, fuzzy msgid "Change weight %:" -msgstr "Caps Height:" +msgstr "Change weight %:" #: ../src/live_effects/lpe-bspline.cpp:35 -#, fuzzy msgid "Change weight percent of the effect" -msgstr "Change gradient stop offset" +msgstr "Change weight percent of the effect" #: ../src/live_effects/lpe-bspline.cpp:99 -#, fuzzy msgid "Default weight" -msgstr "Default title" +msgstr "Default weight" #: ../src/live_effects/lpe-bspline.cpp:104 -#, fuzzy msgid "Make cusp" -msgstr "Make star" +msgstr "Make cusp" #: ../src/live_effects/lpe-bspline.cpp:148 -#, fuzzy msgid "Change to default weight" -msgstr "Default title" +msgstr "Change to default weight" #: ../src/live_effects/lpe-bspline.cpp:154 -#, fuzzy msgid "Change to 0 weight" -msgstr "Caps Height:" +msgstr "Change to 0 weight" #: ../src/live_effects/lpe-bspline.cpp:160 #: ../src/live_effects/lpe-fillet-chamfer.cpp:240 @@ -9968,12 +9737,11 @@ msgstr "Scale the width of the stitch path relative to its length" #: ../src/live_effects/lpe-ellipse_5pts.cpp:77 msgid "Five points required for constructing an ellipse" -msgstr "" +msgstr "Five points required for constructing an ellipse" #: ../src/live_effects/lpe-ellipse_5pts.cpp:162 -#, fuzzy msgid "No ellipse found for specified points" -msgstr "No edge data found in specified file." +msgstr "No ellipse found for specified points" #: ../src/live_effects/lpe-envelope.cpp:31 msgid "Top bend path:" @@ -10008,9 +9776,8 @@ msgid "Left path along which to bend the original path" msgstr "Left path along which to bend the original path" #: ../src/live_effects/lpe-envelope.cpp:35 -#, fuzzy msgid "_Enable left & right paths" -msgstr "E_nable left & right paths" +msgstr "_Enable left & right paths" #: ../src/live_effects/lpe-envelope.cpp:35 msgid "Enable the left and right deformation paths" @@ -10033,29 +9800,24 @@ msgid "Defines the direction and magnitude of the extrusion" msgstr "Defines the direction and magnitude of the extrusion" #: ../src/live_effects/lpe-fill-between-many.cpp:25 -#, fuzzy msgid "Paths from which to take the original path data" -msgstr "Path from which to take the original path data" +msgstr "Paths from which to take the original path data" #: ../src/live_effects/lpe-fill-between-strokes.cpp:24 -#, fuzzy msgid "Second path:" -msgstr "Bend path:" +msgstr "Second path:" #: ../src/live_effects/lpe-fill-between-strokes.cpp:24 -#, fuzzy msgid "Second path from which to take the original path data" -msgstr "Path from which to take the original path data" +msgstr "Second path from which to take the original path data" #: ../src/live_effects/lpe-fill-between-strokes.cpp:25 -#, fuzzy msgid "Reverse Second" -msgstr "Reverse gradient" +msgstr "Reverse Second" #: ../src/live_effects/lpe-fill-between-strokes.cpp:25 -#, fuzzy msgid "Reverses the second path order" -msgstr "Reverse the direction of the gradient" +msgstr "Reverses the second path order" #: ../src/live_effects/lpe-fillet-chamfer.cpp:41 #: ../src/widgets/text-toolbar.cpp:1788 @@ -10064,127 +9826,109 @@ msgid "Auto" msgstr "Auto" #: ../src/live_effects/lpe-fillet-chamfer.cpp:42 -#, fuzzy msgid "Force arc" -msgstr "Force" +msgstr "Force arc" #: ../src/live_effects/lpe-fillet-chamfer.cpp:43 msgid "Force bezier" -msgstr "" +msgstr "Force bezier" #: ../src/live_effects/lpe-fillet-chamfer.cpp:53 -#, fuzzy msgid "Fillet point" -msgstr "Fill Paint" +msgstr "Fillet point" #: ../src/live_effects/lpe-fillet-chamfer.cpp:54 -#, fuzzy msgid "Hide knots" -msgstr "Hide object" +msgstr "Hide knots" #: ../src/live_effects/lpe-fillet-chamfer.cpp:55 -#, fuzzy msgid "Ignore 0 radius knots" -msgstr "Ignore first and last points" +msgstr "Ignore 0 radius knots" #: ../src/live_effects/lpe-fillet-chamfer.cpp:57 msgid "Flexible radius size (%)" -msgstr "" +msgstr "Flexible radius size (%)" #: ../src/live_effects/lpe-fillet-chamfer.cpp:58 msgid "Use knots distance instead radius" -msgstr "" +msgstr "Use knots distance instead radius" #: ../src/live_effects/lpe-fillet-chamfer.cpp:59 -#, fuzzy msgid "Method:" -msgstr "Method" +msgstr "Method:" #: ../src/live_effects/lpe-fillet-chamfer.cpp:59 -#, fuzzy msgid "Fillets methods" -msgstr "Filling method" +msgstr "Fillets methods" #: ../src/live_effects/lpe-fillet-chamfer.cpp:60 -#, fuzzy msgid "Radius (unit or %):" -msgstr "Radius (px):" +msgstr "Radius (unit or %):" #: ../src/live_effects/lpe-fillet-chamfer.cpp:60 msgid "Radius, in unit or %" -msgstr "" +msgstr "Radius, in unit or %" #: ../src/live_effects/lpe-fillet-chamfer.cpp:61 -#, fuzzy msgid "Chamfer steps:" -msgstr "Number of steps:" +msgstr "Chamfer steps:" #: ../src/live_effects/lpe-fillet-chamfer.cpp:61 -#, fuzzy msgid "Chamfer steps" -msgstr "Number of steps:" +msgstr "Chamfer steps" #: ../src/live_effects/lpe-fillet-chamfer.cpp:63 -#, fuzzy msgid "Helper size with direction:" -msgstr "Angle in X direction" +msgstr "Helper size with direction:" #: ../src/live_effects/lpe-fillet-chamfer.cpp:63 -#, fuzzy msgid "Helper size with direction" -msgstr "Angle in X direction" +msgstr "Helper size with direction" #: ../src/live_effects/lpe-fillet-chamfer.cpp:103 msgid "IMPORTANT! New version soon..." -msgstr "" +msgstr "IMPORTANT! New version soon..." #: ../src/live_effects/lpe-fillet-chamfer.cpp:107 msgid "Not compatible. Convert to path after." -msgstr "" +msgstr "Not compatible. Convert to path after." #: ../src/live_effects/lpe-fillet-chamfer.cpp:165 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:72 -#, fuzzy msgid "Fillet" -msgstr "Fill" +msgstr "Fillet" #: ../src/live_effects/lpe-fillet-chamfer.cpp:169 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:74 -#, fuzzy msgid "Inverse fillet" -msgstr "Invert fill" +msgstr "Inverse fillet" #: ../src/live_effects/lpe-fillet-chamfer.cpp:174 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:76 -#, fuzzy msgid "Chamfer" -msgstr "Cham" +msgstr "Chamfer" #: ../src/live_effects/lpe-fillet-chamfer.cpp:178 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:78 -#, fuzzy msgid "Inverse chamfer" -msgstr "Invert channels:" +msgstr "Inverse chamfer" #: ../src/live_effects/lpe-fillet-chamfer.cpp:247 -#, fuzzy msgid "Convert to fillet" -msgstr "Convert to Braille" +msgstr "Convert to fillet" #: ../src/live_effects/lpe-fillet-chamfer.cpp:254 #: ../src/live_effects/lpe-fillet-chamfer.cpp:278 -#, fuzzy msgid "Convert to inverse fillet" -msgstr "Convert to Braille" +msgstr "Convert to inverse fillet" #: ../src/live_effects/lpe-fillet-chamfer.cpp:270 -#, fuzzy msgid "Convert to chamfer" -msgstr "Convert to Dashes" +msgstr "Convert to chamfer" #: ../src/live_effects/lpe-fillet-chamfer.cpp:290 msgid "Knots and helper paths refreshed" -msgstr "" +msgstr "Knots and helper paths refreshed" #: ../src/live_effects/lpe-gears.cpp:214 msgid "_Teeth:" @@ -10254,7 +9998,7 @@ msgstr "SpiroInterpolator" #: ../src/live_effects/lpe-interpolate_points.cpp:29 #: ../src/live_effects/lpe-powerstroke.cpp:137 msgid "Centripetal Catmull-Rom" -msgstr "" +msgstr "Centripetal Catmull-Rom" #: ../src/live_effects/lpe-interpolate_points.cpp:37 #: ../src/live_effects/lpe-powerstroke.cpp:179 @@ -10291,9 +10035,8 @@ msgid "Miter" msgstr "Mitre" #: ../src/live_effects/lpe-jointype.cpp:34 -#, fuzzy msgid "Miter Clip" -msgstr "Mitre _limit:" +msgstr "Mitre Clip" #. {LINEJOIN_EXTRP_MITER, N_("Extrapolated"), "extrapolated"}, // disabled because doesn't work well #: ../src/live_effects/lpe-jointype.cpp:35 @@ -10302,19 +10045,16 @@ msgid "Extrapolated arc" msgstr "Extrapolated arc" #: ../src/live_effects/lpe-jointype.cpp:36 -#, fuzzy msgid "Extrapolated arc Alt1" -msgstr "Extrapolated arc" +msgstr "Extrapolated arc Alt1" #: ../src/live_effects/lpe-jointype.cpp:37 -#, fuzzy msgid "Extrapolated arc Alt2" -msgstr "Extrapolated arc" +msgstr "Extrapolated arc Alt2" #: ../src/live_effects/lpe-jointype.cpp:38 -#, fuzzy msgid "Extrapolated arc Alt3" -msgstr "Extrapolated arc" +msgstr "Extrapolated arc Alt3" #: ../src/live_effects/lpe-jointype.cpp:42 #: ../src/live_effects/lpe-powerstroke.cpp:149 @@ -10332,19 +10072,16 @@ msgid "Peak" msgstr "Peak" #: ../src/live_effects/lpe-jointype.cpp:54 -#, fuzzy msgid "Thickness of the stroke" -msgstr "Thickness: at 1st side:" +msgstr "Thickness of the stroke" #: ../src/live_effects/lpe-jointype.cpp:55 -#, fuzzy msgid "Line cap" -msgstr "Linear" +msgstr "Line cap" #: ../src/live_effects/lpe-jointype.cpp:55 -#, fuzzy msgid "The end shape of the stroke" -msgstr "The orientation of the ruler" +msgstr "The end shape of the stroke" #. Join type #. TRANSLATORS: The line join style specifies the shape to be used at the @@ -10369,18 +10106,16 @@ msgid "Miter limit:" msgstr "Mitre _limit:" #: ../src/live_effects/lpe-jointype.cpp:59 -#, fuzzy msgid "Maximum length of the miter join (in units of stroke width)" -msgstr "Maximum length of the mitre (in units of stroke width)" +msgstr "Maximum length of the mitre join (in units of stroke width)" #: ../src/live_effects/lpe-jointype.cpp:60 -#, fuzzy msgid "Force miter" -msgstr "Force" +msgstr "Force mitre" #: ../src/live_effects/lpe-jointype.cpp:60 msgid "Overrides the miter limit and forces a join." -msgstr "" +msgstr "Overrides the mitre limit and forces a join." #. initialise your parameters here: #: ../src/live_effects/lpe-knot.cpp:350 @@ -10442,293 +10177,258 @@ msgstr "Change knot crossing" #: ../src/live_effects/lpe-lattice2.cpp:47 #: ../src/live_effects/lpe-perspective-envelope.cpp:43 -#, fuzzy msgid "Mirror movements in horizontal" -msgstr "Move nodes horizontally" +msgstr "Mirror movements in horizontal" #: ../src/live_effects/lpe-lattice2.cpp:48 #: ../src/live_effects/lpe-perspective-envelope.cpp:44 -#, fuzzy msgid "Mirror movements in vertical" -msgstr "Move nodes vertically" +msgstr "Mirror movements in vertical" #: ../src/live_effects/lpe-lattice2.cpp:49 msgid "Update while moving knots (maybe slow)" -msgstr "" +msgstr "Update while moving knots (maybe slow)" #: ../src/live_effects/lpe-lattice2.cpp:50 -#, fuzzy msgid "Control 0:" -msgstr "Control handle 0" +msgstr "Control 0:" #: ../src/live_effects/lpe-lattice2.cpp:50 -#, fuzzy msgid "Control 0 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "Control 0 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:51 -#, fuzzy msgid "Control 1:" -msgstr "Control handle 1" +msgstr "Control 1:" #: ../src/live_effects/lpe-lattice2.cpp:51 -#, fuzzy msgid "Control 1 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "Control 1 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:52 -#, fuzzy msgid "Control 2:" -msgstr "Control handle 2" +msgstr "Control 2:" #: ../src/live_effects/lpe-lattice2.cpp:52 -#, fuzzy msgid "Control 2 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "Control 2 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:53 -#, fuzzy msgid "Control 3:" -msgstr "Control handle 3" +msgstr "Control 3:" #: ../src/live_effects/lpe-lattice2.cpp:53 -#, fuzzy msgid "Control 3 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "Control 3 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:54 -#, fuzzy msgid "Control 4:" -msgstr "Control handle 4" +msgstr "Control 4:" #: ../src/live_effects/lpe-lattice2.cpp:54 -#, fuzzy msgid "Control 4 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "Control 4 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:55 -#, fuzzy msgid "Control 5:" -msgstr "Control handle 5" +msgstr "Control 5:" #: ../src/live_effects/lpe-lattice2.cpp:55 -#, fuzzy msgid "Control 5 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "Control 5 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:56 -#, fuzzy msgid "Control 6:" -msgstr "Control handle 6" +msgstr "Control 6:" #: ../src/live_effects/lpe-lattice2.cpp:56 -#, fuzzy msgid "Control 6 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "Control 6 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:57 -#, fuzzy msgid "Control 7:" -msgstr "Control handle 7" +msgstr "Control 7:" #: ../src/live_effects/lpe-lattice2.cpp:57 -#, fuzzy msgid "Control 7 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "Control 7 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:58 -#, fuzzy msgid "Control 8x9:" -msgstr "Control handle 8" +msgstr "Control 8x9:" #: ../src/live_effects/lpe-lattice2.cpp:58 -#, fuzzy msgid "" "Control 8x9 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "" +"Control 8x9 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:59 -#, fuzzy msgid "Control 10x11:" -msgstr "Control handle 10" +msgstr "Control 10x11:" #: ../src/live_effects/lpe-lattice2.cpp:59 -#, fuzzy msgid "" "Control 10x11 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "" +"Control 10x11 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:60 -#, fuzzy msgid "Control 12:" -msgstr "Control handle 12" +msgstr "Control 12:" #: ../src/live_effects/lpe-lattice2.cpp:60 -#, fuzzy msgid "Control 12 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "" +"Control 12 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:61 -#, fuzzy msgid "Control 13:" -msgstr "Control handle 13" +msgstr "Control 13:" #: ../src/live_effects/lpe-lattice2.cpp:61 -#, fuzzy msgid "Control 13 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "" +"Control 13 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:62 -#, fuzzy msgid "Control 14:" -msgstr "Control handle 14" +msgstr "Control 14:" #: ../src/live_effects/lpe-lattice2.cpp:62 -#, fuzzy msgid "Control 14 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "" +"Control 14 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:63 -#, fuzzy msgid "Control 15:" -msgstr "Control handle 15" +msgstr "Control 15:" #: ../src/live_effects/lpe-lattice2.cpp:63 -#, fuzzy msgid "Control 15 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "" +"Control 15 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:64 -#, fuzzy msgid "Control 16:" -msgstr "Control handle 1" +msgstr "Control 16:" #: ../src/live_effects/lpe-lattice2.cpp:64 -#, fuzzy msgid "Control 16 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "" +"Control 16 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:65 -#, fuzzy msgid "Control 17:" -msgstr "Control handle 1" +msgstr "Control 17:" #: ../src/live_effects/lpe-lattice2.cpp:65 -#, fuzzy msgid "Control 17 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "" +"Control 17 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:66 -#, fuzzy msgid "Control 18:" -msgstr "Control handle 1" +msgstr "Control 18:" #: ../src/live_effects/lpe-lattice2.cpp:66 -#, fuzzy msgid "Control 18 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "" +"Control 18 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:67 -#, fuzzy msgid "Control 19:" -msgstr "Control handle 1" +msgstr "Control 19:" #: ../src/live_effects/lpe-lattice2.cpp:67 -#, fuzzy msgid "Control 19 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "" +"Control 19 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:68 -#, fuzzy msgid "Control 20x21:" -msgstr "Control handle 0" +msgstr "Control 20x21:" #: ../src/live_effects/lpe-lattice2.cpp:68 -#, fuzzy msgid "" "Control 20x21 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "" +"Control 20x21 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:69 -#, fuzzy msgid "Control 22x23:" -msgstr "Control handle 2" +msgstr "Control 22x23:" #: ../src/live_effects/lpe-lattice2.cpp:69 -#, fuzzy msgid "" "Control 22x23 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "" +"Control 22x23 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:70 -#, fuzzy msgid "Control 24x26:" -msgstr "Control handle 2" +msgstr "Control 24x26:" #: ../src/live_effects/lpe-lattice2.cpp:70 -#, fuzzy msgid "" "Control 24x26 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "" +"Control 24x26 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:71 -#, fuzzy msgid "Control 25x27:" -msgstr "Control handle 2" +msgstr "Control 25x27:" #: ../src/live_effects/lpe-lattice2.cpp:71 -#, fuzzy msgid "" "Control 25x27 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "" +"Control 25x27 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:72 -#, fuzzy msgid "Control 28x30:" -msgstr "Control handle 0" +msgstr "Control 28x30:" #: ../src/live_effects/lpe-lattice2.cpp:72 -#, fuzzy msgid "" "Control 28x30 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "" +"Control 28x30 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:73 -#, fuzzy msgid "Control 29x31:" -msgstr "Control handle 1" +msgstr "Control 29x31:" #: ../src/live_effects/lpe-lattice2.cpp:73 -#, fuzzy msgid "" "Control 29x31 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "" +"Control 29x31 - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-lattice2.cpp:74 msgid "Control 32x33x34x35:" -msgstr "" +msgstr "Control 32x33x34x35:" #: ../src/live_effects/lpe-lattice2.cpp:74 msgid "" "Control 32x33x34x35 - Ctrl+Alt+Click: reset, Ctrl: move along " "axes" msgstr "" +"Control 32x33x34x35 - Ctrl+Alt+Click: reset, Ctrl: move along " +"axes" #: ../src/live_effects/lpe-lattice2.cpp:239 -#, fuzzy msgid "Reset grid" -msgstr "Remove grid" +msgstr "Reset grid" #: ../src/live_effects/lpe-lattice2.cpp:271 #: ../src/live_effects/lpe-lattice2.cpp:286 -#, fuzzy msgid "Show Points" -msgstr "Sort points" +msgstr "Show Points" #: ../src/live_effects/lpe-lattice2.cpp:284 -#, fuzzy msgid "Hide Points" -msgstr "Points" +msgstr "Hide Points" #: ../src/live_effects/lpe-patternalongpath.cpp:63 #: ../share/extensions/pathalongpath.inx.h:10 @@ -10833,73 +10533,61 @@ msgid "Perspective" msgstr "Perspective" #: ../src/live_effects/lpe-perspective-envelope.cpp:36 -#, fuzzy msgid "Envelope deformation" -msgstr "Envelope Deformation" +msgstr "Envelope deformation" #: ../src/live_effects/lpe-perspective-envelope.cpp:45 -#, fuzzy msgid "Overflow perspective" -msgstr "Perspective" +msgstr "Overflow perspective" #: ../src/live_effects/lpe-perspective-envelope.cpp:46 msgid "Type" msgstr "Type" #: ../src/live_effects/lpe-perspective-envelope.cpp:46 -#, fuzzy msgid "Select the type of deformation" -msgstr "Duplicate the pattern before deformation" +msgstr "Select the type of deformation" #: ../src/live_effects/lpe-perspective-envelope.cpp:47 -#, fuzzy msgid "Top Left" -msgstr "Top and Left" +msgstr "Top Left" #: ../src/live_effects/lpe-perspective-envelope.cpp:47 -#, fuzzy msgid "Top Left - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "Top Left - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-perspective-envelope.cpp:48 -#, fuzzy msgid "Top Right" -msgstr "Top and right" +msgstr "Top Right" #: ../src/live_effects/lpe-perspective-envelope.cpp:48 -#, fuzzy msgid "Top Right - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "Top Right - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-perspective-envelope.cpp:49 -#, fuzzy msgid "Down Left" -msgstr "Top and Left" +msgstr "Down Left" #: ../src/live_effects/lpe-perspective-envelope.cpp:49 -#, fuzzy msgid "Down Left - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "Down Left - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-perspective-envelope.cpp:50 -#, fuzzy msgid "Down Right" -msgstr "Right" +msgstr "Down Right" #: ../src/live_effects/lpe-perspective-envelope.cpp:50 -#, fuzzy msgid "Down Right - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "Alt: lock handle length; Ctrl+Alt: move along handles" +msgstr "" +"Down Right - Ctrl+Alt+Click: reset, Ctrl: move along axes" #: ../src/live_effects/lpe-perspective-envelope.cpp:367 -#, fuzzy msgid "Handles:" -msgstr "Handle" +msgstr "Handles:" #: ../src/live_effects/lpe-powerstroke.cpp:132 -#, fuzzy msgid "CubicBezierSmooth" -msgstr "CubicBezierJohan" +msgstr "CubicBezierSmooth" #: ../src/live_effects/lpe-powerstroke.cpp:151 #: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:13 @@ -11152,24 +10840,20 @@ msgid "By number of segments" msgstr "By number of segments" #: ../src/live_effects/lpe-roughen.cpp:32 -#, fuzzy msgid "By max. segment size" -msgstr "By max. segment length" +msgstr "By max. segment size" #: ../src/live_effects/lpe-roughen.cpp:38 -#, fuzzy msgid "Along nodes" -msgstr "Join nodes" +msgstr "Along nodes" #: ../src/live_effects/lpe-roughen.cpp:39 -#, fuzzy msgid "Rand" -msgstr "Randomly" +msgstr "Rand" #: ../src/live_effects/lpe-roughen.cpp:40 -#, fuzzy msgid "Retract" -msgstr "Extract" +msgstr "Retract" #. initialise your parameters here: #: ../src/live_effects/lpe-roughen.cpp:49 @@ -11177,44 +10861,36 @@ msgid "Method" msgstr "Method" #: ../src/live_effects/lpe-roughen.cpp:49 -#, fuzzy msgid "Division method" -msgstr "Division method:" +msgstr "Division method" #: ../src/live_effects/lpe-roughen.cpp:51 -#, fuzzy msgid "Max. segment size" -msgstr "By max. segment length" +msgstr "Max. segment size" #: ../src/live_effects/lpe-roughen.cpp:53 -#, fuzzy msgid "Number of segments" -msgstr "Number of segments:" +msgstr "Number of segments" #: ../src/live_effects/lpe-roughen.cpp:55 -#, fuzzy msgid "Max. displacement in X" -msgstr "Maximum displacement in X (px):" +msgstr "Max. displacement in X" #: ../src/live_effects/lpe-roughen.cpp:57 -#, fuzzy msgid "Max. displacement in Y" -msgstr "Maximum displacement in Y (px):" +msgstr "Max. displacement in Y" #: ../src/live_effects/lpe-roughen.cpp:59 -#, fuzzy msgid "Global randomize" -msgstr "visibly randomised" +msgstr "Global randomise" #: ../src/live_effects/lpe-roughen.cpp:61 -#, fuzzy msgid "Handles" -msgstr "Handle" +msgstr "Handles" #: ../src/live_effects/lpe-roughen.cpp:61 -#, fuzzy msgid "Handles options" -msgstr "Randomise position" +msgstr "Handles options" #: ../src/live_effects/lpe-roughen.cpp:63 #: ../share/extensions/jitternodes.inx.h:5 @@ -11222,38 +10898,36 @@ msgid "Shift nodes" msgstr "Shift nodes" #: ../src/live_effects/lpe-roughen.cpp:65 -#, fuzzy msgid "Fixed displacement" -msgstr "X displacement:" +msgstr "Fixed displacement" #: ../src/live_effects/lpe-roughen.cpp:65 msgid "Fixed displacement, 1/3 of segment length" -msgstr "" +msgstr "Fixed displacement, 1/3 of segment length" #: ../src/live_effects/lpe-roughen.cpp:67 -#, fuzzy msgid "Spray Tool friendly" -msgstr "Spray Tool Preferences" +msgstr "Spray Tool friendly" #: ../src/live_effects/lpe-roughen.cpp:67 msgid "For use with spray tool in copy mode" -msgstr "" +msgstr "For use with spray tool in copy mode" #: ../src/live_effects/lpe-roughen.cpp:121 msgid "Add nodes Subdivide each segment" -msgstr "" +msgstr "Add nodes Subdivide each segment" #: ../src/live_effects/lpe-roughen.cpp:130 msgid "Jitter nodes Move nodes/handles" -msgstr "" +msgstr "Jitter nodes Move nodes/handles" #: ../src/live_effects/lpe-roughen.cpp:139 msgid "Extra roughen Add a extra layer of rough" -msgstr "" +msgstr "Extra roughen Add a extra layer of rough" #: ../src/live_effects/lpe-roughen.cpp:148 msgid "Options Modify options to rough" -msgstr "" +msgstr "Options Modify options to rough" #: ../src/live_effects/lpe-ruler.cpp:25 ../share/extensions/measure.inx.h:27 #: ../share/extensions/restack.inx.h:16 @@ -11274,7 +10948,6 @@ msgid "Both" msgstr "Both" #: ../src/live_effects/lpe-ruler.cpp:32 -#, fuzzy msgctxt "Border mark" msgid "None" msgstr "None" @@ -11299,7 +10972,8 @@ msgstr "_Mark distance:" msgid "Distance between successive ruler marks" msgstr "Distance between successive ruler marks" -#: ../src/live_effects/lpe-ruler.cpp:42 ../share/extensions/foldablebox.inx.h:7 +#: ../src/live_effects/lpe-ruler.cpp:42 +#: ../share/extensions/foldablebox.inx.h:7 #: ../share/extensions/interp_att_g.inx.h:9 #: ../share/extensions/layout_nup.inx.h:3 #: ../share/extensions/printing_marks.inx.h:11 @@ -11367,19 +11041,16 @@ msgid "Choose whether to draw marks at the beginning and end of the path" msgstr "Choose whether to draw marks at the beginning and end of the path" #: ../src/live_effects/lpe-show_handles.cpp:25 -#, fuzzy msgid "Show nodes" -msgstr "Show Handles" +msgstr "Show nodes" #: ../src/live_effects/lpe-show_handles.cpp:27 -#, fuzzy msgid "Show path" -msgstr "Stroke path" +msgstr "Show path" #: ../src/live_effects/lpe-show_handles.cpp:28 -#, fuzzy msgid "Scale nodes and handles" -msgstr "Snap nodes, paths, and handles" +msgstr "Scale nodes and handles" #: ../src/live_effects/lpe-show_handles.cpp:29 #: ../src/ui/tool/multi-path-manipulator.cpp:788 @@ -11392,50 +11063,44 @@ msgid "" "The \"show handles\" path effect will remove any custom style on the object " "you are applying it to. If this is not what you want, click Cancel." msgstr "" +"The \"show handles\" path effect will remove any custom style on the object " +"you are applying it to. If this is not what you want, click Cancel." #: ../src/live_effects/lpe-simplify.cpp:30 -#, fuzzy msgid "Steps:" -msgstr "Steps_:" +msgstr "Steps:" #: ../src/live_effects/lpe-simplify.cpp:30 -#, fuzzy msgid "Change number of simplify steps " -msgstr "Star: Change number of corners" +msgstr "Change number of simplify steps " #: ../src/live_effects/lpe-simplify.cpp:31 -#, fuzzy msgid "Roughly threshold:" -msgstr "Threshold:" +msgstr "Roughly threshold:" #: ../src/live_effects/lpe-simplify.cpp:32 -#, fuzzy msgid "Smooth angles:" -msgstr "Smoothness:" +msgstr "Smooth angles:" #: ../src/live_effects/lpe-simplify.cpp:32 msgid "Max degree difference on handles to perform a smooth" -msgstr "" +msgstr "Max degree difference on handles to perform a smooth" #: ../src/live_effects/lpe-simplify.cpp:34 -#, fuzzy msgid "Paths separately" -msgstr "Paste Size separately" +msgstr "Paths separately" #: ../src/live_effects/lpe-simplify.cpp:34 -#, fuzzy msgid "Simplifying paths (separately)" -msgstr "Simplifying paths (separately):" +msgstr "Simplifying paths (separately)" #: ../src/live_effects/lpe-simplify.cpp:36 -#, fuzzy msgid "Just coalesce" -msgstr "Just check tools" +msgstr "Just coalesce" #: ../src/live_effects/lpe-simplify.cpp:36 -#, fuzzy msgid "Simplify just coalesce" -msgstr "Simplify colours" +msgstr "Simplify just coalesce" #. initialise your parameters here: #. testpointA(_("Test Point A"), _("Test A"), "ptA", &wr, this, Geom::Point(100,100)), @@ -11588,146 +11253,120 @@ msgid "Stroke width:" msgstr "Stroke width:" #: ../src/live_effects/lpe-taperstroke.cpp:73 -#, fuzzy msgid "The (non-tapered) width of the path" -msgstr "Scale the width of the stitch path" +msgstr "The (non-tapered) width of the path" #: ../src/live_effects/lpe-taperstroke.cpp:74 -#, fuzzy msgid "Start offset:" -msgstr "Text path offset" +msgstr "Start offset:" #: ../src/live_effects/lpe-taperstroke.cpp:74 msgid "Taper distance from path start" -msgstr "" +msgstr "Taper distance from path start" #: ../src/live_effects/lpe-taperstroke.cpp:75 -#, fuzzy msgid "End offset:" -msgstr "Red offset" +msgstr "End offset:" #: ../src/live_effects/lpe-taperstroke.cpp:75 -#, fuzzy msgid "The ending position of the taper" -msgstr "Use saved size and position of the tile" +msgstr "The ending position of the taper" #: ../src/live_effects/lpe-taperstroke.cpp:76 -#, fuzzy msgid "Taper smoothing:" -msgstr "Smoothing:" +msgstr "Taper smoothing:" #: ../src/live_effects/lpe-taperstroke.cpp:76 msgid "Amount of smoothing to apply to the tapers" -msgstr "" +msgstr "Amount of smoothing to apply to the tapers" #: ../src/live_effects/lpe-taperstroke.cpp:77 -#, fuzzy msgid "Join type:" -msgstr "Line type:" +msgstr "Join type:" #: ../src/live_effects/lpe-taperstroke.cpp:77 -#, fuzzy msgid "Join type for non-smooth nodes" -msgstr "Snap to smooth nodes" +msgstr "Join type for non-smooth nodes" #: ../src/live_effects/lpe-taperstroke.cpp:78 msgid "Limit for miter joins" -msgstr "" +msgstr "Limit for mitre joins" #: ../src/live_effects/lpe-taperstroke.cpp:447 -#, fuzzy msgid "Start point of the taper" -msgstr "Saturation" +msgstr "Start point of the taper" #: ../src/live_effects/lpe-taperstroke.cpp:451 -#, fuzzy msgid "End point of the taper" -msgstr "Unit of the ruler" +msgstr "End point of the taper" #: ../src/live_effects/lpe-transform_2pts.cpp:31 -#, fuzzy msgid "Elastic" -msgstr "Plaster" +msgstr "Elastic" #: ../src/live_effects/lpe-transform_2pts.cpp:31 -#, fuzzy msgid "Elastic transform mode" -msgstr "Select and transform objects" +msgstr "Elastic transform mode" #: ../src/live_effects/lpe-transform_2pts.cpp:32 -#, fuzzy msgid "From original width" -msgstr "Clone original path" +msgstr "From original width" #: ../src/live_effects/lpe-transform_2pts.cpp:33 -#, fuzzy msgid "Lock length" -msgstr "Lock layer" +msgstr "Lock length" #: ../src/live_effects/lpe-transform_2pts.cpp:33 -#, fuzzy msgid "Lock length to current distance" -msgstr "Lock or unlock current layer" +msgstr "Lock length to current distance" #: ../src/live_effects/lpe-transform_2pts.cpp:34 -#, fuzzy msgid "Lock angle" -msgstr "Cone angle" +msgstr "Lock angle" #: ../src/live_effects/lpe-transform_2pts.cpp:35 -#, fuzzy msgid "Flip horizontal" -msgstr "Flip horizontally" +msgstr "Flip horizontal" #: ../src/live_effects/lpe-transform_2pts.cpp:36 -#, fuzzy msgid "Flip vertical" -msgstr "Flip vertically" +msgstr "Flip vertical" #: ../src/live_effects/lpe-transform_2pts.cpp:37 -#, fuzzy msgid "Start point" -msgstr "Sort points" +msgstr "Start point" #: ../src/live_effects/lpe-transform_2pts.cpp:38 -#, fuzzy msgid "End point" -msgstr "Random Point" +msgstr "End point" #: ../src/live_effects/lpe-transform_2pts.cpp:39 -#, fuzzy msgid "Stretch" -msgstr "Strength" +msgstr "Stretch" #: ../src/live_effects/lpe-transform_2pts.cpp:39 -#, fuzzy msgid "Stretch the result" -msgstr "Default export resolution:" +msgstr "Stretch the result" #: ../src/live_effects/lpe-transform_2pts.cpp:40 -#, fuzzy msgid "Offset from knots" -msgstr "Offset points" +msgstr "Offset from knots" #: ../src/live_effects/lpe-transform_2pts.cpp:41 -#, fuzzy msgid "First Knot" -msgstr "First Aid" +msgstr "First Knot" #: ../src/live_effects/lpe-transform_2pts.cpp:42 -#, fuzzy msgid "Last Knot" -msgstr "Knot" +msgstr "Last Knot" #: ../src/live_effects/lpe-transform_2pts.cpp:43 -#, fuzzy msgid "Rotation helper size" -msgstr "Rotation Centres" +msgstr "Rotation helper size" #: ../src/live_effects/lpe-transform_2pts.cpp:196 -#, fuzzy msgid "Change index of knot" -msgstr "Change node type" +msgstr "Change index of knot" #: ../src/live_effects/lpe-transform_2pts.cpp:349 #: ../src/ui/dialog/inkscape-preferences.cpp:1623 @@ -11808,6 +11447,8 @@ msgid "" "Chamfer: Ctrl+Click toggle type, Shift+Click open " "dialog, Ctrl+Alt+Click reset" msgstr "" +"Chamfer: Ctrl+Click toggle type, Shift+Click open " +"dialogue, Ctrl+Alt+Click reset" #: ../src/live_effects/parameter/filletchamferpointarray.cpp:782 #: ../src/live_effects/parameter/filletchamferpointarray.cpp:843 @@ -11815,6 +11456,8 @@ msgid "" "Inverse Chamfer: Ctrl+Click toggle type, Shift+Click " "open dialog, Ctrl+Alt+Click reset" msgstr "" +"Inverse Chamfer: Ctrl+Click toggle type, Shift+Click " +"open dialogue, Ctrl+Alt+Click reset" #: ../src/live_effects/parameter/filletchamferpointarray.cpp:786 #: ../src/live_effects/parameter/filletchamferpointarray.cpp:847 @@ -11822,6 +11465,8 @@ msgid "" "Inverse Fillet: Ctrl+Click toggle type, Shift+Click " "open dialog, Ctrl+Alt+Click reset" msgstr "" +"Inverse Fillet: Ctrl+Click toggle type, Shift+Click " +"open dialogue, Ctrl+Alt+Click reset" #: ../src/live_effects/parameter/filletchamferpointarray.cpp:790 #: ../src/live_effects/parameter/filletchamferpointarray.cpp:851 @@ -11829,6 +11474,8 @@ msgid "" "Fillet: Ctrl+Click toggle type, Shift+Click open " "dialog, Ctrl+Alt+Click reset" msgstr "" +"Fillet: Ctrl+Click toggle type, Shift+Click open " +"dialogue, Ctrl+Alt+Click reset" #: ../src/live_effects/parameter/originalpath.cpp:67 #: ../src/live_effects/parameter/originalpatharray.cpp:155 @@ -11851,36 +11498,30 @@ msgid "Link path parameter to path" msgstr "Link path parameter to path" #: ../src/live_effects/parameter/originalpatharray.cpp:167 -#, fuzzy msgid "Remove Path" -msgstr "_Remove from Path" +msgstr "Remove Path" #: ../src/live_effects/parameter/originalpatharray.cpp:179 #: ../src/ui/dialog/objects.cpp:1854 -#, fuzzy msgid "Move Down" -msgstr "Move to:" +msgstr "Move Down" #: ../src/live_effects/parameter/originalpatharray.cpp:191 #: ../src/ui/dialog/objects.cpp:1862 -#, fuzzy msgid "Move Up" -msgstr "Move path" +msgstr "Move Up" #: ../src/live_effects/parameter/originalpatharray.cpp:231 -#, fuzzy msgid "Move path up" -msgstr "Move path" +msgstr "Move path up" #: ../src/live_effects/parameter/originalpatharray.cpp:261 -#, fuzzy msgid "Move path down" -msgstr "Move path effect down" +msgstr "Move path down" #: ../src/live_effects/parameter/originalpatharray.cpp:279 -#, fuzzy msgid "Remove path" -msgstr "Move path" +msgstr "Remove path" #: ../src/live_effects/parameter/path.cpp:170 msgid "Edit on-canvas" @@ -11908,14 +11549,14 @@ msgstr "Change point parameter" #: ../src/live_effects/parameter/powerstrokepointarray.cpp:239 #: ../src/live_effects/parameter/powerstrokepointarray.cpp:256 -#, fuzzy msgid "" "Stroke width control point: drag to alter the stroke width. Ctrl" "+click adds a control point, Ctrl+Alt+click deletes it, Shift" "+click launches width dialog." msgstr "" "Stroke width control point: drag to alter the stroke width. Ctrl" -"+click adds a control point, Ctrl+Alt+click deletes it." +"+click adds a control point, Ctrl+Alt+click deletes it, Shift" +"+click launches width dialogue." #: ../src/live_effects/parameter/random.cpp:134 msgid "Change random parameter" @@ -11926,9 +11567,8 @@ msgid "Change text parameter" msgstr "Change text parameter" #: ../src/live_effects/parameter/togglebutton.cpp:112 -#, fuzzy msgid "Change togglebutton parameter" -msgstr "Change text parameter" +msgstr "Change togglebutton parameter" #: ../src/live_effects/parameter/transformedpoint.cpp:98 #: ../src/live_effects/parameter/vector.cpp:99 @@ -11980,13 +11620,12 @@ msgid "Export document to a PNG file" msgstr "Export document to a PNG file" #: ../src/main.cpp:330 -#, fuzzy msgid "" "Resolution for exporting to bitmap and for rasterization of filters in PS/" "EPS/PDF (default 96)" msgstr "" "Resolution for exporting to bitmap and for rasterisation of filters in PS/" -"EPS/PDF (default 90)" +"EPS/PDF (default 96)" #: ../src/main.cpp:331 ../src/ui/widget/rendering-options.cpp:37 msgid "DPI" @@ -12091,13 +11730,12 @@ msgid "Export document to an EPS file" msgstr "Export document to an EPS file" #: ../src/main.cpp:412 -#, fuzzy msgid "" "Choose the PostScript Level used to export. Possible choices are 2 and 3 " "(the default)" msgstr "" -"Choose the PostScript Level used to export. Possible choices are 2 (the " -"default) and 3" +"Choose the PostScript Level used to export. Possible choices are 2 and 3 " +"(the default)" #: ../src/main.cpp:414 msgid "PS Level" @@ -12114,7 +11752,7 @@ msgid "" "found in the PDF export dialog, e.g. \"PDF 1.4\" which is PDF-a conformant)" msgstr "" "Export PDF to given version. (hint: make sure to input the exact string " -"found in the PDF export dialog, e.g. \"PDF 1.4\" which is PDF-a conformant)" +"found in the PDF export dialogue, e.g. \"PDF 1.4\" which is PDF-a conformant)" #: ../src/main.cpp:425 msgid "PDF_VERSION" @@ -12665,7 +12303,7 @@ msgstr "URI:" #. TRANSLATORS: this is where you put a URL to a page that defines the license #: ../src/rdf.cpp:291 msgid "URI to this document's license's namespace definition" -msgstr "URI to this document's license's namespace definition" +msgstr "URI to this document's licence's namespace definition" #. TRANSLATORS: fragment of XML representing the license of the document #: ../src/rdf.cpp:295 @@ -12694,7 +12332,8 @@ msgstr "Nothing was deleted." #: ../src/widgets/eraser-toolbar.cpp:120 #: ../src/widgets/gradient-toolbar.cpp:1181 #: ../src/widgets/gradient-toolbar.cpp:1195 -#: ../src/widgets/gradient-toolbar.cpp:1209 ../src/widgets/node-toolbar.cpp:401 +#: ../src/widgets/gradient-toolbar.cpp:1209 +#: ../src/widgets/node-toolbar.cpp:401 msgid "Delete" msgstr "Delete" @@ -12716,25 +12355,21 @@ msgid "Select some objects to group." msgstr "Select some objects to group." #: ../src/selection-chemistry.cpp:775 -#, fuzzy msgctxt "Verb" msgid "Group" msgstr "Group" #: ../src/selection-chemistry.cpp:798 -#, fuzzy msgid "No objects selected to pop out of group." -msgstr "No objects selected to take the style from." +msgstr "No objects selected to pop out of group." #: ../src/selection-chemistry.cpp:808 -#, fuzzy msgid "Selection not in a group." -msgstr "Select a group to ungroup." +msgstr "Selection not in a group." #: ../src/selection-chemistry.cpp:822 -#, fuzzy msgid "Pop selection from group" -msgstr "_Treat selection as group: " +msgstr "Pop selection from group" #: ../src/selection-chemistry.cpp:830 msgid "Select a group to ungroup." @@ -12995,9 +12630,8 @@ msgstr "" "defs>)" #: ../src/selection-chemistry.cpp:2912 -#, fuzzy msgid "Select path(s) to fill." -msgstr "Select path(s) to simplify." +msgstr "Select path(s) to fill." #: ../src/selection-chemistry.cpp:2930 msgid "Select object(s) to convert to marker." @@ -13029,7 +12663,7 @@ msgstr "Select a symbol to extract objects from." #: ../src/selection-chemistry.cpp:3216 msgid "Select only one symbol in Symbol dialog to convert to group." -msgstr "Select only one symbol in Symbol dialog to convert to group." +msgstr "Select only one symbol in Symbol dialogue to convert to group." #: ../src/selection-chemistry.cpp:3272 msgid "Group from symbol" @@ -13072,9 +12706,8 @@ msgid "Select object(s) to create clippath or mask from." msgstr "Select object(s) to create clippath or mask from." #: ../src/selection-chemistry.cpp:3850 ../src/ui/dialog/objects.cpp:1922 -#, fuzzy msgid "Create Clip Group" -msgstr "Create Clo_ne" +msgstr "Create Clip Group" #: ../src/selection-chemistry.cpp:3879 msgid "Select mask object and object(s) to apply clippath or mask to." @@ -13195,11 +12828,11 @@ msgid "Use Shift+D to look up frame" msgstr "Use Shift+D to look up frame" #: ../src/selection-describer.cpp:236 -#, fuzzy, c-format +#, c-format msgid "%1$i objects selected of type %2$s" msgid_plural "%1$i objects selected of types %2$s" -msgstr[0] "%i objects selected of type %s" -msgstr[1] "%i objects selected of types %s" +msgstr[0] "%1$i objects selected of type %2$s" +msgstr[1] "%1$i objects selected of types %2$s" #: ../src/selection-describer.cpp:246 #, c-format @@ -13372,20 +13005,20 @@ msgid_plural "(%d characters%s)" msgstr[0] "(%d character%s)" msgstr[1] "(%d characters%s)" -#: ../src/sp-guide.cpp:261 +#: ../src/sp-guide.cpp:262 msgid "Create Guides Around the Page" msgstr "Create Guides Around the Page" -#: ../src/sp-guide.cpp:274 ../src/verbs.cpp:2544 +#: ../src/sp-guide.cpp:275 ../src/verbs.cpp:2544 msgid "Delete All Guides" msgstr "Delete All Guides" #. Guide has probably been deleted and no longer has an attached namedview. -#: ../src/sp-guide.cpp:485 +#: ../src/sp-guide.cpp:486 msgid "Deleted" msgstr "Deleted" -#: ../src/sp-guide.cpp:494 +#: ../src/sp-guide.cpp:495 msgid "" "Shift+drag to rotate, Ctrl+drag to move origin, Del to " "delete" @@ -13393,17 +13026,17 @@ msgstr "" "Shift+drag to rotate, Ctrl+drag to move origin, Del to " "delete" -#: ../src/sp-guide.cpp:498 +#: ../src/sp-guide.cpp:499 #, c-format msgid "vertical, at %s" msgstr "vertical, at %s" -#: ../src/sp-guide.cpp:501 +#: ../src/sp-guide.cpp:502 #, c-format msgid "horizontal, at %s" msgstr "horizontal, at %s" -#: ../src/sp-guide.cpp:506 +#: ../src/sp-guide.cpp:507 #, c-format msgid "at %d degrees, through (%s,%s)" msgstr "at %d degrees, through (%s,%s)" @@ -13564,8 +13197,8 @@ msgstr "Conditional Group" #: ../src/sp-text.cpp:361 ../src/verbs.cpp:347 #: ../share/extensions/lorem_ipsum.inx.h:8 -#: ../share/extensions/replace_font.inx.h:11 ../share/extensions/split.inx.h:10 -#: ../share/extensions/text_braille.inx.h:2 +#: ../share/extensions/replace_font.inx.h:11 +#: ../share/extensions/split.inx.h:10 ../share/extensions/text_braille.inx.h:2 #: ../share/extensions/text_extract.inx.h:14 #: ../share/extensions/text_flipcase.inx.h:2 #: ../share/extensions/text_lowercase.inx.h:2 @@ -14212,19 +13845,16 @@ msgid "Selection Area" msgstr "Selection Area" #: ../src/ui/dialog/align-and-distribute.cpp:1097 -#, fuzzy msgid "Middle of selection" -msgstr "Width of selection" +msgstr "Middle of selection" #: ../src/ui/dialog/align-and-distribute.cpp:1098 -#, fuzzy msgid "Min value" -msgstr "Kerning value:" +msgstr "Min value" #: ../src/ui/dialog/align-and-distribute.cpp:1099 -#, fuzzy msgid "Max value" -msgstr "Clear values" +msgstr "Max value" #: ../src/ui/dialog/calligraphic-profile-rename.cpp:40 #: ../src/ui/dialog/calligraphic-profile-rename.cpp:138 @@ -14597,13 +14227,12 @@ msgid "Initial color of tiled clones" msgstr "Initial colour of tiled clones" #: ../src/ui/dialog/clonetiler.cpp:665 -#, fuzzy msgid "" "Initial color for clones (works only if the original has unset fill or " "stroke or on spray tool in copy mode)" msgstr "" "Initial colour for clones (works only if the original has unset fill or " -"stroke)" +"stroke or on spray tool in copy mode)" #: ../src/ui/dialog/clonetiler.cpp:680 msgid "H:" @@ -14666,18 +14295,16 @@ msgid "_Trace" msgstr "_Trace" #: ../src/ui/dialog/clonetiler.cpp:788 -#, fuzzy msgid "Trace the drawing under the clones/sprayed items" -msgstr "Trace the drawing under the tiles" +msgstr "Trace the drawing under the clones/sprayed items" #: ../src/ui/dialog/clonetiler.cpp:792 -#, fuzzy msgid "" "For each clone/sprayed item, pick a value from the drawing in its location " "and apply it" msgstr "" -"For each clone, pick a value from the drawing in that clone's location and " -"apply it to the clone" +"For each clone/sprayed item, pick a value from the drawing in its location " +"and apply it" #: ../src/ui/dialog/clonetiler.cpp:811 msgid "1. Pick from the drawing:" @@ -14808,9 +14435,8 @@ msgid "Each clone's opacity is determined by the picked value in that point" msgstr "Each clone's opacity is determined by the selected value in that point" #: ../src/ui/dialog/clonetiler.cpp:1011 -#, fuzzy msgid "Apply to tiled clones:" -msgstr "Delete tiled clones" +msgstr "Apply to tiled clones:" #: ../src/ui/dialog/clonetiler.cpp:1052 msgid "How many rows in the tiling" @@ -15021,12 +14647,12 @@ msgid "License" msgstr "Licence" #: ../src/ui/dialog/document-metadata.cpp:126 -#: ../src/ui/dialog/document-properties.cpp:994 +#: ../src/ui/dialog/document-properties.cpp:1037 msgid "Dublin Core Entities" msgstr "Dublin Core Entities" #: ../src/ui/dialog/document-metadata.cpp:168 -#: ../src/ui/dialog/document-properties.cpp:1056 +#: ../src/ui/dialog/document-properties.cpp:1099 msgid "License" msgstr "Licence" @@ -15040,15 +14666,16 @@ msgid "If unset, no antialiasing will be done on the drawing" msgstr "If unset, no antialiasing will be done on the drawing" #: ../src/ui/dialog/document-properties.cpp:119 -#, fuzzy msgid "Checkerboard background" -msgstr "Remove background" +msgstr "Checkerboard background" #: ../src/ui/dialog/document-properties.cpp:119 msgid "" "If set, use checkerboard for background, otherwise use background color at " "full opacity." msgstr "" +"If set, use checkerboard for background, otherwise use background colour at " +"full opacity." #: ../src/ui/dialog/document-properties.cpp:120 msgid "Show page _border" @@ -15079,14 +14706,14 @@ msgid "Back_ground color:" msgstr "Back_ground colour:" #: ../src/ui/dialog/document-properties.cpp:123 -#, fuzzy msgid "" "Color of the page background. Note: transparency setting ignored while " "editing if 'Checkerboard background' unset (but used when exporting to " "bitmap)." msgstr "" "Colour of the page background. Note: transparency setting ignored while " -"editing but used when exporting to bitmap." +"editing if 'Checkerboard background' unset (but used when exporting to " +"bitmap)." #: ../src/ui/dialog/document-properties.cpp:124 msgid "Border _color:" @@ -15101,9 +14728,8 @@ msgid "Color of the page border" msgstr "Colour of the page border" #: ../src/ui/dialog/document-properties.cpp:125 -#, fuzzy msgid "Display _units:" -msgstr "Grid _units:" +msgstr "Display _units:" #. --------------------------------------------------------------- #. General snap options @@ -15273,7 +14899,8 @@ msgstr "_Remove" msgid "Remove selected grid." msgstr "Remove selected grid." -#: ../src/ui/dialog/document-properties.cpp:162 ../src/widgets/toolbox.cpp:1903 +#: ../src/ui/dialog/document-properties.cpp:162 +#: ../src/widgets/toolbox.cpp:1903 msgid "Guides" msgstr "Guides" @@ -15294,9 +14921,8 @@ msgid "Page Size" msgstr "Page Size" #: ../src/ui/dialog/document-properties.cpp:336 -#, fuzzy msgid "Background" -msgstr "Background" +msgstr "Background" #: ../src/ui/dialog/document-properties.cpp:339 msgid "Border" @@ -15330,139 +14956,138 @@ msgstr "Miscellaneous" #. Inkscape::GC::release(defsRepr); #. inform the document, so we can undo #. Color Management -#: ../src/ui/dialog/document-properties.cpp:526 ../src/verbs.cpp:3020 +#: ../src/ui/dialog/document-properties.cpp:542 ../src/verbs.cpp:3020 msgid "Link Color Profile" msgstr "Link Colour Profile" -#: ../src/ui/dialog/document-properties.cpp:623 +#: ../src/ui/dialog/document-properties.cpp:654 msgid "Remove linked color profile" msgstr "Remove linked colour profile" -#: ../src/ui/dialog/document-properties.cpp:636 +#: ../src/ui/dialog/document-properties.cpp:673 msgid "Linked Color Profiles:" msgstr "Linked Colour Profiles:" -#: ../src/ui/dialog/document-properties.cpp:638 +#: ../src/ui/dialog/document-properties.cpp:675 msgid "Available Color Profiles:" msgstr "Available Colour Profiles:" -#: ../src/ui/dialog/document-properties.cpp:640 +#: ../src/ui/dialog/document-properties.cpp:677 msgid "Link Profile" msgstr "Link Profile" -#: ../src/ui/dialog/document-properties.cpp:643 +#: ../src/ui/dialog/document-properties.cpp:680 msgid "Unlink Profile" msgstr "Unlink Profile" -#: ../src/ui/dialog/document-properties.cpp:721 +#: ../src/ui/dialog/document-properties.cpp:764 msgid "Profile Name" msgstr "Profile Name" -#: ../src/ui/dialog/document-properties.cpp:757 +#: ../src/ui/dialog/document-properties.cpp:800 msgid "External scripts" msgstr "External scripts" -#: ../src/ui/dialog/document-properties.cpp:758 +#: ../src/ui/dialog/document-properties.cpp:801 msgid "Embedded scripts" msgstr "Embedded scripts" -#: ../src/ui/dialog/document-properties.cpp:763 +#: ../src/ui/dialog/document-properties.cpp:806 msgid "External script files:" msgstr "External script files:" -#: ../src/ui/dialog/document-properties.cpp:765 +#: ../src/ui/dialog/document-properties.cpp:808 msgid "Add the current file name or browse for a file" msgstr "Add the current file name or browse for a file" -#: ../src/ui/dialog/document-properties.cpp:768 -#: ../src/ui/dialog/document-properties.cpp:845 +#: ../src/ui/dialog/document-properties.cpp:811 +#: ../src/ui/dialog/document-properties.cpp:888 #: ../src/ui/widget/selected-style.cpp:357 msgid "Remove" msgstr "Remove" -#: ../src/ui/dialog/document-properties.cpp:832 +#: ../src/ui/dialog/document-properties.cpp:875 msgid "Filename" msgstr "Filename" -#: ../src/ui/dialog/document-properties.cpp:840 +#: ../src/ui/dialog/document-properties.cpp:883 msgid "Embedded script files:" msgstr "Embedded script files:" -#: ../src/ui/dialog/document-properties.cpp:842 +#: ../src/ui/dialog/document-properties.cpp:885 #: ../src/ui/dialog/objects.cpp:1894 msgid "New" msgstr "New" -#: ../src/ui/dialog/document-properties.cpp:909 +#: ../src/ui/dialog/document-properties.cpp:952 msgid "Script id" msgstr "Script id" -#: ../src/ui/dialog/document-properties.cpp:915 +#: ../src/ui/dialog/document-properties.cpp:958 msgid "Content:" msgstr "Content:" -#: ../src/ui/dialog/document-properties.cpp:1032 +#: ../src/ui/dialog/document-properties.cpp:1075 msgid "_Save as default" msgstr "_Save as default" -#: ../src/ui/dialog/document-properties.cpp:1033 +#: ../src/ui/dialog/document-properties.cpp:1076 msgid "Save this metadata as the default metadata" msgstr "Save this metadata as the default metadata" -#: ../src/ui/dialog/document-properties.cpp:1034 +#: ../src/ui/dialog/document-properties.cpp:1077 msgid "Use _default" msgstr "Use _default" -#: ../src/ui/dialog/document-properties.cpp:1035 +#: ../src/ui/dialog/document-properties.cpp:1078 msgid "Use the previously saved default metadata here" msgstr "Use the previously saved default metadata here" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1108 +#: ../src/ui/dialog/document-properties.cpp:1151 msgid "Add external script..." msgstr "Add external script..." -#: ../src/ui/dialog/document-properties.cpp:1147 +#: ../src/ui/dialog/document-properties.cpp:1190 msgid "Select a script to load" msgstr "Select a script to load" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1175 +#: ../src/ui/dialog/document-properties.cpp:1218 msgid "Add embedded script..." msgstr "Add embedded script..." #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1206 +#: ../src/ui/dialog/document-properties.cpp:1249 msgid "Remove external script" msgstr "Remove external script" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1235 +#: ../src/ui/dialog/document-properties.cpp:1278 msgid "Remove embedded script" msgstr "Remove embedded script" #. TODO repr->set_content(_EmbeddedContent.get_buffer()->get_text()); #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1331 +#: ../src/ui/dialog/document-properties.cpp:1374 msgid "Edit embedded script" msgstr "Edit embedded script" -#: ../src/ui/dialog/document-properties.cpp:1415 +#: ../src/ui/dialog/document-properties.cpp:1458 msgid "Creation" msgstr "Creation" -#: ../src/ui/dialog/document-properties.cpp:1416 +#: ../src/ui/dialog/document-properties.cpp:1459 msgid "Defined grids" msgstr "Defined grids" -#: ../src/ui/dialog/document-properties.cpp:1660 +#: ../src/ui/dialog/document-properties.cpp:1703 msgid "Remove grid" msgstr "Remove grid" -#: ../src/ui/dialog/document-properties.cpp:1752 -#, fuzzy +#: ../src/ui/dialog/document-properties.cpp:1795 msgid "Changed default display unit" -msgstr "Changed document unit" +msgstr "Changed default display unit" #: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2887 msgid "_Page" @@ -15516,7 +15141,7 @@ msgstr "Close when complete" #: ../src/ui/dialog/export.cpp:173 msgid "Once the export completes, close this dialog" -msgstr "Once the export completes, close this dialog" +msgstr "Once the export completes, close this dialogue" #: ../src/ui/dialog/export.cpp:175 msgid "_Export" @@ -15583,9 +15208,8 @@ msgid "Export the bitmap file with these settings" msgstr "Export the bitmap file with these settings" #: ../src/ui/dialog/export.cpp:479 -#, fuzzy msgid "bitmap" -msgstr "Bitmap" +msgstr "bitmap" #: ../src/ui/dialog/export.cpp:614 #, c-format @@ -15713,7 +15337,8 @@ msgstr "Information" #: ../share/extensions/jitternodes.inx.h:12 #: ../share/extensions/layout_nup.inx.h:24 #: ../share/extensions/lindenmayer.inx.h:13 -#: ../share/extensions/lorem_ipsum.inx.h:6 ../share/extensions/measure.inx.h:33 +#: ../share/extensions/lorem_ipsum.inx.h:6 +#: ../share/extensions/measure.inx.h:33 #: ../share/extensions/pathalongpath.inx.h:16 #: ../share/extensions/pathscatter.inx.h:18 #: ../share/extensions/restack.inx.h:25 ../share/extensions/split.inx.h:8 @@ -15900,7 +15525,6 @@ msgstr "" #: ../src/ui/dialog/filter-effects-dialog.cpp:550 #: ../share/extensions/grid_polar.inx.h:4 -#, fuzzy msgctxt "Label" msgid "None" msgstr "None" @@ -16585,13 +16209,12 @@ msgstr "" "lower opacity areas recede away from the viewer." #: ../src/ui/dialog/filter-effects-dialog.cpp:3042 -#, fuzzy msgid "" "The feTile filter primitive tiles a region with an input graphic. The " "source tile is defined by the filter primitive subregion of the input." msgstr "" -"The feImage filter primitive fills the region with an external image " -"or another part of the document." +"The feTile filter primitive tiles a region with an input graphic. The " +"source tile is defined by the filter primitive subregion of the input." #: ../src/ui/dialog/filter-effects-dialog.cpp:3046 msgid "" @@ -17742,13 +17365,12 @@ msgid "_Set spacing:" msgstr "_Set spacing:" #: ../src/ui/dialog/guides.cpp:47 -#, fuzzy msgid "Lo_cked" -msgstr "Locked" +msgstr "Lo_cked" #: ../src/ui/dialog/guides.cpp:47 msgid "Lock the movement of guides" -msgstr "" +msgstr "Lock the movement of guides" #: ../src/ui/dialog/guides.cpp:48 msgid "Rela_tive change" @@ -17864,17 +17486,16 @@ msgstr "" "Size of dots created with Ctrl+click (relative to current stroke width)" #: ../src/ui/dialog/inkscape-preferences.cpp:213 -#, fuzzy msgid "Base simplify:" -msgstr "Simplify:" +msgstr "Base simplify:" #: ../src/ui/dialog/inkscape-preferences.cpp:213 msgid "on dynamic LPE simplify" -msgstr "" +msgstr "on dynamic LPE simplify" #: ../src/ui/dialog/inkscape-preferences.cpp:214 msgid "Base simplify of dynamic LPE based simplify" -msgstr "" +msgstr "Base simplify of dynamic LPE based simplify" #: ../src/ui/dialog/inkscape-preferences.cpp:229 msgid "No objects selected to take the style from." @@ -18023,7 +17644,6 @@ msgid "Per-object selection cue" msgstr "Per-object selection cue" #: ../src/ui/dialog/inkscape-preferences.cpp:350 -#, fuzzy msgctxt "Selection cue" msgid "None" msgstr "None" @@ -18260,7 +17880,7 @@ msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:466 msgid "Show font substitution warning dialog" -msgstr "Show font substitution warning dialog" +msgstr "Show font substitution warning dialogue" #: ../src/ui/dialog/inkscape-preferences.cpp:467 msgid "" @@ -18306,7 +17926,7 @@ msgstr "Text size unit type:" #: ../src/ui/dialog/inkscape-preferences.cpp:476 msgid "Set the type of unit used in the text toolbar and text dialogs" -msgstr "Set the type of unit used in the text toolbar and text dialogs" +msgstr "Set the type of unit used in the text toolbar and text dialogues" #: ../src/ui/dialog/inkscape-preferences.cpp:477 msgid "Always output text size in pixels (px)" @@ -18357,8 +17977,8 @@ msgid "" "When on, the Gradient Edit button in the Fill & Stroke dialog will show the " "legacy Gradient Editor dialog, when off the Gradient Tool will be used" msgstr "" -"When on, the Gradient Edit button in the Fill & Stroke dialog will show the " -"legacy Gradient Editor dialog, when off the Gradient Tool will be used" +"When on, the Gradient Edit button in the Fill & Stroke dialogue will show " +"the legacy Gradient Editor dialog, when off the Gradient Tool will be used" #: ../src/ui/dialog/inkscape-preferences.cpp:509 msgid "Linear gradient _angle:" @@ -18415,9 +18035,8 @@ msgid "Armenian (hy)" msgstr "Armenian (hy)" #: ../src/ui/dialog/inkscape-preferences.cpp:538 -#, fuzzy msgid "Assamese (as)" -msgstr "Japanese (ja)" +msgstr "Assamese (as)" #: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Azerbaijani (az)" @@ -18444,9 +18063,8 @@ msgid "Bengali/Bangladesh (bn_BD)" msgstr "Bengali/Bangladesh (bn_BD)" #: ../src/ui/dialog/inkscape-preferences.cpp:539 -#, fuzzy msgid "Bodo (brx)" -msgstr "Breton (br)" +msgstr "Bodo (brx)" #: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Breton (br)" @@ -18482,7 +18100,7 @@ msgstr "Danish (da)" #: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Dogri (doi)" -msgstr "" +msgstr "Dogri (doi)" #: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Dutch (nl)" @@ -18545,9 +18163,8 @@ msgid "Galician (gl)" msgstr "Galician (gl)" #: ../src/ui/dialog/inkscape-preferences.cpp:545 -#, fuzzy msgid "Gujarati (gu)" -msgstr "Gujarati" +msgstr "Gujarati (gu)" #: ../src/ui/dialog/inkscape-preferences.cpp:546 msgid "Hebrew (he)" @@ -18555,7 +18172,7 @@ msgstr "Hebrew (he)" #: ../src/ui/dialog/inkscape-preferences.cpp:546 msgid "Hindi (hi)" -msgstr "" +msgstr "Hindi (hi)" #: ../src/ui/dialog/inkscape-preferences.cpp:546 msgid "Hungarian (hu)" @@ -18563,7 +18180,7 @@ msgstr "Hungarian (hu)" #: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Icelandic (is)" -msgstr "" +msgstr "Icelandic (is)" #: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Indonesian (id)" @@ -18582,17 +18199,16 @@ msgid "Japanese (ja)" msgstr "Japanese (ja)" #: ../src/ui/dialog/inkscape-preferences.cpp:549 -#, fuzzy msgid "Kannada (kn)" -msgstr "Kannada" +msgstr "Kannada (kn)" #: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Kashmiri in Peso-Arabic script (ks@aran)" -msgstr "" +msgstr "Kashmiri in Peso-Arabic script (ks@aran)" #: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Kashmiri in Devanagari script (ks@deva)" -msgstr "" +msgstr "Kashmiri in Devanagari script (ks@deva)" #: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Khmer (km)" @@ -18603,14 +18219,12 @@ msgid "Kinyarwanda (rw)" msgstr "Kinyarwanda (rw)" #: ../src/ui/dialog/inkscape-preferences.cpp:549 -#, fuzzy msgid "Konkani (kok)" -msgstr "Korean (ko)" +msgstr "Konkani (kok)" #: ../src/ui/dialog/inkscape-preferences.cpp:549 -#, fuzzy msgid "Konkani in Latin script (kok@latin)" -msgstr "Serbian in Latin script (sr@latin)" +msgstr "Konkani in Latin script (kok@latin)" #: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Korean (ko)" @@ -18630,24 +18244,23 @@ msgstr "Macedonian (mk)" #: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Maithili (mai)" -msgstr "" +msgstr "Maithili (mai)" #: ../src/ui/dialog/inkscape-preferences.cpp:551 -#, fuzzy msgid "Malayalam (ml)" -msgstr "Malayalam" +msgstr "Malayalam (ml)" #: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Manipuri (mni)" -msgstr "" +msgstr "Manipuri (mni)" #: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Manipuri in Bengali script (mni@beng)" -msgstr "" +msgstr "Manipuri in Bengali script (mni@beng)" #: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Marathi (mr)" -msgstr "" +msgstr "Marathi (mr)" #: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Mongolian (mn)" @@ -18667,7 +18280,7 @@ msgstr "Norwegian Nynorsk (nn)" #: ../src/ui/dialog/inkscape-preferences.cpp:553 msgid "Odia (or)" -msgstr "" +msgstr "Odia (or)" #: ../src/ui/dialog/inkscape-preferences.cpp:554 msgid "Panjabi (pa)" @@ -18695,17 +18308,15 @@ msgstr "Russian (ru)" #: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Sanskrit (sa)" -msgstr "" +msgstr "Sanskrit (sa)" #: ../src/ui/dialog/inkscape-preferences.cpp:556 -#, fuzzy msgid "Santali (sat)" -msgstr "Italian (it)" +msgstr "Santali (sat)" #: ../src/ui/dialog/inkscape-preferences.cpp:556 -#, fuzzy msgid "Santali in Devanagari script (sat@deva)" -msgstr "Serbian in Latin script (sr@latin)" +msgstr "Santali in Devanagari script (sat@deva)" #: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Serbian (sr)" @@ -18717,12 +18328,11 @@ msgstr "Serbian in Latin script (sr@latin)" #: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Sindhi (sd)" -msgstr "" +msgstr "Sindhi (sd)" #: ../src/ui/dialog/inkscape-preferences.cpp:557 -#, fuzzy msgid "Sindhi in Devanagari script (sd@deva)" -msgstr "Serbian in Latin script (sr@latin)" +msgstr "Sindhi in Devanagari script (sd@deva)" #: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Slovak (sk)" @@ -18745,14 +18355,12 @@ msgid "Swedish (sv)" msgstr "Swedish (sv)" #: ../src/ui/dialog/inkscape-preferences.cpp:558 -#, fuzzy msgid "Tamil (ta)" -msgstr "Tamil" +msgstr "Tamil (ta)" #: ../src/ui/dialog/inkscape-preferences.cpp:558 -#, fuzzy msgid "Telugu (te)" -msgstr "Telugu (te_IN)" +msgstr "Telugu (te)" #: ../src/ui/dialog/inkscape-preferences.cpp:558 msgid "Thai (th)" @@ -18768,7 +18376,7 @@ msgstr "Ukrainian (uk)" #: ../src/ui/dialog/inkscape-preferences.cpp:559 msgid "Urdu (ur)" -msgstr "" +msgstr "Urdu (ur)" #: ../src/ui/dialog/inkscape-preferences.cpp:560 msgid "Vietnamese (vi)" @@ -18783,25 +18391,21 @@ msgid "Set the language for menus and number formats" msgstr "Set the language for menus and number formats" #: ../src/ui/dialog/inkscape-preferences.cpp:616 -#, fuzzy msgctxt "Icon size" msgid "Larger" -msgstr "Large" +msgstr "Larger" #: ../src/ui/dialog/inkscape-preferences.cpp:616 -#, fuzzy msgctxt "Icon size" msgid "Large" msgstr "Large" #: ../src/ui/dialog/inkscape-preferences.cpp:616 -#, fuzzy msgctxt "Icon size" msgid "Small" msgstr "Small" #: ../src/ui/dialog/inkscape-preferences.cpp:616 -#, fuzzy msgctxt "Icon size" msgid "Smaller" msgstr "Smaller" @@ -18990,7 +18594,6 @@ msgid "Show close button on dialogs" msgstr "Show close button on dialogues" #: ../src/ui/dialog/inkscape-preferences.cpp:697 -#, fuzzy msgctxt "Dialog on top" msgid "None" msgstr "None" @@ -19000,19 +18603,16 @@ msgid "Aggressive" msgstr "Aggressive" #: ../src/ui/dialog/inkscape-preferences.cpp:702 -#, fuzzy msgctxt "Window size" msgid "Small" msgstr "Small" #: ../src/ui/dialog/inkscape-preferences.cpp:702 -#, fuzzy msgctxt "Window size" msgid "Large" msgstr "Large" #: ../src/ui/dialog/inkscape-preferences.cpp:702 -#, fuzzy msgctxt "Window size" msgid "Maximized" msgstr "Maximised" @@ -19051,7 +18651,7 @@ msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:718 msgid "Saving dialogs status" -msgstr "Saving dialogs status" +msgstr "Saving dialogues status" #: ../src/ui/dialog/inkscape-preferences.cpp:722 msgid "" @@ -19063,7 +18663,7 @@ msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:726 msgid "Dialog behavior (requires restart)" -msgstr "Dialog behavior (requires restart)" +msgstr "Dialogue behavior (requires restart)" #: ../src/ui/dialog/inkscape-preferences.cpp:732 msgid "Desktop integration" @@ -19095,7 +18695,7 @@ msgstr "Same as Normal but may work better with some window managers" #: ../src/ui/dialog/inkscape-preferences.cpp:750 msgid "Dialog Transparency" -msgstr "Dialog Transparency" +msgstr "Dialogue Transparency" #: ../src/ui/dialog/inkscape-preferences.cpp:752 msgid "_Opacity when focused:" @@ -19231,16 +18831,16 @@ msgid "Use current directory for \"Save As ...\"" msgstr "Use current directory for \"Save As ...\"" #: ../src/ui/dialog/inkscape-preferences.cpp:893 -#, fuzzy msgid "" "When this option is on, the \"Save as...\" and \"Save a Copy...\" dialogs " "will always open in the directory where the currently open document is; when " "it's off, each will open in the directory where you last saved a file using " "it" msgstr "" -"When this option is on, the \"Save as...\" and \"Save a Copy\" dialogs will " -"always open in the directory where the currently open document is; when it's " -"off, each will open in the directory where you last saved a file using it" +"When this option is on, the \"Save as...\" and \"Save a Copy\" dialogues " +"will always open in the directory where the currently open document is; when " +"it's off, each will open in the directory where you last saved a file using " +"it" #: ../src/ui/dialog/inkscape-preferences.cpp:895 msgid "Add label comments to printing output" @@ -19670,7 +19270,7 @@ msgstr "Preserve K channel in CMYK -> CMYK transforms" #: ../src/ui/dialog/inkscape-preferences.cpp:1091 #: ../src/ui/widget/color-icc-selector.cpp:394 -#: ../src/ui/widget/color-icc-selector.cpp:685 +#: ../src/ui/widget/color-icc-selector.cpp:699 msgid "" msgstr "" @@ -20014,13 +19614,12 @@ msgstr "" "autoscroll; positive is outside the canvas, negative is within the canvas" #: ../src/ui/dialog/inkscape-preferences.cpp:1266 -#, fuzzy msgid "Mouse move pans when Space is pressed" -msgstr "Left mouse button pans when Space is pressed" +msgstr "Mouse move pans when Space is pressed" #: ../src/ui/dialog/inkscape-preferences.cpp:1268 msgid "When on, pressing and holding Space and dragging pans canvas" -msgstr "" +msgstr "When on, pressing and holding Space and dragging pans canvas" #: ../src/ui/dialog/inkscape-preferences.cpp:1269 msgid "Mouse wheel zooms by default" @@ -20040,9 +19639,8 @@ msgstr "Scrolling" #. Snapping options #: ../src/ui/dialog/inkscape-preferences.cpp:1275 -#, fuzzy msgid "Snap indicator" -msgstr "Enable snap indicator" +msgstr "Snap indicator" #: ../src/ui/dialog/inkscape-preferences.cpp:1277 msgid "Enable snap indicator" @@ -20054,17 +19652,19 @@ msgstr "After snapping, a symbol is drawn at the point that has snapped" #: ../src/ui/dialog/inkscape-preferences.cpp:1284 msgid "Snap indicator persistence (in seconds):" -msgstr "" +msgstr "Snap indicator persistence (in seconds):" #: ../src/ui/dialog/inkscape-preferences.cpp:1285 msgid "" "Controls how long the snap indicator message will be shown, before it " "disappears" msgstr "" +"Controls how long the snap indicator message will be shown, before it " +"disappears" #: ../src/ui/dialog/inkscape-preferences.cpp:1287 msgid "What should snap" -msgstr "" +msgstr "What should snap" #: ../src/ui/dialog/inkscape-preferences.cpp:1289 msgid "Only snap the node closest to the pointer" @@ -20105,14 +19705,12 @@ msgstr "" "constraint line" #: ../src/ui/dialog/inkscape-preferences.cpp:1301 -#, fuzzy msgid "Delayed snap" -msgstr "Always snap" +msgstr "Delayed snap" #: ../src/ui/dialog/inkscape-preferences.cpp:1304 -#, fuzzy msgid "Delay (in seconds):" -msgstr "Delay (milliseconds):" +msgstr "Delay (in seconds):" #: ../src/ui/dialog/inkscape-preferences.cpp:1305 msgid "" @@ -20171,7 +19769,6 @@ msgstr "" "counterclockwise" #: ../src/ui/dialog/inkscape-preferences.cpp:1325 -#, fuzzy msgctxt "Rotation angle" msgid "None" msgstr "None" @@ -20552,7 +20149,7 @@ msgstr "Ask about linking and scaling when importing" #: ../src/ui/dialog/inkscape-preferences.cpp:1508 msgid "Pop-up linking and scaling dialog when importing bitmap image." -msgstr "Pop-up linking and scaling dialog when importing bitmap image." +msgstr "Pop-up linking and scaling dialogue when importing bitmap image." #: ../src/ui/dialog/inkscape-preferences.cpp:1514 msgid "Bitmap link:" @@ -20596,7 +20193,6 @@ msgid "Bitmaps" msgstr "Bitmaps" #: ../src/ui/dialog/inkscape-preferences.cpp:1549 -#, fuzzy msgid "" "Select a file of predefined shortcuts to use. Any customized shortcuts you " "create will be added separately to " @@ -20656,7 +20252,6 @@ msgid "Misc" msgstr "Misc" #: ../src/ui/dialog/inkscape-preferences.cpp:1905 -#, fuzzy msgctxt "Spellchecker language" msgid "None" msgstr "None" @@ -20907,30 +20502,27 @@ msgstr "X tilt" msgid "Y tilt" msgstr "Y tilt" -#: ../src/ui/dialog/input.cpp:1616 ../src/ui/widget/color-wheel-selector.cpp:29 +#: ../src/ui/dialog/input.cpp:1616 +#: ../src/ui/widget/color-wheel-selector.cpp:29 msgid "Wheel" msgstr "Wheel" #: ../src/ui/dialog/input.cpp:1625 -#, fuzzy msgctxt "Input device axe" msgid "None" msgstr "None" #: ../src/ui/dialog/knot-properties.cpp:59 -#, fuzzy msgid "Position X:" -msgstr "Position:" +msgstr "Position X:" #: ../src/ui/dialog/knot-properties.cpp:66 -#, fuzzy msgid "Position Y:" -msgstr "Position:" +msgstr "Position Y:" #: ../src/ui/dialog/knot-properties.cpp:120 -#, fuzzy msgid "Modify Knot Position" -msgstr "Light x-Position" +msgstr "Modify Knot Position" #: ../src/ui/dialog/knot-properties.cpp:121 #: ../src/ui/dialog/layer-properties.cpp:411 @@ -20940,14 +20532,14 @@ msgid "_Move" msgstr "_Move" #: ../src/ui/dialog/knot-properties.cpp:180 -#, fuzzy, c-format +#, c-format msgid "Position X (%s):" -msgstr "Position:" +msgstr "Position X (%s):" #: ../src/ui/dialog/knot-properties.cpp:181 -#, fuzzy, c-format +#, c-format msgid "Position Y (%s):" -msgstr "Position:" +msgstr "Position Y (%s):" #: ../src/ui/dialog/layer-properties.cpp:55 msgid "Layer name:" @@ -21036,9 +20628,8 @@ msgid "Lock other layers" msgstr "Lock other layers" #: ../src/ui/dialog/layers.cpp:730 -#, fuzzy msgid "Move layer" -msgstr "Moved layer" +msgstr "Move layer" #: ../src/ui/dialog/layers.cpp:892 msgctxt "Layers" @@ -21140,51 +20731,44 @@ msgid "Deactivate path effect" msgstr "Deactivate path effect" #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:53 -#, fuzzy msgid "Radius (pixels):" -msgstr "Radius (px):" +msgstr "Radius (pixels):" #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:65 -#, fuzzy msgid "Chamfer subdivisions:" -msgstr "Subdivisions:" +msgstr "Chamfer subdivisions:" #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:136 msgid "Modify Fillet-Chamfer" -msgstr "" +msgstr "Modify Fillet-Chamfer" #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:137 -#, fuzzy msgid "_Modify" -msgstr "Modify Path" +msgstr "_Modify" #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:201 msgid "Radius" msgstr "Radius" #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:203 -#, fuzzy msgid "Radius approximated" -msgstr "(approximately round)" +msgstr "Radius approximated" #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:206 -#, fuzzy msgid "Knot distance" -msgstr "Snap _distance" +msgstr "Knot distance" #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:213 -#, fuzzy msgid "Position (%):" -msgstr "Position:" +msgstr "Position (%):" #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:216 -#, fuzzy msgid "%1:" -msgstr "k1:" +msgstr "%1:" #: ../src/ui/dialog/lpe-powerstroke-properties.cpp:122 msgid "Modify Node Position" -msgstr "" +msgstr "Modify Node Position" #: ../src/ui/dialog/memory.cpp:96 msgid "Heap" @@ -21383,9 +20967,8 @@ msgid "Set object description" msgstr "Set object description" #: ../src/ui/dialog/object-properties.cpp:535 -#, fuzzy msgid "Set image rendering option" -msgstr "Device rendering intent:" +msgstr "Set image rendering option" #: ../src/ui/dialog/object-properties.cpp:554 msgid "Lock object" @@ -21404,73 +20987,60 @@ msgid "Unhide object" msgstr "Unhide object" #: ../src/ui/dialog/objects.cpp:874 -#, fuzzy msgid "Unhide objects" -msgstr "Unhide object" +msgstr "Unhide objects" #: ../src/ui/dialog/objects.cpp:874 -#, fuzzy msgid "Hide objects" -msgstr "Hide object" +msgstr "Hide objects" #: ../src/ui/dialog/objects.cpp:894 -#, fuzzy msgid "Lock objects" -msgstr "Lock object" +msgstr "Lock objects" #: ../src/ui/dialog/objects.cpp:894 -#, fuzzy msgid "Unlock objects" -msgstr "Unlock object" +msgstr "Unlock objects" #: ../src/ui/dialog/objects.cpp:906 -#, fuzzy msgid "Layer to group" -msgstr "Layer to top" +msgstr "Layer to group" #: ../src/ui/dialog/objects.cpp:906 -#, fuzzy msgid "Group to layer" -msgstr "Group to symbol" +msgstr "Group to layer" #: ../src/ui/dialog/objects.cpp:1104 -#, fuzzy msgid "Moved objects" -msgstr "No objects" +msgstr "Moved objects" #: ../src/ui/dialog/objects.cpp:1353 ../src/ui/dialog/tags.cpp:853 #: ../src/ui/dialog/tags.cpp:860 -#, fuzzy msgid "Rename object" -msgstr "Rotate objects" +msgstr "Rename object" #: ../src/ui/dialog/objects.cpp:1459 -#, fuzzy msgid "Set object highlight color" -msgstr "Set object title" +msgstr "Set object highlight colour" #: ../src/ui/dialog/objects.cpp:1469 -#, fuzzy msgid "Set object opacity" -msgstr "Set object title" +msgstr "Set object opacity" #: ../src/ui/dialog/objects.cpp:1502 -#, fuzzy msgid "Set object blend mode" -msgstr "Set object label" +msgstr "Set object blend mode" #: ../src/ui/dialog/objects.cpp:1558 -#, fuzzy msgid "Set object blur" -msgstr "Set object label" +msgstr "Set object blur" #: ../src/ui/dialog/objects.cpp:1621 msgctxt "Visibility" msgid "V" -msgstr "" +msgstr "V" #: ../src/ui/dialog/objects.cpp:1622 -#, fuzzy msgctxt "Lock" msgid "L" msgstr "L" @@ -21478,19 +21048,17 @@ msgstr "L" #: ../src/ui/dialog/objects.cpp:1623 msgctxt "Type" msgid "T" -msgstr "" +msgstr "T" #: ../src/ui/dialog/objects.cpp:1624 -#, fuzzy msgctxt "Clip and mask" msgid "CM" -msgstr "CMS" +msgstr "CM" #: ../src/ui/dialog/objects.cpp:1625 -#, fuzzy msgctxt "Highlight" msgid "HL" -msgstr "HSL" +msgstr "HL" #: ../src/ui/dialog/objects.cpp:1626 msgid "Label" @@ -21498,89 +21066,84 @@ msgstr "Label" #. In order to get tooltips on header, we must create our own label. #: ../src/ui/dialog/objects.cpp:1668 -#, fuzzy msgid "Toggle visibility of Layer, Group, or Object." -msgstr "Toggle visibility of current layer" +msgstr "Toggle visibility of Layer, Group, or Object." #: ../src/ui/dialog/objects.cpp:1681 msgid "Toggle lock of Layer, Group, or Object." -msgstr "" +msgstr "Toggle lock of Layer, Group, or Object." #: ../src/ui/dialog/objects.cpp:1693 msgid "" "Type: Layer, Group, or Object. Clicking on Layer or Group icon, toggles " "between the two types." msgstr "" +"Type: Layer, Group, or Object. Clicking on Layer or Group icon, toggles " +"between the two types." #: ../src/ui/dialog/objects.cpp:1712 msgid "Is object clipped and/or masked?" -msgstr "" +msgstr "Is object clipped and/or masked?" #: ../src/ui/dialog/objects.cpp:1723 msgid "" "Highlight color of outline in Node tool. Click to set. If alpha is zero, use " "inherited color." msgstr "" +"Highlight colour of outline in Node tool. Click to set. If alpha is zero, " +"use inherited colour." #: ../src/ui/dialog/objects.cpp:1734 msgid "" "Layer/Group/Object label (inkscape:label). Double-click to set. Default " "value is object 'id'." msgstr "" +"Layer/Group/Object label (inkscape:label). Double-click to set. Default " +"value is object 'id'." #: ../src/ui/dialog/objects.cpp:1831 -#, fuzzy msgid "Add layer..." -msgstr "_Add Layer..." +msgstr "Add layer..." #: ../src/ui/dialog/objects.cpp:1838 -#, fuzzy msgid "Remove object" -msgstr "Remove font" +msgstr "Remove object" #: ../src/ui/dialog/objects.cpp:1846 -#, fuzzy msgid "Move To Bottom" -msgstr "Lower to _Bottom" +msgstr "Move To Bottom" #: ../src/ui/dialog/objects.cpp:1870 -#, fuzzy msgid "Move To Top" -msgstr "Move to:" +msgstr "Move To Top" #: ../src/ui/dialog/objects.cpp:1878 -#, fuzzy msgid "Collapse All" -msgstr "Clea_r All" +msgstr "Collapse All" #: ../src/ui/dialog/objects.cpp:1892 -#, fuzzy msgid "Rename" -msgstr "_Rename" +msgstr "Rename" #: ../src/ui/dialog/objects.cpp:1898 msgid "Solo" -msgstr "" +msgstr "Solo" #: ../src/ui/dialog/objects.cpp:1899 -#, fuzzy msgid "Show All" -msgstr "Show:" +msgstr "Show All" #: ../src/ui/dialog/objects.cpp:1900 -#, fuzzy msgid "Hide All" -msgstr "Unhide All" +msgstr "Hide All" #: ../src/ui/dialog/objects.cpp:1904 -#, fuzzy msgid "Lock Others" -msgstr "Lock other layers" +msgstr "Lock Others" #: ../src/ui/dialog/objects.cpp:1905 -#, fuzzy msgid "Lock All" -msgstr "Unlock All" +msgstr "Lock All" #. LockAndHide #: ../src/ui/dialog/objects.cpp:1906 ../src/verbs.cpp:3011 @@ -21588,26 +21151,22 @@ msgid "Unlock All" msgstr "Unlock All" #: ../src/ui/dialog/objects.cpp:1910 -#, fuzzy msgid "Up" msgstr "Up" #: ../src/ui/dialog/objects.cpp:1911 -#, fuzzy msgid "Down" -msgstr "Downwards" +msgstr "Down" #: ../src/ui/dialog/objects.cpp:1920 -#, fuzzy msgid "Set Clip" -msgstr "Set Cl_ip" +msgstr "Set Clip" #. will never be implemented #. _watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_OBJECT_SET_INVERSE_CLIPPATH, 0, "Set Inverse Clip", (int)BUTTON_SETINVCLIP ) ); #: ../src/ui/dialog/objects.cpp:1926 -#, fuzzy msgid "Unset Clip" -msgstr "Set Cl_ip" +msgstr "Unset Clip" #. Set mask #: ../src/ui/dialog/objects.cpp:1930 ../src/ui/interface.cpp:1754 @@ -21615,14 +21174,12 @@ msgid "Set Mask" msgstr "Set Mask" #: ../src/ui/dialog/objects.cpp:1931 -#, fuzzy msgid "Unset Mask" -msgstr "Set Mask" +msgstr "Unset Mask" #: ../src/ui/dialog/objects.cpp:1953 -#, fuzzy msgid "Select Highlight Color" -msgstr "_Highlight colour:" +msgstr "Select Highlight Colour" #: ../src/ui/dialog/ocaldialogs.cpp:715 msgid "Clipart found" @@ -21752,15 +21309,18 @@ msgstr "The Kopf-Lischinski algorithm" msgid "Output" msgstr "Output" -#: ../src/ui/dialog/pixelartdialog.cpp:297 ../src/ui/dialog/tracedialog.cpp:814 +#: ../src/ui/dialog/pixelartdialog.cpp:297 +#: ../src/ui/dialog/tracedialog.cpp:814 msgid "Reset all settings to defaults" msgstr "Reset all settings to defaults" -#: ../src/ui/dialog/pixelartdialog.cpp:302 ../src/ui/dialog/tracedialog.cpp:819 +#: ../src/ui/dialog/pixelartdialog.cpp:302 +#: ../src/ui/dialog/tracedialog.cpp:819 msgid "Abort a trace in progress" msgstr "Abort a trace in progress" -#: ../src/ui/dialog/pixelartdialog.cpp:306 ../src/ui/dialog/tracedialog.cpp:823 +#: ../src/ui/dialog/pixelartdialog.cpp:306 +#: ../src/ui/dialog/tracedialog.cpp:823 msgid "Execute the trace" msgstr "Execute the trace" @@ -21782,40 +21342,34 @@ msgid "Trace pixel art" msgstr "Trace pixel art" #: ../src/ui/dialog/polar-arrange-tab.cpp:41 -#, fuzzy msgctxt "Polar arrange tab" msgid "Y coordinate of the center" -msgstr "Y coordinate of selected node(s)" +msgstr "Y coordinate of the centre" #: ../src/ui/dialog/polar-arrange-tab.cpp:42 -#, fuzzy msgctxt "Polar arrange tab" msgid "X coordinate of the center" -msgstr "X coordinate of selected node(s)" +msgstr "X coordinate of the centre" #: ../src/ui/dialog/polar-arrange-tab.cpp:43 -#, fuzzy msgctxt "Polar arrange tab" msgid "Y coordinate of the radius" -msgstr "Y coordinate of selected node(s)" +msgstr "Y coordinate of the radius" #: ../src/ui/dialog/polar-arrange-tab.cpp:44 -#, fuzzy msgctxt "Polar arrange tab" msgid "X coordinate of the radius" -msgstr "X coordinate of selected node(s)" +msgstr "X coordinate of the radius" #: ../src/ui/dialog/polar-arrange-tab.cpp:45 -#, fuzzy msgctxt "Polar arrange tab" msgid "Starting angle" -msgstr "Rotation angle" +msgstr "Starting angle" #: ../src/ui/dialog/polar-arrange-tab.cpp:46 -#, fuzzy msgctxt "Polar arrange tab" msgid "End angle" -msgstr "Cone angle" +msgstr "End angle" #: ../src/ui/dialog/polar-arrange-tab.cpp:48 msgctxt "Polar arrange tab" @@ -21853,13 +21407,11 @@ msgid "Parameterized:" msgstr "Parameterised:" #: ../src/ui/dialog/polar-arrange-tab.cpp:83 -#, fuzzy msgctxt "Polar arrange tab" msgid "Center X/Y:" msgstr "Centre X/Y:" #: ../src/ui/dialog/polar-arrange-tab.cpp:105 -#, fuzzy msgctxt "Polar arrange tab" msgid "Radius X/Y:" msgstr "Radius X/Y:" @@ -22139,7 +21691,8 @@ msgid "Preview Text:" msgstr "Preview Text:" #: ../src/ui/dialog/swatches.cpp:202 ../src/ui/tools/gradient-tool.cpp:360 -#: ../src/ui/tools/gradient-tool.cpp:458 ../src/widgets/gradient-vector.cpp:801 +#: ../src/ui/tools/gradient-tool.cpp:458 +#: ../src/widgets/gradient-vector.cpp:801 msgid "Add gradient stop" msgstr "Add gradient stop" @@ -22210,33 +21763,28 @@ msgstr "Unnamed Symbols" #: ../src/ui/dialog/tags.cpp:270 ../src/ui/dialog/tags.cpp:569 #: ../src/ui/dialog/tags.cpp:683 ../src/ui/dialog/tags.cpp:946 -#, fuzzy msgid "Remove from selection set" -msgstr "Remove mask from selection" +msgstr "Remove from selection set" #: ../src/ui/dialog/tags.cpp:427 msgid "Items" -msgstr "" +msgstr "Items" #: ../src/ui/dialog/tags.cpp:666 ../src/ui/dialog/tags.cpp:944 -#, fuzzy msgid "Add selection to set" -msgstr "Raise selection to top" +msgstr "Add selection to set" #: ../src/ui/dialog/tags.cpp:824 -#, fuzzy msgid "Moved sets" -msgstr "Movements" +msgstr "Moved sets" #: ../src/ui/dialog/tags.cpp:1004 -#, fuzzy msgid "Add a new selection set" -msgstr "Add a new connection point" +msgstr "Add a new selection set" #: ../src/ui/dialog/tags.cpp:1013 -#, fuzzy msgid "Remove Item/Set" -msgstr "Remove effects" +msgstr "Remove Item/Set" #: ../src/ui/dialog/template-widget.cpp:37 msgid "More info" @@ -22263,16 +21811,14 @@ msgid "By: " msgstr "By: " #: ../src/ui/dialog/text-edit.cpp:72 -#, fuzzy msgid "_Variants" -msgstr "Variation" +msgstr "_Variants" #: ../src/ui/dialog/text-edit.cpp:73 msgid "Set as _default" msgstr "Set as _default" #: ../src/ui/dialog/text-edit.cpp:87 -#, fuzzy msgid "AaBbCcIiPpQq12369$€¢?.;/()" msgstr "AaBbCcIiPpQq12369$€¢?.;/()" @@ -22306,9 +21852,8 @@ msgid "Vertical text" msgstr "Vertical text" #: ../src/ui/dialog/text-edit.cpp:130 ../src/ui/dialog/text-edit.cpp:131 -#, fuzzy msgid "Spacing between baselines (percent of font size)" -msgstr "Spacing between lines (percent of font size)" +msgstr "Spacing between baselines (percent of font size)" #: ../src/ui/dialog/text-edit.cpp:147 msgid "Text path offset" @@ -22948,9 +22493,8 @@ msgstr "Enter group #%1" #. Pop selection out of group #: ../src/ui/interface.cpp:1528 -#, fuzzy msgid "_Pop selection out of group" -msgstr "_Treat selection as group: " +msgstr "_Pop selection out of group" #. Item dialog #: ../src/ui/interface.cpp:1656 ../src/verbs.cpp:2940 @@ -23007,9 +22551,8 @@ msgstr "Release Mask" #. SSet Clip Group #: ../src/ui/interface.cpp:1776 -#, fuzzy msgid "Create Clip G_roup" -msgstr "Create Clo_ne" +msgstr "Create Clip G_roup" #. Set Clip #: ../src/ui/interface.cpp:1783 @@ -23223,10 +22766,9 @@ msgid "Drag curve" msgstr "Drag curve" #: ../src/ui/tool/curve-drag-point.cpp:192 -#, fuzzy msgctxt "Path segment tip" msgid "Shift: drag to open or move BSpline handles" -msgstr "Shift: drag to add nodes to the selection" +msgstr "Shift: drag to open or move BSpline handles" #: ../src/ui/tool/curve-drag-point.cpp:196 msgctxt "Path segment tip" @@ -23239,13 +22781,12 @@ msgid "Ctrl+Alt: click to insert a node" msgstr "Ctrl+Alt: click to insert a node" #: ../src/ui/tool/curve-drag-point.cpp:204 -#, fuzzy msgctxt "Path segment tip" msgid "" "BSpline segment: drag to shape the segment, doubleclick to insert " "node, click to select (more: Shift, Ctrl+Alt)" msgstr "" -"Bezier segment: drag to shape the segment, doubleclick to insert " +"BSpline segment: drag to shape the segment, doubleclick to insert " "node, click to select (more: Shift, Ctrl+Alt)" #: ../src/ui/tool/curve-drag-point.cpp:209 @@ -23376,10 +22917,9 @@ msgid "more: Shift, Ctrl, Alt" msgstr "more: Shift, Ctrl, Alt" #: ../src/ui/tool/node.cpp:496 -#, fuzzy msgctxt "Path handle tip" msgid "more: Ctrl" -msgstr "more: Ctrl, Alt" +msgstr "more: Ctrl" #: ../src/ui/tool/node.cpp:498 msgctxt "Path handle tip" @@ -23427,7 +22967,7 @@ msgstr "" #: ../src/ui/tool/node.cpp:529 msgctxt "Path handle tip" msgid "Ctrl: Snap handle to steps defined in BSpline Live Path Effect" -msgstr "" +msgstr "Ctrl: Snap handle to steps defined in BSpline Live Path Effect" #: ../src/ui/tool/node.cpp:532 #, c-format @@ -23441,10 +22981,9 @@ msgid "Shift: rotate both handles by the same angle" msgstr "Shift: rotate both handles by the same angle" #: ../src/ui/tool/node.cpp:540 -#, fuzzy msgctxt "Path hande tip" msgid "Shift: move handle" -msgstr "Shift node handles" +msgstr "Shift: move handle" #: ../src/ui/tool/node.cpp:547 ../src/ui/tool/node.cpp:551 #, c-format @@ -23459,6 +22998,8 @@ msgid "" "BSpline node handle: Shift to drag, double click to reset (%s). %g " "power" msgstr "" +"BSpline node handle: Shift to drag, double click to reset (%s). %g " +"power" #: ../src/ui/tool/node.cpp:574 #, c-format @@ -23498,12 +23039,14 @@ msgid "%s: drag to shape the path (more: Shift, Ctrl, Alt)" msgstr "%s: drag to shape the path (more: Shift, Ctrl, Alt)" #: ../src/ui/tool/node.cpp:1451 -#, fuzzy, c-format +#, c-format msgctxt "Path node tip" msgid "" "BSpline node: drag to shape the path (more: Shift, Ctrl, Alt). %g " "power" -msgstr "%s: drag to shape the path (more: Shift, Ctrl, Alt)" +msgstr "" +"BSpline node: drag to shape the path (more: Shift, Ctrl, Alt). %g " +"power" #: ../src/ui/tool/node.cpp:1454 #, c-format @@ -23526,14 +23069,14 @@ msgstr "" "Shift, Ctrl, Alt)" #: ../src/ui/tool/node.cpp:1461 -#, fuzzy, c-format +#, c-format msgctxt "Path node tip" msgid "" "BSpline node: drag to shape the path, click to select only this node " "(more: Shift, Ctrl, Alt). %g power" msgstr "" -"%s: drag to shape the path, click to select only this node (more: " -"Shift, Ctrl, Alt)" +"BSpline node: drag to shape the path, click to select only this node " +"(more: Shift, Ctrl, Alt). %g power" #: ../src/ui/tool/node.cpp:1474 #, c-format @@ -23562,7 +23105,8 @@ msgid "Rotate handle" msgstr "Rotate handle" #. We need to call MPM's method because it could have been our last node -#: ../src/ui/tool/path-manipulator.cpp:1555 ../src/widgets/node-toolbar.cpp:397 +#: ../src/ui/tool/path-manipulator.cpp:1555 +#: ../src/widgets/node-toolbar.cpp:397 msgid "Delete node" msgstr "Delete node" @@ -24185,11 +23729,11 @@ msgstr "Choose a construction tool from the toolbar." #. create the knots #: ../src/ui/tools/measure-tool.cpp:349 msgid "Measure start, Shift+Click for position dialog" -msgstr "" +msgstr "Measure start, Shift+Click for position dialog" #: ../src/ui/tools/measure-tool.cpp:355 msgid "Measure end, Shift+Click for position dialog" -msgstr "" +msgstr "Measure end, Shift+Click for position dialog" #: ../src/ui/tools/measure-tool.cpp:747 ../share/extensions/measure.inx.h:2 msgid "Measure" @@ -24197,29 +23741,28 @@ msgstr "Measure" #: ../src/ui/tools/measure-tool.cpp:752 msgid "Base" -msgstr "" +msgstr "Base" #: ../src/ui/tools/measure-tool.cpp:761 msgid "Add guides from measure tool" -msgstr "" +msgstr "Add guides from measure tool" #: ../src/ui/tools/measure-tool.cpp:781 -msgid "Add Stored to measure tool" -msgstr "" +msgid "Keep last measure on the canvas, for reference" +msgstr "Keep last measure on the canvas, for reference" #: ../src/ui/tools/measure-tool.cpp:801 -#, fuzzy msgid "Convert measure to items" -msgstr "Convert stroke to path" +msgstr "Convert measure to items" #: ../src/ui/tools/measure-tool.cpp:839 msgid "Add global measure line" -msgstr "" +msgstr "Add global measure line" #: ../src/ui/tools/measure-tool.cpp:1290 ../src/ui/tools/measure-tool.cpp:1292 -#, fuzzy, c-format +#, c-format msgid "Crossing %lu" -msgstr "Cross Blur" +msgstr "Crossing %lu" #. TRANSLATORS: Mind the space in front. This is part of a compound message #: ../src/ui/tools/mesh-tool.cpp:122 ../src/ui/tools/mesh-tool.cpp:133 @@ -24281,9 +23824,8 @@ msgid "FIXMEShift: draw mesh around the starting point" msgstr "FIXMEShift: draw mesh around the starting point" #: ../src/ui/tools/mesh-tool.cpp:971 -#, fuzzy msgid "Create mesh" -msgstr "Create default mesh" +msgstr "Create mesh" #: ../src/ui/tools/node-tool.cpp:648 msgctxt "Node tool tip" @@ -24360,11 +23902,12 @@ msgid "Click or click and drag to close and finish the path." msgstr "Click or click and drag to close and finish the path." #: ../src/ui/tools/pen-tool.cpp:642 -#, fuzzy msgid "" "Click or click and drag to close and finish the path. Shift" "+Click make a cusp node" -msgstr "Click or click and drag to close and finish the path." +msgstr "" +"Click or click and drag to close and finish the path. Shift" +"+Click make a cusp node" #: ../src/ui/tools/pen-tool.cpp:654 msgid "" @@ -24373,48 +23916,48 @@ msgstr "" "Click or click and drag to continue the path from this point." #: ../src/ui/tools/pen-tool.cpp:656 -#, fuzzy msgid "" "Click or click and drag to continue the path from this point. " "Shift+Click make a cusp node" msgstr "" -"Click or click and drag to continue the path from this point." +"Click or click and drag to continue the path from this point. " +"Shift+Click make a cusp node" #: ../src/ui/tools/pen-tool.cpp:1797 -#, fuzzy, c-format +#, c-format msgid "" "Curve segment: angle %3.2f°, distance %s; with Ctrl to " "snap angle, Enter or Shift+Enter to finish the path" msgstr "" "Curve segment: angle %3.2f°, distance %s; with Ctrl to " -"snap angle, Enter to finish the path" +"snap angle, Enter or Shift+Enter to finish the path" #: ../src/ui/tools/pen-tool.cpp:1798 -#, fuzzy, c-format +#, c-format msgid "" "Line segment: angle %3.2f°, distance %s; with Ctrl to " "snap angle, Enter or Shift+Enter to finish the path" msgstr "" "Line segment: angle %3.2f°, distance %s; with Ctrl to " -"snap angle, Enter to finish the path" +"snap angle, Enter or Shift+Enter to finish the path" #: ../src/ui/tools/pen-tool.cpp:1801 -#, fuzzy, c-format +#, c-format msgid "" "Curve segment: angle %3.2f°, distance %s; with Shift+Click make a cusp node, Enter or Shift+Enter to finish the path" msgstr "" -"Curve segment: angle %3.2f°, distance %s; with Ctrl to " -"snap angle, Enter to finish the path" +"Curve segment: angle %3.2f°, distance %s; with Shift+Click make a cusp node, Enter or Shift+Enter to finish the path" #: ../src/ui/tools/pen-tool.cpp:1802 -#, fuzzy, c-format +#, c-format msgid "" "Line segment: angle %3.2f°, distance %s; with Shift+Click " "make a cusp node, Enter or Shift+Enter to finish the path" msgstr "" -"Line segment: angle %3.2f°, distance %s; with Ctrl to " -"snap angle, Enter to finish the path" +"Line segment: angle %3.2f°, distance %s; with Shift+Click " +"make a cusp node, Enter or Shift+Enter to finish the path" #: ../src/ui/tools/pen-tool.cpp:1819 #, c-format @@ -25101,299 +24644,276 @@ msgstr "Blur (%)" #: ../src/ui/widget/font-variants.cpp:38 msgctxt "Font variant" msgid "Ligatures" -msgstr "" +msgstr "Ligatures" #: ../src/ui/widget/font-variants.cpp:39 -#, fuzzy msgctxt "Font variant" msgid "Common" -msgstr "common" +msgstr "Common" #: ../src/ui/widget/font-variants.cpp:40 -#, fuzzy msgctxt "Font variant" msgid "Discretionary" -msgstr "Direction" +msgstr "Discretionary" #: ../src/ui/widget/font-variants.cpp:41 -#, fuzzy msgctxt "Font variant" msgid "Historical" -msgstr "Tutorials" +msgstr "Historical" #: ../src/ui/widget/font-variants.cpp:42 -#, fuzzy msgctxt "Font variant" msgid "Contextual" -msgstr "Context" +msgstr "Contextual" #: ../src/ui/widget/font-variants.cpp:44 -#, fuzzy msgctxt "Font variant" msgid "Position" msgstr "Position" #: ../src/ui/widget/font-variants.cpp:45 ../src/ui/widget/font-variants.cpp:50 -#, fuzzy msgctxt "Font variant" msgid "Normal" msgstr "Normal" #: ../src/ui/widget/font-variants.cpp:46 -#, fuzzy msgctxt "Font variant" msgid "Subscript" -msgstr "Script" +msgstr "Subscript" #: ../src/ui/widget/font-variants.cpp:47 -#, fuzzy msgctxt "Font variant" msgid "Superscript" -msgstr "Toggle Superscript" +msgstr "Superscript" #: ../src/ui/widget/font-variants.cpp:49 -#, fuzzy msgctxt "Font variant" msgid "Capitals" -msgstr "Hospital" +msgstr "Capitals" #: ../src/ui/widget/font-variants.cpp:51 -#, fuzzy msgctxt "Font variant" msgid "Small" msgstr "Small" #: ../src/ui/widget/font-variants.cpp:52 -#, fuzzy msgctxt "Font variant" msgid "All small" -msgstr "small" +msgstr "All small" #: ../src/ui/widget/font-variants.cpp:53 -#, fuzzy msgctxt "Font variant" msgid "Petite" -msgstr "All inactive" +msgstr "Petite" #: ../src/ui/widget/font-variants.cpp:54 -#, fuzzy msgctxt "Font variant" msgid "All petite" -msgstr "All inactive" +msgstr "All petite" #: ../src/ui/widget/font-variants.cpp:55 -#, fuzzy msgctxt "Font variant" msgid "Unicase" -msgstr "Unloaded" +msgstr "Unicase" #: ../src/ui/widget/font-variants.cpp:56 -#, fuzzy msgctxt "Font variant" msgid "Titling" -msgstr "Sailing" +msgstr "Titling" #: ../src/ui/widget/font-variants.cpp:58 msgctxt "Font variant" msgid "Numeric" -msgstr "" +msgstr "Numeric" #: ../src/ui/widget/font-variants.cpp:59 -#, fuzzy msgctxt "Font variant" msgid "Lining" -msgstr "Thinning:" +msgstr "Lining" #: ../src/ui/widget/font-variants.cpp:60 -#, fuzzy msgctxt "Font variant" msgid "Old Style" -msgstr "Style" +msgstr "Old Style" #: ../src/ui/widget/font-variants.cpp:61 -#, fuzzy msgctxt "Font variant" msgid "Default Style" -msgstr "Default title" +msgstr "Default Style" #: ../src/ui/widget/font-variants.cpp:62 -#, fuzzy msgctxt "Font variant" msgid "Proportional" -msgstr "Tab Proportion:" +msgstr "Proportional" #: ../src/ui/widget/font-variants.cpp:63 msgctxt "Font variant" msgid "Tabular" -msgstr "" +msgstr "Tabular" #: ../src/ui/widget/font-variants.cpp:64 -#, fuzzy msgctxt "Font variant" msgid "Default Width" -msgstr "Default title" +msgstr "Default Width" #: ../src/ui/widget/font-variants.cpp:65 -#, fuzzy msgctxt "Font variant" msgid "Diagonal" -msgstr "Diagonal guides" +msgstr "Diagonal" #: ../src/ui/widget/font-variants.cpp:66 -#, fuzzy msgctxt "Font variant" msgid "Stacked" -msgstr "Backend" +msgstr "Stacked" #: ../src/ui/widget/font-variants.cpp:67 -#, fuzzy msgctxt "Font variant" msgid "Default Fractions" -msgstr "Default grid settings" +msgstr "Default Fractions" #: ../src/ui/widget/font-variants.cpp:68 msgctxt "Font variant" msgid "Ordinal" -msgstr "" +msgstr "Ordinal" #: ../src/ui/widget/font-variants.cpp:69 msgctxt "Font variant" msgid "Slashed Zero" -msgstr "" +msgstr "Slashed Zero" #: ../src/ui/widget/font-variants.cpp:71 -#, fuzzy msgctxt "Font variant" msgid "Feature Settings" -msgstr "Page settings" +msgstr "Feature Settings" #: ../src/ui/widget/font-variants.cpp:72 msgctxt "Font variant" msgid "Selection has different Feature Settings!" -msgstr "" +msgstr "Selection has different Feature Settings!" #: ../src/ui/widget/font-variants.cpp:85 msgid "Common ligatures. On by default. OpenType tables: 'liga', 'clig'" -msgstr "" +msgstr "Common ligatures. On by default. OpenType tables: 'liga', 'clig'" #: ../src/ui/widget/font-variants.cpp:87 msgid "Discretionary ligatures. Off by default. OpenType table: 'dlig'" -msgstr "" +msgstr "Discretionary ligatures. Off by default. OpenType table: 'dlig'" #: ../src/ui/widget/font-variants.cpp:89 msgid "Historical ligatures. Off by default. OpenType table: 'hlig'" -msgstr "" +msgstr "Historical ligatures. Off by default. OpenType table: 'hlig'" #: ../src/ui/widget/font-variants.cpp:91 msgid "Contextual forms. On by default. OpenType table: 'calt'" -msgstr "" +msgstr "Contextual forms. On by default. OpenType table: 'calt'" #. Position ---------------------------------- #. Add tooltips #: ../src/ui/widget/font-variants.cpp:112 -#, fuzzy msgid "Normal position." -msgstr "X position" +msgstr "Normal position." #: ../src/ui/widget/font-variants.cpp:113 msgid "Subscript. OpenType table: 'subs'" -msgstr "" +msgstr "Subscript. OpenType table: 'subs'" #: ../src/ui/widget/font-variants.cpp:114 msgid "Superscript. OpenType table: 'sups'" -msgstr "" +msgstr "Superscript. OpenType table: 'sups'" #. Caps ---------------------------------- #. Add tooltips #: ../src/ui/widget/font-variants.cpp:138 -#, fuzzy msgid "Normal capitalization." -msgstr "Localisation" +msgstr "Normal capitalisation." #: ../src/ui/widget/font-variants.cpp:139 msgid "Small-caps (lowercase). OpenType table: 'smcp'" -msgstr "" +msgstr "Small-caps (lowercase). OpenType table: 'smcp'" #: ../src/ui/widget/font-variants.cpp:140 msgid "" "All small-caps (uppercase and lowercase). OpenType tables: 'c2sc' and 'smcp'" msgstr "" +"All small-caps (uppercase and lowercase). OpenType tables: 'c2sc' and 'smcp'" #: ../src/ui/widget/font-variants.cpp:141 msgid "Petite-caps (lowercase). OpenType table: 'pcap'" -msgstr "" +msgstr "Petite-caps (lowercase). OpenType table: 'pcap'" #: ../src/ui/widget/font-variants.cpp:142 msgid "" "All petite-caps (uppercase and lowercase). OpenType tables: 'c2sc' and 'pcap'" msgstr "" +"All petite-caps (uppercase and lowercase). OpenType tables: 'c2sc' and 'pcap'" #: ../src/ui/widget/font-variants.cpp:143 msgid "" "Unicase (small caps for uppercase, normal for lowercase). OpenType table: " "'unic'" msgstr "" +"Unicase (small caps for uppercase, normal for lowercase). OpenType table: " +"'unic'" #: ../src/ui/widget/font-variants.cpp:144 msgid "" "Titling caps (lighter-weight uppercase for use in titles). OpenType table: " "'titl'" msgstr "" +"Titling caps (lighter-weight uppercase for use in titles). OpenType table: " +"'titl'" #. Numeric ------------------------------ #. Add tooltips #: ../src/ui/widget/font-variants.cpp:180 -#, fuzzy msgid "Normal style." -msgstr "Normal offset:" +msgstr "Normal style." #: ../src/ui/widget/font-variants.cpp:181 msgid "Lining numerals. OpenType table: 'lnum'" -msgstr "" +msgstr "Lining numerals. OpenType table: 'lnum'" #: ../src/ui/widget/font-variants.cpp:182 msgid "Old style numerals. OpenType table: 'onum'" -msgstr "" +msgstr "Old style numerals. OpenType table: 'onum'" #: ../src/ui/widget/font-variants.cpp:183 -#, fuzzy msgid "Normal widths." -msgstr "Normal light" +msgstr "Normal widths." #: ../src/ui/widget/font-variants.cpp:184 msgid "Proportional width numerals. OpenType table: 'pnum'" -msgstr "" +msgstr "Proportional width numerals. OpenType table: 'pnum'" #: ../src/ui/widget/font-variants.cpp:185 msgid "Same width numerals. OpenType table: 'tnum'" -msgstr "" +msgstr "Same width numerals. OpenType table: 'tnum'" #: ../src/ui/widget/font-variants.cpp:186 -#, fuzzy msgid "Normal fractions." -msgstr "Ignore image rotations" +msgstr "Normal fractions." #: ../src/ui/widget/font-variants.cpp:187 msgid "Diagonal fractions. OpenType table: 'frac'" -msgstr "" +msgstr "Diagonal fractions. OpenType table: 'frac'" #: ../src/ui/widget/font-variants.cpp:188 msgid "Stacked fractions. OpenType table: 'afrc'" -msgstr "" +msgstr "Stacked fractions. OpenType table: 'afrc'" #: ../src/ui/widget/font-variants.cpp:189 msgid "Ordinals (raised 'th', etc.). OpenType table: 'ordn'" -msgstr "" +msgstr "Ordinals (raised 'th', etc.). OpenType table: 'ordn'" #: ../src/ui/widget/font-variants.cpp:190 msgid "Slashed zeros. OpenType table: 'zero'" -msgstr "" +msgstr "Slashed zeros. OpenType table: 'zero'" #. Feature settings --------------------- #. Add tooltips #: ../src/ui/widget/font-variants.cpp:240 msgid "Feature settings in CSS form. No sanity checking is performed." -msgstr "" +msgstr "Feature settings in CSS form. No sanity checking is performed." #: ../src/ui/widget/layer-selector.cpp:118 msgid "Toggle current layer visibility" @@ -25420,9 +24940,8 @@ msgid "MetadataLicence|Other" msgstr "Other" #: ../src/ui/widget/licensor.cpp:72 -#, fuzzy msgid "Document license updated" -msgstr "Document cleanup" +msgstr "Document licence updated" #: ../src/ui/widget/object-composite-settings.cpp:47 #: ../src/ui/widget/selected-style.cpp:1118 @@ -25485,24 +25004,20 @@ msgid "Bottom margin" msgstr "Bottom margin" #: ../src/ui/widget/page-sizer.cpp:244 -#, fuzzy msgid "Scale _x:" -msgstr "Scale x" +msgstr "Scale _x:" #: ../src/ui/widget/page-sizer.cpp:244 -#, fuzzy msgid "Scale X" -msgstr "Scale x" +msgstr "Scale X" #: ../src/ui/widget/page-sizer.cpp:245 -#, fuzzy msgid "Scale _y:" -msgstr "Scale y" +msgstr "Scale _y:" #: ../src/ui/widget/page-sizer.cpp:245 -#, fuzzy msgid "Scale Y" -msgstr "Scale x" +msgstr "Scale Y" #: ../src/ui/widget/page-sizer.cpp:323 msgid "Orientation:" @@ -25543,11 +25058,13 @@ msgid "" "scaling in Inkscape. To set a non-uniform scaling, set the 'viewBox' " "directly." msgstr "" +"While SVG allows non-uniform scaling it is recommended to use only uniform " +"scaling in Inkscape. To set a non-uniform scaling, set the 'viewBox' " +"directly." #: ../src/ui/widget/page-sizer.cpp:483 -#, fuzzy msgid "_Viewbox..." -msgstr "_View" +msgstr "_Viewbox..." #: ../src/ui/widget/page-sizer.cpp:590 msgid "Set page size" @@ -25555,16 +25072,15 @@ msgstr "Set page size" #: ../src/ui/widget/page-sizer.cpp:836 msgid "User units per " -msgstr "" +msgstr "User units per " #: ../src/ui/widget/page-sizer.cpp:932 -#, fuzzy msgid "Set page scale" -msgstr "Set page size" +msgstr "Set page scale" #: ../src/ui/widget/page-sizer.cpp:958 msgid "Set 'viewBox'" -msgstr "" +msgstr "Set 'viewBox'" #: ../src/ui/widget/panel.cpp:116 msgid "List" @@ -25733,13 +25249,11 @@ msgid "Nothing selected" msgstr "Nothing selected" #: ../src/ui/widget/selected-style.cpp:185 -#, fuzzy msgctxt "Fill" msgid "None" msgstr "None" #: ../src/ui/widget/selected-style.cpp:187 -#, fuzzy msgctxt "Stroke" msgid "None" msgstr "None" @@ -25800,19 +25314,16 @@ msgid "Radial gradient stroke" msgstr "Radial gradient stroke" #: ../src/ui/widget/selected-style.cpp:219 -#, fuzzy msgid "M" -msgstr "L" +msgstr "M" #: ../src/ui/widget/selected-style.cpp:222 -#, fuzzy msgid "Mesh gradient fill" -msgstr "Linear gradient fill" +msgstr "Mesh gradient fill" #: ../src/ui/widget/selected-style.cpp:222 -#, fuzzy msgid "Mesh gradient stroke" -msgstr "Linear gradient stroke" +msgstr "Mesh gradient stroke" #: ../src/ui/widget/selected-style.cpp:230 msgid "Different" @@ -26185,7 +25696,7 @@ msgstr "View" #: ../src/verbs.cpp:290 msgid "Dialog" -msgstr "Dialog" +msgstr "Dialogue" #: ../src/verbs.cpp:1275 msgid "Switch to next layer" @@ -26289,14 +25800,13 @@ msgid "Flip vertically" msgstr "Flip vertically" #: ../src/verbs.cpp:1590 -#, fuzzy, c-format +#, c-format msgid "Set %d" -msgstr "Set delay" +msgstr "Set %d" #: ../src/verbs.cpp:1599 ../src/verbs.cpp:2729 -#, fuzzy msgid "Create new selection set" -msgstr "Create new element node" +msgstr "Create new selection set" #. 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 @@ -26361,7 +25871,6 @@ msgid "Unhide all objects in all layers" msgstr "Unhide all objects in all layers" #: ../src/verbs.cpp:2423 -#, fuzzy msgctxt "Verb" msgid "None" msgstr "None" @@ -26488,9 +25997,8 @@ msgid "Quit Inkscape" msgstr "Quit Inkscape" #: ../src/verbs.cpp:2456 -#, fuzzy msgid "New from _Template..." -msgstr "New From Template" +msgstr "New from _Template..." #: ../src/verbs.cpp:2457 msgid "Create new project from template" @@ -26856,14 +26364,12 @@ msgid "Delete all the guides in the document" msgstr "Delete all the guides in the document" #: ../src/verbs.cpp:2546 -#, fuzzy msgid "Lock All Guides" -msgstr "Unlock All" +msgstr "Lock All Guides" #: ../src/verbs.cpp:2546 ../src/widgets/desktop-widget.cpp:404 -#, fuzzy msgid "Toggle lock of all guides in the document" -msgstr "Delete all the guides in the document" +msgstr "Toggle lock of all guides in the document" #: ../src/verbs.cpp:2547 msgid "Create _Guides Around the Page" @@ -26923,14 +26429,12 @@ msgid "Ungroup selected groups" msgstr "Ungroup selected groups" #: ../src/verbs.cpp:2565 -#, fuzzy msgid "_Pop selected objects out of group" -msgstr "Group selected objects" +msgstr "_Pop selected objects out of group" #: ../src/verbs.cpp:2566 -#, fuzzy msgid "Pop selected objects out of group" -msgstr "Group selected objects" +msgstr "Pop selected objects out of group" #: ../src/verbs.cpp:2568 msgid "_Put on Path" @@ -27413,14 +26917,12 @@ msgstr "" "Apply clipping path to selection (using the topmost object as clipping path)" #: ../src/verbs.cpp:2721 -#, fuzzy msgid "Create Cl_ip Group" -msgstr "Create Clo_ne" +msgstr "Create Cl_ip Group" #: ../src/verbs.cpp:2722 -#, fuzzy msgid "Creates a clip group using the selected objects as a base" -msgstr "Create a clone (a copy linked to the original) of selected object" +msgstr "Creates a clip group using the selected objects as a base" #: ../src/verbs.cpp:2724 msgid "Edit clipping path" @@ -28199,7 +27701,7 @@ msgstr "View debug messages" #: ../src/verbs.cpp:2934 msgid "Show/Hide D_ialogs" -msgstr "Show/Hide D_ialogs" +msgstr "Show/Hide D_ialogues" #: ../src/verbs.cpp:2935 msgid "Show or hide all open dialogs" @@ -28254,24 +27756,20 @@ msgid "View Layers" msgstr "View Layers" #: ../src/verbs.cpp:2948 -#, fuzzy msgid "Object_s..." -msgstr "Objects" +msgstr "Object_s..." #: ../src/verbs.cpp:2949 -#, fuzzy msgid "View Objects" -msgstr "Objects" +msgstr "View Objects" #: ../src/verbs.cpp:2950 -#, fuzzy msgid "Selection se_ts..." -msgstr "Selection Area" +msgstr "Selection se_ts..." #: ../src/verbs.cpp:2951 -#, fuzzy msgid "View Tags" -msgstr "View Layers" +msgstr "View Tags" #: ../src/verbs.cpp:2952 msgid "Path E_ffects ..." @@ -28383,7 +27881,7 @@ msgstr "Inkscape: Tracing Pixel Art" #: ../src/verbs.cpp:2987 msgid "Using Trace Pixel Art dialog" -msgstr "Using Trace Pixel Art dialog" +msgstr "Using Trace Pixel Art dialogue" #: ../src/verbs.cpp:2988 msgid "Inkscape: _Calligraphy" @@ -28446,9 +27944,8 @@ msgid "Fit the page to the drawing" msgstr "Fit the page to the drawing" #: ../src/verbs.cpp:3008 -#, fuzzy msgid "_Resize Page to Selection" -msgstr "Fit Page to Selection" +msgstr "_Resize Page to Selection" #: ../src/verbs.cpp:3009 msgid "" @@ -29114,14 +28611,12 @@ msgid "%s%s - Inkscape" msgstr "%s%s - Inkscape" #: ../src/widgets/desktop-widget.cpp:1111 -#, fuzzy msgid "Locked all guides" -msgstr "Lock all layers" +msgstr "Locked all guides" #: ../src/widgets/desktop-widget.cpp:1113 -#, fuzzy msgid "Unlocked all guides" -msgstr "Unlock all layers" +msgstr "Unlocked all guides" #: ../src/widgets/desktop-widget.cpp:1130 msgid "Color-managed display is enabled in this window" @@ -29218,28 +28713,24 @@ msgstr "Cut out from objects" #. Width #: ../src/widgets/eraser-toolbar.cpp:151 -#, fuzzy msgid "(no width)" -msgstr "Zero width" +msgstr "(no width)" #: ../src/widgets/eraser-toolbar.cpp:155 msgid "The width of the eraser pen (relative to the visible canvas area)" msgstr "The width of the eraser pen (relative to the visible canvas area)" #: ../src/widgets/eraser-toolbar.cpp:171 -#, fuzzy msgid "Eraser Mass" -msgstr "Eraser" +msgstr "Eraser Mass" #: ../src/widgets/eraser-toolbar.cpp:172 -#, fuzzy msgid "Increase to make the eraser drag behind, as if slowed by inertia" -msgstr "Increase to make the pen drag behind, as if slowed by inertia" +msgstr "Increase to make the eraser drag behind, as if slowed by inertia" #: ../src/widgets/eraser-toolbar.cpp:186 ../src/widgets/eraser-toolbar.cpp:187 -#, fuzzy msgid "Break apart cut items" -msgstr "Break apart" +msgstr "Break apart cut items" #: ../src/widgets/fill-style.cpp:356 msgid "Change fill rule" @@ -29360,27 +28851,33 @@ msgstr "radial" msgid "Create radial (elliptic or circular) gradient" msgstr "Create radial (elliptic or circular) gradient" -#: ../src/widgets/gradient-toolbar.cpp:1044 ../src/widgets/mesh-toolbar.cpp:387 +#: ../src/widgets/gradient-toolbar.cpp:1044 +#: ../src/widgets/mesh-toolbar.cpp:387 msgid "New:" msgstr "New:" -#: ../src/widgets/gradient-toolbar.cpp:1067 ../src/widgets/mesh-toolbar.cpp:410 +#: ../src/widgets/gradient-toolbar.cpp:1067 +#: ../src/widgets/mesh-toolbar.cpp:410 msgid "fill" msgstr "fill" -#: ../src/widgets/gradient-toolbar.cpp:1067 ../src/widgets/mesh-toolbar.cpp:410 +#: ../src/widgets/gradient-toolbar.cpp:1067 +#: ../src/widgets/mesh-toolbar.cpp:410 msgid "Create gradient in the fill" msgstr "Create gradient in the fill" -#: ../src/widgets/gradient-toolbar.cpp:1071 ../src/widgets/mesh-toolbar.cpp:414 +#: ../src/widgets/gradient-toolbar.cpp:1071 +#: ../src/widgets/mesh-toolbar.cpp:414 msgid "stroke" msgstr "stroke" -#: ../src/widgets/gradient-toolbar.cpp:1071 ../src/widgets/mesh-toolbar.cpp:414 +#: ../src/widgets/gradient-toolbar.cpp:1071 +#: ../src/widgets/mesh-toolbar.cpp:414 msgid "Create gradient in the stroke" msgstr "Create gradient in the stroke" -#: ../src/widgets/gradient-toolbar.cpp:1074 ../src/widgets/mesh-toolbar.cpp:417 +#: ../src/widgets/gradient-toolbar.cpp:1074 +#: ../src/widgets/mesh-toolbar.cpp:417 msgid "on:" msgstr "on:" @@ -29397,7 +28894,6 @@ msgid "Select:" msgstr "Select:" #: ../src/widgets/gradient-toolbar.cpp:1115 -#, fuzzy msgctxt "Gradient repeat type" msgid "None" msgstr "None" @@ -29481,7 +28977,8 @@ msgstr "Link gradients" msgid "Link gradients to change all related gradients" msgstr "Link gradients to change all related gradients" -#: ../src/widgets/gradient-vector.cpp:317 ../src/widgets/paint-selector.cpp:965 +#: ../src/widgets/gradient-vector.cpp:317 +#: ../src/widgets/paint-selector.cpp:965 #: ../src/widgets/stroke-marker-selector.cpp:154 msgid "No document selected" msgstr "No document selected" @@ -29521,31 +29018,28 @@ msgid "Change gradient stop color" msgstr "Change gradient stop colour" #: ../src/widgets/image-menu-item.c:151 -#, fuzzy msgid "Image widget" -msgstr "Image File" +msgstr "Image widget" #: ../src/widgets/image-menu-item.c:152 msgid "Child widget to appear next to the menu text" -msgstr "" +msgstr "Child widget to appear next to the menu text" #: ../src/widgets/image-menu-item.c:167 -#, fuzzy msgid "Use stock" -msgstr "Paste stroke" +msgstr "Use stock" #: ../src/widgets/image-menu-item.c:168 msgid "Whether to use the label text to create a stock menu item" -msgstr "" +msgstr "Whether to use the label text to create a stock menu item" #: ../src/widgets/image-menu-item.c:183 -#, fuzzy msgid "Accel Group" -msgstr "Group" +msgstr "Accel Group" #: ../src/widgets/image-menu-item.c:184 msgid "The Accel Group to use for stock accelerator keys" -msgstr "" +msgstr "The Accel Group to use for stock accelerator keys" #: ../src/widgets/lpe-toolbar.cpp:233 msgid "Closed" @@ -29621,39 +29115,35 @@ msgstr "Open LPE dialogue (to adapt parameters numerically)" #: ../src/widgets/measure-toolbar.cpp:157 msgid "Start and end measures inactive." -msgstr "" +msgstr "Start and end measures inactive." #: ../src/widgets/measure-toolbar.cpp:159 msgid "Start and end measures active." -msgstr "" +msgstr "Start and end measures active." #: ../src/widgets/measure-toolbar.cpp:175 -#, fuzzy msgid "Show all crossings." -msgstr "Show all layers" +msgstr "Show all crossings." #: ../src/widgets/measure-toolbar.cpp:177 msgid "Show visible crossings." -msgstr "" +msgstr "Show visible crossings." #: ../src/widgets/measure-toolbar.cpp:193 msgid "Use all layers in the measure." -msgstr "" +msgstr "Use all layers in the measure." #: ../src/widgets/measure-toolbar.cpp:195 -#, fuzzy msgid "Use current layer in the measure." -msgstr "Raise the current layer to the top" +msgstr "Use current layer in the measure." #: ../src/widgets/measure-toolbar.cpp:211 -#, fuzzy msgid "Compute all elements." -msgstr "tutorial-elements.svg" +msgstr "Compute all elements." #: ../src/widgets/measure-toolbar.cpp:213 -#, fuzzy msgid "Compute max length." -msgstr "In-out path length:" +msgstr "Compute max length." #: ../src/widgets/measure-toolbar.cpp:274 ../src/widgets/text-toolbar.cpp:1609 msgid "Font Size" @@ -29678,84 +29168,72 @@ msgstr "Precision:" #: ../src/widgets/measure-toolbar.cpp:303 msgid "Decimal precision of measure" -msgstr "" +msgstr "Decimal precision of measure" #: ../src/widgets/measure-toolbar.cpp:315 -#, fuzzy msgid "Scale %" -msgstr "Scale x" +msgstr "Scale %" #: ../src/widgets/measure-toolbar.cpp:315 -#, fuzzy msgid "Scale %:" -msgstr "Scale:" +msgstr "Scale %:" #: ../src/widgets/measure-toolbar.cpp:316 msgid "Scale the results" -msgstr "" +msgstr "Scale the results" #: ../src/widgets/measure-toolbar.cpp:329 -#, fuzzy msgid "The offset size" -msgstr "Red offset" +msgstr "The offset size" #: ../src/widgets/measure-toolbar.cpp:341 #: ../src/widgets/measure-toolbar.cpp:342 -#, fuzzy msgid "Ignore first and last" -msgstr "Ignore first and last points" +msgstr "Ignore first and last" #: ../src/widgets/measure-toolbar.cpp:352 #: ../src/widgets/measure-toolbar.cpp:353 -#, fuzzy msgid "Show hidden intersections" -msgstr "guide intersection" +msgstr "Show hidden intersections" #: ../src/widgets/measure-toolbar.cpp:363 #: ../src/widgets/measure-toolbar.cpp:364 -#, fuzzy msgid "Show measures between items" -msgstr "Show movements between paths" +msgstr "Show measures between items" #: ../src/widgets/measure-toolbar.cpp:374 #: ../src/widgets/measure-toolbar.cpp:375 -#, fuzzy msgid "Measure all layers" -msgstr "Search in all layers" +msgstr "Measure all layers" #: ../src/widgets/measure-toolbar.cpp:385 #: ../src/widgets/measure-toolbar.cpp:386 -#, fuzzy msgid "Reverse measure" -msgstr "Reverse path" +msgstr "Reverse measure" #: ../src/widgets/measure-toolbar.cpp:395 #: ../src/widgets/measure-toolbar.cpp:396 msgid "Phantom measure" -msgstr "" +msgstr "Phantom measure" #: ../src/widgets/measure-toolbar.cpp:405 #: ../src/widgets/measure-toolbar.cpp:406 -#, fuzzy msgid "To guides" -msgstr "Show _guides" +msgstr "To guides" #: ../src/widgets/measure-toolbar.cpp:415 #: ../src/widgets/measure-toolbar.cpp:416 -#, fuzzy msgid "Mark Dimension" -msgstr "Dimensions" +msgstr "Mark Dimension" #: ../src/widgets/measure-toolbar.cpp:425 #: ../src/widgets/measure-toolbar.cpp:426 -#, fuzzy msgid "Convert to item" -msgstr "Convert to Braille" +msgstr "Convert to item" #: ../src/widgets/mesh-toolbar.cpp:318 -#, fuzzy msgid "Set mesh type" -msgstr "Set text style" +msgstr "Set mesh type" #: ../src/widgets/mesh-toolbar.cpp:380 msgid "normal" @@ -29826,72 +29304,68 @@ msgstr "Show side and tensor handles" #: ../src/widgets/mesh-toolbar.cpp:509 msgid "WARNING: Mesh SVG Syntax Subject to Change" -msgstr "" +msgstr "WARNING: Mesh SVG Syntax Subject to Change" #: ../src/widgets/mesh-toolbar.cpp:519 msgctxt "Type" msgid "Coons" -msgstr "" +msgstr "Coons" #: ../src/widgets/mesh-toolbar.cpp:522 msgid "Bicubic" -msgstr "" +msgstr "Bicubic" #: ../src/widgets/mesh-toolbar.cpp:524 msgid "Coons" -msgstr "" +msgstr "Coons" #: ../src/widgets/mesh-toolbar.cpp:525 msgid "Coons: no smoothing. Bicubic: smoothing across patch boundaries." -msgstr "" +msgstr "Coons: no smoothing. Bicubic: smoothing across patch boundaries." #: ../src/widgets/mesh-toolbar.cpp:527 ../src/widgets/pencil-toolbar.cpp:375 msgid "Smoothing:" msgstr "Smoothing:" #: ../src/widgets/mesh-toolbar.cpp:537 -#, fuzzy msgid "Toggle Sides" -msgstr "Toggle Bold" +msgstr "Toggle Sides" #: ../src/widgets/mesh-toolbar.cpp:538 msgid "Toggle selected sides between Beziers and lines." -msgstr "" +msgstr "Toggle selected sides between Beziers and lines." #: ../src/widgets/mesh-toolbar.cpp:541 -#, fuzzy msgid "Toggle side:" -msgstr "Toggle Bold" +msgstr "Toggle side:" #: ../src/widgets/mesh-toolbar.cpp:548 -#, fuzzy msgid "Make elliptical" -msgstr "Make italic" +msgstr "Make elliptical" #: ../src/widgets/mesh-toolbar.cpp:549 msgid "" "Make selected sides elliptical by changing length of handles. Works best if " "handles already approximate ellipse." msgstr "" +"Make selected sides elliptical by changing length of handles. Works best if " +"handles already approximate ellipse." #: ../src/widgets/mesh-toolbar.cpp:552 -#, fuzzy msgid "Make elliptical:" -msgstr "Make italic" +msgstr "Make elliptical:" #: ../src/widgets/mesh-toolbar.cpp:559 -#, fuzzy msgid "Pick colors:" -msgstr "Points colour" +msgstr "Pick colours:" #: ../src/widgets/mesh-toolbar.cpp:560 msgid "Pick colors for selected corner nodes from underneath mesh." -msgstr "" +msgstr "Pick colours for selected corner nodes from underneath mesh." #: ../src/widgets/mesh-toolbar.cpp:563 -#, fuzzy msgid "Pick Color" -msgstr "Fill Colour" +msgstr "Pick Colour" #: ../src/widgets/node-toolbar.cpp:341 msgid "Insert node" @@ -30102,9 +29576,8 @@ msgid "Radial gradient" msgstr "Radial gradient" #: ../src/widgets/paint-selector.cpp:228 -#, fuzzy msgid "Mesh gradient" -msgstr "Move gradients" +msgstr "Mesh gradient" #: ../src/widgets/paint-selector.cpp:235 msgid "Unset paint (make it undefined so it can be inherited)" @@ -30156,9 +29629,8 @@ msgid "Radial gradient" msgstr "Radial gradient" #: ../src/widgets/paint-selector.cpp:799 -#, fuzzy msgid "Mesh gradient" -msgstr "Linear gradient" +msgstr "Mesh gradient" #: ../src/widgets/paint-selector.cpp:1098 msgid "" @@ -30247,9 +29719,8 @@ msgid "Create Spiro path" msgstr "Create Spiro path" #: ../src/widgets/pencil-toolbar.cpp:119 -#, fuzzy msgid "Create BSpline path" -msgstr "Create Spiro path" +msgstr "Create BSpline path" #: ../src/widgets/pencil-toolbar.cpp:125 msgid "Zigzag" @@ -30272,7 +29743,6 @@ msgid "Mode of new lines drawn by this tool" msgstr "Mode of new lines drawn by this tool" #: ../src/widgets/pencil-toolbar.cpp:176 -#, fuzzy msgctxt "Freehand shape" msgid "None" msgstr "None" @@ -30290,14 +29760,12 @@ msgid "From clipboard" msgstr "From clipboard" #: ../src/widgets/pencil-toolbar.cpp:181 -#, fuzzy msgid "Bend from clipboard" -msgstr "From clipboard" +msgstr "Bend from clipboard" #: ../src/widgets/pencil-toolbar.cpp:182 -#, fuzzy msgid "Last applied" -msgstr "Last slide:" +msgstr "Last applied" #: ../src/widgets/pencil-toolbar.cpp:207 ../src/widgets/pencil-toolbar.cpp:208 msgid "Shape:" @@ -30333,11 +29801,11 @@ msgstr "" #: ../src/widgets/pencil-toolbar.cpp:407 ../src/widgets/pencil-toolbar.cpp:408 msgid "LPE based interactive simplify" -msgstr "" +msgstr "LPE based interactive simplify" #: ../src/widgets/pencil-toolbar.cpp:418 ../src/widgets/pencil-toolbar.cpp:419 msgid "LPE simplify flatten" -msgstr "" +msgstr "LPE simplify flatten" #: ../src/widgets/rect-toolbar.cpp:125 msgid "Change rectangle" @@ -30505,7 +29973,6 @@ msgstr "X:" #. shortLabel #: ../src/widgets/select-toolbar.cpp:443 -#, fuzzy msgctxt "Select toolbar" msgid "Horizontal coordinate of selection" msgstr "Horizontal coordinate of selection" @@ -30524,7 +29991,6 @@ msgstr "Y:" #. shortLabel #: ../src/widgets/select-toolbar.cpp:462 -#, fuzzy msgctxt "Select toolbar" msgid "Vertical coordinate of selection" msgstr "Vertical coordinate of selection" @@ -30543,7 +30009,6 @@ msgstr "W:" #. shortLabel #: ../src/widgets/select-toolbar.cpp:481 -#, fuzzy msgctxt "Select toolbar" msgid "Width of selection" msgstr "Width of selection" @@ -30570,7 +30035,6 @@ msgstr "H:" #. shortLabel #: ../src/widgets/select-toolbar.cpp:513 -#, fuzzy msgctxt "Select toolbar" msgid "Height of selection" msgstr "Height of selection" @@ -30709,9 +30173,8 @@ msgid "The width of the spray area (relative to the visible canvas area)" msgstr "The width of the spray area (relative to the visible canvas area)" #: ../src/widgets/spray-toolbar.cpp:312 -#, fuzzy msgid "Use the pressure of the input device to alter the width of spray area" -msgstr "Use the pressure of the input device to alter the width of the pen" +msgstr "Use the pressure of the input device to alter the width of spray area" #: ../src/widgets/spray-toolbar.cpp:323 msgid "(maximum mean)" @@ -30769,14 +30232,12 @@ msgid "Spray objects in a single path" msgstr "Spray objects in a single path" #: ../src/widgets/spray-toolbar.cpp:383 -#, fuzzy msgid "Delete sprayed items" -msgstr "Delete gradient stop" +msgstr "Delete sprayed items" #: ../src/widgets/spray-toolbar.cpp:384 -#, fuzzy msgid "Delete sprayed items from selection" -msgstr "Get curves from selection..." +msgstr "Delete sprayed items from selection" #: ../src/widgets/spray-toolbar.cpp:388 ../src/widgets/tweak-toolbar.cpp:253 msgid "Mode" @@ -30850,74 +30311,69 @@ msgstr "" "the original object" #: ../src/widgets/spray-toolbar.cpp:477 -#, fuzzy msgid "Use the pressure of the input device to alter the scale of new items" -msgstr "Use the pressure of the input device to alter the width of the pen" +msgstr "Use the pressure of the input device to alter the scale of new items" #: ../src/widgets/spray-toolbar.cpp:489 ../src/widgets/spray-toolbar.cpp:490 msgid "" "Pick color from the drawing. You can use clonetiler trace dialog for " "advanced effects. In clone mode original fill or stroke colors must be unset." msgstr "" +"Pick colour from the drawing. You can use clonetiler trace dialogue for " +"advanced effects. In clone mode original fill or stroke colours must be " +"unset." #: ../src/widgets/spray-toolbar.cpp:502 ../src/widgets/spray-toolbar.cpp:503 msgid "Pick from center instead average area." -msgstr "" +msgstr "Pick from centre instead average area." #: ../src/widgets/spray-toolbar.cpp:515 ../src/widgets/spray-toolbar.cpp:516 msgid "Inverted pick value, retaining color in advanced trace mode" -msgstr "" +msgstr "Inverted pick value, retaining colour in advanced trace mode" #: ../src/widgets/spray-toolbar.cpp:528 ../src/widgets/spray-toolbar.cpp:529 -#, fuzzy msgid "Apply picked color to fill" -msgstr "Apply last selected colour to fill" +msgstr "Apply picked colour to fill" #: ../src/widgets/spray-toolbar.cpp:541 ../src/widgets/spray-toolbar.cpp:542 -#, fuzzy msgid "Apply picked color to stroke" -msgstr "Apply last selected colour to stroke" +msgstr "Apply picked colour to stroke" #: ../src/widgets/spray-toolbar.cpp:554 ../src/widgets/spray-toolbar.cpp:555 msgid "No overlap between colors" -msgstr "" +msgstr "No overlap between colours" #: ../src/widgets/spray-toolbar.cpp:567 ../src/widgets/spray-toolbar.cpp:568 msgid "Apply over transparent areas" -msgstr "" +msgstr "Apply over transparent areas" #: ../src/widgets/spray-toolbar.cpp:580 ../src/widgets/spray-toolbar.cpp:581 msgid "Apply over no transparent areas" -msgstr "" +msgstr "Apply over no transparent areas" #: ../src/widgets/spray-toolbar.cpp:593 ../src/widgets/spray-toolbar.cpp:594 -#, fuzzy msgid "Prevent overlapping objects" -msgstr "Please select an object" +msgstr "Prevent overlapping objects" #: ../src/widgets/spray-toolbar.cpp:605 -#, fuzzy msgid "(minimum offset)" -msgstr "(minimum force)" +msgstr "(minimum offset)" #: ../src/widgets/spray-toolbar.cpp:605 -#, fuzzy msgid "(maximum offset)" -msgstr "(maximum force)" +msgstr "(maximum offset)" #: ../src/widgets/spray-toolbar.cpp:608 -#, fuzzy msgid "Offset %" -msgstr "Offset y" +msgstr "Offset %" #: ../src/widgets/spray-toolbar.cpp:608 -#, fuzzy msgid "Offset %:" -msgstr "Offset:" +msgstr "Offset %:" #: ../src/widgets/spray-toolbar.cpp:609 msgid "Increase to segregate objects more (value in percent)" -msgstr "" +msgstr "Increase to segregate objects more (value in percent)" #: ../src/widgets/star-toolbar.cpp:103 msgid "Star: Change number of corners" @@ -31090,7 +30546,6 @@ msgid "Scatter randomly the corners and angles" msgstr "Scatter randomly the corners and angles" #: ../src/widgets/stroke-marker-selector.cpp:388 -#, fuzzy msgctxt "Marker" msgid "None" msgstr "None" @@ -31179,33 +30634,28 @@ msgid "Square cap" msgstr "Square cap" #: ../src/widgets/stroke-style.cpp:392 -#, fuzzy msgid "Fill, Stroke, Markers" -msgstr "Stroke Style Markers" +msgstr "Fill, Stroke, Markers" #: ../src/widgets/stroke-style.cpp:396 -#, fuzzy msgid "Stroke, Fill, Markers" -msgstr "Stroke Style Markers" +msgstr "Stroke, Fill, Markers" #: ../src/widgets/stroke-style.cpp:400 -#, fuzzy msgid "Fill, Markers, Stroke" -msgstr "Fill and Stroke" +msgstr "Fill, Markers, Stroke" #: ../src/widgets/stroke-style.cpp:408 -#, fuzzy msgid "Markers, Fill, Stroke" -msgstr "Fill and Stroke" +msgstr "Markers, Fill, Stroke" #: ../src/widgets/stroke-style.cpp:412 -#, fuzzy msgid "Stroke, Markers, Fill" -msgstr "Stroke Style Markers" +msgstr "Stroke, Markers, Fill" #: ../src/widgets/stroke-style.cpp:416 msgid "Markers, Stroke, Fill" -msgstr "" +msgstr "Markers, Stroke, Fill" #: ../src/widgets/stroke-style.cpp:534 msgid "Set markers" @@ -31248,9 +30698,8 @@ msgid "Text: Change line-height" msgstr "Text: Change line-height" #: ../src/widgets/text-toolbar.cpp:728 -#, fuzzy msgid "Text: Change line-height unit" -msgstr "Text: Change line-height" +msgstr "Text: Change line-height unit" #: ../src/widgets/text-toolbar.cpp:777 msgid "Text: Change word-spacing" @@ -31273,9 +30722,8 @@ msgid "Text: Change rotate" msgstr "Text: Change rotate" #: ../src/widgets/text-toolbar.cpp:977 -#, fuzzy msgid "Text: Change writing mode" -msgstr "Text: Change orientation" +msgstr "Text: Change writing mode" #: ../src/widgets/text-toolbar.cpp:1031 msgid "Text: Change orientation" @@ -31346,57 +30794,50 @@ msgid "Horizontal" msgstr "Horizontal" #: ../src/widgets/text-toolbar.cpp:1746 -#, fuzzy msgid "Vertical — RL" -msgstr "Vertical" +msgstr "Vertical — RL" #: ../src/widgets/text-toolbar.cpp:1747 msgid "Vertical text — lines: right to left" -msgstr "" +msgstr "Vertical text — lines: right to left" #: ../src/widgets/text-toolbar.cpp:1753 -#, fuzzy msgid "Vertical — LR" -msgstr "Vertical" +msgstr "Vertical — LR" #: ../src/widgets/text-toolbar.cpp:1754 msgid "Vertical text — lines: left to right" -msgstr "" +msgstr "Vertical text — lines: left to right" #. Name #: ../src/widgets/text-toolbar.cpp:1759 -#, fuzzy msgid "Writing mode" -msgstr "Drawing mode" +msgstr "Writing mode" #. Label #: ../src/widgets/text-toolbar.cpp:1760 msgid "Block progression" -msgstr "" +msgstr "Block progression" #: ../src/widgets/text-toolbar.cpp:1789 -#, fuzzy msgid "Auto glyph orientation" -msgstr "Follow path orientation" +msgstr "Auto glyph orientation" #: ../src/widgets/text-toolbar.cpp:1796 -#, fuzzy msgid "Upright" -msgstr "Brighter" +msgstr "Upright" #: ../src/widgets/text-toolbar.cpp:1797 -#, fuzzy msgid "Upright glyph orientation" -msgstr "Text orientation" +msgstr "Upright glyph orientation" #: ../src/widgets/text-toolbar.cpp:1804 msgid "Sideways" -msgstr "" +msgstr "Sideways" #: ../src/widgets/text-toolbar.cpp:1805 -#, fuzzy msgid "Sideways glyph orientation" -msgstr "Follow path orientation" +msgstr "Sideways glyph orientation" #. Name #: ../src/widgets/text-toolbar.cpp:1811 @@ -31406,7 +30847,7 @@ msgstr "Text orientation" #. Label #: ../src/widgets/text-toolbar.cpp:1812 msgid "Text (glyph) orientation in vertical text." -msgstr "" +msgstr "Text (glyph) orientation in vertical text." #. Drop down menu #: ../src/widgets/text-toolbar.cpp:1845 @@ -31435,9 +30876,8 @@ msgstr "Line:" #. short label #: ../src/widgets/text-toolbar.cpp:1852 -#, fuzzy msgid "Spacing between baselines (times font size)" -msgstr "Spacing between lines (times font size)" +msgstr "Spacing between baselines (times font size)" #. Drop down menu #: ../src/widgets/text-toolbar.cpp:1884 ../src/widgets/text-toolbar.cpp:1915 @@ -31843,7 +31283,6 @@ msgstr "In colour mode, act on objects' hue" #. TRANSLATORS: "H" here stands for hue #: ../src/widgets/tweak-toolbar.cpp:291 -#, fuzzy msgctxt "Hue" msgid "H" msgstr "H" @@ -31854,7 +31293,6 @@ msgstr "In colour mode, act on objects' saturation" #. TRANSLATORS: "S" here stands for Saturation #: ../src/widgets/tweak-toolbar.cpp:307 -#, fuzzy msgctxt "Saturation" msgid "S" msgstr "S" @@ -31865,7 +31303,6 @@ msgstr "In colour mode, act on objects' lightness" #. TRANSLATORS: "L" here stands for Lightness #: ../src/widgets/tweak-toolbar.cpp:323 -#, fuzzy msgctxt "Lightness" msgid "L" msgstr "L" @@ -31876,7 +31313,6 @@ msgstr "In colour mode, act on objects' opacity" #. TRANSLATORS: "O" here stands for Opacity #: ../src/widgets/tweak-toolbar.cpp:339 -#, fuzzy msgctxt "Opacity" msgid "O" msgstr "O" @@ -31913,7 +31349,7 @@ msgstr "" #: ../share/extensions/convert2dashes.py:56 msgid "Total number of objects not converted: {}\n" -msgstr "" +msgstr "Total number of objects not converted: {}\n" #: ../share/extensions/dimension.py:108 msgid "Please select an object." @@ -32030,17 +31466,18 @@ msgid "Need at least 2 paths selected" msgstr "Need at least 2 paths selected" #: ../share/extensions/funcplot.py:46 -#, fuzzy msgid "" "x-interval cannot be zero. Please modify 'Start X value' or 'End X value'" -msgstr "x-interval cannot be zero. Please modify 'Start X' or 'End X'" +msgstr "" +"x-interval cannot be zero. Please modify 'Start X value' or 'End X value'" #: ../share/extensions/funcplot.py:58 -#, fuzzy msgid "" "y-interval cannot be zero. Please modify 'Y value of rectangle's top' or 'Y " "value of rectangle's bottom'" -msgstr "y-interval cannot be zero. Please modify 'Y top' or 'Y bottom'" +msgstr "" +"y-interval cannot be zero. Please modify 'Y value of rectangle's top' or 'Y " +"value of rectangle's bottom'" #: ../share/extensions/funcplot.py:313 msgid "Please select a rectangle" @@ -32055,9 +31492,8 @@ msgid "No paths are selected! Trying to work on all available paths." msgstr "No paths are selected! Trying to work on all available paths." #: ../share/extensions/gcodetools.py:3322 -#, fuzzy msgid "Nothing is selected. Please select something." -msgstr "Noting is selected. Please select something." +msgstr "Nothing is selected. Please select something." #: ../share/extensions/gcodetools.py:3862 msgid "" @@ -32188,12 +31624,11 @@ msgstr "" "+Shift+G) and Object to Path (Ctrl+Shift+C)!" #: ../share/extensions/gcodetools.py:4665 -#, fuzzy msgid "" "Nothing is selected. Please select something to convert to drill point " "(dxfpoint) or clear point sign." msgstr "" -"Noting is selected. Please select something to convert to drill point " +"Nothing is selected. Please select something to convert to drill point " "(dxfpoint) or clear point sign." #: ../share/extensions/gcodetools.py:4748 @@ -32317,9 +31752,8 @@ msgid "Please select an object" msgstr "Please select an object" #: ../share/extensions/gimp_xcf.py:37 -#, fuzzy msgid "Inkscape must be installed and set in your path variable." -msgstr "Gimp must be installed and set in your path variable." +msgstr "Inkscape must be installed and set in your path variable." #: ../share/extensions/gimp_xcf.py:41 msgid "Gimp must be installed and set in your path variable." @@ -32342,9 +31776,8 @@ msgid "Movements" msgstr "Movements" #: ../share/extensions/hpgl_decoder.py:43 -#, fuzzy msgid "Pen " -msgstr "Pen #" +msgstr "Pen " #. issue error if no hpgl data found #: ../share/extensions/hpgl_input.py:56 @@ -32367,7 +31800,7 @@ msgstr "" "No paths where found. Please convert all objects you want to save into paths." #: ../share/extensions/inkex.py:116 -#, fuzzy, python-format +#, python-format msgid "" "The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore " "this extension.Please download and install the latest version from http://" @@ -32378,7 +31811,7 @@ msgid "" "%s" msgstr "" "The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore " -"this extension. Please download and install the latest version from http://" +"this extension.Please download and install the latest version from http://" "cheeseshop.python.org/pypi/lxml/, or install it through your package manager " "by a command like: sudo apt-get install python-lxml\n" "\n" @@ -32402,7 +31835,7 @@ msgstr "No matching node for expression: %s" #: ../share/extensions/inkex.py:358 msgid "SVG Width not set correctly! Assuming width = 100" -msgstr "" +msgstr "SVG Width not set correctly! Assuming width = 100" #: ../share/extensions/interp_att_g.py:175 msgid "There is no selection to interpolate" @@ -32636,7 +32069,8 @@ msgid "Area is zero, cannot calculate Center of Mass" msgstr "Area is zero, cannot calculate Centre of Mass" #: ../share/extensions/pathalongpath.py:207 -#: ../share/extensions/pathscatter.py:226 ../share/extensions/perspective.py:50 +#: ../share/extensions/pathscatter.py:226 +#: ../share/extensions/perspective.py:50 msgid "This extension requires two selected paths." msgstr "This extension requires two selected paths." @@ -32673,7 +32107,8 @@ msgstr "" "like system this can be done with the command, sudo apt-get install python-" "numpy." -#: ../share/extensions/perspective.py:58 ../share/extensions/summersnight.py:49 +#: ../share/extensions/perspective.py:58 +#: ../share/extensions/summersnight.py:49 #, python-format msgid "" "The first selected object is of type '%s'.\n" @@ -32682,13 +32117,15 @@ msgstr "" "The first selected object is of type '%s'.\n" "Try using the procedure Path->Object to Path." -#: ../share/extensions/perspective.py:65 ../share/extensions/summersnight.py:57 +#: ../share/extensions/perspective.py:65 +#: ../share/extensions/summersnight.py:57 msgid "" "This extension requires that the second selected path be four nodes long." msgstr "" "This extension requires that the second selected path be four nodes long." -#: ../share/extensions/perspective.py:91 ../share/extensions/summersnight.py:90 +#: ../share/extensions/perspective.py:91 +#: ../share/extensions/summersnight.py:90 msgid "" "The second selected object is a group, not a path.\n" "Try using the procedure Object->Ungroup." @@ -32696,7 +32133,8 @@ msgstr "" "The second selected object is a group, not a path.\n" "Try using the procedure Object->Ungroup." -#: ../share/extensions/perspective.py:93 ../share/extensions/summersnight.py:92 +#: ../share/extensions/perspective.py:93 +#: ../share/extensions/summersnight.py:92 msgid "" "The second selected object is not a path.\n" "Try using the procedure Path->Object to Path." @@ -32704,7 +32142,8 @@ msgstr "" "The second selected object is not a path.\n" "Try using the procedure Path->Object to Path." -#: ../share/extensions/perspective.py:96 ../share/extensions/summersnight.py:95 +#: ../share/extensions/perspective.py:96 +#: ../share/extensions/summersnight.py:95 msgid "" "The first selected object is not a path.\n" "Try using the procedure Path->Object to Path." @@ -32720,28 +32159,30 @@ msgstr "" "No paths where found. Please convert all objects you want to plot into paths." #: ../share/extensions/plotter.py:146 -#, fuzzy msgid "pySerial is not installed. Please follow these steps:" -msgstr "pySerial is not installed." +msgstr "pySerial is not installed. Please follow these steps:" #: ../share/extensions/plotter.py:147 msgid "1. Download and extract (unzip) this file to your local harddisk:" -msgstr "" +msgstr "1. Download and extract (unzip) this file to your local harddisk:" #: ../share/extensions/plotter.py:149 msgid "" "2. Copy the \"serial\" folder (Can be found inside the just extracted folder)" msgstr "" +"2. Copy the \"serial\" folder (Can be found inside the just extracted folder)" #: ../share/extensions/plotter.py:150 msgid "" " into the following Inkscape folder: C:\\[Program files]\\inkscape\\python" "\\Lib\\" msgstr "" +" into the following Inkscape folder: C:\\[Program files]\\inkscape\\python" +"\\Lib\\" #: ../share/extensions/plotter.py:151 msgid "3. Close and restart Inkscape." -msgstr "" +msgstr "3. Close and restart Inkscape." #: ../share/extensions/plotter.py:200 msgid "" @@ -32863,9 +32304,8 @@ msgid "Please enter a replacement font in the replace all box." msgstr "Please enter a replacement font in the replace all box." #: ../share/extensions/restack.py:75 -#, fuzzy msgid "There is no selection to restack." -msgstr "There is no selection to interpolate" +msgstr "There is no selection to restack." #: ../share/extensions/summersnight.py:41 msgid "" @@ -32894,6 +32334,11 @@ msgid "" "http://sk1project.org/modules.php?name=Products&product=uniconvertor\n" "and install into your Inkscape's Python location\n" msgstr "" +"You need to install the UniConvertor software.\n" +"For GNU/Linux: install the package python-uniconvertor.\n" +"For Windows: download it from\n" +"http://sk1project.org/modules.php?name=Products&product=uniconvertor\n" +"and install into your Inkscape's Python location\n" #: ../share/extensions/voronoi2svg.py:205 msgid "Please select objects!" @@ -32941,9 +32386,8 @@ msgid "The directory \"%s\" does not exists." msgstr "The directory \"%s\" does not exists." #: ../share/extensions/webslicer_export.py:76 -#, fuzzy msgid "No slicer layer found." -msgstr "No current layer." +msgstr "No slicer layer found." #: ../share/extensions/webslicer_export.py:106 #, python-format @@ -33231,24 +32675,24 @@ msgid "Randomize" msgstr "Randomise" #: ../share/extensions/color_randomize.inx.h:4 -#, fuzzy, no-c-format +#, no-c-format msgid "Hue range (%)" -msgstr "Hue rotation (°)" +msgstr "Hue range (%)" #: ../share/extensions/color_randomize.inx.h:6 -#, fuzzy, no-c-format +#, no-c-format msgid "Saturation range (%)" -msgstr "Saturation (%)" +msgstr "Saturation range (%)" #: ../share/extensions/color_randomize.inx.h:8 -#, fuzzy, no-c-format +#, no-c-format msgid "Lightness range (%)" -msgstr "Lightness (%)" +msgstr "Lightness range (%)" #: ../share/extensions/color_randomize.inx.h:10 -#, fuzzy, no-c-format +#, no-c-format msgid "Opacity range (%)" -msgstr "Opacity (%)" +msgstr "Opacity range (%)" #: ../share/extensions/color_randomize.inx.h:12 msgid "" @@ -33256,6 +32700,9 @@ msgid "" "only for objects and groups). Change the range values to limit the distance " "between the original color and the randomized one." msgstr "" +"Randomises hue, saturation, lightness and/or opacity (opacity randomisation " +"only for objects and groups). Change the range values to limit the distance " +"between the original colour and the randomised one." #: ../share/extensions/color_removeblue.inx.h:1 msgid "Remove Blue" @@ -33352,9 +32799,8 @@ msgid "Y Offset:" msgstr "Y Offset:" #: ../share/extensions/dimension.inx.h:4 -#, fuzzy msgid "Bounding box type:" -msgstr "Bounding box type :" +msgstr "Bounding box type:" #: ../share/extensions/dimension.inx.h:5 msgid "Geometric" @@ -33608,12 +33054,11 @@ msgstr "DXF Input" #: ../share/extensions/dxf_input.inx.h:3 msgid "Method of Scaling:" -msgstr "" +msgstr "Method of Scaling:" #: ../share/extensions/dxf_input.inx.h:4 -#, fuzzy msgid "Manual scale factor:" -msgstr "Or, use manual scale factor:" +msgstr "Manual scale factor:" #: ../share/extensions/dxf_input.inx.h:5 msgid "Manual x-axis origin (mm):" @@ -33637,7 +33082,6 @@ msgid "Text Font:" msgstr "Text Font:" #: ../share/extensions/dxf_input.inx.h:11 -#, fuzzy msgid "" "- AutoCAD Release 13 and newer.\n" "- for manual scaling, assume dxf drawing is in mm.\n" @@ -33649,9 +33093,11 @@ msgid "" "- limited support for BLOCKS, use AutoCAD Explode Blocks instead, if needed." msgstr "" "- AutoCAD Release 13 and newer.\n" -"- assume dxf drawing is in mm.\n" -"- assume svg drawing is in pixels, at 90 dpi.\n" +"- for manual scaling, assume dxf drawing is in mm.\n" +"- assume svg drawing is in pixels, at 96 dpi.\n" "- scale factor and origin apply only to manual scaling.\n" +"- 'Automatic scaling' will fit the width of an A4 page.\n" +"- 'Read from file' uses the variable $MEASUREMENT.\n" "- layers are preserved only on File->Open, not Import.\n" "- limited support for BLOCKS, use AutoCAD Explode Blocks instead, if needed." @@ -33676,24 +33122,20 @@ msgid "use LWPOLYLINE type of line output" msgstr "use LWPOLYLINE type of line output" #: ../share/extensions/dxf_outlines.inx.h:5 -#, fuzzy msgid "Base unit:" -msgstr "Base unit" +msgstr "Base unit:" #: ../share/extensions/dxf_outlines.inx.h:6 -#, fuzzy msgid "Character Encoding:" -msgstr "Character Encoding" +msgstr "Character Encoding:" #: ../share/extensions/dxf_outlines.inx.h:7 -#, fuzzy msgid "Layer export selection:" -msgstr "Layer export selection" +msgstr "Layer export selection:" #: ../share/extensions/dxf_outlines.inx.h:8 -#, fuzzy msgid "Layer match name:" -msgstr "Layer match name" +msgstr "Layer match name:" #: ../share/extensions/dxf_outlines.inx.h:9 msgid "pt" @@ -33773,7 +33215,6 @@ msgid "By name match" msgstr "By name match" #: ../share/extensions/dxf_outlines.inx.h:25 -#, fuzzy msgid "" "- AutoCAD Release 14 DXF format.\n" "- The base unit parameter specifies in what unit the coordinates are output " @@ -33791,7 +33232,7 @@ msgid "" msgstr "" "- AutoCAD Release 14 DXF format.\n" "- The base unit parameter specifies in what unit the coordinates are output " -"(90 px = 1 in).\n" +"(96 px = 1 in).\n" "- Supported element types\n" " - paths (lines and splines)\n" " - rectangles\n" @@ -33866,84 +33307,70 @@ msgid "Embed Selected Images" msgstr "Embed Selected Images" #: ../share/extensions/empty_business_card.inx.h:1 -#, fuzzy msgid "Business Card" -msgstr "Business Card 85x54mm" +msgstr "Business Card" #: ../share/extensions/empty_business_card.inx.h:2 -#, fuzzy msgid "Business card size:" -msgstr "Business Card 85x54mm" +msgstr "Business card size:" #: ../share/extensions/empty_desktop.inx.h:1 -#, fuzzy msgid "Desktop" -msgstr "Desktop 640x480" +msgstr "Desktop" #: ../share/extensions/empty_desktop.inx.h:2 -#, fuzzy msgid "Desktop size:" -msgstr "Dot size:" +msgstr "Desktop size:" #. Maximum size is '16k' #: ../share/extensions/empty_desktop.inx.h:4 #: ../share/extensions/empty_generic.inx.h:2 #: ../share/extensions/empty_video.inx.h:4 -#, fuzzy msgid "Custom Width:" -msgstr "Custom size" +msgstr "Custom Width:" #: ../share/extensions/empty_desktop.inx.h:5 #: ../share/extensions/empty_generic.inx.h:3 #: ../share/extensions/empty_video.inx.h:5 -#, fuzzy msgid "Custom Height:" -msgstr "Caps Height:" +msgstr "Custom Height:" #: ../share/extensions/empty_dvd_cover.inx.h:1 -#, fuzzy msgid "DVD Cover" -msgstr "Cover" +msgstr "DVD Cover" #: ../share/extensions/empty_dvd_cover.inx.h:2 -#, fuzzy msgid "DVD spine width:" -msgstr "Line width" +msgstr "DVD spine width:" #: ../share/extensions/empty_dvd_cover.inx.h:3 msgid "DVD cover bleed (mm):" -msgstr "" +msgstr "DVD cover bleed (mm):" #: ../share/extensions/empty_generic.inx.h:1 -#, fuzzy msgid "Generic Canvas" -msgstr "Canvas" +msgstr "Generic Canvas" #: ../share/extensions/empty_generic.inx.h:4 -#, fuzzy msgid "SVG Unit:" -msgstr "Unit:" +msgstr "SVG Unit:" #: ../share/extensions/empty_generic.inx.h:5 -#, fuzzy msgid "Canvas background:" -msgstr "Trace Background" +msgstr "Canvas background:" #: ../share/extensions/empty_generic.inx.h:6 #: ../share/extensions/empty_page.inx.h:5 -#, fuzzy msgid "Hide border" -msgstr "Ridged border" +msgstr "Hide border" #: ../share/extensions/empty_icon.inx.h:1 -#, fuzzy msgid "Icon" -msgstr "Iconify" +msgstr "Icon" #: ../share/extensions/empty_icon.inx.h:2 -#, fuzzy msgid "Icon size:" -msgstr "Font size:" +msgstr "Icon size:" #: ../share/extensions/empty_page.inx.h:2 msgid "Page size:" @@ -33954,19 +33381,16 @@ msgid "Page orientation:" msgstr "Page orientation:" #: ../share/extensions/empty_page.inx.h:4 -#, fuzzy msgid "Page background:" -msgstr "Trace Background" +msgstr "Page background:" #: ../share/extensions/empty_video.inx.h:1 -#, fuzzy msgid "Video Screen" -msgstr "Screen" +msgstr "Video Screen" #: ../share/extensions/empty_video.inx.h:2 -#, fuzzy msgid "Video size:" -msgstr "Dot size:" +msgstr "Video size:" #: ../share/extensions/eps_input.inx.h:1 msgid "EPS Input" @@ -34567,7 +33991,6 @@ msgstr "Full path to log file:" #: ../share/extensions/gcodetools_graffiti.inx.h:37 #: ../share/extensions/gcodetools_lathe.inx.h:41 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:30 -#, fuzzy msgctxt "GCode postprocessor" msgid "None" msgstr "None" @@ -34963,7 +34386,7 @@ msgid "" "of the pattern and get an empty border." msgstr "" "Generate a random pattern of Voronoi cells. The pattern will be accessible " -"in the Fill and Stroke dialog. You must select an object or a group.\n" +"in the Fill and Stroke dialogue. You must select an object or a group.\n" "\n" "If border is zero, the pattern will be discontinuous at the edges. Use a " "positive border, preferably greater than the cell size, to produce a smooth " @@ -35310,7 +34733,6 @@ msgid "Right book page" msgstr "Right book page" #: ../share/extensions/guides_creator.inx.h:24 -#, fuzzy msgctxt "Margin" msgid "None" msgstr "None" @@ -35515,12 +34937,14 @@ msgstr "" "have UniConverter installed and open them again." #: ../share/extensions/hpgl_input.inx.h:3 -#: ../share/extensions/hpgl_output.inx.h:4 ../share/extensions/plotter.inx.h:32 +#: ../share/extensions/hpgl_output.inx.h:4 +#: ../share/extensions/plotter.inx.h:32 msgid "Resolution X (dpi):" msgstr "Resolution X (dpi):" #: ../share/extensions/hpgl_input.inx.h:4 -#: ../share/extensions/hpgl_output.inx.h:5 ../share/extensions/plotter.inx.h:33 +#: ../share/extensions/hpgl_output.inx.h:5 +#: ../share/extensions/plotter.inx.h:33 msgid "" "The amount of steps the plotter moves if it moves for 1 inch on the X axis " "(Default: 1016.0)" @@ -35529,12 +34953,14 @@ msgstr "" "(Default: 1016.0)" #: ../share/extensions/hpgl_input.inx.h:5 -#: ../share/extensions/hpgl_output.inx.h:6 ../share/extensions/plotter.inx.h:34 +#: ../share/extensions/hpgl_output.inx.h:6 +#: ../share/extensions/plotter.inx.h:34 msgid "Resolution Y (dpi):" msgstr "Resolution Y (dpi):" #: ../share/extensions/hpgl_input.inx.h:6 -#: ../share/extensions/hpgl_output.inx.h:7 ../share/extensions/plotter.inx.h:35 +#: ../share/extensions/hpgl_output.inx.h:7 +#: ../share/extensions/plotter.inx.h:35 msgid "" "The amount of steps the plotter moves if it moves for 1 inch on the Y axis " "(Default: 1016.0)" @@ -35573,15 +34999,18 @@ msgstr "" "Please use the plotter extension (Extensions menu) to plot directly over a " "serial connection." -#: ../share/extensions/hpgl_output.inx.h:3 ../share/extensions/plotter.inx.h:31 +#: ../share/extensions/hpgl_output.inx.h:3 +#: ../share/extensions/plotter.inx.h:31 msgid "Plotter Settings " msgstr "Plotter Settings " -#: ../share/extensions/hpgl_output.inx.h:8 ../share/extensions/plotter.inx.h:36 +#: ../share/extensions/hpgl_output.inx.h:8 +#: ../share/extensions/plotter.inx.h:36 msgid "Pen number:" msgstr "Pen number:" -#: ../share/extensions/hpgl_output.inx.h:9 ../share/extensions/plotter.inx.h:37 +#: ../share/extensions/hpgl_output.inx.h:9 +#: ../share/extensions/plotter.inx.h:37 msgid "The number of the pen (tool) to use (Standard: '1')" msgstr "The number of the pen (tool) to use (Standard: '1')" @@ -35662,6 +35091,9 @@ msgid "" "each pen, name the layers \"Pen 1\", \"Pen 2\", etc., and put your drawings " "in the corresponding layers. This overrules the pen number option above." msgstr "" +"If you want to use multiple pens on your pen plotter create one layer for " +"each pen, name the layers \"Pen 1\", \"Pen 2\", etc., and put your drawings " +"in the corresponding layers. This overrules the pen number option above." #: ../share/extensions/hpgl_output.inx.h:23 #: ../share/extensions/plotter.inx.h:51 @@ -35684,9 +35116,8 @@ msgstr "" #: ../share/extensions/hpgl_output.inx.h:26 #: ../share/extensions/plotter.inx.h:54 -#, fuzzy msgid "Tool (Knife) offset correction (mm):" -msgstr "Tool offset (mm):" +msgstr "Tool (Knife) offset correction (mm):" #: ../share/extensions/hpgl_output.inx.h:27 #: ../share/extensions/plotter.inx.h:55 @@ -35699,9 +35130,8 @@ msgstr "" #: ../share/extensions/hpgl_output.inx.h:28 #: ../share/extensions/plotter.inx.h:56 -#, fuzzy msgid "Precut" -msgstr "Use precut" +msgstr "Precut" #: ../share/extensions/hpgl_output.inx.h:29 #: ../share/extensions/plotter.inx.h:57 @@ -35756,96 +35186,85 @@ msgid "Export an HP Graphics Language file" msgstr "Export an HP Graphics Language file" #: ../share/extensions/image_attributes.inx.h:1 -#, fuzzy msgid "Set Image Attributes" -msgstr "Set Attributes" +msgstr "Set Image Attributes" #. render images like in 0.48 #: ../share/extensions/image_attributes.inx.h:3 -#, fuzzy msgid "Basic" -msgstr "Basic Latin" +msgstr "Basic" #. render images like in 0.48 #: ../share/extensions/image_attributes.inx.h:5 msgid "Support non-uniform scaling" -msgstr "" +msgstr "Support non-uniform scaling" #. render images like in 0.48 #: ../share/extensions/image_attributes.inx.h:7 msgid "Render images blocky" -msgstr "" +msgstr "Render images blocky" #. render images like in 0.48 #: ../share/extensions/image_attributes.inx.h:9 msgid "" "Render all bitmap images like in older Inskcape versions. Available options:" msgstr "" +"Render all bitmap images like in older Inskcape versions. Available options:" #. image aspect ratio #: ../share/extensions/image_attributes.inx.h:11 -#, fuzzy msgid "Image Aspect Ratio" -msgstr "Image simplification" +msgstr "Image Aspect Ratio" #. image aspect ratio #: ../share/extensions/image_attributes.inx.h:13 msgid "preserveAspectRatio attribute:" -msgstr "" +msgstr "preserveAspectRatio attribute:" #. image aspect ratio #: ../share/extensions/image_attributes.inx.h:15 msgid "meetOrSlice:" -msgstr "" +msgstr "meetOrSlice:" #. image-rendering #: ../share/extensions/image_attributes.inx.h:17 -#, fuzzy msgid "Scope:" -msgstr "Scope" +msgstr "Scope:" #. image-rendering #: ../share/extensions/image_attributes.inx.h:19 -#, fuzzy msgid "Unset" -msgstr "inset" +msgstr "Unset" #: ../share/extensions/image_attributes.inx.h:20 -#, fuzzy msgid "Change only selected image(s)" -msgstr "Embed only selected images" +msgstr "Change only selected image(s)" #: ../share/extensions/image_attributes.inx.h:21 -#, fuzzy msgid "Change all images in selection" -msgstr "Couldn't find an ellipse in selection" +msgstr "Change all images in selection" #: ../share/extensions/image_attributes.inx.h:22 -#, fuzzy msgid "Change all images in document" -msgstr "Check spelling of text in document" +msgstr "Change all images in document" #. image-rendering #: ../share/extensions/image_attributes.inx.h:24 -#, fuzzy msgid "Image Rendering Quality" -msgstr "Image Rendering:" +msgstr "Image Rendering Quality" #. image-rendering #: ../share/extensions/image_attributes.inx.h:26 -#, fuzzy msgid "Image rendering attribute:" -msgstr "Image Rendering Mode:" +msgstr "Image rendering attribute:" #: ../share/extensions/image_attributes.inx.h:27 -#, fuzzy msgid "Apply attribute to parent group of selection" -msgstr "Apply transformation to selection" +msgstr "Apply attribute to parent group of selection" #: ../share/extensions/image_attributes.inx.h:28 -#, fuzzy msgid "Apply attribute to SVG root" -msgstr "Attribute to set:" +msgstr "Apply attribute to SVG root" #: ../share/extensions/ink2canvas.inx.h:1 msgid "Convert to html5 canvas" @@ -35886,9 +35305,8 @@ msgstr "Keys and Mouse Reference" #. i18n. Please don't translate it unless a page exists in your language #: ../share/extensions/inkscape_help_keys.inx.h:3 -#, fuzzy msgid "http://inkscape.org/doc/keys092.html" -msgstr "http://inkscape.org/doc/keys048.html" +msgstr "http://inkscape.org/doc/keys092.html" #: ../share/extensions/inkscape_help_manual.inx.h:1 msgid "Inkscape Manual" @@ -35905,9 +35323,8 @@ msgstr "New in This Version" #. i18n. Please don't translate it unless a page exists in your language #: ../share/extensions/inkscape_help_relnotes.inx.h:3 -#, fuzzy msgid "http://wiki.inkscape.org/wiki/index.php/Release_notes/0.92" -msgstr "http://wiki.inkscape.org/wiki/index.php/Release_notes/0.91" +msgstr "http://wiki.inkscape.org/wiki/index.php/Release_notes/0.92" #: ../share/extensions/inkscape_help_reportabug.inx.h:1 msgid "Report a Bug" @@ -35937,14 +35354,15 @@ msgstr "Duplicate endpaths" msgid "Interpolate style" msgstr "Interpolate style" -#: ../share/extensions/interp.inx.h:7 ../share/extensions/interp_att_g.inx.h:10 -#, fuzzy +#: ../share/extensions/interp.inx.h:7 +#: ../share/extensions/interp_att_g.inx.h:10 msgid "Use Z-order" -msgstr "Raised border" +msgstr "Use Z-order" -#: ../share/extensions/interp.inx.h:8 ../share/extensions/interp_att_g.inx.h:11 +#: ../share/extensions/interp.inx.h:8 +#: ../share/extensions/interp_att_g.inx.h:11 msgid "Workaround for reversed selection order in Live Preview cycles" -msgstr "" +msgstr "Workaround for reversed selection order in Live Preview cycles" #: ../share/extensions/interp_att_g.inx.h:1 msgid "Interpolate Attribute in a group" @@ -36540,26 +35958,23 @@ msgstr "Shift node handles" #: ../share/extensions/jitternodes.inx.h:7 msgid "Distribution of the displacements:" -msgstr "" +msgstr "Distribution of the displacements:" #: ../share/extensions/jitternodes.inx.h:8 -#, fuzzy msgid "Uniform" -msgstr "Cuneiform" +msgstr "Uniform" #: ../share/extensions/jitternodes.inx.h:9 msgid "Pareto" -msgstr "" +msgstr "Pareto" #: ../share/extensions/jitternodes.inx.h:10 -#, fuzzy msgid "Gaussian" -msgstr "Gaussian Blur" +msgstr "Gaussian" #: ../share/extensions/jitternodes.inx.h:11 -#, fuzzy msgid "Log-normal" -msgstr "normal" +msgstr "Log-normal" #: ../share/extensions/jitternodes.inx.h:13 msgid "" @@ -36857,34 +36272,29 @@ msgid "Measurement Type: " msgstr "Measurement Type: " #: ../share/extensions/measure.inx.h:4 -#, fuzzy msgid "Text Presets" -msgstr "Text Preferences" +msgstr "Text Presets" #: ../share/extensions/measure.inx.h:6 -#, fuzzy msgid "Text on Path" -msgstr "Text On Path" +msgstr "Text on Path" #: ../share/extensions/measure.inx.h:8 -#, fuzzy, no-c-format +#, no-c-format msgid "Offset (%)" -msgstr "Offset (px):" +msgstr "Offset (%)" #: ../share/extensions/measure.inx.h:9 -#, fuzzy msgid "Text anchor:" -msgstr "Text anchor" +msgstr "Text anchor:" #: ../share/extensions/measure.inx.h:10 -#, fuzzy msgid "Fixed Text" -msgstr "Flowed Text" +msgstr "Fixed Text" #: ../share/extensions/measure.inx.h:11 -#, fuzzy msgid "Angle (°):" -msgstr "Angle X:" +msgstr "Angle (°):" #: ../share/extensions/measure.inx.h:12 msgid "Font size (px):" @@ -36913,50 +36323,42 @@ msgid "Center of Mass" msgstr "Center of Mass" #: ../share/extensions/measure.inx.h:21 -#, fuzzy msgid "Text on Path, Start" -msgstr "Text On Path" +msgstr "Text on Path, Start" #: ../share/extensions/measure.inx.h:22 -#, fuzzy msgid "Text on Path, Middle" -msgstr "Text On Path" +msgstr "Text on Path, Middle" #: ../share/extensions/measure.inx.h:23 -#, fuzzy msgid "Text on Path, End" -msgstr "Text On Path" +msgstr "Text on Path, End" #: ../share/extensions/measure.inx.h:24 msgid "Fixed Text, Start of Path" -msgstr "" +msgstr "Fixed Text, Start of Path" #: ../share/extensions/measure.inx.h:25 msgid "Fixed Text, Center of BBox" -msgstr "" +msgstr "Fixed Text, Centre of BBox" #: ../share/extensions/measure.inx.h:26 -#, fuzzy msgid "Fixed Text, Center of Mass" -msgstr "Center of Mass" +msgstr "Fixed Text, Center of Mass" #: ../share/extensions/measure.inx.h:28 -#, fuzzy msgid "Center" -msgstr "centre" +msgstr "Centre" #: ../share/extensions/measure.inx.h:30 -#, fuzzy msgid "Start of Path" -msgstr "Stitch path:" +msgstr "Start of Path" #: ../share/extensions/measure.inx.h:31 -#, fuzzy msgid "Center of BBox" -msgstr "Center of Mass" +msgstr "Center of BBox" #: ../share/extensions/measure.inx.h:32 -#, fuzzy msgid "Center of Mass" msgstr "Center of Mass" @@ -37041,172 +36443,151 @@ msgstr "View Next Glyph" #: ../share/extensions/nicechart.inx.h:1 msgid "NiceCharts" -msgstr "" +msgstr "NiceCharts" #: ../share/extensions/nicechart.inx.h:2 msgid "Data" -msgstr "" +msgstr "Data" #: ../share/extensions/nicechart.inx.h:3 -#, fuzzy msgid "Data from file" -msgstr "Load from file" +msgstr "Data from file" #: ../share/extensions/nicechart.inx.h:5 -#, fuzzy msgid "Delimiter:" -msgstr "Mitre _limit:" +msgstr "Delimiter:" #: ../share/extensions/nicechart.inx.h:6 msgid "Column that contains the keys:" -msgstr "" +msgstr "Column that contains the keys:" #: ../share/extensions/nicechart.inx.h:7 -#, fuzzy msgid "Column that contains the values:" -msgstr "A constant vote value" +msgstr "Column that contains the values:" #: ../share/extensions/nicechart.inx.h:8 msgid "File encoding (e.g. utf-8):" -msgstr "" +msgstr "File encoding (e.g. utf-8):" #: ../share/extensions/nicechart.inx.h:9 msgid "First line contains headings" -msgstr "" +msgstr "First line contains headings" #: ../share/extensions/nicechart.inx.h:10 -#, fuzzy msgid "Direct input" -msgstr "Direction" +msgstr "Direct input" #: ../share/extensions/nicechart.inx.h:11 msgid "Data:" -msgstr "" +msgstr "Data:" #: ../share/extensions/nicechart.inx.h:12 -#, fuzzy msgid "Enter the full path to a CSV file:" -msgstr "Full path to log file:" +msgstr "Enter the full path to a CSV file:" #: ../share/extensions/nicechart.inx.h:13 msgid "Type in comma separated values:" -msgstr "" +msgstr "Type in comma separated values:" #: ../share/extensions/nicechart.inx.h:14 msgid "(format like this: apples:3,bananas:5)" -msgstr "" +msgstr "(format like this: apples:3,bananas:5)" #: ../share/extensions/nicechart.inx.h:15 -#, fuzzy msgid "Labels" -msgstr "Label" +msgstr "Labels" #: ../share/extensions/nicechart.inx.h:16 -#, fuzzy msgid "Font:" -msgstr "Font" +msgstr "Font:" #: ../share/extensions/nicechart.inx.h:18 -#, fuzzy msgid "Font color:" -msgstr "Month colour:" +msgstr "Font colour:" #: ../share/extensions/nicechart.inx.h:19 msgid "Charts" -msgstr "" +msgstr "Charts" #: ../share/extensions/nicechart.inx.h:20 -#, fuzzy msgid "Draw horizontally" -msgstr "Move horizontally" +msgstr "Draw horizontally" #: ../share/extensions/nicechart.inx.h:21 -#, fuzzy msgid "Bar length:" -msgstr "Ma_jor length:" +msgstr "Bar length:" #: ../share/extensions/nicechart.inx.h:22 -#, fuzzy msgid "Bar width:" -msgstr "Blur width:" +msgstr "Bar width:" #: ../share/extensions/nicechart.inx.h:23 -#, fuzzy msgid "Pie radius:" -msgstr "Inner radius:" +msgstr "Pie radius:" #: ../share/extensions/nicechart.inx.h:24 -#, fuzzy msgid "Bar offset:" -msgstr "Text path offset" +msgstr "Bar offset:" #: ../share/extensions/nicechart.inx.h:26 msgid "Offset between chart and labels:" -msgstr "" +msgstr "Offset between chart and labels:" #: ../share/extensions/nicechart.inx.h:27 msgid "Offset between chart and chart title:" -msgstr "" +msgstr "Offset between chart and chart title:" #: ../share/extensions/nicechart.inx.h:28 msgid "Work around aliasing effects (creates overlapping segments)" -msgstr "" +msgstr "Work around aliasing effects (creates overlapping segments)" #: ../share/extensions/nicechart.inx.h:29 -#, fuzzy msgid "Color scheme:" -msgstr "Colours:" +msgstr "Colour scheme:" #: ../share/extensions/nicechart.inx.h:30 -#, fuzzy msgid "Custom colors:" -msgstr "Bump colour" +msgstr "Custom colours:" #: ../share/extensions/nicechart.inx.h:31 -#, fuzzy msgid "Reverse color scheme" -msgstr "Remove stroke colour" +msgstr "Reverse colour scheme" #: ../share/extensions/nicechart.inx.h:32 -#, fuzzy msgid "Drop shadow" -msgstr "Drop Shadow" +msgstr "Drop shadow" #: ../share/extensions/nicechart.inx.h:37 msgid "SAP" -msgstr "" +msgstr "SAP" #: ../share/extensions/nicechart.inx.h:38 -#, fuzzy msgid "Values" -msgstr "Value" +msgstr "Values" #: ../share/extensions/nicechart.inx.h:39 -#, fuzzy msgid "Show values" -msgstr "Show Handles" +msgstr "Show values" #: ../share/extensions/nicechart.inx.h:40 -#, fuzzy msgid "Chart type:" -msgstr "Shadow type:" +msgstr "Chart type:" #: ../share/extensions/nicechart.inx.h:41 -#, fuzzy msgid "Bar chart" -msgstr "Bar Height:" +msgstr "Bar chart" #: ../share/extensions/nicechart.inx.h:42 msgid "Pie chart" -msgstr "" +msgstr "Pie chart" #: ../share/extensions/nicechart.inx.h:43 msgid "Pie chart (percentage)" -msgstr "" +msgstr "Pie chart (percentage)" #: ../share/extensions/nicechart.inx.h:44 msgid "Stacked bar chart" -msgstr "" +msgstr "Stacked bar chart" #: ../share/extensions/param_curves.inx.h:1 msgid "Parametric Curves" @@ -37490,9 +36871,8 @@ msgid "The Baud rate of your serial connection (Default: 9600)" msgstr "The Baud rate of your serial connection (Default: 9600)" #: ../share/extensions/plotter.inx.h:8 -#, fuzzy msgid "Serial byte size:" -msgstr "Palette size:" +msgstr "Serial byte size:" #: ../share/extensions/plotter.inx.h:10 #, no-c-format @@ -37500,11 +36880,12 @@ msgid "" "The Byte size of your serial connection, 99% of all plotters use the default " "setting (Default: 8 Bits)" msgstr "" +"The Byte size of your serial connection, 99% of all plotters use the default " +"setting (Default: 8 Bits)" #: ../share/extensions/plotter.inx.h:11 -#, fuzzy msgid "Serial stop bits:" -msgstr "Serial port:" +msgstr "Serial stop bits:" #: ../share/extensions/plotter.inx.h:13 #, no-c-format @@ -37512,11 +36893,12 @@ msgid "" "The Stop bits of your serial connection, 99% of all plotters use the default " "setting (Default: 1 Bit)" msgstr "" +"The Stop bits of your serial connection, 99% of all plotters use the default " +"setting (Default: 1 Bit)" #: ../share/extensions/plotter.inx.h:14 -#, fuzzy msgid "Serial parity:" -msgstr "Serial port:" +msgstr "Serial parity:" #: ../share/extensions/plotter.inx.h:16 #, no-c-format @@ -37524,11 +36906,12 @@ msgid "" "The Parity of your serial connection, 99% of all plotters use the default " "setting (Default: None)" msgstr "" +"The Parity of your serial connection, 99% of all plotters use the default " +"setting (Default: None)" #: ../share/extensions/plotter.inx.h:17 -#, fuzzy msgid "Serial flow control:" -msgstr "Flow control:" +msgstr "Serial flow control:" #: ../share/extensions/plotter.inx.h:18 msgid "" @@ -37567,9 +36950,8 @@ msgid "DMPL" msgstr "DMPL" #: ../share/extensions/plotter.inx.h:27 -#, fuzzy msgid "KNK Plotter (HPGL variant)" -msgstr "KNK Zing (HPGL variant)" +msgstr "KNK Plotter (HPGL variant)" #: ../share/extensions/plotter.inx.h:28 msgid "" @@ -37621,7 +37003,8 @@ msgstr "" msgid "AutoCAD Plot Input" msgstr "AutoCAD Plot Input" -#: ../share/extensions/plt_input.inx.h:2 ../share/extensions/plt_output.inx.h:2 +#: ../share/extensions/plt_input.inx.h:2 +#: ../share/extensions/plt_output.inx.h:2 msgid "HP Graphics Language Plot file [AutoCAD] (*.plt)" msgstr "HP Graphics Language Plot file [AutoCAD] (*.plt)" @@ -38068,29 +37451,24 @@ msgid "Restack" msgstr "Restack" #: ../share/extensions/restack.inx.h:2 -#, fuzzy msgid "Based on Position" -msgstr "Position" +msgstr "Based on Position" #: ../share/extensions/restack.inx.h:3 -#, fuzzy msgid "Presets" -msgstr "Preset:" +msgstr "Presets" #: ../share/extensions/restack.inx.h:6 -#, fuzzy msgid "Horizontal:" -msgstr "_Horizontal:" +msgstr "Horizontal:" #: ../share/extensions/restack.inx.h:7 -#, fuzzy msgid "Vertical:" -msgstr "_Vertical:" +msgstr "Vertical:" #: ../share/extensions/restack.inx.h:8 -#, fuzzy msgid "Restack Direction" -msgstr "Restack Direction:" +msgstr "Restack Direction" #: ../share/extensions/restack.inx.h:9 msgid "Left to Right (0)" @@ -38117,9 +37495,8 @@ msgid "Radial Inward" msgstr "Radial Inward" #: ../share/extensions/restack.inx.h:15 -#, fuzzy msgid "Object Reference Point" -msgstr "in-out reference point" +msgstr "Object Reference Point" #: ../share/extensions/restack.inx.h:17 #: ../share/extensions/text_extract.inx.h:9 @@ -38140,23 +37517,20 @@ msgid "Bottom" msgstr "Bottom" #: ../share/extensions/restack.inx.h:21 -#, fuzzy msgid "Based on Z-Order" -msgstr "Raised border" +msgstr "Based on Z-Order" #: ../share/extensions/restack.inx.h:22 -#, fuzzy msgid "Restack Mode" -msgstr "Restack" +msgstr "Restack Mode" #: ../share/extensions/restack.inx.h:23 -#, fuzzy msgid "Reverse Z-Order" -msgstr "Reverse gradient" +msgstr "Reverse Z-Order" #: ../share/extensions/restack.inx.h:24 msgid "Shuffle Z-Order" -msgstr "" +msgstr "Shuffle Z-Order" #: ../share/extensions/restack.inx.h:26 msgid "" @@ -38165,6 +37539,10 @@ msgid "" "objects inside a single selected group, or a selection of multiple objects " "on the current drawing level (layer or group)." msgstr "" +"This extension changes the z-order of objects based on their position on the " +"canvas or their current z-order. Selection: The extension restacks either " +"objects inside a single selected group, or a selection of multiple objects " +"on the current drawing level (layer or group)." #: ../share/extensions/restack.inx.h:27 #: ../share/extensions/ungroup_deep.inx.h:6 @@ -38184,13 +37562,12 @@ msgid "Minimum size:" msgstr "Minimum size:" #: ../share/extensions/rtree.inx.h:4 -#, fuzzy msgid "Omit redundant segments" -msgstr "Straighten segments" +msgstr "Omit redundant segments" #: ../share/extensions/rtree.inx.h:5 msgid "Lift pen for backward steps" -msgstr "" +msgstr "Lift pen for backward steps" #: ../share/extensions/rubberstretch.inx.h:1 msgid "Rubber Stretch" @@ -38211,9 +37588,8 @@ msgid "Optimized SVG Output" msgstr "Optimised SVG Output" #: ../share/extensions/scour.inx.h:3 -#, fuzzy msgid "Number of significant digits for coordinates:" -msgstr "Number of significant digits for coords:" +msgstr "Number of significant digits for coordinates:" #: ../share/extensions/scour.inx.h:4 msgid "" @@ -38223,6 +37599,11 @@ msgid "" "\"3\" is specified, the coordinate 3.14159 is output as 3.14 while the " "coordinate 123.675 is output as 124." msgstr "" +"Specifies the number of significant digits that should be output for " +"coordinates. Note that significant digits are *not* the number of decimals " +"but the overall number of digits in the output. For example if a value of " +"\"3\" is specified, the coordinate 3.14159 is output as 3.14 while the " +"coordinate 123.675 is output as 124." #: ../share/extensions/scour.inx.h:5 msgid "Shorten color values" @@ -38233,6 +37614,8 @@ msgid "" "Convert all color specifications to #RRGGBB (or #RGB where applicable) " "format." msgstr "" +"Convert all colour specifications to #RRGGBB (or #RGB where applicable) " +"format." #: ../share/extensions/scour.inx.h:7 msgid "Convert CSS attributes to XML attributes" @@ -38243,17 +37626,20 @@ msgid "" "Convert styles from style tags and inline style=\"\" declarations into XML " "attributes." msgstr "" +"Convert styles from style tags and inline style=\"\" declarations into XML " +"attributes." #: ../share/extensions/scour.inx.h:9 -#, fuzzy msgid "Collapse groups" -msgstr "Clea_r All" +msgstr "Collapse groups" #: ../share/extensions/scour.inx.h:10 msgid "" "Remove useless groups, promoting their contents up one level. Requires " "\"Remove unused IDs\" to be set." msgstr "" +"Remove useless groups, promoting their contents up one level. Requires " +"\"Remove unused IDs\" to be set." #: ../share/extensions/scour.inx.h:11 msgid "Create groups for similar attributes" @@ -38264,6 +37650,8 @@ msgid "" "Create groups for runs of elements having at least one attribute in common " "(e.g. fill-color, stroke-opacity, ...)." msgstr "" +"Create groups for runs of elements having at least one attribute in common " +"(e.g. fill-color, stroke-opacity, ...)." #: ../share/extensions/scour.inx.h:13 msgid "Keep editor data" @@ -38274,14 +37662,16 @@ msgid "" "Don't remove editor-specific elements and attributes. Currently supported: " "Inkscape, Sodipodi and Adobe Illustrator." msgstr "" +"Don't remove editor-specific elements and attributes. Currently supported: " +"Inkscape, Sodipodi and Adobe Illustrator." #: ../share/extensions/scour.inx.h:15 msgid "Keep unreferenced definitions" -msgstr "" +msgstr "Keep unreferenced definitions" #: ../share/extensions/scour.inx.h:16 msgid "Keep element definitions that are not currently used in the SVG" -msgstr "" +msgstr "Keep element definitions that are not currently used in the SVG" #: ../share/extensions/scour.inx.h:17 msgid "Work around renderer bugs" @@ -38292,11 +37682,12 @@ msgid "" "Works around some common renderer bugs (mainly libRSVG) at the cost of a " "slightly larger SVG file." msgstr "" +"Works around some common renderer bugs (mainly libRSVG) at the cost of a " +"slightly larger SVG file." #: ../share/extensions/scour.inx.h:20 -#, fuzzy msgid "Remove the XML declaration" -msgstr "Remove the xml declaration" +msgstr "Remove the XML declaration" #: ../share/extensions/scour.inx.h:21 msgid "" @@ -38304,6 +37695,9 @@ msgid "" "especially if special characters are used in the document) from the file " "header." msgstr "" +"Removes the XML declaration (which is optional but should be provided, " +"especially if special characters are used in the document) from the file " +"header." #: ../share/extensions/scour.inx.h:22 msgid "Remove metadata" @@ -38315,6 +37709,9 @@ msgid "" "include license and author information, alternate versions for non-SVG-" "enabled browsers, etc." msgstr "" +"Remove metadata tags along with all the contained information, which may " +"include licence and author information, alternate versions for non-SVG-" +"enabled browsers, etc." #: ../share/extensions/scour.inx.h:24 msgid "Remove comments" @@ -38322,18 +37719,19 @@ msgstr "Remove comments" #: ../share/extensions/scour.inx.h:25 msgid "Remove all XML comments from output." -msgstr "" +msgstr "Remove all XML comments from output." #: ../share/extensions/scour.inx.h:26 -#, fuzzy msgid "Embed raster images" -msgstr "Embed rasters" +msgstr "Embed raster images" #: ../share/extensions/scour.inx.h:27 msgid "" "Resolve external references to raster images and embed them as Base64-" "encoded data URLs." msgstr "" +"Resolve external references to raster images and embed them as Base64-" +"encoded data URLs." #: ../share/extensions/scour.inx.h:28 msgid "Enable viewboxing" @@ -38345,10 +37743,12 @@ msgid "" "Set page size to 100%/100% (full width and height of the display area) and " "introduce a viewBox specifying the drawings dimensions." msgstr "" +"Set page size to 100%/100% (full width and height of the display area) and " +"introduce a viewBox specifying the drawings dimensions." #: ../share/extensions/scour.inx.h:31 msgid "Format output with line-breaks and indentation" -msgstr "" +msgstr "Format output with line-breaks and indentation" #: ../share/extensions/scour.inx.h:32 msgid "" @@ -38356,11 +37756,13 @@ msgid "" "to hand-edit the SVG file you can disable this option to bring down the file " "size even more at the cost of clarity." msgstr "" +"Produce nicely formatted output including line-breaks. If you do not intend " +"to hand-edit the SVG file you can disable this option to bring down the file " +"size even more at the cost of clarity." #: ../share/extensions/scour.inx.h:33 -#, fuzzy msgid "Indentation characters:" -msgstr "Unicode character:" +msgstr "Indentation characters:" #: ../share/extensions/scour.inx.h:34 msgid "" @@ -38368,21 +37770,25 @@ msgid "" "Specify \"None\" to disable indentation. This option has no effect if " "\"Format output with line-breaks and indentation\" is disabled." msgstr "" +"The type of indentation used for each level of nesting in the output. " +"Specify \"None\" to disable indentation. This option has no effect if " +"\"Format output with line-breaks and indentation\" is disabled." #: ../share/extensions/scour.inx.h:35 -#, fuzzy msgid "Depth of indentation:" -msgstr "Depth function:" +msgstr "Depth of indentation:" #: ../share/extensions/scour.inx.h:36 msgid "" "The depth of the chosen type of indentation. E.g. if you choose \"2\" every " "nesting level in the output will be indented by two additional spaces/tabs." msgstr "" +"The depth of the chosen type of indentation. E.g. if you choose \"2\" every " +"nesting level in the output will be indented by two additional spaces/tabs." #: ../share/extensions/scour.inx.h:37 msgid "Strip the \"xml:space\" attribute from the root SVG element" -msgstr "" +msgstr "Strip the \"xml:space\" attribute from the root SVG element" #: ../share/extensions/scour.inx.h:38 msgid "" @@ -38390,16 +37796,17 @@ msgid "" "root SVG element which instructs the SVG editor not to change whitespace in " "the document at all (and therefore overrides the options above)." msgstr "" +"This is useful if the input file specifies \"xml:space='preserve'\" in the " +"root SVG element which instructs the SVG editor not to change whitespace in " +"the document at all (and therefore overrides the options above)." #: ../share/extensions/scour.inx.h:39 -#, fuzzy msgid "Document options" -msgstr "_Document Properties..." +msgstr "Document options" #: ../share/extensions/scour.inx.h:40 -#, fuzzy msgid "Pretty-printing" -msgstr "Painting" +msgstr "Pretty-printing" #: ../share/extensions/scour.inx.h:41 msgid "Space" @@ -38410,26 +37817,25 @@ msgid "Tab" msgstr "Tab" #: ../share/extensions/scour.inx.h:43 -#, fuzzy msgctxt "Indent" msgid "None" msgstr "None" #: ../share/extensions/scour.inx.h:44 -#, fuzzy msgid "IDs" -msgstr "ID" +msgstr "IDs" #: ../share/extensions/scour.inx.h:45 -#, fuzzy msgid "Remove unused IDs" -msgstr "Remove Red" +msgstr "Remove unused IDs" #: ../share/extensions/scour.inx.h:46 msgid "" "Remove all unreferenced IDs from elements. Those are not needed for " "rendering." msgstr "" +"Remove all unreferenced IDs from elements. Those are not needed for " +"rendering." #: ../share/extensions/scour.inx.h:47 msgid "Shorten IDs" @@ -38441,19 +37847,21 @@ msgid "" "shortest values to the most-referenced elements. For instance, " "\"linearGradient5621\" will become \"a\" if it is the most used element." msgstr "" +"Minimise the length of IDs using only lowercase letters, assigning the " +"shortest values to the most-referenced elements. For instance, " +"\"linearGradient5621\" will become \"a\" if it is the most used element." #: ../share/extensions/scour.inx.h:49 msgid "Prefix shortened IDs with:" -msgstr "" +msgstr "Prefix shortened IDs with:" #: ../share/extensions/scour.inx.h:50 msgid "Prepend shortened IDs with the specified prefix." -msgstr "" +msgstr "Prepend shortened IDs with the specified prefix." #: ../share/extensions/scour.inx.h:51 -#, fuzzy msgid "Preserve manually created IDs not ending with digits" -msgstr "Preserve manually created ID names not ending with digits" +msgstr "Preserve manually created IDs not ending with digits" #: ../share/extensions/scour.inx.h:52 msgid "" @@ -38462,28 +37870,30 @@ msgid "" "preserved while numbered IDs (as they are generated by most SVG editors " "including Inkscape) will be removed/shortened." msgstr "" +"Descriptive IDs which were manually created to reference or label specific " +"elements or groups (e.g. #arrowStart, #arrowEnd or #textLabels) will be " +"preserved while numbered IDs (as they are generated by most SVG editors " +"including Inkscape) will be removed/shortened." #: ../share/extensions/scour.inx.h:53 -#, fuzzy msgid "Preserve the following IDs:" -msgstr "" -"Found the following fonts:\n" -"%s" +msgstr "Preserve the following IDs:" #: ../share/extensions/scour.inx.h:54 msgid "A comma-separated list of IDs that are to be preserved." -msgstr "" +msgstr "A comma-separated list of IDs that are to be preserved." #: ../share/extensions/scour.inx.h:55 -#, fuzzy msgid "Preserve IDs starting with:" -msgstr "Preserve ID names starting with:" +msgstr "Preserve IDs starting with:" #: ../share/extensions/scour.inx.h:56 msgid "" "Preserve all IDs that start with the specified prefix (e.g. specify \"flag\" " "to preserve \"flag-mx\", \"flag-pt\", etc.)." msgstr "" +"Preserve all IDs that start with the specified prefix (e.g. specify \"flag\" " +"to preserve \"flag-mx\", \"flag-pt\", etc.)." #: ../share/extensions/scour.inx.h:57 msgid "Optimized SVG (*.svg)" @@ -38494,30 +37904,26 @@ msgid "Scalable Vector Graphics" msgstr "Scalable Vector Graphics" #: ../share/extensions/seamless_pattern.inx.h:1 -#, fuzzy msgid "Seamless Pattern" -msgstr "Braille Patterns" +msgstr "Seamless Pattern" #: ../share/extensions/seamless_pattern.inx.h:2 #: ../share/extensions/seamless_pattern_procedural.inx.h:2 -#, fuzzy msgid "Custom Width (px):" -msgstr "Stroke width (px):" +msgstr "Custom Width (px):" #: ../share/extensions/seamless_pattern.inx.h:3 #: ../share/extensions/seamless_pattern_procedural.inx.h:3 -#, fuzzy msgid "Custom Height (px):" -msgstr "Right (px):" +msgstr "Custom Height (px):" #: ../share/extensions/seamless_pattern.inx.h:4 -#, fuzzy msgid "This extension overwrites the current document" -msgstr "Remove Symbol from the current document." +msgstr "This extension overwrites the current document" #: ../share/extensions/seamless_pattern_procedural.inx.h:1 msgid "Seamless Pattern Procedural" -msgstr "" +msgstr "Seamless Pattern Procedural" #: ../share/extensions/setup_typography_canvas.inx.h:1 msgid "1 - Setup Typography Canvas" @@ -38547,7 +37953,8 @@ msgstr "Descender:" msgid "sK1 vector graphics files input" msgstr "sK1 vector graphics files input" -#: ../share/extensions/sk1_input.inx.h:2 ../share/extensions/sk1_output.inx.h:2 +#: ../share/extensions/sk1_input.inx.h:2 +#: ../share/extensions/sk1_output.inx.h:2 msgid "sK1 vector graphics files (*.sk1)" msgstr "sK1 vector graphics files (*.sk1)" @@ -39016,28 +38423,24 @@ msgid "From Side c and Angles a, b" msgstr "From Side c and Angles a, b" #: ../share/extensions/ungroup_deep.inx.h:1 -#, fuzzy msgid "Deep Ungroup" -msgstr "Ungroup" +msgstr "Deep Ungroup" #: ../share/extensions/ungroup_deep.inx.h:2 -#, fuzzy msgid "Ungroup all groups in the selected object." -msgstr "Create a clone (a copy linked to the original) of selected object" +msgstr "Ungroup all groups in the selected object." #: ../share/extensions/ungroup_deep.inx.h:3 -#, fuzzy msgid "Starting Depth" -msgstr "Stitch path:" +msgstr "Starting Depth" #: ../share/extensions/ungroup_deep.inx.h:4 -#, fuzzy msgid "Stopping Depth (from top)" -msgstr "Remove clipping path from selection" +msgstr "Stopping Depth (from top)" #: ../share/extensions/ungroup_deep.inx.h:5 msgid "Depth to Keep (from bottom)" -msgstr "" +msgstr "Depth to Keep (from bottom)" #: ../share/extensions/voronoi2svg.inx.h:1 msgid "Voronoi Diagram" @@ -39056,9 +38459,8 @@ msgid "Show the bounding box" msgstr "Show the bounding box" #: ../share/extensions/voronoi2svg.inx.h:6 -#, fuzzy msgid "Triangles color" -msgstr "Triangle out" +msgstr "Triangles colour" #: ../share/extensions/voronoi2svg.inx.h:7 msgid "Delaunay Triangulation" @@ -39077,22 +38479,20 @@ msgid "Automatic from selected objects" msgstr "Automatic from selected objects" #: ../share/extensions/voronoi2svg.inx.h:12 -#, fuzzy msgid "Options for Delaunay Triangulation" -msgstr "Delaunay Triangulation" +msgstr "Options for Delaunay Triangulation" #: ../share/extensions/voronoi2svg.inx.h:13 msgid "Default (Stroke black and no fill)" -msgstr "" +msgstr "Default (Stroke black and no fill)" #: ../share/extensions/voronoi2svg.inx.h:14 -#, fuzzy msgid "Triangles with item color" -msgstr "Change swatch colour" +msgstr "Triangles with item colour" #: ../share/extensions/voronoi2svg.inx.h:15 msgid "Triangles with item color (random on apply)" -msgstr "" +msgstr "Triangles with item colour (random on apply)" #: ../share/extensions/voronoi2svg.inx.h:17 msgid "" @@ -39517,11 +38917,13 @@ msgstr "Tilt (deg):" msgid "Hide lines behind the sphere" msgstr "Hide lines behind the sphere" -#: ../share/extensions/wmf_input.inx.h:1 ../share/extensions/wmf_output.inx.h:1 +#: ../share/extensions/wmf_input.inx.h:1 +#: ../share/extensions/wmf_output.inx.h:1 msgid "Windows Metafile Input" msgstr "Windows Metafile Input" -#: ../share/extensions/wmf_input.inx.h:3 ../share/extensions/wmf_output.inx.h:3 +#: ../share/extensions/wmf_input.inx.h:3 +#: ../share/extensions/wmf_output.inx.h:3 msgid "A popular graphics file format for clipart" msgstr "A popular graphics file format for clipart" @@ -39551,6 +38953,23 @@ msgstr "XAML Input" #~ "The selected object is not a path.\n" #~ "Try using the procedure Path->Object to Path." +#~ msgid "" +#~ "pySerial is not installed.\n" +#~ "\n" +#~ "1. Download pySerial here (not the \".exe\"!): http://pypi.python.org/" +#~ "pypi/pyserial\n" +#~ "2. Extract the \"serial\" subfolder from the zip to the following folder: " +#~ "C:\\[Program files]\\inkscape\\python\\Lib\\\n" +#~ "3. Restart Inkscape." +#~ msgstr "" +#~ "pySerial is not installed.\n" +#~ "\n" +#~ "1. Download pySerial here (not the \".exe\"!): http://pypi.python.org/" +#~ "pypi/pyserial\n" +#~ "2. Extract the \"serial\" subfolder from the zip to the following folder: " +#~ "C:\\[Program files]\\inkscape\\python\\Lib\\\n" +#~ "3. Restart Inkscape." + #~ msgid "" #~ "Converts to HSL, randomizes hue and/or saturation and/or lightness and " #~ "converts it back to RGB." @@ -39568,7 +38987,16 @@ msgstr "XAML Input" #~ msgid "Fixed Angle" #~ msgstr "Fixed Angle" -#, fuzzy +#~ msgid "Initialization commands:" +#~ msgstr "Initialisation commands:" + +#~ msgid "" +#~ "Commands that will be sent to the plotter before the main data stream, " +#~ "only use this if you know what you are doing! (Default: Empty)" +#~ msgstr "" +#~ "Commands that will be sent to the plotter before the main data stream, " +#~ "only use this if you know what you are doing! (Default: Empty)" + #~ msgctxt "Flow control" #~ msgid "None" #~ msgstr "None" @@ -43163,6 +42591,9 @@ msgstr "XAML Input" #~ msgid "Export To Open Clip Art Library" #~ msgstr "Export To Open Clip Art Library" +#~ msgid "Light x-Position" +#~ msgstr "Light x-Position" + #~ msgid "Light y-Position" #~ msgstr "Light y-Position" -- cgit v1.2.3 From 9f19c4dfa626ebdc49a4be26e52f42e155f310bd Mon Sep 17 00:00:00 2001 From: suv-lp <> Date: Thu, 23 Jun 2016 07:15:52 +0200 Subject: [Bug #1589792] Fix scaling for Draw From Triangle. Fixed bugs: - https://launchpad.net/bugs/1589792 (bzr r15000) --- share/extensions/draw_from_triangle.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/share/extensions/draw_from_triangle.py b/share/extensions/draw_from_triangle.py index 74a58b863..3146fe26e 100755 --- a/share/extensions/draw_from_triangle.py +++ b/share/extensions/draw_from_triangle.py @@ -147,8 +147,6 @@ def get_n_points_from_path( node, n):#returns a list of first n points (x,y) in if len(xi) == n and len(yi) == n: points = [] # returned pairs of points for i in range(n): - xi[i] = Draw_From_Triangle.unittouu(e, str(xi[i]) + 'px') - yi[i] = Draw_From_Triangle.unittouu(e, str(yi[i]) + 'px') points.append( [ xi[i], yi[i] ] ) else: #inkex.errormsg(_('Error: Not enough nodes to gather coordinates.')) #fail silently and exit, rather than invoke an error console @@ -176,21 +174,23 @@ def cot(x):#cotangent(x) return 1/tan(x) def report_properties( params ):#report to the Inkscape console using errormsg - inkex.errormsg(_("Side Length 'a' (px): " + str( params[0][0] ) )) - inkex.errormsg(_("Side Length 'b' (px): " + str( params[0][1] ) )) - inkex.errormsg(_("Side Length 'c' (px): " + str( params[0][2] ) )) + # TODO: unit identifier needs solution for arbitrary document scale + unit = Draw_From_Triangle.getDocumentUnit(e) + inkex.errormsg(_("Side Length 'a' (" + unit + "): " + str( params[0][0] ) )) + inkex.errormsg(_("Side Length 'b' (" + unit + "): " + str( params[0][1] ) )) + inkex.errormsg(_("Side Length 'c' (" + unit + "): " + str( params[0][2] ) )) inkex.errormsg(_("Angle 'A' (radians): " + str( params[1][0] ) )) inkex.errormsg(_("Angle 'B' (radians): " + str( params[1][1] ) )) inkex.errormsg(_("Angle 'C' (radians): " + str( params[1][2] ) )) inkex.errormsg(_("Semiperimeter (px): " + str( params[4][1] ) )) - inkex.errormsg(_("Area (px^2): " + str( params[4][0] ) )) + inkex.errormsg(_("Area ("+ unit + "^2): " + str( params[4][0] ) )) return class Style(object): #container for style information def __init__(self, options): #dot markers - self.d_rad = 4 #dot marker radius + self.d_rad = Draw_From_Triangle.unittouu(e, '4px') #dot marker radius self.d_th = Draw_From_Triangle.unittouu(e, '2px') #stroke width self.d_fill= '#aaaaaa' #fill colour self.d_col = '#000000' #stroke colour -- cgit v1.2.3 From a2abc287716054efec7514b36e4ec6beb69400bc Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Thu, 23 Jun 2016 07:48:07 +0200 Subject: [Bug #1594542] Reset paint buckets parameters icon is not visible in Tool Controls Bar. Fixed bugs: - https://launchpad.net/bugs/1594542 (bzr r15001) --- src/widgets/paintbucket-toolbar.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/widgets/paintbucket-toolbar.cpp b/src/widgets/paintbucket-toolbar.cpp index 5cb2dd58b..b717d74fa 100644 --- a/src/widgets/paintbucket-toolbar.cpp +++ b/src/widgets/paintbucket-toolbar.cpp @@ -42,6 +42,7 @@ #include "ui/uxmanager.h" #include "ui/widget/unit-tracker.h" #include "util/units.h" +#include "widgets/ink-action.h" using Inkscape::UI::Widget::UnitTracker; using Inkscape::UI::UXManager; @@ -207,13 +208,14 @@ void sp_paintbucket_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions /* Reset */ { - GtkAction* act = gtk_action_new( "PaintbucketResetAction", + InkAction* inky = ink_action_new( "PaintbucketResetAction", _("Defaults"), _("Reset paint bucket parameters to defaults (use Inkscape Preferences > Tools to change defaults)"), - INKSCAPE_ICON("edit-clear")); - g_signal_connect_after( G_OBJECT(act), "activate", G_CALLBACK(paintbucket_defaults), holder ); - gtk_action_group_add_action( mainActions, act ); - gtk_action_set_sensitive( act, TRUE ); + INKSCAPE_ICON("edit-clear"), + Inkscape::ICON_SIZE_SMALL_TOOLBAR); + g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(paintbucket_defaults), holder ); + gtk_action_group_add_action( mainActions, GTK_ACTION(inky) ); + gtk_action_set_sensitive( GTK_ACTION(inky), TRUE ); } } -- cgit v1.2.3 From a4ba7249e4e4510665860eebb43262b0ec7612b0 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 25 Jun 2016 20:55:14 +0200 Subject: Fix bug#168286 also opem regression on bug#1594565 Fixed bugs: - https://launchpad.net/bugs/168286 (bzr r15002) --- src/sp-item-group.cpp | 104 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 103 insertions(+), 1 deletion(-) diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp index 83d67cf5a..70d2bc732 100644 --- a/src/sp-item-group.cpp +++ b/src/sp-item-group.cpp @@ -53,6 +53,10 @@ #include "layer-model.h" #include "sp-textpath.h" #include "sp-flowtext.h" +#include "sp-tspan.h" +#include "selection-chemistry.h" +#include "xml/sp-css-attr.h" +#include "svg/css-ostringstream.h" using Inkscape::DocumentUndo; @@ -388,6 +392,89 @@ void sp_item_group_ungroup_handle_clones(SPItem *parent, Geom::Affine const g) } } +void +sp_recursive_scale_text_size(Inkscape::XML::Node *repr, double scale){ + for (Inkscape::XML::Node *child = repr->firstChild() ; child; child = child->next() ){ + if ( child) { + sp_recursive_scale_text_size(child, scale); + } + } + SPCSSAttr * css = sp_repr_css_attr(repr,"style"); + Glib::ustring element = g_quark_to_string(repr->code()); + if (css && element == "svg:text" || element == "svg:tspan") { + gchar const *w = sp_repr_css_property(css, "font-size", NULL); + if (w) { + gchar *units = NULL; + double wd = g_ascii_strtod(w, &units); + wd *= scale; + if (w != units) { + Inkscape::CSSOStringStream os; + os << wd << units; // reattach units + sp_repr_css_set_property(css, "font-size", os.str().c_str()); + Glib::ustring css_str; + sp_repr_css_write_string(css,css_str); + repr->setAttribute("style", css_str.c_str()); + } + } + w = NULL; + w = sp_repr_css_property(css, "letter-spacing", NULL); + if (w) { + gchar *units = NULL; + double wd = g_ascii_strtod(w, &units); + wd *= scale; + if (w != units) { + Inkscape::CSSOStringStream os; + os << wd << units; // reattach units + sp_repr_css_set_property(css, "letter-spacing", os.str().c_str()); + Glib::ustring css_str; + sp_repr_css_write_string(css,css_str); + repr->setAttribute("style", css_str.c_str()); + } + } + w = NULL; + w = sp_repr_css_property(css, "word-spacing", NULL); + if (w) { + gchar *units = NULL; + double wd = g_ascii_strtod(w, &units); + wd *= scale; + if (w != units) { + Inkscape::CSSOStringStream os; + os << wd << units; // reattach units + sp_repr_css_set_property(css, "word-spacing", os.str().c_str()); + Glib::ustring css_str; + sp_repr_css_write_string(css,css_str); + repr->setAttribute("style", css_str.c_str()); + } + } + gchar const *dx = repr->attribute("dx"); + if (dx) { + gchar ** dxarray = g_strsplit(dx, " ", 0); + Inkscape::SVGOStringStream dx_data; + while (*dxarray != NULL) { + double pos; + sp_svg_number_read_d(*dxarray, &pos); + pos *= scale; + dx_data << pos << " "; + dxarray++; + } + repr->setAttribute("dx", dx_data.str().c_str()); + } + gchar const *dy = repr->attribute("dy"); + if (dy) { + gchar ** dyarray = g_strsplit(dy, " ", 0); + Inkscape::SVGOStringStream dy_data; + while (*dyarray != NULL) { + double pos; + sp_svg_number_read_d(*dyarray, &pos); + pos *= scale; + dy_data << pos << " "; + dyarray++; + } + repr->setAttribute("dy", dy_data.str().c_str()); + } + } +} + void sp_item_group_ungroup (SPGroup *group, std::vector &children, bool do_done) { @@ -492,7 +579,22 @@ sp_item_group_ungroup (SPGroup *group, std::vector &children, bool do_d // reattached outside of the group, the transform will be written more properly // (i.e. optimized into the object if the corresponding preference is set) gchar *affinestr=sp_svg_transform_write(ctrans); - nrepr->setAttribute("transform", affinestr); + SPText * text = dynamic_cast(citem); + if (text) { + //this causes a change in text-on-path appearance when there is a non-conformal transform, see bug #1594565 + double scale = (ctrans.expansionX() + ctrans.expansionY()) / 2.0; + SPTextPath * text_path = dynamic_cast(text->children); + if (!text_path) { + nrepr->setAttribute("transform", affinestr); + } else { + sp_recursive_scale_text_size(nrepr, scale); + Geom::Affine ttrans = ctrans.inverse() * SP_ITEM(text)->transform * ctrans; + gchar *affinestr = sp_svg_transform_write(ttrans); + nrepr->setAttribute("transform", affinestr); + } + } else { + nrepr->setAttribute("transform", affinestr); + } g_free(affinestr); items = g_slist_prepend (items, nrepr); -- cgit v1.2.3 From 0aca36171bd8c5c33823f839f594b8677d97c51d Mon Sep 17 00:00:00 2001 From: Alvin Penner Date: Wed, 29 Jun 2016 05:34:04 -0400 Subject: avoid zero SBasis curve. (Bug 1593963) Fixed bugs: - https://launchpad.net/bugs/1593963 (bzr r15003) --- src/2geom/sbasis-geometric.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/2geom/sbasis-geometric.cpp b/src/2geom/sbasis-geometric.cpp index 19eccc451..3fe27748e 100644 --- a/src/2geom/sbasis-geometric.cpp +++ b/src/2geom/sbasis-geometric.cpp @@ -227,7 +227,7 @@ Geom::unitVector(D2 const &V_in, double tol, unsigned order){ // -This approach is numerically bad. Find a stable way to rescale V_in to have non vanishing ends. // -This done, unitVector will have jumps at zeros: fill the gaps with arcs of circles. D2 V = RescaleForNonVanishingEnds(V_in); - if (V[0].isZero(0) && V[1].isZero(0)) + if (V[0].isZero(tol) && V[1].isZero(tol)) return Piecewise >(D2(Linear(1),SBasis())); SBasis x = V[0], y = V[1]; -- cgit v1.2.3 From 30e74d438ef362634967a47053ecf27fb950e340 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 2 Jul 2016 02:27:56 +0200 Subject: Fix bug #1598009 regression on path parameter Fixed bugs: - https://launchpad.net/bugs/1598009 (bzr r15004) --- src/live_effects/parameter/path.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp index bed191e83..f0c494267 100644 --- a/src/live_effects/parameter/path.cpp +++ b/src/live_effects/parameter/path.cpp @@ -237,7 +237,6 @@ PathParam::param_editOncanvas(SPItem *item, SPDesktop * dt) r.role = SHAPE_ROLE_LPE_PARAM; r.edit_transform = item->i2dt_affine(); // TODO is it right? - r.edit_transform *= item->transform.inverse(); if (!href) { r.item = reinterpret_cast(param_effect->getLPEObj()); r.lpe_key = param_key; @@ -458,8 +457,7 @@ PathParam::paste_param_path(const char *svgd) SPItem * item = SP_ACTIVE_DESKTOP->getSelection()->singleItem(); if (item != NULL) { Geom::PathVector path_clipboard = sp_svg_read_pathv(svgd); - path_clipboard *= item->i2doc_affine().inverse() * item->transform; - path_clipboard *= Geom::Translate(path_clipboard.initialPoint() - _pathvector.initialPoint()).inverse(); + path_clipboard *= item->i2doc_affine().inverse(); svgd = sp_svg_write_path( path_clipboard ); } -- cgit v1.2.3 From fefc3d571319771e1ee9e6c6f161d29882e7d7ab Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sat, 2 Jul 2016 14:48:19 +0200 Subject: Fix typo from GList purge that broke SVG Font Editor dialog. (bzr r15005) --- src/ui/dialog/svg-fonts-dialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp index 790c0e5fb..e96eec5bb 100644 --- a/src/ui/dialog/svg-fonts-dialog.cpp +++ b/src/ui/dialog/svg-fonts-dialog.cpp @@ -266,7 +266,7 @@ void SvgFontsDialog::update_fonts() { SPDesktop* desktop = this->getDesktop(); SPDocument* document = desktop->getDocument(); - std::vector fonts = document->getResourceList( "fonts" ); + std::vector fonts = document->getResourceList( "font" ); _model->clear(); for (std::vector::const_iterator it = fonts.begin(); it != fonts.end(); ++it) { -- cgit v1.2.3 From aeb705274cc983200011d453643d5e3a6d2fd5f9 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sat, 2 Jul 2016 15:53:33 +0200 Subject: Rename function, fix some indenting issues. (bzr r15006) --- src/ui/dialog/svg-fonts-dialog.cpp | 4 +- src/ui/dialog/svg-fonts-dialog.h | 206 +++++++++++++++++++------------------ 2 files changed, 110 insertions(+), 100 deletions(-) diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp index e96eec5bb..a39955123 100644 --- a/src/ui/dialog/svg-fonts-dialog.cpp +++ b/src/ui/dialog/svg-fonts-dialog.cpp @@ -340,7 +340,7 @@ void SvgFontsDialog::on_font_selection_changed(){ update_sensitiveness(); } -void SvgFontsDialog::on_setwidth_changed(){ +void SvgFontsDialog::on_setfontdata_changed(){ SPFont* spfont = this->get_selected_spfont(); if (spfont){ spfont->horiz_adv_x = setwidth_spin.get_value(); @@ -397,7 +397,7 @@ Gtk::VBox* SvgFontsDialog::global_settings_tab(){ setwidth_hbox->add(*Gtk::manage(new Gtk::Label(_("Set width:")))); setwidth_hbox->add(setwidth_spin); - setwidth_spin.signal_changed().connect(sigc::mem_fun(*this, &SvgFontsDialog::on_setwidth_changed)); + setwidth_spin.signal_changed().connect(sigc::mem_fun(*this, &SvgFontsDialog::on_setfontdata_changed)); setwidth_spin.set_range(0, 4096); setwidth_spin.set_increments(10, 0); global_vbox.pack_start(*setwidth_hbox, false, false); diff --git a/src/ui/dialog/svg-fonts-dialog.h b/src/ui/dialog/svg-fonts-dialog.h index e5c4631e4..e80bbfd39 100644 --- a/src/ui/dialog/svg-fonts-dialog.h +++ b/src/ui/dialog/svg-fonts-dialog.h @@ -69,64 +69,63 @@ public: SvgFontsDialog(); ~SvgFontsDialog(); - static SvgFontsDialog &getInstance() - { return *new SvgFontsDialog(); } + static SvgFontsDialog &getInstance() { return *new SvgFontsDialog(); } void update_fonts(); SvgFont* get_selected_svgfont(); SPFont* get_selected_spfont(); - SPGlyph* get_selected_glyph(); - SPGlyphKerning* get_selected_kerning_pair(); + SPGlyph* get_selected_glyph(); + SPGlyphKerning* get_selected_kerning_pair(); - //TODO: these methods should be private, right?! + //TODO: these methods should be private, right?! void on_font_selection_changed(); - void on_kerning_pair_selection_changed(); + void on_kerning_pair_selection_changed(); void on_preview_text_changed(); void on_kerning_pair_changed(); void on_kerning_value_changed(); - void on_setwidth_changed(); - void add_font(); - Geom::PathVector flip_coordinate_system(Geom::PathVector pathv); + void on_setfontdata_changed(); + void add_font(); + Geom::PathVector flip_coordinate_system(Geom::PathVector pathv); - //TODO: AttrEntry is currently unused. Should we remove it? + //TODO: AttrEntry is currently unused. Should we remove it? class AttrEntry : public Gtk::HBox - { - public: - AttrEntry(SvgFontsDialog* d, gchar* lbl, const SPAttributeEnum attr); - void set_text(char*); - private: - SvgFontsDialog* dialog; - void on_attr_changed(); - Gtk::Entry entry; - SPAttributeEnum attr; + { + public: + AttrEntry(SvgFontsDialog* d, gchar* lbl, const SPAttributeEnum attr); + void set_text(char*); + private: + SvgFontsDialog* dialog; + void on_attr_changed(); + Gtk::Entry entry; + SPAttributeEnum attr; }; private: - void update_glyphs(); - void update_sensitiveness(); - void update_global_settings_tab(); - void populate_glyphs_box(); + void update_glyphs(); + void update_sensitiveness(); + void update_global_settings_tab(); + void populate_glyphs_box(); void populate_kerning_pairs_box(); - void set_glyph_description_from_selected_path(); - void missing_glyph_description_from_selected_path(); - void reset_missing_glyph_description(); - void add_glyph(); - void glyph_unicode_edit(const Glib::ustring&, const Glib::ustring&); - void glyph_name_edit(const Glib::ustring&, const Glib::ustring&); - void remove_selected_glyph(); - void remove_selected_font(); - void remove_selected_kerning_pair(); + void set_glyph_description_from_selected_path(); + void missing_glyph_description_from_selected_path(); + void reset_missing_glyph_description(); + void add_glyph(); + void glyph_unicode_edit(const Glib::ustring&, const Glib::ustring&); + void glyph_name_edit(const Glib::ustring&, const Glib::ustring&); + void remove_selected_glyph(); + void remove_selected_font(); + void remove_selected_kerning_pair(); - void add_kerning_pair(); + void add_kerning_pair(); - void create_glyphs_popup_menu(Gtk::Widget& parent, sigc::slot rem); - void glyphs_list_button_release(GdkEventButton* event); + void create_glyphs_popup_menu(Gtk::Widget& parent, sigc::slot rem); + void glyphs_list_button_release(GdkEventButton* event); - void create_fonts_popup_menu(Gtk::Widget& parent, sigc::slot rem); - void fonts_list_button_release(GdkEventButton* event); + void create_fonts_popup_menu(Gtk::Widget& parent, sigc::slot rem); + void fonts_list_button_release(GdkEventButton* event); - void create_kerning_pairs_popup_menu(Gtk::Widget& parent, sigc::slot rem); - void kerning_pairs_list_button_release(GdkEventButton* event); + void create_kerning_pairs_popup_menu(Gtk::Widget& parent, sigc::slot rem); + void kerning_pairs_list_button_release(GdkEventButton* event); Inkscape::XML::SignalObserver _defs_observer; //in order to update fonts Inkscape::XML::SignalObserver _glyphs_observer; @@ -134,47 +133,47 @@ private: Gtk::HBox* AttrCombo(gchar* lbl, const SPAttributeEnum attr); // Gtk::HBox* AttrSpin(gchar* lbl, const SPAttributeEnum attr); Gtk::VBox* global_settings_tab(); - AttrEntry* _familyname_entry; + AttrEntry* _familyname_entry; Gtk::VBox* kerning_tab(); Gtk::VBox* glyphs_tab(); Gtk::Button _add; Gtk::Button add_glyph_button; - Gtk::Button glyph_from_path_button; - Gtk::Button missing_glyph_button; - Gtk::Button missing_glyph_reset_button; + Gtk::Button glyph_from_path_button; + Gtk::Button missing_glyph_button; + Gtk::Button missing_glyph_reset_button; class Columns : public Gtk::TreeModel::ColumnRecord - { - public: - Columns() - { - add(spfont); - add(svgfont); - add(label); - } - - Gtk::TreeModelColumn spfont; - Gtk::TreeModelColumn svgfont; - Gtk::TreeModelColumn label; + { + public: + Columns() + { + add(spfont); + add(svgfont); + add(label); + } + + Gtk::TreeModelColumn spfont; + Gtk::TreeModelColumn svgfont; + Gtk::TreeModelColumn label; }; Glib::RefPtr _model; Columns _columns; Gtk::TreeView _FontsList; class GlyphsColumns : public Gtk::TreeModel::ColumnRecord - { - public: - GlyphsColumns() - { - add(glyph_node); - add(glyph_name); - add(unicode); - } - - Gtk::TreeModelColumn glyph_node; - Gtk::TreeModelColumn glyph_name; - Gtk::TreeModelColumn unicode; + { + public: + GlyphsColumns() + { + add(glyph_node); + add(glyph_name); + add(unicode); + } + + Gtk::TreeModelColumn glyph_node; + Gtk::TreeModelColumn glyph_name; + Gtk::TreeModelColumn unicode; }; GlyphsColumns _GlyphsListColumns; Glib::RefPtr _GlyphsListStore; @@ -182,30 +181,30 @@ private: Gtk::ScrolledWindow _GlyphsListScroller; class KerningPairColumns : public Gtk::TreeModel::ColumnRecord - { - public: - KerningPairColumns() - { - add(first_glyph); - add(second_glyph); - add(kerning_value); - add(spnode); - } - - Gtk::TreeModelColumn first_glyph; - Gtk::TreeModelColumn second_glyph; - Gtk::TreeModelColumn kerning_value; - Gtk::TreeModelColumn spnode; + { + public: + KerningPairColumns() + { + add(first_glyph); + add(second_glyph); + add(kerning_value); + add(spnode); + } + + Gtk::TreeModelColumn first_glyph; + Gtk::TreeModelColumn second_glyph; + Gtk::TreeModelColumn kerning_value; + Gtk::TreeModelColumn spnode; }; KerningPairColumns _KerningPairsListColumns; Glib::RefPtr _KerningPairsListStore; Gtk::TreeView _KerningPairsList; Gtk::ScrolledWindow _KerningPairsListScroller; - Gtk::Button add_kernpair_button; + Gtk::Button add_kernpair_button; Gtk::VBox _font_settings; - Gtk::VBox global_vbox; - Gtk::VBox glyphs_vbox; + Gtk::VBox global_vbox; + Gtk::VBox glyphs_vbox; Gtk::VBox kerning_vbox; Gtk::Entry _preview_entry; @@ -225,20 +224,20 @@ private: #endif class EntryWidget : public Gtk::HBox - { - public: - EntryWidget() - { - this->add(this->_label); - this->add(this->_entry); - } - void set_label(const gchar* l){ - this->_label.set_text(l); - } - private: - Gtk::Label _label; - Gtk::Entry _entry; - }; + { + public: + EntryWidget() + { + this->add(this->_label); + this->add(this->_entry); + } + void set_label(const gchar* l){ + this->_label.set_text(l); + } + private: + Gtk::Label _label; + Gtk::Entry _entry; + }; EntryWidget _font_family, _font_variant; }; @@ -247,3 +246,14 @@ private: } // namespace Inkscape #endif //#ifndef INKSCAPE_UI_DIALOG_SVG_FONTS_H + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : -- cgit v1.2.3 From 495ac0773c4341589f1cd9108c9de3daf5b78c2c Mon Sep 17 00:00:00 2001 From: Sebastian Faubel Date: Sat, 2 Jul 2016 19:15:39 +0200 Subject: Merge with trunk. (bzr r15002.1.1) --- CMakeLists.txt | 290 +++++++++++++++++++++++++++---- CMakeScripts/ConfigPaths.cmake | 150 ++++++++++++++++ CMakeScripts/DefineDependsandFlags.cmake | 88 +++------- config.h.cmake | 8 + src/CMakeLists.txt | 64 +++---- 5 files changed, 465 insertions(+), 135 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 94dbf60df..74aa54214 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,59 @@ message("------------------------------") message("Source Dir: ${CMAKE_CURRENT_SOURCE_DIR}") message("Binary Dir: ${CMAKE_CURRENT_BINARY_DIR}") +# ----------------------------------------------------------------------------- +# Set platform defaults (originally copied from darktable) +# ----------------------------------------------------------------------------- +include(CMakeScripts/ConfigPaths.cmake) + +if(WIN32) + message("-- Windows build detected, setting default features") + + list(INSERT CMAKE_SYSTEM_INCLUDE_PATH 0 ${DEVLIBS_PATH}) + list(INSERT CMAKE_SYSTEM_LIBRARY_PATH 0 ${DEVLIBS_PATH}) + + set(CMAKE_C_COMPILER "${MINGW_BIN}/gcc.exe") + set(CMAKE_C_LINK_EXECUTABLE "${MINGW_BIN}/gcc.exe") + set(CMAKE_CXX_COMPILER "${MINGW_BIN}/g++.exe") + set(CMAKE_CXX_LINK_EXECUTABLE "${MINGW_BIN}/g++.exe") + set(CMAKE_CXX_STANDARD 11) + + # Setup Windows resource files compiler. + set(CMAKE_RC_COMPILER "${MINGW_BIN}/windres.exe") + set(CMAKE_RC_COMPILER_INIT windres) + enable_language(RC) + set(CMAKE_RC_COMPILE_OBJECT " -O coff -i -o ") + + # These options are required for having i18n support on Windows. + option(ENABLE_NLS "Compile with Native Language Support (using gettext)" ON) + option(HAVE_BIND_TEXTDOMAIN_CODESET "Compile with 'bind_textdomain_codeset' function" ON) + + # Does not compile on Windows with these options. + option(BR_PTHREADS "Use binreloc thread support" OFF) + option(ENABLE_BINRELOC "Use AutoPackage" OFF) +endif(WIN32) + +if(APPLE) + message("-- Mac OS X build detected, setting default features") + + # prefer macports and/or user-installed libraries over system ones + #LIST(APPEND CMAKE_PREFIX_PATH /opt/local /usr/local) + set(CMAKE_FIND_FRAMEWORK "LAST") + + # test and display relevant env variables + if(DEFINED ENV{CMAKE_PREFIX_PATH}) + message("CMAKE_PREFIX_PATH: $ENV{CMAKE_PREFIX_PATH}") + endif() + + if(DEFINED ENV{GTKMM_BASEPATH}) + message("GTKMM_BASEPATH: $ENV{GTKMM_BASEPATH}") + endif() + + # detect current GTK+ backend + pkg_check_variable(gtk+-2.0 target) + message("GTK2 backend: ${GTK+_2.0_TARGET}") +endif(APPLE) + # ----------------------------------------------------------------------------- # CMake Configuration # ----------------------------------------------------------------------------- @@ -19,6 +72,7 @@ project(inkscape) set(INKSCAPE_VERSION 0.92pre1) set(PROJECT_NAME inkscape) set(CMAKE_INCLUDE_CURRENT_DIR TRUE) + if(APPLE) SET(CMAKE_MACOSX_RPATH TRUE) SET(CMAKE_INSTALL_RPATH "@loader_path/../lib/inkscape") @@ -40,29 +94,6 @@ endif() include(CMakeScripts/HelperFunctions.cmake) -# ----------------------------------------------------------------------------- -# Set platform defaults (originally copied from darktable) -# ----------------------------------------------------------------------------- -if(APPLE) - message("-- Mac OS X build detected, setting default features") - # prefer macports and/or user-installed libraries over system ones - #LIST(APPEND CMAKE_PREFIX_PATH /opt/local /usr/local) - set(CMAKE_FIND_FRAMEWORK "LAST") - - # test and display relevant env variables - if(DEFINED ENV{CMAKE_PREFIX_PATH}) - message("CMAKE_PREFIX_PATH: $ENV{CMAKE_PREFIX_PATH}") - endif() - if(DEFINED ENV{GTKMM_BASEPATH}) - message("GTKMM_BASEPATH: $ENV{GTKMM_BASEPATH}") - endif() - - # detect current GTK+ backend - pkg_check_variable(gtk+-2.0 target) - message("GTK2 backend: ${GTK+_2.0_TARGET}") - -endif(APPLE) - # ----------------------------------------------------------------------------- # Redirect output files # ----------------------------------------------------------------------------- @@ -104,7 +135,6 @@ else() message("No gmock/gtest found! Perhaps you wish to run 'bash download-gtest.sh' to download it.") endif() -include(CMakeScripts/ConfigPaths.cmake) # Installation Paths include(CMakeScripts/DefineDependsandFlags.cmake) # Includes, Compiler Flags, and Link Libraries include(CMakeScripts/HelperMacros.cmake) # Misc Utility Macros @@ -182,8 +212,15 @@ endforeach() # Installation # ----------------------------------------------------------------------------- if(UNIX) + #Define the installation + install( + TARGETS inkscape_base inkscape inkview + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib/inkscape + ARCHIVE DESTINATION lib/inkscape + ) + #The install directive for the binaries and libraries are found in src/CMakeList.txt - install( FILES ${CMAKE_BINARY_DIR}/inkscape.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/applications @@ -191,10 +228,179 @@ if(UNIX) # this should probably be done no matter what the platform is, just set SHARE_INSTALL first add_subdirectory(share) - -else() - # TODO, WIN32, APPLE/OSX, MinGW - +elseif(WIN32) + set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/inkscape) + + install(PROGRAMS + ${EXECUTABLE_OUTPUT_PATH}/inkscape.exe + ${EXECUTABLE_OUTPUT_PATH}/inkview.exe + DESTINATION ${CMAKE_INSTALL_PREFIX} + ) + + install(FILES + ${LIBRARY_OUTPUT_PATH}/libinkscape_base.dll + ${LIBRARY_OUTPUT_PATH}/libgrid2.dll + DESTINATION ${CMAKE_INSTALL_PREFIX} + ) + + # devlibs and mingw dlls + install(FILES + AUTHORS + COPYING + NEWS + README + TRANSLATORS + ${DEVLIBS_BIN}/libatkmm-1.6-1.dll + ${DEVLIBS_BIN}/libglibmm-2.4-1.dll + ${DEVLIBS_BIN}/libgiomm-2.4-1.dll + ${DEVLIBS_BIN}/libgtkmm-2.4-1.dll + ${DEVLIBS_BIN}/libgdkmm-2.4-1.dll + ${DEVLIBS_BIN}/libpangomm-1.4-1.dll + ${DEVLIBS_BIN}/libcairomm-1.0-1.dll + ${DEVLIBS_BIN}/libsigc-2.0-0.dll + ${DEVLIBS_BIN}/libfreetype-6.dll + ${DEVLIBS_BIN}/libffi-6.dll + ${DEVLIBS_BIN}/libgc-1.dll + ${DEVLIBS_BIN}/libgsl-19.dll + ${DEVLIBS_BIN}/libgslcblas-0.dll + ${DEVLIBS_BIN}/libharfbuzz-0.dll + ${DEVLIBS_BIN}/liblzma-5.dll + ${DEVLIBS_BIN}/libaspell-15.dll + ${DEVLIBS_BIN}/libatk-1.0-0.dll + ${DEVLIBS_BIN}/libgdk-win32-2.0-0.dll + ${DEVLIBS_BIN}/libgdk_pixbuf-2.0-0.dll + ${DEVLIBS_BIN}/libglib-2.0-0.dll + ${DEVLIBS_BIN}/libgmodule-2.0-0.dll + ${DEVLIBS_BIN}/libgobject-2.0-0.dll + ${DEVLIBS_BIN}/libgtk-win32-2.0-0.dll + ${DEVLIBS_BIN}/libgthread-2.0-0.dll + ${DEVLIBS_BIN}/libgio-2.0-0.dll + ${DEVLIBS_BIN}/libcairo-2.dll + ${DEVLIBS_BIN}/libpixman-1-0.dll + ${DEVLIBS_BIN}/libpoppler-58.dll + ${DEVLIBS_BIN}/libpoppler-glib-8.dll + ${DEVLIBS_BIN}/libpangocairo-1.0-0.dll + ${DEVLIBS_BIN}/libpango-1.0-0.dll + ${DEVLIBS_BIN}/libpangoft2-1.0-0.dll + ${DEVLIBS_BIN}/libpangowin32-1.0-0.dll + ${DEVLIBS_BIN}/libfontconfig-1.dll + ${DEVLIBS_BIN}/libxml2-2.dll + ${DEVLIBS_BIN}/libxslt-1.dll + ${DEVLIBS_BIN}/libexslt-0.dll + ${DEVLIBS_BIN}/libexpat-1.dll + ${DEVLIBS_BIN}/librevenge-0.0.dll + ${DEVLIBS_BIN}/librevenge-stream-0.0.dll + ${DEVLIBS_BIN}/libwpg-0.3.dll + ${DEVLIBS_BIN}/libwpd-0.10.dll + ${DEVLIBS_BIN}/libvisio-0.1.dll + ${DEVLIBS_BIN}/libcdr-0.1.dll + ${DEVLIBS_BIN}/icuin56.dll + ${DEVLIBS_BIN}/icudt56.dll + ${DEVLIBS_BIN}/icuuc56.dll + ${DEVLIBS_BIN}/libjpeg-9.dll + ${DEVLIBS_BIN}/libpng16-16.dll + ${DEVLIBS_BIN}/libtiff-5.dll + ${DEVLIBS_BIN}/libexif-12.dll + ${DEVLIBS_BIN}/libcurl-4.dll + ${DEVLIBS_BIN}/zlib1.dll + ${DEVLIBS_BIN}/bz2-1.dll + ${DEVLIBS_BIN}/libiconv-2.dll + ${DEVLIBS_BIN}/libpopt-0.dll + ${DEVLIBS_BIN}/liblcms2-2.dll + ${DEVLIBS_BIN}/libMagick++-6.Q16-6.dll + ${DEVLIBS_BIN}/libMagickCore-6.Q16-2.dll + ${DEVLIBS_BIN}/libMagickWand-6.Q16-2.dll + ${DEVLIBS_BIN}/libintl-8.dll + ${DEVLIBS_BIN}/libpotrace-0.dll + ${MINGW_BIN}/libstdc++-6.dll + ${MINGW_BIN}/libwinpthread-1.dll + ${MINGW_BIN}/libgcc_s_seh-1.dll + ${MINGW_BIN}/libgomp-1.dll + DESTINATION ${CMAKE_INSTALL_PREFIX}) + + # Setup application data directories, poppler files, locales, icons and themes + file(MAKE_DIRECTORY + data + doc + modules + plugins) + + install(DIRECTORY + data + doc + modules + plugins + share + DESTINATION ${CMAKE_INSTALL_PREFIX} + PATTERN Adwaita EXCLUDE # NOTE: The theme is not used on Windows. + PATTERN hicolor/index.theme EXCLUDE # NOTE: Empty index.theme in hicolor icon theme causes SIGSEGV. + PATTERN CMakeLists.txt EXCLUDE + PATTERN *.am EXCLUDE) + + install(DIRECTORY ${DEVLIBS_PATH}/share/themes + DESTINATION ${CMAKE_INSTALL_PREFIX}/share) + + install(DIRECTORY ${DEVLIBS_PATH}/share/poppler + DESTINATION ${CMAKE_INSTALL_PREFIX}/share) + + install(DIRECTORY ${DEVLIBS_PATH}/etc/fonts + DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) + + install(DIRECTORY ${DEVLIBS_PATH}/share/locale + DESTINATION ${CMAKE_INSTALL_PREFIX}) + + install(DIRECTORY ${DEVLIBS_PATH}/etc/gtk-2.0 + DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) + + # GTK 2.0 + install(DIRECTORY ${DEVLIBS_LIB}/gtk-2.0 + DESTINATION ${CMAKE_INSTALL_PREFIX}/lib + FILES_MATCHING + PATTERN "*.dll" + PATTERN "*.cache") + + install(DIRECTORY ${DEVLIBS_LIB}/gdk-pixbuf-2.0 + DESTINATION ${CMAKE_INSTALL_PREFIX}/lib + FILES_MATCHING + PATTERN "*.dll" + PATTERN "*.cache") + + # Aspell dictionaries + install(DIRECTORY ${DEVLIBS_LIB}/aspell-0.60 + DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + + # Necessary to run extensions on windows if it is not in the path + if (CMAKE_SYSTEM_PROCESSOR MATCHES "AMD64") + install(FILES + ${DEVLIBS_BIN}/gspawn-win64-helper.exe + ${DEVLIBS_BIN}/gspawn-win64-helper-console.exe + DESTINATION ${CMAKE_INSTALL_PREFIX}) + else() + install(FILES + ${DEVLIBS_BIN}/gspawn-win32-helper.exe + ${DEVLIBS_BIN}/gspawn-win32-helper-console.exe + DESTINATION ${CMAKE_INSTALL_PREFIX}) + endif() + + # Perl + install(FILES + ${DEVLIBS_PATH}/perl/bin/perl58.dll + DESTINATION ${CMAKE_INSTALL_PREFIX}) + + # Python + install(FILES + ${DEVLIBS_PATH}/python/python.exe + ${DEVLIBS_PATH}/python/pythonw.exe + ${DEVLIBS_PATH}/python/python27.dll + DESTINATION ${CMAKE_INSTALL_PREFIX}/python) + + install(DIRECTORY ${DEVLIBS_PATH}/python/lib + DESTINATION ${CMAKE_INSTALL_PREFIX}/python) + + install(DIRECTORY ${DEVLIBS_PATH}/python/dlls + DESTINATION ${CMAKE_INSTALL_PREFIX}/python) +elseif(APPLE) + # TODO endif() # ----------------------------------------------------------------------------- @@ -239,6 +445,7 @@ message("") # cmake info message("CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}") +message("CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}") message("CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}") message("CMAKE_SYSTEM_VERSION: ${CMAKE_SYSTEM_VERSION}") message("CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}") @@ -247,6 +454,13 @@ message("CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}") message("CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") message("") +if(WIN32) +message("CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}") +message("CMAKE_FIND_LIBRARY_PREFIXES: ${CMAKE_FIND_LIBRARY_PREFIXES}") +message("CMAKE_FIND_LIBRARY_SUFFIXES: ${CMAKE_FIND_LIBRARY_SUFFIXES}") +message("") +endif() + # dependency info message("ENABLE_LCMS: ${ENABLE_LCMS}") message("ENABLE_POPPLER: ${ENABLE_POPPLER}") @@ -263,4 +477,22 @@ message("WITH_LIBWPG: ${WITH_LIBWPG}") message("WITH_NLS: ${WITH_NLS}") message("WITH_OPENMP: ${WITH_OPENMP}") message("WITH_PROFILING: ${WITH_PROFILING}") + +if(WIN32) +message("") +message("HAVE_MINGW: ${HAVE_MINGW}") +message("HAVE_MINGW64: ${HAVE_MINGW64}") +message("MINGW_PATH: ${MINGW_PATH}") +message("MINGW_ARCH: ${MINGW_ARCH}") +message("MINGW_ARCH_PATH: ${MINGW_ARCH_PATH}") +message("MINGW64_INCLUDE: ${MINGW64_INCLUDE}") +message("MINGW64_LIB: ${MINGW64_LIB}") +message("DEVLIBS_PATH: ${DEVLIBS_PATH}") +message("DEVLIBS_LIB: ${DEVLIBS_LIB}") +message("DEVLIBS_BIN: ${DEVLIBS_BIN}") +message("PKG_CONFIG_PATH: ${PKG_CONFIG_PATH}") +message("GS_PATH ${GS_PATH}") +message("GS_BIN ${GS_BIN}") +endif() + message("------------------------------------------------------------------------") diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake index 3b13a7734..09cd96df0 100644 --- a/CMakeScripts/ConfigPaths.cmake +++ b/CMakeScripts/ConfigPaths.cmake @@ -1,6 +1,156 @@ message(STATUS "Creating build files in: ${CMAKE_CURRENT_BINARY_DIR}") if(WIN32) +# Directory containing the precompiled Inkscape libraries. Usually c:\devlibs or c:\devlibs64 + set(DEVLIBS_PATH C:/devlibs64) + + # Directory containing the MinGW instance used for compilation. Usually c:\mingw or c:\mingw64 + set(MINGW_PATH C:/mingw64) + + # Directory containing the Ghostscript installation. + set(GS_PATH C:/latex/gs/gs8.61) + + # Normalize directory separator slashes. + string(REGEX REPLACE "\\\\" "/" DEVLIBS_PATH ${DEVLIBS_PATH}) + string(REGEX REPLACE "\\\\" "/" MINGW_PATH ${MINGW_PATH}) + string(REGEX REPLACE "\\\\" "/" GS_PATH ${GS_PATH}) + + # =============== DEVLIBS CHECKS =============== + + # Directory containing the compile time .dll.a and .a files. + set(DEVLIBS_LIB "${DEVLIBS_PATH}/lib") + + if(NOT EXISTS "${DEVLIBS_LIB}") + message(FATAL_ERROR "Inkscape development libraries directory does not exist: ${DEVLIBS_LIB}") + endif() + + # Add devlibs libraries to linker path. + link_directories(${DEVLIBS_LIB}) + + set(DEVLIBS_INCLUDE ${DEVLIBS_PATH}/include) + + if(NOT EXISTS ${DEVLIBS_INCLUDE}) + message(FATAL_ERROR "Inkscape development libraries directory does not exist: ${DEVLIBS_INCLUDE}") + endif() + + # Add general MinGW headers to compiler include path. + #include_directories(${DEVLIBS_INCLUDE}) + + # Directory containing the precompiled .dll files. + set(DEVLIBS_BIN ${DEVLIBS_PATH}/bin) + + if(NOT EXISTS ${DEVLIBS_BIN}) + message(FATAL_ERROR "Inkscape development binaries directory does not exist: ${DEVLIBS_BIN}") + endif() + + # Directory containing the pkgconfig .pc files. + set(PKG_CONFIG_PATH "${DEVLIBS_PATH}/lib/pkgconfig") + + if(NOT EXISTS "${PKG_CONFIG_PATH}") + message(FATAL_ERROR "pkgconfig directory does not exist: ${PKG_CONFIG_PATH}") + endif() + + # Add the devlibs directories to the paths used to find libraries and programs. + list(APPEND CMAKE_PREFIX_PATH ${DEVLIBS_PATH}) + + # Eliminate error messages when not having mingw in the environment path variable. + list(APPEND CMAKE_PROGRAM_PATH ${DEVLIBS_BIN}) + + # =============== MINGW CHECKS =============== + + # We are in a MinGW environment. + set(HAVE_MINGW ON) + + # Try to determine the MinGW processor architecture. + if(EXISTS ${MINGW_PATH}/mingw32) + set(HAVE_MINGW64 OFF) + set(MINGW_ARCH mingw32) + elseif(EXISTS ${MINGW_PATH}/x86_64-w64-mingw32) + set(HAVE_MINGW64 ON) + set(MINGW_ARCH x86_64-w64-mingw32) + else() + message(FATAL_ERROR "Unable to determine MinGW processor architecture. Are you using an unsupported MinGW version?") + endif() + + # Path to processor architecture specific binaries and libs. + set(MINGW_ARCH_PATH ${MINGW_PATH}/${MINGW_ARCH}) + + set(MINGW_BIN ${MINGW_PATH}/bin) + + if(NOT EXISTS ${MINGW_BIN}) + message(FATAL_ERROR "MinGW binary directory does not exist: ${MINGW_BIN}") + endif() + + # Eliminate error messages when not having mingw in the environment path variable. + list(APPEND CMAKE_PROGRAM_PATH ${MINGW_BIN}) + + set(MINGW_LIB ${MINGW_PATH}/lib) + + if(NOT EXISTS ${MINGW_LIB}) + message(FATAL_ERROR "MinGW library directory does not exist: ${MINGW_LIB}") + endif() + + # Add MinGW libraries to linker path. + link_directories(${MINGW_LIB}) + + set(MINGW_INCLUDE ${MINGW_PATH}/include) + + if(NOT EXISTS ${MINGW_INCLUDE}) + message(FATAL_ERROR "MinGW include directory does not exist: ${MINGW_INCLUDE}") + endif() + + # Add general MinGW headers to compiler include path. + include_directories(${MINGW_INCLUDE}) + + if(HAVE_MINGW64) + set(MINGW64_LIB ${MINGW_ARCH_PATH}/lib) + + if(NOT EXISTS ${MINGW64_LIB}) + message(FATAL_ERROR "MinGW 64-Bit libraries directory does not exist: ${MINGW64_LIB}") + endif() + + # Add 64-Bit libraries to linker path. + link_directories(${MINGW64_LIB}) + + set(MINGW64_INCLUDE ${MINGW_ARCH_PATH}/include) + + if(NOT EXISTS ${MINGW64_INCLUDE}) + message(FATAL_ERROR "MinGW 64-Bit include directory does not exist: ${MINGW64_INCLUDE}") + endif() + + set(MINGW64_INCLUDE_SDL ${MINGW64_INCLUDE}/c++) + + if(NOT EXISTS ${MINGW64_INCLUDE_SDL}) + message(FATAL_ERROR "MinGW 64-Bit SDL include directory does not exist: ${MINGW64_INCLUDE_SDL}") + endif() + + # Add 64-Bit MinGW headers to compiler include path. + include_directories(${MINGW64_INCLUDE}) + #include_directories(${MINGW64_INCLUDE_SDL}) + endif() + + # =============== GHOSTSCRIPT CHECKS =============== + + # Check for Ghostscript. + set(GS_BIN "${GS_PATH}/bin") + + if(EXISTS "${GS_BIN}") + set(HAVE_GS_BIN ON) + else() + set(HAVE_GS_BIN OFF) + endif() + + # =============== LIBRARY AND LINKER =============== + + # Tweak CMake into using Unix-style library names. + set(CMAKE_FIND_LIBRARY_PREFIXES "lib") + set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".dll") + + if(NOT HAVE_MINGW64) + list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES ".a") + endif() + + # Directory containing the current locale (translations). set(PACKAGE_LOCALE_DIR "locale") set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.") else(WIN32) diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 706860a00..b708484af 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -15,75 +15,31 @@ list(APPEND INKSCAPE_INCS ${PROJECT_SOURCE_DIR} # Files we include # ---------------------------------------------------------------------------- if(WIN32) -message("---------------- BEGIN: Win32 ----------------") - - # The name of the target operating system - set(CMAKE_SYSTEM_NAME Windows) - - message("CMAKE_SYSTEM_NAME: " ${CMAKE_SYSTEM_NAME}) - - set(CMAKE_C_COMPILER gcc) - set(CMAKE_CXX_COMPILER g++) - set(CMAKE_RC_COMPILER windres) - - # Adjust the command line parameters for windres to the verion of MinGW. - set(CMAKE_RC_COMPILER_INIT windres) - enable_language(RC) - set(CMAKE_RC_COMPILE_OBJECT " -O coff -i -o ") - - # Here is the target environment located - set(CMAKE_FIND_ROOT_PATH $ENV{MINGW_PATH}/) - - message("CMAKE_FIND_ROOT_PATH: " ${CMAKE_FIND_ROOT_PATH}) - - # Tweak CMake into using Unix-style library names. - set(CMAKE_FIND_LIBRARY_PREFIXES "lib") - set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".dll") - - message("CMAKE_FIND_LIBRARY_PREFIXES: " ${CMAKE_FIND_LIBRARY_PREFIXES}) - message("CMAKE_FIND_LIBRARY_SUFFIXES: " ${CMAKE_FIND_LIBRARY_SUFFIXES}) - - set(SDL_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}x86_64-w64-mingw32/include/c++) - - message("SDL_INCLUDE_DIR: " ${SDL_INCLUDE_DIR}) - - #if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "^amd64") - link_directories($ENV{MINGW_PATH}/lib) - link_directories($ENV{DEVLIBS_PATH}/lib) - link_directories($ENV{MINGW_PATH}/x86_64-w64-mingw32/lib) - link_directories($ENV{WINDIR}/system32) - - include_directories($ENV{MINGW_PATH}/include) - - include_directories($ENV{MINGW_PATH}/x86_64-w64-mingw32/include) - include_directories($ENV{MINGW_PATH}/x86_64-w64-mingw32/include/c++) - #endif () - - get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES) - - foreach(dir ${dirs}) - message("CMAKE_INCLUDE_DIR:" ${dir}) - endforeach() - - add_definitions(-DFLT_EPSILON=1e-9) - add_definitions(-DFLT_MAX=1e+37) - add_definitions(-DFLT_MIN=1e-37) - - list(APPEND INKSCAPE_LIBS "-lgomp") - list(APPEND INKSCAPE_LIBS "-lwinpthread") - list(APPEND INKSCAPE_LIBS "-lmscms") - - list(APPEND INKSCAPE_CXX_FLAGS "-mwindows") - list(APPEND INKSCAPE_CXX_FLAGS "-mthreads") - list(APPEND INKSCAPE_CXX_FLAGS "-m64") - - # Try to compile using C++ 11. - set(CMAKE_CXX_STANDARD 11) - - message("---------------- END: Win32 ----------------") + # Set the link and include directories + get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES) + + # MinGW supplied STL does not define these floating point constants.. :/ + add_definitions(-DFLT_EPSILON=1e-9) + add_definitions(-DFLT_MAX=1e+37) + add_definitions(-DFLT_MIN=1e-37) + + list(APPEND INKSCAPE_LIBS "-lmscms") + + list(APPEND INKSCAPE_CXX_FLAGS "-mwindows") + list(APPEND INKSCAPE_CXX_FLAGS "-mthreads") + + if(HAVE_MINGW64) + list(APPEND INKSCAPE_LIBS "-lgomp") + list(APPEND INKSCAPE_LIBS "-lwinpthread") + + list(APPEND INKSCAPE_CXX_FLAGS "-m64") + else() + list(APPEND INKSCAPE_CXX_FLAGS "-m32") + endif() endif() pkg_check_modules(INKSCAPE_DEP REQUIRED pangocairo pangoft2 fontconfig gthread-2.0 gsl gmodule-2.0) + list(APPEND INKSCAPE_LIBS ${INKSCAPE_DEP_LDFLAGS}) list(APPEND INKSCAPE_INCS_SYS ${INKSCAPE_DEP_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${INKSCAPE_DEP_LIBRARIES}) diff --git a/config.h.cmake b/config.h.cmake index eae54fd03..b30002622 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -232,10 +232,18 @@ #cmakedefine HAVE_ZLIB_H 1 /* Base data directory -- only path-prefix.h should use it! */ +#ifdef WIN32 +#define INKSCAPE_DATADIR "" +#else #define INKSCAPE_DATADIR "${CMAKE_INSTALL_PREFIX}/share" +#endif /* Base library directory -- only path-prefix.h should use it! */ +#ifdef WIN32 +#define INKSCAPE_LIBDIR "\\lib" +#else #define INKSCAPE_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib" +#endif /* Define to 1 if `lstat' dereferences a symlink specified with a trailing slash. */ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 66f16b7fb..d979d7c13 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,10 +2,6 @@ # Define the main source # ----------------------------------------------------------------------------- -set(main_SRC - main.cpp -) - set(sp_SRC attribute-rel-css.cpp attribute-rel-svg.cpp @@ -423,21 +419,6 @@ set(inkscape_SRC version.h ) -if(WIN32) - list(APPEND inkscape_SRC - inkscape.rc - registrytool.cpp - #deptool.cpp - winconsole.cpp - winmain.cpp - - # ------- - # Headers - registrytool.h - ) -endif() - - # ----------------------------------------------------------------------------- # Generate version file # ----------------------------------------------------------------------------- @@ -481,7 +462,6 @@ add_subdirectory(widgets) add_subdirectory(xml) add_subdirectory(2geom) - # Directories containing lists files that describe building internal libraries add_subdirectory(libavoid) add_subdirectory(libcola) @@ -494,7 +474,6 @@ add_subdirectory(livarot) add_subdirectory(libnrtype) add_subdirectory(libdepixelize) - get_property(inkscape_global_SRC GLOBAL PROPERTY inkscape_global_SRC) set(inkscape_SRC @@ -508,12 +487,32 @@ set(inkscape_SRC #add_inkscape_lib(sp_LIB "${sp_SRC}") #add_inkscape_lib(inkscape_LIB "${inkscape_SRC}") +if(WIN32) + # Sources for the inkscape executable on Windows. + set(main_SRC + registrytool.h + registrytool.cpp + main.cpp + winmain.cpp + #winconsole.cpp + ) + + # Add the platform specific resource files (enabling the app icon). + if(${HAVE_MINGW64}) + list(APPEND main_SRC inkscape-x64.rc) + else() + list(APPEND main_SRC inkscape.rc) + endif() +else() + set(main_SRC main.cpp) +endif() + # Build everything except main and inkview.c in a shared library. add_library(inkscape_base SHARED ${inkscape_SRC} ${sp_SRC}) # make executables for inkscape and inkview -add_executable(inkscape ${main_SRC} ) -add_executable(inkview inkview.cpp ) +add_executable(inkscape ${main_SRC}) +add_executable(inkview inkview.cpp) add_dependencies(inkscape inkscape_version) @@ -525,11 +524,9 @@ set(INKSCAPE_TARGET_LIBS # order from automake #sp_LIB #nrtype_LIB - #inkscape_LIB #sp_LIB # annoying, we need both! nrtype_LIB # annoying, we need both! - croco_LIB avoid_LIB cola_LIB @@ -548,22 +545,9 @@ if (NOT "${WITH_EXT_GDL}") list (INSERT INKSCAPE_TARGET_LIBS 0 "gdl_LIB") endif() - - - # Link the inkscape_base library against all external dependencies target_link_libraries(inkscape_base ${INKSCAPE_TARGET_LIBS}) # Link inkscape and inkview against inkscape_base -target_link_libraries(inkscape inkscape_base ) -target_link_libraries(inkview inkscape_base) - -#Define the installation -install( - TARGETS inkscape_base inkscape inkview - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib/inkscape - ARCHIVE DESTINATION lib/inkscape - ) - - +target_link_libraries(inkscape inkscape_base) +target_link_libraries(inkview inkscape_base) \ No newline at end of file -- cgit v1.2.3 From c55b258d2131bd51a1a98831324173f544cf236b Mon Sep 17 00:00:00 2001 From: Sebastian Faubel Date: Mon, 4 Jul 2016 10:02:41 +0200 Subject: Fixed locales. (bzr r15002.1.2) --- AUTHORS | 2 ++ CMakeLists.txt | 2 +- CMakeScripts/ConfigPaths.cmake | 2 +- mingwenv.bat | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/AUTHORS b/AUTHORS index 665b32a1e..7dafa6193 100644 --- a/AUTHORS +++ b/AUTHORS @@ -172,3 +172,5 @@ Gellule Xg Daniel Yacob David Yip Masatake Yamato +Moritz Eberl +Sebastian Faubel \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 74aa54214..489346ca2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -347,7 +347,7 @@ elseif(WIN32) DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) install(DIRECTORY ${DEVLIBS_PATH}/share/locale - DESTINATION ${CMAKE_INSTALL_PREFIX}) + DESTINATION ${CMAKE_INSTALL_PREFIX}/share) install(DIRECTORY ${DEVLIBS_PATH}/etc/gtk-2.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake index 09cd96df0..6ce849206 100644 --- a/CMakeScripts/ConfigPaths.cmake +++ b/CMakeScripts/ConfigPaths.cmake @@ -151,7 +151,7 @@ if(WIN32) endif() # Directory containing the current locale (translations). - set(PACKAGE_LOCALE_DIR "locale") + set(PACKAGE_LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/share/locale") set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.") else(WIN32) # TODO: check and change this to correct value: diff --git a/mingwenv.bat b/mingwenv.bat index 126f3703c..3765b73b5 100755 --- a/mingwenv.bat +++ b/mingwenv.bat @@ -1,6 +1,6 @@ @echo Setting environment variables for MinGw build of Inkscape -IF "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs -IF "%MINGW_PATH%"=="" set MINGW_PATH=c:\mingw +IF "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs64 +IF "%MINGW_PATH%"=="" set MINGW_PATH=c:\mingw64 set MINGW_BIN=%MINGW_PATH%\bin set PKG_CONFIG_PATH=%DEVLIBS_PATH%\lib\pkgconfig set GS_BIN=C:\latex\gs\gs8.61\bin -- cgit v1.2.3 From f5c74e3a9d4e23e6cc86851b426dd05958e907ee Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Mon, 4 Jul 2016 14:30:44 +0200 Subject: Prevent data-losing crash when sorting attributes and Layer dialog open. (bzr r15007) --- src/attribute-sort-util.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/attribute-sort-util.cpp b/src/attribute-sort-util.cpp index d0f45c418..5c01f7914 100644 --- a/src/attribute-sort-util.cpp +++ b/src/attribute-sort-util.cpp @@ -105,12 +105,17 @@ void sp_attribute_sort_element(Node *repr) { //for (auto it: my_list) { for (std::vector >::iterator it = my_list.begin(); it != my_list.end(); ++it) { - repr->setAttribute( it->first.c_str(), NULL, false ); + // Removing "inkscape:label" results in crash when Layers dialog is open. + if (it->first != "inkscape:label") { + repr->setAttribute( it->first.c_str(), NULL, false ); + } } // Insert all attributes in proper order for (std::vector >::iterator it = my_list.begin(); it != my_list.end(); ++it) { - repr->setAttribute( it->first.c_str(), it->second.c_str(), false ); + if (it->first != "inkscape:label") { + repr->setAttribute( it->first.c_str(), it->second.c_str(), false ); + } } } -- cgit v1.2.3 From be79b33c0c55628f347f2a8418cbd54997050920 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Mon, 4 Jul 2016 16:47:05 +0200 Subject: Fix typo that prevents reading of 'units-per-em'. (bzr r15008) --- src/ui/dialog/svg-fonts-dialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp index a39955123..08ebbcf14 100644 --- a/src/ui/dialog/svg-fonts-dialog.cpp +++ b/src/ui/dialog/svg-fonts-dialog.cpp @@ -497,7 +497,7 @@ SvgFontsDialog::flip_coordinate_system(Geom::PathVector pathv){ for (obj = get_selected_spfont()->children; obj; obj=obj->next){ if (SP_IS_FONTFACE(obj)){ //XML Tree being directly used here while it shouldn't be. - sp_repr_get_double(obj->getRepr(), "units_per_em", &units_per_em); + sp_repr_get_double(obj->getRepr(), "units-per-em", &units_per_em); } } -- cgit v1.2.3 From 638d1a44b273371c8cd6664242238eeb496426d7 Mon Sep 17 00:00:00 2001 From: firashanife Date: Mon, 4 Jul 2016 17:06:17 +0200 Subject: [Bug #1574561] Italian translation updates for 0.92.x. Fixed bugs: - https://launchpad.net/bugs/1574561 (bzr r15009) --- po/it.po | 1270 +++----------------------------------------------------------- 1 file changed, 59 insertions(+), 1211 deletions(-) diff --git a/po/it.po b/po/it.po index 0011c90f7..c069e24c4 100644 --- a/po/it.po +++ b/po/it.po @@ -6633,51 +6633,48 @@ msgid "Replace RGB by any color" msgstr "Rimpiazza RGB con qualsiasi colore" #: ../src/extension/internal/filter/color.h:254 -#, fuzzy msgid "Color Blindness" -msgstr "Cecità colori" +msgstr "Cecità ai colori" #: ../src/extension/internal/filter/color.h:258 -#, fuzzy msgid "Blindness type:" msgstr "Tipo cecità:" #: ../src/extension/internal/filter/color.h:259 msgid "Rod monochromacy (atypical achromatopsia)" -msgstr "" +msgstr "Monocromatismo dei bastoncelli (acromatopsia atipica)" #: ../src/extension/internal/filter/color.h:260 msgid "Cone monochromacy (typical achromatopsia)" -msgstr "" +msgstr "Monocromatismo dei coni (acromatopsia tipica)" #: ../src/extension/internal/filter/color.h:261 msgid "Green weak (deuteranomaly)" -msgstr "" +msgstr "Scarsa sensibilità al verde (deuteranomalia)" #: ../src/extension/internal/filter/color.h:262 msgid "Green blind (deuteranopia)" -msgstr "" +msgstr "Cecità al verde (deuteranopia)" #: ../src/extension/internal/filter/color.h:263 msgid "Red weak (protanomaly)" -msgstr "" +msgstr "Scarsa sensibilità al rosso (protanomalia)" #: ../src/extension/internal/filter/color.h:264 msgid "Red blind (protanopia)" -msgstr "" +msgstr "Cecità al rosso (protanopia)" #: ../src/extension/internal/filter/color.h:265 msgid "Blue weak (tritanomaly)" -msgstr "" +msgstr "Scarsa sensibilità al blu (tritanomalia)" #: ../src/extension/internal/filter/color.h:266 msgid "Blue blind (tritanopia)" -msgstr "" +msgstr "Cecità al blu (tritanopia)" #: ../src/extension/internal/filter/color.h:286 -#, fuzzy msgid "Simulate color blindness" -msgstr "Simula cecità colori" +msgstr "Simula la cecità ai colori" #: ../src/extension/internal/filter/color.h:329 msgid "Color Shift" @@ -9444,19 +9441,16 @@ msgid "Clone original path" msgstr "Clona tracciato originale" #: ../src/live_effects/effect.cpp:137 -#, fuzzy msgid "Lattice Deformation 2" -msgstr "Deformazione reticolare" +msgstr "Deformazione reticolare 2" #: ../src/live_effects/effect.cpp:138 -#, fuzzy msgid "Perspective/Envelope" -msgstr "Prospettiva" +msgstr "Prospettiva/Busta" #: ../src/live_effects/effect.cpp:139 -#, fuzzy msgid "Interpolate points" -msgstr "Interpola" +msgstr "Interpola punti" #: ../src/live_effects/effect.cpp:140 #, fuzzy @@ -9492,9 +9486,8 @@ msgstr "Ruota copie" #. Ponyscape -> Inkscape 0.92 #: ../src/live_effects/effect.cpp:149 -#, fuzzy msgid "Attach path" -msgstr "Tracciato di cucitura:" +msgstr "Lega tracciato" #: ../src/live_effects/effect.cpp:150 #, fuzzy @@ -9511,9 +9504,8 @@ msgid "Ellipse by 5 points" msgstr "Cerchio da 3 punti" #: ../src/live_effects/effect.cpp:153 -#, fuzzy msgid "Bounding Box" -msgstr "Riquadri" +msgstr "Riquadro di delimitazione" #: ../src/live_effects/effect.cpp:361 msgid "Is visible?" @@ -9525,7 +9517,7 @@ msgid "" "disabled on canvas" msgstr "" "Se non selezionato, l'effetto rimane applicato all'oggetto ma è " -"temporaneamente disabilitato sulla tela" +"temporaneamente disabilitato sull'area di lavoro" #: ../src/live_effects/effect.cpp:386 msgid "No effect" @@ -9545,78 +9537,68 @@ msgstr "Modifica del parametro %s." msgid "None of the applied path effect's parameters can be edited on-canvas." msgstr "" "Nessuno dei parametri dell'effetto su tracciato applicato può essere " -"modificato direttamente sulla tela." +"modificato direttamente sull'area di lavoro." #: ../src/live_effects/lpe-attach-path.cpp:29 -#, fuzzy msgid "Start path:" -msgstr "Tracciato di cucitura:" +msgstr "Inizio tracciato:" #: ../src/live_effects/lpe-attach-path.cpp:29 -#, fuzzy msgid "Path to attach to the start of this path" -msgstr "Tracciato da mettere sul tracciato scheletro" +msgstr "Tracciato da legare all'inizio di questo tracciato" #: ../src/live_effects/lpe-attach-path.cpp:30 -#, fuzzy msgid "Start path position:" -msgstr "Posizione casuale" +msgstr "Posizione inizio tracciato:" #: ../src/live_effects/lpe-attach-path.cpp:30 msgid "Position to attach path start to" -msgstr "" +msgstr "Posizione del legame di inizio tracciato" #: ../src/live_effects/lpe-attach-path.cpp:31 -#, fuzzy msgid "Start path curve start:" -msgstr "Imposta colore tracciato a rosso:" +msgstr "Curvatura iniziale di inizio tracciato:" #: ../src/live_effects/lpe-attach-path.cpp:31 #: ../src/live_effects/lpe-attach-path.cpp:35 -#, fuzzy msgid "Starting curve" -msgstr "Trascina curva" +msgstr "Curvatura iniziale" #. , true #: ../src/live_effects/lpe-attach-path.cpp:32 -#, fuzzy msgid "Start path curve end:" -msgstr "Imposta colore tracciato a rosso:" +msgstr "Curvatura finale di inizio tracciato:" #: ../src/live_effects/lpe-attach-path.cpp:32 #: ../src/live_effects/lpe-attach-path.cpp:36 -#, fuzzy msgid "Ending curve" -msgstr "curvatura minima" +msgstr "Curvatura finale" #. , true #: ../src/live_effects/lpe-attach-path.cpp:33 -#, fuzzy msgid "End path:" -msgstr "Tracciato di piega:" +msgstr "Fine tracciato:" #: ../src/live_effects/lpe-attach-path.cpp:33 -#, fuzzy msgid "Path to attach to the end of this path" -msgstr "Tracciato da mettere sul tracciato scheletro" +msgstr "Tracciato da legare alla fine di questo tracciato" #: ../src/live_effects/lpe-attach-path.cpp:34 -#, fuzzy msgid "End path position:" -msgstr "Posizione casuale" +msgstr "Posizione fine tracciato:" #: ../src/live_effects/lpe-attach-path.cpp:34 msgid "Position to attach path end to" -msgstr "" +msgstr "Posizione del legame di fine tracciato" #: ../src/live_effects/lpe-attach-path.cpp:35 msgid "End path curve start:" -msgstr "" +msgstr "Curvatura iniziale di fine tracciato:" #. , true #: ../src/live_effects/lpe-attach-path.cpp:36 msgid "End path curve end:" -msgstr "" +msgstr "Curvatura finale di fine tracciato:" #: ../src/live_effects/lpe-bendpath.cpp:69 msgid "Bend path:" @@ -10346,7 +10328,7 @@ msgstr "Rispecchia i movimenti verticalmente" #: ../src/live_effects/lpe-lattice2.cpp:49 msgid "Update while moving knots (maybe slow)" -msgstr "" +msgstr "Aggiorna durante lo spostamento dei punti (può rallentare)" #: ../src/live_effects/lpe-lattice2.cpp:50 msgid "Control 0:" @@ -11336,7 +11318,7 @@ msgstr "Tratti:" #: ../src/live_effects/lpe-sketch.cpp:38 msgid "Draw that many approximating strokes" -msgstr "Disegna un tal numero di tratti approssimanti" +msgstr "Disegna questo numero di tratti approssimanti" #: ../src/live_effects/lpe-sketch.cpp:39 msgid "Max stroke length:" @@ -11910,7 +11892,7 @@ msgstr "x0:y0:x1:y1" #: ../src/main.cpp:340 msgid "Exported area is the entire drawing (not page)" -msgstr "L'area esportata è il disegno intero (non la tela)" +msgstr "L'area esportata è il disegno intero (non l'area di lavoro)" #: ../src/main.cpp:345 msgid "Exported area is the entire page" @@ -13024,7 +13006,7 @@ msgstr "Rimuovi maschera" #: ../src/selection-chemistry.cpp:4180 msgid "Select object(s) to fit canvas to." -msgstr "Seleziona l'oggetto a cui adattare la tela." +msgstr "Seleziona l'oggetto a cui adattare l'area di lavoro." #. Fit Page #: ../src/selection-chemistry.cpp:4200 ../src/verbs.cpp:3004 @@ -14628,18 +14610,16 @@ msgid "_Trace" msgstr "Ve_ttorizza" #: ../src/ui/dialog/clonetiler.cpp:788 -#, fuzzy msgid "Trace the drawing under the clones/sprayed items" -msgstr "Vettorizza il disegno sotto i cloni" +msgstr "Vettorizza il disegno sotto i cloni/oggetti spruzzati" #: ../src/ui/dialog/clonetiler.cpp:792 -#, fuzzy msgid "" "For each clone/sprayed item, pick a value from the drawing in its location " "and apply it" msgstr "" -"Per ogni clone preleva il valore del disegno su cui il clone è posto e lo " -"applica al clone" +"Per ogni clone/oggetto spruzzato preleva il valore del disegno su cui il " +"clone è posto e lo applica al clone" #: ../src/ui/dialog/clonetiler.cpp:811 msgid "1. Pick from the drawing:" @@ -14772,9 +14752,8 @@ msgid "Each clone's opacity is determined by the picked value in that point" msgstr "L'opacità di ogni clone è determinata dal valore preso in quel punto" #: ../src/ui/dialog/clonetiler.cpp:1011 -#, fuzzy msgid "Apply to tiled clones:" -msgstr "Elimina cloni in serie" +msgstr "Applica ai cloni in serie:" #: ../src/ui/dialog/clonetiler.cpp:1052 msgid "How many rows in the tiling" @@ -20034,7 +20013,7 @@ msgid "" "How fast the canvas autoscrolls when you drag beyond canvas edge (0 to turn " "autoscroll off)" msgstr "" -"La velocità con cui la tela scorrerà automaticamente durante il " +"La velocità con cui l'area di lavoro scorrerà automaticamente durante il " "trascinamento fuori dal bordo (0 per disattivarlo)" #: ../src/ui/dialog/inkscape-preferences.cpp:1264 @@ -20047,9 +20026,9 @@ msgid "" "How far (in screen pixels) you need to be from the canvas edge to trigger " "autoscroll; positive is outside the canvas, negative is within the canvas" msgstr "" -"La distanza (in pixel dello schermo) dal bordo della tela per attivare lo " -"scorrimento automatico; un numero positivo indica l'esterno della tela, uno " -"negativo l'interno" +"La distanza (in pixel dello schermo) dal bordo dell'area di lavoro per " +"attivare lo scorrimento automatico; un numero positivo indica l'esterno " +"dell'area di lavoro, uno negativo l'interno" #: ../src/ui/dialog/inkscape-preferences.cpp:1266 msgid "Mouse move pans when Space is pressed" @@ -20070,8 +20049,9 @@ msgid "" "When on, mouse wheel zooms without Ctrl and scrolls canvas with Ctrl; when " "off, it zooms with Ctrl and scrolls without Ctrl" msgstr "" -"Quando attivo, la rotella del mouse ingrandisce senza Ctrl e sposta la tela " -"con Ctrl; quando disattivo ingrandisce con Ctrl e sposta la tela senza Ctrl" +"Quando attivo, la rotella del mouse ingrandisce senza Ctrl e sposta l'area " +"di lavoro con Ctrl; quando disattivo ingrandisce con Ctrl e sposta l'area di " +"lavoro senza Ctrl" #: ../src/ui/dialog/inkscape-preferences.cpp:1272 msgid "Scrolling" @@ -24942,7 +24922,7 @@ msgstr "Inserimento testo" #: ../src/ui/tools/tool-base.cpp:705 msgid "Space+mouse move to pan canvas" -msgstr "Spazio+spostamento puntatore per muovere la tela" +msgstr "Spazio+spostamento puntatore per muovere l'area di lavoro" #: ../src/ui/tools/tweak-tool.cpp:164 #, c-format @@ -25340,7 +25320,7 @@ msgstr "Proporzionale" #: ../src/ui/widget/font-variants.cpp:63 msgctxt "Font variant" msgid "Tabular" -msgstr "" +msgstr "Tabellare" #: ../src/ui/widget/font-variants.cpp:64 msgctxt "Font variant" @@ -28824,7 +28804,7 @@ msgstr "Larghezza pennino" #: ../src/widgets/calligraphy-toolbar.cpp:431 msgid "The width of the calligraphic pen (relative to the visible canvas area)" -msgstr "La larghezza del pennino (relativa all'area della tela visibile)" +msgstr "La larghezza del pennino (relativa all'area di lavoro visibile)" #. Thinning #: ../src/widgets/calligraphy-toolbar.cpp:444 @@ -29368,7 +29348,7 @@ msgstr "Larghezza zero" #: ../src/widgets/eraser-toolbar.cpp:155 msgid "The width of the eraser pen (relative to the visible canvas area)" -msgstr "La larghezza del cancellino (relativa all'area della tela visibile)" +msgstr "La larghezza del cancellino (relativa all'area di lavoro visibile)" #: ../src/widgets/eraser-toolbar.cpp:171 #, fuzzy @@ -30427,9 +30407,8 @@ msgid "From clipboard" msgstr "Dagli appunti" #: ../src/widgets/pencil-toolbar.cpp:181 -#, fuzzy msgid "Bend from clipboard" -msgstr "Dagli appunti" +msgstr "Piega dagli appunti" #: ../src/widgets/pencil-toolbar.cpp:182 msgid "Last applied" @@ -30848,7 +30827,7 @@ msgstr "(area larga)" #: ../src/widgets/spray-toolbar.cpp:297 msgid "The width of the spray area (relative to the visible canvas area)" msgstr "" -"La larghezza dell'area di spruzzo (relativa all'area della tela visibile)" +"La larghezza dell'area di spruzzo (relativa all'area di lavoro visibile)" #: ../src/widgets/spray-toolbar.cpp:312 msgid "Use the pressure of the input device to alter the width of spray area" @@ -31002,24 +30981,24 @@ msgid "" "Pick color from the drawing. You can use clonetiler trace dialog for " "advanced effects. In clone mode original fill or stroke colors must be unset." msgstr "" +"Preleva il colore dal disegno. Per effetti più avanzati usare i cloni in " +"serie. In modalità di clonazione " #: ../src/widgets/spray-toolbar.cpp:502 ../src/widgets/spray-toolbar.cpp:503 msgid "Pick from center instead average area." -msgstr "" +msgstr "Preleva colore medio area" #: ../src/widgets/spray-toolbar.cpp:515 ../src/widgets/spray-toolbar.cpp:516 msgid "Inverted pick value, retaining color in advanced trace mode" msgstr "" #: ../src/widgets/spray-toolbar.cpp:528 ../src/widgets/spray-toolbar.cpp:529 -#, fuzzy msgid "Apply picked color to fill" -msgstr "Imposta l'ultimo colore selezionato come riempimento" +msgstr "Applica il colore prelevato allo riempimento" #: ../src/widgets/spray-toolbar.cpp:541 ../src/widgets/spray-toolbar.cpp:542 -#, fuzzy msgid "Apply picked color to stroke" -msgstr "Imposta l'ultimo colore selezionato come contorno" +msgstr "Applica il colore prelevato al contorno" #: ../src/widgets/spray-toolbar.cpp:554 ../src/widgets/spray-toolbar.cpp:555 msgid "No overlap between colors" @@ -31055,7 +31034,7 @@ msgstr "Scostamento %:" #: ../src/widgets/spray-toolbar.cpp:609 msgid "Increase to segregate objects more (value in percent)" -msgstr "" +msgstr "Aumentare per separare maggiormente gli oggetti (valore in percentuale)" #: ../src/widgets/star-toolbar.cpp:103 msgid "Star: Change number of corners" @@ -31833,7 +31812,7 @@ msgstr "(ritocco ampio)" #: ../src/widgets/tweak-toolbar.cpp:128 msgid "The width of the tweak area (relative to the visible canvas area)" msgstr "" -"La larghezza dell'area di ritocco (relativa all'area della tela visibile)" +"La larghezza dell'area di ritocco (relativa all'area di lavoro visibile)" #. Force #: ../src/widgets/tweak-toolbar.cpp:142 @@ -39575,10 +39554,6 @@ msgstr "Un formato grafico molto diffuso per clipart" msgid "XAML Input" msgstr "Input XAML" -#, fuzzy -#~ msgid "Break appart cutted itemss" -#~ msgstr "Separa il percorso nel nodo selezionato" - #~ msgid "" #~ "The selected object is not a path.\n" #~ "Try using the procedure Path->Object to Path." @@ -39589,246 +39564,12 @@ msgstr "Input XAML" #~ msgid "Use normal distribution" #~ msgstr "Usa distribuzione normale" -#~ msgid "A4 Landscape Page" -#~ msgstr "Pagina A4 Orizzontale" - -#~ msgid "Empty A4 landscape sheet" -#~ msgstr "Foglio A4 orizzontale vuoto" - -#~ msgid "A4 paper sheet empty landscape" -#~ msgstr "A4 pagina foglio vuoto orizzontale" - -#~ msgid "A4 Page" -#~ msgstr "Pagina A4" - -#~ msgid "Empty A4 sheet" -#~ msgstr "Foglio A4 vuoto" - -#~ msgid "A4 paper sheet empty" -#~ msgstr "A4 pagina foglio vuoto" - -#~ msgid "Black Opaque" -#~ msgstr "Nero opaco" - -#~ msgid "Empty black page" -#~ msgstr "Pagina nera vuota" - -#~ msgid "black opaque empty" -#~ msgstr "nero opaco vuoto" - -#~ msgid "White Opaque" -#~ msgstr "Bianco opaco" - -#~ msgid "Empty white page" -#~ msgstr "Pagina bianca vuota" - -#~ msgid "white opaque empty" -#~ msgstr "bianco opaco vuoto" - -#~ msgid "Empty business card template." -#~ msgstr "Modello biglietto da visita vuoto." - -#~ msgid "business card empty 85x54" -#~ msgstr "biglietto visita vuoto 85x54" - -#~ msgid "Business Card 90x50mm" -#~ msgstr "Biglietto da visita 90x50mm" - -#~ msgid "business card empty 90x50" -#~ msgstr "biglietto visita vuoto 90x50" - -#~ msgid "CD Cover 300dpi" -#~ msgstr "Cover CD 300dpi" - -#~ msgid "Empty CD box cover." -#~ msgstr "Cover CD vuota." - -#~ msgid "CD cover disc disk 300dpi box" -#~ msgstr "CD cover disco 300dpi" - -#~ msgid "DVD Cover Regular 300dpi " -#~ msgstr "Cover DVD Normale 300dpi " - -#~ msgid "Template for both-sides DVD covers." -#~ msgstr "Modello per cover DVD fronte-retro." - -#~ msgid "DVD cover regular 300dpi" -#~ msgstr "DVD cover normale 300dpi" - -#~ msgid "DVD Cover Slim 300dpi " -#~ msgstr "Cover DVD slim 300dpi " - -#~ msgid "Template for both-sides DVD slim covers." -#~ msgstr "Modello per cover DVD slim fronte-retro." - -#~ msgid "DVD cover slim 300dpi" -#~ msgstr "DVD cover slim 300dpi" - -#~ msgid "DVD Cover Superslim 300dpi " -#~ msgstr "Cover DVD superslim 300dpi " - -#~ msgid "Template for both-sides DVD superslim covers." -#~ msgstr "Modello per cover DVD fronte-retro superslim." - -#~ msgid "DVD cover superslim 300dpi" -#~ msgstr "DVD cover superslim 300dpi" - -#~ msgid "DVD Cover Ultraslim 300dpi " -#~ msgstr "Cover DVD ultraslim 300dpi " - -#~ msgid "Template for both-sides DVD ultraslim covers." -#~ msgstr "Modello per cover DVD ultraslim fronte-retro." - -#~ msgid "DVD cover ultraslim 300dpi" -#~ msgstr "DVD cover ultraslim 300dpi" - -#~ msgid "Desktop 1024x768" -#~ msgstr "Desktop 1024x768" - -#~ msgid "Empty desktop size sheet" -#~ msgstr "Foglio dimensione desktop vuoto" - -#~ msgid "desktop 1024x768 wallpaper" -#~ msgstr "desktop 1024x768 wallpaper" - -#~ msgid "Desktop 1600x1200" -#~ msgstr "Desktop 1600x1200" - -#~ msgid "desktop 1600x1200 wallpaper" -#~ msgstr "desktop 1600x1200 wallpaper" - -#~ msgid "desktop 640x480 wallpaper" -#~ msgstr "desktop 640x480 wallpaper" - -#~ msgid "Desktop 800x600" -#~ msgstr "Desktop 800x600" - -#~ msgid "desktop 800x600 wallpaper" -#~ msgstr "desktop 800x600 wallpaper" - -#~ msgid "Fontforge Glyph" -#~ msgstr "Glifo Fontforge" - -#~ msgid "font fontforge glyph 1000x1000" -#~ msgstr "font fontforge glifo 1000x1000" - -#~ msgid "Icon 16x16" -#~ msgstr "Icona 16x16" - -#~ msgid "Small 16x16 icon template." -#~ msgstr "Modello icona piccola 16x16." - -#~ msgid "icon 16x16 empty" -#~ msgstr "icona 16x16 vuota" - -#~ msgid "Icon 32x32" -#~ msgstr "Icona 32x32" - -#~ msgid "32x32 icon template." -#~ msgstr "Modello icona 32x32." - -#~ msgid "icon 32x32 empty" -#~ msgstr "icona 32x32 vuota" - -#~ msgid "Icon 48x48" -#~ msgstr "Icona 48x48" - -#~ msgid "48x48 icon template." -#~ msgstr "Modello icona 48x48." - -#~ msgid "icon 48x48 empty" -#~ msgstr "icona 48x48 vuota" - -#~ msgid "Icon 64x64" -#~ msgstr "Icona 64x64" - -#~ msgid "64x64 icon template." -#~ msgstr "Modello icona 64x64." - -#~ msgid "icon 64x64 empty" -#~ msgstr "icona 64x64 vuota" - -#~ msgid "Letter Landscape" -#~ msgstr "Letter Orizzontale" - -#~ msgid "Standard letter landscape sheet - 792x612" -#~ msgstr "Foglio letter standard orizzontale - 792x612" - -#~ msgid "letter landscape 792x612 empty" -#~ msgstr "letter orizzontale 792x612 vuoto" - -#~ msgid "Letter" -#~ msgstr "Letter" - -#~ msgid "Standard letter sheet - 612x792" -#~ msgstr "Foglio letter standard - 612x792" - -#~ msgid "letter 612x792 empty" -#~ msgstr "letter 612x792 vuoto" - -#~ msgid "No Borders" -#~ msgstr "Nessun bordo" - -#~ msgid "Empty sheet with no borders" -#~ msgstr "Foglio vuoto senza bordi" - -#~ msgid "no borders empty" -#~ msgstr "no bordi vuoto" - -#~ msgid "Video HDTV 1920x1080" -#~ msgstr "Video HDTV 1920x1080" - -#~ msgid "HDTV video template for 1920x1080 resolution." -#~ msgstr "Modello video HDTV per risoluzione 1920x1080." - -#~ msgid "HDTV video empty 1920x1080" -#~ msgstr "HDTV video vuoto 1920x1080" - -#~ msgid "Video NTSC 720x486" -#~ msgstr "Video NTSC 720x486" - -#~ msgid "NTSC video template for 720x486 resolution." -#~ msgstr "Modello video NTSC per risoluzione 720x486." - -#~ msgid "NTSC video empty 720x486" -#~ msgstr "NTSC video vuoto 720x486" - -#~ msgid "Video PAL 728x576" -#~ msgstr "Video PAL 728x576" - -#~ msgid "PAL video template for 728x576 resolution." -#~ msgstr "Modello video PAL per risoluzione 728x576." - -#~ msgid "PAL video empty 728x576" -#~ msgstr "PAL video vuoto 728x576" - -#~ msgid "Web Banner 468x60" -#~ msgstr "Web Banner 468x60" - -#~ msgid "Empty 468x60 web banner template." -#~ msgstr "Modello web banner vuoto 468x60." - -#~ msgid "web banner 468x60 empty" -#~ msgstr "web banner 468x60 vuoto" - -#~ msgid "Web Banner 728x90" -#~ msgstr "Web Banner 728x90" - -#~ msgid "Empty 728x90 web banner template." -#~ msgstr "Modello web banner vuoto 728x90." - -#~ msgid "web banner 728x90 empty" -#~ msgstr "web banner 728x90 vuoto" - #~ msgid "PS+LaTeX: Omit text in PS, and create LaTeX file" #~ msgstr "PS+LaTeX: ometti testo nel file PS, e crea un file LaTeX" #~ msgid "EPS+LaTeX: Omit text in EPS, and create LaTeX file" #~ msgstr "EPS+LaTeX: ometti testo nel file EPS, e crea un file LaTeX" -#~ msgid "import via Poppler" -#~ msgstr "importa via Poppler" - #~ msgid "Text handling:" #~ msgstr "Gestione testo:" @@ -39890,11 +39631,6 @@ msgstr "Input XAML" #~ msgid "Fixed Angle" #~ msgstr "Angolo fisso" -#, fuzzy -#~ msgctxt "Flow control" -#~ msgid "None" -#~ msgstr "Nessuno" - #~ msgid "Arbitrary Angle" #~ msgstr "Angolo arbitrario" @@ -39908,10 +39644,6 @@ msgstr "Input XAML" #~ msgid "Ids" #~ msgstr "_Id" -#, fuzzy -#~ msgid "Help (Options)" -#~ msgstr "Opzioni" - #~ msgid "You need to install the UniConvertor software.\n" #~ msgstr "È necessario installare il programma UniConvertor.\n" @@ -40393,22 +40125,6 @@ msgstr "Input XAML" #~ msgid "<no name found>" #~ msgstr "<nessun nome trovato>" -#, fuzzy -#~ msgid "Set Resolution" -#~ msgstr "Relazione:" - -#, fuzzy -#~ msgid "Fill Area" -#~ msgstr "Colore uniforme" - -#, fuzzy -#~ msgid "Move a connection point" -#~ msgstr "Reinstrada connettore" - -#, fuzzy -#~ msgid "Remove a connection point" -#~ msgstr "Reinstrada connettore" - #, fuzzy #~ msgid "Flowed text (%d character%s)" #~ msgid_plural "Flowed text (%d characters%s)" @@ -40439,22 +40155,6 @@ msgstr "Input XAML" #~ msgid "Connection point drag cancelled." #~ msgstr "Punto finale connettore cancellato." -#~ msgid "T_ype: " -#~ msgstr "T_ipo:" - -#~ msgid "Search in all object types" -#~ msgstr "Cerca oggetti di tutti i tipi" - -#~ msgid "Search all shapes" -#~ msgstr "Cerca tutte le forme" - -#~ msgid "All shapes" -#~ msgstr "Tutte le forme" - -#, fuzzy -#~ msgid "_Text:" -#~ msgstr "Te_sto: " - #~ msgid "Find objects by their text content (exact or partial match)" #~ msgstr "" #~ "Trova oggetti in base al contenuto testuale (corrispondenza esatta o " @@ -40466,10 +40166,6 @@ msgstr "Input XAML" #~ "Trova oggetti in base al valore dell'attributo id (corrispondenza esatta " #~ "o parziale)" -#, fuzzy -#~ msgid "_Style:" -#~ msgstr "_Stile: " - #~ msgid "" #~ "Find objects by the value of the style attribute (exact or partial match)" #~ msgstr "" @@ -40497,30 +40193,14 @@ msgstr "Input XAML" #~ msgid "Select objects matching all of the fields you filled in" #~ msgstr "Cerca oggetti corrispondenti a tutti i campi spuntati" -#, fuzzy -#~ msgid "Green:" -#~ msgstr "Verde" - -#, fuzzy -#~ msgid "Blue:" -#~ msgstr "Blu" - #, fuzzy #~ msgid "Lightness:" #~ msgstr "Luminosità" -#, fuzzy -#~ msgid "Alpha:" -#~ msgstr "Alfa" - #, fuzzy #~ msgid "Level:" #~ msgstr "Livello" -#, fuzzy -#~ msgid "Contrast:" -#~ msgstr "Contrasto" - #, fuzzy #~ msgid "Composite:" #~ msgstr "Composto" @@ -40529,14 +40209,6 @@ msgstr "Input XAML" #~ msgid "Glow:" #~ msgstr "Alone" -#, fuzzy -#~ msgid "Blur:" -#~ msgstr "Sfocat_ura:" - -#, fuzzy -#~ msgid "Blur type:" -#~ msgstr "Ritocco sfocatura" - #, fuzzy #~ msgid "Link or embed image:" #~ msgstr "Incorpora immagini" @@ -40544,54 +40216,6 @@ msgstr "Input XAML" #~ msgid "drawing-%d%s" #~ msgstr "disegno-%d%s" -#~ msgid "%s" -#~ msgstr "%s" - -#~ msgid "Pt" -#~ msgstr "Pt" - -#~ msgid "Picas" -#~ msgstr "Pica" - -#~ msgid "Pc" -#~ msgstr "Pc" - -#~ msgid "Pixels" -#~ msgstr "Pixel" - -#~ msgid "Px" -#~ msgstr "Px" - -#~ msgid "Percent" -#~ msgstr "Percentuale" - -#~ msgid "Percents" -#~ msgstr "Percentuale" - -#~ msgid "Millimeters" -#~ msgstr "Millimetri" - -#~ msgid "Centimeters" -#~ msgstr "Centimetri" - -#~ msgid "Meter" -#~ msgstr "Metro" - -#~ msgid "Meters" -#~ msgstr "Metri" - -#~ msgid "Inches" -#~ msgstr "Pollici" - -#~ msgid "Foot" -#~ msgstr "Piede" - -#~ msgid "Feet" -#~ msgstr "Piedi" - -#~ msgid "em" -#~ msgstr "em" - #~ msgid "Em squares" #~ msgstr "Riquadri Em" @@ -40608,9 +40232,6 @@ msgstr "Input XAML" #~ msgid "Specifies the shape of the path's corners" #~ msgstr "Preleva la luminosità del colore" -#~ msgid "Whiteboa_rd" -#~ msgstr "Whiteboa_rd" - #, fuzzy #~ msgid "Name by which this document is formally known" #~ msgstr "Il nome con cui viene formalmente conosciuto questo documento." @@ -40660,28 +40281,9 @@ msgstr "Input XAML" #~ "L'argomento del documento espresso in parole chiave, frasi, " #~ "classificazioni separate da virgole." -#, fuzzy -#~ msgid "Extent or scope of this document" -#~ msgstr "Intento o scopo del documento." - -#, fuzzy -#~ msgctxt "Web" -#~ msgid "Link" -#~ msgstr "Linea" - #~ msgid "Polyline" #~ msgstr "Poligonale" -#, fuzzy -#~ msgctxt "Object" -#~ msgid "Text" -#~ msgstr "Testo" - -#, fuzzy -#~ msgctxt "Object" -#~ msgid "Clone" -#~ msgstr "Clonato" - #~ msgid "%i object of type %s" #~ msgid_plural "%i objects of type %s" #~ msgstr[0] "%d oggetto del tipo %s" @@ -40766,10 +40368,6 @@ msgstr "Input XAML" #~ "Colore e trasparenza dello sfondo della pagina (usati anche per " #~ "l'esportazione bitmap)" -#, fuzzy -#~ msgid "Color" -#~ msgstr "Poligono" - #~ msgid "" #~ "The feDiffuseLighting and feSpecularLighting filter primitives " #~ "create \"embossed\" shadings. The input's alpha channel is used to " @@ -40799,26 +40397,9 @@ msgstr "Input XAML" #~ "disattivo, con Spazio si passa temporaneamente allo strumento Selettore " #~ "(predefinito)." -#~ msgid "2x2" -#~ msgstr "2x2" - -#~ msgid "4x4" -#~ msgstr "4x4" - -#~ msgid "8x8" -#~ msgstr "8x8" - #~ msgid "Oversample bitmaps:" #~ msgstr "Sovracampionamento bitmap:" -#, fuzzy -#~ msgid "Always embed" -#~ msgstr "Aggancia sempre" - -#, fuzzy -#~ msgid "Always link" -#~ msgstr "Aggancia sempre" - #~ msgid "_Execute Javascript" #~ msgstr "_Esegui Javascript" @@ -40853,10 +40434,6 @@ msgstr "Input XAML" #~ msgid "_Grid" #~ msgstr "_Griglia" -#, fuzzy -#~ msgid " and " -#~ msgstr "Dentro e fuori" - #~ msgid "S_cripts..." #~ msgstr "S_cript..." @@ -40866,18 +40443,6 @@ msgstr "Input XAML" #~ msgid "Save..." #~ msgstr "Salva..." -#, fuzzy -#~ msgid "EditMode" -#~ msgstr "Modalità spigolo:" - -#, fuzzy -#~ msgid "New connection point" -#~ msgstr "Cambia spaziatura connettori" - -#, fuzzy -#~ msgid "Remove connection point" -#~ msgstr "Reinstrada connettore" - #, fuzzy #~ msgid "%s%s: %d (outline%s) - Inkscape" #~ msgstr "%s: %d (contorni) - Inkscape" @@ -40917,34 +40482,6 @@ msgstr "Input XAML" #, fuzzy #~ msgid "keep only visible layers" #~ msgstr "Stampa livelli invisibili" - -#~ msgid "1/10" -#~ msgstr "1/10" - -#~ msgid "1/2" -#~ msgstr "1/2" - -#~ msgid "1/3" -#~ msgstr "1/3" - -#~ msgid "1/4" -#~ msgstr "1/4" - -#~ msgid "1/5" -#~ msgstr "1/5" - -#~ msgid "1/6" -#~ msgstr "1/6" - -#~ msgid "1/7" -#~ msgstr "1/7" - -#~ msgid "1/8" -#~ msgstr "1/8" - -#~ msgid "1/9" -#~ msgstr "1/9" - #, fuzzy #~ msgid "Horizontal guide each:" #~ msgstr "Guide orizzontali ogni" @@ -40988,12 +40525,6 @@ msgstr "Input XAML" #~ "arbitrari. Il motivo è l'oggetto superiore della selezione (sono permessi " #~ "gruppi di tracciati/forme/cloni)." -#~ msgid "ASCII Text" -#~ msgstr "Testo ASCII" - -#~ msgid "Text File (*.txt)" -#~ msgstr "File di testo (*.txt)" - #~ msgid "Text Input" #~ msgstr "Input testo" @@ -41001,14 +40532,6 @@ msgstr "Input XAML" #~ msgid "Dark mode" #~ msgstr "Rilievo scuro" -#, fuzzy -#~ msgid "[Unstable!] Power stroke" -#~ msgstr "Motivo del contorno" - -#, fuzzy -#~ msgid "[Unstable!] Clone original path" -#~ msgstr "Sostituisci testo" - #~ msgid "The directory where autosaves will be written" #~ msgstr "Cartella in cui scrivere i salvataggi automatici" @@ -41018,25 +40541,12 @@ msgstr "Input XAML" #~ msgid "Bitmap size" #~ msgstr "Dimensione bitmap" -#~ msgid "Grid line _color:" -#~ msgstr "_Colore della griglia:" - -#~ msgid "Grid line color" -#~ msgstr "Colore della griglia" - #~ msgid "Export area is drawing" #~ msgstr "L'area esportata è il disegno" #~ msgid "Export area is page" #~ msgstr "L'area esportata è la pagina" -#~ msgid "Vacuum <defs>" -#~ msgstr "Definizioni superflue" - -#, fuzzy -#~ msgid "_Select Same Fill and Stroke" -#~ msgstr "_Riempimento e Contorni" - #~ msgid "%s%s. %s." #~ msgstr "%s%s. %s." @@ -41093,83 +40603,6 @@ msgstr "Input XAML" #~ msgid "was found." #~ msgstr "File trovati" -#~ msgid "Vac_uum Defs" -#~ msgstr "Definizioni s_uperflue" - -#~ msgid "In_kscape Preferences..." -#~ msgstr "Preferenze di In_kscape..." - -#~ msgid "_Find..." -#~ msgstr "_Trova..." - -#, fuzzy -#~ msgid "Font size (px)" -#~ msgstr "Dimensione carattere [px]" - -#, fuzzy -#~ msgid "Angle 0" -#~ msgstr "Angolo X" - -#, fuzzy -#~ msgid "Angle 120" -#~ msgstr "Angolo X" - -#, fuzzy -#~ msgid "Angle 135" -#~ msgstr "Angolo X" - -#, fuzzy -#~ msgid "Angle 150" -#~ msgstr "Angolo X" - -#, fuzzy -#~ msgid "Angle 180" -#~ msgstr "Angolo X" - -#, fuzzy -#~ msgid "Angle 210" -#~ msgstr "Angolo X" - -#, fuzzy -#~ msgid "Angle 225" -#~ msgstr "Angolo X" - -#, fuzzy -#~ msgid "Angle 240" -#~ msgstr "Angolo X" - -#, fuzzy -#~ msgid "Angle 270" -#~ msgstr "Angolo X" - -#, fuzzy -#~ msgid "Angle 30" -#~ msgstr "Angolo X" - -#, fuzzy -#~ msgid "Angle 300" -#~ msgstr "Angolo X" - -#, fuzzy -#~ msgid "Angle 315" -#~ msgstr "Angolo X" - -#, fuzzy -#~ msgid "Angle 330" -#~ msgstr "Angolo X" - -#, fuzzy -#~ msgid "Angle 45" -#~ msgstr "Angolo X" - -#, fuzzy -#~ msgid "Angle 60" -#~ msgstr "Angolo X" - -#, fuzzy -#~ msgid "Angle 90" -#~ msgstr "Angolo X" - #, fuzzy #~ msgid "Display Format: " #~ msgstr "Unità di visualizzazione" @@ -41271,13 +40704,6 @@ msgstr "Input XAML" #~ msgid "No files matched your search" #~ msgstr "Nessun file soddisfa la ricerca" -#, fuzzy -#~ msgid "_Opacity (%):" -#~ msgstr "Opacità, %:" - -#~ msgid "Import a document from Open Clip Art Library" -#~ msgstr "Importa un documento dall'Open Clip Art Library" - #~ msgid "No gradients" #~ msgstr "Nessun gradiente" @@ -41613,10 +41039,6 @@ msgstr "Input XAML" #~ msgid "convex hull corner" #~ msgstr "angolo convesso" -#, fuzzy -#~ msgid "Experimental" -#~ msgstr "Esponente" - #, fuzzy #~ msgid "Diffuse light, custom (ABCs)" #~ msgstr "Illuminazione diffusa" @@ -41625,26 +41047,10 @@ msgstr "Input XAML" #~ msgid "Specular light, custom (ABCs)" #~ msgstr "Illuminazione speculare" -#, fuzzy -#~ msgid "Brightness, custom (Color)" -#~ msgstr "Riduzione luminosità" - -#, fuzzy -#~ msgid "Vibration:" -#~ msgstr "Incidenza:" - -#, fuzzy -#~ msgid "Lightness, custom (Color)" -#~ msgstr "Riduzione luminosità" - #, fuzzy #~ msgid "Quadritone fantasy, custom (Color)" #~ msgstr "Fantasia in quattro torni" -#, fuzzy -#~ msgid "Opacity (%):" -#~ msgstr "Opacità, %:" - #~ msgid "Black, blurred drop shadow" #~ msgstr "Ombra proiettata, nera e sfuocata" @@ -41658,18 +41064,10 @@ msgstr "Input XAML" #~ msgid "Y frequency:" #~ msgstr "Frequenza base:" -#, fuzzy -#~ msgid "Drawing, custom" -#~ msgstr "Disegno" - #, fuzzy #~ msgid "Transluscent" #~ msgstr "Traslucido" -#, fuzzy -#~ msgid "link" -#~ msgstr "linee" - #, fuzzy #~ msgid "To spray a path by pushing, select it and drag over it." #~ msgstr "" @@ -41768,416 +41166,6 @@ msgstr "Input XAML" #~ msgid "ZIP Output" #~ msgstr "Output ZIP" -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Blue1" -#~ msgstr "Blu" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Blue2" -#~ msgstr "Blu" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Blue3" -#~ msgstr "Blu" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Red1" -#~ msgstr "Rosso" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Red2" -#~ msgstr "Rosso" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Red3" -#~ msgstr "Rosso" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Orange1" -#~ msgstr "Ordinamento" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Orange2" -#~ msgstr "Ordinamento" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Orange3" -#~ msgstr "Ordinamento" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Green1" -#~ msgstr "Verde" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Green2" -#~ msgstr "Verde" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Green3" -#~ msgstr "Verde" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Purple1" -#~ msgstr "Persone" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Purple2" -#~ msgstr "Persone" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Purple3" -#~ msgstr "Persone" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Metalic1" -#~ msgstr "Magenta" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Metalic2" -#~ msgstr "Magenta" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Metalic3" -#~ msgstr "Magenta" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Metalic4" -#~ msgstr "Magenta" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Grey1" -#~ msgstr "Grigio" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Grey2" -#~ msgstr "Grigio" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Grey3" -#~ msgstr "Grigio" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Grey4" -#~ msgstr "Grigio" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Grey5" -#~ msgstr "Grigio" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "default outer 1" -#~ msgstr "Titolo predefinito" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "default outer 2" -#~ msgstr "Titolo predefinito" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "default outer 3" -#~ msgstr "Titolo predefinito" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "default block" -#~ msgstr "(predefinito)" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "default covered text" -#~ msgstr "Crea testo dinamico" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "default text" -#~ msgstr "Titolo predefinito" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "default light block" -#~ msgstr "Titolo predefinito" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "default light covered text" -#~ msgstr "Licenza predefinita" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "default light text" -#~ msgstr "Titolo predefinito" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "beetle added green" -#~ msgstr "Crea e modifica i gradienti" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "beetle header text" -#~ msgstr "Elimina testo" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "beetle background" -#~ msgstr "Rimuovi sfondo" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "beetle covered text" -#~ msgstr "Crea testo dinamico" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "beetle text" -#~ msgstr "Elimina testo" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "albatross background" -#~ msgstr "Rimuovi sfondo" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "albatross block" -#~ msgstr "curvo" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "albatross block header" -#~ msgstr "curvo" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "fly text" -#~ msgstr "Inserimento testo" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "fly outer" -#~ msgstr "filtro" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "fly background" -#~ msgstr "Sfondo" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "fly header text" -#~ msgstr "Incolla testo" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "fly covered text" -#~ msgstr "Il testo dinamico è stato creato" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "seagull background" -#~ msgstr "Rimuovi sfondo" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "seagull text" -#~ msgstr "Testo verticale" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "beaver block header text" -#~ msgstr "Crea testo dinamico" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "beaver added green" -#~ msgstr "Crea e modifica i gradienti" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "beaver covered text" -#~ msgstr "Crea testo dinamico" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "beaver background" -#~ msgstr "Rimuovi sfondo" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "beaver text" -#~ msgstr "Crea testo" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "crane outer 1" -#~ msgstr "Triangolo decrescente" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "crane outer 2" -#~ msgstr "Triangolo decrescente" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "crane outer 3" -#~ msgstr "Triangolo decrescente" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "crane added orange" -#~ msgstr "Angolo di rotazione" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "crane block header" -#~ msgstr "Sblocca livello" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "crane covered text" -#~ msgstr "Crea testo dinamico" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "crane text" -#~ msgstr "Crea testo" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "wolverine background" -#~ msgstr "Rimuovi sfondo" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "wolverine text" -#~ msgstr "Elimina testo" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Orange Hilight" -#~ msgstr "Altezza" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Orange" -#~ msgstr "Ordinamento" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Orange Shadow" -#~ msgstr "Ombra interna" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Yellow" -#~ msgstr "Giallo" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Accent Orange" -#~ msgstr "Triangolo exincentro" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Accent Red" -#~ msgstr "centro" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Human" -#~ msgstr "Maniglia" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Environmental Shadow" -#~ msgstr "Ombra interna" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Accent Blue Shadow" -#~ msgstr "Ombra interna" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Accent Green Base" -#~ msgstr "Maiuscole paragrafo" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Accent Magenta" -#~ msgstr "Magenta" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Grey 1" -#~ msgstr "Grigio" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Grey 2" -#~ msgstr "Grigio" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Grey 3" -#~ msgstr "Grigio" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Grey 4" -#~ msgstr "Grigio" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Grey 5" -#~ msgstr "Grigio" - -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "Grey 6" -#~ msgstr "Grigio" - -#, fuzzy -#~ msgctxt "Filter blend mode" -#~ msgid "Normal" -#~ msgstr "Normale" - -#, fuzzy -#~ msgctxt "Filter blend mode" -#~ msgid "Screen" -#~ msgstr "Scherma" - -#, fuzzy -#~ msgctxt "Gap" -#~ msgid "H:" -#~ msgstr "H:" - #~ msgid "When the original is deleted, its clones:" #~ msgstr "Quando l'originale viene cancellato, i suoi cloni vengono:" @@ -42746,10 +41734,6 @@ msgstr "Input XAML" #~ msgid "Text label attached to the path" #~ msgstr "Etichetta testuale attaccata al tracciato" -#, fuzzy -#~ msgid "Transform Handles:" -#~ msgstr "Trasforma gradienti" - #~ msgid "Session file" #~ msgstr "File sessione:" @@ -42762,10 +41746,6 @@ msgstr "Input XAML" #~ msgid "Close file" #~ msgstr "Chiudi file" -#, fuzzy -#~ msgid "Open new file" -#~ msgstr "Apri file sessione" - #~ msgid "Rewind" #~ msgstr "Riavvolgi" @@ -43207,18 +42187,6 @@ msgstr "Input XAML" #~ msgid "HSL bubbles, diffuse" #~ msgstr "Bolle HSL, luce diffusa" -#, fuzzy -#~ msgid "HSL bubbles, transparent" -#~ msgstr "0 (trasparente)" - -#, fuzzy -#~ msgid "Subtract negative" -#~ msgstr "Sottrazione A-B" - -#, fuzzy -#~ msgid "Subtract positive" -#~ msgstr "Variazione punto iniziale" - #~ msgid "Open files saved for plotters" #~ msgstr "Apri file salvati per plotter" @@ -43226,21 +42194,9 @@ msgstr "Input XAML" #~ msgid "Glossy painting effect for bitmaps" #~ msgstr "Converti effetti sfocatura a bitmap" -#, fuzzy -#~ msgid "Melt and glow" -#~ msgstr "Angolo sinistro" - -#, fuzzy -#~ msgid "Badge" -#~ msgstr "Bordatura" - #~ msgid "Ghost outline" #~ msgstr "Contorno fantasma" -#, fuzzy -#~ msgid "Flow inside" -#~ msgstr "Modalità increspatura" - #~ msgid "Lead pencil" #~ msgstr "Pastello a piombo" @@ -43256,40 +42212,12 @@ msgstr "Input XAML" #~ msgid "Organization" #~ msgstr "Organizzazione" -#, fuzzy -#~ msgid "Comics rounded" -#~ msgstr "non arrotondato" - #~ msgid "Preferred resolution (DPI) of bitmaps" #~ msgstr "Risoluzione preferita (DPI) delle bitmap" -#, fuzzy -#~ msgid "Deactivate knotholder?" -#~ msgstr "Disattivato" - #~ msgid "The resolution used for exporting SVG into bitmap (default 90)" #~ msgstr "La risoluzione per esportare SVG in bitmap (predefinita 90)" -#, fuzzy -#~ msgid "gradient level" -#~ msgstr "Nessun gradiente selezionato" - -#, fuzzy -#~ msgid "Under glass effect for bitmaps" -#~ msgstr "Converti effetti sfocatura a bitmap" - -#, fuzzy -#~ msgid "HSL-sensitive Bubbles effect for bitmaps" -#~ msgstr "Converti effetti sfocatura a bitmap" - -#, fuzzy -#~ msgid "Kilt" -#~ msgstr "Tilt" - -#, fuzzy -#~ msgid "Bump for bitmaps" -#~ msgstr "Bitmap" - #~ msgid "Biggest item" #~ msgstr "L'oggetto più grande" @@ -43302,18 +42230,6 @@ msgstr "Input XAML" #~ msgid "Median Filter" #~ msgstr "Filtro mediano" -#, fuzzy -#~ msgid "el Greek" -#~ msgstr "Verde" - -#, fuzzy -#~ msgid "Commands bar icon size" -#~ msgstr "Barra dei comandi" - -#, fuzzy -#~ msgid "Snap nodes" -#~ msgstr "Aggancia ai n_odi" - #, fuzzy #~ msgid "Snap to intersections of a grid with a guide" #~ msgstr "Aggancio alle intersezioni di" @@ -43355,34 +42271,6 @@ msgstr "Input XAML" #~ msgid "Embed fonts (Type 1 only)" #~ msgstr "Includi font (solo Type 1)" -#, fuzzy -#~ msgid "Yes, more descriptions" -#~ msgstr "Imposta descrizione oggetto" - -#, fuzzy -#~ msgid "Crystal" -#~ msgstr "Scala di grigi" - -#, fuzzy -#~ msgid "Artist text" -#~ msgstr "Testo verticale" - -#, fuzzy -#~ msgid "Amount of Blur" -#~ msgstr "Grado di vorticosità" - -#, fuzzy -#~ msgid "Iron Man vector objects" -#~ msgstr "Riordina gli oggetti selezionati" - -#, fuzzy -#~ msgid "PatternedGlass" -#~ msgstr "Motivo" - -#, fuzzy -#~ msgid "Snow" -#~ msgstr "Mostra:" - #~ msgid "Print Destination" #~ msgstr "Destinazione stampa" @@ -43472,26 +42360,6 @@ msgstr "Input XAML" #~ "Inkscape verrà eseguito con i menù predefiniti.\n" #~ "I nuovi menù non verranno salvati." -#, fuzzy -#~ msgid "Gap width" -#~ msgstr "Larghezza uguale" - -#, fuzzy -#~ msgid "Lala" -#~ msgstr "Etichet_ta" - -#, fuzzy -#~ msgid "Lolo" -#~ msgstr "Colore" - -#, fuzzy -#~ msgid "Last gen. segment" -#~ msgstr "Elimina segmento" - -#, fuzzy -#~ msgid "Reference" -#~ msgstr "Differenza" - #, fuzzy #~ msgid "Change LPE point parameter" #~ msgstr "Modifica parametri del punto" @@ -43598,10 +42466,6 @@ msgstr "Input XAML" #~ msgid "What snaps" #~ msgstr "Applicazione aggancio" -#, fuzzy -#~ msgid "Special points to consider" -#~ msgstr "Aggancio alle guide" - #~ msgid "" #~ "This value affects the amount of smoothing applied to freehand lines; " #~ "lower values produce more uneven paths with more nodes" @@ -43632,18 +42496,6 @@ msgstr "Input XAML" #~ msgid "Angle Z" #~ msgstr "Angolo Z" -#, fuzzy -#~ msgid "Enable auto-save of document" -#~ msgstr "Vettorizza: Nessun documento attivo" - -#, fuzzy -#~ msgid "Mode:" -#~ msgstr "Bordo" - -#, fuzzy -#~ msgid "Spiro splines mode" -#~ msgstr "Modalità riduzione" - #~ msgid "Grow (outset) parts of paths" #~ msgstr "Accresce (estrude) parti di tracciati" @@ -43951,10 +42803,6 @@ msgstr "Input XAML" #~ msgid "Print Preview not available" #~ msgstr "Anteprima di stampa non disponibile" -#, fuzzy -#~ msgid "Snap details" -#~ msgstr "Aggancia ai _tracciati" - #~ msgid "Gridtype" #~ msgstr "Tipo di griglia" -- cgit v1.2.3 From 8155c4690b6a74d704eaee3b19fef32c62fd38a4 Mon Sep 17 00:00:00 2001 From: Sebastian Faubel Date: Tue, 5 Jul 2016 12:39:38 +0200 Subject: Refactored the path settings and install scripts. Fixed build for 32-Bit devlibs. (bzr r15002.1.3) --- CMakeLists.txt | 294 ++++------------------------------------- CMakeScripts/ConfigPaths.cmake | 173 ++---------------------- mingwenv.bat | 34 +++-- 3 files changed, 66 insertions(+), 435 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 489346ca2..86ea1ecea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,58 +6,7 @@ message("------------------------------") message("Source Dir: ${CMAKE_CURRENT_SOURCE_DIR}") message("Binary Dir: ${CMAKE_CURRENT_BINARY_DIR}") -# ----------------------------------------------------------------------------- -# Set platform defaults (originally copied from darktable) -# ----------------------------------------------------------------------------- -include(CMakeScripts/ConfigPaths.cmake) - -if(WIN32) - message("-- Windows build detected, setting default features") - - list(INSERT CMAKE_SYSTEM_INCLUDE_PATH 0 ${DEVLIBS_PATH}) - list(INSERT CMAKE_SYSTEM_LIBRARY_PATH 0 ${DEVLIBS_PATH}) - - set(CMAKE_C_COMPILER "${MINGW_BIN}/gcc.exe") - set(CMAKE_C_LINK_EXECUTABLE "${MINGW_BIN}/gcc.exe") - set(CMAKE_CXX_COMPILER "${MINGW_BIN}/g++.exe") - set(CMAKE_CXX_LINK_EXECUTABLE "${MINGW_BIN}/g++.exe") - set(CMAKE_CXX_STANDARD 11) - - # Setup Windows resource files compiler. - set(CMAKE_RC_COMPILER "${MINGW_BIN}/windres.exe") - set(CMAKE_RC_COMPILER_INIT windres) - enable_language(RC) - set(CMAKE_RC_COMPILE_OBJECT " -O coff -i -o ") - - # These options are required for having i18n support on Windows. - option(ENABLE_NLS "Compile with Native Language Support (using gettext)" ON) - option(HAVE_BIND_TEXTDOMAIN_CODESET "Compile with 'bind_textdomain_codeset' function" ON) - - # Does not compile on Windows with these options. - option(BR_PTHREADS "Use binreloc thread support" OFF) - option(ENABLE_BINRELOC "Use AutoPackage" OFF) -endif(WIN32) - -if(APPLE) - message("-- Mac OS X build detected, setting default features") - - # prefer macports and/or user-installed libraries over system ones - #LIST(APPEND CMAKE_PREFIX_PATH /opt/local /usr/local) - set(CMAKE_FIND_FRAMEWORK "LAST") - - # test and display relevant env variables - if(DEFINED ENV{CMAKE_PREFIX_PATH}) - message("CMAKE_PREFIX_PATH: $ENV{CMAKE_PREFIX_PATH}") - endif() - - if(DEFINED ENV{GTKMM_BASEPATH}) - message("GTKMM_BASEPATH: $ENV{GTKMM_BASEPATH}") - endif() - - # detect current GTK+ backend - pkg_check_variable(gtk+-2.0 target) - message("GTK2 backend: ${GTK+_2.0_TARGET}") -endif(APPLE) +include(CMakeScripts/ConfigEnv.cmake) # ----------------------------------------------------------------------------- # CMake Configuration @@ -80,7 +29,6 @@ else() SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/inkscape") endif() - cmake_policy(SET CMP0003 NEW) # don't be prolific with library paths cmake_policy(SET CMP0005 NEW) # proper define quoting cmake_policy(SET CMP0009 NEW) # don't follow symbolic links when using GLOB @@ -178,231 +126,47 @@ add_custom_target(uninstall # Subdirs (on only 1 atm), but a lot happens here # ----------------------------------------------------------------------------- add_subdirectory(src) + if(ENABLE_NLS) add_subdirectory(po) endif(ENABLE_NLS) - # ----------------------------------------------------------------------------- # Man pages # ----------------------------------------------------------------------------- -include("CMakeScripts/Pod2man.cmake") - -# Load AUTHORS file contents into $INKSCAPE_AUTHORS -file(READ ${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS content) -string(REGEX REPLACE "^([^\n#]+)\n" "\\1;\n" content_list "${content}") -join(INKSCAPE_AUTHORS "," "${content_list}") - -foreach(podfile - man/inkscape.pod - man/inkscape.de.pod - man/inkscape.el.pod - man/inkscape.fr.pod - man/inkscape.ja.pod - man/inkscape.sk.pod - man/inkscape.zh_TW.pod - man/inkview.pod) - set(POD_IN ${CMAKE_CURRENT_SOURCE_DIR}/${podfile}.in) - set(POD_OUT ${CMAKE_CURRENT_BINARY_DIR}/${podfile}) - configure_file(${POD_IN} ${POD_OUT}) - pod2man(${POD_OUT} ${INKSCAPE_VERSION} 1 "Inkscape Commands Manual") -endforeach() - -# ----------------------------------------------------------------------------- -# Installation -# ----------------------------------------------------------------------------- -if(UNIX) - #Define the installation - install( - TARGETS inkscape_base inkscape inkview - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib/inkscape - ARCHIVE DESTINATION lib/inkscape - ) - - #The install directive for the binaries and libraries are found in src/CMakeList.txt - install( - FILES ${CMAKE_BINARY_DIR}/inkscape.desktop - DESTINATION ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/applications - ) - - # this should probably be done no matter what the platform is, just set SHARE_INSTALL first - add_subdirectory(share) -elseif(WIN32) - set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/inkscape) - - install(PROGRAMS - ${EXECUTABLE_OUTPUT_PATH}/inkscape.exe - ${EXECUTABLE_OUTPUT_PATH}/inkview.exe - DESTINATION ${CMAKE_INSTALL_PREFIX} - ) - - install(FILES - ${LIBRARY_OUTPUT_PATH}/libinkscape_base.dll - ${LIBRARY_OUTPUT_PATH}/libgrid2.dll - DESTINATION ${CMAKE_INSTALL_PREFIX} - ) - - # devlibs and mingw dlls - install(FILES - AUTHORS - COPYING - NEWS - README - TRANSLATORS - ${DEVLIBS_BIN}/libatkmm-1.6-1.dll - ${DEVLIBS_BIN}/libglibmm-2.4-1.dll - ${DEVLIBS_BIN}/libgiomm-2.4-1.dll - ${DEVLIBS_BIN}/libgtkmm-2.4-1.dll - ${DEVLIBS_BIN}/libgdkmm-2.4-1.dll - ${DEVLIBS_BIN}/libpangomm-1.4-1.dll - ${DEVLIBS_BIN}/libcairomm-1.0-1.dll - ${DEVLIBS_BIN}/libsigc-2.0-0.dll - ${DEVLIBS_BIN}/libfreetype-6.dll - ${DEVLIBS_BIN}/libffi-6.dll - ${DEVLIBS_BIN}/libgc-1.dll - ${DEVLIBS_BIN}/libgsl-19.dll - ${DEVLIBS_BIN}/libgslcblas-0.dll - ${DEVLIBS_BIN}/libharfbuzz-0.dll - ${DEVLIBS_BIN}/liblzma-5.dll - ${DEVLIBS_BIN}/libaspell-15.dll - ${DEVLIBS_BIN}/libatk-1.0-0.dll - ${DEVLIBS_BIN}/libgdk-win32-2.0-0.dll - ${DEVLIBS_BIN}/libgdk_pixbuf-2.0-0.dll - ${DEVLIBS_BIN}/libglib-2.0-0.dll - ${DEVLIBS_BIN}/libgmodule-2.0-0.dll - ${DEVLIBS_BIN}/libgobject-2.0-0.dll - ${DEVLIBS_BIN}/libgtk-win32-2.0-0.dll - ${DEVLIBS_BIN}/libgthread-2.0-0.dll - ${DEVLIBS_BIN}/libgio-2.0-0.dll - ${DEVLIBS_BIN}/libcairo-2.dll - ${DEVLIBS_BIN}/libpixman-1-0.dll - ${DEVLIBS_BIN}/libpoppler-58.dll - ${DEVLIBS_BIN}/libpoppler-glib-8.dll - ${DEVLIBS_BIN}/libpangocairo-1.0-0.dll - ${DEVLIBS_BIN}/libpango-1.0-0.dll - ${DEVLIBS_BIN}/libpangoft2-1.0-0.dll - ${DEVLIBS_BIN}/libpangowin32-1.0-0.dll - ${DEVLIBS_BIN}/libfontconfig-1.dll - ${DEVLIBS_BIN}/libxml2-2.dll - ${DEVLIBS_BIN}/libxslt-1.dll - ${DEVLIBS_BIN}/libexslt-0.dll - ${DEVLIBS_BIN}/libexpat-1.dll - ${DEVLIBS_BIN}/librevenge-0.0.dll - ${DEVLIBS_BIN}/librevenge-stream-0.0.dll - ${DEVLIBS_BIN}/libwpg-0.3.dll - ${DEVLIBS_BIN}/libwpd-0.10.dll - ${DEVLIBS_BIN}/libvisio-0.1.dll - ${DEVLIBS_BIN}/libcdr-0.1.dll - ${DEVLIBS_BIN}/icuin56.dll - ${DEVLIBS_BIN}/icudt56.dll - ${DEVLIBS_BIN}/icuuc56.dll - ${DEVLIBS_BIN}/libjpeg-9.dll - ${DEVLIBS_BIN}/libpng16-16.dll - ${DEVLIBS_BIN}/libtiff-5.dll - ${DEVLIBS_BIN}/libexif-12.dll - ${DEVLIBS_BIN}/libcurl-4.dll - ${DEVLIBS_BIN}/zlib1.dll - ${DEVLIBS_BIN}/bz2-1.dll - ${DEVLIBS_BIN}/libiconv-2.dll - ${DEVLIBS_BIN}/libpopt-0.dll - ${DEVLIBS_BIN}/liblcms2-2.dll - ${DEVLIBS_BIN}/libMagick++-6.Q16-6.dll - ${DEVLIBS_BIN}/libMagickCore-6.Q16-2.dll - ${DEVLIBS_BIN}/libMagickWand-6.Q16-2.dll - ${DEVLIBS_BIN}/libintl-8.dll - ${DEVLIBS_BIN}/libpotrace-0.dll - ${MINGW_BIN}/libstdc++-6.dll - ${MINGW_BIN}/libwinpthread-1.dll - ${MINGW_BIN}/libgcc_s_seh-1.dll - ${MINGW_BIN}/libgomp-1.dll - DESTINATION ${CMAKE_INSTALL_PREFIX}) - - # Setup application data directories, poppler files, locales, icons and themes - file(MAKE_DIRECTORY - data - doc - modules - plugins) - - install(DIRECTORY - data - doc - modules - plugins - share - DESTINATION ${CMAKE_INSTALL_PREFIX} - PATTERN Adwaita EXCLUDE # NOTE: The theme is not used on Windows. - PATTERN hicolor/index.theme EXCLUDE # NOTE: Empty index.theme in hicolor icon theme causes SIGSEGV. - PATTERN CMakeLists.txt EXCLUDE - PATTERN *.am EXCLUDE) - - install(DIRECTORY ${DEVLIBS_PATH}/share/themes - DESTINATION ${CMAKE_INSTALL_PREFIX}/share) - - install(DIRECTORY ${DEVLIBS_PATH}/share/poppler - DESTINATION ${CMAKE_INSTALL_PREFIX}/share) - - install(DIRECTORY ${DEVLIBS_PATH}/etc/fonts - DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) +if(NOT WIN32) + include("CMakeScripts/Pod2man.cmake") - install(DIRECTORY ${DEVLIBS_PATH}/share/locale - DESTINATION ${CMAKE_INSTALL_PREFIX}/share) - - install(DIRECTORY ${DEVLIBS_PATH}/etc/gtk-2.0 - DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) - - # GTK 2.0 - install(DIRECTORY ${DEVLIBS_LIB}/gtk-2.0 - DESTINATION ${CMAKE_INSTALL_PREFIX}/lib - FILES_MATCHING - PATTERN "*.dll" - PATTERN "*.cache") + # Load AUTHORS file contents into $INKSCAPE_AUTHORS + file(READ ${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS content) + string(REGEX REPLACE "^([^\n#]+)\n" "\\1;\n" content_list "${content}") - install(DIRECTORY ${DEVLIBS_LIB}/gdk-pixbuf-2.0 - DESTINATION ${CMAKE_INSTALL_PREFIX}/lib - FILES_MATCHING - PATTERN "*.dll" - PATTERN "*.cache") + join(INKSCAPE_AUTHORS "," "${content_list}") + + foreach(podfile + man/inkscape.pod + man/inkscape.de.pod + man/inkscape.el.pod + man/inkscape.fr.pod + man/inkscape.ja.pod + man/inkscape.sk.pod + man/inkscape.zh_TW.pod + man/inkview.pod) + + set(POD_IN ${CMAKE_CURRENT_SOURCE_DIR}/${podfile}.in) + set(POD_OUT ${CMAKE_CURRENT_BINARY_DIR}/${podfile}) - # Aspell dictionaries - install(DIRECTORY ${DEVLIBS_LIB}/aspell-0.60 - DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) - - # Necessary to run extensions on windows if it is not in the path - if (CMAKE_SYSTEM_PROCESSOR MATCHES "AMD64") - install(FILES - ${DEVLIBS_BIN}/gspawn-win64-helper.exe - ${DEVLIBS_BIN}/gspawn-win64-helper-console.exe - DESTINATION ${CMAKE_INSTALL_PREFIX}) - else() - install(FILES - ${DEVLIBS_BIN}/gspawn-win32-helper.exe - ${DEVLIBS_BIN}/gspawn-win32-helper-console.exe - DESTINATION ${CMAKE_INSTALL_PREFIX}) - endif() - - # Perl - install(FILES - ${DEVLIBS_PATH}/perl/bin/perl58.dll - DESTINATION ${CMAKE_INSTALL_PREFIX}) - - # Python - install(FILES - ${DEVLIBS_PATH}/python/python.exe - ${DEVLIBS_PATH}/python/pythonw.exe - ${DEVLIBS_PATH}/python/python27.dll - DESTINATION ${CMAKE_INSTALL_PREFIX}/python) + configure_file(${POD_IN} ${POD_OUT}) - install(DIRECTORY ${DEVLIBS_PATH}/python/lib - DESTINATION ${CMAKE_INSTALL_PREFIX}/python) - - install(DIRECTORY ${DEVLIBS_PATH}/python/dlls - DESTINATION ${CMAKE_INSTALL_PREFIX}/python) -elseif(APPLE) - # TODO + pod2man(${POD_OUT} ${INKSCAPE_VERSION} 1 "Inkscape Commands Manual") + endforeach() endif() +# ----------------------------------------------------------------------------- +# Installation +# ----------------------------------------------------------------------------- +include(CMakeScripts/Install.cmake) + # ----------------------------------------------------------------------------- # Clean # ----------------------------------------------------------------------------- diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake index 6ce849206..cfe6c66b6 100644 --- a/CMakeScripts/ConfigPaths.cmake +++ b/CMakeScripts/ConfigPaths.cmake @@ -1,166 +1,17 @@ message(STATUS "Creating build files in: ${CMAKE_CURRENT_BINARY_DIR}") if(WIN32) -# Directory containing the precompiled Inkscape libraries. Usually c:\devlibs or c:\devlibs64 - set(DEVLIBS_PATH C:/devlibs64) - - # Directory containing the MinGW instance used for compilation. Usually c:\mingw or c:\mingw64 - set(MINGW_PATH C:/mingw64) - - # Directory containing the Ghostscript installation. - set(GS_PATH C:/latex/gs/gs8.61) - - # Normalize directory separator slashes. - string(REGEX REPLACE "\\\\" "/" DEVLIBS_PATH ${DEVLIBS_PATH}) - string(REGEX REPLACE "\\\\" "/" MINGW_PATH ${MINGW_PATH}) - string(REGEX REPLACE "\\\\" "/" GS_PATH ${GS_PATH}) - - # =============== DEVLIBS CHECKS =============== - - # Directory containing the compile time .dll.a and .a files. - set(DEVLIBS_LIB "${DEVLIBS_PATH}/lib") - - if(NOT EXISTS "${DEVLIBS_LIB}") - message(FATAL_ERROR "Inkscape development libraries directory does not exist: ${DEVLIBS_LIB}") - endif() - - # Add devlibs libraries to linker path. - link_directories(${DEVLIBS_LIB}) - - set(DEVLIBS_INCLUDE ${DEVLIBS_PATH}/include) - - if(NOT EXISTS ${DEVLIBS_INCLUDE}) - message(FATAL_ERROR "Inkscape development libraries directory does not exist: ${DEVLIBS_INCLUDE}") - endif() - - # Add general MinGW headers to compiler include path. - #include_directories(${DEVLIBS_INCLUDE}) - - # Directory containing the precompiled .dll files. - set(DEVLIBS_BIN ${DEVLIBS_PATH}/bin) - - if(NOT EXISTS ${DEVLIBS_BIN}) - message(FATAL_ERROR "Inkscape development binaries directory does not exist: ${DEVLIBS_BIN}") - endif() - - # Directory containing the pkgconfig .pc files. - set(PKG_CONFIG_PATH "${DEVLIBS_PATH}/lib/pkgconfig") - - if(NOT EXISTS "${PKG_CONFIG_PATH}") - message(FATAL_ERROR "pkgconfig directory does not exist: ${PKG_CONFIG_PATH}") - endif() - - # Add the devlibs directories to the paths used to find libraries and programs. - list(APPEND CMAKE_PREFIX_PATH ${DEVLIBS_PATH}) - - # Eliminate error messages when not having mingw in the environment path variable. - list(APPEND CMAKE_PROGRAM_PATH ${DEVLIBS_BIN}) - - # =============== MINGW CHECKS =============== - - # We are in a MinGW environment. - set(HAVE_MINGW ON) - - # Try to determine the MinGW processor architecture. - if(EXISTS ${MINGW_PATH}/mingw32) - set(HAVE_MINGW64 OFF) - set(MINGW_ARCH mingw32) - elseif(EXISTS ${MINGW_PATH}/x86_64-w64-mingw32) - set(HAVE_MINGW64 ON) - set(MINGW_ARCH x86_64-w64-mingw32) - else() - message(FATAL_ERROR "Unable to determine MinGW processor architecture. Are you using an unsupported MinGW version?") - endif() - - # Path to processor architecture specific binaries and libs. - set(MINGW_ARCH_PATH ${MINGW_PATH}/${MINGW_ARCH}) - - set(MINGW_BIN ${MINGW_PATH}/bin) - - if(NOT EXISTS ${MINGW_BIN}) - message(FATAL_ERROR "MinGW binary directory does not exist: ${MINGW_BIN}") - endif() - - # Eliminate error messages when not having mingw in the environment path variable. - list(APPEND CMAKE_PROGRAM_PATH ${MINGW_BIN}) - - set(MINGW_LIB ${MINGW_PATH}/lib) - - if(NOT EXISTS ${MINGW_LIB}) - message(FATAL_ERROR "MinGW library directory does not exist: ${MINGW_LIB}") - endif() - - # Add MinGW libraries to linker path. - link_directories(${MINGW_LIB}) - - set(MINGW_INCLUDE ${MINGW_PATH}/include) - - if(NOT EXISTS ${MINGW_INCLUDE}) - message(FATAL_ERROR "MinGW include directory does not exist: ${MINGW_INCLUDE}") - endif() - - # Add general MinGW headers to compiler include path. - include_directories(${MINGW_INCLUDE}) - - if(HAVE_MINGW64) - set(MINGW64_LIB ${MINGW_ARCH_PATH}/lib) - - if(NOT EXISTS ${MINGW64_LIB}) - message(FATAL_ERROR "MinGW 64-Bit libraries directory does not exist: ${MINGW64_LIB}") - endif() - - # Add 64-Bit libraries to linker path. - link_directories(${MINGW64_LIB}) - - set(MINGW64_INCLUDE ${MINGW_ARCH_PATH}/include) - - if(NOT EXISTS ${MINGW64_INCLUDE}) - message(FATAL_ERROR "MinGW 64-Bit include directory does not exist: ${MINGW64_INCLUDE}") - endif() - - set(MINGW64_INCLUDE_SDL ${MINGW64_INCLUDE}/c++) - - if(NOT EXISTS ${MINGW64_INCLUDE_SDL}) - message(FATAL_ERROR "MinGW 64-Bit SDL include directory does not exist: ${MINGW64_INCLUDE_SDL}") - endif() - - # Add 64-Bit MinGW headers to compiler include path. - include_directories(${MINGW64_INCLUDE}) - #include_directories(${MINGW64_INCLUDE_SDL}) - endif() - - # =============== GHOSTSCRIPT CHECKS =============== - - # Check for Ghostscript. - set(GS_BIN "${GS_PATH}/bin") - - if(EXISTS "${GS_BIN}") - set(HAVE_GS_BIN ON) - else() - set(HAVE_GS_BIN OFF) - endif() - - # =============== LIBRARY AND LINKER =============== - - # Tweak CMake into using Unix-style library names. - set(CMAKE_FIND_LIBRARY_PREFIXES "lib") - set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".dll") - - if(NOT HAVE_MINGW64) - list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES ".a") - endif() - - # Directory containing the current locale (translations). - set(PACKAGE_LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/share/locale") - set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.") -else(WIN32) - # TODO: check and change this to correct value: - if(NOT PACKAGE_LOCALE_DIR) set(PACKAGE_LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/share/locale") # packagers might overwrite this - endif(NOT PACKAGE_LOCALE_DIR) - - if(NOT SHARE_INSTALL) set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.") - endif(NOT SHARE_INSTALL) - mark_as_advanced(SHARE_INSTALL) -endif(WIN32) +else() + # TODO: check and change this to correct value: + if(NOT PACKAGE_LOCALE_DIR) + set(PACKAGE_LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/share/locale") # packagers might overwrite this + endif(NOT PACKAGE_LOCALE_DIR) + + if(NOT SHARE_INSTALL) + set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.") + endif(NOT SHARE_INSTALL) + + mark_as_advanced(SHARE_INSTALL) +endif() \ No newline at end of file diff --git a/mingwenv.bat b/mingwenv.bat index 3765b73b5..02068b72c 100755 --- a/mingwenv.bat +++ b/mingwenv.bat @@ -1,9 +1,25 @@ -@echo Setting environment variables for MinGw build of Inkscape -IF "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs64 -IF "%MINGW_PATH%"=="" set MINGW_PATH=c:\mingw64 -set MINGW_BIN=%MINGW_PATH%\bin -set PKG_CONFIG_PATH=%DEVLIBS_PATH%\lib\pkgconfig -set GS_BIN=C:\latex\gs\gs8.61\bin -set PATH=%DEVLIBS_PATH%\bin;%DEVLIBS_PATH%\python;%MINGW_BIN%;%PATH%;%GS_BIN% -set CMAKE_PREFIX_PATH=%DEVLIBS_PATH% -set GTKMM_BASEPATH=%DEVLIBS_PATH% +@echo off + +REM ----------------------------------------------------------------------------- +REM The paths in this file are used if you want to build Inkscape from the +REM the Windows built-in command line (i.e. MSYS). +REM ----------------------------------------------------------------------------- + +REM Directory containing the precompiled Inkscape libraries. Usually c:\devlibs or c:\devlibs64 +if "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs + +REM Directory containing the MinGW instance used for compilation. Usually c:\mingw or c:\mingw64 +REM Note: Make sure there are no whitespaces in the path. MinGW doesn't like that.. ;) +if "%MINGW_PATH%"=="" set MINGW_PATH=c:\mingw + +REM Directory containing the (optional) Ghostscript installation. +if "%GS_PATH%"=="" set GS_PATH=C:\latex\gs\gs8.61 + +REM ----------------------------------------------------------------------------- +@echo Setting environment variables for MinGW build of Inkscape.. + +REM Include the MinGW environment in the path to prevent error messages during CMake configure. +set PATH=%DEVLIBS_PATH%\bin;%DEVLIBS_PATH%\python;%MINGW_PATH%\bin;%PATH%;%GS_PATH%\bin + +REM Also set the pkgconfig path to prevent error messages during CMake configure. +set PKG_CONFIG_PATH=%DEVLIBS_PATH%\lib\pkgconfig \ No newline at end of file -- cgit v1.2.3 From 825b2c868bd97252896492838964475dbf504d78 Mon Sep 17 00:00:00 2001 From: Sebastian Faubel Date: Tue, 5 Jul 2016 12:42:03 +0200 Subject: Added missing files. (bzr r15002.1.4) --- CMakeScripts/ConfigEnv.cmake | 54 +++++++++ CMakeScripts/Install.cmake | 273 +++++++++++++++++++++++++++++++++++++++++++ mingwenv.cmake | 184 +++++++++++++++++++++++++++++ 3 files changed, 511 insertions(+) create mode 100644 CMakeScripts/ConfigEnv.cmake create mode 100644 CMakeScripts/Install.cmake create mode 100644 mingwenv.cmake diff --git a/CMakeScripts/ConfigEnv.cmake b/CMakeScripts/ConfigEnv.cmake new file mode 100644 index 000000000..91404f874 --- /dev/null +++ b/CMakeScripts/ConfigEnv.cmake @@ -0,0 +1,54 @@ +# ----------------------------------------------------------------------------- +# Set platform defaults (originally copied from darktable) +# ----------------------------------------------------------------------------- +if(WIN32) + message("-- Windows build detected, setting default features") + + include(mingwenv.cmake) + + list(INSERT CMAKE_SYSTEM_INCLUDE_PATH 0 ${DEVLIBS_PATH}) + list(INSERT CMAKE_SYSTEM_LIBRARY_PATH 0 ${DEVLIBS_PATH}) + + set(CMAKE_C_COMPILER "${MINGW_BIN}/gcc.exe") + set(CMAKE_C_LINK_EXECUTABLE "${MINGW_BIN}/gcc.exe") + set(CMAKE_CXX_COMPILER "${MINGW_BIN}/g++.exe") + set(CMAKE_CXX_LINK_EXECUTABLE "${MINGW_BIN}/g++.exe") + set(CMAKE_CXX_STANDARD 11) + + # Setup Windows resource files compiler. + set(CMAKE_RC_COMPILER "${MINGW_BIN}/windres.exe") + set(CMAKE_RC_COMPILER_INIT windres) + enable_language(RC) + set(CMAKE_RC_COMPILE_OBJECT " -O coff -i -o ") + + # These options are required for having i18n support on Windows. + option(ENABLE_NLS "Compile with Native Language Support (using gettext)" ON) + option(HAVE_BIND_TEXTDOMAIN_CODESET "Compile with 'bind_textdomain_codeset' function" ON) + + # Does not compile on Windows with these options. + option(BR_PTHREADS "Use binreloc thread support" OFF) + option(ENABLE_BINRELOC "Use AutoPackage" OFF) +endif() + +if(APPLE) + message("-- Mac OS X build detected, setting default features") + + # prefer macports and/or user-installed libraries over system ones + #LIST(APPEND CMAKE_PREFIX_PATH /opt/local /usr/local) + set(CMAKE_FIND_FRAMEWORK "LAST") + + # test and display relevant env variables + if(DEFINED ENV{CMAKE_PREFIX_PATH}) + message("CMAKE_PREFIX_PATH: $ENV{CMAKE_PREFIX_PATH}") + endif() + + if(DEFINED ENV{GTKMM_BASEPATH}) + message("GTKMM_BASEPATH: $ENV{GTKMM_BASEPATH}") + endif() + + # detect current GTK+ backend + pkg_check_variable(gtk+-2.0 target) + message("GTK2 backend: ${GTK+_2.0_TARGET}") +endif() + +include(CMakeScripts/ConfigPaths.cmake) \ No newline at end of file diff --git a/CMakeScripts/Install.cmake b/CMakeScripts/Install.cmake new file mode 100644 index 000000000..e7311f080 --- /dev/null +++ b/CMakeScripts/Install.cmake @@ -0,0 +1,273 @@ +if(UNIX) + #Define the installation + install( + TARGETS inkscape_base inkscape inkview + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib/inkscape + ARCHIVE DESTINATION lib/inkscape + ) + + #The install directive for the binaries and libraries are found in src/CMakeList.txt + install( + FILES ${CMAKE_BINARY_DIR}/inkscape.desktop + DESTINATION ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/applications + ) + + # this should probably be done no matter what the platform is, just set SHARE_INSTALL first + add_subdirectory(share) +elseif(WIN32) + set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/inkscape) + + install(PROGRAMS + ${EXECUTABLE_OUTPUT_PATH}/inkscape.exe + ${EXECUTABLE_OUTPUT_PATH}/inkview.exe + DESTINATION ${CMAKE_INSTALL_PREFIX} + ) + + install(FILES + ${LIBRARY_OUTPUT_PATH}/libinkscape_base.dll + ${LIBRARY_OUTPUT_PATH}/libgrid2.dll + DESTINATION ${CMAKE_INSTALL_PREFIX} + ) + + # devlibs and mingw dlls + install(FILES + AUTHORS + COPYING + NEWS + README + TRANSLATORS + DESTINATION ${CMAKE_INSTALL_PREFIX}) + + # There are differences in the devlibs for 64-Bit and 32-Bit build environments. + if(HAVE_MINGW64) + install(FILES + ${DEVLIBS_BIN}/bz2-1.dll + ${DEVLIBS_BIN}/icudt56.dll + ${DEVLIBS_BIN}/icuin56.dll + ${DEVLIBS_BIN}/icuuc56.dll + ${DEVLIBS_BIN}/libMagick++-6.Q16-6.dll + ${DEVLIBS_BIN}/libMagickCore-6.Q16-2.dll + ${DEVLIBS_BIN}/libMagickWand-6.Q16-2.dll + ${DEVLIBS_BIN}/libaspell-15.dll + ${DEVLIBS_BIN}/libatk-1.0-0.dll + ${DEVLIBS_BIN}/libatkmm-1.6-1.dll + ${DEVLIBS_BIN}/libcairo-2.dll + ${DEVLIBS_BIN}/libcairomm-1.0-1.dll + ${DEVLIBS_BIN}/libcdr-0.1.dll + ${DEVLIBS_BIN}/libcurl-4.dll + ${DEVLIBS_BIN}/libexif-12.dll + ${DEVLIBS_BIN}/libexpat-1.dll + ${DEVLIBS_BIN}/libexslt-0.dll + ${DEVLIBS_BIN}/libffi-6.dll + ${DEVLIBS_BIN}/libfontconfig-1.dll + ${DEVLIBS_BIN}/libfreetype-6.dll + ${DEVLIBS_BIN}/libgc-1.dll + ${DEVLIBS_BIN}/libgdk-win32-2.0-0.dll + ${DEVLIBS_BIN}/libgdk_pixbuf-2.0-0.dll + ${DEVLIBS_BIN}/libgdkmm-2.4-1.dll + ${DEVLIBS_BIN}/libgio-2.0-0.dll + ${DEVLIBS_BIN}/libgiomm-2.4-1.dll + ${DEVLIBS_BIN}/libglib-2.0-0.dll + ${DEVLIBS_BIN}/libglibmm-2.4-1.dll + ${DEVLIBS_BIN}/libgmodule-2.0-0.dll + ${DEVLIBS_BIN}/libgobject-2.0-0.dll + ${DEVLIBS_BIN}/libgsl-19.dll + ${DEVLIBS_BIN}/libgslcblas-0.dll + ${DEVLIBS_BIN}/libgthread-2.0-0.dll + ${DEVLIBS_BIN}/libgtk-win32-2.0-0.dll + ${DEVLIBS_BIN}/libgtkmm-2.4-1.dll + ${DEVLIBS_BIN}/libharfbuzz-0.dll + ${DEVLIBS_BIN}/libiconv-2.dll + ${DEVLIBS_BIN}/libintl-8.dll + ${DEVLIBS_BIN}/libjpeg-9.dll + ${DEVLIBS_BIN}/liblcms2-2.dll + ${DEVLIBS_BIN}/liblzma-5.dll + ${DEVLIBS_BIN}/libpango-1.0-0.dll + ${DEVLIBS_BIN}/libpangocairo-1.0-0.dll + ${DEVLIBS_BIN}/libpangoft2-1.0-0.dll + ${DEVLIBS_BIN}/libpangomm-1.4-1.dll + ${DEVLIBS_BIN}/libpangowin32-1.0-0.dll + ${DEVLIBS_BIN}/libpixman-1-0.dll + ${DEVLIBS_BIN}/libpng16-16.dll + ${DEVLIBS_BIN}/libpoppler-58.dll + ${DEVLIBS_BIN}/libpoppler-glib-8.dll + ${DEVLIBS_BIN}/libpopt-0.dll + ${DEVLIBS_BIN}/libpotrace-0.dll + ${DEVLIBS_BIN}/librevenge-0.0.dll + ${DEVLIBS_BIN}/librevenge-stream-0.0.dll + ${DEVLIBS_BIN}/libsigc-2.0-0.dll + ${DEVLIBS_BIN}/libtiff-5.dll + ${DEVLIBS_BIN}/libvisio-0.1.dll + ${DEVLIBS_BIN}/libwpd-0.10.dll + ${DEVLIBS_BIN}/libwpg-0.3.dll + ${DEVLIBS_BIN}/libxml2-2.dll + ${DEVLIBS_BIN}/libxslt-1.dll + ${DEVLIBS_BIN}/zlib1.dll + ${MINGW_BIN}/libstdc++-6.dll + ${MINGW_BIN}/libwinpthread-1.dll + ${MINGW_BIN}/libgcc_s_seh-1.dll + ${MINGW_BIN}/libgomp-1.dll + DESTINATION ${CMAKE_INSTALL_PREFIX}) + else() + install(FILES + ${DEVLIBS_BIN}/bzip2.dll + ${DEVLIBS_BIN}/freetype6.dll + ${DEVLIBS_BIN}/iconv.dll + ${DEVLIBS_BIN}/icudata50.dll + ${DEVLIBS_BIN}/icui18n50.dll + ${DEVLIBS_BIN}/icuuc50.dll + ${DEVLIBS_BIN}/intl.dll + ${DEVLIBS_BIN}/libMagick++-3.dll + ${DEVLIBS_BIN}/libMagickCore-3.dll + ${DEVLIBS_BIN}/libMagickWand-3.dll + ${DEVLIBS_BIN}/libatk-1.0-0.dll + ${DEVLIBS_BIN}/libatkmm-1.6-1.dll + ${DEVLIBS_BIN}/libcairo-2.dll + ${DEVLIBS_BIN}/libcairomm-1.0-1.dll + ${DEVLIBS_BIN}/libcdr-0.1.dll + ${DEVLIBS_BIN}/libexif-12.dll + ${DEVLIBS_BIN}/libexpat-1.dll + ${DEVLIBS_BIN}/libexslt.dll + ${DEVLIBS_BIN}/libfontconfig-1.dll + ${DEVLIBS_BIN}/libgcc_s_sjlj-1.dll + ${DEVLIBS_BIN}/libgdk-win32-2.0-0.dll + ${DEVLIBS_BIN}/libgdk_pixbuf-2.0-0.dll + ${DEVLIBS_BIN}/libgdkmm-2.4-1.dll + ${DEVLIBS_BIN}/libgio-2.0-0.dll + ${DEVLIBS_BIN}/libgiomm-2.4-1.dll + ${DEVLIBS_BIN}/libglib-2.0-0.dll + ${DEVLIBS_BIN}/libglibmm-2.4-1.dll + ${DEVLIBS_BIN}/libgmodule-2.0-0.dll + ${DEVLIBS_BIN}/libgobject-2.0-0.dll + ${DEVLIBS_BIN}/libgthread-2.0-0.dll + ${DEVLIBS_BIN}/libgtk-win32-2.0-0.dll + ${DEVLIBS_BIN}/libgtkmm-2.4-1.dll + ${DEVLIBS_BIN}/libintl-8.dll + ${DEVLIBS_BIN}/libjpeg-7.dll + ${DEVLIBS_BIN}/liblcms-1.dll + ${DEVLIBS_BIN}/liblcms2-2.dll + ${DEVLIBS_BIN}/libopenjpeg-2.dll + ${DEVLIBS_BIN}/libpango-1.0-0.dll + ${DEVLIBS_BIN}/libpangocairo-1.0-0.dll + ${DEVLIBS_BIN}/libpangoft2-1.0-0.dll + ${DEVLIBS_BIN}/libpangomm-1.4-1.dll + ${DEVLIBS_BIN}/libpangowin32-1.0-0.dll + ${DEVLIBS_BIN}/libpixman-1-0.dll + ${DEVLIBS_BIN}/libpng12-0.dll + ${DEVLIBS_BIN}/libpng14-14.dll + ${DEVLIBS_BIN}/libpoppler-58.dll + ${DEVLIBS_BIN}/libpoppler-glib-8.dll + ${DEVLIBS_BIN}/libpopt-0.dll + ${DEVLIBS_BIN}/librevenge-0.0.dll + ${DEVLIBS_BIN}/librevenge-stream-0.0.dll + ${DEVLIBS_BIN}/libsigc-2.0-0.dll + ${DEVLIBS_BIN}/libtiff-3.dll + ${DEVLIBS_BIN}/libvisio-0.1.dll + ${DEVLIBS_BIN}/libwpd-0.9.dll + ${DEVLIBS_BIN}/libwpd-stream-0.9.dll + ${DEVLIBS_BIN}/libwpg-0.2.dll + ${DEVLIBS_BIN}/libxml2.dll + ${DEVLIBS_BIN}/libxslt.dll + ${DEVLIBS_BIN}/msvcr70.dll + ${DEVLIBS_BIN}/msvcr71.dll + ${DEVLIBS_BIN}/pthreadGC2.dll + ${DEVLIBS_BIN}/zlib1.dll + ${MINGW_BIN}/mingwm10.dll + ${MINGW_BIN}/libgomp-1.dll + DESTINATION ${CMAKE_INSTALL_PREFIX}) + endif() + + # Setup application data directories, poppler files, locales, icons and themes + file(MAKE_DIRECTORY + data + doc + modules + plugins) + + install(DIRECTORY + data + doc + modules + plugins + share + DESTINATION ${CMAKE_INSTALL_PREFIX} + PATTERN Adwaita EXCLUDE # NOTE: The theme is not used on Windows. + PATTERN hicolor/index.theme EXCLUDE # NOTE: Empty index.theme in hicolor icon theme causes SIGSEGV. + PATTERN CMakeLists.txt EXCLUDE + PATTERN *.am EXCLUDE) + + install(DIRECTORY ${DEVLIBS_PATH}/share/themes + DESTINATION ${CMAKE_INSTALL_PREFIX}/share) + + install(DIRECTORY ${DEVLIBS_PATH}/share/locale + DESTINATION ${CMAKE_INSTALL_PREFIX}/share) + + install(DIRECTORY ${DEVLIBS_PATH}/share/poppler + DESTINATION ${CMAKE_INSTALL_PREFIX}/share) + + install(DIRECTORY ${DEVLIBS_PATH}/etc/fonts + DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) + + install(DIRECTORY ${DEVLIBS_PATH}/etc/gtk-2.0 + DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) + + # GTK 2.0 + install(DIRECTORY ${DEVLIBS_LIB}/gtk-2.0 + DESTINATION ${CMAKE_INSTALL_PREFIX}/lib + FILES_MATCHING + PATTERN "*.dll" + PATTERN "*.cache") + + install(DIRECTORY ${DEVLIBS_LIB}/gdk-pixbuf-2.0 + DESTINATION ${CMAKE_INSTALL_PREFIX}/lib + FILES_MATCHING + PATTERN "*.dll" + PATTERN "*.cache") + + # Aspell dictionaries + install(DIRECTORY ${DEVLIBS_LIB}/aspell-0.60 + DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + + # Necessary to run extensions on windows if it is not in the path + if (HAVE_MINGW64) + install(FILES + ${DEVLIBS_BIN}/gspawn-win64-helper.exe + ${DEVLIBS_BIN}/gspawn-win64-helper-console.exe + DESTINATION ${CMAKE_INSTALL_PREFIX}) + else() + install(FILES + ${DEVLIBS_BIN}/gspawn-win32-helper.exe + ${DEVLIBS_BIN}/gspawn-win32-helper-console.exe + DESTINATION ${CMAKE_INSTALL_PREFIX}) + endif() + + # Perl + install(FILES + ${DEVLIBS_PATH}/perl/bin/perl58.dll + DESTINATION ${CMAKE_INSTALL_PREFIX}) + + # Python + install(FILES + ${DEVLIBS_PATH}/python/python.exe + ${DEVLIBS_PATH}/python/pythonw.exe + DESTINATION ${CMAKE_INSTALL_PREFIX}/python) + + if(HAVE_MINGW64) + install(FILES + ${DEVLIBS_PATH}/python/python27.dll + DESTINATION ${CMAKE_INSTALL_PREFIX}/python) + else() + install(FILES + ${DEVLIBS_PATH}/python/python26.dll + DESTINATION ${CMAKE_INSTALL_PREFIX}/python) + endif() + + install(DIRECTORY ${DEVLIBS_PATH}/python/lib + DESTINATION ${CMAKE_INSTALL_PREFIX}/python) + + install(DIRECTORY ${DEVLIBS_PATH}/python/dlls + DESTINATION ${CMAKE_INSTALL_PREFIX}/python) +elseif(APPLE) + # TODO +endif() \ No newline at end of file diff --git a/mingwenv.cmake b/mingwenv.cmake new file mode 100644 index 000000000..03a653b5d --- /dev/null +++ b/mingwenv.cmake @@ -0,0 +1,184 @@ +# ----------------------------------------------------------------------------- +# Set the paths in this file if you want to build Inkscape from a shell other than the +# Windows built-in command line (i.e. MSYS) or IDEs such as CodeLite. These variables +# will be used as default if no environment variables are set. +# ----------------------------------------------------------------------------- + +# Directory containing the precompiled Inkscape libraries. Usually c:\devlibs or c:\devlibs64 +set(ENV_DEVLIBS_PATH C:/devlibs) + +# Directory containing the MinGW instance used for compilation. Usually c:\mingw or c:\mingw64 +set(ENV_MINGW_PATH C:/mingw) + +# Directory containing the (optional) Ghostscript installation. +set(ENV_GS_PATH C:/latex/gs/gs8.61) + +# ----------------------------------------------------------------------------- +# MinGW Configuration +# ----------------------------------------------------------------------------- +message(STATUS "Configuring MinGW environment:") + +if($ENV{DEVLIBS_PATH} STREQUAL "") + message(STATUS "Setting path to development libraries from mingwenv.cmake: ${ENV_DEVLIBS_PATH}") + set(DEVLIBS_PATH ${ENV_DEVLIBS_PATH}) +else() + message(STATUS "Setting path to development libraries from environment: $ENV{DEVLIBS_PATH}") + set(DEVLIBS_PATH $ENV{DEVLIBS_PATH}) +endif() + +if($ENV{MINGW_PATH} STREQUAL "") + message(STATUS "Setting path to MinGW from mingwenv.cmake: ${ENV_MINGW_PATH}") + set(MINGW_PATH ${ENV_MINGW_PATH}) +else() + message(STATUS "Setting path to MinGW from environment: $ENV{MINGW_PATH}") + set(MINGW_PATH $ENV{MINGW_PATH}) +endif() + +if($ENV{GS_PATH} STREQUAL "") + message(STATUS "Setting path to Ghostscript from mingwenv.cmake: ${ENV_GS_PATH}") + set(GS_PATH ${ENV_GS_PATH}) +else() + message(STATUS "Setting path to Ghostscript from environment: $ENV{GS_PATH}") + set(GS_PATH $ENV{GS_PATH}) +endif() + +# Normalize directory separator slashes. +string(REGEX REPLACE "\\\\" "/" DEVLIBS_PATH ${DEVLIBS_PATH}) +string(REGEX REPLACE "\\\\" "/" MINGW_PATH ${MINGW_PATH}) +string(REGEX REPLACE "\\\\" "/" GS_PATH ${GS_PATH}) + +# ----------------------------------------------------------------------------- +# DEVLIBS CHECKS +# ----------------------------------------------------------------------------- + +# Directory containing the compile time .dll.a and .a files. +set(DEVLIBS_LIB "${DEVLIBS_PATH}/lib") + +if(NOT EXISTS "${DEVLIBS_LIB}") + message(FATAL_ERROR "Inkscape development libraries directory does not exist: ${DEVLIBS_LIB}") +endif() + +# Add devlibs libraries to linker path. +link_directories(${DEVLIBS_LIB}) + +set(DEVLIBS_INCLUDE ${DEVLIBS_PATH}/include) + +if(NOT EXISTS ${DEVLIBS_INCLUDE}) + message(FATAL_ERROR "Inkscape development libraries directory does not exist: ${DEVLIBS_INCLUDE}") +endif() + +# Add general MinGW headers to compiler include path. +#include_directories(${DEVLIBS_INCLUDE}) + +# Directory containing the precompiled .dll files. +set(DEVLIBS_BIN ${DEVLIBS_PATH}/bin) + +if(NOT EXISTS ${DEVLIBS_BIN}) + message(FATAL_ERROR "Inkscape development binaries directory does not exist: ${DEVLIBS_BIN}") +endif() + +# Directory containing the pkgconfig .pc files. +set(PKG_CONFIG_PATH "${DEVLIBS_PATH}/lib/pkgconfig") + +if(NOT EXISTS "${PKG_CONFIG_PATH}") + message(FATAL_ERROR "pkgconfig directory does not exist: ${PKG_CONFIG_PATH}") +endif() + +# Add the devlibs directories to the paths used to find libraries and programs. +list(APPEND CMAKE_PREFIX_PATH ${DEVLIBS_PATH}) + +# Eliminate error messages when not having mingw in the environment path variable. +list(APPEND CMAKE_PROGRAM_PATH ${DEVLIBS_BIN}) + +# ----------------------------------------------------------------------------- +# MINGW CHECKS +# ----------------------------------------------------------------------------- + +# We are in a MinGW environment. +set(HAVE_MINGW ON) + +# Try to determine the MinGW processor architecture. +if(EXISTS ${MINGW_PATH}/mingw32) + set(HAVE_MINGW64 OFF) + set(MINGW_ARCH mingw32) +elseif(EXISTS ${MINGW_PATH}/x86_64-w64-mingw32) + set(HAVE_MINGW64 ON) + set(MINGW_ARCH x86_64-w64-mingw32) +else() + message(FATAL_ERROR "Unable to determine MinGW processor architecture. Are you using an unsupported MinGW version?") +endif() + +# Path to processor architecture specific binaries and libs. +set(MINGW_ARCH_PATH ${MINGW_PATH}/${MINGW_ARCH}) + +set(MINGW_BIN ${MINGW_PATH}/bin) + +if(NOT EXISTS ${MINGW_BIN}) + message(FATAL_ERROR "MinGW binary directory does not exist: ${MINGW_BIN}") +endif() + +# Eliminate error messages when not having mingw in the environment path variable. +list(APPEND CMAKE_PROGRAM_PATH ${MINGW_BIN}) + +set(MINGW_LIB ${MINGW_PATH}/lib) + +if(NOT EXISTS ${MINGW_LIB}) + message(FATAL_ERROR "MinGW library directory does not exist: ${MINGW_LIB}") +endif() + +# Add MinGW libraries to linker path. +link_directories(${MINGW_LIB}) + +set(MINGW_INCLUDE ${MINGW_PATH}/include) + +if(NOT EXISTS ${MINGW_INCLUDE}) + message(FATAL_ERROR "MinGW include directory does not exist: ${MINGW_INCLUDE}") +endif() + +# Add general MinGW headers to compiler include path. +include_directories(SYSTEM ${MINGW_INCLUDE}) + +if(HAVE_MINGW64) + set(MINGW64_LIB ${MINGW_ARCH_PATH}/lib) + + if(NOT EXISTS ${MINGW64_LIB}) + message(FATAL_ERROR "MinGW 64-Bit libraries directory does not exist: ${MINGW64_LIB}") + endif() + + # Add 64-Bit libraries to linker path. + link_directories(${MINGW64_LIB}) + + set(MINGW64_INCLUDE ${MINGW_ARCH_PATH}/include) + + if(NOT EXISTS ${MINGW64_INCLUDE}) + message(FATAL_ERROR "MinGW 64-Bit include directory does not exist: ${MINGW64_INCLUDE}") + endif() + + # Add 64-Bit MinGW headers to compiler include path. + include_directories(${MINGW64_INCLUDE}) +endif() + +# ----------------------------------------------------------------------------- +# GHOSTSCRIPT CHECKS +# ----------------------------------------------------------------------------- + +# Check for Ghostscript. +set(GS_BIN "${GS_PATH}/bin") + +if(EXISTS "${GS_BIN}") + set(HAVE_GS_BIN ON) +else() + set(HAVE_GS_BIN OFF) +endif() + +# ----------------------------------------------------------------------------- +# LIBRARY AND LINKER SETTINGS +# ----------------------------------------------------------------------------- + +# Tweak CMake into using Unix-style library names. +set(CMAKE_FIND_LIBRARY_PREFIXES "lib") +set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".dll") + +if(NOT HAVE_MINGW64) + list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES ".a") +endif() \ No newline at end of file -- cgit v1.2.3 From f381a48f549f2a3c4d7ec48a1458e7555306766b Mon Sep 17 00:00:00 2001 From: Sebastian Faubel Date: Wed, 6 Jul 2016 16:04:54 +0200 Subject: Fixed config.h defines to point to the right locations for data (icons) and locales. (bzr r15002.1.5) --- CMakeLists.txt | 1 + CMakeScripts/ConfigPaths.cmake | 13 ++++++++++++- CMakeScripts/Install.cmake | 2 -- config.h.cmake | 12 ++---------- mingwenv.bat | 8 ++++++-- mingwenv.cmake | 38 +++++++++++++++++++------------------- 6 files changed, 40 insertions(+), 34 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 86ea1ecea..51d665128 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -210,6 +210,7 @@ message("") # cmake info message("CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}") message("CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}") +message("PACKAGE_LOCALE_DIR ${PACKAGE_LOCALE_DIR}") message("CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}") message("CMAKE_SYSTEM_VERSION: ${CMAKE_SYSTEM_VERSION}") message("CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}") diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake index cfe6c66b6..9774d4df2 100644 --- a/CMakeScripts/ConfigPaths.cmake +++ b/CMakeScripts/ConfigPaths.cmake @@ -1,9 +1,20 @@ message(STATUS "Creating build files in: ${CMAKE_CURRENT_BINARY_DIR}") if(WIN32) - set(PACKAGE_LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/share/locale") # packagers might overwrite this + set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/inkscape") + + set(INKSCAPE_LIBDIR "\\\\lib") + set(INKSCAPE_DATADIR "") + + set(PACKAGE_LOCALE_DIR "\\\\share\\\\locale") + set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.") + + mark_as_advanced(SHARE_INSTALL) else() + set(INKSCAPE_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib") + set(INKSCAPE_DATADIR "${CMAKE_INSTALL_PREFIX}/share") + # TODO: check and change this to correct value: if(NOT PACKAGE_LOCALE_DIR) set(PACKAGE_LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/share/locale") # packagers might overwrite this diff --git a/CMakeScripts/Install.cmake b/CMakeScripts/Install.cmake index e7311f080..6a95ce604 100644 --- a/CMakeScripts/Install.cmake +++ b/CMakeScripts/Install.cmake @@ -16,8 +16,6 @@ if(UNIX) # this should probably be done no matter what the platform is, just set SHARE_INSTALL first add_subdirectory(share) elseif(WIN32) - set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/inkscape) - install(PROGRAMS ${EXECUTABLE_OUTPUT_PATH}/inkscape.exe ${EXECUTABLE_OUTPUT_PATH}/inkview.exe diff --git a/config.h.cmake b/config.h.cmake index b30002622..00d6fb8b3 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -232,18 +232,10 @@ #cmakedefine HAVE_ZLIB_H 1 /* Base data directory -- only path-prefix.h should use it! */ -#ifdef WIN32 -#define INKSCAPE_DATADIR "" -#else -#define INKSCAPE_DATADIR "${CMAKE_INSTALL_PREFIX}/share" -#endif +#define INKSCAPE_DATADIR "${INKSCAPE_DATADIR}" /* Base library directory -- only path-prefix.h should use it! */ -#ifdef WIN32 -#define INKSCAPE_LIBDIR "\\lib" -#else -#define INKSCAPE_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib" -#endif +#define INKSCAPE_LIBDIR "${INKSCAPE_LIBDIR}" /* Define to 1 if `lstat' dereferences a symlink specified with a trailing slash. */ diff --git a/mingwenv.bat b/mingwenv.bat index 02068b72c..054e5dcc6 100755 --- a/mingwenv.bat +++ b/mingwenv.bat @@ -6,11 +6,11 @@ REM the Windows built-in command line (i.e. MSYS). REM ----------------------------------------------------------------------------- REM Directory containing the precompiled Inkscape libraries. Usually c:\devlibs or c:\devlibs64 -if "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs +if "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs64 REM Directory containing the MinGW instance used for compilation. Usually c:\mingw or c:\mingw64 REM Note: Make sure there are no whitespaces in the path. MinGW doesn't like that.. ;) -if "%MINGW_PATH%"=="" set MINGW_PATH=c:\mingw +if "%MINGW_PATH%"=="" set MINGW_PATH=c:\mingw64 REM Directory containing the (optional) Ghostscript installation. if "%GS_PATH%"=="" set GS_PATH=C:\latex\gs\gs8.61 @@ -18,6 +18,10 @@ if "%GS_PATH%"=="" set GS_PATH=C:\latex\gs\gs8.61 REM ----------------------------------------------------------------------------- @echo Setting environment variables for MinGW build of Inkscape.. +@echo DEVLIBS_PATH: %DEVLIBS_PATH% +@echo MINGW_PATH: %MINGW_PATH% +@echo GS_PATH: %GS_PATH% + REM Include the MinGW environment in the path to prevent error messages during CMake configure. set PATH=%DEVLIBS_PATH%\bin;%DEVLIBS_PATH%\python;%MINGW_PATH%\bin;%PATH%;%GS_PATH%\bin diff --git a/mingwenv.cmake b/mingwenv.cmake index 03a653b5d..9f7b8c3b1 100644 --- a/mingwenv.cmake +++ b/mingwenv.cmake @@ -5,10 +5,10 @@ # ----------------------------------------------------------------------------- # Directory containing the precompiled Inkscape libraries. Usually c:\devlibs or c:\devlibs64 -set(ENV_DEVLIBS_PATH C:/devlibs) +set(ENV_DEVLIBS_PATH C:/devlibs64) # Directory containing the MinGW instance used for compilation. Usually c:\mingw or c:\mingw64 -set(ENV_MINGW_PATH C:/mingw) +set(ENV_MINGW_PATH C:/mingw64) # Directory containing the (optional) Ghostscript installation. set(ENV_GS_PATH C:/latex/gs/gs8.61) @@ -18,27 +18,27 @@ set(ENV_GS_PATH C:/latex/gs/gs8.61) # ----------------------------------------------------------------------------- message(STATUS "Configuring MinGW environment:") -if($ENV{DEVLIBS_PATH} STREQUAL "") - message(STATUS "Setting path to development libraries from mingwenv.cmake: ${ENV_DEVLIBS_PATH}") +if("$ENV{DEVLIBS_PATH}" STREQUAL "") + message(STATUS " Setting path to development libraries from mingwenv.cmake: ${ENV_DEVLIBS_PATH}") set(DEVLIBS_PATH ${ENV_DEVLIBS_PATH}) else() - message(STATUS "Setting path to development libraries from environment: $ENV{DEVLIBS_PATH}") + message(STATUS " Setting path to development libraries from environment: $ENV{DEVLIBS_PATH}") set(DEVLIBS_PATH $ENV{DEVLIBS_PATH}) endif() -if($ENV{MINGW_PATH} STREQUAL "") - message(STATUS "Setting path to MinGW from mingwenv.cmake: ${ENV_MINGW_PATH}") +if("$ENV{MINGW_PATH}" STREQUAL "") + message(STATUS " Setting path to MinGW from mingwenv.cmake: ${ENV_MINGW_PATH}") set(MINGW_PATH ${ENV_MINGW_PATH}) else() - message(STATUS "Setting path to MinGW from environment: $ENV{MINGW_PATH}") + message(STATUS " Setting path to MinGW from environment: $ENV{MINGW_PATH}") set(MINGW_PATH $ENV{MINGW_PATH}) endif() -if($ENV{GS_PATH} STREQUAL "") - message(STATUS "Setting path to Ghostscript from mingwenv.cmake: ${ENV_GS_PATH}") +if("$ENV{GS_PATH}" STREQUAL "") + message(STATUS " Setting path to Ghostscript from mingwenv.cmake: ${ENV_GS_PATH}") set(GS_PATH ${ENV_GS_PATH}) else() - message(STATUS "Setting path to Ghostscript from environment: $ENV{GS_PATH}") + message(STATUS " Setting path to Ghostscript from environment: $ENV{GS_PATH}") set(GS_PATH $ENV{GS_PATH}) endif() @@ -98,10 +98,10 @@ list(APPEND CMAKE_PROGRAM_PATH ${DEVLIBS_BIN}) set(HAVE_MINGW ON) # Try to determine the MinGW processor architecture. -if(EXISTS ${MINGW_PATH}/mingw32) +if(EXISTS "${MINGW_PATH}/mingw32") set(HAVE_MINGW64 OFF) set(MINGW_ARCH mingw32) -elseif(EXISTS ${MINGW_PATH}/x86_64-w64-mingw32) +elseif(EXISTS "${MINGW_PATH}/x86_64-w64-mingw32") set(HAVE_MINGW64 ON) set(MINGW_ARCH x86_64-w64-mingw32) else() @@ -109,9 +109,9 @@ else() endif() # Path to processor architecture specific binaries and libs. -set(MINGW_ARCH_PATH ${MINGW_PATH}/${MINGW_ARCH}) +set(MINGW_ARCH_PATH "${MINGW_PATH}/${MINGW_ARCH}") -set(MINGW_BIN ${MINGW_PATH}/bin) +set(MINGW_BIN "${MINGW_PATH}/bin") if(NOT EXISTS ${MINGW_BIN}) message(FATAL_ERROR "MinGW binary directory does not exist: ${MINGW_BIN}") @@ -120,7 +120,7 @@ endif() # Eliminate error messages when not having mingw in the environment path variable. list(APPEND CMAKE_PROGRAM_PATH ${MINGW_BIN}) -set(MINGW_LIB ${MINGW_PATH}/lib) +set(MINGW_LIB "${MINGW_PATH}/lib") if(NOT EXISTS ${MINGW_LIB}) message(FATAL_ERROR "MinGW library directory does not exist: ${MINGW_LIB}") @@ -129,7 +129,7 @@ endif() # Add MinGW libraries to linker path. link_directories(${MINGW_LIB}) -set(MINGW_INCLUDE ${MINGW_PATH}/include) +set(MINGW_INCLUDE "${MINGW_PATH}/include") if(NOT EXISTS ${MINGW_INCLUDE}) message(FATAL_ERROR "MinGW include directory does not exist: ${MINGW_INCLUDE}") @@ -139,7 +139,7 @@ endif() include_directories(SYSTEM ${MINGW_INCLUDE}) if(HAVE_MINGW64) - set(MINGW64_LIB ${MINGW_ARCH_PATH}/lib) + set(MINGW64_LIB "${MINGW_ARCH_PATH}/lib") if(NOT EXISTS ${MINGW64_LIB}) message(FATAL_ERROR "MinGW 64-Bit libraries directory does not exist: ${MINGW64_LIB}") @@ -148,7 +148,7 @@ if(HAVE_MINGW64) # Add 64-Bit libraries to linker path. link_directories(${MINGW64_LIB}) - set(MINGW64_INCLUDE ${MINGW_ARCH_PATH}/include) + set(MINGW64_INCLUDE "${MINGW_ARCH_PATH}/include") if(NOT EXISTS ${MINGW64_INCLUDE}) message(FATAL_ERROR "MinGW 64-Bit include directory does not exist: ${MINGW64_INCLUDE}") -- cgit v1.2.3 From 160893d013fe7be78143dfd0c8ea5fc57b52a806 Mon Sep 17 00:00:00 2001 From: Sebastian Faubel Date: Wed, 6 Jul 2016 16:06:45 +0200 Subject: Removed configure.bat and touch.bat (bzr r15002.1.6) --- configure.bat | 9 --------- touch.bat | 1 - 2 files changed, 10 deletions(-) delete mode 100644 configure.bat delete mode 100644 touch.bat diff --git a/configure.bat b/configure.bat deleted file mode 100644 index 11adb9445..000000000 --- a/configure.bat +++ /dev/null @@ -1,9 +0,0 @@ -REM Set the MinGW environment variables. -if "%MINGW_BIN%"=="" call mingwenv.bat - -REM Delete the CMake cache. Needed when changes on the CMakeLists should be applied in a consistent way. -del CMakeCache.txt -rmdir /s /q CMakeFiles - -REM Configure using the MinGW compiler chain. -cmake -D"CMAKE_SYSTEM_PREFIX_PATH:PATH=C:\MinGW64\mingw64\x86_64-w64-mingw32" -G "MinGW Makefiles" .. diff --git a/touch.bat b/touch.bat deleted file mode 100644 index 043b3eb99..000000000 --- a/touch.bat +++ /dev/null @@ -1 +0,0 @@ -forfiles /s /m *.obj /c "cmd /c copy /b @path +,," \ No newline at end of file -- cgit v1.2.3 From 7b0f2601a652adb7566bfac6ec0eab7a9d95c7a2 Mon Sep 17 00:00:00 2001 From: Sebastian Faubel Date: Wed, 6 Jul 2016 17:42:00 +0200 Subject: Fixing build for Linux. Replaced tabs with whitespaces. (bzr r15002.1.7) --- CMakeScripts/ConfigEnv.cmake | 82 ++-- CMakeScripts/ConfigPaths.cmake | 40 +- CMakeScripts/Install.cmake | 515 ++++++++++++------------ mingwenv.cmake | 94 ++--- src/CMakeLists.txt | 883 +++++++++++++++++++++-------------------- 5 files changed, 808 insertions(+), 806 deletions(-) diff --git a/CMakeScripts/ConfigEnv.cmake b/CMakeScripts/ConfigEnv.cmake index 91404f874..ebd005cb3 100644 --- a/CMakeScripts/ConfigEnv.cmake +++ b/CMakeScripts/ConfigEnv.cmake @@ -2,53 +2,53 @@ # Set platform defaults (originally copied from darktable) # ----------------------------------------------------------------------------- if(WIN32) - message("-- Windows build detected, setting default features") + message("-- Windows build detected, setting default features") - include(mingwenv.cmake) - - list(INSERT CMAKE_SYSTEM_INCLUDE_PATH 0 ${DEVLIBS_PATH}) - list(INSERT CMAKE_SYSTEM_LIBRARY_PATH 0 ${DEVLIBS_PATH}) - - set(CMAKE_C_COMPILER "${MINGW_BIN}/gcc.exe") - set(CMAKE_C_LINK_EXECUTABLE "${MINGW_BIN}/gcc.exe") - set(CMAKE_CXX_COMPILER "${MINGW_BIN}/g++.exe") - set(CMAKE_CXX_LINK_EXECUTABLE "${MINGW_BIN}/g++.exe") - set(CMAKE_CXX_STANDARD 11) - - # Setup Windows resource files compiler. - set(CMAKE_RC_COMPILER "${MINGW_BIN}/windres.exe") - set(CMAKE_RC_COMPILER_INIT windres) - enable_language(RC) - set(CMAKE_RC_COMPILE_OBJECT " -O coff -i -o ") - - # These options are required for having i18n support on Windows. - option(ENABLE_NLS "Compile with Native Language Support (using gettext)" ON) - option(HAVE_BIND_TEXTDOMAIN_CODESET "Compile with 'bind_textdomain_codeset' function" ON) - - # Does not compile on Windows with these options. - option(BR_PTHREADS "Use binreloc thread support" OFF) - option(ENABLE_BINRELOC "Use AutoPackage" OFF) + include(mingwenv.cmake) + + list(INSERT CMAKE_SYSTEM_INCLUDE_PATH 0 ${DEVLIBS_PATH}) + list(INSERT CMAKE_SYSTEM_LIBRARY_PATH 0 ${DEVLIBS_PATH}) + + set(CMAKE_C_COMPILER "${MINGW_BIN}/gcc.exe") + set(CMAKE_C_LINK_EXECUTABLE "${MINGW_BIN}/gcc.exe") + set(CMAKE_CXX_COMPILER "${MINGW_BIN}/g++.exe") + set(CMAKE_CXX_LINK_EXECUTABLE "${MINGW_BIN}/g++.exe") + set(CMAKE_CXX_STANDARD 11) + + # Setup Windows resource files compiler. + set(CMAKE_RC_COMPILER "${MINGW_BIN}/windres.exe") + set(CMAKE_RC_COMPILER_INIT windres) + enable_language(RC) + set(CMAKE_RC_COMPILE_OBJECT " -O coff -i -o ") + + # These options are required for having i18n support on Windows. + option(ENABLE_NLS "Compile with Native Language Support (using gettext)" ON) + option(HAVE_BIND_TEXTDOMAIN_CODESET "Compile with 'bind_textdomain_codeset' function" ON) + + # Does not compile on Windows with these options. + option(BR_PTHREADS "Use binreloc thread support" OFF) + option(ENABLE_BINRELOC "Use AutoPackage" OFF) endif() if(APPLE) - message("-- Mac OS X build detected, setting default features") - - # prefer macports and/or user-installed libraries over system ones - #LIST(APPEND CMAKE_PREFIX_PATH /opt/local /usr/local) - set(CMAKE_FIND_FRAMEWORK "LAST") + message("-- Mac OS X build detected, setting default features") + + # prefer macports and/or user-installed libraries over system ones + #LIST(APPEND CMAKE_PREFIX_PATH /opt/local /usr/local) + set(CMAKE_FIND_FRAMEWORK "LAST") - # test and display relevant env variables - if(DEFINED ENV{CMAKE_PREFIX_PATH}) - message("CMAKE_PREFIX_PATH: $ENV{CMAKE_PREFIX_PATH}") - endif() - - if(DEFINED ENV{GTKMM_BASEPATH}) - message("GTKMM_BASEPATH: $ENV{GTKMM_BASEPATH}") - endif() + # test and display relevant env variables + if(DEFINED ENV{CMAKE_PREFIX_PATH}) + message("CMAKE_PREFIX_PATH: $ENV{CMAKE_PREFIX_PATH}") + endif() + + if(DEFINED ENV{GTKMM_BASEPATH}) + message("GTKMM_BASEPATH: $ENV{GTKMM_BASEPATH}") + endif() - # detect current GTK+ backend - pkg_check_variable(gtk+-2.0 target) - message("GTK2 backend: ${GTK+_2.0_TARGET}") + # detect current GTK+ backend + pkg_check_variable(gtk+-2.0 target) + message("GTK2 backend: ${GTK+_2.0_TARGET}") endif() include(CMakeScripts/ConfigPaths.cmake) \ No newline at end of file diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake index 9774d4df2..9489ba047 100644 --- a/CMakeScripts/ConfigPaths.cmake +++ b/CMakeScripts/ConfigPaths.cmake @@ -1,28 +1,28 @@ message(STATUS "Creating build files in: ${CMAKE_CURRENT_BINARY_DIR}") if(WIN32) - set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/inkscape") - - set(INKSCAPE_LIBDIR "\\\\lib") - set(INKSCAPE_DATADIR "") - - set(PACKAGE_LOCALE_DIR "\\\\share\\\\locale") - - set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.") - - mark_as_advanced(SHARE_INSTALL) + set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/inkscape") + + set(INKSCAPE_LIBDIR "\\\\lib") + set(INKSCAPE_DATADIR "") + + set(PACKAGE_LOCALE_DIR "\\\\share\\\\locale") + + set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.") + + mark_as_advanced(SHARE_INSTALL) else() - set(INKSCAPE_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib") - set(INKSCAPE_DATADIR "${CMAKE_INSTALL_PREFIX}/share") + set(INKSCAPE_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib") + set(INKSCAPE_DATADIR "${CMAKE_INSTALL_PREFIX}/share") - # TODO: check and change this to correct value: - if(NOT PACKAGE_LOCALE_DIR) - set(PACKAGE_LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/share/locale") # packagers might overwrite this - endif(NOT PACKAGE_LOCALE_DIR) + # TODO: check and change this to correct value: + if(NOT PACKAGE_LOCALE_DIR) + set(PACKAGE_LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/share/locale") # packagers might overwrite this + endif(NOT PACKAGE_LOCALE_DIR) - if(NOT SHARE_INSTALL) - set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.") - endif(NOT SHARE_INSTALL) + if(NOT SHARE_INSTALL) + set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.") + endif(NOT SHARE_INSTALL) - mark_as_advanced(SHARE_INSTALL) + mark_as_advanced(SHARE_INSTALL) endif() \ No newline at end of file diff --git a/CMakeScripts/Install.cmake b/CMakeScripts/Install.cmake index 6a95ce604..8306cec16 100644 --- a/CMakeScripts/Install.cmake +++ b/CMakeScripts/Install.cmake @@ -1,271 +1,262 @@ -if(UNIX) - #Define the installation - install( - TARGETS inkscape_base inkscape inkview - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib/inkscape - ARCHIVE DESTINATION lib/inkscape - ) - +if(UNIX) #The install directive for the binaries and libraries are found in src/CMakeList.txt - install( - FILES ${CMAKE_BINARY_DIR}/inkscape.desktop - DESTINATION ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/applications - ) + install(FILES + ${CMAKE_BINARY_DIR}/inkscape.desktop + DESTINATION ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/applications) +endif() +if(NOT WIN32) # this should probably be done no matter what the platform is, just set SHARE_INSTALL first - add_subdirectory(share) -elseif(WIN32) - install(PROGRAMS - ${EXECUTABLE_OUTPUT_PATH}/inkscape.exe - ${EXECUTABLE_OUTPUT_PATH}/inkview.exe - DESTINATION ${CMAKE_INSTALL_PREFIX} - ) + add_subdirectory(../share) +else() + install(PROGRAMS + ${EXECUTABLE_OUTPUT_PATH}/inkscape.exe + ${EXECUTABLE_OUTPUT_PATH}/inkview.exe + DESTINATION ${CMAKE_INSTALL_PREFIX} + ) - install(FILES - ${LIBRARY_OUTPUT_PATH}/libinkscape_base.dll - ${LIBRARY_OUTPUT_PATH}/libgrid2.dll - DESTINATION ${CMAKE_INSTALL_PREFIX} - ) - - # devlibs and mingw dlls - install(FILES - AUTHORS - COPYING - NEWS - README - TRANSLATORS - DESTINATION ${CMAKE_INSTALL_PREFIX}) - - # There are differences in the devlibs for 64-Bit and 32-Bit build environments. - if(HAVE_MINGW64) - install(FILES - ${DEVLIBS_BIN}/bz2-1.dll - ${DEVLIBS_BIN}/icudt56.dll - ${DEVLIBS_BIN}/icuin56.dll - ${DEVLIBS_BIN}/icuuc56.dll - ${DEVLIBS_BIN}/libMagick++-6.Q16-6.dll - ${DEVLIBS_BIN}/libMagickCore-6.Q16-2.dll - ${DEVLIBS_BIN}/libMagickWand-6.Q16-2.dll - ${DEVLIBS_BIN}/libaspell-15.dll - ${DEVLIBS_BIN}/libatk-1.0-0.dll - ${DEVLIBS_BIN}/libatkmm-1.6-1.dll - ${DEVLIBS_BIN}/libcairo-2.dll - ${DEVLIBS_BIN}/libcairomm-1.0-1.dll - ${DEVLIBS_BIN}/libcdr-0.1.dll - ${DEVLIBS_BIN}/libcurl-4.dll - ${DEVLIBS_BIN}/libexif-12.dll - ${DEVLIBS_BIN}/libexpat-1.dll - ${DEVLIBS_BIN}/libexslt-0.dll - ${DEVLIBS_BIN}/libffi-6.dll - ${DEVLIBS_BIN}/libfontconfig-1.dll - ${DEVLIBS_BIN}/libfreetype-6.dll - ${DEVLIBS_BIN}/libgc-1.dll - ${DEVLIBS_BIN}/libgdk-win32-2.0-0.dll - ${DEVLIBS_BIN}/libgdk_pixbuf-2.0-0.dll - ${DEVLIBS_BIN}/libgdkmm-2.4-1.dll - ${DEVLIBS_BIN}/libgio-2.0-0.dll - ${DEVLIBS_BIN}/libgiomm-2.4-1.dll - ${DEVLIBS_BIN}/libglib-2.0-0.dll - ${DEVLIBS_BIN}/libglibmm-2.4-1.dll - ${DEVLIBS_BIN}/libgmodule-2.0-0.dll - ${DEVLIBS_BIN}/libgobject-2.0-0.dll - ${DEVLIBS_BIN}/libgsl-19.dll - ${DEVLIBS_BIN}/libgslcblas-0.dll - ${DEVLIBS_BIN}/libgthread-2.0-0.dll - ${DEVLIBS_BIN}/libgtk-win32-2.0-0.dll - ${DEVLIBS_BIN}/libgtkmm-2.4-1.dll - ${DEVLIBS_BIN}/libharfbuzz-0.dll - ${DEVLIBS_BIN}/libiconv-2.dll - ${DEVLIBS_BIN}/libintl-8.dll - ${DEVLIBS_BIN}/libjpeg-9.dll - ${DEVLIBS_BIN}/liblcms2-2.dll - ${DEVLIBS_BIN}/liblzma-5.dll - ${DEVLIBS_BIN}/libpango-1.0-0.dll - ${DEVLIBS_BIN}/libpangocairo-1.0-0.dll - ${DEVLIBS_BIN}/libpangoft2-1.0-0.dll - ${DEVLIBS_BIN}/libpangomm-1.4-1.dll - ${DEVLIBS_BIN}/libpangowin32-1.0-0.dll - ${DEVLIBS_BIN}/libpixman-1-0.dll - ${DEVLIBS_BIN}/libpng16-16.dll - ${DEVLIBS_BIN}/libpoppler-58.dll - ${DEVLIBS_BIN}/libpoppler-glib-8.dll - ${DEVLIBS_BIN}/libpopt-0.dll - ${DEVLIBS_BIN}/libpotrace-0.dll - ${DEVLIBS_BIN}/librevenge-0.0.dll - ${DEVLIBS_BIN}/librevenge-stream-0.0.dll - ${DEVLIBS_BIN}/libsigc-2.0-0.dll - ${DEVLIBS_BIN}/libtiff-5.dll - ${DEVLIBS_BIN}/libvisio-0.1.dll - ${DEVLIBS_BIN}/libwpd-0.10.dll - ${DEVLIBS_BIN}/libwpg-0.3.dll - ${DEVLIBS_BIN}/libxml2-2.dll - ${DEVLIBS_BIN}/libxslt-1.dll - ${DEVLIBS_BIN}/zlib1.dll - ${MINGW_BIN}/libstdc++-6.dll - ${MINGW_BIN}/libwinpthread-1.dll - ${MINGW_BIN}/libgcc_s_seh-1.dll - ${MINGW_BIN}/libgomp-1.dll - DESTINATION ${CMAKE_INSTALL_PREFIX}) - else() - install(FILES - ${DEVLIBS_BIN}/bzip2.dll - ${DEVLIBS_BIN}/freetype6.dll - ${DEVLIBS_BIN}/iconv.dll - ${DEVLIBS_BIN}/icudata50.dll - ${DEVLIBS_BIN}/icui18n50.dll - ${DEVLIBS_BIN}/icuuc50.dll - ${DEVLIBS_BIN}/intl.dll - ${DEVLIBS_BIN}/libMagick++-3.dll - ${DEVLIBS_BIN}/libMagickCore-3.dll - ${DEVLIBS_BIN}/libMagickWand-3.dll - ${DEVLIBS_BIN}/libatk-1.0-0.dll - ${DEVLIBS_BIN}/libatkmm-1.6-1.dll - ${DEVLIBS_BIN}/libcairo-2.dll - ${DEVLIBS_BIN}/libcairomm-1.0-1.dll - ${DEVLIBS_BIN}/libcdr-0.1.dll - ${DEVLIBS_BIN}/libexif-12.dll - ${DEVLIBS_BIN}/libexpat-1.dll - ${DEVLIBS_BIN}/libexslt.dll - ${DEVLIBS_BIN}/libfontconfig-1.dll - ${DEVLIBS_BIN}/libgcc_s_sjlj-1.dll - ${DEVLIBS_BIN}/libgdk-win32-2.0-0.dll - ${DEVLIBS_BIN}/libgdk_pixbuf-2.0-0.dll - ${DEVLIBS_BIN}/libgdkmm-2.4-1.dll - ${DEVLIBS_BIN}/libgio-2.0-0.dll - ${DEVLIBS_BIN}/libgiomm-2.4-1.dll - ${DEVLIBS_BIN}/libglib-2.0-0.dll - ${DEVLIBS_BIN}/libglibmm-2.4-1.dll - ${DEVLIBS_BIN}/libgmodule-2.0-0.dll - ${DEVLIBS_BIN}/libgobject-2.0-0.dll - ${DEVLIBS_BIN}/libgthread-2.0-0.dll - ${DEVLIBS_BIN}/libgtk-win32-2.0-0.dll - ${DEVLIBS_BIN}/libgtkmm-2.4-1.dll - ${DEVLIBS_BIN}/libintl-8.dll - ${DEVLIBS_BIN}/libjpeg-7.dll - ${DEVLIBS_BIN}/liblcms-1.dll - ${DEVLIBS_BIN}/liblcms2-2.dll - ${DEVLIBS_BIN}/libopenjpeg-2.dll - ${DEVLIBS_BIN}/libpango-1.0-0.dll - ${DEVLIBS_BIN}/libpangocairo-1.0-0.dll - ${DEVLIBS_BIN}/libpangoft2-1.0-0.dll - ${DEVLIBS_BIN}/libpangomm-1.4-1.dll - ${DEVLIBS_BIN}/libpangowin32-1.0-0.dll - ${DEVLIBS_BIN}/libpixman-1-0.dll - ${DEVLIBS_BIN}/libpng12-0.dll - ${DEVLIBS_BIN}/libpng14-14.dll - ${DEVLIBS_BIN}/libpoppler-58.dll - ${DEVLIBS_BIN}/libpoppler-glib-8.dll - ${DEVLIBS_BIN}/libpopt-0.dll - ${DEVLIBS_BIN}/librevenge-0.0.dll - ${DEVLIBS_BIN}/librevenge-stream-0.0.dll - ${DEVLIBS_BIN}/libsigc-2.0-0.dll - ${DEVLIBS_BIN}/libtiff-3.dll - ${DEVLIBS_BIN}/libvisio-0.1.dll - ${DEVLIBS_BIN}/libwpd-0.9.dll - ${DEVLIBS_BIN}/libwpd-stream-0.9.dll - ${DEVLIBS_BIN}/libwpg-0.2.dll - ${DEVLIBS_BIN}/libxml2.dll - ${DEVLIBS_BIN}/libxslt.dll - ${DEVLIBS_BIN}/msvcr70.dll - ${DEVLIBS_BIN}/msvcr71.dll - ${DEVLIBS_BIN}/pthreadGC2.dll - ${DEVLIBS_BIN}/zlib1.dll - ${MINGW_BIN}/mingwm10.dll - ${MINGW_BIN}/libgomp-1.dll - DESTINATION ${CMAKE_INSTALL_PREFIX}) - endif() + install(FILES + ${LIBRARY_OUTPUT_PATH}/libinkscape_base.dll + ${LIBRARY_OUTPUT_PATH}/libgrid2.dll + DESTINATION ${CMAKE_INSTALL_PREFIX} + ) + + # devlibs and mingw dlls + install(FILES + AUTHORS + COPYING + NEWS + README + TRANSLATORS + DESTINATION ${CMAKE_INSTALL_PREFIX}) + + # There are differences in the devlibs for 64-Bit and 32-Bit build environments. + if(HAVE_MINGW64) + install(FILES + ${DEVLIBS_BIN}/bz2-1.dll + ${DEVLIBS_BIN}/icudt56.dll + ${DEVLIBS_BIN}/icuin56.dll + ${DEVLIBS_BIN}/icuuc56.dll + ${DEVLIBS_BIN}/libMagick++-6.Q16-6.dll + ${DEVLIBS_BIN}/libMagickCore-6.Q16-2.dll + ${DEVLIBS_BIN}/libMagickWand-6.Q16-2.dll + ${DEVLIBS_BIN}/libaspell-15.dll + ${DEVLIBS_BIN}/libatk-1.0-0.dll + ${DEVLIBS_BIN}/libatkmm-1.6-1.dll + ${DEVLIBS_BIN}/libcairo-2.dll + ${DEVLIBS_BIN}/libcairomm-1.0-1.dll + ${DEVLIBS_BIN}/libcdr-0.1.dll + ${DEVLIBS_BIN}/libcurl-4.dll + ${DEVLIBS_BIN}/libexif-12.dll + ${DEVLIBS_BIN}/libexpat-1.dll + ${DEVLIBS_BIN}/libexslt-0.dll + ${DEVLIBS_BIN}/libffi-6.dll + ${DEVLIBS_BIN}/libfontconfig-1.dll + ${DEVLIBS_BIN}/libfreetype-6.dll + ${DEVLIBS_BIN}/libgc-1.dll + ${DEVLIBS_BIN}/libgdk-win32-2.0-0.dll + ${DEVLIBS_BIN}/libgdk_pixbuf-2.0-0.dll + ${DEVLIBS_BIN}/libgdkmm-2.4-1.dll + ${DEVLIBS_BIN}/libgio-2.0-0.dll + ${DEVLIBS_BIN}/libgiomm-2.4-1.dll + ${DEVLIBS_BIN}/libglib-2.0-0.dll + ${DEVLIBS_BIN}/libglibmm-2.4-1.dll + ${DEVLIBS_BIN}/libgmodule-2.0-0.dll + ${DEVLIBS_BIN}/libgobject-2.0-0.dll + ${DEVLIBS_BIN}/libgsl-19.dll + ${DEVLIBS_BIN}/libgslcblas-0.dll + ${DEVLIBS_BIN}/libgthread-2.0-0.dll + ${DEVLIBS_BIN}/libgtk-win32-2.0-0.dll + ${DEVLIBS_BIN}/libgtkmm-2.4-1.dll + ${DEVLIBS_BIN}/libharfbuzz-0.dll + ${DEVLIBS_BIN}/libiconv-2.dll + ${DEVLIBS_BIN}/libintl-8.dll + ${DEVLIBS_BIN}/libjpeg-9.dll + ${DEVLIBS_BIN}/liblcms2-2.dll + ${DEVLIBS_BIN}/liblzma-5.dll + ${DEVLIBS_BIN}/libpango-1.0-0.dll + ${DEVLIBS_BIN}/libpangocairo-1.0-0.dll + ${DEVLIBS_BIN}/libpangoft2-1.0-0.dll + ${DEVLIBS_BIN}/libpangomm-1.4-1.dll + ${DEVLIBS_BIN}/libpangowin32-1.0-0.dll + ${DEVLIBS_BIN}/libpixman-1-0.dll + ${DEVLIBS_BIN}/libpng16-16.dll + ${DEVLIBS_BIN}/libpoppler-58.dll + ${DEVLIBS_BIN}/libpoppler-glib-8.dll + ${DEVLIBS_BIN}/libpopt-0.dll + ${DEVLIBS_BIN}/libpotrace-0.dll + ${DEVLIBS_BIN}/librevenge-0.0.dll + ${DEVLIBS_BIN}/librevenge-stream-0.0.dll + ${DEVLIBS_BIN}/libsigc-2.0-0.dll + ${DEVLIBS_BIN}/libtiff-5.dll + ${DEVLIBS_BIN}/libvisio-0.1.dll + ${DEVLIBS_BIN}/libwpd-0.10.dll + ${DEVLIBS_BIN}/libwpg-0.3.dll + ${DEVLIBS_BIN}/libxml2-2.dll + ${DEVLIBS_BIN}/libxslt-1.dll + ${DEVLIBS_BIN}/zlib1.dll + ${MINGW_BIN}/libstdc++-6.dll + ${MINGW_BIN}/libwinpthread-1.dll + ${MINGW_BIN}/libgcc_s_seh-1.dll + ${MINGW_BIN}/libgomp-1.dll + DESTINATION ${CMAKE_INSTALL_PREFIX}) + else() + install(FILES + ${DEVLIBS_BIN}/bzip2.dll + ${DEVLIBS_BIN}/freetype6.dll + ${DEVLIBS_BIN}/iconv.dll + ${DEVLIBS_BIN}/icudata50.dll + ${DEVLIBS_BIN}/icui18n50.dll + ${DEVLIBS_BIN}/icuuc50.dll + ${DEVLIBS_BIN}/intl.dll + ${DEVLIBS_BIN}/libMagick++-3.dll + ${DEVLIBS_BIN}/libMagickCore-3.dll + ${DEVLIBS_BIN}/libMagickWand-3.dll + ${DEVLIBS_BIN}/libatk-1.0-0.dll + ${DEVLIBS_BIN}/libatkmm-1.6-1.dll + ${DEVLIBS_BIN}/libcairo-2.dll + ${DEVLIBS_BIN}/libcairomm-1.0-1.dll + ${DEVLIBS_BIN}/libcdr-0.1.dll + ${DEVLIBS_BIN}/libexif-12.dll + ${DEVLIBS_BIN}/libexpat-1.dll + ${DEVLIBS_BIN}/libexslt.dll + ${DEVLIBS_BIN}/libfontconfig-1.dll + ${DEVLIBS_BIN}/libgcc_s_sjlj-1.dll + ${DEVLIBS_BIN}/libgdk-win32-2.0-0.dll + ${DEVLIBS_BIN}/libgdk_pixbuf-2.0-0.dll + ${DEVLIBS_BIN}/libgdkmm-2.4-1.dll + ${DEVLIBS_BIN}/libgio-2.0-0.dll + ${DEVLIBS_BIN}/libgiomm-2.4-1.dll + ${DEVLIBS_BIN}/libglib-2.0-0.dll + ${DEVLIBS_BIN}/libglibmm-2.4-1.dll + ${DEVLIBS_BIN}/libgmodule-2.0-0.dll + ${DEVLIBS_BIN}/libgobject-2.0-0.dll + ${DEVLIBS_BIN}/libgthread-2.0-0.dll + ${DEVLIBS_BIN}/libgtk-win32-2.0-0.dll + ${DEVLIBS_BIN}/libgtkmm-2.4-1.dll + ${DEVLIBS_BIN}/libintl-8.dll + ${DEVLIBS_BIN}/libjpeg-7.dll + ${DEVLIBS_BIN}/liblcms-1.dll + ${DEVLIBS_BIN}/liblcms2-2.dll + ${DEVLIBS_BIN}/libopenjpeg-2.dll + ${DEVLIBS_BIN}/libpango-1.0-0.dll + ${DEVLIBS_BIN}/libpangocairo-1.0-0.dll + ${DEVLIBS_BIN}/libpangoft2-1.0-0.dll + ${DEVLIBS_BIN}/libpangomm-1.4-1.dll + ${DEVLIBS_BIN}/libpangowin32-1.0-0.dll + ${DEVLIBS_BIN}/libpixman-1-0.dll + ${DEVLIBS_BIN}/libpng12-0.dll + ${DEVLIBS_BIN}/libpng14-14.dll + ${DEVLIBS_BIN}/libpoppler-58.dll + ${DEVLIBS_BIN}/libpoppler-glib-8.dll + ${DEVLIBS_BIN}/libpopt-0.dll + ${DEVLIBS_BIN}/librevenge-0.0.dll + ${DEVLIBS_BIN}/librevenge-stream-0.0.dll + ${DEVLIBS_BIN}/libsigc-2.0-0.dll + ${DEVLIBS_BIN}/libtiff-3.dll + ${DEVLIBS_BIN}/libvisio-0.1.dll + ${DEVLIBS_BIN}/libwpd-0.9.dll + ${DEVLIBS_BIN}/libwpd-stream-0.9.dll + ${DEVLIBS_BIN}/libwpg-0.2.dll + ${DEVLIBS_BIN}/libxml2.dll + ${DEVLIBS_BIN}/libxslt.dll + ${DEVLIBS_BIN}/msvcr70.dll + ${DEVLIBS_BIN}/msvcr71.dll + ${DEVLIBS_BIN}/pthreadGC2.dll + ${DEVLIBS_BIN}/zlib1.dll + ${MINGW_BIN}/mingwm10.dll + ${MINGW_BIN}/libgomp-1.dll + DESTINATION ${CMAKE_INSTALL_PREFIX}) + endif() - # Setup application data directories, poppler files, locales, icons and themes - file(MAKE_DIRECTORY - data - doc - modules - plugins) + # Setup application data directories, poppler files, locales, icons and themes + file(MAKE_DIRECTORY + data + doc + modules + plugins) - install(DIRECTORY - data - doc - modules - plugins - share - DESTINATION ${CMAKE_INSTALL_PREFIX} - PATTERN Adwaita EXCLUDE # NOTE: The theme is not used on Windows. - PATTERN hicolor/index.theme EXCLUDE # NOTE: Empty index.theme in hicolor icon theme causes SIGSEGV. - PATTERN CMakeLists.txt EXCLUDE - PATTERN *.am EXCLUDE) - - install(DIRECTORY ${DEVLIBS_PATH}/share/themes - DESTINATION ${CMAKE_INSTALL_PREFIX}/share) - - install(DIRECTORY ${DEVLIBS_PATH}/share/locale - DESTINATION ${CMAKE_INSTALL_PREFIX}/share) - - install(DIRECTORY ${DEVLIBS_PATH}/share/poppler - DESTINATION ${CMAKE_INSTALL_PREFIX}/share) - - install(DIRECTORY ${DEVLIBS_PATH}/etc/fonts - DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) - - install(DIRECTORY ${DEVLIBS_PATH}/etc/gtk-2.0 - DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) - - # GTK 2.0 - install(DIRECTORY ${DEVLIBS_LIB}/gtk-2.0 - DESTINATION ${CMAKE_INSTALL_PREFIX}/lib - FILES_MATCHING - PATTERN "*.dll" - PATTERN "*.cache") + install(DIRECTORY + data + doc + modules + plugins + share + DESTINATION ${CMAKE_INSTALL_PREFIX} + PATTERN Adwaita EXCLUDE # NOTE: The theme is not used on Windows. + PATTERN hicolor/index.theme EXCLUDE # NOTE: Empty index.theme in hicolor icon theme causes SIGSEGV. + PATTERN CMakeLists.txt EXCLUDE + PATTERN *.am EXCLUDE) + + install(DIRECTORY ${DEVLIBS_PATH}/share/themes + DESTINATION ${CMAKE_INSTALL_PREFIX}/share) + + install(DIRECTORY ${DEVLIBS_PATH}/share/locale + DESTINATION ${CMAKE_INSTALL_PREFIX}/share) + + install(DIRECTORY ${DEVLIBS_PATH}/share/poppler + DESTINATION ${CMAKE_INSTALL_PREFIX}/share) + + install(DIRECTORY ${DEVLIBS_PATH}/etc/fonts + DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) + + install(DIRECTORY ${DEVLIBS_PATH}/etc/gtk-2.0 + DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) + + # GTK 2.0 + install(DIRECTORY ${DEVLIBS_LIB}/gtk-2.0 + DESTINATION ${CMAKE_INSTALL_PREFIX}/lib + FILES_MATCHING + PATTERN "*.dll" + PATTERN "*.cache") - install(DIRECTORY ${DEVLIBS_LIB}/gdk-pixbuf-2.0 - DESTINATION ${CMAKE_INSTALL_PREFIX}/lib - FILES_MATCHING - PATTERN "*.dll" - PATTERN "*.cache") - - # Aspell dictionaries - install(DIRECTORY ${DEVLIBS_LIB}/aspell-0.60 - DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) - - # Necessary to run extensions on windows if it is not in the path - if (HAVE_MINGW64) - install(FILES - ${DEVLIBS_BIN}/gspawn-win64-helper.exe - ${DEVLIBS_BIN}/gspawn-win64-helper-console.exe - DESTINATION ${CMAKE_INSTALL_PREFIX}) - else() - install(FILES - ${DEVLIBS_BIN}/gspawn-win32-helper.exe - ${DEVLIBS_BIN}/gspawn-win32-helper-console.exe - DESTINATION ${CMAKE_INSTALL_PREFIX}) - endif() - - # Perl - install(FILES - ${DEVLIBS_PATH}/perl/bin/perl58.dll - DESTINATION ${CMAKE_INSTALL_PREFIX}) + install(DIRECTORY ${DEVLIBS_LIB}/gdk-pixbuf-2.0 + DESTINATION ${CMAKE_INSTALL_PREFIX}/lib + FILES_MATCHING + PATTERN "*.dll" + PATTERN "*.cache") + + # Aspell dictionaries + install(DIRECTORY ${DEVLIBS_LIB}/aspell-0.60 + DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + + # Necessary to run extensions on windows if it is not in the path + if (HAVE_MINGW64) + install(FILES + ${DEVLIBS_BIN}/gspawn-win64-helper.exe + ${DEVLIBS_BIN}/gspawn-win64-helper-console.exe + DESTINATION ${CMAKE_INSTALL_PREFIX}) + else() + install(FILES + ${DEVLIBS_BIN}/gspawn-win32-helper.exe + ${DEVLIBS_BIN}/gspawn-win32-helper-console.exe + DESTINATION ${CMAKE_INSTALL_PREFIX}) + endif() + + # Perl + install(FILES + ${DEVLIBS_PATH}/perl/bin/perl58.dll + DESTINATION ${CMAKE_INSTALL_PREFIX}) - # Python - install(FILES - ${DEVLIBS_PATH}/python/python.exe - ${DEVLIBS_PATH}/python/pythonw.exe - DESTINATION ${CMAKE_INSTALL_PREFIX}/python) - - if(HAVE_MINGW64) - install(FILES - ${DEVLIBS_PATH}/python/python27.dll - DESTINATION ${CMAKE_INSTALL_PREFIX}/python) - else() - install(FILES - ${DEVLIBS_PATH}/python/python26.dll - DESTINATION ${CMAKE_INSTALL_PREFIX}/python) - endif() - - install(DIRECTORY ${DEVLIBS_PATH}/python/lib - DESTINATION ${CMAKE_INSTALL_PREFIX}/python) - - install(DIRECTORY ${DEVLIBS_PATH}/python/dlls - DESTINATION ${CMAKE_INSTALL_PREFIX}/python) -elseif(APPLE) - # TODO + # Python + install(FILES + ${DEVLIBS_PATH}/python/python.exe + ${DEVLIBS_PATH}/python/pythonw.exe + DESTINATION ${CMAKE_INSTALL_PREFIX}/python) + + if(HAVE_MINGW64) + install(FILES + ${DEVLIBS_PATH}/python/python27.dll + DESTINATION ${CMAKE_INSTALL_PREFIX}/python) + else() + install(FILES + ${DEVLIBS_PATH}/python/python26.dll + DESTINATION ${CMAKE_INSTALL_PREFIX}/python) + endif() + + install(DIRECTORY ${DEVLIBS_PATH}/python/lib + DESTINATION ${CMAKE_INSTALL_PREFIX}/python) + + install(DIRECTORY ${DEVLIBS_PATH}/python/dlls + DESTINATION ${CMAKE_INSTALL_PREFIX}/python) endif() \ No newline at end of file diff --git a/mingwenv.cmake b/mingwenv.cmake index 9f7b8c3b1..ab96541d8 100644 --- a/mingwenv.cmake +++ b/mingwenv.cmake @@ -17,31 +17,31 @@ set(ENV_GS_PATH C:/latex/gs/gs8.61) # MinGW Configuration # ----------------------------------------------------------------------------- message(STATUS "Configuring MinGW environment:") - + if("$ENV{DEVLIBS_PATH}" STREQUAL "") - message(STATUS " Setting path to development libraries from mingwenv.cmake: ${ENV_DEVLIBS_PATH}") - set(DEVLIBS_PATH ${ENV_DEVLIBS_PATH}) + message(STATUS " Setting path to development libraries from mingwenv.cmake: ${ENV_DEVLIBS_PATH}") + set(DEVLIBS_PATH ${ENV_DEVLIBS_PATH}) else() - message(STATUS " Setting path to development libraries from environment: $ENV{DEVLIBS_PATH}") - set(DEVLIBS_PATH $ENV{DEVLIBS_PATH}) + message(STATUS " Setting path to development libraries from environment: $ENV{DEVLIBS_PATH}") + set(DEVLIBS_PATH $ENV{DEVLIBS_PATH}) endif() if("$ENV{MINGW_PATH}" STREQUAL "") - message(STATUS " Setting path to MinGW from mingwenv.cmake: ${ENV_MINGW_PATH}") - set(MINGW_PATH ${ENV_MINGW_PATH}) + message(STATUS " Setting path to MinGW from mingwenv.cmake: ${ENV_MINGW_PATH}") + set(MINGW_PATH ${ENV_MINGW_PATH}) else() - message(STATUS " Setting path to MinGW from environment: $ENV{MINGW_PATH}") - set(MINGW_PATH $ENV{MINGW_PATH}) + message(STATUS " Setting path to MinGW from environment: $ENV{MINGW_PATH}") + set(MINGW_PATH $ENV{MINGW_PATH}) endif() if("$ENV{GS_PATH}" STREQUAL "") - message(STATUS " Setting path to Ghostscript from mingwenv.cmake: ${ENV_GS_PATH}") - set(GS_PATH ${ENV_GS_PATH}) + message(STATUS " Setting path to Ghostscript from mingwenv.cmake: ${ENV_GS_PATH}") + set(GS_PATH ${ENV_GS_PATH}) else() - message(STATUS " Setting path to Ghostscript from environment: $ENV{GS_PATH}") - set(GS_PATH $ENV{GS_PATH}) + message(STATUS " Setting path to Ghostscript from environment: $ENV{GS_PATH}") + set(GS_PATH $ENV{GS_PATH}) endif() - + # Normalize directory separator slashes. string(REGEX REPLACE "\\\\" "/" DEVLIBS_PATH ${DEVLIBS_PATH}) string(REGEX REPLACE "\\\\" "/" MINGW_PATH ${MINGW_PATH}) @@ -55,7 +55,7 @@ string(REGEX REPLACE "\\\\" "/" GS_PATH ${GS_PATH}) set(DEVLIBS_LIB "${DEVLIBS_PATH}/lib") if(NOT EXISTS "${DEVLIBS_LIB}") - message(FATAL_ERROR "Inkscape development libraries directory does not exist: ${DEVLIBS_LIB}") + message(FATAL_ERROR "Inkscape development libraries directory does not exist: ${DEVLIBS_LIB}") endif() # Add devlibs libraries to linker path. @@ -64,7 +64,7 @@ link_directories(${DEVLIBS_LIB}) set(DEVLIBS_INCLUDE ${DEVLIBS_PATH}/include) if(NOT EXISTS ${DEVLIBS_INCLUDE}) - message(FATAL_ERROR "Inkscape development libraries directory does not exist: ${DEVLIBS_INCLUDE}") + message(FATAL_ERROR "Inkscape development libraries directory does not exist: ${DEVLIBS_INCLUDE}") endif() # Add general MinGW headers to compiler include path. @@ -74,14 +74,14 @@ endif() set(DEVLIBS_BIN ${DEVLIBS_PATH}/bin) if(NOT EXISTS ${DEVLIBS_BIN}) - message(FATAL_ERROR "Inkscape development binaries directory does not exist: ${DEVLIBS_BIN}") + message(FATAL_ERROR "Inkscape development binaries directory does not exist: ${DEVLIBS_BIN}") endif() # Directory containing the pkgconfig .pc files. set(PKG_CONFIG_PATH "${DEVLIBS_PATH}/lib/pkgconfig") if(NOT EXISTS "${PKG_CONFIG_PATH}") - message(FATAL_ERROR "pkgconfig directory does not exist: ${PKG_CONFIG_PATH}") + message(FATAL_ERROR "pkgconfig directory does not exist: ${PKG_CONFIG_PATH}") endif() # Add the devlibs directories to the paths used to find libraries and programs. @@ -96,16 +96,16 @@ list(APPEND CMAKE_PROGRAM_PATH ${DEVLIBS_BIN}) # We are in a MinGW environment. set(HAVE_MINGW ON) - + # Try to determine the MinGW processor architecture. if(EXISTS "${MINGW_PATH}/mingw32") - set(HAVE_MINGW64 OFF) - set(MINGW_ARCH mingw32) + set(HAVE_MINGW64 OFF) + set(MINGW_ARCH mingw32) elseif(EXISTS "${MINGW_PATH}/x86_64-w64-mingw32") - set(HAVE_MINGW64 ON) - set(MINGW_ARCH x86_64-w64-mingw32) + set(HAVE_MINGW64 ON) + set(MINGW_ARCH x86_64-w64-mingw32) else() - message(FATAL_ERROR "Unable to determine MinGW processor architecture. Are you using an unsupported MinGW version?") + message(FATAL_ERROR "Unable to determine MinGW processor architecture. Are you using an unsupported MinGW version?") endif() # Path to processor architecture specific binaries and libs. @@ -114,7 +114,7 @@ set(MINGW_ARCH_PATH "${MINGW_PATH}/${MINGW_ARCH}") set(MINGW_BIN "${MINGW_PATH}/bin") if(NOT EXISTS ${MINGW_BIN}) - message(FATAL_ERROR "MinGW binary directory does not exist: ${MINGW_BIN}") + message(FATAL_ERROR "MinGW binary directory does not exist: ${MINGW_BIN}") endif() # Eliminate error messages when not having mingw in the environment path variable. @@ -123,7 +123,7 @@ list(APPEND CMAKE_PROGRAM_PATH ${MINGW_BIN}) set(MINGW_LIB "${MINGW_PATH}/lib") if(NOT EXISTS ${MINGW_LIB}) - message(FATAL_ERROR "MinGW library directory does not exist: ${MINGW_LIB}") + message(FATAL_ERROR "MinGW library directory does not exist: ${MINGW_LIB}") endif() # Add MinGW libraries to linker path. @@ -132,30 +132,30 @@ link_directories(${MINGW_LIB}) set(MINGW_INCLUDE "${MINGW_PATH}/include") if(NOT EXISTS ${MINGW_INCLUDE}) - message(FATAL_ERROR "MinGW include directory does not exist: ${MINGW_INCLUDE}") + message(FATAL_ERROR "MinGW include directory does not exist: ${MINGW_INCLUDE}") endif() # Add general MinGW headers to compiler include path. include_directories(SYSTEM ${MINGW_INCLUDE}) if(HAVE_MINGW64) - set(MINGW64_LIB "${MINGW_ARCH_PATH}/lib") - - if(NOT EXISTS ${MINGW64_LIB}) - message(FATAL_ERROR "MinGW 64-Bit libraries directory does not exist: ${MINGW64_LIB}") - endif() - - # Add 64-Bit libraries to linker path. - link_directories(${MINGW64_LIB}) - - set(MINGW64_INCLUDE "${MINGW_ARCH_PATH}/include") - - if(NOT EXISTS ${MINGW64_INCLUDE}) - message(FATAL_ERROR "MinGW 64-Bit include directory does not exist: ${MINGW64_INCLUDE}") - endif() - - # Add 64-Bit MinGW headers to compiler include path. - include_directories(${MINGW64_INCLUDE}) + set(MINGW64_LIB "${MINGW_ARCH_PATH}/lib") + + if(NOT EXISTS ${MINGW64_LIB}) + message(FATAL_ERROR "MinGW 64-Bit libraries directory does not exist: ${MINGW64_LIB}") + endif() + + # Add 64-Bit libraries to linker path. + link_directories(${MINGW64_LIB}) + + set(MINGW64_INCLUDE "${MINGW_ARCH_PATH}/include") + + if(NOT EXISTS ${MINGW64_INCLUDE}) + message(FATAL_ERROR "MinGW 64-Bit include directory does not exist: ${MINGW64_INCLUDE}") + endif() + + # Add 64-Bit MinGW headers to compiler include path. + include_directories(${MINGW64_INCLUDE}) endif() # ----------------------------------------------------------------------------- @@ -166,9 +166,9 @@ endif() set(GS_BIN "${GS_PATH}/bin") if(EXISTS "${GS_BIN}") - set(HAVE_GS_BIN ON) + set(HAVE_GS_BIN ON) else() - set(HAVE_GS_BIN OFF) + set(HAVE_GS_BIN OFF) endif() # ----------------------------------------------------------------------------- @@ -180,5 +180,5 @@ set(CMAKE_FIND_LIBRARY_PREFIXES "lib") set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".dll") if(NOT HAVE_MINGW64) - list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES ".a") + list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES ".a") endif() \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d979d7c13..d4ba9b1f0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,420 +3,420 @@ # ----------------------------------------------------------------------------- set(sp_SRC - attribute-rel-css.cpp - attribute-rel-svg.cpp - attribute-rel-util.cpp - attribute-sort-util.cpp - sp-anchor.cpp - sp-clippath.cpp - sp-conn-end-pair.cpp - sp-conn-end.cpp - sp-cursor.cpp - sp-defs.cpp - sp-desc.cpp - sp-ellipse.cpp - sp-factory.cpp - sp-filter-primitive.cpp - sp-filter-reference.cpp - sp-filter.cpp - sp-flowdiv.cpp - sp-flowregion.cpp - sp-flowtext.cpp - sp-font-face.cpp - sp-font.cpp - sp-glyph-kerning.cpp - sp-glyph.cpp - sp-gradient-reference.cpp - sp-gradient.cpp - sp-guide.cpp - sp-hatch-path.cpp - sp-hatch.cpp - sp-image.cpp - sp-item-group.cpp - sp-item-notify-moveto.cpp - sp-item-rm-unsatisfied-cns.cpp - sp-item-transform.cpp - sp-item-update-cns.cpp - sp-item.cpp - sp-line.cpp - sp-linear-gradient.cpp - sp-lpe-item.cpp - sp-marker.cpp - sp-mask.cpp - sp-mesh-array.cpp - sp-mesh-patch.cpp - sp-mesh-row.cpp - sp-mesh.cpp - sp-metadata.cpp - sp-missing-glyph.cpp - sp-namedview.cpp - sp-object-group.cpp - sp-object.cpp - sp-offset.cpp - sp-paint-server.cpp - sp-path.cpp - sp-pattern.cpp - sp-polygon.cpp - sp-polyline.cpp - sp-radial-gradient.cpp - sp-rect.cpp - sp-root.cpp - sp-script.cpp - sp-shape.cpp - sp-solid-color.cpp - sp-spiral.cpp - sp-star.cpp - sp-stop.cpp - sp-string.cpp - sp-style-elem.cpp - sp-switch.cpp - sp-symbol.cpp - sp-tag-use-reference.cpp - sp-tag-use.cpp - sp-tag.cpp - sp-text.cpp - sp-title.cpp - sp-tref-reference.cpp - sp-tref.cpp - sp-tspan.cpp - sp-use-reference.cpp - sp-use.cpp - splivarot.cpp - viewbox.cpp + attribute-rel-css.cpp + attribute-rel-svg.cpp + attribute-rel-util.cpp + attribute-sort-util.cpp + sp-anchor.cpp + sp-clippath.cpp + sp-conn-end-pair.cpp + sp-conn-end.cpp + sp-cursor.cpp + sp-defs.cpp + sp-desc.cpp + sp-ellipse.cpp + sp-factory.cpp + sp-filter-primitive.cpp + sp-filter-reference.cpp + sp-filter.cpp + sp-flowdiv.cpp + sp-flowregion.cpp + sp-flowtext.cpp + sp-font-face.cpp + sp-font.cpp + sp-glyph-kerning.cpp + sp-glyph.cpp + sp-gradient-reference.cpp + sp-gradient.cpp + sp-guide.cpp + sp-hatch-path.cpp + sp-hatch.cpp + sp-image.cpp + sp-item-group.cpp + sp-item-notify-moveto.cpp + sp-item-rm-unsatisfied-cns.cpp + sp-item-transform.cpp + sp-item-update-cns.cpp + sp-item.cpp + sp-line.cpp + sp-linear-gradient.cpp + sp-lpe-item.cpp + sp-marker.cpp + sp-mask.cpp + sp-mesh-array.cpp + sp-mesh-patch.cpp + sp-mesh-row.cpp + sp-mesh.cpp + sp-metadata.cpp + sp-missing-glyph.cpp + sp-namedview.cpp + sp-object-group.cpp + sp-object.cpp + sp-offset.cpp + sp-paint-server.cpp + sp-path.cpp + sp-pattern.cpp + sp-polygon.cpp + sp-polyline.cpp + sp-radial-gradient.cpp + sp-rect.cpp + sp-root.cpp + sp-script.cpp + sp-shape.cpp + sp-solid-color.cpp + sp-spiral.cpp + sp-star.cpp + sp-stop.cpp + sp-string.cpp + sp-style-elem.cpp + sp-switch.cpp + sp-symbol.cpp + sp-tag-use-reference.cpp + sp-tag-use.cpp + sp-tag.cpp + sp-text.cpp + sp-title.cpp + sp-tref-reference.cpp + sp-tref.cpp + sp-tspan.cpp + sp-use-reference.cpp + sp-use.cpp + splivarot.cpp + viewbox.cpp - # ------- - # Headers - attribute-rel-css.h - attribute-rel-svg.h - attribute-rel-util.h - attribute-sort-util.h - sp-anchor.h - sp-clippath.h - sp-conn-end-pair.h - sp-conn-end.h - sp-cursor.h - sp-defs.h - sp-desc.h - sp-ellipse.h - sp-factory.h - sp-filter-primitive.h - sp-filter-reference.h - sp-filter-units.h - sp-filter.h - sp-flowdiv.h - sp-flowregion.h - sp-flowtext.h - sp-font-face.h - sp-font.h - sp-glyph-kerning.h - sp-glyph.h - sp-gradient-reference.h - sp-gradient-spread.h - sp-gradient-test.h - sp-gradient-units.h - sp-gradient-vector.h - sp-gradient.h - sp-guide-attachment.h - sp-guide-constraint.h - sp-guide.h - sp-hatch-path.h - sp-hatch.h - sp-image.h - sp-item-group.h - sp-item-notify-moveto.h - sp-item-rm-unsatisfied-cns.h - sp-item-transform.h - sp-item-update-cns.h - sp-item.h - sp-line.h - sp-linear-gradient.h - sp-lpe-item.h - sp-marker-loc.h - sp-marker.h - sp-mask.h - sp-mesh-array.h - sp-mesh-patch.h - sp-mesh-row.h - sp-mesh.h - sp-metadata.h - sp-missing-glyph.h - sp-namedview.h - sp-object-group.h - sp-object.h - sp-offset.h - sp-paint-server-reference.h - sp-paint-server.h - sp-path.h - sp-pattern.h - sp-polygon.h - sp-polyline.h - sp-radial-gradient.h - sp-rect.h - sp-root.h - sp-script.h - sp-shape.h - sp-solid-color.h - sp-spiral.h - sp-star.h - sp-stop.h - sp-string.h - sp-style-elem-test.h - sp-style-elem.h - sp-switch.h - sp-symbol.h - sp-tag.h - sp-tag-use.h - sp-tag-use-reference.h - sp-text.h - sp-textpath.h - sp-title.h - sp-tref-reference.h - sp-tref.h - sp-tspan.h - sp-use-reference.h - sp-use.h - viewbox.h + # ------- + # Headers + attribute-rel-css.h + attribute-rel-svg.h + attribute-rel-util.h + attribute-sort-util.h + sp-anchor.h + sp-clippath.h + sp-conn-end-pair.h + sp-conn-end.h + sp-cursor.h + sp-defs.h + sp-desc.h + sp-ellipse.h + sp-factory.h + sp-filter-primitive.h + sp-filter-reference.h + sp-filter-units.h + sp-filter.h + sp-flowdiv.h + sp-flowregion.h + sp-flowtext.h + sp-font-face.h + sp-font.h + sp-glyph-kerning.h + sp-glyph.h + sp-gradient-reference.h + sp-gradient-spread.h + sp-gradient-test.h + sp-gradient-units.h + sp-gradient-vector.h + sp-gradient.h + sp-guide-attachment.h + sp-guide-constraint.h + sp-guide.h + sp-hatch-path.h + sp-hatch.h + sp-image.h + sp-item-group.h + sp-item-notify-moveto.h + sp-item-rm-unsatisfied-cns.h + sp-item-transform.h + sp-item-update-cns.h + sp-item.h + sp-line.h + sp-linear-gradient.h + sp-lpe-item.h + sp-marker-loc.h + sp-marker.h + sp-mask.h + sp-mesh-array.h + sp-mesh-patch.h + sp-mesh-row.h + sp-mesh.h + sp-metadata.h + sp-missing-glyph.h + sp-namedview.h + sp-object-group.h + sp-object.h + sp-offset.h + sp-paint-server-reference.h + sp-paint-server.h + sp-path.h + sp-pattern.h + sp-polygon.h + sp-polyline.h + sp-radial-gradient.h + sp-rect.h + sp-root.h + sp-script.h + sp-shape.h + sp-solid-color.h + sp-spiral.h + sp-star.h + sp-stop.h + sp-string.h + sp-style-elem-test.h + sp-style-elem.h + sp-switch.h + sp-symbol.h + sp-tag.h + sp-tag-use.h + sp-tag-use-reference.h + sp-text.h + sp-textpath.h + sp-title.h + sp-tref-reference.h + sp-tref.h + sp-tspan.h + sp-use-reference.h + sp-use.h + viewbox.h ) set(inkscape_SRC - attributes.cpp - axis-manip.cpp - box3d-side.cpp - box3d.cpp - color-profile.cpp - color.cpp - composite-undo-stack-observer.cpp - conditions.cpp - conn-avoid-ref.cpp - console-output-undo-observer.cpp - context-fns.cpp - desktop-events.cpp - desktop-style.cpp - desktop.cpp - device-manager.cpp - dir-util.cpp - document-subset.cpp - document-undo.cpp - document.cpp - ege-color-prof-tracker.cpp - event-log.cpp - extract-uri.cpp - file.cpp - filter-chemistry.cpp - filter-enums.cpp - gc-anchored.cpp - gc-finalized.cpp - gradient-chemistry.cpp - gradient-drag.cpp - graphlayout.cpp - guide-snapper.cpp - help.cpp - id-clash.cpp - inkscape.cpp - knot-holder-entity.cpp - knot-ptr.cpp - knot.cpp - knotholder.cpp - layer-fns.cpp - layer-manager.cpp - layer-model.cpp - line-geometry.cpp - line-snapper.cpp - main-cmdlineact.cpp - media.cpp - message-context.cpp - message-stack.cpp - mod360.cpp - object-hierarchy.cpp - object-snapper.cpp - path-chemistry.cpp - persp3d-reference.cpp - persp3d.cpp - perspective-line.cpp - preferences.cpp - prefix.cpp - print.cpp - profile-manager.cpp - proj_pt.cpp - pure-transform.cpp - rdf.cpp - removeoverlap.cpp - resource-manager.cpp - rubberband.cpp - satisfied-guide-cns.cpp - selcue.cpp - selection-chemistry.cpp - selection-describer.cpp - selection.cpp - seltrans-handles.cpp - seltrans.cpp - shortcuts.cpp - snap-preferences.cpp - snap.cpp - snapped-curve.cpp - snapped-line.cpp - snapped-point.cpp - snapper.cpp - style-internal.cpp - style.cpp - svg-view-widget.cpp - svg-view.cpp - text-chemistry.cpp - text-editing.cpp - transf_mat_3x4.cpp - unclump.cpp - unicoderange.cpp - uri-references.cpp - uri.cpp - vanishing-point.cpp - verbs.cpp - version.cpp + attributes.cpp + axis-manip.cpp + box3d-side.cpp + box3d.cpp + color-profile.cpp + color.cpp + composite-undo-stack-observer.cpp + conditions.cpp + conn-avoid-ref.cpp + console-output-undo-observer.cpp + context-fns.cpp + desktop-events.cpp + desktop-style.cpp + desktop.cpp + device-manager.cpp + dir-util.cpp + document-subset.cpp + document-undo.cpp + document.cpp + ege-color-prof-tracker.cpp + event-log.cpp + extract-uri.cpp + file.cpp + filter-chemistry.cpp + filter-enums.cpp + gc-anchored.cpp + gc-finalized.cpp + gradient-chemistry.cpp + gradient-drag.cpp + graphlayout.cpp + guide-snapper.cpp + help.cpp + id-clash.cpp + inkscape.cpp + knot-holder-entity.cpp + knot-ptr.cpp + knot.cpp + knotholder.cpp + layer-fns.cpp + layer-manager.cpp + layer-model.cpp + line-geometry.cpp + line-snapper.cpp + main-cmdlineact.cpp + media.cpp + message-context.cpp + message-stack.cpp + mod360.cpp + object-hierarchy.cpp + object-snapper.cpp + path-chemistry.cpp + persp3d-reference.cpp + persp3d.cpp + perspective-line.cpp + preferences.cpp + prefix.cpp + print.cpp + profile-manager.cpp + proj_pt.cpp + pure-transform.cpp + rdf.cpp + removeoverlap.cpp + resource-manager.cpp + rubberband.cpp + satisfied-guide-cns.cpp + selcue.cpp + selection-chemistry.cpp + selection-describer.cpp + selection.cpp + seltrans-handles.cpp + seltrans.cpp + shortcuts.cpp + snap-preferences.cpp + snap.cpp + snapped-curve.cpp + snapped-line.cpp + snapped-point.cpp + snapper.cpp + style-internal.cpp + style.cpp + svg-view-widget.cpp + svg-view.cpp + text-chemistry.cpp + text-editing.cpp + transf_mat_3x4.cpp + unclump.cpp + unicoderange.cpp + uri-references.cpp + uri.cpp + vanishing-point.cpp + verbs.cpp + version.cpp - # ------- - # Headers - MultiPrinter.h - PylogFormatter.h - TRPIFormatter.h - attributes-test.h - attributes.h - axis-manip.h - bad-uri-exception.h - box3d-side.h - box3d.h - cms-color-types.h - cms-system.h - color-profile-cms-fns.h - color-profile-test.h - color-profile.h - color-rgba.h - color.h - colorspace.h - composite-undo-stack-observer.h - conditions.h - conn-avoid-ref.h - console-output-undo-observer.h - context-fns.h - decimal-round.h - desktop-events.h - desktop-style.h - desktop.h - device-manager.h - dir-util-test.h - dir-util.h - document-private.h - document-subset.h - document-undo.h - document.h - ege-color-prof-tracker.h - enums.h - event-log.h - event.h - extract-uri-test.h - extract-uri.h - file.h - fill-or-stroke.h - filter-chemistry.h - filter-enums.h - gc-anchored.h - gc-finalized.h - gradient-chemistry.h - gradient-drag.h - graphlayout.h - guide-snapper.h - help.h - helper-fns.h - icon-size.h - id-clash.h - inkscape-version.h - inkscape.h - isinf.h - knot-enums.h - knot-holder-entity.h - knot-ptr.h - knot.h - knotholder.h - layer-fns.h - layer-manager.h - layer-model.h - line-geometry.h - line-snapper.h - macros.h - main-cmdlineact.h - marker-test.h - media.h - menus-skeleton.h - message-context.h - message-stack.h - message.h - mod360-test.h - mod360.h - number-opt-number.h - object-hierarchy.h - object-snapper.h - object-test.h - path-chemistry.h - path-prefix.h - persp3d-reference.h - persp3d.h - perspective-line.h - preferences-skeleton.h - preferences-test.h - preferences.h - prefix.h - print.h - profile-manager.h - proj_pt.h - pure-transform.h - rdf.h - remove-last.h - removeoverlap.h - require-config.h - resource-manager.h - round-test.h - round.h - rubberband.h - satisfied-guide-cns.h - selcue.h - selection-chemistry.h - selection-describer.h - selection.h - seltrans-handles.h - seltrans.h - shortcuts.h - snap-candidate.h - snap-enums.h - snap-preferences.h - snap.h - snapped-curve.h - snapped-line.h - snapped-point.h - snapper.h - splivarot.h - streq.h - strneq.h - style-enums.h - style-internal.h - style-test.h - style.h - svg-profile.h - svg-view-widget.h - svg-view.h - syseq.h - test-helpers.h - text-chemistry.h - text-editing.h - text-tag-attributes.h - transf_mat_3x4.h - unclump.h - undo-stack-observer.h - unicoderange.h - uri-references.h - uri-test.h - uri.h - vanishing-point.h - verbs-test.h - verbs.h - version.h + # ------- + # Headers + MultiPrinter.h + PylogFormatter.h + TRPIFormatter.h + attributes-test.h + attributes.h + axis-manip.h + bad-uri-exception.h + box3d-side.h + box3d.h + cms-color-types.h + cms-system.h + color-profile-cms-fns.h + color-profile-test.h + color-profile.h + color-rgba.h + color.h + colorspace.h + composite-undo-stack-observer.h + conditions.h + conn-avoid-ref.h + console-output-undo-observer.h + context-fns.h + decimal-round.h + desktop-events.h + desktop-style.h + desktop.h + device-manager.h + dir-util-test.h + dir-util.h + document-private.h + document-subset.h + document-undo.h + document.h + ege-color-prof-tracker.h + enums.h + event-log.h + event.h + extract-uri-test.h + extract-uri.h + file.h + fill-or-stroke.h + filter-chemistry.h + filter-enums.h + gc-anchored.h + gc-finalized.h + gradient-chemistry.h + gradient-drag.h + graphlayout.h + guide-snapper.h + help.h + helper-fns.h + icon-size.h + id-clash.h + inkscape-version.h + inkscape.h + isinf.h + knot-enums.h + knot-holder-entity.h + knot-ptr.h + knot.h + knotholder.h + layer-fns.h + layer-manager.h + layer-model.h + line-geometry.h + line-snapper.h + macros.h + main-cmdlineact.h + marker-test.h + media.h + menus-skeleton.h + message-context.h + message-stack.h + message.h + mod360-test.h + mod360.h + number-opt-number.h + object-hierarchy.h + object-snapper.h + object-test.h + path-chemistry.h + path-prefix.h + persp3d-reference.h + persp3d.h + perspective-line.h + preferences-skeleton.h + preferences-test.h + preferences.h + prefix.h + print.h + profile-manager.h + proj_pt.h + pure-transform.h + rdf.h + remove-last.h + removeoverlap.h + require-config.h + resource-manager.h + round-test.h + round.h + rubberband.h + satisfied-guide-cns.h + selcue.h + selection-chemistry.h + selection-describer.h + selection.h + seltrans-handles.h + seltrans.h + shortcuts.h + snap-candidate.h + snap-enums.h + snap-preferences.h + snap.h + snapped-curve.h + snapped-line.h + snapped-point.h + snapper.h + splivarot.h + streq.h + strneq.h + style-enums.h + style-internal.h + style-test.h + style.h + svg-profile.h + svg-view-widget.h + svg-view.h + syseq.h + test-helpers.h + text-chemistry.h + text-editing.h + text-tag-attributes.h + transf_mat_3x4.h + unclump.h + undo-stack-observer.h + unicoderange.h + uri-references.h + uri-test.h + uri.h + vanishing-point.h + verbs-test.h + verbs.h + version.h ) # ----------------------------------------------------------------------------- @@ -425,19 +425,19 @@ set(inkscape_SRC # a custom target that is always built add_custom_target( - inkscape_version ALL - COMMAND ${CMAKE_COMMAND} - -DINKSCAPE_SOURCE_DIR=${CMAKE_SOURCE_DIR} - -DINKSCAPE_BINARY_DIR=${CMAKE_BINARY_DIR} - -P ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake) + inkscape_version ALL + COMMAND ${CMAKE_COMMAND} + -DINKSCAPE_SOURCE_DIR=${CMAKE_SOURCE_DIR} + -DINKSCAPE_BINARY_DIR=${CMAKE_BINARY_DIR} + -P ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake) # buildinfo.h is a generated file set_source_files_properties( - ${CMAKE_BINARY_DIR}/src/inkscape-version.cpp - PROPERTIES GENERATED TRUE) + ${CMAKE_BINARY_DIR}/src/inkscape-version.cpp + PROPERTIES GENERATED TRUE) list(APPEND inkscape_SRC - ${CMAKE_BINARY_DIR}/src/inkscape-version.cpp + ${CMAKE_BINARY_DIR}/src/inkscape-version.cpp ) @@ -477,8 +477,8 @@ add_subdirectory(libdepixelize) get_property(inkscape_global_SRC GLOBAL PROPERTY inkscape_global_SRC) set(inkscape_SRC - ${inkscape_global_SRC} - ${inkscape_SRC} + ${inkscape_global_SRC} + ${inkscape_SRC} ) # ----------------------------------------------------------------------------- @@ -488,23 +488,23 @@ set(inkscape_SRC #add_inkscape_lib(inkscape_LIB "${inkscape_SRC}") if(WIN32) - # Sources for the inkscape executable on Windows. - set(main_SRC - registrytool.h - registrytool.cpp - main.cpp - winmain.cpp - #winconsole.cpp - ) - - # Add the platform specific resource files (enabling the app icon). - if(${HAVE_MINGW64}) - list(APPEND main_SRC inkscape-x64.rc) - else() - list(APPEND main_SRC inkscape.rc) - endif() + # Sources for the inkscape executable on Windows. + set(main_SRC + registrytool.h + registrytool.cpp + main.cpp + winmain.cpp + #winconsole.cpp + ) + + # Add the platform specific resource files (enabling the app icon). + if(${HAVE_MINGW64}) + list(APPEND main_SRC inkscape-x64.rc) + else() + list(APPEND main_SRC inkscape.rc) + endif() else() - set(main_SRC main.cpp) + set(main_SRC main.cpp) endif() # Build everything except main and inkview.c in a shared library. @@ -550,4 +550,15 @@ target_link_libraries(inkscape_base ${INKSCAPE_TARGET_LIBS}) # Link inkscape and inkview against inkscape_base target_link_libraries(inkscape inkscape_base) -target_link_libraries(inkview inkscape_base) \ No newline at end of file +target_link_libraries(inkview inkscape_base) + +if(NOT WIN32) + #Define the installation + install(TARGETS + inkscape_base + inkscape + inkview + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib/inkscape + ARCHIVE DESTINATION lib/inkscape) +endif() -- cgit v1.2.3 From 24ac45b8bad3a477e2af643c36a77d82916a2017 Mon Sep 17 00:00:00 2001 From: Sebastian Faubel Date: Wed, 6 Jul 2016 17:45:34 +0200 Subject: Fixing build for Linux. (bzr r15002.1.8) --- CMakeLists.txt | 5 +++++ CMakeScripts/Install.cmake | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 51d665128..910ed4e20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -165,6 +165,11 @@ endif() # ----------------------------------------------------------------------------- # Installation # ----------------------------------------------------------------------------- +if(NOT WIN32) + # this should probably be done no matter what the platform is, just set SHARE_INSTALL first + add_subdirectory(share) +endif() + include(CMakeScripts/Install.cmake) # ----------------------------------------------------------------------------- diff --git a/CMakeScripts/Install.cmake b/CMakeScripts/Install.cmake index 8306cec16..aee0444de 100644 --- a/CMakeScripts/Install.cmake +++ b/CMakeScripts/Install.cmake @@ -5,10 +5,7 @@ if(UNIX) DESTINATION ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/applications) endif() -if(NOT WIN32) - # this should probably be done no matter what the platform is, just set SHARE_INSTALL first - add_subdirectory(../share) -else() +if(WIN32) install(PROGRAMS ${EXECUTABLE_OUTPUT_PATH}/inkscape.exe ${EXECUTABLE_OUTPUT_PATH}/inkview.exe -- cgit v1.2.3 From b3a4994bc0f688b221c91e1f82d8300d9d0d1d81 Mon Sep 17 00:00:00 2001 From: chironsylvain Date: Wed, 6 Jul 2016 19:26:23 +0200 Subject: Translations. French translations update. (bzr r15010) --- packaging/win32/languages/French.nsh | 38 +- po/fr.po | 3739 +++++++++++++++++----------------- 2 files changed, 1869 insertions(+), 1908 deletions(-) diff --git a/packaging/win32/languages/French.nsh b/packaging/win32/languages/French.nsh index 7d14f19e3..05a42573d 100644 --- a/packaging/win32/languages/French.nsh +++ b/packaging/win32/languages/French.nsh @@ -2,28 +2,28 @@ ;By matiphas@free.fr, Nicolas Dufour ${LangFileString} CaptionDescription "diteur vectoriel SVG libre" ${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) est diffus sous la licence publique gnrale (GPL) GNU. La licence est fournie ici pour information uniquement. $_CLICK" -${LangFileString} DIFFERENT_USER "Inkscape a dj t install par l'utilisateur $0.$\r$\nSi vous continuez, l'installation pourrait devenir dfectueuse!$\r$\nVeuillez, svp, vous connecter en tant que $0 et essayer de nouveau." -${LangFileString} WANT_UNINSTALL_BEFORE "$R1 a dj t install. $\nVoulez-vous supprimer la version prcdente avant l'installation d' $(^Name) ?" +${LangFileString} DIFFERENT_USER "Inkscape a dj t install par l'utilisateur $0.$\r$\nSi vous continuez, l'installation pourrait devenir dfectueuse!$\r$\nVeuillez vous connecter en tant que $0 et essayer nouveau." +${LangFileString} WANT_UNINSTALL_BEFORE "$R1 a dj t install. $\nVoulez-vous supprimer la version prcdente avant l'installation d'$(^Name) ?" ${LangFileString} OK_CANCEL_DESC "$\n$\nCliquer sur OK pour continuer ou CANCEL pour annuler." -${LangFileString} NO_ADMIN "Vous n'avez pas les privilges d'administrateur.$\r$\nL'installation d'Inkscape pour tous les utilisateurs pourrait devenir dfectueuse.$\r$\nVeuillez dcocher l'option 'pour tous les utilisateurs'." -${LangFileString} NOT_SUPPORTED "Inkscape n'est pas excutable sur Windows 95/98/ME!$\r$\nVeuillez, svp, consulter les sites web officiels pour plus d'information." +${LangFileString} NO_ADMIN "Vous n'avez pas les privilges d'administration.$\r$\nL'installation d'Inkscape pour tous les utilisateurs pourrait devenir dfectueuse.$\r$\nVeuillez dcocher l'option pour tous les utilisateurs." +${LangFileString} NOT_SUPPORTED "Inkscape n'est pas excutable sur Windows 95/98/Me!$\r$\nVeuillez consulter le site web officiel pour plus d'informations." ${LangFileString} Full "Complte" ${LangFileString} Optimal "Optimale" ${LangFileString} Minimal "Minimale" -${LangFileString} Core "Editeur SVG Inkscape (ncessaire)" -${LangFileString} CoreDesc "Fichiers indispensables d'Inkscape et dlls" +${LangFileString} Core "diteur SVG Inkscape (ncessaire)" +${LangFileString} CoreDesc "Fichiers indispensables d'Inkscape et bibliothques dynamiques" ${LangFileString} GTKFiles "Environnement GTK+ (ncessaire)" -${LangFileString} GTKFilesDesc "Une bote outils multi-plateformes pour interfaces graphiques, utilise par Inkscape" +${LangFileString} GTKFilesDesc "Une bote outils multi-plateforme pour interfaces graphiques, utilise par Inkscape" ${LangFileString} Shortcuts "Raccourcis" ${LangFileString} ShortcutsDesc "Raccourcis pour dmarrer Inkscape" ${LangFileString} Alluser "Pour tous les utilisateurs" -${LangFileString} AlluserDesc "Installer cette application pour tous les utilisateurs de cet ordinateurs" +${LangFileString} AlluserDesc "Installer cette application pour tous les utilisateurs de cet ordinateur" ${LangFileString} Desktop "Bureau" ${LangFileString} DesktopDesc "Crer un raccourci vers Inkscape sur le bureau" -${LangFileString} Startmenu "Menu dmarrer" -${LangFileString} StartmenuDesc "Crer une entre Inkscape dans le menu dmarrer" -${LangFileString} Quicklaunch "Lancement rapide" -${LangFileString} QuicklaunchDesc "Crer un raccourci vers Inkscape dans la barre de lancement rapide" +${LangFileString} Startmenu "Menu Windows" +${LangFileString} StartmenuDesc "Crer une entre Inkscape dans le menu Windows" +${LangFileString} Quicklaunch "Barre des tches" +${LangFileString} QuicklaunchDesc "Crer un raccourci vers Inkscape dans la barre des tches" ${LangFileString} SVGWriter "Ouvrir les fichiers SVG avec Inkscape" ${LangFileString} SVGWriterDesc "Choisir Inkscape comme diteur par dfaut pour les fichiers SVG" ${LangFileString} ContextMenu "Menu contextuel" @@ -33,11 +33,11 @@ ${LangFileString} DeletePrefsDesc "Effacer les pr ${LangFileString} Addfiles "Fichiers additionnels" ${LangFileString} AddfilesDesc "Fichiers additionnels" ${LangFileString} Examples "Exemples" -${LangFileString} ExamplesDesc "Examples d'utilisation d'Inkscape" +${LangFileString} ExamplesDesc "Exemples d'utilisation d'Inkscape" ${LangFileString} Tutorials "Didacticiels" ${LangFileString} TutorialsDesc "Didacticiels sur l'utilisation d'Inkscape" ${LangFileString} Languages "Traductions" -${LangFileString} LanguagesDesc "Installer des traductions pour Inkscape" +${LangFileString} LanguagesDesc "Installer les traductions d'Inkscape" ${LangFileString} lng_am "Amharique" ${LangFileString} lng_ar "Arabe" ${LangFileString} lng_az "Azri" @@ -47,7 +47,7 @@ ${LangFileString} lng_bn "Bengali" ${LangFileString} lng_bn_BD "Bengali Bangladesh" ${LangFileString} lng_br "Breton" ${LangFileString} lng_ca "Catalan" -${LangFileString} lng_ca@valencia "Catalan Valencien" +${LangFileString} lng_ca@valencia "Catalan valencien" ${LangFileString} lng_cs "Tchque" ${LangFileString} lng_da "Danois" ${LangFileString} lng_de "Allemand" @@ -56,9 +56,9 @@ ${LangFileString} lng_el "Grec" ${LangFileString} lng_en "Anglais" ${LangFileString} lng_en_AU "Anglais (Australie)" ${LangFileString} lng_en_CA "Anglais (Canada)" -${LangFileString} lng_en_GB "Anglais (Grande Bretagne)" +${LangFileString} lng_en_GB "Anglais (Royaume-Uni)" ${LangFileString} lng_en_US@piglatin "Pig Latin" -${LangFileString} lng_eo "Esperanto" +${LangFileString} lng_eo "Espranto" ${LangFileString} lng_es "Espagnol" ${LangFileString} lng_es_MX "Espagnol (Mexique)" ${LangFileString} lng_et "Estonien" @@ -69,7 +69,7 @@ ${LangFileString} lng_fr "Fran ${LangFileString} lng_he "Hbreu" ${LangFileString} lng_ga "Irlandais" ${LangFileString} lng_gl "Galicien" -${LangFileString} lng_hr "Croatian" +${LangFileString} lng_hr "Croate" ${LangFileString} lng_hu "Hongrois" ${LangFileString} lng_hy "Armenian" ${LangFileString} lng_id "Indonsien" @@ -95,7 +95,7 @@ ${LangFileString} lng_ru "Russe" ${LangFileString} lng_rw "Kinyarouandais" ${LangFileString} lng_sk "Slovaque" ${LangFileString} lng_sl "Slovne" -${LangFileString} lng_sq "Albanian" +${LangFileString} lng_sq "Albanais" ${LangFileString} lng_sr "Serbe" ${LangFileString} lng_sr@latin "Serbe (notation latine)" ${LangFileString} lng_sv "Sudois" diff --git a/po/fr.po b/po/fr.po index 19a680bc4..8f0559eb1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13,19 +13,21 @@ # Florent Becker # Sophie Gousset # Nicolas Dufour , 2008-2015. +# Sylvain Chiron , 2016. +# msgid "" msgstr "" "Project-Id-Version: inkscape\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2016-06-02 12:12+0200\n" -"PO-Revision-Date: 2016-06-02 12:14+0200\n" -"Last-Translator: Nicolas Dufour \n" -"Language-Team: fr@li.org\n" +"POT-Creation-Date: 2016-06-08 09:06+0200\n" +"PO-Revision-Date: 2016-07-01 14:31+0200\n" +"Last-Translator: Sylvain Chiron \n" +"Language-Team: français <>\n" "Language: fr_FR\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" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Poedit-Bookmarks: 46,-1,-1,-1,-1,-1,-1,-1,-1,-1\n" "X-Generator: Poedit 1.8.7.1\n" @@ -43,6 +45,9 @@ msgid "" "Illustrator, CorelDraw, or Xara X, using the W3C standard Scalable Vector " "Graphics (SVG) file format." msgstr "" +"Un éditeur d'images vectorielles libre, avec des capacités similaires à " +"Illustrator, CorelDraw et Xara X, utilisant le standard du W3C Scalable " +"Vector Graphics (SVG) comme format de fichier." #: ../inkscape.appdata.xml.in.h:4 msgid "" @@ -52,6 +57,13 @@ msgid "" "trace bitmaps and much more. We also aim to maintain a thriving user and " "developer community by using open, community-oriented development." msgstr "" +"Inkscape prend en charge de nombreuses fonctionnalités avancées du SVG " +"(marqueurs, clones, mélange alpha, etc.) et un grand soin est porté à " +"l'ergonomie de l'interface. Il est très facile d'éditer des notes, " +"d'effectuer des opérations de chemin complexes, de vectoriser du matriciel " +"et bien plus. Nous cherchons également à faire prospérer une communauté " +"d'utilisateurs et de développeurs avec un développement ouvert et " +"communautaire." #: ../inkscape.appdata.xml.in.h:5 msgid "Main application window" @@ -443,7 +455,7 @@ msgstr "Barbouillage de pixels" #: ../share/filters/filters.svg.h:124 msgid "Van Gogh painting effect for bitmaps" -msgstr "Effets de peinture Van Gogh, pour les images bitmap" +msgstr "Effet de peinture Van Gogh pour les images matricielles" #: ../share/filters/filters.svg.h:126 msgid "Cracked Glass" @@ -953,7 +965,8 @@ msgstr "Découpe et flou" #: ../share/filters/filters.svg.h:344 msgid "In and out glow with a possible offset and colorizable flood" msgstr "" -"Lueur intérieure et extérieure avec possibilité de décaler et colorer le fond" +"Lueur intérieure et extérieure avec un éventuel décalage et remplissage " +"coloré" #: ../share/filters/filters.svg.h:346 msgid "Dark Emboss" @@ -1360,8 +1373,7 @@ msgstr "Gravure transparente" #: ../share/filters/filters.svg.h:496 msgid "Gives a transparent engraving effect with rough line and filling" -msgstr "" -"Donne un effet de gravure transparente avec un trait agité et un remplissage" +msgstr "Donne un effet de gravure transparente avec un trait et un fond agités" #: ../share/filters/filters.svg.h:498 msgid "Alpha Draw Liquid" @@ -1370,8 +1382,8 @@ msgstr "Dessin transparent liquide" #: ../share/filters/filters.svg.h:500 msgid "Gives a transparent fluid drawing effect with rough line and filling" msgstr "" -"Donne un effet de dessin liquide et transparent avec un trait agité et un " -"remplissage" +"Donne un effet de dessin liquide et transparent avec un trait et un fond " +"agités" #: ../share/filters/filters.svg.h:502 msgid "Liquid Drawing" @@ -1406,7 +1418,8 @@ msgstr "Gravure transparente B" msgid "" "Gives a controllable roughness engraving effect to bitmaps and materials" msgstr "" -"Donne un effet de gravure agitée contrôlable aux bitmaps et aux matières" +"Donne un effet de gravure agitée contrôlable aux objets matriciels et aux " +"matières" #: ../share/filters/filters.svg.h:518 msgid "Lapping" @@ -1561,7 +1574,7 @@ msgstr "Impression en relief" #: ../share/filters/filters.svg.h:580 msgid "Bumps effect with a bevel, color flood and complex lighting" msgstr "" -"Biseau avec des bosselages, du remplissage de couleur et une lumière complexe" +"Biseau avec des bosselages, un remplissage de couleur et une lumière complexe" #: ../share/filters/filters.svg.h:582 msgid "Growing Cells" @@ -1570,8 +1583,7 @@ msgstr "Cellules vivantes" #: ../share/filters/filters.svg.h:584 msgid "Random rounded living cells like fill" msgstr "" -"Remplissage avec des formes rondes et aléatoires ressemblant à des cellules " -"vivantes" +"Fond avec des formes rondes et aléatoires ressemblant à des cellules vivantes" #: ../share/filters/filters.svg.h:586 msgid "Fluorescence" @@ -1630,9 +1642,8 @@ msgid "Plasticine" msgstr "Pâte à modeler" #: ../share/filters/filters.svg.h:612 -#, fuzzy msgid "Matte modeling paste emboss effect" -msgstr "Coller l'effet de chemin en direct" +msgstr "Effet de bosselage façon pâte à modeler mate" #: ../share/filters/filters.svg.h:614 msgid "Rough Canvas Painting" @@ -1687,9 +1698,8 @@ msgid "Pointillism" msgstr "Pointillisme" #: ../share/filters/filters.svg.h:640 -#, fuzzy msgid "Gives a turbulent pointillist HSL sensitive transparency" -msgstr "Donne une transparence sensible TSL, pointilliste" +msgstr "Donne une transparence turbulente, pointilliste et sensible TSL" #: ../share/filters/filters.svg.h:642 msgid "Silhouette Marbled" @@ -1748,9 +1758,8 @@ msgid "Cross Noise Poster" msgstr "Poster de bruit croisé" #: ../share/filters/filters.svg.h:668 -#, fuzzy msgid "Overlay with a small scale screen like noise" -msgstr "Ajoute à l'image un grain de photo" +msgstr "Ajouter un grain de photo à l'image" #: ../share/filters/filters.svg.h:670 msgid "Cross Noise Poster B" @@ -1758,7 +1767,7 @@ msgstr "Poster de bruit croisé B" #: ../share/filters/filters.svg.h:672 msgid "Adds a small scale screen like noise locally" -msgstr "Ajoute une petite zone de bruit localement" +msgstr "Ajoute du bruit localement" #: ../share/filters/filters.svg.h:674 msgid "Poster Color Fun" @@ -1766,7 +1775,7 @@ msgstr "Affiche couleur amusante" #: ../share/filters/filters.svg.h:678 msgid "Poster Rough" -msgstr "Poster brut" +msgstr "Poster d'agitation" #: ../share/filters/filters.svg.h:680 msgid "Adds roughness to one of the two channels of the Poster paint filter" @@ -1781,8 +1790,7 @@ msgstr "Monochrome transparent craquelé" #: ../share/filters/filters.svg.h:692 ../share/filters/filters.svg.h:704 #: ../share/filters/filters.svg.h:708 ../share/filters/filters.svg.h:712 msgid "Basic noise fill texture; adjust color in Flood" -msgstr "" -"Texture de remplissage agité de base ; ajuster la couleur avec Remplissage" +msgstr "Texture de fond agité de base ; ajuster la couleur dans le Remplissage" #: ../share/filters/filters.svg.h:686 msgid "Alpha Turbulent" @@ -1798,7 +1806,7 @@ msgstr "Bruit croisé B" #: ../share/filters/filters.svg.h:696 msgid "Adds a small scale crossy graininess" -msgstr "Ajoute une petite zone de grain croisé" +msgstr "Ajoute du grain croisé" #: ../share/filters/filters.svg.h:698 msgid "Cross Noise" @@ -1806,7 +1814,7 @@ msgstr "Bruit croisé" #: ../share/filters/filters.svg.h:700 msgid "Adds a small scale screen like graininess" -msgstr "Ajoute une petite zone de grain " +msgstr "Ajoute du grain" #: ../share/filters/filters.svg.h:702 msgid "Duotone Turbulent" @@ -1842,7 +1850,7 @@ msgstr "Liquide" #: ../share/filters/filters.svg.h:724 msgid "Colorizable filling with liquid transparency" -msgstr "Remplissage qu'il est possible de colorer, à la transparence liquide" +msgstr "Remplissage qui peut être coloré avec de la transparence liquide" #: ../share/filters/filters.svg.h:726 msgid "Aluminium" @@ -3411,15 +3419,15 @@ msgstr "Hermine" #: ../share/patterns/patterns.svg.h:1 msgid "Sand (bitmap)" -msgstr "Sable (bitmap)" +msgstr "Sable (matriciel)" #: ../share/patterns/patterns.svg.h:1 msgid "Cloth (bitmap)" -msgstr "Textile (bitmap)" +msgstr "Textile (matriciel)" #: ../share/patterns/patterns.svg.h:1 msgid "Old paint (bitmap)" -msgstr "Peinture vieillie (bitmap)" +msgstr "Peinture vieillie (matricielle)" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:2 @@ -3451,7 +3459,7 @@ msgstr "Bureau de change" #: ../share/symbols/symbols.h:9 ../share/symbols/symbols.h:10 msgctxt "Symbol" msgid "Currency Exchange - Euro" -msgstr "Bureau de changes - Euro" +msgstr "Bureau de changes — Euro" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:11 ../share/symbols/symbols.h:12 @@ -3531,13 +3539,13 @@ msgstr "Ascenseur" #: ../share/symbols/symbols.h:35 ../share/symbols/symbols.h:36 msgctxt "Symbol" msgid "Toilets - Men" -msgstr "Toilettes - Hommes" +msgstr "Toilettes — Hommes" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:37 ../share/symbols/symbols.h:38 msgctxt "Symbol" msgid "Toilets - Women" -msgstr "Toilettes - Femmes" +msgstr "Toilettes — Femmes" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:39 ../share/symbols/symbols.h:40 @@ -3575,7 +3583,7 @@ msgstr "Information" #: ../share/symbols/symbols.h:49 ../share/symbols/symbols.h:50 msgctxt "Symbol" msgid "Hotel Information" -msgstr "Espace information de l’hôtel" +msgstr "Espace information de l'hôtel" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:51 ../share/symbols/symbols.h:52 @@ -3653,7 +3661,7 @@ msgstr "Boutiques" #: ../share/symbols/symbols.h:75 ../share/symbols/symbols.h:76 msgctxt "Symbol" msgid "Barber Shop - Beauty Salon" -msgstr "Salon de beauté - salon de coiffure" +msgstr "Salon de beauté — salon de coiffure" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:77 ../share/symbols/symbols.h:78 @@ -3811,7 +3819,7 @@ msgstr "Flèche vers la droite et le bas" #: ../share/symbols/symbols.h:127 ../share/symbols/symbols.h:128 msgctxt "Symbol" msgid "NPS Wheelchair Accessible - 1996" -msgstr "Accessible en fauteuil roulant (NPS - 1996)" +msgstr "Accessible en fauteuil roulant (NPS — 1996)" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:129 ../share/symbols/symbols.h:130 @@ -4503,16 +4511,16 @@ msgstr "guides typographie canevas" msgid "3D Box" msgstr "Boîte 3D" -#: ../src/color-profile.cpp:842 +#: ../src/color-profile.cpp:856 #, c-format msgid "Color profiles directory (%s) is unavailable." msgstr "Le dossier des profils de couleur (%s) est indisponible." -#: ../src/color-profile.cpp:901 ../src/color-profile.cpp:918 +#: ../src/color-profile.cpp:928 ../src/color-profile.cpp:945 msgid "(invalid UTF-8 string)" msgstr "(chaîne UTF-8 invalide)" -#: ../src/color-profile.cpp:903 +#: ../src/color-profile.cpp:930 msgctxt "Profile name" msgid "None" msgstr "Aucun" @@ -4520,13 +4528,12 @@ msgstr "Aucun" #: ../src/context-fns.cpp:33 ../src/context-fns.cpp:62 msgid "Current layer is hidden. Unhide it to be able to draw on it." msgstr "" -"Le calque courant est caché. Le rendre visible pour pouvoir y " -"dessiner." +"Le calque actif est masqué. Rendez-le visible pour pouvoir y dessiner." #: ../src/context-fns.cpp:39 ../src/context-fns.cpp:68 msgid "Current layer is locked. Unlock it to be able to draw on it." msgstr "" -"Le calque courant est verrouillé. Le déverrouiller pour pouvoir y " +"Le calque actif est verrouillé. Déverrouillez-le pour pouvoir y " "dessiner." #: ../src/desktop-events.cpp:244 @@ -4998,8 +5005,8 @@ msgstr "" "\n" "Les extensions défectueuses ont été ignorées. Inkscape va continuer à " "fonctionner normalement, mais ces extensions seront indisponibles. Pour plus " -"de détails concernant ce problème, référez-vous à l'historique (log) des " -"messages d'erreur : " +"de détails concernant ce problème, référez-vous au journal des messages " +"d'erreur : " #: ../src/extension/error-file.cpp:67 msgid "Show dialog on startup" @@ -5008,7 +5015,7 @@ msgstr "Afficher le dialogue au démarrage" #: ../src/extension/execution-env.cpp:136 #, c-format msgid "'%s' working, please wait..." -msgstr "'%s' en cours..." +msgstr "« %s » en cours..." #. static int i = 0; #. std::cout << "Checking module[" << i++ << "]: " << name << std::endl; @@ -5018,7 +5025,8 @@ msgid "" "inx file could have been caused by a faulty installation of Inkscape." msgstr "" " C'est le résultat d'un fichier .inx incorrect pour cette extension. Un " -"fichier .inx incorrect peut être du à un problème d'installation d'Inkscape." +"fichier .inx incorrect peut être dû à un problème dans l'installation " +"d'Inkscape." #: ../src/extension/extension.cpp:277 msgid "the extension is designed for Windows only." @@ -5026,7 +5034,7 @@ msgstr "l'extension ne fonctionne qu'avec Windows." #: ../src/extension/extension.cpp:282 msgid "an ID was not defined for it." -msgstr "aucun Id ne lui est affecté." +msgstr "aucun ID ne lui est affecté." #: ../src/extension/extension.cpp:286 msgid "there was no name defined for it." @@ -5056,7 +5064,7 @@ msgstr " » n'a pas été chargée, car " #: ../src/extension/extension.cpp:670 #, c-format msgid "Could not create extension error log file '%s'" -msgstr "Impossible de créer le fichier d'erreur de l'extension : '%s'" +msgstr "Impossible de créer le journal d'erreurs de l'extension : « %s »" #: ../src/extension/extension.cpp:778 #: ../share/extensions/webslicer_create_rect.inx.h:2 @@ -5065,7 +5073,7 @@ msgstr "Nom :" #: ../src/extension/extension.cpp:779 msgid "ID:" -msgstr "Id :" +msgstr "ID :" #: ../src/extension/extension.cpp:780 msgid "State:" @@ -5093,7 +5101,7 @@ msgstr "" "vous référer au site internet d'Inkscape ou aux listes de diffusion pour " "toute question relative à celle-ci." -#: ../src/extension/implementation/script.cpp:1108 +#: ../src/extension/implementation/script.cpp:1111 msgid "" "Inkscape has received additional data from the script executed. The script " "did not return an error, but this may indicate the results will not be as " @@ -5135,7 +5143,7 @@ msgstr "Seuil adaptatif" #: ../src/widgets/eraser-toolbar.cpp:154 ../src/widgets/spray-toolbar.cpp:297 #: ../src/widgets/tweak-toolbar.cpp:128 ../share/extensions/foldablebox.inx.h:2 msgid "Width:" -msgstr "Épaisseur :" +msgstr "Largeur :" #: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:42 #: ../src/extension/internal/bitmap/raise.cpp:43 @@ -5192,7 +5200,9 @@ msgstr "Images matricielles" #: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:49 msgid "Apply adaptive thresholding to selected bitmap(s)" -msgstr "Appliquer un effet de seuil adaptatif au bitmap sélectionné" +msgstr "" +"Appliquer un effet de seuil adaptatif au(x) objet(s) matriciel(s) " +"sélectionné(s)" #: ../src/extension/internal/bitmap/addNoise.cpp:45 msgid "Add Noise" @@ -5241,7 +5251,7 @@ msgstr "Bruit de Poisson" #: ../src/extension/internal/bitmap/addNoise.cpp:60 msgid "Add random noise to selected bitmap(s)" -msgstr "Ajouter du bruit aux bitmaps sélectionnés" +msgstr "Ajouter du bruit aléatoire au(x) objet(s) matriciel(s) sélectionné(s)" #: ../src/extension/internal/bitmap/blur.cpp:38 #: ../src/extension/internal/filter/blurs.h:54 @@ -5273,7 +5283,7 @@ msgstr "Sigma :" #: ../src/extension/internal/bitmap/blur.cpp:47 msgid "Blur selected bitmap(s)" -msgstr "Rendre flous les bitmaps sélectionnés" +msgstr "Flouter le(s) objet(s) matriciel(s) sélectionné(s)" #: ../src/extension/internal/bitmap/channel.cpp:48 msgid "Channel" @@ -5338,7 +5348,8 @@ msgstr "Fusain" #: ../src/extension/internal/bitmap/charcoal.cpp:47 msgid "Apply charcoal stylization to selected bitmap(s)" -msgstr "Transformer les bitmaps sélectionnés en dessins au fusain" +msgstr "" +"Transformer le(s) objet(s) matriciel(s) sélectionné(s) en dessins au fusain" #: ../src/extension/internal/bitmap/colorize.cpp:50 #: ../src/extension/internal/filter/color.h:392 @@ -5348,7 +5359,8 @@ msgstr "Colorer" #: ../src/extension/internal/bitmap/colorize.cpp:58 msgid "Colorize selected bitmap(s) with specified color, using given opacity" msgstr "" -"Colorer les bitmaps sélectionnés avec la couleur et l'opacité spécifiées" +"Colorer le(s) objet(s) matriciel(s) sélectionné(s) avec la couleur et " +"l'opacité spécifiées" #: ../src/extension/internal/bitmap/contrast.cpp:40 #: ../src/extension/internal/filter/color.h:1189 @@ -5388,7 +5400,7 @@ msgstr "Droite (px) :" #: ../src/extension/internal/bitmap/crop.cpp:77 msgid "Crop selected bitmap(s)" -msgstr "Rogner les bitmaps sélectionnés" +msgstr "Rogner le(s) objet(s) matriciel(s) sélectionné(s)" #: ../src/extension/internal/bitmap/cycleColormap.cpp:37 msgid "Cycle Colormap" @@ -5403,7 +5415,9 @@ msgstr "Quantité :" #: ../src/extension/internal/bitmap/cycleColormap.cpp:45 msgid "Cycle colormap(s) of selected bitmap(s)" -msgstr "Cycler les couleurs dans les bitmaps sélectionnés" +msgstr "" +"Permuter cycliquement les couleurs dans le(s) objet(s) matriciel(s) " +"sélectionné(s)" #: ../src/extension/internal/bitmap/despeckle.cpp:36 msgid "Despeckle" @@ -5411,7 +5425,8 @@ msgstr "Adoucir les parasites" #: ../src/extension/internal/bitmap/despeckle.cpp:43 msgid "Reduce speckle noise of selected bitmap(s)" -msgstr "Adoucir le bruit parasite sur les bitmaps sélectionnés" +msgstr "" +"Adoucir le bruit parasite sur le(s) objet(s) matriciel(s) sélectionné(s)" #: ../src/extension/internal/bitmap/edge.cpp:37 msgid "Edge" @@ -5419,7 +5434,9 @@ msgstr "Contours" #: ../src/extension/internal/bitmap/edge.cpp:45 msgid "Highlight edges of selected bitmap(s)" -msgstr "Surligner les contours des bitmaps sélectionnés" +msgstr "" +"Afficher les bords du/des objet(s) matriciel(s) sélectionné(s) en " +"surbrillance" #: ../src/extension/internal/bitmap/emboss.cpp:38 msgid "Emboss" @@ -5428,7 +5445,8 @@ msgstr "Embosser" #: ../src/extension/internal/bitmap/emboss.cpp:47 msgid "Emboss selected bitmap(s); highlight edges with 3D effect" msgstr "" -"Gaufrer les bitmaps sélectionnés ; surligne les contours avec un effet 3D" +"Gaufrer le(s) objet(s) matriciel(s) sélectionné(s) ; surligner les contours " +"avec un effet 3D" #: ../src/extension/internal/bitmap/enhance.cpp:35 msgid "Enhance" @@ -5436,7 +5454,8 @@ msgstr "Améliorer" #: ../src/extension/internal/bitmap/enhance.cpp:42 msgid "Enhance selected bitmap(s); minimize noise" -msgstr "Améliorer les bitmaps sélectionnés ; minimise le bruit" +msgstr "" +"Améliorer le(s) objet(s) matriciel(s) sélectionné(s) ; minimiser le bruit" #: ../src/extension/internal/bitmap/equalize.cpp:35 msgid "Equalize" @@ -5444,7 +5463,7 @@ msgstr "Égaliser" #: ../src/extension/internal/bitmap/equalize.cpp:42 msgid "Equalize selected bitmap(s); histogram equalization" -msgstr "Égaliser l'histogramme des bitmaps sélectionnés" +msgstr "Égaliser l'histogramme du/des objet(s) matriciel(s) sélectionné(s)" #: ../src/extension/internal/bitmap/gaussianBlur.cpp:38 #: ../src/filter-enums.cpp:29 @@ -5459,7 +5478,7 @@ msgstr "Facteur :" #: ../src/extension/internal/bitmap/gaussianBlur.cpp:47 msgid "Gaussian blur selected bitmap(s)" -msgstr "Appliquer un flou gaussien aux bitmaps sélectionnés" +msgstr "Appliquer un flou gaussien au(x) objet(s) matriciel(s) sélectionné(s)" #: ../src/extension/internal/bitmap/implode.cpp:37 msgid "Implode" @@ -5467,7 +5486,7 @@ msgstr "Imploser" #: ../src/extension/internal/bitmap/implode.cpp:45 msgid "Implode selected bitmap(s)" -msgstr "Imploser les bitmaps sélectionnés" +msgstr "Imploser le(s) objet(s) matriciel(s) sélectionné(s)" #: ../src/extension/internal/bitmap/level.cpp:41 #: ../src/extension/internal/filter/color.h:817 @@ -5497,9 +5516,9 @@ msgid "" "Level selected bitmap(s) by scaling values falling between the given ranges " "to the full color range" msgstr "" -"Niveler les bitmaps sélectionnés en mettant à l'échelle les valeurs se " -"situant dans l'intervalle donné pour les élargir à la gamme complète de " -"couleur" +"Niveler le(s) objet(s) matriciel(s) sélectionné(s) en mettant à l'échelle " +"les valeurs se situant dans l'intervalle donné pour les élargir à la gamme " +"complète de couleur" #: ../src/extension/internal/bitmap/levelChannel.cpp:52 msgid "Level (with Channel)" @@ -5515,9 +5534,9 @@ msgid "" "Level the specified channel of selected bitmap(s) by scaling values falling " "between the given ranges to the full color range" msgstr "" -"Niveler la composante spécifiée des bitmaps sélectionnés en mettant à " -"l'échelle les valeurs se situant dans l'intervalle donné pour les élargir à " -"la gamme complète de couleur" +"Niveler la composante spécifiée du/des objet(s) matriciel(s) sélectionné(s) " +"en mettant à l'échelle les valeurs se situant dans l'intervalle donné pour " +"les élargir à la gamme complète de couleur" #: ../src/extension/internal/bitmap/medianFilter.cpp:37 msgid "Median" @@ -5550,7 +5569,8 @@ msgstr "Brillance :" msgid "" "Adjust the amount of hue, saturation, and brightness in selected bitmap(s)" msgstr "" -"Moduler la teinte, la saturation et la luminosité des bitmaps sélectionnés." +"Moduler la teinte, la saturation et la luminosité du/des objet(s) " +"matriciel(s) sélectionné(s)" #: ../src/extension/internal/bitmap/negate.cpp:36 msgid "Negate" @@ -5558,7 +5578,7 @@ msgstr "Inverser" #: ../src/extension/internal/bitmap/negate.cpp:43 msgid "Negate (take inverse) selected bitmap(s)" -msgstr "Inverser les bitmaps sélectionnés" +msgstr "Inverser les couleurs dans le(s) objet(s) matriciel(s) sélectionné(s)" #: ../src/extension/internal/bitmap/normalize.cpp:36 msgid "Normalize" @@ -5569,8 +5589,8 @@ msgid "" "Normalize selected bitmap(s), expanding color range to the full possible " "range of color" msgstr "" -"Normaliser les bitmaps sélectionnés, étend la gamme des couleurs présente à " -"la gamme complète de couleur" +"Normaliser le(s) objet(s) matriciel(s) sélectionné(s), en étendant la gamme " +"des couleurs présente à la gamme complète de couleur" #: ../src/extension/internal/bitmap/oilPaint.cpp:37 msgid "Oil Paint" @@ -5579,8 +5599,8 @@ msgstr "Peinture à l'huile" #: ../src/extension/internal/bitmap/oilPaint.cpp:45 msgid "Stylize selected bitmap(s) so that they appear to be painted with oils" msgstr "" -"Styliser les bitmaps sélectionnés en leur donnant l'apparence d'une peinture " -"à l'huile" +"Styliser le(s) objet(s) matriciel(s) sélectionné(s) en leur donnant " +"l'apparence d'une peinture à l'huile" #: ../src/extension/internal/bitmap/opacity.cpp:38 #: ../src/extension/internal/filter/blurs.h:333 @@ -5599,7 +5619,9 @@ msgstr "Opacité :" #: ../src/extension/internal/bitmap/opacity.cpp:46 msgid "Modify opacity channel(s) of selected bitmap(s)" -msgstr "Modifier la composante opacité des bitmaps sélectionnés" +msgstr "" +"Modifier le(s) canal/aux d'opacité du/des objet(s) matriciel(s) " +"sélectionné(s)" #: ../src/extension/internal/bitmap/raise.cpp:40 msgid "Raise" @@ -5613,8 +5635,8 @@ msgstr "En relief" msgid "" "Alter lightness the edges of selected bitmap(s) to create a raised appearance" msgstr "" -"Changer la luminosité des bitmaps sélectionnés pour les faire apparaître " -"« en relief »" +"Changer la luminosité du/des objet(s) matriciel(s) sélectionné(s) pour les " +"faire apparaître « en relief »" #: ../src/extension/internal/bitmap/reduceNoise.cpp:40 msgid "Reduce Noise" @@ -5634,7 +5656,8 @@ msgstr "Ordre :" msgid "" "Reduce noise in selected bitmap(s) using a noise peak elimination filter" msgstr "" -"Réduire le bruit dans les bitmaps sélectionnés en éliminant les pics de bruit" +"Réduire le bruit dans le(s) objet(s) matriciel(s) sélectionné(s) en " +"éliminant les pics de bruit" #: ../src/extension/internal/bitmap/sample.cpp:39 msgid "Resample" @@ -5645,7 +5668,7 @@ msgid "" "Alter the resolution of selected image by resizing it to the given pixel size" msgstr "" "Changer la résolution de l'image en la redimensionnant avec la taille de " -"pixel donnée." +"pixel donnée" #: ../src/extension/internal/bitmap/shade.cpp:40 msgid "Shade" @@ -5665,11 +5688,13 @@ msgstr "Ombrage coloré" #: ../src/extension/internal/bitmap/shade.cpp:50 msgid "Shade selected bitmap(s) simulating distant light source" -msgstr "Ombrer les bitmaps sélectionnés; simule une source lumineuse lointaine" +msgstr "" +"Ombrer le(s) objet(s) matriciel(s) sélectionné(s), simulant une source " +"lumineuse lointaine" #: ../src/extension/internal/bitmap/sharpen.cpp:47 msgid "Sharpen selected bitmap(s)" -msgstr "Rendre plus nets les bitmaps sélectionnés" +msgstr "Rendre plus nets le(s) objet(s) matriciel(s) sélectionné(s)" #: ../src/extension/internal/bitmap/solarize.cpp:39 #: ../src/extension/internal/filter/color.h:1569 @@ -5680,7 +5705,8 @@ msgstr "Solariser" #: ../src/extension/internal/bitmap/solarize.cpp:47 msgid "Solarize selected bitmap(s), like overexposing photographic film" msgstr "" -"Solariser les bitmaps sélectionnés, donne un effet de pellicule surexposée" +"Solariser le(s) objet(s) matriciel(s) sélectionné(s), comme un effet de " +"pellicule surexposée" #: ../src/extension/internal/bitmap/spread.cpp:37 msgid "Dither" @@ -5691,8 +5717,8 @@ msgid "" "Randomly scatter pixels in selected bitmap(s), within the given radius of " "the original position" msgstr "" -"Disperser au hasard les pixels des bitmaps sélectionnés, dans le rayon donné " -"de la position originale" +"Disperser aléatoirement les pixels dans le(s) objet(s) matriciel(s) " +"sélectionné(s), dans le rayon donné par rapport à la position originale" #: ../src/extension/internal/bitmap/swirl.cpp:39 msgid "Degrees:" @@ -5700,7 +5726,9 @@ msgstr "Degrés :" #: ../src/extension/internal/bitmap/swirl.cpp:45 msgid "Swirl selected bitmap(s) around center point" -msgstr "Faire tourbillonner les bitmaps autour d'un point central" +msgstr "" +"Faire tourbillonner le(s) objet(s) matriciel(s) sélectionné(s) autour d'un " +"point central" #. TRANSLATORS: see http://docs.gimp.org/en/gimp-tool-threshold.html #: ../src/extension/internal/bitmap/threshold.cpp:38 @@ -5715,7 +5743,7 @@ msgstr "Seuil :" #: ../src/extension/internal/bitmap/threshold.cpp:46 msgid "Threshold selected bitmap(s)" -msgstr "Appliquer un seuil sur les bitmaps sélectionnés" +msgstr "Appliquer un seuil sur le(s) objet(s) matriciel(s) sélectionné(s)" #: ../src/extension/internal/bitmap/unsharpmask.cpp:41 msgid "Unsharp Mask" @@ -5724,8 +5752,8 @@ msgstr "Masque de netteté" #: ../src/extension/internal/bitmap/unsharpmask.cpp:52 msgid "Sharpen selected bitmap(s) using unsharp mask algorithms" msgstr "" -"Rendre plus nets les bitmaps sélectionnés en utilisant des algorithmes de " -"netteté de type « unsharp mask »" +"Rendre plus nets le(s) objet(s) matriciel(s) sélectionné(s) en utilisant des " +"algorithmes de type « unsharp mask »" #: ../src/extension/internal/bitmap/wave.cpp:38 msgid "Wave" @@ -5741,7 +5769,9 @@ msgstr "Longueur d'onde :" #: ../src/extension/internal/bitmap/wave.cpp:47 msgid "Alter selected bitmap(s) along sine wave" -msgstr "Altérer les bitmaps sélectionnés suivant une onde sinusoïdale" +msgstr "" +"Altérer le(s) objet(s) matriciel(s) sélectionné(s) suivant une onde " +"sinusoïdale" #: ../src/extension/internal/bluredge.cpp:132 msgid "Inset/Outset Halo" @@ -5757,7 +5787,7 @@ msgstr "Nombre de passes :" #: ../src/extension/internal/bluredge.cpp:135 msgid "Number of inset/outset copies of the object to make" -msgstr "Nombre de copies contractées/dilatées de l'objet à créer" +msgstr "Nombre de copies érodées/dilatées de l'objet à créer" #: ../src/extension/internal/bluredge.cpp:139 #: ../share/extensions/extrude.inx.h:5 @@ -5792,9 +5822,8 @@ msgstr "PostScript niveau 2" #: ../src/extension/internal/cairo-ps-out.cpp:333 #: ../src/extension/internal/cairo-ps-out.cpp:375 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:250 -#, fuzzy msgid "Text output options:" -msgstr "Orientation du texte" +msgstr "Options de la sortie texte :" #: ../src/extension/internal/cairo-ps-out.cpp:334 #: ../src/extension/internal/cairo-ps-out.cpp:376 @@ -5852,7 +5881,7 @@ msgstr "Fond perdu/marge (mm) :" #: ../src/extension/internal/cairo-ps-out.cpp:387 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:262 msgid "Limit export to the object with ID:" -msgstr "Limiter l'exportation à l'objet ayant l'Id :" +msgstr "Limiter l'exportation à l'objet ayant l'ID :" #: ../src/extension/internal/cairo-ps-out.cpp:349 #: ../share/extensions/ps_input.inx.h:2 @@ -6028,7 +6057,7 @@ msgstr "Utiliser les gradients linéaires rectangulaires natifs" #: ../src/extension/internal/emf-inout.cpp:3626 msgid "Map all fill patterns to standard EMF hatches" -msgstr "Associer tous les motifs de remplissage en hachures EMF" +msgstr "Associer tous les motifs de fond en hachures EMF" #: ../src/extension/internal/emf-inout.cpp:3627 msgid "Ignore image rotations" @@ -6733,7 +6762,7 @@ msgstr "Fondu 2 :" #: ../src/extension/internal/filter/color.h:425 msgid "Blend image or object with a flood color" -msgstr "Mélange un image ou un objet avec une couleur de remplissage" +msgstr "Mélanger une image ou un objet avec une couleur de remplissage" #: ../src/extension/internal/filter/color.h:499 ../src/filter-enums.cpp:23 msgid "Component Transfer" @@ -6945,7 +6974,7 @@ msgstr "Ombres" #: ../src/widgets/gradient-toolbar.cpp:1159 #: ../src/widgets/measure-toolbar.cpp:328 msgid "Offset" -msgstr "Offset" +msgstr "Décalage" #: ../src/extension/internal/filter/color.h:1127 msgid "Modify lights and shadows separately" @@ -7137,7 +7166,7 @@ msgstr "Étroit" #: ../src/extension/internal/filter/distort.h:81 msgid "No fill" -msgstr "Aucun remplissage" +msgstr "Fond vide" #: ../src/extension/internal/filter/distort.h:83 msgid "Turbulence:" @@ -7380,7 +7409,7 @@ msgstr "Ajoute un contour qui peut être coloré" #: ../src/extension/internal/filter/overlays.h:56 msgid "Noise Fill" -msgstr "Remplissage turbulent" +msgstr "Fond turbulent" #: ../src/extension/internal/filter/overlays.h:59 #: ../src/extension/internal/filter/paint.h:690 @@ -7920,8 +7949,8 @@ msgid "" "When an image is upscaled, apply smoothing or keep blocky (pixelated). (Will " "not work in all browsers.)" msgstr "" -"When an image is upscaled, apply smoothing or keep blocky (pixelated). (Will " -"not work in all browsers.)" +"Lorsqu'une image est agrandie, la lisser ou bien conserver des blocs (gros " +"pixels). Non supporté par certains navigateurs." #: ../src/extension/internal/gdkpixbuf-input.cpp:206 #: ../src/ui/dialog/inkscape-preferences.cpp:1518 @@ -8103,7 +8132,7 @@ msgstr "Propriétés de la page" #: ../src/extension/internal/pdfinput/pdf-input.cpp:129 msgid "Precision of approximating gradient meshes:" -msgstr "Précision de l'approximation sur les mailles de dégradés :" +msgstr "Précision de l'approximation sur les filets de dégradés :" #: ../src/extension/internal/pdfinput/pdf-input.cpp:130 msgid "" @@ -8123,6 +8152,10 @@ msgid "" "glyphs where each glyph is a path. Images are stored internally. Meshes " "cause entire document to be rendered as a raster image." msgstr "" +"Importer depuis une bibliothèque externe. Le texte est constitué de groupes " +"contenant des glyphes clonés où chaque glyphe est un chemin. Les images sont " +"stockées en interne. Les filets amènent le document entier à être rendu " +"comme une image matricielle." #: ../src/extension/internal/pdfinput/pdf-input.cpp:136 msgid "Internal import" @@ -8134,6 +8167,9 @@ msgid "" "white space is missing. Meshes are converted to tiles, the number depends on " "the precision set below." msgstr "" +"Importer depuis une bibliothèque interne (dérivée de Poppler). Le texte est " +"stocké comme du texte mais les espaces manquent. Les filets sont convertis " +"en carreaux dont le nombre dépend de la précision définie ci-dessous." #: ../src/extension/internal/pdfinput/pdf-input.cpp:148 msgid "rough" @@ -8149,7 +8185,7 @@ msgstr "grossier" #: ../src/extension/internal/pdfinput/pdf-input.cpp:159 msgid "Replace PDF fonts by closest-named installed fonts" msgstr "" -"Remplace les polices du PDF par les polices installées dont le nom est le " +"Remplacer les polices du PDF par les polices installées dont le nom est le " "plus proche" #: ../src/extension/internal/pdfinput/pdf-input.cpp:161 @@ -8352,7 +8388,7 @@ msgstr "Sortie WMF" #: ../src/extension/internal/wmf-inout.cpp:3204 msgid "Map all fill patterns to standard WMF hatches" -msgstr "Associer tous les motifs de remplissage en hachures WMF" +msgstr "Associer tous les motifs de fond à des hachures WMF standards" #: ../src/extension/internal/wmf-inout.cpp:3208 #: ../share/extensions/wmf_input.inx.h:2 ../share/extensions/wmf_output.inx.h:2 @@ -8569,11 +8605,11 @@ msgstr "Opacité de fond" #: ../src/filter-enums.cpp:45 msgid "Fill Paint" -msgstr "Remplissage" +msgstr "Teinture du fond" #: ../src/filter-enums.cpp:46 msgid "Stroke Paint" -msgstr "Remplissage du contour" +msgstr "Teinture du contour" #. New in Compositing and Blending Level 1 #: ../src/filter-enums.cpp:58 @@ -8691,7 +8727,7 @@ msgstr "Aucun" #: ../src/filter-enums.cpp:137 msgid "Erode" -msgstr "Contracter" +msgstr "Éroder" #: ../src/filter-enums.cpp:138 msgid "Dilate" @@ -8727,51 +8763,51 @@ msgstr "Supprimer l'échantillon" #: ../src/gradient-drag.cpp:97 ../src/ui/tools/gradient-tool.cpp:90 msgid "Linear gradient start" -msgstr "Début de dégradé linéaire" +msgstr "Début du dégradé linéaire" #. POINT_LG_BEGIN #: ../src/gradient-drag.cpp:98 ../src/ui/tools/gradient-tool.cpp:91 msgid "Linear gradient end" -msgstr "Fin de dégradé linéaire" +msgstr "Fin du dégradé linéaire" #: ../src/gradient-drag.cpp:99 ../src/ui/tools/gradient-tool.cpp:92 msgid "Linear gradient mid stop" -msgstr "Stop médian de dégradé linéaire" +msgstr "Stop médian du dégradé linéaire" #: ../src/gradient-drag.cpp:100 ../src/ui/tools/gradient-tool.cpp:93 msgid "Radial gradient center" -msgstr "Centre de dégradé radial" +msgstr "Centre du dégradé radial" #: ../src/gradient-drag.cpp:101 ../src/gradient-drag.cpp:102 #: ../src/ui/tools/gradient-tool.cpp:94 ../src/ui/tools/gradient-tool.cpp:95 msgid "Radial gradient radius" -msgstr "Rayon de dégradé radial" +msgstr "Rayon du dégradé radial" #: ../src/gradient-drag.cpp:103 ../src/ui/tools/gradient-tool.cpp:96 msgid "Radial gradient focus" -msgstr "Foyer de dégradé radial" +msgstr "Foyer du dégradé radial" #. POINT_RG_FOCUS #: ../src/gradient-drag.cpp:104 ../src/gradient-drag.cpp:105 #: ../src/ui/tools/gradient-tool.cpp:97 ../src/ui/tools/gradient-tool.cpp:98 msgid "Radial gradient mid stop" -msgstr "Stop médian de dégradé radial" +msgstr "Stop médian du dégradé radial" #: ../src/gradient-drag.cpp:106 ../src/ui/tools/mesh-tool.cpp:93 msgid "Mesh gradient corner" -msgstr "coin de filet de dégradé" +msgstr "Coin du filet de dégradé" #: ../src/gradient-drag.cpp:107 ../src/ui/tools/mesh-tool.cpp:94 msgid "Mesh gradient handle" -msgstr "poignée de filet de dégradé" +msgstr "Poignée du filet de dégradé" #: ../src/gradient-drag.cpp:108 ../src/ui/tools/mesh-tool.cpp:95 msgid "Mesh gradient tensor" -msgstr "tenseur de filet de dégradé" +msgstr "Tenseur du filet de dégradé" #: ../src/gradient-drag.cpp:565 msgid "Added patch row or column" -msgstr "" +msgstr "Ligne ou colonne réparatrice ajoutée" #: ../src/gradient-drag.cpp:798 msgid "Merge gradient handles" @@ -8792,8 +8828,8 @@ msgid "" "%s %d for: %s%s; drag with Ctrl to snap offset; click with Ctrl" "+Alt to delete stop" msgstr "" -"%s %d pour %s%s; déplacer avec Ctrl pour faire varier le décalage par " -"incréments; cliquer avec Ctrl+Alt pour supprimer le stop" +"%s %d pour %s%s ; cliquer-glisser avec Ctrl pour faire varier le " +"décalage par incréments ; cliquer avec Ctrl+Alt pour supprimer le stop" #: ../src/gradient-drag.cpp:1427 ../src/gradient-drag.cpp:1434 msgid " (stroke)" @@ -8805,17 +8841,17 @@ msgid "" "%s for: %s%s; drag with Ctrl to snap angle, with Ctrl+Alt to " "preserve angle, with Ctrl+Shift to scale around center" msgstr "" -"%s pour %s%s; cliquer-déplacer avec Ctrl pour faire varier l'angle " -"par incréments; Ctrl+Alt pour préserver l'angle, avec Ctrl+Maj " -"pour redimensionner autour du centre" +"%s pour %s%s ; cliquer-glisser avec Ctrl pour faire varier l'angle " +"par incréments, avec Ctrl+Alt pour préserver l'angle, avec Ctrl" +"+Maj pour redimensionner autour du centre" #: ../src/gradient-drag.cpp:1439 msgid "" "Radial gradient center and focus; drag with Shift to " "separate focus" msgstr "" -"Dégradé radial, centre et foyer; déplacer avec Maj pour " -"séparer le foyer" +"Dégradé radial, centre et foyer ; cliquer-glisser avec Maj pour séparer le foyer" #: ../src/gradient-drag.cpp:1442 #, c-format @@ -8826,11 +8862,11 @@ msgid_plural "" "Gradient point shared by %d gradients; drag with Shift to " "separate" msgstr[0] "" -"Point de dégradé partagé entre %d dégradé; déplacer avec Maj " -"pour séparer " +"Point de dégradé partagé entre %d dégradé ; déplacer avec Maj " +"pour séparer" msgstr[1] "" -"Point de dégradé partagé entre %d dégradés; déplacer avec Maj " -"pour séparer " +"Point de dégradé partagé entre %d dégradés ; déplacer avec Maj " +"pour séparer" #: ../src/gradient-drag.cpp:2364 msgid "Move gradient handle(s)" @@ -8911,19 +8947,18 @@ msgstr "Déplacer la poignée de nœud" #. TRANSLATORS: This refers to the pattern that's inside the object #: ../src/knotholder.cpp:277 ../src/knotholder.cpp:299 msgid "Move the pattern fill inside the object" -msgstr "Déplacer le motif de remplissage à l'intérieur de l'objet" +msgstr "Déplacer le motif de fond à l'intérieur de l'objet" #: ../src/knotholder.cpp:281 ../src/knotholder.cpp:303 msgid "Scale the pattern fill; uniformly if with Ctrl" msgstr "" -"Redimensionner le motif de remplissage ; uniformiser en maintenant la " -"touche Ctrl" +"Redimensionner le motif de fond ; uniformiser en maintenant la touche " +"Ctrl" #: ../src/knotholder.cpp:285 ../src/knotholder.cpp:307 msgid "Rotate the pattern fill; with Ctrl to snap angle" msgstr "" -"Tourner le motif de remplissage ; Ctrl pour tourner par " -"incréments" +"Tourner le motif de fond ; Ctrl pour tourner par incréments" #: ../src/libgdl/gdl-dock-bar.c:105 msgid "Master" @@ -8931,23 +8966,23 @@ msgstr "Maître" #: ../src/libgdl/gdl-dock-bar.c:106 msgid "GdlDockMaster object which the dockbar widget is attached to" -msgstr "Objet GdlDockMaster auquel la barre détachable est attachée" +msgstr "Objet GdlDockMaster auquel la barre d'ancrage est ancrée" #: ../src/libgdl/gdl-dock-bar.c:113 msgid "Dockbar style" -msgstr "Style de barre détachable" +msgstr "Style de barre d'ancrage" #: ../src/libgdl/gdl-dock-bar.c:114 msgid "Dockbar style to show items on it" -msgstr "Style de barre d'attache pour l'affichage de ses éléments" +msgstr "Style de barre d'ancrage pour l'affichage de ses éléments" #: ../src/libgdl/gdl-dock-item-grip.c:402 msgid "Iconify this dock" -msgstr "Iconifier ce point d'attache" +msgstr "Icônifier ce point d'ancrage" #: ../src/libgdl/gdl-dock-item-grip.c:404 msgid "Close this dock" -msgstr "Fermer ce point d'attache" +msgstr "Fermer ce point d'ancrage" #: ../src/libgdl/gdl-dock-item-grip.c:723 ../src/libgdl/gdl-dock-tablabel.c:125 msgid "Controlling dock item" @@ -8955,7 +8990,7 @@ msgstr "Élément détachable de contrôle" #: ../src/libgdl/gdl-dock-item-grip.c:724 msgid "Dockitem which 'owns' this grip" -msgstr "Élément d'attache qui « possède » cette prise" +msgstr "Élément ancré qui « possède » cette prise" #: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/ruler.cpp:201 #: ../share/extensions/gcodetools_graffiti.inx.h:9 @@ -8974,8 +9009,8 @@ msgstr "Redimensionnable" #: ../src/libgdl/gdl-dock-item.c:315 msgid "If set, the dock item can be resized when docked in a GtkPanel widget" msgstr "" -"Si coché, l'élément détachable peut être redimensionné quand il est attaché " -"à un widget GtkPanel" +"Si coché, l'élément ancrable peut être redimensionné quand il est ancré à un " +"gadget GtkPanel" #: ../src/libgdl/gdl-dock-item.c:322 msgid "Item behavior" @@ -8986,8 +9021,8 @@ msgid "" "General behavior for the dock item (i.e. whether it can float, if it's " "locked, etc.)" msgstr "" -"Comportement général de l'élément détachable (par ex, s'il peut flotter, " -"s'il est verouillé, etc...)" +"Comportement général de l'élément détachable (par ex., s'il peut flotter, " +"s'il est verrouillé, etc.)" #: ../src/libgdl/gdl-dock-item.c:331 ../src/libgdl/gdl-dock-master.c:148 msgid "Locked" @@ -9022,8 +9057,8 @@ msgid "" "You can't add a dock object (%p of type %s) inside a %s. Use a GdlDock or " "some other compound dock object." msgstr "" -"Vous ne pouvez pas ajouter d'objet d'attache (%p de type %s) dans un %s. " -"Utilisez un GdlDock ou un autre objet d'attache composite." +"Vous ne pouvez pas ajouter d'objet ancrable (%p de type %s) dans un %s. " +"Utilisez un GdlDock ou un autre objet ancrable composite." #: ../src/libgdl/gdl-dock-item.c:723 #, c-format @@ -9032,13 +9067,13 @@ msgid "" "widget at a time; it already contains a widget of type %s" msgstr "" "Tentative d'ajout d'un gadget de %s à un %s, mais il ne peut contenir qu'un " -"gadget à la fois ; il contient déjà un gadget detype %s" +"gadget à la fois ; il contient déjà un gadget de type %s" #: ../src/libgdl/gdl-dock-item.c:1474 ../src/libgdl/gdl-dock-item.c:1524 #, c-format msgid "Unsupported docking strategy %s in dock object of type %s" msgstr "" -"La stratégie d'attache %s n'est pas supportée pour l'objet d'attache de type " +"La stratégie d'ancrage %s n'est pas supportée pour l'objet ancrable de type " "%s" #. UnLock menuitem @@ -9067,7 +9102,7 @@ msgstr "Titre par défaut" #: ../src/libgdl/gdl-dock-master.c:142 msgid "Default title for newly created floating docks" -msgstr "Titre par défaut pour les nouveaux points d'attache flottants" +msgstr "Titre par défaut pour les nouveaux points d'ancrage flottants" #: ../src/libgdl/gdl-dock-master.c:149 msgid "" @@ -9092,8 +9127,8 @@ msgid "" "master %p: unable to add object %p[%s] to the hash. There already is an " "item with that name (%p)." msgstr "" -"maître %p: impossible d'ajouter l'objet %p[%s] dans la table. Il y a déjà un " -"élément avec ce nom (%p)." +"maître %p : impossible d'ajouter l'objet %p[%s] dans la table. Il y a déjà " +"un élément avec ce nom (%p)." #: ../src/libgdl/gdl-dock-master.c:955 #, c-format @@ -9101,8 +9136,8 @@ msgid "" "The new dock controller %p is automatic. Only manual dock objects should be " "named controller." msgstr "" -"Le nouveau contrôleur d'attache %p est automatique. Seuls les ojbets " -"d'attache manuels peuvent être nommés contrôleurs." +"Le nouveau contrôleur d'ancrage %p est automatique. Seuls les objets ancrés " +"manuels peuvent être nommés contrôleurs." #: ../src/libgdl/gdl-dock-notebook.c:132 #: ../src/ui/dialog/align-and-distribute.cpp:1089 @@ -9128,7 +9163,7 @@ msgstr "Nom" #: ../src/libgdl/gdl-dock-object.c:126 msgid "Unique name for identifying the dock object" -msgstr "Nom unique pour identifier l'objet d'attache" +msgstr "Nom unique pour identifier l'objet ancrable" #: ../src/libgdl/gdl-dock-object.c:133 msgid "Long name" @@ -9136,31 +9171,31 @@ msgstr "Nom complet" #: ../src/libgdl/gdl-dock-object.c:134 msgid "Human readable name for the dock object" -msgstr "Nom lisible attribué à l'objet d'attache" +msgstr "Nom lisible attribué à l'objet ancrable" #: ../src/libgdl/gdl-dock-object.c:140 msgid "Stock Icon" -msgstr "Icone en bibliothèque" +msgstr "Icône en bibliothèque" #: ../src/libgdl/gdl-dock-object.c:141 msgid "Stock icon for the dock object" -msgstr "Icone en bibliothèque pour l'objet d'attache" +msgstr "Icône en bibliothèque pour l'objet ancrable" #: ../src/libgdl/gdl-dock-object.c:147 msgid "Pixbuf Icon" -msgstr "Icone Pixbuf" +msgstr "Icône Pixbuf" #: ../src/libgdl/gdl-dock-object.c:148 msgid "Pixbuf icon for the dock object" -msgstr "Icone Pixbuf pour l'objet d'attache" +msgstr "Icône Pixbuf pour l'objet ancrable" #: ../src/libgdl/gdl-dock-object.c:153 msgid "Dock master" -msgstr "Maître d'attache" +msgstr "Maître d'ancrage" #: ../src/libgdl/gdl-dock-object.c:154 msgid "Dock master this dock object is bound to" -msgstr "Maître d'attache auquel cet objet d'attache est lié" +msgstr "Maître d'ancrage auquel cet objet ancrable est lié" #: ../src/libgdl/gdl-dock-object.c:463 #, c-format @@ -9168,7 +9203,7 @@ msgid "" "Call to gdl_dock_object_dock in a dock object %p (object type is %s) which " "hasn't implemented this method" msgstr "" -"Appel à gdl_dock_object_dock dans un objet d'attache %p (le type d'objet est " +"Appel à gdl_dock_object_dock dans un objet ancrable %p (le type d'objet est " "%s) qui n'a pas implémenté cette méthode" #: ../src/libgdl/gdl-dock-object.c:602 @@ -9177,22 +9212,22 @@ msgid "" "Dock operation requested in a non-bound object %p. The application might " "crash" msgstr "" -"Opération d'attache demandée sur un ojbet %p non-lié. L'application pourrait " -"planter" +"Opération d'ancrage demandée sur un objet %p non lié. L'application risque " +"de planter" #: ../src/libgdl/gdl-dock-object.c:609 #, c-format msgid "Cannot dock %p to %p because they belong to different masters" msgstr "" -"Impossible d'attacher %p à %p car ils appartiennent à des maîtres différents" +"Impossible d'ancrer %p à %p car ils appartiennent à des maîtres différents" #: ../src/libgdl/gdl-dock-object.c:651 #, c-format msgid "" "Attempt to bind to %p an already bound dock object %p (current master: %p)" msgstr "" -"Tentative d'attacher à %p un objet d'attache %p déjà lié par ailleurs " -"(maître actuel: %p)" +"Tentative d'ancrer à %p un objet ancrable %p déjà lié par ailleurs (maître " +"actuel : %p)" #: ../src/libgdl/gdl-dock-paned.c:130 ../src/widgets/ruler.cpp:239 msgid "Position" @@ -9211,8 +9246,8 @@ msgid "" "Whether the placeholder will stick to its host or move up the hierarchy when " "the host is redocked" msgstr "" -"Détermine si l'élément substituable restera attaché à son hôte ou remontera " -"dans la hiérarchie quand l'hôte est réattaché" +"Détermine si l'élément substituable restera ancré à son hôte ou remontera " +"dans la hiérarchie quand l'hôte est réancré" #: ../src/libgdl/gdl-dock-placeholder.c:149 msgid "Host" @@ -9220,7 +9255,7 @@ msgstr "Hôte" #: ../src/libgdl/gdl-dock-placeholder.c:150 msgid "The dock object this placeholder is attached to" -msgstr "L'objet d'attachement auquel cet élément substituable est attaché" +msgstr "L'objet ancrable auquel cet élément substituable est ancré" #: ../src/libgdl/gdl-dock-placeholder.c:157 msgid "Next placement" @@ -9231,16 +9266,16 @@ msgid "" "The position an item will be docked to our host if a request is made to dock " "to us" msgstr "" -"La position où un élément sera attaché à l'hôte si une demande d'attachement " -"est faite" +"La position où un élément sera ancré à l'hôte si une demande d'ancrage est " +"faite" #: ../src/libgdl/gdl-dock-placeholder.c:168 msgid "Width for the widget when it's attached to the placeholder" -msgstr "Largeur du gadget quand il est attaché à l'élément substituable" +msgstr "Largeur du gadget quand il est ancré à l'élément substituable" #: ../src/libgdl/gdl-dock-placeholder.c:176 msgid "Height for the widget when it's attached to the placeholder" -msgstr "Hauteur du gadget quand il est attaché à l'élément substituable" +msgstr "Hauteur du gadget quand il est ancré à l'élément substituable" #: ../src/libgdl/gdl-dock-placeholder.c:182 msgid "Floating Toplevel" @@ -9249,7 +9284,7 @@ msgstr "Niveau supérieur flottant" #: ../src/libgdl/gdl-dock-placeholder.c:183 msgid "Whether the placeholder is standing in for a floating toplevel dock" msgstr "" -"Détermine si l'élément substituable réserve la place pour un point d'attache " +"Détermine si l'élément substituable réserve la place pour un point d'ancrage " "flottant de niveau supérieur" #: ../src/libgdl/gdl-dock-placeholder.c:189 @@ -9258,7 +9293,7 @@ msgstr "Coordonnée X" #: ../src/libgdl/gdl-dock-placeholder.c:190 msgid "X coordinate for dock when floating" -msgstr "Coordonnée X du point d'attache quand il est flottant" +msgstr "Coordonnée X du point d'ancrage quand il est flottant" #: ../src/libgdl/gdl-dock-placeholder.c:196 msgid "Y Coordinate" @@ -9266,13 +9301,12 @@ msgstr "Coordonnée Y" #: ../src/libgdl/gdl-dock-placeholder.c:197 msgid "Y coordinate for dock when floating" -msgstr "Coordonnée Y du point d'attache quand il est flottant" +msgstr "Coordonnée Y du point d'ancrage quand il est flottant" #: ../src/libgdl/gdl-dock-placeholder.c:499 msgid "Attempt to dock a dock object to an unbound placeholder" msgstr "" -"Tentative d'attachement d'un objet d'attache sur un élément substituable non " -"lié" +"Tentative d'ancrage d'un objet ancrable sur un élément substituable non lié" #: ../src/libgdl/gdl-dock-placeholder.c:611 #, c-format @@ -9290,28 +9324,28 @@ msgstr "" #: ../src/libgdl/gdl-dock-tablabel.c:126 msgid "Dockitem which 'owns' this tablabel" -msgstr "Élément d'attache qui « possède » ce tablabel" +msgstr "Élément ancré auquel correspond cet onglet" #: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:687 #: ../src/ui/dialog/inkscape-preferences.cpp:730 msgid "Floating" -msgstr "Flottant" +msgstr "Flottants" #: ../src/libgdl/gdl-dock.c:177 msgid "Whether the dock is floating in its own window" -msgstr "Détermine si le point d'attache flotte dans sa propre fenêtre" +msgstr "Détermine si le point d'ancrage flotte dans sa propre fenêtre" #: ../src/libgdl/gdl-dock.c:185 msgid "Default title for the newly created floating docks" -msgstr "Titre par défaut pour les nouveaux point d'attache flottants" +msgstr "Titre par défaut pour les nouveaux points d'ancrage flottants" #: ../src/libgdl/gdl-dock.c:192 msgid "Width for the dock when it's of floating type" -msgstr "Largeur du point d'attache quand il est de type flottant" +msgstr "Largeur du point d'ancrage quand il est de type flottant" #: ../src/libgdl/gdl-dock.c:200 msgid "Height for the dock when it's of floating type" -msgstr "Hauteur du point d'attache quand il est de type flottant" +msgstr "Hauteur du point d'ancrage quand il est de type flottant" #: ../src/libgdl/gdl-dock.c:207 msgid "Float X" @@ -9319,7 +9353,7 @@ msgstr "X flottant" #: ../src/libgdl/gdl-dock.c:208 msgid "X coordinate for a floating dock" -msgstr "Coordonnée X pour un point d'attache flottant" +msgstr "Coordonnée X pour un point d'ancrage flottant" #: ../src/libgdl/gdl-dock.c:215 msgid "Float Y" @@ -9327,12 +9361,12 @@ msgstr "Y flottant" #: ../src/libgdl/gdl-dock.c:216 msgid "Y coordinate for a floating dock" -msgstr "Coordonnée Y pour un point d'attache flottant" +msgstr "Coordonnée Y pour un point d'ancrage flottant" #: ../src/libgdl/gdl-dock.c:476 #, c-format msgid "Dock #%d" -msgstr "Point d'attache #%d" +msgstr "Point d'ancrage #%d" #: ../src/libnrtype/FontFactory.cpp:636 msgid "Ignoring font without family that will crash Pango" @@ -9467,9 +9501,8 @@ msgid "Clone original path" msgstr "Cloner le chemin original" #: ../src/live_effects/effect.cpp:137 -#, fuzzy msgid "Lattice Deformation 2" -msgstr "Déformation par grille" +msgstr "Déformation par grille 2" #: ../src/live_effects/effect.cpp:138 msgid "Perspective/Envelope" @@ -9490,7 +9523,7 @@ msgstr "Afficher les poignées" #: ../src/live_effects/effect.cpp:143 ../src/widgets/pencil-toolbar.cpp:118 msgid "BSpline" -msgstr "BSpline" +msgstr "B-spline" #: ../src/live_effects/effect.cpp:144 msgid "Join type" @@ -9510,17 +9543,16 @@ msgstr "Tourner les copies" #. Ponyscape -> Inkscape 0.92 #: ../src/live_effects/effect.cpp:149 -#, fuzzy msgid "Attach path" -msgstr "Chemin de liaison" +msgstr "Joindre un chemin" #: ../src/live_effects/effect.cpp:150 msgid "Fill between strokes" -msgstr "Remplit entre les contours" +msgstr "Remplir entre les contours" #: ../src/live_effects/effect.cpp:151 ../src/selection-chemistry.cpp:2906 msgid "Fill between many" -msgstr "" +msgstr "Remplir dans les nuées" #: ../src/live_effects/effect.cpp:152 msgid "Ellipse by 5 points" @@ -9550,7 +9582,7 @@ msgstr "Pas d'effet" #, c-format msgid "Please specify a parameter path for the LPE '%s' with %d mouse clicks" msgstr "" -"Veuillez spécifier un chemin paramètre pour l'effet de chemin '%s' avec %d " +"Veuillez spécifier un chemin paramètre pour l'effet de chemin « %s » avec %d " "clics de souris" #: ../src/live_effects/effect.cpp:765 @@ -9581,9 +9613,8 @@ msgid "Position to attach path start to" msgstr "Position à laquelle attacher le début du chemin" #: ../src/live_effects/lpe-attach-path.cpp:31 -#, fuzzy msgid "Start path curve start:" -msgstr "Définir la couleur du chemin en rouge :" +msgstr "Début de la courbe du chemin de départ :" #: ../src/live_effects/lpe-attach-path.cpp:31 #: ../src/live_effects/lpe-attach-path.cpp:35 @@ -9592,9 +9623,8 @@ msgstr "Courbe de début" #. , true #: ../src/live_effects/lpe-attach-path.cpp:32 -#, fuzzy msgid "Start path curve end:" -msgstr "Définir la couleur du chemin en rouge :" +msgstr "Fin de la courbe du chemin de départ :" #: ../src/live_effects/lpe-attach-path.cpp:32 #: ../src/live_effects/lpe-attach-path.cpp:36 @@ -9620,12 +9650,12 @@ msgstr "Position à laquelle attacher la fin du chemin" #: ../src/live_effects/lpe-attach-path.cpp:35 msgid "End path curve start:" -msgstr "" +msgstr "Début de la courbe du chemin de fin :" #. , true #: ../src/live_effects/lpe-attach-path.cpp:36 msgid "End path curve end:" -msgstr "" +msgstr "Fin de la courbe du chemin de fin :" #: ../src/live_effects/lpe-bendpath.cpp:69 msgid "Bend path:" @@ -9648,7 +9678,7 @@ msgstr "Largeur du chemin" #: ../src/live_effects/lpe-bendpath.cpp:72 msgid "W_idth in units of length" -msgstr "Largeur en un_ités de longueur" +msgstr "_Largeur en unités de longueur" #: ../src/live_effects/lpe-bendpath.cpp:72 msgid "Scale the width of the path in units of its length" @@ -9656,7 +9686,7 @@ msgstr "Rendre la largeur proportionnelle à la longueur du chemin de courbure" #: ../src/live_effects/lpe-bendpath.cpp:73 msgid "_Original path is vertical" -msgstr "Le chemin _original est vertical" +msgstr "Chemin _original vertical" #: ../src/live_effects/lpe-bendpath.cpp:73 msgid "Rotates the original 90 degrees, before bending it along the bend path" @@ -9664,9 +9694,8 @@ msgstr "Tourne l'original de 90 degrés avant de le déformer le long du chemin" #: ../src/live_effects/lpe-bendpath.cpp:178 #: ../src/live_effects/lpe-patternalongpath.cpp:285 -#, fuzzy msgid "Change the width" -msgstr "Modifier l'épaisseur du contour" +msgstr "Modifier la largeur" #: ../src/live_effects/lpe-bounding-box.cpp:24 #: ../src/live_effects/lpe-clone-original.cpp:18 @@ -9682,9 +9711,8 @@ msgid "Path from which to take the original path data" msgstr "Chemin à partir duquel le chemin original sera cloné" #: ../src/live_effects/lpe-bounding-box.cpp:25 -#, fuzzy msgid "Visual Bounds" -msgstr "Boîte englobante visuelle" +msgstr "Limites visuelles" #: ../src/live_effects/lpe-bounding-box.cpp:25 msgid "Uses the visual bounding box" @@ -9692,11 +9720,11 @@ msgstr "Utilise la boîte englobante visuelle" #: ../src/live_effects/lpe-bspline.cpp:30 msgid "Steps with CTRL:" -msgstr "" +msgstr "Étapes avec Ctrl :" #: ../src/live_effects/lpe-bspline.cpp:30 msgid "Change number of steps with CTRL pressed" -msgstr "" +msgstr "Modifier le nombre d'étapes avec Ctrl enfoncé" #: ../src/live_effects/lpe-bspline.cpp:31 #: ../src/live_effects/lpe-simplify.cpp:33 @@ -9711,11 +9739,11 @@ msgstr "Taille de la poignée" #: ../src/live_effects/lpe-bspline.cpp:32 msgid "Apply changes if weight = 0%" -msgstr "" +msgstr "Appliquer les modifications si le poids = 0 %" #: ../src/live_effects/lpe-bspline.cpp:33 msgid "Apply changes if weight > 0%" -msgstr "" +msgstr "Appliquer les modifications si le poids > 0 %" #: ../src/live_effects/lpe-bspline.cpp:34 #: ../src/live_effects/lpe-fillet-chamfer.cpp:56 @@ -9723,34 +9751,28 @@ msgid "Change only selected nodes" msgstr "Modifier les nœuds sélectionnés seulement" #: ../src/live_effects/lpe-bspline.cpp:35 -#, fuzzy msgid "Change weight %:" -msgstr "Hauteur de capitale :" +msgstr "Modifier le poids en % :" #: ../src/live_effects/lpe-bspline.cpp:35 -#, fuzzy msgid "Change weight percent of the effect" -msgstr "Hauteur de la zone d'action du filtre" +msgstr "Modifier le poids de l'effet en pourcentage" #: ../src/live_effects/lpe-bspline.cpp:99 -#, fuzzy msgid "Default weight" -msgstr "Titre par défaut" +msgstr "Poids par défaut" #: ../src/live_effects/lpe-bspline.cpp:104 -#, fuzzy msgid "Make cusp" -msgstr "Transformer en étoile" +msgstr "Créer une pointe" #: ../src/live_effects/lpe-bspline.cpp:148 -#, fuzzy msgid "Change to default weight" -msgstr "Titre par défaut" +msgstr "Affecter le poids par défaut" #: ../src/live_effects/lpe-bspline.cpp:154 -#, fuzzy msgid "Change to 0 weight" -msgstr "Hauteur de capitale :" +msgstr "Affecter un poids de 0" #: ../src/live_effects/lpe-bspline.cpp:160 #: ../src/live_effects/lpe-fillet-chamfer.cpp:240 @@ -9841,20 +9863,20 @@ msgstr "" #: ../src/live_effects/lpe-curvestitch.cpp:47 msgid "Scale _width:" -msgstr "R_edimensionner l'épaisseur :" +msgstr "R_edimensionner la largeur :" #: ../src/live_effects/lpe-curvestitch.cpp:47 msgid "Scale the width of the stitch path" -msgstr "Redimensionne l'épaisseur du chemin de liaison" +msgstr "Redimensionner la largeur du chemin de liaison" #: ../src/live_effects/lpe-curvestitch.cpp:48 msgid "Scale _width relative to length" -msgstr "R_edimensionner l'épaisseur en fonction de la longueur" +msgstr "R_edimensionner la largeur en fonction de la longueur" #: ../src/live_effects/lpe-curvestitch.cpp:48 msgid "Scale the width of the stitch path relative to its length" msgstr "" -"Redimensionner l'épaisseur du chemin de liaison proportionnellement à sa " +"Redimensionner la largeur du chemin de liaison proportionnellement à sa " "longueur" #: ../src/live_effects/lpe-ellipse_5pts.cpp:77 @@ -9862,9 +9884,8 @@ msgid "Five points required for constructing an ellipse" msgstr "Cinq points sont nécessaires à la construction d'une ellipse" #: ../src/live_effects/lpe-ellipse_5pts.cpp:162 -#, fuzzy msgid "No ellipse found for specified points" -msgstr "Le fichier spécifié ne contient aucune donnée de bord." +msgstr "Aucune ellipse trouvée pour les points indiqués" #: ../src/live_effects/lpe-envelope.cpp:31 msgid "Top bend path:" @@ -9903,9 +9924,8 @@ msgstr "" "Chemin gauche de l'enveloppe le long duquel le chemin original sera courbé" #: ../src/live_effects/lpe-envelope.cpp:35 -#, fuzzy msgid "_Enable left & right paths" -msgstr "Utiliser les chemi_ns gauche et droit" +msgstr "Utilis_er les chemins gauche & droit" #: ../src/live_effects/lpe-envelope.cpp:35 msgid "Enable the left and right deformation paths" @@ -9913,7 +9933,7 @@ msgstr "Utiliser les chemins gauche et droit de l'enveloppe" #: ../src/live_effects/lpe-envelope.cpp:36 msgid "_Enable top & bottom paths" -msgstr "Utiliser les ch_emins supérieur et inférieur" +msgstr "Utilis_er les chemins supérieur & inférieur" #: ../src/live_effects/lpe-envelope.cpp:36 msgid "Enable the top and bottom deformation paths" @@ -9928,27 +9948,24 @@ msgid "Defines the direction and magnitude of the extrusion" msgstr "Définit la direction et l'amplitude de l'extrusion" #: ../src/live_effects/lpe-fill-between-many.cpp:25 -#, fuzzy msgid "Paths from which to take the original path data" -msgstr "Chemin à partir duquel le chemin original sera cloné" +msgstr "Chemins à partir desquels prendre les données de chemin originales" #: ../src/live_effects/lpe-fill-between-strokes.cpp:24 msgid "Second path:" msgstr "Deuxième chemin :" #: ../src/live_effects/lpe-fill-between-strokes.cpp:24 -#, fuzzy msgid "Second path from which to take the original path data" -msgstr "Second chemin à partir duquel le chemin original sera cloné" +msgstr "Second chemin à partir duquel prendre les données de chemin originales" #: ../src/live_effects/lpe-fill-between-strokes.cpp:25 msgid "Reverse Second" msgstr "Inverser le second chemin" #: ../src/live_effects/lpe-fill-between-strokes.cpp:25 -#, fuzzy msgid "Reverses the second path order" -msgstr "Inverser la direction du dégradé" +msgstr "Inverse l'ordre du second chemin" #: ../src/live_effects/lpe-fillet-chamfer.cpp:41 #: ../src/widgets/text-toolbar.cpp:1788 @@ -10006,7 +10023,7 @@ msgstr "Marches de chanfrein :" #: ../src/live_effects/lpe-fillet-chamfer.cpp:61 msgid "Chamfer steps" -msgstr "Marches de chanfrein :" +msgstr "Marches de chanfrein" #: ../src/live_effects/lpe-fillet-chamfer.cpp:63 msgid "Helper size with direction:" @@ -10018,11 +10035,11 @@ msgstr "Taille du marquage de direction" #: ../src/live_effects/lpe-fillet-chamfer.cpp:103 msgid "IMPORTANT! New version soon..." -msgstr "" +msgstr "IMPORTANT ! Bientôt une nouvelle version..." #: ../src/live_effects/lpe-fillet-chamfer.cpp:107 msgid "Not compatible. Convert to path after." -msgstr "" +msgstr "Incompatible. Convertissez en chemin après." #: ../src/live_effects/lpe-fillet-chamfer.cpp:165 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:72 @@ -10045,15 +10062,13 @@ msgid "Inverse chamfer" msgstr "Chanfrein inversé" #: ../src/live_effects/lpe-fillet-chamfer.cpp:247 -#, fuzzy msgid "Convert to fillet" -msgstr "Convertir en Braille" +msgstr "Convertir en listel" #: ../src/live_effects/lpe-fillet-chamfer.cpp:254 #: ../src/live_effects/lpe-fillet-chamfer.cpp:278 -#, fuzzy msgid "Convert to inverse fillet" -msgstr "Convertir en Braille" +msgstr "Convertir en listel inversé" #: ../src/live_effects/lpe-fillet-chamfer.cpp:270 msgid "Convert to chamfer" @@ -10061,7 +10076,7 @@ msgstr "Convertir en chanfrein" #: ../src/live_effects/lpe-fillet-chamfer.cpp:290 msgid "Knots and helper paths refreshed" -msgstr "" +msgstr "Nœuds et chemin adjoints actualisés" #: ../src/live_effects/lpe-gears.cpp:214 msgid "_Teeth:" @@ -10169,9 +10184,8 @@ msgid "Miter" msgstr "Raccordé" #: ../src/live_effects/lpe-jointype.cpp:34 -#, fuzzy msgid "Miter Clip" -msgstr "Limite du raccord :" +msgstr "Limite du raccord" #. {LINEJOIN_EXTRP_MITER, N_("Extrapolated"), "extrapolated"}, // disabled because doesn't work well #: ../src/live_effects/lpe-jointype.cpp:35 @@ -10180,19 +10194,16 @@ msgid "Extrapolated arc" msgstr "Arc extrapolé" #: ../src/live_effects/lpe-jointype.cpp:36 -#, fuzzy msgid "Extrapolated arc Alt1" -msgstr "Arc extrapolé" +msgstr "Arc extrapolé Alt1" #: ../src/live_effects/lpe-jointype.cpp:37 -#, fuzzy msgid "Extrapolated arc Alt2" -msgstr "Arc extrapolé" +msgstr "Arc extrapolé Alt2" #: ../src/live_effects/lpe-jointype.cpp:38 -#, fuzzy msgid "Extrapolated arc Alt3" -msgstr "Arc extrapolé" +msgstr "Arc extrapolé Alt3" #: ../src/live_effects/lpe-jointype.cpp:42 #: ../src/live_effects/lpe-powerstroke.cpp:149 @@ -10214,14 +10225,12 @@ msgid "Thickness of the stroke" msgstr "Épaisseur du contour" #: ../src/live_effects/lpe-jointype.cpp:55 -#, fuzzy msgid "Line cap" -msgstr "Linéaire" +msgstr "Couvercle de la ligne" #: ../src/live_effects/lpe-jointype.cpp:55 -#, fuzzy msgid "The end shape of the stroke" -msgstr "Orientation de la règle" +msgstr "La forme de fin du contour" #. Join type #. TRANSLATORS: The line join style specifies the shape to be used at the @@ -10246,18 +10255,16 @@ msgid "Miter limit:" msgstr "Limite du raccord :" #: ../src/live_effects/lpe-jointype.cpp:59 -#, fuzzy msgid "Maximum length of the miter join (in units of stroke width)" msgstr "Longueur maximum du raccord (en unités de l'épaisseur du contour)" #: ../src/live_effects/lpe-jointype.cpp:60 -#, fuzzy msgid "Force miter" -msgstr "Force" +msgstr "Forcer le raccord" #: ../src/live_effects/lpe-jointype.cpp:60 msgid "Overrides the miter limit and forces a join." -msgstr "" +msgstr "Ignore la limite du raccord et force la jointure." #. initialise your parameters here: #: ../src/live_effects/lpe-knot.cpp:350 @@ -10296,13 +10303,11 @@ msgstr "Ajoute l'épaisseur du trait croisé à la taille de l'interruption" #: ../src/live_effects/lpe-knot.cpp:354 msgid "S_witcher size:" -msgstr "Taille du sé_lecteur :" +msgstr "Taille du co_mmutateur :" #: ../src/live_effects/lpe-knot.cpp:354 msgid "Orientation indicator/switcher size" -msgstr "" -"Le sélecteur précise l'orientation des croisements et permet de la changer " -"(clic). Changer la sélection par cliquer-déplacer" +msgstr "Indicateur d'orientation/taille du commutateur" #: ../src/live_effects/lpe-knot.cpp:355 msgid "Crossing Signs" @@ -10323,19 +10328,17 @@ msgstr "Modifier le croisement de l'entrelacs" #: ../src/live_effects/lpe-lattice2.cpp:47 #: ../src/live_effects/lpe-perspective-envelope.cpp:43 -#, fuzzy msgid "Mirror movements in horizontal" -msgstr "Déplacer les nœuds horizontalement" +msgstr "Copier les mouvements en miroir horizontal" #: ../src/live_effects/lpe-lattice2.cpp:48 #: ../src/live_effects/lpe-perspective-envelope.cpp:44 -#, fuzzy msgid "Mirror movements in vertical" -msgstr "Déplacer les nœuds verticalement" +msgstr "Copier les mouvements en miroir vertical" #: ../src/live_effects/lpe-lattice2.cpp:49 msgid "Update while moving knots (maybe slow)" -msgstr "" +msgstr "Mettre à jour pendant le déplacement des nœuds (peut ralentir)" #: ../src/live_effects/lpe-lattice2.cpp:50 msgid "Control 0:" @@ -10344,8 +10347,8 @@ msgstr "Contrôle 0 :" #: ../src/live_effects/lpe-lattice2.cpp:50 msgid "Control 0 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 0 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +"Contrôle 0 — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer le " +"long des axes" #: ../src/live_effects/lpe-lattice2.cpp:51 msgid "Control 1:" @@ -10354,8 +10357,8 @@ msgstr "Contrôle 1 :" #: ../src/live_effects/lpe-lattice2.cpp:51 msgid "Control 1 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 1 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +"Contrôle 1 — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer le " +"long des axes" #: ../src/live_effects/lpe-lattice2.cpp:52 msgid "Control 2:" @@ -10364,8 +10367,8 @@ msgstr "Contrôle 2 :" #: ../src/live_effects/lpe-lattice2.cpp:52 msgid "Control 2 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 2 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +"Contrôle 2 — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer le " +"long des axes" #: ../src/live_effects/lpe-lattice2.cpp:53 msgid "Control 3:" @@ -10374,8 +10377,8 @@ msgstr "Contrôle 3 :" #: ../src/live_effects/lpe-lattice2.cpp:53 msgid "Control 3 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 3 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +"Contrôle 3 — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer le " +"long des axes" #: ../src/live_effects/lpe-lattice2.cpp:54 msgid "Control 4:" @@ -10384,8 +10387,8 @@ msgstr "Contrôle 4 :" #: ../src/live_effects/lpe-lattice2.cpp:54 msgid "Control 4 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 4 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +"Contrôle 4 — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer le " +"long des axes" #: ../src/live_effects/lpe-lattice2.cpp:55 msgid "Control 5:" @@ -10394,8 +10397,8 @@ msgstr "Contrôle 5 :" #: ../src/live_effects/lpe-lattice2.cpp:55 msgid "Control 5 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 5 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +"Contrôle 5 — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer le " +"long des axes" #: ../src/live_effects/lpe-lattice2.cpp:56 msgid "Control 6:" @@ -10404,8 +10407,8 @@ msgstr "Contrôle 6 :" #: ../src/live_effects/lpe-lattice2.cpp:56 msgid "Control 6 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 6 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +"Contrôle 6 — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer le " +"long des axes" #: ../src/live_effects/lpe-lattice2.cpp:57 msgid "Control 7:" @@ -10414,8 +10417,8 @@ msgstr "Contrôle 7 :" #: ../src/live_effects/lpe-lattice2.cpp:57 msgid "Control 7 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 7 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +"Contrôle 7 — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer le " +"long des axes" #: ../src/live_effects/lpe-lattice2.cpp:58 msgid "Control 8x9:" @@ -10425,8 +10428,8 @@ msgstr "Contrôle 8x9 :" msgid "" "Control 8x9 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 8x9 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +"Contrôle 8x9 — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer " +"le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:59 msgid "Control 10x11:" @@ -10436,7 +10439,7 @@ msgstr "Contrôle 10x11 :" msgid "" "Control 10x11 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 10x11 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " +"Contrôle 10x11 — Ctrl+Alt+clic : réinitialiser, Ctrl : " "déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:60 @@ -10446,8 +10449,8 @@ msgstr "Contrôle 12 :" #: ../src/live_effects/lpe-lattice2.cpp:60 msgid "Control 12 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 12 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +"Contrôle 12 — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer " +"le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:61 msgid "Control 13:" @@ -10456,8 +10459,8 @@ msgstr "Contrôle 13 :" #: ../src/live_effects/lpe-lattice2.cpp:61 msgid "Control 13 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 13 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +"Contrôle 13 — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer " +"le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:62 msgid "Control 14:" @@ -10466,8 +10469,8 @@ msgstr "Contrôle 14 :" #: ../src/live_effects/lpe-lattice2.cpp:62 msgid "Control 14 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 14 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +"Contrôle 14 — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer " +"le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:63 msgid "Control 15:" @@ -10476,8 +10479,8 @@ msgstr "Contrôle 15 :" #: ../src/live_effects/lpe-lattice2.cpp:63 msgid "Control 15 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 15 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +"Contrôle 15 — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer " +"le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:64 msgid "Control 16:" @@ -10486,8 +10489,8 @@ msgstr "Contrôle 16 :" #: ../src/live_effects/lpe-lattice2.cpp:64 msgid "Control 16 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 16 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +"Contrôle 16 — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer " +"le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:65 msgid "Control 17:" @@ -10496,8 +10499,8 @@ msgstr "Contrôle 17 :" #: ../src/live_effects/lpe-lattice2.cpp:65 msgid "Control 17 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 17 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +"Contrôle 17 — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer " +"le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:66 msgid "Control 18:" @@ -10506,8 +10509,8 @@ msgstr "Contrôle 18 :" #: ../src/live_effects/lpe-lattice2.cpp:66 msgid "Control 18 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 18 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +"Contrôle 18 — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer " +"le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:67 msgid "Control 19:" @@ -10516,8 +10519,8 @@ msgstr "Contrôle 19 :" #: ../src/live_effects/lpe-lattice2.cpp:67 msgid "Control 19 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 19 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +"Contrôle 19 — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer " +"le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:68 msgid "Control 20x21:" @@ -10527,7 +10530,7 @@ msgstr "Contrôle 20x21 :" msgid "" "Control 20x21 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 20x21 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " +"Contrôle 20x21 — Ctrl+Alt+clic : réinitialiser, Ctrl : " "déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:69 @@ -10538,7 +10541,7 @@ msgstr "Contrôle 22x23 :" msgid "" "Control 22x23 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 22x23 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " +"Contrôle 22x23 — Ctrl+Alt+clic : réinitialiser, Ctrl : " "déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:70 @@ -10549,7 +10552,7 @@ msgstr "Contrôle 24x26 :" msgid "" "Control 24x26 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 24x26 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " +"Contrôle 24x26 — Ctrl+Alt+clic : réinitialiser, Ctrl : " "déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:71 @@ -10560,7 +10563,7 @@ msgstr "Contrôle 25x27 :" msgid "" "Control 25x27 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 25x27 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " +"Contrôle 25x27 — Ctrl+Alt+clic : réinitialiser, Ctrl : " "déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:72 @@ -10571,7 +10574,7 @@ msgstr "Contrôle 28x30 :" msgid "" "Control 28x30 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 28x30 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " +"Contrôle 28x30 — Ctrl+Alt+clic : réinitialiser, Ctrl : " "déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:73 @@ -10582,7 +10585,7 @@ msgstr "Contrôle 29x31 :" msgid "" "Control 29x31 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -"Contrôle 29x31 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " +"Contrôle 29x31 — Ctrl+Alt+clic : réinitialiser, Ctrl : " "déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:74 @@ -10594,8 +10597,8 @@ msgid "" "Control 32x33x34x35 - Ctrl+Alt+Click: reset, Ctrl: move along " "axes" msgstr "" -"Contrôle 32x33x34x35 - Ctrl+Alt+clic pour réinitialiser, Ctrl " -"pour déplacer le long des axes" +"Contrôle 32x33x34x35 — Ctrl+Alt+clic : réinitialiser, Ctrl : " +"déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:239 msgid "Reset grid" @@ -10669,7 +10672,7 @@ msgid "" "limited to -90% of pattern width." msgstr "" "Espace entre les exemplaires du motif. Les valeurs négatives sont " -"autorisées, mais limitées à -90 % de la largeur du motif." +"autorisées, mais limitées à -90 % de la largeur du motif." #: ../src/live_effects/lpe-patternalongpath.cpp:84 msgid "No_rmal offset:" @@ -10719,9 +10722,8 @@ msgid "Envelope deformation" msgstr "Déformation par enveloppe" #: ../src/live_effects/lpe-perspective-envelope.cpp:45 -#, fuzzy msgid "Overflow perspective" -msgstr "Perspective" +msgstr "Perspective du débordement" #: ../src/live_effects/lpe-perspective-envelope.cpp:46 msgid "Type" @@ -10738,6 +10740,8 @@ msgstr "Haut et gauche" #: ../src/live_effects/lpe-perspective-envelope.cpp:47 msgid "Top Left - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" +"Haut-gauche — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer " +"le long des axes" #: ../src/live_effects/lpe-perspective-envelope.cpp:48 msgid "Top Right" @@ -10746,6 +10750,8 @@ msgstr "Haut et droite" #: ../src/live_effects/lpe-perspective-envelope.cpp:48 msgid "Top Right - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" +"Haut-droite — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer " +"le long des axes" #: ../src/live_effects/lpe-perspective-envelope.cpp:49 msgid "Down Left" @@ -10754,6 +10760,8 @@ msgstr "Bas et gauche" #: ../src/live_effects/lpe-perspective-envelope.cpp:49 msgid "Down Left - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" +"Bas-gauche — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer le " +"long des axes" #: ../src/live_effects/lpe-perspective-envelope.cpp:50 msgid "Down Right" @@ -10762,15 +10770,16 @@ msgstr "Bas et droite" #: ../src/live_effects/lpe-perspective-envelope.cpp:50 msgid "Down Right - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" +"Bas-droite — Ctrl+Alt+clic : réinitialiser, Ctrl : déplacer le " +"long des axes" #: ../src/live_effects/lpe-perspective-envelope.cpp:367 msgid "Handles:" msgstr "Poignées :" #: ../src/live_effects/lpe-powerstroke.cpp:132 -#, fuzzy msgid "CubicBezierSmooth" -msgstr "CubicBezierJohan" +msgstr "CubicBezierLisse" #: ../src/live_effects/lpe-powerstroke.cpp:151 #: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:13 @@ -10788,7 +10797,7 @@ msgstr "Spiro" #: ../src/live_effects/lpe-powerstroke.cpp:177 msgid "Offset points" -msgstr "Points d'offset" +msgstr "Points de transformation" #: ../src/live_effects/lpe-powerstroke.cpp:178 msgid "Sort points" @@ -10797,8 +10806,8 @@ msgstr "Trier les points" #: ../src/live_effects/lpe-powerstroke.cpp:178 msgid "Sort offset points according to their time value along the curve" msgstr "" -"Trie les points de décalage en fonction de leur valeur temps le long de la " -"courbe" +"Trie les points de transformation en fonction de leur valeur temps le long " +"de la courbe" #: ../src/live_effects/lpe-powerstroke.cpp:180 #: ../share/extensions/fractalize.inx.h:3 @@ -11095,30 +11104,30 @@ msgid "Fixed displacement, 1/3 of segment length" msgstr "Déplacement fixé à 1/3 de la longueur de segment" #: ../src/live_effects/lpe-roughen.cpp:67 -#, fuzzy msgid "Spray Tool friendly" -msgstr "Préférences de l'outil aérographe" +msgstr "Outil aérographe avec sympathie" #: ../src/live_effects/lpe-roughen.cpp:67 -#, fuzzy msgid "For use with spray tool in copy mode" -msgstr "Pour utiliser avec l'outil aérographe" +msgstr "Pour utiliser avec l'outil aérographe en mode copie" #: ../src/live_effects/lpe-roughen.cpp:121 msgid "Add nodes Subdivide each segment" -msgstr "" +msgstr "Ajouter des nœuds Subdiviser chaque segment" #: ../src/live_effects/lpe-roughen.cpp:130 msgid "Jitter nodes Move nodes/handles" -msgstr "" +msgstr "Éparpiller les nœuds Déplacer les nœuds/poignées" #: ../src/live_effects/lpe-roughen.cpp:139 msgid "Extra roughen Add a extra layer of rough" msgstr "" +"Ajouter du grain supplémentaire Ajouter une couche supplémentaire de " +"grain" #: ../src/live_effects/lpe-roughen.cpp:148 msgid "Options Modify options to rough" -msgstr "" +msgstr "Options Modifier les options du grain" #: ../src/live_effects/lpe-ruler.cpp:25 ../share/extensions/measure.inx.h:27 #: ../share/extensions/restack.inx.h:16 @@ -11244,9 +11253,8 @@ msgid "Show path" msgstr "Afficher le chemin" #: ../src/live_effects/lpe-show_handles.cpp:28 -#, fuzzy msgid "Scale nodes and handles" -msgstr "Aimanter aux nœuds, chemins et poignées" +msgstr "Changer l'échelle des nœuds et poignées" #: ../src/live_effects/lpe-show_handles.cpp:29 #: ../src/ui/tool/multi-path-manipulator.cpp:788 @@ -11259,49 +11267,46 @@ msgid "" "The \"show handles\" path effect will remove any custom style on the object " "you are applying it to. If this is not what you want, click Cancel." msgstr "" +"L'effet de chemin « Afficher les poignées » supprimera tout style " +"personnalisé sur l'objet auquel vous l'appliquez. Si ce n'est pas ce que " +"vous souhaitez, annulez." #: ../src/live_effects/lpe-simplify.cpp:30 msgid "Steps:" msgstr "Incréments :" #: ../src/live_effects/lpe-simplify.cpp:30 -#, fuzzy msgid "Change number of simplify steps " -msgstr "Étoile : modifier le nombre de sommets" +msgstr "Modifier le nombre d'étapes de simplification" #: ../src/live_effects/lpe-simplify.cpp:31 -#, fuzzy msgid "Roughly threshold:" -msgstr "Seuil :" +msgstr "Seuil approximatif :" #: ../src/live_effects/lpe-simplify.cpp:32 -#, fuzzy msgid "Smooth angles:" -msgstr "Lissage :" +msgstr "Angles doux :" #: ../src/live_effects/lpe-simplify.cpp:32 msgid "Max degree difference on handles to perform a smooth" msgstr "" +"Différence de degrés maximale sur les poignées pour effectuer un lissage" #: ../src/live_effects/lpe-simplify.cpp:34 -#, fuzzy msgid "Paths separately" -msgstr "Coller les dimensions séparément" +msgstr "Chemins séparément" #: ../src/live_effects/lpe-simplify.cpp:34 -#, fuzzy msgid "Simplifying paths (separately)" -msgstr "Simplification individuelle des chemins" +msgstr "Simplification des chemins (séparément)" #: ../src/live_effects/lpe-simplify.cpp:36 -#, fuzzy msgid "Just coalesce" -msgstr "vérifier seulement les outils" +msgstr "Juste l'union" #: ../src/live_effects/lpe-simplify.cpp:36 -#, fuzzy msgid "Simplify just coalesce" -msgstr "Simplifier les couleurs" +msgstr "Ne simplifier que l'union" #. initialise your parameters here: #. testpointA(_("Test Point A"), _("Test A"), "ptA", &wr, this, Geom::Point(100,100)), @@ -11396,7 +11401,7 @@ msgstr "Nombre de lignes de construction (tangentes) à dessiner" #: ../src/ui/dialog/filter-effects-dialog.cpp:2918 #: ../share/extensions/render_alphabetsoup.inx.h:3 msgid "Scale:" -msgstr "Longueur/Courbure :" +msgstr "Échelle :" #: ../src/live_effects/lpe-sketch.cpp:59 msgid "" @@ -11458,98 +11463,82 @@ msgid "Stroke width:" msgstr "Épaisseur du contour :" #: ../src/live_effects/lpe-taperstroke.cpp:73 -#, fuzzy msgid "The (non-tapered) width of the path" -msgstr "Redimensionne l'épaisseur du chemin de liaison" +msgstr "L'épaisseur du chemin (non effilé)" #: ../src/live_effects/lpe-taperstroke.cpp:74 -#, fuzzy msgid "Start offset:" -msgstr "Décalage du chemin de texte" +msgstr "Position de départ :" #: ../src/live_effects/lpe-taperstroke.cpp:74 msgid "Taper distance from path start" -msgstr "" +msgstr "Distance d'effilage à partir du début du chemin" #: ../src/live_effects/lpe-taperstroke.cpp:75 -#, fuzzy msgid "End offset:" -msgstr "Décalage rouge" +msgstr "Position de fin :" #: ../src/live_effects/lpe-taperstroke.cpp:75 -#, fuzzy msgid "The ending position of the taper" -msgstr "Utiliser les dimensions et position enregistrées du pavage" +msgstr "La position de fin de l'effilage" #: ../src/live_effects/lpe-taperstroke.cpp:76 -#, fuzzy msgid "Taper smoothing:" -msgstr "Lissage :" +msgstr "Lissage de l'effilage :" #: ../src/live_effects/lpe-taperstroke.cpp:76 msgid "Amount of smoothing to apply to the tapers" -msgstr "" +msgstr "Quantité de lissage à appliquer aux effilages" #: ../src/live_effects/lpe-taperstroke.cpp:77 -#, fuzzy msgid "Join type:" -msgstr "Type de ligne : " +msgstr "Type de jointure : " #: ../src/live_effects/lpe-taperstroke.cpp:77 -#, fuzzy msgid "Join type for non-smooth nodes" -msgstr "Aimanter aux nœuds doux" +msgstr "Type de jointure pour les nœuds non doux" #: ../src/live_effects/lpe-taperstroke.cpp:78 msgid "Limit for miter joins" -msgstr "" +msgstr "Limite pour les jointures en onglet" #: ../src/live_effects/lpe-taperstroke.cpp:447 msgid "Start point of the taper" -msgstr "" +msgstr "Point de départ de l'effilage" #: ../src/live_effects/lpe-taperstroke.cpp:451 -#, fuzzy msgid "End point of the taper" -msgstr "Unité de mesure de la règle" +msgstr "Point d'arrivée de l'effilage" #: ../src/live_effects/lpe-transform_2pts.cpp:31 -#, fuzzy msgid "Elastic" -msgstr "Pâte à modeler" +msgstr "Élastique" #: ../src/live_effects/lpe-transform_2pts.cpp:31 -#, fuzzy msgid "Elastic transform mode" -msgstr "Sélectionner et transformer des objets" +msgstr "Mode de transformation élastique" #: ../src/live_effects/lpe-transform_2pts.cpp:32 -#, fuzzy msgid "From original width" -msgstr "Cloner le chemin original" +msgstr "Depuis l'épaisseur originale" #: ../src/live_effects/lpe-transform_2pts.cpp:33 -#, fuzzy msgid "Lock length" -msgstr "Verrouiller le calque" +msgstr "Verrouiller la longueur" #: ../src/live_effects/lpe-transform_2pts.cpp:33 -#, fuzzy msgid "Lock length to current distance" -msgstr "Verrouiller ou libérer le calque courant" +msgstr "Verrouiller la longueur à la distance actuelle" #: ../src/live_effects/lpe-transform_2pts.cpp:34 -#, fuzzy msgid "Lock angle" -msgstr "Angle du cône" +msgstr "Verrouiller l'angle" #: ../src/live_effects/lpe-transform_2pts.cpp:35 -#, fuzzy msgid "Flip horizontal" msgstr "Retourner horizontalement" #: ../src/live_effects/lpe-transform_2pts.cpp:36 -#, fuzzy msgid "Flip vertical" msgstr "Retourner verticalement" @@ -11562,39 +11551,32 @@ msgid "End point" msgstr "Point final" #: ../src/live_effects/lpe-transform_2pts.cpp:39 -#, fuzzy msgid "Stretch" -msgstr "Force" +msgstr "Étirer" #: ../src/live_effects/lpe-transform_2pts.cpp:39 -#, fuzzy msgid "Stretch the result" msgstr "Étirer le résultat" #: ../src/live_effects/lpe-transform_2pts.cpp:40 -#, fuzzy msgid "Offset from knots" -msgstr "Points d'offset" +msgstr "Décalage depuis les nœuds" #: ../src/live_effects/lpe-transform_2pts.cpp:41 -#, fuzzy msgid "First Knot" -msgstr "Premiers secours" +msgstr "Premier nœud" #: ../src/live_effects/lpe-transform_2pts.cpp:42 -#, fuzzy msgid "Last Knot" -msgstr "Entrelacs" +msgstr "Dernier nœud" #: ../src/live_effects/lpe-transform_2pts.cpp:43 -#, fuzzy msgid "Rotation helper size" -msgstr "Centres de rotation" +msgstr "Taille de la rotation" #: ../src/live_effects/lpe-transform_2pts.cpp:196 -#, fuzzy msgid "Change index of knot" -msgstr "Modifier le type de nœud" +msgstr "Modifier l'index du nœud" #: ../src/live_effects/lpe-transform_2pts.cpp:349 #: ../src/ui/dialog/inkscape-preferences.cpp:1623 @@ -11681,6 +11663,8 @@ msgid "" "Chamfer: Ctrl+Click toggle type, Shift+Click open " "dialog, Ctrl+Alt+Click reset" msgstr "" +"Chanfrein : Ctrl+clic change le type, Maj+clic ouvre la " +"boîte de dialogue, Ctrl+Alt+clic réinitialise" #: ../src/live_effects/parameter/filletchamferpointarray.cpp:782 #: ../src/live_effects/parameter/filletchamferpointarray.cpp:843 @@ -11688,6 +11672,8 @@ msgid "" "Inverse Chamfer: Ctrl+Click toggle type, Shift+Click " "open dialog, Ctrl+Alt+Click reset" msgstr "" +"Chanfrein inverse : Ctrl+clic change le type, Maj+clic " +"ouvre la boîte de dialogue, Ctrl+Alt+clic réinitialise" #: ../src/live_effects/parameter/filletchamferpointarray.cpp:786 #: ../src/live_effects/parameter/filletchamferpointarray.cpp:847 @@ -11695,6 +11681,8 @@ msgid "" "Inverse Fillet: Ctrl+Click toggle type, Shift+Click " "open dialog, Ctrl+Alt+Click reset" msgstr "" +"Listel inverse : Ctrl+clic change le type, Maj+clic " +"ouvre la boîte de dialogue, Ctrl+Alt+clic réinitialise" #: ../src/live_effects/parameter/filletchamferpointarray.cpp:790 #: ../src/live_effects/parameter/filletchamferpointarray.cpp:851 @@ -11702,6 +11690,8 @@ msgid "" "Fillet: Ctrl+Click toggle type, Shift+Click open " "dialog, Ctrl+Alt+Click reset" msgstr "" +"Listel : Ctrl+clic change le type, Maj+clic ouvre la " +"boîte de dialogue, Ctrl+Alt+clic réinitialise" #: ../src/live_effects/parameter/originalpath.cpp:67 #: ../src/live_effects/parameter/originalpatharray.cpp:155 @@ -11724,36 +11714,30 @@ msgid "Link path parameter to path" msgstr "Lier les paramètres de chemin au chemin" #: ../src/live_effects/parameter/originalpatharray.cpp:167 -#, fuzzy msgid "Remove Path" -msgstr "_Retirer du chemin" +msgstr "Supprimer le chemin" #: ../src/live_effects/parameter/originalpatharray.cpp:179 #: ../src/ui/dialog/objects.cpp:1854 -#, fuzzy msgid "Move Down" -msgstr "Mode déplacement" +msgstr "Descendre" #: ../src/live_effects/parameter/originalpatharray.cpp:191 #: ../src/ui/dialog/objects.cpp:1862 -#, fuzzy msgid "Move Up" -msgstr "Déplacer le chemin" +msgstr "Monter" #: ../src/live_effects/parameter/originalpatharray.cpp:231 -#, fuzzy msgid "Move path up" -msgstr "Déplacer le chemin" +msgstr "Monter le chemin" #: ../src/live_effects/parameter/originalpatharray.cpp:261 -#, fuzzy msgid "Move path down" -msgstr "Descendre l'effet de chemin" +msgstr "Descendre le chemin" #: ../src/live_effects/parameter/originalpatharray.cpp:279 -#, fuzzy msgid "Remove path" -msgstr "Déplacer le chemin" +msgstr "Supprimer le chemin" #: ../src/live_effects/parameter/path.cpp:170 msgid "Edit on-canvas" @@ -11781,15 +11765,15 @@ msgstr "Modifier le paramètre de point" #: ../src/live_effects/parameter/powerstrokepointarray.cpp:239 #: ../src/live_effects/parameter/powerstrokepointarray.cpp:256 -#, fuzzy msgid "" "Stroke width control point: drag to alter the stroke width. Ctrl" "+click adds a control point, Ctrl+Alt+click deletes it, Shift" "+click launches width dialog." msgstr "" -"point de contrôle de l'épaisseur de contour : cliquer-glisser pour " -"modifier l'épaisseur ; Ctrl+clic ajouter un point de contrôle ; " -"Ctrl+Alt+clic supprime le point de contrôle" +"Point de contrôle de l'épaisseur de contour : cliquer-glisser pour " +"modifier l'épaisseur. Ctrl+clic ajoute un point de contrôle, Ctrl" +"+Alt+clic le supprime, Maj+clic ouvre la boîte de dialogue de " +"l'épaisseur." #: ../src/live_effects/parameter/random.cpp:134 msgid "Change random parameter" @@ -11800,9 +11784,8 @@ msgid "Change text parameter" msgstr "Modifier le paramètre de texte" #: ../src/live_effects/parameter/togglebutton.cpp:112 -#, fuzzy msgid "Change togglebutton parameter" -msgstr "Modifier le paramètre de texte" +msgstr "Modifier le paramètre du bouton-bascule" #: ../src/live_effects/parameter/transformedpoint.cpp:98 #: ../src/live_effects/parameter/vector.cpp:99 @@ -11816,12 +11799,12 @@ msgstr "Modifier le paramètre d'unité" #: ../src/main-cmdlineact.cpp:49 #, c-format msgid "Unable to find verb ID '%s' specified on the command line.\n" -msgstr "Verbe '%s' spécifié sur la ligne de commande introuvable.\n" +msgstr "Verbe « %s » spécifié sur la ligne de commande introuvable.\n" #: ../src/main-cmdlineact.cpp:60 #, c-format msgid "Unable to find node ID: '%s'\n" -msgstr "Impossible de trouver le nœud '%s'\n" +msgstr "Impossible de trouver le nœud « %s »\n" #: ../src/main.cpp:300 msgid "Print the Inkscape version number" @@ -11845,7 +11828,7 @@ msgstr "Ouvrir les document(s) spécifiés (la chaîne d'option peut être exclu #: ../src/main.cpp:398 ../src/main.cpp:403 ../src/main.cpp:408 #: ../src/main.cpp:419 ../src/main.cpp:435 ../src/main.cpp:440 msgid "FILENAME" -msgstr "NOMDEFICHIER" +msgstr "NOM_DE_FICHIER" #: ../src/main.cpp:320 msgid "Print document(s) to specified output file (use '| program' for pipe)" @@ -11858,13 +11841,12 @@ msgid "Export document to a PNG file" msgstr "Exporter le document vers un fichier PNG" #: ../src/main.cpp:330 -#, fuzzy msgid "" "Resolution for exporting to bitmap and for rasterization of filters in PS/" "EPS/PDF (default 96)" msgstr "" -"Résolution pour l'exportation de bitmap et la rastérisation des filtres en " -"PS/EPS/PDS (90 par défaut)" +"Résolution pour l'exportation en matriciel et la rastérisation des filtres " +"en PS/EPS/PDS (96 par défaut)" #: ../src/main.cpp:331 ../src/ui/widget/rendering-options.cpp:37 msgid "DPI" @@ -11905,12 +11887,13 @@ msgid "" "Snap the bitmap export area outwards to the nearest integer values (in SVG " "user units)" msgstr "" -"Ajuster la zone à exporter en bitmap aux valeurs entières supérieures les " -"plus proches (en unités utilisateur SVG)" +"Ajuster la zone à exporter en image matricielle aux valeurs entières " +"supérieures les plus proches (en unités utilisateur SVG)" #: ../src/main.cpp:360 msgid "The width of exported bitmap in pixels (overrides export-dpi)" -msgstr "La largeur en pixels du bitmap exporté (préempte export-dpi)" +msgstr "" +"La largeur en pixels de l'image matricielle exportée (préempte export-dpi)" #: ../src/main.cpp:361 msgid "WIDTH" @@ -11918,7 +11901,8 @@ msgstr "LARGEUR" #: ../src/main.cpp:365 msgid "The height of exported bitmap in pixels (overrides export-dpi)" -msgstr "La hauteur en pixels du bitmap exporté (préempte export-dpi)" +msgstr "" +"La hauteur en pixels de l'image matricielle exportée (préempte export-dpi)" #: ../src/main.cpp:366 msgid "HEIGHT" @@ -11926,12 +11910,12 @@ msgstr "HAUTEUR" #: ../src/main.cpp:370 msgid "The ID of the object to export" -msgstr "L'Id de l'objet à exporter" +msgstr "L'ID de l'objet à exporter" #: ../src/main.cpp:371 ../src/main.cpp:484 #: ../src/ui/dialog/inkscape-preferences.cpp:1569 msgid "ID" -msgstr "Id" +msgstr "ID" #. TRANSLATORS: this means: "Only export the object whose id is given in --export-id". #. See "man inkscape" for details. @@ -11951,8 +11935,8 @@ msgstr "" #: ../src/main.cpp:387 msgid "Background color of exported bitmap (any SVG-supported color string)" msgstr "" -"Couleur de fond du bitmap exporté (n'importe quelle code de couleur permise " -"par SVG)" +"Couleur de fond de l'image matricielle exportée (dans un format accepté par " +"le SVG)" #: ../src/main.cpp:388 msgid "COLOR" @@ -11960,7 +11944,9 @@ msgstr "COULEUR" #: ../src/main.cpp:392 msgid "Background opacity of exported bitmap (either 0.0 to 1.0, or 1 to 255)" -msgstr "Opacité du fond du bitmap exporté (entre 0,0 et 1,0 ou 1 et 255))" +msgstr "" +"Opacité du fond de l'image matricielle exportée (soit entre 0,0 et 1,0 soit " +"entre 1 et 255)" #: ../src/main.cpp:397 msgid "Export document to plain SVG file (no sodipodi or inkscape namespaces)" @@ -11977,7 +11963,6 @@ msgid "Export document to an EPS file" msgstr "Exporter le document en fichier EPS" #: ../src/main.cpp:412 -#, fuzzy msgid "" "Choose the PostScript Level used to export. Possible choices are 2 and 3 " "(the default)" @@ -12001,7 +11986,7 @@ msgid "" msgstr "" "Exporter le PDF dans une version donnée (astuce : assurez-vous que la valeur " "saisie corresponde bien à la chaîne présentée dans la boîte de dialogue " -"d'exportation PDF, par exemple \"PDF 1.4\" - conforme PDF-a)" +"d'exportation PDF, par exemple « PDF 1.4 » — conforme PDF-a)" #: ../src/main.cpp:425 msgid "PDF_VERSION" @@ -12013,7 +11998,7 @@ msgid "" "exported, putting the text on top of the PDF/PS/EPS file. Include the result " "in LaTeX like: \\input{latexfile.tex}" msgstr "" -"Exporte en PDF, PS ou EPS sans texte, celui-ci étant exporté dans un LaTex " +"Exporte en PDF, PS ou EPS sans texte, celui-ci étant exporté dans un LaTeX " "séparé. Le résultat peut être intégré dans LaTeX avec : \\input{latexfile." "tex}" @@ -12078,7 +12063,7 @@ msgstr "Afficher id,x,y,w,h pour tous les objets" #: ../src/main.cpp:483 msgid "The ID of the object whose dimensions are queried" -msgstr "L'Id de l'objet dont les dimensions sont demandées" +msgstr "L'ID de l'objet dont les dimensions sont demandées" #. TRANSLATORS: this option makes Inkscape print the name (path) of the extension directory #: ../src/main.cpp:489 @@ -12103,11 +12088,11 @@ msgstr "" #: ../src/main.cpp:506 msgid "BUS-NAME" -msgstr "" +msgstr "NOM_DE_BUS" #: ../src/main.cpp:511 msgid "List the IDs of all the verbs in Inkscape" -msgstr "Afficher les Ids de tous les verbes d'Inkscape" +msgstr "Afficher les IDs de tous les verbes d'Inkscape" #: ../src/main.cpp:516 msgid "Verb to call when Inkscape opens." @@ -12115,19 +12100,19 @@ msgstr "Verbe sélectionné au démarrage d'Inkscape." #: ../src/main.cpp:517 msgid "VERB-ID" -msgstr "VERB-ID" +msgstr "ID_ACTION" #: ../src/main.cpp:521 msgid "Object ID to select when Inkscape opens." -msgstr "Id de l'objet à sélectionner au démarrage d'Inkscape." +msgstr "ID de l'objet à sélectionner au démarrage d'Inkscape." #: ../src/main.cpp:522 msgid "OBJECT-ID" -msgstr "OBJECT-ID" +msgstr "ID_OBJET" #: ../src/main.cpp:526 msgid "Start Inkscape in interactive shell mode." -msgstr "Démarrer Inkscape en mode de commande interactif." +msgstr "Démarrer Inkscape en mode ligne de commande interactif." #: ../src/main.cpp:876 ../src/main.cpp:1349 msgid "" @@ -12233,7 +12218,7 @@ msgstr "Aid_e" #: ../src/menus-skeleton.h:293 msgid "Tutorials" -msgstr "Didacticiels" +msgstr "_Didacticiels" #: ../src/path-chemistry.cpp:63 msgid "Select object(s) to combine." @@ -12388,25 +12373,25 @@ msgstr "CC Paternité" #: ../src/rdf.cpp:180 msgid "CC Attribution-ShareAlike" -msgstr "CC Paternité - Partage des conditions initiales à l'identique" +msgstr "CC Paternité — Partage dans les mêmes conditions" #: ../src/rdf.cpp:185 msgid "CC Attribution-NoDerivs" -msgstr "CC Paternité - Pas de modification" +msgstr "CC Paternité — Pas de modification" #: ../src/rdf.cpp:190 msgid "CC Attribution-NonCommercial" -msgstr "CC Paternité - Pas d'utilisation commerciale" +msgstr "CC Paternité — Pas d'utilisation commerciale" #: ../src/rdf.cpp:195 msgid "CC Attribution-NonCommercial-ShareAlike" msgstr "" -"CC Paternité - Pas d'utilisation commerciale - Partage des conditions " -"initiales à l'identique" +"CC Paternité — Pas d'utilisation commerciale — Partage dans les mêmes " +"conditions" #: ../src/rdf.cpp:200 msgid "CC Attribution-NonCommercial-NoDerivs" -msgstr "CC Paternité - Pas d'utilisation commerciale - Pas de modification" +msgstr "CC Paternité — Pas d'utilisation commerciale — Pas de modification" #: ../src/rdf.cpp:205 msgid "CC0 Public Domain Dedication" @@ -12609,19 +12594,16 @@ msgid "Group" msgstr "Grouper" #: ../src/selection-chemistry.cpp:798 -#, fuzzy msgid "No objects selected to pop out of group." -msgstr "Aucun objet sélectionné pour en capturer le style." +msgstr "Aucun objet sélectionné à sortir du groupe." #: ../src/selection-chemistry.cpp:808 -#, fuzzy msgid "Selection not in a group." -msgstr "Sélectionner un groupe à dégrouper." +msgstr "La sélection n'est pas dans un groupe." #: ../src/selection-chemistry.cpp:822 -#, fuzzy msgid "Pop selection from group" -msgstr "_Manipuler la sélection comme un groupe :" +msgstr "_Sortir la sélection du groupe" #: ../src/selection-chemistry.cpp:830 msgid "Select a group to ungroup." @@ -12698,7 +12680,7 @@ msgstr "Coller le style" #: ../src/selection-chemistry.cpp:1265 msgid "Paste live path effect" -msgstr "Coller l'effet de chemin en direct" +msgstr "Coller l'effet de chemin interactif" #: ../src/selection-chemistry.cpp:1287 msgid "Select object(s) to remove live path effects from." @@ -12708,7 +12690,7 @@ msgstr "" #: ../src/selection-chemistry.cpp:1299 msgid "Remove live path effect" -msgstr "Supprimer l'effet de chemin en direct" +msgstr "Supprimer l'effet de chemin interactif" #: ../src/selection-chemistry.cpp:1310 msgid "Select object(s) to remove filters from." @@ -12866,7 +12848,7 @@ msgid "" "a flowed text to go to its frame." msgstr "" "Sélectionner un clone pour sélectionner son original. Sélectionner un " -"offset lié pour sélectionner sa source. Sélectionner un texte " +"décalage lié pour sélectionner sa source. Sélectionner un texte " "suivant un chemin pour sélectionner son chemin. Sélectionner un texte " "encadré pour sélectionner son cadre." @@ -12875,8 +12857,8 @@ msgid "" "Cannot find the object to select (orphaned clone, offset, textpath, " "flowed text?)" msgstr "" -"Impossible de trouver l'objet à sélectionner (clone orphelin, offset, " -"chemin de texte, texte encadré ?)" +"Impossible de trouver l'objet à sélectionner (clone orphelin, " +"décalage, chemin de texte, texte encadré ?)" #: ../src/selection-chemistry.cpp:2822 msgid "" @@ -12887,9 +12869,8 @@ msgstr "" "dans <defs>)" #: ../src/selection-chemistry.cpp:2912 -#, fuzzy msgid "Select path(s) to fill." -msgstr "Sélectionner un ou des chemin(s) à simplifier." +msgstr "Sélectionner le(s) chemin(s) à colorer." #: ../src/selection-chemistry.cpp:2930 msgid "Select object(s) to convert to marker." @@ -12931,8 +12912,7 @@ msgstr "Groupe à partir d'un symbole" #: ../src/selection-chemistry.cpp:3290 msgid "Select object(s) to convert to pattern." -msgstr "" -"Sélectionner un ou des objet(s) à convertir en motif de remplissage." +msgstr "Sélectionner un ou des objet(s) à convertir en motif." #: ../src/selection-chemistry.cpp:3386 msgid "Objects to pattern" @@ -12941,12 +12921,12 @@ msgstr "Objets en motif" #: ../src/selection-chemistry.cpp:3402 msgid "Select an object with pattern fill to extract objects from." msgstr "" -"Sélectionner un objet rempli avec un motif pour en extraire des " +"Sélectionner un objet avec un motif pour fond pour en extraire des " "objets." #: ../src/selection-chemistry.cpp:3461 msgid "No pattern fills in the selection." -msgstr "Aucun motif de remplissage dans la sélection." +msgstr "Aucun fond utilisant un motif dans la sélection." #: ../src/selection-chemistry.cpp:3464 msgid "Pattern to objects" @@ -12954,15 +12934,16 @@ msgstr "Motif en objets" #: ../src/selection-chemistry.cpp:3550 msgid "Select object(s) to make a bitmap copy." -msgstr "Sélectionner un ou des objet(s) pour en faire une copie bitmap." +msgstr "" +"Sélectionner un ou des objet(s) pour en créer une copie matricielle." #: ../src/selection-chemistry.cpp:3554 msgid "Rendering bitmap..." -msgstr "Génération du bitmap..." +msgstr "Génération de l'objet matriciel..." #: ../src/selection-chemistry.cpp:3739 msgid "Create bitmap" -msgstr "Créer un bitmap" +msgstr "Créer un objet matriciel" #: ../src/selection-chemistry.cpp:3764 ../src/selection-chemistry.cpp:3876 msgid "Select object(s) to create clippath or mask from." @@ -12971,9 +12952,8 @@ msgstr "" "découpe ou un masque sera créé." #: ../src/selection-chemistry.cpp:3850 ../src/ui/dialog/objects.cpp:1922 -#, fuzzy msgid "Create Clip Group" -msgstr "Créer un clo_ne" +msgstr "Créer un groupe de découpe" #: ../src/selection-chemistry.cpp:3879 msgid "Select mask object and object(s) to apply clippath or mask to." @@ -13110,8 +13090,8 @@ msgstr[1] "%1$i objets de types %2$s sélectionnés" #, c-format msgid "; %d filtered object " msgid_plural "; %d filtered objects " -msgstr[0] "; %d objet filtré" -msgstr[1] "; %d objets filtrés" +msgstr[0] " ; %d objet filtré " +msgstr[1] " ; %d objets filtrés " #: ../src/seltrans-handles.cpp:9 msgid "" @@ -13119,7 +13099,7 @@ msgid "" "with Shift to scale around rotation center" msgstr "" "Agrandir ou rétrécir la sélection ; Ctrl pour redimensionner " -"uniformément; Maj pour redimensionner autour du centre de rotation" +"uniformément ; Maj pour redimensionner autour du centre de rotation" #: ../src/seltrans-handles.cpp:10 msgid "" @@ -13150,7 +13130,7 @@ msgid "" "Center of rotation and skewing: drag to reposition; scaling with " "Shift also uses this center" msgstr "" -"Centre de rotation/inclinaison : cliquer-déplacer pour le déplacer ; " +"Centre de rotation/inclinaison : cliquer-glisser pour le déplacer ; " "redimensionner avec Maj utilise aussi ce centre" #: ../src/seltrans.cpp:487 ../src/ui/dialog/transformation.cpp:979 @@ -13173,24 +13153,22 @@ msgstr "Rétablir le centre" #, c-format msgid "Scale: %0.2f%% x %0.2f%%; with Ctrl to lock ratio" msgstr "" -"Redimensionnement : %0.2f%% x %0.2f%% ; Ctrl pour préserver le " -"ratio" +"Redimensionnement : %0.2f %% × %0.2f %% ; Ctrl pour préserver " +"le ratio" #. TRANSLATORS: don't modify the first ";" #. (it will NOT be displayed as ";" - only the second one will be) #: ../src/seltrans.cpp:1202 #, c-format msgid "Skew: %0.2f°; with Ctrl to snap angle" -msgstr "" -"Inclinaison : %0.2f° ; Ctrl pour incliner par incréments" +msgstr "Inclinaison : %0.2f° ; Ctrl pour incliner par incréments" #. TRANSLATORS: don't modify the first ";" #. (it will NOT be displayed as ";" - only the second one will be) #: ../src/seltrans.cpp:1278 #, c-format msgid "Rotate: %0.2f°; with Ctrl to snap angle" -msgstr "" -"Rotation : %0.2f° ; Ctrl pour tourner par incréments" +msgstr "Rotation : %0.2f° ; Ctrl pour tourner par incréments" #: ../src/seltrans.cpp:1315 #, c-format @@ -13203,8 +13181,8 @@ msgid "" "Move by %s, %s; with Ctrl to restrict to horizontal/vertical; " "with Shift to disable snapping" msgstr "" -"Déplacer de %s, %s ; Ctrl restreindre à l'horizontale/" -"verticale; Maj désactiver le magnétisme" +"Déplacer de %s, %s ; Ctrl pour restreindre à l'horizontale/" +"verticale ; Maj pour désactiver le magnétisme" #: ../src/shortcuts.cpp:226 #, c-format @@ -13281,38 +13259,38 @@ msgid_plural "(%d characters%s)" msgstr[0] "(%d caractère%s)" msgstr[1] "(%d caractères%s)" -#: ../src/sp-guide.cpp:261 +#: ../src/sp-guide.cpp:262 msgid "Create Guides Around the Page" msgstr "Créer des guides autour de la page" -#: ../src/sp-guide.cpp:274 ../src/verbs.cpp:2544 +#: ../src/sp-guide.cpp:275 ../src/verbs.cpp:2544 msgid "Delete All Guides" msgstr "Supprimer tous les guides" #. Guide has probably been deleted and no longer has an attached namedview. -#: ../src/sp-guide.cpp:485 +#: ../src/sp-guide.cpp:486 msgid "Deleted" msgstr "Supprimé" -#: ../src/sp-guide.cpp:494 +#: ../src/sp-guide.cpp:495 msgid "" "Shift+drag to rotate, Ctrl+drag to move origin, Del to " "delete" msgstr "" -"Maj+déplacer pour pivoter, Ctrl+déplacer pour déplacer " -"l'origine, Del pour supprimer" +"Maj+cliquer-glisser pour pivoter, Ctrl+cliquer-glisser pour " +"déplacer l'origine, Suppr pour supprimer" -#: ../src/sp-guide.cpp:498 +#: ../src/sp-guide.cpp:499 #, c-format msgid "vertical, at %s" msgstr "verticale, à %s" -#: ../src/sp-guide.cpp:501 +#: ../src/sp-guide.cpp:502 #, c-format msgid "horizontal, at %s" msgstr "horizontale, à %s" -#: ../src/sp-guide.cpp:506 +#: ../src/sp-guide.cpp:507 #, c-format msgid "at %d degrees, through (%s,%s)" msgstr "à %d degrés, passe par (%s,%s)" @@ -13324,12 +13302,12 @@ msgstr "embarquée" #: ../src/sp-image.cpp:525 #, c-format msgid "[bad reference]: %s" -msgstr "[mauvaise référence] : %s" +msgstr "[référence invalide] : %s" #: ../src/sp-image.cpp:526 #, c-format msgid "%d × %d: %s" -msgstr "%d × %d : %s" +msgstr "%d× ; %d : %s" #: ../src/sp-item-group.cpp:307 ../src/ui/dialog/objects.cpp:1915 msgid "Group" @@ -13352,22 +13330,22 @@ msgstr "Objet" #: ../src/sp-item.cpp:1043 #, c-format msgid "%s; clipped" -msgstr "%s; découpé" +msgstr "%s ; découpé" #: ../src/sp-item.cpp:1049 #, c-format msgid "%s; masked" -msgstr "%s; masqué" +msgstr "%s ; masqué" #: ../src/sp-item.cpp:1059 #, c-format msgid "%s; filtered (%s)" -msgstr "%s; filtré (%s)" +msgstr "%s ; filtré (%s)" #: ../src/sp-item.cpp:1061 #, c-format msgid "%s; filtered" -msgstr "%s; filtré" +msgstr "%s ; filtré" #: ../src/sp-line.cpp:113 msgid "Line" @@ -13379,17 +13357,17 @@ msgstr "Exception pendant l'exécution de l'effet de chemin." #: ../src/sp-offset.cpp:331 msgid "Linked Offset" -msgstr "Offset lié" +msgstr "Décalage lié" #: ../src/sp-offset.cpp:333 msgid "Dynamic Offset" -msgstr "Offset dynamique" +msgstr "Décalage dynamique" #. TRANSLATORS COMMENT: %s is either "outset" or "inset" depending on sign #: ../src/sp-offset.cpp:339 #, c-format msgid "%s by %f pt" -msgstr "%s de %f pt" +msgstr "%s de %f pt" #: ../src/sp-offset.cpp:340 msgid "outset" @@ -13397,7 +13375,7 @@ msgstr "dilaté" #: ../src/sp-offset.cpp:340 msgid "inset" -msgstr "contracté" +msgstr "érodé" #: ../src/sp-path.cpp:59 msgid "Path" @@ -13598,20 +13576,20 @@ msgstr "Aucun chemin avec contour dans la sélection." #: ../src/splivarot.cpp:1585 msgid "Selected object is not a path, cannot inset/outset." msgstr "" -"L'objet sélectionné n'est pas un chemin, impossible de le contracter/" +"L'objet sélectionné n'est pas un chemin, impossible de l'éroder/" "dilater." #: ../src/splivarot.cpp:1676 ../src/splivarot.cpp:1743 msgid "Create linked offset" -msgstr "Créer un objet offset lié" +msgstr "Créer un décalage lié" #: ../src/splivarot.cpp:1677 ../src/splivarot.cpp:1744 msgid "Create dynamic offset" -msgstr "Créer un objet offset dynamique" +msgstr "Créer un décalage dynamique" #: ../src/splivarot.cpp:1769 msgid "Select path(s) to inset/outset." -msgstr "Sélectionner des chemin(s) pour les contracter/dilater." +msgstr "Sélectionner des chemin(s) pour les éroder/dilater." #: ../src/splivarot.cpp:1965 msgid "Outset path" @@ -13619,11 +13597,11 @@ msgstr "Dilater le chemin" #: ../src/splivarot.cpp:1965 msgid "Inset path" -msgstr "Contracter le chemin" +msgstr "Éroder le chemin" #: ../src/splivarot.cpp:1967 msgid "No paths to inset/outset in the selection." -msgstr "Aucun chemin à contracter/dilater dans la sélection." +msgstr "Aucun chemin à éroder/dilater dans la sélection." #: ../src/splivarot.cpp:2129 msgid "Simplifying paths (separately):" @@ -13636,12 +13614,12 @@ msgstr "Simplification des chemins :" #: ../src/splivarot.cpp:2168 #, c-format msgid "%s %d of %d paths simplified..." -msgstr "Simplification %s - %d chemins simplifiés sur %d..." +msgstr "Simplification %s — %d chemins simplifiés sur %d..." #: ../src/splivarot.cpp:2181 #, c-format msgid "%d paths simplified." -msgstr "Fait - %d chemins simplifiés." +msgstr "Fait — %d chemins simplifiés." #: ../src/splivarot.cpp:2195 msgid "Select path(s) to simplify." @@ -13778,7 +13756,7 @@ msgstr "Vectoriser : pas de document actif" #: ../src/trace/trace.cpp:439 msgid "Trace: Image has no bitmap data" -msgstr "Vectoriser : l'image ne contient pas de données bitmap" +msgstr "Vectoriser : L'image ne contient pas de données matricielles" #: ../src/trace/trace.cpp:446 msgid "Trace: Starting trace..." @@ -13787,7 +13765,7 @@ msgstr "Vectorisation : début de l'opération..." #. ## inform the document, so we can undo #: ../src/trace/trace.cpp:549 msgid "Trace bitmap" -msgstr "Vectoriser un bitmap" +msgstr "Vectoriser un objet matriciel" #: ../src/trace/trace.cpp:553 #, c-format @@ -13966,7 +13944,7 @@ msgstr "Relativement à : " #: ../src/ui/dialog/align-and-distribute.cpp:957 msgid "_Treat selection as group: " -msgstr "_Manipuler la sélection comme un groupe :" +msgstr "_Manipuler la sélection comme un groupe : " #. Align #: ../src/ui/dialog/align-and-distribute.cpp:963 ../src/verbs.cpp:3036 @@ -14149,19 +14127,16 @@ msgid "Selection Area" msgstr "Zone de sélection" #: ../src/ui/dialog/align-and-distribute.cpp:1097 -#, fuzzy msgid "Middle of selection" -msgstr "Largeur de la sélection" +msgstr "Milieu de la sélection" #: ../src/ui/dialog/align-and-distribute.cpp:1098 -#, fuzzy msgid "Min value" -msgstr "Valeur de crénage :" +msgstr "Valeur minimum" #: ../src/ui/dialog/align-and-distribute.cpp:1099 -#, fuzzy msgid "Max value" -msgstr "Effacer les valeurs" +msgstr "Valeur maximum" #: ../src/ui/dialog/calligraphic-profile-rename.cpp:40 #: ../src/ui/dialog/calligraphic-profile-rename.cpp:138 @@ -14191,7 +14166,7 @@ msgstr "P1 : translation" #: ../src/ui/dialog/clonetiler.cpp:123 msgid "P2: 180° rotation" -msgstr "P2 : rotation de 180°" +msgstr "P2 : rotation de 180°" #: ../src/ui/dialog/clonetiler.cpp:124 msgid "PM: reflection" @@ -14213,47 +14188,47 @@ msgstr "PMM : réflexion + réflexion" #: ../src/ui/dialog/clonetiler.cpp:130 msgid "PMG: reflection + 180° rotation" -msgstr "PMG : réflexion + rotation de 180°" +msgstr "PMG : réflexion + rotation de 180°" #: ../src/ui/dialog/clonetiler.cpp:131 msgid "PGG: glide reflection + 180° rotation" -msgstr "PGG : réflexion glissée + rotation de 180°" +msgstr "PGG : réflexion glissée + rotation de 180°" #: ../src/ui/dialog/clonetiler.cpp:132 msgid "CMM: reflection + reflection + 180° rotation" -msgstr "CMM : réflexion + réflexion + rotation de 180°" +msgstr "CMM : réflexion + réflexion + rotation de 180°" #: ../src/ui/dialog/clonetiler.cpp:133 msgid "P4: 90° rotation" -msgstr "P4 : rotation de 90°" +msgstr "P4 : rotation de 90°" #: ../src/ui/dialog/clonetiler.cpp:134 msgid "P4M: 90° rotation + 45° reflection" -msgstr "P4M : rotation de 90° + réflexion à 45°" +msgstr "P4M : rotation de 90° + réflexion à 45°" #: ../src/ui/dialog/clonetiler.cpp:135 msgid "P4G: 90° rotation + 90° reflection" -msgstr "P4G : rotation de 90° + réflexion à 90°" +msgstr "P4G : rotation de 90° + réflexion à 90°" #: ../src/ui/dialog/clonetiler.cpp:136 msgid "P3: 120° rotation" -msgstr "P3 : rotation de 120°" +msgstr "P3 : rotation de 120°" #: ../src/ui/dialog/clonetiler.cpp:137 msgid "P31M: reflection + 120° rotation, dense" -msgstr "P31M : réflexion + rotation de 120°, dense" +msgstr "P31M : réflexion + rotation de 120°, dense" #: ../src/ui/dialog/clonetiler.cpp:138 msgid "P3M1: reflection + 120° rotation, sparse" -msgstr "P3M1 : réflexion + rotation de 120°, clairsemé" +msgstr "P3M1 : réflexion + rotation de 120°, clairsemé" #: ../src/ui/dialog/clonetiler.cpp:139 msgid "P6: 60° rotation" -msgstr "P6 : rotation de 60°" +msgstr "P6 : rotation de 60°" #: ../src/ui/dialog/clonetiler.cpp:140 msgid "P6M: reflection + 60° rotation" -msgstr "P6M : réflexion + rotation de 60°" +msgstr "P6M : réflexion + rotation de 60°" # See: # http://www.bib.ulb.ac.be/coursmath/doc/17.htm (visual examples) @@ -14557,15 +14532,15 @@ msgstr "Couleur initiale :" #: ../src/ui/dialog/clonetiler.cpp:665 msgid "Initial color of tiled clones" -msgstr "Couleur initiale des clones de pavage" +msgstr "Couleur initiale des clones du pavage" #: ../src/ui/dialog/clonetiler.cpp:665 msgid "" "Initial color for clones (works only if the original has unset fill or " "stroke or on spray tool in copy mode)" msgstr "" -"Couleur initiale pour les clones (ne fonctionne que si l'original a un fond " -"ou un contour indéfini, ou avec l'outil aérographe en mode copie)" +"Couleur initiale des clones (ne fonctionne que si l'original a un fond ou un " +"contour indéfini, ou avec l'outil aérographe en mode copie)" #: ../src/ui/dialog/clonetiler.cpp:680 msgid "H:" @@ -14628,18 +14603,16 @@ msgid "_Trace" msgstr "_Calquer" #: ../src/ui/dialog/clonetiler.cpp:788 -#, fuzzy msgid "Trace the drawing under the clones/sprayed items" -msgstr "Calquer depuis le dessin sous les pavés" +msgstr "Vectoriser le dessin sous les clones/éléments pulvérisés" #: ../src/ui/dialog/clonetiler.cpp:792 -#, fuzzy msgid "" "For each clone/sprayed item, pick a value from the drawing in its location " "and apply it" msgstr "" -"Pour chaque clone, capturer une valeur du dessin à l'emplacement du clone et " -"l'appliquer au clone" +"Pour chaque clone/objet pulvérisé, capturer une valeur du dessin à son " +"emplacement et la lui appliquer" #: ../src/ui/dialog/clonetiler.cpp:811 msgid "1. Pick from the drawing:" @@ -14778,9 +14751,8 @@ msgstr "" "L'opacité de chaque clone est déterminée par la valeur capturée en ce point" #: ../src/ui/dialog/clonetiler.cpp:1011 -#, fuzzy msgid "Apply to tiled clones:" -msgstr "Supprimer les clones de pavage" +msgstr "Appliquer aux clones du pavage :" #: ../src/ui/dialog/clonetiler.cpp:1052 msgid "How many rows in the tiling" @@ -14812,7 +14784,7 @@ msgstr "Largeur, hauteur :" #: ../src/ui/dialog/clonetiler.cpp:1196 msgid "Fill the specified width and height with the tiling" -msgstr "Remplir avec le pavage selon la hauteur et la largeur spécifiées" +msgstr "Remplir la largeur et la hauteur spécifiées avec le pavage" #: ../src/ui/dialog/clonetiler.cpp:1217 msgid "Use saved size and position of the tile" @@ -14823,8 +14795,8 @@ msgid "" "Pretend that the size and position of the tile are the same as the last time " "you tiled it (if any), instead of using the current size" msgstr "" -"Utiliser les mêmes dimensions et position de pavés que lors du pavage " -"précédent (si possible), au lieu d'utiliser les paramètres courants" +"Utiliser les mêmes dimension et position de pavés que lors du pavage " +"précédent (si possible), au lieu d'utiliser les paramètres actuels" #: ../src/ui/dialog/clonetiler.cpp:1254 msgid " _Create " @@ -14846,8 +14818,8 @@ msgstr "É_parpiller" #: ../src/ui/dialog/clonetiler.cpp:1277 msgid "Spread out clones to reduce clumping; can be applied repeatedly" msgstr "" -"Disperser les clones de façon à reduire le rassemblement; peut être appliqué " -"plusieurs fois" +"Disperser les clones de façon à réduire le rassemblement ; peut être " +"appliqué plusieurs fois" #: ../src/ui/dialog/clonetiler.cpp:1283 msgid " Re_move " @@ -14856,8 +14828,8 @@ msgstr "_Supprimer" #: ../src/ui/dialog/clonetiler.cpp:1284 msgid "Remove existing tiled clones of the selected object (siblings only)" msgstr "" -"Retirer les clones de pavage de l'objet sélectionné (seulement les « enfants " -"de mêmes parents »)" +"Supprimer les clones de pavage de l'objet sélectionné (au même niveau " +"arborescent uniquement)" #: ../src/ui/dialog/clonetiler.cpp:1301 msgid " R_eset " @@ -14938,8 +14910,8 @@ msgstr "Hasard :" msgid "" "Color: %s; Click to set fill, Shift+click to set stroke" msgstr "" -"Couleur : %s ; Clic pour définir le fond, Maj + clic " -"pour définir le contour" +"Couleur : %s ; clic pour définir le fond, Maj+clic pour " +"définir le contour" #: ../src/ui/dialog/color-item.cpp:505 msgid "Change color definition" @@ -14979,11 +14951,11 @@ msgstr "Effa_cer" #: ../src/ui/dialog/debug.cpp:87 ../src/ui/dialog/messages.cpp:48 msgid "Capture log messages" -msgstr "Capturer les messages de log" +msgstr "Capturer la journalisation" #: ../src/ui/dialog/debug.cpp:91 msgid "Release log messages" -msgstr "Détacher les messages de log" +msgstr "Détacher la journalisation" #: ../src/ui/dialog/document-metadata.cpp:88 #: ../src/ui/dialog/document-properties.cpp:167 @@ -14996,12 +14968,12 @@ msgid "License" msgstr "Licence" #: ../src/ui/dialog/document-metadata.cpp:126 -#: ../src/ui/dialog/document-properties.cpp:994 +#: ../src/ui/dialog/document-properties.cpp:1037 msgid "Dublin Core Entities" msgstr "Entités Dublin Core" #: ../src/ui/dialog/document-metadata.cpp:168 -#: ../src/ui/dialog/document-properties.cpp:1056 +#: ../src/ui/dialog/document-properties.cpp:1099 msgid "License" msgstr "Licence" @@ -15015,15 +14987,16 @@ msgid "If unset, no antialiasing will be done on the drawing" msgstr "Si décoché, l'antialiasing ne sera pas appliqué au dessin" #: ../src/ui/dialog/document-properties.cpp:119 -#, fuzzy msgid "Checkerboard background" -msgstr "Retirer l'arrière-plan" +msgstr "Arrière-plan en damier" #: ../src/ui/dialog/document-properties.cpp:119 msgid "" "If set, use checkerboard for background, otherwise use background color at " "full opacity." msgstr "" +"Si défini, utiliser un damier comme arrière-plan, sinon utiliser la couleur " +"de fond avec opacité complète." #: ../src/ui/dialog/document-properties.cpp:120 msgid "Show page _border" @@ -15054,14 +15027,14 @@ msgid "Back_ground color:" msgstr "Couleur de _fond :" #: ../src/ui/dialog/document-properties.cpp:123 -#, fuzzy msgid "" "Color of the page background. Note: transparency setting ignored while " "editing if 'Checkerboard background' unset (but used when exporting to " "bitmap)." msgstr "" -"Couleur du fond de page. Note : les paramètres de transparence sont ignorés " -"pendant l'édition, mais utilisées lors de l'exportation en PNG." +"Couleur du fond de la page. Note : le réglage de la transparence est ignoré " +"pendant l'édition si « Arrière-plan en damier » est désactivé (mais utilisé " +"lors de l'exportation en matriciel)." #: ../src/ui/dialog/document-properties.cpp:124 msgid "Border _color:" @@ -15076,9 +15049,8 @@ msgid "Color of the page border" msgstr "Couleur de bordure de page" #: ../src/ui/dialog/document-properties.cpp:125 -#, fuzzy msgid "Display _units:" -msgstr "Unité d'affichage" +msgstr "_Unité par défaut :" #. --------------------------------------------------------------- #. General snap options @@ -15088,7 +15060,7 @@ msgstr "Afficher les _guides" #: ../src/ui/dialog/document-properties.cpp:129 msgid "Show or hide guides" -msgstr "Afficher ou non les guides" +msgstr "Afficher ou masquer les guides" #: ../src/ui/dialog/document-properties.cpp:130 msgid "Guide co_lor:" @@ -15282,9 +15254,8 @@ msgid "Page Size" msgstr "Taille de la page" #: ../src/ui/dialog/document-properties.cpp:336 -#, fuzzy msgid "Background" -msgstr "Fond" +msgstr "Arrière-plan" #: ../src/ui/dialog/document-properties.cpp:339 msgid "Border" @@ -15318,139 +15289,138 @@ msgstr "Divers" #. Inkscape::GC::release(defsRepr); #. inform the document, so we can undo #. Color Management -#: ../src/ui/dialog/document-properties.cpp:526 ../src/verbs.cpp:3020 +#: ../src/ui/dialog/document-properties.cpp:542 ../src/verbs.cpp:3020 msgid "Link Color Profile" msgstr "Lier un profil de couleurs" -#: ../src/ui/dialog/document-properties.cpp:623 +#: ../src/ui/dialog/document-properties.cpp:654 msgid "Remove linked color profile" msgstr "Supprimer le profil de couleur lié" -#: ../src/ui/dialog/document-properties.cpp:636 +#: ../src/ui/dialog/document-properties.cpp:673 msgid "Linked Color Profiles:" msgstr "Profils de couleur liés :" -#: ../src/ui/dialog/document-properties.cpp:638 +#: ../src/ui/dialog/document-properties.cpp:675 msgid "Available Color Profiles:" msgstr "Profils de couleur disponibles :" -#: ../src/ui/dialog/document-properties.cpp:640 +#: ../src/ui/dialog/document-properties.cpp:677 msgid "Link Profile" msgstr "Lier au profil" -#: ../src/ui/dialog/document-properties.cpp:643 +#: ../src/ui/dialog/document-properties.cpp:680 msgid "Unlink Profile" msgstr "Délier le profil" -#: ../src/ui/dialog/document-properties.cpp:721 +#: ../src/ui/dialog/document-properties.cpp:764 msgid "Profile Name" msgstr "Nom du profil" -#: ../src/ui/dialog/document-properties.cpp:757 +#: ../src/ui/dialog/document-properties.cpp:800 msgid "External scripts" msgstr "Programmes externes" -#: ../src/ui/dialog/document-properties.cpp:758 +#: ../src/ui/dialog/document-properties.cpp:801 msgid "Embedded scripts" msgstr "Programmes incorporés" -#: ../src/ui/dialog/document-properties.cpp:763 +#: ../src/ui/dialog/document-properties.cpp:806 msgid "External script files:" msgstr "Fichier de programmation externe :" -#: ../src/ui/dialog/document-properties.cpp:765 +#: ../src/ui/dialog/document-properties.cpp:808 msgid "Add the current file name or browse for a file" msgstr "Choisir un fichier" -#: ../src/ui/dialog/document-properties.cpp:768 -#: ../src/ui/dialog/document-properties.cpp:845 +#: ../src/ui/dialog/document-properties.cpp:811 +#: ../src/ui/dialog/document-properties.cpp:888 #: ../src/ui/widget/selected-style.cpp:357 msgid "Remove" msgstr "Supprimer" -#: ../src/ui/dialog/document-properties.cpp:832 +#: ../src/ui/dialog/document-properties.cpp:875 msgid "Filename" msgstr "Nom du fichier" -#: ../src/ui/dialog/document-properties.cpp:840 +#: ../src/ui/dialog/document-properties.cpp:883 msgid "Embedded script files:" msgstr "Fichier de programmation incorporés :" -#: ../src/ui/dialog/document-properties.cpp:842 +#: ../src/ui/dialog/document-properties.cpp:885 #: ../src/ui/dialog/objects.cpp:1894 msgid "New" msgstr "Nouvelle" -#: ../src/ui/dialog/document-properties.cpp:909 +#: ../src/ui/dialog/document-properties.cpp:952 msgid "Script id" msgstr "Identifiant du script" -#: ../src/ui/dialog/document-properties.cpp:915 +#: ../src/ui/dialog/document-properties.cpp:958 msgid "Content:" msgstr "Contenu :" -#: ../src/ui/dialog/document-properties.cpp:1032 +#: ../src/ui/dialog/document-properties.cpp:1075 msgid "_Save as default" msgstr "Enregistrer comme valeur par _défaut" -#: ../src/ui/dialog/document-properties.cpp:1033 +#: ../src/ui/dialog/document-properties.cpp:1076 msgid "Save this metadata as the default metadata" msgstr "Enregistrer ces informations comme métadonnées par défaut" -#: ../src/ui/dialog/document-properties.cpp:1034 +#: ../src/ui/dialog/document-properties.cpp:1077 msgid "Use _default" msgstr "Utiliser les valeurs par défaut" -#: ../src/ui/dialog/document-properties.cpp:1035 +#: ../src/ui/dialog/document-properties.cpp:1078 msgid "Use the previously saved default metadata here" msgstr "Utiliser les métadonnées précédentes valeurs par défaut" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1108 +#: ../src/ui/dialog/document-properties.cpp:1151 msgid "Add external script..." msgstr "Ajouter un programme externe..." -#: ../src/ui/dialog/document-properties.cpp:1147 +#: ../src/ui/dialog/document-properties.cpp:1190 msgid "Select a script to load" msgstr "Sélectionnez un script à charger" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1175 +#: ../src/ui/dialog/document-properties.cpp:1218 msgid "Add embedded script..." msgstr "Ajouter un programme incorporé..." #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1206 +#: ../src/ui/dialog/document-properties.cpp:1249 msgid "Remove external script" msgstr "Supprimer un programme externe" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1235 +#: ../src/ui/dialog/document-properties.cpp:1278 msgid "Remove embedded script" msgstr "Retirer le programme incorporé" #. TODO repr->set_content(_EmbeddedContent.get_buffer()->get_text()); #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1331 +#: ../src/ui/dialog/document-properties.cpp:1374 msgid "Edit embedded script" msgstr "Retirer le programme incorporé" -#: ../src/ui/dialog/document-properties.cpp:1415 +#: ../src/ui/dialog/document-properties.cpp:1458 msgid "Creation" msgstr " Création " -#: ../src/ui/dialog/document-properties.cpp:1416 +#: ../src/ui/dialog/document-properties.cpp:1459 msgid "Defined grids" msgstr "Grilles définies" -#: ../src/ui/dialog/document-properties.cpp:1660 +#: ../src/ui/dialog/document-properties.cpp:1703 msgid "Remove grid" msgstr "Supprimer la grille" -#: ../src/ui/dialog/document-properties.cpp:1752 -#, fuzzy +#: ../src/ui/dialog/document-properties.cpp:1795 msgid "Changed default display unit" -msgstr "Changer l'unité de mesure du document" +msgstr "Changer l'unité utilisée par défaut" #: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2887 msgid "_Page" @@ -15472,7 +15442,7 @@ msgstr "P_ersonnalisée" #: ../src/widgets/measure-toolbar.cpp:294 #: ../share/extensions/render_gears.inx.h:6 msgid "Units:" -msgstr "Unités :" +msgstr "Unité :" #: ../src/ui/dialog/export.cpp:167 msgid "_Export As..." @@ -15570,11 +15540,11 @@ msgstr "Nom de _fichier" #: ../src/ui/dialog/export.cpp:354 msgid "Export the bitmap file with these settings" -msgstr "Exporter le fichier bitmap avec ces réglages" +msgstr "Exporter le fichier d'image matricielle avec ces réglages" #: ../src/ui/dialog/export.cpp:479 msgid "bitmap" -msgstr "bitmap" +msgstr "image" #: ../src/ui/dialog/export.cpp:614 #, c-format @@ -15641,7 +15611,7 @@ msgstr "Le dossier %s n'existe pas ou n'est pas un dossier.\n" #. TRANSLATORS: %1 will be the filename, %2 the width, and %3 the height of the image #: ../src/ui/dialog/export.cpp:1154 ../src/ui/dialog/export.cpp:1156 msgid "Exporting %1 (%2 x %3)" -msgstr "Exportation s1(%2 x %3) en cours" +msgstr "Exportation de %1 (%2 x %3) en cours" #: ../src/ui/dialog/export.cpp:1183 #, c-format @@ -15727,7 +15697,7 @@ msgstr "Pas d'aperçu" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:531 msgid "too large for preview" -msgstr "image trop grande pour un aperçu" +msgstr "trop gros pour l'aperçu" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:617 msgid "Enable preview" @@ -15764,14 +15734,14 @@ msgstr "Toutes les images" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:832 #: ../src/ui/dialog/filedialogimpl-win32.cpp:289 msgid "All Vectors" -msgstr "Tous les formats vectoriels" +msgstr "Toutes les images vectorielles" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:805 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:821 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:835 #: ../src/ui/dialog/filedialogimpl-win32.cpp:290 msgid "All Bitmaps" -msgstr "Toutes les images bitmap" +msgstr "Toutes les images matricielles" #. ###### File options #. ###### Do we want the .xxx extension automatically added? @@ -15783,7 +15753,7 @@ msgstr "Ajouter une extension automatiquement" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1227 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1480 msgid "Guess from extension" -msgstr "Deviner le type de fichier par l'extension" +msgstr "Deviner à partir de l'extension" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1499 msgid "Left edge of source" @@ -16116,7 +16086,7 @@ msgid "" "performed without specifying a complete matrix." msgstr "" "Indique le type d'opération matricielle. Le mot-clef « matrice » indique " -"qu'une matrice 5x4 sera donnée en entrée. Les autres mots-clés représentent " +"qu'une matrice 5×4 sera donnée en entrée. Les autres mots-clés représentent " "des raccourcis pour les opérations les plus fréquentes sur les couleurs sans " "spécifier de matrice." @@ -16275,7 +16245,7 @@ msgid "" msgstr "" "Détermine comment étendre l'image en entrée avec des valeurs de couleur si " "besoin, pour que les opérations matricielles puissent être appliquées quand " -"le kernel est positionné au bord ou près du bord de l'image en entrée." +"le noyau est positionné au bord ou près du bord de l'image en entrée." #: ../src/ui/dialog/filter-effects-dialog.cpp:2908 msgid "Preserve Alpha" @@ -16369,8 +16339,8 @@ msgid "" "Erode: performs \"thinning\" of input image.\n" "Dilate: performs \"fattenning\" of input image." msgstr "" -"Contracter : rend l'image plus « fine ».\n" -"Dilater : rend l'image plus « épaisse »" +"Éroder : rend l'image plus « fine ».\n" +"Dilater : rend l'image plus « épaisse »." #: ../src/ui/dialog/filter-effects-dialog.cpp:2937 msgid "Source of Image:" @@ -16515,9 +16485,9 @@ msgid "" "effects." msgstr "" "feDisplacementMap déplace les pixels de la première entrée en " -"utilisant la deuxième entrée comme displacement map, qui définit la distance " -"d'où le pixel doit venir. Les exemples les plus classiques sont les effets " -"de tourbillon et de contraction." +"utilisant la deuxième entrée comme carte de déplacement, qui définit la " +"distance d'où le pixel doit venir. Les exemples les plus classiques sont les " +"effets de tourbillon et d'érosion." #: ../src/ui/dialog/filter-effects-dialog.cpp:3014 msgid "" @@ -16563,9 +16533,9 @@ msgid "" "For single-color objects erode makes the object thinner and dilate makes it " "thicker." msgstr "" -"feMorphology fournit des effets de contraction et de dilatation. Pour " -"des objets de couleur uniforme la contraction rend l'objet plus fin et la " -"dilatation le rend plus épais." +"feMorphology fournit des effets d'érosion et de dilatation. Pour des " +"objets de couleur uniforme, l'érosion rend l'objet plus fin et la dilatation " +"le rend plus épais." #: ../src/ui/dialog/filter-effects-dialog.cpp:3034 msgid "" @@ -16574,7 +16544,7 @@ msgid "" "a slightly different position than the actual object." msgstr "" "feOffset décale l'image d'une quantité définie par l'utilisateur. Par " -"example, il est utile dans le cas des ombres portées, où les ombres sont " +"exemple, il est utile dans le cas des ombres portées, où les ombres sont " "dans une position légèrement différente de l'objet source de l'ombre." #: ../src/ui/dialog/filter-effects-dialog.cpp:3038 @@ -16591,13 +16561,12 @@ msgstr "" "par rapport au point de vue." #: ../src/ui/dialog/filter-effects-dialog.cpp:3042 -#, fuzzy msgid "" "The feTile filter primitive tiles a region with an input graphic. The " "source tile is defined by the filter primitive subregion of the input." msgstr "" -"feImage remplit la zone avec une image externe ou une autre partie du " -"document." +"La primitive de filtre feTile pave une zone avec une image. Le pavé " +"source est déterminé par la sous-zone de l'entrée de la primitive de filtre." #: ../src/ui/dialog/filter-effects-dialog.cpp:3046 msgid "" @@ -16649,7 +16618,7 @@ msgstr "Ca_lque courant" #: ../src/ui/dialog/find.cpp:76 msgid "Limit search to the current layer" -msgstr "Limiter la recherche au calque courant" +msgstr "Limiter la recherche au calque actif" #: ../src/ui/dialog/find.cpp:77 msgid "Sele_ction" @@ -16657,7 +16626,7 @@ msgstr "Séle_ction" #: ../src/ui/dialog/find.cpp:77 msgid "Limit search to the current selection" -msgstr "Limiter la recherche à la sélection courante" +msgstr "Limiter la recherche à la sélection actuelle" #: ../src/ui/dialog/find.cpp:78 msgid "Search in text objects" @@ -16847,11 +16816,11 @@ msgstr "Rechercher les images" #: ../src/ui/dialog/find.cpp:111 msgid "Offsets" -msgstr "Offsets" +msgstr "Décalages" #: ../src/ui/dialog/find.cpp:111 msgid "Search offset objects" -msgstr "Rechercher les objets offset" +msgstr "Rechercher les objets de décalage" #: ../src/ui/dialog/find.cpp:112 msgid "Object types" @@ -17279,11 +17248,11 @@ msgstr "Supplément latin-1" #: ../src/ui/dialog/glyphs.cpp:155 msgid "Latin Extended-A" -msgstr "Latin étendu - A" +msgstr "Latin étendu — A" #: ../src/ui/dialog/glyphs.cpp:156 msgid "Latin Extended-B" -msgstr "Latin étendu - B" +msgstr "Latin étendu — B" #: ../src/ui/dialog/glyphs.cpp:157 msgid "IPA Extensions" @@ -17291,7 +17260,7 @@ msgstr "Extensions IPA" #: ../src/ui/dialog/glyphs.cpp:158 msgid "Spacing Modifier Letters" -msgstr "Lettres du modificateur d'emplacement" +msgstr "Lettres du modificateur d'espacement" #: ../src/ui/dialog/glyphs.cpp:159 msgid "Combining Diacritical Marks" @@ -17435,11 +17404,11 @@ msgstr "Casseau (dingbats)" #: ../src/ui/dialog/glyphs.cpp:233 msgid "Miscellaneous Mathematical Symbols-A" -msgstr "Symboles mathématiques divers - A" +msgstr "Symboles mathématiques divers — A" #: ../src/ui/dialog/glyphs.cpp:234 msgid "Supplemental Arrows-A" -msgstr "Supplément de flèches - A" +msgstr "Supplément de flèches — A" #: ../src/ui/dialog/glyphs.cpp:235 msgid "Braille Patterns" @@ -17447,11 +17416,11 @@ msgstr "Motifs Braille" #: ../src/ui/dialog/glyphs.cpp:236 msgid "Supplemental Arrows-B" -msgstr "Supplément de flèches - B" +msgstr "Supplément de flèches — B" #: ../src/ui/dialog/glyphs.cpp:237 msgid "Miscellaneous Mathematical Symbols-B" -msgstr "Symboles mathématiques divers - B" +msgstr "Symboles mathématiques divers — B" #: ../src/ui/dialog/glyphs.cpp:238 msgid "Supplemental Mathematical Operators" @@ -17463,7 +17432,7 @@ msgstr "Divers symboles et flèches" #: ../src/ui/dialog/glyphs.cpp:241 msgid "Latin Extended-C" -msgstr "Latin étendu - C" +msgstr "Latin étendu — C" #: ../src/ui/dialog/glyphs.cpp:243 msgid "Georgian Supplement" @@ -17475,7 +17444,7 @@ msgstr "Éthiopien étendu" #: ../src/ui/dialog/glyphs.cpp:246 msgid "Cyrillic Extended-A" -msgstr "Cyrillique étendu - A" +msgstr "Cyrillique étendu — A" #: ../src/ui/dialog/glyphs.cpp:247 msgid "Supplemental Punctuation" @@ -17527,7 +17496,7 @@ msgstr "Compatibilité CJC" #: ../src/ui/dialog/glyphs.cpp:262 msgid "CJK Unified Ideographs Extension A" -msgstr "Idéogrammes unifiés CJC - supplément A" +msgstr "Idéogrammes unifiés CJC, supplément A" #: ../src/ui/dialog/glyphs.cpp:263 msgid "Yijing Hexagram Symbols" @@ -17551,7 +17520,7 @@ msgstr "Lisu" #: ../src/ui/dialog/glyphs.cpp:269 msgid "Cyrillic Extended-B" -msgstr "Cyrillique étendu - B" +msgstr "Cyrillique étendu — B" #: ../src/ui/dialog/glyphs.cpp:270 msgid "Bamum" @@ -17563,7 +17532,7 @@ msgstr "Lettres de ton modificatives" #: ../src/ui/dialog/glyphs.cpp:272 msgid "Latin Extended-D" -msgstr "Latin étendu - D" +msgstr "Latin étendu — D" #: ../src/ui/dialog/glyphs.cpp:274 msgid "Common Indic Number Forms" @@ -17575,7 +17544,7 @@ msgstr "Dévanâgarî étendu" #: ../src/ui/dialog/glyphs.cpp:280 msgid "Hangul Jamo Extended-A" -msgstr "Jamos hangûls étendu - A" +msgstr "Jamos hangûls étendu — A" #: ../src/ui/dialog/glyphs.cpp:281 msgid "Javanese" @@ -17583,7 +17552,7 @@ msgstr "Javanais" #: ../src/ui/dialog/glyphs.cpp:283 msgid "Myanmar Extended-A" -msgstr "Birman étendu - A" +msgstr "Birman étendu — A" #: ../src/ui/dialog/glyphs.cpp:284 msgid "Tai Viet" @@ -17599,7 +17568,7 @@ msgstr "Syllabes hangûles" #: ../src/ui/dialog/glyphs.cpp:287 msgid "Hangul Jamo Extended-B" -msgstr "Jamos hangûls étendu - B" +msgstr "Jamos hangûls étendu — B" #: ../src/ui/dialog/glyphs.cpp:288 msgid "High Surrogates" @@ -17627,7 +17596,7 @@ msgstr "Formes de présentation alphabétiques" #: ../src/ui/dialog/glyphs.cpp:294 msgid "Arabic Presentation Forms-A" -msgstr "Formes de présentation arabes - A" +msgstr "Formes de présentation arabes — A" #: ../src/ui/dialog/glyphs.cpp:295 msgid "Variation Selectors" @@ -17651,7 +17620,7 @@ msgstr "Petites variantes de forme" #: ../src/ui/dialog/glyphs.cpp:300 msgid "Arabic Presentation Forms-B" -msgstr "Formes de présentation arabes - B" +msgstr "Formes de présentation arabes — B" #: ../src/ui/dialog/glyphs.cpp:301 msgid "Halfwidth and Fullwidth Forms" @@ -17757,13 +17726,12 @@ msgid "_Set spacing:" msgstr "Définir l'e_spacement :" #: ../src/ui/dialog/guides.cpp:47 -#, fuzzy msgid "Lo_cked" -msgstr "Verrouillé" +msgstr "_Verrouillé" #: ../src/ui/dialog/guides.cpp:47 msgid "Lock the movement of guides" -msgstr "" +msgstr "Verrouiller le déplacement des guides" #: ../src/ui/dialog/guides.cpp:48 msgid "Rela_tive change" @@ -17806,17 +17774,17 @@ msgstr "Ligne de guide" #: ../src/ui/dialog/guides.cpp:336 #, c-format msgid "Guideline ID: %s" -msgstr "Id de la ligne de guide : %s" +msgstr "ID de la ligne de guide : %s" #: ../src/ui/dialog/guides.cpp:342 #, c-format msgid "Current: %s" -msgstr "Courant : %s" +msgstr "Actuel : %s" #: ../src/ui/dialog/icon-preview.cpp:155 #, c-format msgid "%d x %d" -msgstr "%d x %d" +msgstr "%d x %d" #: ../src/ui/dialog/icon-preview.cpp:167 msgid "Magnified:" @@ -17885,17 +17853,18 @@ msgstr "" "de contour)" #: ../src/ui/dialog/inkscape-preferences.cpp:213 -#, fuzzy msgid "Base simplify:" msgstr "Simplification :" #: ../src/ui/dialog/inkscape-preferences.cpp:213 msgid "on dynamic LPE simplify" -msgstr "" +msgstr "sur simplification dynamique des effets de chemin interactifs" #: ../src/ui/dialog/inkscape-preferences.cpp:214 msgid "Base simplify of dynamic LPE based simplify" msgstr "" +"Simplification de base de la simplification dynamique avec effets de chemin " +"interactifs" #: ../src/ui/dialog/inkscape-preferences.cpp:229 msgid "No objects selected to take the style from." @@ -18078,7 +18047,7 @@ msgstr "Chaque objet sélectionné affiche sa boîte englobante" #. Node #: ../src/ui/dialog/inkscape-preferences.cpp:361 msgid "Node" -msgstr "Nœud" +msgstr "Nœuds" #: ../src/ui/dialog/inkscape-preferences.cpp:364 msgid "Path outline" @@ -18229,9 +18198,9 @@ msgid "" "considered for calculating lengths. Only lengths between actual curve " "intersections will be displayed." msgstr "" -"Le début et la fin de la ligne de contrôle de l'outil de mesure ne sont pas " -"pris en compte dans le calcul des longueurs. Seules les longueurs entre les " -"intersections des chemins sont affichées." +"Le début et la fin de la ligne de contrôle de l'outil de mesure ne seront " +"pas pris en compte dans le calcul des longueurs. Seules les longueurs entre " +"les intersections des chemins sont affichées." #. Shapes #: ../src/ui/dialog/inkscape-preferences.cpp:405 @@ -18247,9 +18216,9 @@ msgid "" "If on, the sketch result will be the normal average of all sketches made, " "instead of averaging the old result with the new sketch" msgstr "" -"Si coché, le résultat du croquis sera moyenné avec tous les autres croquis ; " -"sinon, la moyenne sera effectuée entre l'ancien résultat et le nouveau " -"croquis" +"Si coché, le résultat du croquis sera la moyenne de tous les croquis " +"réalisés ; sinon, la moyenne sera effectuée entre l'ancien résultat et le " +"nouveau croquis" #. Pen #: ../src/ui/dialog/inkscape-preferences.cpp:443 @@ -18330,7 +18299,7 @@ msgstr "Pouce" #: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Em square" -msgstr "Em carré" +msgstr "Carré cadratin" #. , _("Ex square"), _("Percent") #. , SP_CSS_UNIT_EX, SP_CSS_UNIT_PERCENT @@ -18365,7 +18334,7 @@ msgstr "Gomme" #. Paint Bucket #: ../src/ui/dialog/inkscape-preferences.cpp:493 msgid "Paint Bucket" -msgstr "Remplissage au seau" +msgstr "Pot de peinture" #. Gradient #: ../src/ui/dialog/inkscape-preferences.cpp:499 @@ -18398,6 +18367,9 @@ msgid "" "When on, the Gradient Edit button in the Fill & Stroke dialog will show the " "legacy Gradient Editor dialog, when off the Gradient Tool will be used" msgstr "" +"Si coché, le bouton d'édition de dégradé dans la boîte de dialogue Fond et " +"contour affichera l'ancien formulaire d'édition de dégradé ; si décoché, " +"l'outil Dégradé sera utilisé" #: ../src/ui/dialog/inkscape-preferences.cpp:509 msgid "Linear gradient _angle:" @@ -18407,7 +18379,7 @@ msgstr "_Angle de dégradé linéaire :" msgid "" "Default angle of new linear gradients in degrees (clockwise from horizontal)" msgstr "" -"Angle par défaut des nouveaux gradients linéaires (en degrés, dans le sens " +"Angle par défaut des nouveaux dégradés linéaires (en degrés, dans le sens " "horaire à partir de l'horizontale)" #. Dropper @@ -18430,7 +18402,7 @@ msgstr "" #. disabled, because the LPETool is not finished yet. #: ../src/ui/dialog/inkscape-preferences.cpp:527 msgid "LPE Tool" -msgstr "Outil effets de chemin en direct" +msgstr "Effets de chemin interactifs" #: ../src/ui/dialog/inkscape-preferences.cpp:534 msgid "Interface" @@ -18438,7 +18410,7 @@ msgstr "Interface" #: ../src/ui/dialog/inkscape-preferences.cpp:537 msgid "System default" -msgstr "Valeur par défaut du système d'exploitation" +msgstr "Valeur par défaut du système" #: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Albanian (sq)" @@ -18482,7 +18454,7 @@ msgstr "Bengali (bn)" #: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Bengali/Bangladesh (bn_BD)" -msgstr "Bengali/Bengladesh (bn_BD)" +msgstr "Bengali/Bangladesh (bn_BD)" #: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Bodo (brx)" @@ -18498,7 +18470,7 @@ msgstr "Catalan (ca)" #: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Valencian Catalan (ca@valencia)" -msgstr "Catalan Valencien (ca@valencia)" +msgstr "Catalan valencien (ca@valencia)" #: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Chinese/China (zh_CN)" @@ -18813,10 +18785,9 @@ msgid "Set the language for menus and number formats" msgstr "Définit la langue pour les menus et les formats numériques" #: ../src/ui/dialog/inkscape-preferences.cpp:616 -#, fuzzy msgctxt "Icon size" msgid "Larger" -msgstr "Grand" +msgstr "Géant" #: ../src/ui/dialog/inkscape-preferences.cpp:616 msgctxt "Icon size" @@ -18950,26 +18921,26 @@ msgstr "Icônes et texte" #: ../src/ui/dialog/inkscape-preferences.cpp:666 msgid "Dockbar style (requires restart):" -msgstr "Style de barre détachable (nécessite un redémarrage) :" +msgstr "Style de barre d'ancrage (nécessite un redémarrage) :" #: ../src/ui/dialog/inkscape-preferences.cpp:667 msgid "" "Selects whether the vertical bars on the dockbar will show text labels, " "icons, or both" msgstr "" -"Défini si les barres verticales affichent dans la barre détachable des " -"labels, des icônes, ou les deux" +"Définit si les barres verticales affichent dans la barre d'ancrage des " +"libellés, des icônes, ou les deux" #: ../src/ui/dialog/inkscape-preferences.cpp:674 msgid "Switcher style (requires restart):" -msgstr "Style de bouton de commutation (nécessite un redémarrage)" +msgstr "Style de bouton de commutation (nécessite un redémarrage) :" #: ../src/ui/dialog/inkscape-preferences.cpp:675 msgid "" "Selects whether the dockbar switcher will show text labels, icons, or both" msgstr "" -"Défini si les sélecteurs de boîtes de dialogue affichent dans la barre " -"détachable des labels, des icônes, ou les deux" +"Définit si les sélecteurs de boîtes de dialogue affichent dans la barre " +"d'ancrage des libellés, des icônes, ou les deux" #. Windows #: ../src/ui/dialog/inkscape-preferences.cpp:679 @@ -18997,7 +18968,7 @@ msgstr "Ne pas enregistrer l'état des boîtes de dialogue" #: ../src/ui/dialog/inkscape-preferences.cpp:686 #: ../src/ui/dialog/inkscape-preferences.cpp:728 msgid "Dockable" -msgstr "Attachable" +msgstr "Ancrables" #: ../src/ui/dialog/inkscape-preferences.cpp:690 msgid "Native open/save dialogs" @@ -19013,7 +18984,7 @@ msgstr "Les dialogues sont cachés dans la barre des tâches" #: ../src/ui/dialog/inkscape-preferences.cpp:694 msgid "Save and restore documents viewport" -msgstr "Enregistrer et restaurer l'état des boîtes de dialogue" +msgstr "Enregistrer et restaurer la zone affichée des documents" #: ../src/ui/dialog/inkscape-preferences.cpp:695 msgid "Zoom when window is resized" @@ -19021,7 +18992,7 @@ msgstr "Zoomer quand la fenêtre est redimensionnée" #: ../src/ui/dialog/inkscape-preferences.cpp:696 msgid "Show close button on dialogs" -msgstr "Afficher un bouton de fermeture sur les dialogues" +msgstr "Afficher un bouton de fermeture sur les boîtes de dialogues" #: ../src/ui/dialog/inkscape-preferences.cpp:697 msgctxt "Dialog on top" @@ -19163,7 +19134,7 @@ msgid "" msgstr "" "Si coché, le dessin est rezoomé quand la fenêtre est redimensionnée, pour " "garder visible la même aire (c'est l'option par défaut qui peut être changée " -"dans toute fenêtre en utilisant le boutton au dessus de la barre de " +"dans toute fenêtre en utilisant le bouton au-dessus de la barre de " "défilement de droite)" #: ../src/ui/dialog/inkscape-preferences.cpp:767 @@ -19171,6 +19142,8 @@ msgid "" "Save documents viewport (zoom and panning position). Useful to turn off when " "sharing version controlled files." msgstr "" +"Enregistrer la zone affichée des documents (le zoom et la position). Utile à " +"désactiver lors du partage de fichiers dans un dépôt versionné." #: ../src/ui/dialog/inkscape-preferences.cpp:769 msgid "Whether dialog windows have a close button (requires restart)" @@ -19204,7 +19177,7 @@ msgstr "Réglages par défaut de la grille" #: ../src/ui/dialog/inkscape-preferences.cpp:786 #: ../src/ui/dialog/inkscape-preferences.cpp:811 msgid "Grid units:" -msgstr "Unités de la grille :" +msgstr "Unité de la grille :" #: ../src/ui/dialog/inkscape-preferences.cpp:791 #: ../src/ui/dialog/inkscape-preferences.cpp:816 @@ -19270,7 +19243,7 @@ msgstr "Entrée/sortie" #: ../src/ui/dialog/inkscape-preferences.cpp:891 msgid "Use current directory for \"Save As ...\"" -msgstr "« Enregistrer sous... » utilise le dossier courant " +msgstr "« Enregistrer sous... » utilise le répertoire en cours" #: ../src/ui/dialog/inkscape-preferences.cpp:893 msgid "" @@ -19327,7 +19300,7 @@ msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:908 msgid "_Click/drag threshold:" -msgstr "_Seuil de cliquer-déplacer :" +msgstr "_Seuil de cliquer-glisser :" #: ../src/ui/dialog/inkscape-preferences.cpp:908 #: ../src/ui/dialog/inkscape-preferences.cpp:1250 @@ -19736,7 +19709,7 @@ msgstr "Préserver la composante N dans les transformaitons CMJN > CMJN" #: ../src/ui/dialog/inkscape-preferences.cpp:1091 #: ../src/ui/widget/color-icc-selector.cpp:394 -#: ../src/ui/widget/color-icc-selector.cpp:685 +#: ../src/ui/widget/color-icc-selector.cpp:699 msgid "" msgstr "" @@ -19880,11 +19853,11 @@ msgstr "Sélectionner dans tous les calques" #: ../src/ui/dialog/inkscape-preferences.cpp:1195 msgid "Select only within current layer" -msgstr "Sélectionner seulement dans le calque courant" +msgstr "Sélectionner seulement dans le calque actif" #: ../src/ui/dialog/inkscape-preferences.cpp:1196 msgid "Select in current layer and sublayers" -msgstr "Sélectionner dans le calque courant et ses sous-calques" +msgstr "Sélectionner dans le calque actif et ses sous-calques" #: ../src/ui/dialog/inkscape-preferences.cpp:1197 msgid "Ignore hidden objects and layers" @@ -19903,8 +19876,8 @@ msgid "" "Uncheck this to be able to keep the current objects selected when the " "current layer changes" msgstr "" -"Si décoché, les objets sélectionnés restent sélectionnés lorsque vous passez " -"du calque courant à un autre" +"Si décoché, les objets sélectionnés restent sélectionnés lorsque le calque " +"actif change" #: ../src/ui/dialog/inkscape-preferences.cpp:1204 msgid "Ctrl+A, Tab, Shift+Tab" @@ -19913,22 +19886,22 @@ msgstr "Ctrl+A, Tab, Maj+Tab" #: ../src/ui/dialog/inkscape-preferences.cpp:1206 msgid "Make keyboard selection commands work on objects in all layers" msgstr "" -"Les commandes de sélection au clavier s'appliquent aux objets dans tous les " +"Appliquer les commandes de sélection au clavier aux objets de tous les " "calques" #: ../src/ui/dialog/inkscape-preferences.cpp:1208 msgid "Make keyboard selection commands work on objects in current layer only" msgstr "" -"Les commandes de sélection au clavier s'appliquent seulement dans le calque " -"courant" +"Appliquer les commandes de sélection au clavier aux objets du calque actif " +"uniquement" #: ../src/ui/dialog/inkscape-preferences.cpp:1210 msgid "" "Make keyboard selection commands work on objects in current layer and all " "its sublayers" msgstr "" -"Les commandes de sélection au clavier s'appliquent seulement dans le calque " -"courant et dans ses sous-calques" +"Appliquer les commandes de sélection au clavier aux objets du calque actif " +"et de ses sous-calques" #: ../src/ui/dialog/inkscape-preferences.cpp:1212 msgid "" @@ -19948,7 +19921,7 @@ msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1216 msgid "Wrap when cycling objects in z-order" -msgstr "Défilement continu des objets dans le plan" +msgstr "Cycler lors de la sélection des objets par ordre d'empilement" #: ../src/ui/dialog/inkscape-preferences.cpp:1218 msgid "Alt+Scroll Wheel" @@ -19957,8 +19930,8 @@ msgstr "Alt+molette" #: ../src/ui/dialog/inkscape-preferences.cpp:1220 msgid "Wrap around at start and end when cycling objects in z-order" msgstr "" -"Défile la sélection des objets dans le plan en continu, sans arrêt aux " -"objets placés aux extrémités du plan" +"Passer au premier après le dernier et au dernier avant le premier lors de la " +"sélection des objets par ordre d'empilement" #: ../src/ui/dialog/inkscape-preferences.cpp:1222 msgid "Selecting" @@ -19980,7 +19953,7 @@ msgstr "Transformer les dégradés" #: ../src/ui/dialog/inkscape-preferences.cpp:1228 msgid "Transform patterns" -msgstr "Transformer les motifs de remplissage" +msgstr "Transformer les motifs" #: ../src/ui/dialog/inkscape-preferences.cpp:1230 msgid "Preserved" @@ -20003,13 +19976,12 @@ msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1237 #: ../src/widgets/select-toolbar.cpp:587 msgid "Move gradients (in fill or stroke) along with the objects" -msgstr "Transformer les dégradés avec les objets (fond et contour)" +msgstr "Déplacer les dégradés (dans le fond ou le contour) avec les objets" #: ../src/ui/dialog/inkscape-preferences.cpp:1239 #: ../src/widgets/select-toolbar.cpp:598 msgid "Move patterns (in fill or stroke) along with the objects" -msgstr "" -"Transformer les motifs de remplissage avec les objets (fond et contour)" +msgstr "Déplacer les motifs (dans le fond ou le contour) avec les objets" #: ../src/ui/dialog/inkscape-preferences.cpp:1240 msgid "Store transformation" @@ -20047,7 +20019,7 @@ msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1252 msgid "Ctrl+arrows" -msgstr "Ctrl+flèches" +msgstr "Ctrl+flèche" #: ../src/ui/dialog/inkscape-preferences.cpp:1254 msgid "Sc_roll by:" @@ -20056,7 +20028,7 @@ msgstr "Défile_r de :" #: ../src/ui/dialog/inkscape-preferences.cpp:1255 msgid "Pressing Ctrl+arrow key scrolls by this distance (in screen pixels)" msgstr "" -"Appuyer sur Ctrl+flèches fait défiler de cette distance (en pixels d'écran)" +"Appuyer sur Ctrl+flèche fait défiler de cette distance (en pixels d'écran)" #: ../src/ui/dialog/inkscape-preferences.cpp:1257 msgid "_Acceleration:" @@ -20067,7 +20039,7 @@ msgid "" "Pressing and holding Ctrl+arrow will gradually speed up scrolling (0 for no " "acceleration)" msgstr "" -"Garder appuyé Ctrl+flèches accélère graduellement la vitesse du défilement " +"Garder appuyé Ctrl+flèche accélèrera graduellement la vitesse du défilement " "(0 pour aucune accélération)" #: ../src/ui/dialog/inkscape-preferences.cpp:1259 @@ -20097,19 +20069,19 @@ msgid "" "autoscroll; positive is outside the canvas, negative is within the canvas" msgstr "" "Distance (en pixels d'écran) à laquelle il faut être du bord de la zone de " -"travail pour activer le défilement automatique; les valeurs positives sont " +"travail pour activer le défilement automatique ; les valeurs positives sont " "en dehors de la zone, les négatives à l'intérieur" #: ../src/ui/dialog/inkscape-preferences.cpp:1266 -#, fuzzy msgid "Mouse move pans when Space is pressed" msgstr "" -"Le bouton gauche de la souris fait défiler horizontalement quand la touche " -"Espace est pressée" +"Le bouton gauche de la souris fait défiler quand la touche Espace est " +"enfoncée" #: ../src/ui/dialog/inkscape-preferences.cpp:1268 msgid "When on, pressing and holding Space and dragging pans canvas" msgstr "" +"Si coché, maintenir la touche Espace et cliquer-glisser déplace le canevas" #: ../src/ui/dialog/inkscape-preferences.cpp:1269 msgid "Mouse wheel zooms by default" @@ -20153,7 +20125,7 @@ msgstr "Fixe la durée d'affichage du message de l'indicateur de magnétisme" #: ../src/ui/dialog/inkscape-preferences.cpp:1287 msgid "What should snap" -msgstr "" +msgstr "Ce qui devrait s'aimanter" #: ../src/ui/dialog/inkscape-preferences.cpp:1289 msgid "Only snap the node closest to the pointer" @@ -20238,12 +20210,11 @@ msgstr "Appuyer sur > ou < redimensionne de cet incrément" #: ../src/ui/dialog/inkscape-preferences.cpp:1319 msgid "_Inset/Outset by:" -msgstr "_Contracter/dilater de :" +msgstr "_Éroder/dilater de :" #: ../src/ui/dialog/inkscape-preferences.cpp:1320 msgid "Inset and Outset commands displace the path by this distance" -msgstr "" -"Les commandes contracter et dilater déplacent le chemin de cette distance" +msgstr "Les commandes éroder et dilater déplacent le chemin de cette distance" #: ../src/ui/dialog/inkscape-preferences.cpp:1321 msgid "Compass-like display of angles" @@ -20294,7 +20265,7 @@ msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1335 msgid "_Zoom in/out by:" -msgstr "(Dé)_Zoomer de :" +msgstr "(Dé)_zoomer de :" #: ../src/ui/dialog/inkscape-preferences.cpp:1335 #: ../src/ui/dialog/objects.cpp:1630 @@ -20307,8 +20278,7 @@ msgid "" "Zoom tool click, +/- keys, and middle click zoom in and out by this " "multiplier" msgstr "" -"Les outils de zoom (clic en mode zoom, touches +/-, clic bouton du milieu) " -"zooment ou dézooment selon ce facteur" +"L'outil de zoom et les touches +/- zooment ou dézooment selon ce facteur" #: ../src/ui/dialog/inkscape-preferences.cpp:1337 msgid "Steps" @@ -20337,7 +20307,7 @@ msgstr "Sont supprimés" #: ../src/ui/dialog/inkscape-preferences.cpp:1351 msgid "Moving original: clones and linked offsets" -msgstr "Lorsque l'original est déplacé, ses clones et ses offsets liés" +msgstr "Lorsque l'original est déplacé, ses clones et ses décalages liés" #: ../src/ui/dialog/inkscape-preferences.cpp:1353 msgid "Clones are translated by the same vector as their original" @@ -20371,7 +20341,8 @@ msgstr "Les clones orphelins sont supprimés en même temps que leur original" #: ../src/ui/dialog/inkscape-preferences.cpp:1364 msgid "Duplicating original+clones/linked offset" msgstr "" -"Lors de la duplication d'un original et de ses clones ou de ses offsets liés" +"Lors de la duplication d'un original et de ses clones ou de ses décalages " +"liés" #: ../src/ui/dialog/inkscape-preferences.cpp:1366 msgid "Relink duplicated clones" @@ -20474,6 +20445,8 @@ msgid "" "Stroke color same as object, fill color either object fill color or marker " "fill color" msgstr "" +"Couleur de contour identique à celle l'objet, couleur de fond identique à " +"celle de l'objet ou à la couleur de fond du marqueur" #: ../src/ui/dialog/inkscape-preferences.cpp:1413 #: ../share/extensions/hershey.inx.h:27 @@ -20498,7 +20471,7 @@ msgstr "Nettoyage" #: ../src/ui/dialog/inkscape-preferences.cpp:1428 msgid "Number of _Threads:" -msgstr "Nombre de _threads :" +msgstr "Nombre de _fils d'exécution :" #: ../src/ui/dialog/inkscape-preferences.cpp:1428 #: ../src/ui/dialog/inkscape-preferences.cpp:1964 @@ -20508,8 +20481,8 @@ msgstr "(nécessite un redémarrage)" #: ../src/ui/dialog/inkscape-preferences.cpp:1429 msgid "Configure number of processors/threads to use when rendering filters" msgstr "" -"Configure le nombre de processeurs/threads à utiliser pour le rendu des " -"filtres" +"Configure le nombre de processeurs/fils d'exécution à utiliser pour le rendu " +"des filtres" #: ../src/ui/dialog/inkscape-preferences.cpp:1433 msgid "Rendering _cache size:" @@ -20566,13 +20539,13 @@ msgid "" "Best quality, but display may be very slow at high zooms (bitmap export " "always uses best quality)" msgstr "" -"La plus haute qualité, mais l'affichage peut être très lent pour des zooms " -"importants (l'export en bitmap utilise toujours la plus haute qualité)" +"Plus haute qualité, mais l'affichage peut être très lent à des zooms élevés " +"(l'export en matriciel utilise toujours la meilleure qualité)" #: ../src/ui/dialog/inkscape-preferences.cpp:1451 #: ../src/ui/dialog/inkscape-preferences.cpp:1475 msgid "Better quality, but slower display" -msgstr "Meilleure qualité, mais affichage plus lent" +msgstr "Haute qualité, mais affichage plus lent" #: ../src/ui/dialog/inkscape-preferences.cpp:1453 #: ../src/ui/dialog/inkscape-preferences.cpp:1477 @@ -20582,14 +20555,13 @@ msgstr "Qualité moyenne, vitesse d'affichage acceptable" #: ../src/ui/dialog/inkscape-preferences.cpp:1455 #: ../src/ui/dialog/inkscape-preferences.cpp:1479 msgid "Lower quality (some artifacts), but display is faster" -msgstr "Qualité plus faible (présence d'artefacts), mais affichage plus rapide" +msgstr "Basse qualité (présence d'artefacts), mais affichage plus rapide" #: ../src/ui/dialog/inkscape-preferences.cpp:1457 #: ../src/ui/dialog/inkscape-preferences.cpp:1481 msgid "Lowest quality (considerable artifacts), but display is fastest" msgstr "" -"La plus mauvaise qualité (nombreux artefacts), mais l'affichage est bien " -"plus rapide" +"Plus basse qualité (nombreux artefacts), mais affichage bien plus rapide" #: ../src/ui/dialog/inkscape-preferences.cpp:1471 msgid "Filter effects quality for display" @@ -20609,7 +20581,7 @@ msgstr "Édition" #: ../src/ui/dialog/inkscape-preferences.cpp:1490 msgid "Automatically reload bitmaps" -msgstr "Recharger automatiquement les bitmaps" +msgstr "Recharger automatiquement les objets matriciels" #: ../src/ui/dialog/inkscape-preferences.cpp:1492 msgid "Automatically reload linked images when file is changed on disk" @@ -20619,7 +20591,7 @@ msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1494 msgid "_Bitmap editor:" -msgstr "Éditeur de _bitmap :" +msgstr "Éditeur d'images _matricielles :" #: ../src/ui/dialog/inkscape-preferences.cpp:1496 #: ../share/extensions/guillotine.inx.h:5 ../share/extensions/plotter.inx.h:65 @@ -20643,16 +20615,15 @@ msgstr "Créer" #: ../src/ui/dialog/inkscape-preferences.cpp:1502 msgid "Resolution for Create Bitmap _Copy:" -msgstr "Résolution pour _Créer une copie bitmap :" +msgstr "Résolution pour _Créer une copie matricielle :" #: ../src/ui/dialog/inkscape-preferences.cpp:1503 msgid "Resolution used by the Create Bitmap Copy command" -msgstr "Résolution utilisée par la commande Créer une copie bitmap" +msgstr "Résolution utilisée par la commande Créer une copie matricielle" #: ../src/ui/dialog/inkscape-preferences.cpp:1506 msgid "Ask about linking and scaling when importing" -msgstr "" -"Demander les options de lien et de mise à l'échelle lors de l'importation" +msgstr "Demander pour le lien et la mise à l'échelle à chaque importation" #: ../src/ui/dialog/inkscape-preferences.cpp:1508 msgid "Pop-up linking and scaling dialog when importing bitmap image." @@ -20662,21 +20633,21 @@ msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1514 msgid "Bitmap link:" -msgstr "Importation de bitmap :" +msgstr "Importation d'image matricielle :" #: ../src/ui/dialog/inkscape-preferences.cpp:1521 msgid "Bitmap scale (image-rendering):" -msgstr "Mise à l'échelle bitmap (rendu de l'image) :" +msgstr "Mise à l'échelle des images matricielles (rendu) :" #: ../src/ui/dialog/inkscape-preferences.cpp:1526 msgid "Default _import resolution:" -msgstr "Résolution par défaut d'_importation :" +msgstr "Résolution d'_importation par défaut :" #: ../src/ui/dialog/inkscape-preferences.cpp:1527 msgid "Default bitmap resolution (in dots per inch) for bitmap import" msgstr "" -"Résolution bitmap par défaut (point par pouce) dans la boîte de dialogue " -"importer" +"Résolution par défaut des images matricielles (en points par pouce) pour " +"l'import" #: ../src/ui/dialog/inkscape-preferences.cpp:1528 msgid "Override file resolution" @@ -20703,16 +20674,15 @@ msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1537 msgid "Bitmaps" -msgstr "Bitmaps" +msgstr "Matriciel" #: ../src/ui/dialog/inkscape-preferences.cpp:1549 -#, fuzzy msgid "" "Select a file of predefined shortcuts to use. Any customized shortcuts you " "create will be added separately to " msgstr "" -"Sélectionnez un fichier de raccourcis prédéfinis à utiliser. Vos " -"modifications seront ajoutées séparément" +"Sélectionnez un fichier de raccourcis prédéfinis à utiliser. Les raccourcis " +"personnalisés que vous créerez seront ajoutés séparément à " #: ../src/ui/dialog/inkscape-preferences.cpp:1552 msgid "Shortcut file:" @@ -21032,17 +21002,14 @@ msgid "None" msgstr "Aucun" #: ../src/ui/dialog/knot-properties.cpp:59 -#, fuzzy msgid "Position X:" -msgstr "Position :" +msgstr "Coordonnée X :" #: ../src/ui/dialog/knot-properties.cpp:66 -#, fuzzy msgid "Position Y:" -msgstr "Position :" +msgstr "Coordonnée Y :" #: ../src/ui/dialog/knot-properties.cpp:120 -#, fuzzy msgid "Modify Knot Position" msgstr "Modifier la position du nœud" @@ -21054,14 +21021,14 @@ msgid "_Move" msgstr "Déplace_ment" #: ../src/ui/dialog/knot-properties.cpp:180 -#, fuzzy, c-format +#, c-format msgid "Position X (%s):" -msgstr "Position (%) :" +msgstr "Coordonnée X (%s) :" #: ../src/ui/dialog/knot-properties.cpp:181 -#, fuzzy, c-format +#, c-format msgid "Position Y (%s):" -msgstr "Position (%) :" +msgstr "Coordonnée Y (%s) :" #: ../src/ui/dialog/layer-properties.cpp:55 msgid "Layer name:" @@ -21073,15 +21040,15 @@ msgstr "Ajouter un calque" #: ../src/ui/dialog/layer-properties.cpp:176 msgid "Above current" -msgstr "Au-dessus du calque courant" +msgstr "Au-dessus du calque actif" #: ../src/ui/dialog/layer-properties.cpp:180 msgid "Below current" -msgstr "En-dessous du calque courant" +msgstr "En dessous du calque actif" #: ../src/ui/dialog/layer-properties.cpp:183 msgid "As sublayer of current" -msgstr "Comme sous-calque du calque courant" +msgstr "Comme sous-calque du calque actif" #: ../src/ui/dialog/layer-properties.cpp:352 msgid "Rename Layer" @@ -21266,7 +21233,7 @@ msgstr "Modifier le filet ou le chanfrein" #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:137 msgid "_Modify" -msgstr "_Modifer" +msgstr "_Modifier" #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:201 msgid "Radius" @@ -21317,7 +21284,7 @@ msgstr "Inconnu" #: ../src/ui/dialog/memory.cpp:167 msgid "Combined" -msgstr "Combinée" +msgstr "Somme" #: ../src/ui/dialog/memory.cpp:209 msgid "Recalculate" @@ -21325,7 +21292,7 @@ msgstr "Recalculer" #: ../src/ui/dialog/messages.cpp:47 msgid "Clear log messages" -msgstr "Nettoyer les messages de log" +msgstr "Nettoyer les journaux" #: ../src/ui/dialog/messages.cpp:81 msgid "Ready." @@ -21333,11 +21300,11 @@ msgstr "Prêt." #: ../src/ui/dialog/messages.cpp:174 msgid "Log capture started." -msgstr "Capture des logs démarrée." +msgstr "Capture des journaux démarrée." #: ../src/ui/dialog/messages.cpp:203 msgid "Log capture stopped." -msgstr "Capture des logs arrêtée." +msgstr "Capture des journaux arrêtée." #: ../src/ui/dialog/new-from-template.cpp:27 msgid "Create from template" @@ -21371,7 +21338,7 @@ msgstr "Afficher :" #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/linking.html#AElementXLinkActuateAttribute #: ../src/ui/dialog/object-attributes.cpp:60 msgid "Actuate:" -msgstr "Contenu non automatique :" +msgstr "Actionner :" #: ../src/ui/dialog/object-attributes.cpp:65 msgid "URL:" @@ -21431,9 +21398,9 @@ msgid "" "Note that this behaviour is not defined in the SVG 1.1 specification and not " "all browsers follow this interpretation." msgstr "" -"Ce paramètre peut joueur sur la façon dont un bitmap est agrandi :\n" -"\t'auto' pas de préférence;\n" -"\t'optimizeQuality' lissé;\n" +"Ce paramètre peut jouer sur la façon dont le matriciel est agrandi :\n" +"\t'auto' pas de préférence ;\n" +"\t'optimizeQuality' lissé ;\n" "\t'optimizeSpeed' pixélisé.\n" "Notez que ce comportement n'est pas défini dans la spécification SVG 1.1 et " "que tous les navigateurs ne suivent pas cette interprétation." @@ -21467,15 +21434,15 @@ msgstr "Réf" #: ../src/ui/dialog/object-properties.cpp:472 msgid "Id invalid! " -msgstr "Id invalide !" +msgstr "ID invalide !" #: ../src/ui/dialog/object-properties.cpp:474 msgid "Id exists! " -msgstr "Cet Id existe déjà !" +msgstr "Cet ID existe déjà !" #: ../src/ui/dialog/object-properties.cpp:480 msgid "Set object ID" -msgstr "Définir l'Id d'un objet" +msgstr "Définir l'ID d'un objet" #: ../src/ui/dialog/object-properties.cpp:494 msgid "Set object label" @@ -21589,35 +21556,40 @@ msgstr "Étiquette" #. In order to get tooltips on header, we must create our own label. #: ../src/ui/dialog/objects.cpp:1668 -#, fuzzy msgid "Toggle visibility of Layer, Group, or Object." -msgstr "Afficher le calque courant uniquement" +msgstr "Basculer la visibilité du calque, groupe ou objet." #: ../src/ui/dialog/objects.cpp:1681 msgid "Toggle lock of Layer, Group, or Object." -msgstr "" +msgstr "Basculer le verrouillage du calque, groupe ou objet." #: ../src/ui/dialog/objects.cpp:1693 msgid "" "Type: Layer, Group, or Object. Clicking on Layer or Group icon, toggles " "between the two types." msgstr "" +"Type : calque, groupe ou objet. Cliquer sur une icône de calque ou de groupe " +"bascule entre les deux types." #: ../src/ui/dialog/objects.cpp:1712 msgid "Is object clipped and/or masked?" -msgstr "" +msgstr "L'objet est-il découpé et/ou un masque est-il appliqué ?" #: ../src/ui/dialog/objects.cpp:1723 msgid "" "Highlight color of outline in Node tool. Click to set. If alpha is zero, use " "inherited color." msgstr "" +"Mettre en surbrillance la couleur de la bordure dans l'outil Nœuds. Cliquer " +"pour définir. Si la quantité d'alpha est nulle, utiliser la couleur héritée." #: ../src/ui/dialog/objects.cpp:1734 msgid "" "Layer/Group/Object label (inkscape:label). Double-click to set. Default " "value is object 'id'." msgstr "" +"Libellé du calque/groupe/objet (inkscape:label). Double-cliquer pour " +"définir. La valeur par défaut est l'ID de l'objet." #: ../src/ui/dialog/objects.cpp:1831 msgid "Add layer..." @@ -21628,19 +21600,16 @@ msgid "Remove object" msgstr "Supprimer l'objet" #: ../src/ui/dialog/objects.cpp:1846 -#, fuzzy msgid "Move To Bottom" -msgstr "Descendre à l'arrière-pl_an" +msgstr "Descendre à l'arrière-plan" #: ../src/ui/dialog/objects.cpp:1870 -#, fuzzy msgid "Move To Top" -msgstr "Mode déplacement" +msgstr "Monter au premier plan" #: ../src/ui/dialog/objects.cpp:1878 -#, fuzzy msgid "Collapse All" -msgstr "Efface_r tout" +msgstr "Tout réduire" #: ../src/ui/dialog/objects.cpp:1892 msgid "Rename" @@ -21648,7 +21617,7 @@ msgstr "Renommer" #: ../src/ui/dialog/objects.cpp:1898 msgid "Solo" -msgstr "" +msgstr "Un seul" #: ../src/ui/dialog/objects.cpp:1899 msgid "Show All" @@ -21816,7 +21785,7 @@ msgstr "Convertir en courbes _B-spline" #: ../src/ui/dialog/pixelartdialog.cpp:274 msgid "Preserve staircasing artifacts" -msgstr "Préserver les artefacts en marche d'escalier" +msgstr "Préserver les artefacts en marches d'escalier" #: ../src/ui/dialog/pixelartdialog.cpp:281 msgid "_Smooth curves" @@ -21952,7 +21921,7 @@ msgstr "Organiser sur une ellipse" #: ../src/ui/dialog/print.cpp:111 msgid "Could not open temporary PNG for bitmap printing" -msgstr "Impossible d'ouvrir un PNG temporaire pour imprimer en bitmap." +msgstr "Impossible d'ouvrir un PNG temporaire pour l'impression matricielle" #: ../src/ui/dialog/print.cpp:138 msgid "Could not set up Document" @@ -22292,14 +22261,12 @@ msgid "Add selection to set" msgstr "Ajouter la sélection à l'ensemble" #: ../src/ui/dialog/tags.cpp:824 -#, fuzzy msgid "Moved sets" -msgstr "Déplacements" +msgstr "Ensembles déplacés" #: ../src/ui/dialog/tags.cpp:1004 -#, fuzzy msgid "Add a new selection set" -msgstr "Ajouter un nouveau point de connexion" +msgstr "Ajouter un nouvel ensemble de sélection" #: ../src/ui/dialog/tags.cpp:1013 msgid "Remove Item/Set" @@ -22373,9 +22340,8 @@ msgid "Vertical text" msgstr "Texte vertical" #: ../src/ui/dialog/text-edit.cpp:130 ../src/ui/dialog/text-edit.cpp:131 -#, fuzzy msgid "Spacing between baselines (percent of font size)" -msgstr "Espacement entre les lignes (pourcentage de la taille de la police)" +msgstr "Espacement entre les lignes (en % de la taille de la police)" #: ../src/ui/dialog/text-edit.cpp:147 msgid "Text path offset" @@ -22516,7 +22482,8 @@ msgstr "_Adoucir" #: ../src/ui/dialog/tracedialog.cpp:653 msgid "Apply Gaussian blur to the bitmap before tracing" -msgstr "Appliquer un flou gaussien sur le bitmap avant de le vectoriser" +msgstr "" +"Appliquer un flou gaussien sur l'objet matriciel avant la vectorisation" #. TRANSLATORS: "Stack" is a verb here #: ../src/ui/dialog/tracedialog.cpp:657 @@ -22558,7 +22525,7 @@ msgstr "Supprimer les _parasites" #: ../src/ui/dialog/tracedialog.cpp:692 msgid "Ignore small spots (speckles) in the bitmap" -msgstr "Ignorer les petits points (parasites) présents dans le bitmap" +msgstr "Ignorer les petits points (parasites) présents dans l'objet matriciel" #: ../src/ui/dialog/tracedialog.cpp:700 msgid "Speckles of up to this many pixels will be suppressed" @@ -22616,7 +22583,7 @@ msgid "" "\n" "http://potrace.sourceforge.net" msgstr "" -"La vectorisation des bitmaps d'Inkscape\n" +"La vectorisation d'Inkscape\n" "s'appuie sur Potrace,\n" "créé par Peter Selinger\n" "\n" @@ -22650,8 +22617,8 @@ msgid "" "Preview the intermediate bitmap with the current settings, without actual " "tracing" msgstr "" -"Aperçu du bitmap intermédiaire avec les paramètres définis, sans " -"vectorisation effective" +"Aperçu de l'image matricielle intermédiaire avec les paramètres définis, " +"sans vectorisation effective" #: ../src/ui/dialog/tracedialog.cpp:800 msgid "Preview" @@ -22816,7 +22783,7 @@ msgstr "Tourner dans le sens horaire" #: ../src/ui/dialog/transformation.cpp:970 #: ../src/ui/dialog/transformation.cpp:994 msgid "Transform matrix is singular, not used." -msgstr "" +msgstr "La matrice de transformation est singulière, non utilisée." #: ../src/ui/dialog/transformation.cpp:1010 msgid "Edit transformation matrix" @@ -22854,7 +22821,7 @@ msgstr "Définir" #: ../src/ui/dialog/xml-tree.cpp:121 msgid "Drag to reorder nodes" -msgstr "Cliquer-déplacer pour réorganiser les nœuds" +msgstr "Cliquer-glisser pour réorganiser les nœuds" #: ../src/ui/dialog/xml-tree.cpp:154 ../src/ui/dialog/xml-tree.cpp:155 #: ../src/ui/dialog/xml-tree.cpp:1143 @@ -22887,7 +22854,7 @@ msgstr "Valeur de l'attribut" #: ../src/ui/dialog/xml-tree.cpp:319 msgid "Click to select nodes, drag to rearrange." msgstr "" -"Cliquer pour sélectionner des nœuds, cliquer-déplacer pour les " +"Cliquer pour sélectionner des nœuds, cliquer-glisser pour les " "déplacer." #: ../src/ui/dialog/xml-tree.cpp:330 @@ -22990,7 +22957,7 @@ msgstr "Déposer le symbole" #: ../src/ui/interface.cpp:1303 msgid "Drop bitmap image" -msgstr "Déposer une image bitmap" +msgstr "Déposer une image matricielle" #: ../src/ui/interface.cpp:1395 #, c-format @@ -23000,10 +22967,10 @@ msgid "" "\n" "The file already exists in \"%s\". Replacing it will overwrite its contents." msgstr "" -"Le fichier « %s » existe déjà.\n" -"Voulez-vous l'écraser ?\n" +"Le fichier « %s » existe déjà. Voulez-" +"vous l'écraser ?\n" "\n" -"Le fichier existe déjà dans « %s ». Le remplacer écrase son contenu." +"Le fichier existe déjà dans « %s ». Le remplacer écrasera son contenu." #: ../src/ui/interface.cpp:1402 ../share/extensions/web-set-att.inx.h:21 #: ../share/extensions/web-transmit-att.inx.h:19 @@ -23021,9 +22988,8 @@ msgstr "Entrer dans le groupe #%1" #. Pop selection out of group #: ../src/ui/interface.cpp:1528 -#, fuzzy msgid "_Pop selection out of group" -msgstr "_Manipuler la sélection comme un groupe :" +msgstr "_Sortir la sélection du groupe" #. Item dialog #: ../src/ui/interface.cpp:1656 ../src/verbs.cpp:2940 @@ -23080,9 +23046,8 @@ msgstr "Retirer le masque" #. SSet Clip Group #: ../src/ui/interface.cpp:1776 -#, fuzzy msgid "Create Clip G_roup" -msgstr "Créer un clo_ne" +msgstr "Créer un g_roupe de découpe" #. Set Clip #: ../src/ui/interface.cpp:1783 @@ -23141,7 +23106,7 @@ msgstr "Éditer avec un logiciel externe..." #. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) #: ../src/ui/interface.cpp:2009 ../src/verbs.cpp:2628 msgid "_Trace Bitmap..." -msgstr "Vec_toriser le bitmap..." +msgstr "Vec_toriser un objet matriciel..." #. Trace Pixel Art #: ../src/ui/interface.cpp:2018 @@ -23173,7 +23138,7 @@ msgstr "_Texte et police..." #. Spellcheck dialog #: ../src/ui/interface.cpp:2215 ../src/verbs.cpp:2930 msgid "Check Spellin_g..." -msgstr "Vérification ortho_graphique..." +msgstr "Vérifier l'ortho_graphe..." #: ../src/ui/object-edit.cpp:450 msgid "" @@ -23291,26 +23256,27 @@ msgstr "" #: ../src/ui/object-edit.cpp:1398 msgid "Adjust the offset distance" -msgstr "Ajuster la distance d'offset" +msgstr "Ajuster la distance de décalage" #: ../src/ui/object-edit.cpp:1435 msgid "Drag to resize the flowed text frame" -msgstr "Cliquer-déplacer pour redimensionner le cadre du texte" +msgstr "Cliquer-glisser pour redimensionner le cadre du texte" #: ../src/ui/tool/curve-drag-point.cpp:131 msgid "Drag curve" msgstr "Déplacer la courbe" #: ../src/ui/tool/curve-drag-point.cpp:192 -#, fuzzy msgctxt "Path segment tip" msgid "Shift: drag to open or move BSpline handles" -msgstr "Déplacer les poignées de nœuds" +msgstr "" +"Maj : cliquer-glisser pour ouvrir ou déplacer les poignées de la B-" +"spline" #: ../src/ui/tool/curve-drag-point.cpp:196 msgctxt "Path segment tip" msgid "Shift: click to toggle segment selection" -msgstr "Maj : cliquer pour inverser l'état de sélection" +msgstr "Maj : cliquer pour inverser l'état de sélection du segment" #: ../src/ui/tool/curve-drag-point.cpp:200 msgctxt "Path segment tip" @@ -23318,15 +23284,14 @@ msgid "Ctrl+Alt: click to insert a node" msgstr "Ctrl+Alt : cliquer pour insérer un nœud" #: ../src/ui/tool/curve-drag-point.cpp:204 -#, fuzzy msgctxt "Path segment tip" msgid "" "BSpline segment: drag to shape the segment, doubleclick to insert " "node, click to select (more: Shift, Ctrl+Alt)" msgstr "" -"Segment de Bézier : cliquer-déplacer pour modeler le segment, double-" -"cliquer pour insérer un nœud, cliquer pour sélectionner (modificateurs : " -"Maj, Ctrl+Alt)" +"Segment de B-spline : cliquer-glisser pour modeler le segment, double-" +"cliquer pour insérer un nœud, cliquer pour sélectionner (plus : Maj, Ctrl" +"+Alt)" #: ../src/ui/tool/curve-drag-point.cpp:209 msgctxt "Path segment tip" @@ -23334,9 +23299,9 @@ msgid "" "Linear segment: drag to convert to a Bezier segment, doubleclick to " "insert node, click to select (more: Shift, Ctrl+Alt)" msgstr "" -"Segment linéaire : cliquer-déplacer pour convertir en segment de " +"Segment linéaire : cliquer-glisser pour convertir en segment de " "Bézier, double-cliquer pour insérer un nœud, cliquer pour sélectionner " -"(modificateurs : Maj, Ctrl+Alt)" +"(plus : Maj, Ctrl+Alt)" #: ../src/ui/tool/curve-drag-point.cpp:213 msgctxt "Path segment tip" @@ -23344,9 +23309,9 @@ msgid "" "Bezier segment: drag to shape the segment, doubleclick to insert " "node, click to select (more: Shift, Ctrl+Alt)" msgstr "" -"Segment de Bézier : cliquer-déplacer pour modeler le segment, double-" -"cliquer pour insérer un nœud, cliquer pour sélectionner (modificateurs : " -"Maj, Ctrl+Alt)" +"Segment de Bézier : cliquer-glisser pour modeler le segment, double-" +"cliquer pour insérer un nœud, cliquer pour sélectionner (plus : Maj, Ctrl" +"+Alt)" #: ../src/ui/tool/multi-path-manipulator.cpp:315 msgid "Retract handles" @@ -23455,18 +23420,17 @@ msgstr "Poignée de nœud automatique" #: ../src/ui/tool/node.cpp:494 msgctxt "Path handle tip" msgid "more: Shift, Ctrl, Alt" -msgstr "modificateurs : Maj, Ctrl, Alt" +msgstr "plus : Maj, Ctrl, Alt" #: ../src/ui/tool/node.cpp:496 -#, fuzzy msgctxt "Path handle tip" msgid "more: Ctrl" -msgstr "modificateurs : Ctrl, Alt" +msgstr "plus : Ctrl" #: ../src/ui/tool/node.cpp:498 msgctxt "Path handle tip" msgid "more: Ctrl, Alt" -msgstr "modificateurs : Ctrl, Alt" +msgstr "plus : Ctrl, Alt" #: ../src/ui/tool/node.cpp:504 #, c-format @@ -23476,7 +23440,7 @@ msgid "" "increments while rotating both handles" msgstr "" "Maj+Ctrl+Alt : préserver la longueur et forcer l'incrément de l'angle " -"de rotation à %g ° lorsque les deux poignées sont tournées" +"de rotation à %g° lorsque les deux poignées sont tournées" #: ../src/ui/tool/node.cpp:509 #, c-format @@ -23485,7 +23449,7 @@ msgid "" "Ctrl+Alt: preserve length and snap rotation angle to %g° increments" msgstr "" "Ctrl+Alt : préserver la longueur et forcer l'incrément de l'angle de " -"rotation à %g °" +"rotation à %g°" #: ../src/ui/tool/node.cpp:515 msgctxt "Path handle tip" @@ -23506,62 +23470,64 @@ msgid "" "Shift+Ctrl: snap rotation angle to %g° increments and rotate both " "handles" msgstr "" -"Maj+Ctrl : forcer l'incrément de l'angle de rotation à %g ° et " -"tourner les deux poignées" +"Maj+Ctrl : forcer l'incrément de l'angle de rotation à %g° et tourner " +"les deux poignées" #: ../src/ui/tool/node.cpp:529 msgctxt "Path handle tip" msgid "Ctrl: Snap handle to steps defined in BSpline Live Path Effect" msgstr "" +"Ctrl : aimanter les poignées aux étapes définies dans l'effet de " +"chemin interactif B-spline" #: ../src/ui/tool/node.cpp:532 #, c-format msgctxt "Path handle tip" msgid "Ctrl: snap rotation angle to %g° increments, click to retract" msgstr "" -"Ctrl : forcer l'incrément de l'angle de rotation à %g °, cliquer pour " +"Ctrl : forcer l'incrément de l'angle de rotation à %g°, cliquer pour " "rétracter" #: ../src/ui/tool/node.cpp:537 msgctxt "Path hande tip" msgid "Shift: rotate both handles by the same angle" -msgstr "Maj : applique une rotation d'angle identique aux deux poignées" +msgstr "" +"Maj : appliquer une rotation d'angle identique aux deux poignées" #: ../src/ui/tool/node.cpp:540 -#, fuzzy msgctxt "Path hande tip" msgid "Shift: move handle" -msgstr "Déplacer les poignées de nœuds" +msgstr "Maj : déplacer la poignée" #: ../src/ui/tool/node.cpp:547 ../src/ui/tool/node.cpp:551 #, c-format msgctxt "Path handle tip" msgid "Auto node handle: drag to convert to smooth node (%s)" msgstr "" -"Poignées de nœud automatique : cliquer-déplacer pour convertir en " -"nœud doux (%s)" +"Poignée de nœud automatique : cliquer-glisser pour convertir en nœud " +"doux (%s)" #: ../src/ui/tool/node.cpp:554 -#, fuzzy, c-format +#, c-format msgctxt "Path handle tip" msgid "" "BSpline node handle: Shift to drag, double click to reset (%s). %g " "power" msgstr "" -"Poignées de nœud automatique : cliquer-déplacer pour convertir en " -"nœud doux (%s)" +"Poignée de nœud de B-spline : Maj pour déplacer, double-clic pour " +"réinitialiser (%s). %g puissance" #: ../src/ui/tool/node.cpp:574 #, c-format msgctxt "Path handle tip" msgid "Move handle by %s, %s; angle %.2f°, length %s" -msgstr "Déplacement des poignées de %s, %s; angle %.2f°, longueur %s" +msgstr "Déplacement des poignées de %s, %s ; angle %.2f°, longueur %s" #: ../src/ui/tool/node.cpp:1425 msgctxt "Path node tip" msgid "Shift: drag out a handle, click to toggle selection" msgstr "" -"Maj : cliquer-déplacer pour étirer une poignée, cliquer pour inverser " +"Maj : cliquer-glisser pour étirer une poignée, cliquer pour inverser " "l'état de sélection" #: ../src/ui/tool/node.cpp:1427 @@ -23592,18 +23558,17 @@ msgstr "Alt : sculpter les nœuds" msgctxt "Path node tip" msgid "%s: drag to shape the path (more: Shift, Ctrl, Alt)" msgstr "" -"%s : cliquer-déplacer pour modeler le chemin (modificateurs : Maj, " -"Ctrl, Alt)" +"%s : cliquer-glisser pour modeler le chemin (plus : Maj, Ctrl, Alt)" #: ../src/ui/tool/node.cpp:1451 -#, fuzzy, c-format +#, c-format msgctxt "Path node tip" msgid "" "BSpline node: drag to shape the path (more: Shift, Ctrl, Alt). %g " "power" msgstr "" -"%s : cliquer-déplacer pour modeler le chemin (modificateurs : Maj, " -"Ctrl, Alt)" +"Nœud de B-spline : déplacer pour modeler le chemin (plus : Maj, Ctrl, " +"Alt). %g puissance" #: ../src/ui/tool/node.cpp:1454 #, c-format @@ -23612,9 +23577,8 @@ msgid "" "%s: drag to shape the path, click to toggle scale/rotation handles " "(more: Shift, Ctrl, Alt)" msgstr "" -"%s : cliquer-déplacer pour modeler le chemin, cliquer pour basculer " -"entre les poignées de sélection et de rotation (modificateurs : Maj, Ctrl, " -"Alt)" +"%s : cliquer-glisser pour modeler le chemin, cliquer pour basculer " +"entre les poignées de sélection et de rotation (plus : Maj, Ctrl, Alt)" #: ../src/ui/tool/node.cpp:1458 #, c-format @@ -23623,18 +23587,18 @@ msgid "" "%s: drag to shape the path, click to select only this node (more: " "Shift, Ctrl, Alt)" msgstr "" -"%s : cliquer-déplacer pour modeler le chemin, cliquer pour " -"sélectionner seulement ce nœud (modificateurs : Maj, Ctrl, Alt)" +"%s : cliquer-glisser pour modeler le chemin, cliquer pour " +"sélectionner seulement ce nœud (plus : Maj, Ctrl, Alt)" #: ../src/ui/tool/node.cpp:1461 -#, fuzzy, c-format +#, c-format msgctxt "Path node tip" msgid "" "BSpline node: drag to shape the path, click to select only this node " "(more: Shift, Ctrl, Alt). %g power" msgstr "" -"%s : cliquer-déplacer pour modeler le chemin, cliquer pour " -"sélectionner seulement ce nœud (modificateurs : Maj, Ctrl, Alt)" +"Nœud de B-spline : cliquer-glisser pour modeler le chemin, cliquer " +"pour sélectionner seulement ce nœud (plus : Maj, Ctrl, Alt). %g puissance" #: ../src/ui/tool/node.cpp:1474 #, c-format @@ -23683,7 +23647,7 @@ msgstr "Retracter la poignée" msgctxt "Transform handle tip" msgid "Shift+Ctrl: scale uniformly about the rotation center" msgstr "" -"Maj+Ctrl : redimensionne uniformément autour du centre de rotation" +"Maj+Ctrl : redimensionner uniformément autour du centre de rotation" #: ../src/ui/tool/transform-handle-set.cpp:205 msgctxt "Transform handle tip" @@ -23695,8 +23659,8 @@ msgctxt "Transform handle tip" msgid "" "Shift+Alt: scale using an integer ratio about the rotation center" msgstr "" -"Maj+Alt : redimensionne conformément à un rapport entier autour du " -"centre de rotation" +"Maj+Alt : redimensionne avec un facteur entier autour du centre de " +"rotation" #: ../src/ui/tool/transform-handle-set.cpp:212 msgctxt "Transform handle tip" @@ -23706,20 +23670,20 @@ msgstr "Maj : redimensionner à partir du centre de rotation" #: ../src/ui/tool/transform-handle-set.cpp:215 msgctxt "Transform handle tip" msgid "Alt: scale using an integer ratio" -msgstr "Alt : redimensionne conformément à un rapport entier" +msgstr "Alt : redimensionner avec un facteur entier" #: ../src/ui/tool/transform-handle-set.cpp:217 msgctxt "Transform handle tip" msgid "Scale handle: drag to scale the selection" msgstr "" -"Poignée de redimensionnement : cliquer-déplacer pour redimensionner " -"la sélection" +"Poignée de mise à l'échelle : cliquer-glisser pour redimensionner la " +"sélection" #: ../src/ui/tool/transform-handle-set.cpp:222 #, c-format msgctxt "Transform handle tip" msgid "Scale by %.2f%% x %.2f%%" -msgstr "Redimensionnement de %.2f%% x %.2f%%" +msgstr "Redimensionner de %.2f %% × %.2f %%" #: ../src/ui/tool/transform-handle-set.cpp:449 #, c-format @@ -23727,18 +23691,18 @@ msgctxt "Transform handle tip" msgid "" "Shift+Ctrl: rotate around the opposite corner and snap angle to %f° " "increments" -msgstr "Maj+Ctrl : tourne autour du coin opposé par incréments de %f °" +msgstr "Maj+Ctrl : tourner autour du coin opposé par incréments de %f°" #: ../src/ui/tool/transform-handle-set.cpp:452 msgctxt "Transform handle tip" msgid "Shift: rotate around the opposite corner" -msgstr "Maj : tourne autour du coin opposé" +msgstr "Maj : tourner autour du coin opposé" #: ../src/ui/tool/transform-handle-set.cpp:456 #, c-format msgctxt "Transform handle tip" msgid "Ctrl: snap angle to %f° increments" -msgstr "Ctrl : tourner par incréments de %f °" +msgstr "Ctrl : tourner par incréments de %f°" #: ../src/ui/tool/transform-handle-set.cpp:458 msgctxt "Transform handle tip" @@ -23746,15 +23710,15 @@ msgid "" "Rotation handle: drag to rotate the selection around the rotation " "center" msgstr "" -"Poignée de rotation : cliquer-déplacer pour faire tourner la " -"sélection autour du centre de rotation" +"Poignée de rotation : cliquer-glisser pour faire tourner la sélection " +"autour du centre de rotation" #. event #: ../src/ui/tool/transform-handle-set.cpp:463 #, c-format msgctxt "Transform handle tip" msgid "Rotate by %.2f°" -msgstr "Rotation de %.2f °" +msgstr "Tourner de %.2f°" #: ../src/ui/tool/transform-handle-set.cpp:588 #, c-format @@ -23764,7 +23728,7 @@ msgid "" "increments" msgstr "" "Maj+Ctrl : incliner par rapport au centre de rotation par incréments " -"de %f °" +"de %f°" #: ../src/ui/tool/transform-handle-set.cpp:591 msgctxt "Transform handle tip" @@ -23775,33 +23739,33 @@ msgstr "Maj : incliner par rapport au centre de rotation" #, c-format msgctxt "Transform handle tip" msgid "Ctrl: snap skew angle to %f° increments" -msgstr "Ctrl : incliner par incréments de %f °" +msgstr "Ctrl : incliner par incréments de %f°" #: ../src/ui/tool/transform-handle-set.cpp:598 msgctxt "Transform handle tip" msgid "" "Skew handle: drag to skew (shear) selection about the opposite handle" msgstr "" -"Poignée d'inclinaison : cliquer-déplacer pour incliner la sélection " +"Poignée d'inclinaison : cliquer-glisser pour incliner la sélection " "par rapport à la poignée opposée" #: ../src/ui/tool/transform-handle-set.cpp:604 #, c-format msgctxt "Transform handle tip" msgid "Skew horizontally by %.2f°" -msgstr "Incline horizontalement de %.2f °" +msgstr "Incliner horizontalement de %.2f°" #: ../src/ui/tool/transform-handle-set.cpp:607 #, c-format msgctxt "Transform handle tip" msgid "Skew vertically by %.2f°" -msgstr "Incline verticalement de %.2f °" +msgstr "Incliner verticalement de %.2f°" #: ../src/ui/tool/transform-handle-set.cpp:666 msgctxt "Transform handle tip" msgid "Rotation center: drag to change the origin of transforms" msgstr "" -"Centre de rotation : cliquer-déplacer pour modifier l'origine des " +"Centre de rotation : cliquer-glisser pour modifier l'origine des " "transformations" #: ../src/ui/tools-switch.cpp:101 @@ -23810,7 +23774,7 @@ msgid "" "objects." msgstr "" "Cliquer pour sélectionner et transformer des objets, cliquer-" -"déplacer pour sélectionner plusieurs objets." +"glisser pour sélectionner plusieurs objets." #: ../src/ui/tools-switch.cpp:102 msgid "Modify selected path points (nodes) directly." @@ -23819,40 +23783,40 @@ msgstr "Modifier les points du chemin (nœuds) sélectionnés directement." #: ../src/ui/tools-switch.cpp:103 msgid "To tweak a path by pushing, select it and drag over it." msgstr "" -"Pour perturber un chemin en le poussant, sélectionnez-le et faites glisser " -"la souris dessus." +"Pour ajuster un chemin en le poussant, sélectionnez-le et faites glisser la " +"souris dessus." #: ../src/ui/tools-switch.cpp:104 msgid "" "Drag, click or click and scroll to spray the selected " "objects." msgstr "" -"Cliquer-déplacer, cliquer ou défiler pour pulvériser " -"les objets sélectionnés." +"Cliquer-glisser, cliquer ou cliquer et défiler pour " +"pulvériser les objets sélectionnés." #: ../src/ui/tools-switch.cpp:105 msgid "" "Drag to create a rectangle. Drag controls to round corners and " "resize. Click to select." msgstr "" -"Cliquer-déplacer pour créer un rectangle. Déplacer les poignées pour arrondir les coins. Cliquer pour sélectionner." +"Cliquer-glisser pour créer un rectangle. Déplacer les poignées " +"pour arrondir les coins. Cliquer pour sélectionner." #: ../src/ui/tools-switch.cpp:106 msgid "" "Drag to create a 3D box. Drag controls to resize in " "perspective. Click to select (with Ctrl+Alt for single faces)." msgstr "" -"Cliquer-déplacer pour créer une boîte 3D. Déplacer les poignées pour redimensionner en perspective. Cliquer pour sélectionner " -"(avec Ctrl+Alt pour sélectionner les faces)." +"Cliquer-glisser pour créer une boîte 3D. Déplacer les poignées " +"pour redimensionner en perspective. Cliquer pour sélectionner (avec " +"Ctrl+Alt pour sélectionner les faces)." #: ../src/ui/tools-switch.cpp:107 msgid "" "Drag to create an ellipse. Drag controls to make an arc or " "segment. Click to select." msgstr "" -"Cliquer-déplacer pour créer une ellipse. Déplacer les poignées " +"Cliquer-glisser pour créer une ellipse. Déplacer les poignées " "pour faire des arcs ou des camemberts. Cliquer pour sélectionner." #: ../src/ui/tools-switch.cpp:108 @@ -23860,7 +23824,7 @@ msgid "" "Drag to create a star. Drag controls to edit the star shape. " "Click to select." msgstr "" -"Cliquer-déplacer pour créer une étoile. Déplacer les poignées " +"Cliquer-glisser pour créer une étoile. Déplacer les poignées " "pour éditer la forme de l'étoile. Cliquer pour sélectionner." #: ../src/ui/tools-switch.cpp:109 @@ -23868,7 +23832,7 @@ msgid "" "Drag to create a spiral. Drag controls to edit the spiral " "shape. Click to select." msgstr "" -"Cliquer-déplacer pour créer une spirale. Déplacer les poignées " +"Cliquer-glisser pour créer une spirale. Déplacer les poignées " "pour modifier la forme de la spirale. Cliquer pour sélectionner." #: ../src/ui/tools-switch.cpp:110 @@ -23876,8 +23840,8 @@ msgid "" "Drag to create a freehand line. Shift appends to selected " "path, Alt activates sketch mode." msgstr "" -"Cliquer-déplacer pour créer une ligne à main levée. Maj pour " -"l'ajouter au chemin sélectionné. Alt pour activer le mode croquis." +"Cliquer-glisser pour créer une ligne à main levée. Maj pour " +"l'ajouter au chemin sélectionné, Alt pour activer le mode croquis." #: ../src/ui/tools-switch.cpp:111 msgid "" @@ -23885,8 +23849,8 @@ msgid "" "append to selected path. Ctrl+click to create single dots (straight " "line modes only)." msgstr "" -"Cliquer ou cliquer-déplacer pour commencer un chemin; Maj pour ajouter au chemin sélectionné; Ctrl+clic pour créer des " +"Cliquer ou cliquer-glisser pour commencer un chemin ; Maj pour ajouter au chemin sélectionné ; Ctrl+clic pour créer des " "points isolés (avec les modes lignes droites)." #: ../src/ui/tools-switch.cpp:112 @@ -23894,7 +23858,7 @@ msgid "" "Drag to draw a calligraphic stroke; with Ctrl to track a guide " "path. Arrow keys adjust width (left/right) and angle (up/down)." msgstr "" -"Cliquer-déplacer pour calligraphier; Ctrl pour suivre un " +"Cliquer-glisser pour calligraphier ; Ctrl pour suivre un " "guide. Les flèches gauche/droite ajustent la largeur de la " "plume, haut/bas son angle." @@ -23903,15 +23867,15 @@ msgid "" "Click to select or create text, drag to create flowed text; " "then type." msgstr "" -"Cliquer pour sélectionner ou créer un texte, cliquer-déplacer " -"pour créer un texte encadré; puis taper le texte." +"Cliquer pour sélectionner ou créer un texte, cliquer-glisser " +"pour créer un texte encadré ; puis taper le texte." #: ../src/ui/tools-switch.cpp:114 msgid "" "Drag or double click to create a gradient on selected objects, " "drag handles to adjust gradients." msgstr "" -"Cliquer-déplacer ou double-cliquer pour créer un dégradé sur " +"Cliquer-glisser ou double-cliquer pour créer un dégradé sur " "les objets sélectionnés, déplacer les poignées pour ajuster les " "dégradés." @@ -23920,21 +23884,20 @@ msgid "" "Drag or double click to create a mesh on selected objects, " "drag handles to adjust meshes." msgstr "" -"Cliquer-déplacer ou double-cliquer pour créer une toile sur " -"les objets sélectionnés, déplacer les poignées pour ajuster les " -"toiles." +"Cliquer-glisser ou double-cliquer pour créer une toile sur les " +"objets sélectionnés, déplacer les poignées pour ajuster les toiles." #: ../src/ui/tools-switch.cpp:116 msgid "" "Click or drag around an area to zoom in, Shift+click to " "zoom out." msgstr "" -"Cliquer ou cliquer-déplacer sur une zone pour zoomer, Maj" +"Cliquer ou cliquer-glisser sur une zone pour zoomer, Maj" "+clic pour dézoomer." #: ../src/ui/tools-switch.cpp:117 msgid "Drag to measure the dimensions of objects." -msgstr "Cliquer-glisser pour mesurer les dimensions des objets." +msgstr "Cliquer-glisser pour mesurer les dimensions des objets." #: ../src/ui/tools-switch.cpp:118 ../src/ui/tools/dropper-tool.cpp:274 msgid "" @@ -23943,10 +23906,10 @@ msgid "" "to copy the color under mouse to clipboard" msgstr "" "Cliquer pour appliquer au fond, Maj+clic pour appliquer au " -"contour; cliquer-déplacer pour capturer la couleur moyenne sur une " -"zone; à combiner avec Alt pour capturer la couleur inverse; Ctrl" +"contour ; cliquer-glisser pour capturer la couleur moyenne sur une " +"zone ; à combiner avec Alt pour capturer la couleur inverse ; Ctrl" "+C pour copier la couleur sous le curseur de la souris vers le presse-" -"papiers " +"papiers" #: ../src/ui/tools-switch.cpp:119 msgid "Click and drag between shapes to create a connector." @@ -23958,17 +23921,17 @@ msgid "" "fill with the current selection, Ctrl+click to change the clicked " "object's fill and stroke to the current setting." msgstr "" -"Cliquer pour remplir une région bornée. Maj+Clic pour faire " -"une union du remplissage avec la sélection courante, Ctrl+Clic pour " -"changer le trait et le remplissage de l'objet désigné" +"Cliquer pour remplir une région bornée, Maj+clic pour unir le " +"nouveau fond avec la sélection actuelle, Ctrl+clic pour changer le " +"contour et le fond de l'objet désigné." #: ../src/ui/tools-switch.cpp:123 msgid "Drag to erase." -msgstr "Cliquer-déplacer pour effacer" +msgstr "Cliquer-glisser pour effacer." #: ../src/ui/tools-switch.cpp:124 msgid "Choose a subtool from the toolbar" -msgstr "Sélectionner un outil secondaire dans la barre d'outils" +msgstr "Choisissez un outil secondaire dans la barre de contrôle" #: ../src/ui/tools/arc-tool.cpp:242 msgid "" @@ -23987,7 +23950,7 @@ msgid "" "Ellipse: %s × %s (constrained to ratio %d:%d); with Shift " "to draw around the starting point" msgstr "" -"Ellipse : %s × %s; (contrainte de ratio %d:%d); Maj pour " +"Ellipse : %s × %s (contrainte au ratio %d:%d) ; Maj pour " "dessiner autour du point de départ" #: ../src/ui/tools/arc-tool.cpp:414 @@ -23996,8 +23959,8 @@ msgid "" "Ellipse: %s × %s; with Ctrl to make square or integer-" "ratio ellipse; with Shift to draw around the starting point" msgstr "" -"Ellipse : %s × %s; Ctrl pour dessiner des cercles ou des " -"ellipses de ratio entier, Maj pour dessiner autour du point de départ" +"Ellipse : %s × %s ; Ctrl pour dessiner des cercles ou des " +"ellipses de ratio entier ; Maj pour dessiner autour du point de départ" #: ../src/ui/tools/arc-tool.cpp:437 msgid "Create ellipse" @@ -24012,7 +23975,7 @@ msgstr "Changer la perspective (angle des LP)" #. status text #: ../src/ui/tools/box3d-tool.cpp:573 msgid "3D Box; with Shift to extrude along the Z axis" -msgstr "Boîte 3D. Utiliser Maj pour extruder suivant Z" +msgstr "Boîte 3D ; Maj pour extruder suivant l'axe Z" #: ../src/ui/tools/box3d-tool.cpp:599 msgid "Create 3D box" @@ -24022,7 +23985,7 @@ msgstr "Créer une boîte 3D" msgid "" "Guide path selected; start drawing along the guide with Ctrl" msgstr "" -"Guide sélectionné; commencer à dessiner le long du guide avec " +"Guide sélectionné ; commencer à dessiner le long du guide avec " "Ctrl" #: ../src/ui/tools/calligraphic-tool.cpp:527 @@ -24031,7 +23994,7 @@ msgstr "Choisir un chemin comme guide avec Ctrl" #: ../src/ui/tools/calligraphic-tool.cpp:662 msgid "Tracking: connection to guide path lost!" -msgstr "Suivi : Connexion avec le guide perdue !" +msgstr "Suivi : connexion avec le guide perdue !" #: ../src/ui/tools/calligraphic-tool.cpp:662 msgid "Tracking a guide path" @@ -24078,12 +24041,12 @@ msgstr "Sélectionner au moins un objet non connecteur." #: ../src/ui/tools/connector-tool.cpp:1329 #: ../src/widgets/connector-toolbar.cpp:308 msgid "Make connectors avoid selected objects" -msgstr "Faire que les connecteurs évitent les objets sélectionnés" +msgstr "Faire éviter les objets sélectionnés par les connecteurs" #: ../src/ui/tools/connector-tool.cpp:1330 #: ../src/widgets/connector-toolbar.cpp:318 msgid "Make connectors ignore selected objects" -msgstr "Faire que les connecteurs ignorent les objets sélectionnés" +msgstr "Faire ignorer les objets sélectionnés par les connecteurs" #. alpha of color under cursor, to show in the statusbar #. locale-sensitive printf is OK, since this goes to the UI, not into SVG @@ -24145,7 +24108,7 @@ msgstr "Grand" #: ../src/ui/tools/flood-tool.cpp:415 msgid "Too much inset, the result is empty." -msgstr "Trop de contraction, le résultat est vide." +msgstr "Érosion trop importante, le résultat est vide." #: ../src/ui/tools/flood-tool.cpp:456 #, c-format @@ -24154,20 +24117,20 @@ msgid "" msgid_plural "" "Area filled, path with %d nodes created and unioned with selection." msgstr[0] "" -"Zone remplie, création d'un chemin de %d nœud, ajouté à la sélection." +"Zone remplie, chemin de %d nœud créé et ajouté à la sélection." msgstr[1] "" -"Zone remplie, création d'un chemin de %d nœuds, ajouté à la sélection." +"Zone remplie, chemin de %d nœuds créé et ajouté à la sélection." #: ../src/ui/tools/flood-tool.cpp:462 #, c-format msgid "Area filled, path with %d node created." msgid_plural "Area filled, path with %d nodes created." -msgstr[0] "Zone remplie, création d'un chemin avec %d nœud." -msgstr[1] "Zone remplie, création d'un chemin avec %d nœuds." +msgstr[0] "Zone remplie, chemin de %d nœud créé." +msgstr[1] "Zone remplie, chemin de %d nœuds créé." #: ../src/ui/tools/flood-tool.cpp:730 ../src/ui/tools/flood-tool.cpp:1040 msgid "Area is not bounded, cannot fill." -msgstr "Zone non bornée, impossible de remplir." +msgstr "Zone non bornée, impossible de la remplir." #: ../src/ui/tools/flood-tool.cpp:1045 msgid "" @@ -24179,7 +24142,7 @@ msgstr "" #: ../src/ui/tools/flood-tool.cpp:1063 ../src/ui/tools/flood-tool.cpp:1214 msgid "Fill bounded area" -msgstr "Remplissage d'une zone bornée" +msgstr "Remplir une zone bornée" #: ../src/ui/tools/flood-tool.cpp:1079 msgid "Set style on object" @@ -24245,11 +24208,11 @@ msgid "" msgid_plural "" "One handle merging %d stops (drag with Shift to separate) selected" msgstr[0] "" -"Une poignée de dégradé rassemblant %d stops (cliquer-glissser avec Maj pour les séparer) sélectionnée" +"Une poignée de dégradé rassemblant %d stops (cliquer-glisser avec Maj " +"pour les séparer) sélectionnée" msgstr[1] "" -"Une poignée de dégradé rassemblant %d stops (cliquer-glissser avec Maj pour les séparer) sélectionnée" +"Une poignée de dégradé rassemblant %d stops (cliquer-glisser avec Maj " +"pour les séparer) sélectionnée" #. TRANSLATORS: The plural refers to number of selected gradient handles. This is part of a compound message (part two indicates selected object count) #: ../src/ui/tools/gradient-tool.cpp:138 @@ -24296,10 +24259,10 @@ msgstr "Maj : pour dessiner le dégradé autour du point de départ" msgid "Gradient for %d object; with Ctrl to snap angle" msgid_plural "Gradient for %d objects; with Ctrl to snap angle" msgstr[0] "" -"Dégradé appliqué à %d objet; déplacer avec Ctrl pour forcer la " -"modification de l'inclinaison par incréments" +"Dégradé appliqué à %d objet ; déplacer avec Ctrl pour forcer " +"la modification de l'inclinaison par incréments" msgstr[1] "" -"Dégradé appliqué à %d objets; déplacer avec Ctrl pour forcer " +"Dégradé appliqué à %d objets ; déplacer avec Ctrl pour forcer " "la modification de l'inclinaison par incréments" #: ../src/ui/tools/gradient-tool.cpp:949 ../src/ui/tools/mesh-tool.cpp:981 @@ -24308,16 +24271,18 @@ msgstr "Sélectionner des objets auxquels appliquer un dégradé." #: ../src/ui/tools/lpe-tool.cpp:195 msgid "Choose a construction tool from the toolbar." -msgstr "Sélectionner un outil de construction dans la barre d'outils" +msgstr "Choisissez la construction à réaliser dans la barre de contrôle." #. create the knots #: ../src/ui/tools/measure-tool.cpp:349 msgid "Measure start, Shift+Click for position dialog" msgstr "" +"Début de la mesure, Maj+clic pour la boîte de dialogue de position" #: ../src/ui/tools/measure-tool.cpp:355 msgid "Measure end, Shift+Click for position dialog" msgstr "" +"Fin de la mesure, Maj+clic pour la boîte de dialogue de position" #: ../src/ui/tools/measure-tool.cpp:747 ../share/extensions/measure.inx.h:2 msgid "Measure" @@ -24329,25 +24294,24 @@ msgstr "Base" #: ../src/ui/tools/measure-tool.cpp:761 msgid "Add guides from measure tool" -msgstr "" +msgstr "Ajouter des guides depuis l'outil de mesure" #: ../src/ui/tools/measure-tool.cpp:781 -msgid "Add Stored to measure tool" -msgstr "" +msgid "Keep last measure on the canvas, for reference" +msgstr "Conserver la dernière mesure sur le canevas, pour référence" #: ../src/ui/tools/measure-tool.cpp:801 -#, fuzzy msgid "Convert measure to items" -msgstr "Convertir un contour en chemin" +msgstr "Convertir la mesure en éléments" #: ../src/ui/tools/measure-tool.cpp:839 msgid "Add global measure line" -msgstr "" +msgstr "Ajouter une ligne de mesure globale" #: ../src/ui/tools/measure-tool.cpp:1290 ../src/ui/tools/measure-tool.cpp:1292 -#, fuzzy, c-format +#, c-format msgid "Crossing %lu" -msgstr "Flou croisé" +msgstr "%lu traversé(s)" #. TRANSLATORS: Mind the space in front. This is part of a compound message #: ../src/ui/tools/mesh-tool.cpp:122 ../src/ui/tools/mesh-tool.cpp:133 @@ -24377,19 +24341,19 @@ msgstr[1] "" #: ../src/ui/tools/mesh-tool.cpp:311 msgid "Split mesh row/column" -msgstr "Inverser les lignes et colonnes du filet" +msgstr "Éclater les lignes et colonnes du filet" #: ../src/ui/tools/mesh-tool.cpp:397 msgid "Toggled mesh path type." -msgstr "" +msgstr "Type de chemin du filet inversé." #: ../src/ui/tools/mesh-tool.cpp:401 msgid "Approximated arc for mesh side." -msgstr "" +msgstr "Arc approximé pour le côté du filet." #: ../src/ui/tools/mesh-tool.cpp:405 msgid "Toggled mesh tensors." -msgstr "" +msgstr "Tenseurs du filet inversés." #: ../src/ui/tools/mesh-tool.cpp:409 msgid "Smoothed mesh corner color." @@ -24405,16 +24369,15 @@ msgstr "Créer un filet par défaut" #: ../src/ui/tools/mesh-tool.cpp:713 msgid "FIXMECtrl: snap mesh angle" -msgstr "Ctrl : aimanter au angles du filet" +msgstr "Ctrl : aimanter aux angles du filet" #: ../src/ui/tools/mesh-tool.cpp:714 msgid "FIXMEShift: draw mesh around the starting point" msgstr "Maj : dessiner le filet autour du point de départ" #: ../src/ui/tools/mesh-tool.cpp:971 -#, fuzzy msgid "Create mesh" -msgstr "Créer un filet par défaut" +msgstr "Créer un filet" #: ../src/ui/tools/node-tool.cpp:648 msgctxt "Node tool tip" @@ -24422,13 +24385,13 @@ msgid "" "Shift: drag to add nodes to the selection, click to toggle object " "selection" msgstr "" -"Maj : cliquer-déplacer pour ajouter des nœuds à la sélection, cliquer " +"Maj : cliquer-glisser pour ajouter des nœuds à la sélection, cliquer " "pour inverser l'état de sélection de l'objet" #: ../src/ui/tools/node-tool.cpp:652 msgctxt "Node tool tip" msgid "Shift: drag to add nodes to the selection" -msgstr "Maj : cliquer-déplacer pour ajouter des nœuds à la sélection" +msgstr "Maj : cliquer-glisser pour ajouter des nœuds à la sélection" #: ../src/ui/tools/node-tool.cpp:681 #, c-format @@ -24464,15 +24427,14 @@ msgstr "" msgctxt "Node tool tip" msgid "Drag to select nodes, click to clear the selection" msgstr "" -"Cliquer-glisser pour sélectionner des nœuds, cliquer pour libérer la " -"sélection" +"Cliquer-glisser pour sélectionner des nœuds, cliquer pour vider la sélection" #: ../src/ui/tools/node-tool.cpp:711 msgctxt "Node tool tip" msgid "Drag to select objects to edit, click to edit this object (more: Shift)" msgstr "" "Cliquer-glisser pour sélectionner les objets à éditer, cliquer pour éditer " -"les objets (modificateur : Maj)" +"les objets (plus : Maj)" #: ../src/ui/tools/node-tool.cpp:714 msgctxt "Node tool tip" @@ -24498,67 +24460,69 @@ msgstr "Ajout au chemin sélectionné" #: ../src/ui/tools/pen-tool.cpp:640 msgid "Click or click and drag to close and finish the path." msgstr "" -"Cliquer ou cliquer-déplacer pour fermer et terminer le chemin." +"Cliquer ou cliquer-glisser pour fermer et terminer le chemin." #: ../src/ui/tools/pen-tool.cpp:642 -#, fuzzy msgid "" "Click or click and drag to close and finish the path. Shift" "+Click make a cusp node" msgstr "" -"Cliquer ou cliquer-déplacer pour fermer et terminer le chemin." +"Cliquer ou cliquer-glisser pour fermer et terminer le chemin. " +"Maj+clic pour créer un point de rebroussement" #: ../src/ui/tools/pen-tool.cpp:654 msgid "" "Click or click and drag to continue the path from this point." msgstr "" -"Cliquer ou cliquer-déplacer pour prolonger le chemin à partir " +"Cliquer ou cliquer-glisser pour prolonger le chemin à partir " "de ce point." #: ../src/ui/tools/pen-tool.cpp:656 -#, fuzzy msgid "" "Click or click and drag to continue the path from this point. " "Shift+Click make a cusp node" msgstr "" -"Cliquer ou cliquer-déplacer pour prolonger le chemin à partir " -"de ce point." +"Cliquer ou cliquer-glisser pour prolonger le chemin à partir " +"de ce point. Maj+clic pour créer un point de rebroussement" #: ../src/ui/tools/pen-tool.cpp:1797 -#, fuzzy, c-format +#, c-format msgid "" "Curve segment: angle %3.2f°, distance %s; with Ctrl to " "snap angle, Enter or Shift+Enter to finish the path" msgstr "" -"Segment de courbe : angle %3.2f°, distance %s ; Ctrl pour " -"tourner par incréments ; Entrée pour terminer le chemin" +"Segment de courbe : angle %3.2f°, distance %s ; Ctrl pour " +"tourner par incréments ; Entrée ou Maj+Entrée pour terminer le " +"chemin" #: ../src/ui/tools/pen-tool.cpp:1798 -#, fuzzy, c-format +#, c-format msgid "" "Line segment: angle %3.2f°, distance %s; with Ctrl to " "snap angle, Enter or Shift+Enter to finish the path" msgstr "" -"Segment de droite : angle %3.2f°, distance %s ; Ctrl pour " -"tourner par incréments ; Entrée pour terminer le chemin" +"Segment de droite : angle %3.2f°, distance %s ; Ctrl pour " +"tourner par incréments ; Entrée ou Maj+Entrée pour terminer le " +"chemin" #: ../src/ui/tools/pen-tool.cpp:1801 -#, fuzzy, c-format +#, c-format msgid "" "Curve segment: angle %3.2f°, distance %s; with Shift+Click make a cusp node, Enter or Shift+Enter to finish the path" msgstr "" -"Segment de courbe : angle %3.2f°, distance %s ; Ctrl pour " -"tourner par incréments ; Entrée pour terminer le chemin" +"Segment de courbe : angle %3.2f°, distance %s ; Maj+clic pour " +"créer un point de rebroussement ; Entrée ou Maj+Entrée pour " +"terminer le chemin" #: ../src/ui/tools/pen-tool.cpp:1802 -#, fuzzy, c-format +#, c-format msgid "" "Line segment: angle %3.2f°, distance %s; with Shift+Click " "make a cusp node, Enter or Shift+Enter to finish the path" msgstr "" -"Segment de droite : angle %3.2f°, distance %s ; Ctrl pour " -"tourner par incréments ; Entrée pour terminer le chemin" +"Segment de droite : angle %3.2f°, distance %s ; Maj+clic pour " +"créer un point de rebroussement ; Entrée pour terminer le chemin" #: ../src/ui/tools/pen-tool.cpp:1819 #, c-format @@ -24566,7 +24530,7 @@ msgid "" "Curve handle: angle %3.2f°, length %s; with Ctrl to snap " "angle" msgstr "" -"Poignée de contrôle: angle %3.2f°, longueur %s; Ctrl pour " +"Poignée de contrôle: angle %3.2f°, longueur %s ; Ctrl pour " "tourner par incréments" #: ../src/ui/tools/pen-tool.cpp:1843 @@ -24575,9 +24539,9 @@ msgid "" "Curve handle, symmetric: angle %3.2f°, length %s; with Ctrl to snap angle, with Shift to move this handle only" msgstr "" -"Poignée de la courbe, symétrique : angle %3.2f°, longueur %s ; " -"avec Ctrl pour tourner par incréments ; Maj pour ne déplacer " -"que cette poignée" +"Poignée de la courbe, symétrique : angle %3.2f°, longueur %s ; " +"Ctrl pour tourner par incréments ; Maj pour ne déplacer que " +"cette poignée" #: ../src/ui/tools/pen-tool.cpp:1844 #, c-format @@ -24585,9 +24549,8 @@ msgid "" "Curve handle: angle %3.2f°, length %s; with Ctrl to snap " "angle, with Shift to move this handle only" msgstr "" -"Poignée de la courbe : angle %3.2f°, longueur %s ; avec Ctrl pour tourner par incréments ; Maj pour ne déplacer que cette " -"poignée" +"Poignée de la courbe : angle %3.2f°, longueur %s ; avec Ctrl " +"pour tourner par incréments ; Maj pour ne déplacer que cette poignée" #: ../src/ui/tools/pen-tool.cpp:1978 msgid "Drawing finished" @@ -24636,8 +24599,8 @@ msgid "" "Rectangle: %s × %s (constrained to ratio %d:%d); with Shift to draw around the starting point" msgstr "" -"Rectangle : %s × %s; (contraint de ratio %d:%d) ; Maj " -"pour dessiner autour du point de départ" +"Rectangle : %s × %s ; (contraint au ratio %d:%d) ; Maj pour " +"dessiner autour du point de départ" #: ../src/ui/tools/rect-tool.cpp:441 #, c-format @@ -24645,8 +24608,8 @@ msgid "" "Rectangle: %s × %s (constrained to golden ratio 1.618 : 1); with " "Shift to draw around the starting point" msgstr "" -"Rectangle : %s × %s; (contraint au ratio du Nombre d'Or 1.618 : " -"1) ; Maj dessiner autour du point de départ" +"Rectangle : %s × %s; (contraint au ratio du nombre d'or 1,618:1) ; " +"Maj dessiner autour du point de départ" #: ../src/ui/tools/rect-tool.cpp:443 #, c-format @@ -24654,8 +24617,8 @@ msgid "" "Rectangle: %s × %s (constrained to golden ratio 1 : 1.618); with " "Shift to draw around the starting point" msgstr "" -"Rectangle : %s × %s; (contraint au ratio du Nombre d'Or 1 : " -"1.618) ; Maj pour dessiner autour du point de départ" +"Rectangle : %s × %s; (contraint au ratio du nombre d'or 1:1.618) ; " +"Maj pour dessiner autour du point de départ" #: ../src/ui/tools/rect-tool.cpp:447 #, c-format @@ -24663,8 +24626,8 @@ msgid "" "Rectangle: %s × %s; with Ctrl to make square or integer-" "ratio rectangle; with Shift to draw around the starting point" msgstr "" -"Rectangle : %s × %s; Ctrl forcer un rectangle carré ou de " -"ratio entier; Maj dessiner autour du point de départ" +"Rectangle : %s × %s ; Ctrl pour forcer un rectangle carré ou " +"de ratio entier ; Maj pour dessiner autour du point de départ" #: ../src/ui/tools/rect-tool.cpp:470 msgid "Create rectangle" @@ -24697,36 +24660,36 @@ msgid "" "Draw over objects to select them; release Alt to switch to " "rubberband selection" msgstr "" -"Tracer un trait passant par des objets pour les sélectionner. Lâcher " -"la touche Alt pour repasser en mode sélection rectangle" +"Tracer un trait passant par des objets pour les sélectionner ; lâcher " +"Alt pour repasser en sélection par rectangle" #: ../src/ui/tools/select-tool.cpp:640 msgid "" "Drag around objects to select them; press Alt to switch to " "touch selection" msgstr "" -"Entourer les objets pour les sélectionner; appuyer sur Alt " +"Entourer les objets pour les sélectionner ; appuyer sur Alt " "pour passer en « toucher pour sélectionner »" #: ../src/ui/tools/select-tool.cpp:921 msgid "Ctrl: click to select in groups; drag to move hor/vert" msgstr "" -"Ctrl : Cliquer pour sélectionner dans les groupes; cliquer-déplacer " -"pour déplacer horizontalement/verticalment" +"Ctrl : cliquer pour sélectionner dans les groupes ; cliquer-glisser " +"pour déplacer horizontalement/verticalement" #: ../src/ui/tools/select-tool.cpp:922 msgid "Shift: click to toggle select; drag for rubberband selection" msgstr "" -"Maj : cliquer pour inverser l'état de sélection, cliquer-déplacer " -"pour activer la sélection rectangle" +"Maj : cliquer pour inverser l'état de sélection ; cliquer-glisser " +"pour sélectionner par rectangle" #: ../src/ui/tools/select-tool.cpp:923 msgid "" "Alt: click to select under; scroll mouse-wheel to cycle-select; drag " "to move selected or select by touch" msgstr "" -"Alt : cliquer pour sélectionner sous, utiliser la molette pour " -"sélectionner cycliquement, cliquer-déplacer pour déplacer ou passer en " +"Alt : cliquer pour sélectionner en dessous ; tourner la molette pour " +"sélectionner cycliquement ; cliquer-glisser pour déplacer ou passer en " "« toucher pour sélectionner »" #: ../src/ui/tools/select-tool.cpp:1131 @@ -24746,8 +24709,8 @@ msgstr "Alt : verrouiller le rayon de la spirale" msgid "" "Spiral: radius %s, angle %5g°; with Ctrl to snap angle" msgstr "" -"Spirale : rayon %s, angle %5g° ; avec Ctrl pour tourner " -"par incréments" +"Spirale : rayon %s, angle %5g° ; Ctrl pour tourner par " +"incréments" #: ../src/ui/tools/spiral-tool.cpp:411 msgid "Create spiral" @@ -24770,8 +24733,8 @@ msgid "" "%s. Drag, click or click and scroll to spray copies of the initial " "selection." msgstr "" -"%s. Cliquer-déplacer, cliquer ou défiler pour pulvériser des copies " -"de la sélection initiale." +"%s. Cliquer-glisser, cliquer ou défiler pour pulvériser des copies de " +"la sélection initiale." #: ../src/ui/tools/spray-tool.cpp:224 #, c-format @@ -24779,8 +24742,8 @@ msgid "" "%s. Drag, click or click and scroll to spray clones of the initial " "selection." msgstr "" -"%s. Cliquer-déplacer, cliquer ou défiler pour pulvériser des clones " -"de la sélection initiale." +"%s. Cliquer-glisser, cliquer ou défiler pour pulvériser des clones de " +"la sélection initiale." #: ../src/ui/tools/spray-tool.cpp:227 #, c-format @@ -24788,7 +24751,7 @@ msgid "" "%s. Drag, click or click and scroll to spray in a single path of the " "initial selection." msgstr "" -"%s. Cliquer-déplacer, cliquer ou défiler pour pulvériser dans un chemin " +"%s. Cliquer-glisser, cliquer ou défiler pour pulvériser dans un chemin " "unique la sélection initiale." #: ../src/ui/tools/spray-tool.cpp:1305 @@ -24817,15 +24780,15 @@ msgstr "" msgid "" "Polygon: radius %s, angle %5g°; with Ctrl to snap angle" msgstr "" -"Polygone : rayon %s, angle %5g° ; Ctrl pour tourner par " +"Polygone : rayon %s, angle %5g° ; Ctrl pour tourner par " "incréments" #: ../src/ui/tools/star-tool.cpp:408 #, c-format msgid "Star: radius %s, angle %5g°; with Ctrl to snap angle" msgstr "" -"Étoile : rayon %s, angle %5g° ; Ctrl pour tourner/" -"incliner par incréments" +"Étoile : rayon %s, angle %5g° ; Ctrl pour tourner/incliner par " +"incréments" #: ../src/ui/tools/star-tool.cpp:436 msgid "Create star" @@ -24834,14 +24797,14 @@ msgstr "Créer une étoile" #: ../src/ui/tools/text-tool.cpp:370 msgid "Click to edit the text, drag to select part of the text." msgstr "" -"Cliquer pour éditer le texte, cliquer-déplacer pour " +"Cliquer pour éditer le texte, cliquer-glisser pour " "sélectionner une partie du texte." #: ../src/ui/tools/text-tool.cpp:372 msgid "" "Click to edit the flowed text, drag to select part of the text." msgstr "" -"Cliquer pour éditer le texte encadré, cliquer-déplacer pour " +"Cliquer pour éditer le texte encadré, cliquer-glisser pour " "sélectionner une partie du texte." #: ../src/ui/tools/text-tool.cpp:426 @@ -24859,7 +24822,7 @@ msgstr "Insérer un caractère Unicode" #: ../src/ui/tools/text-tool.cpp:501 #, c-format msgid "Unicode (Enter to finish): %s: %s" -msgstr "Unicode (Entrée pour terminer) : %s: %s" +msgstr "Unicode (Entrée pour terminer) : %s : %s" #: ../src/ui/tools/text-tool.cpp:503 ../src/ui/tools/text-tool.cpp:808 msgid "Unicode (Enter to finish): " @@ -24868,7 +24831,7 @@ msgstr "Unicode (Entrée pour terminer) : " #: ../src/ui/tools/text-tool.cpp:586 #, c-format msgid "Flowed text frame: %s × %s" -msgstr "Cadre de texte : %s × %s" +msgstr "Cadre de texte : %s × %s" #: ../src/ui/tools/text-tool.cpp:644 msgid "Type text; Enter to start new line." @@ -25002,7 +24965,7 @@ msgstr "%s. Cliquer-glisser pour déplacer." #, c-format msgid "%s. Drag or click to move in; with Shift to move out." msgstr "" -"%s. Cliquer-glisser ou cliquer pour rapprocher; avec Maj pour " +"%s. Cliquer-glisser ou cliquer pour rapprocher ; avec Maj pour " "éloigner." #: ../src/ui/tools/tweak-tool.cpp:176 @@ -25014,7 +24977,7 @@ msgstr "%s. Glisser ou cliquer pour déplacer aléatoirement." #, c-format msgid "%s. Drag or click to scale down; with Shift to scale up." msgstr "" -"%s. Cliquer-glisser ou cliquer pour réduire; avec Maj pour " +"%s. Cliquer-glisser ou cliquer pour réduire ; avec Maj pour " "agrandir." #: ../src/ui/tools/tweak-tool.cpp:188 @@ -25041,14 +25004,14 @@ msgstr "%s. Glisser pour pousser les chemins." #, c-format msgid "%s. Drag or click to inset paths; with Shift to outset." msgstr "" -"%s. Cliquer-glisser ou cliquer pour rétrécir les chemins; avec Maj " +"%s. Cliquer-glisser ou cliquer pour rétrécir les chemins ; avec Maj " "pour les élargir." #: ../src/ui/tools/tweak-tool.cpp:216 #, c-format msgid "%s. Drag or click to attract paths; with Shift to repel." msgstr "" -"%s. Cliquer-glisser ou cliquer pour attirer les chemins; avec Maj " +"%s. Cliquer-glisser ou cliquer pour attirer les chemins ; avec Maj " "pour les repousser." #: ../src/ui/tools/tweak-tool.cpp:224 @@ -25075,7 +25038,7 @@ msgstr "" msgid "" "%s. Drag or click to increase blur; with Shift to decrease." msgstr "" -"%s. Cliquer-glisser ou cliquer pour augmenter le flou; avec Maj pour " +"%s. Cliquer-glisser ou cliquer pour augmenter le flou ; avec Maj pour " "le diminuer." #: ../src/ui/tools/tweak-tool.cpp:1191 @@ -25112,7 +25075,7 @@ msgstr "Ajuster en poussant le chemin" #: ../src/ui/tools/tweak-tool.cpp:1253 msgid "Shrink/grow path tweak" -msgstr "Ajuster en contractant ou en dilatant le chemin" +msgstr "Ajuster en érodant ou en dilatant le chemin" #: ../src/ui/tools/tweak-tool.cpp:1257 msgid "Attract/repel path tweak" @@ -25292,157 +25255,131 @@ msgid "Ligatures" msgstr "Ligatures" #: ../src/ui/widget/font-variants.cpp:39 -#, fuzzy msgctxt "Font variant" msgid "Common" -msgstr "commun" +msgstr "Communes" #: ../src/ui/widget/font-variants.cpp:40 -#, fuzzy msgctxt "Font variant" msgid "Discretionary" -msgstr "Direction" +msgstr "Discrétionnaires" #: ../src/ui/widget/font-variants.cpp:41 -#, fuzzy msgctxt "Font variant" msgid "Historical" -msgstr "Didacticiels" +msgstr "Historiques" #: ../src/ui/widget/font-variants.cpp:42 -#, fuzzy msgctxt "Font variant" msgid "Contextual" -msgstr "Contexte" +msgstr "Contextuelles" #: ../src/ui/widget/font-variants.cpp:44 -#, fuzzy msgctxt "Font variant" msgid "Position" msgstr "Position" #: ../src/ui/widget/font-variants.cpp:45 ../src/ui/widget/font-variants.cpp:50 -#, fuzzy msgctxt "Font variant" msgid "Normal" -msgstr "Normal" +msgstr "Normale" #: ../src/ui/widget/font-variants.cpp:46 -#, fuzzy msgctxt "Font variant" msgid "Subscript" -msgstr "Script" +msgstr "Indice" #: ../src/ui/widget/font-variants.cpp:47 -#, fuzzy msgctxt "Font variant" msgid "Superscript" -msgstr "Inverser le mode exposant" +msgstr "Exposant" #: ../src/ui/widget/font-variants.cpp:49 -#, fuzzy msgctxt "Font variant" msgid "Capitals" -msgstr "Hôpital" +msgstr "Capitales" #: ../src/ui/widget/font-variants.cpp:51 -#, fuzzy msgctxt "Font variant" msgid "Small" -msgstr "Petit" +msgstr "Petites" #: ../src/ui/widget/font-variants.cpp:52 -#, fuzzy msgctxt "Font variant" msgid "All small" -msgstr "Toutes les formes" +msgstr "Petites pour tout" #: ../src/ui/widget/font-variants.cpp:53 -#, fuzzy msgctxt "Font variant" msgid "Petite" -msgstr "Tout inactif" +msgstr "Plus petites" #: ../src/ui/widget/font-variants.cpp:54 -#, fuzzy msgctxt "Font variant" msgid "All petite" -msgstr "Tout inactif" +msgstr "Plus petites pour tout" #: ../src/ui/widget/font-variants.cpp:55 -#, fuzzy msgctxt "Font variant" msgid "Unicase" -msgstr "Picas" +msgstr "Unicasse" #: ../src/ui/widget/font-variants.cpp:56 -#, fuzzy msgctxt "Font variant" msgid "Titling" -msgstr "Voile" +msgstr "Titre" #: ../src/ui/widget/font-variants.cpp:58 -#, fuzzy msgctxt "Font variant" msgid "Numeric" msgstr "Numérique" #: ../src/ui/widget/font-variants.cpp:59 -#, fuzzy msgctxt "Font variant" msgid "Lining" -msgstr "Amincissement :" +msgstr "Aligné" #: ../src/ui/widget/font-variants.cpp:60 -#, fuzzy msgctxt "Font variant" msgid "Old Style" -msgstr "Style" +msgstr "Style ancien" #: ../src/ui/widget/font-variants.cpp:61 -#, fuzzy msgctxt "Font variant" msgid "Default Style" -msgstr "Titre par défaut" +msgstr "Style par défaut" #: ../src/ui/widget/font-variants.cpp:62 -#, fuzzy msgctxt "Font variant" msgid "Proportional" -msgstr "Proportion de la patte :" +msgstr "Proportionnelle" #: ../src/ui/widget/font-variants.cpp:63 -#, fuzzy msgctxt "Font variant" msgid "Tabular" msgstr "Tabulaire" #: ../src/ui/widget/font-variants.cpp:64 -#, fuzzy msgctxt "Font variant" msgid "Default Width" -msgstr "Titre par défaut" +msgstr "Largeur par défaut" #: ../src/ui/widget/font-variants.cpp:65 -#, fuzzy msgctxt "Font variant" msgid "Diagonal" -msgstr "Guides diagonaux" +msgstr "En diagonale" #: ../src/ui/widget/font-variants.cpp:66 -#, fuzzy msgctxt "Font variant" msgid "Stacked" -msgstr "Moteur" +msgstr "Verticales" #: ../src/ui/widget/font-variants.cpp:67 -#, fuzzy msgctxt "Font variant" msgid "Default Fractions" -msgstr "Réglages par défaut de la grille" +msgstr "Fractions par défaut" #: ../src/ui/widget/font-variants.cpp:68 -#, fuzzy msgctxt "Font variant" msgid "Ordinal" msgstr "Ordinal" @@ -25453,15 +25390,14 @@ msgid "Slashed Zero" msgstr "Zéro barré" #: ../src/ui/widget/font-variants.cpp:71 -#, fuzzy msgctxt "Font variant" msgid "Feature Settings" -msgstr "Propriétés de la page" +msgstr "Propriétés de la fonction" #: ../src/ui/widget/font-variants.cpp:72 msgctxt "Font variant" msgid "Selection has different Feature Settings!" -msgstr "" +msgstr "La sélection a des propriétés de fonction différentes !" #: ../src/ui/widget/font-variants.cpp:85 msgid "Common ligatures. On by default. OpenType tables: 'liga', 'clig'" @@ -25470,6 +25406,7 @@ msgstr "Ligatures communes. Activé par défaut. Tables OpenType : liga, clig" #: ../src/ui/widget/font-variants.cpp:87 msgid "Discretionary ligatures. Off by default. OpenType table: 'dlig'" msgstr "" +"Ligatures discrétionnaires. Désactivé par défaut. Table OpenType : dlig" #: ../src/ui/widget/font-variants.cpp:89 msgid "Historical ligatures. Off by default. OpenType table: 'hlig'" @@ -25482,121 +25419,124 @@ msgstr "Formes contextuelles. Activé par défaut. Table OpenType : calt" #. Position ---------------------------------- #. Add tooltips #: ../src/ui/widget/font-variants.cpp:112 -#, fuzzy msgid "Normal position." -msgstr "Position X" +msgstr "Position normale." #: ../src/ui/widget/font-variants.cpp:113 msgid "Subscript. OpenType table: 'subs'" -msgstr "" +msgstr "Indice. Table OpenType : subs" #: ../src/ui/widget/font-variants.cpp:114 msgid "Superscript. OpenType table: 'sups'" -msgstr "" +msgstr "Exposant. Table OpenType : sups" #. Caps ---------------------------------- #. Add tooltips #: ../src/ui/widget/font-variants.cpp:138 -#, fuzzy msgid "Normal capitalization." -msgstr "Localisation" +msgstr "Capitalisation normale." #: ../src/ui/widget/font-variants.cpp:139 msgid "Small-caps (lowercase). OpenType table: 'smcp'" -msgstr "" +msgstr "Petites capitales (pour les minuscules). Table OpenType : smcp" #: ../src/ui/widget/font-variants.cpp:140 msgid "" "All small-caps (uppercase and lowercase). OpenType tables: 'c2sc' and 'smcp'" msgstr "" +"Tout en petites capitales (les majuscules et les minuscules). Tables " +"OpenType : c2sc et smcp" #: ../src/ui/widget/font-variants.cpp:141 msgid "Petite-caps (lowercase). OpenType table: 'pcap'" msgstr "" +"Plus petites capitales (pour les minuscules). Tables OpenType : c2sc et smcp" #: ../src/ui/widget/font-variants.cpp:142 msgid "" "All petite-caps (uppercase and lowercase). OpenType tables: 'c2sc' and 'pcap'" msgstr "" +"Tout en petites capitales (les majuscules et les minuscules). Tables " +"OpenType : c2sc et pcap" #: ../src/ui/widget/font-variants.cpp:143 msgid "" "Unicase (small caps for uppercase, normal for lowercase). OpenType table: " "'unic'" msgstr "" +"Unicasse (petites capitales pour les majuscules, normal pour les " +"minuscules). Table OpenType : unic" #: ../src/ui/widget/font-variants.cpp:144 msgid "" "Titling caps (lighter-weight uppercase for use in titles). OpenType table: " "'titl'" msgstr "" +"Capitales de titre (majuscules de poids inférieur). Table OpenType : titl" #. Numeric ------------------------------ #. Add tooltips #: ../src/ui/widget/font-variants.cpp:180 -#, fuzzy msgid "Normal style." -msgstr "Décalage normal :" +msgstr "Style normal." #: ../src/ui/widget/font-variants.cpp:181 msgid "Lining numerals. OpenType table: 'lnum'" -msgstr "" +msgstr "Numériques alignés. Table OpenType : lnum" #: ../src/ui/widget/font-variants.cpp:182 msgid "Old style numerals. OpenType table: 'onum'" -msgstr "" +msgstr "Numériques en style ancien. Table OpenType : onum" #: ../src/ui/widget/font-variants.cpp:183 -#, fuzzy msgid "Normal widths." -msgstr "Lumière normale" +msgstr "Largeurs normales." #: ../src/ui/widget/font-variants.cpp:184 msgid "Proportional width numerals. OpenType table: 'pnum'" -msgstr "" +msgstr "Numériques de largeur proportionnelle. Table OpenType : pnum" #: ../src/ui/widget/font-variants.cpp:185 msgid "Same width numerals. OpenType table: 'tnum'" -msgstr "" +msgstr "Numériques de même largeur. Table OpenType : tnum" #: ../src/ui/widget/font-variants.cpp:186 -#, fuzzy msgid "Normal fractions." -msgstr "Ignorer les rotations d'image" +msgstr "Fractions normales." #: ../src/ui/widget/font-variants.cpp:187 msgid "Diagonal fractions. OpenType table: 'frac'" -msgstr "" +msgstr "Fractions diagonales. Table OpenType : frac" #: ../src/ui/widget/font-variants.cpp:188 msgid "Stacked fractions. OpenType table: 'afrc'" -msgstr "" +msgstr "Fractions empilées. Table OpenType : afrc" #: ../src/ui/widget/font-variants.cpp:189 msgid "Ordinals (raised 'th', etc.). OpenType table: 'ordn'" -msgstr "" +msgstr "Ordinaux (« e » exposant, etc.). Table OpenType : ordn" #: ../src/ui/widget/font-variants.cpp:190 msgid "Slashed zeros. OpenType table: 'zero'" -msgstr "" +msgstr "Zéros barrés. Table OpenType : zero" #. Feature settings --------------------- #. Add tooltips #: ../src/ui/widget/font-variants.cpp:240 msgid "Feature settings in CSS form. No sanity checking is performed." -msgstr "" +msgstr "Propriétés de la fonction en CSS. Aucune vérification n'est effectuée." #: ../src/ui/widget/layer-selector.cpp:118 msgid "Toggle current layer visibility" -msgstr "Afficher ou masquer le calque courant" +msgstr "Afficher ou masquer le calque actif" #: ../src/ui/widget/layer-selector.cpp:138 msgid "Lock or unlock current layer" -msgstr "Verrouiller ou libérer le calque courant" +msgstr "Verrouiller ou déverrouiller le calque actif" #: ../src/ui/widget/layer-selector.cpp:141 msgid "Current layer" -msgstr "Calque courant" +msgstr "Calque actif" #: ../src/ui/widget/layer-selector.cpp:582 msgid "(root)" @@ -25611,9 +25551,8 @@ msgid "MetadataLicence|Other" msgstr "Autre" #: ../src/ui/widget/licensor.cpp:72 -#, fuzzy msgid "Document license updated" -msgstr "Nettoyage du document" +msgstr "Licence du document mise à jour" #: ../src/ui/widget/object-composite-settings.cpp:47 #: ../src/ui/widget/selected-style.cpp:1118 @@ -25633,15 +25572,15 @@ msgstr "Modifier l'opacité" #: ../src/ui/widget/page-sizer.cpp:236 msgid "U_nits:" -msgstr "U_nités :" +msgstr "U_nité :" #: ../src/ui/widget/page-sizer.cpp:237 msgid "Width of paper" -msgstr "Largeur de papier" +msgstr "Largeur du papier" #: ../src/ui/widget/page-sizer.cpp:238 msgid "Height of paper" -msgstr "Hauteur de papier" +msgstr "Hauteur du papier" #: ../src/ui/widget/page-sizer.cpp:239 msgid "T_op margin:" @@ -25657,7 +25596,7 @@ msgstr "Gauch_e :" #: ../src/ui/widget/page-sizer.cpp:240 msgid "Left margin" -msgstr "Marge gauche" +msgstr "Marge de gauche" #: ../src/ui/widget/page-sizer.cpp:241 msgid "Ri_ght:" @@ -25665,7 +25604,7 @@ msgstr "Dro_ite :" #: ../src/ui/widget/page-sizer.cpp:241 msgid "Right margin" -msgstr "Marge droite" +msgstr "Marge de droite" #: ../src/ui/widget/page-sizer.cpp:242 msgid "Botto_m:" @@ -25681,7 +25620,7 @@ msgstr "Échelle _x :" #: ../src/ui/widget/page-sizer.cpp:244 msgid "Scale X" -msgstr "Échelle x" +msgstr "Échelle X" #: ../src/ui/widget/page-sizer.cpp:245 msgid "Scale _y:" @@ -25689,7 +25628,7 @@ msgstr "Échelle _y :" #: ../src/ui/widget/page-sizer.cpp:245 msgid "Scale Y" -msgstr "Échelle x" +msgstr "Échelle Y" #: ../src/ui/widget/page-sizer.cpp:323 msgid "Orientation:" @@ -25730,11 +25669,14 @@ msgid "" "scaling in Inkscape. To set a non-uniform scaling, set the 'viewBox' " "directly." msgstr "" +"Bien que le SVG autorise le redimensionnement non uniforme, il est " +"recommandé de n'utiliser que le redimensionnement uniforme dans Inkscape. " +"Pour effectuer un redimensionnement non uniforme, définissez directement la " +"« zone de vue »." #: ../src/ui/widget/page-sizer.cpp:483 -#, fuzzy msgid "_Viewbox..." -msgstr "_Affichage" +msgstr "_Zone de vue..." #: ../src/ui/widget/page-sizer.cpp:590 msgid "Set page size" @@ -25742,16 +25684,15 @@ msgstr "Définir les dimensions de la page" #: ../src/ui/widget/page-sizer.cpp:836 msgid "User units per " -msgstr "" +msgstr "Unités utilisateur par " #: ../src/ui/widget/page-sizer.cpp:932 -#, fuzzy msgid "Set page scale" -msgstr "Définir les dimensions de la page" +msgstr "Définir la mise à l'échelle de la page" #: ../src/ui/widget/page-sizer.cpp:958 msgid "Set 'viewBox'" -msgstr "" +msgstr "Définir la « zone de vue »" #: ../src/ui/widget/panel.cpp:116 msgid "List" @@ -25849,14 +25790,14 @@ msgstr "_Parcourir..." #: ../src/ui/widget/preferences-widget.cpp:881 msgid "Select a bitmap editor" -msgstr "Sélectionnez un éditeur de bitmap" +msgstr "Sélectionnez un éditeur d'images matricielles" #: ../src/ui/widget/random.cpp:84 msgid "" "Reseed the random number generator; this creates a different sequence of " "random numbers." msgstr "" -"Réinitialiser le générateur pseudo-aléatoire; cela crée une nouvelle suite " +"Réinitialiser le générateur pseudo-aléatoire ; cela crée une nouvelle suite " "de nombre aléatoires." #: ../src/ui/widget/rendering-options.cpp:33 @@ -25869,15 +25810,15 @@ msgstr "Vectoriel" #: ../src/ui/widget/rendering-options.cpp:35 msgid "Bitmap" -msgstr "Bitmap" +msgstr "Matriciel" #: ../src/ui/widget/rendering-options.cpp:36 msgid "Bitmap options" -msgstr "Options pour les bitmaps" +msgstr "Options pour les objets matriciels" #: ../src/ui/widget/rendering-options.cpp:38 msgid "Preferred resolution of rendering, in dots per inch." -msgstr "Résolution préférée (point par pouce) du rendu." +msgstr "Résolution préférée pour le rendu, en points par pouce." #: ../src/ui/widget/rendering-options.cpp:47 msgid "" @@ -25885,9 +25826,9 @@ msgid "" "smaller in file size and can be arbitrarily scaled, but some filter effects " "will not be correctly rendered." msgstr "" -"Utiliser les opérateurs vectoriels Cairo. Le fichier image résultant est en " -"général moins volumineux et reste redimensionnable; cependant les motifs de " -"remplissage seront perdus." +"Produire en utilisant les opérations vectorielles Cairo. L'image résultante " +"est en général moins volumineuse et reste redimensionnable, mais certains " +"effets de filtre ne seront pas rendus correctement." #: ../src/ui/widget/rendering-options.cpp:52 msgid "" @@ -25895,9 +25836,9 @@ msgid "" "size and cannot be arbitrarily scaled without quality loss, but all objects " "will be rendered exactly as displayed." msgstr "" -"Tout imprimer en tant que bitmap. Le fichier image résultant sera en général " -"plus volumineux et n'est plus redimensionnable sans perte de qualité, " -"cependant tous les objets seront rendus tels qu'affichés." +"Tout produire en matriciel. L'image résultante est en général plus " +"volumineuse et n'est plus redimensionnable sans perte de qualité, mais tous " +"les objets seront rendus tels qu'affichés." #: ../src/ui/widget/selected-style.cpp:131 #: ../src/ui/widget/style-swatch.cpp:129 @@ -25950,7 +25891,7 @@ msgstr "Motif" #: ../src/ui/widget/selected-style.cpp:196 #: ../src/ui/widget/style-swatch.cpp:304 msgid "Pattern fill" -msgstr "Motif de remplissage" +msgstr "Motif de fond" #: ../src/ui/widget/selected-style.cpp:196 #: ../src/ui/widget/style-swatch.cpp:304 @@ -25986,19 +25927,16 @@ msgid "Radial gradient stroke" msgstr "Dégradé radial de contour" #: ../src/ui/widget/selected-style.cpp:219 -#, fuzzy msgid "M" -msgstr "L" +msgstr "M" #: ../src/ui/widget/selected-style.cpp:222 -#, fuzzy msgid "Mesh gradient fill" -msgstr "Dégradé linéaire de fond" +msgstr "Fond du filet de dégradé" #: ../src/ui/widget/selected-style.cpp:222 -#, fuzzy msgid "Mesh gradient stroke" -msgstr "Dégradé linéaire de contour" +msgstr "Contour du filet de dégradé" #: ../src/ui/widget/selected-style.cpp:230 msgid "Different" @@ -26169,7 +26107,7 @@ msgstr "Modifier l'épaisseur du contour" #: ../src/ui/widget/selected-style.cpp:1072 msgid ", drag to adjust" -msgstr ", cliquer-déplacer pour ajuster" +msgstr ", cliquer-glisser pour ajuster" #: ../src/ui/widget/selected-style.cpp:1157 #, c-format @@ -26215,7 +26153,7 @@ msgid "" "modifiers to adjust hue" msgstr "" "Ajustement de la saturation : valeur précédente %.3g, désormais " -"%.3g (diff. %.3g) ; Ctrl pour ajuster la luminosité, csans touche " +"%.3g (diff. %.3g) ; Ctrl pour ajuster la luminosité, sans touche " "modificatrice pour ajuster la teinte" #: ../src/ui/widget/selected-style.cpp:1397 @@ -26297,12 +26235,12 @@ msgstr "Épaisseur de contour : %.5g%s" #: ../src/ui/widget/style-swatch.cpp:364 #, c-format msgid "O: %2.0f" -msgstr "O: %2.0f" +msgstr "O : %2.0f" #: ../src/ui/widget/style-swatch.cpp:369 #, c-format msgid "Opacity: %2.1f %%" -msgstr "Opacité : %2.1f %%" +msgstr "Opacité : %2.1f %%" #: ../src/vanishing-point.cpp:133 msgid "Split vanishing points" @@ -26324,8 +26262,8 @@ msgid_plural "" "b> to separate selected box(es)" msgstr[0] "Point de fuite fini partagé par %d boîte" msgstr[1] "" -"Point de fuite fini partagé par %d boîtes; cliquer-déplacer " -"avec Maj pour séparer les boîte(s) sélectionnée(s)" +"Point de fuite fini partagé par %d boîtes ; cliquer-glisser " +"avec Maj pour séparer la/les boîte(s) sélectionnée(s)" #. This won't make sense any more when infinite VPs are not shown on the canvas, #. but currently we update the status message anyway @@ -26337,8 +26275,8 @@ msgid_plural "" "Shift to separate selected box(es)" msgstr[0] "Point de fuite infini partagé par %d boîte" msgstr[1] "" -"Point de fuite infini partagé par %d boîtes; cliquer-déplacer " -"avec Maj pour séparer les boîte(s) sélectionnée(s)" +"Point de fuite infini partagé par %d boîtes ; cliquer-glisser " +"avec Maj pour séparer la/les boîte(s) sélectionnée(s)" #: ../src/vanishing-point.cpp:344 #, c-format @@ -26348,11 +26286,11 @@ msgid_plural "" "shared by %d boxes; drag with Shift to separate selected " "box(es)" msgstr[0] "" -"partagé par %d boîte; déplacer avec Maj pour séparer les " -"boîte(s) sélectionnée(s)" +"partagé par %d boîte ; cliquer-glisser avec Maj pour séparer " +"la/les boîte(s) sélectionnée(s)" msgstr[1] "" -"partagé par %d boîtes; déplacer avec Maj pour séparer la boîte " -"sélectionnée" +"partagé par %d boîtes ; cliquer-glisser avec Maj pour séparer " +"la/les boîte(s) sélectionnée(s)" #: ../src/verbs.cpp:137 msgid "File" @@ -26403,7 +26341,7 @@ msgstr "Impossible de transférer sous le premier calque." #: ../src/verbs.cpp:1311 ../src/verbs.cpp:1378 ../src/verbs.cpp:1414 #: ../src/verbs.cpp:1420 ../src/verbs.cpp:1444 ../src/verbs.cpp:1459 msgid "No current layer." -msgstr "Aucun calque courant." +msgstr "Aucun calque actif." #: ../src/verbs.cpp:1340 ../src/verbs.cpp:1344 #, c-format @@ -26478,14 +26416,13 @@ msgid "Flip vertically" msgstr "Retourner verticalement" #: ../src/verbs.cpp:1590 -#, fuzzy, c-format +#, c-format msgid "Set %d" -msgstr "Définir la largeur :" +msgstr "Définir %d" #: ../src/verbs.cpp:1599 ../src/verbs.cpp:2729 -#, fuzzy msgid "Create new selection set" -msgstr "Créer un nouveau nœud élément" +msgstr "Créer un nouvel ensemble de sélection" # Name of the displayed file (in Help > tutorials > ...). To be translated if the tutorial has been translated. #. TRANSLATORS: If you have translated the tutorial-basic.en.svgz file to your language, @@ -26544,7 +26481,7 @@ msgstr "tutorial-tips.fr.svg" #: ../src/verbs.cpp:2396 ../src/verbs.cpp:3012 msgid "Unlock all objects in the current layer" -msgstr "Déverrouiller tous les objets sur le calque courant" +msgstr "Déverrouiller tous les objets sur le calque actif" #: ../src/verbs.cpp:2400 ../src/verbs.cpp:3014 msgid "Unlock all objects in all layers" @@ -26552,7 +26489,7 @@ msgstr "Déverouiller tous les objets sur tous les calques" #: ../src/verbs.cpp:2404 ../src/verbs.cpp:3016 msgid "Unhide all objects in the current layer" -msgstr "Montrer tous les objets sur le calque courant" +msgstr "Montrer tous les objets sur le calque actif" #: ../src/verbs.cpp:2408 ../src/verbs.cpp:3018 msgid "Unhide all objects in all layers" @@ -26642,7 +26579,7 @@ msgstr "_Importer..." #: ../src/verbs.cpp:2444 msgid "Import a bitmap or SVG image into this document" -msgstr "Importer une image SVG ou bitmap dans ce document" +msgstr "Importer une image matricielle ou une image SVG dans ce document" #. new FileVerb(SP_VERB_FILE_EXPORT, "FileExport", N_("_Export Bitmap..."), N_("Export this document or a selection as a bitmap image"), INKSCAPE_ICON("document-export")), #: ../src/verbs.cpp:2446 @@ -26651,7 +26588,7 @@ msgstr "Importer un Clip Art..." #: ../src/verbs.cpp:2447 msgid "Import clipart from Open Clip Art Library" -msgstr "Importer depuis la bibliothèque Open Clip Art" +msgstr "Importer un Clip Art depuis la bibliothèque 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:2449 @@ -26687,9 +26624,8 @@ msgid "Quit Inkscape" msgstr "Quitter Inkscape" #: ../src/verbs.cpp:2456 -#, fuzzy msgid "New from _Template..." -msgstr "Nouveau à partir d'un modèle" +msgstr "Nouveau à partir d'un _modèle..." #: ../src/verbs.cpp:2457 msgid "Create new project from template" @@ -26885,13 +26821,15 @@ msgstr "Sélectionner l'objet auquel le clone sélectionné est lié" #: ../src/verbs.cpp:2504 msgid "Clone original path (LPE)" -msgstr "Cloner le chemin original (LPE)" +msgstr "Cloner le chemin original (ECI)" #: ../src/verbs.cpp:2505 msgid "" "Creates a new path, applies the Clone original LPE, and refers it to the " "selected path" msgstr "" +"Crée un nouveau chemin, applique l'ECI original du clone, et le dirige vers " +"le chemin sélectionné" #: ../src/verbs.cpp:2506 msgid "Objects to _Marker" @@ -26927,7 +26865,7 @@ msgstr "Motif en _objets" #: ../src/verbs.cpp:2513 msgid "Extract objects from a tiled pattern fill" -msgstr "Extraire des objet(s) d'un motif de remplissage" +msgstr "Extraire des objet(s) d'un fond en motif pavé" #: ../src/verbs.cpp:2514 msgid "Group to Symbol" @@ -27018,7 +26956,7 @@ msgid "" "etc) as the selected objects" msgstr "" "Sélectionner tous les objets de même type (rectangle, arc, texte, chemin, " -"bitmap, etc.) que la sélection" +"matriciel, etc.) que la sélection" #: ../src/verbs.cpp:2534 msgid "In_vert Selection" @@ -27068,14 +27006,12 @@ msgid "Delete all the guides in the document" msgstr "Supprimer tous les guides du document" #: ../src/verbs.cpp:2546 -#, fuzzy msgid "Lock All Guides" -msgstr "Verrouiller tout" +msgstr "Verrouiller tout les guides" #: ../src/verbs.cpp:2546 ../src/widgets/desktop-widget.cpp:404 -#, fuzzy msgid "Toggle lock of all guides in the document" -msgstr "Supprimer tous les guides du document" +msgstr "Inverser l'état du verrou tous les guides du document" #: ../src/verbs.cpp:2547 msgid "Create _Guides Around the Page" @@ -27135,14 +27071,12 @@ msgid "Ungroup selected groups" msgstr "Dégrouper les groupes sélectionnés" #: ../src/verbs.cpp:2565 -#, fuzzy msgid "_Pop selected objects out of group" -msgstr "Grouper les objets sélectionnés" +msgstr "_Sortir les objets sélectionnés du groupe" #: ../src/verbs.cpp:2566 -#, fuzzy msgid "Pop selected objects out of group" -msgstr "Grouper les objets sélectionnés" +msgstr "Sortir les objets sélectionnés du groupe" #: ../src/verbs.cpp:2568 msgid "_Put on Path" @@ -27229,11 +27163,11 @@ msgstr "Dilater les chemins sélectionnés" #: ../src/verbs.cpp:2597 msgid "O_utset Path by 1 px" -msgstr "_Dilater le chemin de 1px" +msgstr "_Dilater le chemin d'1 px" #: ../src/verbs.cpp:2598 msgid "Outset selected paths by 1 px" -msgstr "Dilater les chemins sélectionnés de 1 px" +msgstr "Dilater les chemins sélectionnés d'1 px" #: ../src/verbs.cpp:2600 msgid "O_utset Path by 10 px" @@ -27248,43 +27182,43 @@ msgstr "Dilater les chemins sélectionnés de 10 px" #. See also the Advanced Tutorial for explanation. #: ../src/verbs.cpp:2605 msgid "I_nset" -msgstr "Co_ntracter" +msgstr "_Éroder" #: ../src/verbs.cpp:2606 msgid "Inset selected paths" -msgstr "Contracter les chemins sélectionnés" +msgstr "Éroder les chemins sélectionnés" #: ../src/verbs.cpp:2608 msgid "I_nset Path by 1 px" -msgstr "Co_ntracter le chemin de 1 px" +msgstr "_Éroder le chemin d'1 px" #: ../src/verbs.cpp:2609 msgid "Inset selected paths by 1 px" -msgstr "Contracter les chemins sélectionnés de 1 px" +msgstr "Éroder les chemins sélectionnés d'1 px" #: ../src/verbs.cpp:2611 msgid "I_nset Path by 10 px" -msgstr "Co_ntracter le chemin de 10 px" +msgstr "_Éroder le chemin de 10 px" #: ../src/verbs.cpp:2612 msgid "Inset selected paths by 10 px" -msgstr "Contracter les chemins sélectionnés de 10 px" +msgstr "Éroder les chemins sélectionnés de 10 px" #: ../src/verbs.cpp:2614 msgid "D_ynamic Offset" -msgstr "Offset d_ynamique" +msgstr "Décalage d_ynamique" #: ../src/verbs.cpp:2614 msgid "Create a dynamic offset object" -msgstr "Créer un objet offset dynamique" +msgstr "Créer un objet de décalage dynamique" #: ../src/verbs.cpp:2616 msgid "_Linked Offset" -msgstr "Offset _lié" +msgstr "Décalage _lié" #: ../src/verbs.cpp:2617 msgid "Create a dynamic offset object linked to the original path" -msgstr "Créer un objet offset dynamique lié au chemin original" +msgstr "Créer un objet de décalage dynamique lié au chemin original" #: ../src/verbs.cpp:2619 msgid "_Stroke to Path" @@ -27314,7 +27248,7 @@ msgstr "" #: ../src/verbs.cpp:2629 msgid "Create one or more paths from a bitmap by tracing it" -msgstr "Créer un ou plusieurs chemin en vectorisant un bitmap" +msgstr "Créer un ou plusieurs chemin en vectorisant un objet matriciel" #: ../src/verbs.cpp:2632 msgid "Trace Pixel Art..." @@ -27328,11 +27262,13 @@ msgstr "" #: ../src/verbs.cpp:2634 msgid "Make a _Bitmap Copy" -msgstr "Faire une copie bit_map" +msgstr "Créer une copie _matricielle" #: ../src/verbs.cpp:2635 msgid "Export selection to a bitmap and insert it into document" -msgstr "Exporter la sélection en bitmap et insérer celui-ci dans le document" +msgstr "" +"Exporter la sélection vers un objet matriciel et insérer celui-ci dans le " +"document" #: ../src/verbs.cpp:2636 msgid "_Combine" @@ -27375,7 +27311,7 @@ msgstr "Re_nommer le calque..." #: ../src/verbs.cpp:2648 msgid "Rename the current layer" -msgstr "Renommer le calque courant" +msgstr "Renommer le calque actif" #: ../src/verbs.cpp:2649 msgid "Switch to Layer Abov_e" @@ -27383,7 +27319,7 @@ msgstr "Passer au calque supéri_eur" #: ../src/verbs.cpp:2650 msgid "Switch to the layer above the current" -msgstr "Passer au calque au-dessus du calque courant" +msgstr "Passer au calque au-dessus du calque actif" #: ../src/verbs.cpp:2651 msgid "Switch to Layer Belo_w" @@ -27391,7 +27327,7 @@ msgstr "Passer au calque inférie_ur" #: ../src/verbs.cpp:2652 msgid "Switch to the layer below the current" -msgstr "Passer au calque en-dessous du calque courant" +msgstr "Passer au calque en dessous du calque actif" #: ../src/verbs.cpp:2653 msgid "Move Selection to Layer Abo_ve" @@ -27399,7 +27335,7 @@ msgstr "Déplacer la sélection au calque su_périeur" #: ../src/verbs.cpp:2654 msgid "Move selection to the layer above the current" -msgstr "Déplacer la sélection vers le calque au-dessus du calque courant" +msgstr "Déplacer la sélection vers le calque au-dessus du calque actif" #: ../src/verbs.cpp:2655 msgid "Move Selection to Layer Bel_ow" @@ -27407,7 +27343,7 @@ msgstr "Déplacer la sélection au calque in_férieur" #: ../src/verbs.cpp:2656 msgid "Move selection to the layer below the current" -msgstr "Déplacer la sélection vers le calque en-dessous du calque courant" +msgstr "Déplacer la sélection vers le calque en dessous du calque actif" #: ../src/verbs.cpp:2657 msgid "Move Selection to Layer..." @@ -27419,7 +27355,7 @@ msgstr "Calque au pre_mier plan" #: ../src/verbs.cpp:2660 msgid "Raise the current layer to the top" -msgstr "Monter le calque courant au premier plan" +msgstr "Monter le calque actif au premier plan" #: ../src/verbs.cpp:2661 msgid "Layer to _Bottom" @@ -27427,7 +27363,7 @@ msgstr "Calque à l'a_rrière-plan" #: ../src/verbs.cpp:2662 msgid "Lower the current layer to the bottom" -msgstr "Descendre le calque courant à l'arrière-plan" +msgstr "Descendre le calque actif à l'arrière-plan" #: ../src/verbs.cpp:2663 msgid "_Raise Layer" @@ -27435,7 +27371,7 @@ msgstr "M_onter le calque" #: ../src/verbs.cpp:2664 msgid "Raise the current layer" -msgstr "Monter le calque courant" +msgstr "Monter le calque actif" #: ../src/verbs.cpp:2665 msgid "_Lower Layer" @@ -27443,11 +27379,11 @@ msgstr "Descen_dre le calque" #: ../src/verbs.cpp:2666 msgid "Lower the current layer" -msgstr "Descendre le calque courant" +msgstr "Descendre le calque actif" #: ../src/verbs.cpp:2667 msgid "D_uplicate Current Layer" -msgstr "D_upliquer le calque courant" +msgstr "D_upliquer le calque actif" #: ../src/verbs.cpp:2668 msgid "Duplicate an existing layer" @@ -27455,11 +27391,11 @@ msgstr "Dupliquer un calque existant" #: ../src/verbs.cpp:2669 msgid "_Delete Current Layer" -msgstr "_Supprimer le calque courant" +msgstr "_Supprimer le calque actif" #: ../src/verbs.cpp:2670 msgid "Delete the current layer" -msgstr "Supprimer le calque courant" +msgstr "Supprimer le calque actif" #: ../src/verbs.cpp:2671 msgid "_Show/hide other layers" @@ -27467,7 +27403,7 @@ msgstr "Afficher ou masquer les autres calques" #: ../src/verbs.cpp:2672 msgid "Solo the current layer" -msgstr "Afficher le calque courant uniquement" +msgstr "Afficher le calque actif uniquement" #: ../src/verbs.cpp:2673 msgid "_Show all layers" @@ -27511,19 +27447,19 @@ msgstr "Déverrouiller tous les calques" #: ../src/verbs.cpp:2683 msgid "_Lock/Unlock Current Layer" -msgstr "Verrouiller ou _libérer le calque courant" +msgstr "_Verrouiller/déverrouiller le calque actif" #: ../src/verbs.cpp:2684 msgid "Toggle lock on current layer" -msgstr "Afficher le calque courant uniquement" +msgstr "Changer l'état du verrou sur le calque actif" #: ../src/verbs.cpp:2685 msgid "_Show/hide Current Layer" -msgstr "Afficher ou _masquer le calque courant" +msgstr "Afficher/_masquer le calque actif" #: ../src/verbs.cpp:2686 msgid "Toggle visibility of current layer" -msgstr "Afficher le calque courant uniquement" +msgstr "Changer la visibilité du calque actif" #. Object #: ../src/verbs.cpp:2689 @@ -27633,14 +27569,13 @@ msgstr "" "au-dessus comme chemin de découpe)" #: ../src/verbs.cpp:2721 -#, fuzzy msgid "Create Cl_ip Group" -msgstr "Créer un clo_ne" +msgstr "Créer un groupe de _découpe" #: ../src/verbs.cpp:2722 -#, fuzzy msgid "Creates a clip group using the selected objects as a base" -msgstr "Créer un clone (une copie liée à l'original) de l'objet sélectionné" +msgstr "" +"Créer un groupe de découpe en utilisant les objets sélectionnés comme base" #: ../src/verbs.cpp:2724 msgid "Edit clipping path" @@ -27654,7 +27589,7 @@ msgstr "Retirer le chemin de découpe de la sélection" #: ../src/verbs.cpp:2731 msgctxt "ContextVerb" msgid "Select" -msgstr "Sélectionner" +msgstr "Sélecteur" #: ../src/verbs.cpp:2732 msgid "Select and transform objects" @@ -27663,7 +27598,7 @@ msgstr "Sélectionner et transformer des objets" #: ../src/verbs.cpp:2733 msgctxt "ContextVerb" msgid "Node Edit" -msgstr "Éditer les nœuds" +msgstr "Nœuds" #: ../src/verbs.cpp:2734 msgid "Edit paths by nodes" @@ -27779,7 +27714,7 @@ msgstr "Filet" #: ../src/verbs.cpp:2760 msgid "Create and edit meshes" -msgstr "Créer et éditer des toiles de dégradés" +msgstr "Créer et éditer des filets de dégradé" #: ../src/verbs.cpp:2761 msgctxt "ContextVerb" @@ -27788,11 +27723,11 @@ msgstr "Zoom" #: ../src/verbs.cpp:2762 msgid "Zoom in or out" -msgstr "(Dé)zoomer" +msgstr "Zoomer et dézoomer" #: ../src/verbs.cpp:2764 msgid "Measurement tool" -msgstr "Outil de mesure" +msgstr "Mesurer des distances et des angles" #: ../src/verbs.cpp:2765 msgctxt "ContextVerb" @@ -27811,7 +27746,7 @@ msgstr "Créer des connecteurs" #: ../src/verbs.cpp:2771 msgctxt "ContextVerb" msgid "Paint Bucket" -msgstr "Remplissage au seau" +msgstr "Pot de peinture" #: ../src/verbs.cpp:2772 msgid "Fill bounded areas" @@ -27820,7 +27755,7 @@ msgstr "Remplir une zone bornée" #: ../src/verbs.cpp:2775 msgctxt "ContextVerb" msgid "LPE Edit" -msgstr "Édition des effets de chemin en direct" +msgstr "Édition des effets de chemin interactifs" #: ../src/verbs.cpp:2776 msgid "Edit Path Effect parameters" @@ -27838,189 +27773,189 @@ msgstr "Effacer les chemins existants" #: ../src/verbs.cpp:2779 msgctxt "ContextVerb" msgid "LPE Tool" -msgstr "Outil effets de chemin en direct" +msgstr "Effets de chemin interactifs" #: ../src/verbs.cpp:2780 msgid "Do geometric constructions" -msgstr "Réalise des contructions géométriques" +msgstr "Réaliser des constructions géométriques" #. Tool prefs #: ../src/verbs.cpp:2782 msgid "Selector Preferences" -msgstr "Préférences du sélecteur" +msgstr "Préférences : Sélecteur" #: ../src/verbs.cpp:2783 msgid "Open Preferences for the Selector tool" -msgstr "Ouvrir les préférences de l'outil sélecteur" +msgstr "Ouvrir les préférences de l'outil Sélecteur" #: ../src/verbs.cpp:2784 msgid "Node Tool Preferences" -msgstr "Préférences des nœuds" +msgstr "Préférences : Nœuds" #: ../src/verbs.cpp:2785 msgid "Open Preferences for the Node tool" -msgstr "Ouvrir les préférences de l'outil nœud" +msgstr "Ouvrir les préférences de l'outil Nœuds" # flo: je ne suis pas certain du nom bidouillage, à changer si tu as mieux. #: ../src/verbs.cpp:2786 msgid "Tweak Tool Preferences" -msgstr "Préférences de l'outil d'ajustement" +msgstr "Préférences : Ajuster" #: ../src/verbs.cpp:2787 msgid "Open Preferences for the Tweak tool" -msgstr "Ouvrir les préférences de l'outil d'ajustement" +msgstr "Ouvrir les préférences de l'outil Ajuster" #: ../src/verbs.cpp:2788 msgid "Spray Tool Preferences" -msgstr "Préférences de l'outil aérographe" +msgstr "Préférences : Aérographe" #: ../src/verbs.cpp:2789 msgid "Open Preferences for the Spray tool" -msgstr "Ouvrir les préférences de l'outil aérographe" +msgstr "Ouvrir les préférences de l'outil Aérographe" #: ../src/verbs.cpp:2790 msgid "Rectangle Preferences" -msgstr "Préférences des rectangles" +msgstr "Préférences : Rectangle" #: ../src/verbs.cpp:2791 msgid "Open Preferences for the Rectangle tool" -msgstr "Ouvrir les préférences de l'outil rectangle" +msgstr "Ouvrir les préférences de l'outil Rectangle" #: ../src/verbs.cpp:2792 msgid "3D Box Preferences" -msgstr "Préférences des boîtes 3D" +msgstr "Préférences : Boîtes 3D" #: ../src/verbs.cpp:2793 msgid "Open Preferences for the 3D Box tool" -msgstr "Ouvrir les préférences de l'outil boîte 3D" +msgstr "Ouvrir les préférences de l'outil Boîte 3D" #: ../src/verbs.cpp:2794 msgid "Ellipse Preferences" -msgstr "Préférences des ellipses" +msgstr "Préférences : Ellipse" #: ../src/verbs.cpp:2795 msgid "Open Preferences for the Ellipse tool" -msgstr "Ouvrir les préférences de l'outil ellipse" +msgstr "Ouvrir les préférences de l'outil Ellipse" #: ../src/verbs.cpp:2796 msgid "Star Preferences" -msgstr "Préférences des étoiles" +msgstr "Préférences : Étoile" #: ../src/verbs.cpp:2797 msgid "Open Preferences for the Star tool" -msgstr "Ouvrir les préférences de l'outil étoile" +msgstr "Ouvrir les préférences de l'outil Étoile" #: ../src/verbs.cpp:2798 msgid "Spiral Preferences" -msgstr "Préférences des spirales" +msgstr "Préférences : Spirale" #: ../src/verbs.cpp:2799 msgid "Open Preferences for the Spiral tool" -msgstr "Ouvrir les préférences de l'outil spirale" +msgstr "Ouvrir les préférences de l'outil Spirale" #: ../src/verbs.cpp:2800 msgid "Pencil Preferences" -msgstr "Préférences du crayon" +msgstr "Préférences : Crayon" #: ../src/verbs.cpp:2801 msgid "Open Preferences for the Pencil tool" -msgstr "Ouvrir les préférences de l'outil crayon" +msgstr "Ouvrir les préférences de l'outil Crayon" #: ../src/verbs.cpp:2802 msgid "Pen Preferences" -msgstr "Préférences du stylo" +msgstr "Préférences : Stylo" #: ../src/verbs.cpp:2803 msgid "Open Preferences for the Pen tool" -msgstr "Ouvrir les préférences de l'outil stylo" +msgstr "Ouvrir les préférences de l'outil Stylo" #: ../src/verbs.cpp:2804 msgid "Calligraphic Preferences" -msgstr "Préférences de la plume calligraphique" +msgstr "Préférences : Plume calligraphique" #: ../src/verbs.cpp:2805 msgid "Open Preferences for the Calligraphy tool" -msgstr "Ouvrir les préférences de la plume calligraphique" +msgstr "Ouvrir les préférences de la Plume calligraphique" #: ../src/verbs.cpp:2806 msgid "Text Preferences" -msgstr "Préférences des textes" +msgstr "Préférences : Texte" #: ../src/verbs.cpp:2807 msgid "Open Preferences for the Text tool" -msgstr "Ouvrir les préférences de l'outil texte" +msgstr "Ouvrir les préférences de l'outil Texte" #: ../src/verbs.cpp:2808 msgid "Gradient Preferences" -msgstr "Préférences des dégradés" +msgstr "Préférences : Dégradé" #: ../src/verbs.cpp:2809 msgid "Open Preferences for the Gradient tool" -msgstr "Ouvrir les préférences de l'outil de dégradé" +msgstr "Ouvrir les préférences de l'outil Dégradé" #: ../src/verbs.cpp:2810 msgid "Mesh Preferences" -msgstr "Préférences de l'outil Mesh" +msgstr "Préférences : Filet" #: ../src/verbs.cpp:2811 msgid "Open Preferences for the Mesh tool" -msgstr "Ouvrir les préférences de l'outil de Mesh" +msgstr "Ouvrir les préférences de l'outil Filet" #: ../src/verbs.cpp:2812 msgid "Zoom Preferences" -msgstr "Préférences du zoom" +msgstr "Préférences : Zoom" #: ../src/verbs.cpp:2813 msgid "Open Preferences for the Zoom tool" -msgstr "Ouvrir les préférences de l'outil zoom" +msgstr "Ouvrir les préférences de l'outil Zoom" #: ../src/verbs.cpp:2814 msgid "Measure Preferences" -msgstr "Préférences de l'outil de mesure" +msgstr "Préférences : Mesurer" #: ../src/verbs.cpp:2815 msgid "Open Preferences for the Measure tool" -msgstr "Ouvrir les préférences de l'outil de mesure" +msgstr "Ouvrir les préférences de l'outil Mesurer" #: ../src/verbs.cpp:2816 msgid "Dropper Preferences" -msgstr "Préférences de la pipette" +msgstr "Préférences : Pipette" #: ../src/verbs.cpp:2817 msgid "Open Preferences for the Dropper tool" -msgstr "Ouvrir les préférences de l'outil pipette" +msgstr "Ouvrir les préférences de l'outil Pipette" #: ../src/verbs.cpp:2818 msgid "Connector Preferences" -msgstr "Préférences des connecteurs" +msgstr "Préférences : Connecteur" #: ../src/verbs.cpp:2819 msgid "Open Preferences for the Connector tool" -msgstr "Ouvrir les préférences de l'outil connecteur" +msgstr "Ouvrir les préférences de l'outil Connecteur" #: ../src/verbs.cpp:2822 msgid "Paint Bucket Preferences" -msgstr "Préférences de remplissage au seau" +msgstr "Préférences : Pot de peinture" #: ../src/verbs.cpp:2823 msgid "Open Preferences for the Paint Bucket tool" -msgstr "Ouvrir les préférences de l'outil de remplissage au seau" +msgstr "Ouvrir les préférences de l'outil Pot de peinture" #: ../src/verbs.cpp:2826 msgid "Eraser Preferences" -msgstr "Préférences de la gomme" +msgstr "Préférences : Gomme" #: ../src/verbs.cpp:2827 msgid "Open Preferences for the Eraser tool" -msgstr "Ouvrir les préférences de l'outil gomme" +msgstr "Ouvrir les préférences de l'outil Gomme" #: ../src/verbs.cpp:2828 msgid "LPE Tool Preferences" -msgstr "Préférences de l'outil Effets de chemin en direct" +msgstr "Préférences : Effets de chemin interactifs" #: ../src/verbs.cpp:2829 msgid "Open Preferences for the LPETool tool" -msgstr "Ouvrir les préférences de l'outil Effets de chemin en direct" +msgstr "Ouvrir les préférences de l'outil Effets de chemin interactifs" #. Zoom/View #: ../src/verbs.cpp:2831 @@ -28045,7 +27980,7 @@ msgstr "_Règles" #: ../src/verbs.cpp:2833 msgid "Show or hide the canvas rulers" -msgstr "Afficher ou non les règles de la zone de travail" +msgstr "Afficher ou masquer les règles de la zone de travail" #: ../src/verbs.cpp:2834 msgid "Scroll_bars" @@ -28053,7 +27988,7 @@ msgstr "_Barres de défilement" #: ../src/verbs.cpp:2834 msgid "Show or hide the canvas scrollbars" -msgstr "Afficher ou non les barres de défilement de la zone de travail" +msgstr "Afficher ou masquer les barres de défilement de la zone de travail" #: ../src/verbs.cpp:2835 msgid "Page _Grid" @@ -28061,7 +27996,7 @@ msgstr "_Grille" #: ../src/verbs.cpp:2835 msgid "Show or hide the page grid" -msgstr "Afficher ou non la grille" +msgstr "Afficher ou masquer la grille" #: ../src/verbs.cpp:2836 msgid "G_uides" @@ -28070,8 +28005,8 @@ msgstr "G_uides" #: ../src/verbs.cpp:2836 msgid "Show or hide guides (drag from a ruler to create a guide)" msgstr "" -"Afficher ou non les guides (pour créer un guide, effectuer un cliquer-" -"déplacer depuis une règle)" +"Afficher ou masquer les guides (pour créer un guide, cliquer-glisser depuis " +"une règle)" #: ../src/verbs.cpp:2837 msgid "Enable snapping" @@ -28083,23 +28018,23 @@ msgstr "Barre des _commandes" #: ../src/verbs.cpp:2838 msgid "Show or hide the Commands bar (under the menu)" -msgstr "Afficher ou non la barre des commandes (sous le menu)" +msgstr "Afficher ou masquer la barre des commandes (sous le menu)" #: ../src/verbs.cpp:2839 msgid "Sn_ap Controls Bar" -msgstr "Barre des contrôles du m_agnétisme" +msgstr "Barre de contrôle du m_agnétisme" #: ../src/verbs.cpp:2839 msgid "Show or hide the snapping controls" -msgstr "Afficher ou non la barre des contrôles du magnétisme" +msgstr "Afficher ou masquer la barre de contrôle du magnétisme" #: ../src/verbs.cpp:2840 msgid "T_ool Controls Bar" -msgstr "Barre des contrôles d'_outils" +msgstr "Barre de contrôle des _outils" #: ../src/verbs.cpp:2840 msgid "Show or hide the Tool Controls bar" -msgstr "Afficher ou non la barre des contrôles d'outils" +msgstr "Afficher ou masquer la barre de contrôle des outils" #: ../src/verbs.cpp:2841 msgid "_Toolbox" @@ -28107,7 +28042,7 @@ msgstr "Boîte à _outils" #: ../src/verbs.cpp:2841 msgid "Show or hide the main toolbox (on the left)" -msgstr "Afficher ou non la boîte à outils principale (à gauche)" +msgstr "Afficher ou masquer la boîte à outils principale (à gauche)" #: ../src/verbs.cpp:2842 msgid "_Palette" @@ -28115,7 +28050,7 @@ msgstr "_Palette" #: ../src/verbs.cpp:2842 msgid "Show or hide the color palette" -msgstr "Afficher ou non la palette de couleurs" +msgstr "Afficher ou masquer la palette de couleurs" #: ../src/verbs.cpp:2843 msgid "_Statusbar" @@ -28123,7 +28058,7 @@ msgstr "Barre d'_état" #: ../src/verbs.cpp:2843 msgid "Show or hide the statusbar (at the bottom of the window)" -msgstr "Afficher ou non la barre d'état (en bas de la fenêtre)" +msgstr "Afficher ou masquer la barre d'état (en bas de la fenêtre)" #: ../src/verbs.cpp:2844 msgid "Nex_t Zoom" @@ -28171,7 +28106,7 @@ msgstr "Plein _écran" #: ../src/verbs.cpp:2854 ../src/verbs.cpp:2856 msgid "Stretch this document window to full screen" -msgstr "Afficher cette fenêtre (document) en plein écran" +msgstr "Afficher cette fenêtre de document en plein écran" #: ../src/verbs.cpp:2856 msgid "Fullscreen & Focus Mode" @@ -28274,7 +28209,7 @@ msgstr "" #: ../src/verbs.cpp:2888 msgid "Zoom to fit page in window" -msgstr "Ajuster la page à la fenêtre" +msgstr "Zoomer sur la page entière" #: ../src/verbs.cpp:2889 msgid "Page _Width" @@ -28282,15 +28217,15 @@ msgstr "_Largeur de la page" #: ../src/verbs.cpp:2890 msgid "Zoom to fit page width in window" -msgstr "Zoomer pour ajuster la largeur de la page à la fenêtre" +msgstr "Zoomer sur la largeur de la page" #: ../src/verbs.cpp:2892 msgid "Zoom to fit drawing in window" -msgstr "Zoomer pour ajuster le dessin à la fenêtre" +msgstr "Zoomer sur le dessin" #: ../src/verbs.cpp:2894 msgid "Zoom to fit selection in window" -msgstr "Zoomer pour ajuster la sélection à la fenêtre" +msgstr "Zoomer sur la sélection" #. Dialogs #: ../src/verbs.cpp:2897 @@ -28416,7 +28351,7 @@ msgstr "Rechercher et remplacer du texte dans le document" #: ../src/verbs.cpp:2931 msgid "Check spelling of text in document" -msgstr "Vérifier l'orthographe des texte du document" +msgstr "Vérifier l'orthographe des textes du document" #: ../src/verbs.cpp:2932 msgid "_Messages..." @@ -28436,15 +28371,14 @@ msgstr "Afficher ou non les dialogues ouverts" #: ../src/verbs.cpp:2936 msgid "Create Tiled Clones..." -msgstr "Créer un pavage avec des clones..." +msgstr "Créer un pavage de clones..." #: ../src/verbs.cpp:2937 msgid "" "Create multiple clones of selected object, arranging them into a pattern or " "scattering" msgstr "" -"Créer des clones multiple d'un objet, et les arranger selon un motif ou les " -"disperser" +"Créer des clones multiples d'un objet, organisés selon un motif ou dispersés" #: ../src/verbs.cpp:2938 msgid "_Object attributes..." @@ -28457,7 +28391,7 @@ msgstr "Éditer les attributs de l'objet..." #: ../src/verbs.cpp:2941 msgid "Edit the ID, locked and visible status, and other object properties" msgstr "" -"Editer l'Id, les statuts de visibilité et de verrouillage et autres " +"Éditer l'ID, les statuts de visibilité et de verrouillage et d'autres " "propriétés des objets" #: ../src/verbs.cpp:2942 @@ -28466,8 +28400,7 @@ msgstr "Périp_hériques de saisie..." #: ../src/verbs.cpp:2943 msgid "Configure extended input devices, such as a graphics tablet" -msgstr "" -"Configurer les périphériques de saisie étendus, comme une tablette graphique" +msgstr "Configurer les périphériques de saisie étendus (tablette graphique...)" #: ../src/verbs.cpp:2944 msgid "_Extensions..." @@ -28475,7 +28408,7 @@ msgstr "_Extensions..." #: ../src/verbs.cpp:2945 msgid "Query information about extensions" -msgstr "Demander des informations à propos des extensions" +msgstr "Demander des informations sur les extensions" #: ../src/verbs.cpp:2946 msgid "Layer_s..." @@ -28490,19 +28423,16 @@ msgid "Object_s..." msgstr "Objet_s..." #: ../src/verbs.cpp:2949 -#, fuzzy msgid "View Objects" -msgstr "Objets" +msgstr "Afficher les objets" #: ../src/verbs.cpp:2950 -#, fuzzy msgid "Selection se_ts..." -msgstr "Zone de sélection" +msgstr "Ensembles de sélection..." #: ../src/verbs.cpp:2951 -#, fuzzy msgid "View Tags" -msgstr "Afficher les calques" +msgstr "Afficher les balises" #: ../src/verbs.cpp:2952 msgid "Path E_ffects ..." @@ -28536,12 +28466,12 @@ msgstr "Imprimer les couleurs..." msgid "" "Select which color separations to render in Print Colors Preview rendermode" msgstr "" -"Sélectionner quelles séparations de couleur afficher en mode aperçu des " +"Sélectionner quelles séparations de couleur afficher en mode Aperçu des " "couleurs d'impression" #: ../src/verbs.cpp:2960 msgid "_Export PNG Image..." -msgstr "_Exporter une image PNG..." +msgstr "_Exporter au format PNG..." #: ../src/verbs.cpp:2961 msgid "Export this document or a selection as a PNG image" @@ -28558,11 +28488,11 @@ msgstr "Information sur les extensions d'Inkscape" #: ../src/verbs.cpp:2965 msgid "About _Memory" -msgstr "Gestion _mémoire" +msgstr "Gestion de la _mémoire" #: ../src/verbs.cpp:2966 msgid "Memory usage information" -msgstr "Information sur l'utilisation de la mémoire" +msgstr "Données sur l'utilisation de la mémoire" #: ../src/verbs.cpp:2967 msgid "_About Inkscape" @@ -28577,53 +28507,53 @@ msgstr "Version, auteurs et licence d'Inkscape" #. Tutorials #: ../src/verbs.cpp:2973 msgid "Inkscape: _Basic" -msgstr "Inkscape : _basique" +msgstr "Inkscape : _Basique" #: ../src/verbs.cpp:2974 msgid "Getting started with Inkscape" -msgstr "Premiers pas avec Inkscape" +msgstr "Démarrer avec Inkscape" #. "tutorial_basic" #: ../src/verbs.cpp:2975 msgid "Inkscape: _Shapes" -msgstr "Inkscape : _formes" +msgstr "Inkscape : _Formes" #: ../src/verbs.cpp:2976 msgid "Using shape tools to create and edit shapes" -msgstr "Utilisation des outils de formes pour créer et éditer des formes" +msgstr "Utiliser les outils de formes pour créer et éditer des formes" #: ../src/verbs.cpp:2977 msgid "Inkscape: _Advanced" -msgstr "Inkscape : _avancé" +msgstr "Inkscape : _Avancé" #: ../src/verbs.cpp:2978 msgid "Advanced Inkscape topics" -msgstr "Sujets avancés d'Inkscape" +msgstr "Sujets avancés sur Inkscape" #. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) #: ../src/verbs.cpp:2982 msgid "Inkscape: T_racing" -msgstr "Inkscape : _vectorisation" +msgstr "Inkscape : _Vectorisation" #: ../src/verbs.cpp:2983 msgid "Using bitmap tracing" -msgstr "Vectorisation de bitmap" +msgstr "Utiliser la vectorisation d'images matricielles" #: ../src/verbs.cpp:2986 msgid "Inkscape: Tracing Pixel Art" -msgstr "Inkscape : vectoriser du pixel art" +msgstr "Inkscape : Vectoriser du pixel art" #: ../src/verbs.cpp:2987 msgid "Using Trace Pixel Art dialog" -msgstr "" +msgstr "Utiliser la boîte de dialogue Vectoriser du pixel art" #: ../src/verbs.cpp:2988 msgid "Inkscape: _Calligraphy" -msgstr "Inkscape : _calligraphie" +msgstr "Inkscape : _Calligraphie" #: ../src/verbs.cpp:2989 msgid "Using the Calligraphy pen tool" -msgstr "Utilisation de la plume calligraphique d'Inkscape" +msgstr "Utiliser la plume calligraphique d'Inkscape" #: ../src/verbs.cpp:2990 msgid "Inkscape: _Interpolate" @@ -28640,7 +28570,7 @@ msgstr "Rudiments de _design" #: ../src/verbs.cpp:2993 msgid "Principles of design in the tutorial form" -msgstr "Rudiments de design sous forme de didacticiel" +msgstr "Principes de conception graphique en didacticiel" #. "tutorial_design" #: ../src/verbs.cpp:2994 @@ -28671,23 +28601,22 @@ msgstr "Répéter la dernière extension avec les nouveaux paramètres" #: ../src/verbs.cpp:3005 msgid "Fit the page to the current selection" -msgstr "Ajuster la page à la sélection courante" +msgstr "Ajuster la taille de la page à la sélection actuelle" #: ../src/verbs.cpp:3007 msgid "Fit the page to the drawing" -msgstr "Ajuster la page au dessin" +msgstr "Ajuster la taille de la page au dessin" #: ../src/verbs.cpp:3008 -#, fuzzy msgid "_Resize Page to Selection" -msgstr "Ajuster la page à la sélection" +msgstr "_Ajuster la taille de la page à la sélection" #: ../src/verbs.cpp:3009 msgid "" "Fit the page to the current selection or the drawing if there is no selection" msgstr "" -"Ajuster la page à la sélection courante ou au dessin s'il n'y a pas de " -"sélection" +"Ajuster la taille de la page à la sélection actuelle ou au dessin s'il n'y " +"en a pas" #: ../src/verbs.cpp:3013 msgid "Unlock All in All Layers" @@ -28811,7 +28740,7 @@ msgstr "Arc ouvert" #: ../src/widgets/arc-toolbar.cpp:357 msgid "Switch to arc (unclosed shape)" -msgstr "Tracer un arc (courbe non fermée)" +msgstr "Transformer en arc (forme non fermée)" #: ../src/widgets/arc-toolbar.cpp:380 msgid "Make whole" @@ -28819,13 +28748,13 @@ msgstr "Refermer" #: ../src/widgets/arc-toolbar.cpp:381 msgid "Make the shape a whole ellipse, not arc or segment" -msgstr "Transformer en ellipse pleine (pas un arc ou un camembert)" +msgstr "Transformer en ellipse pleine (ni arc ni segment)" # ligne d'horizon ? #. TODO: use the correct axis here, too #: ../src/widgets/box3d-toolbar.cpp:233 msgid "3D Box: Change perspective (angle of infinite axis)" -msgstr "Boîte 3D: changer la perspective (angle de ligne d'horizon)" +msgstr "Boîte 3D : Changer la perspective (angle de ligne d'horizon)" #: ../src/widgets/box3d-toolbar.cpp:302 msgid "Angle in X direction" @@ -28996,8 +28925,8 @@ msgid "" "The angle of the pen's nib (in degrees; 0 = horizontal; has no effect if " "fixation = 0)" msgstr "" -"Angle de la plume (en degrés; 0 = horizontal; n'a pas d'effet si orientation " -"= 0)" +"Angle de la plume (en degrés ; 0 = horizontal ; n'a pas d'effet si " +"orientation = 0)" #. Fixation #: ../src/widgets/calligraphy-toolbar.cpp:478 @@ -29159,8 +29088,8 @@ msgid "" "Trace the lightness of the background by the width of the pen (white - " "minimum width, black - maximum width)" msgstr "" -"Imiter la luminosité de l'arrière-plan avec l'épaisseur du trait (blanc - " -"trait fin, noir - trait épais)" +"Imiter la luminosité de l'arrière-plan avec l'épaisseur du trait (blanc : " +"trait fin, noir : trait épais)" #: ../src/widgets/calligraphy-toolbar.cpp:579 msgid "Use the pressure of the input device to alter the width of the pen" @@ -29279,7 +29208,7 @@ msgstr "Ne pas permettre que deux formes se chevauchent" #: ../src/widgets/dash-selector.cpp:59 msgid "Dash pattern" -msgstr "Motif de pointillé" +msgstr "Motif de pointillés" #: ../src/widgets/dash-selector.cpp:76 msgid "Pattern offset" @@ -29287,7 +29216,7 @@ msgstr "Décalage du motif" #: ../src/widgets/desktop-widget.cpp:499 msgid "Zoom drawing if window size changes" -msgstr "Zoomer le dessin si les dimensions de la fenêtre sont modifiées" +msgstr "Ajuster le zoom si la fenêtre change de taille" #. Display the initial welcome message in the statusbar #: ../src/widgets/desktop-widget.cpp:701 @@ -29295,9 +29224,9 @@ msgid "" "Welcome to Inkscape! Use shape or freehand tools to create objects; " "use selector (arrow) to move or transform them." msgstr "" -"Bienvenue dans Inkscape! Utilisez les formes ou l'outil de dessin à " -"main levée pour créer des objets; utilisez les sélecteurs (flèches) pour les " -"déplacer ou les modifier." +"Bienvenue dans Inkscape ! Utilisez les formes ou l'outil de dessin à " +"main levée pour créer des objets ; utilisez les sélecteurs (flèches) pour " +"les déplacer ou les modifier." #: ../src/widgets/desktop-widget.cpp:743 msgid "Cursor coordinates" @@ -29334,42 +29263,40 @@ msgstr "sans filtre" #: ../src/widgets/desktop-widget.cpp:917 #, c-format msgid "%s%s: %d (%s%s) - Inkscape" -msgstr "%s%s: %d (%s%s) - Inkscape" +msgstr "%s%s : %d (%s%s) — Inkscape" #: ../src/widgets/desktop-widget.cpp:919 ../src/widgets/desktop-widget.cpp:923 #, c-format msgid "%s%s: %d (%s) - Inkscape" -msgstr "%s%s: %d (%s) - Inkscape" +msgstr "%s%s : %d (%s) — Inkscape" #: ../src/widgets/desktop-widget.cpp:925 #, c-format msgid "%s%s: %d - Inkscape" -msgstr "%s%s: %d - Inkscape" +msgstr "%s%s : %d — Inkscape" #: ../src/widgets/desktop-widget.cpp:931 #, c-format msgid "%s%s (%s%s) - Inkscape" -msgstr "%s%s (%s%s) - Inkscape" +msgstr "%s%s (%s%s) — Inkscape" #: ../src/widgets/desktop-widget.cpp:933 ../src/widgets/desktop-widget.cpp:937 #, c-format msgid "%s%s (%s) - Inkscape" -msgstr "%s%s (%s) - Inkscape" +msgstr "%s%s (%s) — Inkscape" #: ../src/widgets/desktop-widget.cpp:939 #, c-format msgid "%s%s - Inkscape" -msgstr "%s%s - Inkscape" +msgstr "%s%s — Inkscape" #: ../src/widgets/desktop-widget.cpp:1111 -#, fuzzy msgid "Locked all guides" -msgstr "Verrouiller tous les calques" +msgstr "Tous les guides sont verrouillés" #: ../src/widgets/desktop-widget.cpp:1113 -#, fuzzy msgid "Unlocked all guides" -msgstr "Déverrouiller tous les calques" +msgstr "Tous les guides sont déverrouillés" #: ../src/widgets/desktop-widget.cpp:1130 msgid "Color-managed display is enabled in this window" @@ -29429,8 +29356,8 @@ msgid "" "Pick both the color and the alpha (transparency) under cursor; otherwise, " "pick only the visible color premultiplied by alpha" msgstr "" -"Capturer à la fois la couleur et l'alpha (opacité) sous le curseur; Sinon, " -"ne capturer que la couleur visible prémultipliée par l'alpha" +"Capturer à la fois la couleur et l'alpha (opacité) sous le curseur ; sinon, " +"ne capturer que la couleur visible multipliée par l'alpha" #: ../src/widgets/dropper-toolbar.cpp:94 msgid "Pick" @@ -29469,29 +29396,25 @@ msgstr "Effacer une partie d'objet" #. Width #: ../src/widgets/eraser-toolbar.cpp:151 -#, fuzzy msgid "(no width)" -msgstr "Aucune épaisseur" +msgstr "(pas de largeur)" #: ../src/widgets/eraser-toolbar.cpp:155 msgid "The width of the eraser pen (relative to the visible canvas area)" -msgstr "Largeur de la gomme (relativement à la zone de travail visible)" +msgstr "Largeur de la gomme (relative à la zone de travail visible)" #: ../src/widgets/eraser-toolbar.cpp:171 -#, fuzzy msgid "Eraser Mass" -msgstr "Gomme" +msgstr "Inertie de la gomme" #: ../src/widgets/eraser-toolbar.cpp:172 -#, fuzzy msgid "Increase to make the eraser drag behind, as if slowed by inertia" msgstr "" -"Augmenter ce paramètre pour que la plume traîne, ralentie par son inertie" +"Augmenter ce paramètre pour que la gomme traîne, ralentie par son inertie" #: ../src/widgets/eraser-toolbar.cpp:186 ../src/widgets/eraser-toolbar.cpp:187 -#, fuzzy msgid "Break apart cut items" -msgstr "Séparer" +msgstr "Séparer les éléments coupés" #: ../src/widgets/fill-style.cpp:356 msgid "Change fill rule" @@ -29538,9 +29461,8 @@ msgid "Style" msgstr "Style" #: ../src/widgets/font-selector.cpp:226 -#, fuzzy msgid "Face" -msgstr "Facettes" +msgstr "Style d'écriture" #: ../src/widgets/font-selector.cpp:255 ../share/extensions/dots.inx.h:3 #: ../share/extensions/nicechart.inx.h:17 @@ -29674,10 +29596,10 @@ msgid "" "(spreadMethod=\"repeat\"), or repeat the gradient in alternating opposite " "directions (spreadMethod=\"reflect\")" msgstr "" -"Prolongement du dégradé au delà de la définition de son vecteur : prolonger " -"par une zone uniforme de la dernière couleur (aucune, spreadMethod=\"pad\"), " -"répéter le dégradé (directe, spreadMethod=\"repeat\") ou le réfléchir " -"(réflection, spreadMethod=\"reflect\")" +"Prolongement du dégradé au-delà de la définition de son vecteur : prolonger " +"par une zone uniforme de la dernière couleur (spreadMethod=\"pad\"), répéter " +"le dégradé (spreadMethod=\"repeat\") ou le réfléchir (spreadMethod=\"reflect" +"\")" #: ../src/widgets/gradient-toolbar.cpp:1130 msgid "Repeat:" @@ -29773,31 +29695,29 @@ msgid "Change gradient stop color" msgstr "Modifier la couleur d'un stop de dégradé" #: ../src/widgets/image-menu-item.c:151 -#, fuzzy msgid "Image widget" -msgstr "Fichier image" +msgstr "Élément image" #: ../src/widgets/image-menu-item.c:152 msgid "Child widget to appear next to the menu text" -msgstr "" +msgstr "Élément enfant apparaissant à côté du texte du menu" #: ../src/widgets/image-menu-item.c:167 -#, fuzzy msgid "Use stock" -msgstr "Coller le contour" +msgstr "Utiliser le stock" #: ../src/widgets/image-menu-item.c:168 msgid "Whether to use the label text to create a stock menu item" -msgstr "" +msgstr "Utiliser ou non le libellé pour créer un élément de menu prédéfini" #: ../src/widgets/image-menu-item.c:183 -#, fuzzy msgid "Accel Group" -msgstr "Groupe" +msgstr "Groupe de raccourcis" #: ../src/widgets/image-menu-item.c:184 msgid "The Accel Group to use for stock accelerator keys" msgstr "" +"Le groupe de raccourcis à utiliser pour les touches de raccourcis prédéfinies" #: ../src/widgets/lpe-toolbar.cpp:233 msgid "Closed" @@ -29875,40 +29795,36 @@ msgstr "" #: ../src/widgets/measure-toolbar.cpp:157 msgid "Start and end measures inactive." -msgstr "" +msgstr "Mesures de début et de fin inactives." #: ../src/widgets/measure-toolbar.cpp:159 msgid "Start and end measures active." -msgstr "" +msgstr "Mesures de début et de fin actives." #: ../src/widgets/measure-toolbar.cpp:175 -#, fuzzy msgid "Show all crossings." msgstr "Afficher tous les calques" #: ../src/widgets/measure-toolbar.cpp:177 msgid "Show visible crossings." -msgstr "" +msgstr "Afficher les croisements visibles." #: ../src/widgets/measure-toolbar.cpp:193 msgid "Use all layers in the measure." msgstr "Appliquer la mesure à tous les calques." #: ../src/widgets/measure-toolbar.cpp:195 -#, fuzzy msgid "Use current layer in the measure." -msgstr "Monter le calque courant au premier plan" +msgstr "Utiliser le calque actif dans la mesure." # Name of the displayed file (in Help > tutorials > ...). To be translated if the tutorial has been translated. #: ../src/widgets/measure-toolbar.cpp:211 -#, fuzzy msgid "Compute all elements." -msgstr "tutorial-elements.fr.svg" +msgstr "Calculer tous les éléments." #: ../src/widgets/measure-toolbar.cpp:213 -#, fuzzy msgid "Compute max length." -msgstr "Longueur du chemin d'entrée-sortie :" +msgstr "Calculer la longueur maximale." #: ../src/widgets/measure-toolbar.cpp:274 ../src/widgets/text-toolbar.cpp:1609 msgid "Font Size" @@ -29936,54 +29852,45 @@ msgid "Decimal precision of measure" msgstr "Précision décimale de la mesure" #: ../src/widgets/measure-toolbar.cpp:315 -#, fuzzy msgid "Scale %" -msgstr "Échelle x" +msgstr "Échelle %" #: ../src/widgets/measure-toolbar.cpp:315 -#, fuzzy msgid "Scale %:" -msgstr "Longueur/Courbure :" +msgstr "Échelle % :" #: ../src/widgets/measure-toolbar.cpp:316 -#, fuzzy msgid "Scale the results" -msgstr "Étirer le résultat" +msgstr "Redimensionner le résultat" #: ../src/widgets/measure-toolbar.cpp:329 -#, fuzzy msgid "The offset size" -msgstr "Décalage rouge" +msgstr "Taille du décalage" #: ../src/widgets/measure-toolbar.cpp:341 #: ../src/widgets/measure-toolbar.cpp:342 -#, fuzzy msgid "Ignore first and last" -msgstr "Ignorer le premier et le dernier point" +msgstr "Ignorer le premier et le dernier" #: ../src/widgets/measure-toolbar.cpp:352 #: ../src/widgets/measure-toolbar.cpp:353 -#, fuzzy msgid "Show hidden intersections" -msgstr "intersections de guide" +msgstr "Afficher les intersections cachées" #: ../src/widgets/measure-toolbar.cpp:363 #: ../src/widgets/measure-toolbar.cpp:364 -#, fuzzy msgid "Show measures between items" -msgstr "Montrer les déplacements entre les chemins" +msgstr "Afficher les distances entre les éléments" #: ../src/widgets/measure-toolbar.cpp:374 #: ../src/widgets/measure-toolbar.cpp:375 -#, fuzzy msgid "Measure all layers" -msgstr "Rechercher dans tous les calques" +msgstr "Mesurer tous les calques" #: ../src/widgets/measure-toolbar.cpp:385 #: ../src/widgets/measure-toolbar.cpp:386 -#, fuzzy msgid "Reverse measure" -msgstr "Inverser le chemin" +msgstr "Inverser la mesure" #: ../src/widgets/measure-toolbar.cpp:395 #: ../src/widgets/measure-toolbar.cpp:396 @@ -29992,26 +29899,22 @@ msgstr "Mesure fantôme" #: ../src/widgets/measure-toolbar.cpp:405 #: ../src/widgets/measure-toolbar.cpp:406 -#, fuzzy msgid "To guides" -msgstr "Afficher les _guides" +msgstr "En _guides" #: ../src/widgets/measure-toolbar.cpp:415 #: ../src/widgets/measure-toolbar.cpp:416 -#, fuzzy msgid "Mark Dimension" -msgstr "Dimensions" +msgstr "Marquer la taille" #: ../src/widgets/measure-toolbar.cpp:425 #: ../src/widgets/measure-toolbar.cpp:426 -#, fuzzy msgid "Convert to item" -msgstr "Convertir en Braille" +msgstr "Convertir en élément" #: ../src/widgets/mesh-toolbar.cpp:318 -#, fuzzy msgid "Set mesh type" -msgstr "Appliquer un style à un texte" +msgstr "Définir le type de filet" #: ../src/widgets/mesh-toolbar.cpp:380 msgid "normal" @@ -30019,7 +29922,7 @@ msgstr "normal" #: ../src/widgets/mesh-toolbar.cpp:380 msgid "Create mesh gradient" -msgstr "Créer un dégradé filet" +msgstr "Créer un filet de dégradé" #: ../src/widgets/mesh-toolbar.cpp:384 msgid "conical" @@ -30077,18 +29980,17 @@ msgid "Show Handles" msgstr "Afficher les poignées" #: ../src/widgets/mesh-toolbar.cpp:494 -#, fuzzy msgid "Show side and tensor handles" -msgstr "Afficher les poignées de transformation" +msgstr "Afficher les poignées des côtés et de tension" #: ../src/widgets/mesh-toolbar.cpp:509 msgid "WARNING: Mesh SVG Syntax Subject to Change" -msgstr "" +msgstr "ATTENTION : La syntaxe SVG des filets n'est pas encore figée" #: ../src/widgets/mesh-toolbar.cpp:519 msgctxt "Type" msgid "Coons" -msgstr "" +msgstr "Droit" #: ../src/widgets/mesh-toolbar.cpp:522 msgid "Bicubic" @@ -30096,59 +29998,57 @@ msgstr "Bicubique" #: ../src/widgets/mesh-toolbar.cpp:524 msgid "Coons" -msgstr "" +msgstr "Droit" #: ../src/widgets/mesh-toolbar.cpp:525 msgid "Coons: no smoothing. Bicubic: smoothing across patch boundaries." -msgstr "" +msgstr "Droit : pas de lissage. Bicubique : lissage sur les bords du raccords." #: ../src/widgets/mesh-toolbar.cpp:527 ../src/widgets/pencil-toolbar.cpp:375 msgid "Smoothing:" msgstr "Lissage :" #: ../src/widgets/mesh-toolbar.cpp:537 -#, fuzzy msgid "Toggle Sides" -msgstr "Inverser la graisse" +msgstr "Changer les côtés" #: ../src/widgets/mesh-toolbar.cpp:538 msgid "Toggle selected sides between Beziers and lines." -msgstr "" +msgstr "Changer les côtés sélectionnés entre courbes de Bézier et lignes." #: ../src/widgets/mesh-toolbar.cpp:541 -#, fuzzy msgid "Toggle side:" -msgstr "Inverser la graisse" +msgstr "Changer le côté :" #: ../src/widgets/mesh-toolbar.cpp:548 -#, fuzzy msgid "Make elliptical" -msgstr "Rendre italique" +msgstr "Rendre elliptique" #: ../src/widgets/mesh-toolbar.cpp:549 msgid "" "Make selected sides elliptical by changing length of handles. Works best if " "handles already approximate ellipse." msgstr "" +"Rendre les côtés sélectionnés elliptiques en changeant la longueur des " +"poignées. Fonctionne mieux si les poignées approximent déjà une ellipse." #: ../src/widgets/mesh-toolbar.cpp:552 -#, fuzzy msgid "Make elliptical:" -msgstr "Rendre italique" +msgstr "Rendre elliptique :" #: ../src/widgets/mesh-toolbar.cpp:559 -#, fuzzy msgid "Pick colors:" -msgstr "Couleur des points" +msgstr "Capturer des couleurs :" #: ../src/widgets/mesh-toolbar.cpp:560 msgid "Pick colors for selected corner nodes from underneath mesh." msgstr "" +"Capturer des couleurs pour les nœuds en coin sélectionnés depuis le filet " +"sous-jacent." #: ../src/widgets/mesh-toolbar.cpp:563 -#, fuzzy msgid "Pick Color" -msgstr "Couleur de remplissage" +msgstr "Capturer une couleur" #: ../src/widgets/node-toolbar.cpp:341 msgid "Insert node" @@ -30363,9 +30263,8 @@ msgid "Radial gradient" msgstr "Dégradé radial" #: ../src/widgets/paint-selector.cpp:228 -#, fuzzy msgid "Mesh gradient" -msgstr "Déplacer les dégradés" +msgstr "Filet de dégradé" #: ../src/widgets/paint-selector.cpp:235 msgid "Unset paint (make it undefined so it can be inherited)" @@ -30378,14 +30277,14 @@ msgid "" "evenodd)" msgstr "" "Toute intersection d'un chemin avec lui-même ou avec un de ses sous-chemins " -"engendrera des lacunes dans le remplissage (fill-rule: evenodd)" +"créera des trous dans le remplissage (fill-rule: evenodd)" #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty #: ../src/widgets/paint-selector.cpp:263 msgid "" "Fill is solid unless a subpath is counterdirectional (fill-rule: nonzero)" msgstr "" -"Le remplissage est sans lacune, sauf si un sous-chemin est en sens inverse " +"Le remplissage est complet à moins qu'un sous-chemin soit en sens inverse " "(fill-rule: nonzero)" #: ../src/widgets/paint-selector.cpp:605 @@ -30418,9 +30317,8 @@ msgid "Radial gradient" msgstr "Dégradé radial" #: ../src/widgets/paint-selector.cpp:799 -#, fuzzy msgid "Mesh gradient" -msgstr "Dégradé linéaire" +msgstr "Filet de dégradé" #: ../src/widgets/paint-selector.cpp:1098 msgid "" @@ -30428,9 +30326,9 @@ msgid "" "pattern on canvas. Use Object > Pattern > Objects to Pattern to " "create a new pattern from selection." msgstr "" -"Utiliser l'outil nœud pour ajuster la position, l'échelle et l'angle " -"du motif sur la zone de travail. Utiliser Objet > Motifs > Objets " -"en Motif pour créer un nouveau motif à partir de la sélection." +"Utiliser l'outil Nœuds pour ajuster la position, l'échelle et l'angle " +"du motif sur la zone de travail. Utiliser Objet > Motif > Objets en " +"motif pour créer un nouveau motif à partir de la sélection." #: ../src/widgets/paint-selector.cpp:1111 msgid "Pattern fill" @@ -30473,7 +30371,7 @@ msgid "" "The amount to grow (positive) or shrink (negative) the created fill path" msgstr "" "Agrandit (si positif) ou rétrécit (si négatif) de cette quantité le chemin " -"créé par remplissage." +"créé par remplissage" #: ../src/widgets/paintbucket-toolbar.cpp:199 msgid "Close gaps" @@ -30494,8 +30392,8 @@ msgid "" "Reset paint bucket parameters to defaults (use Inkscape Preferences > Tools " "to change defaults)" msgstr "" -"Restaurer les préférences par défaut de l'outil de remplissage au seau " -"(changez les valeurs par défaut dans Inkscape Préférences>Outils)" +"Restaurer les préférences par défaut du pot de peinture (changez les valeurs " +"par défaut dans les Préférences d'Inkscape > Outils)" #: ../src/widgets/pencil-toolbar.cpp:105 msgid "Bezier" @@ -30510,9 +30408,8 @@ msgid "Create Spiro path" msgstr "Créer un chemin spirographique" #: ../src/widgets/pencil-toolbar.cpp:119 -#, fuzzy msgid "Create BSpline path" -msgstr "Créer un chemin spirographique" +msgstr "Créer une B-spline" #: ../src/widgets/pencil-toolbar.cpp:125 msgid "Zigzag" @@ -30549,17 +30446,15 @@ msgstr "Triangle croissant" #: ../src/widgets/pencil-toolbar.cpp:180 msgid "From clipboard" -msgstr "À partir du presse-papier" +msgstr "Depuis le presse-papier" #: ../src/widgets/pencil-toolbar.cpp:181 -#, fuzzy msgid "Bend from clipboard" -msgstr "À partir du presse-papier" +msgstr "Courber depuis le presse-papier" #: ../src/widgets/pencil-toolbar.cpp:182 -#, fuzzy msgid "Last applied" -msgstr "Dernière diapositive :" +msgstr "Dernière application" #: ../src/widgets/pencil-toolbar.cpp:207 ../src/widgets/pencil-toolbar.cpp:208 msgid "Shape:" @@ -30595,11 +30490,11 @@ msgstr "" #: ../src/widgets/pencil-toolbar.cpp:407 ../src/widgets/pencil-toolbar.cpp:408 msgid "LPE based interactive simplify" -msgstr "" +msgstr "Simplification interactive des ECI" #: ../src/widgets/pencil-toolbar.cpp:418 ../src/widgets/pencil-toolbar.cpp:419 msgid "LPE simplify flatten" -msgstr "" +msgstr "Aplanissement de simplification des ECI" #: ../src/widgets/rect-toolbar.cpp:125 msgid "Change rectangle" @@ -30763,7 +30658,7 @@ msgstr "" #: ../src/widgets/select-toolbar.cpp:441 msgctxt "Select toolbar" msgid "X position" -msgstr "Position X" +msgstr "Coordonnée X" #. label #: ../src/widgets/select-toolbar.cpp:442 @@ -30773,7 +30668,6 @@ msgstr "X :" #. shortLabel #: ../src/widgets/select-toolbar.cpp:443 -#, fuzzy msgctxt "Select toolbar" msgid "Horizontal coordinate of selection" msgstr "Coordonnée horizontale de la sélection" @@ -30782,7 +30676,7 @@ msgstr "Coordonnée horizontale de la sélection" #: ../src/widgets/select-toolbar.cpp:460 msgctxt "Select toolbar" msgid "Y position" -msgstr "Position Y" +msgstr "Coordonnée Y" #. label #: ../src/widgets/select-toolbar.cpp:461 @@ -30792,7 +30686,6 @@ msgstr "Y :" #. shortLabel #: ../src/widgets/select-toolbar.cpp:462 -#, fuzzy msgctxt "Select toolbar" msgid "Vertical coordinate of selection" msgstr "Coordonnée verticale de la sélection" @@ -30811,7 +30704,6 @@ msgstr "L :" #. shortLabel #: ../src/widgets/select-toolbar.cpp:481 -#, fuzzy msgctxt "Select toolbar" msgid "Width of selection" msgstr "Largeur de la sélection" @@ -30839,7 +30731,6 @@ msgstr "H :" #. shortLabel #: ../src/widgets/select-toolbar.cpp:513 -#, fuzzy msgctxt "Select toolbar" msgid "Height of selection" msgstr "Hauteur de la sélection" @@ -30930,7 +30821,7 @@ msgstr "Divergence :" #: ../src/widgets/spiral-toolbar.cpp:259 msgid "How much denser/sparser are outer revolutions; 1 = uniform" -msgstr "Densité de la révolution; 1 = uniforme" +msgstr "Densité de la révolution ; 1 = uniforme" #: ../src/widgets/spiral-toolbar.cpp:270 msgid "starts from center" @@ -30981,11 +30872,10 @@ msgstr "" "visible)" #: ../src/widgets/spray-toolbar.cpp:312 -#, fuzzy msgid "Use the pressure of the input device to alter the width of spray area" msgstr "" "Utiliser la pression du périphérique d'entrée pour modifier la largeur de la " -"plume" +"zone de pulvérisation" #: ../src/widgets/spray-toolbar.cpp:323 msgid "(maximum mean)" @@ -31045,14 +30935,12 @@ msgid "Spray objects in a single path" msgstr "Pulvérisation fusionnée en un chemin unique" #: ../src/widgets/spray-toolbar.cpp:383 -#, fuzzy msgid "Delete sprayed items" -msgstr "Supprimer un stop de dégradé" +msgstr "Supprimer les éléments pulvérisés" #: ../src/widgets/spray-toolbar.cpp:384 -#, fuzzy msgid "Delete sprayed items from selection" -msgstr "Obtenir les courbes à partir de la sélection..." +msgstr "Supprimer les éléments pulvérisés de la sélection" #: ../src/widgets/spray-toolbar.cpp:388 ../src/widgets/tweak-toolbar.cpp:253 msgid "Mode" @@ -31127,52 +31015,52 @@ msgstr "" "taille que l'objet original" #: ../src/widgets/spray-toolbar.cpp:477 -#, fuzzy msgid "Use the pressure of the input device to alter the scale of new items" msgstr "" -"Utiliser la pression du périphérique d'entrée pour modifier la largeur de la " -"plume" +"Utiliser la pression du périphérique d'entrée pour changer l'échelle des " +"nouveaux éléments" #: ../src/widgets/spray-toolbar.cpp:489 ../src/widgets/spray-toolbar.cpp:490 msgid "" "Pick color from the drawing. You can use clonetiler trace dialog for " "advanced effects. In clone mode original fill or stroke colors must be unset." msgstr "" +"Capturer une couleur depuis le dessin. Vous pouvez utiliser la boîte de " +"dialogue de pavage de clones pour des effets avancés. En mode clone, les " +"couleurs de fond et de contour initiales doivent être indéfinies." #: ../src/widgets/spray-toolbar.cpp:502 ../src/widgets/spray-toolbar.cpp:503 msgid "Pick from center instead average area." -msgstr "" +msgstr "Capturer depuis le centre plutôt que depuis une zone moyenne." #: ../src/widgets/spray-toolbar.cpp:515 ../src/widgets/spray-toolbar.cpp:516 msgid "Inverted pick value, retaining color in advanced trace mode" msgstr "" +"Valeur capturée inversée, conservant la couleur en mode de dessin avancé" #: ../src/widgets/spray-toolbar.cpp:528 ../src/widgets/spray-toolbar.cpp:529 -#, fuzzy msgid "Apply picked color to fill" -msgstr "Appliquer la dernière couleur sélectionnée au remplissage" +msgstr "Appliquer la couleur capturée au fond" #: ../src/widgets/spray-toolbar.cpp:541 ../src/widgets/spray-toolbar.cpp:542 -#, fuzzy msgid "Apply picked color to stroke" -msgstr "Appliquer la dernière couleur sélectionnée au contour" +msgstr "Appliquer la couleur capturée au contour" #: ../src/widgets/spray-toolbar.cpp:554 ../src/widgets/spray-toolbar.cpp:555 msgid "No overlap between colors" -msgstr "" +msgstr "Pas de chevauchement entre les couleurs" #: ../src/widgets/spray-toolbar.cpp:567 ../src/widgets/spray-toolbar.cpp:568 msgid "Apply over transparent areas" -msgstr "" +msgstr "Appliquer sur les zones transparentes" #: ../src/widgets/spray-toolbar.cpp:580 ../src/widgets/spray-toolbar.cpp:581 msgid "Apply over no transparent areas" -msgstr "" +msgstr "Ne pas appliquer sur les zones transparentes" #: ../src/widgets/spray-toolbar.cpp:593 ../src/widgets/spray-toolbar.cpp:594 -#, fuzzy msgid "Prevent overlapping objects" -msgstr "Veuillez sélectionner un objet" +msgstr "Empêcher les objets superposés" #: ../src/widgets/spray-toolbar.cpp:605 msgid "(minimum offset)" @@ -31192,7 +31080,7 @@ msgstr "Décalage % :" #: ../src/widgets/spray-toolbar.cpp:609 msgid "Increase to segregate objects more (value in percent)" -msgstr "" +msgstr "Augmentez pour séparer davantage les objets (valeur en pourcentage)" #: ../src/widgets/star-toolbar.cpp:103 msgid "Star: Change number of corners" @@ -31620,7 +31508,7 @@ msgstr "Vertical — DG" #: ../src/widgets/text-toolbar.cpp:1747 msgid "Vertical text — lines: right to left" -msgstr "" +msgstr "Texte vertical — lignes : droite vers gauche" #: ../src/widgets/text-toolbar.cpp:1753 msgid "Vertical — LR" @@ -31628,7 +31516,7 @@ msgstr "Vertical — GD" #: ../src/widgets/text-toolbar.cpp:1754 msgid "Vertical text — lines: left to right" -msgstr "" +msgstr "Texte vertical — lignes : gauche vers droite" #. Name #: ../src/widgets/text-toolbar.cpp:1759 @@ -31638,31 +31526,27 @@ msgstr "Orientation de l'écriture" #. Label #: ../src/widgets/text-toolbar.cpp:1760 msgid "Block progression" -msgstr "" +msgstr "Progression du bloc" #: ../src/widgets/text-toolbar.cpp:1789 -#, fuzzy msgid "Auto glyph orientation" -msgstr "Suivre l'orientation du chemin" +msgstr "Glyphe orienté automatiquement" #: ../src/widgets/text-toolbar.cpp:1796 -#, fuzzy msgid "Upright" -msgstr "Plus clair" +msgstr "Verticale" #: ../src/widgets/text-toolbar.cpp:1797 -#, fuzzy msgid "Upright glyph orientation" -msgstr "Orientation du texte" +msgstr "Glyphe orienté verticalement" #: ../src/widgets/text-toolbar.cpp:1804 msgid "Sideways" -msgstr "" +msgstr "Sur le côté" #: ../src/widgets/text-toolbar.cpp:1805 -#, fuzzy msgid "Sideways glyph orientation" -msgstr "Suivre l'orientation du chemin" +msgstr "Glyphe orienté sur le côté" #. Name #: ../src/widgets/text-toolbar.cpp:1811 @@ -31672,7 +31556,7 @@ msgstr "Orientation du texte" #. Label #: ../src/widgets/text-toolbar.cpp:1812 msgid "Text (glyph) orientation in vertical text." -msgstr "" +msgstr "Orientation du texte (glyphe) dans du texte vertical." #. Drop down menu #: ../src/widgets/text-toolbar.cpp:1845 @@ -31701,9 +31585,8 @@ msgstr "Ligne :" #. short label #: ../src/widgets/text-toolbar.cpp:1852 -#, fuzzy msgid "Spacing between baselines (times font size)" -msgstr "Espacement entre les lignes (nombre de fois la taille de la police)" +msgstr "Espacement entre les lignes de base (× taille de police)" #. Drop down menu #: ../src/widgets/text-toolbar.cpp:1884 ../src/widgets/text-toolbar.cpp:1915 @@ -31831,7 +31714,7 @@ msgstr "À définir" #: ../src/widgets/toolbox.cpp:225 msgid "Style of Paint Bucket fill objects" -msgstr "Style des objets créés par remplissage au seau" +msgstr "Style du fond des objets créés par le Pot de peinture" #: ../src/widgets/toolbox.cpp:1750 msgid "Bounding box" @@ -32062,7 +31945,7 @@ msgstr "Mode rétrécissement/élargissement" #: ../src/widgets/tweak-toolbar.cpp:213 msgid "Shrink (inset) parts of paths; with Shift grow (outset)" -msgstr "Rétrécit les chemins (contraction) ; avec Maj, élargit (dilatation)" +msgstr "Rétrécit les chemins (érosion) ; avec Maj, élargit (dilatation)" #: ../src/widgets/tweak-toolbar.cpp:219 msgid "Attract/repel mode" @@ -32236,6 +32119,8 @@ msgid "" "%d ENTITIES of type POLYLINE encountered and ignored. Please try to convert " "to Release 13 format using QCad." msgstr "" +"%d ENTITÉS de type POLYLIGNE rencontrées et ignorées. Veuillez essayer de " +"convertir vers le format Release 13 avec QCad." #: ../share/extensions/dxf_outlines.py:47 msgid "" @@ -32250,11 +32135,13 @@ msgid "" "Error: Field 'Layer match name' must be filled when using 'By name match' " "option" msgstr "" +"Erreur : Le champ « Filtrage du nom de calque » doit être complété lors de " +"l'utilisation de l'option « Correspondance par nom »" #: ../share/extensions/dxf_outlines.py:354 #, python-format msgid "Warning: Layer '%s' not found!" -msgstr "Attention : calque '%s' introuvable !" +msgstr "Attention : calque « %s » introuvable !" #: ../share/extensions/embedimage.py:83 msgid "" @@ -32300,7 +32187,6 @@ msgid "Need at least 2 paths selected" msgstr "Au moins deux chemins doivent être sélectionnés" #: ../share/extensions/funcplot.py:46 -#, fuzzy msgid "" "x-interval cannot be zero. Please modify 'Start X value' or 'End X value'" msgstr "" @@ -32308,7 +32194,6 @@ msgstr "" "ou la valeur X de fin" #: ../share/extensions/funcplot.py:58 -#, fuzzy msgid "" "y-interval cannot be zero. Please modify 'Y value of rectangle's top' or 'Y " "value of rectangle's bottom'" @@ -32357,13 +32242,13 @@ msgid "" "Orientation points for '%s' layer have not been found! Please add " "orientation points using Orientation tab!" msgstr "" -"Les points d'orientation n'ont pas été définis pour le calque '%s'. Veuillez " -"ajouter des points d'orientation avec l'onglet Orientation." +"Les points d'orientation n'ont pas été définis pour le calque « %s ». " +"Veuillez ajouter des points d'orientation avec l'onglet Orientation." #: ../share/extensions/gcodetools.py:4045 #, python-format msgid "There are more than one orientation point groups in '%s' layer" -msgstr "Le calque '%s' contient plus d'un groupe de points d'orientation" +msgstr "Le calque « %s » contient plus d'un groupe de points d'orientation" #: ../share/extensions/gcodetools.py:4076 #: ../share/extensions/gcodetools.py:4078 @@ -32372,6 +32257,9 @@ msgid "" "should not be the same. If there are three orientation points they should " "not be in a straight line.)" msgstr "" +"Les points d'orientation sont invalides ! (S'il y a deux points " +"d'orientation, ils devraient être différents. S'il y en a trois, ils ne " +"devraient pas être alignés.)" #: ../share/extensions/gcodetools.py:4248 #, python-format @@ -32380,7 +32268,7 @@ msgid "" "be corrupt!" msgstr "" "Attention ! Des mauvais points d'orientation ont été trouvés dans le calque " -"'%s'. Le Gcode généré pourrait être corrompu !" +"« %s ». Le G-code généré pourrait être corrompu !" #: ../share/extensions/gcodetools.py:4261 #, python-format @@ -32389,7 +32277,7 @@ msgid "" "could be corrupt!" msgstr "" "Attention ! Un mauvais point de référence graffiti a été trouvé dans le " -"calque '%s'. Le Gcode généré pourrait être corrompu !" +"calque « %s ». Le G-code généré pourrait être corrompu !" #. xgettext:no-pango-format #: ../share/extensions/gcodetools.py:4282 @@ -32401,14 +32289,13 @@ msgid "" "Solution 3: export all contours to PostScript level 2 (File->Save As->.ps) " "and File->Import this file." msgstr "" -"Cette extension ne fonctionne qu'avec des chemins ou des offsets dynamiques " -"(ou des groupes contenant seulement ces types d'objets). Tout autre objet " -"sera ignoré.\n" -"Solution 1 : lancez la commande Chemin>Objet en chemin (ou Maj+Ctrl+C).\n" -"Solution 2 : Chemin>Offset dynamique (ou Ctrl+J).\n" -"Solution 3 : exportez tous les contours en PostScript niveau 2 " -"(Fichier>Enregistrer sous>.ps) puis réimportez le fichier avec " -"Fichier>Importer." +"Cette extension ne fonctionne qu'avec des chemins et des décalages " +"dynamiques (ou des groupes contenant seulement ces types d'objets). Tous les " +"autres objets seront ignorés !\n" +"Solution 1 : lancez la commande Chemin > Objet en chemin (ou Maj+Ctrl+C).\n" +"Solution 2 : Chemin > Morphologie dynamique (ou Ctrl+J).\n" +"Solution 3 : exportez tous les contours en PostScript niveau 2 (Fichier > " +"Enregistrer sous > .ps) puis réimportez le fichier avec Fichier > Importer." #: ../share/extensions/gcodetools.py:4288 msgid "" @@ -32423,6 +32310,8 @@ msgid "" "Warning! There are some paths in the root of the document, but not in any " "layer! Using bottom-most layer for them." msgstr "" +"Attention ! Il y a des chemins dans la racine du document, mais il n'y en a " +"dans aucun calque ! Le calque du fond est utilisé pour eux." #: ../share/extensions/gcodetools.py:4369 #, python-format @@ -32430,22 +32319,26 @@ msgid "" "Warning! Tool's and default tool's parameter's (%s) types are not the same " "( type('%s') != type('%s') )." msgstr "" +"Attention ! Les types du paramètre de l'outil et de l'outil par défaut (%s) " +"ne sont pas les mêmes (type('%s') ≠ type('%s'))." #: ../share/extensions/gcodetools.py:4372 #, python-format msgid "Warning! Tool has parameter that default tool has not ( '%s': '%s' )." msgstr "" +"Attention ! L'outil a un paramètre que l'outil par défaut n'a pas (« %s » : " +"« %s »)." #: ../share/extensions/gcodetools.py:4386 #, python-format msgid "Layer '%s' contains more than one tool!" -msgstr "Le calque '%s' contient plus d'un outil !" +msgstr "Le calque « %s » contient plus d'un outil !" #: ../share/extensions/gcodetools.py:4389 #, python-format msgid "" "Can not find tool for '%s' layer! Please add one with Tools library tab!" -msgstr "" +msgstr "Impossible de trouver l'outil pour le calque « %s » ! " #: ../share/extensions/gcodetools.py:4551 #: ../share/extensions/gcodetools.py:4706 @@ -32453,16 +32346,16 @@ msgid "" "Warning: One or more paths do not have 'd' parameter, try to Ungroup (Ctrl" "+Shift+G) and Object to Path (Ctrl+Shift+C)!" msgstr "" -"Attention : au moins un chemin n'a pas de paramètre 'd'. Veuillez dégrouper " -"(Maj+Ctrl+G) et transformer l'objet en chemin (Maj+Ctrl+C)." +"Attention : au moins un chemin n'a pas de paramètre « d ». Essayez de " +"dégrouper (Maj+Ctrl+G) et de transformer l'objet en chemin (Maj+Ctrl+C)." #: ../share/extensions/gcodetools.py:4665 -#, fuzzy msgid "" "Nothing is selected. Please select something to convert to drill point " "(dxfpoint) or clear point sign." msgstr "" "Rien n'est sélectionné. Veuillez sélectionner quelque chose à convertir en " +"point de forage (dxfpoint) ou enlevez le signe du point." #: ../share/extensions/gcodetools.py:4748 #: ../share/extensions/gcodetools.py:4994 @@ -32474,8 +32367,8 @@ msgstr "Cette extension nécessite la sélection d'un chemin." #, python-format msgid "Tool diameter must be > 0 but tool's diameter on '%s' layer is not!" msgstr "" -"Le diamètre d'outil doit être supérieur à 0, ce qui n'est pas le cas pour " -"l'outil du calque '%s' !" +"Le diamètre de l'outil doit être supérieur à 0, ce qui n'est pas le cas sur " +"le calque « %s » !" #: ../share/extensions/gcodetools.py:4765 #: ../share/extensions/gcodetools.py:4954 @@ -32489,17 +32382,17 @@ msgstr "Veuillez sélectionner au moins un chemin à graver et recommencer." #: ../share/extensions/gcodetools.py:5517 msgid "Unknown unit selected. mm assumed" -msgstr "Aucune unité n'a été sélectionnée. mm utilisés par défaut." +msgstr "Unité inconnue sélectionnée. mm utilisés par défaut" #: ../share/extensions/gcodetools.py:5538 #, python-format msgid "Tool '%s' has no shape. 45 degree cone assumed!" -msgstr "L'outil '%s' n'a pas de forme. Un cône de 45 degrés sera utilisé !" +msgstr "L'outil « %s » n'a pas de forme. Un cône de 45 degrés sera utilisé !" #: ../share/extensions/gcodetools.py:5609 #: ../share/extensions/gcodetools.py:5614 msgid "csp_normalised_normal error. See log." -msgstr "" +msgstr "Erreur csp_normalised_normal. Consultez le journal." #: ../share/extensions/gcodetools.py:5802 msgid "No need to engrave sharp angles." @@ -32540,10 +32433,13 @@ msgstr "" #: ../share/extensions/gcodetools.py:6105 msgid "Lathe X and Z axis remap should be 'X', 'Y' or 'Z'. Exiting..." msgstr "" +"Les axes X et Z du remappage du tour devraient être « X », « Y » ou « Z ». " +"Fermeture..." #: ../share/extensions/gcodetools.py:6108 msgid "Lathe X and Z axis remap should be the same. Exiting..." msgstr "" +"Les axes X et Z du remappage du tour devraient être identiques. Fermeture..." #: ../share/extensions/gcodetools.py:6660 #, python-format @@ -32577,8 +32473,8 @@ msgid "" "Failed to import the subprocess module. Please report this as a bug at: " "https://bugs.launchpad.net/inkscape." msgstr "" -"Échec lors de l'importation du module subprocess. Veuillez rapporter ce " -"défaut à : https://bugs.launchpad.net/inkscape." +"Échec lors de l'importation du module subprocess. Veuillez signaler ce bogue " +"sur : https://bugs.launchpad.net/inkscape." #: ../share/extensions/generate_voronoi.py:34 msgid "Python version is: " @@ -32589,13 +32485,12 @@ msgid "Please select an object" msgstr "Veuillez sélectionner un objet" #: ../share/extensions/gimp_xcf.py:37 -#, fuzzy msgid "Inkscape must be installed and set in your path variable." -msgstr "Gimp doit être installé et défini dans votre variable PATH." +msgstr "Inkscape doit être installé et accessible par votre variable PATH." #: ../share/extensions/gimp_xcf.py:41 msgid "Gimp must be installed and set in your path variable." -msgstr "Gimp doit être installé et défini dans votre variable PATH." +msgstr "Gimp doit être installé et accessible par votre variable PATH." #: ../share/extensions/gimp_xcf.py:45 msgid "An error occurred while processing the XCF file." @@ -32614,9 +32509,8 @@ msgid "Movements" msgstr "Déplacements" #: ../share/extensions/hpgl_decoder.py:43 -#, fuzzy msgid "Pen " -msgstr "Numéro du stylo" +msgstr "Stylo " #. issue error if no hpgl data found #: ../share/extensions/hpgl_input.py:56 @@ -32636,9 +32530,11 @@ msgstr "" msgid "" "No paths where found. Please convert all objects you want to save into paths." msgstr "" +"Aucun chemin n'a été trouvé. Veuillez convertir tous les objets que vous " +"souhaitez enregistrer en chemins." #: ../share/extensions/inkex.py:116 -#, fuzzy, python-format +#, python-format msgid "" "The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore " "this extension.Please download and install the latest version from http://" @@ -32648,11 +32544,11 @@ msgid "" "Technical details:\n" "%s" msgstr "" -"La fantastique classe lxml pour libxml2 est nécessaire à inkex.py et par " -"conséquent à cette extension. Veuillez en télécharger et installer la " -"dernière version à partir du site http://cheeseshop.python.org/pypi/lxml/, " -"ou l'installer directement avec votre gestionnaire de paquet avec une " -"commande du type : sudo apt-get install python-lxml\n" +"La fantastique surcouche lxml pour libxml2 est nécessaire à inkex.py et par " +"conséquent à cette extension. Veuillez télécharger et installer la dernière " +"version depuis http://cheeseshop.python.org/pypi/lxml/, ou l'installer " +"directement avec votre gestionnaire de paquets avec une commande du type : " +"sudo apt-get install python-lxml\n" "\n" "Détails techniques :\n" "%s" @@ -32675,6 +32571,8 @@ msgstr "Aucun nœud ne correspond à l'expression : %s" #: ../share/extensions/inkex.py:358 msgid "SVG Width not set correctly! Assuming width = 100" msgstr "" +"La largeur SVG n'est pas correctement définie ! Largeur de 100 utilisée par " +"défaut" #: ../share/extensions/interp_att_g.py:175 msgid "There is no selection to interpolate" @@ -32698,9 +32596,9 @@ msgid "" "\n" msgstr "" "Le script JessyInk n'est pas installé dans ce fichier SVG ou est d'une " -"version différente de l'extension. Veuillez utiliser la commande " -"Extensions>JessyInk>Installation/mise à jour pour installer ou mettre à jour " -"le script.\n" +"version différente de l'extension. Veuillez utiliser la commande Extensions " +"> JessyInk > Installation/mise à jour pour installer ou mettre à jour le " +"script.\n" "\n" #: ../share/extensions/jessyInk_autoTexts.py:47 @@ -32717,7 +32615,7 @@ msgid "" "Node with id '{0}' is not a suitable text node and was therefore ignored.\n" "\n" msgstr "" -"Le nœud d'id '{0}' n'est pas un nœud texte approprié et a été de fait " +"Le nœud d'id « {0} » n'est pas un nœud texte approprié et a été de fait " "ignoré.\n" "\n" @@ -32735,13 +32633,15 @@ msgstr "Commande Inkscape introuvable.\n" #: ../share/extensions/jessyInk_masterSlide.py:54 msgid "Layer not found. Removed current master slide selection.\n" -msgstr "" +msgstr "Calque non trouvé. Sélection glissée maître actuelle supprimée.\n" #: ../share/extensions/jessyInk_masterSlide.py:56 msgid "" "More than one layer with this name found. Removed current master slide " "selection.\n" msgstr "" +"Plus d'un calque avec ce nom a été trouvé. Sélection glissée maître actuelle " +"supprimée.\n" #: ../share/extensions/jessyInk_summary.py:68 #, python-brace-format @@ -32804,7 +32704,7 @@ msgstr "" #, python-brace-format msgid "{0}\t\"{1}\" (object id \"{2}\") will be replaced by \"{3}\"." msgstr "" -"{0}\t\"{1}\" (l'objet d'identifiant \"{2}\") sera remplacé par \"{3}\"." +"{0}\t« {1} » (l'objet d'identifiant « {2} ») sera remplacé par « {3} »." #: ../share/extensions/jessyInk_summary.py:167 #, python-brace-format @@ -32826,12 +32726,12 @@ msgstr "" #: ../share/extensions/jessyInk_summary.py:173 #, python-brace-format msgid "{0}\tView will be set according to object \"{1}\"" -msgstr "{0}\tLa vue sera définie en fonction de l'objet \"{1}\"" +msgstr "{0}\tLa vue sera définie en fonction de l'objet « {1} »" #: ../share/extensions/jessyInk_summary.py:175 #, python-brace-format msgid "{0}\tObject \"{1}\"" -msgstr "{0}\tObect \"{1}\"" +msgstr "{0}\tObjet « {1} »" #: ../share/extensions/jessyInk_summary.py:178 msgid " will appear" @@ -32844,7 +32744,7 @@ msgstr "disparaîtra" #: ../share/extensions/jessyInk_summary.py:183 #, python-brace-format msgid " using effect \"{0}\"" -msgstr "avec l'effet \"{0}\"" +msgstr "avec l'effet « {0} »" #: ../share/extensions/jessyInk_summary.py:186 msgid " in {0!s} s" @@ -32868,6 +32768,9 @@ msgid "" "Could not obtain the selected layer for inclusion of the video element.\n" "\n" msgstr "" +"Impossible de récupérer le calque sélectionner pour l'inclusion de l'élément " +"vidéo.\n" +"\n" #: ../share/extensions/jessyInk_view.py:74 msgid "More than one object selected. Please select only one object.\n" @@ -32879,6 +32782,8 @@ msgid "" "No object selected. Please select the object you want to assign a view to " "and then press apply.\n" msgstr "" +"Aucun objet sélectionné. Veuillez sélectionner l'objet auquel vous souhaitez " +"affecter une vue puis cliquez sur Appliquer.\n" #: ../share/extensions/markers_strokepaint.py:82 #, python-format @@ -32896,10 +32801,10 @@ msgid "" "extension. Please install them and try again. On a Debian-like system this " "can be done with the command, sudo apt-get install python-numpy." msgstr "" -"Échec lors de l'importation des modules numpy. Ces modules sont nécessaires " -"à cette extension. Veuillez les installer et réessayer. Sur un système de " -"type Debian, cette installation peut être réalisée avec la commande : sudo " -"apt-get install python-numpy." +"Échec lors de l'import des modules numpy. Ces modules sont nécessaires à " +"cette extension. Veuillez les installer et réessayer. Sur un système de type " +"Debian, cette installation peut être réalisée avec la commande : sudo apt-" +"get install python-numpy" #: ../share/extensions/measure.py:119 msgid "Area is zero, cannot calculate Center of Mass" @@ -32924,6 +32829,8 @@ msgid "" "The 'stretch' option requires that the pattern must have non-zero width :\n" "Please edit the pattern width." msgstr "" +"L'option « étirer » nécessite que le motif ait une largeur non nulle :\n" +"Veuillez modifier la largeur du motif." #: ../share/extensions/pathmodifier.py:235 #, python-format @@ -32937,10 +32844,10 @@ msgid "" "like system this can be done with the command, sudo apt-get install python-" "numpy." msgstr "" -"Échec lors de l'import des modules numpy.linalg. Ces modules sont " +"Échec lors de l'import des modules numpy ou numpy.linalg. Ces modules sont " "nécessaires à cette extension. Veuillez les installer et réessayer. Sur un " "système de type Debian, cette installation peut être réalisée avec la " -"commande : sudo apt-get install python-numpy." +"commande : sudo apt-get install python-numpy" #: ../share/extensions/perspective.py:58 ../share/extensions/summersnight.py:49 #, python-format @@ -32948,8 +32855,8 @@ msgid "" "The first selected object is of type '%s'.\n" "Try using the procedure Path->Object to Path." msgstr "" -"Le premier objet sélectionné est de type '%s'.\n" -"Essayez la commande Chemin>Objet en chemin." +"Le premier objet sélectionné est de type « %s ».\n" +"Essayez la commande Chemin > Objet en chemin." #: ../share/extensions/perspective.py:65 ../share/extensions/summersnight.py:57 msgid "" @@ -32987,36 +32894,41 @@ msgstr "" msgid "" "No paths where found. Please convert all objects you want to plot into paths." msgstr "" +"Aucun chemin n'a été trouvé. Veuillez convertir tous les objets que vous " +"souhaitez tracer en chemins." #: ../share/extensions/plotter.py:146 -#, fuzzy msgid "pySerial is not installed. Please follow these steps:" -msgstr "pySerial n'est pas installé." +msgstr "pySerial n'est pas installé. Veuillez suivre ces étapes :" #: ../share/extensions/plotter.py:147 msgid "1. Download and extract (unzip) this file to your local harddisk:" -msgstr "" +msgstr "1. Téléchargez et dézippez ce fichier sur votre disque dur local :" #: ../share/extensions/plotter.py:149 msgid "" "2. Copy the \"serial\" folder (Can be found inside the just extracted folder)" -msgstr "" +msgstr "2. Copier le dossier « serial » (présent dans le dossier extrait)" #: ../share/extensions/plotter.py:150 msgid "" " into the following Inkscape folder: C:\\[Program files]\\inkscape\\python" "\\Lib\\" msgstr "" +" dans le dossier d'Inkscape suivant : C:\\[Program Files]\\Inkscape\\python" +"\\Lib" #: ../share/extensions/plotter.py:151 msgid "3. Close and restart Inkscape." -msgstr "" +msgstr "3. Fermez et redémarrez Inkscape." #: ../share/extensions/plotter.py:200 msgid "" "Could not open port. Please check that your plotter is running, connected " "and the settings are correct." msgstr "" +"Échec à l'ouverture du port. Veuillez vérifier que votre traceur est lancé " +"et connecté et que les réglages sont corrects." #: ../share/extensions/polyhedron_3d.py:64 msgid "" @@ -33027,7 +32939,7 @@ msgstr "" "Échec lors de l'import du module numpy. Ce module est nécessaire à cette " "extension. Veuillez l'installer et réessayer. Sur un système de type Debian, " "cette installation peut être réalisée avec la commande : sudo apt-get " -"install python-numpy." +"install python-numpy" #: ../share/extensions/polyhedron_3d.py:335 msgid "No face data found in specified file." @@ -33139,22 +33051,21 @@ msgstr "" "les polices par." #: ../share/extensions/restack.py:75 -#, fuzzy msgid "There is no selection to restack." -msgstr "Aucune sélection à interpoler" +msgstr "Il n'y a aucune sélection à réempiler." #: ../share/extensions/summersnight.py:41 msgid "" "This extension requires two selected paths. \n" "The second path must be exactly four nodes long." msgstr "" -"Cette extension nécessite la sélection de deux chemins. Le second chemin " -"sélectionné doit contenir exactement quatre nœuds." +"Cette extension nécessite la sélection de deux chemins.\n" +"Le second chemin sélectionné doit contenir exactement quatre nœuds." #: ../share/extensions/svg_and_media_zip_output.py:128 #, python-format msgid "Could not locate file: %s" -msgstr "Impossible de localiser le fichier %s" +msgstr "Impossible de localiser le fichier : %s" #: ../share/extensions/svgcalendar.py:265 #: ../share/extensions/svgcalendar.py:287 @@ -33170,6 +33081,11 @@ msgid "" "http://sk1project.org/modules.php?name=Products&product=uniconvertor\n" "and install into your Inkscape's Python location\n" msgstr "" +"Vous devez installer le logiciel UniConvertor.\n" +"Sous GNU/Linux : installez le paquet python-uniconvertor.\n" +"Sous Windows : téléchargez-le depuis\n" +"http://sk1project.org/modules.php?name=Products&product=uniconvertor\n" +"et placez-le dans votre installation de Python jointe à Inkscape\n" #: ../share/extensions/voronoi2svg.py:205 msgid "Please select objects!" @@ -33191,7 +33107,7 @@ msgstr "" msgid "" "You must to select some \"Slicer rectangles\" or other \"Layout groups\"." msgstr "" -"Vous devez sélectionner des « Rectangles de découpe » ou d'autres « Groupes " +"Vous devez sélectionner des « Rectangles de découpe » ou d'autres « Groupes " "de mise en page »." #: ../share/extensions/webslicer_create_group.py:74 @@ -33206,7 +33122,7 @@ msgstr "Vous devez spécifier un dossier pour exporter les slices." #: ../share/extensions/webslicer_export.py:67 #, python-format msgid "Can't create \"%s\"." -msgstr "Création de \"%s\" impossible." +msgstr "Création de « %s » impossible." #: ../share/extensions/webslicer_export.py:68 #, python-format @@ -33216,17 +33132,16 @@ msgstr "Erreur : %s" #: ../share/extensions/webslicer_export.py:71 #, python-format msgid "The directory \"%s\" does not exists." -msgstr "Le dossier \"%s\" n'existe pas." +msgstr "Le dossier « %s » n'existe pas." #: ../share/extensions/webslicer_export.py:76 -#, fuzzy msgid "No slicer layer found." -msgstr "Aucun calque courant." +msgstr "Aucun calque de découpe trouvé." #: ../share/extensions/webslicer_export.py:106 #, python-format msgid "You have more than one element with \"%s\" html-id." -msgstr "Vous avez plus d'une occurrence de l'élément d'identifiant \"%s\"." +msgstr "Vous avez plus d'une occurrence de l'élément d'identifiant « %s »." #: ../share/extensions/webslicer_export.py:336 msgid "You must install the ImageMagick to get JPG and GIF." @@ -33272,7 +33187,7 @@ msgstr "Nombre de segments :" #: ../share/extensions/straightseg.inx.h:4 #: ../share/extensions/summersnight.inx.h:2 ../share/extensions/whirl.inx.h:4 msgid "Modify Path" -msgstr "Modifer le chemin" +msgstr "Modifier le chemin" #: ../share/extensions/ai_input.inx.h:1 msgid "AI 8.0 Input" @@ -33400,6 +33315,15 @@ msgid "" " * Random Hue/Saturation/Lightness: randomize the parameter's value.\n" " " msgstr "" +"Ajuste la teinte, la saturation et la luminosité dans la représentation TSL " +"de la couleur des objets sélectionnés.\n" +"Options :\n" +" * Teinte : tourner en degrés (cycle autour).\n" +" * Saturation : ajouter/soustraire % (min=-100, max=100).\n" +" * Luminosité : ajouter/soustraire % (min=-100, max=100).\n" +" * Teinte/saturation/luminosité aléatoire : définir une valeur aléatoire " +"au paramètre.\n" +" " #: ../share/extensions/color_blackandwhite.inx.h:1 msgid "Black and White" @@ -33407,7 +33331,7 @@ msgstr "Noir et blanc" #: ../share/extensions/color_blackandwhite.inx.h:2 msgid "Threshold Color (1-255):" -msgstr "Seuil de couleur (1-255) :" +msgstr "Seuil de couleur (1–255) :" #: ../share/extensions/color_brighter.inx.h:1 msgid "Brighter" @@ -33501,24 +33425,24 @@ msgid "Randomize" msgstr "Aléatoire" #: ../share/extensions/color_randomize.inx.h:4 -#, fuzzy, no-c-format +#, no-c-format msgid "Hue range (%)" -msgstr "Rotation de teinte (°)" +msgstr "Plage de teinte (%)" #: ../share/extensions/color_randomize.inx.h:6 -#, fuzzy, no-c-format +#, no-c-format msgid "Saturation range (%)" -msgstr "Saturation (%)" +msgstr "Plage de saturation (%)" #: ../share/extensions/color_randomize.inx.h:8 -#, fuzzy, no-c-format +#, no-c-format msgid "Lightness range (%)" -msgstr "Luminosité (%)" +msgstr "Plage de luminosité (%)" #: ../share/extensions/color_randomize.inx.h:10 -#, fuzzy, no-c-format +#, no-c-format msgid "Opacity range (%)" -msgstr "Opacité (%)" +msgstr "Plage d'opacité (%)" #: ../share/extensions/color_randomize.inx.h:12 msgid "" @@ -33526,6 +33450,10 @@ msgid "" "only for objects and groups). Change the range values to limit the distance " "between the original color and the randomized one." msgstr "" +"Donner des valeurs aléatoires à la teinte, la saturation, la luminosité et/" +"ou l'opacité (opacité aléatoire seulement pour les objets et les groupes). " +"Changez les valeurs de plage pour borner la distance entre la couleur " +"initiale et la couleur aléatoire." #: ../share/extensions/color_removeblue.inx.h:1 msgid "Remove Blue" @@ -33615,14 +33543,13 @@ msgstr "Dimensions" #: ../share/extensions/dimension.inx.h:2 msgid "X Offset:" -msgstr "Décalage sur l'axe X :" +msgstr "Décalage en X :" #: ../share/extensions/dimension.inx.h:3 msgid "Y Offset:" -msgstr "Décalage sur l'axe Y :" +msgstr "Décalage en Y :" #: ../share/extensions/dimension.inx.h:4 -#, fuzzy msgid "Bounding box type:" msgstr "Type de boîte englobante :" @@ -33883,9 +33810,8 @@ msgid "Method of Scaling:" msgstr "Méthode de mise à l'échelle :" #: ../share/extensions/dxf_input.inx.h:4 -#, fuzzy msgid "Manual scale factor:" -msgstr "Ou utiliser un facteur d'échelle manuel :" +msgstr "Facteur d'échelle manuel :" #: ../share/extensions/dxf_input.inx.h:5 msgid "Manual x-axis origin (mm):" @@ -33902,14 +33828,13 @@ msgstr "Point d'importation compatible avec les outils G-code" #: ../share/extensions/dxf_input.inx.h:8 #: ../share/extensions/render_barcode_qrcode.inx.h:16 msgid "Character encoding:" -msgstr "Encodage de caractère :" +msgstr "Encodage des caractères :" #: ../share/extensions/dxf_input.inx.h:9 msgid "Text Font:" msgstr "Police du texte :" #: ../share/extensions/dxf_input.inx.h:11 -#, fuzzy msgid "" "- AutoCAD Release 13 and newer.\n" "- for manual scaling, assume dxf drawing is in mm.\n" @@ -33920,15 +33845,16 @@ msgid "" "- layers are preserved only on File->Open, not Import.\n" "- limited support for BLOCKS, use AutoCAD Explode Blocks instead, if needed." msgstr "" -"Pour AutoCAD version R13 ou plus récente.\n" -"- Le dessin dxf doit être en mm.\n" -"- Le dessin svg est en pixels, à 90 ppp.\n" -"- Le facteur d'échelle et l'origine ne s'applique qu'au redimensionnement " +"- Pour AutoCAD version R13 ou plus récente.\n" +"- Pour une mise à l'échelle automatique, le dessin dxf est en mm.\n" +"- Le dessin SVG est en pixels, à 96 ppp.\n" +"- Le facteur d'échelle et l'origine ne s'appliquent qu'au redimensionnement " "manuel.\n" -"- Les calques sont préservés par l'utilisation du menu Fichier>Ouvrir, mais " -"pas par Import.\n" -"- Le support des BLOCKS est limité. Préférez l'utilisation de AutoCAD " -"Explode Blocks si nécessaire." +"- « Redimensionnement automatique » adaptera la largeur à une page A4.\n" +"- « Lire depuis un fichier » utilise la variable $MEASUREMENT.\n" +"- Les calques sont préservés avec Fichier > Ouvrir, mais pas avec Import.\n" +"- Le support des BLOCKS est limité, utilisez AutoCAD Explode Blocks à la " +"palce si nécessaire." #: ../share/extensions/dxf_input.inx.h:19 msgid "AutoCAD DXF R13 (*.dxf)" @@ -33951,24 +33877,20 @@ msgid "use LWPOLYLINE type of line output" msgstr "utiliser une type de ligne LWPOLYLINE en sortie" #: ../share/extensions/dxf_outlines.inx.h:5 -#, fuzzy msgid "Base unit:" -msgstr "Unité de base" +msgstr "Unité de base :" #: ../share/extensions/dxf_outlines.inx.h:6 -#, fuzzy msgid "Character Encoding:" -msgstr "Encodage de caractère" +msgstr "Encodage des caractères :" #: ../share/extensions/dxf_outlines.inx.h:7 -#, fuzzy msgid "Layer export selection:" -msgstr "Supprimer la sélection" +msgstr "Sélection d'export du calque :" #: ../share/extensions/dxf_outlines.inx.h:8 -#, fuzzy msgid "Layer match name:" -msgstr "Calque correspondant au nom" +msgstr "Filtrage du nom du calque :" #: ../share/extensions/dxf_outlines.inx.h:9 msgid "pt" @@ -34048,7 +33970,6 @@ msgid "By name match" msgstr "Correspondance par nom" #: ../share/extensions/dxf_outlines.inx.h:25 -#, fuzzy msgid "" "- AutoCAD Release 14 DXF format.\n" "- The base unit parameter specifies in what unit the coordinates are output " @@ -34064,9 +33985,9 @@ msgid "" "- You can choose to export all layers, only visible ones or by name match " "(case insensitive and use comma ',' as separator)" msgstr "" -"Format AutoCAD DXF Release 14.\n" +"- Format DXF d'AutoCAD Release 14.\n" "- Le paramètre unité de base spécifie dans quelle unité les coordonnées sont " -"générées (90 px = 1 in).\n" +"générées (96 px = 1 in).\n" "- Types d'éléments supportés :\n" " - chemins (lignes et splines) ;\n" " - rectangles ;\n" @@ -34075,8 +33996,9 @@ msgstr "" "utilisée que par des lecteurs ROBO-Master et AutoDesk, pas Inkscape.\n" "- La sortie LWPOLYLINE est une polyligne multi-connectée. Désactivez cette " "option pour utiliser une ancienne version de la sortie LINE.\n" -"- Vous pouvez choisir d'exporter tous les calques ou seulement ceux qui sont " -"visibles." +"- Vous pouvez choisir d'exporter tous les calques, seulement ceux qui sont " +"visibles ou bien filtrés par nom (casse ignorée ; utilisez une virgule « , » " +"pour séparer)." #: ../share/extensions/dxf_outlines.inx.h:34 msgid "Desktop Cutting Plotter (AutoCAD DXF R14) (*.dxf)" @@ -34089,7 +34011,7 @@ msgstr "Sortie DXF" #: ../share/extensions/dxf_output.inx.h:2 msgid "pstoedit must be installed to run; see http://www.pstoedit.net/pstoedit" msgstr "" -"pstoedit doit être installé pour être exécuté; consultez le site http://www." +"pstoedit doit être installé pour être exécuté ; consultez le site http://www." "pstoedit.net/pstoedit" #: ../share/extensions/dxf_output.inx.h:3 @@ -34142,48 +34064,41 @@ msgid "Embed Selected Images" msgstr "Incorporer les images sélectionnées" #: ../share/extensions/empty_business_card.inx.h:1 -#, fuzzy msgid "Business Card" -msgstr "Carte de visite 85x54 mm" +msgstr "Carte de visite" #: ../share/extensions/empty_business_card.inx.h:2 -#, fuzzy msgid "Business card size:" -msgstr "Carte de visite 85x54 mm" +msgstr "Taille de la carte de visite :" #: ../share/extensions/empty_desktop.inx.h:1 -#, fuzzy msgid "Desktop" -msgstr "Bureau 640x480" +msgstr "Bureau" #: ../share/extensions/empty_desktop.inx.h:2 -#, fuzzy msgid "Desktop size:" -msgstr "Dimensions des points :" +msgstr "Taille du bureau :" #. Maximum size is '16k' #: ../share/extensions/empty_desktop.inx.h:4 #: ../share/extensions/empty_generic.inx.h:2 #: ../share/extensions/empty_video.inx.h:4 -#, fuzzy msgid "Custom Width:" -msgstr "Dimensions personnalisées" +msgstr "Largeur personnalisée :" #: ../share/extensions/empty_desktop.inx.h:5 #: ../share/extensions/empty_generic.inx.h:3 #: ../share/extensions/empty_video.inx.h:5 -#, fuzzy msgid "Custom Height:" -msgstr "Hauteur de capitale :" +msgstr "Hauteur personnalisée :" #: ../share/extensions/empty_dvd_cover.inx.h:1 msgid "DVD Cover" msgstr "Pochette de DVD" #: ../share/extensions/empty_dvd_cover.inx.h:2 -#, fuzzy msgid "DVD spine width:" -msgstr "Largeur de ligne" +msgstr "Largeur de crête du DVD :" #: ../share/extensions/empty_dvd_cover.inx.h:3 msgid "DVD cover bleed (mm):" @@ -34195,18 +34110,16 @@ msgstr "Espace de travail générique" #: ../share/extensions/empty_generic.inx.h:4 msgid "SVG Unit:" -msgstr "Unité SCG :" +msgstr "Unité SVG :" #: ../share/extensions/empty_generic.inx.h:5 -#, fuzzy msgid "Canvas background:" -msgstr "Tracer selon le fond" +msgstr "Arrière-plan du canevas :" #: ../share/extensions/empty_generic.inx.h:6 #: ../share/extensions/empty_page.inx.h:5 -#, fuzzy msgid "Hide border" -msgstr "Contour en arête" +msgstr "Masquer la bordure" #: ../share/extensions/empty_icon.inx.h:1 msgid "Icon" @@ -34225,19 +34138,16 @@ msgid "Page orientation:" msgstr "Orientation de la page :" #: ../share/extensions/empty_page.inx.h:4 -#, fuzzy msgid "Page background:" -msgstr "Tracer selon le fond" +msgstr "Arrière-plan de la page :" #: ../share/extensions/empty_video.inx.h:1 -#, fuzzy msgid "Video Screen" -msgstr "Superposition" +msgstr "Écran vidéo" #: ../share/extensions/empty_video.inx.h:2 -#, fuzzy msgid "Video size:" -msgstr "Dimensions des points :" +msgstr "Taille de la vidéo :" #: ../share/extensions/eps_input.inx.h:1 msgid "EPS Input" @@ -34359,7 +34269,7 @@ msgstr "Valeur X de fin :" #: ../share/extensions/funcplot.inx.h:5 msgid "Multiply X range by 2*pi" -msgstr "Multiplier l'amplitude en X par 2*pi" +msgstr "Multiplier l'amplitude en X par 2×π" #: ../share/extensions/funcplot.inx.h:6 msgid "Y value of rectangle's bottom:" @@ -34437,13 +34347,13 @@ msgid "" "\n" "The constants pi and e are also available." msgstr "" -"Les fonctions mathématiques standard de python sont disponibles:\n" +"Les fonctions mathématiques standard de Python sont disponibles :\n" "\n" -"ceil(x); fabs(x); floor(x); fmod(x,y); frexp(x); ldexp(x,i);\n" -"modf(x); exp(x); log(x [, base]); log10(x); pow(x,y); sqrt(x);\n" -"acos(x); asin(x); atan(x); atan2(y,x); hypot(x,y);\n" -"cos(x); sin(x); tan(x); degrees(x); radians(x);\n" -"cosh(x); sinh(x); tanh(x).\n" +"ceil(x), fabs(x), floor(x), fmod(x,y), frexp(x), ldexp(x,i),\n" +"modf(x), exp(x), log(x [, base]), log10(x), pow(x,y), sqrt(x),\n" +"acos(x), asin(x), atan(x), atan2(y,x), hypot(x,y),\n" +"cos(x), sin(x), tan(x), degrees(x), radians(x),\n" +"cosh(x), sinh(x), tanh(x).\n" "\n" "Les constantes « pi » et « e » sont aussi disponibles." @@ -34490,9 +34400,9 @@ msgid "" "engravers Plotters etc. To get more info visit developers page at http://www." "cnc-club.ru/gcodetools" msgstr "" -"Gcodetools a été développé pour réaliser du code Gcode simple à partir des " -"chemins d'Inkscape. Gcode est un format spécial utilisé dans la plupart des " -"machines-outils à commande numérique. Ainsi Gcodetools vous permet " +"Gcodetools a été développé pour réaliser du code G-code simple à partir des " +"chemins d'Inkscape. G-code est un format spécial utilisé dans la plupart des " +"machines-outils à commande numérique. Gcodetools vous permet ainsi " "d'utiliser Inkscape comme un programme de fabrication assistée par " "ordinateur. Il peut être utilisé avec un grand nombre de machines. Pour de " "plus amples informations, visitez la page des développeurs sur le site " @@ -34518,6 +34428,14 @@ msgid "" "www.cnc-club.ru/gcodetoolsru Credits: Nick Drobchenko, Vladimir Kalyaev, " "John Brooker, Henry Nicolas, Chris Lusby Taylor. Gcodetools ver. 1.7" msgstr "" +"Greffon Gcodetools : convertit des chemins en G-code (en utilisant " +"l'interpolation circulaire), crée des décalages de chemin et grave les coins " +"pointus avec des tranchets coniques. Ce greffon calcule le G-code pour les " +"chemins en utilisant l'interpolation circulaire ou le mouvement linéaire si " +"besoin. Des tutoriels, des manuels et des forums d'aide sont disponibles. " +"Forum anglais : http://www.cnc-club.ru/gcodetools — Forum russe : http://www." +"cnc-club.ru/gcodetoolsru — Crédits : Nick Drobchenko, Vladimir Kalyaev, John " +"Brooker, Henry Nicolas, Chris Lusby Taylor. Gcodetools ver. 1.7" #: ../share/extensions/gcodetools_about.inx.h:5 #: ../share/extensions/gcodetools_area.inx.h:55 @@ -34531,15 +34449,15 @@ msgstr "" #: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:19 #: ../share/extensions/gcodetools_tools_library.inx.h:14 msgid "Gcodetools" -msgstr "Programmation de commande numérique" +msgstr "Gcodetools" #: ../share/extensions/gcodetools_area.inx.h:1 msgid "Area" -msgstr "Aire" +msgstr "Zone" #: ../share/extensions/gcodetools_area.inx.h:2 msgid "Maximum area cutting curves:" -msgstr "" +msgstr "Aire maximum coupant les courbes :" #: ../share/extensions/gcodetools_area.inx.h:3 msgid "Area width:" @@ -34547,7 +34465,7 @@ msgstr "Largeur de la zone :" #: ../share/extensions/gcodetools_area.inx.h:4 msgid "Area tool overlap (0..0.9):" -msgstr "Superposition d'outil de zone (0..0.9) :" +msgstr "Superposition d'outil de zone (0 à 0,9) :" #: ../share/extensions/gcodetools_area.inx.h:5 msgid "" @@ -34557,6 +34475,12 @@ msgid "" "the nearest tool definition (\"Tool diameter\" value). Only one offset will " "be created if the \"Area width\" is equal to \"1/2 D\"." msgstr "" +"« Créer un décalage de zone » : crée plusieurs décalages de chemin " +"d'Inkscape pour remplir la zone de chemin original jusqu'à la valeur « Rayon " +"de la zone ». Les bordures commencent à partir d'« 1÷2 D » jusqu'à la " +"largeur totale « Largeur de la zone » avec « D » étapes, D correspondant à " +"la définition d'outil la plus proche (valeur « Diamètre de l'outil »). Seul " +"un décalage sera créé si la « Largeur de la zone » est égale à « 1÷2 D »." #: ../share/extensions/gcodetools_area.inx.h:6 msgid "Fill area" @@ -34595,9 +34519,8 @@ msgid "mark with an arrow" msgstr "marquer avec une flèche" #: ../share/extensions/gcodetools_area.inx.h:16 -#, fuzzy msgid "mark with style" -msgstr "Style de commutation" +msgstr "marquer avec du style" #: ../share/extensions/gcodetools_area.inx.h:17 msgid "delete" @@ -34609,6 +34532,9 @@ msgid "" "+Ctrl+G) 3. Press Apply Suspected small objects will be marked out by " "colored arrows." msgstr "" +"Utilisation : 1. Sélectionnez tous les Décalages de zones (bordures grises) " +"— 2. Objet > Dégrouper (Maj+Ctrl+G) — 3. Cliquez sur Appliquer — Les petits " +"objets suspectés seront marqués par des flèches colorées." #: ../share/extensions/gcodetools_area.inx.h:19 #: ../share/extensions/gcodetools_lathe.inx.h:12 @@ -34644,7 +34570,7 @@ msgstr "Fonction de profondeur :" #: ../share/extensions/gcodetools_lathe.inx.h:17 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:6 msgid "Sort paths to reduse rapid distance" -msgstr "" +msgstr "Trier les chemins pour réduire la distance rapide" #: ../share/extensions/gcodetools_area.inx.h:25 #: ../share/extensions/gcodetools_lathe.inx.h:18 @@ -34675,6 +34601,13 @@ msgid "" "(black), d is the depth defined by orientation points, s - surface defined " "by orientation points." msgstr "" +"La tolérance d'interpolation biarc est la distance maximale entre le chemin " +"et son approximation. Le segment sera divisé en deux segments si la distance " +"entre le segment du chemin et son approximation dépasse la tolérance " +"d'interpolation biarc. Pour la fonction de profondeur, c est " +"l'intensité de la couleur de 0,0 (blanc) à 1.0 (noir), d est la " +"profondeur définie par les points d'orientation et s est la surface " +"définie par les points d'orientation." #: ../share/extensions/gcodetools_area.inx.h:30 #: ../share/extensions/gcodetools_engraving.inx.h:8 @@ -34714,7 +34647,7 @@ msgstr "Rayon d'arc minimum :" #: ../share/extensions/gcodetools_lathe.inx.h:27 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:16 msgid "Comment Gcode:" -msgstr "Commenter le Gcode :" +msgstr "Commenter le G-code :" #: ../share/extensions/gcodetools_area.inx.h:35 #: ../share/extensions/gcodetools_engraving.inx.h:13 @@ -34768,7 +34701,7 @@ msgstr "Dossier :" #: ../share/extensions/gcodetools_lathe.inx.h:33 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:22 msgid "Z safe height for G00 move over blank:" -msgstr "" +msgstr "Hauteur Z sûre pour un déplacement G00 sur du vide :" #: ../share/extensions/gcodetools_area.inx.h:41 #: ../share/extensions/gcodetools_dxf_points.inx.h:13 @@ -34842,7 +34775,7 @@ msgstr "Paramétrer G-code" #: ../share/extensions/gcodetools_lathe.inx.h:43 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:32 msgid "Flip y axis and parameterize Gcode" -msgstr "" +msgstr "Retourner l'axe Y et paramétrer G-code" #: ../share/extensions/gcodetools_area.inx.h:51 #: ../share/extensions/gcodetools_dxf_points.inx.h:23 @@ -34889,6 +34822,11 @@ msgid "" "used. Also you can manually select object, open XML editor (Shift+Ctrl+X) " "and add or remove XML tag 'dxfpoint' with any value." msgstr "" +"Convertir les objets sélectionnés en points de forage (comme le fait le " +"greffon dxf_import). Vous pouvez aussi enregistrer la forme originale. Seul " +"le point de départ de chaque courbe sera utilisé. Vous pouvez aussi " +"sélectionner manuellement un objet, ouvrir l'éditeur XML (Maj+Ctrl+X) et " +"ajouter ou supprimer la balise XML « dxfpoint » avec une valeur." #: ../share/extensions/gcodetools_dxf_points.inx.h:5 msgid "set as dxfpoint and save shape" @@ -34896,11 +34834,11 @@ msgstr "définir en tant que dxfpoint et enregistrer la forme" #: ../share/extensions/gcodetools_dxf_points.inx.h:6 msgid "set as dxfpoint and draw arrow" -msgstr "" +msgstr "définir en tant que dxfpoint et dessiner la flèche" #: ../share/extensions/gcodetools_dxf_points.inx.h:7 msgid "clear dxfpoint sign" -msgstr "" +msgstr "enlever le signe du dxfpoint" #: ../share/extensions/gcodetools_engraving.inx.h:1 msgid "Engraving" @@ -34908,7 +34846,7 @@ msgstr "Gravure" #: ../share/extensions/gcodetools_engraving.inx.h:2 msgid "Smooth convex corners between this value and 180 degrees:" -msgstr "" +msgstr "Coins convexes lisses entre cette valeur et 180 degrés :" #: ../share/extensions/gcodetools_engraving.inx.h:3 msgid "Maximum distance for engraving (mm/inch):" @@ -34920,7 +34858,7 @@ msgstr "Facteur de précision (2 faible à 10 fort) :" #: ../share/extensions/gcodetools_engraving.inx.h:5 msgid "Draw additional graphics to see engraving path" -msgstr "" +msgstr "Dessiner des graphismes supplémentaires pour voir le chemin gravé" #: ../share/extensions/gcodetools_engraving.inx.h:6 msgid "" @@ -34931,6 +34869,13 @@ msgid "" "sphere..(radius r)...........................: math.sqrt(max(0,r**2-w**2)) " "ellipse.(minor axis r, major 4r).....: math.sqrt(max(0,r**2-w**2))*4" msgstr "" +"Cette fonction crée un chemin pour graver des lettres ou une forme avec des " +"angles aigus. La profondeur du tranchet, fonction du rayon, est définie par " +"l'outil. La profondeur est une expression en langage Python. Par exemple : " +"cone.... (45 degrees))......................: w cone....(height/" +"diameter=10/3)..: 10*w/3 sphere..(radius r)...........................: math." +"sqrt(max(0,r**2-w**2)) ellipse.(minor axis r, major 4r).....: math." +"sqrt(max(0,r**2-w**2))*4" #: ../share/extensions/gcodetools_graffiti.inx.h:1 msgid "Graffiti" @@ -34962,7 +34907,7 @@ msgstr "Taille de l'aperçu (px) :" #: ../share/extensions/gcodetools_graffiti.inx.h:8 msgid "Preview's paint emmit (pts/s):" -msgstr "" +msgstr "Émission du dessin de l'aperçu (pts/s) :" #: ../share/extensions/gcodetools_graffiti.inx.h:10 #: ../share/extensions/gcodetools_orientation_points.inx.h:3 @@ -35016,7 +34961,7 @@ msgstr "" "points seulement : ne pas disposer les trois points sur une ligne (utilisez " "alors le mode 2 points). Vous pouvez modifier les valeurs de surface et de " "profondeur sur l'axe Z plus tard avec l'outil texte (3e coordonnée). En " -"l'absence de points d'orientation dans le calque courant, ils sont récupérés " +"l'absence de points d'orientation dans le calque actif, ils sont récupérés " "dans le calque supérieur. Ne dégroupez pas les points d'orientation. Vous " "pouvez les sélectionner en double-cliquant pour rentrer dans le groupe, ou " "avec la combinaison Ctrl+clic. Appuyez sur Appliquer pour créer des points " @@ -35048,7 +34993,7 @@ msgstr "Reconfiguration de l'axe X du tour :" #: ../share/extensions/gcodetools_lathe.inx.h:7 msgid "Lathe Z axis remap:" -msgstr "Reconfiguration de l'axe Y du tour :" +msgstr "Reconfiguration de l'axe Z du tour :" #: ../share/extensions/gcodetools_lathe.inx.h:8 msgid "Move path" @@ -35056,20 +35001,19 @@ msgstr "Déplacer le chemin" #: ../share/extensions/gcodetools_lathe.inx.h:9 msgid "Offset path" -msgstr "Chemin offset" +msgstr "Décaler le chemin" #: ../share/extensions/gcodetools_lathe.inx.h:10 -#, fuzzy msgid "Lathe modify path" -msgstr "Modifer le chemin" +msgstr "Modifier le chemin du tour" #: ../share/extensions/gcodetools_lathe.inx.h:11 msgid "" "This function modifies path so it will be able to be cut with the " "rectangular cutter." msgstr "" -"Cette fonction modifie le chemin de façon à ce qu'il soit possible de le " -"découper avec un coupoir rectangulaire." +"Cette fonction modifie le chemin de sorte qu'il soit possible de le découper " +"avec un coupoir rectangulaire." #: ../share/extensions/gcodetools_orientation_points.inx.h:1 msgid "Orientation points" @@ -35118,9 +35062,8 @@ msgid "Prepare corners" msgstr "Préparer les coins" #: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:11 -#, fuzzy msgid "Stepout distance for corners:" -msgstr "Aimanter aux coins des boîtes englobantes" +msgstr "Distance de retrait pour les coins :" #: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:12 msgid "Maximum angle for corner (0-180 deg):" @@ -35312,7 +35255,7 @@ msgstr "Sous-subdivisions par subdivision sur l'axe X :" msgid "Halve X Subsubdiv. Frequency after 'n' Subdivs. (log only):" msgstr "" "Diviser par deux la fréquence des sous-subdivisions sur l'axe X après « n » " -"subdibvisions (log seulement) :" +"subdivisions (log seulement) :" #: ../share/extensions/grid_cartesian.inx.h:10 msgid "Major X Division Thickness (px):" @@ -35355,7 +35298,7 @@ msgstr "Sous-subdivisions par subdivision sur l'axe Y :" msgid "Halve Y Subsubdiv. Frequency after 'n' Subdivs. (log only):" msgstr "" "Diviser par deux la fréquence des sous-subdivisions sur l'axe Y après « n » " -"subdibvisions (log seulement) :" +"subdivisions (log seulement) :" #: ../share/extensions/grid_cartesian.inx.h:20 msgid "Major Y Division Thickness (px):" @@ -35477,7 +35420,7 @@ msgstr "Subdivisions par marque angulaire principale :" msgid "Minor Angle Division End 'n' Divs. Before Centre:" msgstr "" "Afficher les marques angulaires secondaires\n" -"à partir de la nième marque circulaire en partant du centre :" +"à partir de la énième marque circulaire en partant du centre :" #: ../share/extensions/grid_polar.inx.h:20 msgid "Major Angular Division Thickness (px):" @@ -35525,19 +35468,19 @@ msgstr "Guides diagonaux" #: ../share/extensions/guides_creator.inx.h:12 msgid "Upper left corner" -msgstr "coin supérieur gauche" +msgstr "Coin supérieur gauche" #: ../share/extensions/guides_creator.inx.h:13 msgid "Upper right corner" -msgstr "coin supérieur droit" +msgstr "Coin supérieur droit" #: ../share/extensions/guides_creator.inx.h:14 msgid "Lower left corner" -msgstr "coin inférieur gauche" +msgstr "Coin inférieur gauche" #: ../share/extensions/guides_creator.inx.h:15 msgid "Lower right corner" -msgstr "coin inférieur droit" +msgstr "Coin inférieur droit" #: ../share/extensions/guides_creator.inx.h:16 msgid "Margins" @@ -35613,11 +35556,11 @@ msgstr "Texte :" #: ../share/extensions/hershey.inx.h:4 msgid "Action: " -msgstr "Action :" +msgstr "Action : " #: ../share/extensions/hershey.inx.h:5 msgid "Font face: " -msgstr "Type de police :" +msgstr "Type de police : " #: ../share/extensions/hershey.inx.h:6 msgid "Typeset that text" @@ -35746,17 +35689,19 @@ msgid "" " www.evilmadscientist.com/go/hershey" msgstr "" "\n" -"Cette extension compose une ligne de texte en utilisant les fontes " -"« Hershey » pour traceurs, dérivées de NBS SP-424 1976-04, « A contribution " -"to computer typesetting techniques: Tables of Coordinates for Hershey's " -"Repertory of Occidental Type Fonts and Graphic Symbols. »\n" +"Cette extension compose une ligne de texte\n" +"en utilisant les polices « Hershey » pour traceurs,\n" +"dérivées de NBS SP-424 1976-04, « A contribution to\n" +"computer typesetting techniques: Tables of\n" +"Coordinates for Hershey's Repertory of\n" +"Occidental Type Fonts and Graphic Symbols ».\n" "\n" -"Il ne s'agit pas de fontes de contour traditionnelles, mais de fontes à " -"contour simple ou de fontes de gravure ou les caractères sont formés par " -"leur contour (et sans remplissage).\n" +"Il ne s'agit pas de polices de contour traditionnelles,\n" +"mais de polices à contour simple ou de polices de gravure\n" +"où les caractères sont formés par leur contour (et pas par leur fond).\n" "\n" -"Des information supplémentaires sont disponible sur le site :\n" -"www.evilmadscientist.com/go/hershey" +"Des informations supplémentaires sont disponibles sur le site :\n" +" www.evilmadscientist.com/go/hershey" #: ../share/extensions/hpgl_input.inx.h:1 msgid "HPGL Input" @@ -35784,7 +35729,7 @@ msgid "" "(Default: 1016.0)" msgstr "" "Le nombre de pas effectués par votre traceur lorsqu'il se déplace d'un pouce " -"sur l'axe X (par défaut, 1016)" +"sur l'axe X (par défaut : 1016)" #: ../share/extensions/hpgl_input.inx.h:5 #: ../share/extensions/hpgl_output.inx.h:6 ../share/extensions/plotter.inx.h:34 @@ -35798,7 +35743,7 @@ msgid "" "(Default: 1016.0)" msgstr "" "Le nombre de pas effectués par votre traceur lorsqu'il se déplace d'un pouce " -"sur l'axe Y (par défaut, 1016)" +"sur l'axe Y (par défaut : 1016)" #: ../share/extensions/hpgl_input.inx.h:7 msgid "Show movements between paths" @@ -35807,7 +35752,7 @@ msgstr "Montrer les déplacements entre les chemins" #: ../share/extensions/hpgl_input.inx.h:8 msgid "Check this to show movements between paths (Default: Unchecked)" msgstr "" -"Cocher pour montrer les déplacements entre les chemins (décoché par défaut)" +"Cocher pour montrer les déplacements entre les chemins (par défaut : décoché)" #: ../share/extensions/hpgl_input.inx.h:9 #: ../share/extensions/hpgl_output.inx.h:35 @@ -35864,7 +35809,6 @@ msgid "Pen speed (cm/s or mm/s):" msgstr "Vitesse du stylo (cm/s ou mm/s) :" #: ../share/extensions/hpgl_output.inx.h:13 -#, fuzzy msgid "" "The speed the pen will move with in centimeters or millimeters per second " "(depending on your plotter model), set to 0 to omit command; most plotters " @@ -35880,7 +35824,7 @@ msgstr "Rotation (°, sens horaire) :" #: ../share/extensions/hpgl_output.inx.h:15 #: ../share/extensions/plotter.inx.h:43 msgid "Rotation of the drawing (Default: 0°)" -msgstr "Rotation du dessin (par défaut : 0 °)" +msgstr "Rotation du dessin (par défaut : 0°)" #: ../share/extensions/hpgl_output.inx.h:16 #: ../share/extensions/plotter.inx.h:44 @@ -35890,7 +35834,7 @@ msgstr "Refléter sur l'axe Y" #: ../share/extensions/hpgl_output.inx.h:17 #: ../share/extensions/plotter.inx.h:45 msgid "Check this to mirror the X axis (Default: Unchecked)" -msgstr "Cocher pour refléter l'axe X (décoché par défaut)" +msgstr "Cocher pour refléter l'axe X (par défaut : décoché)" #: ../share/extensions/hpgl_output.inx.h:18 #: ../share/extensions/plotter.inx.h:46 @@ -35900,7 +35844,7 @@ msgstr "Refléter sur l'axe Y" #: ../share/extensions/hpgl_output.inx.h:19 #: ../share/extensions/plotter.inx.h:47 msgid "Check this to mirror the Y axis (Default: Unchecked)" -msgstr "Cocher pour refléter l'axe Y (décoché par défaut)" +msgstr "Cocher pour refléter l'axe Y (par défaut : décoché)" #: ../share/extensions/hpgl_output.inx.h:20 #: ../share/extensions/plotter.inx.h:48 @@ -35912,7 +35856,7 @@ msgstr "Centrer le point zéro" msgid "" "Check this if your plotter uses a centered zero point (Default: Unchecked)" msgstr "" -"Cocher si votre traceur utilise un point zéro centré (décoché par défaut)" +"Cocher si votre traceur utilise un point zéro centré (par défaut : décoché)" #: ../share/extensions/hpgl_output.inx.h:22 #: ../share/extensions/plotter.inx.h:50 @@ -35921,6 +35865,10 @@ msgid "" "each pen, name the layers \"Pen 1\", \"Pen 2\", etc., and put your drawings " "in the corresponding layers. This overrules the pen number option above." msgstr "" +"Si vous souhaitez utiliser plusieurs stylos sur votre traceur de stylos, " +"créez un calque pour chaque stylo, nommez-les « Pen 1 », « Pen 2 », est. et " +"mettez vos dessins sur les calques correspondants. Cela outrepasse l'option " +"du nombre de stylos ci-dessus." #: ../share/extensions/hpgl_output.inx.h:23 #: ../share/extensions/plotter.inx.h:51 @@ -35938,12 +35886,14 @@ msgid "" "The distance in mm that will be cut over the starting point of the path to " "prevent open paths, set to 0.0 to omit command (Default: 1.00)" msgstr "" +"La distance en mm qui sera coupée par-dessus le point de départ du chemin " +"pour empêcher les chemins ouverts ; indiquez 0,0 pour ignorer la commande " +"(par défaut : 1,0)" #: ../share/extensions/hpgl_output.inx.h:26 #: ../share/extensions/plotter.inx.h:54 -#, fuzzy msgid "Tool (Knife) offset correction (mm):" -msgstr "Décalage de l'outil (mm) :" +msgstr "Décalage correctif du couteau (mm) :" #: ../share/extensions/hpgl_output.inx.h:27 #: ../share/extensions/plotter.inx.h:55 @@ -35951,10 +35901,11 @@ msgid "" "The offset from the tool tip to the tool axis in mm, set to 0.0 to omit " "command (Default: 0.25)" msgstr "" +"Le décalage allant de la bulle à l'axe de l'outil en mm ; indiquez 0,0 pour " +"omettre la commande (par défaut : 0,25)" #: ../share/extensions/hpgl_output.inx.h:28 #: ../share/extensions/plotter.inx.h:56 -#, fuzzy msgid "Precut" msgstr "Prédécouper" @@ -35964,6 +35915,8 @@ msgid "" "Check this to cut a small line before the real drawing starts to correctly " "align the tool orientation. (Default: Checked)" msgstr "" +"Cocher pour faire une petite coupure avant que le dessin réel commence à " +"aligner correctement l'orientation de l'outil (par défaut : coché)." #: ../share/extensions/hpgl_output.inx.h:30 #: ../share/extensions/plotter.inx.h:58 @@ -35978,7 +35931,7 @@ msgid "" msgstr "" "Les courbes étant divisées en lignes, ce nombre contrôle la finesse de la " "courbe qui sera reproduite ; plus le nombre est petit, plus la courbe est " -"précise (par défaut : 1.2)" +"précise (par défaut : 1,2)" #: ../share/extensions/hpgl_output.inx.h:32 #: ../share/extensions/plotter.inx.h:60 @@ -35992,6 +35945,9 @@ msgid "" "if used). If unchecked you have to make sure that all parts of your drawing " "are within the document border! (Default: Checked)" msgstr "" +"Cocher pour aligner automatiquement le dessin au point zéro (auquel s'ajoute " +"le décalage de l'outil si utilisé). Si décoché, vous devez vous assurer que " +"tous vos objets sont dans la bordure du document (par défaut : coché)." #: ../share/extensions/hpgl_output.inx.h:34 #: ../share/extensions/plotter.inx.h:64 @@ -36001,47 +35957,43 @@ msgid "" msgstr "" "Tous ces paramètres dépendent du traceur que vous utilisez. Pour de plus " "amples informations, veuillez consulter le manuel ou la documentation en " -"ligne de votre traceur.." +"ligne de votre traceur." #: ../share/extensions/hpgl_output.inx.h:36 msgid "Export an HP Graphics Language file" msgstr "Exporter vers un fichier HP Graphics Language" #: ../share/extensions/image_attributes.inx.h:1 -#, fuzzy msgid "Set Image Attributes" -msgstr "Définir les attributs" +msgstr "Définir les attributs de l'image" #. render images like in 0.48 #: ../share/extensions/image_attributes.inx.h:3 -#, fuzzy msgid "Basic" -msgstr "Latin de base" +msgstr "Basique" #. render images like in 0.48 #: ../share/extensions/image_attributes.inx.h:5 -#, fuzzy msgid "Support non-uniform scaling" -msgstr "Support pour la mise à l'échelle non uniforme" +msgstr "Support de la mise à l'échelle non uniforme" #. render images like in 0.48 #: ../share/extensions/image_attributes.inx.h:7 msgid "Render images blocky" -msgstr "Affiche les images pixélisées" +msgstr "Rendre les images pixélisées" #. render images like in 0.48 #: ../share/extensions/image_attributes.inx.h:9 msgid "" "Render all bitmap images like in older Inskcape versions. Available options:" msgstr "" -"Affiche toutes les images matricielles come dans les anciennes versions " +"Afficher toutes les images matricielles comme dans les anciennes versions " "d'Inkscape. Options disponibles :" #. image aspect ratio #: ../share/extensions/image_attributes.inx.h:11 -#, fuzzy msgid "Image Aspect Ratio" -msgstr "Simplification de l'image" +msgstr "Facteur d'échelle de l'image" #. image aspect ratio #: ../share/extensions/image_attributes.inx.h:13 @@ -36051,68 +36003,59 @@ msgstr "Attribut preserveAspectRatio :" #. image aspect ratio #: ../share/extensions/image_attributes.inx.h:15 msgid "meetOrSlice:" -msgstr "" +msgstr "meetOrSlice :" #. image-rendering #: ../share/extensions/image_attributes.inx.h:17 -#, fuzzy msgid "Scope:" -msgstr "Étendue" +msgstr "Étendue :" #. image-rendering #: ../share/extensions/image_attributes.inx.h:19 -#, fuzzy msgid "Unset" -msgstr "Incrustation" +msgstr "Indéfini" #: ../share/extensions/image_attributes.inx.h:20 -#, fuzzy msgid "Change only selected image(s)" -msgstr "Modifier les nœuds sélectionnés seulement" +msgstr "Modifier la/les image(s) sélectionnée(s) seulement" #: ../share/extensions/image_attributes.inx.h:21 -#, fuzzy msgid "Change all images in selection" -msgstr "La sélection ne contient aucune ellipse" +msgstr "Modifier toutes les images de la sélection" #: ../share/extensions/image_attributes.inx.h:22 -#, fuzzy msgid "Change all images in document" -msgstr "Vérifier l'orthographe des texte du document" +msgstr "Modifier toutes les images du document" #. image-rendering #: ../share/extensions/image_attributes.inx.h:24 -#, fuzzy msgid "Image Rendering Quality" -msgstr "Rendu de l'image :" +msgstr "Qualité du rendu de l'image :" #. image-rendering #: ../share/extensions/image_attributes.inx.h:26 -#, fuzzy msgid "Image rendering attribute:" -msgstr "Mode de rendu de l'image :" +msgstr "Attribut de rendu de l'image :" #: ../share/extensions/image_attributes.inx.h:27 -#, fuzzy msgid "Apply attribute to parent group of selection" -msgstr "Appliquer la transformation à la sélection" +msgstr "Appliquer l'attribut au groupe parent de la sélection" #: ../share/extensions/image_attributes.inx.h:28 -#, fuzzy msgid "Apply attribute to SVG root" -msgstr "Attribut à définir :" +msgstr "Appliquer l'attribut à la racine SVG" #: ../share/extensions/ink2canvas.inx.h:1 msgid "Convert to html5 canvas" -msgstr "Convertir en canvas HTML5" +msgstr "Convertir en canevas HTML 5" #: ../share/extensions/ink2canvas.inx.h:2 msgid "HTML 5 canvas (*.html)" -msgstr "HTML 5 canvas (*.html)" +msgstr "Canevas HTML 5 (*.html)" #: ../share/extensions/ink2canvas.inx.h:3 msgid "HTML 5 canvas code" -msgstr "Code HTML 5 canvas" +msgstr "Code de canevas HTML 5" #: ../share/extensions/inkscape_follow_link.inx.h:1 msgid "Follow Link" @@ -36120,11 +36063,11 @@ msgstr "Suivre le lien" #: ../share/extensions/inkscape_help_askaquestion.inx.h:1 msgid "Ask Us a Question" -msgstr "Nous poser une question" +msgstr "Nous poser une _question" #: ../share/extensions/inkscape_help_commandline.inx.h:1 msgid "Command Line Options" -msgstr "Options de la ligne de commande" +msgstr "_Options de la ligne de commande" #. i18n. Please don't translate it unless a page exists in your language #: ../share/extensions/inkscape_help_commandline.inx.h:3 @@ -36133,11 +36076,11 @@ msgstr "http://inkscape.org/doc/inkscape-man.fr.html" #: ../share/extensions/inkscape_help_faq.inx.h:1 msgid "FAQ" -msgstr "FAQ" +msgstr "_FAQ" #: ../share/extensions/inkscape_help_keys.inx.h:1 msgid "Keys and Mouse Reference" -msgstr "Référence des raccourcis clavier et souris" +msgstr "_Référence des raccourcis clavier et souris" #. i18n. Please don't translate it unless a page exists in your language #: ../share/extensions/inkscape_help_keys.inx.h:3 @@ -36146,7 +36089,7 @@ msgstr "http://inkscape.org/doc/keys092.fr.html" #: ../share/extensions/inkscape_help_manual.inx.h:1 msgid "Inkscape Manual" -msgstr "Manuel d'Inkscape" +msgstr "Manuel d'_Inkscape" #. i18n. Please don't translate it unless a page exists in your language #: ../share/extensions/inkscape_help_manual.inx.h:3 @@ -36155,7 +36098,7 @@ msgstr "http://tavmjong.free.fr/INKSCAPE/MANUAL/html_fr/index.html" #: ../share/extensions/inkscape_help_relnotes.inx.h:1 msgid "New in This Version" -msgstr "Nouveautés de cette version" +msgstr "Nouveautés de cette _version" #. i18n. Please don't translate it unless a page exists in your language #: ../share/extensions/inkscape_help_relnotes.inx.h:3 @@ -36164,11 +36107,11 @@ msgstr "http://wiki.inkscape.org/wiki/index.php/Release_notes/0.92" #: ../share/extensions/inkscape_help_reportabug.inx.h:1 msgid "Report a Bug" -msgstr "Rapport de bug" +msgstr "Signaler un pro_blème" #: ../share/extensions/inkscape_help_svgspec.inx.h:1 msgid "SVG 1.1 Specification" -msgstr "Spécification de SVG 1.1" +msgstr "_Spécification de SVG 1.1" #: ../share/extensions/interp.inx.h:1 msgid "Interpolate" @@ -36191,13 +36134,14 @@ msgid "Interpolate style" msgstr "Interpoler le style" #: ../share/extensions/interp.inx.h:7 ../share/extensions/interp_att_g.inx.h:10 -#, fuzzy msgid "Use Z-order" -msgstr "Contour surélevé" +msgstr "Utiliser le rang d'empilement" #: ../share/extensions/interp.inx.h:8 ../share/extensions/interp_att_g.inx.h:11 msgid "Workaround for reversed selection order in Live Preview cycles" msgstr "" +"Contournement pour l'ordre de sélection inversé dans les cycles d'Aperçu en " +"direct" #: ../share/extensions/interp_att_g.inx.h:1 msgid "Interpolate Attribute in a group" @@ -36804,38 +36748,35 @@ msgstr "Déplacer les poignées de nœuds" #: ../share/extensions/jitternodes.inx.h:7 msgid "Distribution of the displacements:" -msgstr "" +msgstr "Distribution des déplacements :" #: ../share/extensions/jitternodes.inx.h:8 -#, fuzzy msgid "Uniform" -msgstr "Cunéiforme" +msgstr "Uniforme" #: ../share/extensions/jitternodes.inx.h:9 msgid "Pareto" -msgstr "" +msgstr "Pareto" #: ../share/extensions/jitternodes.inx.h:10 -#, fuzzy msgid "Gaussian" msgstr "Flou gaussien" #: ../share/extensions/jitternodes.inx.h:11 -#, fuzzy msgid "Log-normal" -msgstr "normal" +msgstr "Log-normal" #: ../share/extensions/jitternodes.inx.h:13 msgid "" "This effect randomly shifts the nodes (and optionally node handles) of the " "selected path." msgstr "" -"Cet effet décale les nœuds du chemin sélectionné. Il peut aussi agir sur les " -"poignées." +"Cet effet décale aléatoirement les nœuds (et éventuellement les poignées de " +"nœud) du chemin sélectionné." #: ../share/extensions/layers2svgfont.inx.h:1 msgid "3 - Convert Glyph Layers to SVG Font" -msgstr "3 - Convertir les calques de glyphe en police SVG" +msgstr "(3) Convertir les calques de glyphe en police SVG" #: ../share/extensions/layers2svgfont.inx.h:2 #: ../share/extensions/new_glyph_layer.inx.h:3 @@ -36936,7 +36877,6 @@ msgid "Margin box" msgstr "Boîte de marge" #: ../share/extensions/layout_nup.inx.h:25 -#, fuzzy msgid "" "\n" "Parameters:\n" @@ -36951,13 +36891,17 @@ msgid "" msgstr "" "\n" "Paramètres :\n" -" * Page size: width and height.\n" -" * Page margins: extra space around each page.\n" -" * Layout rows and cols.\n" -" * Layout size: width and height, auto calculated if one is 0.\n" -" * Auto calculate layout size: don't use the layout size values.\n" -" * Layout margins: white space around each part of the layout.\n" -" * Layout padding: inner padding for each part of the layout.\n" +" * Taille de la page : largeur et hauteur.\n" +" * Marges des pages : espace supplémentaire aux bords de chaque page.\n" +" * Nombre de lignes et de colonnes de la disposition.\n" +" * Taille de la disposition : largeur et hauteur (0 pour auto-calculer).\n" +" * Auto-calculer la taille de la disposition : ne pas utiliser la taille " +"de disposition définie.\n" +" * Marges de la disposition : espace autour de chaque partie de la " +"disposition.\n" +" * Marges internes de la disposition : décalage intérieur pour chaque " +"partie de la disposition.\n" +" " #: ../share/extensions/layout_nup.inx.h:36 #: ../share/extensions/perfectboundcover.inx.h:20 @@ -37027,13 +36971,15 @@ msgid "" "]: return to remembered point\n" msgstr "" "\n" -"Le chemin est généré en appliquant des règles à un axiome, sur plusieurs " -"générations. Les commandes suivantes sont reconnues dans les champs Axiome " -"et Règles :\n" +"Le chemin est généré en appliquant des\n" +"règles à un axiome, sur plusieurs générations.\n" +"Les commandes suivantes sont reconnues\n" +"dans les champs Axiome et Règles :\n" "\n" "A, B, C, D, E ou F : dessiner d'un pas en avant ;\n" "G, H, I, J, K ou L : déplacer d'un pas en avant ;\n" -"+ : tourner à gauche ;- : tourner à droite ;\n" +"+ : tourner à gauche ;\n" +"- : tourner à droite ;\n" "| : tourner de 180 degrés ;\n" "[ : enregistrer le point ;\n" "] : retourner au point enregistré.\n" @@ -37061,7 +37007,7 @@ msgid "" "new flowed text object, the size of the page, is created in a new layer." msgstr "" "Cette effet crée un texte bouche-trou « Lorem Ipsum » (du pseudo-latin). Si " -"un cadre de texte est sélectionné, y ajoute Lorem Ipsum; sinon, un nouveau " +"un cadre de texte est sélectionné, y ajoute Lorem Ipsum ; sinon, un nouveau " "cadre de texte de la taille de la page est créé dans un nouveau calque." #: ../share/extensions/markers_strokepaint.inx.h:1 @@ -37113,12 +37059,10 @@ msgid "Measurement Type: " msgstr "Type de mesure :" #: ../share/extensions/measure.inx.h:4 -#, fuzzy msgid "Text Presets" -msgstr "Préférences des textes" +msgstr "Prédéfinitions de texte" #: ../share/extensions/measure.inx.h:6 -#, fuzzy msgid "Text on Path" msgstr "Texte suivant un chemin" @@ -37149,7 +37093,7 @@ msgstr "Décalage (px) :" #: ../share/extensions/measure.inx.h:15 msgid "Scale Factor (Drawing:Real Length) = 1:" -msgstr "Facteur d'échelle (Dessin:Longueur réelle) :" +msgstr "Coefficient de proportionnalité (Dessin:Longueur réelle) = 1 :" #: ../share/extensions/measure.inx.h:16 msgid "Length Unit:" @@ -37206,7 +37150,7 @@ msgid "Center of Mass" msgstr "Barycentre" #: ../share/extensions/measure.inx.h:35 -#, fuzzy, no-c-format +#, no-c-format msgid "" "This effect measures the length, area, or center-of-mass of the selected " "paths. Length and area are added as a text object with the selected units. " @@ -37224,24 +37168,25 @@ msgid "" "Bezier curves. If a circle is used, the area may be too high by as much as " "0.03%." msgstr "" -"Cet effet mesure la longueur ou l'aire du chemin sélectionné et l'ajoute " -"comme un objet texte avec l'unité sélectionnée.\n" +"Cet effet mesure la longueur, l'aire ou le centre-de-masse des chemins " +"sélectionnés. La longueur et l'aire sont ajoutées sous forme d'objet texte " +"avec l'unité sélectionnée. Le centre-de-masse est représenté par une croix.\n" "\n" -" * L'affichage peut s'effectuer sur le chemin, ou comme texte indépendant " -"sur un angle choisi.\n" -" * Le nombre de chiffres affichés peut être contrôlé par le champ " +" * Le format d'affichage du texte peut être soit du Texte-sur-chemin, ou du " +"texte indépendant sur un angle choisi.\n" +" * Le nombre de chiffres significatifs peut être contrôlé par le champ " "Précision.\n" -" * Le champ Décalage contrôle la distance entre le texte et le chemin.\n" -" * Le facteur d'échelle peut être utilisé pour réaliser des mesures dans " -"des dessins à l'échelle. Par exemple, si 1 cm dans le dessin est égal à 2,5 " -"m en réalité, le facteur d'échelle doit être réglé à 250.\n" +" * Le champ Décalage définit la distance entre le texte et le chemin.\n" +" * Le Facteur d'échelle peut être utilisé pour réaliser des mesures dans " +"des dessins redimensionnés. Par exemple, si 1 cm dans le dessin est égal à " +"2,5 m en réalité, le Facteur d'échelle doit être réglé à 250.\n" " * Lors du calcul de l'aire, le résultat devrait être précis pour les " "polygones et les courbes de Bézier. Si un cercle est utilisé, l'aire " "pourrait être jusqu'à 0,03 % supérieure à la valeur attendue." #: ../share/extensions/merge_styles.inx.h:1 msgid "Merge Styles into CSS" -msgstr "Fusionner les styles dans une feuille de styles" +msgstr "Fusionner les styles dans du CSS" #: ../share/extensions/merge_styles.inx.h:2 msgid "" @@ -37273,7 +37218,7 @@ msgstr "Amplitude :" #: ../share/extensions/new_glyph_layer.inx.h:1 msgid "2 - Add Glyph Layer" -msgstr "2 - Ajouter un calque de glyphe" +msgstr "(2) Ajouter un calque de glyphe" #: ../share/extensions/new_glyph_layer.inx.h:2 msgid "Unicode character:" @@ -37285,162 +37230,139 @@ msgstr "Voir le glyphe suivant" #: ../share/extensions/nicechart.inx.h:1 msgid "NiceCharts" -msgstr "" +msgstr "Jolis graphiques" #: ../share/extensions/nicechart.inx.h:2 -#, fuzzy msgid "Data" -msgstr "Entrée/sortie de données" +msgstr "Données" #: ../share/extensions/nicechart.inx.h:3 -#, fuzzy msgid "Data from file" -msgstr "Charger depuis un fichier" +msgstr "Données depuis un fichier" #: ../share/extensions/nicechart.inx.h:5 -#, fuzzy msgid "Delimiter:" -msgstr "Limite du raccord :" +msgstr "Délimiteur :" #: ../share/extensions/nicechart.inx.h:6 msgid "Column that contains the keys:" -msgstr "" +msgstr "Colonne contenant les clés :" #: ../share/extensions/nicechart.inx.h:7 -#, fuzzy msgid "Column that contains the values:" -msgstr "Valeur de vote constant" +msgstr "Colonne contenant les valeurs :" #: ../share/extensions/nicechart.inx.h:8 msgid "File encoding (e.g. utf-8):" -msgstr "" +msgstr "Encodage du fichier (par ex. utf-8) :" #: ../share/extensions/nicechart.inx.h:9 msgid "First line contains headings" -msgstr "" +msgstr "La première ligne contient les titres" #: ../share/extensions/nicechart.inx.h:10 -#, fuzzy msgid "Direct input" -msgstr "Direction" +msgstr "Entrée directe" #: ../share/extensions/nicechart.inx.h:11 -#, fuzzy msgid "Data:" -msgstr "Entrée/sortie de données" +msgstr "Données :" #: ../share/extensions/nicechart.inx.h:12 -#, fuzzy msgid "Enter the full path to a CSV file:" -msgstr "Chemin du fichier journal :" +msgstr "Entrez le chemin complet d'un fichier CSV :" #: ../share/extensions/nicechart.inx.h:13 msgid "Type in comma separated values:" -msgstr "" +msgstr "Saisissez des valeurs séparées par des virgules :" #: ../share/extensions/nicechart.inx.h:14 msgid "(format like this: apples:3,bananas:5)" -msgstr "" +msgstr "(formatez de cette façon : apples:3,bananas:5)" #: ../share/extensions/nicechart.inx.h:15 -#, fuzzy msgid "Labels" -msgstr "Étiquette" +msgstr "Étiquettes" #: ../share/extensions/nicechart.inx.h:16 -#, fuzzy msgid "Font:" -msgstr "Police" +msgstr "Police :" #: ../share/extensions/nicechart.inx.h:18 -#, fuzzy msgid "Font color:" -msgstr "Couleur des mois :" +msgstr "Couleur de police :" #: ../share/extensions/nicechart.inx.h:19 msgid "Charts" -msgstr "" +msgstr "Graphiques" #: ../share/extensions/nicechart.inx.h:20 -#, fuzzy msgid "Draw horizontally" -msgstr "Déplacer horizontalement" +msgstr "Dessiner horizontalement" #: ../share/extensions/nicechart.inx.h:21 -#, fuzzy msgid "Bar length:" -msgstr "Longueur _principale :" +msgstr "Longueur des barres :" #: ../share/extensions/nicechart.inx.h:22 -#, fuzzy msgid "Bar width:" -msgstr "Largeur du flou :" +msgstr "Largeur des barres :" #: ../share/extensions/nicechart.inx.h:23 -#, fuzzy msgid "Pie radius:" -msgstr "Rayon intérieur :" +msgstr "Rayon du camembert :" #: ../share/extensions/nicechart.inx.h:24 -#, fuzzy msgid "Bar offset:" -msgstr "Décalage du chemin de texte" +msgstr "Décalage des barres :" #: ../share/extensions/nicechart.inx.h:26 msgid "Offset between chart and labels:" -msgstr "" +msgstr "Décalage entre le graphique et les étiquettes :" #: ../share/extensions/nicechart.inx.h:27 msgid "Offset between chart and chart title:" -msgstr "" +msgstr "Décalage entre le graphique et son intitulé :" #: ../share/extensions/nicechart.inx.h:28 msgid "Work around aliasing effects (creates overlapping segments)" -msgstr "" +msgstr "Contourner les effets de lissage (crée des segments se recouvrant)" #: ../share/extensions/nicechart.inx.h:29 -#, fuzzy msgid "Color scheme:" -msgstr "Couleurs :" +msgstr "Thème de couleurs :" #: ../share/extensions/nicechart.inx.h:30 -#, fuzzy msgid "Custom colors:" -msgstr "Couleur du bosselage" +msgstr "Couleurs personnalisées :" #: ../share/extensions/nicechart.inx.h:31 -#, fuzzy msgid "Reverse color scheme" -msgstr "Supprimer la couleur du contour" +msgstr "Inverser le thème de couleurs" #: ../share/extensions/nicechart.inx.h:32 -#, fuzzy msgid "Drop shadow" msgstr "Ombre portée" #: ../share/extensions/nicechart.inx.h:37 msgid "SAP" -msgstr "" +msgstr "SAP" #: ../share/extensions/nicechart.inx.h:38 -#, fuzzy msgid "Values" msgstr "Valeur" #: ../share/extensions/nicechart.inx.h:39 -#, fuzzy msgid "Show values" -msgstr "Afficher les poignées" +msgstr "Afficher les valeurs" #: ../share/extensions/nicechart.inx.h:40 -#, fuzzy msgid "Chart type:" -msgstr "Type d'ombre :" +msgstr "Type de graphique :" #: ../share/extensions/nicechart.inx.h:41 -#, fuzzy msgid "Bar chart" -msgstr "Hauteur des barres :" +msgstr "Diagramme en barres" #: ../share/extensions/nicechart.inx.h:42 msgid "Pie chart" @@ -37452,7 +37374,7 @@ msgstr "Camembert (pourcentage)" #: ../share/extensions/nicechart.inx.h:44 msgid "Stacked bar chart" -msgstr "" +msgstr "Barres empilées" #: ../share/extensions/param_curves.inx.h:1 msgid "Parametric Curves" @@ -37472,7 +37394,7 @@ msgstr "Valeur T de fin :" #: ../share/extensions/param_curves.inx.h:5 msgid "Multiply t-range by 2*pi" -msgstr "Multiplier l'amplitude en T par 2*pi" +msgstr "Multiplier l'amplitude en T par 2×π" #: ../share/extensions/param_curves.inx.h:6 msgid "X-value of rectangle's left:" @@ -37510,7 +37432,7 @@ msgstr "Fonction X :" #: ../share/extensions/param_curves.inx.h:27 msgid "Y-Function:" -msgstr "Fonction X :" +msgstr "Fonction Y :" #: ../share/extensions/pathalongpath.inx.h:1 msgid "Pattern along Path" @@ -37633,7 +37555,6 @@ msgstr "Largeur du livre (pouces) :" msgid "Book Height (inches):" msgstr "Hauteur du livre (pouces) :" -# soh msgstr "Note : le calcul à partir du grammage est la meilleure estimation possible" #: ../share/extensions/perfectboundcover.inx.h:5 msgid "Number of Pages:" msgstr "Nombre de pages :" @@ -37689,7 +37610,7 @@ msgstr "Fond perdu (pouces) :" #: ../share/extensions/perfectboundcover.inx.h:18 msgid "Note: Bond Weight # calculations are a best-guess estimate." msgstr "" -"Note : le calcul du poids de « bond » est la meilleure estimation possible" +"Note : Le calcul du poids de « bond » est la meilleure estimation possible." #: ../share/extensions/pixelsnap.inx.h:1 msgid "PixelSnap" @@ -37701,7 +37622,7 @@ msgid "" "fills to full points." msgstr "" "Aligne les chemins de la sélection sur les pixels. Les bordures sont " -"alignées sur des demi-points, et les remplissages sur des points." +"alignées sur des demi-points, et les fonds sur des points." #: ../share/extensions/plotter.inx.h:1 msgid "Plot" @@ -37747,7 +37668,7 @@ msgid "" "The Byte size of your serial connection, 99% of all plotters use the default " "setting (Default: 8 Bits)" msgstr "" -"La taille d'octet de votre connexion série. 99 % des traceurs utilisent le " +"La taille d'octet de votre connexion série ; 99 % des traceurs utilisent le " "paramètre par défaut (8 bits)" #: ../share/extensions/plotter.inx.h:11 @@ -37848,8 +37769,8 @@ msgid "" "ignore this command. (Default: 0)" msgstr "" "La vitesse du stylo est exprimée en cm/s ou en mm/s en fonction du modèle de " -"traceur. La plupart des traceurs ignorent cette commande (Défaut à 0 pour " -"ignorer la commande)." +"traceur. La plupart des traceurs ignorent cette commande (par défaut : 0 " +"pour ignorer la commande)." #: ../share/extensions/plotter.inx.h:42 msgid "Rotation (°, clockwise):" @@ -37864,6 +37785,8 @@ msgid "" "Check this to get verbose information about the plot without actually " "sending something to the plotter (A.k.a. data dump) (Default: Unchecked)" msgstr "" +"Cocher pour obtenir des informations verbeuses (cliché de données) sur la " +"trace sans rien envoyer au traceur (par défaut : décoché)" #: ../share/extensions/plt_input.inx.h:1 msgid "AutoCAD Plot Input" @@ -38095,7 +38018,7 @@ msgstr "Voir le glyphe précédent" #: ../share/extensions/print_win32_vector.inx.h:1 msgid "Win32 Vector Print" -msgstr "Impression Windows 32-bits" +msgstr "Impression Windows 32 bits" #: ../share/extensions/printing_marks.inx.h:1 msgid "Printing Marks" @@ -38191,15 +38114,14 @@ msgstr "QR Code" #: ../share/extensions/render_barcode_qrcode.inx.h:2 msgid "See http://www.denso-wave.com/qrcode/index-e.html for details" msgstr "" -"Voir http://www.denso-wave.com/qrcode/index-e.html pour de plus amples " -"détails" +"Voir http://www.denso-wave.com/qrcode/index-e.html pour plus de détails" #: ../share/extensions/render_barcode_qrcode.inx.h:6 msgid "" "With \"Auto\", the size of the barcode depends on the length of the text and " "the error correction level" msgstr "" -"Avec \"Auto\", la taille du code-barres dépend de la longueur du texte et du " +"Avec « Auto », la taille du code-barres dépend de la longueur du texte et du " "niveau de correction d'erreur" #: ../share/extensions/render_barcode_qrcode.inx.h:7 @@ -38281,15 +38203,15 @@ msgstr "Trouver et remplacer une police" #: ../share/extensions/replace_font.inx.h:3 msgid "Find font: " -msgstr "Rechercher cette police :" +msgstr "Rechercher cette police : " #: ../share/extensions/replace_font.inx.h:4 msgid "Replace with: " -msgstr "Remplacer par :" +msgstr "Remplacer par : " #: ../share/extensions/replace_font.inx.h:5 msgid "Replace all fonts with: " -msgstr "Remplacer toutes les polices par :" +msgstr "Remplacer toutes les polices par : " #: ../share/extensions/replace_font.inx.h:6 msgid "List all fonts" @@ -38316,7 +38238,7 @@ msgstr "Seulement les objets sélectionnés" #: ../share/extensions/restack.inx.h:1 msgid "Restack" -msgstr "Ré-empiler" +msgstr "Réempiler" #: ../share/extensions/restack.inx.h:2 msgid "Based on Position" @@ -38336,7 +38258,7 @@ msgstr "Vertical :" #: ../share/extensions/restack.inx.h:8 msgid "Restack Direction" -msgstr "Sens du ré-empilement :" +msgstr "Sens du réempilement :" #: ../share/extensions/restack.inx.h:9 msgid "Left to Right (0)" @@ -38386,19 +38308,19 @@ msgstr "Bas" #: ../share/extensions/restack.inx.h:21 msgid "Based on Z-Order" -msgstr "Basé sur l'ordre z" +msgstr "Basé sur l'ordre d'empilement" #: ../share/extensions/restack.inx.h:22 msgid "Restack Mode" -msgstr "Mode ré-empilage" +msgstr "Mode réempilage" #: ../share/extensions/restack.inx.h:23 msgid "Reverse Z-Order" -msgstr "Ordre z inversé" +msgstr "Inverser l'ordre d'empilement" #: ../share/extensions/restack.inx.h:24 msgid "Shuffle Z-Order" -msgstr "" +msgstr "Mélanger les ordres d'empilement" #: ../share/extensions/restack.inx.h:26 msgid "" @@ -38407,6 +38329,11 @@ msgid "" "objects inside a single selected group, or a selection of multiple objects " "on the current drawing level (layer or group)." msgstr "" +"Cette extension change l'ordre d'empilement des objets (position sur l'axe " +"Z) en fonction de leur position sur le canevas ou leur ordre d'empilement " +"actuel. Sélection : L'extension réempile soit les objets dans un seul groupe " +"sélectionné, ou une sélection de plusieurs objets sur le niveau de dessin " +"actuel (calque ou groupe)." #: ../share/extensions/restack.inx.h:27 #: ../share/extensions/ungroup_deep.inx.h:6 @@ -38431,7 +38358,7 @@ msgstr "Éliminer les segments superflus" #: ../share/extensions/rtree.inx.h:5 msgid "Lift pen for backward steps" -msgstr "" +msgstr "Lever le stylo pour les étapes de retour" #: ../share/extensions/rubberstretch.inx.h:1 msgid "Rubber Stretch" @@ -38452,7 +38379,6 @@ msgid "Optimized SVG Output" msgstr "Sortie SVG optimisé" #: ../share/extensions/scour.inx.h:3 -#, fuzzy msgid "Number of significant digits for coordinates:" msgstr "Nombre de chiffres significatifs pour les coordonnées :" @@ -38464,6 +38390,11 @@ msgid "" "\"3\" is specified, the coordinate 3.14159 is output as 3.14 while the " "coordinate 123.675 is output as 124." msgstr "" +"Indique le nombre de chiffres significatifs qui devraient être affichés pour " +"les coordonnées. Notez que les chiffres significatifs ne correspondent *pas* " +"au nombre de décimales mais au nombre total de chiffres dans la sortie. Par " +"exemple, avec une valeur de « 3 », la coordonnée 3.14159 devient 3.14 et la " +"coordonnée 123.675 devient 124." #: ../share/extensions/scour.inx.h:5 msgid "Shorten color values" @@ -38474,6 +38405,8 @@ msgid "" "Convert all color specifications to #RRGGBB (or #RGB where applicable) " "format." msgstr "" +"Convertir toutes les spécifications de couleurs au format #RRVVBB (ou #RVB " +"si applicable)." #: ../share/extensions/scour.inx.h:7 msgid "Convert CSS attributes to XML attributes" @@ -38484,17 +38417,20 @@ msgid "" "Convert styles from style tags and inline style=\"\" declarations into XML " "attributes." msgstr "" +"Convertir les styles des balises de style et déclarations de styles en ligne " +"en attributs XML." #: ../share/extensions/scour.inx.h:9 -#, fuzzy msgid "Collapse groups" -msgstr "Efface_r tout" +msgstr "Réduire les groupes" #: ../share/extensions/scour.inx.h:10 msgid "" "Remove useless groups, promoting their contents up one level. Requires " "\"Remove unused IDs\" to be set." msgstr "" +"Supprimer les groupes inutiles, faisant monter leur contenu d'un niveau. " +"Nécessite que « Supprimer les ID inutilisés » soit défini." #: ../share/extensions/scour.inx.h:11 msgid "Create groups for similar attributes" @@ -38505,24 +38441,30 @@ msgid "" "Create groups for runs of elements having at least one attribute in common " "(e.g. fill-color, stroke-opacity, ...)." msgstr "" +"Créer des groupes pour les ensembles d'éléments ayant au moins un attribut " +"en commun (par ex. couleur de fond « fill-color », opacité du contour " +"« stroke-opacity »...)." #: ../share/extensions/scour.inx.h:13 msgid "Keep editor data" -msgstr "Conserve les données d'édition" +msgstr "Conserver les données d'édition" #: ../share/extensions/scour.inx.h:14 msgid "" "Don't remove editor-specific elements and attributes. Currently supported: " "Inkscape, Sodipodi and Adobe Illustrator." msgstr "" +"Ne pas supprimer les éléments et attributs spécifiques de l'éditeur. " +"Actuellement supportés : Inkscape, Sodipodi et Adobe Illustrator." #: ../share/extensions/scour.inx.h:15 msgid "Keep unreferenced definitions" -msgstr "" +msgstr "Conserver les définitions non référencées" #: ../share/extensions/scour.inx.h:16 msgid "Keep element definitions that are not currently used in the SVG" msgstr "" +"Conserver les définitions d'éléments qui ne sont pas utilisées dans le SVG" #: ../share/extensions/scour.inx.h:17 msgid "Work around renderer bugs" @@ -38533,9 +38475,10 @@ msgid "" "Works around some common renderer bugs (mainly libRSVG) at the cost of a " "slightly larger SVG file." msgstr "" +"Contourne des défauts de rendu courants (principalement libRSVG), au prix " +"d'un fichier SVG légèrement plus lourd." #: ../share/extensions/scour.inx.h:20 -#, fuzzy msgid "Remove the XML declaration" msgstr "Supprimer la déclaration XML" @@ -38545,6 +38488,9 @@ msgid "" "especially if special characters are used in the document) from the file " "header." msgstr "" +"Supprime la déclaration XML (qui est optionnelle mais devrait être fournie, " +"particulièrement si des caractères spéciaux sont utilisés dans le document) " +"de l'en-tête du fichier." #: ../share/extensions/scour.inx.h:22 msgid "Remove metadata" @@ -38556,6 +38502,9 @@ msgid "" "include license and author information, alternate versions for non-SVG-" "enabled browsers, etc." msgstr "" +"Supprimer les balises de métadonnées avec toutes les informations fournies, " +"qui peuvent inclure des informations de licence ou des crédits, des versions " +"alternatives pour les navigateurs ne supportant pas le SVG, etc." #: ../share/extensions/scour.inx.h:24 msgid "Remove comments" @@ -38563,22 +38512,23 @@ msgstr "Supprimer les commentaires" #: ../share/extensions/scour.inx.h:25 msgid "Remove all XML comments from output." -msgstr "" +msgstr "Supprimer tous les commentaires XML de la sortie" #: ../share/extensions/scour.inx.h:26 -#, fuzzy msgid "Embed raster images" -msgstr "Incorporer les images" +msgstr "Incorporer les images matricielles" #: ../share/extensions/scour.inx.h:27 msgid "" "Resolve external references to raster images and embed them as Base64-" "encoded data URLs." msgstr "" +"Résoudre les références externes vers des images matricielles et les " +"incorporer en tant qu'URL de données en Base64." #: ../share/extensions/scour.inx.h:28 msgid "Enable viewboxing" -msgstr "Activer une viewBox" +msgstr "Activer la vue par zone" #: ../share/extensions/scour.inx.h:30 #, no-c-format @@ -38586,10 +38536,13 @@ msgid "" "Set page size to 100%/100% (full width and height of the display area) and " "introduce a viewBox specifying the drawings dimensions." msgstr "" +"Définir la taille de la page à 100 %/100 % (largeur et hauteur complètes de " +"la zone d'affichage) et introduire une zone de vue spécifiant les dimensions " +"du dessin." #: ../share/extensions/scour.inx.h:31 msgid "Format output with line-breaks and indentation" -msgstr "" +msgstr "Formater la sortie avec des retours à la ligne et de l'indentation" #: ../share/extensions/scour.inx.h:32 msgid "" @@ -38597,11 +38550,14 @@ msgid "" "to hand-edit the SVG file you can disable this option to bring down the file " "size even more at the cost of clarity." msgstr "" +"Produire une sortie correctement formatée avec des retours à la ligne. Si " +"vous n'envisagez pas de modifier le texte du fichier SVG à la main, vous " +"pouvez désactiver cette option pour réduire davantage la taille du fichier " +"au prix de la clarité." #: ../share/extensions/scour.inx.h:33 -#, fuzzy msgid "Indentation characters:" -msgstr "Caractère Unicode :" +msgstr "Caractères d'indentation :" #: ../share/extensions/scour.inx.h:34 msgid "" @@ -38609,21 +38565,27 @@ msgid "" "Specify \"None\" to disable indentation. This option has no effect if " "\"Format output with line-breaks and indentation\" is disabled." msgstr "" +"Le type d'indentation utilisé pour chaque niveau d'indentation/retrait dans " +"la sortie. Indiquez « Aucune » pour désactiver l'indentation. Cette option " +"n'a pas d'effet si « Formater la sortie avec des retours à la ligne et de " +"l'indentation » est désactivée." #: ../share/extensions/scour.inx.h:35 -#, fuzzy msgid "Depth of indentation:" -msgstr "Fonction de profondeur :" +msgstr "Longueur de l'indentation :" #: ../share/extensions/scour.inx.h:36 msgid "" "The depth of the chosen type of indentation. E.g. if you choose \"2\" every " "nesting level in the output will be indented by two additional spaces/tabs." msgstr "" +"La longueur du type d'indentation choisi. Par ex., si vous choisissez « 2 », " +"tout niveau d'indentation dans la sortie sera indenté avec deux espaces/" +"tabulations supplémentaires." #: ../share/extensions/scour.inx.h:37 msgid "Strip the \"xml:space\" attribute from the root SVG element" -msgstr "" +msgstr "Retirer l'attribut « xml:space » de l'élément SVG racine" #: ../share/extensions/scour.inx.h:38 msgid "" @@ -38631,16 +38593,17 @@ msgid "" "root SVG element which instructs the SVG editor not to change whitespace in " "the document at all (and therefore overrides the options above)." msgstr "" +"Cela est utile si le fichier d'entrée spécifie « xml:space='preserve' dans " +"l'élément SVG racine qui indique à l'éditeur SVG de ne modifier aucunement " +"les espaces du document (et donc écrase les options ci-dessus)." #: ../share/extensions/scour.inx.h:39 -#, fuzzy msgid "Document options" -msgstr "Propriétés du do_cument..." +msgstr "Options du documents" #: ../share/extensions/scour.inx.h:40 -#, fuzzy msgid "Pretty-printing" -msgstr "Peinture" +msgstr "Impression élégante" #: ../share/extensions/scour.inx.h:41 msgid "Space" @@ -38656,20 +38619,20 @@ msgid "None" msgstr "Aucune" #: ../share/extensions/scour.inx.h:44 -#, fuzzy msgid "IDs" -msgstr "Id" +msgstr "ID" #: ../share/extensions/scour.inx.h:45 -#, fuzzy msgid "Remove unused IDs" -msgstr "Supprimer le rouge" +msgstr "Supprimer les ID inutilisés" #: ../share/extensions/scour.inx.h:46 msgid "" "Remove all unreferenced IDs from elements. Those are not needed for " "rendering." msgstr "" +"Supprimer toutes les ID non référencées des éléments. Ils ne sont pas " +"nécessaires pour le rendu." #: ../share/extensions/scour.inx.h:47 msgid "Shorten IDs" @@ -38681,17 +38644,20 @@ msgid "" "shortest values to the most-referenced elements. For instance, " "\"linearGradient5621\" will become \"a\" if it is the most used element." msgstr "" +"Minimiser la longueur des identifiants utilisant uniquement des lettres " +"minuscules, affectant les valeurs les plus courtes aux éléments les plus " +"souvent référencés. Par exemple, « linearGradient32 » deviendra « a » s'il " +"s'agit de l'élément le plus référencé." #: ../share/extensions/scour.inx.h:49 msgid "Prefix shortened IDs with:" -msgstr "" +msgstr "Préfixer les ID raccourcis avec :" #: ../share/extensions/scour.inx.h:50 msgid "Prepend shortened IDs with the specified prefix." -msgstr "" +msgstr "Préfixer les ID raccourcis avec le préfixe spécifié." #: ../share/extensions/scour.inx.h:51 -#, fuzzy msgid "Preserve manually created IDs not ending with digits" msgstr "" "Préserver les identifiants manuels qui ne se terminent pas par un chiffre" @@ -38703,28 +38669,31 @@ msgid "" "preserved while numbered IDs (as they are generated by most SVG editors " "including Inkscape) will be removed/shortened." msgstr "" +"Les ID descriptifs qui ont été créés manuellement pour référencer ou " +"étiqueter des éléments ou groupes spécifiques (par ex. #arrowStart, " +"#arrowEnd ou #textLabels) seront préservés tandis que les ID numérotés " +"(puisqu'ils sont générés par la plupart des éditeurs SVG dont Inkscape) " +"seront supprimés/raccourcis." #: ../share/extensions/scour.inx.h:53 -#, fuzzy msgid "Preserve the following IDs:" -msgstr "" -"Liste des polices utilisées :\n" -"%s" +msgstr "Préserver les ID suivants :" #: ../share/extensions/scour.inx.h:54 msgid "A comma-separated list of IDs that are to be preserved." -msgstr "" +msgstr "Une liste d'identifiants à préserver séparés par des virgules" #: ../share/extensions/scour.inx.h:55 -#, fuzzy msgid "Preserve IDs starting with:" -msgstr "Préserver les identifiants débutant par :" +msgstr "Préserver les identifiants commençant par :" #: ../share/extensions/scour.inx.h:56 msgid "" "Preserve all IDs that start with the specified prefix (e.g. specify \"flag\" " "to preserve \"flag-mx\", \"flag-pt\", etc.)." msgstr "" +"Préserver tous les identifiants qui commencent par le préfixe spécifié (par " +"ex. indiquez « flag » pour préserver « flag-mx », « flag-pt », etc.)." #: ../share/extensions/scour.inx.h:57 msgid "Optimized SVG (*.svg)" @@ -38735,34 +38704,30 @@ msgid "Scalable Vector Graphics" msgstr "Scalable Vector Graphics" #: ../share/extensions/seamless_pattern.inx.h:1 -#, fuzzy msgid "Seamless Pattern" -msgstr "Motifs Braille" +msgstr "Motif sans couture" #: ../share/extensions/seamless_pattern.inx.h:2 #: ../share/extensions/seamless_pattern_procedural.inx.h:2 -#, fuzzy msgid "Custom Width (px):" -msgstr "Épaisseur du contour (px) :" +msgstr "Largeur personnalisée (px) :" #: ../share/extensions/seamless_pattern.inx.h:3 #: ../share/extensions/seamless_pattern_procedural.inx.h:3 -#, fuzzy msgid "Custom Height (px):" -msgstr "Droite (px) :" +msgstr "Hauteur personnalisée (px) :" #: ../share/extensions/seamless_pattern.inx.h:4 -#, fuzzy msgid "This extension overwrites the current document" -msgstr "L'extension écrase le document en cours" +msgstr "Cette extension écrase le document en cours" #: ../share/extensions/seamless_pattern_procedural.inx.h:1 msgid "Seamless Pattern Procedural" -msgstr "" +msgstr "Motif sans couture procédural" #: ../share/extensions/setup_typography_canvas.inx.h:1 msgid "1 - Setup Typography Canvas" -msgstr "1 - Paramétrer le canevas typographique" +msgstr "(1) Paramétrer le canevas typographique" #: ../share/extensions/setup_typography_canvas.inx.h:2 msgid "Em-size:" @@ -38778,7 +38743,7 @@ msgstr "Hauteur de capitale :" #: ../share/extensions/setup_typography_canvas.inx.h:5 msgid "X-Height:" -msgstr "Hauteur d'x :" +msgstr "Hauteur de minuscule :" #: ../share/extensions/setup_typography_canvas.inx.h:6 msgid "Descender:" @@ -38823,15 +38788,15 @@ msgstr "Spirographe" #: ../share/extensions/spirograph.inx.h:2 msgid "R - Ring Radius (px):" -msgstr "R - rayon de l'anneau (px) :" +msgstr "R – rayon de l'anneau (px) :" #: ../share/extensions/spirograph.inx.h:3 msgid "r - Gear Radius (px):" -msgstr "r - Rayon de l'engrenage (px) :" +msgstr "r – Rayon de l'engrenage (px) :" #: ../share/extensions/spirograph.inx.h:4 msgid "d - Pen Radius (px):" -msgstr "d - Rayon du stylo (px) :" +msgstr "d – Rayon du stylo (px) :" #: ../share/extensions/spirograph.inx.h:5 msgid "Gear Placement:" @@ -39259,28 +39224,24 @@ msgid "From Side c and Angles a, b" msgstr "À partir du côté c et des angles a et b" #: ../share/extensions/ungroup_deep.inx.h:1 -#, fuzzy msgid "Deep Ungroup" -msgstr "Dégrouper" +msgstr "Dégrouper récursivement" #: ../share/extensions/ungroup_deep.inx.h:2 -#, fuzzy msgid "Ungroup all groups in the selected object." -msgstr "Créer un clone (une copie liée à l'original) de l'objet sélectionné" +msgstr "Dégrouper tous les groupes dans l'objet sélectionné." #: ../share/extensions/ungroup_deep.inx.h:3 -#, fuzzy msgid "Starting Depth" -msgstr "Chemin de départ :" +msgstr "Profondeur de départ" #: ../share/extensions/ungroup_deep.inx.h:4 -#, fuzzy msgid "Stopping Depth (from top)" -msgstr "Retirer le chemin de découpe de la sélection" +msgstr "Profondeur d'arrêt (depuis le haut)" #: ../share/extensions/ungroup_deep.inx.h:5 msgid "Depth to Keep (from bottom)" -msgstr "" +msgstr "Profondeur à conserver (depuis le bas)" #: ../share/extensions/voronoi2svg.inx.h:1 msgid "Voronoi Diagram" @@ -39299,9 +39260,8 @@ msgid "Show the bounding box" msgstr "Montrer la boîte englobante" #: ../share/extensions/voronoi2svg.inx.h:6 -#, fuzzy msgid "Triangles color" -msgstr "Triangle croissant" +msgstr "Couleur des triangles" #: ../share/extensions/voronoi2svg.inx.h:7 msgid "Delaunay Triangulation" @@ -39320,22 +39280,20 @@ msgid "Automatic from selected objects" msgstr "Automatique à partir des objets sélectionnés" #: ../share/extensions/voronoi2svg.inx.h:12 -#, fuzzy msgid "Options for Delaunay Triangulation" -msgstr "Triangulation de Delaunay" +msgstr "Options de la triangulation de Delaunay" #: ../share/extensions/voronoi2svg.inx.h:13 msgid "Default (Stroke black and no fill)" -msgstr "" +msgstr "Par défaut (contour noir et fond vide)" #: ../share/extensions/voronoi2svg.inx.h:14 -#, fuzzy msgid "Triangles with item color" -msgstr "Modifier la couleur de l'échantillon" +msgstr "Triangles avec couleur d'élément" #: ../share/extensions/voronoi2svg.inx.h:15 msgid "Triangles with item color (random on apply)" -msgstr "" +msgstr "Triangles avec couleur d'élément (aléatoire à l'application)" #: ../share/extensions/voronoi2svg.inx.h:17 msgid "" @@ -39530,7 +39488,7 @@ msgstr "Définir un groupe de composants" #: ../share/extensions/webslicer_create_group.inx.h:3 #: ../share/extensions/webslicer_create_rect.inx.h:18 msgid "HTML id attribute:" -msgstr "Attribut d'Id HTML :" +msgstr "Attribut HTML id :" #: ../share/extensions/webslicer_create_group.inx.h:4 #: ../share/extensions/webslicer_create_rect.inx.h:19 @@ -39640,19 +39598,19 @@ msgstr "Élément bloc HTML positionné avec l'image en arrière-plan" #: ../share/extensions/webslicer_create_rect.inx.h:23 msgid "Tiled Background (on parent group)" -msgstr "Arrière plan en mosaïque (sur le groupe parent)" +msgstr "Arrière-plan en mosaïque (sur le groupe parent)" #: ../share/extensions/webslicer_create_rect.inx.h:24 msgid "Background — repeat horizontally (on parent group)" -msgstr "Arrière plan - répéter horizontalement (sur le groupe parent)" +msgstr "Arrière plan — répéter horizontalement (sur le groupe parent)" #: ../share/extensions/webslicer_create_rect.inx.h:25 msgid "Background — repeat vertically (on parent group)" -msgstr "Arrière plan - répéter verticalement (sur le groupe parent)" +msgstr "Arrière plan — répéter verticalement (sur le groupe parent)" #: ../share/extensions/webslicer_create_rect.inx.h:26 msgid "Background — no repeat (on parent group)" -msgstr "Arrière plan - ne pas répéter (sur le groupe parent)" +msgstr "Arrière plan — ne pas répéter (sur le groupe parent)" #: ../share/extensions/webslicer_create_rect.inx.h:27 msgid "Positioned Image" @@ -39778,6 +39736,9 @@ msgstr "Un format graphique populaire pour les cliparts" msgid "XAML Input" msgstr "Entrée XAML" +#~ msgid "Add Stored to measure tool" +#~ msgstr "Ajouter la valeur stockée à l'outil de mesure" + #, fuzzy #~ msgid "Max. smooth handle angle" #~ msgstr "Poignée de nœud doux" @@ -41137,10 +41098,10 @@ msgstr "Entrée XAML" #~ msgstr "Texte encadré" #~ msgid "Rotate _90° CW" -#~ msgstr "Tourner de _90° dans le sens horaire" +#~ msgstr "Tourner de _90° dans le sens horaire" #~ msgid "Rotate 9_0° CCW" -#~ msgstr "Tourner de 9_0° dans le sens anti-horaire" +#~ msgstr "Tourner de 9_0° dans le sens anti-horaire" #~ msgid "Set Resolution" #~ msgstr "Définir la résolution" @@ -41842,7 +41803,7 @@ msgstr "Entrée XAML" #~ msgctxt "Measurement tool" #~ msgid "Measure" -#~ msgstr "Mesurer" +#~ msgstr "Rapporteur" #~ msgid "Toggle bold or normal weight" #~ msgstr "Basculer entre gras et normal" @@ -43607,7 +43568,7 @@ msgstr "Entrée XAML" #~ "this object (more: Shift)" #~ msgstr "" #~ "%u sur %u nœuds sélectionnés. Cliquer-glisser pour sélectionner " -#~ "des nœuds, cliquer pour éditer seulement cet objet (modificateur : Maj)" +#~ "des nœuds, cliquer pour éditer seulement cet objet (plus : Maj)" #~ msgctxt "Node tool tip" #~ msgid "" -- cgit v1.2.3 From 42dddc450cb3828cee7f0e2b5a2765603ead5fd8 Mon Sep 17 00:00:00 2001 From: suv-lp <> Date: Wed, 6 Jul 2016 22:46:22 +0200 Subject: fix for mac os (bzr r15012) --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 910ed4e20..b4ec5993e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,7 @@ message("------------------------------") message("Source Dir: ${CMAKE_CURRENT_SOURCE_DIR}") message("Binary Dir: ${CMAKE_CURRENT_BINARY_DIR}") +include(CMakeScripts/HelperFunctions.cmake) include(CMakeScripts/ConfigEnv.cmake) # ----------------------------------------------------------------------------- @@ -40,7 +41,6 @@ if(CMAKE_COMPILER_IS_GNUCC) endif() endif() -include(CMakeScripts/HelperFunctions.cmake) # ----------------------------------------------------------------------------- # Redirect output files -- cgit v1.2.3 From 71cb7d8ddbabf102501c9b245c2eea99a4ba1011 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Fri, 8 Jul 2016 09:17:55 +0200 Subject: Documentation. French documentation translation updated. (bzr r15013) --- TRANSLATORS | 3 +- doc/keys.fr.html | 405 ++++++++-------- po/fr.po | 5 +- share/tutorials/tutorial-advanced.fr.svg | 120 ++--- share/tutorials/tutorial-basic.fr.svg | 530 ++++++++++---------- share/tutorials/tutorial-calligraphy.fr.svg | 660 ++++++++++++------------- share/tutorials/tutorial-elements.fr.svg | 326 ++++++------- share/tutorials/tutorial-interpolate.fr.svg | 4 +- share/tutorials/tutorial-shapes.fr.svg | 726 ++++++++++++++-------------- share/tutorials/tutorial-tips.fr.svg | 152 +++--- share/tutorials/tutorial-tracing.fr.svg | 6 +- src/ui/dialog/aboutbox.cpp | 24 +- 12 files changed, 1485 insertions(+), 1476 deletions(-) diff --git a/TRANSLATORS b/TRANSLATORS index 90954c4b1..0cc0991ed 100644 --- a/TRANSLATORS +++ b/TRANSLATORS @@ -102,7 +102,7 @@ Muhammad Bashir Al-Noimi , 2008. Myckel Habets , 2008. Nasreen , 2013. Nguyen Dinh Trung , 2007, 2008. -Nicolas Dufour , 2008-2015. +Nicolas Dufour , 2008-2016. Paresh prabhu , 2013. Pawan Chitrakar , 2006. Przemysław Loesch , 2005. @@ -122,6 +122,7 @@ Stefan Graubner , 2005. Supranee Thirawatthanasuk , 2006. Sushma Joshi , 2011. Sveinn í Felli , 2014-2015. +Sylvain Chiron , 2016. Takeshi Aihana , 2000, 2001. Tim Sheridan , 2007-2016. Theppitak Karoonboonyanan , 2006. diff --git a/doc/keys.fr.html b/doc/keys.fr.html index 5bc90a580..c3e08e745 100644 --- a/doc/keys.fr.html +++ b/doc/keys.fr.html @@ -16,15 +16,10 @@
-

This document describes the default keyboard and mouse shortcuts of Inkscape, corresponding to the -share/keys/default.xml file in your Inkscape installation. Some of the keyboard shortcuts may not be available for non-US keyboard layouts, but most (not all) of these shortcuts are configurable by the user. You can create custom shortcuts and load custom keyboard shortcut files in the Inkscape Preferences, or by following the instructions in the default.xml file.

+

Ce document décrit les raccourcis clavier par défaut d'Inkscape, qui correspondent au fichier share/keys/default.xml distribué avec Inkscape. Certains des raccourcis clavier peuvent ne pas fonctionner sur les dispositions de touches non états-uniennes, mais la plupart (pas tous) peuvent être configurés par l'utilisateur. Vous pouvez créer des raccourcis clavier personnalisés et charger des fichiers de raccourcis dans les préférences d'Inkscape, ou en suivant les instructions du fichier default.xml.

-

Unless noted otherwise, keypad keys (such as arrows, Home, End, +, -, digits) are -supposed to work the same as corresponding regular keys. If you have a new shortcut -idea, please contact the developers (by writing to the devel mailing list -or by submitting a -feature request).

+

Sauf mention contraire, les touches du pavé numérique (incluant les flèches, Origine, Fin, +, − et les chiffres) sont supposées se comporter comme des touches normales. Si vous avez de nouvelles idées de raccourcis, veuillez contacter les développeurs (en envoyant un courriel à la liste de diffusion des développeurs ou en soumettant une demande de fonctionnalité).

@@ -40,14 +35,14 @@ feature request).

Ouvrir
  • - Afficher ou masquer + Afficher/masquer
  • À l'intérieur d'une boîte de dialogue
  • - Barres de contrôle des outils + Barre de contrôle des outils
    • @@ -61,7 +56,7 @@ feature request).

  • - Zone de travail + Canevas
  • - Outil Nœud + Outil Nœuds
    • @@ -240,13 +235,13 @@ feature request).

      Affichage des poignées
    • - Redimensionner les nœuds (plus d'un nœud dans la sélection) + Redimensionner les nœuds (plus d'un nœud dans la sélection)
    • Tourner les nœuds (plus d'un nœud dans la sélection)
    • - Retourner les nœuds (plus d'un nœud dans la sélection) + Retourner les nœuds (plus d'un nœud dans la sélection)
    • Modifier les segments @@ -414,7 +409,7 @@ feature request).

      Se déplacer dans le texte
    • - Cadre de texte (interne) + Texte encadré (cadre interne)
    • Cadre de texte (externe) @@ -459,7 +454,7 @@ feature request).

      Outil Gomme
    • - Remplissage au seau + Pot de peinture
    • Outil Dégradé @@ -525,7 +520,7 @@ feature request).

      - Lorsque l'option « Le bouton gauche de la souris fait défiler horizontalement quant la touche Espace est pressée » est activée dans les préférences, Espace+déplacer avec la souris déplace la zone de travail au lieu d'activer l'outil Sélection. + Lorsque l'option « Le bouton gauche de la souris fait défiler quand la touche Espace est enfoncée » est activée dans les préférences, Espace+cliquer-glisser avec la souris déplace le canevas au lieu d'activer l'outil Sélecteur. @@ -535,7 +530,7 @@ feature request).

      n - Outil Nœud + Outil Nœuds @@ -699,7 +694,7 @@ feature request).

      u - Outil Remplissage au seau + Outil Pot de peinture @@ -739,7 +734,7 @@ feature request).

      - Double-cliquez sur l'icône d'un outil pour ouvrir la boîte de dialogue Préférences d'Inkscape à la page de cet outil. + Double-cliquez sur l'icône d'un outil pour ouvrir la boîte de dialogue des Préférences à la page de cet outil. @@ -770,7 +765,7 @@ feature request).

      +F - Fond et contour + Remplissage et contour @@ -913,7 +908,7 @@ feature request).

      +E - Exporter en bitmap + Exporter en PNG @@ -937,7 +932,7 @@ feature request).

      +B - Vectoriser le bitmap + Vectoriser un objet matriciel @@ -950,7 +945,7 @@ feature request).

      +7 - Éditeur d'effets de chemin + Effets de chemin @@ -979,7 +974,7 @@ feature request).

      - Afficher ou masquer

      + Afficher/masquer @@ -994,7 +989,7 @@ feature request).

      - Cache temporairement toutes les boîtes de dialogues ouvertes ; une autre pression sur cette touche montre à nouveau les boîtes masquées. + Masque temporairement toutes les boîtes de dialogues ouvertes et les réaffiche à la deuxième pression. @@ -1013,7 +1008,7 @@ feature request).

      Échap - retourner à l'espace de travail + passer la main au canevas @@ -1062,7 +1057,7 @@ feature request).

      - Valide la nouvelle valeur tapée dans le champ textuel et retourne à l'espace de travail + Valide la valeur saisie dans le champ textuel et rend la main au canevas. @@ -1073,7 +1068,7 @@ feature request).

      +Entrée - dans l'éditeur XML, positionne la valeur de l'attribut + valider la valeur de l'attribut (éditeur XML) @@ -1089,7 +1084,7 @@ feature request).

      Entrée - active le bouton ou la liste en cours + activer le bouton ou la liste en cours @@ -1103,7 +1098,7 @@ feature request).

      +Page précédente - dans une boîte de dialogue à onglets, change d'onglet + changer d'onglet (le cas échéant) @@ -1112,7 +1107,7 @@ feature request).

    -

    Barres de contrôle des outils

    +

    Barre de contrôle des outils

    @@ -1127,7 +1122,7 @@ feature request).

    @@ -1174,7 +1169,7 @@ feature request).

    @@ -1219,7 +1214,7 @@ feature request).

    @@ -1228,13 +1223,13 @@ feature request).

    Échap @@ -1251,7 +1246,7 @@ feature request).

    @@ -1261,7 +1256,7 @@ feature request).

    -

    Zone de travail

    +

    Canevas

    - The tool controls bar at the top of the document window provides different buttons and controls for each tool. + La barre de contrôle des outil en haut de la fenêtre du document propose différents boutons et contrôles pour l'outil sélectionné.
    - Use these to navigate between fields in the tool controls bar (the value in the field you leave, if changed, is accepted). + À utiliser pour naviguer entre les champs dans la barre de contrôle des outils (la valeur est validée lorsque vous quittez le champ).
    - Valide la nouvelle valeur tapée dans le champ textuel et retourne à l'espace de travail + Valide la valeur saisie dans le champ textuel et rend la main au canevas.
    - annuler les modifications et retourner à l'espace de travail + annuler les modifications et rendre la main au canevas
    - Annule toutes les modifications effectuées dans le champ textuel et passe l'espace de travail au premier plan. + Annule les modifications effectuées dans le champ textuel sélectionné et rend la main au canevas.
    - Annule toutes les modifications effectuées dans le champ textuel, mais reste dans le champ. + Annule les modifications effectuées dans le champ textuel sélectionné en lui laissant la main.
    @@ -1286,7 +1281,7 @@ feature request).

    @@ -1346,7 +1341,7 @@ feature request).

    @@ -1458,7 +1453,7 @@ feature request).

    @@ -1494,7 +1489,7 @@ feature request).

    @@ -1505,7 +1500,7 @@ feature request).

    +flèches @@ -1517,10 +1512,10 @@ feature request).

    @@ -1534,7 +1529,7 @@ feature request).

    +cliquer-glisser avec le bouton droit @@ -1543,13 +1538,13 @@ feature request).

    molette de la souris @@ -1560,13 +1555,13 @@ feature request).

    +molette de la souris @@ -1653,13 +1648,13 @@ feature request).

    @@ -1677,7 +1672,7 @@ feature request).

    @@ -1698,7 +1693,7 @@ feature request).

    @@ -1716,7 +1711,7 @@ feature request).

    @@ -1865,7 +1860,7 @@ feature request).

    +I @@ -1983,7 +1978,7 @@ feature request).

    F11 @@ -2005,7 +2000,7 @@ feature request).

    +F11 @@ -2032,7 +2027,7 @@ feature request).

    Maj +F10, -Clic droit +clic droit @@ -2385,13 +2380,13 @@ feature request).

    @@ -2410,7 +2405,7 @@ feature request).

    @@ -2479,7 +2474,7 @@ feature request).

    @@ -2512,7 +2507,7 @@ feature request).

    @@ -2564,7 +2559,7 @@ feature request).

    @@ -2575,19 +2570,19 @@ feature request).

    +B @@ -2600,13 +2595,13 @@ feature request).

    +B @@ -2627,7 +2622,7 @@ feature request).

    +I @@ -2646,7 +2641,7 @@ feature request).

    +I @@ -2673,7 +2668,7 @@ feature request).

    +G @@ -2805,7 +2800,7 @@ feature request).

    +C @@ -2818,7 +2813,7 @@ feature request).

    +C @@ -2845,7 +2840,7 @@ feature request).

    @@ -2853,7 +2848,7 @@ feature request).

    @@ -2879,7 +2874,7 @@ feature request).

    @@ -2896,7 +2891,7 @@ feature request).

    @@ -2913,7 +2908,7 @@ feature request).

    @@ -2954,7 +2949,7 @@ feature request).

    @@ -2965,7 +2960,7 @@ feature request).

    +( @@ -2982,7 +2977,7 @@ feature request).

    @@ -2993,7 +2988,7 @@ feature request).

    +( @@ -3017,7 +3012,7 @@ feature request).

    +( @@ -3053,7 +3048,7 @@ feature request).

    +J @@ -3066,13 +3061,13 @@ feature request).

    +J @@ -3089,7 +3084,7 @@ feature request).

    @@ -3116,19 +3111,19 @@ feature request).

    @@ -3252,7 +3247,7 @@ feature request).

    @@ -3289,7 +3284,7 @@ feature request).

    @@ -3306,13 +3301,13 @@ feature request).

    @@ -3340,7 +3335,7 @@ feature request).

    @@ -3388,7 +3383,7 @@ feature request).

    @@ -3400,7 +3395,7 @@ feature request).

    @@ -3411,13 +3406,13 @@ feature request).

    +A @@ -3445,13 +3440,13 @@ feature request).

    ! @@ -3556,19 +3551,19 @@ feature request).

    @@ -3656,7 +3651,7 @@ feature request).

    @@ -3673,19 +3668,19 @@ feature request).

    @@ -3713,7 +3708,7 @@ feature request).

    @@ -3734,7 +3729,7 @@ feature request).

    @@ -3822,7 +3817,7 @@ feature request).

    +S @@ -3905,7 +3900,7 @@ feature request).

    @@ -3925,7 +3920,7 @@ feature request).

    > @@ -3935,13 +3930,13 @@ feature request).

    < @@ -4009,7 +4004,7 @@ feature request).

    @@ -4056,13 +4051,13 @@ feature request).

    +cliquer-glisser @@ -4073,7 +4068,7 @@ feature request).

    +cliquer-glisser @@ -4093,13 +4088,13 @@ feature request).

    ] @@ -4251,7 +4246,7 @@ feature request).

    @@ -4261,7 +4256,7 @@ feature request).

    -

    Outil Nœud

    +

    Outil Nœuds

    - - + − dézoomer @@ -1295,16 +1290,16 @@ feature request).

    - Les touches + et - du clavier numérique modifient le niveau de zoom même lorsque vous éditez du texte, sauf sur VerrNum est actif. + Les touches + et − du pavé numérique modifient le niveau de zoom même lorsque vous éditez du texte si VerrNum est inactif.
    - Clic central, + clic milieu, Ctrl - +Clic droit + +clic droit zoomer @@ -1315,10 +1310,10 @@ feature request).

    		 Maj - +Clic central, + +clic milieu, Maj - +Clic droit + +clic droit dézoomer @@ -1338,7 +1333,7 @@ feature request).

    - Lorsque l'option « La molette de la souris zoome par défaut » est activée dans les préférences, la combinaison Ctrl+molette fait défiler l'espace de travail. Pour zoomer, utiliser dans ce cas la molette sans la touche Ctrl. + Lorsque l'option « La molette de la souris zoome par défaut » est activée dans les préférences, la combinaison Ctrl+molette fait défiler le canevas. Pour zoomer, utiliser dans ce cas la molette sans la touche Ctrl.
    Maj - +cliquer-glisser avec le bouton central + +cliquer-glisser bouton du milieu zoomer sur la zone @@ -1381,7 +1376,7 @@ feature request).

    - Zoom sur la sélection, ou à défaut double le facteur de zoom, jusqu'à ce que la touche soit relâchée. + Zoome sur la sélection, ou à défaut double le facteur de zoom, et rétablit le zoom précédent lorsque la touche est relâchée.

    - Historique du zoom

    + Historique des zooms

    - Faire défiler (déplacer)

    + Défilement (déplacement sur le canevas)
    - faire défiler l'espace de travail + faire défiler le canevas
    - cliquer-glisser avec le bouton central + cliquer-glisser bouton du milieu - déplacer la zone de travail + déplacer le canevas
    - déplacer la zone de travail + déplacer le canevas
    - faire défiler la zone de travail verticalement + faire défiler le canevas verticalement
    - Lorsque l'option « La molette de la souris zoome par défaut » est activée dans les préférences, la molette modifie le niveau de zoom. Pour faire défiler l'espace de travail, utiliser dans ce cas la combinaison Ctrl+molette. + Lorsque l'option « La molette de la souris zoome par défaut » est activée dans les préférences, la molette modifie le niveau de zoom. Pour faire défiler le canevas, utiliser dans ce cas la combinaison Ctrl+molette.
    - faire défiler la zone de travail horizontalement + faire défiler le canevas horizontalement
    - Lorsque l'option « Le bouton gauche de la souris fait défiler horizontalement quant la touche Espace est pressée » est activée dans les préférences, Espace+déplacer avec la souris déplace également la zone de travail. + Lorsque l'option « Le bouton gauche de la souris fait défiler quand la touche Espace est enfoncée » est activée dans les préférences, Espace+cliquer-glisser avec la souris déplace également le canevas.
    - For activating / deactivating snapping to guides, use the snap bar or the global snapping toggle (% key). + Pour activer/désactiver le magnétisme des guides, utilisez la barre de contrôle du magnétisme ou le commutateur global (touche %).
    - When you create a new guide by dragging off the ruler, guide visibility is automatically turned on. + Lorsqu'un nouveau guide est créé avec un cliquer-glisser à partir d'une règle, l'affichage des guides est automatiquement activé.
    - For activating / deactivating snapping to grids, use the snap bar or the global snapping toggle (% key). + Pour activer/désactiver le magnétisme des grilles, utilisez la barre de contrôle du magnétisme ou le commutateur global (touche %).
    - This toggle affects snapping to grids, guides, and objects in all tools. The settings in the snap bar determine which snap targets and snapping points will snap. + Ce commutateur affecte le magnétisme aux grilles, aux guides et aux objets avec tous les outils. Les réglages de la barre de contrôle du magnétisme déterminent quelles cibles vont aimanter et quels points vont s'aimanter.
    Ctrl - +touche 5 du clavier numérique + +touche 5 du pavé numérique alterner le mode entre normal/sans filtre/contour @@ -1763,7 +1758,7 @@ feature request).

    - Clic droit + clic droit ouvrir le menu contextuel @@ -1854,7 +1849,7 @@ feature request).

    +E     		- exporter un bitmap + exporter au format PNG
    - importer un bitmap ou un fichier vectoriel + importer une image matricielle ou vectorielle
    - basculer en mode plein écran + passer en plein écran
    - afficher ou cacher les barres d'outils et basculer le mode plein écran + afficher ou cacher les barres d'outils et passer en plein écran
    menu contextuel @@ -2239,7 +2234,7 @@ feature request).

    - Ces commandes déplacent le calque courant parmi les autres calques. + Ces commandes déplacent le calque actif parmi les autres calques.
    - Positionne les objets du presse-papiers sous le curseur de la souris, ou, si la souris est en dehors de l'espace de travail, au milieu de la fenêtre. + Positionne les objets du presse-papiers sous le curseur de la souris, ou, si la souris est en dehors du canevas, au milieu de la fenêtre.
    - Lorsque le texte est édité avec l'outil Texte, cette action colle le texte contenu dans le presse-papiers dans l'objet texte courant. + Lorsque le texte est édité avec l'outil Texte, cette action colle le texte contenu dans le presse-papiers dans l'objet texte actif.
    - Place les objets contenus dans le presse-papiers à l'emplacement d'origine d'où ils ont été copiés. + Place les objets contenus dans le presse-papiers à l'emplacement où ils ont été originellement copiés.
    - Les objets nouvellement créés sont placés exactement au dessus des originaux puis sélectionnés. + Les objets nouvellement créés sont placés exactement au-dessus des originaux puis sélectionnés.
    - Le clone est positionné exactement au dessus de l'objet original et est sélectionné. + Le clone est positionné exactement au-dessus de l'objet original et est sélectionné.

    - Bitmaps

    + Corps matriciels
    - faire une copie bitmap + créer une copie matricielle
    - This exports the selected object(s) (all other objects hidden) as PNG in the document's directory and imports it back as embedded bitmap. + Exporte le(s) objet(s) sélectionné(s) (tous les autres sont cachés) en PNG dans le dossier du document et réimporte le résultat en tant qu'objet matriciel incorporé.
    - Le bitmap importé est positionné au dessus de la sélection originale et est sélectionné. + L'objet matriciel importé est positionné au-dessus de la sélection originale et est sélectionné.
    - vectoriser le bitmap + vectoriser un objet matriciel
    - Ouvre la boîte de dialogue Vectoriser le bitmap pour convertir une image matricielle en chemins. + Ouvre la boîte de dialogue Vectoriser un objet matriciel pour convertir une image matricielle en chemins.
    - objets en motif + objet(s) en motif
    - motif en objects + motif en objet(s)
    - objets en guides + objet(s) en guide(s)
    - convertir les objets sélectionnés en chemin + convertir le(s) objet(s) sélectionné(s) en chemin
    - convertir les contours des objets sélectionnés en chemin + convertir les contours en chemin
    - Union combine n'importe quel nombre d'objets en un chemin unique, en supprimant les superpositions. + L'union combine n'importe quel nombre d'objets en un chemin unique, en supprimant les superpositions.
    Ctrl - +- + +− différence @@ -2862,7 +2857,7 @@ feature request).

    - Différence fonctionne avec deux objects, et extrait l'objet supérieur (dans le plan) de l'objet inférieur. + La différence fonctionne avec deux objets, et extrait l'objet supérieur (dans le plan) de l'objet inférieur.
    - Intersection crée un chemin représentant la partie commune (superposition) des objets sélectionnés. + L'intersection crée un chemin représentant la partie commune (superposition) des objets sélectionnés.
    - Exclusion est équivalent à union, excepté qu'il fonctionne sur deux objets et supprime les zones pour lesquelles les objets se superposent. + L'exclusion est similaire à l'union, mais elle fonctionne avec seulement deux objets et supprime les zones sur lesquelles les objets se superposent.
    - Division découpe l'objet inférieur (dans le plan) en morceaux en fonction de la forme de l'objet supérieur, tout en conservant le fond et le contour de l'objet inférieur. + La division découpe l'objet inférieur (dans le plan) en morceaux en fonction de la forme de l'objet supérieur, tout en conservant le fond et le contour de l'objet inférieur.

    - Offsets

    + Décalages
    - contracter le chemin (vers le centre) + éroder le chemin (vers le centre)
    - La distance de décalage par défaut est de 2 pixels (unités de pixel SVG, et non pas pixels d'écran). + La distance de décalage par défaut est de 2 px (unités de pixel SVG, et non pas pixels d'écran).
    - contracter le chemin d'un pixel + érodel le chemin d'1 pixel
    - contracter le chemin de 10 pixels + éroder le chemin de 10 pixels
    - créer un offset dynamique + créer un décalage dynamique
    - créer un offset lié + créer un décalage lié
    - Ces commandes produisent un objet de type offset indépendant ou lié à l'original, et éditable avec l'outil Nœud. + Ces commandes produisent un objet de décalage indépendant ou lié à l'original, et éditable avec l'outil Nœuds.
    - Appliquer cette commande sur un offset lié provoque la sélection du chemin d'où il est issu. + Appliquer cette commande sur un décalage lié provoque la sélection du chemin dont il est issu.
    - La différence avec la commande grouper est que la combinaison crée un objet unique. + La différence avec le groupage est que la combinaison crée un objet unique.
    - Cette commande est différente de la commande Union dans la mesure ou les zones superposées ne sont pas affectées. + Cette commande diffère de l'union dans la mesure ou les zones superposées ne sont pas affectées.
    - La façon dont les zones superposées sont replies est contrôlée par la règle de remplissage (avec ou sans lacune) définie dans la boîte de dialogue Fond et contour. + La façon dont les zones superposées sont remplies est contrôlée par la règle du Fond (avec ou sans lacune) définie dans la boîte de dialogue Fond et contour.
    - Sur les chemins, double-cliquer active l'outil Nœud, sur le texte, l'outil Texte, et sur les formes, l'outil correspondant à la forme. + Sur les chemins, double-cliquer active l'outil Nœuds ; sur les formes, l'outil de forme correspondant ; sur le texte, l'outil Texte.
    - Cliquer-glisser au-dessus des objets provoque leur sélection, ainsi que la désélection des objets précédemment sélectionnés. + Cliquer-glisser autour des objets effectue une sélection par rectangle ; la sélection précédente est désélectionnée.
    - En général, le départ de la sélection s'effectue sur une zone vide de l'espace de travail. + En général, le rectangle de sélection doit partir d'une zone vide du canevas.
    - Cependant, si vous appuyez sur Maj avant de cliquer-glisser, Inkscape effectuera la sélection même si vous démarrez sur un objet. + Cependant, si vous appuyez sur Maj avant de cliquer-glisser, la sélection par rectangle fonctionnera même si vous démarrez sur un objet.
    - Pour démarrer la sélection par le toucher lorsqu'un objet est déjà sélectionné, utilisez la combinaison Maj+Alt. + Pour démarrer la sélection par le toucher avec Alt, rien ne doit être sélectionné ; sinon, utilisez Maj+Alt.
    - Sauf réorganisation manuelle, le dernier objet créé est toujours au dessus. + Sauf réorganisation manuelle, le dernier objet créé est toujours au-dessus.
    - Fonctionne sur les objets du calque courant (sauf si les préférences ont été modifiées). + Fonctionne sur les objets du calque actif (sauf si les préférences ont été modifiées).
    - sélectionner tout (calque courant) + sélectionner tout (calque actif)
    - Fonctionne sur les objets du calque courant (sauf si les préférences ont été modifiées). + Fonctionne sur les objets du calque actif (sauf si les préférences ont été modifiées).
    - inverser la sélection (calque courant) + inverser la sélection (calque actif)
    - Inverse la sélection (désélectionne ce qui était sélectionné et inversement) dans le calque courant. + Inverse la sélection (désélectionne ce qui était sélectionné et inversement) dans le calque actif.
    - Avec GNU/Linux, Alt+clic et Alt+cliquer-glisser peuvent être réservés au gestionnaire de fenêtre. Reconfigurez ce dernier si vous souhaitez utiliser ces raccourcis avec Inkscape. + Sous GNU/Linux, Alt+clic et Alt+cliquer-glisser peuvent être réservés par le gestionnaire de fenêtres. Reconfigurez ce dernier si vous souhaitez utiliser ces raccourcis avec Inkscape.
    - Si votre clavier possède une touche Meta, vous pouvez éventuellement la choisir comme touche modificatrice à la place de Alt. + Si votre clavier possède une touche Méta, vous pouvez éventuellement la configurer comme touche modificatrice à la place de Alt.
    - Vous pouvez parfois utiliser également Ctrl+Alt+clic (sélectionner dessous dans des groupes) avec le même effet que Alt+clic. + Vous pouvez parfois utiliser également Ctrl+Alt+clic (sélectionner en dessous dans des groupes) avec le même effet que Alt+clic.
    - Cliquer-glisser un objet sélectionne l'objet (dans le cas ou il n'était pas sélectionné) puis déplace la sélection. + Cliquer-glisser un objet sélectionne l'objet s'il n'était pas déjà sélectionné, puis déplace la sélection.
    - Alt+cliquer-glisser déplace la sélection en cours (sans sélectionner ce qui est sous le curseur), quelque soit l'endroit ou l'opération est initiée. + Alt+cliquer-glisser déplace la sélection actuelle (sans sélectionner ce qui est sous le curseur), quel que soit l'endroit ou l'opération est initiée.
    - Avec GNU/Linux, Alt+clic et Alt+cliquer-glisser peuvent être réservés au gestionnaire de fenêtre. Reconfigurez ce dernier si vous souhaitez utiliser ces raccourcis avec Inkscape. + Sous GNU/Linux, Alt+clic et Alt+cliquer-glisser peuvent être réservés par le gestionnaire de fenêtres. Reconfigurez ce dernier si vous souhaitez utiliser ces raccourcis avec Inkscape.
    - Si votre clavier possède une touche Meta, vous pouvez éventuellement la choisir comme touche modificatrice à la place de Alt. + Si votre clavier possède une touche Méta, vous pouvez éventuellement la configurer comme touche modificatrice à la place de Alt.
    - This temporarily disables snapping when you are dragging with snapping activated. + Désactive temporairement le magnétisme lorsque vous déplacez une sélection avec le magnétisme activé.
    - Vous pouvez maintenir la barre d'Espace pendant le déplacement pour obtenir une jolie trainée. + Vous pouvez maintenir la barre Espace pendant le déplacement pour obtenir une jolie traînée.
    - basculer les poignées en mode redimensionnement ou en mode rotation + échanger les poignées entre redimensionnement et rotation
    - Maintenir Alt pendant le redimensionnement pour limiter celui-ci à un rapport entier (de 2, 3, 4, etc. lors d'une agrandissement, ou 1/2, 1/3, 1/4, etc. pour un rétrécissement) de la taille initiale. + Maintenir Alt pendant le redimensionnement pour le contraindre à un rapport entier (de 2, 3, 4, etc. lors d'un agrandissement, ou 1÷2, 1÷3, 1÷4, etc. pour un rétrécissement) de la taille initiale.
    - redimensionner la sélection en ajoutant un pas + redimensionner la sélection en ajoutant un incrément
    - redimensionner la sélection en retirant un pas + redimensionner la sélection en retirant un incrément
    - Le pas de redimensionnement par défaut est de 2 pixels (unités de pixel SVG, et non pas pixels d'écran). + L'incrément de redimensionnement par défaut est de 2 pixels (unités de pixel SVG, et non pas pixels d'écran).
    - The default size increment is added to (or subtracted from) either the selection's height or width, whichever one is larger. Scaling is done around the center of the selection's bounding box and keeps the proportions of the selected object(s). + L'incrément de taille par défaut est ajouté (ou retiré) soit à la hauteur soit à la largeur de la sélection, en fonction du plus important. Une mise à l'échelle est effectuée autour du centre de la boîte englobante de la sélection et préserve les proportions du ou des objet(s) sélectionné(s).
    - tourner par incrément + tourner par incréments
    - Maintenir Ctrl pendant l'utilisation d'une poignée de rotation (dans les coins) contraint l'angle de rotation au pas d'angle (15 degrés par défaut). + Maintenir Ctrl pendant l'utilisation d'une poignée de rotation (dans les coins) contraint l'angle de rotation à l'incrément d'angle (15 degrés par défaut).
    - rotate around opposite corner + tourner autour du coin opposé
    - tourner la sélection d'un angle défini + tourner la sélection par incréments
    - Le pas d'angle est de 15 degrés par défaut. ] provoque un rotation horaire, [ une rotation anti-horaire. + L'incrément d'angle est de 15 degrés par défaut. ] provoque un rotation horaire, [ une rotation anti-horaire.
    - L'utilisation de la touche Échap pendant que le bouton de la souris est encore en action annule la sélection par cliquer-glisser, le déplacement ou les transformations en cours. + Appuyer sur Échap pendant que le bouton de la souris est encore en action annule la sélection par cliquer-glisser, le déplacement ou les transformations en cours.
    @@ -4358,7 +4353,7 @@ feature request).

    @@ -4375,7 +4370,7 @@ feature request).

    @@ -4415,7 +4410,7 @@ feature request).

    @@ -4432,7 +4427,7 @@ feature request).

    @@ -4611,13 +4606,13 @@ feature request).

    @@ -4672,13 +4667,13 @@ feature request).

    @@ -4727,7 +4722,7 @@ feature request).

    @@ -4744,7 +4739,7 @@ feature request).

    @@ -4775,7 +4770,7 @@ feature request).

    flèches @@ -4786,7 +4781,7 @@ feature request).

    +flèches @@ -4858,7 +4853,7 @@ feature request).

    @@ -4929,7 +4924,7 @@ feature request).

    @@ -5023,7 +5018,7 @@ feature request).

    @@ -5109,7 +5104,7 @@ feature request).

    @@ -5121,7 +5116,7 @@ feature request).

    @@ -5147,7 +5142,7 @@ feature request).

    @@ -5187,7 +5182,7 @@ feature request).

    @@ -5225,7 +5220,7 @@ feature request).

    @@ -5255,7 +5250,7 @@ feature request).

    @@ -5406,7 +5401,7 @@ feature request).

    +clic @@ -5599,7 +5594,7 @@ feature request).

    @@ -5639,13 +5634,13 @@ feature request).

    @@ -5661,7 +5656,7 @@ feature request).

    @@ -5736,7 +5731,7 @@ feature request).

    +cliquer-glisser @@ -5749,7 +5744,7 @@ feature request).

    +cliquer-glisser @@ -6086,7 +6081,7 @@ feature request).

    +cliquer-glisser @@ -6097,13 +6092,13 @@ feature request).

    +cliquer-glisser @@ -6147,7 +6142,7 @@ feature request).

    @@ -6519,13 +6514,13 @@ feature request).

    ] @@ -6620,7 +6615,7 @@ feature request).

    @@ -6646,7 +6641,7 @@ feature request).

    @@ -6802,7 +6797,7 @@ feature request).

    @@ -6858,7 +6853,7 @@ feature request).

    @@ -7042,7 +7037,7 @@ feature request).

    @@ -7194,7 +7189,7 @@ feature request).

    @@ -7245,7 +7240,7 @@ feature request).

    @@ -7283,7 +7278,7 @@ feature request).

    @@ -7300,7 +7295,7 @@ feature request).

    @@ -7320,7 +7315,7 @@ feature request).

    clic @@ -7347,7 +7342,7 @@ feature request).

    @@ -7467,7 +7462,7 @@ feature request).

    @@ -7560,13 +7555,13 @@ feature request).

    @@ -7621,7 +7616,7 @@ feature request).

    @@ -7666,16 +7661,16 @@ feature request).

    Entrée @@ -7684,13 +7679,13 @@ feature request).

    double-clic @@ -7712,7 +7707,7 @@ feature request).

    +Z @@ -7976,7 +7971,7 @@ feature request).

    @@ -7986,7 +7981,7 @@ feature request).

    @@ -8145,7 +8140,7 @@ feature request).

    @@ -8183,13 +8178,13 @@ feature request).

    @@ -8444,7 +8439,7 @@ feature request).

    @@ -8776,7 +8771,7 @@ feature request).

    -

    Remplissage au seau

    +

    Pot de peinture

    - Cliquer sur le segment d'un chemin sélectionné sélectionne les deux nœuds les plus proches du point où a été effectuée l'action. + Cliquer sur le segment d'un chemin sélectionné sélectionne les deux nœuds les plus proches du point où l'action a été effectuée.
    - Ajoute ou supprime un nœud (en cliquant sur un nœud) ou deux (en cliquant sur le chemin) des nœuds sélectionnés. + Ajoute ou supprime un nœud (en cliquant sur un nœud) ou deux (en cliquant sur le chemin) des nœuds sélectionnés.
    - Cliquer-glisser au-dessus des nœuds provoque leur sélection, ainsi que la désélection des nœuds précédemment sélectionnés. + Cliquer-glisser autour des nœuds effectue une sélection par rectangle ; la sélection de nœuds précédente est désélectionnée.
    - En général, le point de départ d'une sélection par cliquer-glisser ne doit pas être situé au dessus d'un chemin ou d'un nœud. + En général, le point de départ d'une sélection par cliquer-glisser ne doit pas être situé au-dessus d'un chemin ou d'un nœud.
    - Le curseur doit être positionné au dessus d'un nœud pour étendre ou restreindre. + Le curseur doit être positionné au-dessus d'un nœud pour étendre ou restreindre.
    - Each key press or turn of the mouse wheel selects the nearest unselected node or deselects the farthest selected node. + Chaque pression de touche ou rotation de la molette de la souris sélectionne le nœud non sélectionné le plus proche ou désélectionne le nœud sélectionné le plus éloigné.
    - This restricts movement to the directions of the node's handles, their counter directions and perpendiculars (total 8 snaps). + Bloque le mouvement dans les directions des poignées du nœud, ainsi que les directions opposées et perpendiculaires (8 directions au total).
    - Si le nœud est consécutif à une ligne droite (sur un ou deux côtés), la contrainte s'applique aux directions et aux perpendiculaires de cette ligne. + Si le nœud est consécutif à une ligne droite (sur un ou deux côtés), ce sont ses directions et les perpendiculaires qui sont utilisées.
    - Vous pouvez maintenir la barre d'Espace pendant le déplacement pour obtenir une jolie trainée. + Vous pouvez maintenir la barre Espace pendant le déplacement pour obtenir une jolie traînée.
    - Sclupter déplace les nœuds sélectionnés de façon à ce que les nœuds étirés suivent la souris, les plus éloignés restant immobiles. Tous les nœuds intermédiaires sélectionnés se déplacent en fonction de leur distance du curseur, en formant une courbe en forme de cloche. + Sculpter déplace les nœuds sélectionnés de façon à ce que les nœuds étirés suivent la souris, les plus éloignés restant immobiles. Tous les nœuds intermédiaires sélectionnés se déplacent en fonction de leur distance au curseur, en formant une courbe en forme de cloche.
    - déplacer les nœuds sélectionnés d'un pas + déplacer les nœuds sélectionnés d'un pas
    - déplacer les nœuds sélectionnés de 10 pas + déplacer les nœuds sélectionnés de 10 pas
    - The default angle step is 15 degrees. This also snaps to the handle's original angle, its counter direction and perpendiculars. + L'incrément d'angle est de 15 degrés par défaut. Contraint également à l'angle original de la poignée, la direction opposée et ses perpendiculaires.
    - Le redimensionnement pas défaut est de 2 pixels (unités de pixel SVG, et non pas pixels d'écran). Peut s'appliquer à plus d'un nœud. + Le redimensionnement par défaut est de 2 pixels (unités de pixel SVG, et non pas pixels d'écran). Peut s'appliquer à plus d'un nœud.
    - Le pas d'angle pas défaut est de 15 degrés. ] tourne dans le sens horaire, [ dans le sens anti-horaire. Peut s'appliquer à plus d'un nœud. + Le pas d'angle par défaut est de 15 degrés. ] tourne dans le sens horaire, [ dans le sens anti-horaire. Peut s'appliquer à plus d'un nœud.

    - Redimensionner les nœuds (plus d'un nœud dans la sélection)

    + Redimensionner les nœuds (plus d'un nœud dans la sélection)
    - Si la souris est au dessus d'un nœud, ce nœud devient l'axe de redimensionnement. Sinon, le redimensionnement s'effectue par rapport au centre géométrique des nœuds sélectionnés. + Si la souris est au-dessus d'un nœud, ce nœud devient l'axe de redimensionnement. Sinon, le redimensionnement s'effectue par rapport au centre géométrique des nœuds sélectionnés.
    - Le pas de redimensionnement par défaut est de 2 pixels (unités de pixel SVG, et non pas pixels d'écran). + L'incrément de redimensionnement par défaut est de 2 pixels (unités de pixel SVG, et non pas pixels d'écran).
    - The default size increment is added to (or subtracted from) either the node selection's height or width, whichever one is larger. Scaling keeps the proportions of the node selection. + L'incrément de taille par défaut est ajouté (ou retiré) soit à la hauteur soit à la largeur de la sélection de nœuds, en fonction du plus grand. La mise à l'échelle préserve les proportions de la sélection de nœuds.
    - Le pas d'angle est de 15 degrés par défaut. ] provoque un rotation horaire, [ une rotation anti-horaire. + L'incrément d'angle est de 15 degrés par défaut. ] provoque un rotation horaire, [ une rotation anti-horaire.

    - Retourner les nœuds (plus d'un nœud dans la sélection)

    + Retourner les nœuds (plus d'un nœud dans la sélection)
    - basculer en mode doux, dur, symétrique ou automatique + passer en mode doux, dur, symétrique ou automatique
    - Les nouveaux nœuds sont créés sur le même chemin, sont positionnés exactement au dessus des anciens nœuds, puis sont sélectionnés. + Les nouveaux nœuds sont créés sur le même chemin, sont positionnés exactement au-dessus des anciens nœuds, puis sont sélectionnés.
    - L'outil Nœud peut également manipuler les poignées des formes (rectangles, ellipses, étoiles et spirales). Cliquer sur la forme pour la sélectionner. + L'outil Nœuds peut également manipuler les poignées des formes (rectangles, ellipses, étoiles et spirales). Cliquer sur une forme pour la sélectionner.
    - Référez-vous aux outils de forme pour en savoir plus sur leurs raccourcis spécifiques (tous fonctionnent également avec l'outil Nœud). + Référez-vous aux outils de forme pour en savoir plus sur leurs raccourcis spécifiques (tous fonctionnent également avec l'outil Nœuds).
    - L'outil Nœud peut également éditer les poignées des remplissages par motif et par dégradé, ainsi que les poignées éditables des effets de chemin. + L'outil Nœuds peut également éditer les poignées des remplissages par motif et par dégradé, ainsi que les poignées éditables des effets de chemin.
    - basculer temporairement en mode rétrécissement + passer temporairement en mode rétrécissement
    - basculer temporairement en mode élargissement + passer temporairement en mode élargissement
    - set base of angle measurement to cursor position + définir la base de la mesure de l'angle à la position du curseur
    - contraindre la mesure d'angle au pas d'angle + contraindre la mesure d'angle à l'incrément d'angle
    - Le pas d'angle est de 15 degrés par défaut. + L'incrément d'angle est de 15 degrés par défaut.
    - This restricts width/height ratio or its inverse to a whole number or the golden ratio. + Contraint l'ellipse de sorte que le rapport hauteur÷largeur ou son inverse soit un nombre entier ou le nombre d'or.
    - tourner les LP de l'axe X (dans le cas où elles sont parallèles) d'un pas d'angle + tourner les LP de l'axe X (dans le cas où elles sont parallèles) d'un incrément d'angle
    - Le pas d'angle pas défaut est de 15 degrés. ], ) et } tournent dans le sens horaire, [, ( et { dans le sens anti-horaire. + L'incrément d'angle par défaut est de 15 degrés. ], ) et } tournent dans le sens horaire, [, ( et { dans le sens anti-horaire.
    - Avec la touche Alt maintenue, l'ellipse est aggrandie de façon à ce que sa circonférence passe par ces deux points (Ctrl+Alt est un cas spécifique abordé plus bas). + Avec la touche Alt maintenue, l'ellipse est agrandie de façon à ce que sa circonférence passe par ces deux points (Ctrl+Alt est un cas spécifique abordé plus bas).
    - This restricts width/height ratio or its inverse to a whole number or the golden ratio. + Contraint l'ellipse de sorte que le rapport hauteur÷largeur ou son inverse soit un nombre entier ou le nombre d'or.
    - Le pas d'angle est de 15 degrés par défaut. + L'incrément d'angle est de 15 degrés par défaut.
    - Le pas d'angle est de 15 degrés par défaut. + L'incrément d'angle est de 15 degrés par défaut.
    - Le pas d'angle est de 15 degrés par défaut. + L'incrément d'angle est de 15 degrés par défaut.
    - Déplacer la poignée extérieure ajuste le paramètre « Tours ». + Déplacer la poignée extérieure ajuste le paramètre « Tours ».
    - Le pas d'angle est de 15 degrés par défaut. Fonctionne pour les deux poignées. + L'incrément d'angle est de 15 degrés par défaut. Fonctionne pour les deux poignées.
    - If a path is selected, Shift+dragging from anywhere starts a new subpath instead of a new independent path. + Si un chemin est sélectionné, le raccourci Maj+cliquer-glisser crée un nouveau sous-chemin au lieu d'un nouveau chemin indépendant.
    - This temporarily disables snapping when you are dragging with snapping activated. + Désactive temporairement le magnétisme lorsque vous déplacez une sélection avec le magnétisme activé.
    - start a straight path (finish with another click) + créer un chemin droit (terminer avec un autre clic)
    - Crée des petits cercles dont la taille (relative à l'épaisseur de coutour courante) peut être définie dans les préférences. + Crée des petits cercles dont la taille (relative à l'épaisseur de contour en cours) peut être définie dans les préférences.
    - Le pas d'angle est de 15 degrés par défaut. + L'incrément d'angle est de 15 degrés par défaut.
    - contraindre le dernier segment au pas d'angle + contraindre le dernier segment à l'incrément d'angle
    - Contraint l'angle du nouveau nœud au pas d'angle (15 degrés par défaut) par rapport au nœud précédent. + Contraint l'angle du nouveau nœud à l'incrément d'angle (15 degrés par défaut) par rapport au nœud précédent.
    - Crée des petits cercles dont la taille (relative à l'épaisseur de coutour courante) peut être définie dans les préférences. + Crée des petits cercles dont la taille (relative à l'épaisseur de contour en cours) peut être définie dans les préférences.
    - terminer le chemin courant + terminer le chemin en cours
    - Clic droit + clic droit - terminer le chemin courant + terminer le chemin en cours
    - terminer le chemin courant + terminer le chemin en cours
    - Enter or right click finish the current line, discarding the last unfinished (red) segment. Double left click finishes the current line where double-clicked. + La touche Entrée et le clic droit terminent la ligne en cours, annulant le dernier segment inachevé (visualisé en rouge). Un double-clic du bouton gauche achève la ligne en cours à l'emplacement du curseur.
    - annuler la ligne courante + annuler la ligne en cours
    - All these commands cancel current text selection, if any. Use them with Shift to add to / subtract from selection instead. + Toutes ces commandes annulent la sélection de texte actuelle. Utilisez-les avec Maj pour ajouter/retirer à la sélection à la place.

    - Cadre de texte (interne)

    + Texte encadré (cadre interne)
    - Pour saisir les caractères + et -, utilisez le clavier principal. Les touches + et - du clavier numérique sont réservées au zoom (sauf si la touche VerrNum est activée). + Pour saisir les caractères + et −, utilisez le clavier principal. Les touches + et − du pavé numérique sont réservées au zoom (sauf si la touche VerrNum est activée).
    - Par exemple, Ctrl+U 2 0 1 4 crée un tiret cadratin , et Ctrl+U a 9 un symbole copyright. + Par exemple, Ctrl+U 2 0 1 4 Entrée crée un tiret cadratin « — » ; Ctrl+U a 9 Entrée un symbole copyright « © ».
    - Pour rester en mode Unicode après l'insertion d'un caractère, utiliser la touche Espace à la place d'Entrée. + Pour rester en mode Unicode après l'insertion d'un caractère, utiliser la barre Espace à la place d'Entrée.
    - Ces commandes (disponibles uniquement lors de l'édition du texte) ajustent l'interlettrage dans la lignes courante (texte normal) ou dans le paragraphe (texte encadré). + Ces commandes (disponibles uniquement lors de l'édition du texte) ajustent l'interlettrage dans la ligne actuelle (texte normal) ou dans le paragraphe (texte encadré).
    @@ -9127,7 +9122,7 @@ feature request).

    @@ -9189,7 +9184,7 @@ feature request).

    @@ -9348,7 +9343,7 @@ feature request).

    diff --git a/po/fr.po b/po/fr.po index 8f0559eb1..cb4a1fbc9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -12,7 +12,7 @@ # Jonathan Ernst , 2006. # Florent Becker # Sophie Gousset -# Nicolas Dufour , 2008-2015. +# Nicolas Dufour , 2008-2016. # Sylvain Chiron , 2016. # msgid "" @@ -13865,7 +13865,8 @@ msgstr "" " Jonathan Ernst (jonathan@ernstfamily.ch)\n" " Florent Becker (florent.becker@ens-lyon.org)\n" " Sophie Gousset (contact@sophieweb.com)\n" -" Nicolas Dufour (nicoduf@yahoo.fr)" +" Nicolas Dufour (nicoduf@yahoo.fr)\n" +" Sylvain Chiron (chironsylvain@orange.fr)" #: ../src/ui/dialog/align-and-distribute.cpp:206 #: ../src/ui/dialog/align-and-distribute.cpp:937 diff --git a/share/tutorials/tutorial-advanced.fr.svg b/share/tutorials/tutorial-advanced.fr.svg index 695d40790..2608d48d1 100644 --- a/share/tutorials/tutorial-advanced.fr.svg +++ b/share/tutorials/tutorial-advanced.fr.svg @@ -43,7 +43,7 @@ ::AVANCÉ -bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net + @@ -87,7 +87,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - Coller les dimensions change l'échelle de la sélection entière jusqu'à l'obtention de la taille du ou des objets du presse-papiers. Coller la largeur/Coller la hauteur change l'échelle de la sélection entière horizontalement/verticalement afin d'obtenir la même largeur/hauteur que le ou les objets du presse-papiers. Ces commandes respectent le verrou des proportions sur la barre de contrôle de l'outil Sélection (entre les champs L et H), de sorte que lorsque le verrou est actif, l'autre dimension de l'objet sélectionné soit transformée dans les mêmes proportions ; dans le cas contraire, l'autre dimension ne sera pas modifiée. Les commandes contenant « séparément » fonctionnent de la même façon que les commandes précédemment décrites, à l'exception près que chaque objet sélectionné change d'échelle séparément, afin que chacun ait la taille/largeur/hauteur du ou des objets du presse-papiers. + Coller les dimensions change l'échelle de la sélection entière jusqu'à l'obtention de la taille du ou des objets du presse-papiers. Coller la largeur/Coller la hauteur change l'échelle de la sélection entière horizontalement/verticalement afin d'obtenir la même largeur/hauteur que le ou les objets du presse-papiers. Ces commandes respectent le verrou des proportions sur la barre de contrôle de l'outil Sélecteur (entre les champs L et H), de sorte que lorsque le verrou est actif, l'autre dimension de l'objet sélectionné soit transformée dans les mêmes proportions ; dans le cas contraire, l'autre dimension ne sera pas modifiée. Les commandes contenant « séparément » fonctionnent de la même façon que les commandes précédemment décrites, à l'exception près que chaque objet sélectionné change d'échelle séparément, afin que chacun ait la taille/largeur/hauteur du ou des objets du presse-papiers. @@ -136,7 +136,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - Avec l'outil stylo, chaque clic crée un nœud dur sans poignée d'incurvation, et donc une série de clics produit une séquence de segments de droite. Cliquer-déplacer crée un nœud de Bézier doux, avec deux poignées de contrôles colinéaires opposées. Appuyez sur Maj tout en déplaçant une poignée de contrôle pour la faire tourner en gardant l'autre fixe. Comme d'habitude, Ctrl limite la modification de la direction d'un segment ou des poignées de contrôle par incréments de 15 degrés. Appuyer sur Entrée finalise le tracé, Échap l'annule. Pour annuler uniquement le dernier segment d'une ligne non finalisée, appuyez sur Retour arrière. + Avec l'outil stylo, chaque clic crée un nœud dur sans poignée d'incurvation, et donc une série de clics produit une séquence de segments de droite. Cliquer-glisser crée un nœud de Bézier doux, avec deux poignées de contrôles colinéaires opposées. Appuyez sur Maj tout en déplaçant une poignée de contrôle pour la faire tourner en gardant l'autre fixe. Comme d'habitude, Ctrl limite la modification de la direction d'un segment ou des poignées de contrôle par incréments de 15 degrés. Appuyer sur Entrée finalise le tracé, Échap l'annule. Pour annuler uniquement le dernier segment d'une ligne non finalisée, appuyez sur Retour arrière. @@ -189,7 +189,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - Vous pouvez aussi rétracter les poignées de contrôle d'un nœud en effectuant un Ctrl+clic sur ce dernier. Si deux nœuds adjacents ont leurs poignées rétractées, le chemin entre ces deux nœuds devient un segment de droite. Pour faire ressortir les poignées rétractées d'un nœud, effectuer un Maj+déplacer depuis ce nœud. + Vous pouvez aussi rétracter les poignées de contrôle d'un nœud en effectuant un Ctrl+clic sur ce dernier. Si deux nœuds adjacents ont leurs poignées rétractées, le chemin entre ces deux nœuds devient un segment de droite. Pour faire ressortir les poignées rétractées d'un nœud, effectuer un Maj+cliquer-glisser depuis ce nœud. Sous-chemins et combinaisons @@ -305,175 +305,175 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - Inkscape peut étirer et contracter les formes non seulement par une modification de leurs dimensions, mais aussi par morphose du chemin, c'est-à-dire par un déplacement perpendiculaire au chemin en tout point. Les commandes correspondantes sont Éroder (Ctrl+() et Dilater (Ctrl+)). Par exemple, ci-dessous, voyez le chemin original (en rouge) et des érosions et dilatations de celui-ci : + Inkscape peut étirer et contracter les formes non seulement par une modification de leurs dimensions, mais aussi par décalage du chemin, c'est-à-dire par un déplacement perpendiculaire au chemin en tout point. Les commandes correspondantes sont Éroder (Ctrl+() et Dilater (Ctrl+)). Par exemple, ci-dessous, voyez le chemin original (en rouge) et des érosions et dilatations de celui-ci : - - - - - - - - + + + + + + + + - Les commandes Éroder et Dilater brutes produisent des chemins (si nécessaire en convertissant l'objet original en chemin). Une morphose dynamique (Ctrl+J) sera souvent plus pratique : elle crée un objet avec une poignée déplaçable qui contrôle le rayon de morphose. Voyez avec l'objet ci-dessous ; sélectionnez-le et passez en édition de nœuds pour vous faire une idée : + Les commandes Éroder et Dilater brutes produisent des chemins (si nécessaire en convertissant l'objet original en chemin). Un décalage dynamique (Ctrl+J) sera souvent plus pratique : il crée un objet avec une poignée déplaçable qui contrôle le rayon du décalage. Voyez avec l'objet ci-dessous ; sélectionnez-le et passez en édition de nœuds pour vous faire une idée : - - + + - Un tel objet de morphose dynamique garde le chemin d'origine en mémoire, et ainsi ne se « dégrade » pas lorsque vous modifiez la distance de morphose un grand nombre de fois. Quand vous n'avez plus besoin de l'ajuster, vous pouvez toujours le convertir de nouveau en chemin. + Un tel objet de décalage dynamique garde le chemin d'origine en mémoire, et ainsi ne se « dégrade » pas lorsque vous modifiez la distance de décalage un grand nombre de fois. Quand vous n'avez plus besoin de l'ajuster, vous pouvez toujours le convertir de nouveau en chemin. - + - Encore plus pratique : la morphose liée, similaire à une morphose dynamique mais connectée au chemin qui reste éditable. Vous pouvez en créer autant que vous voulez à partir d'un chemin source. Ci-dessous, le chemin source est en rouge, la première morphose liée à celui-ci a un contour noir et pas de fond, l'autre un fond noir et pas de contour. + Encore plus pratique : le décalage lié, similaire à un décalage dynamique mais connecté au chemin qui reste éditable. Vous pouvez en créer autant que vous voulez à partir d'un chemin source. Ci-dessous, le chemin source est en rouge, le premier décalage lié à celui-ci a un contour noir et pas de fond, l'autre un fond noir et pas de contour. - + - Sélectionnez l'objet rouge et éditez ses nœuds ; regardez comment réagissent les deux morphoses liées. Maintenant, sélectionnez une des morphose et déplacez sa poignée pour ajuster le rayon de la morphose. Enfin, observez comment vous pouvez déplacer et transformer les objets de morphose indépendamment sans perdre leur lien avec la source. + Sélectionnez l'objet rouge et éditez ses nœuds ; regardez comment réagissent les deux décalages liés. Maintenant, sélectionnez un des décalages et déplacez sa poignée pour ajuster le rayon du décalage. Enfin, observez comment vous pouvez déplacer et transformer les objets de décalage indépendamment sans perdre leur lien avec la source. - + - - Simplification + + Simplification - + L'usage le plus courant de la commande Simplifier (Ctrl+L) est la réduction du nombre de nœuds d'un chemin tout en préservant au maximum son aspect. Cela peut être utile pour les chemins tracés à main levée car cet outil crée parfois plus de nœuds que nécessaire. Ci-dessous, le dessin de gauche a été créé à main levée et celui de droite est une copie qui a été quelque peu simplifiée. Le chemin original comporte 28 nœuds, tandis que le simplifié n'en a que 17 (et est donc bien plus facile à retravailler avec l'outil Nœuds) et est plus lisse. - - - + + + L'importance de la simplification (appelée seuil) dépend de la taille de la sélection. Ainsi, si vous sélectionnez simultanément un chemin et un autre objet plus important, la simplification sera plus agressive que pour le chemin seul. De plus, la commande Simplifier est accélérée : si vous appuyez sur Ctrl+L plusieurs fois de suite rapidement (avec moins de 0,5 s entre deux appuis consécutifs), le seuil est incrémenté à chaque pression. Après une pause, le seuil de simplification revient à sa valeur par défaut. Grâce à cette accélération, il est facile d'ajuster précisément la simplification dont vous avez besoin pour chaque cas. - + En plus d'adoucir les tracés à main, Simplifier peut être utilisé pour générer différents effets créatifs et originaux. Une forme plutôt rigide et géométrique bénéficiera souvent d'un brin de simplification qui lui donnera un peu de vie — adoucissant certains coins et introduisant des distorsions très naturelles, parfois très stylées et d'autres fois plutôt amusantes. Voici un exemple de dessin (clipart) bien plus réussi après avoir été simplifié : - Original - Simplification légère - Simplification agressive - - - - - Créer du texte + Original + Simplification légère + Simplification agressive + + + + + Créer du texte - + Inkscape permet la composition de textes longs et complexes. Cependant, il convient aussi assez bien pour la création de petits textes comme des titres, bannières, logos, étiquettes et légendes de diagrammes, etc. Cette section est une introduction très basique aux possibilités de création de textes avec Inkscape. - + Créer un objet texte se fait tout simplement en passant à l'outil Texte (F8), en cliquant quelque part sur le canevas et en tapant votre texte. Pour changer la police, le style, la taille ou l'alignement d'un texte, ouvrez la boîte de dialogue texte et police (Maj+Ctrl+T). Cette boîte de dialogue a aussi un onglet de saisie de texte que vous pouvez utiliser afin d'éditer l'objet texte sélectionné — dans certaines situations, il peut être plus pratique que l'édition directement sur le canevas (notamment, cet onglet supporte la vérification orthographique à la volée). - + Comme les autres outils, l'outil Texte peut sélectionner des objets de son propre type — les objets texte donc — de sorte que vous pouvez cliquer sur tout objet texte existant (comme ce paragraphe) afin de le sélectionner ou d'y positionner votre curseur. - + Une des opérations les plus courantes sur la mise en page des textes est l'ajustement de l'espacement entre des lettres ou des lignes. Comme toujours, Inkscape fournit des raccourcis clavier dans ce but. Les combinaisons Alt+< et Alt+> modifient l'inter-lettrage de la ligne courante d'un objet texte, de sorte que la longueur de cette ligne change d'1 pixel au zoom actuel (à comparer avec le comportement du sélecteur où les mêmes touches permettent de modifier les dimensions d'un objet au pixel près). Généralement, si la taille de la police est plus grande que celle par défaut dans un objet texte, elle présente un meilleur rendu après en avoir légèrement resserré les lettres. Voici un exemple : - Original - Inter-lettrage diminué - Inspiration - Inspiration - + Original + Inter-lettrage diminué + Inspiration + Inspiration + La version remaniée rend un peu mieux, mais n'est toujours pas parfaite : les distances entre les lettres ne sont pas uniformes ; par exemple, le « a » et le « t » sont trop éloignés tandis que le « t » et le « i » sont trop proches. L'imperfection des crénages (particulièrement visible avec des grandes tailles de police) est plus importante dans des fontes de mauvaise qualité ; toutefois, vous trouverez probablement, dans toutes les chaînes de texte et toutes les polices, des paires de lettres qui bénéficieront d'un ajustement de crénage. - + Inkscape facilite ces ajustements ; vous n'avez qu'à positionner votre curseur d'édition de texte entre les caractères qui posent problème et à utiliser Alt+flèche pour déplacer les lettres à droite du curseur. Vous trouverez encore ci-dessous le même exemple, mais cette fois avec des ajustements manuels, de sorte que les lettres sont positionnées uniformément. - Inter-lettrage diminué et crénage manuel de certaines paires de lettres - Inspiration - + Inter-lettrage diminué et crénage manuel de certaines paires de lettres + Inspiration + En plus de pouvoir déplacer les lettres horizontalement avec Alt+Gauche ou Alt+Droite, vous pouvez aussi les déplacer verticalement en utilisant Alt+Haut or Alt+Bas : - Inspiration - + Inspiration + Bien sûr, vous pourriez convertir votre texte en chemin (Maj+Ctrl+C) et déplacer les lettres comme un objet chemin classique. Cependant, il est bien plus pratique de conserver ses propriétés de texte : il reste éditable, vous pouvez essayer différentes fontes tout en préservant vos crénages et espacements, et la taille du fichier enregistré reste plus petite. Le seul désavantage de conserver le « texte en texte » est que vous devrez avoir sa fonte originale installée sur tout système où vous voudriez ouvrir votre document SVG. - + De la même façon, vous pouvez ajuster l'inter-lignage des objets texte de plusieurs lignes. Essayez les raccourcis Ctrl+Alt+< et Ctrl+Alt+> sur n'importe quel paragraphe de ce didacticiel pour faire varier la hauteur globale de l'objet texte de 1 pixel au zoom courant. Comme dans le sélecteur, combiner un raccourci d'espacement ou de crénage avec la touche Maj multipliera son action par 10. - - Éditeur XML + + Éditeur XML - + L'outil le plus puissant d'Inkscape est l'éditeur XML (Maj+Ctrl+X). Affichant l'arborescence XML complète du document, il en reflète en permanence l'état courant. Vous pouvez modifier votre dessin et observer les changements correspondants dans l'arborescence XML. De plus, vous pouvez éditer tout texte, élément ou attribut dans l'éditeur XML et voir le résultat sur le canevas. C'est le meilleur outil imaginable pour apprendre le SVG interactivement et il vous permet d'appliquer des astuces qui seraient impossibles avec des outils d'édition standard. - - Conclusion + + Conclusion - + Ce didacticiel ne montre qu'une petite partie des possibilités d'Inkscape. Nous espérons que vous l'avez apprécié. N'ayez pas peur d'expérimenter et de partager vos créations. Veuillez consulter www.inkscape.org pour avoir accès à plus d'information, aux dernières versions et à l'aide des communautés de développeurs et utilisateurs. - + diff --git a/share/tutorials/tutorial-basic.fr.svg b/share/tutorials/tutorial-basic.fr.svg index f9eea1f98..bd55a3f07 100644 --- a/share/tutorials/tutorial-basic.fr.svg +++ b/share/tutorials/tutorial-basic.fr.svg @@ -49,7 +49,7 @@ - Ce didacticiel présente les opérations de base d'Inkscape. Il se présente sous la forme d'un document Inkscape que vous pouvez visionner, éditer et éventuellement sauvegarder. + Ce didacticiel présente les bases de l'utilisation d'Inkscape. Il s'agit d'un document Inkscape : vous pouvez le visionner, le modifier, en copier des éléments ou même le sauvegarder. @@ -66,7 +66,7 @@ - Il y a plusieurs façons de se déplacer sur le canevas. Utilisez le raccourci Ctrl+flèche pour vous déplacer avec le clavier (essayez donc dès maintenant de faire défiler ce document vers le bas). Vous pouvez aussi faire glisser le canevas en enfonçant le bouton du milieu de la souris. Ou bien, vous pouvez utiliser les barres de défilement (Ctrl+B permet de les afficher/masquer). La molette de la souris permet les déplacements verticaux, et même horizontaux en combinaison avec la touche Maj. + Il y a plusieurs façons de se déplacer sur le canevas. Utilisez le raccourci Ctrl+flèche pour vous déplacer avec le clavier (essayez donc dès maintenant de faire défiler ce document vers le bas). Vous pouvez aussi agripper et déplacer le canevas en enfonçant le bouton du milieu de la souris. Ou bien, vous pouvez utiliser les barres de défilement (Ctrl+B permet de les afficher/masquer). La molette de la souris permet les déplacements verticaux, et même horizontaux en combinaison avec la touche Maj. Zoomer et dézoomer @@ -76,7 +76,7 @@ - Le moyen le plus simple est d'utiliser les touches - et + (ou =). Vous pouvez aussi zoomer avec Ctrl+clic-milieu ou Ctrl+clic-droit, et dézoomer avec Maj+clic-milieu ou Maj+clic-droit, ou bien faire tourner la molette de la souris tout en appuyant sur Ctrl. Vous pouvez aussi cliquer sur le champ de saisie (dans le coin en bas à droite de la fenêtre), y saisir une valeur de zoom, et la valider en appuyant sur la touche Entrée. Enfin, il reste l'outil de zoom (dans la barre d'outils à gauche) qui vous permet de définir une région sur laquelle zoomer à l'aide de la souris. + Le moyen le plus simple est d'utiliser les touches − et + (ou =). Vous pouvez aussi zoomer avec Ctrl+clic milieu ou Ctrl+clic droit, et dézoomer avec Maj+clic milieu ou Maj+clic droit, ou bien faire tourner la molette de la souris tout en appuyant sur Ctrl. Vous pouvez aussi cliquer sur le champ de saisie (dans le coin en bas à droite de la fenêtre), y saisir une valeur de zoom, et la valider en appuyant sur la touche Entrée. Enfin, il reste l'outil de zoom (dans la barre d'outils à gauche) qui vous permet de définir une région sur laquelle zoomer à l'aide de la souris. @@ -141,313 +141,313 @@ - Il est temps de passer aux formes ! Cliquez sur l'outil Rectangle dans la barre d'outils (ou appuyez sur F4) et avec un cliquer-déplacer, créez un rectangle, soit dans un nouveau document vide, soit dans celui-ci : + Il est temps de passer aux formes ! Cliquez sur l'outil Rectangle dans la barre d'outils (ou appuyez sur F4) et avec un cliquer-glisser, créez un rectangle, soit dans un nouveau document vide, soit dans celui-ci : - - - - - - - - - - - - + + + + + + + + + + + + Comme vous pouvez le voir, par défaut, les rectangles sont bleus, avec un contour noir, et complètement opaques. Nous allons voir comment changer cela ci-dessous. Avec les autres outils, vous pouvez aussi créer des ellipses, des étoiles et des spirales : - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Ces outils sont les outils de formes. Chaque forme créée affiche une ou plusieurs poignées en forme de diamant ; essayez de les déplacer pour voir comment la forme réagit. Pour chacun des outils de formes, la barre de contrôle fournit une façon supplémentaire de modifier la forme ; ces contrôles affectent la forme sélectionnée (c'est-à-dire celle qui a ses poignées affichées) et définissent les paramètres par défaut qui s'appliqueront lors de la création de toute nouvelle forme. - + Pour annuler votre dernière action, appuyez sur Ctrl+Z (ou si vous changez d'avis, vous pouvez restaurer l'action annulée avec Maj+Ctrl+Z). - - Déplacer, redimensionner et tourner + + Déplacer, redimensionner et tourner - + L'outil d'Inkscape le plus utilisé est le sélecteur. Cliquez sur le bouton tout en haut (celui avec la flèche) dans la barre d'outils (ou appuyez sur F1 ou sur la barre d'espace). Vous pouvez alors sélectionner n'importe quel objet sur le canevas. Ainsi, sélectionnez le rectangle ci-dessous. - - + + Vous devriez voir apparaître huit poignées en forme de flèche autour des bords de l'objet. Vous pouvez maintenant : - - + + - Déplacer l'objet à la souris avec un cliquer-déplacer (appuyez sur Ctrl pour restreindre le mouvement à l'horizontale et à la verticale). + Déplacer l'objet à la souris avec un cliquer-glisser (appuyez sur Ctrl pour restreindre le mouvement à l'horizontale et à la verticale). - - + + Redimensionner l'objet, en déplaçant une poignée (appuyez sur Ctrl pour préserver ses proportions). - + Cliquez à nouveau sur le rectangle. Les poignées changent de forme. Vous pouvez maintenant : - - + + Tourner l'objet en déplaçant une poignée de coin (appuyez sur Ctrl pour forcer une rotation par incréments de 15 degrés ; déplacez la croix pour définir le centre de rotation). - - + + Incliner l'objet en déplaçant une poignée autre que celle d'un coin (appuyez sur Ctrl pour forcer une inclinaison par incréments de 15 degrés). - + Toujours avec le sélecteur, dans les champs numériques de la barre supérieure, vous pouvez définir précisément les coordonnées (X et Y) et la taille (L et H) de la sélection. - - Transformer à l'aide des raccourcis clavier + + Transformer à l'aide des raccourcis clavier - + Une des capacités d'Inkscape le distinguant d'autres éditeurs vectoriels est la possibilité d'utiliser le clavier de façon intensive. Il n'y a pratiquement pas d'action ou de commande qui ne soit pas accessible depuis le clavier, et la transformation d'objet ne fait pas exception. - + - Vous pouvez utiliser le clavier pour déplacer (flèches), redimensionner (< et >) et tourner ([ et ]) les objets. L'incrément par défaut de modification des dimensions et de déplacement est de 2 px ; avec la touche Maj, le déplacement est multiplié par 10. Ctrl+> et Ctrl+< redimensionnent respectivement de 200 % et 50 % par rapport à l'original. L'incrément de rotation par défaut est de 15 degrés ; ou de 90 degrés si vous appuyez sur Ctrl. + Vous pouvez utiliser le clavier pour déplacer (flèches), redimensionner (< et >) et tourner ([ et ]) les objets. L'incrément par défaut de modification des dimensions et de déplacement est de 2 px ; avec la touche Maj, le déplacement est multiplié par 10. Ctrl+> et Ctrl+< redimensionnent respectivement de 200 % et 50 % par rapport à l'original. L'incrément de rotation par défaut est de 15 degrés ; ou de 90 degrés si vous appuyez sur Ctrl. - + Mais les transformations à l'échelle du pixel sont peut-être les plus utiles, obtenues par la combinaison de la touche Alt avec un raccourci. Par exemple, Alt+flèche déplace la sélection d'1 pixel, au zoom courant (c'est-à-dire d'un pixel sur l'écran, à ne pas confondre avec l'unité px qui est une unité SVG de longueur indépendante du zoom). Ceci implique que si vous zoomez plus, un raccourci Alt+flèche provoquera un mouvement absolu plus petit, correspondant toujours à un pixel à l'écran. Il est ainsi possible de positionner des objets avec une précision arbitraire simplement en zoomant ou dézoommant selon les besoins. - + De même, Alt+> et Alt+< changent les dimensions de la sélection d'1 pixel à l'écran, et Alt+[ et Alt+] la tournent de telle façon que le point le plus éloigné du centre bouge d'un seul pixel à l'écran. - + Note : il se peut que les utilisateurs de Linux n'obtiennent pas les résultats attendus avec Alt+flèche et d'autres combinaisons si leur gestionnaire de fenêtres récupère les événements des touches avant qu'elles n'atteignent l'application Inkscape. Une des solutions consiste à changer la configuration du gestionnaire de fenêtres pour éviter cela. - - Sélections multiples + + Sélections multiples - + - Avec Maj+clic, vous pouvez simultanément sélectionner plusieurs objets. Avec un cliquer-déplacer, vous pouvez aussi définir une zone autour des objets ; on appelle ceci une sélection par bande étirable (le sélecteur crée une bande étirable quand on commence un cliquer-déplacer sur une zone vide ; mais si vous appuyez sur Maj avant de cliquer, Inkscape forcera la création d'une bande étirable). Entraînez-vous avec les trois formes ci-dessous : + Avec Maj+clic, vous pouvez simultanément sélectionner plusieurs objets. Avec un cliquer-glisser, vous pouvez aussi définir une zone autour des objets ; on appelle ceci une sélection par bande étirable (le sélecteur crée une bande étirable quand on commence un cliquer-glisser sur une zone vide ; mais si vous appuyez sur Maj avant de cliquer, Inkscape forcera la création d'une bande étirable). Entraînez-vous avec les trois formes ci-dessous : - - - - + + + + - Maintenant, utilisez la bande étirable (déplacer ou Maj+déplacer) à titre d'exemple pour sélectionner les deux ellipses mais pas le rectangle : + Maintenant, utilisez la bande étirable (avec un cliquer-glisser ou Maj+cilquer-glisser) à titre d'exemple pour sélectionner les deux ellipses mais pas le rectangle : - - - - + + + + Tout objet sélectionné affiche une marque de sélection — par défaut, un cadre en pointillés. Ceci permet de distinguer facilement ce qui est sélectionné de ce qui ne l'est pas. Si, par exemple, vous sélectionnez les deux ellipses et le rectangle ci-dessus, sans ces indications, il vous sera difficile de savoir si les ellipses sont bien sélectionnées ou non. - + Maj+clic sur un objet sélectionné l'exclut de la sélection. Sélectionnez les trois objets ci-dessus, puis utilisez Maj+clic pour exclure les deux ellipses de la sélection, en n'y conservant que le rectangle. - + Appuyer sur Échap désélectionne tous les objets. Ctrl+A sélectionne tous les objets du calque courant (si vous n'avez pas créé de calque, vous sélectionnerez tous les objets du document). - - Grouper + + Grouper - + Plusieurs objets peuvent être réunis dans un groupe. Un groupe se comporte comme un simple objet quand vous le déplacez ou le transformez. Ci-dessous, les trois objets de gauche sont indépendants ; les trois mêmes objets de droite sont groupés. Essayez de les déplacer. - - - - + + + + - + Pour créer un groupe, sélectionnez un ou plusieurs objets et appuyez sur Ctrl+G. Pour dégrouper un ou plusieurs groupes, sélectionnez-les et appuyez sur Ctrl+U. Les groupes peuvent eux-mêmes être groupés, comme n'importe quels autres objets ; de tels groupes récursifs peuvent avoir une profondeur quelconque. Cependant, Ctrl+U ne dégroupe que le dernier niveau de groupe de la sélection ; vous devrez répéter Ctrl+U si vous voulez dégrouper complètement des groupes de groupes. - + Cependant, vous n'avez pas nécessairement besoin de dégrouper pour éditer un objet au sein d'un groupe. Un simple Ctrl+clic sur un objet permet de le sélectionner seul et de l'éditer, et Maj+Ctrl+clic sur plusieurs objets (inclus ou non dans des groupes quelconques) permet d'effectuer une sélection multiple. Essayez de déplacer ou transformer sans les dégrouper les formes du groupe ci-dessus à droite, puis de les désélectionner, et resélectionnez le groupe normalement pour vérifier qu'elles sont toujours groupées. - - Fond et contour + + Fond et contour - + La façon la plus simple de donner une couleur à un objet est probablement de sélectionner un objet, puis de cliquer sur une couleur dans la palette en bas afin de le peindre (changer sa couleur de fond). Vous pouvez également ouvrir la boîte de dialogue Palettes depuis le menu Affichage (ou appuyer sur Maj+Ctrl+W), sélectionner un objet, et cliquer sur une couleur pour le peindre. - + La boîte de dialogue Fond et contour du menu Objet (ou accessible avec Maj+Ctrl+F) est plus puissante. Sélectionnez la forme ci-dessous et ouvrez la boîte de dialogue Fond et contour. - - + + - Vous constatez que la boîte de dialogue a trois onglets : Fond, Contour et Style du contour. L'onglet Fond permet d'éditer le remplissage (l'intérieur) du ou des objet(s) sélectionné(s). L'utilisation des boutons juste sous l'onglet vous permet de choisir le type de remplissage, incluant sans remplissage (le bouton avec un X), couleur de remplissage uniforme, ou encore dégradé linéaire ou radial. Pour la forme ci-dessus, le bouton Couleur uniforme devrait être sélectionné. + Vous constatez que la boîte de dialogue a trois onglets : Fond, Contour et Style du contour. L'onglet Fond permet d'éditer le fond (l'intérieur) du ou des objet(s) sélectionné(s) (on parle aussi de remplissage — « fill » en anglais —, mais nous avons choisi une traduction brève pour des contraintes techniques). L'utilisation des boutons juste sous l'onglet vous permet de choisir le type de fond : transparent (aucun fond, le bouton avec un X), couleur de fond uniforme, ou encore dégradé linéaire ou radial. Pour la forme ci-dessus, le bouton Couleur uniforme devrait être sélectionné. - + - + Plus bas, vous pouvez voir la collection de sélecteurs de couleur chacun dans un onglet : RVB, TSL, CMJN, et Roue. Le plus pratique est peut-être la roue, dans laquelle vous pouvez tourner un triangle pour choisir une teinte sur la roue, puis une nuance dans le triangle. Tous les sélecteurs de couleur comportent une réglette pour définir l'alpha (opacité) de(s) objet(s) sélectionné(s). - + - + Quand vous sélectionnez un objet, la boîte de dialogue Fond et contour est mise à jour pour afficher ses fond et contour actuels (quand plusieurs objets sont sélectionnés, elle affiche la moyenne de leurs couleurs). Jouez avec les exemples ci-dessous ou créez les vôtres : - - - - - - - - + + + + + + + + - + En utilisant l'onglet Contour, vous pouvez enlever le contour d'un objet ou lui attribuer n'importe quelle couleur ou transparence : - - - - - - - - - + + + + + + + + + - + Le dernier onglet, Style de contour, vous permet de définir la largeur et les autres paramètres du contour : - - - - - - - - + + + + + + + + - + Enfin, vous pouvez utiliser des dégradés au lieu de couleurs uniformes pour les fonds comme pour les contours : @@ -488,42 +488,42 @@ - - - - - - - - + + + + + + + + - + Quand vous passez d'une couleur uniforme à un dégradé, le dégradé nouvellement créé utilise cette même couleur, allant d'opaque à transparente. Utilisez l'outil de Dégradé (Ctrl+F1) pour déplacer les poignées de dégradé — les poignées de contrôle connectées par des lignes qui définissent la direction et la longueur du dégradé. Quand l'une de ces poignées est sélectionnée (surlignée en bleu), la boîte de dialogue Fond et contour permet de définir la couleur liée à cette poignée à la place de la couleur de l'objet sélectionné. - + - + Une autre manière pratique de changer la couleur d'un objet est d'utiliser l'outil Pipette (F7). Un simple clic n'importe où sur le dessin avec cet outil permet d'attribuer la couleur ainsi capturée au fond de l'objet sélectionné (Maj+clic l'attribuera à son contour). - - Duplication, alignement, distribution + + Duplication, alignement, distribution - + - + Une des opérations les plus courantes est la duplication d'un objet (Ctrl+D). Le dupliqué est placé juste au-dessus de l'original et est sélectionné, vous permettant ainsi de le déplacer à la souris ou avec des raccourcis. Pour vous exercer, essayez de remplir la ligne avec des copies du carré noir ci-dessous : - - + + - + Il y a des chances que vos copies du carré ne soient pas bien alignées. La boîte de dialogue Aligner et distribuer (Maj+Ctrl+A) devient alors utile. Sélectionnez tous les carrés (avec Maj+clic ou une bande étirable), ouvrez la boîte de dialogue et appuyez sur le bouton « Centrer selon l'axe horizontal », puis sur « Distribuer des distances horizontalement entre les objets » (consultez les indications affichées quand la souris passe au-dessus des boutons). Les objets sont maintenant alignés et distribués de façon équidistante. Voici d'autres exemples d'objets alignés et distribués : @@ -542,187 +542,187 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ordre d'empilement + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ordre d'empilement - + - + Lorsque plusieurs objets se recouvrent, il est possible de définir l'ordre dans lequel ils sont empilés, c'est-à-dire quels objets sont en haut et masquent les autres (paramètre z-order). Les deux commandes du menu Objet, Monter au premier plan (touche Origine) et Descendre à l'arrière-plan (touche Fin), feront passer les objets sélectionnés tout au-dessus ou tout au fond de l'empilement du calque actuel. Deux autres commandes, Monter (Page précédente) et Descendre (Page suivante), les enfouiront ou émergeront d'un cran seulement, c'est-à-dire juste au-delà d'un objet non sélectionné dans l'empilement (seuls les objets chevauchant la sélection comptent, en fonction de leur boîte englobante). - + - + Exercez-vous à l'utilisation de ces commandes en inversant la superposition des objets ci-dessous, de telle sorte que l'ellipse la plus à gauche soit tout au-dessus et la plus à droite tout au fond : - - - - - - - + + + + + + + - + Un raccourci de sélection très utile est la touche Tab. Si rien n'est sélectionné, il sélectionne l'objet le plus au fond ; sinon, il sélectionne l'objet juste au-dessus de l'objet sélectionné dans l'empilement. Maj+Tab fait l'inverse, commençant par l'objet tout au-dessus en allant vers le fond. Comme les objets que vous créez sont ajoutés au-dessus de la superposition, appuyer sur Maj+Tab quand aucun objet n'est sélectionné vous permettra de retrouver facilement le dernier objet que vous avez créé. Essayez Tab et Maj+Tab sur les ellipses superposées ci-dessus. - - Sélectionner et déplacer des objets couverts + + Sélectionner et déplacer des objets couverts - + - + Que faire si l'objet dont vous avez besoin est caché derrière un autre objet ? Vous pouvez encore voir l'objet en dessous si celui du dessus est (partiellement) transparent, mais en cliquant dessus, vous sélectionnerez l'objet du dessus, pas celui dont vous avez besoin. - + - + Pour cela, il faut utiliser Alt+clic. Alt+clic sélectionne d'abord l'objet du dessus, comme un clic normal ; mais le Alt+clic suivant au même endroit sélectionne l'objet juste en dessous ; et ainsi de suite. Donc, plusieurs Alt+clic à la suite vous permettront de naviguer du dessus vers le fond à travers la superposition de différents objets sous le pointeur de la souris. Quand l'objet du fond est sélectionné, un Alt+clic de plus sélectionne de nouveau l'objet du dessus. - + - + [Si vous êtes sous Linux, vous pourriez éventuellement vous apercevoir que Alt+clic ne fonctionne pas correctement, mais déplace la fenêtre Inkscape en totalité. C'est parce que votre gestionnaire de fenêtres a réservé le raccourci Alt+clic pour une autre action. Pour corriger cela, il faut trouver l'option de configuration du comportement des fenêtres de votre gestionnaire de fenêtres, puis la désactiver ou bien lui associer une autre touche (par exemple Super — aussi appelée « Windows »), afin qu'Inkscape et les autres applications puissent librement utiliser la touche Alt.] - + - + - Bien, mais une fois l'objet recouvert sélectionné, qu'en faire ? Vous pouvez le transformer grâce aux raccourcis et déplacer ses poignées de sélection. Cependant, déplacer l'objet lui-même resélectionnera l'objet tout au dessus à nouveau (le cliquer-déplacer est conçu comme cela : d'abord sélectionner l'objet le plus haut juste sous le curseur puis déplacer la sélection). Pour demander à Inkscape de déplacer la sélection présente (éventuellement en dessous d'autres objets) sans rien sélectionner d'autre, utilisez Alt+déplacer. Cela vous permettra de déplacer la sélection actuelle où que vous placiez la souris. + Bien, mais une fois l'objet recouvert sélectionné, qu'en faire ? Vous pouvez le transformer grâce aux raccourcis et déplacer ses poignées de sélection. Cependant, déplacer l'objet lui-même resélectionnera l'objet tout au-dessus à nouveau (le cliquer-glisser est conçu comme cela : d'abord sélectionner l'objet le plus haut juste sous le curseur puis déplacer la sélection). Pour demander à Inkscape de déplacer la sélection présente (éventuellement en dessous d'autres objets) sans rien sélectionner d'autre, utilisez Alt+cliquer-glisser. Cela vous permettra de déplacer la sélection actuelle où que vous placiez la souris. - + - + - Essayez Alt+clic et Alt+déplacer sur les deux formes brunes sous le rectangle vert transparent : + Essayez Alt+clic et Alt+cliquer-glisser sur les deux formes brunes sous le rectangle vert transparent : - - - - - Sélectionner des objets similaires + + + + + Sélectionner des objets similaires - + - + Inkscape peut sélectionner automatiquement tous les objets ayant un point commun. Par exemple, si vous souhaitez sélectionner tous les carrés bleus ci-dessous, sélectionnez tout d'abord l'un d'entre eux, puis utilisez Édition > Sélectionner même > Couleur de fond dans le menu. Tous les objets avec la même teinte de bleu seront alors sélectionnés. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Vous pouvez non seulement sélectionner par couleur de fond, mais également par couleur de contour, style de contour, fond et contour, et type d'objet. - - Conclusion + + Conclusion - + - + Ceci conclut le didacticiel basique. Inkscape offre beaucoup d'autres fonctionnalités, mais les techniques décrites ci-dessus vous permettront déjà de créer des dessins simples mais utiles. Pour un usage plus avancé, consultez le didacticiel avancé dans Aide > Didacticiels. - + diff --git a/share/tutorials/tutorial-calligraphy.fr.svg b/share/tutorials/tutorial-calligraphy.fr.svg index 99a38c538..a444a92f2 100644 --- a/share/tutorials/tutorial-calligraphy.fr.svg +++ b/share/tutorials/tutorial-calligraphy.fr.svg @@ -43,192 +43,192 @@ ::CALLIGRAPHIE -bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net + - L'outil Calligraphie est l'un des nombreux bons outils proposés par Inkscape. Ce didacticiel vous aidera à découvrir le fonctionnement de cet outil, ainsi que les bases et techniques de l'art de la calligraphie. + L'outil Calligraphie est l'un des nombreux superbes outils d'Inkscape. Ce didacticiel vous aidera à découvrir le fonctionnement de cet outil, ainsi que les bases et techniques de l'art de la calligraphie. - + - Utiliser Ctrl+flèche, la molette de la souris ou le glisser avec le bouton du milieu pour faire défiler la page vers le bas. Pour les bases de création, sélection et transformation d'objet, lisez le didacticiel basique dans Aide > Didacticiels. + Utiliser Ctrl+flèche, la molette de la souris ou le bouton du milieu pour faire défiler la page vers le bas. Pour les bases de création, sélection et transformation d'objet, lisez le didacticiel basique dans Aide > Didacticiels. - - Histoire et styles + + Histoire et styles - + Par définition, la calligraphie signifie « belle écriture » ou « faculté d'écrire élégamment ». La calligraphie est essentiellement l'art de former à la main de beaux caractères d'écriture. Cela peut sembler intimidant, mais avec un peu de pratique, n'importe qui peut maîtriser les bases de cet art. - + Les premières formes de calligraphie apparaissent avec les peintures des hommes des cavernes. Et jusqu'à l'apparition de l'imprimerie, en 1440 environ, les livres et autres publications étaient calligraphiés. Un scribe devait transcrire à la main toute copie de livre ou publication. L'écriture se faisait avec une plume (d'oie) et de l'encre sur des matériaux tels que du parchemin ou du vélin. Les styles de lettrage utilisés au cours des âges incluent le Rustique, la minuscule Caroline, le Blackletter, etc. Aujourd'hui, l'emplacement le plus commun où une personne classique trouvera de la calligraphie est probablement le faire-part d'un mariage. - + Il existe trois principales familles de calligraphie : - - + + Occidentale ou romane - - + + Arabe - - + + Chinoise ou orientale - + Ce didacticiel se focalise principalement sur la calligraphie occidentale, étant donné que les deux autres styles nécessitent généralement un pinceau (au lieu d'une plume), qui ne fait pas encore partie des fonctions de notre outil Calligraphie. - + Un des grands avantages que nous avons sur les scribes du passé est la commande Annuler. Si vous faites une erreur, la page entière n'est pas perdue. L'outil Calligraphie d'Inkscape permet aussi des techniques qui ne seraient pas possible avec les plumes et encres traditionnelles. - - Matériel + + Matériel - + Vous obtiendrez de meilleurs résultats si vous utilisez une tablette graphique avec stylet (ex. : une Wacom). Mais grâce à la flexibilité de notre outil, vous pouvez également obtenir des résultats décents avec une souris, même s'il vous sera plus difficile de produire des tracés rapides réguliers. - + Inkscape est capable d'utiliser les sensibilités à la pression et à l'inclinaison d'un stylet de tablette qui prend en charge ces fonctions. Les fonctions de sensibilité sont désactivées par défaut parce qu'elles nécessitent de la configuration. Souvenez-vous par ailleurs que la calligraphie avec une plume ou un stylo avec pointe ne sont pas vraiment sensibles à la pression, contrairement à un pinceau. - + Si vous avez une tablette et désirez utiliser les fonctions de sensibilité, vous devez configurer votre périphérique. Cette configuration n'a besoin d'être effectuée qu'une seule fois, les réglages seront sauvegardés. Pour en activer le support, vous devez avoir la tablette graphique branchée avant de démarrer Inkscape, puis, ouvrir la boîte de dialogue Périphériques de saisie…, via le menu Édition. Lorsque cette boîte de dialogue est ouverte, vous pouvez sélectionner le périphérique et les réglages que vous désirez pour le stylet de votre tablette. Enfin, après avoir choisi ces réglages, passez à l'outil Calligraphie et commutez les boutons de la barre d'outils pour la pression et l'inclinaison. Inkscape se souviendra de ces réglages au prochain démarrage. - + Le stylo calligraphique d'Inkscape peut être sensible à la vélocité du tracé (voir « Amincissement » plus bas), donc, si vous utilisez une souris, vous désirerez probablement mettre ce paramètre à zéro. - - Options de l'outil Calligraphie + + Options de l'outil Calligraphie - + Passez à l'outil Calligraphie en appuyant sur Ctrl+F6 ou sur C, ou encore en cliquant sur son bouton dans la barre d'outils. Vous remarquerez alors, dans la barre d'outils du haut, huit options : largeur & amincissement ; angle & fixité ; terminaisons ; tremblement, agitation & inertie. Il y a également deux autres boutons pour activer ou désactiver la pression de la tablette et la sensibilité à l'inclinaison (pour les tablettes graphiques). - - Largeur et amincissement + + Largeur et amincissement - + Cette paire d'options contrôle la largeur de votre plume. La largeur peut varier entre 1 et 100 et est (par défaut) mesurée selon une unité relative à la taille de votre fenêtre d'édition, mais indépendante du zoom. En effet, l'« unité de mesure » naturelle en calligraphie est l'amplitude du mouvement de votre main et il est donc pratique d'avoir votre largeur de plume en rapport constant par rapport à votre « planche d'écriture » et non pas en unités réelles, ce qui la ferait dépendre du zoom. Ce comportement est toutefois optionnel, et peut donc être modifié pour ceux qui préféreraient une unité absolue peu importe le zoom. Pour passer à ce mode, utilisez la case à cocher sur la page de Préférences de l'outil (vous pouvez l'ouvrir en double-cliquant sur le bouton de l'outil). - + Comme la largeur de plume varie souvent, vous pouvez l'ajuster sans avoir à retourner à la barre d'outils, en utilisant les touches fléchées gauche et droite ou avec une tablette qui supporte la sensibilité à la pression. L'avantage de ces raccourcis est qu'ils fonctionnent même pendant que vous dessinez, de sorte que vous pouvez faire varier la largeur de votre plume progressivement pendant un tracé : - largeur=1, augmentant… atteignant 47, diminuant… de nouveau à 0 - - + largeur=1, augmentant… atteignant 47, diminuant… de nouveau à 0 + + La largeur de la plume peut aussi dépendre de la vélocité, et ceci est contrôlé par le paramètre d'amincissement. Ce paramètre peut prendre une valeur entre -100 et 100 ; zéro signifie que la largeur est indépendante de la vélocité, des valeurs positives font que des tracés plus rapides sont plus fins, des valeurs négatives font que des tracés plus rapides deviennent plus épais. La valeur par défaut de 10 implique un amincissement modéré des tracés rapides. Voici quelques exemples, tous tracés avec une largeur de 20 et un angle de 90° : - amincissement = 0 (largeur uniforme) - amincissement = 10 - amincissement = 40 - amincissement = -20 - amincissement = -60 - - - - - - - - - - - - - - - - - - - - - + amincissement = 0 (largeur uniforme) + amincissement = 10 + amincissement = 40 + amincissement = -20 + amincissement = -60 + + + + + + + + + + + + + + + + + + + + + Pour vous amuser, donnez une valeur de 100 (le maximum) à la largeur et à l'amincissement puis dessinez avec des mouvements brusques pour obtenir des formes étrangement naturalistes, ressemblant à des neurones. - - - - - - - - Angle et fixité + + + + + + + + Angle et fixité - + @@ -243,15 +243,15 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - - - - angle = 90° - angle = 30° (par défaut) - angle = 0° - angle = -90° - - + + + + angle = 90° + angle = 30° (par défaut) + angle = 0° + angle = -90° + + @@ -260,34 +260,34 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - - + + Chaque style de calligraphie traditionnelle possède son propre angle prédominant. L'écriture onciale, par exemple, utilise un angle de 25 degrés. Les styles plus complexes et les calligraphes plus expérimentés feront souvent varier cet angle pendant le tracé, ce qu'Inkscape permet par pression sur les touches fléchées haut et bas ou avec une tablette qui supporte la sensibilité à l'inclinaison. Néanmoins, pour l'exercice des débutants en calligraphie, conserver un angle constant fonctionnera mieux. Voici des exemples de tracés dessinés selon différents angles (fixité = 100) : - angle = 30° - angle = 60° - angle = 90° - angle = 0° - angle = 15° - angle = -45° - - - - - - - + angle = 30° + angle = 60° + angle = 90° + angle = 0° + angle = 15° + angle = -45° + + + + + + + Comme vous pouvez le voir, le tracé est plus fin quand il est parallèle à l'angle, et plus épais quand il est perpendiculaire. Des angles positifs sont plus naturels et traditionnels pour une calligraphie tracée de la main droite. - + @@ -299,19 +299,19 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - angle = 30°fixité = 100 - angle = 30°fixité = 80 - angle = 30°fixité = 0 - - - - - - - - - - + angle = 30°fixité = 100 + angle = 30°fixité = 80 + angle = 30°fixité = 0 + + + + + + + + + + @@ -320,7 +320,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -329,7 +329,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -338,7 +338,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -347,7 +347,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -356,7 +356,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -365,7 +365,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -374,7 +374,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -383,7 +383,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -392,7 +392,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -401,7 +401,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -410,7 +410,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -419,7 +419,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -428,7 +428,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -437,7 +437,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -446,7 +446,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -455,7 +455,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -464,26 +464,26 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + Typographiquement parlant, une fixité maximale et donc un contraste maximal de largeur de tracé (ci-dessus à gauche) sont les caractéristiques des antiques fontes serif, comme Times ou Bodoni (parce que ces fontes étaient historiquement une imitation d'une calligraphie effectuée avec une plume orientée de façon fixe). D'un autre côté, une fixité nulle et donc un contraste de largeur nulle (ci-dessus à droite) font plutôt penser à une fonte sans serif moderne, comme Helvetica. - - Tremblement + + Tremblement - + Le tremblement est conçu pour donner une apparence plus naturelle aux tracés calligraphiques. Le tremblement est ajustable dans la barre de contrôle, avec des valeurs comprises entre 0 et 100. Ceci influencera vos tracés, produisant différents effets pouvant aller des légères inégalités aux bavures et tâches. Cela augmente significativement les possibilités de l'outil. - + lent - intermédiaire + moyen rapide @@ -495,289 +495,289 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - tremblement = 0 - tremblement = 10 - tremblement = 30 - tremblement = 50 - tremblement = 70 - tremblement = 90 - tremblement = 20 - tremblement = 40 - tremblement = 60 - tremblement = 80 - tremblement = 100 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Agitation et inertie + tremblement = 0 + tremblement = 10 + tremblement = 30 + tremblement = 50 + tremblement = 70 + tremblement = 90 + tremblement = 20 + tremblement = 40 + tremblement = 60 + tremblement = 80 + tremblement = 100 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Agitation et inertie - + Contrairement à la largeur et à l'angle, ces deux derniers paramètres définissent la « sensation » laissée par l'outil plutôt qu'affecter son rendu visuel. Il n'y aura donc pas d'illustration dans cette section ; à la place, effectuez simplement des tests par vous-même pour vous faire une idée du fonctionnement. - + L'agitation est la résistance du papier au mouvement de la plume. La valeur par défaut est au minimum (0), et augmenter ce paramètre rend le papier glissant : si la masse est forte, la plume a tendance à partir dans des changements de directions brusques ; si la masse est nulle, une agitation forte provoquera des tortillements incontrôlables de la plume. - + En physique, la masse est ce qui génère l'inertie ; plus la masse de l'outil Calligraphie d'Inkscape est importante, et plus celui-ci traîne derrière votre stylet (ou pointeur de souris) et lisse les changements de direction et mouvements brusques de votre tracé. Par défaut cette valeur est assez faible (2) de façon à ce que l'outil soit rapide et réactif, mais vous pouvez augmenter la masse pour obtenir une plume plus lente et douce. - - Exemples de calligraphies + + Exemples de calligraphies - + Maintenant que vous connaissez les possibilités de base de l'outil, vous pouvez essayer de produire de vraies calligraphies. Si vous êtes débutant dans cette discipline, procurez-vous un bon livre sur la calligraphie et étudiez-le avec Inkscape. Cette section vous montrera juste quelques exemples simples. - + Tout d'abord pour tracer des lettres, vous avez besoin d'une paire de règles pour vous guider. Si vous devez avoir une écriture inclinée ou cursive, ajoutez aussi des guides inclinés en travers des deux règles horizontales. Par exemple : - - - - - - - - - + + + + + + + + + Ensuite le zoom devra être réglé de telle sorte que la hauteur entre les règles corresponde à votre amplitude naturelle de mouvement de main. Ajustez les paramètres largeur et angle, et c'est parti ! - + La première chose que vous devriez faire en tant que calligraphe débutant est probablement de vous entraîner à dessiner les éléments de base des lettres — des traits horizontaux et verticaux, des tracés ronds et des traits inclinés. Voici quelques éléments de lettres pour l'écriture onciale : - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + Plusieurs astuces utiles : - - + + Si votre main est confortablement installée sur la tablette, ne la déplacez pas. Faites plutôt défiler le canevas (touches Ctrl+flèche) avec votre main gauche après avoir fini chaque lettre. - - + + Si votre dernier coup de plume est mauvais, annulez-le (Ctrl+Z). Cependant, si sa forme est bonne, mais que la position et la taille doivent être légèrement rectifiées, il vaut mieux utiliser le Sélecteur temporairement (espace) et opérer les déplacement/redimensionnement/rotation nécessaires (en utilisant la souris ou le clavier), puis appuyer sur espace de nouveau pour reprendre l'outil Calligraphie. - - + + Quand vous avez fini un mot, passez de nouveau au Sélecteur pour ajuster l'uniformité des traits et l'inter-lettrage. N'en faites pas trop cependant ; une belle calligraphie doit garder le côté légèrement irrégulier d'une écriture manuscrite. Résistez à la tentation de dupliquer des lettres et des morceaux de lettres ; chaque coup de plume doit être original. - + Et voici quelques exemples de lettrages complets : - - - - - - - - - Écriture onciale - Écriture carolingienne (minuscule Caroline) - Écriture gothique - Écriture bâtarde - - - Écriture italique florissante - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Conclusion + + + + + + + + + Écriture onciale + Écriture carolingienne (minuscule Caroline) + Écriture gothique + Écriture bâtarde + + + Écriture italique florissante + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Conclusion - + La calligraphie n'est pas seulement amusante ; c'est un art profondément spirituel qui peut transformer votre regard sur tout ce que vous faites et voyez. L'outil Calligraphie d'Inkscape ne peut servir que d'introduction modeste. Et pourtant, il est très amusant de jouer avec et il peut servir à des travaux concrets. Faites-vous plaisir ! - + diff --git a/share/tutorials/tutorial-elements.fr.svg b/share/tutorials/tutorial-elements.fr.svg index a0b9ca9f7..769600571 100644 --- a/share/tutorials/tutorial-elements.fr.svg +++ b/share/tutorials/tutorial-elements.fr.svg @@ -48,7 +48,7 @@ - Ce didacticiel s'attache à montrer les éléments et principes de design habituellement enseignés aux étudiants débutants en art afin de comprendre les différentes notions impliquées dans une création. Cette liste n'est pas exhaustive, aussi n'hésitez pas à enrichir (modifier, ajouter, supprimer, combiner des paragraphes) ce didacticiel pour le rendre plus complet. + Ce didacticiel présente des rudiments et des principes de conception graphique qui sont habituellement enseignés aux étudiants débutant en art afin de comprendre les différentes notions impliquées dans une création. Cette liste n'est pas exhaustive, aussi n'hésitez pas à enrichir ce didacticiel (en ajoutant, supprimant, combinant des paragraphes) pour le rendre plus complet. @@ -60,7 +60,7 @@ Forme Espace Texture - Valeur + Luminosité Taille Équilibre Contraste @@ -78,19 +78,19 @@ - Les éléments suivants forment les bases de l'élaboration d'un design. + Les éléments suivants constituent les blocs constitutifs de la conception graphique. - - Ligne + + Ligne - + - Une ligne est définie comme une marque avec une longueur et une direction, créée par un point se déplaçant sur une surface. Une ligne peut varier en longueur, largeur, direction, courbure et en couleur. Une ligne peut être bidimensionnelle (un trait de crayon sur du papier) ou tridimensionnelle. + Une ligne est définie comme une marque avec une longueur et une direction, créée par un point se déplaçant sur une surface. Une ligne peut varier en longueur, en épaisseur, en direction, en courbure et en couleur. Une ligne peut être bidimensionnelle (un trait de crayon sur du papier) ou tridimensionnelle. - + @@ -102,58 +102,58 @@ - - Forme + + Forme - + Une forme est créée par la rencontre ou l'intersection de signes entourant un espace. Une variation de couleur ou une ombre peuvent définir une forme. Les formes peuvent être classées en deux catégories : géométriques (un carré, un triangle, un cercle) et organiques (contour irrégulier). - + - - Taille + + Taille - + La taille se réfère aux proportions des objets, lignes ou formes. Les variations de taille entre des objets peuvent être réelles ou imaginaires. - - GRAND - petit - - Espace + + GRAND + petit + + Espace - + - L'espace est l'aire vide (ou ouverte) entre, autour, au-dessus, en dessous, devant ou dans des objets. Les formes peuvent être définies par l'espace qu'elles contiennent et qui les entoure. L'espace est souvent qualifié de tri- ou bi-dimensionnel. L'espace positif est celui rempli par une forme. L'espace négatif est celui qui entoure une forme. + L'espace est l'aire vide (ou ouverte) entre, autour, au-dessus, en dessous, devant ou dans des objets. Les formes peuvent être définies par l'espace qu'elles contiennent et qui les entoure. L'espace est souvent qualifié de tri ou bidimensionnel. L'espace positif est celui rempli par une forme. L'espace négatif est celui qui entoure une forme. - - - - - - Couleur + + + + + + Couleur - + - La couleur est la perception que l'on a d'une surface d'après la longueur d'onde de la lumière qu'elle reflète. La couleur a trois composantes : une Teinte (un autre mot pour couleur, indiquée par des mots comme rouge ou jaune), une Saturation (éclatante ou terne), une Luminosité (claire ou sombre). + La couleur est la perception que l'on a d'une surface d'après la longueur d'onde de la lumière qu'elle reflète. La couleur a trois composantes : une teinte (un autre mot pour couleur, indiquée par des mots comme rouge ou jaune), une saturation (éclatante ou terne), une luminosité (claire ou sombre). @@ -166,14 +166,14 @@ - - - Texture + + + Texture - + - + La texture est associée au toucher (texture réelle) d'une surface ou à la façon dont elle rend visuellement (texture visuelle). Une texture peut être décrite par des qualificatifs tels que rude, soyeuse ou rocailleuse. @@ -188,17 +188,17 @@ - - - - - - Valeur + + + + + + Luminosité - + - + La luminosité représente le niveau de clarté ou d'obscurité d'une chose. La modification de luminosité d'une couleur peut être obtenue en y adjoignant du blanc ou du noir. Le clair-obscur se sert de variations de luminosité pour faire contraster dramatiquement des zones claires et sombres dans une composition. Notez que la luminosité est parfois appelée valeur par les peintres. @@ -222,73 +222,73 @@ - - - - - - - Principes de design + + + + + + + Principes de design - + - + Les principes combinent les éléments de design pour produire une composition. - - Équilibre + + Équilibre - + - + - L'équilibre est une impression visuelle de parité dans la forme, la valeur, la couleur… L'équilibre peut être symétrique (équilibré) ou asymétrique (déséquilibré). Les objets, luminosités, couleurs, textures, formes, etc., peuvent être mis à contribution pour créer un équilibre dans la composition. + L'équilibre est une impression visuelle de parité dans la forme, la valeur, la couleur… L'équilibre peut être symétrique (équilibré) ou asymétrique (déséquilibré). Les objets, luminosités, couleurs, textures, formes, etc. peuvent être mis à contribution pour créer un équilibre dans une composition. - - - - - - - - Contraste + + + + + + + + Contraste - + - + Le contraste est la juxtaposition d'éléments qui s'opposent. - - - - - - Emphase + + + + + + Emphase - + - + L'emphase est utilisée pour accentuer certaines parties d'une œuvre et attirer l'attention. Le centre d'intérêt ou le point focal est l'endroit qui attire l'œil en premier. - - - - - - - Proportion + + + + + + + Proportion - + - + La proportion décrit la taille, l'emplacement ou la quantité d'une chose comparativement à une autre. @@ -342,9 +342,9 @@ - - - + + + @@ -381,9 +381,9 @@ - Fourmi & 4×4 au hasard - Image SVG créée par Andrew FitzsimonAutorisation de la bibliothèque Open Clip Arthttp://www.openclipart.org/ - + Fourmi & 4×4 au hasard + Image SVG créée par Andrew FitzsimonAutorisation de la bibliothèque Open Clip Arthttp://www.openclipart.org/ + @@ -403,15 +403,15 @@ - - - - Motif + + + + Motif - + - + Un motif est créé par la répétition d'un élément (ligne, forme ou couleur) encore et encore. @@ -425,16 +425,16 @@ - - - - - Gradation + + + + + Gradation - + - + Une gradation de taille et de direction produit une perspective linéaire. Une gradation de couleur, chaud vers froid et tonique ou de sombre à clair, produit une perspective aérienne. La gradation peut ajouter de l'intérêt et du mouvement à une forme. Une gradation de l'obscur vers le clair peut guider le regard le long d'une forme. @@ -448,21 +448,21 @@ - - - - - - - - Composition + + + + + + + + Composition - + - + - La disposition de différents éléments pour former un tout. + La combinaison de différents éléments pour former un tout. @@ -544,99 +544,99 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - Bibliographie + + + Bibliographie - + - + - Voici une bibliographie (partielle) utilisée pour la réalisation de ce document : + Voici une bibliographie partielle des ressources utilisées pour la réalisation de ce document. - - + + - + http://www.makart.com/resources/artclass/EPlist.html - - + + - + http://www.princetonol.com/groups/iad/Files/elements2.htm - - + + - + http://www.johnlovett.com/test.htm - - + + - + http://digital-web.com/articles/elements_of_design/ - - + + - + http://digital-web.com/articles/principles_of_design/ - + - + - Remerciements spéciaux à Linda Kim (http://www.coroflot.com/redlucite/) qui m'a (http://www.rejon.org/) bien aidé sur ce didacticiel. Merci également à l'Open Clip Art Library (http://www.openclipart.org/) et aux gens qui ont soumis des dessins pour ce projet. + Remerciements particuliers à Linda Kim (http://www.coroflot.com/redlucite/) qui m'a (http://www.rejon.org/) bien aidé sur ce didacticiel. Merci également à la bibliothèque Open Clip Art (http://www.openclipart.org/) et aux personnes qui ont soumis des dessins pour ce projet. - + diff --git a/share/tutorials/tutorial-interpolate.fr.svg b/share/tutorials/tutorial-interpolate.fr.svg index d2c088351..48801d0df 100644 --- a/share/tutorials/tutorial-interpolate.fr.svg +++ b/share/tutorials/tutorial-interpolate.fr.svg @@ -43,7 +43,7 @@ ::INTERPOLATION -Ryan Lerch, ryanlerch at gmail dot com + @@ -176,7 +176,7 @@ Ryan Lerch, ryanlerch at gmail dot com - Lorsque vous utilisez l'extension Interpoler entre deux chemins différents, la position du nœud de départ de chaque chemin est importante. Pour trouver ce nœud particulier, sélectionnez le chemin, puis l'outil Nœud pour faire apparaître les nœuds, et appuyez sur la touche Tab. Le premier nœud apparaissant sélectionné est le nœud de départ. + Lorsque vous utilisez l'extension Interpoler entre deux chemins différents, la position du nœud de départ de chaque chemin est importante. Pour trouver ce nœud particulier, sélectionnez le chemin, puis l'outil Nœuds pour faire apparaître les nœuds, et appuyez sur la touche Tab. Le premier nœud apparaissant sélectionné est le nœud de départ. diff --git a/share/tutorials/tutorial-shapes.fr.svg b/share/tutorials/tutorial-shapes.fr.svg index 7a8965d72..5c2dcc5fa 100644 --- a/share/tutorials/tutorial-shapes.fr.svg +++ b/share/tutorials/tutorial-shapes.fr.svg @@ -77,310 +77,310 @@ - Les outils de formes sont : l'outil rectangle, l'outil ellipse, l'outil étoile et l'outil spirale. Nous allons d'abord voir comment ces outils fonctionnent de manière générale, puis nous explorerons les possibilités particulières de chacun d'entre eux. + Les outils de formes sont : l'outil Rectangle, l'outil Ellipse, l'outil Étoile et l'outil Spirale. Nous allons d'abord voir comment ces outils fonctionnent de manière générale, puis nous explorerons les possibilités particulières de chacun d'entre eux. - - Principes généraux + + Principes généraux - + - Une forme est créée sur le canevas par un cliquer-déplacer avec l'outil lui correspondant. Une fois la forme créée (et tant qu'elle est sélectionnée), elle affiche ses poignées (des marques en forme de diamant, carré ou cercle), de sorte que vous pouvez toujours la modifier en déplaçant ces poignées. + Une forme est créée sur le canevas par un cliquer-glisser avec l'outil lui correspondant. Une fois la forme créée (et tant qu'elle est sélectionnée), elle affiche ses poignées (des marques en forme de diamant, carré ou cercle), de sorte que vous pouvez toujours la modifier en déplaçant ces poignées. - + - Les quatre types de formes affichent leurs poignées dans les quatre outils de forme, mais aussi dans l'outil nœud (F2). Lorsque vous faites passer le curseur de la souris au-dessus d'une poignée, la barre d'état affiche des messages vous indiquant ce que vous pouvez faire en lui cliquant dessus ou en la déplaçant en combinaison avec différents raccourcis. + Les quatre types de formes affichent leurs poignées dans les quatre outils de forme, mais aussi dans l'outil Nœuds (F2). Lorsque vous faites passer le curseur de la souris au-dessus d'une poignée, la barre d'état affiche des messages vous indiquant ce que vous pouvez faire en lui cliquant dessus ou en la déplaçant en combinaison avec différents raccourcis. - + - De plus, chaque outil de forme affiche ses paramètres dans la barre de contrôle d'outil (qui est affichée horizontalement au-dessus du canevas). Elle comporte habituellement plusieurs champs numériques et un bouton de remise à zéro (retour aux valeurs par défaut) de ces champs. Quand une ou plusieurs formes de l'outil en cours d'utilisation sont sélectionnées, modifier les valeurs de ces champs de la barre de contrôle permet de modifier la ou les formes sélectionnées. + De plus, chaque outil de forme affiche ses paramètres dans la barre de contrôle des outils (qui est affichée horizontalement au-dessus du canevas). Elle comporte habituellement plusieurs champs numériques et un bouton de remise à zéro (retour aux valeurs par défaut) de ces champs. Quand une ou plusieurs formes de l'outil en cours d'utilisation sont sélectionnées, modifier les valeurs de ces champs de la barre de contrôle permet de modifier la ou les formes sélectionnées. - + - Toute modification effectuée via la barre de contrôle est retenue afin d'être appliquée à la prochaine forme que vous dessinerez avec cet outil. Par exemple, après avoir changé le nombre de sommets d'une étoile, les étoiles que vous créerez par la suite auront le même nombre de sommets. De plus, le simple fait de sélectionner une forme donnée envoie ses paramètres à la barre de contrôle d'outil et donc permet de définir les valeurs pour les formes de ce type que vous créerez après. + Tous les changements effectués à la barre de contrôle sont mémorisés afin d'être appliqués à la prochaine forme que vous dessinerez avec cet outil. Par exemple, après avoir changé le nombre de sommets d'une étoile, les étoiles que vous créerez par la suite auront le même nombre de sommets. De plus, le simple fait de sélectionner une forme donnée envoie ses paramètres à la barre de contrôle de l'outil et donc permet de définir les valeurs pour les formes de ce type que vous créerez après. - + Lorsque vous utilisez un outil de forme, vous pouvez sélectionner un objet en cliquant dessus. Ctrl+clic (sélectionner au sein d'un groupe) et Alt+clic (sélectionner dessous) fonctionnent aussi comme dans le sélecteur. Échap permet de désélectionner. - - Rectangles + + Rectangles - + Le rectangle est la forme la plus simple mais sans doute la plus courante en design et en illustration. Inkscape tente de rendre la création et la modification des rectangles aussi simple et efficace que possible. - + Passez à l'outil Rectangle en appuyant sur F4 ou en cliquant sur son bouton dans la barre d'outils. Dessinez un nouveau rectangle à côté de celui-ci : - dessinez ici - - + dessinez ici + + Puis, sans quitter l'outil Rectangle, passez d'un rectangle à l'autre en cliquant dessus. - + Raccourcis de dessin des rectangles : - - + + En appuyant sur Ctrl, vous pouvez dessiner un carré ou un rectangle de rapport de dimensions entier (2:1, 3:1, etc.). - - + + En appuyant sur Maj, vous pouvez dessiner autour du point de départ. - + Comme vous pouvez le voir, le rectangle sélectionné (le rectangle qui vient d'être créé est toujours sélectionné) affiche trois poignées dans trois de ses coins. En fait, il y a quatre poignées, mais deux d'entre elles (dans le coin supérieur droit) se chevauchent si le rectangle n'est pas arrondi. Ces deux-là sont les poignées d'arrondi ; les deux autres (en haut à gauche, et en bas à droite) sont les poignées de redimensionnement. - + Voyons les poignées d'arrondi d'abord. Saisissez l'une d'elles, et déplacez-la vers le bas. Les quatre coins du rectangle deviennent arrondis, et vous pouvez maintenant voir la deuxième poignée d'arrondi — qui est toujours au même emplacement dans le coin. Si vous voulez obtenir des coins arrondis circulairement, vous n'avez plus rien à faire. Si vous voulez des arrondis avec un rayon différent selon le côté, vous pouvez déplacer la deuxième poignée vers la gauche. - + Ici, les deux premiers rectangles ont des coins arrondis circulairement et les deux autres des coins arrondis elliptiquement : - Coins arrondis elliptiques - Coins arrondis circulaires - - - - - + Coins arrondis elliptiques + Coins arrondis circulaires + + + + + Toujours avec l'outil Rectangle, cliquez sur ces rectangles pour les sélectionner et observez leurs poignées d'arrondi. - + Souvent, le rayon et la forme des coins arrondis doivent garder les mêmes proportions au sein d'une composition, même si les dimensions des rectangles sont différentes (comme dans des diagrammes formés de boîtes arrondies de différentes tailles). Inkscape permet cela facilement. Passez à l'outil sélecteur ; dans la barre de contrôle de cet outil, il y a un groupe de quatre boutons, le second affichant deux coins arrondis concentriques. Ce bouton vous permet de déterminer si les rayons des coins arrondis doivent être mis à l'échelle ou non quand vous redimensionnez un rectangle. - + Ici par exemple, le rectangle original rouge a été dupliqué et ses dimensions changées (augmentées et diminuées) plusieurs fois selon différentes proportions, le bouton « préserver l'échelle des arrondis » étant désactivé : - Redimensionner des rectangles arrondis avec « Préserver l'échelle des arrondis » désactivé - - - - - - - - - + Redimensionner des rectangles arrondis avec « Préserver l'échelle des arrondis » désactivé + + + + + + + + + Notez que la taille et la forme des coins arrondis restent les mêmes pour tous les rectangles, de sorte que les coins arrondis se superposent exactement en haut à droite de la figure. Tous les rectangles bleus en pointillés ont été obtenus après un redimensionnement de l'original dans le sélecteur, sans avoir réajusté les poignées d'arrondi. - + Pour comparer, voici la même composition, mais créée cette fois-ci le bouton « préserver l'échelle des arrondis » étant activé : - Redimensionner des rectangles arrondis avec « Préserver l'échelle des arrondis » activé - - - - - - - - - + Redimensionner des rectangles arrondis avec « Préserver l'échelle des arrondis » activé + + + + + + + + + Maintenant, les rectangles ont tous des coins arrondis différemment, et il n'y a plus aucune superposition en haut à droite (zoomez pour le vérifier). Ce résultat (visible) est le même que celui que vous auriez obtenu en convertissant le rectangle original en chemin (Ctrl+Maj+C) puis en modifiant les dimensions de ce chemin. - + Voici les raccourcis permettant de manipuler les poignées d'arrondi d'un rectangle : - - + + Déplacez-les en appuyant sur Ctrl pour garder égaux les deux rayons (arrondi circulaire). - - + + Ctrl+clic sur une poignée rendra son rayon égal à celui de la deuxième sans avoir à la déplacer. - - + + Maj+clic permet de supprimer l'arrondi. - + Vous avez peut-être remarqué que la barre de contrôle de l'outil Rectangle affiche deux champs pour les rayons horizontal (Rx) et vertical (Ry) d'arrondi pour le rectangle sélectionné , vous permettant ainsi de modifier précisément ces rayons dans l'unité de votre choix. Le bouton Rendre les coins pointus fait simplement ce qu'il indique : il supprime l'arrondi des rectangles sélectionnés. - + Un avantage important de ces contrôles est qu'ils peuvent affecter plusieurs rectangles en même temps. Par exemple, si vous voulez modifier tous les rectangles d'un calque, vous n'avez qu'à appuyer sur Ctrl+A (tout sélectionner) et définir les paramètres voulus dans la barre de contrôle. Si des objets autres que des rectangles sont sélectionnés, ils seront ignorés — seuls les rectangles seront modifiés. - + Maintenant, observons les poignées de redimensionnement d'un rectangle. Vous vous demandez peut-être à quoi elles servent puisqu'il est possible de redimensionner un rectangle avec le sélecteur ? - + Le problème avec le sélecteur est que pour lui, les notions d'horizontale et de verticale sont celles de la page. En revanche, les poignées de redimensionnement d'un rectangle agissent parallèlement à ses côtés, même si le rectangle a été tourné ou incliné. Par exemple, essayez de redimensionner ce rectangle d'abord avec le sélecteur puis avec ses poignées de redimensionnement dans l'outil Rectangle : - - + + Comme il y a deux poignées de redimensionnement, vous pouvez modifier les dimensions du rectangle selon n'importe quelle direction et même parallèlement à ses côtés. Le redimensionnement préserve les rayons d'arrondi des coins. - + Voici les raccourcis permettant de manipuler les poignées de redimensionnement d'un rectangle : - - + + Déplacez-les en appuyant sur Ctrl pour forcer leur déplacement parallèlement aux côtés du rectangle ou à sa diagonale. Autrement dit, Ctrl permet de préserver la largeur ou la hauteur ou encore le ratio largeur/hauteur du rectangle (dans son propre système de coordonnées qui peut être tourné ou incliné). - + Voici le même rectangle, entouré de lignes pointillées grises indiquant les directions dans lesquelles vous pouvez déplacer ses poignées de redimensionnement en appuyant sur Ctrl (essayez) : - + - - Faire coller le rectangle — redimensionner les poignées avec Ctrl - + + Faire coller le rectangle — redimensionner les poignées avec Ctrl + En inclinant et en tournant un rectangle, puis en le dupliquant et en modifiant ses dimensions avec ses poignées de redimensionnement, vous pouvez facilement créer des dessins en 3D : - - - - - - - - - - - - - - - - - - - - - 3 rectangles originaux - Différents rectangles copiés et redimensionnés à l'aide les poignées, la plupart avec Ctrl - + + + + + + + + + + + + + + + + + + + + + 3 rectangles originaux + Différents rectangles copiés et redimensionnés à l'aide les poignées, la plupart avec Ctrl + @@ -451,615 +451,615 @@ - - - - - - - - - - - - - - - - - - - - - - - - Ellipses + + + + + + + + + + + + + + + + + + + + + + + + Ellipses - + L'outil Ellipse (F5) permet de créer des ellipses et des cercles, que vous pouvez transformer en camemberts ou en arcs. Les raccourcis sont les mêmes que ceux de l'outil Rectangle : - - + + En appuyant sur Ctrl, vous pouvez dessiner un cercle ou une ellipse de ratio entier (2:1, 3:1, etc.). - - + + En appuyant sur Maj, vous pouvez dessiner autour du point de départ. - + Intéressons-nous aux poignées d'une ellipse. Sélectionnez l'ellipse suivante : - - + + Une fois de plus, vous ne voyez d'abord que trois poignées, mais il y en a quatre. À droite, il y a en fait deux poignées qui se superposent et qui permettent « d'ouvrir » l'ellipse. En déplaçant la première de ces poignées, la deuxième devient visible ; déplacer ces poignées vous permet d'obtenir toutes sortes d'arcs ou de camemberts (portions d'ellipse en forme de parts de tarte) : - - - - - - - - + + + + + + + + Pour obtenir un camembert (un arc avec ses deux rayons), déplacez la poignée vers l'extérieur de l'ellipse ; pour obtenir un arc, déplacez-la vers l'intérieur. Ci-dessus, vous pouvez voir 4 camemberts à gauche et 3 arcs à droite. Notez que les arcs sont des formes ouvertes, c'est-à-dire que le contour court le long de l'ellipse mais ne relie pas les extrémités de l'arc. Ceci devient évident si vous supprimez le fond, ne gardant visible que le contour : - + 15 - Segments - Arcs - - - - - - - - - - - - - - - - - - - - + Segments + Arcs + + + + + + + + + + + + + + + + + + + + Voyez le groupe de camemberts ressemblant à un ventilateur sur la gauche. Le créer a été facile, en déplaçant les poignées par incréments d'angle avec la touche Ctrl. Voici les raccourcis des poignées arc/camembert : - - + + En appuyant sur Ctrl, forcez des modifications d'angle par incréments de 15 degrés lors des déplacements de ces poignées. - - + + Maj+clic sur ces poignées permet de refermer ces arcs/camemberts pour en refaire des ellipses. - + L'incrément d'angle par défaut peut être modifié dans les préférences d'Inkscape (dans l'onglet Comportement > Incréments). - + Les deux autres poignées d'une ellipse sont utilisées pour la redimensionner autour de son centre. Les raccourcis qui y sont associés sont similaires à ceux des poignées d'arrondi d'un rectangle : - - + + Déplacez-les tout en appuyant sur Ctrl pour faire un cercle (garder les deux rayons égaux). - - + + Ctrl+clic sur une de ces poignées permet de transformer l'ellipse en cercle sans déplacer de poignée. - + Et, tout comme les poignées de redimensionnement d'un rectangle, ces poignées permettent d'ajuster la largeur et la hauteur d'une ellipse dans son propre système de coordonnées. Ce qui signifie qu'une ellipse qui a été tournée ou inclinée peut facilement être redimensionnée parallèlement à ses axes. Essayez de modifier les dimensions de ces ellipses en utilisant leurs poignées de redimensionnement : - - - - - - - - Étoiles + + + + + + + + Étoiles - + Les étoiles sont les formes les plus complexes et les plus intéressantes. Si vous voulez épater vos amis avec Inkscape, laissez-les s'amuser un peu avec l'outil Étoile. Il est particulièrement amusant — presque addictif ! - + L'outil Étoile permet de créer deux types de formes similaires : des étoiles et des polygones. Une étoile a deux poignées dont les positions définissent la longueur et la forme de ses branches ; un polygone n'a qu'une poignée qui permet en la déplaçant de redimensionner et tourner ce polygone : - + Étoile - + Polygone - + Dans la barre de contrôle de l'outil Étoile, les deux premiers boutons déterminent si l'objet prend la forme d'une étoile ou d'un polygone régulier. Puis un champ numérique permet de définir le nombre de sommets d'une étoile ou d'un polygone. Ce paramètre n'est modifiable que depuis cette barre de contrôle, et peut varier de 3 (évidemment) à 1024, mais vous devriez éviter d'entrer un trop grand nombre (disons, plus de 200) si votre ordinateur n'est pas très puissant. - + Quand vous dessinez une nouvelle étoile ou un nouveau polygone, - - + + Déplacez une poignée en appuyant sur Ctrl pour forcer des modifications d'angle par incréments de 15 degrés. - + Par nature, une étoile est une des formes les plus intéressantes (bien qu'en pratique les polygones soient souvent plus utiles). Les deux poignées d'une étoile ont des fonctions légèrement différentes. La première poignée (lors de la création de l'étoile, elle se trouve sur une pointe, c'est-à-dire un coin convexe de l'étoile) permet d'allonger ou raccourcir les branches de l'étoile, et si vous la tournez (relativement au centre de la forme), l'autre poignée accompagne cette rotation. Ceci implique que vous ne pouvez pas incliner les branches de l'étoile avec cette poignée. - + Par contre, l'autre poignée (située initialement sur un coin concave entre deux pointes) est libre de se déplacer radialement et tangentiellement, sans affecter la poignée au bout d'une pointe (en fait cette poignée peut devenir à son tour la poignée de pointe si elle est déplacée plus loin du centre que l'autre poignée). Avec cette poignée, vous pouvez incliner les branches de l'étoile pour obtenir toutes sortes de cristaux, mandalas et flocons : - - - - - - - - - - + + + + + + + + + + Si vous voulez juste obtenir une étoile simple, sans de telles dentelles, vous pouvez restreindre le comportement de cette poignée de façon à éviter toute inclinaison : - - + + Déplacer la poignée en appuyant sur Ctrl permet de garder l'étoile strictement radiale (sans inclinaison). - - + + Ctrl+clic sur la poignée permet de supprimer l'inclinaison sans la déplacer. - + En complément utile des possibilités de déplacement des poignées sur le canevas, la barre de contrôle comprend un champ Ratio des rayons qui définit le rapport entre les distances séparant chacune des poignée du centre. - + Les étoiles d'Inkscape ont deux astuces de plus dans leur sac. En géométrie, un polygone est une forme composée de segments de droites avec des coins anguleux. Dans le monde réel, un certain degré de courbure est parfois présent — et Inkscape peut gérer cela aussi. Cependant, arrondir une étoile ou un polygone est un peu différent d'arrondir un rectangle. Vous n'avez pas de poignée dédiée à cette opération, mais, - - + + - Maj+cliquer-déplacer tangentiellement une poignée permet d'arrondir une étoile ou un polygone. + Maj+cliquer-glisser tangentiellement une poignée permet d'arrondir une étoile ou un polygone. - - + + Maj+clic sur une poignée permet de supprimer l'arrondi. - + « Tangentiellement » signifie dans une direction perpendiculaire à celle d'un rayon. Si vous tournez une poignée en sens anti-horaire, vous augmentez l'arrondi ; en sens horaire, vous le diminuez (voyez plus loin ci-dessous pour des exemples d'arrondi négatif). - + Voici une comparaison entre un carré arrondi (issu de l'outil Rectangle) et un quadrilatère arrondi (issu de l'outil Étoile) : - + Polygone arrondi - + Rectangle arrondi - + - Comme vous pouvez le voir, alors qu'un rectangle arrondi a des côtés droits et des coins arrondis (circulairement ou elliptiquement), un polygone ou une étoile arrondi n'a aucun segment rectiligne ; ses courbures varient régulièrement entre un maximum (dans les coins) et un minimum (entre deux coins). Inkscape opère ceci en ajoutant deux tangentes de Bézier colinéaires à chaque nœud de la forme (vous pouvez les voir en convertissant la forme en chemin et en l'examinant avec l'outil Nœud). + Comme vous pouvez le voir, alors qu'un rectangle arrondi a des côtés droits et des coins arrondis (circulairement ou elliptiquement), un polygone ou une étoile arrondi n'a aucun segment rectiligne ; ses courbures varient régulièrement entre un maximum (dans les coins) et un minimum (entre deux coins). Inkscape opère ceci en ajoutant deux tangentes de Bézier colinéaires à chaque nœud de la forme (vous pouvez les voir en convertissant la forme en chemin et en l'examinant avec l'outil Nœuds). - + Le paramètre d'arrondi que vous pouvez ajuster dans la barre de contrôle est le rapport entre la longueur de ces tangentes et celle du côté adjacent de l'étoile/polygone. Ce paramètre peut être négatif, inversant ainsi la direction des tangentes. Des valeurs de 0,2 à 0,4 donnent une courbure normale (assez courante) ; des valeurs plus importantes conduisent à des formes superbes, inextricables et totalement imprévisibles. Une étoile avec une grande valeur d'arrondi peut facilement dépasser les limites fixées habituellement par ses poignées. Voici quelques exemples, indiquant chacun sa valeur d'arrondi : - - - - - - - - - - - - - - 0,25 - 0,25 - 0,25 - 0,37 - - 0,43 - 3,00 - -3,00 - - 0,41 - 5,43 - 1,85 - 0,21 - -3,00 - - -0,43 - - -8,94 - - 0,39 - + + + + + + + + + + + + + + 0,25 + 0,25 + 0,25 + 0,37 + + 0,43 + 3,00 + -3,00 + + 0,41 + 5,43 + 1,85 + 0,21 + -3,00 + + -0,43 + + -8,94 + + 0,39 + - Si vous voulez que les pointes d'une étoile soient pointues et que les creux soient arrondis ou l'inverse, il suffit simplement de créer un offset (Ctrl+J) de cette étoile : + Si vous voulez que les pointes d'une étoile soient pointues et que les creux soient arrondis ou l'inverse, il suffit simplement de créer un décalage (Ctrl+J) pour cette étoile : - - - - Étoile originale - Offset lié, érodé - Offset lié, dilaté - + + + + Étoile originale + Décalage lié, érodé + Décalage lié, dilaté + - Maj+cliquer-déplacer les poignées d'une étoile dans Inkscape est une des plus merveilleuses activités connues de l'être humain. Mais on peut faire encore mieux. + Maj+cliquer-glisser les poignées d'une étoile dans Inkscape est l'une des plus merveilleuses activités connues de l'être humain. Mais on peut faire encore mieux. - + Afin d'imiter encore mieux les formes du monde réel, Inkscape peut rendre aléatoires (c'est-à-dire déformer aléatoirement) ses étoiles et polygones. Un peu de hasard rend une étoile moins régulière, plus « humaine », souvent amusante ; un hasard plus important est une façon distrayante d'obtenir toute une variété de formes complètement imprédictibles. Une étoile arrondie garde des courbures douces quand elle est rendue aléatoire. Voici les raccourcis : - - + + - Alt+cliquer-déplacer tangentiellement une poignée permet de rendre une étoile ou un polygone aléatoire. + Alt+cliquer-glisser tangentiellement une poignée permet de rendre une étoile ou un polygone aléatoire. - - + + Alt+clic sur une poignée permet de supprimer le hasard. - + - Lors de l'édition (avec les poignées) d'une étoile aléatoire, celle-ci « tremblera » car chaque position précise de ses poignées correspond à une unique quantité de hasard. Donc, déplacer une poignée sans appuyer sur Alt réinitialise ce hasard en conservant son niveau, tandis que Alt+cliquer-déplacer préserve ce hasard mais ajuste son niveau. Voici des étoiles dont les paramètres sont identiques, mais chacune d'entre elles a vu sa quantité de hasard mise à jour en déplaçant très légèrement sa poignée (la quantité de hasard varie de 0,1 tout au long de la figure suivante) : + Lors de l'édition (avec les poignées) d'une étoile aléatoire, celle-ci « tremblera » car chaque position précise de ses poignées correspond à une unique quantité de hasard. Donc, déplacer une poignée sans appuyer sur Alt réinitialise ce hasard en conservant son niveau, tandis que Alt+cliquer-glisser préserve ce hasard mais ajuste son niveau. Voici des étoiles dont les paramètres sont identiques, mais chacune d'entre elles a vu sa quantité de hasard mise à jour en déplaçant très légèrement sa poignée (la quantité de hasard varie de 0,1 tout au long de la figure suivante) : - - - - - - + + + + + + Et voici l'étoile du milieu de la figure ci-dessus, avec une quantité de hasard variant entre -0,2 et 0,2 : - +0,2 - +0,1 - 0 - -0,1 - -0,2 - - - - - - + +0,2 + +0,1 + 0 + -0,1 + -0,2 + + + + + + - Essayez de Alt+cliquer-déplacer une poignée de l'étoile du milieu de la figure ci-dessus et observez comment elle passe de la forme de celle de gauche à la forme de celle de droite — et même au-delà. + Essayez de Alt+cliquer-glisser une poignée de l'étoile du milieu de la figure ci-dessus et observez comment elle passe de la forme de celle de gauche à la forme de celle de droite — et même au-delà. - + Vous trouverez probablement vos propres applications aux étoiles aléatoires, mais j'avoue aimer particulièrement les éclaboussures en forme d'amibes et les grandes planètes irrégulières aux paysages fantastiques : - - - - - - - - - - - Spirales + + + + + + + + + + + Spirales - + Les spirales d'Inkscape sont des formes versatiles, et bien qu'elles ne soient pas aussi captivantes que les étoiles, elles sont parfois utiles. Une spirale, comme une étoile, est dessinée autour de son centre ; lors de sa création tout comme lors de son édition, - - + + Déplacez une poignée en appuyant sur Ctrl pour forcer des modifications d'angle par incréments de 15 degrés. - + Une fois créée, une spirale possède deux poignées, intérieure et extérieure. Les deux poignées peuvent être simplement déplacées pour enrouler ou dérouler la spirale (c'est-à-dire la prolonger, en modifiant le nombre de ses tours). Voici les autres raccourcis : - + Poignée extérieure : - - + + - Maj+cliquer-déplacer pour redimensionner/tourner la spirale autour de son centre (sans l'enrouler ou la dérouler). + Maj+cliquer-glisser pour redimensionner/tourner la spirale autour de son centre (sans l'enrouler ou la dérouler). - - + + - Alt+cliquer-déplacer pour verrouiller le rayon de la spirale pendant que vous l'enroulez ou la déroulez. + Alt+cliquer-glisser pour verrouiller le rayon de la spirale pendant que vous l'enroulez ou la déroulez. - + Poignée intérieure : - - + + - Alt+cliquer-déplacer verticalement pour faire converger/diverger la spirale. + Alt+cliquer-glisser verticalement pour faire converger/diverger la spirale. - - + + Alt+clic pour remettre la divergence à zéro. - - + + Maj+clic pour déplacer la poignée intérieure au centre. - + - La divergence d'une spirale est la mesure de la non-linéarité de ses enroulements. Quand la divergence vaut 1, la spirale est uniforme ; inférieure à 1 (Alt+cliquer-déplacer vers le haut), la spirale devient plus dense à sa périphérie ; supérieure à 1 (Alt+cliquer-déplacer vers le bas), la spirale est plus dense en son centre : + La divergence d'une spirale est la mesure de la non-linéarité de ses enroulements. Quand la divergence vaut 1, la spirale est uniforme ; inférieure à 1 (Alt+cliquer-glisser vers le haut), la spirale devient plus dense à sa périphérie ; supérieure à 1 (Alt+cliquer-glisser vers le bas), la spirale est plus dense en son centre : - 0,2 - 0,5 - 6 - 2 - 1 - - - - - - + 0,2 + 0,5 + 6 + 2 + 1 + + + + + + Le nombre maximum de tours d'une spirale est 1024. - + Tout comme l'outil Ellipse ne se limite pas aux ellipses, mais permet de créer des arcs (des lignes à la courbure constante), l'outil spirale permet de créer des lignes à la courbure variant régulièrement. Comparé à une courbe de Bézier, un arc de spirale est souvent plus pratique car vous pouvez l'allonger ou le raccourcir en déplaçant une poignée le long de la courbe sans modifier sa forme. De plus, alors qu'une spirale est habituellement dessinée sans fond, vous pouvez en ajouter un et retirer le contour afin d'obtenir des effets intéressants. - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + Les spirales avec des contours en pointillés sont particulièrement intéressantes — elles combinent la concentration naturelle de la forme avec l'espacement régulier des pointillés pour fournir de superbes effets de moiré : - - - - - Conclusion + + + + + Conclusion - + Les outils de formes d'Inkscape sont particulièrement puissants. Initiez-vous à leurs astuces à loisir — cela vous servira pour tout travail de design, car utiliser des formes plutôt que des chemins rend la création d'un dessin vectoriel plus rapide et sa modification plus facile. Si vous avez des idées pour améliorer d'une façon quelconque les outils de formes, n'hésitez pas à contacter les développeurs. - + diff --git a/share/tutorials/tutorial-tips.fr.svg b/share/tutorials/tutorial-tips.fr.svg index 49bc535a4..0a0807b03 100644 --- a/share/tutorials/tutorial-tips.fr.svg +++ b/share/tutorials/tutorial-tips.fr.svg @@ -319,7 +319,7 @@ - Commencez par créer un dégradé avec deux stops (vous pouvez le définir dans la boîte de dialogue Remplissage et contour ou utiliser l'outil Dégradé). À présent, avec l'outil Dégradé, ajoutez un nouveau stop au milieu du dégradé, soit en double-cliquant sur la ligne du dégradé, soit en sélectionnant le stop de forme carrée et en cliquant sur le bouton Insérer un nouveau stop dans la barre des contrôles de l'outil Dégradé ; puis déplacez légèrement ce nouveau stop. Ensuite, ajoutez d'autres stops de part et d'autre de celui du milieu et déplacez-les aussi de sorte que le dégradé ait l'air lisse. Plus vous ajoutez de stops, plus vous pouvez rendre le dégradé résultant soyeux. Voici le dégradé initial avec deux stops (noir et blanc) : + Commencez par créer un dégradé avec deux stops (vous pouvez le définir dans la boîte de dialogue Fond et contour ou utiliser l'outil Dégradé). À présent, avec l'outil Dégradé, ajoutez un nouveau stop au milieu du dégradé, soit en double-cliquant sur la ligne du dégradé, soit en sélectionnant le stop de forme carrée et en cliquant sur le bouton Insérer un nouveau stop dans la barre de contrôle de l'outil Dégradé ; puis déplacez légèrement ce nouveau stop. Ensuite, ajoutez d'autres stops de part et d'autre de celui du milieu et déplacez-les aussi de sorte que le dégradé ait l'air lisse. Plus vous ajoutez de stops, plus vous pouvez rendre le dégradé résultant soyeux. Voici le dégradé initial avec deux stops (noir et blanc) : @@ -327,8 +327,8 @@ - - + + @@ -416,18 +416,18 @@ - - - - - - - - - - Dégradés radiaux excentriques + + + + + + + + + + Dégradés radiaux excentriques - + @@ -444,216 +444,216 @@ - - - - Alignement au centre de la page + + + + Alignement au centre de la page - + Pour aligner quelque chose au centre ou le long d'un côté de la page, sélectionnez l'objet ou le groupe à aligner puis ouvrez la boîte de dialogue Aligner et distribuer (Maj+Ctrl+A). Vous pouvez alors choisir la Page dans la liste relativement à et enfin aligner votre sélection comme vous le désirez. - - Nettoyage du document + + Nettoyage du document - + Quand ils ne sont plus utilisés, beaucoup de dégradés, motifs et marqueurs (plus précisément, ceux que vous avez édités manuellement) restent dans les palettes correspondantes et peuvent être utilisés dans de nouveaux objets. Cependant, si vous voulez optimiser votre document, utilisez la commande Nettoyer le document du menu Fichier. Elle supprimera tout dégradé, motif ou marqueur qui n'est plus utilisé par aucun objet du document, réduisant ainsi la taille du fichier. - - Fonctionnalités cachées et éditeur XML + + Fonctionnalités cachées et éditeur XML - + L'éditeur XML (Maj+Ctrl+X) vous permet de modifier la plupart des aspects du document sans avoir à utiliser un éditeur de texte externe. De plus, Inkscape supporte souvent des fonctionnalités SVG pas encore accessibles depuis l'interface graphique. L'éditeur XML offre la possibilité d'accéder à ces fonctionnalités (à condition de connaître le SVG). - - Changer l'unité de mesure des règles + + Changer l'unité de mesure des règles - + - Dans le modèle par défaut, l'unité de mesure utilisée par les règles est le px (« unité utilisateur SVG », égale à 0,75 pt ou 1/96 de pouce dans Inkscape). C'est aussi l'unité utilisée pour l'affichage des coordonnées dans le coin inférieur gauche, et celle présélectionnée dans les menus qui font intervenir des unités (vous pouvez placer votre souris sur une règle pour faire apparaître une bulle indiquant l'unité utilisée). Pour modifier cela, ouvrez les Propriétés du document (Maj+Ctrl+D) et changez l'Unité par défaut dans l'onglet Page. + Dans le modèle par défaut, l'unité de mesure utilisée par les règles est le millimètre (mm). C'est aussi l'unité utilisée pour afficher les coordonnées dans le coin inférieur gauche, et celle présélectionnée dans les menus qui font intervenir des unités (vous pouvez placer votre souris sur une règle pour faire apparaître une bulle indiquant l'unité utilisée). Pour modifier cela, ouvrez les Propriétés du document (Maj+Ctrl+D) et changez l'Unité par défaut dans l'onglet Page. - - Appliquer des coups de tampon + + Appliquer des coups de tampon - + Pour créer rapidement plusieurs copies d'un objet, utilisez le coup de tampon. Déplacez simplement un objet (ou redimensionnez/tournez-le) et, alors que le bouton de la souris est toujours pressé, appuyez sur Espace. Ceci appose un « tampon » de l'objet courant. Vous pouvez répéter ce coup de tampon autant de fois que vous le voulez. - - Astuces du stylo + + Astuces du stylo - + Avec l'outil Stylo (courbes de Bézier), vous pouvez achever votre ligne de plusieurs façons : - - + + Appuyer sur Entrée - - + + Effectuer un double-clic avec le bouton gauche de la souris - - + + Cliquer avec le bouton droit - - + + Sélectionner un autre outil - + Notez que tant que le chemin n'est pas terminé (c'est-à-dire qu'il est affiché en vert, avec le segment actuel en rouge), il n'existe pas encore en tant qu'objet dans le document. Pour l'annuler, vous pouvez donc utiliser les raccourcis Échap (abandonner complètement le chemin) ou Retour arrière (supprimer le dernier segment du chemin non terminé) à la place d'Annuler. - + Pour ajouter un nouveau sous-chemin à un chemin existant, sélectionnez ce chemin et commencez à dessiner (d'où vous voulez) tout en appuyant sur Maj. Cependant, si vous voulez simplement prolonger un chemin existant, Maj n'est pas nécessaire ; commencez simplement à dessiner depuis l'une des ancres situées aux extrémités du chemin sélectionné. - - Entrer des valeurs Unicode + + Entrer des valeurs Unicode - + Quand vous êtes dans l'outil Texte, appuyer sur Ctrl+U permet d'alterner les modes Normal et Unicode. En mode Unicode, chaque groupe de 4 chiffres hexadécimaux que vous tapez devient un caractère Unicode, vous permettant ainsi de taper les symboles que vous voulez (si vous connaissez leur numéro Unicode, et si la police les supporte). Pour valider un caractère Unicode, appuyez sur Entrée. Par exemple, Ctrl+U 2 0 1 4 Entrée insère un tiret long (—). Pour quitter le mode Unicode sans insérer quoi que ce soit, appuyez sur la touche Échap. - + Vous pouvez également utiliser la boîte de dialogue Texte > Glyphes pour rechercher et insérer des glyphes dans votre document. - - Utilisation de la grille pour dessiner des icônes + + Utilisation de la grille pour dessiner des icônes - + - Supposons que vous vouliez créer une icône de 24×24 pixels. Créez un canevas de 24×24 px (utilisez les Préférences du document) et créez une grille avec un espacement de 0,5 px (48×48 lignes de grille, donc). Maintenant, si vous alignez des objets avec un fond sur les lignes paires de la grille et les contours sur les lignes impaires, avec un nombre pair (en px) comme largeur de contour, en exportant le document à la résolution par défaut de 96 ppp (de sorte qu'1 px corresponde à 1 pixel matriciel), vous obtiendrez une icône matricielle nette ne nécessitant pas d'anticrénelage. + Supposons que vous vouliez créer une icône de 24×24 pixels. Créez un canevas de 24×24 px (utilisez les Préférences du document) et créez une grille avec un espacement de 0,5 px (48×48 lignes de grille, donc). Maintenant, si vous alignez des objets avec un fond sur les lignes paires de la grille et les contours sur les lignes impaires, avec un nombre pair (en px) comme largeur de contour, en exportant le document à la résolution par défaut de 96 ppp (de sorte qu'1 px corresponde à 1 pixel en matriciel), vous obtiendrez une icône matricielle nette ne nécessitant pas d'anticrénelage. - - Rotation d'objets + + Rotation d'objets - + Avec l'outil Sélecteur, le clic sur un objet permet d'afficher les flèches de redimensionnement, et un clic de plus sur l'objet permet d'afficher les flèches d'inclinaison et de rotation. Si vous déplacez les flèches des coins, l'objet tournera autour du centre (représenté par une croix). Si vous appuyez sur Maj pendant cette opération, la rotation se fera autour du coin opposé. Vous pouvez aussi déplacer le centre de rotation (la croix) où vous le désirez. - + Ou bien, vous pouvez effectuer une rotation en utilisant les raccourcis clavier : [ et ] (de 15 degrés) ou Ctrl+[ et Ctrl+] (de 90 degrés). Ces mêmes raccourcis [] combinés avec Alt permettent des rotations lentes à l'échelle du pixel. - - Ombres portées + + Ombres portées - + Pour créer rapidement une ombre portée sur des objets, utilisez la fonctionnalité Filtres > Ombres et lueurs > Ombre portée…. - + Vous pouvez aussi facilement créer des ombres portées manuellement avec le paramètre de flou de la boîte de dialogue Fond et contour. Sélectionnez un objet, dupliquez-le avec Ctrl+D, appuyez sur la touche Page suivante pour déplacer le duplicata sous l'objet original, puis déplacez-le légèrement vers le bas et la droite par rapport à l'original. Ouvrez maintenant la boîte de dialogue Fond et contour et changez la valeur du flou à 5. Le tour est joué ! - - Placement d'un texte le long d'un chemin + + Placement d'un texte le long d'un chemin - + Pour placer du texte le long d'une courbe, sélectionnez le texte et la courbe puis utilisez la commande Mettre suivant un chemin du menu Texte. Le texte commencera au début du chemin. En général, il vaut mieux créer un chemin auquel vous voulez que le texte s'adapte plutôt que d'adapter ce texte à un autre élément (préexistant) du dessin — cela vous autorisera un meilleur contrôle sans avoir à « bricoler » votre dessin. - - Sélection de l'original + + Sélection de l'original - + - Quand vous avez affaire à un texte suivant un chemin, un offset lié ou un clone, leur objet/chemin source peut être difficile à sélectionner (caché sous d'autres objets, rendu invisible et/ou verrouillé). Le raccourci magique Maj+D peut alors vous aider ; sélectionnez le texte, l'offset lié ou le clone et appuyez sur Maj+D pour sélectionner alors le chemin correspondant, la source de l'offset ou l'original du clone. + Quand vous avez affaire à un texte suivant un chemin, un décalage lié ou un clone, son objet/chemin source peut être difficile à sélectionner (caché sous d'autres objets, rendu invisible et/ou verrouillé). Le raccourci magique Maj+D peut alors vous aider : sélectionnez le texte, le décalage lié ou le clone et appuyez sur Maj+D pour sélectionner alors le chemin correspondant, la source du décalage ou du clone. - - Au cas où la fenêtre serait hors de l'écran + + Au cas où la fenêtre serait hors de l'écran - + Quand vous transférez des documents entre des systèmes avec des résolutions ou un nombre d'écrans différents, vous pouvez être confronté au problème suivant : Inkscape a enregistré une position de fenêtre qui fait que vous ne pouvez plus atteindre Inkscape sur votre écran. Il suffit de maximiser la fenêtre (ce qui devrait la rendre de nouveau visible à l'écran ; utilisez la barre des tâches), d'enregistrer le document et de le recharger. Vous pouvez éviter tout cela en désactivant l'option « enregistrer la taille et la position des fenêtres » (dans l'onglet Interface > Fenêtres des Préférences d'Inkscape). - - Transparence, dégradés et export en Postscript + + Transparence, dégradés et export en Postscript - + - Les formats PostScript et EPS ne supportent pas la transparence, aussi vous ne devriez pas en utiliser si vous comptez exporter en PS/EPS. Dans le cas d'une transparence uniforme couvrant une couleur uniforme, il est facile d'y remédier : sélectionnez l'un des objets transparents, prenez l'outil Pipette (F7), assurez-vous que le bouton Opacité : Capturer est désactivé dans la barre des contrôles de la pipette et cliquez sur ce même objet. La couleur visible sera capturée et réassignée à l'objet mais cette fois, sans transparence. Répétez cette opération pour tous les objets transparents. Si votre objet transparent chevauche plusieurs zones de différentes couleurs uniformes, vous devrez le découper en morceaux (un morceau par zone) puis appliquer cette procédure à chacun des morceaux. Notez que l'outil Pipette ne change pas la valeur d'opacité de l'objet, mais seulement la valeur alpha de sa couleur de fond ou de contour ; assurez-vous donc que tous les objets ont une opacité de 100 % avant de commencer. + Les formats PostScript et EPS ne supportent pas la transparence, aussi vous ne devriez pas en utiliser si vous comptez exporter en PS/EPS. Dans le cas d'une transparence uniforme couvrant une couleur uniforme, il est facile d'y remédier : sélectionnez l'un des objets transparents, prenez l'outil Pipette (F7), assurez-vous que le bouton Opacité : Capturer est désactivé dans la barre de contrôle de la Pipette et cliquez sur ce même objet. La couleur visible sera capturée et réassignée à l'objet mais cette fois, sans transparence. Répétez cette opération pour tous les objets transparents. Si votre objet transparent chevauche plusieurs zones de différentes couleurs uniformes, vous devrez le découper en morceaux (un morceau par zone) puis appliquer cette procédure à chacun des morceaux. Notez que l'outil Pipette ne change pas la valeur d'opacité de l'objet, mais seulement la valeur alpha de sa couleur de fond ou de contour ; assurez-vous donc que tous les objets ont une opacité de 100 % avant de commencer. - + diff --git a/share/tutorials/tutorial-tracing.fr.svg b/share/tutorials/tutorial-tracing.fr.svg index 49accc44c..eb041f7f1 100644 --- a/share/tutorials/tutorial-tracing.fr.svg +++ b/share/tutorials/tutorial-tracing.fr.svg @@ -48,14 +48,14 @@ - Inkscape permet de vectoriser des images matricielles, pour en faire un <chemin> inséré dans votre dessin SVG. Ce didacticiel devrait vous aider à comprendre le fonctionnement de cet outil. + Inkscape permet de vectoriser des images matricielles, pour en faire un chemin (élément <path>) inséré dans votre dessin SVG. Ce didacticiel devrait vous aider à prendre en main l'outil. - À l'heure actuelle, Inkscape utilise le moteur de vectorisation de bitmap Potrace (potrace.sourceforge.net) créé par Peter Selinger. Dans le futur, nous espérons permettre l'utilisation d'autres programmes/moteurs de vectorisation ; pour le moment, cependant, cet excellent outil est plus que suffisant pour nos besoins. + À l'heure actuelle, Inkscape utilise le moteur de vectorisation d'images matricielles Potrace (potrace.sourceforge.net) créé par Peter Selinger. Dans le futur, nous espérons permettre l'utilisation d'autres programmes/moteurs de vectorisation ; pour le moment, cependant, cet excellent outil est plus que suffisant pour nos besoins. @@ -83,7 +83,7 @@ - Pour utiliser l'outil de vectorisation, ouvrez ou importez une image, sélectionnez-la, et lancez la commande Chemin > Vectoriser le bitmap ou appuyez sur Maj+Alt+B. + Pour utiliser l'outil de vectorisation, ouvrez ou importez une image, sélectionnez-la, et lancez la commande Chemin > Vectoriser un objet matriciel ou appuyez sur Maj+Alt+B. Options principales de vectorisation diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp index 1a87a9718..6276d3391 100644 --- a/src/ui/dialog/aboutbox.cpp +++ b/src/ui/dialog/aboutbox.cpp @@ -467,7 +467,8 @@ void AboutBox::initStrings() { "Adib Taraben , 2004-2014.\n" "Alan Monfort , 2009-2010.\n" "Alastair McKinstry , 2000.\n" -"Aleksandar Urošević , 2004-2006.\n" +"Aleksandar Marković , 2015.\n" +"Aleksandar Urošević , 2004-2009.\n" "Alessio Frusciante , 2002, 2003.\n" "Alexander Shopov , 2006.\n" "Alexandre Prokoudine , 2005, 2010-2014.\n" @@ -499,18 +500,19 @@ void AboutBox::initStrings() { "Cédric Gemy , 2006.\n" "Daniel Díaz , 2004.\n" "Didier Conchaudron , 2003.\n" -"Dimitris Spingos , 2011-2013.\n" +"Dimitris Spingos (Δημήτρης Σπίγγος) , 2011-2015.\n" "Dorji Tashi , 2006.\n" "Duarte Loreto 2002, 2003 (Maintainer).\n" "Elias Norberg , 2009.\n" "Equipe de Tradução Inkscape Brasil , 2007.\n" "Fatih Demir , 2000.\n" -"Firas Hanife , 2014-2015.\n" +"Firas Hanife , 2014-2016.\n" "Foppe Benedictus , 2007-2009.\n" "Francesc Dorca , 2003. Traducció sodipodi.\n" "Francisco Javier F. Serrador , 2003.\n" "Francisco Xosé Vázquez Grandal , 2001.\n" "Frederic Rodrigo , 2004-2005.\n" +"Ganesh Murmu , 2014.\n" "Ge'ez Frontier Foundation , 2002.\n" "George Boukeas , 2011.\n" "Heiko Wöhrle , 2014.\n" @@ -528,6 +530,7 @@ void AboutBox::initStrings() { "Jeroen van der Vegt , 2003, 2005, 2008.\n" "Jin-Hwan Jeong , 2009.\n" "Jonathan Ernst , 2006.\n" +"Jordi Mas i Hernàndez , 2015.\n" "Jose Antonio Salgueiro Aquino , 2003.\n" "Josef Vybiral , 2005-2006.\n" "Juarez Rudsatz , 2004.\n" @@ -542,10 +545,11 @@ void AboutBox::initStrings() { "Kingsley Turner , 2006.\n" "Kitae , 2006.\n" "Kjartan Maraas , 2000-2002.\n" -"Kris De Gussem , 2008-2014.\n" +"Kris De Gussem , 2008-2015.\n" "Lauris Kaplinski , 2000.\n" "Leandro Regueiro , 2006-2008, 2010.\n" "Liu Xiaoqin , 2008.\n" +"Louni Kandulna , 2014.\n" "Luca Bruno , 2005.\n" "Lucas Vieites Fariña, 2003-2013.\n" "Mahesh subedi , 2006.\n" @@ -561,8 +565,10 @@ void AboutBox::initStrings() { "Mufit Eribol , 2000.\n" "Muhammad Bashir Al-Noimi , 2008.\n" "Myckel Habets , 2008.\n" +"Nasreen , 2013.\n" "Nguyen Dinh Trung , 2007, 2008.\n" -"Nicolas Dufour , 2008-2014.\n" +"Nicolas Dufour , 2008-2016.\n" +"Paresh prabhu , 2013.\n" "Pawan Chitrakar , 2006.\n" "Przemysław Loesch , 2005.\n" "Quico Llach , 2000. Traducció sodipodi.\n" @@ -570,6 +576,8 @@ void AboutBox::initStrings() { "Riku Leino , 2006-2011.\n" "Rune Rønde Laursen , 2006.\n" "Ruud Steltenpool , 2006.\n" +"Sangeeta , 2011.\n" +"Savitha , 2013.\n" "Serdar Soytetir , 2005.\n" "shivaken , 2004.\n" "Shyam Krishna Bal , 2006.\n" @@ -577,8 +585,11 @@ void AboutBox::initStrings() { "Spyros Blanas , 2006, 2011.\n" "Stefan Graubner , 2005.\n" "Supranee Thirawatthanasuk , 2006.\n" +"Sushma Joshi , 2011.\n" +"Sveinn í Felli , 2014-2015.\n" +"Sylvain Chiron , 2016.\n" "Takeshi Aihana , 2000, 2001.\n" -"Tim Sheridan , 2007-2014.\n" +"Tim Sheridan , 2007-2016.\n" "Theppitak Karoonboonyanan , 2006.\n" "Thiago Pimentel , 2006.\n" "Toshifumi Sato , 2005.\n" @@ -592,6 +603,7 @@ void AboutBox::initStrings() { "Vital Khilko , 2003.\n" "Vitaly Lipatov , 2002, 2004.\n" "vonHalenbach , 2005.\n" +"vrundeshw , 2012.\n" "Waluyo Adi Siswanto , 2011.\n" "Wang Li , 2002.\n" "Wei-Lun Chao , 2006.\n" -- cgit v1.2.3 From 6ab54065345b9ad993f3d1dda202480cafd83258 Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Fri, 8 Jul 2016 23:38:34 +0200 Subject: Dutch translation update (bzr r15014) --- po/nl.po | 229 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 128 insertions(+), 101 deletions(-) diff --git a/po/nl.po b/po/nl.po index 2178d10dc..c0b77686e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -60,7 +60,7 @@ msgstr "" "Project-Id-Version: inkscape 0.92\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2016-06-08 09:06+0200\n" -"PO-Revision-Date: 2016-06-08 22:16+0100\n" +"PO-Revision-Date: 2016-07-08 23:37+0100\n" "Last-Translator: Kris De Gussem \n" "Language-Team: Dutch\n" "Language: nl\n" @@ -10314,7 +10314,7 @@ msgstr "Verplaatsingen verticaal spiegelen" #: ../src/live_effects/lpe-lattice2.cpp:49 msgid "Update while moving knots (maybe slow)" -msgstr "" +msgstr "Bijwerken tijdens knooppuntverplaatsing (kan traag zijn)" #: ../src/live_effects/lpe-lattice2.cpp:50 msgid "Control 0:" @@ -20259,11 +20259,11 @@ msgstr "Na toepassen afsnijpad/masker" #: ../src/ui/dialog/inkscape-preferences.cpp:1398 msgid "Ungroup automatically created groups" -msgstr "Automatisch aangemaakte groepen degroeperen" +msgstr "Automatisch aangemaakte groepen opheffen" #: ../src/ui/dialog/inkscape-preferences.cpp:1400 msgid "Ungroup groups created when setting clip/mask" -msgstr "Groepen gemaakt tijdens maskeren/afsnijden, degroeperen" +msgstr "Groepen gemaakt tijdens maskeren/afsnijden, opheffen" #: ../src/ui/dialog/inkscape-preferences.cpp:1402 msgid "Clippaths and masks" @@ -32784,9 +32784,8 @@ msgid "Please enter a replacement font in the replace all box." msgstr "Geef een vervanglettertype op in Alle lettertypen vervangen met." #: ../share/extensions/restack.py:75 -#, fuzzy msgid "There is no selection to restack." -msgstr "Er is geen selectie om te interpoleren" +msgstr "Er is geen selectie om te herstapelen." #: ../share/extensions/summersnight.py:41 msgid "" @@ -32862,9 +32861,8 @@ msgid "The directory \"%s\" does not exists." msgstr "De map \"%s\" bestaat niet." #: ../share/extensions/webslicer_export.py:76 -#, fuzzy msgid "No slicer layer found." -msgstr "Geen huidige laag." +msgstr "Geen afkniplaag gevonden." #: ../share/extensions/webslicer_export.py:106 #, python-format @@ -33695,7 +33693,6 @@ msgid "By name match" msgstr "Overeenkomst naam" #: ../share/extensions/dxf_outlines.inx.h:25 -#, fuzzy msgid "" "- AutoCAD Release 14 DXF format.\n" "- The base unit parameter specifies in what unit the coordinates are output " @@ -33713,7 +33710,7 @@ msgid "" msgstr "" "- AutoCAD versie 14 DXF-formaat.\n" "- De parameter basiseenheid specifiëert in welke eenheid de coördinaten " -"weggeschreven worden (90 px = 1 duim).\n" +"weggeschreven worden (96 px = 1 duim).\n" "- Ondersteunde elementen\n" " - paden (lijnstukken en splines)\n" " - rechthoeken\n" @@ -33823,13 +33820,12 @@ msgid "DVD Cover" msgstr "DVD voorblad" #: ../share/extensions/empty_dvd_cover.inx.h:2 -#, fuzzy msgid "DVD spine width:" -msgstr "Lijnbreedte" +msgstr "Rugbreedte:" #: ../share/extensions/empty_dvd_cover.inx.h:3 msgid "DVD cover bleed (mm):" -msgstr "" +msgstr "Deksel (mm):" #: ../share/extensions/empty_generic.inx.h:1 msgid "Generic Canvas" @@ -35612,9 +35608,8 @@ msgstr "" #: ../share/extensions/hpgl_output.inx.h:26 #: ../share/extensions/plotter.inx.h:54 -#, fuzzy msgid "Tool (Knife) offset correction (mm):" -msgstr "Gereedschapsafstand (mm):" +msgstr "Correctie gereedschapsafstand (mes) (mm):" #: ../share/extensions/hpgl_output.inx.h:27 #: ../share/extensions/plotter.inx.h:55 @@ -35695,34 +35690,35 @@ msgstr "Basis" #. render images like in 0.48 #: ../share/extensions/image_attributes.inx.h:5 msgid "Support non-uniform scaling" -msgstr "" +msgstr "Niet-uniforme schaling ondersteunen" #. render images like in 0.48 #: ../share/extensions/image_attributes.inx.h:7 msgid "Render images blocky" -msgstr "" +msgstr "Afbeelden gepixeleerd renderen" #. render images like in 0.48 #: ../share/extensions/image_attributes.inx.h:9 msgid "" "Render all bitmap images like in older Inskcape versions. Available options:" msgstr "" +"Alle afbeeldingen zoals in oudere Inkscapeversies renderen. Beschikbare " +"opties:" #. image aspect ratio #: ../share/extensions/image_attributes.inx.h:11 -#, fuzzy msgid "Image Aspect Ratio" -msgstr "Vereenvoudigen afbeelding" +msgstr "Aspectverhouding afbeelding" #. image aspect ratio #: ../share/extensions/image_attributes.inx.h:13 msgid "preserveAspectRatio attribute:" -msgstr "" +msgstr "preserveAspectRatio attribuut:" #. image aspect ratio #: ../share/extensions/image_attributes.inx.h:15 msgid "meetOrSlice:" -msgstr "" +msgstr "meetOrSlice:" #. image-rendering #: ../share/extensions/image_attributes.inx.h:17 @@ -35731,9 +35727,8 @@ msgstr "Bereik:" #. image-rendering #: ../share/extensions/image_attributes.inx.h:19 -#, fuzzy msgid "Unset" -msgstr "Vergroten" +msgstr "Uitzetten" #: ../share/extensions/image_attributes.inx.h:20 msgid "Change only selected image(s)" @@ -35856,12 +35851,12 @@ msgstr "Stijl interpoleren" #: ../share/extensions/interp.inx.h:7 #: ../share/extensions/interp_att_g.inx.h:10 msgid "Use Z-order" -msgstr "Z-orde gebruiken" +msgstr "Z-volgorde gebruiken" #: ../share/extensions/interp.inx.h:8 #: ../share/extensions/interp_att_g.inx.h:11 msgid "Workaround for reversed selection order in Live Preview cycles" -msgstr "" +msgstr "Workaround voor omgekeerde selectievolgorde in Live voorvertoning" #: ../share/extensions/interp_att_g.inx.h:1 msgid "Interpolate Attribute in a group" @@ -36839,16 +36834,15 @@ msgstr "Tekst op pad, einde" #: ../share/extensions/measure.inx.h:24 msgid "Fixed Text, Start of Path" -msgstr "" +msgstr "Vaste tekst, begin pad" #: ../share/extensions/measure.inx.h:25 msgid "Fixed Text, Center of BBox" -msgstr "" +msgstr "Vaste tekst, midden omvattend vak" #: ../share/extensions/measure.inx.h:26 -#, fuzzy msgid "Fixed Text, Center of Mass" -msgstr "Massacentrum" +msgstr "Vaste tekst, massacentrum" #: ../share/extensions/measure.inx.h:28 msgid "Center" @@ -36946,15 +36940,15 @@ msgstr "Volgend karakter bekijken" #: ../share/extensions/nicechart.inx.h:1 msgid "NiceCharts" -msgstr "" +msgstr "NiceCharts" #: ../share/extensions/nicechart.inx.h:2 msgid "Data" -msgstr "" +msgstr "Data" #: ../share/extensions/nicechart.inx.h:3 msgid "Data from file" -msgstr "Data uit bestand" +msgstr "Uit bestand" #: ../share/extensions/nicechart.inx.h:5 msgid "Delimiter:" @@ -36962,19 +36956,19 @@ msgstr "Scheidingsteken:" #: ../share/extensions/nicechart.inx.h:6 msgid "Column that contains the keys:" -msgstr "" +msgstr "Kolom met sleutelwoorden:" #: ../share/extensions/nicechart.inx.h:7 msgid "Column that contains the values:" -msgstr "Kolom met de waarden:" +msgstr "Kolom met waarden:" #: ../share/extensions/nicechart.inx.h:8 msgid "File encoding (e.g. utf-8):" -msgstr "" +msgstr "Bestandsencodering (vb. utf-8):" #: ../share/extensions/nicechart.inx.h:9 msgid "First line contains headings" -msgstr "" +msgstr "Eerste lijn bevat hoofding" #: ../share/extensions/nicechart.inx.h:10 msgid "Direct input" @@ -36982,7 +36976,7 @@ msgstr "Directe invoer" #: ../share/extensions/nicechart.inx.h:11 msgid "Data:" -msgstr "" +msgstr "Data:" #: ../share/extensions/nicechart.inx.h:12 msgid "Enter the full path to a CSV file:" @@ -36990,11 +36984,11 @@ msgstr "Volledig pad naar csv-bestand:" #: ../share/extensions/nicechart.inx.h:13 msgid "Type in comma separated values:" -msgstr "" +msgstr "Typ met komma gescheiden waarden:" #: ../share/extensions/nicechart.inx.h:14 msgid "(format like this: apples:3,bananas:5)" -msgstr "" +msgstr "(formatteer zoals: appels:3,bananen:5)" #: ../share/extensions/nicechart.inx.h:15 msgid "Labels" @@ -37010,43 +37004,39 @@ msgstr "Tekstkleur:" #: ../share/extensions/nicechart.inx.h:19 msgid "Charts" -msgstr "" +msgstr "Grafieken" #: ../share/extensions/nicechart.inx.h:20 msgid "Draw horizontally" msgstr "Horizontaal tekenen" #: ../share/extensions/nicechart.inx.h:21 -#, fuzzy msgid "Bar length:" -msgstr "Len_gte hoofdmarkering:" +msgstr "Lengte bar:" #: ../share/extensions/nicechart.inx.h:22 -#, fuzzy msgid "Bar width:" -msgstr "Vervagingsbreedte:" +msgstr "Breedte bar:" #: ../share/extensions/nicechart.inx.h:23 -#, fuzzy msgid "Pie radius:" -msgstr "Binnenstraal:" +msgstr "Straal:" #: ../share/extensions/nicechart.inx.h:24 -#, fuzzy msgid "Bar offset:" -msgstr "Verplaatsing blauw" +msgstr "Afstand bar" #: ../share/extensions/nicechart.inx.h:26 msgid "Offset between chart and labels:" -msgstr "" +msgstr "Afstand tussen grafiek en labels:" #: ../share/extensions/nicechart.inx.h:27 msgid "Offset between chart and chart title:" -msgstr "" +msgstr "Afstand tussen grafiek en grafiektitel:" #: ../share/extensions/nicechart.inx.h:28 msgid "Work around aliasing effects (creates overlapping segments)" -msgstr "" +msgstr "Workaround alisingeffecten (maakt overlappende segmenten)" #: ../share/extensions/nicechart.inx.h:29 msgid "Color scheme:" @@ -37057,18 +37047,16 @@ msgid "Custom colors:" msgstr "Aangepaste kleuren:" #: ../share/extensions/nicechart.inx.h:31 -#, fuzzy msgid "Reverse color scheme" -msgstr "Lijnkleur verwijderen" +msgstr "Kleurschema omkeren" #: ../share/extensions/nicechart.inx.h:32 -#, fuzzy msgid "Drop shadow" msgstr "Slagschaduw" #: ../share/extensions/nicechart.inx.h:37 msgid "SAP" -msgstr "" +msgstr "SAP" #: ../share/extensions/nicechart.inx.h:38 msgid "Values" @@ -37088,15 +37076,15 @@ msgstr "Bargrafiek" #: ../share/extensions/nicechart.inx.h:42 msgid "Pie chart" -msgstr "" +msgstr "Taartdiagram" #: ../share/extensions/nicechart.inx.h:43 msgid "Pie chart (percentage)" -msgstr "" +msgstr "Taartdiagram (percentage)" #: ../share/extensions/nicechart.inx.h:44 msgid "Stacked bar chart" -msgstr "" +msgstr "Gestapelde bargrafiek" #: ../share/extensions/param_curves.inx.h:1 msgid "Parametric Curves" @@ -37964,9 +37952,8 @@ msgid "Based on Position" msgstr "Gebaseerd op positie" #: ../share/extensions/restack.inx.h:3 -#, fuzzy msgid "Presets" -msgstr "Aanwezigheid" +msgstr "Voorinstelling" #: ../share/extensions/restack.inx.h:6 msgid "Horizontal:" @@ -37977,9 +37964,8 @@ msgid "Vertical:" msgstr "Verticaal:" #: ../share/extensions/restack.inx.h:8 -#, fuzzy msgid "Restack Direction" -msgstr "Richting herstapelen:" +msgstr "Herstapelrichting" #: ../share/extensions/restack.inx.h:9 msgid "Left to Right (0)" @@ -38006,9 +37992,8 @@ msgid "Radial Inward" msgstr "Radiaal naar binnen" #: ../share/extensions/restack.inx.h:15 -#, fuzzy msgid "Object Reference Point" -msgstr "In-uit referentiepunt" +msgstr "Referentiepunt object" #: ../share/extensions/restack.inx.h:17 #: ../share/extensions/text_extract.inx.h:9 @@ -38030,20 +38015,19 @@ msgstr "Onderaan" #: ../share/extensions/restack.inx.h:21 msgid "Based on Z-Order" -msgstr "Gebaseerd op Z-orde" +msgstr "Gebaseerd op Z-volgorde" #: ../share/extensions/restack.inx.h:22 -#, fuzzy msgid "Restack Mode" -msgstr "Herstapelen" +msgstr "Herstapelmodus" #: ../share/extensions/restack.inx.h:23 msgid "Reverse Z-Order" -msgstr "Z-orde omkeren" +msgstr "Z-volgorde omkeren" #: ../share/extensions/restack.inx.h:24 msgid "Shuffle Z-Order" -msgstr "Z-orde shuffelen" +msgstr "Z-volgorde shuffelen" #: ../share/extensions/restack.inx.h:26 msgid "" @@ -38052,6 +38036,10 @@ msgid "" "objects inside a single selected group, or a selection of multiple objects " "on the current drawing level (layer or group)." msgstr "" +"Deze uitbreiding verandert de Z-volgorde volgens de positie op het canvas of " +"de huidige Z-volgorde. Selectie: de uitbreiding herstapelt ofwel objecten in " +"een geselecteerde groep of een selectie van meerdere objecten in het huidige " +"niveau (laag of groep)." #: ../share/extensions/restack.inx.h:27 #: ../share/extensions/ungroup_deep.inx.h:6 @@ -38071,13 +38059,12 @@ msgid "Minimum size:" msgstr "Minimum grootte:" #: ../share/extensions/rtree.inx.h:4 -#, fuzzy msgid "Omit redundant segments" -msgstr "Segmenten effenen" +msgstr "Redundate segmenten weglaten" #: ../share/extensions/rtree.inx.h:5 msgid "Lift pen for backward steps" -msgstr "" +msgstr "Pen opheffen voor stappen terug" #: ../share/extensions/rubberstretch.inx.h:1 msgid "Rubber Stretch" @@ -38098,7 +38085,6 @@ msgid "Optimized SVG Output" msgstr "Geoptimaliseerde SVG-uitvoer" #: ../share/extensions/scour.inx.h:3 -#, fuzzy msgid "Number of significant digits for coordinates:" msgstr "Aantal beduidende cijfers voor coördinaten:" @@ -38110,6 +38096,11 @@ msgid "" "\"3\" is specified, the coordinate 3.14159 is output as 3.14 while the " "coordinate 123.675 is output as 124." msgstr "" +"Bepaalt het aantal significante cijfers voor de coördinaten in de uitvoer. " +"Noteer dat het aantal significante cijfers *niet* het aantal decimalen zijn, " +"maar het totaal aantal cijfers in de uitvoer. Als bijvoorbeeld de waarde " +"\"3\" is opgegeven,- en de cördinaat is 3.14159, dan is 3.14 de uitvoer, " +"terwijl 123.675 weggeschreven wordt als 124." #: ../share/extensions/scour.inx.h:5 msgid "Shorten color values" @@ -38120,6 +38111,7 @@ msgid "" "Convert all color specifications to #RRGGBB (or #RGB where applicable) " "format." msgstr "" +"Alle kleurspecificaties naar #RRGGBB (of #RGB indien toepasbaar) omzetten." #: ../share/extensions/scour.inx.h:7 msgid "Convert CSS attributes to XML attributes" @@ -38130,17 +38122,20 @@ msgid "" "Convert styles from style tags and inline style=\"\" declarations into XML " "attributes." msgstr "" +"Stijlen uit stijltags en inline style=\"\" declaraties omzetten in XML-" +"attributen." #: ../share/extensions/scour.inx.h:9 -#, fuzzy msgid "Collapse groups" -msgstr "Alles samenvouwen" +msgstr "Groepen opheffen" #: ../share/extensions/scour.inx.h:10 msgid "" "Remove useless groups, promoting their contents up one level. Requires " "\"Remove unused IDs\" to be set." msgstr "" +"Onnodige groepen verwijderen zondat hun inhoud één niveau hoger komt. " +"Hiervoor moet \"Ongebruikte ID's verwijderen\" aangevinkt zijn." #: ../share/extensions/scour.inx.h:11 msgid "Create groups for similar attributes" @@ -38151,6 +38146,8 @@ msgid "" "Create groups for runs of elements having at least one attribute in common " "(e.g. fill-color, stroke-opacity, ...)." msgstr "" +"Groepen voor elementen creëren die tenminsten één attribuut " +"gemeenschappelijk hebben (vb. vulkleur, lijnondoorzichtigheid, etc.)." #: ../share/extensions/scour.inx.h:13 msgid "Keep editor data" @@ -38161,14 +38158,16 @@ msgid "" "Don't remove editor-specific elements and attributes. Currently supported: " "Inkscape, Sodipodi and Adobe Illustrator." msgstr "" +"Editorspecifieke elementen en attributen niet verwijderen. Worden " +"ondersteund: Inkscape, Sodipodi en Adobe Illustrator." #: ../share/extensions/scour.inx.h:15 msgid "Keep unreferenced definitions" -msgstr "" +msgstr "Ongebruikte definities behouden" #: ../share/extensions/scour.inx.h:16 msgid "Keep element definitions that are not currently used in the SVG" -msgstr "" +msgstr "Definities behouden die op dit ogenblik niet in de SVG gebruikt worden" #: ../share/extensions/scour.inx.h:17 msgid "Work around renderer bugs" @@ -38179,6 +38178,8 @@ msgid "" "Works around some common renderer bugs (mainly libRSVG) at the cost of a " "slightly larger SVG file." msgstr "" +"Rond vaak voorkomende renderbugs werken (vooral libRSVG) ten koste van een " +"iets grotere SVG." #: ../share/extensions/scour.inx.h:20 msgid "Remove the XML declaration" @@ -38190,6 +38191,9 @@ msgid "" "especially if special characters are used in the document) from the file " "header." msgstr "" +"Verwijdert de XML-declaratie (die optioneel is, maar opgegeven kan worden, " +"vooral indien speciale karakters in het document gebruikt worden) van de " +"bestandshoofding." #: ../share/extensions/scour.inx.h:22 msgid "Remove metadata" @@ -38201,6 +38205,9 @@ msgid "" "include license and author information, alternate versions for non-SVG-" "enabled browsers, etc." msgstr "" +"Metadatatags verwijderen met alle inhoud verwijderen, die licentie- en " +"auteursinformatie, alternatieve versies voor niet-SVG-browsers, etc. kunnen " +"bevatten." #: ../share/extensions/scour.inx.h:24 msgid "Remove comments" @@ -38208,7 +38215,7 @@ msgstr "Opmerkingen verwijderen" #: ../share/extensions/scour.inx.h:25 msgid "Remove all XML comments from output." -msgstr "" +msgstr "Alle XML-commentaren in de uitvoer weghalen." #: ../share/extensions/scour.inx.h:26 msgid "Embed raster images" @@ -38219,6 +38226,8 @@ msgid "" "Resolve external references to raster images and embed them as Base64-" "encoded data URLs." msgstr "" +"Externe referenties naar rasterafbeeldingen aanpassen en invoegen als Base64-" +"geëncodeerde data-URL's." #: ../share/extensions/scour.inx.h:28 msgid "Enable viewboxing" @@ -38230,10 +38239,12 @@ msgid "" "Set page size to 100%/100% (full width and height of the display area) and " "introduce a viewBox specifying the drawings dimensions." msgstr "" +"Paginagrootte instellen als 100%/100% (volle breedte en hoogte van " +"afbeeldingsbereik) en een viewbox introduceren om de dimensies op te geven." #: ../share/extensions/scour.inx.h:31 msgid "Format output with line-breaks and indentation" -msgstr "" +msgstr "Uitvoer formatteren met line-breaks and inspringing" #: ../share/extensions/scour.inx.h:32 msgid "" @@ -38241,11 +38252,13 @@ msgid "" "to hand-edit the SVG file you can disable this option to bring down the file " "size even more at the cost of clarity." msgstr "" +"Keurig geformatteerde uitvoer produceren met line-breaks. Indien je niet van " +"plan bent om de SVG met de hand aan te passen, kan je deze optie " +"uitschakelen om de bestandsgrootte te reduceren ten koste van leesbaarheid." #: ../share/extensions/scour.inx.h:33 -#, fuzzy msgid "Indentation characters:" -msgstr "Unicodeteken:" +msgstr "Inspringingskarakters:" #: ../share/extensions/scour.inx.h:34 msgid "" @@ -38253,21 +38266,26 @@ msgid "" "Specify \"None\" to disable indentation. This option has no effect if " "\"Format output with line-breaks and indentation\" is disabled." msgstr "" +"Het type inspringing dat voor ieder niveau in de uitvoer gebruikt wordt. " +"Geef \"Geen\" op om inspringing uit te schakelen. Deze optie heeft geen " +"effect indien \"Uitvoer formatteren met line-breaks and inspringing\" " +"uitgeschakeld is." #: ../share/extensions/scour.inx.h:35 -#, fuzzy msgid "Depth of indentation:" -msgstr "Dieptefunctie:" +msgstr "Inspringingsdiepte:" #: ../share/extensions/scour.inx.h:36 msgid "" "The depth of the chosen type of indentation. E.g. if you choose \"2\" every " "nesting level in the output will be indented by two additional spaces/tabs." msgstr "" +"Diepte van de gekozen inspringing. Indien je bijvoorbeeld \"2\" opgeeft, zal " +"elk niveau in de uitvoer met 2 extra spaties/tabs inspringen." #: ../share/extensions/scour.inx.h:37 msgid "Strip the \"xml:space\" attribute from the root SVG element" -msgstr "" +msgstr "Het \"xml:space\" attribuut van het hoofd-SVG-element strippen" #: ../share/extensions/scour.inx.h:38 msgid "" @@ -38275,6 +38293,10 @@ msgid "" "root SVG element which instructs the SVG editor not to change whitespace in " "the document at all (and therefore overrides the options above)." msgstr "" +"Dit is bruikbaar indien het invoerbestand \"xml:space='preserve'\" " +"specifieert in het hoofd-SVG-element, dat verhindert dat de SVG-bewerker " +"witruimte in het document niet mag wijzigen (en bijgevolg bovenstaande " +"opties overschrijft)." #: ../share/extensions/scour.inx.h:39 msgid "Document options" @@ -38282,7 +38304,7 @@ msgstr "Documenteigenschappen" #: ../share/extensions/scour.inx.h:40 msgid "Pretty-printing" -msgstr "" +msgstr "Pretty-printing" #: ../share/extensions/scour.inx.h:41 msgid "Space" @@ -38310,6 +38332,8 @@ msgid "" "Remove all unreferenced IDs from elements. Those are not needed for " "rendering." msgstr "" +"Alle ongebruikte ID's van elementen verwijderen. Deze worden niet voor " +"rendering gebruikt." #: ../share/extensions/scour.inx.h:47 msgid "Shorten IDs" @@ -38321,17 +38345,20 @@ msgid "" "shortest values to the most-referenced elements. For instance, " "\"linearGradient5621\" will become \"a\" if it is the most used element." msgstr "" +"De lengte van ID's minimaliseren door hoofdletters te vermijden en de " +"kortste waarde te gebruiken voor de meest gerefereerde elementen. Zo wordt " +"bijvoorbeeld \"linearGradient5621\" \"a\" indien het het meest gebruikte " +"element is." #: ../share/extensions/scour.inx.h:49 msgid "Prefix shortened IDs with:" -msgstr "" +msgstr "Prefix afgekorte ID's:" #: ../share/extensions/scour.inx.h:50 msgid "Prepend shortened IDs with the specified prefix." -msgstr "" +msgstr "Afgekorte ID's vooraf laten gaan door deze prefix." #: ../share/extensions/scour.inx.h:51 -#, fuzzy msgid "Preserve manually created IDs not ending with digits" msgstr "Manueel gemaakte ID-namen die niet eindigen met cijfers, behouden" @@ -38342,28 +38369,31 @@ msgid "" "preserved while numbered IDs (as they are generated by most SVG editors " "including Inkscape) will be removed/shortened." msgstr "" +"Beschrijvende ID's die manueel gemaakt werden om naar specifieke elementen " +"of groepen te refereren of te labelen (bv. #arrowStart, #arrowEnd or " +"#textLabels), blijven behouden, terwijl genummerde ID's (zoals deze door de " +"meeste SVG-bewerkers, inclusief Inkscape, aangemaakt worden) verwijderd/" +"afgekort worden." #: ../share/extensions/scour.inx.h:53 -#, fuzzy msgid "Preserve the following IDs:" -msgstr "" -"Volgende lettertypes gevonden:\n" -"%s" +msgstr "Volgende ID's behouden:" #: ../share/extensions/scour.inx.h:54 msgid "A comma-separated list of IDs that are to be preserved." -msgstr "" +msgstr "Een kommagescheiden lijst van ID's die behouden worden." #: ../share/extensions/scour.inx.h:55 -#, fuzzy msgid "Preserve IDs starting with:" -msgstr "ID namen behouden die beginnen met:" +msgstr "ID's behouden die beginnen met:" #: ../share/extensions/scour.inx.h:56 msgid "" "Preserve all IDs that start with the specified prefix (e.g. specify \"flag\" " "to preserve \"flag-mx\", \"flag-pt\", etc.)." msgstr "" +"ID's behouden die starten met de volgende prefix (vb. geef \"flag\" op om " +"\"flag-mx\", \"flag-pt\", etc. te behouden)." #: ../share/extensions/scour.inx.h:57 msgid "Optimized SVG (*.svg)" @@ -38374,9 +38404,8 @@ msgid "Scalable Vector Graphics" msgstr "Scalable Vector Graphics" #: ../share/extensions/seamless_pattern.inx.h:1 -#, fuzzy msgid "Seamless Pattern" -msgstr "Braillepatronen" +msgstr "Naadloos patroon" #: ../share/extensions/seamless_pattern.inx.h:2 #: ../share/extensions/seamless_pattern_procedural.inx.h:2 @@ -38389,9 +38418,8 @@ msgid "Custom Height (px):" msgstr "Aangepaste hoogte (px):" #: ../share/extensions/seamless_pattern.inx.h:4 -#, fuzzy msgid "This extension overwrites the current document" -msgstr "Symbool uit huidig document verwijderen." +msgstr "Deze uitbreiding overschrijft het huidig document" #: ../share/extensions/seamless_pattern_procedural.inx.h:1 msgid "Seamless Pattern Procedural" @@ -38896,9 +38924,8 @@ msgid "From Side c and Angles a, b" msgstr "Gebruik zijde c en hoeken a en b" #: ../share/extensions/ungroup_deep.inx.h:1 -#, fuzzy msgid "Deep Ungroup" -msgstr "Groep opheffen" +msgstr "Alles degroeperen" #: ../share/extensions/ungroup_deep.inx.h:2 msgid "Ungroup all groups in the selected object." -- cgit v1.2.3 From 1ba616c66fa080af9f6afc94af4e16247ed2dada Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sun, 10 Jul 2016 18:38:29 +0200 Subject: Comment out unused enum. (bzr r15015) --- src/xml/event.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/xml/event.h b/src/xml/event.h index 73e68daeb..f6b734c29 100644 --- a/src/xml/event.h +++ b/src/xml/event.h @@ -33,13 +33,13 @@ namespace XML { /** * @brief Enumeration of all XML event types */ -enum EventType { - EVENT_ADD, ///< Child added - EVENT_DEL, ///< Child removed - EVENT_CHG_ATTR, ///< Attribute changed - EVENT_CHG_CONTENT, ///< Content changed - EVENT_CHG_ORDER ///< Order of children changed -}; +// enum EventType { +// EVENT_ADD, ///< Child added +// EVENT_DEL, ///< Child removed +// EVENT_CHG_ATTR, ///< Attribute changed +// EVENT_CHG_CONTENT, ///< Content changed +// EVENT_CHG_ORDER ///< Order of children changed +// }; /** * @brief Generic XML modification event -- cgit v1.2.3 From 017a9a82eaaaa643535f1405236c06927dd9d9d4 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Wed, 13 Jul 2016 23:45:05 +0200 Subject: Translations: Update German .po file Includes *a lot* of new and improved translations by Maren Hachmann (bzr r15016) --- po/de.po | 2878 +++++++++++++++++++++++++++++--------------------------------- 1 file changed, 1338 insertions(+), 1540 deletions(-) diff --git a/po/de.po b/po/de.po index 0eb36f400..7c2ad38ba 100644 --- a/po/de.po +++ b/po/de.po @@ -15,18 +15,18 @@ # Alexander Senger , 2009. # Benjamin Weis , 2014. # Heiko Wöhrle , 2014. -# Eduard Braun , 2015. # Sönke Roggatz , 2015. -# Maren Hachmann , 2015. +# Maren Hachmann , 2015, 2016. +# Eduard Braun , 2015-2016. #: ../src/ui/dialog/clonetiler.cpp:1010 msgid "" msgstr "" "Project-Id-Version: inkscape\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2016-06-02 12:12+0200\n" -"PO-Revision-Date: 2015-12-01 00:26+0100\n" +"POT-Creation-Date: 2016-06-08 09:06+0200\n" +"PO-Revision-Date: 2016-06-18 03:02+0200\n" "Last-Translator: Maren Hachmann \n" -"Language-Team: German <>\n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,6 +52,10 @@ msgid "" "Illustrator, CorelDraw, or Xara X, using the W3C standard Scalable Vector " "Graphics (SVG) file format." msgstr "" +"Inkscape ist ein quelloffenes Programm zum Bearbeiten von Vektorgrafiken im " +"vom W3C standardisierten SVG-Dateiformat (Scalable Vector Graphics), das " +"über ähnliche Funktionen wie Adobe Illustrator, CorelDraw oder Xara X " +"verfügt." #: ../inkscape.appdata.xml.in.h:4 msgid "" @@ -61,11 +65,15 @@ msgid "" "trace bitmaps and much more. We also aim to maintain a thriving user and " "developer community by using open, community-oriented development." msgstr "" +"Inkscape unterstützt viele fortgeschrittene SVG-Eigenschaften " +"(Knotenmarkierungen, Klone, Alpha Blending usw.) und legt viel Wert auf eine " +"auf übliche Arbeitsabläufe optimierte Benutzeroberfläche. Knotenbearbeitung, " +"komplexe Pfadoperationen, das Vektorisieren von Rastergrafiken und noch " +"vieles mehr lassen sich so ganz einfach ausführen." #: ../inkscape.appdata.xml.in.h:5 -#, fuzzy msgid "Main application window" -msgstr "Fenster d_uplizieren" +msgstr "Hauptfenster" #: ../inkscape.desktop.in.h:3 msgid "Inkscape Vector Graphics Editor" @@ -77,7 +85,7 @@ msgstr "Skalierbare Vektorgrafiken erstellen und bearbeiten" #: ../inkscape.desktop.in.h:5 msgid "image;editor;vector;drawing;" -msgstr "" +msgstr "image;editor;vector;drawing;" #: ../inkscape.desktop.in.h:6 msgid "New Drawing" @@ -85,7 +93,7 @@ msgstr "Neue Zeichnung" #: ../share/filters/filters.svg.h:2 msgid "Smart Jelly" -msgstr "schmuckes Gelee" +msgstr "Schmuckes Gelee" #: ../share/filters/filters.svg.h:3 ../share/filters/filters.svg.h:7 #: ../share/filters/filters.svg.h:15 ../share/filters/filters.svg.h:31 @@ -3378,7 +3386,7 @@ msgstr "Sand (Bitmap)" #: ../share/patterns/patterns.svg.h:1 msgid "Cloth (bitmap)" -msgstr "Stoff (Bitmap" +msgstr "Stoff (Bitmap)" #: ../share/patterns/patterns.svg.h:1 msgid "Old paint (bitmap)" @@ -4044,13 +4052,13 @@ msgstr "Verzögerung" #: ../share/symbols/symbols.h:175 msgctxt "Symbol" msgid "Loop Limit Begin" -msgstr "Schleifen Limit Anfang" +msgstr "Schleifen-Anfang" #. Symbols: ./FlowSymbols.svg #: ../share/symbols/symbols.h:176 msgctxt "Symbol" msgid "Loop Limit End" -msgstr "Schleifen Limit Ende" +msgstr "Schleifen-Ende" #. Symbols: ./LogicSymbols.svg #: ../share/symbols/symbols.h:177 @@ -4423,7 +4431,7 @@ msgstr "Einfache CD-Beschriftungsvorlage mit CD-Rändern" # key words for search #: ../share/templates/templates.h:1 msgid "CD label 120x120 disc disk" -msgstr "CD Label Etikett 120x120 DVD" +msgstr "CD-Etikett 120x120 DVD" #: ../share/templates/templates.h:1 msgid "No Layers" @@ -4445,6 +4453,7 @@ msgstr "LaTeX Beamer" msgid "LaTeX beamer template with helping grid." msgstr "Vorlage für LaTeX Beamer mit Hilfsgitter." +# The original appears to be a bit redundant, but I don't know enough about LaTex. #: ../share/templates/templates.h:1 msgid "LaTex LaTeX latex grid beamer" msgstr "LaTex LaTeX latex Gitter Beamer" @@ -4467,17 +4476,17 @@ msgstr "Arbeitsfläche mit Hilfslinien für Typografie" msgid "3D Box" msgstr "3D-Box" -#: ../src/color-profile.cpp:842 +#: ../src/color-profile.cpp:856 #, c-format msgid "Color profiles directory (%s) is unavailable." msgstr "Farbprofilverzeichnis (%s) ist nicht verfügbar." -#: ../src/color-profile.cpp:901 ../src/color-profile.cpp:918 +#: ../src/color-profile.cpp:928 ../src/color-profile.cpp:945 msgid "(invalid UTF-8 string)" msgstr "(ungültiger UTF-8 string)" # CHECK -#: ../src/color-profile.cpp:903 +#: ../src/color-profile.cpp:930 msgctxt "Profile name" msgid "None" msgstr "Kein" @@ -4577,12 +4586,12 @@ msgstr "Winkel der Z-Achse" #: ../src/display/canvas-axonomgrid.cpp:374 ../src/display/canvas-grid.cpp:713 msgid "Minor grid line _color:" -msgstr "Nebengitter-Linienfarbe:" +msgstr "Nebengitterlinienfarbe:" #: ../src/display/canvas-axonomgrid.cpp:374 ../src/display/canvas-grid.cpp:713 #: ../src/ui/dialog/inkscape-preferences.cpp:775 msgid "Minor grid line color" -msgstr "Nebengitter-Linienfarbe:" +msgstr "Nebengitterlinienfarbe:" #: ../src/display/canvas-axonomgrid.cpp:374 ../src/display/canvas-grid.cpp:713 msgid "Color of the minor grid lines" @@ -4693,11 +4702,11 @@ msgstr "Gitternetzlinie" #: ../src/display/snap-indicator.cpp:82 msgid "grid intersection" -msgstr "Gitter-Überschneidung" +msgstr "Gitterüberschneidung" #: ../src/display/snap-indicator.cpp:85 msgid "grid line (perpendicular)" -msgstr "Gitterlinie (Senkrechte)" +msgstr "Gitterlinie (senkrecht)" #: ../src/display/snap-indicator.cpp:88 msgid "guide" @@ -4705,7 +4714,7 @@ msgstr "Hilfslinie" #: ../src/display/snap-indicator.cpp:91 msgid "guide intersection" -msgstr "Gitter-Überschneidung" +msgstr "Hilfslinienüberschneidung" #: ../src/display/snap-indicator.cpp:94 msgid "guide origin" @@ -4713,7 +4722,7 @@ msgstr "Hilfslinienursprung" #: ../src/display/snap-indicator.cpp:97 msgid "guide (perpendicular)" -msgstr "Hilfslinie (Senkrechte)" +msgstr "Hilfslinie (senkrecht)" #: ../src/display/snap-indicator.cpp:100 msgid "grid-guide intersection" @@ -4807,13 +4816,14 @@ msgstr "Textanker" msgid "text baseline" msgstr "Text-Grundlinie" +# Does this refer to holding Ctrl down while moving a snappable object? #: ../src/display/snap-indicator.cpp:170 msgid "constrained angle" -msgstr "abhängiger Winkel" +msgstr "winkelbeschränkt" #: ../src/display/snap-indicator.cpp:173 msgid "constraint" -msgstr "erzwungen" +msgstr "beschränkt" #: ../src/display/snap-indicator.cpp:187 msgid "Bounding box corner" @@ -4982,8 +4992,8 @@ msgid "" " This is caused by an improper .inx file for this extension. An improper ." "inx file could have been caused by a faulty installation of Inkscape." msgstr "" -" Dies wurde durch eine fehlerhafte ».inx«-Datei für diese Erweiterung " -"verursacht. Eine fehlerhafte .inx Datei kann Folge einer Fehlinstallation " +" Dies wurde durch eine fehlerhafte „.inx“-Datei für diese Erweiterung " +"verursacht. Eine fehlerhafte „.inx“-Datei kann Folge einer Fehlinstallation " "von Inkscape sein." #: ../src/extension/extension.cpp:277 @@ -5060,7 +5070,7 @@ msgstr "" "Inkscape-Webseite oder wenden Sie sich an die Mailingliste, wenn Sie Fragen " "zu dieser Erweiterung haben." -#: ../src/extension/implementation/script.cpp:1108 +#: ../src/extension/implementation/script.cpp:1111 msgid "" "Inkscape has received additional data from the script executed. The script " "did not return an error, but this may indicate the results will not be as " @@ -5207,7 +5217,7 @@ msgstr "Schrotrauschen" #: ../src/extension/internal/bitmap/addNoise.cpp:60 msgid "Add random noise to selected bitmap(s)" -msgstr "Füge den Bitmap(s) zufälliges Rauschen hinzu" +msgstr "Fügt den Bitmap(s) zufälliges Rauschen hinzu" #: ../src/extension/internal/bitmap/blur.cpp:38 #: ../src/extension/internal/filter/blurs.h:54 @@ -5235,7 +5245,7 @@ msgstr "Radius:" #: ../src/extension/internal/bitmap/sharpen.cpp:41 #: ../src/extension/internal/bitmap/unsharpmask.cpp:44 msgid "Sigma:" -msgstr "Sigma" +msgstr "Sigma:" #: ../src/extension/internal/bitmap/blur.cpp:47 msgid "Blur selected bitmap(s)" @@ -5247,7 +5257,7 @@ msgstr "Kanal" #: ../src/extension/internal/bitmap/channel.cpp:50 msgid "Layer:" -msgstr "Ebene" +msgstr "Ebene:" #: ../src/extension/internal/bitmap/channel.cpp:51 #: ../src/extension/internal/bitmap/levelChannel.cpp:55 @@ -5323,7 +5333,7 @@ msgstr "Kontrast" #: ../src/extension/internal/bitmap/contrast.cpp:42 msgid "Adjust:" -msgstr "Anpassen" +msgstr "Anpassen:" #: ../src/extension/internal/bitmap/contrast.cpp:48 msgid "Increase or decrease contrast in bitmap(s)" @@ -5909,7 +5919,7 @@ msgstr "Corel DRAW Komprimierte Exchange Datei (.ccx)" #: ../src/extension/internal/cdr-input.cpp:325 msgid "Open compressed exchange files saved in Corel DRAW" msgstr "" -"Öffnen einer komprimierten Exchange Datei, die in Corel DRAW gespeichert " +"Öffnen einer komprimierten Exchange-Datei, die in Corel DRAW gespeichert " "wurde" #: ../src/extension/internal/cdr-input.cpp:332 @@ -6431,7 +6441,7 @@ msgstr "Spot" #: ../src/extension/internal/filter/bumps.h:109 msgid "Distant light options" -msgstr "Entfernte Lichtoptionen" +msgstr "Optionen für entfernte Lichtquelle" #: ../src/extension/internal/filter/bumps.h:110 #: ../src/extension/internal/filter/bumps.h:332 @@ -6466,7 +6476,7 @@ msgstr "Z (Quelle)" #: ../src/extension/internal/filter/bumps.h:116 msgid "Spot light options" -msgstr "Punktlicht-Optionen" +msgstr "Spotlight-Optionen" #: ../src/extension/internal/filter/bumps.h:120 msgid "X target" @@ -6525,11 +6535,11 @@ msgstr "Hintergrund-Deckkraft" #: ../src/extension/internal/filter/bumps.h:327 #: ../src/extension/internal/filter/color.h:1115 msgid "Lighting" -msgstr "Blitz" +msgstr "Beleuchtung" #: ../src/extension/internal/filter/bumps.h:334 msgid "Lighting blend:" -msgstr "Blitz-Mischung:" +msgstr "Beleuchtungs-Mischung:" #: ../src/extension/internal/filter/bumps.h:341 msgid "Highlight blend:" @@ -6691,7 +6701,7 @@ msgstr "Mischen 2:" #: ../src/extension/internal/filter/color.h:425 msgid "Blend image or object with a flood color" -msgstr "Mischt Bild oder Objekt mit einer fließenden Farbe" +msgstr "Mischt Bild oder Objekt mit einer Füllfarbe" #: ../src/extension/internal/filter/color.h:499 ../src/filter-enums.cpp:23 msgid "Component Transfer" @@ -6717,7 +6727,7 @@ msgstr "Getrennt" #: ../src/live_effects/lpe-interpolate_points.cpp:25 #: ../src/live_effects/lpe-powerstroke.cpp:133 msgid "Linear" -msgstr "Linie" +msgstr "Linear" #: ../src/extension/internal/filter/color.h:506 ../src/filter-enums.cpp:114 msgid "Gamma" @@ -6725,7 +6735,7 @@ msgstr "Gamma" #: ../src/extension/internal/filter/color.h:515 msgid "Basic component transfer structure" -msgstr "Basis-Komponente Transferstruktur" +msgstr "Basiskomponenten-Transferstruktur" #: ../src/extension/internal/filter/color.h:584 msgid "Duochrome" @@ -6737,7 +6747,7 @@ msgstr "Fluoreszenz-Level" #: ../src/extension/internal/filter/color.h:589 msgid "Swap:" -msgstr "Tausch:" +msgstr "Vertauschen:" #: ../src/extension/internal/filter/color.h:590 msgid "No swap" @@ -6885,7 +6895,7 @@ msgstr "Transparenz invertieren" #: ../src/extension/internal/filter/color.h:999 msgid "Manage hue, lightness and transparency inversions" -msgstr "Verwalten Farbton, Helligkeit und Transparenz-Umkehrungen" +msgstr "Farbton, Helligkeit und Transparenz-Umkehrungen verwalten" #: ../src/extension/internal/filter/color.h:1117 msgid "Lights" @@ -6907,11 +6917,11 @@ msgstr "Versatz" #: ../src/extension/internal/filter/color.h:1127 msgid "Modify lights and shadows separately" -msgstr "Licht und Schatten einzeln verändern" +msgstr "Lichter und Schatten einzeln verändern" #: ../src/extension/internal/filter/color.h:1186 msgid "Lightness-Contrast" -msgstr "Helligkeit - Kontrast" +msgstr "Helligkeit / Kontrast" #: ../src/extension/internal/filter/color.h:1197 msgid "Modify lightness and contrast separately" @@ -6959,8 +6969,8 @@ msgid "" "Nudge RGB channels separately and blend them to different types of " "backgrounds" msgstr "" -"Präzisionsausrichtung nach RGB-Kanälen getrennt und mischt sie zu " -"verschiedenen Typen von Hintergründen" +"Präzisionsausrichtung nach RGB-Kanälen getrennt; mischt sie zu verschiedenen " +"Typen von Hintergründen" #: ../src/extension/internal/filter/color.h:1377 msgid "Nudge CMY" @@ -6968,23 +6978,23 @@ msgstr "Präzisionsausrichtung RGB" #: ../src/extension/internal/filter/color.h:1381 msgid "Cyan offset" -msgstr "Blau-Versatz" +msgstr "Cyan-Verschiebung" #: ../src/extension/internal/filter/color.h:1384 msgid "Magenta offset" -msgstr "Rot-Versatz" +msgstr "Magenta-Verschiebung" #: ../src/extension/internal/filter/color.h:1387 msgid "Yellow offset" -msgstr "Gelb-Versatz" +msgstr "Gelb-Verschiebung" #: ../src/extension/internal/filter/color.h:1402 msgid "" "Nudge CMY channels separately and blend them to different types of " "backgrounds" msgstr "" -"Präzisionsausrichtung nach RGB-Kanälen getrennt und mischt sie zu " -"verschiedenen Typen von Hintergründen" +"Präzisionsausrichtung nach CMY-Kanälen getrennt; mischt sie zu verschiedenen " +"Typen von Hintergründen" #: ../src/extension/internal/filter/color.h:1483 msgid "Quadritone fantasy" @@ -6992,7 +7002,7 @@ msgstr "Vierfarben-Fantasie" #: ../src/extension/internal/filter/color.h:1485 msgid "Hue distribution (°)" -msgstr "Farbton Verteilung (°)" +msgstr "Farbtonverteilung (°)" #: ../src/extension/internal/filter/color.h:1486 #: ../share/extensions/svgcalendar.inx.h:19 @@ -7057,15 +7067,15 @@ msgstr "Globales Licht" #: ../src/extension/internal/filter/color.h:1683 msgid "Hue distribution (°):" -msgstr "Farbton Verteilung (°):" +msgstr "Farbtonverteilung (°):" #: ../src/extension/internal/filter/color.h:1694 msgid "" "Create a custom tritone palette with additional glow, blend modes and hue " "moving" msgstr "" -"Erstellt eine benutzerdefinierte Tritonus-Palette mit zusätzlichen Glanz, " -"Füllmethoden und Farbton-Bewegung" +"Erstellt eine benutzerdefinierte Tritonus-Palette mit zusätzlichem Glanz, " +"Mischmodi und Farbtonverschiebung" #: ../src/extension/internal/filter/distort.h:67 msgid "Felt Feather" @@ -7091,7 +7101,7 @@ msgstr "Breit" #: ../src/extension/internal/filter/distort.h:80 #: ../src/extension/internal/filter/textures.h:78 msgid "Narrow" -msgstr "eng" +msgstr "Schmal" #: ../src/extension/internal/filter/distort.h:81 msgid "No fill" @@ -7248,7 +7258,7 @@ msgstr "Inhalt verwischen" #: ../src/extension/internal/filter/morphology.h:79 msgid "Smooth edges and angles of shapes" -msgstr "Glatte Kanten und Ecken von Formen" +msgstr "Kanten und Ecken von Formen glätten" #: ../src/extension/internal/filter/morphology.h:166 msgid "Outline" @@ -7264,7 +7274,7 @@ msgstr "Bild ausblenden" #: ../src/extension/internal/filter/morphology.h:172 msgid "Composite type:" -msgstr "Gemischter Typ" +msgstr "Mischtyp:" #: ../src/extension/internal/filter/morphology.h:173 ../src/filter-enums.cpp:88 msgid "Over" @@ -7447,7 +7457,7 @@ msgstr "Kornmischung:" #: ../src/extension/internal/filter/paint.h:116 msgid "Chromo effect with customizable edge drawing and graininess" -msgstr "Chromeffekt mit anpassbarer Kantenzeichnung und Körnigkeit" +msgstr "Chromoeffekt mit anpassbarer Kantenzeichnung und Körnigkeit" #: ../src/extension/internal/filter/paint.h:232 msgid "Cross Engraving" @@ -7549,7 +7559,7 @@ msgstr "Geglättet" #: ../src/extension/internal/filter/paint.h:588 msgid "Contrasted" -msgstr "Abgestochen" +msgstr "Kontrastiert" #: ../src/extension/internal/filter/paint.h:591 #: ../src/live_effects/lpe-jointype.cpp:54 @@ -7564,7 +7574,7 @@ msgstr "Mischmodus:" #: ../src/extension/internal/filter/paint.h:605 msgid "Posterize and draw smooth lines around color shapes" -msgstr "Posterisiere und zeichne weicle Linien um farbige Formen herum" +msgstr "Posterisiere und zeichne weiche Linien um farbige Formen herum" #: ../src/extension/internal/filter/paint.h:687 msgid "Point Engraving" @@ -7629,11 +7639,11 @@ msgstr "Simuliere Kantenglättung" #: ../src/extension/internal/filter/paint.h:880 msgid "Poster and painting effects" -msgstr "Poster und Gemäldeeffekt" +msgstr "Poster- und Gemäldeeffekte" #: ../src/extension/internal/filter/paint.h:973 msgid "Posterize Basic" -msgstr "Posterisations-Basis" +msgstr "Posterisieren (einfach)" #: ../src/extension/internal/filter/paint.h:984 msgid "Simple posterizing effect" @@ -7752,7 +7762,7 @@ msgstr "Tintenklecks auf Stoff oder rauem Papier" #: ../src/extension/internal/filter/transparency.h:53 #: ../src/filter-enums.cpp:21 msgid "Blend" -msgstr "Mischen" +msgstr "Überlagern" #: ../src/extension/internal/filter/transparency.h:55 ../src/rdf.cpp:261 msgid "Source:" @@ -7829,9 +7839,10 @@ msgid "" "Embed results in stand-alone, larger SVG files. Link references a file " "outside this SVG document and all files must be moved together." msgstr "" -"Einbetten des Ergebnisses in eine eigenständige, größere SVG-Datei.Die " -"Verknüpfung referenziert auf eine Datei außerhalb des SVG-Dokuments und alle " -"Dateien müssen an einer Stelle liegen." +"„Einbetten“ bedeutet, dass die Bilder innerhalb der SVG-Datei gespeichert " +"werden, wodurch die Datei größer wird. „Verknüpfen“ bedeutet, dass im SVG " +"auf eine externe Bilddatei verwiesen wird. In diesem Fall müssen ggf. später " +"alle Dateien gemeinsam verschoben oder kopiert werden." #: ../src/extension/internal/gdkpixbuf-input.cpp:196 #: ../src/ui/dialog/inkscape-preferences.cpp:1511 @@ -7872,7 +7883,7 @@ msgstr "Standard-Importauflösung" #: ../src/extension/internal/gdkpixbuf-input.cpp:205 #, c-format msgid "Image Rendering Mode:" -msgstr "Darstellugsmethode:" +msgstr "Darstellungsmethode (Rasterbilder):" #: ../src/extension/internal/gdkpixbuf-input.cpp:205 #, c-format @@ -8074,7 +8085,7 @@ msgid "" "and slow performance." msgstr "" "Hinweis: Wird die Präzision zu hoch eingestellt, kann dies zu einer " -"großen SVG Datei und erhöhtem Ressourcenbedarf führen." +"großen SVG-Datei und erhöhtem Ressourcenbedarf führen." #: ../src/extension/internal/pdfinput/pdf-input.cpp:134 msgid "Poppler/Cairo import" @@ -8102,7 +8113,7 @@ msgid "" msgstr "" "Import durch interne (von Poppler abgeleitete) Bibliothek. Text wird als " "Text gespeichert, jedoch gehen Leerzeichen verloren. Verlaufsgitter werden " -"gekachelt dargestellt, die Anzahl der Kacheln wird duch die unten " +"gekachelt dargestellt, die Anzahl der Kacheln wird durch die unten " "eingestellte Präzision bestimmt." #: ../src/extension/internal/pdfinput/pdf-input.cpp:148 @@ -8361,7 +8372,8 @@ msgstr "default.de.svg" #: ../src/file.cpp:332 msgid "Broken links have been changed to point to existing files." msgstr "" -"Defekte Verknüpfungen wurden geändert, um vorhandene Dateien zu verweisen." +"Defekte Verknüpfungen wurden geändert, um auf vorhandene Dateien zu " +"verweisen." #: ../src/file.cpp:343 ../src/file.cpp:1278 #, c-format @@ -8480,15 +8492,15 @@ msgstr "Importiere Clipart" #: ../src/filter-enums.cpp:22 msgid "Color Matrix" -msgstr "Farb-Matrix" +msgstr "Farbmatrix" #: ../src/filter-enums.cpp:24 msgid "Composite" -msgstr "Gemisch" +msgstr "Kombinieren" #: ../src/filter-enums.cpp:25 msgid "Convolve Matrix" -msgstr "Matrix falten" +msgstr "Faltungsmatrix" #: ../src/filter-enums.cpp:26 msgid "Diffuse Lighting" @@ -8508,7 +8520,7 @@ msgstr "Zusammenführen" #: ../src/filter-enums.cpp:34 msgid "Specular Lighting" -msgstr "Beleuchtung mit Glanzlichtern" +msgstr "Punktlicht" #: ../src/filter-enums.cpp:35 msgid "Tile" @@ -8822,8 +8834,8 @@ msgstr "Dokument wird automatisch gespeichert..." #: ../src/inkscape.cpp:335 msgid "Autosave failed! Could not find inkscape extension to save document." msgstr "" -"Automatisches Speichern fehlgeschlagen! Inkscape-Endung konnte nicht " -"gefunden werden." +"Automatisches Speichern fehlgeschlagen! Inkscape-Erweiterung zum Speichern " +"konnte nicht gefunden werden." #: ../src/inkscape.cpp:338 ../src/inkscape.cpp:345 #, c-format @@ -8880,8 +8892,7 @@ msgstr "Bewegen des Füllmusters innerhalb des Objektes" #: ../src/knotholder.cpp:281 ../src/knotholder.cpp:303 msgid "Scale the pattern fill; uniformly if with Ctrl" -msgstr "" -"Einheitliches Skalieren des Füllmusters; gleichmäßig durch Strg" +msgstr "Skalieren des Füllmusters; gleichmäßig durch Strg" #: ../src/knotholder.cpp:285 ../src/knotholder.cpp:307 msgid "Rotate the pattern fill; with Ctrl to snap angle" @@ -8899,11 +8910,11 @@ msgstr "GdlDockMaster-Objekt, dem das Objekt zugeordnet ist" #: ../src/libgdl/gdl-dock-bar.c:113 msgid "Dockbar style" -msgstr "Stil de Dockleiste" +msgstr "Stil der Dockleiste" #: ../src/libgdl/gdl-dock-bar.c:114 msgid "Dockbar style to show items on it" -msgstr "Stil, in dem Objekte auf der Dockleiste gezeigt werden" +msgstr "Stil, in dem Objekte in der Dockleiste gezeigt werden" # "piktogrammifizieren" geht noch besser? #: ../src/libgdl/gdl-dock-item-grip.c:402 @@ -8912,7 +8923,7 @@ msgstr "Dieses Dock auf Icongröße verkleinern" #: ../src/libgdl/gdl-dock-item-grip.c:404 msgid "Close this dock" -msgstr "Diesen Dok schließen" +msgstr "Diesen Dock schließen" # Zeit korrekt? #: ../src/libgdl/gdl-dock-item-grip.c:723 ../src/libgdl/gdl-dock-tablabel.c:125 @@ -9065,7 +9076,7 @@ msgid "" "named controller." msgstr "" "Die neue Docksteuerung %p ist automatisch. Nur manuelle Dockobjekte sollten " -"Steuerung heissen." +"Steuerung heißen." #: ../src/libgdl/gdl-dock-notebook.c:132 #: ../src/ui/dialog/align-and-distribute.cpp:1089 @@ -9079,7 +9090,7 @@ msgstr "Seite" #: ../src/libgdl/gdl-dock-notebook.c:133 msgid "The index of the current page" -msgstr "Aktuelle Seitenzahl" +msgstr "Aktuelle Seitennummer" #: ../src/libgdl/gdl-dock-object.c:125 #: ../src/live_effects/parameter/originalpatharray.cpp:82 @@ -9111,11 +9122,11 @@ msgstr "Standardpiktogramm für das Dock-Objekt" #: ../src/libgdl/gdl-dock-object.c:147 msgid "Pixbuf Icon" -msgstr "Pixbuf Symbol" +msgstr "Pixbuf-Symbol" #: ../src/libgdl/gdl-dock-object.c:148 msgid "Pixbuf icon for the dock object" -msgstr "Pixbuf Symbol für das Leisten-Objekt" +msgstr "Pixbuf-Symbol für das Leisten-Objekt" #: ../src/libgdl/gdl-dock-object.c:153 msgid "Dock master" @@ -9180,7 +9191,7 @@ msgstr "" #: ../src/libgdl/gdl-dock-placeholder.c:149 msgid "Host" -msgstr "Betreiber" +msgstr "Wirt" #: ../src/libgdl/gdl-dock-placeholder.c:150 msgid "The dock object this placeholder is attached to" @@ -9382,7 +9393,7 @@ msgstr "Muster entlang Pfad" #. for historic reasons, this effect is called skeletal(strokes) in Inkscape:SVG #: ../src/live_effects/effect.cpp:121 msgid "Stitch Sub-Paths" -msgstr "Unterpfade zusammenfügen" +msgstr "Unterpfade vernähen" #. 0.47 #: ../src/live_effects/effect.cpp:123 @@ -9465,11 +9476,11 @@ msgstr "Pfad verjüngen" #: ../src/live_effects/effect.cpp:146 msgid "Mirror symmetry" -msgstr "Spiegelsymmetrisch" +msgstr "Spiegelsymmetrie" #: ../src/live_effects/effect.cpp:147 msgid "Rotate copies" -msgstr "Kopien rotieren" +msgstr "Gedrehte Kopien" #. Ponyscape -> Inkscape 0.92 #: ../src/live_effects/effect.cpp:149 @@ -9512,13 +9523,13 @@ msgstr "Kein Effekt" #, c-format msgid "Please specify a parameter path for the LPE '%s' with %d mouse clicks" msgstr "" -"Bitte spezifizieren Sie einen Parameterpfad für den Pfadeffekt \"%s\" mit %d " +"Bitte erstellen Sie einen Parameterpfad für den Pfadeffekt \"%s\" mit %d " "Mausklicks." #: ../src/live_effects/effect.cpp:765 #, c-format msgid "Editing parameter %s." -msgstr "Editiere Parameter %s." +msgstr "Bearbeite Parameter %s." #: ../src/live_effects/effect.cpp:770 msgid "None of the applied path effect's parameters can be edited on-canvas." @@ -9528,72 +9539,72 @@ msgstr "" #: ../src/live_effects/lpe-attach-path.cpp:29 msgid "Start path:" -msgstr "Pfadanfang:" +msgstr "Anfangspfad:" #: ../src/live_effects/lpe-attach-path.cpp:29 msgid "Path to attach to the start of this path" -msgstr "Pfad welcher an den Pfadanfang angeheftet wird" +msgstr "Pfad, welcher an den Anfang des aktuellen Pfades angeheftet wird" #: ../src/live_effects/lpe-attach-path.cpp:30 msgid "Start path position:" -msgstr "Position Pfadanfang:" +msgstr "Position Anfangspfad:" #: ../src/live_effects/lpe-attach-path.cpp:30 msgid "Position to attach path start to" -msgstr "Position an welcher der Pfadanfang angeheftet wird" +msgstr "Position, an welcher der erste Verbindungspfad angeheftet wird" #: ../src/live_effects/lpe-attach-path.cpp:31 msgid "Start path curve start:" -msgstr "Kurvenanfang am Pfadanfang:" +msgstr "Anfang der Anfangspfadkurve:" #: ../src/live_effects/lpe-attach-path.cpp:31 #: ../src/live_effects/lpe-attach-path.cpp:35 msgid "Starting curve" -msgstr "Kurvenlinie am Anfang" +msgstr "Krümmung am Anfang" #. , true #: ../src/live_effects/lpe-attach-path.cpp:32 msgid "Start path curve end:" -msgstr "Kurvenende am Pfadanfang:" +msgstr "Ende der Anfangspfadkurve:" #: ../src/live_effects/lpe-attach-path.cpp:32 #: ../src/live_effects/lpe-attach-path.cpp:36 msgid "Ending curve" -msgstr "Kurvenlinie am Ende" +msgstr "Krümmung am Ende" #. , true #: ../src/live_effects/lpe-attach-path.cpp:33 msgid "End path:" -msgstr "Pfadende:" +msgstr "Endpfad:" #: ../src/live_effects/lpe-attach-path.cpp:33 msgid "Path to attach to the end of this path" -msgstr "Pfad welcher an das Pfadende angeheftet wird" +msgstr "Pfad, welcher an das Pfadende angeheftet wird" #: ../src/live_effects/lpe-attach-path.cpp:34 msgid "End path position:" -msgstr "Position Pfadende:" +msgstr "Position Endpfad:" #: ../src/live_effects/lpe-attach-path.cpp:34 msgid "Position to attach path end to" -msgstr "Position an welcher das Pfadende angeheftet wird" +msgstr "Position, an welcher der Endpfad angeheftet wird" #: ../src/live_effects/lpe-attach-path.cpp:35 msgid "End path curve start:" -msgstr "Kurvenanfang am Pfadende:" +msgstr "Anfang der Endpfadkurve:" #. , true #: ../src/live_effects/lpe-attach-path.cpp:36 msgid "End path curve end:" -msgstr "Kurvenende am Pfadende:" +msgstr "Ende der Endpfadkurve:" #: ../src/live_effects/lpe-bendpath.cpp:69 msgid "Bend path:" -msgstr "Pfad verbiegen" +msgstr "Verbiegepfad:" #: ../src/live_effects/lpe-bendpath.cpp:69 msgid "Path along which to bend the original path" -msgstr "Pfad an den der Orginalpfad angelegt wird" +msgstr "Pfad, entlang welchem der Originalpfad gebogen werden soll" #: ../src/live_effects/lpe-bendpath.cpp:71 #: ../src/live_effects/lpe-patternalongpath.cpp:74 @@ -9621,13 +9632,12 @@ msgstr "Originalpfad ist vertikal" #: ../src/live_effects/lpe-bendpath.cpp:73 msgid "Rotates the original 90 degrees, before bending it along the bend path" msgstr "" -"Rotiert das Original um 90 Grad bevor es entlang des Pfades gebogen wird" +"Rotiert das Original um 90 Grad, bevor es entlang des Pfades gebogen wird" #: ../src/live_effects/lpe-bendpath.cpp:178 #: ../src/live_effects/lpe-patternalongpath.cpp:285 -#, fuzzy msgid "Change the width" -msgstr "Breite der Kontur ändern" +msgstr "Breite ändern" #: ../src/live_effects/lpe-bounding-box.cpp:24 #: ../src/live_effects/lpe-clone-original.cpp:18 @@ -9640,7 +9650,7 @@ msgstr "Verknüpfter Pfad:" #: ../src/live_effects/lpe-clone-original.cpp:18 #: ../src/live_effects/lpe-fill-between-strokes.cpp:23 msgid "Path from which to take the original path data" -msgstr "Pfad von dem die Orginal-Pfaddaten genommen werden" +msgstr "Pfad, von dem die Orginal-Pfaddaten genommen werden" #: ../src/live_effects/lpe-bounding-box.cpp:25 msgid "Visual Bounds" @@ -9735,7 +9745,7 @@ msgstr "Stich-Pfad" #: ../src/live_effects/lpe-curvestitch.cpp:41 msgid "The path that will be used as stitch." -msgstr "Der Pfad wird als Knoten verwendet" +msgstr "Pfad, der zum „Zusammennähen“ verwendet wird." #: ../src/live_effects/lpe-curvestitch.cpp:42 msgid "N_umber of paths:" @@ -9747,7 +9757,7 @@ msgstr "Anzahl der zu erzeugenden Pfade" #: ../src/live_effects/lpe-curvestitch.cpp:43 msgid "Sta_rt edge variance:" -msgstr "Start der Kanten Abweichung" +msgstr "Start der Kanten-Abweichung" # Hier "stitches" etwa Kopien? Was ist dieser Effekt? #: ../src/live_effects/lpe-curvestitch.cpp:43 @@ -9756,7 +9766,7 @@ msgid "" "& outside the guide path" msgstr "" "Mittlere Größe der Abstände, um die die Startpunkte der Kopien inner- und " -"außerhalb des Pfades versetzt werden." +"außerhalb des Pfades zufällig versetzt werden." # Falschrum? Ausprobieren... Abweichung der Start-Abstände vielleicht? #: ../src/live_effects/lpe-curvestitch.cpp:44 @@ -9769,12 +9779,12 @@ msgid "" "& forth along the guide path" msgstr "" "Mittlere Größe der Abstände, um die die Startpunkte der Kopien entlang des " -"Führungspfades versetzt werden." +"Führungspfades zufällig versetzt werden." # Falschrum? Ausprobieren... Abweichung der End-Kante vielleicht? #: ../src/live_effects/lpe-curvestitch.cpp:45 msgid "End ed_ge variance:" -msgstr "Ende der Kanten Abweichung" +msgstr "Ende der Kanten-Abweichung" #: ../src/live_effects/lpe-curvestitch.cpp:45 msgid "" @@ -9782,7 +9792,7 @@ msgid "" "outside the guide path" msgstr "" "Mittlere Größe der Abstände, um die die Endpunkte der Kopien inner- und " -"außerhalb des Führungspfades versetzt werden." +"außerhalb des Führungspfades zufällig versetzt werden." # Falschrum? Ausprobieren... Abweichung der End-Abstände vielleicht? #: ../src/live_effects/lpe-curvestitch.cpp:46 @@ -9795,7 +9805,7 @@ msgid "" "forth along the guide path" msgstr "" "Mittlere Größe der Abstände, um die die Endpunkte der Kopien entlang des " -"Führungspfades versetzt werden." +"Führungspfades zufällig versetzt werden." #: ../src/live_effects/lpe-curvestitch.cpp:47 msgid "Scale _width:" @@ -9859,7 +9869,7 @@ msgstr "Aktiviere linke und rechte Pfade" #: ../src/live_effects/lpe-envelope.cpp:35 msgid "Enable the left and right deformation paths" -msgstr "Aktiviere linke und rechte Verformungs-Pfade" +msgstr "Aktiviere linken und rechten Verformungs-Pfad" #: ../src/live_effects/lpe-envelope.cpp:36 msgid "_Enable top & bottom paths" @@ -9867,7 +9877,7 @@ msgstr "Aktiviere obere und untere Pfade" #: ../src/live_effects/lpe-envelope.cpp:36 msgid "Enable the top and bottom deformation paths" -msgstr "Aktiviere obere und untere Verformungs-Pfade" +msgstr "Aktiviere oberen und unteren Verformungs-Pfad" #: ../src/live_effects/lpe-extrude.cpp:30 msgid "Direction" @@ -9879,7 +9889,7 @@ msgstr "Definiert Richtung und Ausmaß der Extrusion" #: ../src/live_effects/lpe-fill-between-many.cpp:25 msgid "Paths from which to take the original path data" -msgstr "Pfade von denen die Orginal-Pfaddaten genommen werden" +msgstr "Pfade, von denen die Orginal-Pfaddaten genommen werden" #: ../src/live_effects/lpe-fill-between-strokes.cpp:24 msgid "Second path:" @@ -9887,7 +9897,7 @@ msgstr "Zweiter Pfad:" #: ../src/live_effects/lpe-fill-between-strokes.cpp:24 msgid "Second path from which to take the original path data" -msgstr "Zweiter Pfad von dem die Orginal-Pfaddaten genommen werden" +msgstr "Zweiter Pfad, von dem die Orginal-Pfaddaten genommen werden" #: ../src/live_effects/lpe-fill-between-strokes.cpp:25 msgid "Reverse Second" @@ -9965,11 +9975,11 @@ msgstr "Länge der Hilfslinien mit Richtung" #: ../src/live_effects/lpe-fillet-chamfer.cpp:103 msgid "IMPORTANT! New version soon..." -msgstr "" +msgstr "WICHTIG! Bald neue Version..." #: ../src/live_effects/lpe-fillet-chamfer.cpp:107 msgid "Not compatible. Convert to path after." -msgstr "" +msgstr "Nicht kompatibel. Im Anschluss in Pfad umwandeln." #: ../src/live_effects/lpe-fillet-chamfer.cpp:165 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:72 @@ -10020,6 +10030,7 @@ msgstr "Zahl der Zähne" msgid "_Phi:" msgstr "_Phi:" +# Are angle and ratio the same here? Does anyone know more about gears...? #: ../src/live_effects/lpe-gears.cpp:215 msgid "" "Tooth pressure angle (typically 20-25 deg). The ratio of teeth not in " @@ -10032,7 +10043,7 @@ msgstr "Flugbahn:" #: ../src/live_effects/lpe-interpolate.cpp:30 msgid "Path along which intermediate steps are created." -msgstr "Pfad, entlang dem die Zwischenschritte entstehen" +msgstr "Pfad, entlang dem die Zwischenschritte erstellt werden." #: ../src/live_effects/lpe-interpolate.cpp:31 msgid "Steps_:" @@ -10052,9 +10063,9 @@ msgid "" "the path. If false, the distance depends on the location of the nodes of the " "trajectory path." msgstr "" -"Falls gesetzt ist der Abstand zwischen zwei Interpolationen konstant entlang " -"des Pfades. Falls nicht gesetzt hängt der Abstand von der Position der " -"Knoten des Trajektorienpfades ab." +"Falls gesetzt, ist der Abstand zwischen zwei Interpolationen konstant " +"entlang des Pfades. Falls nicht gesetzt, hängt der Abstand von der Position " +"der Knoten des Trajektorienpfades ab." #: ../src/live_effects/lpe-interpolate_points.cpp:26 #: ../src/live_effects/lpe-powerstroke.cpp:134 @@ -10121,19 +10132,16 @@ msgid "Extrapolated arc" msgstr "Abgeleitete Kurve" #: ../src/live_effects/lpe-jointype.cpp:36 -#, fuzzy msgid "Extrapolated arc Alt1" -msgstr "Abgeleitete Kurve" +msgstr "Abgeleitete Kurve Variante 1" #: ../src/live_effects/lpe-jointype.cpp:37 -#, fuzzy msgid "Extrapolated arc Alt2" -msgstr "Abgeleitete Kurve" +msgstr "Abgeleitete Kurve Variante 2" #: ../src/live_effects/lpe-jointype.cpp:38 -#, fuzzy msgid "Extrapolated arc Alt3" -msgstr "Abgeleitete Kurve" +msgstr "Abgeleitete Kurve Variante 3" #: ../src/live_effects/lpe-jointype.cpp:42 #: ../src/live_effects/lpe-powerstroke.cpp:149 @@ -10191,7 +10199,7 @@ msgstr "" #: ../src/live_effects/lpe-jointype.cpp:60 msgid "Force miter" -msgstr "Gehrung erwingen" +msgstr "Gehrung erzwingen" #: ../src/live_effects/lpe-jointype.cpp:60 msgid "Overrides the miter limit and forces a join." @@ -10249,7 +10257,7 @@ msgstr "Kreuzungsmarkierungen" #: ../src/live_effects/lpe-knot.cpp:626 msgid "Drag to select a crossing, click to flip it" msgstr "" -"Ziehen Sie, um eine Überschneidung auszuwählen, Klicken Sie, um sie " +"Ziehen Sie, um eine Überschneidung auszuwählen; klicken Sie, um sie " "umzudrehen" #. / @todo Is this the right verb? @@ -10270,6 +10278,7 @@ msgstr "Bewegungen vertikal spiegeln" #: ../src/live_effects/lpe-lattice2.cpp:49 msgid "Update while moving knots (maybe slow)" msgstr "" +"Während des Verschiebens von Knoten aktualisieren (möglicherweise langsam)" #: ../src/live_effects/lpe-lattice2.cpp:50 msgid "Control 0:" @@ -10652,10 +10661,12 @@ msgstr "Perspektive" msgid "Envelope deformation" msgstr "Umhüllung verformen" +# Jabier: The 4 knots of the perspective can have positions not in real +# perspective if this option is checked. +# Maybe also: 'Falsche Perspektive erlauben'? #: ../src/live_effects/lpe-perspective-envelope.cpp:45 -#, fuzzy msgid "Overflow perspective" -msgstr "Perspektive" +msgstr "Perspektive: Überschreitung erlauben" #: ../src/live_effects/lpe-perspective-envelope.cpp:46 msgid "Type" @@ -10869,7 +10880,7 @@ msgid "" "Add direction randomness by moving 'bottom' half-turns tangentially to the " "boundary." msgstr "" -"Ändert Richtung zufällig, in dem \"untere\" Wendepunkte tangential zur " +"Ändert Richtung zufällig, indem \"untere\" Wendepunkte tangential zur " "Begrenzung bewegt werden." #: ../src/live_effects/lpe-rough-hatches.cpp:235 @@ -10977,11 +10988,11 @@ msgstr "Entlang Knoten" #: ../src/live_effects/lpe-roughen.cpp:39 msgid "Rand" -msgstr "" +msgstr "zufällig" #: ../src/live_effects/lpe-roughen.cpp:40 msgid "Retract" -msgstr "" +msgstr "zurückziehen" #. initialise your parameters here: #: ../src/live_effects/lpe-roughen.cpp:49 @@ -11038,9 +11049,8 @@ msgid "Spray Tool friendly" msgstr "Optimiert für Sprühwerkzeug" #: ../src/live_effects/lpe-roughen.cpp:67 -#, fuzzy msgid "For use with spray tool in copy mode" -msgstr "Für die Verwendung in Kombination mit dem Sprühwerkzeug" +msgstr "Für die Verwendung mit dem Sprühwerkzeug im Kopiermodus" #: ../src/live_effects/lpe-roughen.cpp:121 msgid "Add nodes Subdivide each segment" @@ -11179,7 +11189,7 @@ msgstr "Pfad anzeigen" #: ../src/live_effects/lpe-show_handles.cpp:28 msgid "Scale nodes and handles" -msgstr "Knoten, Anfasser skalieren" +msgstr "Knoten und Anfasser skalieren" #: ../src/live_effects/lpe-show_handles.cpp:29 #: ../src/ui/tool/multi-path-manipulator.cpp:788 @@ -11192,6 +11202,9 @@ msgid "" "The \"show handles\" path effect will remove any custom style on the object " "you are applying it to. If this is not what you want, click Cancel." msgstr "" +"Der „Anfasser zeigen“-Pfadeffekt entfernt alle benutzerdefinierten Stile des " +"Objektes, auf den er angewendet wird. Ist dies nicht erwünscht, bitte auf " +"„Abbrechen“ klicken." #: ../src/live_effects/lpe-simplify.cpp:30 msgid "Steps:" @@ -11203,7 +11216,7 @@ msgstr "Anzahl der Vereinfachungsschritte" #: ../src/live_effects/lpe-simplify.cpp:31 msgid "Roughly threshold:" -msgstr "Rauigkeits Schwellwert:" +msgstr "Rauigkeits-Schwellwert:" #: ../src/live_effects/lpe-simplify.cpp:32 msgid "Smooth angles:" @@ -11211,7 +11224,7 @@ msgstr "Ecken abrunden:" #: ../src/live_effects/lpe-simplify.cpp:32 msgid "Max degree difference on handles to perform a smooth" -msgstr "Maximaler Winkel zwischen Anfassern für den noch geglättet wird" +msgstr "Maximaler Winkel zwischen Anfassern, für den noch geglättet wird" #: ../src/live_effects/lpe-simplify.cpp:34 msgid "Paths separately" @@ -11221,31 +11234,33 @@ msgstr "Pfade getrennt" msgid "Simplifying paths (separately)" msgstr "Vereinfache Pfade (getrennt)" +# Ask Jabier what this does #: ../src/live_effects/lpe-simplify.cpp:36 msgid "Just coalesce" -msgstr "" +msgstr "Nur verschmelzen" +# I asked Jabier what this option does, but he didn't have a clue. #: ../src/live_effects/lpe-simplify.cpp:36 msgid "Simplify just coalesce" -msgstr "" +msgstr "Vereinfachen verschmilzt nur" #. initialise your parameters here: #. testpointA(_("Test Point A"), _("Test A"), "ptA", &wr, this, Geom::Point(100,100)), #: ../src/live_effects/lpe-sketch.cpp:38 msgid "Strokes:" -msgstr "Kontur:" +msgstr "Striche:" #: ../src/live_effects/lpe-sketch.cpp:38 msgid "Draw that many approximating strokes" -msgstr "Zeichne diese Zahl an durchschnittlichen Strichen" +msgstr "Zeichne diese Anzahl von Näherungs-Strichen" #: ../src/live_effects/lpe-sketch.cpp:39 msgid "Max stroke length:" -msgstr "Maximale Konturbreite:" +msgstr "Maximale Strichlänge:" #: ../src/live_effects/lpe-sketch.cpp:40 msgid "Maximum length of approximating strokes" -msgstr "Maximale Länge der durchschnittlichen Striche" +msgstr "Maximale Länge der Näherungs-Striche" #: ../src/live_effects/lpe-sketch.cpp:41 msgid "Stroke length variation:" @@ -11262,8 +11277,8 @@ msgstr "Max. Überlappung:" #: ../src/live_effects/lpe-sketch.cpp:44 msgid "How much successive strokes should overlap (relative to maximum length)" msgstr "" -"Wie viele erfolgreich gezeichnete Striche sollen überlappen (relativ zur " -"max. Länge)" +"Wie viele aufeinanderfolgende Striche sollen überlappen (relativ zur max. " +"Länge)" #: ../src/live_effects/lpe-sketch.cpp:45 msgid "Overlap variation:" @@ -11282,8 +11297,8 @@ msgid "" "Maximum distance between ends of original and approximating paths (relative " "to maximum length)" msgstr "" -"Maximale Distanz zwischen dem Ende der originalen und durschnittlichen Pfade " -"(relativ zur max. Länge)" +"Maximale Distanz zwischen dem Ende des Originalpfades und dem der " +"Näherungspfade (relativ zur max. Länge)" #: ../src/live_effects/lpe-sketch.cpp:49 msgid "Average offset:" @@ -11291,7 +11306,7 @@ msgstr "Durchschn. Versatz:" #: ../src/live_effects/lpe-sketch.cpp:50 msgid "Average distance each stroke is away from the original path" -msgstr "Mittlere Distanz, die ein Strich vom Originalpfad entfernt ist" +msgstr "Mittlerer Abstand eines Striches vom Originalpfad" #: ../src/live_effects/lpe-sketch.cpp:51 msgid "Max. tremble:" @@ -11432,89 +11447,72 @@ msgid "End point of the taper" msgstr "Endpunkt der Verjüngung" #: ../src/live_effects/lpe-transform_2pts.cpp:31 -#, fuzzy msgid "Elastic" -msgstr "Knetmasse" +msgstr "Elastisch" #: ../src/live_effects/lpe-transform_2pts.cpp:31 -#, fuzzy msgid "Elastic transform mode" -msgstr "Objekte auswählen und verändern" +msgstr "Elastischer Transformationsmodus" #: ../src/live_effects/lpe-transform_2pts.cpp:32 -#, fuzzy msgid "From original width" -msgstr "Originalpfad klonen" +msgstr "Ursprüngliche Breite" #: ../src/live_effects/lpe-transform_2pts.cpp:33 -#, fuzzy msgid "Lock length" -msgstr "Ebene sperren" +msgstr "Länge sperren" #: ../src/live_effects/lpe-transform_2pts.cpp:33 -#, fuzzy msgid "Lock length to current distance" -msgstr "Sperren oder Entsperren der aktuellen Ebene" +msgstr "Behält die aktuelle Länge bei" #: ../src/live_effects/lpe-transform_2pts.cpp:34 msgid "Lock angle" msgstr "Winkel sperren" #: ../src/live_effects/lpe-transform_2pts.cpp:35 -#, fuzzy msgid "Flip horizontal" -msgstr "Horizontal umkehren" +msgstr "Horizontal spiegeln" #: ../src/live_effects/lpe-transform_2pts.cpp:36 -#, fuzzy msgid "Flip vertical" -msgstr "Vertikal umkehren" +msgstr "Vertikal spiegeln" #: ../src/live_effects/lpe-transform_2pts.cpp:37 -#, fuzzy msgid "Start point" -msgstr "Punkte sortieren" +msgstr "Anfangspunkt" #: ../src/live_effects/lpe-transform_2pts.cpp:38 -#, fuzzy msgid "End point" -msgstr "Pfadende:" +msgstr "Endpunkt" #: ../src/live_effects/lpe-transform_2pts.cpp:39 -#, fuzzy msgid "Stretch" -msgstr "Stärke" +msgstr "Strecken" #: ../src/live_effects/lpe-transform_2pts.cpp:39 -#, fuzzy msgid "Stretch the result" -msgstr "Filter-Auflösung setzen" +msgstr "Streckt den resultierenden Pfad" -# !!! verb or noun? #: ../src/live_effects/lpe-transform_2pts.cpp:40 -#, fuzzy msgid "Offset from knots" -msgstr "Versatzpunkte" +msgstr "Verschiebung relativ zu den Knoten" #: ../src/live_effects/lpe-transform_2pts.cpp:41 -#, fuzzy msgid "First Knot" -msgstr "Erste Hilfe" +msgstr "Erster Knoten" #: ../src/live_effects/lpe-transform_2pts.cpp:42 -#, fuzzy msgid "Last Knot" -msgstr "Knoten" +msgstr "Letzter Knoten" #: ../src/live_effects/lpe-transform_2pts.cpp:43 -#, fuzzy msgid "Rotation helper size" -msgstr "Drehpunkte" +msgstr "Größe des Helfers für Rotation" #: ../src/live_effects/lpe-transform_2pts.cpp:196 -#, fuzzy msgid "Change index of knot" -msgstr "Knotentyp ändern" +msgstr "Knotenindex ändern" #: ../src/live_effects/lpe-transform_2pts.cpp:349 #: ../src/ui/dialog/inkscape-preferences.cpp:1623 @@ -11596,6 +11594,8 @@ msgid "" "Chamfer: Ctrl+Click toggle type, Shift+Click open " "dialog, Ctrl+Alt+Click reset" msgstr "" +"Fasen: Strg+Klick Typ ändern, Umschalt+Klick Dialog " +"öffnen, Strg+Alt+Klick zurücksetzen" #: ../src/live_effects/parameter/filletchamferpointarray.cpp:782 #: ../src/live_effects/parameter/filletchamferpointarray.cpp:843 @@ -11603,6 +11603,8 @@ msgid "" "Inverse Chamfer: Ctrl+Click toggle type, Shift+Click " "open dialog, Ctrl+Alt+Click reset" msgstr "" +"Invertierte Fasung: Strg+Klick Typ ändern, Umschalt+Klick Dialog öffnen, Strg+Alt+Klick zurücksetzen" #: ../src/live_effects/parameter/filletchamferpointarray.cpp:786 #: ../src/live_effects/parameter/filletchamferpointarray.cpp:847 @@ -11610,6 +11612,8 @@ msgid "" "Inverse Fillet: Ctrl+Click toggle type, Shift+Click " "open dialog, Ctrl+Alt+Click reset" msgstr "" +"Invertierte Abrundung: Strg+Klick Typ ändern, Umschalt" +"+Klick Dialog öffnen, Strg+Alt+Klick zurücksetzen" #: ../src/live_effects/parameter/filletchamferpointarray.cpp:790 #: ../src/live_effects/parameter/filletchamferpointarray.cpp:851 @@ -11617,6 +11621,8 @@ msgid "" "Fillet: Ctrl+Click toggle type, Shift+Click open " "dialog, Ctrl+Alt+Click reset" msgstr "" +"Abrunden: Strg+Klick Typ ändern, Umschalt+Klick Dialog " +"öffnen, Strg+Alt+Klick zurücksetzen" #: ../src/live_effects/parameter/originalpath.cpp:67 #: ../src/live_effects/parameter/originalpatharray.cpp:155 @@ -11695,7 +11701,7 @@ msgid "" "+click adds a control point, Ctrl+Alt+click deletes it, Shift" "+click launches width dialog." msgstr "" -"Kontrollpunkt der Kontur Ziehen verändert Strichstärke. Strg" +"Kontrollpunkt für Konturbreite: Ziehen verändert Strichstärke. Strg" "+Klick fügt Kontrollpunkt hinzu, Strg+Alt+Klick löscht ihn, " "Umschalt+Klick öffnet Dialog um Position/Strichstärke manuell " "festzulegen." @@ -11709,9 +11715,8 @@ msgid "Change text parameter" msgstr "Textparameter ändern" #: ../src/live_effects/parameter/togglebutton.cpp:112 -#, fuzzy msgid "Change togglebutton parameter" -msgstr "Textparameter ändern" +msgstr "Parameter für Schaltfläche ändern" #: ../src/live_effects/parameter/transformedpoint.cpp:98 #: ../src/live_effects/parameter/vector.cpp:99 @@ -11821,7 +11826,7 @@ msgstr "" #: ../src/main.cpp:360 msgid "The width of exported bitmap in pixels (overrides export-dpi)" -msgstr "Breite der erzeugten Bitmap in Pixeln (überschreibt Export-dpi)" +msgstr "Breite der erzeugten Rastergrafik in Pixeln (überschreibt Export-dpi)" #: ../src/main.cpp:361 msgid "WIDTH" @@ -11829,20 +11834,21 @@ msgstr "BREITE" #: ../src/main.cpp:365 msgid "The height of exported bitmap in pixels (overrides export-dpi)" -msgstr "Höhe der erzeugten Bitmap in Pixeln (überschreibt Export-dpi)" +msgstr "Höhe der erzeugten Rastergrafik in Pixeln (überschreibt Export-dpi)" #: ../src/main.cpp:366 msgid "HEIGHT" msgstr "HÖHE" +# Changed because this refers to object id in xml #: ../src/main.cpp:370 msgid "The ID of the object to export" -msgstr "Kennung des zu exportierenden Objektes" +msgstr "ID des zu exportierenden Objektes" #: ../src/main.cpp:371 ../src/main.cpp:484 #: ../src/ui/dialog/inkscape-preferences.cpp:1569 msgid "ID" -msgstr "Kennung" +msgstr "ID" #. TRANSLATORS: this means: "Only export the object whose id is given in --export-id". #. See "man inkscape" for details. @@ -11862,7 +11868,7 @@ msgstr "" #: ../src/main.cpp:387 msgid "Background color of exported bitmap (any SVG-supported color string)" msgstr "" -"Hintergrundfarbe der exportierten Bitmap (jede von SVG unterstützte " +"Hintergrundfarbe der exportierten Rastergrafik (jede von SVG unterstützte " "Farbzeichenkette)" #: ../src/main.cpp:388 @@ -11872,47 +11878,49 @@ msgstr "FARBE" #: ../src/main.cpp:392 msgid "Background opacity of exported bitmap (either 0.0 to 1.0, or 1 to 255)" msgstr "" -"Hintergrunddeckkraft der exportierten Bitmap (0,0 bis 1,0 oder 1 bis 255)" +"Hintergrunddeckkraft der exportierten Rastergrafik (0,0 bis 1,0 oder 1 bis " +"255)" #: ../src/main.cpp:397 msgid "Export document to plain SVG file (no sodipodi or inkscape namespaces)" msgstr "" -"Dokument in reine SVG-Datei exportieren (ohne Sodipodi- oder Inkscape-" +"Dokument als reine SVG-Datei exportieren (ohne Sodipodi- oder Inkscape-" "Namensräume)" #: ../src/main.cpp:402 msgid "Export document to a PS file" -msgstr "Das Dokument in eine PS-Datei exportieren" +msgstr "Das Dokument als PS-Datei exportieren" #: ../src/main.cpp:407 msgid "Export document to an EPS file" -msgstr "Das Dokument in eine EPS-Datei exportieren" +msgstr "Das Dokument als EPS-Datei exportieren" #: ../src/main.cpp:412 msgid "" "Choose the PostScript Level used to export. Possible choices are 2 and 3 " "(the default)" msgstr "" -"Wähle das PostScript Level für den Export. Auswahlmöglichkeiten sind 2 und 3 " +"Wähle das PostScript-Level für den Export. Auswahlmöglichkeiten sind 2 und 3 " "(Standard)" #: ../src/main.cpp:414 msgid "PS Level" -msgstr "PS Level" +msgstr "PS-Level" #: ../src/main.cpp:418 msgid "Export document to a PDF file" -msgstr "Das Dokument in eine PDF-Datei exportieren" +msgstr "Das Dokument als PDF-Datei exportieren" +# !!! would these quotes need to be kept as they are? Looks like it's explaining command line options. #. TRANSLATORS: "--export-pdf-version" is an Inkscape command line option; see "inkscape --help" #: ../src/main.cpp:424 msgid "" "Export PDF to given version. (hint: make sure to input the exact string " "found in the PDF export dialog, e.g. \"PDF 1.4\" which is PDF-a conformant)" msgstr "" -"Exportiere PDF in der angegebenen Version. (Hinweis: Stellen Sie sicher das " -"die Version exakt wie im PDF Export Dialog angegeben wird. Beispiel \"PDF " -"1.3\" ist PDF -a konform)" +"Export als PDF in der angegebenen Version. (Hinweis: Stellen Sie sicher, " +"dass die Version exakt wie im PDF-Export-Dialog angegeben wird, z. B. " +"Beispiel \"PDF 1.4\", dieses ist PDF/A-konform)" #: ../src/main.cpp:425 msgid "PDF_VERSION" @@ -11924,17 +11932,17 @@ msgid "" "exported, putting the text on top of the PDF/PS/EPS file. Include the result " "in LaTeX like: \\input{latexfile.tex}" msgstr "" -"Exportiere PDF/PS/EPS ohne Text. Neben PDF/PS/EPS wird eine LaTeX-Datei " -"exportiert, die den Text oben auf die PDF/PS/EPS-Datei legt. Einbinden des " +"Exportiert als PDF/PS/EPS ohne Text. Neben PDF/PS/EPS wird eine LaTeX-Datei " +"exportiert, die den Text über die PDF/PS/EPS-Datei legt. Einbinden des " "Ergebnisses in Latex mit: \\input{latexfile.tex}" #: ../src/main.cpp:434 msgid "Export document to an Enhanced Metafile (EMF) File" -msgstr "Dokument in eine Erweiterte Metadatei (EMF) exportieren" +msgstr "Dokument als Erweiterte Metadatei (EMF) exportieren" #: ../src/main.cpp:439 msgid "Export document to a Windows Metafile (WMF) File" -msgstr "Dokument in eine Windows-Metadatei (WMF) exportieren" +msgstr "Dokument als Windows-Metadatei (WMF) exportieren" #: ../src/main.cpp:444 msgid "Convert text object to paths on export (PS, EPS, PDF, SVG)" @@ -11987,7 +11995,7 @@ msgstr "id, x, y, w und h für alle Objekte auflisten" #: ../src/main.cpp:483 msgid "The ID of the object whose dimensions are queried" -msgstr "Objekt-ID-Kennung, dessen Abmessungen abgefragt werden" +msgstr "ID des Objektes, dessen Abmessungen abgefragt werden" #. TRANSLATORS: this option makes Inkscape print the name (path) of the extension directory #: ../src/main.cpp:489 @@ -12000,15 +12008,15 @@ msgstr "Unbenutzte Elemente aus den <defs> des Dokuments entfernen" #: ../src/main.cpp:500 msgid "Enter a listening loop for D-Bus messages in console mode" -msgstr "Warteschleife für D-Bus Nachrichten im Konsolen-Modus eingeben" +msgstr "Warteschleife für D-Bus-Nachrichten im Konsolen-Modus eingeben" #: ../src/main.cpp:505 msgid "" "Specify the D-Bus bus name to listen for messages on (default is org." "inkscape)" msgstr "" -"D-Bus Namen angeben, von welchem Nachrichten angezeigt werden sollen " -"(Vorgabe ist org.inkscape)" +"D-Bus-Namen angeben, dessen Nachrichten angezeigt werden sollen (Vorgabe ist " +"org.inkscape)" #: ../src/main.cpp:506 msgid "BUS-NAME" @@ -12016,11 +12024,11 @@ msgstr "BUS-NAME" #: ../src/main.cpp:511 msgid "List the IDs of all the verbs in Inkscape" -msgstr "Liste die Kennungen von allen Verben in Inkscape" +msgstr "Listet die ID aller Verben in Inkscape" #: ../src/main.cpp:516 msgid "Verb to call when Inkscape opens." -msgstr "Aufzurufendes Verb wenn Inkscape startet." +msgstr "Aufzurufendes Verb wenn Inkscape startet" #: ../src/main.cpp:517 msgid "VERB-ID" @@ -12028,7 +12036,7 @@ msgstr "VERB-ID" #: ../src/main.cpp:521 msgid "Object ID to select when Inkscape opens." -msgstr "Auszuwählende Objekt-Kennung wenn Inkscape startet." +msgstr "ID des Objektes, das beim Start von Inkscape ausgewählt werden soll" #: ../src/main.cpp:522 msgid "OBJECT-ID" @@ -12069,7 +12077,7 @@ msgstr "_Klonen" #: ../src/menus-skeleton.h:79 msgid "Select Sa_me" -msgstr "Das Gleiche auswählen" +msgstr "Das Gleiche aus_wählen" #: ../src/menus-skeleton.h:100 msgid "_View" @@ -12217,7 +12225,7 @@ msgstr "Fluchtpunkt umschalten" #: ../src/persp3d.cpp:334 msgid "Toggle multiple vanishing points" -msgstr "Multiple Fluchtpunkte umschalten" +msgstr "Mehrere Fluchtpunkte umschalten" # not sure here -cm- #: ../src/preferences-skeleton.h:102 @@ -12283,7 +12291,7 @@ msgstr "Die Einstellungsdatei %s ist keine reguläre Datei." #: ../src/preferences.cpp:226 #, c-format msgid "The preferences file %s could not be read." -msgstr "Datei Einstellungsdatei %s konnte nicht gelesen werden." +msgstr "Die Einstellungsdatei %s konnte nicht gelesen werden." #: ../src/preferences.cpp:237 #, c-format @@ -12341,7 +12349,7 @@ msgstr "Titel:" #: ../src/rdf.cpp:236 msgid "A name given to the resource" -msgstr "Gegebener Name der Ressource" +msgstr "Frei wählbarer Name des Dokuments" #: ../src/rdf.cpp:238 msgid "Date:" @@ -12351,9 +12359,7 @@ msgstr "Datum:" msgid "" "A point or period of time associated with an event in the lifecycle of the " "resource" -msgstr "" -"Ein Zeitpunkt oder eine Zeitdauer, die mit einem Ereignis innerhalb dessen " -"Lebenszeit verbunden ist" +msgstr "Ein für das Dokument wichtiger Zeitpunkt oder Zeitraum" #: ../src/rdf.cpp:241 ../share/extensions/webslicer_create_rect.inx.h:3 msgid "Format:" @@ -12361,16 +12367,17 @@ msgstr "Format:" #: ../src/rdf.cpp:242 msgid "The file format, physical medium, or dimensions of the resource" -msgstr "Das Dateiformat, physikalische Medium oder Dimension der Quelle" +msgstr "" +"Das Dateiformat, physikalische Medium oder die Abmessungen des Dokuments" #: ../src/rdf.cpp:245 msgid "The nature or genre of the resource" -msgstr "Die Art oder Gattung der Ressource" +msgstr "Die Art oder Gattung des Dokuments" # !!! Urheber? #: ../src/rdf.cpp:248 msgid "Creator:" -msgstr "Ersteller:" +msgstr "Urheber:" #: ../src/rdf.cpp:249 msgid "An entity primarily responsible for making the resource" @@ -12384,7 +12391,7 @@ msgstr "Rechte:" #: ../src/rdf.cpp:252 msgid "Information about rights held in and over the resource" -msgstr "Informationen über die an der Ressource gehaltenen Rechte" +msgstr "Informationen über die am Dokument gehaltenen Rechte" #: ../src/rdf.cpp:254 msgid "Publisher:" @@ -12394,7 +12401,7 @@ msgstr "Herausgeber:" msgid "An entity responsible for making the resource available" msgstr "" "Name der Person oder Organisation, die für die Verfügbarmachung des " -"Dokuments verantwortlich ist." +"Dokuments verantwortlich ist" #: ../src/rdf.cpp:258 msgid "Identifier:" @@ -12402,11 +12409,11 @@ msgstr "Identifikator:" #: ../src/rdf.cpp:259 msgid "An unambiguous reference to the resource within a given context" -msgstr "Eine eindeutige Referenz auf die Quelle im angegebenen Kontext" +msgstr "Eine eindeutige Referenz auf das Dokument in einem bestimmten Kontext" #: ../src/rdf.cpp:262 msgid "A related resource from which the described resource is derived" -msgstr "Die ürsprüngliche Quelle aus welcher der Inhalt entnommen ist" +msgstr "Die ursprüngliche Quelle, aus welcher der Inhalt entnommen ist" #: ../src/rdf.cpp:264 msgid "Relation:" @@ -12414,7 +12421,7 @@ msgstr "Beziehung:" #: ../src/rdf.cpp:265 msgid "A related resource" -msgstr "Zugehörige Ressource" +msgstr "Zugehöriges Dokument" #: ../src/rdf.cpp:267 ../src/ui/dialog/inkscape-preferences.cpp:1925 msgid "Language:" @@ -12422,7 +12429,7 @@ msgstr "Sprache:" #: ../src/rdf.cpp:268 msgid "A language of the resource" -msgstr "Sprache der Ressource" +msgstr "Sprache des Dokuments" #: ../src/rdf.cpp:270 msgid "Keywords:" @@ -12430,7 +12437,7 @@ msgstr "Schlüsselwörter:" #: ../src/rdf.cpp:271 msgid "The topic of the resource" -msgstr "Thema der Ressource" +msgstr "Thema des Dokuments" # !!! not the best translation #. TRANSLATORS: "Coverage": the spatial or temporal characteristics of the content. @@ -12444,8 +12451,8 @@ msgid "" "The spatial or temporal topic of the resource, the spatial applicability of " "the resource, or the jurisdiction under which the resource is relevant" msgstr "" -"Der zeitliche oder räumliche Hintergrund der Ressource, die räumliche " -"Verfügbarkeit oder die Gerichtsbarkeit unter welcher die Quelle steht" +"Der zeitliche oder räumliche Hintergrund des Dokuments, der räumliche " +"Geltungsbereich oder die Gerichtsbarkeit, für die das Dokument relevant ist" #: ../src/rdf.cpp:279 msgid "Description:" @@ -12453,7 +12460,7 @@ msgstr "Beschreibung:" #: ../src/rdf.cpp:280 msgid "An account of the resource" -msgstr "Bericht über die Ressource" +msgstr "Eine Beschreibung des Dokuments" #. FIXME: need to handle 1 agent per line of input #: ../src/rdf.cpp:284 @@ -12532,20 +12539,18 @@ msgid "Group" msgstr "Gruppieren" #: ../src/selection-chemistry.cpp:798 -#, fuzzy msgid "No objects selected to pop out of group." -msgstr "Objekte auswählen, um Stil zu übernehmen." +msgstr "" +"Keine Objekte ausgewählt, die aus der Gruppe herausgelöst werden " +"könnten." #: ../src/selection-chemistry.cpp:808 -#, fuzzy msgid "Selection not in a group." -msgstr "" -"Eine Gruppe auswählen, deren Gruppierung aufgehoben werden soll." +msgstr "Auswahl ist nicht in einer Gruppe." #: ../src/selection-chemistry.cpp:822 -#, fuzzy msgid "Pop selection from group" -msgstr "Auswahl als Gruppe behandeln:" +msgstr "Auswahl aus Gruppe entfernen" #: ../src/selection-chemistry.cpp:830 msgid "Select a group to ungroup." @@ -12563,7 +12568,7 @@ msgstr "Gruppierung aufheben" #: ../src/selection-chemistry.cpp:988 msgid "Select object(s) to raise." -msgstr "Objekte zum Heraufsetzen auswählen." +msgstr "Objekte zum Anheben auswählen." #: ../src/selection-chemistry.cpp:994 ../src/selection-chemistry.cpp:1047 #: ../src/selection-chemistry.cpp:1073 ../src/selection-chemistry.cpp:1131 @@ -12571,43 +12576,40 @@ msgid "" "You cannot raise/lower objects from different groups or layers." msgstr "" "Objekte aus verschiedenen Gruppen oder Ebenen können nicht " -"herauf- oder herabgesetzt werden." +"gleichzeitig angehoben/abgesenkt werden." #. TRANSLATORS: "Raise" means "to raise an object" in the undo history #: ../src/selection-chemistry.cpp:1031 msgctxt "Undo action" msgid "Raise" -msgstr "Heraufsetzen" +msgstr "Anheben" #: ../src/selection-chemistry.cpp:1039 msgid "Select object(s) to raise to top." -msgstr "" -"Objekt(e) auswählen, die in den Vordergrund heraufgesetzt werden " -"sollen." +msgstr "Objekt(e) auswählen, die nach oben angehoben werden sollen." #: ../src/selection-chemistry.cpp:1060 msgid "Raise to top" -msgstr "Nach ganz oben heraufsetzen" +msgstr "Nach ganz oben anheben" #: ../src/selection-chemistry.cpp:1067 msgid "Select object(s) to lower." -msgstr "Objekt(e) zum Herabsetzen auswählen." +msgstr "Objekt(e) zum Absenken auswählen." #. TRANSLATORS: "Lower" means "to lower an object" in the undo history #: ../src/selection-chemistry.cpp:1115 msgctxt "Undo action" msgid "Lower" -msgstr "Herabsetzen" +msgstr "Absenken" #: ../src/selection-chemistry.cpp:1123 msgid "Select object(s) to lower to bottom." msgstr "" -"Objekt(e) auswählen, die ganz in den Hintergrund herabgesetzt werden " -"sollen." +"Objekt(e) auswählen, die nach ganz unten abgesenkt werden sollen." #: ../src/selection-chemistry.cpp:1154 msgid "Lower to bottom" -msgstr "Nach ganz unten herabsetzen" +msgstr "Nach ganz unten absenken" # !!! just make the menu item insensitive #: ../src/selection-chemistry.cpp:1164 @@ -12625,7 +12627,7 @@ msgstr "Einfügen" #: ../src/selection-chemistry.cpp:1255 msgid "Paste style" -msgstr "Stil anwenden" +msgstr "Stil übertragen" #: ../src/selection-chemistry.cpp:1265 msgid "Paste live path effect" @@ -12633,7 +12635,7 @@ msgstr "Pfadeffekt einfügen" #: ../src/selection-chemistry.cpp:1287 msgid "Select object(s) to remove live path effects from." -msgstr "Objekt(e) auswählen, um den Pfadeffekt zu entfernen." +msgstr "Objekt(e) auswählen, deren Pfadeffekte entfernt werden sollen." #: ../src/selection-chemistry.cpp:1299 msgid "Remove live path effect" @@ -12641,7 +12643,7 @@ msgstr "Pfadeffekt entfernen" #: ../src/selection-chemistry.cpp:1310 msgid "Select object(s) to remove filters from." -msgstr "Text auswählen, um Filter zu entfernen." +msgstr "Objekt(e) auswählen, deren Filter entfernt werden sollen." #: ../src/selection-chemistry.cpp:1320 #: ../src/ui/dialog/filter-effects-dialog.cpp:1695 @@ -12659,12 +12661,12 @@ msgstr "Größe getrennt einfügen" #: ../src/selection-chemistry.cpp:1367 msgid "Select object(s) to move to the layer above." msgstr "" -"Objekt(e) auswählen, welche eine Ebene weiter nach oben verschoben " -"werden sollen." +"Objekt(e) auswählen, welche in die Ebene darüber verschoben werden " +"sollen." #: ../src/selection-chemistry.cpp:1393 msgid "Raise to next layer" -msgstr "Auf nächste Ebene anheben" +msgstr "In darüberliegende Ebene anheben" #: ../src/selection-chemistry.cpp:1400 msgid "No more layers above." @@ -12678,7 +12680,7 @@ msgstr "" #: ../src/selection-chemistry.cpp:1437 msgid "Lower to previous layer" -msgstr "Zur nächsten Ebene absenken" +msgstr "Zur darunterliegenden Ebene absenken" #: ../src/selection-chemistry.cpp:1444 msgid "No more layers below." @@ -12696,7 +12698,7 @@ msgstr "Auswahl zur Ebene verschieben" #. to a translation... but leave that for another day. #: ../src/selection-chemistry.cpp:1561 ../src/seltrans.cpp:391 msgid "Cannot transform an embedded SVG." -msgstr "Kann ein eingebettetes SVG nicht verändern." +msgstr "Kann ein eingebettetes SVG nicht transformieren." #: ../src/selection-chemistry.cpp:1731 msgid "Remove transform" @@ -12717,7 +12719,7 @@ msgstr "Drehen" #: ../src/selection-chemistry.cpp:2208 msgid "Rotate by pixels" -msgstr "Um Pixel rotieren" +msgstr "Pixelweise drehen" #: ../src/selection-chemistry.cpp:2238 ../src/seltrans.cpp:481 #: ../src/ui/dialog/transformation.cpp:864 ../src/ui/widget/page-sizer.cpp:450 @@ -12752,7 +12754,7 @@ msgstr "Horizontal um einzelne Pixel verschieben" #: ../src/selection-chemistry.cpp:2510 msgid "The selection has no applied path effect." -msgstr "Auf die Selektion ist kein Pfadeffekt angewandt." +msgstr "Die Auswahl enthält keine Objekte mit Pfadeffekt." #: ../src/selection-chemistry.cpp:2602 ../src/ui/dialog/clonetiler.cpp:2238 msgid "Select an object to clone." @@ -12765,11 +12767,13 @@ msgstr "Klonen" #: ../src/selection-chemistry.cpp:2651 msgid "Select clones to relink." -msgstr "Klon auswählen, um wieder zu verknüpfen" +msgstr "Klone auswählen, die neu verknüpft werden sollen" #: ../src/selection-chemistry.cpp:2658 msgid "Copy an object to clipboard to relink clones to." -msgstr "Kopiert ein Objekt in die Ablage als Elter für Klone." +msgstr "" +"Objekt, mit dem die Klone neu verknüpft werden sollen, in die " +"Zwischenablage kopieren." #: ../src/selection-chemistry.cpp:2679 msgid "No clones to relink in the selection." @@ -12779,7 +12783,7 @@ msgstr "" #: ../src/selection-chemistry.cpp:2682 msgid "Relink clone" -msgstr "Klon wiederverbinden" +msgstr "Klon neu verknüpfen" #: ../src/selection-chemistry.cpp:2696 msgid "Select clones to unlink." @@ -12819,7 +12823,7 @@ msgid "" "defs>)" msgstr "" "Dieses Objekt kann nicht ausgewählt werden - es ist unsichtbar und " -"befindet sich in <defs>" +"befindet sich in <defs>." #: ../src/selection-chemistry.cpp:2912 msgid "Select path(s) to fill." @@ -12863,7 +12867,7 @@ msgstr "" #: ../src/selection-chemistry.cpp:3272 msgid "Group from symbol" -msgstr "Gruppieren vom Symbol" +msgstr "Symbol zu Gruppe" #: ../src/selection-chemistry.cpp:3290 msgid "Select object(s) to convert to pattern." @@ -12925,7 +12929,7 @@ msgstr "Maske setzen" #: ../src/selection-chemistry.cpp:4043 msgid "Select object(s) to remove clippath or mask from." msgstr "" -"Objekt(e) auswählen deren Ausschneidepfad oder Maske entfernt werden " +"Objekt(e) auswählen, deren Ausschneidepfad oder Maske entfernt werden " "soll." #: ../src/selection-chemistry.cpp:4159 @@ -12936,10 +12940,11 @@ msgstr "Ausschneidepfad freigeben" msgid "Release mask" msgstr "Maske freigeben" +# While it's canvas in English, the page size is what is intended (according to cpp file). #: ../src/selection-chemistry.cpp:4180 msgid "Select object(s) to fit canvas to." msgstr "" -"Objekt(e) auswählen, auf die die Arbeitsfläche angepasst werden soll." +"Objekt(e) auswählen, an die die Seitengröße angepasst werden soll." #. Fit Page #: ../src/selection-chemistry.cpp:4200 ../src/verbs.cpp:3004 @@ -13003,8 +13008,8 @@ msgstr " in unbenannter Gruppe (%s)" #, c-format msgid " in %i parent (%s)" msgid_plural " in %i parents (%s)" -msgstr[0] " in %i Abstammung (%s)" -msgstr[1] " in %i Abstammungen (%s)" +msgstr[0] " in %i Elternelement (%s)" +msgstr[1] " in %i Elternelementen (%s)" #: ../src/selection-describer.cpp:186 #, c-format @@ -13077,7 +13082,7 @@ msgid "" "to rotate around the opposite corner" msgstr "" "Drehen der Auswahl; Winkel mit Strg einrasten; Umschalt " -"dreht entlang der gegenüberliegenden Seite" +"dreht um die gegenüberliegende Ecke" #: ../src/seltrans-handles.cpp:13 msgid "" @@ -13107,8 +13112,8 @@ msgstr "Mittelpunkt zurücksetzen" #, c-format msgid "Scale: %0.2f%% x %0.2f%%; with Ctrl to lock ratio" msgstr "" -"Skalierung: %0.2f%% × %0.2f%%; Höhen-/Breitenverhältnis mit Strg beibehalten" +"Skalierung: %0.2f%% × %0.2f%%; Seitenverhältnis mit Strg " +"beibehalten" #. TRANSLATORS: don't modify the first ";" #. (it will NOT be displayed as ";" - only the second one will be) @@ -13138,11 +13143,10 @@ msgstr "" "Verschieben um %s, %s; mit Strg auf horizontale/vertikale " "Verschiebung beschränken; Umschalt deaktiviert das Einrasten" -# !!! palettes, not swatches? #: ../src/shortcuts.cpp:226 #, c-format msgid "Keyboard directory (%s) is unavailable." -msgstr "Tastatur-verzeichnis (%s) nicht verfügbar." +msgstr "Tastaturkürzelverzeichnis (%s) nicht verfügbar." #: ../src/shortcuts.cpp:337 ../src/ui/dialog/export.cpp:1305 #: ../src/ui/dialog/export.cpp:1339 @@ -13205,7 +13209,7 @@ msgstr "Verknüpfter Fließtext" #: ../src/sp-flowtext.cpp:292 ../src/sp-text.cpp:380 #: ../src/ui/tools/text-tool.cpp:1556 msgid " [truncated]" -msgstr "[abgestumpft}" +msgstr "[abgeschnitten]" #: ../src/sp-flowtext.cpp:294 #, c-format @@ -13214,20 +13218,20 @@ msgid_plural "(%d characters%s)" msgstr[0] "(%d Zeichen%s)" msgstr[1] "(%d Zeichen%s)" -#: ../src/sp-guide.cpp:261 +#: ../src/sp-guide.cpp:262 msgid "Create Guides Around the Page" msgstr "Hilfslinien an Seitenrändern erstellen" -#: ../src/sp-guide.cpp:274 ../src/verbs.cpp:2544 +#: ../src/sp-guide.cpp:275 ../src/verbs.cpp:2544 msgid "Delete All Guides" msgstr "Hilfslinien löschen" #. Guide has probably been deleted and no longer has an attached namedview. -#: ../src/sp-guide.cpp:485 +#: ../src/sp-guide.cpp:486 msgid "Deleted" msgstr "Gelöscht" -#: ../src/sp-guide.cpp:494 +#: ../src/sp-guide.cpp:495 msgid "" "Shift+drag to rotate, Ctrl+drag to move origin, Del to " "delete" @@ -13235,17 +13239,17 @@ msgstr "" "Umschalt+Ziehen rotiert, Strg+Ziehen bewegt Ursprung, Entf löscht." -#: ../src/sp-guide.cpp:498 +#: ../src/sp-guide.cpp:499 #, c-format msgid "vertical, at %s" msgstr "Vertikale Hilfslinie bei %s" -#: ../src/sp-guide.cpp:501 +#: ../src/sp-guide.cpp:502 #, c-format msgid "horizontal, at %s" msgstr "Horizontale Hilfslinie bei %s" -#: ../src/sp-guide.cpp:506 +#: ../src/sp-guide.cpp:507 #, c-format msgid "at %d degrees, through (%s,%s)" msgstr "bei %d Grad, durch (%s, %s)" @@ -13268,6 +13272,7 @@ msgstr "%d × %d: %s" msgid "Group" msgstr "Gruppe" +# Or 'von'? 'Eine Gruppe von Objekten' sounds more natural. #: ../src/sp-item-group.cpp:313 ../src/sp-switch.cpp:69 #, c-format msgid "of %d object" @@ -13308,7 +13313,7 @@ msgstr "Linie" #: ../src/sp-lpe-item.cpp:258 ../src/sp-lpe-item.cpp:705 msgid "An exception occurred during execution of the Path Effect." -msgstr "Beim ausführen des Pfadeffektes ist ein Fehler aufgetreten." +msgstr "Beim Anwenden des Pfadeffektes ist ein Fehler aufgetreten." #: ../src/sp-offset.cpp:331 msgid "Linked Offset" @@ -13322,7 +13327,7 @@ msgstr "Dynamischer Versatz" #: ../src/sp-offset.cpp:339 #, c-format msgid "%s by %f pt" -msgstr "%s von %f Pkt." +msgstr "%s von %f pt" #: ../src/sp-offset.cpp:340 msgid "outset" @@ -13485,7 +13490,7 @@ msgstr "Überschneidung" #: ../src/splivarot.cpp:106 ../src/splivarot.cpp:112 msgid "Division" -msgstr "Aufteilung" +msgstr "Division" #: ../src/splivarot.cpp:118 msgid "Cut path" @@ -13508,8 +13513,9 @@ msgid "" "Unable to determine the z-order of the objects selected for " "difference, XOR, division, or path cut." msgstr "" -"Die Z-Tiefe der ausgewählten Objekte konnte nicht für die Differenz-, " -"XOR-, Division- oder Pfadzuschneideoperation ermittelt werden." +"Die Stapelhöhe der ausgewählten Objekte konnte nicht für die " +"Differenz-, XOR-, Divisions- oder Pfad-Zerschneiden-Operation ermittelt " +"werden." #: ../src/splivarot.cpp:408 msgid "" @@ -13591,7 +13597,8 @@ msgstr "Die Auswahl enthält keine Pfade zum Vereinfachen." #: ../src/text-chemistry.cpp:91 msgid "Select a text and a path to put text on path." -msgstr "Einen Text und Pfad auswählen, um Text an Pfad auszurichten." +msgstr "" +"Einen Text und einen Pfad auswählen, um Text an Pfad auszurichten." #: ../src/text-chemistry.cpp:96 msgid "" @@ -13607,7 +13614,7 @@ msgid "" "You cannot put text on a rectangle in this version. Convert rectangle to " "path first." msgstr "" -"Fließtext auf einem Rechteck in dieser Version noch nicht unterstützt. " +"Fließtext in einem Rechteck in dieser Version noch nicht unterstützt. " "Rechteck vorerst in einen Pfad umwandeln." #: ../src/text-chemistry.cpp:112 @@ -13621,15 +13628,15 @@ msgstr "Text an Pfad ausrichten" #: ../src/text-chemistry.cpp:194 msgid "Select a text on path to remove it from path." -msgstr "Einen Text-Pfad zum Trennen vom Pfad auswählen." +msgstr "Einen Text zum Trennen von einem Pfad auswählen." #: ../src/text-chemistry.cpp:213 msgid "No texts-on-paths in the selection." -msgstr "Kein Text-Pfad in der Auswahl vorhanden." +msgstr "Kein Text an Pfad in der Auswahl vorhanden." #: ../src/text-chemistry.cpp:216 ../src/verbs.cpp:2571 msgid "Remove text from path" -msgstr "Text wird von Pfad getrennt" +msgstr "Text von Pfad trennen" #: ../src/text-chemistry.cpp:257 ../src/text-chemistry.cpp:277 msgid "Select text(s) to remove kerns from." @@ -13644,7 +13651,7 @@ msgid "" "Select a text and one or more paths or shapes to flow text " "into frame." msgstr "" -"Einen Text und Pfad oder Form zum Erzeugen eines " +"Einen Text und Pfad(e) oder Form(en) zum Erzeugen eines " "Fließtextes auswählen." #: ../src/text-chemistry.cpp:369 @@ -13825,7 +13832,9 @@ msgstr "" "Stefan Graubner (pflaumenmus92@gmx.net)\n" "Stefan von Halenbach (vonHalenbach@users.sourceforge.net)\n" "Uwe Schöler (uschoeler@yahoo.de)\n" -"Wolfram Strempfer (wolfram@strempfer.de)" +"Wolfram Strempfer (wolfram@strempfer.de)\n" +"Eduard Braun (Eduard.Braun2@gmx.de)\n" +"Maren Hachmann (marenhachmann@yahoo.com)" #: ../src/ui/dialog/align-and-distribute.cpp:206 #: ../src/ui/dialog/align-and-distribute.cpp:937 @@ -13870,7 +13879,7 @@ msgstr "Netzwerk von Objektverbindern anordnen" #: ../src/ui/dialog/align-and-distribute.cpp:632 msgid "Exchange Positions" -msgstr "Positionen verändern" +msgstr "Positionen tauschen" #: ../src/ui/dialog/align-and-distribute.cpp:666 msgid "Unclump" @@ -14012,16 +14021,17 @@ msgstr "Das gewählte Netzwerk von Objektverbindern gefällig anordnen" #: ../src/ui/dialog/align-and-distribute.cpp:1044 msgid "Exchange positions of selected objects - selection order" -msgstr "Ändern der Position der ausgewählten Objekte - Auswahlanordnung" +msgstr "Vertauschen der Position der ausgewählten Objekte - Auswahlanordnung" #: ../src/ui/dialog/align-and-distribute.cpp:1047 msgid "Exchange positions of selected objects - stacking order" -msgstr "Ändern der Position der ausgewählten Objekte - Stapelanordnung" +msgstr "Vertauschen der Position der ausgewählten Objekte - Stapelanordnung" #: ../src/ui/dialog/align-and-distribute.cpp:1050 msgid "Exchange positions of selected objects - clockwise rotate" msgstr "" -"Ändern der Position der ausgewählten Objekte - im Uhrzeigersinn rotierend" +"Vertauschen der Position der ausgewählten Objekte - im Uhrzeigersinn " +"rotierend" #: ../src/ui/dialog/align-and-distribute.cpp:1055 msgid "Randomize centers in both dimensions" @@ -14079,19 +14089,16 @@ msgid "Selection Area" msgstr "Auswahlbereich" #: ../src/ui/dialog/align-and-distribute.cpp:1097 -#, fuzzy msgid "Middle of selection" -msgstr "Breite der Auswahl" +msgstr "Mitte der Auswahl" #: ../src/ui/dialog/align-and-distribute.cpp:1098 -#, fuzzy msgid "Min value" -msgstr "Unterschneidungswert:" +msgstr "Kleinste Koordinate der Auswahl" #: ../src/ui/dialog/align-and-distribute.cpp:1099 -#, fuzzy msgid "Max value" -msgstr "Werte zurücksetzen" +msgstr "Größte Koordinate der Auswahl" #: ../src/ui/dialog/calligraphic-profile-rename.cpp:40 #: ../src/ui/dialog/calligraphic-profile-rename.cpp:138 @@ -14125,33 +14132,33 @@ msgstr "P2: 180° Drehung" #: ../src/ui/dialog/clonetiler.cpp:124 msgid "PM: reflection" -msgstr "PM: Reflektion" +msgstr "PM: Reflexion" #. TRANSLATORS: "glide reflection" is a reflection and a translation combined. #. For more info, see http://mathforum.org/sum95/suzanne/symsusan.html #: ../src/ui/dialog/clonetiler.cpp:127 msgid "PG: glide reflection" -msgstr "PG: gleitende Reflektion" +msgstr "PG: gleitende Reflexion" #: ../src/ui/dialog/clonetiler.cpp:128 msgid "CM: reflection + glide reflection" -msgstr "CM: Reflektion + gleitende Reflektion" +msgstr "CM: Reflexion + gleitende Reflexion" #: ../src/ui/dialog/clonetiler.cpp:129 msgid "PMM: reflection + reflection" -msgstr "PMM: Reflektion + Reflektion" +msgstr "PMM: Reflexion + Reflexion" #: ../src/ui/dialog/clonetiler.cpp:130 msgid "PMG: reflection + 180° rotation" -msgstr "PMG: Reflektion + 180° Drehung" +msgstr "PMG: Reflexion + 180° Drehung" #: ../src/ui/dialog/clonetiler.cpp:131 msgid "PGG: glide reflection + 180° rotation" -msgstr "PGG: gleitende Reflektion + 180° Drehung" +msgstr "PGG: gleitende Reflexion + 180° Drehung" #: ../src/ui/dialog/clonetiler.cpp:132 msgid "CMM: reflection + reflection + 180° rotation" -msgstr "CMM: Reflektion + Reflektion + 180° Drehung" +msgstr "CMM: Reflexion + Reflexion + 180° Drehung" #: ../src/ui/dialog/clonetiler.cpp:133 msgid "P4: 90° rotation" @@ -14159,11 +14166,11 @@ msgstr "P4: 90° Drehung" #: ../src/ui/dialog/clonetiler.cpp:134 msgid "P4M: 90° rotation + 45° reflection" -msgstr "P4M: 90° Drehung + 45° Reflektion" +msgstr "P4M: 90° Drehung + 45° Reflexion" #: ../src/ui/dialog/clonetiler.cpp:135 msgid "P4G: 90° rotation + 90° reflection" -msgstr "P4G: 90° Drehung + 90° Reflektion" +msgstr "P4G: 90° Drehung + 90° Reflexion" #: ../src/ui/dialog/clonetiler.cpp:136 msgid "P3: 120° rotation" @@ -14171,11 +14178,11 @@ msgstr "P3: 120° Drehung" #: ../src/ui/dialog/clonetiler.cpp:137 msgid "P31M: reflection + 120° rotation, dense" -msgstr "P31M: Reflektion + 120° Drehung, dicht" +msgstr "P31M: Reflexion + 120° Drehung, dicht" #: ../src/ui/dialog/clonetiler.cpp:138 msgid "P3M1: reflection + 120° rotation, sparse" -msgstr "P3M1: Reflektion + 120° Drehung, dünn" +msgstr "P3M1: Reflexion + 120° Drehung, dünn" #: ../src/ui/dialog/clonetiler.cpp:139 msgid "P6: 60° rotation" @@ -14183,7 +14190,7 @@ msgstr "P6: 60° Drehung" #: ../src/ui/dialog/clonetiler.cpp:140 msgid "P6M: reflection + 60° rotation" -msgstr "P6M: Reflektion + 60° Drehung" +msgstr "P6M: Reflexion + 60° Drehung" #: ../src/ui/dialog/clonetiler.cpp:160 msgid "Select one of the 17 symmetry groups for the tiling" @@ -14474,13 +14481,12 @@ msgid "Initial color of tiled clones" msgstr "Ursprüngliche Farbe der gekachelten Klone" #: ../src/ui/dialog/clonetiler.cpp:665 -#, fuzzy msgid "" "Initial color for clones (works only if the original has unset fill or " "stroke or on spray tool in copy mode)" msgstr "" -"Ursprüngliche Farbe der Klone (Füllung oder Kontur des Originals dürfen " -"nicht gesetzt sein )" +"Ursprüngliche Farbe der Klone (Füllung oder Konturfarbe des Originals dürfen " +"nicht gesetzt sein; Ausnahme: Sprühwerkzeug im Kopiermodus)" #: ../src/ui/dialog/clonetiler.cpp:680 msgid "H:" @@ -14545,18 +14551,16 @@ msgid "_Trace" msgstr "_Nachzeichnen" #: ../src/ui/dialog/clonetiler.cpp:788 -#, fuzzy msgid "Trace the drawing under the clones/sprayed items" -msgstr "Zeichnung unter den Kacheln nachzeichnen" +msgstr "Zeichnung unter den Klonen / gesprühten Objekten abpausen" #: ../src/ui/dialog/clonetiler.cpp:792 -#, fuzzy msgid "" "For each clone/sprayed item, pick a value from the drawing in its location " "and apply it" msgstr "" -"Für jeden Klon den entsprechenden Wert an dessen Stelle aus der Zeichnung " -"anwenden" +"Für jeden Klon / jedes gesprühte Objekt den Wert an dessen Position aus der " +"Zeichnung übernehmen" #: ../src/ui/dialog/clonetiler.cpp:811 msgid "1. Pick from the drawing:" @@ -14653,11 +14657,11 @@ msgstr "Übernommenen Wert invertieren" #: ../src/ui/dialog/clonetiler.cpp:944 msgid "3. Apply the value to the clones':" -msgstr "3. Wert auf die Klone anwenden:" +msgstr "3. Wert auf diese Kloneigenschaft anwenden:" #: ../src/ui/dialog/clonetiler.cpp:959 msgid "Presence" -msgstr "Anwesenheit" +msgstr "Vorhandensein" #: ../src/ui/dialog/clonetiler.cpp:962 msgid "" @@ -14689,9 +14693,8 @@ msgstr "" "Die Deckkraft jedes Klons wird durch den Wert an dieser Stelle bestimmt" #: ../src/ui/dialog/clonetiler.cpp:1011 -#, fuzzy msgid "Apply to tiled clones:" -msgstr "Gekachelte Klone löschen" +msgstr "Auf gekachelte Klone anwenden:" #: ../src/ui/dialog/clonetiler.cpp:1052 msgid "How many rows in the tiling" @@ -14723,7 +14726,7 @@ msgstr "Breite, Höhe: " #: ../src/ui/dialog/clonetiler.cpp:1196 msgid "Fill the specified width and height with the tiling" -msgstr "Durch Höhe und Breite festgelegte Fläche mit Füllmuster versehen" +msgstr "Durch Höhe und Breite festgelegte Fläche mit Klonen ausfüllen" #: ../src/ui/dialog/clonetiler.cpp:1217 msgid "Use saved size and position of the tile" @@ -14734,8 +14737,8 @@ 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 "" -"Anstelle der aktuellen Größe die letzte Position und Größe der Kachel/" -"Musterfüllung vorgeben" +"Anstelle der aktuellen Größe die beim letzten Kachelvorgang verwendete " +"Position und Größe der Kachel als Startposition/-größe verwenden" #: ../src/ui/dialog/clonetiler.cpp:1254 msgid " _Create " @@ -14802,7 +14805,8 @@ msgstr "Das Objekt hat keine gekachelten Klone." #: ../src/ui/dialog/clonetiler.cpp:2117 msgid "Select one object whose tiled clones to unclump." -msgstr "Ein Objekt auswählen, dessen gekachelte Klone entklumpt werden." +msgstr "" +"Ein Objekt auswählen, dessen gekachelte Klone entklumpt werden sollen." #: ../src/ui/dialog/clonetiler.cpp:2137 msgid "Unclump tiled clones" @@ -14810,7 +14814,8 @@ msgstr "Gekachelte Klone entklumpen" #: ../src/ui/dialog/clonetiler.cpp:2166 msgid "Select one object whose tiled clones to remove." -msgstr "Ein Objekt auswählen, dessen gekachelte Klone entfernt werden." +msgstr "" +"Ein Objekt auswählen, dessen gekachelte Klone entfernt werden sollen." #: ../src/ui/dialog/clonetiler.cpp:2191 msgid "Delete tiled clones" @@ -14826,7 +14831,7 @@ msgstr "" #: ../src/ui/dialog/clonetiler.cpp:2253 msgid "Creating tiled clones..." -msgstr "Geschachtelte Klone erstellen..." +msgstr "Gekachelte Klone erstellen..." #: ../src/ui/dialog/clonetiler.cpp:2670 msgid "Create tiled clones" @@ -14850,7 +14855,7 @@ msgid "" "Color: %s; Click to set fill, Shift+click to set stroke" msgstr "" "Farbe: %s; Klick legt die Füllung fest, Umschalt+Klick " -"legt die Konturfarbe fest" +"die Konturfarbe" #: ../src/ui/dialog/color-item.cpp:505 msgid "Change color definition" @@ -14908,12 +14913,12 @@ msgstr "Nutzungsbedingungen - Lizenz" # !!! #: ../src/ui/dialog/document-metadata.cpp:126 -#: ../src/ui/dialog/document-properties.cpp:994 +#: ../src/ui/dialog/document-properties.cpp:1037 msgid "Dublin Core Entities" msgstr "Dublin-Core-Entities" #: ../src/ui/dialog/document-metadata.cpp:168 -#: ../src/ui/dialog/document-properties.cpp:1056 +#: ../src/ui/dialog/document-properties.cpp:1099 msgid "License" msgstr "Lizenz" @@ -14924,18 +14929,19 @@ msgstr "Kantenglättung verwenden" #: ../src/ui/dialog/document-properties.cpp:118 msgid "If unset, no antialiasing will be done on the drawing" -msgstr "Wenn abgewählt, erfolgt keine Kantenglättung" +msgstr "Wenn nicht gewählt, erfolgt keine Kantenglättung" #: ../src/ui/dialog/document-properties.cpp:119 -#, fuzzy msgid "Checkerboard background" -msgstr "Hintergrund entfernen" +msgstr "Schachbrettmuster als Hintergrund" #: ../src/ui/dialog/document-properties.cpp:119 msgid "" "If set, use checkerboard for background, otherwise use background color at " "full opacity." msgstr "" +"Wenn aktiviert, wird ein Schachbrettmuster als Hintergrund verwendet, " +"andernfalls die Hintergrundfarbe mit voller Deckkraft." #: ../src/ui/dialog/document-properties.cpp:120 msgid "Show page _border" @@ -14943,7 +14949,7 @@ msgstr "_Rand der Seite anzeigen" #: ../src/ui/dialog/document-properties.cpp:120 msgid "If set, rectangular page border is shown" -msgstr "Wenn gesetzt, dann wird ein rechteckiger Seitenrand gezeigt" +msgstr "Wenn aktiviert, dann wird ein rechteckiger Seitenrand gezeigt" #: ../src/ui/dialog/document-properties.cpp:121 msgid "Border on _top of drawing" @@ -14951,7 +14957,7 @@ msgstr "Rand im _Vordergrund anzeigen" #: ../src/ui/dialog/document-properties.cpp:121 msgid "If set, border is always on top of the drawing" -msgstr "Wenn gesetzt, dann ist der Rand immmer im Vordergrund" +msgstr "Wenn aktiviert, dann ist der Rand immer im Vordergrund" #: ../src/ui/dialog/document-properties.cpp:122 msgid "_Show border shadow" @@ -14960,7 +14966,7 @@ msgstr "Rand_schatten anzeigen" #: ../src/ui/dialog/document-properties.cpp:122 msgid "If set, page border shows a shadow on its right and lower side" msgstr "" -"Wenn gesetzt, dann zeigt der Seitenrand einen Schatten an der rechten und " +"Wenn aktiviert, dann zeigt der Seitenrand einen Schatten an der rechten und " "unteren Seite" #: ../src/ui/dialog/document-properties.cpp:123 @@ -14968,14 +14974,14 @@ msgid "Back_ground color:" msgstr "Hintergrundfarbe:" #: ../src/ui/dialog/document-properties.cpp:123 -#, fuzzy msgid "" "Color of the page background. Note: transparency setting ignored while " "editing if 'Checkerboard background' unset (but used when exporting to " "bitmap)." msgstr "" "Farbe des Seitenhintergrunds. Hinweis: Transparenzeinstellung wird während " -"der Bearbeitung ignoriert, aber für den Bitmap-Export genutzt" +"der Bearbeitung ignoriert, wenn 'Schachbrettmuster als Hintergrund' " +"deaktiviert ist (wird für den Bitmap-Export jedoch immer benutzt)" #: ../src/ui/dialog/document-properties.cpp:124 msgid "Border _color:" @@ -15049,8 +15055,8 @@ msgstr "Einrastabstand in Bildschirmpixeln, um an Objekten einzurasten" #: ../src/ui/dialog/document-properties.cpp:134 msgid "Always snap to objects, regardless of their distance" msgstr "" -"Wenn gesetzt, dann rasten Objekte am nahesten Objekt ein, unabhängig von der " -"Entfernung" +"Objekte rasten immer am nächstgelegenen Objekt ein, egal, wie weit dieses " +"entfernt ist" #: ../src/ui/dialog/document-properties.cpp:135 msgid "" @@ -15058,7 +15064,7 @@ msgid "" "specified below" msgstr "" "Nur an anderen Objekten einrasten, wenn diese innerhalb der unten " -"festgelegten Reichweite sind." +"festgelegten Reichweite sind" #. Options for snapping to grids #: ../src/ui/dialog/document-properties.cpp:138 @@ -15071,13 +15077,13 @@ msgstr "Nur einrasten, wenn _näher als:" #: ../src/ui/dialog/document-properties.cpp:139 msgid "Snapping distance, in screen pixels, for snapping to grid" -msgstr "Einrastabstand in Bildschirmpixeln, um in das Gitter einzurasten" +msgstr "Einrastabstand in Bildschirmpixeln, um am Gitter einzurasten" #: ../src/ui/dialog/document-properties.cpp:139 msgid "Always snap to grids, regardless of the distance" msgstr "" -"Wenn gesetzt, dann rasten Objekte an der nahesten Gitterslinie ein, " -"unabhängig von der Entfernung" +"Objekte rasten an der nächstgelegenen Gitterlinie ein, egal, wie weit diese " +"entfernt ist" #: ../src/ui/dialog/document-properties.cpp:140 msgid "" @@ -15085,7 +15091,7 @@ msgid "" "specified below" msgstr "" "Nur an Gitterlinien einrasten, wenn diese innerhalb der unten festgelegten " -"Reichweite sind." +"Reichweite sind" #. Options for snapping to guides #: ../src/ui/dialog/document-properties.cpp:143 @@ -15103,8 +15109,8 @@ msgstr "Einrastabstand in Bildschirmpixeln, um an Hilfslinien einzurasten" #: ../src/ui/dialog/document-properties.cpp:144 msgid "Always snap to guides, regardless of the distance" msgstr "" -"Objekte rasten immer an der nächsten Hilfslinie ein, unabhängig von der " -"Entfernung" +"Objekte rasten immer an der nächstgelegenen Hilfslinie ein, egal, wie weit " +"diese entfernt ist" #: ../src/ui/dialog/document-properties.cpp:145 msgid "" @@ -15112,7 +15118,7 @@ msgid "" "below" msgstr "" "Nur an Hilfslinien einrasten, wenn diese innerhalb der unten festgelegten " -"Reichweite sind." +"Reichweite sind" #. --------------------------------------------------------------- #: ../src/ui/dialog/document-properties.cpp:148 @@ -15122,8 +15128,7 @@ msgstr "An Ausschneidepfaden einrasten" #: ../src/ui/dialog/document-properties.cpp:148 msgid "When snapping to paths, then also try snapping to clip paths" msgstr "" -"Neben dem Einrasten an Pfaden, auch versuchen an Ausschneidepfaden " -"einzurasten" +"Beim Einrasten an Pfaden auch versuchen, an Ausschneidepfaden einzurasten" #: ../src/ui/dialog/document-properties.cpp:149 msgid "Snap to mask paths" @@ -15131,8 +15136,7 @@ msgstr "An Maskenpfaden einrasten" #: ../src/ui/dialog/document-properties.cpp:149 msgid "When snapping to paths, then also try snapping to mask paths" -msgstr "" -"Neben dem Einrasten an Pfaden, auch versuchen an Maskenpfaden einzurasten" +msgstr "Beim Einrasten an Pfaden auch versuchen, an Maskenpfaden einzurasten" #: ../src/ui/dialog/document-properties.cpp:150 msgid "Snap perpendicularly" @@ -15142,7 +15146,7 @@ msgstr "Senkrecht einrasten" msgid "" "When snapping to paths or guides, then also try snapping perpendicularly" msgstr "" -"Neben dem Einrasten an Pfaden oder Hilfslinien, auch versuchen senkrecht " +"Beim Einrasten an Pfaden oder Hilfslinien auch versuchen, senkrecht " "einzurasten" #: ../src/ui/dialog/document-properties.cpp:151 @@ -15152,7 +15156,7 @@ msgstr "Tangential einrasten" #: ../src/ui/dialog/document-properties.cpp:151 msgid "When snapping to paths or guides, then also try snapping tangentially" msgstr "" -"Neben dem Einrasten an Pfaden oder Hilfslinien, auch versuchen tangential " +"Beim Einrasten an Pfaden oder Hilfslinien auch versuchen, tangential " "einzurasten" #: ../src/ui/dialog/document-properties.cpp:154 @@ -15185,32 +15189,26 @@ msgstr "Einrasten" msgid "Scripting" msgstr "Skripte" -# !!! #: ../src/ui/dialog/document-properties.cpp:330 msgid "General" msgstr "Allgemein" -# !!! #: ../src/ui/dialog/document-properties.cpp:333 msgid "Page Size" msgstr "Seitengröße" #: ../src/ui/dialog/document-properties.cpp:336 -#, fuzzy msgid "Background" -msgstr "Hintergrund" +msgstr "Hintergrund" -# !!! #: ../src/ui/dialog/document-properties.cpp:339 msgid "Border" msgstr "Rand" -# !!! #: ../src/ui/dialog/document-properties.cpp:342 msgid "Display" msgstr "Anzeige" -# !!! #: ../src/ui/dialog/document-properties.cpp:381 msgid "Guides" msgstr "Hilfslinien" @@ -15235,137 +15233,137 @@ msgstr "Verschiedenes" #. Inkscape::GC::release(defsRepr); #. inform the document, so we can undo #. Color Management -#: ../src/ui/dialog/document-properties.cpp:526 ../src/verbs.cpp:3020 +#: ../src/ui/dialog/document-properties.cpp:542 ../src/verbs.cpp:3020 msgid "Link Color Profile" -msgstr "Farb-Profil verknüpfen" +msgstr "Farbprofil verknüpfen" -#: ../src/ui/dialog/document-properties.cpp:623 +#: ../src/ui/dialog/document-properties.cpp:654 msgid "Remove linked color profile" -msgstr "Verknüpftes Farb-Profil entfernen" +msgstr "Verknüpftes Farbprofil entfernen" -#: ../src/ui/dialog/document-properties.cpp:636 +#: ../src/ui/dialog/document-properties.cpp:673 msgid "Linked Color Profiles:" -msgstr "Verknüpfte Farb-Profile:" +msgstr "Verknüpfte Farbprofile:" -#: ../src/ui/dialog/document-properties.cpp:638 +#: ../src/ui/dialog/document-properties.cpp:675 msgid "Available Color Profiles:" -msgstr "Verfügbare Farb-Profile:" +msgstr "Verfügbare Farbprofile:" -#: ../src/ui/dialog/document-properties.cpp:640 +#: ../src/ui/dialog/document-properties.cpp:677 msgid "Link Profile" msgstr "Profil verknüpfen" -#: ../src/ui/dialog/document-properties.cpp:643 +#: ../src/ui/dialog/document-properties.cpp:680 msgid "Unlink Profile" msgstr "Profil entknüpfen" -#: ../src/ui/dialog/document-properties.cpp:721 +#: ../src/ui/dialog/document-properties.cpp:764 msgid "Profile Name" -msgstr "Profil-Name" +msgstr "Profilname" -#: ../src/ui/dialog/document-properties.cpp:757 +#: ../src/ui/dialog/document-properties.cpp:800 msgid "External scripts" -msgstr "Externe Scripte" +msgstr "Externe Skripte" -#: ../src/ui/dialog/document-properties.cpp:758 +#: ../src/ui/dialog/document-properties.cpp:801 msgid "Embedded scripts" -msgstr "Eingebettete Scripte" +msgstr "Eingebettete Skripte" -#: ../src/ui/dialog/document-properties.cpp:763 +#: ../src/ui/dialog/document-properties.cpp:806 msgid "External script files:" -msgstr "Externe Script-Dateien:" +msgstr "Externe Skriptdateien:" -#: ../src/ui/dialog/document-properties.cpp:765 +#: ../src/ui/dialog/document-properties.cpp:808 msgid "Add the current file name or browse for a file" msgstr "" "Fügen Sie den aktuellen Dateinamen hinzu oder suchen Sie nach einer Datei" -#: ../src/ui/dialog/document-properties.cpp:768 -#: ../src/ui/dialog/document-properties.cpp:845 +#: ../src/ui/dialog/document-properties.cpp:811 +#: ../src/ui/dialog/document-properties.cpp:888 #: ../src/ui/widget/selected-style.cpp:357 msgid "Remove" msgstr "Entfernen" -#: ../src/ui/dialog/document-properties.cpp:832 +#: ../src/ui/dialog/document-properties.cpp:875 msgid "Filename" msgstr "Dateiname" -#: ../src/ui/dialog/document-properties.cpp:840 +#: ../src/ui/dialog/document-properties.cpp:883 msgid "Embedded script files:" -msgstr "Eingebettete Script-Dateien:" +msgstr "Eingebettete Skriptdateien:" -#: ../src/ui/dialog/document-properties.cpp:842 +#: ../src/ui/dialog/document-properties.cpp:885 #: ../src/ui/dialog/objects.cpp:1894 msgid "New" msgstr "Neu" -#: ../src/ui/dialog/document-properties.cpp:909 +#: ../src/ui/dialog/document-properties.cpp:952 msgid "Script id" -msgstr "Skript id" +msgstr "Skript-ID" -#: ../src/ui/dialog/document-properties.cpp:915 +#: ../src/ui/dialog/document-properties.cpp:958 msgid "Content:" msgstr "Inhalt:" -#: ../src/ui/dialog/document-properties.cpp:1032 +#: ../src/ui/dialog/document-properties.cpp:1075 msgid "_Save as default" msgstr "Zur Vorgabe machen" -#: ../src/ui/dialog/document-properties.cpp:1033 +#: ../src/ui/dialog/document-properties.cpp:1076 msgid "Save this metadata as the default metadata" -msgstr "Metadaten als Standard-Metadaten abspeichern" +msgstr "Metadaten als Standard abspeichern" -#: ../src/ui/dialog/document-properties.cpp:1034 +#: ../src/ui/dialog/document-properties.cpp:1077 msgid "Use _default" msgstr "Standardeinstellungen benutzen" -#: ../src/ui/dialog/document-properties.cpp:1035 +#: ../src/ui/dialog/document-properties.cpp:1078 msgid "Use the previously saved default metadata here" -msgstr "Verwenden Sie hier die zuvor gespeicherte Standardmetadaten" +msgstr "Die zuvor gespeicherten Standardmetadaten verwenden" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1108 +#: ../src/ui/dialog/document-properties.cpp:1151 msgid "Add external script..." -msgstr "Füge externes Script hinzu..." +msgstr "Füge externes Skript hinzu..." -#: ../src/ui/dialog/document-properties.cpp:1147 +#: ../src/ui/dialog/document-properties.cpp:1190 msgid "Select a script to load" msgstr "Skript zum Laden auswählen" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1175 +#: ../src/ui/dialog/document-properties.cpp:1218 msgid "Add embedded script..." -msgstr "Füge eingebettetes Script hinzu..." +msgstr "Füge eingebettetes Skript hinzu..." #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1206 +#: ../src/ui/dialog/document-properties.cpp:1249 msgid "Remove external script" -msgstr "Lösche externes Script" +msgstr "Lösche externes Skript" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1235 +#: ../src/ui/dialog/document-properties.cpp:1278 msgid "Remove embedded script" -msgstr "Eingebettetes Script entfernen" +msgstr "Eingebettetes Skript entfernen" #. TODO repr->set_content(_EmbeddedContent.get_buffer()->get_text()); #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1331 +#: ../src/ui/dialog/document-properties.cpp:1374 msgid "Edit embedded script" -msgstr "Eingebettetes Script bearbeiten" +msgstr "Eingebettetes Skript bearbeiten" -#: ../src/ui/dialog/document-properties.cpp:1415 +#: ../src/ui/dialog/document-properties.cpp:1458 msgid "Creation" msgstr "Erzeugen" -#: ../src/ui/dialog/document-properties.cpp:1416 +#: ../src/ui/dialog/document-properties.cpp:1459 msgid "Defined grids" msgstr "Definierte Gitter" -#: ../src/ui/dialog/document-properties.cpp:1660 +#: ../src/ui/dialog/document-properties.cpp:1703 msgid "Remove grid" msgstr "Gitter entfernen" -#: ../src/ui/dialog/document-properties.cpp:1752 +#: ../src/ui/dialog/document-properties.cpp:1795 msgid "Changed default display unit" msgstr "Änderung der Anzeigeeinheit" @@ -15487,11 +15485,12 @@ msgstr "_Dateiname" #: ../src/ui/dialog/export.cpp:354 msgid "Export the bitmap file with these settings" -msgstr "Bitmapdatei mit diesen Einstellungen exportieren" +msgstr "Rastergrafik mit diesen Einstellungen exportieren" +# Example file name #: ../src/ui/dialog/export.cpp:479 msgid "bitmap" -msgstr "Bitmap" +msgstr "Rastergrafik" #: ../src/ui/dialog/export.cpp:614 #, c-format @@ -15531,7 +15530,7 @@ msgstr "Konnte nicht als Datei %s exportieren." #, c-format msgid "Successfully exported %d files from %d selected items." msgstr "" -"Erfolgreich %d Dateien aus %d ausgewählten Artikeln exportiert." +"Erfolgreich %d Dateien aus %d ausgewählten Objekten exportiert." #: ../src/ui/dialog/export.cpp:1109 msgid "You have to enter a filename." @@ -15543,7 +15542,7 @@ msgstr "Sie müssen einen Dateinamen angeben" #: ../src/ui/dialog/export.cpp:1124 msgid "The chosen area to be exported is invalid." -msgstr "Der zum Exportieren gewählte Bereich ist ungültig" +msgstr "Der zum Exportieren gewählte Bereich ist ungültig." #: ../src/ui/dialog/export.cpp:1125 msgid "The chosen area to be exported is invalid" @@ -15562,11 +15561,11 @@ msgstr "Exportiere %1 (%2 x %3)" #: ../src/ui/dialog/export.cpp:1183 #, c-format msgid "Drawing exported to %s." -msgstr "Zeichnung exportiert zu %s." +msgstr "Zeichnung exportiert als %s." #: ../src/ui/dialog/export.cpp:1187 msgid "Export aborted." -msgstr "Export abgebochen." +msgstr "Export abgebrochen." #: ../src/ui/dialog/export.cpp:1308 ../src/ui/interface.cpp:1401 #: ../src/widgets/desktop-widget.cpp:1201 @@ -15680,14 +15679,14 @@ msgstr "Alle Bilder" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:832 #: ../src/ui/dialog/filedialogimpl-win32.cpp:289 msgid "All Vectors" -msgstr "Alle Vektoren" +msgstr "Alle Vektorgrafiken" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:805 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:821 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:835 #: ../src/ui/dialog/filedialogimpl-win32.cpp:290 msgid "All Bitmaps" -msgstr "Alle Bitmaps" +msgstr "Alle Rastergrafiken" #. ###### File options #. ###### Do we want the .xxx extension automatically added? @@ -15735,7 +15734,7 @@ msgstr "Zielhöhe" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1507 msgid "Resolution (dots per inch)" -msgstr "Auflösung (Punkte pro Zoll)" +msgstr "Auflösung (dpi)" #. ######################################### #. ## EXTRA WIDGET -- SOURCE SIDE @@ -15801,8 +15800,8 @@ msgid "" "depend on input colors, so can be used to adjust a constant component value." msgstr "" "Diese Matrix definiert eine lineare Transformation im Farbraum. Jede Zeile " -"wirkt auf eine der Farbkomponenten des Ausgangs, jede Spalte bestimmt den " -"Einfluß der jeweiligen Eingangskomponente. Die letzte Spalte gibt einen " +"wirkt auf eine der Farbkomponenten des Ausgangs. Jede Spalte bestimmt den " +"Einfluss der jeweiligen Eingangskomponente. Die letzte Spalte gibt einen " "konstanten Grundwert der Ausgangskomponenten vor." # CHECK @@ -15814,16 +15813,16 @@ msgstr "Keine" #: ../src/ui/dialog/filter-effects-dialog.cpp:657 msgid "Image File" -msgstr "Bild-Datei" +msgstr "Bilddatei" #: ../src/ui/dialog/filter-effects-dialog.cpp:660 msgid "Selected SVG Element" -msgstr "Gewähltes SVG Element" +msgstr "Gewähltes SVG-Element" #. TODO: any image, not just svg #: ../src/ui/dialog/filter-effects-dialog.cpp:730 msgid "Select an image to be used as feImage input" -msgstr "Wählt ein Bild als Eingabe für feBild" +msgstr "Ein Bild als Eingabe für Bild-Filterbaustein wählen" #: ../src/ui/dialog/filter-effects-dialog.cpp:822 msgid "This SVG filter effect does not require any parameters." @@ -15889,7 +15888,7 @@ msgstr "Y-Koordinate" #: ../src/ui/dialog/filter-effects-dialog.cpp:1203 #: ../src/ui/dialog/filter-effects-dialog.cpp:1206 msgid "Z coordinate" -msgstr "X-Koordinate" +msgstr "Z-Koordinate" #: ../src/ui/dialog/filter-effects-dialog.cpp:1206 msgid "Points At" @@ -15914,7 +15913,7 @@ msgid "" "light source and the point to which it is pointing at) and the spot light " "cone. No light is projected outside this cone." msgstr "" -"Öffnungswinkel des Lichtkonus (gemessen vom Zentralstrahl zum Rand). Kein " +"Öffnungswinkel des Lichtkegels (gemessen vom Zentralstrahl zum Rand). Kein " "Licht fällt außerhalb der Grenzen dieses Kegels." #: ../src/ui/dialog/filter-effects-dialog.cpp:1275 @@ -16007,6 +16006,7 @@ msgstr "X-Koordinate der linken Ecke des Ausschnitts, auf den Filter wirkt" msgid "Y coordinate of the upper corners of filter effects region" msgstr "Y-Koordinate der obere Ecke des Ausschnitts, auf den Filter wirkt" +# Abmessungen? #. default width: #. default height: #: ../src/ui/dialog/filter-effects-dialog.cpp:2876 @@ -16030,8 +16030,8 @@ msgid "" msgstr "" "Gibt den Typ der Matrix vor. Das Schlüsselwort \"matrix\" erzwingt eine " "volle 5x4-Wertematrix, während andere Schlüsselwörter bequeme Abkürzungen " -"für oft verwendete Farboperationen bereitstellen, ohne eine komplette Matrix " -"angeben zu müssen." +"für oft verwendete Farboperationen bereitstellen, ohne dass eine komplette " +"Matrix angegeben werden muss." #: ../src/ui/dialog/filter-effects-dialog.cpp:2883 msgid "Value(s):" @@ -16105,7 +16105,7 @@ msgstr "Höhe der Faltungsmatrix" #: ../src/ui/dialog/filter-effects-dialog.cpp:2901 #: ../src/ui/dialog/object-attributes.cpp:48 msgid "Target:" -msgstr "Target:" +msgstr "Ziel:" #: ../src/ui/dialog/filter-effects-dialog.cpp:2901 msgid "" @@ -16137,12 +16137,12 @@ msgid "" "the matrix diagonal) while a matrix filled with a constant non-zero value " "would lead to a common blur effect." msgstr "" -"Diese Matrize beschreibt die Faltungsoperation, die auf das Eingangsbild " -"angewendet wird, um die Pixelfarben im Ausgang zu erhalten. Verschiedene " -"Anordnungen der Werte in der Matrix resultieren in unterschiedlichen " -"visuellen Effekten. Die 1-Matrix ergibt einen Bewegungsunschärfe-Effekt " -"(entlang der Richtung der Matrixdiagonalen), während eine Matrix mit " -"konstanten Einträgen eine isotrope Unschärfe erzeugt." +"Diese Matrix beschreibt die Faltungsoperation, die auf das Eingangsbild " +"angewendet wird, um die Pixelfarben im Ausgang zu berechnen. Verschiedene " +"Wertanordnungen in der Matrix resultieren in unterschiedlichen visuellen " +"Effekten. Die 1-Matrix ergibt einen Bewegungsunschärfe-Effekt (entlang der " +"Richtung der Matrixdiagonalen), während eine Matrix mit konstanten Einträgen " +"(außer 0) eine isotrope Unschärfe erzeugt." #: ../src/ui/dialog/filter-effects-dialog.cpp:2905 msgid "Divisor:" @@ -16155,10 +16155,10 @@ msgid "" "divisor that is the sum of all the matrix values tends to have an evening " "effect on the overall color intensity of the result." msgstr "" -"Durch diesen Wert wird das Ergebnis der Faltung angewendet auf das " -"Eingangsbild geteilt, um den endgültigen Farbwert des Ausgangspixels zu " -"erhalten. Ist der Divisor die Summe der Matrixeinträge, so wird das Ergebnis " -"eine gemittelte Farbintensität aufweisen." +"Das Ergebnis der Faltung angewendet auf das Eingangsbild wird durch diesen " +"Wert geteilt, um den endgültigen Farbwert des Ausgangspixels zu erhalten. " +"Ist der Divisor die Summe der Matrixeinträge, so wird das Ergebnis eine " +"gemittelte Farbintensität aufweisen." #: ../src/ui/dialog/filter-effects-dialog.cpp:2906 msgid "Bias:" @@ -16174,7 +16174,7 @@ msgstr "" #: ../src/ui/dialog/filter-effects-dialog.cpp:2907 msgid "Edge Mode:" -msgstr "Kanten-Modus:" +msgstr "Kantenmodus:" #: ../src/ui/dialog/filter-effects-dialog.cpp:2907 msgid "" @@ -16193,13 +16193,14 @@ msgstr "Alphawert beibehalten" #: ../src/ui/dialog/filter-effects-dialog.cpp:2908 msgid "If set, the alpha channel won't be altered by this filter primitive." msgstr "" -"Wenn gesetzt, wird der Alphakanal von diesem Filterbaustein nicht " +"Wenn aktiviert, wird der Alphakanal von diesem Filterbaustein nicht " "beeinflusst." +# The color itself is not diffuse. It's the color of the diffuse lighting source. #. default: white #: ../src/ui/dialog/filter-effects-dialog.cpp:2911 msgid "Diffuse Color:" -msgstr "Diffusreflektierende Farbe:" +msgstr "Farbe:" #: ../src/ui/dialog/filter-effects-dialog.cpp:2911 #: ../src/ui/dialog/filter-effects-dialog.cpp:2944 @@ -16266,7 +16267,7 @@ msgstr "Die gesamte Filterregion wird mit dieser Farbe gefüllt." #: ../src/ui/dialog/filter-effects-dialog.cpp:2927 msgid "Standard Deviation:" -msgstr "Standard Abweichung:" +msgstr "Standardabweichung:" #: ../src/ui/dialog/filter-effects-dialog.cpp:2927 msgid "The standard deviation for the blur operation." @@ -16282,7 +16283,7 @@ msgstr "" #: ../src/ui/dialog/filter-effects-dialog.cpp:2937 msgid "Source of Image:" -msgstr "Bild-Quelle:" +msgstr "Bildquelle:" #: ../src/ui/dialog/filter-effects-dialog.cpp:2940 msgid "Delta X:" @@ -16345,7 +16346,7 @@ msgid "" "The feBlend filter primitive provides 4 image blending modes: screen, " "multiply, darken and lighten." msgstr "" -"Der Mischen Filterbaustein sieht 4 Bild-Misch-Modi vor: Screen, " +"Der Überlagern-Filterbaustein sieht 4 Bild-Misch-Modi vor: Screen, " "Multiplizieren, Verdunkeln und Aufhellen." #: ../src/ui/dialog/filter-effects-dialog.cpp:2990 @@ -16356,7 +16357,7 @@ msgid "" msgstr "" "Der Filterbaustein Farbmatrix wendet eine Matrix-Transformation auf " "die Farben der gerenderten Pixel an. Dies erlaubt Effekte wie Umwandeln in " -"Graustufen, Modifizieren der Sättigung und Änderung des Farbwerts." +"Graustufen, Modifizieren der Sättigung und Änderung des Farbtons." #: ../src/ui/dialog/filter-effects-dialog.cpp:2994 msgid "" @@ -16377,8 +16378,8 @@ msgid "" "standard. Porter-Duff blending modes are essentially logical operations " "between the corresponding pixel values of the images." msgstr "" -"Der Filterbaustein Kombinieren kombiniert zwei Bilder mittels einer " -"der Porter-Duff-Misch-Modi oder dem arithmetischen Modus, wie sie im SVG-" +"Der Filterbaustein Kombinieren kombiniert zwei Bilder mittels eines " +"der Porter-Duff-Misch-Modi oder des arithmetischen Modus, wie sie im SVG-" "Standard beschrieben sind. Die Porter-Duff-Misch-Modi bestehen im " "Wesentlichen aus logischen Operationen zwischen den korrespondierenden Pixel-" "Werten der Bilder." @@ -16405,10 +16406,10 @@ msgid "" "information: higher opacity areas are raised toward the viewer and lower " "opacity areas recede away from the viewer." msgstr "" -"Die Filterbausteine DiffuseBeleuchtung und Punktlichtbeleuchtung " -"erzeugen \"Relief-Schattierungen\". Der Alphakanal des Eingangs wird " -"verwendet, um Höheninformationen zu erhalten: opakere Gebiete werden " -"angehoben, weniger opake abgesenkt." +"Die Filterbausteine Diffuse Beleuchtung und Punktlicht erzeugen " +"reliefartige Schattierungen. Der Alphakanal des Eingangs wird verwendet, um " +"Tiefeninformationen zu erhalten: deckende Bereiche werden angehoben, " +"transparente abgesenkt." #: ../src/ui/dialog/filter-effects-dialog.cpp:3010 msgid "" @@ -16417,8 +16418,8 @@ msgid "" "how far the pixel should come from. Classical examples are whirl and pinch " "effects." msgstr "" -"Der Filterbaustein VersatzKarte verschiebt die Pixel des ersten " -"Eingangs unter Verwendung des zweiten Eingangs als Versatzkarte. Letztere " +"Der Filterbaustein Versatzkarte verschiebt die Pixel des ersten " +"Eingangs, wobei der zweite Eingang als Versatzkarte verwendet wird. Letztere " "definiert, woher die Pixel kommen sollen. Klassische Beispiele sind Wirbel- " "und Quetscheffekte." @@ -16428,8 +16429,8 @@ msgid "" "opacity. It is usually used as an input to other filters to apply color to " "a graphic." msgstr "" -"Der Filterbaustein Füllung füllt einen Bereich mit vorgegebener Farbe " -"und Opazität. Normalerweise wird dies als Eingang für andere Filter " +"Der Filterbaustein Füllen füllt einen Bereich mit vorgegebener Farbe " +"und Deckkraft. Normalerweise wird dies als Eingang für andere Filter " "verwendet, um so Farben ins Spiel zu bringen." #: ../src/ui/dialog/filter-effects-dialog.cpp:3018 @@ -16456,10 +16457,10 @@ msgid "" "compositing for this. This is equivalent to using several feBlend primitives " "in 'normal' mode or several feComposite primitives in 'over' mode." msgstr "" -"Der Filterbaustein Verschmelzen führt mehrere einzelne Bilder unter " +"Der Filterbaustein Zusammenführen führt mehrere einzelne Bilder unter " "Verwendung des Alphakanals zu einem einzigen zusammen. Dies ist äquivalent " -"zu den Bausteinen Überblenden im Normalmodus oder Verbund im \"Überlagern\"-" -"Modus." +"zur Verwendung mehrerer „Überlagern“-Filterbausteine im Normalmodus oder " +"mehrerer „Kombinieren“-Filterbausteine im „Über“-Modus." #: ../src/ui/dialog/filter-effects-dialog.cpp:3030 msgid "" @@ -16467,9 +16468,9 @@ msgid "" "For single-color objects erode makes the object thinner and dilate makes it " "thicker." msgstr "" -"Der Filterbaustein Morphologie stellt die Effekte \"Erodieren\" und " -"\"Weiten\" zur Verfügung. Für einfarbige Objekte wirkt \"Erodieren\" " -"ausdünnend und \"Weiten\" verdickend." +"Der Filterbaustein Morphologie stellt die Effekte „Erodieren“ und " +"„Weiten“ zur Verfügung. Für einfarbige Objekte wirkt „Erodieren“ ausdünnend " +"und „Weiten“ verdickend." #: ../src/ui/dialog/filter-effects-dialog.cpp:3034 msgid "" @@ -16489,10 +16490,10 @@ msgid "" "depth information: higher opacity areas are raised toward the viewer and " "lower opacity areas recede away from the viewer." msgstr "" -"Die Filterbausteine DiffuseBeleuchtung und Punktlichtbeleuchtung erzeugen \"Relief\"-Schattierungen. Der Alphakanal des Eingangs wird " -"verwendet, um Tiefeninformationen zu erhalten: opakere Gebiete werden " -"angehoben, weniger opake abgesenkt." +"Die Filterbausteine Diffuse Beleuchtung und Punktlicht " +"erzeugen reliefartige Schattierungen. Der Alphakanal des Eingangs wird " +"verwendet, um Tiefeninformationen zu erhalten: deckende Bereiche werden " +"angehoben, transparente abgesenkt." #: ../src/ui/dialog/filter-effects-dialog.cpp:3042 msgid "" @@ -16528,7 +16529,7 @@ msgstr "Finden:" #: ../src/ui/dialog/find.cpp:72 msgid "Find objects by their content or properties (exact or partial match)" msgstr "" -"Objekte nach ihrem Inhalt oder Eigenschaften finden (exakte oder partielle " +"Objekte nach ihrem Inhalt oder Eigenschaften finden (exakte oder teilweise " "Übereinstimmung)" #: ../src/ui/dialog/find.cpp:73 @@ -16573,7 +16574,7 @@ msgstr "Eigenschaften" #: ../src/ui/dialog/find.cpp:79 msgid "Search in object properties, styles, attributes and IDs" -msgstr "Suche in Objekt-Eigenschaften, Stilen, Attributen und IDs" +msgstr "Suche in Objekteigenschaften, Stilen, Attributen und IDs" #: ../src/ui/dialog/find.cpp:81 msgid "Search in" @@ -16589,7 +16590,7 @@ msgstr "schreibungsabhängig" #: ../src/ui/dialog/find.cpp:84 msgid "Match upper/lower case" -msgstr "Entspricht Groß-/ Kleinschreibung" +msgstr "Groß-/ Kleinschreibung berücksichtigen" #: ../src/ui/dialog/find.cpp:85 msgid "E_xact match" @@ -16626,7 +16627,7 @@ msgstr "_ID" #: ../src/ui/dialog/find.cpp:91 msgid "Search id name" -msgstr "Suche nach id Name" +msgstr "Suche nach ID-Wert" #: ../src/ui/dialog/find.cpp:92 msgid "Attribute _name" @@ -16650,11 +16651,11 @@ msgstr "_Stil" #: ../src/ui/dialog/find.cpp:94 msgid "Search style" -msgstr "Suchstil" +msgstr "Stil suchen" #: ../src/ui/dialog/find.cpp:95 msgid "F_ont" -msgstr "Schrift" +msgstr "Schriftart" #: ../src/ui/dialog/find.cpp:95 msgid "Search fonts" @@ -16678,7 +16679,7 @@ msgstr "Rechtecke" #: ../src/ui/dialog/find.cpp:99 msgid "Search rectangles" -msgstr "Rechtecke durchsuchen" +msgstr "Rechtecke suchen" #: ../src/ui/dialog/find.cpp:100 msgid "Ellipses" @@ -16686,7 +16687,7 @@ msgstr "Ellipsen" #: ../src/ui/dialog/find.cpp:100 msgid "Search ellipses, arcs, circles" -msgstr "Ellipsen, Bögen und Kreise durchsuchen" +msgstr "Ellipsen, Bögen und Kreise suchen" #: ../src/ui/dialog/find.cpp:101 msgid "Stars" @@ -16702,7 +16703,7 @@ msgstr "Spiralen" #: ../src/ui/dialog/find.cpp:102 msgid "Search spirals" -msgstr "Spiralen durchsuchen" +msgstr "Spiralen suchen" #: ../src/ui/dialog/find.cpp:103 ../src/widgets/toolbox.cpp:1804 msgid "Paths" @@ -16718,7 +16719,7 @@ msgstr "Texte" #: ../src/ui/dialog/find.cpp:104 msgid "Search text objects" -msgstr "Textobjekte durchsuchen" +msgstr "Textobjekte suchen" #: ../src/ui/dialog/find.cpp:105 msgid "Groups" @@ -16726,7 +16727,7 @@ msgstr "Gruppen" #: ../src/ui/dialog/find.cpp:105 msgid "Search groups" -msgstr "Gruppen durchsuchen" +msgstr "Gruppen suchen" #. TRANSLATORS: "Clones" is a noun indicating type of object to find #: ../src/ui/dialog/find.cpp:108 @@ -16736,7 +16737,7 @@ msgstr "Klone" #: ../src/ui/dialog/find.cpp:108 msgid "Search clones" -msgstr "Klone durchsuchen" +msgstr "Klone suchen" #: ../src/ui/dialog/find.cpp:110 ../share/extensions/embedimage.inx.h:3 #: ../share/extensions/extractimage.inx.h:5 @@ -16746,7 +16747,7 @@ msgstr "Bilder" #: ../src/ui/dialog/find.cpp:110 msgid "Search images" -msgstr "Bilder durchsuchen" +msgstr "Bilder suchen" #: ../src/ui/dialog/find.cpp:111 msgid "Offsets" @@ -16754,7 +16755,7 @@ msgstr "Versatz" #: ../src/ui/dialog/find.cpp:111 msgid "Search offset objects" -msgstr "Objekte mit Versatz finden" +msgstr "Versatzobjekte suchen" #: ../src/ui/dialog/find.cpp:112 msgid "Object types" @@ -16766,7 +16767,7 @@ msgstr "_Suchen" #: ../src/ui/dialog/find.cpp:115 msgid "Select all objects matching the selection criteria" -msgstr "Wähle Objekte aus, die zu allen angegebene Feldern passen" +msgstr "Wählt alle Objekte aus, die die Suchkriterien erfüllen" #: ../src/ui/dialog/find.cpp:116 msgid "_Replace All" @@ -16826,7 +16827,7 @@ msgstr "Keine Objekte gefunden" #: ../src/ui/dialog/find.cpp:896 msgid "Select an object type" -msgstr "Wählen Sie ein Objekttyp" +msgstr "Wählen Sie einen Objekttyp" #: ../src/ui/dialog/find.cpp:914 msgid "Select a property" @@ -16838,7 +16839,7 @@ msgid "" "Some fonts are not available and have been substituted." msgstr "" "\n" -"Einige Schriften sind nicht vefügbar und wurden ersetzt." +"Einige Schriften sind nicht verfügbar und wurden ersetzt." #: ../src/ui/dialog/font-substitution.cpp:82 msgid "Font substitution" @@ -16870,15 +16871,15 @@ msgstr "geerbt" #: ../src/ui/dialog/glyphs.cpp:63 ../src/ui/dialog/glyphs.cpp:165 msgid "Arabic" -msgstr "Arabisch (ar)" +msgstr "Arabisch" #: ../src/ui/dialog/glyphs.cpp:64 ../src/ui/dialog/glyphs.cpp:163 msgid "Armenian" -msgstr "Armenisch (hy)" +msgstr "Armenisch" #: ../src/ui/dialog/glyphs.cpp:65 ../src/ui/dialog/glyphs.cpp:172 msgid "Bengali" -msgstr "Bengalesisch (bn)" +msgstr "Bengalisch" #: ../src/ui/dialog/glyphs.cpp:66 ../src/ui/dialog/glyphs.cpp:254 msgid "Bopomofo" @@ -16899,7 +16900,7 @@ msgstr "Kyrillisch" #: ../src/ui/dialog/glyphs.cpp:70 msgid "Deseret" -msgstr "Deseret" +msgstr "Mormonenalphabet" #: ../src/ui/dialog/glyphs.cpp:71 ../src/ui/dialog/glyphs.cpp:171 msgid "Devanagari" @@ -16935,11 +16936,11 @@ msgstr "Han" #: ../src/ui/dialog/glyphs.cpp:79 msgid "Hangul" -msgstr "Hangul" +msgstr "Hangeul-Jamo" #: ../src/ui/dialog/glyphs.cpp:80 ../src/ui/dialog/glyphs.cpp:164 msgid "Hebrew" -msgstr "Hebräisch (he)" +msgstr "Hebräisch" #: ../src/ui/dialog/glyphs.cpp:81 ../src/ui/dialog/glyphs.cpp:252 msgid "Hiragana" @@ -16955,11 +16956,11 @@ msgstr "Katakana" #: ../src/ui/dialog/glyphs.cpp:84 ../src/ui/dialog/glyphs.cpp:197 msgid "Khmer" -msgstr "Khmer (km)" +msgstr "Khmer" #: ../src/ui/dialog/glyphs.cpp:85 ../src/ui/dialog/glyphs.cpp:182 msgid "Lao" -msgstr "Lao" +msgstr "Laotisch" #: ../src/ui/dialog/glyphs.cpp:86 msgid "Latin" @@ -16971,19 +16972,19 @@ msgstr "Malayalam" #: ../src/ui/dialog/glyphs.cpp:88 ../src/ui/dialog/glyphs.cpp:198 msgid "Mongolian" -msgstr "Mongolisch (mn)" +msgstr "Mongolisch" #: ../src/ui/dialog/glyphs.cpp:89 ../src/ui/dialog/glyphs.cpp:184 msgid "Myanmar" -msgstr "Myanmar" +msgstr "Birmanisch" #: ../src/ui/dialog/glyphs.cpp:90 ../src/ui/dialog/glyphs.cpp:191 msgid "Ogham" -msgstr "Oghamschrift" +msgstr "Ogam" #: ../src/ui/dialog/glyphs.cpp:91 msgid "Old Italic" -msgstr "Kursiv" +msgstr "Altitalisch" #: ../src/ui/dialog/glyphs.cpp:92 ../src/ui/dialog/glyphs.cpp:175 msgid "Oriya" @@ -16991,7 +16992,7 @@ msgstr "Oriya" #: ../src/ui/dialog/glyphs.cpp:93 ../src/ui/dialog/glyphs.cpp:192 msgid "Runic" -msgstr "Runic" +msgstr "Runen" #: ../src/ui/dialog/glyphs.cpp:94 ../src/ui/dialog/glyphs.cpp:180 msgid "Sinhala" @@ -16999,7 +17000,7 @@ msgstr "Singhalesisch" #: ../src/ui/dialog/glyphs.cpp:95 ../src/ui/dialog/glyphs.cpp:166 msgid "Syriac" -msgstr "Syriac" +msgstr "Syrisch" #: ../src/ui/dialog/glyphs.cpp:96 ../src/ui/dialog/glyphs.cpp:176 msgid "Tamil" @@ -17015,7 +17016,7 @@ msgstr "Thaana" #: ../src/ui/dialog/glyphs.cpp:99 ../src/ui/dialog/glyphs.cpp:181 msgid "Thai" -msgstr "Thai (th)" +msgstr "Thailändisch" #: ../src/ui/dialog/glyphs.cpp:100 ../src/ui/dialog/glyphs.cpp:183 msgid "Tibetan" @@ -17023,7 +17024,7 @@ msgstr "Tibetisch" #: ../src/ui/dialog/glyphs.cpp:101 msgid "Canadian Aboriginal" -msgstr "Kanadisch Aborigini" +msgstr "Kanadisch Indigen" #: ../src/ui/dialog/glyphs.cpp:102 msgid "Yi" @@ -17035,15 +17036,15 @@ msgstr "Tagalog" #: ../src/ui/dialog/glyphs.cpp:104 ../src/ui/dialog/glyphs.cpp:194 msgid "Hanunoo" -msgstr "Hanunoo" +msgstr "Hanunó'o" #: ../src/ui/dialog/glyphs.cpp:105 ../src/ui/dialog/glyphs.cpp:195 msgid "Buhid" -msgstr "Buhid" +msgstr "Buid" #: ../src/ui/dialog/glyphs.cpp:106 ../src/ui/dialog/glyphs.cpp:196 msgid "Tagbanwa" -msgstr "Tagbanwa" +msgstr "Tagbanuwa" #: ../src/ui/dialog/glyphs.cpp:107 msgid "Braille" @@ -17051,7 +17052,7 @@ msgstr "Braille (Blindenschrift)" #: ../src/ui/dialog/glyphs.cpp:108 msgid "Cypriot" -msgstr "Zypriotisch" +msgstr "Kyprisch" #: ../src/ui/dialog/glyphs.cpp:109 ../src/ui/dialog/glyphs.cpp:200 msgid "Limbu" @@ -17079,7 +17080,7 @@ msgstr "Ugaritisch" #: ../src/ui/dialog/glyphs.cpp:115 ../src/ui/dialog/glyphs.cpp:202 msgid "New Tai Lue" -msgstr "Neu Tai-Lue" +msgstr "Neu-Tai-Lue" #: ../src/ui/dialog/glyphs.cpp:116 ../src/ui/dialog/glyphs.cpp:204 msgid "Buginese" @@ -17095,7 +17096,7 @@ msgstr "Tifinagh" #: ../src/ui/dialog/glyphs.cpp:119 ../src/ui/dialog/glyphs.cpp:273 msgid "Syloti Nagri" -msgstr "Sylheti Nagari" +msgstr "Syloti Nagri" #: ../src/ui/dialog/glyphs.cpp:120 msgid "Old Persian" @@ -17123,7 +17124,7 @@ msgstr "Phönizisch" #: ../src/ui/dialog/glyphs.cpp:126 ../src/ui/dialog/glyphs.cpp:275 msgid "Phags-pa" -msgstr "Phagpa" +msgstr "Phagspa" #: ../src/ui/dialog/glyphs.cpp:127 msgid "N'Ko" @@ -17175,19 +17176,19 @@ msgstr "Lydisch" #: ../src/ui/dialog/glyphs.cpp:153 msgid "Basic Latin" -msgstr "Latein" +msgstr "Basis-Lateinisch" #: ../src/ui/dialog/glyphs.cpp:154 msgid "Latin-1 Supplement" -msgstr "Latein-1 Ergänzung" +msgstr "Lateinisch-1, Ergänzung" #: ../src/ui/dialog/glyphs.cpp:155 msgid "Latin Extended-A" -msgstr "Latein Erweitert-A" +msgstr "Lateinisch, erweitert-A" #: ../src/ui/dialog/glyphs.cpp:156 msgid "Latin Extended-B" -msgstr "Latein Erweitert-B" +msgstr "Lateinisch, erweitert-B" #: ../src/ui/dialog/glyphs.cpp:157 msgid "IPA Extensions" @@ -17199,7 +17200,7 @@ msgstr "Spacing Modifier Letters" #: ../src/ui/dialog/glyphs.cpp:159 msgid "Combining Diacritical Marks" -msgstr "Kombination diaktritischer Zeichen" +msgstr "Kombinierende diaktritische Zeichen" #: ../src/ui/dialog/glyphs.cpp:160 msgid "Greek and Coptic" @@ -17207,11 +17208,11 @@ msgstr "Griechisch und Koptisch" #: ../src/ui/dialog/glyphs.cpp:162 msgid "Cyrillic Supplement" -msgstr "Kyrillisch Ergänzend" +msgstr "Kyrillisch, Ergänzung" #: ../src/ui/dialog/glyphs.cpp:167 msgid "Arabic Supplement" -msgstr "Arabisch Ergänzend" +msgstr "Arabisch, Ergänzung" #: ../src/ui/dialog/glyphs.cpp:169 msgid "NKo" @@ -17223,31 +17224,31 @@ msgstr "Samaritanisch" #: ../src/ui/dialog/glyphs.cpp:186 msgid "Hangul Jamo" -msgstr "Hangul Jamo" +msgstr "Hangeul-Jamo" #: ../src/ui/dialog/glyphs.cpp:188 msgid "Ethiopic Supplement" -msgstr "Äthiopisch Ergänzend" +msgstr "Äthiopisch, Ergänzung" #: ../src/ui/dialog/glyphs.cpp:190 msgid "Unified Canadian Aboriginal Syllabics" -msgstr "Einheitliches Kanadisch Aborigini Symbole" +msgstr "Vereinheitlichte Silbenzeichen kanadischer Ureinwohner" #: ../src/ui/dialog/glyphs.cpp:199 msgid "Unified Canadian Aboriginal Syllabics Extended" -msgstr "Einheitliche Kanadisch-Aborigini-Syllabisch Erweitert" +msgstr "Vereinheitlichte Silbenzeichen kanadischer Ureinwohner, erweitert" #: ../src/ui/dialog/glyphs.cpp:203 msgid "Khmer Symbols" -msgstr "Khmer (km) Symbole" +msgstr "Khmer-Symbole" #: ../src/ui/dialog/glyphs.cpp:205 msgid "Tai Tham" -msgstr "Tai Tham" +msgstr "Lanna" #: ../src/ui/dialog/glyphs.cpp:210 msgid "Vedic Extensions" -msgstr "Verdic Erweiterung" +msgstr "Verdische Erweiterungen" #: ../src/ui/dialog/glyphs.cpp:211 msgid "Phonetic Extensions" @@ -17255,43 +17256,43 @@ msgstr "Phonetische Erweiterungen" #: ../src/ui/dialog/glyphs.cpp:212 msgid "Phonetic Extensions Supplement" -msgstr "Phonetische Zusatz -rweiterungen" +msgstr "Phonetische Erweiterungen, Ergänzung" #: ../src/ui/dialog/glyphs.cpp:213 msgid "Combining Diacritical Marks Supplement" -msgstr "Kombiation diakritischer Zeichen Ergänzung" +msgstr "Kombinierende diakritische Zeichen, Ergänzung" #: ../src/ui/dialog/glyphs.cpp:214 msgid "Latin Extended Additional" -msgstr "Latein Erweitert Zusatz" +msgstr "Lateinisch, weiterer Zusatz" #: ../src/ui/dialog/glyphs.cpp:215 msgid "Greek Extended" -msgstr "Griechisch Erweitert" +msgstr "Griechisch, Zusatz" #: ../src/ui/dialog/glyphs.cpp:216 msgid "General Punctuation" -msgstr "Generelle Punktierung" +msgstr "Allgemeine Interpunktion" #: ../src/ui/dialog/glyphs.cpp:217 msgid "Superscripts and Subscripts" -msgstr "Hoch- und Tiefgestellt" +msgstr "Hoch- und tiefgestellte Zeichen" #: ../src/ui/dialog/glyphs.cpp:218 msgid "Currency Symbols" -msgstr "Währungssymbole" +msgstr "Währungszeichen" #: ../src/ui/dialog/glyphs.cpp:219 msgid "Combining Diacritical Marks for Symbols" -msgstr "Kombiation diakritischer Zeichen für Symbole" +msgstr "Kombinierende diakritische Zeichen für Symbole" #: ../src/ui/dialog/glyphs.cpp:220 msgid "Letterlike Symbols" -msgstr "Buchstabenartige Symbole" +msgstr "Buchstabenähnliche Symbole" #: ../src/ui/dialog/glyphs.cpp:221 msgid "Number Forms" -msgstr "Zahlenformen" +msgstr "Zahlzeichen" #: ../src/ui/dialog/glyphs.cpp:222 msgid "Arrows" @@ -17303,11 +17304,11 @@ msgstr "Mathematische Operatoren" #: ../src/ui/dialog/glyphs.cpp:224 msgid "Miscellaneous Technical" -msgstr "Verschiedenes Technisches" +msgstr "Verschiedene technische Zeichen" #: ../src/ui/dialog/glyphs.cpp:225 msgid "Control Pictures" -msgstr "Bildkontrolle" +msgstr "Symbole für Steuerzeichen" #: ../src/ui/dialog/glyphs.cpp:226 msgid "Optical Character Recognition" @@ -17315,12 +17316,12 @@ msgstr "Optische Zeichenerkennung" #: ../src/ui/dialog/glyphs.cpp:227 msgid "Enclosed Alphanumerics" -msgstr "Eingeschlossene Alphanumerik" +msgstr "Umschlossene alphanumerische Zeichen" # not sure here -cm- #: ../src/ui/dialog/glyphs.cpp:228 msgid "Box Drawing" -msgstr "Box Zeichnung" +msgstr "Rahmenzeichnung" #: ../src/ui/dialog/glyphs.cpp:229 msgid "Block Elements" @@ -17344,15 +17345,15 @@ msgstr "Verschiedene mathematische Symbole-A" #: ../src/ui/dialog/glyphs.cpp:234 msgid "Supplemental Arrows-A" -msgstr "Ergänzende Pfeile-A" +msgstr "Zusätzliche Pfeile-A" #: ../src/ui/dialog/glyphs.cpp:235 msgid "Braille Patterns" -msgstr "Braille Muster" +msgstr "Braille-Zeichen" #: ../src/ui/dialog/glyphs.cpp:236 msgid "Supplemental Arrows-B" -msgstr "Ergänzende Pfeile-B" +msgstr "Zusätzliche Pfeile-B" #: ../src/ui/dialog/glyphs.cpp:237 msgid "Miscellaneous Mathematical Symbols-B" @@ -17360,7 +17361,7 @@ msgstr "Verschiedene mathematische Symbole-B" #: ../src/ui/dialog/glyphs.cpp:238 msgid "Supplemental Mathematical Operators" -msgstr "ergänzende mathematische Operatoren" +msgstr "Zusätzliche mathematische Operatoren" #: ../src/ui/dialog/glyphs.cpp:239 msgid "Miscellaneous Symbols and Arrows" @@ -17368,44 +17369,44 @@ msgstr "Verschiedene Symbole und Pfeile" #: ../src/ui/dialog/glyphs.cpp:241 msgid "Latin Extended-C" -msgstr "Latein Erweitert-C" +msgstr "Lateinisch, erweitert-C" # !!! #: ../src/ui/dialog/glyphs.cpp:243 msgid "Georgian Supplement" -msgstr "Georgisch Ergänzend" +msgstr "Georgisch, Ergänzung" #: ../src/ui/dialog/glyphs.cpp:245 msgid "Ethiopic Extended" -msgstr "Äthiopisch Erweitert" +msgstr "Äthiopisch, erweitert" #: ../src/ui/dialog/glyphs.cpp:246 msgid "Cyrillic Extended-A" -msgstr "Kyrillisch Erweitert-A" +msgstr "Kyrillisch, erweitert-A" #: ../src/ui/dialog/glyphs.cpp:247 msgid "Supplemental Punctuation" -msgstr "Ergänzende Punktierung" +msgstr "Zusätzliche Interpunktion" #: ../src/ui/dialog/glyphs.cpp:248 msgid "CJK Radicals Supplement" -msgstr "CJK Radikal Ergänzend" +msgstr "CJK-Radikale, Ergänzung" #: ../src/ui/dialog/glyphs.cpp:249 msgid "Kangxi Radicals" -msgstr "Kangxi Radikal" +msgstr "Kangxi-Radikale" #: ../src/ui/dialog/glyphs.cpp:250 msgid "Ideographic Description Characters" -msgstr "Sinnbildliche Beschreibungsbuchstaben" +msgstr "Ideographische Beschreibungszeichen" #: ../src/ui/dialog/glyphs.cpp:251 msgid "CJK Symbols and Punctuation" -msgstr "CJK Symbole und Punktierungen" +msgstr "CJK-Symbole und Interpunktion" #: ../src/ui/dialog/glyphs.cpp:255 msgid "Hangul Compatibility Jamo" -msgstr "Hangul Kompatibel Jamo" +msgstr "Hangeul-Jamo, Kompatibilität" #: ../src/ui/dialog/glyphs.cpp:256 msgid "Kanbun" @@ -17413,43 +17414,43 @@ msgstr "Kanbun" #: ../src/ui/dialog/glyphs.cpp:257 msgid "Bopomofo Extended" -msgstr "Bopomofo Erweitert" +msgstr "Bopomofo, erweitert" #: ../src/ui/dialog/glyphs.cpp:258 msgid "CJK Strokes" -msgstr "CJK Konturen" +msgstr "CJK-Striche" #: ../src/ui/dialog/glyphs.cpp:259 msgid "Katakana Phonetic Extensions" -msgstr "Katakana Phonetische Erweiterungen" +msgstr "Katakana, Phonetische Erweiterungen" #: ../src/ui/dialog/glyphs.cpp:260 msgid "Enclosed CJK Letters and Months" -msgstr "Eingeschlossene CJK Buchstaben und Monate" +msgstr "Umschlossene CJK-Zeichen und -Monate" #: ../src/ui/dialog/glyphs.cpp:261 msgid "CJK Compatibility" -msgstr "CJK Kompatibilität" +msgstr "CJK-Kompatibilität" #: ../src/ui/dialog/glyphs.cpp:262 msgid "CJK Unified Ideographs Extension A" -msgstr "CJK einheitliche Sinnbilder Erweiterung A" +msgstr "Vereinheitlichte CJK-Ideogramme, Erweiterung A" #: ../src/ui/dialog/glyphs.cpp:263 msgid "Yijing Hexagram Symbols" -msgstr "Yijing Hexagram Symbole" +msgstr "I-Ging-Hexagramme" #: ../src/ui/dialog/glyphs.cpp:264 msgid "CJK Unified Ideographs" -msgstr "CJK einheitliche Schriftzeichen" +msgstr "Vereinheitlichte CJK-Ideogramme" #: ../src/ui/dialog/glyphs.cpp:265 msgid "Yi Syllables" -msgstr "Yi Silben" +msgstr "Yi-Silbenzeichen" #: ../src/ui/dialog/glyphs.cpp:266 msgid "Yi Radicals" -msgstr "Yi Radikal" +msgstr "Yi-Radikale" #: ../src/ui/dialog/glyphs.cpp:267 msgid "Lisu" @@ -17457,7 +17458,7 @@ msgstr "Lisu" #: ../src/ui/dialog/glyphs.cpp:269 msgid "Cyrillic Extended-B" -msgstr "Kyrillisch Erweitert-B" +msgstr "Kyrillisch, erweitert-B" #: ../src/ui/dialog/glyphs.cpp:270 msgid "Bamum" @@ -17465,31 +17466,31 @@ msgstr "Bamum" #: ../src/ui/dialog/glyphs.cpp:271 msgid "Modifier Tone Letters" -msgstr "Modifier Tone Letters" +msgstr "Modifizierende Tonzeichen" #: ../src/ui/dialog/glyphs.cpp:272 msgid "Latin Extended-D" -msgstr "Latein Erweitert-D" +msgstr "Lateinisch, erweitert-D" #: ../src/ui/dialog/glyphs.cpp:274 msgid "Common Indic Number Forms" -msgstr "grbäuchliche indische Zahlformen" +msgstr "Allgemeine indische Ziffern" #: ../src/ui/dialog/glyphs.cpp:277 msgid "Devanagari Extended" -msgstr "Devanagari Erweitert" +msgstr "Devanagari, erweitert" #: ../src/ui/dialog/glyphs.cpp:280 msgid "Hangul Jamo Extended-A" -msgstr "Hangul Jamo Erweitert-A" +msgstr "Hangeul-Jamo, erweitert-A" #: ../src/ui/dialog/glyphs.cpp:281 msgid "Javanese" -msgstr "Javanesisch" +msgstr "Javanisch" #: ../src/ui/dialog/glyphs.cpp:283 msgid "Myanmar Extended-A" -msgstr "Myanmar-Erweitert-A" +msgstr "Birmanisch, erweitert-A" #: ../src/ui/dialog/glyphs.cpp:284 msgid "Tai Viet" @@ -17501,31 +17502,31 @@ msgstr "Meitei-Mayek" #: ../src/ui/dialog/glyphs.cpp:286 msgid "Hangul Syllables" -msgstr "Hangul Silben" +msgstr "Hangeul-Silbenzeichen" #: ../src/ui/dialog/glyphs.cpp:287 msgid "Hangul Jamo Extended-B" -msgstr "Hangul Jamo Erweitert-B" +msgstr "Hangeul-Jamo, erweitert-B" #: ../src/ui/dialog/glyphs.cpp:288 msgid "High Surrogates" -msgstr "Oberer Ersatz" +msgstr "High Surrogates" #: ../src/ui/dialog/glyphs.cpp:289 msgid "High Private Use Surrogates" -msgstr "Oberer privatgenutzter Ersatz" +msgstr "High Surrogates (privater Bereich)" #: ../src/ui/dialog/glyphs.cpp:290 msgid "Low Surrogates" -msgstr "Unterer Ersatz" +msgstr "Low Surrogates" #: ../src/ui/dialog/glyphs.cpp:291 msgid "Private Use Area" -msgstr "Privatgenutzter Bereich" +msgstr "Private Use Zone" #: ../src/ui/dialog/glyphs.cpp:292 msgid "CJK Compatibility Ideographs" -msgstr "CJK Kombatibilitätssinnbilder" +msgstr "CJK-Ideogramme, Kompatibilität" #: ../src/ui/dialog/glyphs.cpp:293 msgid "Alphabetic Presentation Forms" @@ -17537,7 +17538,7 @@ msgstr "Arabische Präsentationsformen-A" #: ../src/ui/dialog/glyphs.cpp:295 msgid "Variation Selectors" -msgstr "Varianten-Auswahl" +msgstr "Variantenselektoren" #: ../src/ui/dialog/glyphs.cpp:296 msgid "Vertical Forms" @@ -17545,11 +17546,11 @@ msgstr "Vertikale Formen" #: ../src/ui/dialog/glyphs.cpp:297 msgid "Combining Half Marks" -msgstr "Halbzeichen kombinieren" +msgstr "Kombinierende halbe diakritische Zeichen" #: ../src/ui/dialog/glyphs.cpp:298 msgid "CJK Compatibility Forms" -msgstr "CJK Kompatible Formen" +msgstr "CJK-Kompatibilitätsformen" #: ../src/ui/dialog/glyphs.cpp:299 msgid "Small Form Variants" @@ -17561,15 +17562,15 @@ msgstr "Arabische Präsentationsformen-B" #: ../src/ui/dialog/glyphs.cpp:301 msgid "Halfwidth and Fullwidth Forms" -msgstr "Halbbreite und Vollbreite Formen" +msgstr "Halbbreite und vollbreite Formen" #: ../src/ui/dialog/glyphs.cpp:302 msgid "Specials" -msgstr "Besonderes" +msgstr "Spezielles" #: ../src/ui/dialog/glyphs.cpp:377 msgid "Script: " -msgstr "Skript:" +msgstr "Schriftsystem:" #: ../src/ui/dialog/glyphs.cpp:414 msgid "Range: " @@ -17586,7 +17587,7 @@ msgstr "Text hinzufügen" #: ../src/ui/dialog/grid-arrange-tab.cpp:345 msgid "Arrange in a grid" -msgstr "In Raster anordnen:" +msgstr "Gitterförmig anordnen:" #: ../src/ui/dialog/grid-arrange-tab.cpp:571 #: ../src/ui/dialog/object-attributes.cpp:66 @@ -17598,7 +17599,7 @@ msgstr "X:" #: ../src/ui/dialog/grid-arrange-tab.cpp:571 msgid "Horizontal spacing between columns." -msgstr "Horizontale Abstände zwischen Spalten (px-Einheiten)" +msgstr "Horizontale Abstände zwischen Spalten" #: ../src/ui/dialog/grid-arrange-tab.cpp:572 #: ../src/ui/dialog/object-attributes.cpp:67 @@ -17610,11 +17611,11 @@ msgstr "Y:" #: ../src/ui/dialog/grid-arrange-tab.cpp:572 msgid "Vertical spacing between rows." -msgstr "Vertikale Abstände zwischen Reihen (px-Einheiten)" +msgstr "Vertikale Abstände zwischen Zeilen" #: ../src/ui/dialog/grid-arrange-tab.cpp:618 msgid "_Rows:" -msgstr "_Reihen:" +msgstr "_Zeilen:" #: ../src/ui/dialog/grid-arrange-tab.cpp:627 msgid "Number of rows" @@ -17627,7 +17628,7 @@ msgstr "Gleiche Höhe" #: ../src/ui/dialog/grid-arrange-tab.cpp:642 msgid "If not set, each row has the height of the tallest object in it" msgstr "" -"Wenn nicht gesetzt, dann hat jede Zeile die Höhe des größten enthaltenen " +"Wenn nicht aktiviert, dann hat jede Zeile die Höhe des größten enthaltenen " "Objektes" #. #### Number of columns #### @@ -17646,8 +17647,8 @@ msgstr "Gleiche Breite" #: ../src/ui/dialog/grid-arrange-tab.cpp:681 msgid "If not set, each column has the width of the widest object in it" msgstr "" -"Wenn nicht gesetzt, dann hat jede Spalte die Breite des größten enthaltenen " -"Objektes" +"Wenn nicht aktiviert, dann hat jede Spalte die Breite des größten " +"enthaltenen Objektes" #. Anchor selection widget #: ../src/ui/dialog/grid-arrange-tab.cpp:692 @@ -17661,16 +17662,15 @@ msgstr "In den Auswahlrahmen _einpassen" #: ../src/ui/dialog/grid-arrange-tab.cpp:708 msgid "_Set spacing:" -msgstr "Abstand setzen:" +msgstr "Abstände setzen:" #: ../src/ui/dialog/guides.cpp:47 -#, fuzzy msgid "Lo_cked" -msgstr "Gesperrt" +msgstr "_Gesperrt" #: ../src/ui/dialog/guides.cpp:47 msgid "Lock the movement of guides" -msgstr "" +msgstr "Hilfslinien können nicht verschoben werden" #: ../src/ui/dialog/guides.cpp:48 msgid "Rela_tive change" @@ -17683,16 +17683,16 @@ msgstr "Hilfslinien relativ zur aktuellen Position verschieben/drehen" #: ../src/ui/dialog/guides.cpp:49 msgctxt "Guides" msgid "_X:" -msgstr "_X: [Hilfslinien]" +msgstr "_X:" #: ../src/ui/dialog/guides.cpp:50 msgctxt "Guides" msgid "_Y:" -msgstr "_Y: [Hilfslinien]" +msgstr "_Y:" #: ../src/ui/dialog/guides.cpp:51 ../src/ui/dialog/object-properties.cpp:59 msgid "_Label:" -msgstr "_Bezeichner:" +msgstr "_Beschriftung:" #: ../src/ui/dialog/guides.cpp:51 msgid "Optionally give this guideline a name" @@ -17704,16 +17704,16 @@ msgstr "Winkel:" #: ../src/ui/dialog/guides.cpp:139 msgid "Set guide properties" -msgstr "Hilfslinien-Eigenschaften setzen" +msgstr "Hilfslinieneigenschaften setzen" #: ../src/ui/dialog/guides.cpp:169 msgid "Guideline" -msgstr "Hilfslinien" +msgstr "Hilfslinie" #: ../src/ui/dialog/guides.cpp:336 #, c-format msgid "Guideline ID: %s" -msgstr "Hilfslinien ID: %s" +msgstr "Hilfslinien-ID: %s" #: ../src/ui/dialog/guides.cpp:342 #, c-format @@ -17731,7 +17731,7 @@ msgstr "Vergrößert:" #: ../src/ui/dialog/icon-preview.cpp:236 msgid "Actual Size:" -msgstr "Aktuelle Größe:" +msgstr "Tatsächliche Größe:" #: ../src/ui/dialog/icon-preview.cpp:241 msgctxt "Icon preview window" @@ -17751,20 +17751,20 @@ msgstr "Auswahlmarkierung anzeigen" msgid "" "Whether selected objects display a selection cue (the same as in selector)" msgstr "" -"Sind die ausgewählten Objekte visuell hervorgehoben (wie beim " +"Ob ausgewählte Objekte optisch hervorgehoben werden sollen (wie beim " "Auswahlwerkzeug)" #: ../src/ui/dialog/inkscape-preferences.cpp:190 msgid "Enable gradient editing" -msgstr "Farbverlaufs-Editor aktiviert" +msgstr "Farbverlaufsbearbeitung aktiviert" #: ../src/ui/dialog/inkscape-preferences.cpp:191 msgid "Whether selected objects display gradient editing controls" -msgstr "Ausgewählten Objekte zeigen Farbverlaufs-Anfasser an" +msgstr "Ausgewählte Objekte zeigen Farbverlaufs-Anfasser an" #: ../src/ui/dialog/inkscape-preferences.cpp:196 msgid "Conversion to guides uses edges instead of bounding box" -msgstr "Umwandlung zu Hilfslinien nutzt Ecken anstelle von Objektrahmen" +msgstr "Umwandlung zu Hilfslinien nutzt Objektkanten anstelle von Objektrahmen" #: ../src/ui/dialog/inkscape-preferences.cpp:197 msgid "" @@ -17776,30 +17776,31 @@ msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:204 msgid "Ctrl+click _dot size:" -msgstr "Strg+Klick Punktgröße:" +msgstr "Punktgröße bei Strg+Klick:" #: ../src/ui/dialog/inkscape-preferences.cpp:204 msgid "times current stroke width" -msgstr "(Faktor zur Kontur)" +msgstr "mal Konturbreite" #: ../src/ui/dialog/inkscape-preferences.cpp:205 msgid "Size of dots created with Ctrl+click (relative to current stroke width)" msgstr "" -"Größe der Punkte, die durch Strg+Klick erzeugt werden (Relativ zur aktuellen " -"Strichdicke)" +"Größe der Punkte, die durch Strg+Klick erzeugt werden (relativ zur aktuellen " +"Konturbreite)" #: ../src/ui/dialog/inkscape-preferences.cpp:213 -#, fuzzy msgid "Base simplify:" -msgstr "Vereinfachen:" +msgstr "Basisvereinfachung:" #: ../src/ui/dialog/inkscape-preferences.cpp:213 msgid "on dynamic LPE simplify" -msgstr "" +msgstr "beim Vereinfachen über Pfadeffekt" #: ../src/ui/dialog/inkscape-preferences.cpp:214 msgid "Base simplify of dynamic LPE based simplify" msgstr "" +"Basisvereinfachung beim Vereinfachen mit der Pfadeffekt basierten " +"Vereinfachung" #: ../src/ui/dialog/inkscape-preferences.cpp:229 msgid "No objects selected to take the style from." @@ -17834,8 +17835,8 @@ msgid "" "Each tool may store its own style to apply to the newly created objects. Use " "the button below to set it." msgstr "" -"Werkzeuge können eigene Stilvorgaben behalten, die auf neu erzeugte Objekte " -"angewendet werden. Stilvorgabe mit der unteren Schaltfläche festlegen." +"Jedes Werkzeug kann einen vorgegebenen Stil für alle neu damit erzeugten " +"Objekte nutzen. Stilvorgabe mit der unteren Schaltfläche festlegen." #. style swatch #: ../src/ui/dialog/inkscape-preferences.cpp:291 @@ -17905,7 +17906,7 @@ msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:331 msgid "Average all sketches" -msgstr "Durchschnittliche Qualität der Sketche" +msgstr "Aus allen Skizzenlinien mitteln" #: ../src/ui/dialog/inkscape-preferences.cpp:332 msgid "Width is in absolute units" @@ -18068,7 +18069,7 @@ msgid "" "milliseconds); specify 0 to have the outline shown until mouse leaves the " "path" msgstr "" -"Bestimmt die Dauer der Pfad anzeige (in Millisekunden). Bei 0 wird der " +"Bestimmt die Dauer der Pfadanzeige (in Millisekunden). Bei 0 wird der " "Entwurfspfad angezeigt bis die Maus den Bereich verlassen hat." #: ../src/ui/dialog/inkscape-preferences.cpp:381 @@ -18114,11 +18115,11 @@ msgstr "Zoomfaktor" #: ../src/ui/dialog/inkscape-preferences.cpp:399 ../src/verbs.cpp:2763 msgctxt "ContextVerb" msgid "Measure" -msgstr "Ausmessen" +msgstr "Messen" #: ../src/ui/dialog/inkscape-preferences.cpp:401 msgid "Ignore first and last points" -msgstr "Ersten und letzen Punkt ignorieren" +msgstr "Anfangs- und Endpunkt ignorieren" #: ../src/ui/dialog/inkscape-preferences.cpp:402 msgid "" @@ -18137,15 +18138,15 @@ msgstr "Formen" #: ../src/ui/dialog/inkscape-preferences.cpp:438 msgid "Sketch mode" -msgstr "Freihandmodus" +msgstr "Skizziermodus" #: ../src/ui/dialog/inkscape-preferences.cpp:440 msgid "" "If on, the sketch result will be the normal average of all sketches made, " "instead of averaging the old result with the new sketch" msgstr "" -"Wenn gewählt, dann ist das Resultat das Mittel aus allen Skizzen, statt das " -"alte Ergebnis mit der neuen Skizze zu mitteln." +"Wenn gewählt, dann ist das Resultat das Mittel aus allen Skizzenlinien, " +"statt das alte Ergebnis mit der neuen Linie zu mitteln." #. Pen #: ../src/ui/dialog/inkscape-preferences.cpp:443 @@ -18172,8 +18173,8 @@ msgid "" "If on, each newly created object will be selected (deselecting previous " "selection)" msgstr "" -"Wenn eingeschaltet, dann wird jedes neu erzeugte Objekt ausgewählt " -"(vorherige Auswahl ist nicht mehr aktiv)" +"Wenn aktiviert, dann wird jedes neu erzeugte Objekt ausgewählt (vorherige " +"Auswahl ist nicht mehr aktiv)" #. Text #: ../src/ui/dialog/inkscape-preferences.cpp:458 ../src/verbs.cpp:2755 @@ -18183,25 +18184,25 @@ msgstr "Text" #: ../src/ui/dialog/inkscape-preferences.cpp:463 msgid "Show font samples in the drop-down list" -msgstr "Zeigt Schriftart-Beispiele in der Auswahl-Liste" +msgstr "Zeigt Schriftart-Beispiele in der Auswahlliste" #: ../src/ui/dialog/inkscape-preferences.cpp:464 msgid "" "Show font samples alongside font names in the drop-down list in Text bar" msgstr "" -"Zeigt Schriftart-Beispiele neben den Schriftartnamen in der Auswahl-Liste in " -"der Textleiste" +"Zeigt Schriftart-Beispiele neben den Schriftartnamen in der Auswahlliste in " +"der Textwerkzeugleiste" #: ../src/ui/dialog/inkscape-preferences.cpp:466 msgid "Show font substitution warning dialog" -msgstr "Zeige Warnungsdialog für Schriftersetzung" +msgstr "Zeige Warndialog für Schriftersetzung" #: ../src/ui/dialog/inkscape-preferences.cpp:467 msgid "" "Show font substitution warning dialog when requested fonts are not available " "on the system" msgstr "" -"Zeigt Schriftartenersetzungs-Warnmeldung, wenn angeforderte Schriftartenauf " +"Zeigt Schriftartenersetzungs-Warnmeldung, wenn angeforderte Schriftarten auf " "dem System nicht verfügbar sind" #: ../src/ui/dialog/inkscape-preferences.cpp:470 @@ -18242,7 +18243,7 @@ msgstr "Textgrößen-Einheitstyp:" msgid "Set the type of unit used in the text toolbar and text dialogs" msgstr "" "Setzt den Typ der Einheit, die in der Text-Werkzeugleiste und in " -"Textdialogen verwendet werden" +"Textdialogen verwendet wird" #: ../src/ui/dialog/inkscape-preferences.cpp:477 msgid "Always output text size in pixels (px)" @@ -18281,7 +18282,7 @@ msgid "" "uncheck to allow sharing of gradient definitions so that editing one object " "may affect other objects using the same gradient" msgstr "" -"Wenn aktiviert werden gemeinsam genutzte Verläufe automatisch aufgeteilt, " +"Wenn aktiviert, werden gemeinsam genutzte Verläufe automatisch aufgeteilt, " "sobald einer geändert wird. Andernfalls werden bei der Änderung eines " "Verlaufes sämtliche Objekte mit dem gleichen Verlauf ebenfalls geändert." @@ -18712,10 +18713,9 @@ msgid "Set the language for menus and number formats" msgstr "Sprache für Menüs und Zahlenformate setzen" #: ../src/ui/dialog/inkscape-preferences.cpp:616 -#, fuzzy msgctxt "Icon size" msgid "Larger" -msgstr "Groß" +msgstr "Größer" #: ../src/ui/dialog/inkscape-preferences.cpp:616 msgctxt "Icon size" @@ -19281,7 +19281,7 @@ msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:928 msgid "XML formatting" -msgstr "XML Format" +msgstr "XML-Format" #: ../src/ui/dialog/inkscape-preferences.cpp:930 msgid "Inline attributes" @@ -19368,7 +19368,7 @@ msgid "" "anything smaller is written as zero" msgstr "" "Alle Zahlen die kleiner als 10 hoch diesen Exponenten sind, werden als 0 in " -"SVG Dateien geschrieben." +"SVG-Dateien geschrieben." #. Code to add controls for attribute checking options #. Add incorrect style properties options @@ -19396,7 +19396,7 @@ msgstr "Attribute löschen" #: ../src/ui/dialog/inkscape-preferences.cpp:964 msgid "Delete invalid or non-useful attributes from element tag" -msgstr "Löscht ungültige oder nicht-nützliche Attribute vom Element Tag" +msgstr "Löscht ungültige oder nicht-nützliche Attribute vom Element-Tag" #. Add incorrect style properties options #: ../src/ui/dialog/inkscape-preferences.cpp:967 @@ -19608,7 +19608,7 @@ msgstr "Lässt K-Kanal in CMYK -> CMYK Transformation unverändert." # CHECK #: ../src/ui/dialog/inkscape-preferences.cpp:1091 #: ../src/ui/widget/color-icc-selector.cpp:394 -#: ../src/ui/widget/color-icc-selector.cpp:685 +#: ../src/ui/widget/color-icc-selector.cpp:699 msgid "" msgstr "" @@ -20550,7 +20550,7 @@ msgstr "Standard-Bitmapauflösung (Punkte pro Zoll) für Bitmap-Import" #: ../src/ui/dialog/inkscape-preferences.cpp:1528 msgid "Override file resolution" -msgstr "Datei-Auflösung überschreiben" +msgstr "Dateiauflösung überschreiben" #: ../src/ui/dialog/inkscape-preferences.cpp:1530 msgid "Use default bitmap resolution in favor of information from file" @@ -20900,17 +20900,14 @@ msgid "None" msgstr "Keine" #: ../src/ui/dialog/knot-properties.cpp:59 -#, fuzzy msgid "Position X:" -msgstr "Position:" +msgstr "X-Position:" #: ../src/ui/dialog/knot-properties.cpp:66 -#, fuzzy msgid "Position Y:" -msgstr "Position:" +msgstr "Y-Position:" #: ../src/ui/dialog/knot-properties.cpp:120 -#, fuzzy msgid "Modify Knot Position" msgstr "Knotenposition anpassen" @@ -20922,14 +20919,14 @@ msgid "_Move" msgstr "_Verschieben" #: ../src/ui/dialog/knot-properties.cpp:180 -#, fuzzy, c-format +#, c-format msgid "Position X (%s):" -msgstr "Position (%):" +msgstr "X-Position (%s):" #: ../src/ui/dialog/knot-properties.cpp:181 -#, fuzzy, c-format +#, c-format msgid "Position Y (%s):" -msgstr "Position (%):" +msgstr "Y-Position (%s):" #: ../src/ui/dialog/layer-properties.cpp:55 msgid "Layer name:" @@ -22245,16 +22242,15 @@ msgstr "Ausrichten - Nur Fließtext" #. Direction buttons #: ../src/ui/dialog/text-edit.cpp:109 ../src/widgets/text-toolbar.cpp:1740 msgid "Horizontal text" -msgstr "Horizontale Textausrichtung" +msgstr "Horizontaler Text" #: ../src/ui/dialog/text-edit.cpp:110 msgid "Vertical text" -msgstr "Vertikale Textausrichtung" +msgstr "Vertikaler Text" #: ../src/ui/dialog/text-edit.cpp:130 ../src/ui/dialog/text-edit.cpp:131 -#, fuzzy msgid "Spacing between baselines (percent of font size)" -msgstr "Abstand zwischen Linien (Prozent der Schriftgröße)" +msgstr "Abstand zwischen Grundlinien (Prozent der Schriftgröße)" #: ../src/ui/dialog/text-edit.cpp:147 msgid "Text path offset" @@ -22879,7 +22875,7 @@ msgid "" "The file already exists in \"%s\". Replacing it will overwrite its contents." msgstr "" "Eine Datei namens „%s“ existiert " -"bereits. Soll sie ersetzt werden?\n" +"bereits. Soll diese ersetzt werden?\n" "\n" "Die Datei existiert bereits in „%s“. Sie zu ersetzen wird ihren Inhalt " "überschreiben." @@ -22896,13 +22892,12 @@ msgstr "Zum übergeordneten Objekt gehen" #. TRANSLATORS: #%1 is the id of the group e.g. , not a number. #: ../src/ui/interface.cpp:1514 msgid "Enter group #%1" -msgstr "Gruppe #%1 beitreten" +msgstr "Gruppe #%1 betreten" #. Pop selection out of group #: ../src/ui/interface.cpp:1528 -#, fuzzy msgid "_Pop selection out of group" -msgstr "Auswahl als Gruppe behandeln:" +msgstr "Auswahl aus Gruppe herauslösen" #. Item dialog #: ../src/ui/interface.cpp:1656 ../src/verbs.cpp:2940 @@ -22920,7 +22915,7 @@ msgstr "Das Gleiche auswählen" #. Select same fill and stroke #: ../src/ui/interface.cpp:1686 msgid "Fill and Stroke" -msgstr "Füllung und _Kontur" +msgstr "Füllung und Kontur" #. Select same fill color #: ../src/ui/interface.cpp:1693 @@ -23175,10 +23170,10 @@ msgid "Drag curve" msgstr "Kurve ziehen" #: ../src/ui/tool/curve-drag-point.cpp:192 -#, fuzzy msgctxt "Path segment tip" msgid "Shift: drag to open or move BSpline handles" -msgstr "Knotenanfasser verschieben" +msgstr "" +"Umschalt: Ziehen um B-Spline-Anfasser zu öffnen oder zu verschieben" #: ../src/ui/tool/curve-drag-point.cpp:196 msgctxt "Path segment tip" @@ -23191,14 +23186,13 @@ msgid "Ctrl+Alt: click to insert a node" msgstr "Strg+Alt: Klicken, um einen Knoten einzufügen" #: ../src/ui/tool/curve-drag-point.cpp:204 -#, fuzzy msgctxt "Path segment tip" msgid "" "BSpline segment: drag to shape the segment, doubleclick to insert " "node, click to select (more: Shift, Ctrl+Alt)" msgstr "" "B-Spline Segment: Ziehen, um das Segment zu formen, Doppelklick zum " -"Einfügen eines Knotens oder Klicken zum Auswählen (mehr: Umschalt, Strg+Alt)" +"Einfügen eines Knotens, Klicken zum Auswählen (mehr: Umschalt, Strg+Alt)" #: ../src/ui/tool/curve-drag-point.cpp:209 msgctxt "Path segment tip" @@ -23329,10 +23323,9 @@ msgid "more: Shift, Ctrl, Alt" msgstr "mehr: Umschalt, Strg, Alt" #: ../src/ui/tool/node.cpp:496 -#, fuzzy msgctxt "Path handle tip" msgid "more: Ctrl" -msgstr "more: Strg, Alt" +msgstr "more: Strg" #: ../src/ui/tool/node.cpp:498 msgctxt "Path handle tip" @@ -23381,6 +23374,8 @@ msgstr "" msgctxt "Path handle tip" msgid "Ctrl: Snap handle to steps defined in BSpline Live Path Effect" msgstr "" +"Strg: Anfasser um derzeit im BSpline-Pfadeffekt festgelegte Schritte " +"verschieben" #: ../src/ui/tool/node.cpp:532 #, c-format @@ -23396,10 +23391,9 @@ msgid "Shift: rotate both handles by the same angle" msgstr "Umschalt: Dreht beide Anfasser um den gleichen Winkel" #: ../src/ui/tool/node.cpp:540 -#, fuzzy msgctxt "Path hande tip" msgid "Shift: move handle" -msgstr "Knotenanfasser verschieben" +msgstr "Umschalt: Anfasser verschieben" #: ../src/ui/tool/node.cpp:547 ../src/ui/tool/node.cpp:551 #, c-format @@ -23410,14 +23404,14 @@ msgstr "" "konvertieren (%s)" #: ../src/ui/tool/node.cpp:554 -#, fuzzy, c-format +#, c-format msgctxt "Path handle tip" msgid "" "BSpline node handle: Shift to drag, double click to reset (%s). %g " "power" msgstr "" -"Automatischer Knoten-Anfasser: Ziehen, um in einen weichen Knoten zu " -"konvertieren (%s)" +"B-Spline Knoten-Anfasser: Umschalt zum verschieben, Doppelklick zum " +"zurücksetzen (%s). Exponent %g" #: ../src/ui/tool/node.cpp:574 #, c-format @@ -23462,12 +23456,14 @@ msgid "%s: drag to shape the path (more: Shift, Ctrl, Alt)" msgstr "%s: Ziehen, um den Pfad zu formen (mehr: Umschalt, Strg, Alt)" #: ../src/ui/tool/node.cpp:1451 -#, fuzzy, c-format +#, c-format msgctxt "Path node tip" msgid "" "BSpline node: drag to shape the path (more: Shift, Ctrl, Alt). %g " "power" -msgstr "%s: Ziehen, um den Pfad zu formen (mehr: Umschalt, Strg, Alt)" +msgstr "" +"BSpline Knoten: Ziehen, um den Pfad zu formen (mehr: Umschalt, Strg, " +"Alt). %g " #: ../src/ui/tool/node.cpp:1454 #, c-format @@ -23490,14 +23486,14 @@ msgstr "" "auszuwählen (mehr: Umschalt, Strg, Alt)" #: ../src/ui/tool/node.cpp:1461 -#, fuzzy, c-format +#, c-format msgctxt "Path node tip" msgid "" "BSpline node: drag to shape the path, click to select only this node " "(more: Shift, Ctrl, Alt). %g power" msgstr "" -"%s: Ziehen, um den Pfad zu formen, Klicken, um nur diesen Knoten " -"auszuwählen (mehr: Umschalt, Strg, Alt)" +"B-Spline Knoten: Ziehen, um den Pfad zu formen, Klicken, um nur " +"diesen Knoten auszuwählen (mehr: Umschalt, Strg, Alt). Exponent %g" #: ../src/ui/tool/node.cpp:1474 #, c-format @@ -23676,7 +23672,8 @@ msgstr "Ausgewählte Pfadpunkte (Knoten) direkt ändern." #: ../src/ui/tools-switch.cpp:103 msgid "To tweak a path by pushing, select it and drag over it." msgstr "" -"Um eine Pfadform zu justieren, selektieren Sie diesen und ziehen über ihn." +"Um eine Pfadform zu justieren, wählen Sie diesen aus und klicken und ziehen " +"Sie mit der Maus darüber." #: ../src/ui/tools-switch.cpp:104 msgid "" @@ -24045,8 +24042,8 @@ msgstr "Stil auf Objekte anwenden" #: ../src/ui/tools/flood-tool.cpp:1139 msgid "Draw over areas to add to fill, hold Alt for touch fill" msgstr "" -"Zeichne über Flächen um zur Füllung hinzuzufügen, Alt für " -"Füllen durch Berührung" +"Zeichnen über Flächen fügt zur Füllung hinzu; Alt für Füllen " +"durch Berührung" #. We hit green anchor, closing Green-Blue-Red #: ../src/ui/tools/freehand-base.cpp:677 @@ -24164,41 +24161,41 @@ msgstr "Ein Konstruktionswerkzeug von der Werkzeugleiste wählen." #. create the knots #: ../src/ui/tools/measure-tool.cpp:349 msgid "Measure start, Shift+Click for position dialog" -msgstr "" +msgstr "Erster Messpunkt, Umschalt+Klick für Positionsdialog" #: ../src/ui/tools/measure-tool.cpp:355 msgid "Measure end, Shift+Click for position dialog" -msgstr "" +msgstr "Zweiter Messpunkt, Umschalt+Klick für Positionsdialog" +# Is this meant to be translatable? #: ../src/ui/tools/measure-tool.cpp:747 ../share/extensions/measure.inx.h:2 msgid "Measure" -msgstr "Ausmessen" +msgstr "Maßstab" #: ../src/ui/tools/measure-tool.cpp:752 msgid "Base" -msgstr "" +msgstr "Basis" #: ../src/ui/tools/measure-tool.cpp:761 msgid "Add guides from measure tool" -msgstr "" +msgstr "Hilflinien aus Messwerkzeug hinzufügen" #: ../src/ui/tools/measure-tool.cpp:781 -msgid "Add Stored to measure tool" -msgstr "" +msgid "Keep last measure on the canvas, for reference" +msgstr "Letzte Messung als Referenz auf der Leinwand behalten" #: ../src/ui/tools/measure-tool.cpp:801 -#, fuzzy msgid "Convert measure to items" -msgstr "Kontur in Pfad umwandeln" +msgstr "Maßstab in Objekte umwandeln" #: ../src/ui/tools/measure-tool.cpp:839 msgid "Add global measure line" -msgstr "" +msgstr "Maßlinie erstellen" #: ../src/ui/tools/measure-tool.cpp:1290 ../src/ui/tools/measure-tool.cpp:1292 -#, fuzzy, c-format +#, c-format msgid "Crossing %lu" -msgstr "Kreuzungsmarkierungen" +msgstr "Schnittpunkt %lu" #. TRANSLATORS: Mind the space in front. This is part of a compound message #: ../src/ui/tools/mesh-tool.cpp:122 ../src/ui/tools/mesh-tool.cpp:133 @@ -24262,9 +24259,8 @@ msgid "FIXMEShift: draw mesh around the starting point" msgstr "FIXMEUmschalt: Gitter um den Startpunkt zeichnen" #: ../src/ui/tools/mesh-tool.cpp:971 -#, fuzzy msgid "Create mesh" -msgstr "Standardgitter erstellen" +msgstr "Verlaufsgitter erstellen" #: ../src/ui/tools/node-tool.cpp:648 msgctxt "Node tool tip" @@ -24346,11 +24342,12 @@ msgid "Click or click and drag to close and finish the path." msgstr "Klick oder Klick und Ziehen, um den Pfad abzuschließen." #: ../src/ui/tools/pen-tool.cpp:642 -#, fuzzy msgid "" "Click or click and drag to close and finish the path. Shift" "+Click make a cusp node" -msgstr "Klick oder Klick und Ziehen, um den Pfad abzuschließen." +msgstr "" +"Klick oder Klick und Ziehen, um den Pfad abzuschließen. " +"Umschalt+Klick um spitzen Knoten zu erzeugen" #: ../src/ui/tools/pen-tool.cpp:654 msgid "" @@ -24360,49 +24357,50 @@ msgstr "" "fortzusetzen." #: ../src/ui/tools/pen-tool.cpp:656 -#, fuzzy msgid "" "Click or click and drag to continue the path from this point. " "Shift+Click make a cusp node" msgstr "" "Klick oder Klick und Ziehen, um den Pfad von diesem Punkt aus " -"fortzusetzen." +"fortzusetzen. Umschalt+Klick um spitzen Knoten zu erzeugen" #: ../src/ui/tools/pen-tool.cpp:1797 -#, fuzzy, c-format +#, c-format msgid "" "Curve segment: angle %3.2f°, distance %s; with Ctrl to " "snap angle, Enter or Shift+Enter to finish the path" msgstr "" "Kurvensegment: Winkel %3.2f°, Abstand %s; Strg rastet den " -"Winkel ein; Eingabe schließt den Pfad ab" +"Winkel ein; Eingabe oder Umschalt+Eingabe schließen den Pfad ab" #: ../src/ui/tools/pen-tool.cpp:1798 -#, fuzzy, c-format +#, c-format msgid "" "Line segment: angle %3.2f°, distance %s; with Ctrl to " "snap angle, Enter or Shift+Enter to finish the path" msgstr "" "Liniensegment: Winkel %3.2f°, Abstand %s; Strg rastet den " -"Winkel ein; Eingabe schließt den Pfad ab" +"Winkel ein; Eingabe oder Umschalt+Eingabe schließen den Pfad ab" #: ../src/ui/tools/pen-tool.cpp:1801 -#, fuzzy, c-format +#, c-format msgid "" "Curve segment: angle %3.2f°, distance %s; with Shift+Click make a cusp node, Enter or Shift+Enter to finish the path" msgstr "" -"Kurvensegment: Winkel %3.2f°, Abstand %s; Strg rastet den " -"Winkel ein; Eingabe schließt den Pfad ab" +"Kurvensegment: Winkel %3.2f°, Abstand %s; Umschalt+Klick " +"erzeugt spitzen Winkel; Eingabe oderUmschalt+Eingabe schließen " +"den Pfad ab" #: ../src/ui/tools/pen-tool.cpp:1802 -#, fuzzy, c-format +#, c-format msgid "" "Line segment: angle %3.2f°, distance %s; with Shift+Click " "make a cusp node, Enter or Shift+Enter to finish the path" msgstr "" -"Liniensegment: Winkel %3.2f°, Abstand %s; Strg rastet den " -"Winkel ein; Eingabe schließt den Pfad ab" +"Liniensegment: Winkel %3.2f°, Abstand %s; Umschalt+Klick " +"erzeugt spitzen Winkel; Eingabe oder Umschalt+Eingabe " +"schließen den Pfad ab" #: ../src/ui/tools/pen-tool.cpp:1819 #, c-format @@ -25539,15 +25537,15 @@ msgstr "Ändern der Seitengröße auf Inhalt..." #: ../src/ui/widget/page-sizer.cpp:447 msgid "_Resize page to drawing or selection" -msgstr "Seite in Auswahl ein_passen" +msgstr "Seiteng_röße auf Zeichnungs-/Auswahlgröße" #: ../src/ui/widget/page-sizer.cpp:448 msgid "" "Resize the page to fit the current selection, or the entire drawing if there " "is no selection" msgstr "" -"Seitengröße verändern, so daß sie auf die aktuelle Auswahl passt, oder auf " -"die ganze Zeichnung, wenn keine Auswahl existiert" +"Seitengröße so verändern, daß die aktuelle Auswahl, oder, falls nichts " +"ausgewählt ist, die gesamte Zeichnung, hineinpasst." #: ../src/ui/widget/page-sizer.cpp:479 msgid "" @@ -25555,7 +25553,7 @@ msgid "" "scaling in Inkscape. To set a non-uniform scaling, set the 'viewBox' " "directly." msgstr "" -"Obwohl das SVG Format unterschiedliche Skalierungsfaktoren erlaubt, wird " +"Obwohl das SVG-Format unterschiedliche Skalierungsfaktoren erlaubt, wird " "dies für die Verwendung in Inkscape nicht empfohlen. Um unterschiedliche " "Skalierungsfaktoren festzulegen kann das 'viewBox' Attribut direkt " "bearbeitet werden." @@ -25880,11 +25878,11 @@ msgstr "a" #: ../src/ui/widget/selected-style.cpp:247 msgid "Fill is averaged over selected objects" -msgstr "Füllung wird über ausgewählte Objekte gemittelt" +msgstr "Füllfarbe wird über ausgewählte Objekte gemittelt" #: ../src/ui/widget/selected-style.cpp:247 msgid "Stroke is averaged over selected objects" -msgstr "Konturlinie wird über ausgewählte Objekte gemittelt" +msgstr "Konturfarbe wird über ausgewählte Objekte gemittelt" # !!! #. TRANSLATOR COMMENT: M means "Multiple" @@ -26310,14 +26308,13 @@ msgid "Flip vertically" msgstr "Vertikal umkehren" #: ../src/verbs.cpp:1590 -#, fuzzy, c-format +#, c-format msgid "Set %d" -msgstr "Verzögerung setzen" +msgstr "Gruppe %d" #: ../src/verbs.cpp:1599 ../src/verbs.cpp:2729 -#, fuzzy msgid "Create new selection set" -msgstr "Neuen Elementknoten erzeugen" +msgstr "Neue Auswahlgruppe erzeugen" #. 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 @@ -26885,16 +26882,13 @@ msgstr "Jede Auswahl von Objekten oder Knoten aufheben" msgid "Delete all the guides in the document" msgstr "Alle Hilfslinien aus dem Dokument löschen" -# !!! mnemonics #: ../src/verbs.cpp:2546 -#, fuzzy msgid "Lock All Guides" -msgstr "Alle sperren" +msgstr "Alle Hilfslinien sperren" #: ../src/verbs.cpp:2546 ../src/widgets/desktop-widget.cpp:404 -#, fuzzy msgid "Toggle lock of all guides in the document" -msgstr "Alle Hilfslinien aus dem Dokument löschen" +msgstr "Sperrt/Entsperrt alle Hilfslinien im Dokument" #: ../src/verbs.cpp:2547 msgid "Create _Guides Around the Page" @@ -26954,14 +26948,12 @@ msgid "Ungroup selected groups" msgstr "Gruppierung markierter Gruppen aufheben" #: ../src/verbs.cpp:2565 -#, fuzzy msgid "_Pop selected objects out of group" -msgstr "Die gewählten Objekte gruppieren" +msgstr "Gewählte Objekte aus Gruppe herauslösen" #: ../src/verbs.cpp:2566 -#, fuzzy msgid "Pop selected objects out of group" -msgstr "Die gewählten Objekte gruppieren" +msgstr "Gewählte Objekte aus Gruppe herauslösen" #: ../src/verbs.cpp:2568 msgid "_Put on Path" @@ -28125,7 +28117,7 @@ msgstr "Globale Einstellungen für Inkscape bearbeiten" #: ../src/verbs.cpp:2899 msgid "_Document Properties..." -msgstr "_Dokumenteneinstellungen..." +msgstr "_Dokumenteinstellungen..." #: ../src/verbs.cpp:2900 msgid "Edit properties of this document (to be saved with the document)" @@ -28317,7 +28309,7 @@ msgstr "Aus_wahlgruppen..." #: ../src/verbs.cpp:2951 msgid "View Tags" -msgstr "" +msgstr "Tags anzeigen" #: ../src/verbs.cpp:2952 msgid "Path E_ffects ..." @@ -28495,9 +28487,8 @@ msgid "Fit the page to the drawing" msgstr "Die Seite in die Zeichnungsgröße einpassen" #: ../src/verbs.cpp:3008 -#, fuzzy msgid "_Resize Page to Selection" -msgstr "Seite in Auswahl einpassen" +msgstr "Seiteng_röße auf Auswahlgröße" #: ../src/verbs.cpp:3009 msgid "" @@ -29181,14 +29172,12 @@ msgid "%s%s - Inkscape" msgstr "%s%s - Inkscape" #: ../src/widgets/desktop-widget.cpp:1111 -#, fuzzy msgid "Locked all guides" -msgstr "Alle Ebenen sperren" +msgstr "Alle Ebenen gesperret" #: ../src/widgets/desktop-widget.cpp:1113 -#, fuzzy msgid "Unlocked all guides" -msgstr "Alle Ebenen entsperren" +msgstr "Alle Ebenen entsperret" # ??? #: ../src/widgets/desktop-widget.cpp:1130 @@ -29229,7 +29218,7 @@ msgstr "" "Die Datei \"%s\" wurde in einem " "möglicherweise verlustbehafteten Format gespeichert!\n" "\n" -"Möchten Sie das Dokument als Inkscape SVG speichern?" +"Möchten Sie das Dokument als Inkscape-SVG speichern?" #: ../src/widgets/desktop-widget.cpp:1258 msgid "_Save as Inkscape SVG" @@ -29289,9 +29278,8 @@ msgstr "Aus Objekt herausschneiden" #. Width #: ../src/widgets/eraser-toolbar.cpp:151 -#, fuzzy msgid "(no width)" -msgstr "Nullbreite" +msgstr "(Nullbreite) " #: ../src/widgets/eraser-toolbar.cpp:155 msgid "The width of the eraser pen (relative to the visible canvas area)" @@ -29299,19 +29287,17 @@ msgstr "Die Größe des Radierers (relativ zur sichtbaren Arbeitsfläche)" # Name des Effekte-submenü, das alle Bitmap-Effekte beinhaltet. #: ../src/widgets/eraser-toolbar.cpp:171 -#, fuzzy msgid "Eraser Mass" -msgstr "Radierer" +msgstr "Masse des Radierers" #: ../src/widgets/eraser-toolbar.cpp:172 -#, fuzzy msgid "Increase to make the eraser drag behind, as if slowed by inertia" -msgstr "Erhöhen, um den Füller nachzuschleppen, wie durch Trägheit verlangsamt" +msgstr "" +"Erhöhen, um den Radierer nachzuschleppen, wie durch Trägheit verlangsamt" #: ../src/widgets/eraser-toolbar.cpp:186 ../src/widgets/eraser-toolbar.cpp:187 -#, fuzzy msgid "Break apart cut items" -msgstr "Zerlegen" +msgstr "Aufgetrennte Objekte zerlegen" #: ../src/widgets/fill-style.cpp:356 msgid "Change fill rule" @@ -29594,32 +29580,36 @@ msgstr "Farbverlaufs-Editor" msgid "Change gradient stop color" msgstr "Zwischenfarbe des Farbverlaufs ändern" +# Only used for development purposes #: ../src/widgets/image-menu-item.c:151 -#, fuzzy msgid "Image widget" -msgstr "Bild-Datei" +msgstr "Bild-Widget" +# Only used for development purposes #: ../src/widgets/image-menu-item.c:152 msgid "Child widget to appear next to the menu text" -msgstr "" +msgstr "Kind-Widget, das neben dem Text im Menü erscheint" #: ../src/widgets/image-menu-item.c:167 -#, fuzzy msgid "Use stock" -msgstr "Kontur einfügen" +msgstr "Standard verwenden" +# Only used for development purposes. #: ../src/widgets/image-menu-item.c:168 msgid "Whether to use the label text to create a stock menu item" msgstr "" +"Ob der Beschriftungstext verwendet werden soll, um einen Standard-" +"Menüeintrag zu generieren." +# Only used for development purposes #: ../src/widgets/image-menu-item.c:183 -#, fuzzy msgid "Accel Group" -msgstr "Gruppe" +msgstr "Schnellzugriffsgruppe" +# Only used for development purposes #: ../src/widgets/image-menu-item.c:184 msgid "The Accel Group to use for stock accelerator keys" -msgstr "" +msgstr "Die Gruppe, die für Standardtastaturkürzel verwendet werden soll" #: ../src/widgets/lpe-toolbar.cpp:233 msgid "Closed" @@ -29696,40 +29686,35 @@ msgstr "Öffnet den LPE-Dialog (erlaubt Anpassung der Parameterwerte)" #: ../src/widgets/measure-toolbar.cpp:157 msgid "Start and end measures inactive." -msgstr "" +msgstr "Anfangs- und Endpunkt inaktiv." #: ../src/widgets/measure-toolbar.cpp:159 msgid "Start and end measures active." -msgstr "" +msgstr "Anfangs- und Endpunkt aktiv." #: ../src/widgets/measure-toolbar.cpp:175 -#, fuzzy msgid "Show all crossings." -msgstr "Alle Ebenen zeigen" +msgstr "Alle Schnittpunkte anzeigen" #: ../src/widgets/measure-toolbar.cpp:177 -#, fuzzy msgid "Show visible crossings." -msgstr "Nur sichtbare Ebenen behalten" +msgstr "Nur sichtbare Schnittpunkte anzeigen" #: ../src/widgets/measure-toolbar.cpp:193 msgid "Use all layers in the measure." -msgstr "" +msgstr "Alle Ebenen bei Messung berücksichtigen." #: ../src/widgets/measure-toolbar.cpp:195 -#, fuzzy msgid "Use current layer in the measure." -msgstr "Die aktuelle Ebene nach ganz oben anheben" +msgstr "Nur die aktuelle Ebene bei Messung berücksichtigen." #: ../src/widgets/measure-toolbar.cpp:211 -#, fuzzy msgid "Compute all elements." -msgstr "tutorial-elements.de.svg" +msgstr "Alle Teilstrecken auswerten." #: ../src/widgets/measure-toolbar.cpp:213 -#, fuzzy msgid "Compute max length." -msgstr "Innen-Außen-Pfadlänge:" +msgstr "Gesamtsrecke auswerten." #: ../src/widgets/measure-toolbar.cpp:274 ../src/widgets/text-toolbar.cpp:1609 msgid "Font Size" @@ -29741,12 +29726,12 @@ msgstr "Schriftgröße:" #: ../src/widgets/measure-toolbar.cpp:275 msgid "The font size to be used in the measurement labels" -msgstr "Die Schriftgröße, die für die Messungen verwendet werden" +msgstr "Die Schriftgröße, die für Bemaßungen verwendet wird" #: ../src/widgets/measure-toolbar.cpp:286 #: ../src/widgets/measure-toolbar.cpp:294 msgid "The units to be used for the measurements" -msgstr "Die Einheiten, die für die Messungen verwendet werden" +msgstr "Die Einheiten, die für die Bemaßungen verwendet werden" #: ../src/widgets/measure-toolbar.cpp:302 ../share/extensions/measure.inx.h:14 msgid "Precision:" @@ -29754,80 +29739,68 @@ msgstr "Genauigkeit:" #: ../src/widgets/measure-toolbar.cpp:303 msgid "Decimal precision of measure" -msgstr "" +msgstr "Anzahl Dezimalstellen in Bemaßungen" #: ../src/widgets/measure-toolbar.cpp:315 -#, fuzzy msgid "Scale %" -msgstr "X skalieren" +msgstr "Skalierung" #: ../src/widgets/measure-toolbar.cpp:315 -#, fuzzy msgid "Scale %:" msgstr "Skalierung:" #: ../src/widgets/measure-toolbar.cpp:316 -#, fuzzy msgid "Scale the results" -msgstr "Filter-Auflösung setzen" +msgstr "Skalierung der Maße (in Prozent)" #: ../src/widgets/measure-toolbar.cpp:329 -#, fuzzy msgid "The offset size" -msgstr "Rot-Versatz:" +msgstr "Versatz für manuell erstellte Bemaßungen" #: ../src/widgets/measure-toolbar.cpp:341 #: ../src/widgets/measure-toolbar.cpp:342 -#, fuzzy msgid "Ignore first and last" -msgstr "Ersten und letzen Punkt ignorieren" +msgstr "Anfangs- und Endpunkt ignorieren" #: ../src/widgets/measure-toolbar.cpp:352 #: ../src/widgets/measure-toolbar.cpp:353 -#, fuzzy msgid "Show hidden intersections" -msgstr "Gitter-Überschneidung" +msgstr "Zeige versteckte Überschneidungen" #: ../src/widgets/measure-toolbar.cpp:363 #: ../src/widgets/measure-toolbar.cpp:364 -#, fuzzy msgid "Show measures between items" -msgstr "Bewegung zwischen den Pfaden anzeigen" +msgstr "Bemaßungen zwischen Überschneidungen anzeigen" #: ../src/widgets/measure-toolbar.cpp:374 #: ../src/widgets/measure-toolbar.cpp:375 -#, fuzzy msgid "Measure all layers" -msgstr "In allen Ebenen suchen" +msgstr "Allen Ebenen für die Messung berücksichtigen" #: ../src/widgets/measure-toolbar.cpp:385 #: ../src/widgets/measure-toolbar.cpp:386 -#, fuzzy msgid "Reverse measure" -msgstr "Pfadrichtung umkehren" +msgstr "Maßstab umkehren" #: ../src/widgets/measure-toolbar.cpp:395 #: ../src/widgets/measure-toolbar.cpp:396 msgid "Phantom measure" -msgstr "" +msgstr "Phantombild des aktuellen Maßstabs erstellen" #: ../src/widgets/measure-toolbar.cpp:405 #: ../src/widgets/measure-toolbar.cpp:406 -#, fuzzy msgid "To guides" -msgstr "_Hilfslinien anzeigen" +msgstr "In Hilfslinien umwandeln" #: ../src/widgets/measure-toolbar.cpp:415 #: ../src/widgets/measure-toolbar.cpp:416 -#, fuzzy msgid "Mark Dimension" -msgstr "Dimensionen" +msgstr "Bemaßung erstellen" #: ../src/widgets/measure-toolbar.cpp:425 #: ../src/widgets/measure-toolbar.cpp:426 -#, fuzzy msgid "Convert to item" -msgstr "Umwandeln in Abrundung" +msgstr "In Zeichenobjekte umwandeln" #: ../src/widgets/mesh-toolbar.cpp:318 msgid "Set mesh type" @@ -29927,29 +29900,32 @@ msgstr "Glättung:" #: ../src/widgets/mesh-toolbar.cpp:537 msgid "Toggle Sides" -msgstr "" +msgstr "Seiten umschalten" #: ../src/widgets/mesh-toolbar.cpp:538 msgid "Toggle selected sides between Beziers and lines." -msgstr "" +msgstr "Ausgewählte Seiten zu Bézierkurven oder Linien machen" #: ../src/widgets/mesh-toolbar.cpp:541 msgid "Toggle side:" -msgstr "" +msgstr "Seite umschalten:" #: ../src/widgets/mesh-toolbar.cpp:548 msgid "Make elliptical" -msgstr "" +msgstr "Elliptisch machen" #: ../src/widgets/mesh-toolbar.cpp:549 msgid "" "Make selected sides elliptical by changing length of handles. Works best if " "handles already approximate ellipse." msgstr "" +"Ausgewählte Seiten elliptisch machen durch Veränderung der Anfasserlänge. " +"Funktioniert am besten, wenn die Anfasser bereits annäherungsweise eine " +"Ellipsenform bilden." #: ../src/widgets/mesh-toolbar.cpp:552 msgid "Make elliptical:" -msgstr "" +msgstr "Elliptisch machen:" #: ../src/widgets/mesh-toolbar.cpp:559 msgid "Pick colors:" @@ -30408,7 +30384,7 @@ msgstr "Pfadeffektbasiertes interaktives Vereinfachen" #: ../src/widgets/pencil-toolbar.cpp:418 ../src/widgets/pencil-toolbar.cpp:419 msgid "LPE simplify flatten" -msgstr "" +msgstr "Vereinfachen-Pfadeffekt in normalen Pfad umwandeln" #: ../src/widgets/rect-toolbar.cpp:125 msgid "Change rectangle" @@ -30580,7 +30556,6 @@ msgstr "X:" #. shortLabel #: ../src/widgets/select-toolbar.cpp:443 -#, fuzzy msgctxt "Select toolbar" msgid "Horizontal coordinate of selection" msgstr "Horizontale Koordinate der Auswahl" @@ -30599,7 +30574,6 @@ msgstr "Y:" #. shortLabel #: ../src/widgets/select-toolbar.cpp:462 -#, fuzzy msgctxt "Select toolbar" msgid "Vertical coordinate of selection" msgstr "Vertikale Koordinate der Auswahl" @@ -30618,7 +30592,6 @@ msgstr "B:" #. shortLabel #: ../src/widgets/select-toolbar.cpp:481 -#, fuzzy msgctxt "Select toolbar" msgid "Width of selection" msgstr "Breite der Auswahl" @@ -30645,7 +30618,6 @@ msgstr "H:" #. shortLabel #: ../src/widgets/select-toolbar.cpp:513 -#, fuzzy msgctxt "Select toolbar" msgid "Height of selection" msgstr "Höhe der Auswahl" @@ -30785,11 +30757,10 @@ msgid "The width of the spray area (relative to the visible canvas area)" msgstr "Breite des Sprühbereichs (relativ zur sichtbaren Arbeitsfläche)" #: ../src/widgets/spray-toolbar.cpp:312 -#, fuzzy msgid "Use the pressure of the input device to alter the width of spray area" msgstr "" "Druckempfindlichkeit des Eingabegeräts benutzen, um die Strichbreite des " -"Füllers zu beeinflussen" +"Sprühbereichs zu beeinflussen" #: ../src/widgets/spray-toolbar.cpp:323 msgid "(maximum mean)" @@ -30801,7 +30772,7 @@ msgstr "Fokus" #: ../src/widgets/spray-toolbar.cpp:326 msgid "Focus:" -msgstr "Fokus:" +msgstr "Fokussierung:" #: ../src/widgets/spray-toolbar.cpp:326 msgid "0 to spray a spot; increase to enlarge the ring radius" @@ -30847,14 +30818,12 @@ msgid "Spray objects in a single path" msgstr "Sprüht Objekte in einen einzelnen Pfad" #: ../src/widgets/spray-toolbar.cpp:383 -#, fuzzy msgid "Delete sprayed items" -msgstr "Zwischenfarbe des Farbverlaufs löschen" +msgstr "Gesprühte Objekte löschen" #: ../src/widgets/spray-toolbar.cpp:384 -#, fuzzy msgid "Delete sprayed items from selection" -msgstr "Kurven von der Auswahl erhalten..." +msgstr "Gesprühte Objekte aus der Auswahl löschen" #: ../src/widgets/spray-toolbar.cpp:388 ../src/widgets/tweak-toolbar.cpp:253 msgid "Mode" @@ -30881,8 +30850,8 @@ msgstr "Anzahl der Objekte festlegen, die per Klick gesprüht werden" msgid "" "Use the pressure of the input device to alter the amount of sprayed objects" msgstr "" -"Druckempfindlichkeit des Eingabegeräts benutzen, um die Anzahl der zu " -"sprühenden Objekte zu beeinflussen" +"Druckempfindlichkeit des Eingabegeräts benutzen, um die Anzahl der " +"gesprühten Objekte zu beeinflussen" #: ../src/widgets/spray-toolbar.cpp:438 msgid "(high rotation variation)" @@ -30894,7 +30863,7 @@ msgstr "Drehung" #: ../src/widgets/spray-toolbar.cpp:441 msgid "Rotation:" -msgstr "D_rehung:" +msgstr "Drehung:" #: ../src/widgets/spray-toolbar.cpp:443 #, no-c-format @@ -30917,7 +30886,7 @@ msgstr "Skalieren" #: ../src/widgets/spray-toolbar.cpp:459 msgctxt "Spray tool" msgid "Scale:" -msgstr "Skalierung:" +msgstr "Skalieren" #: ../src/widgets/spray-toolbar.cpp:461 #, no-c-format @@ -30929,76 +30898,74 @@ msgstr "" "das Originalobjekt." #: ../src/widgets/spray-toolbar.cpp:477 -#, fuzzy msgid "Use the pressure of the input device to alter the scale of new items" msgstr "" -"Druckempfindlichkeit des Eingabegeräts benutzen, um die Strichbreite des " -"Füllers zu beeinflussen" +"Druckempfindlichkeit des Eingabegeräts benutzen, um die Skalierung neuer " +"Objekte zu beeinflussen" #: ../src/widgets/spray-toolbar.cpp:489 ../src/widgets/spray-toolbar.cpp:490 msgid "" "Pick color from the drawing. You can use clonetiler trace dialog for " "advanced effects. In clone mode original fill or stroke colors must be unset." msgstr "" +"Farbe aus der Zeichnung übernehmen. Der Dialog für das Erzeugen gekachelter " +"Klone kann für fortgeschrittene Effekte verwendet werden. Im Klon-Modus " +"müssen Füllung und Konturfarbe des Originalobjekts undefiniert sein." #: ../src/widgets/spray-toolbar.cpp:502 ../src/widgets/spray-toolbar.cpp:503 msgid "Pick from center instead average area." -msgstr "" +msgstr "Farbe vom Zentrum übernehmen statt über die gesamte Fläche zu mitteln." +# What's the meaning of the seond part? #: ../src/widgets/spray-toolbar.cpp:515 ../src/widgets/spray-toolbar.cpp:516 msgid "Inverted pick value, retaining color in advanced trace mode" -msgstr "" +msgstr "Übernommene Farbe invertieren" #: ../src/widgets/spray-toolbar.cpp:528 ../src/widgets/spray-toolbar.cpp:529 -#, fuzzy msgid "Apply picked color to fill" -msgstr "Zuletzt gewählte Farbe auf Füllung anwenden" +msgstr "Gewählte Farbe auf Füllung anwenden" #: ../src/widgets/spray-toolbar.cpp:541 ../src/widgets/spray-toolbar.cpp:542 -#, fuzzy msgid "Apply picked color to stroke" -msgstr "Zuletzt gewählte Farbe auf Kontur anwenden" +msgstr "Gewählte Farbe auf Kontur anwenden" #: ../src/widgets/spray-toolbar.cpp:554 ../src/widgets/spray-toolbar.cpp:555 msgid "No overlap between colors" -msgstr "" +msgstr "Überlappung zwischen unterschiedlichen Farben verhindern" #: ../src/widgets/spray-toolbar.cpp:567 ../src/widgets/spray-toolbar.cpp:568 msgid "Apply over transparent areas" -msgstr "" +msgstr "Über transparenten Bereichen sprühen" #: ../src/widgets/spray-toolbar.cpp:580 ../src/widgets/spray-toolbar.cpp:581 msgid "Apply over no transparent areas" -msgstr "" +msgstr "Über nicht transparenten Bereichen sprühen" #: ../src/widgets/spray-toolbar.cpp:593 ../src/widgets/spray-toolbar.cpp:594 -#, fuzzy msgid "Prevent overlapping objects" -msgstr "Bitte wählen Sie ein Objekt." +msgstr "Überlappung zwischen gesprühten Objekten verhindern" #: ../src/widgets/spray-toolbar.cpp:605 -#, fuzzy msgid "(minimum offset)" -msgstr "(minimale Stärke)" +msgstr "(minimaler Versatz)" #: ../src/widgets/spray-toolbar.cpp:605 -#, fuzzy msgid "(maximum offset)" -msgstr "(maximale Stärke)" +msgstr "(maximaler Versatz)" #: ../src/widgets/spray-toolbar.cpp:608 -#, fuzzy msgid "Offset %" -msgstr "Versatz (px):" +msgstr "Versatz" #: ../src/widgets/spray-toolbar.cpp:608 -#, fuzzy msgid "Offset %:" msgstr "Versatz:" #: ../src/widgets/spray-toolbar.cpp:609 msgid "Increase to segregate objects more (value in percent)" msgstr "" +"Erhöhen um Separation zwischen gesprühten Objekten zu erhöhen (Wert in " +"Prozent)" #: ../src/widgets/star-toolbar.cpp:103 msgid "Star: Change number of corners" @@ -31264,33 +31231,28 @@ msgid "Square cap" msgstr "Quadratisches Ende" #: ../src/widgets/stroke-style.cpp:392 -#, fuzzy msgid "Fill, Stroke, Markers" -msgstr "Strich-Stilmarkierungen" +msgstr "Füllung, Kontur, Markierungen" #: ../src/widgets/stroke-style.cpp:396 -#, fuzzy msgid "Stroke, Fill, Markers" -msgstr "Strich-Stilmarkierungen" +msgstr "Kontur, Füllung, Markierungen" #: ../src/widgets/stroke-style.cpp:400 -#, fuzzy msgid "Fill, Markers, Stroke" -msgstr "Füllung und _Kontur" +msgstr "Füllung, Markierungen, Kontur" #: ../src/widgets/stroke-style.cpp:408 -#, fuzzy msgid "Markers, Fill, Stroke" -msgstr "Füllung und _Kontur" +msgstr "Markierungen, Füllung, Kontur" #: ../src/widgets/stroke-style.cpp:412 -#, fuzzy msgid "Stroke, Markers, Fill" -msgstr "Strich-Stilmarkierungen" +msgstr "Kontur, Markierungen, Füllung" #: ../src/widgets/stroke-style.cpp:416 msgid "Markers, Stroke, Fill" -msgstr "" +msgstr "Markierungen, Kontur, Füllung" #: ../src/widgets/stroke-style.cpp:534 msgid "Set markers" @@ -31333,9 +31295,8 @@ msgid "Text: Change line-height" msgstr "Text: Linienhöhe ändern" #: ../src/widgets/text-toolbar.cpp:728 -#, fuzzy msgid "Text: Change line-height unit" -msgstr "Text: Linienhöhe ändern" +msgstr "Text: Einheit für Zeilenabstand ändern" #: ../src/widgets/text-toolbar.cpp:777 msgid "Text: Change word-spacing" @@ -31358,13 +31319,12 @@ msgid "Text: Change rotate" msgstr "Text: Ändern Drehung" #: ../src/widgets/text-toolbar.cpp:977 -#, fuzzy msgid "Text: Change writing mode" -msgstr "Text: Richtung ändern" +msgstr "Textrichtung ändern" #: ../src/widgets/text-toolbar.cpp:1031 msgid "Text: Change orientation" -msgstr "Text: Richtung ändern" +msgstr "Textausrichtung ändern" #: ../src/widgets/text-toolbar.cpp:1539 msgid "Font Family" @@ -31416,6 +31376,7 @@ msgstr "Tiefgestellt umschalten" msgid "Justify" msgstr "Blocksatz" +# Alignment (left, center, right, block) #. Name #: ../src/widgets/text-toolbar.cpp:1711 msgid "Alignment" @@ -31431,68 +31392,62 @@ msgid "Horizontal" msgstr "Horizontal" #: ../src/widgets/text-toolbar.cpp:1746 -#, fuzzy msgid "Vertical — RL" -msgstr "Vertikal" +msgstr "Vertikal — RL" #: ../src/widgets/text-toolbar.cpp:1747 msgid "Vertical text — lines: right to left" -msgstr "" +msgstr "Vertikaler Text — Zeilen von rechts nach links" #: ../src/widgets/text-toolbar.cpp:1753 -#, fuzzy msgid "Vertical — LR" -msgstr "Vertikal" +msgstr "Vertikal — LR" #: ../src/widgets/text-toolbar.cpp:1754 msgid "Vertical text — lines: left to right" -msgstr "" +msgstr "Vertikaler Text — Zeilen von links nach rechts" -# not sure here -cm- +# Writing mode (Horizontal, Vertical-LR, Vertical-RL) #. Name #: ../src/widgets/text-toolbar.cpp:1759 -#, fuzzy msgid "Writing mode" -msgstr "Zeichenmodus" +msgstr "Textrichtung" #. Label #: ../src/widgets/text-toolbar.cpp:1760 msgid "Block progression" -msgstr "" +msgstr "Textrichtung" #: ../src/widgets/text-toolbar.cpp:1789 -#, fuzzy msgid "Auto glyph orientation" -msgstr "Folgen der Pfadausrichtung" +msgstr "Automatische Zeichenausrichtung" #: ../src/widgets/text-toolbar.cpp:1796 -#, fuzzy msgid "Upright" -msgstr "Heller" +msgstr "Aufrecht" #: ../src/widgets/text-toolbar.cpp:1797 -#, fuzzy msgid "Upright glyph orientation" -msgstr "Textausrichtung" +msgstr "Aufrechte Zeichenausrichtung" #: ../src/widgets/text-toolbar.cpp:1804 msgid "Sideways" -msgstr "" +msgstr "Gedreht" #: ../src/widgets/text-toolbar.cpp:1805 -#, fuzzy msgid "Sideways glyph orientation" -msgstr "Folgen der Pfadausrichtung" +msgstr "Gedrehte Zeichenausrichtung" +# Text (glyph) orientation (Auto (mixed), Upright, Sideways) #. Name #: ../src/widgets/text-toolbar.cpp:1811 msgid "Text orientation" -msgstr "Textausrichtung" +msgstr "Zeichenausrichtung" #. Label #: ../src/widgets/text-toolbar.cpp:1812 msgid "Text (glyph) orientation in vertical text." -msgstr "" +msgstr "Zeichenausrichtung in vertikalem Text" #. Drop down menu #: ../src/widgets/text-toolbar.cpp:1845 @@ -31521,9 +31476,8 @@ msgstr "Linie:" #. short label #: ../src/widgets/text-toolbar.cpp:1852 -#, fuzzy msgid "Spacing between baselines (times font size)" -msgstr "Abstand zwischen Linien (Times Schriftgröße)" +msgstr "Abstand zwischen Grundlinien (relativ zur Schriftgröße)" #. Drop down menu #: ../src/widgets/text-toolbar.cpp:1884 ../src/widgets/text-toolbar.cpp:1915 @@ -31547,7 +31501,7 @@ msgstr "Wort:" #. short label #: ../src/widgets/text-toolbar.cpp:1891 msgid "Spacing between words (px)" -msgstr "Abstand zwischen Wörtern (px)" +msgstr "Wortabstand (px)" #. name #: ../src/widgets/text-toolbar.cpp:1920 @@ -31562,7 +31516,7 @@ msgstr "Buchstabe:" #. short label #: ../src/widgets/text-toolbar.cpp:1922 msgid "Spacing between letters (px)" -msgstr "Abstand zwischen Buchstaben (px)" +msgstr "Zeichenabstand (px)" #. name #: ../src/widgets/text-toolbar.cpp:1951 @@ -31999,7 +31953,7 @@ msgstr "" #: ../share/extensions/convert2dashes.py:56 msgid "Total number of objects not converted: {}\n" -msgstr "" +msgstr "Anzahl aller nicht umgewandelten Objekte: {}\n" #: ../share/extensions/dimension.py:108 msgid "Please select an object." @@ -32439,9 +32393,8 @@ msgid "Movements" msgstr "Bewegungen" #: ../share/extensions/hpgl_decoder.py:43 -#, fuzzy msgid "Pen " -msgstr "Stift #" +msgstr "Stift " #. issue error if no hpgl data found #: ../share/extensions/hpgl_input.py:56 @@ -32465,7 +32418,7 @@ msgstr "" "konvertieren." #: ../share/extensions/inkex.py:116 -#, fuzzy, python-format +#, python-format msgid "" "The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore " "this extension.Please download and install the latest version from http://" @@ -32475,10 +32428,11 @@ msgid "" "Technical details:\n" "%s" msgstr "" -"Der fantastische lxml-Wrapper für libxml2 wird von inkex.py und dessen " -"Erweiterung benötigt. Diese erhalten Sie unter \"http://cheeseshop.python." -"org/pypi/lxml/\" oder durch ein Packet ihres Paketmanagers (z.B.: sudo apt-" -"get install python-lxml)\n" +"Der fantastische lxml-Wrapper für libxml2 wird von inkex.py und deshalb auch " +"von dieser ErweiterungErweiterung benötigt. Die aktuellste Version können " +"Sie unter http://cheeseshop.python.org/pypi/lxml/ herunterladen und " +"installieren oder über ihren Paketmanager mit einem Befehl wie „sudo apt-get " +"install python-lxml“ installieren.\n" "\n" "Technische Details: \n" "%s" @@ -32824,28 +32778,32 @@ msgstr "" "Keine Pfade gefunden. Bitte alle zu plottenden Objekte in Pfade umwandeln." #: ../share/extensions/plotter.py:146 -#, fuzzy msgid "pySerial is not installed. Please follow these steps:" -msgstr "pySerial ist nicht installiert." +msgstr "pySerial ist nicht installiert. Bitte folgen Sie diesen Anweisungen:" #: ../share/extensions/plotter.py:147 msgid "1. Download and extract (unzip) this file to your local harddisk:" msgstr "" +"1. Laden Sie diese Datei herunter und entpacken (unzip) Sie sie auf Ihre " +"lokale Festplatte:" #: ../share/extensions/plotter.py:149 msgid "" "2. Copy the \"serial\" folder (Can be found inside the just extracted folder)" msgstr "" +"2. Kopieren Sie den Ordner „serial“ (befindet sich in dem soeben entpackten " +"Verzeichnis)" #: ../share/extensions/plotter.py:150 msgid "" " into the following Inkscape folder: C:\\[Program files]\\inkscape\\python" "\\Lib\\" msgstr "" +"in den folgenden Inkscape-Ordner: C:\\[Programme]\\inkscape\\python\\Lib\\" #: ../share/extensions/plotter.py:151 msgid "3. Close and restart Inkscape." -msgstr "" +msgstr "3. Schließen Sie Inkscape und starten Sie es erneut." #: ../share/extensions/plotter.py:200 msgid "" @@ -32972,9 +32930,8 @@ msgstr "" "Bitte geben Sie eine Ersetzungsschriftart im \"Alles ersetzen\"-Feld ein." #: ../share/extensions/restack.py:75 -#, fuzzy msgid "There is no selection to restack." -msgstr "Es gibt keine Auswahl zum interpolieren" +msgstr "Es gibt keine Auswahl zum Umschichten" #: ../share/extensions/summersnight.py:41 msgid "" @@ -33003,6 +32960,12 @@ msgid "" "http://sk1project.org/modules.php?name=Products&product=uniconvertor\n" "and install into your Inkscape's Python location\n" msgstr "" +"Sie benötigen die Software „UniConvertor“.\n" +"Unter GNU/Linux: Installieren Sie das Paket „python-uniconvertor“.\n" +"Unter Windows: Laden Sie die Software von \n" +"http://sk1project.org/modules.php?name=Products&product=uniconvertor\n" +"herunter und installieren Sie diese in das Python-Verzeichnis Ihrer Inkscape-" +"Installation.\n" #: ../share/extensions/voronoi2svg.py:205 msgid "Please select objects!" @@ -33057,7 +33020,7 @@ msgstr "Keine „Slicer“-Ebene gefunden." #: ../share/extensions/webslicer_export.py:106 #, python-format msgid "You have more than one element with \"%s\" html-id." -msgstr "Sie haben mehr als ein Element mit \"%s\" html-id." +msgstr "Sie haben mehr als ein Element mit \"%s\" HTML-ID." #: ../share/extensions/webslicer_export.py:336 msgid "You must install the ImageMagick to get JPG and GIF." @@ -33344,24 +33307,24 @@ msgid "Randomize" msgstr "Zufallsänderung" #: ../share/extensions/color_randomize.inx.h:4 -#, fuzzy, no-c-format +#, no-c-format msgid "Hue range (%)" -msgstr "Farbtondrehung (°)" +msgstr "Farbtonabweichung (%)" #: ../share/extensions/color_randomize.inx.h:6 -#, fuzzy, no-c-format +#, no-c-format msgid "Saturation range (%)" -msgstr "Sättigung (%)" +msgstr "Sättigungsabweichung (%)" #: ../share/extensions/color_randomize.inx.h:8 -#, fuzzy, no-c-format +#, no-c-format msgid "Lightness range (%)" -msgstr "Helligkeit (%)" +msgstr "Helligkeitsabweichung (%)" #: ../share/extensions/color_randomize.inx.h:10 -#, fuzzy, no-c-format +#, no-c-format msgid "Opacity range (%)" -msgstr "Deckkraft (%)" +msgstr "Deckkraftabweichung (%)" #: ../share/extensions/color_randomize.inx.h:12 msgid "" @@ -33369,6 +33332,10 @@ msgid "" "only for objects and groups). Change the range values to limit the distance " "between the original color and the randomized one." msgstr "" +"Verändert zufällig Farbe, Sättigung, Helligkeit und / oder Deckkraft " +"(Deckkraft sowohl für Objekte als auch für Gruppen). Eine Verringerung der " +"Abweichungswerte limitiert die Stärke der Abweichung zwischen dem Wert der " +"Originalfarbe und der zufällig erzeugten." #: ../share/extensions/color_removeblue.inx.h:1 msgid "Remove Blue" @@ -33466,7 +33433,6 @@ msgid "Y Offset:" msgstr "Y-Versatz:" #: ../share/extensions/dimension.inx.h:4 -#, fuzzy msgid "Bounding box type:" msgstr "Objektrahmentyp:" @@ -33754,7 +33720,6 @@ msgid "Text Font:" msgstr "Text-Schriftart" #: ../share/extensions/dxf_input.inx.h:11 -#, fuzzy msgid "" "- AutoCAD Release 13 and newer.\n" "- for manual scaling, assume dxf drawing is in mm.\n" @@ -33765,11 +33730,15 @@ msgid "" "- layers are preserved only on File->Open, not Import.\n" "- limited support for BLOCKS, use AutoCAD Explode Blocks instead, if needed." msgstr "" -"- AutoCAD R13 und neuer.\n" -"- Längeneinheiten der Zeichnung sind mm.\n" -"- SVG-Längeneinheiten sind Pixel bei 90 dpi.\n" -"- Ebenen werden nur erhalten bei \"Datei > Öffnen\", nicht bei " -"\"Importieren\".\n" +"- AutoCAD Version 13 und neuer.\n" +"- für manuelle Größenänderung gehen Sie davon aus, dass die Einheit der dxf-" +"Zeichnung mm ist.\n" +"- gehen Sie von der Einheit Pixel bei 96 dpi für die SVG-Zeichnung aus.\n" +"- Skalierungsfaktor und Ursprung gelten nur für manuelle Größenänderung.\n" +"- „Automatisches Skalieren“ passt in die Breite einer A4-Seite ein.\n" +"- „Lesen aus Datei“ verwendet die Variable $MEASUREMENT.\n" +"- Ebenen werden nur bei „Datei > Öffnen“ erhalten, nicht bei " +"„Importieren“.\n" "- BLOCKS werden nicht voll unterstützt. Verwenden Sie AutoCAD Explode " "Blocks, falls nötig." @@ -33802,12 +33771,10 @@ msgid "Character Encoding:" msgstr "Zeichenkodierung:" #: ../share/extensions/dxf_outlines.inx.h:7 -#, fuzzy msgid "Layer export selection:" msgstr "Ebenen-Export-Auswahl" #: ../share/extensions/dxf_outlines.inx.h:8 -#, fuzzy msgid "Layer match name:" msgstr "Übereinstimmender Ebenenname" @@ -33889,7 +33856,6 @@ msgid "By name match" msgstr "Nach Namensübereinstimmung" #: ../share/extensions/dxf_outlines.inx.h:25 -#, fuzzy msgid "" "- AutoCAD Release 14 DXF format.\n" "- The base unit parameter specifies in what unit the coordinates are output " @@ -33905,17 +33871,21 @@ msgid "" "- You can choose to export all layers, only visible ones or by name match " "(case insensitive and use comma ',' as separator)" msgstr "" -"- AutoCAD R14-Format.\n" -"- Die Basiseinheit Parameter gibt an, in welcher Einheit die Koordinaten " -"ausgegeben werden (90 px = 1 in).\n" -"- Unterstüzte Elementtypen\n" -" -Pfade (Linien und Splines)\n" -" -Rechtecke\n" -" -Klone (Die Kreuzreferenz zum Original geht verloren)\n" -"- Die Option ROBO-Master bezieht sich auf spezielle Splines, die nur in ROBO-" -"Master und AutoDesk, nicht aber in Inkscape, zur Verfügung stehen.\n" -"- Es werden nur LWPOLYLINE- und SPLINE-Elemente unterstützt.\n" -"-Sie können alle oder nur sichtbare Ebenen exportieren" +"- AutoCAD Version 14 DXF-Format.\n" +"- Der Parameter „Basiseinheit“ gibt an, in welcher Einheit die Koordinaten " +"ausgegeben werden (96 px = 1 in).\n" +"- Unterstützte Elementtypen\n" +" - Pfade (Linien und Bézierkurven)\n" +" - Rechtecke\n" +" - Klone (die Kreuzreferenz zum Original geht verloren)\n" +"- Die Option ROBO-Master-Ausgabe bezieht sich auf spezielle Kurven, die nur " +"mit ROBO-Master- und AutoDesk-Anzeigeprogrammen geöffnet werden können, " +"nicht aber mit Inkscape.\n" +"- Die LWPOLYLINE-Ausgabe erzeugt eine vielfach verbundene Polylinie. " +"Deaktivieren um eine ältere Version der LINE-Ausgabe zu verwenden.\n" +"- Sie können entweder alle, nur sichtbare oder namensgleiche Ebenen " +"exportieren (ignoriert Groß-/Kleinschreibung, Komma (,) trennt die einzelnen " +"Namen)." #: ../share/extensions/dxf_outlines.inx.h:34 msgid "Desktop Cutting Plotter (AutoCAD DXF R14) (*.dxf)" @@ -33993,9 +33963,8 @@ msgid "Desktop" msgstr "Desktop" #: ../share/extensions/empty_desktop.inx.h:2 -#, fuzzy msgid "Desktop size:" -msgstr "Punktgröße:" +msgstr "Desktopgröße:" #. Maximum size is '16k' #: ../share/extensions/empty_desktop.inx.h:4 @@ -34021,7 +33990,7 @@ msgstr "Breite des DVD-Hüllen-Rückens:" #: ../share/extensions/empty_dvd_cover.inx.h:3 msgid "DVD cover bleed (mm):" -msgstr "DVD-Cover Beschnittzugabe (mm):" +msgstr "DVD-Cover-Beschnittzugabe (mm):" #: ../share/extensions/empty_generic.inx.h:1 msgid "Generic Canvas" @@ -34061,14 +34030,12 @@ msgid "Page background:" msgstr "Seitenhintergrund:" #: ../share/extensions/empty_video.inx.h:1 -#, fuzzy msgid "Video Screen" -msgstr "Screen" +msgstr "Video-Leinwand" #: ../share/extensions/empty_video.inx.h:2 -#, fuzzy msgid "Video size:" -msgstr "Punktgröße:" +msgstr "Videogröße:" #: ../share/extensions/eps_input.inx.h:1 msgid "EPS Input" @@ -34380,15 +34347,15 @@ msgstr "Fläche" #: ../share/extensions/gcodetools_area.inx.h:2 msgid "Maximum area cutting curves:" -msgstr "Maximale Flächenschnittkurven:" +msgstr "Maximale Anzahl Flächenschnittkurven:" #: ../share/extensions/gcodetools_area.inx.h:3 msgid "Area width:" -msgstr "Bereichsbreite:" +msgstr "Breite der Fläche:" #: ../share/extensions/gcodetools_area.inx.h:4 msgid "Area tool overlap (0..0.9):" -msgstr "Flächen-Wekzeugüberlappung (0..0.9):" +msgstr "Flächen-Werkzeugüberlappung (0 bis 0,9):" #: ../share/extensions/gcodetools_area.inx.h:5 msgid "" @@ -34398,24 +34365,25 @@ msgid "" "the nearest tool definition (\"Tool diameter\" value). Only one offset will " "be created if the \"Area width\" is equal to \"1/2 D\"." msgstr "" -"\"Erstelle Flächenversatz\": Erstellt verschiedene Inkscape-Pfadversätze, um " -"die originale Pfadfläche bis zum \"Flächenradius\"-Wert zu füllen. Umrisse " -"starten von \"1/2 D\" bis zur \"Flächenbreite\" totale Breite mit \"D\" " -"Schritten, wobei D von der nähestenis Werkzeugdefinition genommen wird " -"(\"Werkzeugdurchmesser\" Wert). Nur ein Versatz wird erstellt, wenn die " -"\"Flächenbreite\" gleich \"1/2 D\" ist." +"\"Erstelle Flächenversatz\": Erstellt verschiedene Inkscape-Versatzobjekte, " +"um die originale Pfadfläche bis zur maximalen \"Breite der Fläche\" zu " +"füllen. Die dabei erstellten Umrisse reichen von \"1/2 D\" bis zur gesamten " +"\"Breite der Fläche\" in \"D\" breitenSchritten, wobei D von der nächsten " +"Werkzeugdefinition genommen wird (Wert für \"Werkzeugdurchmesser\"). Es wird " +"nur ein einziger Versatz erstellt, wenn die \"Bereichsbreite\" gleich \"1/2 D" +"\" ist." #: ../share/extensions/gcodetools_area.inx.h:6 msgid "Fill area" -msgstr "Füllbereich" +msgstr "Bereich füllen" #: ../share/extensions/gcodetools_area.inx.h:7 msgid "Area fill angle" -msgstr "Bereichsfüllwinkel" +msgstr "Winkel der Flächenfüllung" #: ../share/extensions/gcodetools_area.inx.h:8 msgid "Area fill shift" -msgstr "Flächenfüllung verschieben" +msgstr "Verschiebung der Flächenfüllung" #: ../share/extensions/gcodetools_area.inx.h:9 msgid "Filling method" @@ -34427,11 +34395,11 @@ msgstr "Zickzack" #: ../share/extensions/gcodetools_area.inx.h:12 msgid "Area artifacts" -msgstr "Bereichsstörungen" +msgstr "Flächenartefakte" #: ../share/extensions/gcodetools_area.inx.h:13 msgid "Artifact diameter:" -msgstr "Durchmesser des Gegenstandes:" +msgstr "Durchmesser des Artefakts:" #: ../share/extensions/gcodetools_area.inx.h:14 msgid "Action:" @@ -34455,9 +34423,10 @@ msgid "" "+Ctrl+G) 3. Press Apply Suspected small objects will be marked out by " "colored arrows." msgstr "" -"Nutzung: 1. Wählen Sie alle Flächen Verschiebungen (graue Umrandung) 2. " -"Objekt/Gruppierung aufheben (Umschalt+Strg+G) 3. Klicken Sie auf Übernehmen " -"und kleine Objekte werden durch farbige Pfeile markiert." +"Nutzung: 1. Wählen Sie alle Versatzobjekte aus (graue Umrandung) 2. Objekt/" +"Gruppierung aufheben (Umschalt+Strg+G) 3. Klicken Sie auf Anwenden. " +"(Vermutlich) zu kleine Objekte werden dann z.B. mit farbigen Pfeilen " +"markiert." #: ../share/extensions/gcodetools_area.inx.h:19 #: ../share/extensions/gcodetools_lathe.inx.h:12 @@ -34469,19 +34438,19 @@ msgstr "Pfad zu GCode" #: ../share/extensions/gcodetools_lathe.inx.h:13 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:2 msgid "Biarc interpolation tolerance:" -msgstr "Biarc Interpolationstoleranz" +msgstr "Biarc-Interpolationstoleranz:" #: ../share/extensions/gcodetools_area.inx.h:21 #: ../share/extensions/gcodetools_lathe.inx.h:14 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:3 msgid "Maximum splitting depth:" -msgstr "Maximale Teilingstiefe:" +msgstr "Maximale Teilungstiefe:" #: ../share/extensions/gcodetools_area.inx.h:22 #: ../share/extensions/gcodetools_lathe.inx.h:15 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:4 msgid "Cutting order:" -msgstr "Schnittreihenfolge" +msgstr "Schnittreihenfolge:" #: ../share/extensions/gcodetools_area.inx.h:23 #: ../share/extensions/gcodetools_lathe.inx.h:16 @@ -34493,25 +34462,25 @@ msgstr "Tiefenfunktion:" #: ../share/extensions/gcodetools_lathe.inx.h:17 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:6 msgid "Sort paths to reduse rapid distance" -msgstr "Sortiere Pfade um schnelle Entfernung zu reduzieren" +msgstr "Sortiere Pfade, um schnelle Entfernung zu reduzieren" #: ../share/extensions/gcodetools_area.inx.h:25 #: ../share/extensions/gcodetools_lathe.inx.h:18 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:7 msgid "Subpath by subpath" -msgstr "Unterpfad nach Unterpfad" +msgstr "Unterpfad für Unterpfad" #: ../share/extensions/gcodetools_area.inx.h:26 #: ../share/extensions/gcodetools_lathe.inx.h:19 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:8 msgid "Path by path" -msgstr "Pfad um Pfad" +msgstr "Pfad für Pfad" #: ../share/extensions/gcodetools_area.inx.h:27 #: ../share/extensions/gcodetools_lathe.inx.h:20 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:9 msgid "Pass by Pass" -msgstr "Durchlauf nach Durchlauf" +msgstr "Durchlauf für Durchlauf" #: ../share/extensions/gcodetools_area.inx.h:28 #: ../share/extensions/gcodetools_lathe.inx.h:21 @@ -34524,12 +34493,13 @@ msgid "" "(black), d is the depth defined by orientation points, s - surface defined " "by orientation points." msgstr "" -"Biarc Interpolationstoleranz ist der maximale Abstand zwischen dem Pfad und " -"seiner Annäherung. Das Segment wird in zwei Segmente aufgeteilt, wenn der " -"Abstand zwischen Pfad-Segment und dessen Angleichung die Biarc " -"Interpolationstoleranz überschreitet. Für Tiefe c=Farbintensität von 0.0 " -"(weiß) bis 1.0 (schwarz), d ist die Tiefe, definiert durch " -"Orientierungspunkte - Oberfläche definiert durch Orientierungspunkte." +"Biarc-Interpolationstoleranz ist der maximale Abstand zwischen dem Pfad und " +"seiner Annäherung. Ein Segment wird in zwei Segmente aufgeteilt, wenn der " +"Abstand zwischen Pfad-Segment und dessen Angleichung die Biarc-" +"Interpolationstoleranz überschreitet. In der Tiefenfunktion ist " +"c=Farbintensität von 0.0 (weiß) bis 1.0 (schwarz), d ist die Tiefe, " +"definiert durch Orientierungspunkte, s ist die Oberfläche definiert durch " +"Orientierungspunkte." #: ../share/extensions/gcodetools_area.inx.h:30 #: ../share/extensions/gcodetools_engraving.inx.h:8 @@ -34553,7 +34523,7 @@ msgstr "Versatz entlang Z-Achse:" #: ../share/extensions/gcodetools_lathe.inx.h:25 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:14 msgid "Select all paths if nothing is selected" -msgstr "Pfad auswählen, wenn nichts gewählt wurde" +msgstr "Alle Pfade auswählen, wenn nichts gewählt wurde" #: ../share/extensions/gcodetools_area.inx.h:33 #: ../share/extensions/gcodetools_engraving.inx.h:11 @@ -34577,7 +34547,7 @@ msgstr "Kommentar GCode:" #: ../share/extensions/gcodetools_lathe.inx.h:28 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:17 msgid "Get additional comments from object's properties" -msgstr "Weitere Kommentare von Objekteigenschaften" +msgstr "Weitere Kommentare aus Objekteigenschaften holen" #: ../share/extensions/gcodetools_area.inx.h:36 #: ../share/extensions/gcodetools_dxf_points.inx.h:8 @@ -34605,7 +34575,7 @@ msgstr "Datei:" #: ../share/extensions/gcodetools_lathe.inx.h:31 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:20 msgid "Add numeric suffix to filename" -msgstr "Hinzufügen eines numerischen Anhangs an den Dateinamen" +msgstr "Zahl an den Dateinamen anhängen" #: ../share/extensions/gcodetools_area.inx.h:39 #: ../share/extensions/gcodetools_dxf_points.inx.h:11 @@ -34697,7 +34667,7 @@ msgstr "GCode parametrisieren" #: ../share/extensions/gcodetools_lathe.inx.h:43 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:32 msgid "Flip y axis and parameterize Gcode" -msgstr "Y-Achse kippen und GCode parametrisieren" +msgstr "Y-Achse umkehren und GCode parametrisieren" #: ../share/extensions/gcodetools_area.inx.h:51 #: ../share/extensions/gcodetools_dxf_points.inx.h:23 @@ -34725,7 +34695,7 @@ msgstr "Nach Aktualisierungen suchen" msgid "Check for Gcodetools latest stable version and try to get the updates." msgstr "" "Prüfen Sie die letzte stabile Version der GCode-Werkzeuge und versuchen Sie " -"die Aktualisierungen." +"die Aktualisierungen herunterzuladen." #: ../share/extensions/gcodetools_dxf_points.inx.h:1 msgid "DXF Points" @@ -34746,10 +34716,10 @@ msgid "" "used. Also you can manually select object, open XML editor (Shift+Ctrl+X) " "and add or remove XML tag 'dxfpoint' with any value." msgstr "" -"Konvertiert ausgewählte Objekte an Bohr-Punkten (wie dxf_import plugin). Sie " +"Konvertiert ausgewählte Objekte zu Bohr-Punkten (wie dxf_import plugin). Sie " "können auch die ursprüngliche Form speichern. Nur der Startpunkt jeder Kurve " "wird verwendet. Sie können auch manuell ein Objekt auswählen, öffnen den XML-" -"Editor (Umschalt+Strg+X) und den XML-Tag \"dxfpoint 'mit einem beliebigen " +"Editor (Umschalt+Strg+X) und den XML-Tag 'dxfpoint' mit einem beliebigen " "Wert hinzufügen oder entfernen." #: ../share/extensions/gcodetools_dxf_points.inx.h:5 @@ -34758,11 +34728,11 @@ msgstr "Als DXF-Punkt setzen und Form abspeichern" #: ../share/extensions/gcodetools_dxf_points.inx.h:6 msgid "set as dxfpoint and draw arrow" -msgstr "Als DXF-Punkt setzen und Bogen zeichnen" +msgstr "Als DXF-Punkt setzen und Pfeil zeichnen" #: ../share/extensions/gcodetools_dxf_points.inx.h:7 msgid "clear dxfpoint sign" -msgstr "DXF-Zeichen bereinigen" +msgstr "DXF-Punkt-Zeichen bereinigen" #: ../share/extensions/gcodetools_engraving.inx.h:1 msgid "Engraving" @@ -34793,11 +34763,11 @@ msgid "" "sphere..(radius r)...........................: math.sqrt(max(0,r**2-w**2)) " "ellipse.(minor axis r, major 4r).....: math.sqrt(max(0,r**2-w**2))*4" msgstr "" -"Diese Funktion erzeugt einen Pfad um Buchstaben zu gravieren oder eine " +"Diese Funktion erzeugt einen Pfad, um Buchstaben zu gravieren oder eine " "beliebige Form mit scharfen Winkeln. Die Schnitt-Tiefe als eine Funktion des " "Radius wird durch das Werkzeug definiert. Die Tiefe kann jeder Python-" "Ausdruck sein. Zum Beispiel: Kegel....(45 Grad) ......................: w " -"Kegel....(Höhe / Durchmesser = 10/3) ..: 10*m/3 Kugel..(Radius " +"Kegel....(Höhe / Durchmesser=10/3) ..: 10*w/3 Kugel..(Radius " "r) ...........................: math.sqrt(max(0,r**2-w**2)) Ellipse." "(Nebenachse r, Hauptachse 4r).....: math.sqrt(max (0,r-w**2**2))*4" @@ -34819,7 +34789,7 @@ msgstr "Startposition (x;y):" #: ../share/extensions/gcodetools_graffiti.inx.h:5 msgid "Create preview" -msgstr "Vorschau ersellen" +msgstr "Vorschau erstellen" #: ../share/extensions/gcodetools_graffiti.inx.h:6 msgid "Create linearization preview" @@ -34831,7 +34801,7 @@ msgstr "Vorschaugröße (px):" #: ../share/extensions/gcodetools_graffiti.inx.h:8 msgid "Preview's paint emmit (pts/s):" -msgstr "Farbemmission für Vorschau (pts/s)" +msgstr "Farbemission für Vorschau (pts/s)" #: ../share/extensions/gcodetools_graffiti.inx.h:10 #: ../share/extensions/gcodetools_orientation_points.inx.h:3 @@ -34841,25 +34811,24 @@ msgstr "Ausrichtungstyp:" #: ../share/extensions/gcodetools_graffiti.inx.h:11 #: ../share/extensions/gcodetools_orientation_points.inx.h:4 msgid "Z surface:" -msgstr "Z Fläche:" +msgstr "Z-Oberfläche:" #: ../share/extensions/gcodetools_graffiti.inx.h:12 #: ../share/extensions/gcodetools_orientation_points.inx.h:5 msgid "Z depth:" -msgstr "Z Tiefe:" +msgstr "Z-Tiefe:" #: ../share/extensions/gcodetools_graffiti.inx.h:14 #: ../share/extensions/gcodetools_orientation_points.inx.h:7 msgid "2-points mode (move and rotate, maintained aspect ratio X/Y)" -msgstr "" -"2-Punkt-Modus (verschieben und drehen, gehaltenes Aspektverhältnis X/Y)" +msgstr "2-Punkt-Modus (verschieben und drehen, behält X/Y-Verhältnis bei)" #: ../share/extensions/gcodetools_graffiti.inx.h:15 #: ../share/extensions/gcodetools_orientation_points.inx.h:8 msgid "3-points mode (move, rotate and mirror, different X/Y scale)" msgstr "" -"3-Punkt-Modus (verschieben, drehen und spiegeln, unterschiedliche X/Y " -"Einteilung)" +"3-Punkt-Modus (verschieben, drehen und spiegeln, unterschiedliche Skalen für " +"X und Y)" #: ../share/extensions/gcodetools_graffiti.inx.h:16 #: ../share/extensions/gcodetools_orientation_points.inx.h:9 @@ -34884,15 +34853,15 @@ msgid "" "(independent set for each layer)." msgstr "" "Orientierungspunkte werden zum Berechnen von Transformationen (Versatz, " -"Skalierung, Spiegel, eine Drehung in XY-Ebene) des Pfades benutzt. 3-Punkt-" -"Modus: Lege nicht alle drei in einer Linie an (Einsatz 2-Punkt-Modus " -"stattdessen nehmen). Sie können die Z-Oberfläche modifizieren, die Z-Tiefen-" -"Werte später mit Text-Werkzeug (3. Koordinaten). Wenn es keine " -"Orientierungspunkte in der aktuellen Ebene gibt, werden sie von der oberen " -"Schicht genommen. Die Gruppierung von Orientierungspunkten nicht aufheben! " -"Sie können diese mit Doppelklick auf die Gruppe auswählen oder durch Strg" -"+Eingabe-Taste. Jetzt drücken Sie Anwenden, um die Kontrollpunkte " -"(unabhängiger Satz für jede Ebene) zu erstellen." +"Skalierung, Spiegel, eine Drehung in XY-Ebene) des Pfades benutzt. Nur 3-" +"Punkt-Modus: Nicht alle drei auf einer Linie anlegen (stattdessen 2-Punkt-" +"Modus verwenden). Sie können die Z-Oberflächen und Z-Tiefen-Werte später mit " +"dem Text-Werkzeug verändern (3. Koordinaten). Wenn es keine " +"Orientierungspunkte in der aktuellen Ebene gibt, werden die von der Ebene " +"darüber verwendet. Die Gruppierung von Orientierungspunkten nicht aufheben! " +"Sie können die Gruppe mit Doppelklick oder Strg+Eingabetaste betreten. " +"Klicken Sie auf Anwenden, um die Kontrollpunkte (unabhängiger Satz für jede " +"Ebene) zu erstellen." #: ../share/extensions/gcodetools_lathe.inx.h:1 msgid "Lathe" @@ -34933,7 +34902,7 @@ msgstr "Pfadversatz" #: ../share/extensions/gcodetools_lathe.inx.h:10 msgid "Lathe modify path" -msgstr "Pfad drehend modifizieren" +msgstr "Drehpfad modifizieren" #: ../share/extensions/gcodetools_lathe.inx.h:11 msgid "" @@ -34965,7 +34934,7 @@ msgstr "Innen-Außen-Pfadlänge:" #: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:5 msgid "In-out path max distance to reference point:" -msgstr "Innen-Außen max. Pfaddistanz zum Referenzpunkt" +msgstr "max. Distanz des Innen-Außen-Pfades zum Referenzpunkt" #: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:6 msgid "In-out path type:" @@ -34997,7 +34966,7 @@ msgstr "Maximaler Winkel für Ecke (0-180 Grad):" #: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:14 msgid "Perpendicular" -msgstr "Senkrechte Winkelhalbierende" +msgstr "Senkrechte" #: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:15 msgid "Tangent" @@ -35034,7 +35003,7 @@ msgstr "Plasma" #: ../share/extensions/gcodetools_tools_library.inx.h:7 msgid "tangent knife" -msgstr "Tangentialer Versatz" +msgstr "Tangentiales Messer" #: ../share/extensions/gcodetools_tools_library.inx.h:8 msgid "lathe cutter" @@ -35055,19 +35024,19 @@ msgid "" "active layer is used. If there is no tool inside the current layer it is " "taken from the upper layer. Press Apply to create new tool." msgstr "" -"Der ausgewählte Werkzeugtyp füllt entsprechende Standardwerte. Sie können " -"diese Werte mit dem Textwerkzeug später ändern. Es wird das oberste Werkzeug " +"Der ausgewählte Werkzeugtyp gibt passende Standardwerte vor. Sie können " +"diese Werte später mit dem Textwerkzeug ändern. Es wird das oberste Werkzeug " "(Z-Ordnung) in der aktiven Ebene verwendet. Wenn kein Werkzeug innerhalb der " -"aktuellen Ebene vorhanden ist, wird es von der oberen Ebene genommen. " -"Drücken Sie auf Übernehmen, um das neue Werkzeug zu erstellen." +"aktuellen Ebene vorhanden ist, wird eines von der Ebene darüber verwendet. " +"Anwenden erstellt ein neues Werkzeug." #: ../share/extensions/generate_voronoi.inx.h:1 msgid "Voronoi Pattern" -msgstr "Voronoi Muster" +msgstr "Voronoi-Muster" #: ../share/extensions/generate_voronoi.inx.h:3 msgid "Average size of cell (px):" -msgstr "Durchschnittliche Größe der Zelle (px)" +msgstr "Durchschnittliche Zellengröße (px)" #: ../share/extensions/generate_voronoi.inx.h:4 msgid "Size of Border (px):" @@ -35087,10 +35056,11 @@ msgstr "" "Füllungs- und Kontur-Dialog verfügbar sein. Sie müssen dazu ein Objekt oder " "ein Gruppe auswählen.\n" "\n" -" Ist der Rand null, wird das Muster an den Kanten unterbrochen. Nehmen Sie " -"einen positiven Wert, größer als die Zellgröße, um einen weichen Übergang " -"zwischen Zellen und Rand zu schaffen. Nehmen Sie einen negativen Wert, um " -"die Mustergröße zu reduzieren und einen lehren Rand zu erzeugen." +"Ist der Rand null, wird das Muster an den Kanten unterbrochen. Nehmen Sie " +"einen positiven Wert, am besten größer als die Zellgröße, um einen " +"fließenden Übergang zwischen den einzelnen Musterkacheln zu erhalten. Nehmen " +"Sie einen negativen Wert, um die Mustergröße zu reduzieren und einen leeren " +"Rand zu erzeugen." #: ../share/extensions/gimp_xcf.inx.h:1 msgid "GIMP XCF" @@ -35138,7 +35108,7 @@ msgstr "" "konvertierte Ebene ein.\n" "\n" "Jede erste Ebene wird in eine Gimp-Ebene umgewandelt. Unterebenen werden mit " -"ihrer ersten übergeordnete Ebene in einer einzigen Gimp-Ebene verkettet und " +"ihrer ersten übergeordneten Ebene in einer einzigen Gimp-Ebene verkettet und " "konvertiert." #: ../share/extensions/gimp_xcf.inx.h:15 @@ -35152,7 +35122,7 @@ msgstr "Kartesisches Gitter" #: ../share/extensions/grid_cartesian.inx.h:2 #: ../share/extensions/grid_isometric.inx.h:10 msgid "Border Thickness (px):" -msgstr "Randdicke [px]" +msgstr "Randkonturbreite (px):" #: ../share/extensions/grid_cartesian.inx.h:3 msgid "X Axis" @@ -35164,7 +35134,7 @@ msgstr "Haupt-X-Teilungen:" #: ../share/extensions/grid_cartesian.inx.h:5 msgid "Major X Division Spacing (px):" -msgstr "Haupt-X-Teilung Abstand (px):" +msgstr "Abstand Haupt-X-Teilungen (px):" #: ../share/extensions/grid_cartesian.inx.h:6 msgid "Subdivisions per Major X Division:" @@ -35176,25 +35146,25 @@ msgstr "Logarithmische X-Unterteilung (Basis wie oben gegeben)" #: ../share/extensions/grid_cartesian.inx.h:8 msgid "Subsubdivs. per X Subdivision:" -msgstr "Unter-Unterteilungen pro X-Unterteilung" +msgstr "Unter-Unterteilungen pro X-Unterteilung:" #: ../share/extensions/grid_cartesian.inx.h:9 msgid "Halve X Subsubdiv. Frequency after 'n' Subdivs. (log only):" msgstr "" "Halbiert X-Unter-Unterteilungsfrequenz nach n Unterteilungen. (nur " -"Logarithmus)" +"Logarithmus):" #: ../share/extensions/grid_cartesian.inx.h:10 msgid "Major X Division Thickness (px):" -msgstr "Haupt-X-Teilung Dicke (px):" +msgstr "Konturbreite der Haupt-X-Teilung (px):" #: ../share/extensions/grid_cartesian.inx.h:11 msgid "Minor X Division Thickness (px):" -msgstr "Nebenteilung X Dicke (px):" +msgstr "Konturbreite der X-Nebenteilung (px):" #: ../share/extensions/grid_cartesian.inx.h:12 msgid "Subminor X Division Thickness (px):" -msgstr "Strichstärke untergeordnete X-Teilung [px]" +msgstr "Konturbreite untergeordnete X-Teilung (px):" #: ../share/extensions/grid_cartesian.inx.h:13 msgid "Y Axis" @@ -35206,7 +35176,7 @@ msgstr "Haupt-Y-Teilungen:" #: ../share/extensions/grid_cartesian.inx.h:15 msgid "Major Y Division Spacing (px):" -msgstr "Haupt-Y-Teilung Abstand (px):" +msgstr "Abstand Haupt-Y-Teilung (px):" #: ../share/extensions/grid_cartesian.inx.h:16 msgid "Subdivisions per Major Y Division:" @@ -35218,25 +35188,25 @@ msgstr "Logarithmische Y-Unterteilung (Basis wie oben gegeben)" #: ../share/extensions/grid_cartesian.inx.h:18 msgid "Subsubdivs. per Y Subdivision:" -msgstr "Unter-Unterteilungen pro Y-Unterteilung" +msgstr "Unter-Unterteilungen pro Y-Unterteilung:" #: ../share/extensions/grid_cartesian.inx.h:19 msgid "Halve Y Subsubdiv. Frequency after 'n' Subdivs. (log only):" msgstr "" "Halbiert Y-Unter-Unterteilungsfrequenz nach n Unterteilungen. (nur " -"Logarithmus)" +"Logarithmus):" #: ../share/extensions/grid_cartesian.inx.h:20 msgid "Major Y Division Thickness (px):" -msgstr "Haupt-Y-Teilung Dicke (px):" +msgstr "Konturbreite der Haupt-Y-Teilung (px):" #: ../share/extensions/grid_cartesian.inx.h:21 msgid "Minor Y Division Thickness (px):" -msgstr "Nebenteilung Y Dicke (px):" +msgstr "Konturbreite der Nebenteilung Y (px):" #: ../share/extensions/grid_cartesian.inx.h:22 msgid "Subminor Y Division Thickness (px):" -msgstr "Strichstärke untergeordnete Y-Teilung [px]" +msgstr "Konturbreite untergeordnete Y-Teilung (px):" #: ../share/extensions/grid_isometric.inx.h:1 msgid "Isometric Grid" @@ -35244,11 +35214,11 @@ msgstr "Isometrisches Gitter" #: ../share/extensions/grid_isometric.inx.h:2 msgid "X Divisions [x2]:" -msgstr "X-Teilungen [x2]:" +msgstr "X-Teilungen (x2):" #: ../share/extensions/grid_isometric.inx.h:3 msgid "Y Divisions [x2] [> 1/2 X Div]:" -msgstr "Y-Teilung [x2] [> 1/2 X Div]:" +msgstr "Y-Teilung (x2) (> 1/2 X Div):" #: ../share/extensions/grid_isometric.inx.h:4 msgid "Division Spacing (px):" @@ -35272,7 +35242,7 @@ msgstr "Nebenteilungsdicke (px):" #: ../share/extensions/grid_isometric.inx.h:9 msgid "Subminor Division Thickness (px):" -msgstr "Strichstärke untergeordneteTeilung (px):" +msgstr "Konturbreite untergeordnete Teilung (px):" #: ../share/extensions/grid_polar.inx.h:1 msgid "Polar Grid" @@ -35280,11 +35250,11 @@ msgstr "Polargitter" #: ../share/extensions/grid_polar.inx.h:2 msgid "Centre Dot Diameter (px):" -msgstr "Durchmesser Mittelpunkt [px]" +msgstr "Durchmesser Mittelpunkt (px):" #: ../share/extensions/grid_polar.inx.h:3 msgid "Circumferential Labels:" -msgstr "Umlaufende Bezeichner" +msgstr "Umlaufende Bezeichner:" #: ../share/extensions/grid_polar.inx.h:5 msgid "Degrees" @@ -35292,11 +35262,11 @@ msgstr "Grad" #: ../share/extensions/grid_polar.inx.h:6 msgid "Circumferential Label Size (px):" -msgstr "Größe des umlaufenden Bezeichners [px]" +msgstr "Größe des umlaufenden Bezeichners (px):" #: ../share/extensions/grid_polar.inx.h:7 msgid "Circumferential Label Outset (px):" -msgstr "Beginn des umlaufenden Bezeichners [px]" +msgstr "Abstand des umlaufenden Bezeichners (px):" #: ../share/extensions/grid_polar.inx.h:8 msgid "Circular Divisions" @@ -35308,11 +35278,11 @@ msgstr "Hauptkreisteilung:" #: ../share/extensions/grid_polar.inx.h:10 msgid "Major Circular Division Spacing (px):" -msgstr "Haupt-Kreis-Teilung Abstand [px]" +msgstr "Haupt-Kreis-Teilung Abstand (px):" #: ../share/extensions/grid_polar.inx.h:11 msgid "Subdivisions per Major Circular Division:" -msgstr "Nebenteilungen pro Kreishauptteilung" +msgstr "Nebenteilungen pro Kreishauptteilung:" #: ../share/extensions/grid_polar.inx.h:12 msgid "Logarithmic Subdiv. (Base given by entry above)" @@ -35320,11 +35290,11 @@ msgstr "Logarithmische Unterteilung (Basis wie oben gegeben)" #: ../share/extensions/grid_polar.inx.h:13 msgid "Major Circular Division Thickness (px):" -msgstr "Strichstärke Kreisteilung [px]" +msgstr "Konturbreite Kreisteilung (px):" #: ../share/extensions/grid_polar.inx.h:14 msgid "Minor Circular Division Thickness (px):" -msgstr "Strichstärke Kreisnebenteilung (px):" +msgstr "Konturbreite Kreisnebenteilung (px):" #: ../share/extensions/grid_polar.inx.h:15 msgid "Angular Divisions" @@ -35332,27 +35302,27 @@ msgstr "Winkelteilung" #: ../share/extensions/grid_polar.inx.h:16 msgid "Angle Divisions:" -msgstr "Winkelteilung" +msgstr "Winkelteilung:" #: ../share/extensions/grid_polar.inx.h:17 msgid "Angle Divisions at Centre:" -msgstr "Winkelteilung im Zentrum" +msgstr "Winkelteilung im Zentrum:" #: ../share/extensions/grid_polar.inx.h:18 msgid "Subdivisions per Major Angular Division:" -msgstr "Nebenteilungen pro Winkelhauptteilung" +msgstr "Nebenteilungen pro Winkelhauptteilung:" #: ../share/extensions/grid_polar.inx.h:19 msgid "Minor Angle Division End 'n' Divs. Before Centre:" -msgstr "Winkel-Nebenteilung endet 'n' Teilstriche vor dem Zentrum" +msgstr "Winkel-Nebenteilung endet n Teilstriche vor dem Zentrum:" #: ../share/extensions/grid_polar.inx.h:20 msgid "Major Angular Division Thickness (px):" -msgstr "Strichstärke Winkelteilung [px]" +msgstr "Konturbreite Winkelteilung (px)" #: ../share/extensions/grid_polar.inx.h:21 msgid "Minor Angular Division Thickness (px):" -msgstr "Strichstärke Winkelnebenteilung (px):" +msgstr "Konturbreite Winkelnebenteilung (px):" #: ../share/extensions/guides_creator.inx.h:1 msgid "Guides creator" @@ -35400,11 +35370,11 @@ msgstr "Obere rechte Ecke" #: ../share/extensions/guides_creator.inx.h:14 msgid "Lower left corner" -msgstr "untere linke Ecke" +msgstr "Untere linke Ecke" #: ../share/extensions/guides_creator.inx.h:15 msgid "Lower right corner" -msgstr "untere rechte Ecke" +msgstr "Untere rechte Ecke" #: ../share/extensions/guides_creator.inx.h:16 msgid "Margins" @@ -35466,7 +35436,7 @@ msgstr "Anfasser zeichnen" #: ../share/extensions/hershey.inx.h:1 msgid "Hershey Text" -msgstr "Hershey Text" +msgstr "Hershey-Text" #: ../share/extensions/hershey.inx.h:2 msgid "Render Text" @@ -35521,15 +35491,15 @@ msgstr "Serifenschrift fett" #: ../share/extensions/hershey.inx.h:14 msgid "Script 1-stroke" -msgstr "Skript 1 Strich" +msgstr "Kurrent 1 Strich" #: ../share/extensions/hershey.inx.h:15 msgid "Script 1-stroke (alt)" -msgstr "Skript 1 Strich (alt)" +msgstr "Kurrent 1 Strich (alt)" #: ../share/extensions/hershey.inx.h:16 msgid "Script medium" -msgstr "Skript mittel" +msgstr "Kurrent mittel" #: ../share/extensions/hershey.inx.h:17 msgid "Gothic English" @@ -35614,17 +35584,18 @@ msgid "" " www.evilmadscientist.com/go/hershey" msgstr "" "\n" -"Diese Erweiterung erstellt eine Liniengrafik aus Text durch\n" -"\"Hershey\" fonts for plotters, derived from \n" +"Diese Erweiterung erstellt eine Liniengrafik\n" +" aus Text unter Verwendung von \"Hershey\"\n" +"Schriftarten für Plotter, abgeleitet von\n" "NBS SP-424 1976-04, \"A contribution to \n" "computer typesetting techniques: Tables of\n" "Coordinates for Hershey's Repertory of\n" "Occidental Type Fonts and Graphic Symbols.\"\n" "\n" -"Es handelt sich nicht um traditionelle \"outline\" Schriften, \n" -"sondern um \"Ein-Strich-\" Schriften, oder\n" -"\"Gravur\" Schriften, bei welchen der Buchstabe aus\n" -"Linien anstelle einer Füllung besteht.\n" +"Es handelt sich nicht um traditionelle \"outline\"-\n" +"Schriften, sondern um \"Ein-Strich\"-Schriften,\n" +" oder \"Gravur\"-Schriften, bei welchen der Buch-\n" +"stabe aus Linien anstelle einer Füllung besteht.\n" "\n" "Weitere Informationen sind hier verfügbar:\n" " www.evilmadscientist.com/go/hershey" @@ -35639,7 +35610,7 @@ msgid "" "other HPGL files please change their file extension to .plt, make sure you " "have UniConverter installed and open them again." msgstr "" -"Bitte beachten Sie, das nur HPGL-Dateien geöffnet werden können, welche mit " +"Bitte beachten Sie, dass nur HPGL-Dateien geöffnet werden können, welche mit " "Inkscape erstellt wurden. Um andere HPGL-Dateien zu öffnen, ändern Sie die " "Dateiendung zu .plt, stellen Sie sicher das UniConverter installiert ist und " "öffnen Sie die Datei erneut." @@ -35655,8 +35626,8 @@ msgid "" "The amount of steps the plotter moves if it moves for 1 inch on the X axis " "(Default: 1016.0)" msgstr "" -"Die Anzahl der Schritte, die sich der Plotter für 1 Zoll auf der X-Achse " -"bewegt (Standard: '1016')" +"Die Anzahl der Schritte, um die sich der Plotter für 1 Zoll auf der X-Achse " +"bewegt (Standard: 1016)" #: ../share/extensions/hpgl_input.inx.h:5 #: ../share/extensions/hpgl_output.inx.h:6 ../share/extensions/plotter.inx.h:34 @@ -35669,7 +35640,7 @@ msgid "" "The amount of steps the plotter moves if it moves for 1 inch on the Y axis " "(Default: 1016.0)" msgstr "" -"Die Anzahl der Schritte, die sich der Plotter für 1 Zoll auf der Y-Achse " +"Die Anzahl der Schritte, um die sich der Plotter für 1 Zoll auf der Y-Achse " "bewegt (Standard: '1016')" #: ../share/extensions/hpgl_input.inx.h:7 @@ -35679,8 +35650,8 @@ msgstr "Bewegung zwischen den Pfaden anzeigen" #: ../share/extensions/hpgl_input.inx.h:8 msgid "Check this to show movements between paths (Default: Unchecked)" msgstr "" -"Dies auswählen um die Bewegung zwischen den Pfaden anzuzeigen (Standard: " -"nicht aktiviert)" +"Aktivieren, um die Bewegung zwischen den Pfaden anzuzeigen (Standard: nicht " +"aktiviert)" #: ../share/extensions/hpgl_input.inx.h:9 #: ../share/extensions/hpgl_output.inx.h:35 @@ -35752,27 +35723,27 @@ msgstr "Drehung (°, im Uhrzeigersinn):" #: ../share/extensions/hpgl_output.inx.h:15 #: ../share/extensions/plotter.inx.h:43 msgid "Rotation of the drawing (Default: 0°)" -msgstr "Drehung der Zeichnung in Grad (Standard 0°)" +msgstr "Drehung der Zeichnung in Grad (Standard: 0°)" #: ../share/extensions/hpgl_output.inx.h:16 #: ../share/extensions/plotter.inx.h:44 msgid "Mirror X axis" -msgstr "X-Spiegelachse" +msgstr "Um X-Achse spiegeln" #: ../share/extensions/hpgl_output.inx.h:17 #: ../share/extensions/plotter.inx.h:45 msgid "Check this to mirror the X axis (Default: Unchecked)" -msgstr "X-Achse spiegeln" +msgstr "Aktivieren zum Spiegeln um die X-Achse (Standard: deaktiviert)" #: ../share/extensions/hpgl_output.inx.h:18 #: ../share/extensions/plotter.inx.h:46 msgid "Mirror Y axis" -msgstr "Y-Spiegelachse" +msgstr "Um Y-Achse spiegeln" #: ../share/extensions/hpgl_output.inx.h:19 #: ../share/extensions/plotter.inx.h:47 msgid "Check this to mirror the Y axis (Default: Unchecked)" -msgstr "Y-Achse spiegeln" +msgstr "Aktivieren zum Spiegeln um die Y-Achse (Standard: deaktiviert)" #: ../share/extensions/hpgl_output.inx.h:20 #: ../share/extensions/plotter.inx.h:48 @@ -35783,7 +35754,9 @@ msgstr "Zentrierter Nullpunkt" #: ../share/extensions/plotter.inx.h:49 msgid "" "Check this if your plotter uses a centered zero point (Default: Unchecked)" -msgstr "Wählen wenn der verwendete Plotter seinen 0-Punkt in der Mitte hat." +msgstr "" +"Aktivieren, wenn der verwendete Plotter seinen 0-Punkt in der Mitte hat " +"(Standard: deaktiviert)" #: ../share/extensions/hpgl_output.inx.h:22 #: ../share/extensions/plotter.inx.h:50 @@ -35792,6 +35765,10 @@ msgid "" "each pen, name the layers \"Pen 1\", \"Pen 2\", etc., and put your drawings " "in the corresponding layers. This overrules the pen number option above." msgstr "" +"Möchten Sie mehrere Stifte in Ihrem Stiftplotter verwenden, so erstellen Sie " +"für jeden Stift eine eigene Ebene, benennen diese nach dem Schema „Pen 1“, " +"„Pen 2“ usw. und erstellen Sie Ihre Zeichnung in der entsprechenden Ebene. " +"Dies hat Vorrang vor der obigen Stiftnummer-Einstellung." #: ../share/extensions/hpgl_output.inx.h:23 #: ../share/extensions/plotter.inx.h:51 @@ -35810,13 +35787,13 @@ msgid "" "prevent open paths, set to 0.0 to omit command (Default: 1.00)" msgstr "" "Der Abstand in mm, mit dem über den Ausgangspunkt des Pfades geschnitten " -"wird, um offene Pfade zu schützen (Standard: '1.00')" +"wird, um offene Pfade zu verhindern. Bei 0,0 wird der Befehl weggelassen " +"(Standard: 1,00)" #: ../share/extensions/hpgl_output.inx.h:26 #: ../share/extensions/plotter.inx.h:54 -#, fuzzy msgid "Tool (Knife) offset correction (mm):" -msgstr "Werkzeugversatz (mm):" +msgstr "Werkzeug-(Messer)-Versatzkorrektur (mm):" #: ../share/extensions/hpgl_output.inx.h:27 #: ../share/extensions/plotter.inx.h:55 @@ -35825,13 +35802,12 @@ msgid "" "command (Default: 0.25)" msgstr "" "Der Versatz zwischen Werkzeugspitze und -achse in mm. Auf 0 setzen um Befehl " -"zu übergehen (Standard: '0.25')" +"zu übergehen (Standard: 0,25)" #: ../share/extensions/hpgl_output.inx.h:28 #: ../share/extensions/plotter.inx.h:56 -#, fuzzy msgid "Precut" -msgstr "Überschnitt verwenden" +msgstr "Vorschneiden" #: ../share/extensions/hpgl_output.inx.h:29 #: ../share/extensions/plotter.inx.h:57 @@ -35839,8 +35815,8 @@ msgid "" "Check this to cut a small line before the real drawing starts to correctly " "align the tool orientation. (Default: Checked)" msgstr "" -"Wählen um eine kurzen Schnitt vor dem Beginn der Zeichnung zu setzen, um das " -"Werkzeug richtig auszurichten." +"Aktivieren, um eine kurzen Schnitt vor dem Beginn der Zeichnung zu setzen, " +"um das Werkzeug richtig auszurichten." #: ../share/extensions/hpgl_output.inx.h:30 #: ../share/extensions/plotter.inx.h:58 @@ -35854,7 +35830,7 @@ msgid "" "be reproduced, the smaller the finer (Default: '1.2')" msgstr "" "Kurven werden in Linien aufgeteilt. Diese Zahl regelt wie fein die Kurven " -"reproduziert werden; Je kleiner desto feiner (Standard: '1.2')" +"reproduziert werden, je kleiner desto feiner (Standard: 1,2)" #: ../share/extensions/hpgl_output.inx.h:32 #: ../share/extensions/plotter.inx.h:60 @@ -35868,9 +35844,10 @@ msgid "" "if used). If unchecked you have to make sure that all parts of your drawing " "are within the document border! (Default: Checked)" msgstr "" -"Wählen um die Zeichnung automatisch am 0-Punkt auszurichten (+ Abstand wenn " -"dieser eingestellt ist). Wenn nicht gewählt, selbst prüfen ob alle Teile der " -"Zeichnung innerhalb der Dokumentengrenzen sind. (Standard: ausgewählt)" +"Aktivieren, um die Zeichnung automatisch am Nullpunkt auszurichten " +"(zuzüglich Werkzeugabstand, soferndieser eingestellt ist). Wenn nicht " +"aktiviert, bitte selbst prüfen ob alle Teile der Zeichnung innerhalb der " +"Dokumentengrenzen sind! (Standard: ausgewählt)" #: ../share/extensions/hpgl_output.inx.h:34 #: ../share/extensions/plotter.inx.h:64 @@ -35879,103 +35856,94 @@ msgid "" "please consult the manual or homepage for your plotter." msgstr "" "Alle Einstellungen hängen vom verwendeten Plotter ab. Für mehr Informationen " -"beachten Sie dessen Bedienungsanleitung oder die Homepage des Plotters." +"beachten Sie dessen Bedienungsanleitung oder die Informationen auf der " +"Webseite des Plotterherstellers." #: ../share/extensions/hpgl_output.inx.h:36 msgid "Export an HP Graphics Language file" msgstr "HP Graphic Language-Datei exportieren" #: ../share/extensions/image_attributes.inx.h:1 -#, fuzzy msgid "Set Image Attributes" -msgstr "Attribute festlegen" +msgstr "Bildattribute festlegen" #. render images like in 0.48 #: ../share/extensions/image_attributes.inx.h:3 -#, fuzzy msgid "Basic" -msgstr "Latein" +msgstr "Einfach" #. render images like in 0.48 #: ../share/extensions/image_attributes.inx.h:5 msgid "Support non-uniform scaling" -msgstr "" +msgstr "Änderung des Größenverhältnisses zulassen" #. render images like in 0.48 #: ../share/extensions/image_attributes.inx.h:7 msgid "Render images blocky" -msgstr "" +msgstr "Stark vergrößerte Bilder nicht weichzeichnen" #. render images like in 0.48 #: ../share/extensions/image_attributes.inx.h:9 msgid "" "Render all bitmap images like in older Inskcape versions. Available options:" msgstr "" +"Alle Rastergrafiken wie in älteren Inkscape-Versionen darstellen. Verfügbare " +"Optionen:" #. image aspect ratio #: ../share/extensions/image_attributes.inx.h:11 -#, fuzzy msgid "Image Aspect Ratio" -msgstr "Bild-Vereinfachungen" +msgstr "Seitenverhältnis der Rastergrafik" #. image aspect ratio #: ../share/extensions/image_attributes.inx.h:13 msgid "preserveAspectRatio attribute:" -msgstr "" +msgstr "Attribut 'preserveAspectRatio':" #. image aspect ratio #: ../share/extensions/image_attributes.inx.h:15 msgid "meetOrSlice:" -msgstr "" +msgstr "meetOrSlice:" #. image-rendering #: ../share/extensions/image_attributes.inx.h:17 -#, fuzzy msgid "Scope:" -msgstr "Umfang" +msgstr "Anwenden auf:" #. image-rendering #: ../share/extensions/image_attributes.inx.h:19 -#, fuzzy msgid "Unset" -msgstr "Einlage" +msgstr "Nicht gesetzt" #: ../share/extensions/image_attributes.inx.h:20 -#, fuzzy msgid "Change only selected image(s)" -msgstr "Nur ausgewählte Knoten ändern" +msgstr "Ausgewählte Rastergrafik(en)" #: ../share/extensions/image_attributes.inx.h:21 -#, fuzzy msgid "Change all images in selection" -msgstr "In der Auswahl konnte keine Ellipse gefunden werden" +msgstr "Alle Rastergrafiken in der aktuellen Auswahl" #: ../share/extensions/image_attributes.inx.h:22 -#, fuzzy msgid "Change all images in document" -msgstr "Rechtschreibprüfung für Text im Dokument" +msgstr "Alle Rastergrafiken im Dokument" #. image-rendering #: ../share/extensions/image_attributes.inx.h:24 -#, fuzzy msgid "Image Rendering Quality" -msgstr "Bildrendering" +msgstr "Qualität der Bildwiedergabe" #. image-rendering #: ../share/extensions/image_attributes.inx.h:26 -#, fuzzy msgid "Image rendering attribute:" -msgstr "Darstellugsmethode:" +msgstr "Bildwiedergabeeigenschaft:" #: ../share/extensions/image_attributes.inx.h:27 -#, fuzzy msgid "Apply attribute to parent group of selection" -msgstr "Transformation auf Auswahl anwenden" +msgstr "Attribut auf die übergeordnete Gruppe der Auswahl anwenden" #: ../share/extensions/image_attributes.inx.h:28 -#, fuzzy msgid "Apply attribute to SVG root" -msgstr "Attribute:" +msgstr "Attribute auf das SVG-Wurzelelement anwenden" #: ../share/extensions/ink2canvas.inx.h:1 msgid "Convert to html5 canvas" @@ -36017,9 +35985,8 @@ msgstr "Referenz der Tasten- und Maus-Befehle" #. i18n. Please don't translate it unless a page exists in your language #: ../share/extensions/inkscape_help_keys.inx.h:3 -#, fuzzy msgid "http://inkscape.org/doc/keys092.html" -msgstr "http://inkscape.org/doc/keys091.de.html" +msgstr "http://inkscape.org/doc/keys092.de.html" #: ../share/extensions/inkscape_help_manual.inx.h:1 msgid "Inkscape Manual" @@ -36036,9 +36003,8 @@ msgstr "Neu in dieser Version" #. i18n. Please don't translate it unless a page exists in your language #: ../share/extensions/inkscape_help_relnotes.inx.h:3 -#, fuzzy msgid "http://wiki.inkscape.org/wiki/index.php/Release_notes/0.92" -msgstr "http://wiki.inkscape.org/wiki/index.php/Release_notes/0.91" +msgstr "http://wiki.inkscape.org/wiki/index.php/Release_notes/0.92" #: ../share/extensions/inkscape_help_reportabug.inx.h:1 msgid "Report a Bug" @@ -36054,11 +36020,11 @@ msgstr "Interpolieren" #: ../share/extensions/interp.inx.h:3 msgid "Interpolation steps:" -msgstr "Interpolationsschritte" +msgstr "Interpolationsschritte:" #: ../share/extensions/interp.inx.h:4 msgid "Interpolation method:" -msgstr "Interpolationsmethode" +msgstr "Interpolationsmethode:" #: ../share/extensions/interp.inx.h:5 msgid "Duplicate endpaths" @@ -36066,16 +36032,16 @@ msgstr "Endpfade duplizieren" #: ../share/extensions/interp.inx.h:6 msgid "Interpolate style" -msgstr "Stil Interpolieren" +msgstr "Stil interpolieren" #: ../share/extensions/interp.inx.h:7 ../share/extensions/interp_att_g.inx.h:10 -#, fuzzy msgid "Use Z-order" -msgstr "Erhöhter Rand" +msgstr "Stapelordnung verwenden" #: ../share/extensions/interp.inx.h:8 ../share/extensions/interp_att_g.inx.h:11 msgid "Workaround for reversed selection order in Live Preview cycles" msgstr "" +"Schafft Abhilfe für die wechselnde Auswahlreihenfolge in Vorschauzyklen" #: ../share/extensions/interp_att_g.inx.h:1 msgid "Interpolate Attribute in a group" @@ -36083,15 +36049,15 @@ msgstr "Attribut innerhalb einer Gruppe interpolieren" #: ../share/extensions/interp_att_g.inx.h:3 msgid "Attribute to Interpolate:" -msgstr "Attribut für Interpolation" +msgstr "Attribut für Interpolation:" #: ../share/extensions/interp_att_g.inx.h:4 msgid "Other Attribute:" -msgstr "Anderes Attribut" +msgstr "Anderes Attribut:" #: ../share/extensions/interp_att_g.inx.h:5 msgid "Other Attribute type:" -msgstr "Anderer Attributtyp" +msgstr "Anderer Attributtyp:" #: ../share/extensions/interp_att_g.inx.h:6 msgid "Apply to:" @@ -36099,11 +36065,11 @@ msgstr "Anwenden auf:" #: ../share/extensions/interp_att_g.inx.h:7 msgid "Start Value:" -msgstr "Startwert" +msgstr "Startwert:" #: ../share/extensions/interp_att_g.inx.h:8 msgid "End Value:" -msgstr "Endwert" +msgstr "Endwert:" #: ../share/extensions/interp_att_g.inx.h:15 msgid "Translate X" @@ -36162,7 +36128,7 @@ msgid "" "selection." msgstr "" "Dieser Effekt setzt ein beliebiges interpolierbares Attribut für jedes " -"Element innerhalb einer Gruppe oder einer mehrteiligen Auswahl" +"Element innerhalb einer Gruppe oder einer Mehrfachauswahl" #: ../share/extensions/jessyInk_autoTexts.inx.h:1 msgid "Auto-texts" @@ -36203,8 +36169,8 @@ msgid "" "JessyInk presentation. Please see code.google.com/p/jessyink for more " "details." msgstr "" -"Diese Erweiterung erlaubt Ihnen Autotexte für eine JessyInk-Präsentation zu " -"installieren, aktualisieren und zu löschen. Bitte schauen Sie auf code." +"Diese Erweiterung erlaubt Ihnen, Autotexte in eine JessyInk-Präsentation " +"einzufügen, zu aktualisieren und zu löschen. Bitte schauen Sie auf code." "google.com/p/jessyink für weitere Details." #: ../share/extensions/jessyInk_autoTexts.inx.h:10 @@ -36232,6 +36198,7 @@ msgstr "Effekte" msgid "Duration in seconds:" msgstr "Dauer in Sekunden:" +# Is this the general term fo an effect that is to be applied at the 'start' of a slide? #: ../share/extensions/jessyInk_effects.inx.h:6 msgid "Build-in effect" msgstr "Anzeigen" @@ -36254,8 +36221,9 @@ msgstr "Einblenden" #: ../share/extensions/jessyInk_effects.inx.h:10 #: ../share/extensions/jessyInk_transitions.inx.h:10 msgid "Pop" -msgstr "aufpoppen" +msgstr "Aufpoppen" +# This is then probably the effect that is to be used at the end of a slide's displaying time. #: ../share/extensions/jessyInk_effects.inx.h:11 msgid "Build-out effect" msgstr "Ausblenden" @@ -36270,13 +36238,13 @@ msgid "" "JessyInk presentation. Please see code.google.com/p/jessyink for more " "details." msgstr "" -"Diese Erweiterung erlaubt Ihnen Objekteffekte für eine JessyInk-Präsentation " -"zu installieren, aktualisieren und zu löschen. Bitte schauen Sie auf code." -"google.com/p/jessyink für weitere Details." +"Diese Erweiterung erlaubt Ihnen, Objekteffekte für eine JessyInk-" +"Präsentation einzufügen, zu aktualisieren und zu löschen. Bitte schauen Sie " +"auf code.google.com/p/jessyink für weitere Details." #: ../share/extensions/jessyInk_export.inx.h:1 msgid "JessyInk zipped pdf or png output" -msgstr "JessyInk gepackte PDF- oder PNG-Ausgabe" +msgstr "JessyInk, gepackte PDF- oder PNG-Ausgabe" #: ../share/extensions/jessyInk_export.inx.h:4 msgid "Resolution:" @@ -36302,15 +36270,15 @@ msgstr "" #: ../share/extensions/jessyInk_export.inx.h:9 msgid "JessyInk zipped pdf or png output (*.zip)" -msgstr "JessyInk gepackte PDF- oder PNG-Ausgabe (*.zip)" +msgstr "JessyInk, gepackte PDF- oder PNG-Ausgabe (*.zip)" #: ../share/extensions/jessyInk_export.inx.h:10 msgid "" "Creates a zip file containing pdfs or pngs of all slides of a JessyInk " "presentation." msgstr "" -"Erstellt eine Zip-Datei, in der die PDF's oder PNG's aller Folien der " -"JessyInk-Präsentation enthalten sind." +"Erstellt eine Zip-Datei, in der die PDFs oder PNGs aller Folien der JessyInk-" +"Präsentation enthalten sind." #: ../share/extensions/jessyInk_install.inx.h:1 msgid "Install/update" @@ -36322,10 +36290,10 @@ msgid "" "to turn your SVG file into a presentation. Please see code.google.com/p/" "jessyink for more details." msgstr "" -"Diese Erweiterung erlaubt Ihnen JessyInk-Scripte zu installieren oder zu " -"aktualisieren, wenn Sie Ihre SVG-Datei in eine Präsentation umwandeln " -"möchten. Bitte schauen Sie auf code.google.com/p/jessyink für weitere " -"Details." +"Diese Erweiterung erlaubt Ihnen, ein JessyInk-Skript in Ihre SVG-Datei " +"einzufügen, wenn Sie Ihre SVG-Datei in eine Präsentation umwandeln möchten " +"oder Ihre Präsentation zu aktualisieren. Bitte schauen Sie auf code.google." +"com/p/jessyink für weitere Details." #: ../share/extensions/jessyInk_keyBindings.inx.h:1 msgid "Key bindings" @@ -36341,7 +36309,7 @@ msgstr "Zurück (mit Effekten):" #: ../share/extensions/jessyInk_keyBindings.inx.h:4 msgid "Next (with effects):" -msgstr "Nächste (mit Effekten):" +msgstr "Weiter (mit Effekten):" #: ../share/extensions/jessyInk_keyBindings.inx.h:5 msgid "Back (without effects):" @@ -36349,7 +36317,7 @@ msgstr "Zurück (Ohne Effekte):" #: ../share/extensions/jessyInk_keyBindings.inx.h:6 msgid "Next (without effects):" -msgstr "Nächste (ohne Effekte):" +msgstr "Weiter (ohne Effekte):" #: ../share/extensions/jessyInk_keyBindings.inx.h:7 msgid "First slide:" @@ -36369,7 +36337,7 @@ msgstr "In den Zeichnenmodus wechseln:" #: ../share/extensions/jessyInk_keyBindings.inx.h:11 msgid "Set duration:" -msgstr "Sättigung setzen:" +msgstr "Dauer wählen:" #: ../share/extensions/jessyInk_keyBindings.inx.h:12 msgid "Add slide:" @@ -36377,11 +36345,11 @@ msgstr "Folie hinzufügen:" #: ../share/extensions/jessyInk_keyBindings.inx.h:13 msgid "Toggle progress bar:" -msgstr "Fortschrittsbalken umschalten:" +msgstr "Fortschrittsbalken de-/aktivieren:" #: ../share/extensions/jessyInk_keyBindings.inx.h:14 msgid "Reset timer:" -msgstr "Zeitgeber zurücksetzen" +msgstr "Zeitgeber zurücksetzen:" #: ../share/extensions/jessyInk_keyBindings.inx.h:15 msgid "Export presentation:" @@ -36393,7 +36361,7 @@ msgstr "In den Folienmodus wechseln:" #: ../share/extensions/jessyInk_keyBindings.inx.h:18 msgid "Set path width to default:" -msgstr "Setze Pfadbreite als Vorgabe:" +msgstr "Setze Pfadbreite auf Vorgabewert:" #: ../share/extensions/jessyInk_keyBindings.inx.h:19 msgid "Set path width to 1:" @@ -36461,12 +36429,12 @@ msgstr "Indexmodus" #: ../share/extensions/jessyInk_keyBindings.inx.h:35 msgid "Select the slide to the left:" -msgstr "Wähle die Folien nach Links aus:" +msgstr "Wähle die linke Folie:" # !!! #: ../share/extensions/jessyInk_keyBindings.inx.h:36 msgid "Select the slide to the right:" -msgstr "Wähle die Folien nach Rechts aus:" +msgstr "Wähle die rechte Folie:" #: ../share/extensions/jessyInk_keyBindings.inx.h:37 msgid "Select the slide above:" @@ -36494,7 +36462,7 @@ msgstr "Anzahl der Spalten erhöhen:" #: ../share/extensions/jessyInk_keyBindings.inx.h:43 msgid "Set number of columns to default:" -msgstr "Anzahl der Spalten zur Vorgabe machen:" +msgstr "Anzahl der Spalten auf Standard setzen:" #: ../share/extensions/jessyInk_keyBindings.inx.h:45 msgid "" @@ -36502,7 +36470,7 @@ msgid "" "see code.google.com/p/jessyink for more details." msgstr "" "Diese Erweiterung erlaubt Ihnen, die Tastenkombinationen zu verändern, die " -"JessyInk benutzt. Bite schauen Sie auf code.google.com/p/jessyink für " +"JessyInk benutzt. Bitte schauen Sie auf code.google.com/p/jessyink für " "weitere Details." #: ../share/extensions/jessyInk_masterSlide.inx.h:1 @@ -36516,7 +36484,7 @@ msgstr "Name der Ebene:" #: ../share/extensions/jessyInk_masterSlide.inx.h:4 msgid "If no layer name is supplied, the master slide is unset." -msgstr "Wird kein Ebenen-Name angegeben, wird der Foleinmaster nicht gesetzt." +msgstr "Wird kein Ebenen-Name angegeben, wird der Folienmaster nicht gesetzt." #: ../share/extensions/jessyInk_masterSlide.inx.h:6 msgid "" @@ -36524,11 +36492,12 @@ msgid "" "see code.google.com/p/jessyink for more details." msgstr "" "Diese Erweiterung erlaubt Ihnen, den Folienmaster zu verändern, den JessyInk " -"benutzt. Bite schauen Sie auf code.google.com/p/jessyink für weitere Details." +"benutzt. Bitte schauen Sie auf code.google.com/p/jessyink für weitere " +"Details." #: ../share/extensions/jessyInk_mouseHandler.inx.h:1 msgid "Mouse handler" -msgstr "Maus-Anfasser" +msgstr "Mausbedienung" #: ../share/extensions/jessyInk_mouseHandler.inx.h:2 msgid "Mouse settings:" @@ -36548,13 +36517,12 @@ msgid "" "This extension allows you customise the mouse handler JessyInk uses. Please " "see code.google.com/p/jessyink for more details." msgstr "" -"Diese Erweiterung erlaubt Ihnen, die Maus-Andasser zu verändern, die " -"JessyInk benutzt. Bite schauen Sie auf code.google.com/p/jessyink für " -"weitere Details." +"Diese Erweiterung erlaubt Ihnen, die Mausbedienung in JessyInk zu verändern. " +"Bitte schauen Sie auf code.google.com/p/jessyink für weitere Details." #: ../share/extensions/jessyInk_summary.inx.h:1 msgid "Summary" -msgstr "Ergebnis" +msgstr "Übersicht" #: ../share/extensions/jessyInk_summary.inx.h:3 msgid "" @@ -36562,8 +36530,8 @@ msgid "" "effects and transitions contained in this SVG file. Please see code.google." "com/p/jessyink for more details." msgstr "" -"Diese Erweiterung erlaubt Ihnen, Informationen über das JessyInk-Script, " -"Effekte und Übergänge zu erhalten, die zu dieser SVG-Datei gehören. Bite " +"Diese Erweiterung erlaubt Ihnen, Informationen über das JessyInk-Skript, " +"Effekte und Übergänge zu erhalten, die zu dieser SVG-Datei gehören. Bitte " "schauen Sie auf code.google.com/p/jessyink für weitere Details." #: ../share/extensions/jessyInk_transitions.inx.h:1 @@ -36572,16 +36540,16 @@ msgstr "Übergänge" #: ../share/extensions/jessyInk_transitions.inx.h:6 msgid "Transition in effect" -msgstr "Übergang im Effekt" +msgstr "Effekt beim Einblenden" # !!! #: ../share/extensions/jessyInk_transitions.inx.h:9 msgid "Fade" -msgstr "Ausblendung" +msgstr "Langsames Einblenden" #: ../share/extensions/jessyInk_transitions.inx.h:11 msgid "Transition out effect" -msgstr "Übergang aus dem Effekt" +msgstr "Effekt beim Ausblenden" #: ../share/extensions/jessyInk_transitions.inx.h:13 msgid "" @@ -36598,7 +36566,7 @@ msgstr "Deinstallieren/Entfernen" #: ../share/extensions/jessyInk_uninstall.inx.h:3 msgid "Remove script" -msgstr "Script entfernen" +msgstr "Skript entfernen" #: ../share/extensions/jessyInk_uninstall.inx.h:4 msgid "Remove effects" @@ -36623,7 +36591,7 @@ msgstr "Ansichten entfernen" #: ../share/extensions/jessyInk_uninstall.inx.h:9 msgid "Please select the parts of JessyInk you want to uninstall/remove." msgstr "" -"Bitte wählen Sie die Teile von JessyInk aus, die Sie deinstallieren oder " +"Bitte wählen Sie die Teile von JessyInk aus, die Sie aus der Präsentation " "löschen möchten." #: ../share/extensions/jessyInk_uninstall.inx.h:11 @@ -36631,7 +36599,7 @@ msgid "" "This extension allows you to uninstall the JessyInk script. Please see code." "google.com/p/jessyink for more details." msgstr "" -"Diese Erweiterung erlaubt Ihnen das JessyInk-Script zu deinstallieren. Bitte " +"Diese Erweiterung erlaubt Ihnen das JessyInk-Skript zu entfernen. Bitte " "schauen Sie auf code.google.com/p/jessyink für weitere Details." #: ../share/extensions/jessyInk_video.inx.h:1 @@ -36644,8 +36612,8 @@ msgid "" "This element allows you to integrate a video into your JessyInk " "presentation. Please see code.google.com/p/jessyink for more details." msgstr "" -"Diese Erweiterung fügt ein JessyInk Video Element der derzeitigen Folie " -"(Ebene) hinzu. Dieses Element erlaubt Ihnen ein Video in Ihre JessyInk-" +"Diese Erweiterung fügt der derzeitigen Folie (Ebene) ein JessyInk-Video-" +"Element hinzu. Dieses Element erlaubt Ihnen, ein Video in Ihre JessyInk-" "Präsentation zu integrieren. Bitte schauen Sie auf code.google.com/p/" "jessyink für weitere Details." @@ -36658,13 +36626,14 @@ msgid "Choose order number 0 to set the initial view of a slide." msgstr "" "Wählen Sie die Nummer 0, um die initiale Ansicht einer Folie zu setzen." +# Is a view = slide?... #: ../share/extensions/jessyInk_view.inx.h:8 msgid "" "This extension allows you to set, update and remove views for a JessyInk " "presentation. Please see code.google.com/p/jessyink for more details." msgstr "" "Diese Erweiterung erlaubt Ihnen, Ansichten für eine JessyInk-Präsentation zu " -"aktualisieren und zu löschen. Bite schauen Sie auf code.google.com/p/" +"aktualisieren und zu löschen. Bitte schauen Sie auf code.google.com/p/" "jessyink für weitere Details." #: ../share/extensions/jitternodes.inx.h:1 @@ -36685,26 +36654,23 @@ msgstr "Knotenanfasser verschieben" #: ../share/extensions/jitternodes.inx.h:7 msgid "Distribution of the displacements:" -msgstr "" +msgstr "Verteilung der Verschiebungen:" #: ../share/extensions/jitternodes.inx.h:8 -#, fuzzy msgid "Uniform" -msgstr "Keilschrift" +msgstr "Gleichmäßig" #: ../share/extensions/jitternodes.inx.h:9 msgid "Pareto" -msgstr "" +msgstr "Pareto" #: ../share/extensions/jitternodes.inx.h:10 -#, fuzzy msgid "Gaussian" -msgstr "Gaußscher Weichzeichner" +msgstr "Gauß" #: ../share/extensions/jitternodes.inx.h:11 -#, fuzzy msgid "Log-normal" -msgstr "Normal" +msgstr "Log-Normal" #: ../share/extensions/jitternodes.inx.h:13 msgid "" @@ -36729,11 +36695,11 @@ msgstr "Typografie" #: ../share/extensions/layout_nup.inx.h:1 msgid "N-up layout" -msgstr "N-up layout" +msgstr "N-Up-Layout" #: ../share/extensions/layout_nup.inx.h:2 msgid "Page dimensions" -msgstr "Seitendimensionen" +msgstr "Seitengröße" #: ../share/extensions/layout_nup.inx.h:4 msgid "Size X:" @@ -36765,7 +36731,7 @@ msgstr "Rechts:" #: ../share/extensions/layout_nup.inx.h:10 msgid "Page margins" -msgstr "Seitenrand" +msgstr "Seitenränder" #: ../share/extensions/layout_nup.inx.h:11 msgid "Layout dimensions" @@ -36777,11 +36743,11 @@ msgstr "Spalten:" #: ../share/extensions/layout_nup.inx.h:14 msgid "Auto calculate layout size" -msgstr "Kalkuliere Entwurfgröße automatisch" +msgstr "Kalkuliere Layoutgröße automatisch" #: ../share/extensions/layout_nup.inx.h:15 msgid "Layout padding" -msgstr "Layout-Füllung" +msgstr "Layout-Innenabstand" #: ../share/extensions/layout_nup.inx.h:16 msgid "Layout margins" @@ -36802,7 +36768,7 @@ msgstr "Schnittmarken" #: ../share/extensions/layout_nup.inx.h:20 msgid "Padding guide" -msgstr "Umrandungslinie" +msgstr "Innenabstandslinie" #: ../share/extensions/layout_nup.inx.h:21 msgid "Margin guide" @@ -36833,19 +36799,21 @@ msgstr "" "Parameter:\n" "     * Seitengröße: Breite und Höhe\n" "     * Seitenränder: Zusätzlicher Platz um jede Seite.\n" -"     * Anordnung Zeilen und Spalten:\n" -"     * Anordnung: Breite und Höhe automatisch berechnen, wenn eins 0 ist.\n" -"     * Layoutgröße automatisch berechnen: Verwenden Sie nicht die " -"Layoutgrößen-Werte.\n" -"     * Layout-Margin: Weißer Fläche um jeden Teil des Layouts.\n" -"     * Layout Padding: Innere Füllung für jeden Teil des Layouts." - +"     * Layout: Zeilen und Spalten.\n" +"     * Layout: Breite und Höhe automatisch berechnen, wenn eines davon 0 " +"ist.\n" +"     * Layoutgröße automatisch berechnen: Verwendet nicht nicht die Werte " +"für Layout-Abmessungen.\n" +"     * Layout-Ränder: Leerraum um jeden Teil des Layouts.\n" +"     * Layout-Innenabstand: Abstand zum Inhalt jedes Layoutteils." + +# !!! used for too many different things, translation difficult... #: ../share/extensions/layout_nup.inx.h:36 #: ../share/extensions/perfectboundcover.inx.h:20 #: ../share/extensions/printing_marks.inx.h:21 #: ../share/extensions/svgcalendar.inx.h:13 msgid "Layout" -msgstr "Ausrichtung" +msgstr "Layout" #: ../share/extensions/lindenmayer.inx.h:1 msgid "L-system" @@ -37003,35 +36971,31 @@ msgstr "Pfad ausmessen" msgid "Measurement Type: " msgstr "Mess-Typ:" +# 'Typ' passt hier besser als 'Voreinstellungen' #: ../share/extensions/measure.inx.h:4 -#, fuzzy msgid "Text Presets" -msgstr "Einstellungen für Textwerkzeug" +msgstr "Texttyp" #: ../share/extensions/measure.inx.h:6 -#, fuzzy msgid "Text on Path" msgstr "Text an Pfad" #: ../share/extensions/measure.inx.h:8 -#, fuzzy, no-c-format +#, no-c-format msgid "Offset (%)" -msgstr "Versatz (px):" +msgstr "Abstand (%):" #: ../share/extensions/measure.inx.h:9 -#, fuzzy msgid "Text anchor:" -msgstr "Textanker" +msgstr "Textanker:" #: ../share/extensions/measure.inx.h:10 -#, fuzzy msgid "Fixed Text" -msgstr "Fließtext" +msgstr "Normaler Text" #: ../share/extensions/measure.inx.h:11 -#, fuzzy msgid "Angle (°):" -msgstr "Winkel X:" +msgstr "Winkel (°):" #: ../share/extensions/measure.inx.h:12 msgid "Font size (px):" @@ -37060,50 +37024,42 @@ msgid "Center of Mass" msgstr "Massenmittelpunkt" #: ../share/extensions/measure.inx.h:21 -#, fuzzy msgid "Text on Path, Start" -msgstr "Text an Pfad" +msgstr "Text an Pfad, Anfang" #: ../share/extensions/measure.inx.h:22 -#, fuzzy msgid "Text on Path, Middle" -msgstr "Text an Pfad" +msgstr "Text an Pfad, Mitte" #: ../share/extensions/measure.inx.h:23 -#, fuzzy msgid "Text on Path, End" -msgstr "Text an Pfad" +msgstr "Text an Pfad, Ende" #: ../share/extensions/measure.inx.h:24 msgid "Fixed Text, Start of Path" -msgstr "" +msgstr "Normaler Text, Pfadanfang" #: ../share/extensions/measure.inx.h:25 msgid "Fixed Text, Center of BBox" -msgstr "" +msgstr "Normaler Text, Zentrum des Objektrahmens" #: ../share/extensions/measure.inx.h:26 -#, fuzzy msgid "Fixed Text, Center of Mass" -msgstr "Massenmittelpunkt" +msgstr "Normaler Text, Massenmittelpunkt" #: ../share/extensions/measure.inx.h:28 -#, fuzzy msgid "Center" -msgstr "Zentrieren" +msgstr "Mitte" #: ../share/extensions/measure.inx.h:30 -#, fuzzy msgid "Start of Path" -msgstr "Pfadanfang:" +msgstr "Pfadanfang" #: ../share/extensions/measure.inx.h:31 -#, fuzzy msgid "Center of BBox" -msgstr "Massenmittelpunkt" +msgstr "Zentrum des Objektrahmens" #: ../share/extensions/measure.inx.h:32 -#, fuzzy msgid "Center of Mass" msgstr "Massenmittelpunkt" @@ -37186,174 +37142,153 @@ msgstr "Nächsten Glyph anzeigen" #: ../share/extensions/nicechart.inx.h:1 msgid "NiceCharts" -msgstr "" +msgstr "Diagramme" #: ../share/extensions/nicechart.inx.h:2 msgid "Data" -msgstr "" +msgstr "Daten" #: ../share/extensions/nicechart.inx.h:3 -#, fuzzy msgid "Data from file" -msgstr "Lade von Datei" +msgstr "Daten aus Datei" #: ../share/extensions/nicechart.inx.h:5 -#, fuzzy msgid "Delimiter:" -msgstr "Gehrungslimit:" +msgstr "Trennzeichen:" #: ../share/extensions/nicechart.inx.h:6 msgid "Column that contains the keys:" -msgstr "" +msgstr "Spalte, die die Schlüssel enthält:" #: ../share/extensions/nicechart.inx.h:7 -#, fuzzy msgid "Column that contains the values:" -msgstr "Eine konstante Stimmenzahl" +msgstr "Spalte, die die Werte enthält:" #: ../share/extensions/nicechart.inx.h:8 msgid "File encoding (e.g. utf-8):" -msgstr "" +msgstr "Dateikodierung (z.B. utf-8):" #: ../share/extensions/nicechart.inx.h:9 msgid "First line contains headings" -msgstr "" +msgstr "Erste Zeile enthält Überschriften" #: ../share/extensions/nicechart.inx.h:10 -#, fuzzy msgid "Direct input" -msgstr "Richtung" +msgstr "Direkt eingeben" #: ../share/extensions/nicechart.inx.h:11 msgid "Data:" -msgstr "" +msgstr "Daten:" #: ../share/extensions/nicechart.inx.h:12 -#, fuzzy msgid "Enter the full path to a CSV file:" -msgstr "Vollständiger Pfad zur Protokolldatei:" +msgstr "Vollständiger Pfad zu einer CSV-Datei:" #: ../share/extensions/nicechart.inx.h:13 msgid "Type in comma separated values:" -msgstr "" +msgstr "Komma getrennte Werte eingeben:" #: ../share/extensions/nicechart.inx.h:14 msgid "(format like this: apples:3,bananas:5)" -msgstr "" +msgstr "(Format folgt diesem Schema: Äpfel:3,Bananen:5)" # New objects dialog from ponyscape: single letter to describe state of the object in header of the table: label of object, id as default, but can be changed to anything #: ../share/extensions/nicechart.inx.h:15 -#, fuzzy msgid "Labels" -msgstr "Name" +msgstr "Beschriftungen" #: ../share/extensions/nicechart.inx.h:16 -#, fuzzy msgid "Font:" -msgstr "Schrift" +msgstr "Schriftart:" # !!! correct? #: ../share/extensions/nicechart.inx.h:18 -#, fuzzy msgid "Font color:" -msgstr "Monatsfarbe:" +msgstr "Schriftfarbe:" #: ../share/extensions/nicechart.inx.h:19 msgid "Charts" -msgstr "" +msgstr "Diagramme" #: ../share/extensions/nicechart.inx.h:20 -#, fuzzy msgid "Draw horizontally" -msgstr "Horizontal verschieben" +msgstr "Horizontal zeichnen" #: ../share/extensions/nicechart.inx.h:21 -#, fuzzy msgid "Bar length:" -msgstr "Gr_oße Länge:" +msgstr "Balkenlänge:" #: ../share/extensions/nicechart.inx.h:22 -#, fuzzy msgid "Bar width:" -msgstr "Breite der Weichzeichnung" +msgstr "Balkenbreite:" #: ../share/extensions/nicechart.inx.h:23 -#, fuzzy msgid "Pie radius:" -msgstr "Innerer Radius:" +msgstr "Tortenradius:" #: ../share/extensions/nicechart.inx.h:24 -#, fuzzy msgid "Bar offset:" -msgstr "Pfadanfang:" +msgstr "Abstand zwischen Balken:" #: ../share/extensions/nicechart.inx.h:26 msgid "Offset between chart and labels:" -msgstr "" +msgstr "Abstand zwischen Diagramm und Beschriftungen:" #: ../share/extensions/nicechart.inx.h:27 msgid "Offset between chart and chart title:" -msgstr "" +msgstr "Abstand zwischen Diagramm und Diagrammtitel:" #: ../share/extensions/nicechart.inx.h:28 msgid "Work around aliasing effects (creates overlapping segments)" -msgstr "" +msgstr "Lückeneffekte umgehen (erstellt überlappende Segmente)" #: ../share/extensions/nicechart.inx.h:29 -#, fuzzy msgid "Color scheme:" -msgstr "Farben:" +msgstr "Farbschema:" #: ../share/extensions/nicechart.inx.h:30 -#, fuzzy msgid "Custom colors:" -msgstr "Beulenfarbe" +msgstr "Benutzerdefinierte Farben:" #: ../share/extensions/nicechart.inx.h:31 -#, fuzzy msgid "Reverse color scheme" -msgstr "Konturfarbe entfernen" +msgstr "Farbschema umkehren" #: ../share/extensions/nicechart.inx.h:32 -#, fuzzy msgid "Drop shadow" -msgstr "Abgesetzter Schatten" +msgstr "Schatten" #: ../share/extensions/nicechart.inx.h:37 msgid "SAP" -msgstr "" +msgstr "SAP" #: ../share/extensions/nicechart.inx.h:38 -#, fuzzy msgid "Values" -msgstr "Wert" +msgstr "Werte" #: ../share/extensions/nicechart.inx.h:39 -#, fuzzy msgid "Show values" -msgstr "Anfasser zeigen" +msgstr "Werte anzeigen" #: ../share/extensions/nicechart.inx.h:40 -#, fuzzy msgid "Chart type:" -msgstr "Schattentyp:" +msgstr "Diagrammtyp:" #: ../share/extensions/nicechart.inx.h:41 -#, fuzzy msgid "Bar chart" -msgstr "Höhe der Striche:" +msgstr "Balkendiagramm" #: ../share/extensions/nicechart.inx.h:42 msgid "Pie chart" -msgstr "" +msgstr "Tortendiagramm" #: ../share/extensions/nicechart.inx.h:43 msgid "Pie chart (percentage)" -msgstr "" +msgstr "Tortendiagramm (prozentual)" #: ../share/extensions/nicechart.inx.h:44 msgid "Stacked bar chart" -msgstr "" +msgstr "Gestapeltes Balkendiagramm" #: ../share/extensions/param_curves.inx.h:1 msgid "Parametric Curves" @@ -37642,9 +37577,8 @@ msgid "The Baud rate of your serial connection (Default: 9600)" msgstr "Die Baudrate Ihrer seriellen Verbindung (Standard: 9600)" #: ../share/extensions/plotter.inx.h:8 -#, fuzzy msgid "Serial byte size:" -msgstr "Palettengröße:" +msgstr "Serielle Bytegröße:" #: ../share/extensions/plotter.inx.h:10 #, no-c-format @@ -37652,11 +37586,12 @@ msgid "" "The Byte size of your serial connection, 99% of all plotters use the default " "setting (Default: 8 Bits)" msgstr "" +"Die Bytegröße Ihrer seriellen Verbindung; 99% aller Plotter verwenden die " +"Standardeinstellung (8 Bit)." #: ../share/extensions/plotter.inx.h:11 -#, fuzzy msgid "Serial stop bits:" -msgstr "Serieller Port:" +msgstr "Serielles Stop-Bit:" #: ../share/extensions/plotter.inx.h:13 #, no-c-format @@ -37664,11 +37599,12 @@ msgid "" "The Stop bits of your serial connection, 99% of all plotters use the default " "setting (Default: 1 Bit)" msgstr "" +"Das Stop-Bit Ihrer seriellen Verbindung; 99% aller Plotter verwenden die " +"Standardeinstellung (1 Bit)." #: ../share/extensions/plotter.inx.h:14 -#, fuzzy msgid "Serial parity:" -msgstr "Serieller Port:" +msgstr "Serielle Parität:" #: ../share/extensions/plotter.inx.h:16 #, no-c-format @@ -37676,11 +37612,12 @@ msgid "" "The Parity of your serial connection, 99% of all plotters use the default " "setting (Default: None)" msgstr "" +"Die Parität Ihrer seriellen Verbindung; 99% aller Plotter verwenden die " +"Standardeinstellung (Keine)." #: ../share/extensions/plotter.inx.h:17 -#, fuzzy msgid "Serial flow control:" -msgstr "Fließkontrolle:" +msgstr "Serielle Flusssteuerung:" #: ../share/extensions/plotter.inx.h:18 msgid "" @@ -37719,9 +37656,8 @@ msgid "DMPL" msgstr "DMPL" #: ../share/extensions/plotter.inx.h:27 -#, fuzzy msgid "KNK Plotter (HPGL variant)" -msgstr "KNK Zing (HPGL-Variante)" +msgstr "KNK Plotter (HPGL-Variante)" #: ../share/extensions/plotter.inx.h:28 msgid "" @@ -38205,7 +38141,7 @@ msgstr "Schriftarten auflisten" msgid "" "Choose this tab if you would like to see a list of the fonts used/found." msgstr "" -"Schließen Sie diesen Tab wenn Sie eine Liste der benutzten/gefundenen " +"Schließen Sie diesen Tab, wenn Sie eine Liste der verwendeten/gefundenen " "Schriftarten sehen möchten." #: ../share/extensions/replace_font.inx.h:8 @@ -38225,29 +38161,24 @@ msgid "Restack" msgstr "Umschichten" #: ../share/extensions/restack.inx.h:2 -#, fuzzy msgid "Based on Position" -msgstr "Knotenposition anpassen" +msgstr "Positionsabhängig" #: ../share/extensions/restack.inx.h:3 -#, fuzzy msgid "Presets" -msgstr "Voreinstellung" +msgstr "Vorgabewerte" #: ../share/extensions/restack.inx.h:6 -#, fuzzy msgid "Horizontal:" -msgstr "_Horizontal:" +msgstr "Horizontal:" #: ../share/extensions/restack.inx.h:7 -#, fuzzy msgid "Vertical:" -msgstr "_Vertikal:" +msgstr "Vertikal:" #: ../share/extensions/restack.inx.h:8 -#, fuzzy msgid "Restack Direction" -msgstr "Richtung" +msgstr "Richtung des Umschichtens" #: ../share/extensions/restack.inx.h:9 msgid "Left to Right (0)" @@ -38267,16 +38198,15 @@ msgstr "Oben nach Unten (270)" #: ../share/extensions/restack.inx.h:13 msgid "Radial Outward" -msgstr "Radial nach Aussen" +msgstr "Radial nach Außen" #: ../share/extensions/restack.inx.h:14 msgid "Radial Inward" msgstr "Radial nach Innen" #: ../share/extensions/restack.inx.h:15 -#, fuzzy msgid "Object Reference Point" -msgstr "Innen-Außen-Referenzpunkt" +msgstr "Objektreferenzpunkt" #: ../share/extensions/restack.inx.h:17 #: ../share/extensions/text_extract.inx.h:9 @@ -38294,27 +38224,23 @@ msgstr "Oben" #: ../share/extensions/text_extract.inx.h:13 #: ../share/extensions/text_merge.inx.h:13 msgid "Bottom" -msgstr "Unterste" +msgstr "Unten" #: ../share/extensions/restack.inx.h:21 -#, fuzzy msgid "Based on Z-Order" -msgstr "Erhöhter Rand" +msgstr "Nach Stapelordnung" #: ../share/extensions/restack.inx.h:22 -#, fuzzy msgid "Restack Mode" -msgstr "Umschichten" +msgstr "Umschichten-Modus" #: ../share/extensions/restack.inx.h:23 -#, fuzzy msgid "Reverse Z-Order" -msgstr "Farbverlauf umkehren" +msgstr "Stapelordnung umkehren" #: ../share/extensions/restack.inx.h:24 -#, fuzzy msgid "Shuffle Z-Order" -msgstr "Erhöhter Rand" +msgstr "Zufällige Stapelordnung" #: ../share/extensions/restack.inx.h:26 msgid "" @@ -38323,6 +38249,11 @@ msgid "" "objects inside a single selected group, or a selection of multiple objects " "on the current drawing level (layer or group)." msgstr "" +"Diese Erweiterung verändert die Stapelordnung von Objekten in Abhängigkeit " +"von ihrer Position auf der Zeichenfläche oder ihrer aktuellen Stapelordnung. " +"Auswahl: Die Erweiterung schichtet entweder die Objekte innerhalb einer " +"einzelnen, ausgewählten Gruppe um oder mehrere ausgewählte Objekte innerhalb " +"der aktiven Ebene oder Gruppe." #: ../share/extensions/restack.inx.h:27 #: ../share/extensions/ungroup_deep.inx.h:6 @@ -38342,13 +38273,12 @@ msgid "Minimum size:" msgstr "Mindestgröße:" #: ../share/extensions/rtree.inx.h:4 -#, fuzzy msgid "Omit redundant segments" -msgstr "Segmente begradigen" +msgstr "Identische Segmente entfernen" #: ../share/extensions/rtree.inx.h:5 msgid "Lift pen for backward steps" -msgstr "" +msgstr "Stift für Rückwärtsschritte anheben" #: ../share/extensions/rubberstretch.inx.h:1 msgid "Rubber Stretch" @@ -38369,9 +38299,8 @@ msgid "Optimized SVG Output" msgstr "Optimierte SVG-Ausgabe" #: ../share/extensions/scour.inx.h:3 -#, fuzzy msgid "Number of significant digits for coordinates:" -msgstr "Anzahl der signifikanten Ziffern für Koordinaten:" +msgstr "Anzahl der signifikanten Stellen für Koordinaten:" #: ../share/extensions/scour.inx.h:4 msgid "" @@ -38381,8 +38310,12 @@ msgid "" "\"3\" is specified, the coordinate 3.14159 is output as 3.14 while the " "coordinate 123.675 is output as 124." msgstr "" +"Legt die Anzahl der signifikanten Stellen für Koordinaten fest. Signifikante " +"Stellen entsprechen *nicht* der Anzahl an Nachkommastellen, sondern der " +"Gesamtzahl der Stellen in der Ausgabe. Wird zum Beispiel ein Wert von \"3\" " +"festgelegt, wird die Koordinate 3.14159 als 3.14 ausgegeben während die " +"Koordinate 123.675 als 124 ausgegeben wird." -# !!! correct? #: ../share/extensions/scour.inx.h:5 msgid "Shorten color values" msgstr "Farbwerte kürzen" @@ -38392,37 +38325,43 @@ msgid "" "Convert all color specifications to #RRGGBB (or #RGB where applicable) " "format." msgstr "" +"Wandelt alle Farbangaben in die Form #RRGGBB (bzw. #RGB wenn möglich) um." #: ../share/extensions/scour.inx.h:7 msgid "Convert CSS attributes to XML attributes" -msgstr "CSS Attribute zu XML Attribute konvertieren" +msgstr "CSS-Attribute in XML-Attribute umwandeln" #: ../share/extensions/scour.inx.h:8 msgid "" "Convert styles from style tags and inline style=\"\" declarations into XML " "attributes." msgstr "" +"Wandelt Stilvorgaben aus Style-Tags und inline style=\"\" Deklarationen in " +"XML-Attribute um." #: ../share/extensions/scour.inx.h:9 -#, fuzzy msgid "Collapse groups" -msgstr "Alle zusammenklappen" +msgstr "Gruppen zusammenklappen" #: ../share/extensions/scour.inx.h:10 msgid "" "Remove useless groups, promoting their contents up one level. Requires " "\"Remove unused IDs\" to be set." msgstr "" +"Enfernt unnötige Gruppen und hebt ihren Inhalt um eine Gliederungsebene an. " +"Benötigt \"Unbenutzte IDs entfernen\"." #: ../share/extensions/scour.inx.h:11 msgid "Create groups for similar attributes" -msgstr "Erstellen von Gruppen für ähnliche Attribute" +msgstr "Gruppen für ähnliche Attribute erstellen" #: ../share/extensions/scour.inx.h:12 msgid "" "Create groups for runs of elements having at least one attribute in common " "(e.g. fill-color, stroke-opacity, ...)." msgstr "" +"Erstellt Gruppen für aufeinanderfolgende Elemente, die mindestes ein " +"Attribut gemeinsam haben (z.B. fill-color, stroke-opacity, ...)." #: ../share/extensions/scour.inx.h:13 msgid "Keep editor data" @@ -38433,14 +38372,16 @@ msgid "" "Don't remove editor-specific elements and attributes. Currently supported: " "Inkscape, Sodipodi and Adobe Illustrator." msgstr "" +"Verhindert das Entfernen von Editor-spezifischen Elementen und Attributen. " +"Derzeit unterstützt: Inkscape, Sodipodi und Adobe Illustrator." #: ../share/extensions/scour.inx.h:15 msgid "Keep unreferenced definitions" -msgstr "" +msgstr "Unreferenzierte Definitionen erhalten" #: ../share/extensions/scour.inx.h:16 msgid "Keep element definitions that are not currently used in the SVG" -msgstr "" +msgstr "Erhält Element-Definitionen die derzeit nicht im SVG genutzt werden" #: ../share/extensions/scour.inx.h:17 msgid "Work around renderer bugs" @@ -38451,9 +38392,10 @@ msgid "" "Works around some common renderer bugs (mainly libRSVG) at the cost of a " "slightly larger SVG file." msgstr "" +"Umgeht einige verbreitete Fehler in Renderern (insbesondere libRSVG) auf " +"Kosten einer etwas größeren SVG-Datei." #: ../share/extensions/scour.inx.h:20 -#, fuzzy msgid "Remove the XML declaration" msgstr "XML-Deklaration entfernen" @@ -38463,6 +38405,9 @@ msgid "" "especially if special characters are used in the document) from the file " "header." msgstr "" +"Entfernt die XML-Deklaration aus dem Dateikopf (diese ist optional, aber " +"sollte insbesondere dann angegeben werden, wenn Sonderzeichen im Dokument " +"benutzt werden)." #: ../share/extensions/scour.inx.h:22 msgid "Remove metadata" @@ -38474,6 +38419,9 @@ msgid "" "include license and author information, alternate versions for non-SVG-" "enabled browsers, etc." msgstr "" +"Entfernt metadata-Tags und alle darin enthaltenen Informationen, wie z.B. " +"Angaben zu Lizenz und Urheber, alternative Versionen für Browser ohne SVG-" +"Unterstützung, etc." #: ../share/extensions/scour.inx.h:24 msgid "Remove comments" @@ -38481,10 +38429,9 @@ msgstr "Kommentare entfernen" #: ../share/extensions/scour.inx.h:25 msgid "Remove all XML comments from output." -msgstr "" +msgstr "Entfernt alle XML-Kommentare aus der Ausgabe." #: ../share/extensions/scour.inx.h:26 -#, fuzzy msgid "Embed raster images" msgstr "Rasterbilder einbetten" @@ -38493,6 +38440,8 @@ msgid "" "Resolve external references to raster images and embed them as Base64-" "encoded data URLs." msgstr "" +"Löst externe Referenzen zu Rastergrafiken auf und bettet diese als Base-64 " +"enkodierte Daten-URLs ein." #: ../share/extensions/scour.inx.h:28 msgid "Enable viewboxing" @@ -38504,10 +38453,12 @@ msgid "" "Set page size to 100%/100% (full width and height of the display area) and " "introduce a viewBox specifying the drawings dimensions." msgstr "" +"Legt die Seitengröße auf 100%/100% (Volle Höhe/Breite des Anzeigebereichs) " +"fest und erstellt eine viewBox welche die Abmessungen der Grafik angibt." #: ../share/extensions/scour.inx.h:31 msgid "Format output with line-breaks and indentation" -msgstr "" +msgstr "Ausgabe mit Zeilenumbrüchen und Einrückungen formatieren" #: ../share/extensions/scour.inx.h:32 msgid "" @@ -38515,11 +38466,14 @@ msgid "" "to hand-edit the SVG file you can disable this option to bring down the file " "size even more at the cost of clarity." msgstr "" +"Erstellt eine mit Zeilenumbrüchen übersichtlich formatierte Ausgabe. Wenn " +"die SVG-Datei nicht von Hand bearbeitet werden soll, kann diese Einstellung " +"deaktiviert werden, um die Dateigröße auf Kosten der Leserlichkeit noch " +"weiter zu verringern." #: ../share/extensions/scour.inx.h:33 -#, fuzzy msgid "Indentation characters:" -msgstr "Unicode-Zeichen:" +msgstr "Zeichen für Einrückungen:" #: ../share/extensions/scour.inx.h:34 msgid "" @@ -38527,21 +38481,27 @@ msgid "" "Specify \"None\" to disable indentation. This option has no effect if " "\"Format output with line-breaks and indentation\" is disabled." msgstr "" +"Gibt die Art der Einrückung an, die für jede Gliederungsebene in der Ausgabe " +"hinzugefügt wird. \"Keine\" deaktiviert die Einrückung. Diese Einstellung " +"hat keine Wirkung wenn \"Ausgabe mit Zeilenumbrüchen und Einrückungen " +"formatieren\" deaktiviert ist." #: ../share/extensions/scour.inx.h:35 -#, fuzzy msgid "Depth of indentation:" -msgstr "Tiefenfunktion:" +msgstr "Einrücktiefe:" #: ../share/extensions/scour.inx.h:36 msgid "" "The depth of the chosen type of indentation. E.g. if you choose \"2\" every " "nesting level in the output will be indented by two additional spaces/tabs." msgstr "" +"Tiefe der gewählten Einrückung. Wenn z.B. \"2\" gewählt wird, wird jede " +"zusätzliche Gliederungsebene in der Ausgabe um zwei zusätzliche Leerzeichen/" +"Tabs eingerückt." #: ../share/extensions/scour.inx.h:37 msgid "Strip the \"xml:space\" attribute from the root SVG element" -msgstr "" +msgstr "\"xml:space\"-Attribut vom SVG-Wurzelelement entfernen" #: ../share/extensions/scour.inx.h:38 msgid "" @@ -38549,16 +38509,18 @@ msgid "" "root SVG element which instructs the SVG editor not to change whitespace in " "the document at all (and therefore overrides the options above)." msgstr "" +"Nützlich wenn die Eingabedatei die Angabe \"xml:space='preserve'\" im SVG-" +"Wurzelelement enthält, welche den SVG-Editor anweist Leerraum, d.h. " +"Zeilenumbrüche und Leerzeichen, im Dokument nicht zu verändern (was die " +"vorigen Optionen außer Kraft setzt)." #: ../share/extensions/scour.inx.h:39 -#, fuzzy msgid "Document options" -msgstr "_Dokumenteneinstellungen..." +msgstr "Dokumenteinstellungen" #: ../share/extensions/scour.inx.h:40 -#, fuzzy msgid "Pretty-printing" -msgstr "Gemälde" +msgstr "Formatierung" #: ../share/extensions/scour.inx.h:41 msgid "Space" @@ -38568,27 +38530,26 @@ msgstr "Leerzeichen" msgid "Tab" msgstr "Tab" -# CHECK #: ../share/extensions/scour.inx.h:43 msgctxt "Indent" msgid "None" msgstr "Keine" #: ../share/extensions/scour.inx.h:44 -#, fuzzy msgid "IDs" -msgstr "Kennung" +msgstr "IDs" #: ../share/extensions/scour.inx.h:45 -#, fuzzy msgid "Remove unused IDs" -msgstr "Rot entfernen" +msgstr "Unbenutzte IDs entfernen" #: ../share/extensions/scour.inx.h:46 msgid "" "Remove all unreferenced IDs from elements. Those are not needed for " "rendering." msgstr "" +"Entfernt alle unreferenzierten IDs von Elementen. Diese werden für die " +"Darstellung nicht benötigt." #: ../share/extensions/scour.inx.h:47 msgid "Shorten IDs" @@ -38600,19 +38561,22 @@ msgid "" "shortest values to the most-referenced elements. For instance, " "\"linearGradient5621\" will become \"a\" if it is the most used element." msgstr "" +"Erstellt IDs minimaler Länge aus Kleinbuchstaben. Die kürzesten IDs werden " +"für die am häufigsten referenzierten Elemente verwendet, z.B. wird " +"\"linearGradient5621\" zu \"a\" verkürzt wenn er das meistreferenzierte " +"Element ist." #: ../share/extensions/scour.inx.h:49 msgid "Prefix shortened IDs with:" -msgstr "" +msgstr "Präfix für gekürzte IDs:" #: ../share/extensions/scour.inx.h:50 msgid "Prepend shortened IDs with the specified prefix." -msgstr "" +msgstr "Stellt gekürzten IDs den angegebenen Präfix voran." #: ../share/extensions/scour.inx.h:51 -#, fuzzy msgid "Preserve manually created IDs not ending with digits" -msgstr "Manuell erstellte ID-Namen, die nicht auf Ziffern enden, erhalten" +msgstr "Manuell erstellte IDs, die nicht auf Ziffern enden, erhalten" #: ../share/extensions/scour.inx.h:52 msgid "" @@ -38621,28 +38585,32 @@ msgid "" "preserved while numbered IDs (as they are generated by most SVG editors " "including Inkscape) will be removed/shortened." msgstr "" +"IDs mit aussagekräftigen Namen, die manuell erstellt wurden um bestimmte " +"Elemente und Gruppen zu bezeichnen (z.B. #arrowStart, #arrowEnd or " +"#textLabels), werden erhalten. Durchnummerierte IDs (wie sie von den meisten " +"SVG-Editoren einschließlich Inkscape erstellt werden) werden entfernt/" +"gekürzt." #: ../share/extensions/scour.inx.h:53 -#, fuzzy msgid "Preserve the following IDs:" -msgstr "" -"Es wurden folgende Schriftarten gefunden:\n" -"%s" +msgstr "Folgende IDs erhalten:" #: ../share/extensions/scour.inx.h:54 msgid "A comma-separated list of IDs that are to be preserved." msgstr "" +"Eine durch Kommata getrennte Liste von IDs die nicht entfernt werden sollen." #: ../share/extensions/scour.inx.h:55 -#, fuzzy msgid "Preserve IDs starting with:" -msgstr "ID-Namen, die wie folgt anfangen, erhalten:" +msgstr "IDs mit folgendem Präfix erhalten:" #: ../share/extensions/scour.inx.h:56 msgid "" "Preserve all IDs that start with the specified prefix (e.g. specify \"flag\" " "to preserve \"flag-mx\", \"flag-pt\", etc.)." msgstr "" +"Erhält IDs, die mit dem angegebenen Präfix beginnen (die Angabe \"flag\" " +"erhält z.B. die IDs \"flag-mx\", \"flag-pt\", etc.)." #: ../share/extensions/scour.inx.h:57 msgid "Optimized SVG (*.svg)" @@ -38663,18 +38631,16 @@ msgstr "Benutzerdefinierte Breite (px):" #: ../share/extensions/seamless_pattern.inx.h:3 #: ../share/extensions/seamless_pattern_procedural.inx.h:3 -#, fuzzy msgid "Custom Height (px):" -msgstr "Rechts (px):" +msgstr "Benutzerdefinierte Höhe (px):" #: ../share/extensions/seamless_pattern.inx.h:4 -#, fuzzy msgid "This extension overwrites the current document" -msgstr "Diese Erweiterung ersetzt den Inhalt des aktuellen Dokuments." +msgstr "Diese Erweiterung überschreibt das aktuelle Dokument" #: ../share/extensions/seamless_pattern_procedural.inx.h:1 msgid "Seamless Pattern Procedural" -msgstr "" +msgstr "Vorlage für nahtlose Muster" #: ../share/extensions/setup_typography_canvas.inx.h:1 msgid "1 - Setup Typography Canvas" @@ -38821,11 +38787,11 @@ msgstr "FXG-Ausgabe" #: ../share/extensions/svg2fxg.inx.h:2 msgid "Flash XML Graphics (*.fxg)" -msgstr "Flash XML Grafik (*.fxg)" +msgstr "Flash XML-Grafik (*.fxg)" #: ../share/extensions/svg2fxg.inx.h:3 msgid "Adobe's XML Graphics file format" -msgstr "Adobe's XML Graphik Dateiformat" +msgstr "Adobe's XML-Grafik Dateiformat" #: ../share/extensions/svg2xaml.inx.h:1 msgid "XAML Output" @@ -39017,7 +38983,7 @@ msgstr "" #: ../share/extensions/svgfont2layers.inx.h:1 msgid "Convert SVG Font to Glyph Layers" -msgstr "Konvertiere SVG Schrift zu Glyph-Ebenen" +msgstr "Konvertiere SVG-Schrift zu Glyph-Ebenen" #: ../share/extensions/svgfont2layers.inx.h:2 msgid "Load only the first 30 glyphs (Recommended)" @@ -39037,7 +39003,7 @@ msgstr "Synfig Animation, estrellt mit der sif-Datei Export Erweiterung" #: ../share/extensions/tar_layers.inx.h:1 msgid "Collection of SVG files One per root layer" -msgstr "Sammlung von SVG Dateien. Eine je Hauptebene" +msgstr "Sammlung von SVG-Dateien. Eine je Hauptebene" #: ../share/extensions/tar_layers.inx.h:2 msgid "Layers as Separate SVG (*.tar)" @@ -39048,7 +39014,7 @@ msgid "" "Each layer split into it's own svg file and collected as a tape archive (tar " "file)" msgstr "" -"Jede Ebene wird in einer eigenen SVG Datei gespeichert und die Dateien in " +"Jede Ebene wird in einer eigenen SVG-Datei gespeichert und die Dateien in " "einerm TAR-Archiv zusammengefasst" #: ../share/extensions/text_braille.inx.h:1 @@ -39181,32 +39147,29 @@ msgid "From Side c and Angles a, b" msgstr "Von Seite c und Winkel a, b" #: ../share/extensions/ungroup_deep.inx.h:1 -#, fuzzy msgid "Deep Ungroup" -msgstr "Gruppierung aufheben" +msgstr "Alle Gruppen aufheben" #: ../share/extensions/ungroup_deep.inx.h:2 -#, fuzzy msgid "Ungroup all groups in the selected object." -msgstr "Eine Ausschneidemaske auf Basis der gewählten Objekte erstellen" +msgstr "Hebt alle Gruppen im ausgewählten Objekt auf." +# Tiefe is maybe not the best term here... #: ../share/extensions/ungroup_deep.inx.h:3 -#, fuzzy msgid "Starting Depth" -msgstr "Pfadanfang:" +msgstr "Starttiefe:" #: ../share/extensions/ungroup_deep.inx.h:4 -#, fuzzy msgid "Stopping Depth (from top)" -msgstr "Ausschneidepfad von Auswahl entfernen" +msgstr "Endtiefe (von oben)" #: ../share/extensions/ungroup_deep.inx.h:5 msgid "Depth to Keep (from bottom)" -msgstr "" +msgstr "Zu erhaltende Tiefe (von unten)" #: ../share/extensions/voronoi2svg.inx.h:1 msgid "Voronoi Diagram" -msgstr "Voronoi Diagramm" +msgstr "Voronoi-Diagramm" #: ../share/extensions/voronoi2svg.inx.h:3 msgid "Type of diagram:" @@ -39221,9 +39184,8 @@ msgid "Show the bounding box" msgstr "Objektrahmen anzeigen" #: ../share/extensions/voronoi2svg.inx.h:6 -#, fuzzy msgid "Triangles color" -msgstr "Dreieck Ende" +msgstr "Farbe der Dreiecke" #: ../share/extensions/voronoi2svg.inx.h:7 msgid "Delaunay Triangulation" @@ -39242,22 +39204,20 @@ msgid "Automatic from selected objects" msgstr "Automatisch von ausgewählten Objekten" #: ../share/extensions/voronoi2svg.inx.h:12 -#, fuzzy msgid "Options for Delaunay Triangulation" -msgstr "Delaunay Dreiecksmethode" +msgstr "Einstellungen für die Delaunay-Dreiecksmethode" #: ../share/extensions/voronoi2svg.inx.h:13 msgid "Default (Stroke black and no fill)" -msgstr "" +msgstr "Standard (schwarze Kontur, keine Füllung)" #: ../share/extensions/voronoi2svg.inx.h:14 -#, fuzzy msgid "Triangles with item color" -msgstr "Farbmuster-Farbe ändern" +msgstr "Dreiecke in Objektfarbe" #: ../share/extensions/voronoi2svg.inx.h:15 msgid "Triangles with item color (random on apply)" -msgstr "" +msgstr "Dreicke in Objektfarbe (zufällig angewendet)" #: ../share/extensions/voronoi2svg.inx.h:17 msgid "" @@ -39451,12 +39411,12 @@ msgstr "Layoutgruppe festlegen" #: ../share/extensions/webslicer_create_group.inx.h:3 #: ../share/extensions/webslicer_create_rect.inx.h:18 msgid "HTML id attribute:" -msgstr "HTML id Attribut:" +msgstr "HTML-ID-Attribut:" #: ../share/extensions/webslicer_create_group.inx.h:4 #: ../share/extensions/webslicer_create_rect.inx.h:19 msgid "HTML class attribute:" -msgstr "HTML Klassen Attribut:" +msgstr "HTML-Klassen-Attribut:" #: ../share/extensions/webslicer_create_group.inx.h:5 msgid "Width unit:" @@ -39556,7 +39516,7 @@ msgstr "Layout-Anordnung:" #: ../share/extensions/webslicer_create_rect.inx.h:22 msgid "Positioned html block element with the image as Background" -msgstr "Positioniert html Block-Elemente mit dem Bild als Hintergrund" +msgstr "Positioniertes HTML-Block-Element mit dem Bild als Hintergrund" #: ../share/extensions/webslicer_create_rect.inx.h:23 msgid "Tiled Background (on parent group)" @@ -39698,24 +39658,10 @@ msgstr "Ein beliebtes Dateiformat für Clipart" msgid "XAML Input" msgstr "XAML einlesen" -#~ msgid "" -#~ "Select exactly 2 paths to perform difference, division, or path " -#~ "cut." -#~ msgstr "" -#~ "Wählen Sie genau 2 Pfade aus, um eine Differenz-, XOR-, Dvisions- " -#~ "oder Pfadzuschneideoperation auszuführen." - -#, fuzzy -#~ msgid "Measure start" -#~ msgstr "Pfad ausmessen" - -#, fuzzy -#~ msgid "Measure end" -#~ msgstr "Ausmessen" - -#, fuzzy -#~ msgid "Only visible intersections" -#~ msgstr "Gitter-Überschneidung" +# Entry in edit history, but what is "Stored" (where) and can it actually be undone? +# - According to Jabier, it's the grey phantom measure you get (temporarily) when using the corresponding button - used to compare two measures. +#~ msgid "Add Stored to measure tool" +#~ msgstr "Phantombild des aktuellen Maßstabs erstellt" #~ msgid "Miter _limit:" #~ msgstr "Gehrungs_limit:" @@ -39737,6 +39683,13 @@ msgstr "XAML einlesen" #~ msgid "Use normal distribution" #~ msgstr "Normalverteilung verwenden" +#~ msgid "" +#~ "Select exactly 2 paths to perform difference, division, or path " +#~ "cut." +#~ msgstr "" +#~ "Wählen Sie genau 2 Pfade aus, um eine Differenz-, XOR-, Dvisions- " +#~ "oder Pfadzuschneideoperation auszuführen." + #~ msgid "Group collapsing" #~ msgstr "Guppen zusammenklappen" @@ -39755,109 +39708,9 @@ msgstr "XAML einlesen" #~ msgid "Help (Options)" #~ msgstr "Hilfe (Optionen)" -#~ msgid "" -#~ "This extension optimizes the SVG file according to the following " -#~ "options:\n" -#~ " * Shorten color names: convert all colors to #RRGGBB or #RGB format.\n" -#~ " * Convert CSS attributes to XML attributes: convert styles from style " -#~ "tags and inline style=\"\" declarations into XML attributes.\n" -#~ " * Group collapsing: removes useless g elements, promoting their " -#~ "contents up one level. Requires \"Remove unused ID names for elements\" " -#~ "to be set.\n" -#~ " * Create groups for similar attributes: create g elements for runs of " -#~ "elements having at least one attribute in common (e.g. fill color, stroke " -#~ "opacity, ...).\n" -#~ " * Embed rasters: embed raster images as base64-encoded data URLs.\n" -#~ " * Keep editor data: don't remove Inkscape, Sodipodi or Adobe " -#~ "Illustrator elements and attributes.\n" -#~ " * Remove metadata: remove metadata tags along with all the " -#~ "information in them, which may include license metadata, alternate " -#~ "versions for non-SVG-enabled browsers, etc.\n" -#~ " * Remove comments: remove comment tags.\n" -#~ " * Work around renderer bugs: emits slightly larger SVG data, but " -#~ "works around a bug in librsvg's renderer, which is used in Eye of GNOME " -#~ "and other various applications.\n" -#~ " * Enable viewboxing: size image to 100%/100% and introduce a " -#~ "viewBox.\n" -#~ " * Number of significant digits for coords: all coordinates are output " -#~ "with that number of significant digits. For example, if 3 is specified, " -#~ "the coordinate 3.5153 is output as 3.51 and the coordinate 471.55 is " -#~ "output as 472.\n" -#~ " * XML indentation (pretty-printing): either None for no indentation, " -#~ "Space to use one space per nesting level, or Tab to use one tab per " -#~ "nesting level." -#~ msgstr "" -#~ "Diese Erweiterung optimiert die SVG-Datei mit folgenden Optionen:\n" -#~ "     * Kürzen der Farbnamen: Konvertiert alle Farben in #RRGGBB oder #RGB-" -#~ "Format.\n" -#~ "     * Konvertieren von CSS-Attributen zu XML-Attributen: Konvertiert " -#~ "Stile aus »style«-Tags und Inline-Deklarationen (style=\"\") zu XML-" -#~ "Attributen.\n" -#~ "     * Gruppen zusammenklappen: Entfernt überflüssige »g«-Elemente, hebt " -#~ "ihre Inhalte eine Ebene nach oben an. »Unbenutzte ID-Namen für Elemente " -#~ "löschen« muss gesetzt sein.\n" -#~ "     * Erstellen von Gruppen für ähnliche Attribute: Erstellt »g«-" -#~ "Elemente für Elemente mit mindestens einem gemeinsamen Attribut (z.B. " -#~ "Füllfarbe, Kontur-Deckkraft, ...).\n" -#~ "     * Rasterbilder einbetten: Bettet Rasterbilder als base64-kodierte " -#~ "Daten-URLs ein.\n" -#~ "     * Editor-Daten erhalten: Inkscape-, Sodipodi- oder Adobe-Illustrator-" -#~ "Elemente und -Attribute werden nicht gelöscht.\n" -#~ "     * Metadaten entfernen: Entfernt »metadata«-Tags zusammen mit allen " -#~ "Informationen, inklusive aller Lizenz-Metadaten, alternative Versionen " -#~ "für Nicht-SVG-fähige Browser usw.\n" -#~ "     * Kommentare entfernen: »comment«-Tags entfernen.\n" -#~ "     * Renderer-Bugs umgehen: erstellt etwas umfangreichere SVG-Daten, " -#~ "aber umgeht einen Fehler im librsvg-Renderer, der in »Eye of GNOME« und " -#~ "anderen Anwendungen verwendet wird.\n" -#~ "     * Viewbox aktivieren: skaliert das Bild auf 100%/100% und fügt eine " -#~ "»viewBox« hinzu.\n" -#~ "     * Anzahl der signifikanten Ziffern für Koordinaten: alle Koordinaten " -#~ "werden mit der angegebenen Anzahl an signifikanten Ziffern ausgegeben. " -#~ "Wenn z.B. 3 angegeben wird, wird die Koordinate 3.5153 als 3.51 " -#~ "ausgegeben und die Koordinate 471.55 als 472.\n" -#~ "     * XML-Einrückung (Quelltextfomatierung): Wählen Sie entweder »Keine« " -#~ "für keine Einrückung, »Leerzeichen«, um ein Lehrzeichen pro " -#~ "Einrückungsebene oder »Tab« für ein Tabulatorzeichen pro Einrückungsebene." - #~ msgid "Help (Ids)" #~ msgstr "Hilfe (IDs)" -#~ msgid "" -#~ "Ids specific options:\n" -#~ " * Remove unused ID names for elements: remove all unreferenced ID " -#~ "attributes.\n" -#~ " * Shorten IDs: reduce the length of all ID attributes, assigning the " -#~ "shortest to the most-referenced elements. For instance, " -#~ "#linearGradient5621, referenced 100 times, can become #a.\n" -#~ " * Preserve manually created ID names not ending with digits: usually, " -#~ "optimised SVG output removes these, but if they're needed for referencing " -#~ "(e.g. #middledot), you may use this option.\n" -#~ " * Preserve these ID names, comma-separated: you can use this in " -#~ "conjunction with the other preserve options if you wish to preserve some " -#~ "more specific ID names.\n" -#~ " * Preserve ID names starting with: usually, optimised SVG output " -#~ "removes all unused ID names, but if all of your preserved ID names start " -#~ "with the same prefix (e.g. #flag-mx, #flag-pt), you may use this option." -#~ msgstr "" -#~ "ID spezifische Optionen:\n" -#~ "     * Nicht verwendete ID-Namen für Elemente entfernen: Entfernt alle " -#~ "nicht referenzierten ID-Attribute.\n" -#~ "     * IDs kürzen: Reduziert die Länge aller ID-Attribute, wobei die " -#~ "kürzesten den meistverwendeten Elementen zugewiesen werden. Zum Beispiel " -#~ "könnte ein 100mal referenzierter »#linearGradient5621« zu »#a« werden.\n" -#~ "     * Manuell erstellte ID-Namen, die nicht auf Ziffern enden, erhalten: " -#~ "In der Regel entfernt die optimierte SVG-Ausgabe diese, aber wenn sie für " -#~ "eine Referenzierung (z.B. #middledot) notwendig sind, können Sie diese " -#~ "Option verwenden.\n" -#~ "     * Folgende ID-Namen erhalten (Komma getrennte Liste): Verwenden Sie " -#~ "dies in Verbindung mit den anderen Erhaltungs-Optionen, wenn Sie einige " -#~ "bestimmte ID-Namen beibehalten wollen.\n" -#~ "     * ID-Namen, die wie folgt anfangen, erhalten: In der Regel entfernt " -#~ "die optimierte SVG-Ausgabe alle nicht verwendeten ID-Namen, aber wenn " -#~ "alle ID-Namen, die Sie erhalten möchten, mit dem gleichen Präfix (z.B. " -#~ "#flag-mx, #flag-pt) beginnen, können Sie diese Option verwenden." - # CHECK #~ msgctxt "Flow control" #~ msgid "None" @@ -42101,45 +41954,9 @@ msgstr "XAML einlesen" #~ msgid "Set precision" #~ msgstr "Genauigkeit" -#~ msgid "Strip xml prolog" -#~ msgstr "Herauslösen des XML Prologes" - #~ msgid "Style to xml" #~ msgstr "Stil nach XML" -#~ msgid "" -#~ "This extension optimizes the SVG file according to the following " -#~ "options:\n" -#~ " * Simplify colors: convert all colors to #RRGGBB format.\n" -#~ " * Style to xml: convert styles into XML attributes.\n" -#~ " * Group collapsing: collapse group elements.\n" -#~ " * Enable id stripping: remove all un-referenced ID attributes.\n" -#~ " * Embed rasters: embed rasters as base64-encoded data.\n" -#~ " * Keep editor data: don't remove Inkscape, Sodipodi or Adobe " -#~ "Illustrator elements and attributes.\n" -#~ " * Enable viewboxing: size image to 100%/100% and introduce a " -#~ "viewBox.\n" -#~ " * Strip xml prolog: don't output the xml prolog.\n" -#~ " * Set precision: set number of significant digits (default: 5).\n" -#~ " * Indent: indentation of the output: none, space, tab (default: " -#~ "space)." -#~ msgstr "" -#~ "Diese Erweiterung optimiert die SVG-Datei gemäß nachfolgender Optionen: \n" -#~ " * Farben vereinfachen: Konvertiert alle Farben in das #RRGGBB " -#~ "Format.\n" -#~ " * Stil nach XML: Konvertiert Stile in XML-Attribute.\n" -#~ " * Guppen zusammenklappen: Klappt <g> Elemente zusammen.\n" -#~ " * ID-Herauslösen einschalten: Löscht alle nicht verweisenden ID-" -#~ "Attribute.\n" -#~ " * Raster einbetten: Bettet Raster als base64-encoded Data ein.\n" -#~ " * Behalten der Editor-Daten: Behalten von Inkscape-, Sodipodi- oder " -#~ "Adobe Illustrator-Elementen und Attribute.\n" -#~ " * Vorschau einschalten: Setzt Bildgröße auf 100%/100% und fügt eine " -#~ "Vorschau ein.\n" -#~ " * Herauslösen des XML Prologes: Es wird kein XML-Prolog ausgegeben.\n" -#~ " * Genauigkeit: Anzahl der maßgeblichen Stellen setzen (Vorgabe: 5).\n" -#~ " * Einzug: Einrücken der Ausgabe: Kein, Space, Tab (Vorgabe: Space)." - #~ msgid "Y frequency:" #~ msgstr "Basisfrequenz:" @@ -42594,25 +42411,6 @@ msgstr "XAML einlesen" #~ msgid "PLACEHOLDER, do not translate" #~ msgstr "PLACEHOLDER, do not translate" -#~ msgid "" -#~ "Welcome to Inkscape! Use shape or drawing tools to create objects; " -#~ "use selector (arrow) to move or transform them." -#~ msgstr "" -#~ "Willkommen bei Inkscape! Nutzen Sie Formen- und Zeichenwerkzeuge, " -#~ "um Objekte zu erstellen; das Auswahlwerkzeug (Pfeil) verschiebt und " -#~ "bearbeitet sie." - -#~ msgid "" -#~ "The file \"%s\" was saved with a " -#~ "format (%s) that may cause data loss!\n" -#~ "\n" -#~ "Do you want to save this file as an Inkscape SVG?" -#~ msgstr "" -#~ "Das Dokument \"%s\" wurde in einem " -#~ "möglicherweise verlustbehafteten Format (%s) gespeichert!\n" -#~ "\n" -#~ "Möchten Sie das Dokument als ein Inkscape SVG speichern?" - #~ msgid "Opacity, %" #~ msgstr "Deckkraft, %:" -- cgit v1.2.3 From a42c66cd5a915c7ddba323af7ec714d629e6059b Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Mon, 18 Jul 2016 11:19:25 -0600 Subject: [Bug #1524838] Disambiguate sigc::ptr_fun to fix C++14 compilation. (bzr r15016.1.1) --- src/ui/dialog/knot-properties.cpp | 2 +- src/ui/dialog/layer-properties.cpp | 2 +- src/ui/dialog/lpe-fillet-chamfer-properties.cpp | 2 +- src/ui/dialog/lpe-powerstroke-properties.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ui/dialog/knot-properties.cpp b/src/ui/dialog/knot-properties.cpp index 9c23c33e1..a91a09a4f 100644 --- a/src/ui/dialog/knot-properties.cpp +++ b/src/ui/dialog/knot-properties.cpp @@ -145,7 +145,7 @@ KnotPropertiesDialog::_close() destroy_(); Glib::signal_idle().connect( sigc::bind_return( - sigc::bind(sigc::ptr_fun(&::operator delete), this), + sigc::bind(sigc::ptr_fun(&::operator delete), this), false ) ); diff --git a/src/ui/dialog/layer-properties.cpp b/src/ui/dialog/layer-properties.cpp index 1b8fbb3f7..5d550ed48 100644 --- a/src/ui/dialog/layer-properties.cpp +++ b/src/ui/dialog/layer-properties.cpp @@ -146,7 +146,7 @@ LayerPropertiesDialog::_close() destroy_(); Glib::signal_idle().connect( sigc::bind_return( - sigc::bind(sigc::ptr_fun(&::operator delete), this), + sigc::bind(sigc::ptr_fun(&::operator delete), this), false ) ); diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp index 5ccee103c..b0cc91868 100644 --- a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp +++ b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp @@ -177,7 +177,7 @@ void FilletChamferPropertiesDialog::_close() destroy_(); Glib::signal_idle().connect( sigc::bind_return( - sigc::bind(sigc::ptr_fun(&::operator delete), this), + sigc::bind(sigc::ptr_fun(&::operator delete), this), false ) ); diff --git a/src/ui/dialog/lpe-powerstroke-properties.cpp b/src/ui/dialog/lpe-powerstroke-properties.cpp index cfc972547..a6dcce907 100644 --- a/src/ui/dialog/lpe-powerstroke-properties.cpp +++ b/src/ui/dialog/lpe-powerstroke-properties.cpp @@ -146,7 +146,7 @@ PowerstrokePropertiesDialog::_close() destroy_(); Glib::signal_idle().connect( sigc::bind_return( - sigc::bind(sigc::ptr_fun(&::operator delete), this), + sigc::bind(sigc::ptr_fun(&::operator delete), this), false ) ); -- cgit v1.2.3 From a83543fbf553fb141ec68386ecc77e2bffe36b10 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Fri, 22 Jul 2016 17:22:19 +0200 Subject: Fixed null when selection contains more than one item Fixed bugs: - https://launchpad.net/bugs/1591390 (bzr r15018) --- src/ui/tools/tool-base.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp index 36fe26e76..72ba499de 100644 --- a/src/ui/tools/tool-base.cpp +++ b/src/ui/tools/tool-base.cpp @@ -1083,7 +1083,7 @@ void sp_event_root_menu_popup(SPDesktop *desktop, SPItem *item, GdkEvent *event) /* fixme: This is not what I want but works for now (Lauris) */ if (event->type == GDK_KEY_PRESS) { - item = desktop->getSelection()->singleItem(); + item = desktop->getSelection()->itemList().front(); } ContextMenu* CM = new ContextMenu(desktop, item); -- cgit v1.2.3 From 1dd869116719a20f503e05f3b01cddb8b0c97ed6 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Sat, 23 Jul 2016 11:30:20 +0200 Subject: Fix auto palette when using extensions (bzr r15019) --- src/document-undo.cpp | 7 ++++++- src/document.cpp | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/document-undo.cpp b/src/document-undo.cpp index eb0ac7707..c27904ea8 100644 --- a/src/document-undo.cpp +++ b/src/document-undo.cpp @@ -196,6 +196,7 @@ void Inkscape::DocumentUndo::cancel(SPDocument *doc) if (doc->priv->partial) { sp_repr_undo_log (doc->priv->partial); + doc->emitReconstructionFinish(); sp_repr_free_log (doc->priv->partial); doc->priv->partial = NULL; } @@ -222,6 +223,8 @@ static void perform_document_update(SPDocument &doc) { doc.ensureUpToDate(); Inkscape::XML::Event *update_log=sp_repr_commit_undoable(doc.rdoc); + doc.emitReconstructionFinish(); + if (update_log != NULL) { g_warning("Document was modified while being updated after undo operation"); sp_repr_debug_print_log(update_log); @@ -322,8 +325,10 @@ gboolean Inkscape::DocumentUndo::redo(SPDocument *doc) doc->priv->sensitive = TRUE; doc->priv->seeking = false; - if (ret) + if (ret) { INKSCAPE.external_change(); + doc->emitReconstructionFinish(); + } return ret; } diff --git a/src/document.cpp b/src/document.cpp index 902dabbc3..9f408788b 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -955,6 +955,9 @@ SPDocument::emitReconstructionFinish(void) { // printf("Finishing Reconstruction\n"); priv->_reconstruction_finish_signal.emit(); + // indicates that gradients are reloaded (to rebuild the Auto palette) + priv->resources_changed_signals[g_quark_from_string("gradient")].emit(); + /** // Reference to the old persp3d object is invalid after reconstruction. -- cgit v1.2.3 From 98d87665f4230cbd85df6b6c7d61be770ac6524a Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 23 Jul 2016 20:53:24 +0200 Subject: Order and cleanup of some LPE (bzr r15020) --- src/live_effects/lpe-copy_rotate.cpp | 3 ++- src/live_effects/lpe-lattice2.cpp | 7 +++---- src/live_effects/lpe-lattice2.h | 2 +- src/live_effects/lpe-mirror_symmetry.cpp | 5 ++--- src/live_effects/lpe-mirror_symmetry.h | 2 +- src/live_effects/lpe-roughen.cpp | 6 +++--- src/live_effects/lpe-roughen.h | 1 + src/live_effects/lpe-show_handles.cpp | 4 ++-- src/live_effects/lpe-show_handles.h | 2 +- src/live_effects/lpe-simplify.cpp | 5 ++--- src/live_effects/lpe-simplify.h | 2 +- 11 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index efea76039..80f5bdafd 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -11,7 +11,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include #include #include <2geom/path-intersection.h> #include <2geom/sbasis-to-bezier.h> @@ -22,6 +21,8 @@ #include "knot-holder-entity.h" #include "knotholder.h" +// TODO due to internal breakage in glibmm headers, this must be last: +#include namespace Inkscape { namespace LivePathEffect { diff --git a/src/live_effects/lpe-lattice2.cpp b/src/live_effects/lpe-lattice2.cpp index 0c403daec..bacbe5fa7 100644 --- a/src/live_effects/lpe-lattice2.cpp +++ b/src/live_effects/lpe-lattice2.cpp @@ -17,9 +17,6 @@ */ #include "live_effects/lpe-lattice2.h" - -#include - #include "sp-shape.h" #include "sp-item.h" #include "sp-path.h" @@ -36,6 +33,8 @@ #include <2geom/d2.h> #include <2geom/piecewise.h> #include <2geom/transforms.h> +// TODO due to internal breakage in glibmm headers, this must be last: +#include using namespace Geom; @@ -280,7 +279,7 @@ void LPELattice2::onExpanderChanged() { expanded = expander->get_expanded(); - if(expander->get_expanded()) { + if(expanded) { expander->set_label (Glib::ustring(_("Hide Points"))); } else { expander->set_label (Glib::ustring(_("Show Points"))); diff --git a/src/live_effects/lpe-lattice2.h b/src/live_effects/lpe-lattice2.h index 8d0c18a3a..07bc4af86 100644 --- a/src/live_effects/lpe-lattice2.h +++ b/src/live_effects/lpe-lattice2.h @@ -18,8 +18,8 @@ * * Released under GNU GPL, read the file 'COPYING' for more information */ +#include #include "live_effects/parameter/enum.h" -#include #include "live_effects/effect.h" #include "live_effects/parameter/point.h" #include "live_effects/lpegroupbbox.h" diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index 9f3070ff4..cf866ad6a 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -13,9 +13,6 @@ * * Released under GNU GPL, read the file 'COPYING' for more information */ -#include -#include - #include "live_effects/lpe-mirror_symmetry.h" #include #include @@ -28,6 +25,8 @@ #include "knot-holder-entity.h" #include "knotholder.h" #include "inkscape.h" +// TODO due to internal breakage in glibmm headers, this must be last: +#include namespace Inkscape { namespace LivePathEffect { diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h index 3a244cb7e..9e5b4d628 100644 --- a/src/live_effects/lpe-mirror_symmetry.h +++ b/src/live_effects/lpe-mirror_symmetry.h @@ -15,7 +15,7 @@ * * Released under GNU GPL, read the file 'COPYING' for more information */ - +#include #include "live_effects/effect.h" #include "live_effects/parameter/parameter.h" #include "live_effects/parameter/point.h" diff --git a/src/live_effects/lpe-roughen.cpp b/src/live_effects/lpe-roughen.cpp index 105fe2fc4..14137b043 100644 --- a/src/live_effects/lpe-roughen.cpp +++ b/src/live_effects/lpe-roughen.cpp @@ -13,16 +13,16 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include -#include "desktop.h" #include "live_effects/lpe-roughen.h" +#include "desktop.h" #include "display/curve.h" #include "live_effects/parameter/parameter.h" #include #include "helper/geom.h" #include "sp-item-group.h" -#include #include +// TODO due to internal breakage in glibmm headers, this must be last: +#include namespace Inkscape { namespace LivePathEffect { diff --git a/src/live_effects/lpe-roughen.h b/src/live_effects/lpe-roughen.h index 44a723c89..c4be8fed7 100644 --- a/src/live_effects/lpe-roughen.h +++ b/src/live_effects/lpe-roughen.h @@ -12,6 +12,7 @@ #ifndef INKSCAPE_LPE_ROUGHEN_H #define INKSCAPE_LPE_ROUGHEN_H +#include #include "live_effects/parameter/enum.h" #include "live_effects/effect.h" #include "live_effects/parameter/parameter.h" diff --git a/src/live_effects/lpe-show_handles.cpp b/src/live_effects/lpe-show_handles.cpp index 0bc1c4f17..2d4666fe4 100644 --- a/src/live_effects/lpe-show_handles.cpp +++ b/src/live_effects/lpe-show_handles.cpp @@ -6,8 +6,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include -#include #include "live_effects/lpe-show_handles.h" #include "live_effects/parameter/parameter.h" #include <2geom/sbasis-to-bezier.h> @@ -16,6 +14,8 @@ #include "desktop-style.h" #include "style.h" #include "svg/svg.h" +// TODO due to internal breakage in glibmm headers, this must be last: +#include namespace Inkscape { namespace LivePathEffect { diff --git a/src/live_effects/lpe-show_handles.h b/src/live_effects/lpe-show_handles.h index 34390dd32..8bff3c1a8 100644 --- a/src/live_effects/lpe-show_handles.h +++ b/src/live_effects/lpe-show_handles.h @@ -8,7 +8,7 @@ * Copyright (C) Jabier Arraiza Cenoz 2014 * Released under GNU GPL, read the file 'COPYING' for more information */ - +#include #include "live_effects/effect.h" #include "live_effects/lpegroupbbox.h" #include "live_effects/parameter/bool.h" diff --git a/src/live_effects/lpe-simplify.cpp b/src/live_effects/lpe-simplify.cpp index f807bdc8d..b0c1fbc23 100644 --- a/src/live_effects/lpe-simplify.cpp +++ b/src/live_effects/lpe-simplify.cpp @@ -2,12 +2,9 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include - #include "live_effects/lpe-simplify.h" #include "display/curve.h" #include "live_effects/parameter/parameter.h" -#include #include "helper/geom.h" #include "livarot/Path.h" #include "splivarot.h" @@ -21,6 +18,8 @@ #include <2geom/interval.h> #include "ui/icon-names.h" #include "util/units.h" +// TODO due to internal breakage in glibmm headers, this must be last: +#include namespace Inkscape { namespace LivePathEffect { diff --git a/src/live_effects/lpe-simplify.h b/src/live_effects/lpe-simplify.h index 294d77b35..8135561af 100644 --- a/src/live_effects/lpe-simplify.h +++ b/src/live_effects/lpe-simplify.h @@ -6,7 +6,7 @@ * * Released under GNU GPL, read the file 'COPYING' for more information */ - +#include #include "live_effects/effect.h" #include "live_effects/parameter/togglebutton.h" #include "live_effects/lpegroupbbox.h" -- cgit v1.2.3 From 06caba8f2caeb07011e492d7218f0b8f6b28e801 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sun, 24 Jul 2016 17:05:29 +0200 Subject: Fises to toggle button and coding style (bzr r15021) --- share/icons/icons.svg | 2 +- share/icons/symbolic_icons.svg | 2 +- src/live_effects/parameter/togglebutton.cpp | 70 +++++++++++++++-------------- src/live_effects/parameter/togglebutton.h | 8 ++-- src/ui/widget/registered-widget.cpp | 6 +-- src/ui/widget/registered-widget.h | 3 +- 6 files changed, 46 insertions(+), 45 deletions(-) diff --git a/share/icons/icons.svg b/share/icons/icons.svg index 8323795bc..4a65cd3f1 100644 --- a/share/icons/icons.svg +++ b/share/icons/icons.svg @@ -4090,7 +4090,7 @@ http://www.inkscape.org/ - + diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index aee4937c5..762bf6fd1 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -3241,7 +3241,7 @@ - + diff --git a/src/live_effects/parameter/togglebutton.cpp b/src/live_effects/parameter/togglebutton.cpp index 47a8b5615..c761731b7 100644 --- a/src/live_effects/parameter/togglebutton.cpp +++ b/src/live_effects/parameter/togglebutton.cpp @@ -24,10 +24,10 @@ namespace LivePathEffect { ToggleButtonParam::ToggleButtonParam( const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr, Effect* effect, bool default_value, const Glib::ustring& inactive_label, - char const * icon_active, char const * icon_inactive, - Inkscape::IconSize icon_size) + char const * _icon_active, char const * _icon_inactive, + Inkscape::IconSize _icon_size) : Parameter(label, tip, key, wr, effect), value(default_value), defvalue(default_value), - inactiveLabel(inactive_label), iconActive(icon_active), iconInactive(icon_inactive), iconSize(icon_size) + inactive_label(inactive_label), _icon_active(_icon_active), _icon_inactive(_icon_inactive), _icon_size(_icon_size) { checkwdg = NULL; } @@ -75,38 +75,40 @@ ToggleButtonParam::param_newWidget() param_effect->getRepr(), param_effect->getSPDoc()) ); #if GTK_CHECK_VERSION(3,0,0) - GtkWidget * boxButton = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_set_homogeneous(GTK_BOX(boxButton), false); + GtkWidget * box_button = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_box_set_homogeneous(GTK_BOX(box_button), false); #else - GtkWidget * boxButton = gtk_hbox_new (false, 0); + GtkWidget * box_button = gtk_hbox_new (false, 0); #endif - GtkWidget * labelButton = gtk_label_new (""); + GtkWidget * label_button = gtk_label_new (""); if (!param_label.empty()) { - if(value || inactiveLabel.empty()){ - gtk_label_set_text(GTK_LABEL(labelButton), param_label.c_str()); + if(value || inactive_label.empty()){ + gtk_label_set_text(GTK_LABEL(label_button), param_label.c_str()); }else{ - gtk_label_set_text(GTK_LABEL(labelButton), inactiveLabel.c_str()); + gtk_label_set_text(GTK_LABEL(label_button), inactive_label.c_str()); } } - gtk_widget_show(labelButton); - if ( iconActive ) { - if(!iconInactive){ - iconInactive = iconActive; + gtk_widget_show(label_button); + if ( _icon_active ) { + if(!_icon_inactive){ + _icon_inactive = _icon_active; } - gtk_widget_show(boxButton); - GtkWidget *iconButton = sp_icon_new(iconSize, iconActive); + gtk_widget_show(box_button); + GtkWidget *icon_button = NULL; if(!value){ - iconButton = sp_icon_new(iconSize, iconInactive); + icon_button = sp_icon_new(_icon_size, _icon_inactive); + } else { + icon_button = sp_icon_new(_icon_size, _icon_active); } - gtk_widget_show(iconButton); - gtk_box_pack_start (GTK_BOX(boxButton), iconButton, false, false, 1); + gtk_widget_show(icon_button); + gtk_box_pack_start (GTK_BOX(box_button), icon_button, false, false, 1); if (!param_label.empty()) { - gtk_box_pack_start (GTK_BOX(boxButton), labelButton, false, false, 1); + gtk_box_pack_start (GTK_BOX(box_button), label_button, false, false, 1); } }else{ - gtk_box_pack_start (GTK_BOX(boxButton), labelButton, false, false, 1); + gtk_box_pack_start (GTK_BOX(box_button), label_button, false, false, 1); } - checkwdg->add(*Gtk::manage(Glib::wrap(boxButton))); + checkwdg->add(*Gtk::manage(Glib::wrap(box_button))); checkwdg->setActive(value); checkwdg->setProgrammatically = false; checkwdg->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change togglebutton parameter")); @@ -126,25 +128,27 @@ ToggleButtonParam::refresh_button() if(!checkwdg){ return; } - Gtk::Widget * boxButton = checkwdg->get_child(); - if(!boxButton){ + Gtk::Widget * box_button = checkwdg->get_child(); + if(!box_button){ return; } - GList * childs = gtk_container_get_children(GTK_CONTAINER(boxButton->gobj())); - guint totalWidgets = g_list_length (childs); + GList * childs = gtk_container_get_children(GTK_CONTAINER(box_button->gobj())); + guint total_widgets = g_list_length (childs); if (!param_label.empty()) { - if(value || inactiveLabel.empty()){ - gtk_label_set_text(GTK_LABEL(g_list_nth_data(childs, totalWidgets-1)), param_label.c_str()); + if(value || inactive_label.empty()){ + gtk_label_set_text(GTK_LABEL(g_list_nth_data(childs, total_widgets-1)), param_label.c_str()); }else{ - gtk_label_set_text(GTK_LABEL(g_list_nth_data(childs, totalWidgets-1)), inactiveLabel.c_str()); + gtk_label_set_text(GTK_LABEL(g_list_nth_data(childs, total_widgets-1)), inactive_label.c_str()); } } - if ( iconActive ) { - GdkPixbuf * iconPixbuf = sp_pixbuf_new( iconSize, iconActive ); + if ( _icon_active ) { + GdkPixbuf * icon_pixbuf = NULL; if(!value){ - iconPixbuf = sp_pixbuf_new( iconSize, iconInactive); + icon_pixbuf = sp_pixbuf_new( _icon_size, _icon_inactive ); + } else { + icon_pixbuf = sp_pixbuf_new( _icon_size, _icon_active ); } - gtk_image_set_from_pixbuf (GTK_IMAGE(g_list_nth_data(childs, 0)), iconPixbuf); + gtk_image_set_from_pixbuf (GTK_IMAGE(g_list_nth_data(childs, 0)), icon_pixbuf); } } diff --git a/src/live_effects/parameter/togglebutton.h b/src/live_effects/parameter/togglebutton.h index 4e545bcfd..8390fec86 100644 --- a/src/live_effects/parameter/togglebutton.h +++ b/src/live_effects/parameter/togglebutton.h @@ -59,10 +59,10 @@ private: void refresh_button(); bool value; bool defvalue; - const Glib::ustring inactiveLabel; - const char * iconActive; - const char * iconInactive; - Inkscape::IconSize iconSize; + const Glib::ustring inactive_label; + const char * _icon_active; + const char * _icon_inactive; + Inkscape::IconSize _icon_size; Inkscape::UI::Widget::RegisteredToggleButton * checkwdg; sigc::signal _signal_toggled; diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp index 298377af3..572845668 100644 --- a/src/ui/widget/registered-widget.cpp +++ b/src/ui/widget/registered-widget.cpp @@ -113,10 +113,8 @@ RegisteredToggleButton::~RegisteredToggleButton() _toggled_connection.disconnect(); } -RegisteredToggleButton::RegisteredToggleButton (const Glib::ustring& /*label*/, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right, Inkscape::XML::Node* repr_in, SPDocument *doc_in, char const *active_str, char const *inactive_str) +RegisteredToggleButton::RegisteredToggleButton (const Glib::ustring& /*label*/, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right, Inkscape::XML::Node* repr_in, SPDocument *doc_in, char const *icon_active, char const *icon_inactive) : RegisteredWidget() - , _active_str(active_str) - , _inactive_str(inactive_str) { init_parent(key, wr, repr_in, doc_in); setProgrammatically = false; @@ -149,7 +147,7 @@ RegisteredToggleButton::on_toggled() return; _wr->setUpdating (true); - write_to_xml(get_active() ? _active_str : _inactive_str); + write_to_xml(get_active() ? "true" : "false"); //The slave button is greyed out if the master button is untoggled for (std::list::const_iterator i = _slavewidgets.begin(); i != _slavewidgets.end(); ++i) { (*i)->set_sensitive(get_active()); diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h index 9d2489712..ab2e4c8e4 100644 --- a/src/ui/widget/registered-widget.h +++ b/src/ui/widget/registered-widget.h @@ -166,7 +166,7 @@ protected: class RegisteredToggleButton : public RegisteredWidget { public: virtual ~RegisteredToggleButton(); - RegisteredToggleButton (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right=true, Inkscape::XML::Node* repr_in=NULL, SPDocument *doc_in=NULL, char const *active_str = "true", char const *inactive_str = "false"); + RegisteredToggleButton (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right=true, Inkscape::XML::Node* repr_in=NULL, SPDocument *doc_in=NULL, char const *icon_active = "true", char const *icon_inactive = "false"); void setActive (bool); @@ -183,7 +183,6 @@ public: // if a callback checks it, it must reset it back to false protected: - char const *_active_str, *_inactive_str; sigc::connection _toggled_connection; void on_toggled(); }; -- cgit v1.2.3 From 325f658295ffa45c23c681a6a96a76acf232ef29 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sun, 24 Jul 2016 17:58:34 +0200 Subject: Fixed a bug on roughen LPE on open paths (bzr r15022) --- src/live_effects/lpe-roughen.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/live_effects/lpe-roughen.cpp b/src/live_effects/lpe-roughen.cpp index 14137b043..13f2b7b51 100644 --- a/src/live_effects/lpe-roughen.cpp +++ b/src/live_effects/lpe-roughen.cpp @@ -229,7 +229,7 @@ void LPERoughen::doEffect(SPCurve *curve) nCurve->lineto(curve_it1->finalPoint()); } last_move = Geom::Point(0, 0); - double length = curve_it1->length(0.001); + double length = curve_it1->length(0.01); std::size_t splits = 0; if (method == DM_SEGMENTS) { splits = segments; @@ -354,9 +354,6 @@ SPCurve const * LPERoughen::addNodesAndJitter(Geom::Curve const * A, Geom::Point point_a3 = seg1[3] + point_a3; ray.setPoints(prev,A->initialPoint()); point_a1 = A->initialPoint() + Geom::Point::polar(ray.angle(), max_lenght); - if(prev == Geom::Point(0,0)){ - point_a1 = randomize(max_lenght); - } if(last){ Geom::Path b2(point_b3); b2.appendNew(point_a3); -- cgit v1.2.3 From c6c1a5740f4778826030b6b724063d757a7cc603 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sun, 24 Jul 2016 19:27:32 +0200 Subject: Order some headers (bzr r15023) --- src/live_effects/lpe-lattice2.h | 2 +- src/live_effects/lpe-roughen.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/live_effects/lpe-lattice2.h b/src/live_effects/lpe-lattice2.h index 07bc4af86..4a025d182 100644 --- a/src/live_effects/lpe-lattice2.h +++ b/src/live_effects/lpe-lattice2.h @@ -19,8 +19,8 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ #include -#include "live_effects/parameter/enum.h" #include "live_effects/effect.h" +#include "live_effects/parameter/enum.h" #include "live_effects/parameter/point.h" #include "live_effects/lpegroupbbox.h" diff --git a/src/live_effects/lpe-roughen.h b/src/live_effects/lpe-roughen.h index c4be8fed7..dbdb91e62 100644 --- a/src/live_effects/lpe-roughen.h +++ b/src/live_effects/lpe-roughen.h @@ -13,8 +13,8 @@ #define INKSCAPE_LPE_ROUGHEN_H #include -#include "live_effects/parameter/enum.h" #include "live_effects/effect.h" +#include "live_effects/parameter/enum.h" #include "live_effects/parameter/parameter.h" #include "live_effects/parameter/path.h" #include "live_effects/parameter/bool.h" -- cgit v1.2.3 From 40136abc93171fd163a78472cdeaf5d875acefda Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sun, 24 Jul 2016 22:27:21 -0700 Subject: Revert the canvas widget changes, which cause performance regressions on GTK2 on some platforms. (bzr r15023.3.1) --- src/desktop.cpp | 19 ++- src/desktop.h | 1 + src/display/sp-canvas.cpp | 376 ++++++++++++++++++++++++---------------------- src/display/sp-canvas.h | 33 ++-- 4 files changed, 229 insertions(+), 200 deletions(-) diff --git a/src/desktop.cpp b/src/desktop.cpp index d482d0d7f..331ab3351 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -111,6 +111,7 @@ SPDesktop::SPDesktop() : sketch( NULL ), controls( NULL ), tempgroup ( NULL ), + table( NULL ), page( NULL ), page_border( NULL ), current( NULL ), @@ -210,7 +211,11 @@ SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas, Inkscape::UI::View::EditWid g_signal_connect (G_OBJECT (main), "event", G_CALLBACK (sp_desktop_root_handler), this); /* This is the background the page sits on. */ - canvas->setBackgroundColor(0xffffff00); + table = sp_canvas_item_new (main, SP_TYPE_CTRLRECT, NULL); + SP_CTRLRECT(table)->setRectangle(Geom::Rect(Geom::Point(-80000, -80000), Geom::Point(80000, 80000))); + SP_CTRLRECT(table)->setColor(0x00000000, true, 0x00000000); + SP_CTRLRECT(table)->setCheckerboard( false ); + sp_canvas_item_move_to_z (table, 0); page = sp_canvas_item_new (main, SP_TYPE_CTRLRECT, NULL); ((CtrlRect *) page)->setColor(0x00000000, FALSE, 0x00000000); @@ -1728,11 +1733,17 @@ static void _namedview_modified (SPObject *obj, guint flags, SPDesktop *desktop) SPNamedView *nv=SP_NAMEDVIEW(obj); if (flags & SP_OBJECT_MODIFIED_FLAG) { + + /* Set page background */ + sp_canvas_item_show (desktop->table); if (nv->pagecheckerboard) { - desktop->canvas->setBackgroundCheckerboard(); + ((CtrlRect *) desktop->table)->setCheckerboard( true ); + ((CtrlRect *) desktop->table)->setColor(0x00000000, true, nv->pagecolor ); // | 0xff); } else { - desktop->canvas->setBackgroundColor(nv->pagecolor); + ((CtrlRect *) desktop->table)->setCheckerboard( false ); + ((CtrlRect *) desktop->table)->setColor(0x00000000, true, nv->pagecolor | 0xff); } + sp_canvas_item_move_to_z (desktop->table, 0); /* Show/hide page border */ if (nv->showborder) { @@ -1745,7 +1756,7 @@ static void _namedview_modified (SPObject *obj, guint flags, SPDesktop *desktop) } // place in the z-order stack if (nv->borderlayer == SP_BORDER_LAYER_BOTTOM) { - sp_canvas_item_move_to_z (desktop->page_border, 1); + sp_canvas_item_move_to_z (desktop->page_border, 2); } else { int order = sp_canvas_item_order (desktop->page_border); int morder = sp_canvas_item_order (desktop->drawing); diff --git a/src/desktop.h b/src/desktop.h index 3652d4a97..f1444ba7b 100644 --- a/src/desktop.h +++ b/src/desktop.h @@ -174,6 +174,7 @@ public: SPCanvasGroup *sketch; SPCanvasGroup *controls; SPCanvasGroup *tempgroup; ///< contains temporary canvas items + SPCanvasItem *table; ///< outside-of-page background SPCanvasItem *page; ///< page background SPCanvasItem *page_border; ///< page border SPCSSAttr *current; ///< current style diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index 7d76fa043..df84e379c 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -8,11 +8,9 @@ * fred * bbyak * Jon A. Cruz - * Krzysztof Kosiński * * Copyright (C) 1998 The Free Software Foundation * Copyright (C) 2002-2006 authors - * Copyright (C) 2016 Google Inc. * * Released under GNU GPL, read the file 'COPYING' for more information */ @@ -27,7 +25,6 @@ #include "helper/sp-marshal.h" #include <2geom/rect.h> #include <2geom/affine.h> -#include "display/cairo-utils.h" #include "display/sp-canvas.h" #include "display/sp-canvas-group.h" #include "preferences.h" @@ -38,7 +35,6 @@ #include "display/cairo-utils.h" #include "debug/gdk-event-latency-tracker.h" #include "desktop.h" -#include "color.h" using Inkscape::Debug::GdkEventLatencyTracker; @@ -126,7 +122,7 @@ struct SPCanvasClass { namespace { -gint const UPDATE_PRIORITY = G_PRIORITY_DEFAULT_IDLE; +gint const UPDATE_PRIORITY = G_PRIORITY_HIGH_IDLE; GdkWindow *getWindow(SPCanvas *canvas) { @@ -939,6 +935,7 @@ void sp_canvas_class_init(SPCanvasClass *klass) static void sp_canvas_init(SPCanvas *canvas) { gtk_widget_set_has_window (GTK_WIDGET (canvas), TRUE); + gtk_widget_set_double_buffered (GTK_WIDGET (canvas), FALSE); gtk_widget_set_can_focus (GTK_WIDGET (canvas), TRUE); canvas->_pick_event.type = GDK_LEAVE_NOTIFY; @@ -959,10 +956,9 @@ static void sp_canvas_init(SPCanvas *canvas) canvas->_drawing_disabled = false; - canvas->_backing_store = NULL; - canvas->_clean_region = cairo_region_create(); - canvas->_background = cairo_pattern_create_rgb(1, 1, 1); - canvas->_background_is_checkerboard = false; + canvas->_tiles=NULL; + canvas->_tLeft=canvas->_tTop=canvas->_tRight=canvas->_tBottom=0; + canvas->_tile_h=canvas->_tile_h=0; canvas->_forced_redraw_count = 0; canvas->_forced_redraw_limit = -1; @@ -971,12 +967,22 @@ static void sp_canvas_init(SPCanvas *canvas) canvas->_enable_cms_display_adj = false; new (&canvas->_cms_key) Glib::ustring(""); #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) + + canvas->_is_scrolling = false; } void SPCanvas::shutdownTransients() { - // Reset the clean region - dirtyAll(); + // We turn off the need_redraw flag, since if the canvas is mapped again + // it will request a redraw anyways. We do not turn off the need_update + // flag, though, because updates are not queued when the canvas remaps + // itself. + // + _need_redraw = FALSE; + if (_tiles) g_free(_tiles); + _tiles = NULL; + _tLeft = _tTop = _tRight = _tBottom = 0; + _tile_h = _tile_h = 0; if (_grabbed_item) { _grabbed_item = NULL; @@ -999,18 +1005,6 @@ void SPCanvas::dispose(GObject *object) g_object_unref (canvas->_root); canvas->_root = NULL; } - if (canvas->_backing_store) { - cairo_surface_destroy(canvas->_backing_store); - canvas->_backing_store = NULL; - } - if (canvas->_clean_region) { - cairo_region_destroy(canvas->_clean_region); - canvas->_clean_region = NULL; - } - if (canvas->_background) { - cairo_pattern_destroy(canvas->_background); - canvas->_background = NULL; - } canvas->shutdownTransients(); #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) @@ -1144,48 +1138,41 @@ void SPCanvas::handle_size_request(GtkWidget *widget, GtkRequisition *req) void SPCanvas::handle_size_allocate(GtkWidget *widget, GtkAllocation *allocation) { SPCanvas *canvas = SP_CANVAS (widget); - GtkAllocation old_allocation; + GtkAllocation widg_allocation; - gtk_widget_get_allocation(widget, &old_allocation); + gtk_widget_get_allocation (widget, &widg_allocation); -// Geom::IntRect old_area = Geom::IntRect::from_xywh(canvas->_x0, canvas->_y0, -// old_allocation.width, old_allocation.height); +// Geom::IntRect old_area = Geom::IntRect::from_xywh(canvas->x0, canvas->y0, +// widg_allocation.width, widg_allocation.height); Geom::IntRect new_area = Geom::IntRect::from_xywh(canvas->_x0, canvas->_y0, allocation->width, allocation->height); - // resize backing store - cairo_surface_t *new_backing_store = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, - allocation->width, allocation->height); - if (canvas->_backing_store) { - cairo_t *cr = cairo_create(new_backing_store); - cairo_translate(cr, -canvas->_x0, -canvas->_y0); - cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); - cairo_set_source(cr, canvas->_background); - cairo_paint(cr); - cairo_set_source_surface(cr, canvas->_backing_store, canvas->_x0, canvas->_y0); - cairo_paint(cr); - cairo_destroy(cr); - cairo_surface_destroy(canvas->_backing_store); - } - canvas->_backing_store = new_backing_store; - - // Clip the clean region to the new allocation - cairo_rectangle_int_t crect = { canvas->_x0, canvas->_y0, allocation->width, allocation->height }; - cairo_region_intersect_rectangle(canvas->_clean_region, &crect); - - gtk_widget_set_allocation (widget, allocation); - + // Schedule redraw of new region + canvas->resizeTiles(canvas->_x0, canvas->_y0, canvas->_x0 + allocation->width, canvas->_y0 + allocation->height); if (SP_CANVAS_ITEM_GET_CLASS (canvas->_root)->viewbox_changed) SP_CANVAS_ITEM_GET_CLASS (canvas->_root)->viewbox_changed (canvas->_root, new_area); + if (allocation->width > widg_allocation.width) { + canvas->requestRedraw(canvas->_x0 + widg_allocation.width, + 0, + canvas->_x0 + allocation->width, + canvas->_y0 + allocation->height); + } + if (allocation->height > widg_allocation.height) { + canvas->requestRedraw(0, + canvas->_y0 + widg_allocation.height, + canvas->_x0 + allocation->width, + canvas->_y0 + allocation->height); + } + + gtk_widget_set_allocation (widget, allocation); + if (gtk_widget_get_realized (widget)) { gdk_window_move_resize (gtk_widget_get_window (widget), allocation->x, allocation->y, allocation->width, allocation->height); } - // Schedule redraw of any newly exposed regions - canvas->addIdle(); } int SPCanvas::emitEvent(GdkEvent *event) @@ -1539,23 +1526,48 @@ int SPCanvas::handle_motion(GtkWidget *widget, GdkEventMotion *event) void SPCanvas::paintSingleBuffer(Geom::IntRect const &paint_rect, Geom::IntRect const &canvas_rect, int /*sw*/) { + GtkWidget *widget = GTK_WIDGET (this); + + // Mark the region clean + markRect(paint_rect, 0); + SPCanvasBuf buf; buf.buf = NULL; buf.buf_rowstride = 0; buf.rect = paint_rect; buf.visible_rect = canvas_rect; buf.is_empty = true; + //buf.ct = gdk_cairo_create(widget->window); // create temporary surface cairo_surface_t *imgs = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, paint_rect.width(), paint_rect.height()); buf.ct = cairo_create(imgs); + //cairo_translate(buf.ct, -x0, -y0); + + // fix coordinates, clip all drawing to the tile and clear the background + //cairo_translate(buf.ct, paint_rect.left() - canvas->x0, paint_rect.top() - canvas->y0); + //cairo_rectangle(buf.ct, 0, 0, paint_rect.width(), paint_rect.height()); + //cairo_set_line_width(buf.ct, 3); + //cairo_set_source_rgba(buf.ct, 1.0, 0.0, 0.0, 0.1); + //cairo_stroke_preserve(buf.ct); + //cairo_clip(buf.ct); + +#if GTK_CHECK_VERSION(3,0,0) + GtkStyleContext *context = gtk_widget_get_style_context(widget); + GdkRGBA color; + gtk_style_context_get_background_color(context, + gtk_widget_get_state_flags(widget), + &color); + gdk_cairo_set_source_rgba(buf.ct, &color); +#else + GtkStyle *style = gtk_widget_get_style (widget); + gdk_cairo_set_source_color(buf.ct, &style->bg[GTK_STATE_NORMAL]); +#endif - cairo_save(buf.ct); - cairo_translate(buf.ct, -paint_rect.left(), -paint_rect.top()); - cairo_set_source(buf.ct, _background); cairo_set_operator(buf.ct, CAIRO_OPERATOR_SOURCE); + //cairo_rectangle(buf.ct, 0, 0, paint_rect.width(), paint_rec.height()); cairo_paint(buf.ct); - cairo_restore(buf.ct); + cairo_set_operator(buf.ct, CAIRO_OPERATOR_OVER); if (_root->visible) { SP_CANVAS_ITEM_GET_CLASS(_root)->render(_root, &buf); @@ -1588,8 +1600,7 @@ void SPCanvas::paintSingleBuffer(Geom::IntRect const &paint_rect, Geom::IntRect } #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) - //cairo_t *xct = gdk_cairo_create(gtk_widget_get_window (widget)); - cairo_t *xct = cairo_create(_backing_store); + cairo_t *xct = gdk_cairo_create(gtk_widget_get_window (widget)); cairo_translate(xct, paint_rect.left() - _x0, paint_rect.top() - _y0); cairo_rectangle(xct, 0, 0, paint_rect.width(), paint_rect.height()); cairo_clip(xct); @@ -1598,12 +1609,6 @@ void SPCanvas::paintSingleBuffer(Geom::IntRect const &paint_rect, Geom::IntRect cairo_paint(xct); cairo_destroy(xct); cairo_surface_destroy(imgs); - - // Mark the painted rectangle clean - markRect(paint_rect, 0); - - gtk_widget_queue_draw_area(GTK_WIDGET(this), paint_rect.left() -_x0, paint_rect.top() - _y0, - paint_rect.width(), paint_rect.height()); } struct PaintRectSetup { @@ -1787,49 +1792,52 @@ void SPCanvas::endForcedFullRedraws() _forced_redraw_limit = -1; } +#if GTK_CHECK_VERSION(3,0,0) gboolean SPCanvas::handle_draw(GtkWidget *widget, cairo_t *cr) { SPCanvas *canvas = SP_CANVAS(widget); - // Blit from the backing store, without regard for the clean region. - // This is necessary because GTK clears the widget for us, which causes - // severe flicker while drawing if we don't blit the old contents. - cairo_set_source_surface(cr, canvas->_backing_store, 0, 0); - cairo_paint(cr); - cairo_rectangle_list_t *rects = cairo_copy_clip_rectangle_list(cr); - cairo_region_t *dirty_region = cairo_region_create(); for (int i = 0; i < rects->num_rectangles; i++) { cairo_rectangle_t rectangle = rects->rectangles[i]; - Geom::Rect dr = Geom::Rect::from_xywh(rectangle.x + canvas->_x0, rectangle.y + canvas->_y0, - rectangle.width, rectangle.height); - Geom::IntRect ir = dr.roundOutwards(); - cairo_rectangle_int_t irect = { ir.left(), ir.top(), ir.width(), ir.height() }; - cairo_region_union_rectangle(dirty_region, &irect); - } - cairo_rectangle_list_destroy(rects); - cairo_region_subtract(dirty_region, canvas->_clean_region); - // Render the dirty portion in the background - if (!cairo_region_is_empty(dirty_region)) { - canvas->addIdle(); + Geom::IntRect r = Geom::IntRect::from_xywh(rectangle.x + canvas->_x0, rectangle.y + canvas->_y0, + rectangle.width, rectangle.height); + + canvas->requestRedraw(r.left(), r.top(), r.right(), r.bottom()); } - cairo_region_destroy(dirty_region); - return TRUE; + cairo_rectangle_list_destroy(rects); + + return FALSE; } -#if !GTK_CHECK_VERSION(3,0,0) +#else gboolean SPCanvas::handle_expose(GtkWidget *widget, GdkEventExpose *event) { - cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(widget)); + SPCanvas *canvas = SP_CANVAS(widget); + + if (!gtk_widget_is_drawable (widget) || + (event->window != getWindow(canvas))) { + return FALSE; + } + + int n_rects = 0; + GdkRectangle *rects = NULL; + gdk_region_get_rectangles(event->region, &rects, &n_rects); - gdk_cairo_region (cr, event->region); - cairo_clip (cr); - gboolean result = SPCanvas::handle_draw(widget, cr); + if(rects == NULL) + return FALSE; + + for (int i = 0; i < n_rects; i++) { + GdkRectangle rectangle = rects[i]; - cairo_destroy (cr); + Geom::IntRect r = Geom::IntRect::from_xywh(rectangle.x + canvas->_x0, rectangle.y + canvas->_y0, + rectangle.width, rectangle.height); + + canvas->requestRedraw(r.left(), r.top(), r.right(), r.bottom()); + } - return result; + return FALSE; } #endif @@ -1882,22 +1890,42 @@ int SPCanvas::paint() _need_update = FALSE; } - GtkAllocation allocation; - gtk_widget_get_allocation(GTK_WIDGET(this), &allocation); - cairo_rectangle_int_t crect = { _x0, _y0, allocation.width, allocation.height }; - cairo_region_t *to_draw = cairo_region_create_rectangle(&crect); - cairo_region_subtract(to_draw, _clean_region); + if (!_need_redraw) { + return TRUE; + } - int n_rects = cairo_region_num_rectangles(to_draw); - for (int i = 0; i < n_rects; ++i) { - cairo_rectangle_int_t crect; - cairo_region_get_rectangle(to_draw, i, &crect); - if (!paintRect(crect.x, crect.y, crect.x + crect.width, crect.y + crect.height)) { - // Aborted - return FALSE; - }; + Cairo::RefPtr to_paint = Cairo::Region::create(); + + for (int j = _tTop; j < _tBottom; ++j) { + for (int i = _tLeft; i < _tRight; ++i) { + int tile_index = (i - _tLeft) + (j - _tTop) * _tile_h; + + if (_tiles[tile_index]) { // if this tile is dirtied (nonzero) + Cairo::RectangleInt rect = {i*TILE_SIZE, j*TILE_SIZE, + TILE_SIZE, TILE_SIZE}; + to_paint->do_union(rect); + } + } + } + + int n_rect = to_paint->get_num_rectangles(); + + if (n_rect > 0) { + for (int i=0; i < n_rect; i++) { + Cairo::RectangleInt rect = to_paint->get_rectangle(i); + int x0 = rect.x; + int y0 = rect.y; + int x1 = x0 + rect.width; + int y1 = y0 + rect.height; + if (!paintRect(x0, y0, x1, y1)) { + // Aborted + return FALSE; + }; + } } + _need_redraw = FALSE; + // we've had a full unaborted redraw, reset the full redraw counter if (_forced_redraw_limit != -1) { _forced_redraw_count = 0; @@ -1976,41 +2004,15 @@ void SPCanvas::scrollTo(double cx, double cy, unsigned int clear, bool is_scroll Geom::IntRect old_area = getViewboxIntegers(); Geom::IntRect new_area = old_area + Geom::IntPoint(dx, dy); - - gtk_widget_get_allocation(&_widget, &allocation); - - // adjust backing store contents - assert(_backing_store); - cairo_surface_t *new_backing_store = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, - allocation.width, allocation.height); - cairo_t *cr = cairo_create(new_backing_store); - cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); - // Paint the background - cairo_translate(cr, -ix, -iy); - cairo_set_source(cr, _background); - cairo_paint(cr); - // Copy the old backing store contents - cairo_set_source_surface(cr, _backing_store, _x0, _y0); - cairo_rectangle(cr, _x0, _y0, allocation.width, allocation.height); - cairo_clip(cr); - cairo_paint(cr); - cairo_destroy(cr); - cairo_surface_destroy(_backing_store); - _backing_store = new_backing_store; - + _dx0 = cx; // here the 'd' stands for double, not delta! _dy0 = cy; _x0 = ix; _y0 = iy; - // Adjust the clean region - if (clear) { - dirtyAll(); - } else { - cairo_rectangle_int_t crect = { _x0, _y0, allocation.width, allocation.height }; - cairo_region_intersect_rectangle(_clean_region, &crect); - } + gtk_widget_get_allocation(&_widget, &allocation); + resizeTiles(_x0, _y0, _x0 + allocation.width, _y0 + allocation.height); if (SP_CANVAS_ITEM_GET_CLASS(_root)->viewbox_changed) { SP_CANVAS_ITEM_GET_CLASS(_root)->viewbox_changed(_root, new_area); } @@ -2018,17 +2020,19 @@ void SPCanvas::scrollTo(double cx, double cy, unsigned int clear, bool is_scroll if (!clear) { // scrolling without zoom; redraw only the newly exposed areas if ((dx != 0) || (dy != 0)) { + this->_is_scrolling = is_scrolling; if (gtk_widget_get_realized(GTK_WIDGET(this))) { gdk_window_scroll(getWindow(this), -dx, -dy); } } + } else { + // scrolling as part of zoom; do nothing here - the next do_update will perform full redraw } - addIdle(); } void SPCanvas::updateNow() { - if (_need_update) { + if (_need_update || _need_redraw) { doUpdate(); } } @@ -2041,45 +2045,26 @@ void SPCanvas::requestUpdate() void SPCanvas::requestRedraw(int x0, int y0, int x1, int y1) { + GtkAllocation allocation; + if (!gtk_widget_is_drawable( GTK_WIDGET(this) )) { return; } - if (x0 >= x1 || y0 >= y1) { + if ((x0 >= x1) || (y0 >= y1)) { return; } Geom::IntRect bbox(x0, y0, x1, y1); - dirtyRect(bbox); - addIdle(); -} - -void SPCanvas::setBackgroundColor(guint32 rgba) { - double new_r = SP_RGBA32_R_F(rgba); - double new_g = SP_RGBA32_G_F(rgba); - double new_b = SP_RGBA32_B_F(rgba); - if (!_background_is_checkerboard) { - double old_r, old_g, old_b; - cairo_pattern_get_rgba(_background, &old_r, &old_g, &old_b, NULL); - if (new_r == old_r && new_g == old_g && new_b == old_b) return; - } - if (_background) { - cairo_pattern_destroy(_background); - } - _background = cairo_pattern_create_rgb(new_r, new_g, new_b); - _background_is_checkerboard = false; - dirtyAll(); - addIdle(); -} + gtk_widget_get_allocation(GTK_WIDGET(this), &allocation); -void SPCanvas::setBackgroundCheckerboard() { - if (_background_is_checkerboard) return; - if (_background) { - cairo_pattern_destroy(_background); + Geom::IntRect canvas_rect = Geom::IntRect::from_xywh(this->_x0, this->_y0, + allocation.width, allocation.height); + + Geom::OptIntRect clip = bbox & canvas_rect; + if (clip) { + dirtyRect(*clip); + addIdle(); } - _background = ink_cairo_pattern_create_checkerboard(); - _background_is_checkerboard = true; - dirtyAll(); - addIdle(); } /** @@ -2183,24 +2168,63 @@ inline int sp_canvas_tile_ceil(int x) return ((x + (TILE_SIZE - 1)) & (~(TILE_SIZE - 1))) / TILE_SIZE; } -void SPCanvas::dirtyRect(Geom::IntRect const &area) { - markRect(area, 1); +void SPCanvas::resizeTiles(int nl, int nt, int nr, int nb) +{ + if ( nl >= nr || nt >= nb ) { + if (_tiles) g_free(_tiles); + _tLeft = _tTop = _tRight = _tBottom = 0; + _tile_h = _tile_h = 0; + _tiles = NULL; + return; + } + int tl = sp_canvas_tile_floor(nl); + int tt = sp_canvas_tile_floor(nt); + int tr = sp_canvas_tile_ceil(nr); + int tb = sp_canvas_tile_ceil(nb); + + int nh = tr-tl, nv = tb-tt; + uint8_t *ntiles = (uint8_t*) g_malloc(nh * nv * sizeof(uint8_t)); + for (int i = tl; i < tr; i++) { + for (int j = tt; j < tb; j++) { + int ind = (i-tl) + (j-tt)*nh; + if ( i >= _tLeft && i < _tRight && j >= _tTop && j < _tBottom ) { + ntiles[ind] = _tiles[(i - _tLeft) + (j - _tTop) * _tile_h]; // copy from the old tile + } else { + ntiles[ind] = 0; // newly exposed areas get 0 + } + } + } + if (_tiles) g_free(_tiles); + _tiles = ntiles; + _tLeft = tl; + _tTop = tt; + _tRight = tr; + _tBottom = tb; + _tile_h = nh; + _tile_h = nv; } -void SPCanvas::dirtyAll() { - if (_clean_region && !cairo_region_is_empty(_clean_region)) { - cairo_region_destroy(_clean_region); - _clean_region = cairo_region_create(); - } +void SPCanvas::dirtyRect(Geom::IntRect const &area) { + _need_redraw = TRUE; + markRect(area, 1); } void SPCanvas::markRect(Geom::IntRect const &area, uint8_t val) { - cairo_rectangle_int_t crect = { area.left(), area.top(), area.width(), area.height() }; - if (val) { - cairo_region_subtract_rectangle(_clean_region, &crect); - } else { - cairo_region_union_rectangle(_clean_region, &crect); + int tl = sp_canvas_tile_floor(area.left()); + int tt = sp_canvas_tile_floor(area.top()); + int tr = sp_canvas_tile_ceil(area.right()); + int tb = sp_canvas_tile_ceil(area.bottom()); + if ( tl >= _tRight || tr <= _tLeft || tt >= _tBottom || tb <= _tTop ) return; + if ( tl < _tLeft ) tl = _tLeft; + if ( tr > _tRight ) tr = _tRight; + if ( tt < _tTop ) tt = _tTop; + if ( tb > _tBottom ) tb = _tBottom; + + for (int i=tl; i * Lauris Kaplinski * Jon A. Cruz - * Krzysztof Kosiński * * Copyright (C) 1998 The Free Software Foundation * Copyright (C) 2002 Lauris Kaplinski - * Copyright (C) 2016 Google Inc. * * Released under GNU GPL, read the file 'COPYING' for more information */ @@ -87,9 +85,6 @@ struct SPCanvas { Geom::IntRect getViewboxIntegers() const; SPCanvasGroup *getRoot(); - void setBackgroundColor(guint32 rgba); - void setBackgroundCheckerboard(); - /// Returns new canvas as widget. static GtkWidget *createAA(); @@ -108,8 +103,7 @@ private: /// Marks the specified area as dirty (requiring redraw) void dirtyRect(Geom::IntRect const &area); - /// Marks the whole widget for redraw - void dirtyAll(); + /// Marks specific canvas rectangle as clean (val == 0) or dirty (otherwise) void markRect(Geom::IntRect const &area, uint8_t val); /// Invokes update, paint, and repick on canvas. @@ -161,8 +155,9 @@ public: */ static gint handle_scroll(GtkWidget *widget, GdkEventScroll *event); static gint handle_motion(GtkWidget *widget, GdkEventMotion *event); +#if GTK_CHECK_VERSION(3,0,0) static gboolean handle_draw(GtkWidget *widget, cairo_t *cr); -#if !GTK_CHECK_VERSION(3,0,0) +#else static gboolean handle_expose(GtkWidget *widget, GdkEventExpose *event); #endif static gint handle_key_event(GtkWidget *widget, GdkEventKey *event); @@ -181,18 +176,15 @@ public: bool _is_dragging; double _dx0; double _dy0; - int _x0; ///< World coordinate of the leftmost pixels - int _y0; ///< World coordinate of the topmost pixels - - /// Image surface storing the contents of the widget - cairo_surface_t *_backing_store; - /// Area of the widget that has up-to-date content - cairo_region_t *_clean_region; - /// Widget background, defaults to white - cairo_pattern_t *_background; - bool _background_is_checkerboard; - - /// Last known modifier state, for deferred repick when a button is down. + int _x0; + int _y0; + + /* Area that needs redrawing, stored as a microtile array */ + int _tLeft, _tTop, _tRight, _tBottom; + int _tile_w, _tile_h; + uint8_t *_tiles; + + /** Last known modifier state, for deferred repick when a button is down. */ int _state; /** The item containing the mouse pointer, or NULL if none. */ @@ -216,6 +208,7 @@ public: int _close_enough; unsigned int _need_update : 1; + unsigned int _need_redraw : 1; unsigned int _need_repick : 1; int _forced_redraw_count; -- cgit v1.2.3
    - This adds new stop(s) in the middle(s) between adjacent, selected stops or, if only one stop is selected, in the middle of the segment that starts with the selected stop. + Ajoute un ou plusieurs stops au milieu d'un ou plusieurs segments, ce qui implique qu'au moins deux poignées adjacentes doivent être sélectionnées.
    - Sculpter déplace les stops intermédiaires sélectionnés en fonction de leur distance par rapport au stop sur lequel s'effectue le cliquer-glisser, en utilisant un courbe régulière en forme de cloche similaire à celle du mode sculpter de l'outil Nœud. + Sculpter déplace les stops intermédiaires sélectionnés en fonction de leur distance par rapport au stop sur lequel s'effectue le cliquer-glisser, en utilisant un courbe régulière en forme de cloche similaire à celle du mode sculpter de l'outil Nœuds.
    - Lorsqu'une poignée de dégradé (avec l'outil Dégradé) est sélectionnés, cette poignée prend la couleur et non pas l'objet tout entier. + Lorsqu'une poignée de dégradé (avec l'outil Dégradé) est sélectionnée, cette poignée prend la couleur et non pas l'objet tout entier.