diff --git a/ChangeLog b/ChangeLog index 403fa5974a..498b5acf36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4010 @@ +commit 6582692ec6c8196108b2d42f6758c62076a88d13 +Author: Michael Natterer +Date: Tue Apr 17 21:27:05 2018 +0200 + + configure.ac: release 2.10.0-RC2 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 27d75a5bd0027e33521aedee7971ad7c76a2649c +Author: Øyvind Kolås +Date: Tue Apr 17 21:24:08 2018 +0200 + + NEWS: mention CIE Lab gradient blending + + NEWS | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit ff82b3779c09745ac96fc709469896a3ef7fa9cd +Author: Michael Natterer +Date: Tue Apr 17 21:21:33 2018 +0200 + + NEWS: more updates + + NEWS | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 5e3df8032ad726f8bb7608e904a43175cbb41f4b +Author: Michael Natterer +Date: Tue Apr 17 21:16:50 2018 +0200 + + NEWS: mention new libgimp API + + NEWS | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 4d94863abcb267af962fa0ba0df56a98b7f44da0 +Author: Michael Natterer +Date: Tue Apr 17 20:44:03 2018 +0200 + + app: don't use style->dark for histogram and curve intersections/grid + + because it's always darker than "bg" and not visible in dark themes. + Instead, use "text_aa" which is always between "text" and "base". + + app/widgets/gimpcurveview.c | 2 +- + app/widgets/gimphistogramview.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 434728da084297aabbf9ec134f675ec23c0a6cbc +Author: Michael Natterer +Date: Tue Apr 17 19:59:06 2018 +0200 + + themes: switch Dark's base[SELECTED] and text[SELECTED] colors + + so selected text is totally obvious. Also improves histogram and other + places which use base/text's higher contrast. + + themes/Dark/gtkrc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 436e53d39075c376ad32746420b0d17bb7679c62 +Author: Michael Natterer +Date: Tue Apr 17 13:17:13 2018 +0200 + + pdb: improve docs about which procedures are affected by context + settings + + Also add some double blank lines so they show up as single blank + lines in the generated docs, which improves readablility. + + app/pdb/context-cmds.c | 33 +++++++++++++++++++++++++++------ + app/pdb/drawable-edit-cmds.c | 10 ++++++++-- + app/pdb/image-select-cmds.c | 9 +++++++++ + libgimp/gimpcontext_pdb.c | 37 ++++++++++++++++++++++++++++++++----- + libgimp/gimpdrawableedit_pdb.c | 14 ++++++++++++-- + libgimp/gimpimageselect_pdb.c | 9 +++++++++ + pdb/groups/context.pdb | 38 + +++++++++++++++++++++++++++++++++----- + pdb/groups/drawable_edit.pdb | 14 ++++++++++++-- + pdb/groups/image_select.pdb | 9 +++++++++ + 9 files changed, 151 insertions(+), 22 deletions(-) + +commit e02a03a63d3213b6facb7a0b3fa72ab94bc643c4 +Author: Michael Natterer +Date: Tue Apr 17 13:16:31 2018 +0200 + + devel-docs: add missing stuff to libgimpbase-sections.txt + + devel-docs/libgimpbase/libgimpbase-sections.txt | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 93313cd93c537b64edd036947bf0eb11ccd585a4 +Author: Michael Natterer +Date: Tue Apr 17 12:56:39 2018 +0200 + + docs, etc: system gimprc and manpage regenerated with new setting + + (filter-tool-use-last-settings no) + + docs/gimprc.5.in | 6 ++++++ + etc/gimprc.in | 5 +++++ + 2 files changed, 11 insertions(+) + +commit 93f41b344c0b6af7561a9ff6aefc04ca168b7f3c +Author: Michael Natterer +Date: Tue Apr 17 01:16:54 2018 +0200 + + pdb: improve docs of gimp_context_set_diagonal_neighbors() + + app/pdb/context-cmds.c | 2 +- + libgimp/gimpcontext_pdb.c | 3 ++- + pdb/groups/context.pdb | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) + +commit c0dd812ea6b546ed14ed655d075226aae06ef017 +Author: Michael Natterer +Date: Tue Apr 17 00:42:15 2018 +0200 + + pdb: fix use of "seed" properties in plug_in_compat.pdb + + now that GeglParamSpecSeed is uint. + + app/pdb/plug-in-compat-cmds.c | 12 ++++++------ + pdb/groups/plug_in_compat.pdb | 12 ++++++------ + 2 files changed, 12 insertions(+), 12 deletions(-) + +commit 2da25576c3a14bba06ddb395e8e1858a0c0a9beb +Author: Michael Natterer +Date: Tue Apr 17 00:12:01 2018 +0200 + + app: fix duplication of GeglParamSpecSeed, we missed its limits before + + (which are probably never used, but still) + + app/core/gimpparamspecs-duplicate.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit cb84e0ab56f556492e16ccd4515b555a4c1d0f08 +Author: Michael Natterer +Date: Tue Apr 17 00:07:55 2018 +0200 + + configure.ac: reqire GEGL >= 0.3.34 + + app/sanity.c | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit fff0717632d402d62d57b3ac9cb604f09e8ab6a6 +Author: Tobias Ellinghaus +Date: Mon Apr 16 23:54:45 2018 +0200 + + PFM: Fix writing with ',' as decimal separator + + Some locales (like German) use ',' as the decimal separator, so using + printf like functions to output a float value fails when the result + should always use '.'. Since there are only two distinct possibilities + we just write the string representation and be done with it. + + plug-ins/common/file-pnm.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4bcc1183e5ff9783b8eb8a420b1eee8c60b7db14 +Author: Michael Natterer +Date: Mon Apr 16 21:44:47 2018 +0200 + + devel-docs: add new libgimp functions + + devel-docs/libgimp/libgimp-sections.txt | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +commit 233ac80de16c89ddef4397fe1a09907354b45b92 +Author: Michael Natterer +Date: Mon Apr 16 20:12:12 2018 +0200 + + script-fu: port all scripts to the new gimp-drawable-edit functions + + plug-ins/script-fu/scripts/add-bevel.scm | 6 +-- + plug-ins/script-fu/scripts/addborder.scm | 10 ++-- + plug-ins/script-fu/scripts/burn-in-anim.scm | 61 + ++++++++++++----------- + plug-ins/script-fu/scripts/carve-it.scm | 14 +++--- + plug-ins/script-fu/scripts/chrome-it.scm | 20 ++++---- + plug-ins/script-fu/scripts/circuit.scm | 4 +- + plug-ins/script-fu/scripts/clothify.scm | 3 +- + plug-ins/script-fu/scripts/coffee.scm | 21 ++++---- + plug-ins/script-fu/scripts/distress-selection.scm | 4 +- + plug-ins/script-fu/scripts/drop-shadow.scm | 6 +-- + plug-ins/script-fu/scripts/erase-rows.scm | 6 ++- + plug-ins/script-fu/scripts/font-map.scm | 4 +- + plug-ins/script-fu/scripts/fuzzyborder.scm | 10 ++-- + plug-ins/script-fu/scripts/gradient-example.scm | 14 ++++-- + plug-ins/script-fu/scripts/grid-system.scm | 2 +- + plug-ins/script-fu/scripts/lava.scm | 2 +- + plug-ins/script-fu/scripts/line-nova.scm | 2 +- + plug-ins/script-fu/scripts/mkbrush.scm | 10 ++-- + plug-ins/script-fu/scripts/old-photo.scm | 2 +- + plug-ins/script-fu/scripts/perspective-shadow.scm | 4 +- + plug-ins/script-fu/scripts/predator.scm | 2 +- + plug-ins/script-fu/scripts/ripply-anim.scm | 4 +- + plug-ins/script-fu/scripts/round-corners.scm | 2 +- + plug-ins/script-fu/scripts/slide.scm | 4 +- + plug-ins/script-fu/scripts/test-sphere.scm | 29 ++++++----- + plug-ins/script-fu/scripts/weave.scm | 31 +++++++----- + plug-ins/script-fu/scripts/xach-effect.scm | 14 +++--- + 27 files changed, 162 insertions(+), 129 deletions(-) + +commit 90ef8b123cf8d5ae4439a76eb4fee7670e0fb68f +Author: Michael Natterer +Date: Mon Apr 16 16:13:46 2018 +0200 + + libgimp: properly sort gimp.defs + + libgimp/gimp.def | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ddfc7715cbcd8d165520902bc0abfff3c09b88f4 +Author: Ell +Date: Mon Apr 16 09:49:15 2018 -0400 + + app: make the airbrush tool thread-safe w.r.t. paint thread + + GimpAirbrush currently performs painting and flushes the image on + its own during the airbrush timeout. This is unsafe w.r.t. the + paint thread, since the timeout is run on the main thread, while + paint commands should run on the paint thread. + + Add a "timeout" signal to GimpAirbrush, and simply emit this signal + during the airbrush timeout, rather than actually painting. + + Connect to this signal in GimpAirbrushTool, and use + gimppaintool-paint to perform the actual painting, in a thread-safe + manner (see the previous commit.) + + app/paint/gimpairbrush.c | 37 ++++++++++++++++++++----------------- + app/paint/gimpairbrush.h | 11 +++++------ + app/tools/gimpairbrushtool.c | 33 ++++++++++++++++++++++++++++++++- + 3 files changed, 57 insertions(+), 24 deletions(-) + +commit e02a339e01df51f96ed4d017ce4ae7b7c0a9f83d +Author: Ell +Date: Mon Apr 16 09:36:35 2018 -0400 + + app: reorganize gimppainttool-paint, to allow use by subclasses + + We'd like subclasses of GimpPaintTool to be able to issue paint + commands to the tool's paint-core (in particular, see the next + commit.) Since paint commands should be executed on the paint + thread, the subclasses must not call the paint-core functions + directly, but should rather let gimppainttool-paint issue the + commands on their behalf. + + Reorgainze gimppainttool-paint to make it usable for this purpose + by subclasses. In particular, add + gimp_paint_tool_paint_core_paint() and + gimp_paint_tool_paint_core_interpolate(), which call the + corresponding paint-core functions on the paint thread. + + Additionally, rename the {start,end,flush}_paint() virtual + functions of GimpPaintTool to paint_{start,end,flush}(), and rename + gimp_paint_tool_is_painting() to gimp_paint_tool_paint_is_active(), + so that all the gimppainttool-paint-related stuff are grouped under + the same namespace. + + app/tools/gimpbrushtool.c | 33 +++++----- + app/tools/gimppainttool-paint.c | 140 + ++++++++++++++++++++++++++++++++++------ + app/tools/gimppainttool-paint.h | 35 ++++++---- + app/tools/gimppainttool.c | 6 -- + app/tools/gimppainttool.h | 8 +-- + 5 files changed, 163 insertions(+), 59 deletions(-) + +commit 3f4995d3d71f294271a71b707133e098243a7331 +Author: Michael Natterer +Date: Mon Apr 16 11:42:46 2018 +0200 + + pdb: add procedures to set the built-in gradients + + gimp-context-set-gradient-fg-bg-rgb + gimp-context-set-gradient-fg-bg-hsv-cw + gimp-context-set-gradient-fg-bg-hsv-ccw + gimp-context-set-gradient-fg-transparent + + app/pdb/context-cmds.c | 125 + ++++++++++++++++++++++++++++++++++++++++++++++ + app/pdb/internal-procs.c | 2 +- + libgimp/gimp.def | 4 ++ + libgimp/gimpcontext_pdb.c | 124 + +++++++++++++++++++++++++++++++++++++++++++++ + libgimp/gimpcontext_pdb.h | 4 ++ + pdb/groups/context.pdb | 85 +++++++++++++++++++++++++++++++ + 6 files changed, 343 insertions(+), 1 deletion(-) + +commit 92a8978064eb52e1072ed4b83ea1d505507a1f8a +Author: Jehan +Date: Mon Apr 16 09:13:59 2018 +0200 + + data: re-add 3 brushes of very questionable origin, but as "obsolete". + + So I discover the concept of obsolete data in GIMP where some data can + be apparently unavailable in the GUI, but still selectable by script. + This somehow reverts commit 26cb87aa2dfaaa63c71cc4e5dfe40c75f8005353 + then moves the brushes into the obsolete section instead of simple + deletion. This way, any script using the said brushes won't break at + least. + + We will definitely remove the brushes for 3.0, but for now it's better + to keep scripts as compatible as possible. + + data/brushes/gimp-obsolete-files/Makefile.am | 3 +++ + data/brushes/gimp-obsolete-files/dunes.gbr | Bin 0 -> 1100 bytes + data/brushes/gimp-obsolete-files/galaxy-big.gbr | Bin 0 -> 10040 bytes + data/brushes/gimp-obsolete-files/galaxy.gbr | Bin 0 -> 2637 bytes + 4 files changed, 3 insertions(+) + +commit 64bab848c323ae47e0565c150873819592e6fba3 +Author: Jehan +Date: Mon Apr 16 09:11:41 2018 +0200 + + NEWS, devel-docs: next release is RC2 + some fixes in release howto. + + NEWS | 4 ++-- + devel-docs/release-howto.txt | 12 ++++++------ + 2 files changed, 8 insertions(+), 8 deletions(-) + +commit d3124d980a99a583cf230922d53f1a1991cc6b82 +Author: Sebastian Rasmussen +Date: Mon Apr 16 07:11:27 2018 +0000 + + Update Swedish translation + + po-libgimp/sv.po | 1079 + ++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 680 insertions(+), 399 deletions(-) + +commit 410e55c40c09f5623d80dbbf91e185dfefb22c67 +Author: Michael Natterer +Date: Mon Apr 16 01:18:05 2018 +0200 + + pdb: never pass bogus supersample values to gimp_drawable_gradient() + + even when supersampling is not enabled, or we will get warnings about + out-of-range property values. + + app/pdb/drawable-edit-cmds.c | 20 ++++++++++++++------ + app/pdb/edit-cmds.c | 18 +++++++++++++----- + pdb/groups/drawable_edit.pdb | 20 ++++++++++++++------ + pdb/groups/edit.pdb | 18 +++++++++++++----- + 4 files changed, 54 insertions(+), 22 deletions(-) + +commit 055e61f06558615b297163b689043bea258c6eed +Author: Marco Ciampa +Date: Sun Apr 15 17:53:37 2018 +0200 + + Updated Italian translation + + po-libgimp/it.po | 294 + +++++++++++++++++++++++++++++-------------------------- + 1 file changed, 157 insertions(+), 137 deletions(-) + +commit c30239c912b393c4884399bf481d7cbfb48b160f +Author: Marco Ciampa +Date: Sun Apr 15 17:52:05 2018 +0200 + + Updated Italian translation + + po-plug-ins/it.po | 24 ++++++++++++++---------- + 1 file changed, 14 insertions(+), 10 deletions(-) + +commit bba7130cc24c9ec7d8ad8c6ef5ae03d7bf38d0ac +Author: Marco Ciampa +Date: Sun Apr 15 17:50:36 2018 +0200 + + Updated Italian translation + + po/it.po | 2381 + ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 1309 insertions(+), 1072 deletions(-) + +commit dbf57b44941168758998eca658faa169e3e2a0bd +Author: Alexandre Prokoudine +Date: Sun Apr 15 17:52:37 2018 +0300 + + Update Russian translation + + po-libgimp/ru.po | 502 +++++++++++++++++++++------------- + po/ru.po | 817 + ++++++++++++++++++++++++++++++------------------------- + 2 files changed, 758 insertions(+), 561 deletions(-) + +commit 5ee67deea5d49ad2a4328e055841ea2b81553a20 +Author: Michael Natterer +Date: Sun Apr 15 16:39:59 2018 +0200 + + pdb: deprecate all non-clipboard functions in the "edit" group + + Still have to port script-fu scripts... + + app/pdb/edit-cmds.c | 48 +++++++++++------- + libgimp/gimpedit_pdb.c | 14 ++++++ + libgimp/gimpedit_pdb.h | 7 +++ + libgimp/gimpexport.c | 2 +- + pdb/groups/edit.pdb | 16 ++++++ + plug-ins/gfig/gfig-dialog.c | 96 + ++++++++++++++++-------------------- + plug-ins/screenshot/screenshot-x11.c | 2 +- + 7 files changed, 113 insertions(+), 72 deletions(-) + +commit 1305926f38f0552675f667661236c144ad24b5e1 +Author: Michael Natterer +Date: Sun Apr 15 16:15:07 2018 +0200 + + pdb: forgot to add drawable_edit.pdb + + pdb/groups/drawable_edit.pdb | 433 + +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 433 insertions(+) + +commit c50449670b3b4292f463b1b80894abb8de2dc91b +Author: Tobias Ellinghaus +Date: Sun Apr 15 16:10:04 2018 +0200 + + Fix build with vector icons enabled + + The invert-svg tool was never built so generating the + Symbolic-Inverted + icons failed. Thanks Ell for the hint how to fix this. + + tools/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ef3edece9b6c685766bbd490cc7586facc90547c +Author: Michael Natterer +Date: Sun Apr 15 16:06:00 2018 +0200 + + pdb: improve docs of deprecated functions + + Don't unconditionally overwrite all the proc's description, author + etc. Instead, try to preserve them and append the "Deprecated" notes + to the help texts and generated comments. + + Only affects one procedure because we killed the meta info of all + other deprecated procs so far, but now we don't have to do that any + longer. + + app/pdb/text-layer-cmds.c | 4 +++- + libgimp/gimptextlayer_pdb.c | 6 ++++++ + pdb/app.pl | 24 +++++++++++++++++++++++- + pdb/lib.pl | 22 ++++++++++++++++++---- + pdb/stddefs.pdb | 4 ++-- + 5 files changed, 52 insertions(+), 8 deletions(-) + +commit 50536e1c3822a58db26c8061a51240bb94782e20 +Author: Michael Natterer +Date: Sun Apr 15 14:57:25 2018 +0200 + + Bug 795230 - Rename Blend tool and provide PDB compatibility + + Add new PDB group "drawable_edit" which has all procedures from the + "edit" group which are not cut/copy/paste. + + The new group's procedures don't have opacity, paint_mode + etc. arguments but take them from the context instead. Unlike the old + gimp-edit-fill, gimp-drawable-edit-fill now uses the context's opacity + and paint_mode. + + The new gimp-drawable-edit-gradient-fill procedure uses even more + context properties which are also newly added with this commit + (gradient_color_space, gradient_repeat_mode, gradient_reverse). + + And some cleanup in context.pdb. + + This is still WIP, nothing in the edit group is depcreated yet. + + app/pdb/Makefile.am | 1 + + app/pdb/context-cmds.c | 532 + ++++++++++++++++++++++------ + app/pdb/drawable-edit-cmds.c | 609 + ++++++++++++++++++++++++++++++++ + app/pdb/edit-cmds.c | 6 +- + app/pdb/internal-procs.c | 3 +- + app/pdb/internal-procs.h | 1 + + devel-docs/libgimp/libgimp-docs.sgml | 1 + + devel-docs/libgimp/libgimp-sections.txt | 10 + + libgimp/Makefile.am | 2 + + libgimp/gimp.def | 12 + + libgimp/gimp_pdb_headers.h | 1 + + libgimp/gimpcontext_pdb.c | 352 +++++++++++++----- + libgimp/gimpcontext_pdb.h | 226 ++++++------ + libgimp/gimpdrawableedit_pdb.c | 310 ++++++++++++++++ + libgimp/gimpdrawableedit_pdb.h | 60 ++++ + pdb/Makefile.am | 1 + + pdb/groups.pl | 1 + + pdb/groups/context.pdb | 303 ++++++++++++---- + pdb/groups/edit.pdb | 2 - + po/POTFILES.in | 1 + + 20 files changed, 2077 insertions(+), 357 deletions(-) + +commit 1a277f2cc6c4c0e50fcd9faf4c24714da10cb5ee +Author: Ell +Date: Sun Apr 15 03:24:43 2018 -0400 + + icons: s/gimp-tool-blend/gimp-tool-gradient/ in SVG icons + + In particular, so that we use the correct element IDs, if we ever + extract the icons based on element ID. + + icons/Color/24/gimp-tool-gradient.svg | 2 +- + icons/Color/color-scalable.svg | 4 ++-- + icons/Color/scalable/gimp-tool-gradient.svg | 2 +- + icons/Symbolic/24/gimp-tool-gradient.svg | 4 ++-- + icons/Symbolic/scalable/gimp-tool-gradient.svg | 4 ++-- + icons/Symbolic/symbolic-scalable.svg | 6 +++--- + 6 files changed, 11 insertions(+), 11 deletions(-) + +commit 02808e8072c336ff5bc1312a0bedc2a95fda3919 +Merge: e30a32d56e 92330425c8 +Author: Ell +Date: Sun Apr 15 03:30:52 2018 -0400 + + Merge branch 'fix-gradient-history' + + This fixes the history of app/core/gimpdrawable-gradient.h, and + app/tools/gimpgradienttool{.c,-editor.{c,h}}. + +commit 92330425c8f5350cac0bed8ea146f135029e4aca +Author: Michael Natterer +Date: Sat Apr 14 00:52:20 2018 +0200 + + Bug 795230 - Rename Blend tool and provide PDB compatibility + + Redo the part of commits b0beb0197a4bd2c14ded20da976d4affd0c94729, + c3f98cccbdb6a154ca6efea043e46c9c532a407c, + 6b0f5136e09f64a830b65037f48493fc0040674f, + and 3736bfd189c53637f04fb751ed8d02070e6289fb, reverted by commit + e30a32d56e123a9e221102cc2707fd697f1d7945. + + app/tools/gimpgradienttool-editor.c | 1437 + +++++++++++++++++------------------ + app/tools/gimpgradienttool-editor.h | 38 +- + app/tools/gimpgradienttool.c | 837 ++++++++++---------- + 3 files changed, 1156 insertions(+), 1156 deletions(-) + +commit 2e69608a46190cf4b0214a942f616ef3fde9e3a2 +Author: Michael Natterer +Date: Sat Apr 14 00:52:20 2018 +0200 + + Bug 795230 - Rename Blend tool and provide PDB compatibility + + Rename gimpblendtool{.c,-editor.{c,h}} to + gimpgradientool{.c,-editor.{c,h}}. Note that this commit only + renames the files; the actual changes are done in the next commit, + so that git doesn't consider them new files. + + app/tools/{gimpblendtool-editor.c => gimpgradienttool-editor.c} | 0 + app/tools/{gimpblendtool-editor.h => gimpgradienttool-editor.h} | 0 + app/tools/{gimpblendtool.c => gimpgradienttool.c} | 0 + 3 files changed, 0 insertions(+), 0 deletions(-) + +commit 721ce91d75e574657a8ba57d6a37e98783e36059 +Author: Michael Natterer +Date: Fri Apr 13 23:43:27 2018 +0200 + + Bug 795230 - Rename Blend tool and provide PDB compatibility + + Redo the part of commits 4f2e078ccb7be72c3af4641781f23b7d0c27f25e + and 5f6dfc7617cb8d50173707ad748fd172107e06f6, reverted by commit + e30a32d56e123a9e221102cc2707fd697f1d7945. + + app/core/gimpdrawable-gradient.h | 53 + ++++++++++++++++++++-------------------- + 1 file changed, 27 insertions(+), 26 deletions(-) + +commit 9fd44d5e44ea13d5419e4cc40e620563b2530d21 +Author: Michael Natterer +Date: Fri Apr 13 23:43:27 2018 +0200 + + Bug 795230 - Rename Blend tool and provide PDB compatibility + + Rename gimpdrawable-blend.h to gimpdrawable-gradient.h. Note that + this commit only renames the file; the actual changes are done in + the next commit, so that git doesn't consider this a new file. + + app/core/{gimpdrawable-blend.h => gimpdrawable-gradient.h} | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit e30a32d56e123a9e221102cc2707fd697f1d7945 +Author: Ell +Date: Sun Apr 15 02:42:35 2018 -0400 + + Bug 795230 - Rename Blend tool and provide PDB compatibility + + Partially revert commits 4f2e078ccb7be72c3af4641781f23b7d0c27f25e + and b0beb0197a4bd2c14ded20da976d4affd0c94729, since the changes + they introduced to some of the renamed files were big enough for + git to consider them entirely new files, hence we lost their + history. The next few commits fix this. + + This commit also partially or entirely undoes followup commits + 5f6dfc7617cb8d50173707ad748fd172107e06f6, + c3f98cccbdb6a154ca6efea043e46c9c532a407c, + 6b0f5136e09f64a830b65037f48493fc0040674f, + and 3736bfd189c53637f04fb751ed8d02070e6289fb, which will be + restored by the next few commits as well. + + app/core/gimpdrawable-blend.h | 49 + + app/core/gimpdrawable-gradient.h | 50 - + app/tools/gimpblendtool-editor.c | 2518 + +++++++++++++++++++++++++++++++++++ + app/tools/gimpblendtool-editor.h | 48 + + app/tools/gimpblendtool.c | 1072 +++++++++++++++ + app/tools/gimpgradienttool-editor.c | 2517 + ---------------------------------- + app/tools/gimpgradienttool-editor.h | 48 - + app/tools/gimpgradienttool.c | 1073 --------------- + 8 files changed, 3687 insertions(+), 3688 deletions(-) + +commit 309d118f6528bd2ae480c241a190e2d26a0ee8fa +Author: Jehan +Date: Sun Apr 15 02:15:14 2018 +0200 + + app, devel-docs: improve position of loading text on splash image. + + The upper text will be centered on the top quarter of the bottom + quarter + of the splash image, whereas the bottom text will be centered on the + bottom quarter of the bottom quarter of the splash (unless the + splash is + too small, in which case the double of the layout pixel extents + will be + used). Basically don't use absolute pixel values anymore for + positionning. This should all be done relatively since there are + nowadays all kind of display size (and positionning the text 6 + pixels to + the bottom, as it was done, may be ok on low density displays, + yet will + look ugly on high density screens). + + Also write this down in the splash requirements in the release + howto so + that splash designers are aware that the bottom quarter of their image + will have to be adapted for printing text. + + app/gui/splash.c | 37 ++++++++++++++++++++++++++++++++----- + devel-docs/release-howto.txt | 2 ++ + 2 files changed, 34 insertions(+), 5 deletions(-) + +commit 09b16f6cc085aeb523a1eacf1ba479db6c4ff165 +Author: Ell +Date: Sat Apr 14 17:55:44 2018 -0400 + + app: avoid copying the brush boundary on each brush tool flush() + + In GimpBrushTool, remember the settings used for the last cached + brush boundary, and avoid creating a new copy if the settings + didn't change. This should lower the overhead of + gimp_brush_tool_flush_paint() when not using dynamics. + + app/tools/gimpbrushtool.c | 43 + ++++++++++++++++++++++++++++++++++++------- + app/tools/gimpbrushtool.h | 5 +++++ + 2 files changed, 41 insertions(+), 7 deletions(-) + +commit 1806e56405cb0579f521a27d71c00aa417d27d32 +Author: Jehan +Date: Sun Apr 15 00:09:57 2018 +0200 + + INSTALL: make clear not to install libmypaint from master. + + Also add a note about installing possibly from the release tarball or + from the package manager of a distribution, since apparently some + assume + it has to be installed from repository, making their own life harder + that it has to! + Finally split the libmypaint and mypaint-brushes into their own + numbers + to make things even clearer. + + INSTALL.in | 24 ++++++++++++++---------- + 1 file changed, 14 insertions(+), 10 deletions(-) + +commit 9674186bed1a3482102df682bad04d4aa0066d15 +Author: Anders Jonsson +Date: Sat Apr 14 20:19:18 2018 +0000 + + Update Swedish translation + + po-script-fu/sv.po | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 7e82a24875c090222529a5480e7868527548d0a6 +Author: Anders Jonsson +Date: Sat Apr 14 20:10:35 2018 +0000 + + Update Swedish translation + + po-plug-ins/sv.po | 60 + ++++++++++++++++++++----------------------------------- + 1 file changed, 22 insertions(+), 38 deletions(-) + +commit f505f57bd89217ac70f7db250917c3351af50d34 +Author: Sebastian Rasmussen +Date: Sat Apr 14 20:02:23 2018 +0000 + + Update Swedish translation + + po/sv.po | 24491 + +++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 14109 insertions(+), 10382 deletions(-) + +commit f365de49a03fd7ee532741692def3ec851500682 +Author: Piotr Drąg +Date: Sat Apr 14 21:18:03 2018 +0200 + + Update Polish translation + + po/pl.po | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit d528f80c16735f35f9d61f099323c1f246b27ecc +Author: Michael Natterer +Date: Sat Apr 14 21:14:52 2018 +0200 + + app: cast g_object_ref() argument in gimp_plug_in_proc_frame_init() + + app/plug-in/gimppluginprocframe.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3661097c04384dc23275387c6d48e632368e0a88 +Author: Michael Natterer +Date: Sat Apr 14 21:11:05 2018 +0200 + + app: add gimp_pdb_context_get_paint_options_list() + + Which returns the entire GimpContainer of paint options. + + app/pdb/gimppdbcontext.c | 8 ++++++++ + app/pdb/gimppdbcontext.h | 2 ++ + 2 files changed, 10 insertions(+) + +commit 0c066f311e3024a90fe835feb9f89906d7882fb4 +Author: Michael Natterer +Date: Sat Apr 14 21:09:01 2018 +0200 + + app: drop alpha from all fishes in gimpgradient.c + + Alpha is calculated separately, ne need to run it through babl. + Also some formatting cleanup. + + app/core/gimpgradient.c | 58 + ++++++++++++++++++++++++++----------------------- + 1 file changed, 31 insertions(+), 27 deletions(-) + +commit 3736bfd189c53637f04fb751ed8d02070e6289fb +Author: Michael Natterer +Date: Sat Apr 14 21:06:13 2018 +0200 + + app: even in a "gradient tool" its called "Blending" not "Gradienting" + + app/tools/gimpgradienttool-editor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8cc1258444a888ecb5deee568cbdd211ad64ffdb +Author: Piotr Drąg +Date: Sat Apr 14 19:11:16 2018 +0200 + + Update Polish translation + + po-libgimp/pl.po | 255 + ++++++++++++++++++++++++++++--------------------------- + 1 file changed, 130 insertions(+), 125 deletions(-) + +commit 6d6da684f1cb4e07bce4883f6d37b1865d58d942 +Author: Øyvind Kolås +Date: Sat Apr 14 18:11:57 2018 +0200 + + app: add handling of CIE Lab blend space to gradient + + Using CIE Lab yields gradients that more closely resemble the + perceptual + gradients but without the gamma based blending problems of linear-RGB + / CIE + XYZ. + + app/core/gimpgradient.c | 38 ++++++++++++++++++++++++++++++-------- + 1 file changed, 30 insertions(+), 8 deletions(-) + +commit e007da260476c7b4ad9a5c0cccc5a783ee6e5086 +Author: Øyvind Kolås +Date: Sat Apr 14 18:11:38 2018 +0200 + + libgimpbase: add GIMP_GRADIENT_BLEND_CIE_LAB value to enum + + libgimpbase/gimpbaseenums.c | 2 ++ + libgimpbase/gimpbaseenums.h | 3 ++- + pdb/enums.pl | 6 ++++-- + 3 files changed, 8 insertions(+), 3 deletions(-) + +commit f660d614f2bccbc0d0e3dd331fa2d03668dbc1c2 +Author: Jehan +Date: Sat Apr 14 16:18:18 2018 +0200 + + NEWS: keep up-to-date. + + NEWS | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 45c172a885dfa1684e3b0fad1a6e5cde5a1ccb0f +Author: Ell +Date: Sat Apr 14 09:48:10 2018 -0400 + + Bug 795257 - Segmentation fault crash using the clone tool + + Commit f5cb1fed85341a9d0a46fb1391b19fa9ea3ccb42, which performed + brush outline generation in GimpPaintTool in synchrony with the + paint thread, wasn't enough, since GimpSourceTool could still call + gimp_brush_tool_create_outline() directly during its + GimpDrawTool::draw() method, leading to the same race condition + when executed concurrently with the paint thread. + + Partially revert the above commit, so that outline generation is + handled as before, as far as GimpPaintTool is concenered. Instead, + add GimpPaintTool::{start,end,flush}_paint() virtual functions; the + first two are called when starting/ending painting using the paint + thread, while the third is called during the display-update + timeout, while the main thread and the paint thread are + synchronized. This allows subclasses to perform non-thread-safe + actions while the threads are synchronized. + + Override these functions in GimpBrushTool, and cache the brush + boundary in the flush() function. Use the cached boundary in + gimp_brush_tool_create_outline() while painting, to avoid the above + race condition, both when this function is called through + GimpPaintTool, and through GimpSourceTool. + + app/tools/gimpbrushtool.c | 109 + +++++++++++++++++++++++++++++++++------- + app/tools/gimpbrushtool.h | 6 ++- + app/tools/gimppainttool-paint.c | 60 +++++++--------------- + app/tools/gimppainttool.c | 34 ++++++------- + app/tools/gimppainttool.h | 58 +++++++++++---------- + 5 files changed, 160 insertions(+), 107 deletions(-) + +commit 3ac794816a97ebf76b71dddd610220f19bf7191e +Author: Jehan +Date: Sat Apr 14 15:36:08 2018 +0200 + + Bug 724692 - Canvas rotation stuck with specific order of actions. + + Commit b279c2d217 was breaking a specific use case, which I oversaw: + when space bar activates the move tool, you may want to release the + space bar while mouse button is pressed, and expect to still be + able to + move the layer/selection/guide, but releasing space was stopping the + move immediately. The move tool must only be deactivated when + both space + and button 1 are released, and the move itself must continue as + long as + button 1 is pressed (when started while space was pressed). + + As a nice side effect of this commit, panning and canvas rotation are + also improved since now they can be continued while releasing space + (respectively shift-space) if mouse button 1 was pressed, and up until + the mouse button is released. Pressing space again, then releasing the + mouse, back and forth, also work as expected (i.e. move tool stay + activated though the move stops; and panning or rotation continue). + + Of course now we don't get anymore panning/rotation stuck while + neither + space nor mouse buttons are pressed (which was the original bug). At + least one of these need to stay pressed for panning/rotation/move to + stay activated. And initial activation is obviously always through + (shift-)space only. + + app/display/gimpdisplayshell-tool-events.c | 54 + ++++++++++++++++++++++++------ + app/display/gimpdisplayshell.h | 6 ++++ + 2 files changed, 49 insertions(+), 11 deletions(-) + +commit 6b0f5136e09f64a830b65037f48493fc0040674f +Author: Jehan +Date: Sat Apr 14 14:27:36 2018 +0200 + + app: use "g" for gradient shortcut. + + It makes more sense than "l" as a default, and "g" was currently + unused. + So not much left to ponder. + + app/tools/gimpgradienttool.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5e98dade143189e1c0c636e387eb67590f7b124f +Author: Øyvind Kolås +Date: Sat Apr 14 12:38:43 2018 +0200 + + configure/app: depend on GEGL 0.3.32 + + app/sanity.c | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 680da3ada808950a542d1a3c0dbbaf794b7678c0 +Author: Piotr Drąg +Date: Sat Apr 14 10:23:37 2018 +0200 + + Update Polish translation + + po-libgimp/pl.po | 268 ++++++++++----------- + po/pl.po | 691 + ++++++++++++++++++++++++++++--------------------------- + 2 files changed, 490 insertions(+), 469 deletions(-) + +commit c3f98cccbdb6a154ca6efea043e46c9c532a407c +Author: Jehan +Date: Sat Apr 14 04:09:29 2018 +0200 + + app: fix menu path for gradient tool s/Blen_d/Gra_dient/. + + This one string was still using the old name, which appeared in + menus or + in the shortcut list. + + app/tools/gimpgradienttool.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 063a83c1ec677d1ce2888e3699582624aff5adbe +Author: Jehan +Date: Sat Apr 14 03:57:11 2018 +0200 + + app: migrate configuration files for s/Blend/Gradient/ tool renaming. + + This includes migrating properly any custom shortcut (menurc), as well + as a few strings in tool-presets/, and finally "gimp-blend-tool" in + contextrc and devicerc. + File toolrc also has some occurrences, but we are already skipping it + anyway, same as whatever is under tool-options/. + Hopefully I missed nothing. + + app/core/gimp-user-install.c | 58 + ++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 56 insertions(+), 2 deletions(-) + +commit 257eb95258a2797e160f095b6a0f8f7bcc81190d +Author: Michael Natterer +Date: Sat Apr 14 02:19:50 2018 +0200 + + app: simpler and better-aligned packig in gimpviewablebox + + app/widgets/gimpviewablebox.c | 17 ++--------------- + 1 file changed, 2 insertions(+), 15 deletions(-) + +commit 4705684b0ebaa2b3f36c909f75c5b88a98a018d6 +Author: Michael Natterer +Date: Sat Apr 14 02:18:56 2018 +0200 + + po: fix typo in POTFILES.in + + po/POTFILES.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5f6dfc7617cb8d50173707ad748fd172107e06f6 +Author: Michael Natterer +Date: Sat Apr 14 01:34:50 2018 +0200 + + app: add GimpGradientBlendColorSpace parameter to + gimp_drawable_gradient() + + app/core/gimpdrawable-gradient.c | 70 + +++++++++++++++++++++------------------- + app/core/gimpdrawable-gradient.h | 39 +++++++++++----------- + app/pdb/edit-cmds.c | 1 + + pdb/groups/edit.pdb | 5 +-- + 4 files changed, 60 insertions(+), 55 deletions(-) + +commit b0beb0197a4bd2c14ded20da976d4affd0c94729 +Author: Michael Natterer +Date: Sat Apr 14 00:52:20 2018 +0200 + + Bug 795230 - Rename Blend tool and provide PDB compatibility + + Rename the tool and its options, and the gradient sub-struct of paint + options. + + app/core/gimptoolpreset.c | 4 +- + app/dialogs/dialogs.c | 2 +- + app/paint/gimppaintoptions.c | 34 +- + app/paint/gimppaintoptions.h | 12 +- + app/tools/Makefile.am | 12 +- + app/tools/gimp-tools.c | 4 +- + app/tools/gimpblendtool-editor.c | 2518 + -------------------- + app/tools/gimpblendtool-editor.h | 48 - + app/tools/gimpblendtool.c | 1073 --------- + .../{gimpblendoptions.c => gimpgradientoptions.c} | 109 +- + .../{gimpblendoptions.h => gimpgradientoptions.h} | 28 +- + app/tools/gimpgradienttool-editor.c | 2517 + +++++++++++++++++++ + app/tools/gimpgradienttool-editor.h | 48 + + app/tools/gimpgradienttool.c | 1073 +++++++++ + app/tools/{gimpblendtool.h => gimpgradienttool.h} | 38 +- + app/tools/tool_manager.c | 2 +- + app/widgets/gimphelp-ids.h | 2 +- + data/tool-presets/FX/FX-Radial-Softlight.gtp | 6 +- + data/tool-presets/FX/Vignette.gtp | 6 +- + menus/image-menu.xml.in | 2 +- + po/POTFILES.in | 6 +- + 21 files changed, 3772 insertions(+), 3772 deletions(-) + +commit 4f2e078ccb7be72c3af4641781f23b7d0c27f25e +Author: Michael Natterer +Date: Fri Apr 13 23:43:27 2018 +0200 + + Bug 795230 - Rename Blend tool and provide PDB compatibility + + Rename gimpdrawable-blend.[ch] to gimpdrawable-gradient.[ch] + + app/core/Makefile.am | 4 +- + app/core/gimpdrawable-blend.h | 49 + ------------------- + ...impdrawable-blend.c => gimpdrawable-gradient.c} | 56 + +++++++++++----------- + app/core/gimpdrawable-gradient.h | 49 + +++++++++++++++++++ + app/pdb/edit-cmds.c | 28 +++++------ + app/tools/gimpblendtool.c | 9 ++-- + pdb/groups/edit.pdb | 28 +++++------ + po/POTFILES.in | 2 +- + 8 files changed, 113 insertions(+), 112 deletions(-) + +commit b55c116755864570bc0597dbb877c40c821949b3 +Author: Michael Natterer +Date: Fri Apr 13 23:36:16 2018 +0200 + + Bug 795230 - Rename Blend tool and provide PDB compatibility + + Rename GimpOperationBlend to GimpOperationGradient. + + app/core/gimpdrawable-blend.c | 2 +- + app/operations/Makefile.am | 4 +- + app/operations/gimp-operations.c | 4 +- + ...impoperationblend.c => gimpoperationgradient.c} | 106 + ++++++++++----------- + ...impoperationblend.h => gimpoperationgradient.h} | 30 +++--- + app/tools/gimpblendtool.c | 2 +- + 6 files changed, 73 insertions(+), 75 deletions(-) + +commit ea474f5e78eb348d3308ea879b292f226a9a46e6 +Author: Michael Natterer +Date: Fri Apr 13 23:27:03 2018 +0200 + + Bug 795230 - Rename Blend tool and provide PDB compatibility + + Rename the tool cursor: blend -> gradient in filename and enum value. + + app/tools/gimpblendtool.c | 2 +- + app/widgets/gimpcursor.c | 2 +- + app/widgets/widgets-enums.h | 2 +- + cursors/Makefile.am | 2 +- + cursors/gimp-tool-cursors.xcf | Bin 78346 -> 78349 bytes + cursors/{tool-blend.png => tool-gradient.png} | Bin + 6 files changed, 4 insertions(+), 4 deletions(-) + +commit 99ea6f91e20868838062fc156cb6f9c112e2979f +Author: Michael Natterer +Date: Fri Apr 13 23:12:21 2018 +0200 + + app: fix the build after the GimpGradientBlendColorSpace commit + + Somehow, gimppalette-import.c was not rebuilt on my system, + leaving one gimp_gradient_get_color_at() unchanged. + + app/core/gimppalette-import.c | 14 ++++++++------ + app/core/gimppalette-import.h | 1 + + app/dialogs/palette-import-dialog.c | 1 + + 3 files changed, 10 insertions(+), 6 deletions(-) + +commit ebb9d83d631764b8d4d17c7740ee9f020f3f545d +Author: Michael Natterer +Date: Fri Apr 13 23:07:08 2018 +0200 + + Bug 795230 - Rename Blend tool and provide PDB compatibility + + Step 1: rename the icon to GIMP_ICON_TOOL_GRADIENT + (gimp-tool-gradient) + + app/core/gimpgradient.c | 2 +- + app/tools/gimpblendtool.c | 4 ++-- + devel-docs/libgimpwidgets/libgimpwidgets-sections.txt | 2 +- + .../16/{gimp-tool-blend.png => gimp-tool-gradient.png} | Bin + .../24/{gimp-tool-blend.png => gimp-tool-gradient.png} | Bin + .../24/{gimp-tool-blend.svg => gimp-tool-gradient.svg} | 0 + .../{gimp-tool-blend.svg => gimp-tool-gradient.svg} | 0 + .../16/{gimp-tool-blend.png => gimp-tool-gradient.png} | Bin + .../22/{gimp-tool-blend.png => gimp-tool-gradient.png} | Bin + icons/Legacy/Makefile.am | 4 ++-- + .../16/{gimp-tool-blend.png => gimp-tool-gradient.png} | Bin + .../24/{gimp-tool-blend.png => gimp-tool-gradient.png} | Bin + .../24/{gimp-tool-blend.svg => gimp-tool-gradient.svg} | 0 + .../{gimp-tool-blend.svg => gimp-tool-gradient.svg} | 0 + icons/icon-list.mk | 8 + ++++---- + libgimpwidgets/gimpicons.c | 2 ++ + libgimpwidgets/gimpicons.h | 6 +++--- + 17 files changed, 15 insertions(+), 13 deletions(-) + +commit bf49b476209ed8350438fa496e7338c172b9b3b3 +Author: Michael Natterer +Date: Fri Apr 13 22:33:16 2018 +0200 + + Bug 795207 - Add color space to blend(gradient) tool options + + First WIP commit, adds: + + - enum GimpGradientBlendColorSpace { RGB_PERCEPTUAL, RGB_LINEAR } + - linear blending mode for gradient segments + - tool options GUI for the blend and paint tools which use gradients + + app/actions/gradient-editor-commands.c | 2 + + app/core/gimpgradient.c | 133 + +++++++++++++++++++++------------ + app/core/gimpgradient.h | 6 ++ + app/operations/gimpoperationblend.c | 68 +++++++++++------ + app/operations/gimpoperationblend.h | 25 ++++--- + app/paint/gimppaintoptions.c | 25 ++++++- + app/paint/gimppaintoptions.h | 5 +- + app/pdb/gradient-cmds.c | 54 +++++++++---- + app/pdb/gradients-cmds.c | 12 ++- + app/tools/gimpblendoptions.c | 10 +++ + app/tools/gimpblendoptions.h | 2 +- + app/tools/gimpblendtool-editor.c | 7 +- + app/tools/gimppaintoptions-gui.c | 16 +++- + app/widgets/gimpgradienteditor.c | 8 +- + app/widgets/gimpgradienteditor.h | 2 + + app/widgets/gimpgradientselect.c | 4 +- + app/widgets/gimpviewablebox.c | 47 +++++++++++- + app/widgets/gimpviewablebox.h | 4 +- + app/widgets/gimpviewrenderergradient.c | 25 ++++++- + app/widgets/gimpviewrenderergradient.h | 24 +++--- + libgimp/gimpenums.c.tail | 2 + + libgimpbase/gimpbase.def | 1 + + libgimpbase/gimpbaseenums.c | 30 ++++++++ + libgimpbase/gimpbaseenums.h | 12 +++ + pdb/enums.pl | 8 ++ + pdb/groups/gradient.pdb | 54 +++++++++---- + pdb/groups/gradients.pdb | 12 ++- + 27 files changed, 445 insertions(+), 153 deletions(-) + +commit 3cb7fc86aa673cadfef4edbbb9043360f6198352 +Author: Alexandre Prokoudine +Date: Fri Apr 13 19:58:22 2018 +0300 + + NEWS: update + + NEWS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ff34965faf98f1d533b5b38143d534a7f2496a3b +Author: Ell +Date: Fri Apr 13 09:56:20 2018 -0400 + + Bug 795177 - seg fault with clone tool + + Don't flush the source pickable in gimp_source_core_motion(), as + this introduces a race condition between the paint thread and the + display-update timeout, when the source pickable is the image + containing the target drawable. + + Flushing the source pickable shouldn't be currently necessary, and + either way, should happen during initialization. + + app/paint/gimpsourcecore.c | 2 -- + 1 file changed, 2 deletions(-) + +commit 65c7ce5e7d398eeb24a6eb29a43b91debfdaf29c +Author: Ell +Date: Fri Apr 13 08:15:45 2018 -0400 + + build: add Chinese (China) translation to the Windows installer + + build/windows/installer/gimp3264.iss | 1 + + build/windows/installer/lang/Makefile.am | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit 6785a689cf05cf48699e5be2f07c4fafcb767f1b +Author: Aron Xu +Date: Thu Apr 12 22:51:45 2018 +0800 + + po-windows-installer: add Chinese (China) translation + + po-windows-installer/LINGUAS | 1 + + po-windows-installer/zh_CN.po | 368 + ++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 369 insertions(+) + +commit 2255f09fac2c3ae101e0d48d7fafbb2a11863c91 +Author: Aron Xu +Date: Thu Apr 12 22:22:28 2018 +0800 + + Update Chinese (China) translation + + po/zh_CN.po | 31325 + +++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 20127 insertions(+), 11198 deletions(-) + +commit b91742a84fe78fb6e5b99cb147cb35ec2504b2c6 +Author: Jehan +Date: Thu Apr 12 12:13:38 2018 +0200 + + Bug 795185 - Corrective rotation guides are incorrect in GIMP 2.10. + + Most expected behavior in normal transform is to see the preview, + whereas you usually don't want to see it in corrective mode. In 2.8 + actually, it seems like it was not even possible to see the image + preview in corrective mode. + + So let's set "show-preview" to these defaults when "direction" + property + is updated. It is still possible to change it manually for any + specific + use cases (i.e. you can hide the preview in normal transform, and + oppositely you can show it in corrective transform), but at least now + defaults are sane. + + app/tools/gimptransformoptions.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 3841d3d5378173aabdd0d79a25b8cb08ca3591fb +Author: Jehan +Date: Thu Apr 12 10:03:13 2018 +0200 + + Bug 795185 - "Show image preview" works differently if checked + before... + + ... or during rotation. + If checked before rotation, it works as expected, i.e. one sees + only the + original or the rotated image. + While rotation is in progress: if unchecked, one sees neither the + original nor the image preview; if checked, one sees both original and + rotated preview. + Let's make the behavior consistent and only show exactly one + version at + all time. + + app/tools/gimptransformtool.c | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +commit 421c9fc51a25de283cfff4554ac29c7c833f5745 +Author: Michael Natterer +Date: Wed Apr 11 11:31:02 2018 +0200 + + Bug 795050 - ‘strncpy’ output truncated before terminating nul + + Use memcpy() because we really dont' want to copy the terminating nul, + but we don't want a warning either. + + app/core/gimp-templates.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5b8b33dad723323080aa4e3064f8e259147723ef +Author: Ell +Date: Wed Apr 11 04:49:27 2018 -0400 + + app: invert zoom mapping in gegl:panorama-projection gyro controller + + app/propgui/gimppropgui-panorama-projection.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5430e7794c006c4086710c24def569ed32e725d4 +Author: Ell +Date: Wed Apr 11 04:46:52 2018 -0400 + + app: various fixes in GimpToolGyroscope + + Invert zoom adjustment using the mouse or the keyboard when in + inverse mode. Take zoom factor into account when panning using the + keyboard. Fix motion cancelation. + + app/display/gimptoolgyroscope.c | 27 +++++++++++++++++++-------- + 1 file changed, 19 insertions(+), 8 deletions(-) + +commit 7bb0821977685193c04f4bc8ced5ad4413b6a515 +Author: Piotr Drąg +Date: Wed Apr 11 10:17:46 2018 +0200 + + Update Polish translation + + po/pl.po | 320 + ++++++++++++++++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 246 insertions(+), 74 deletions(-) + +commit 1993d8a4a78fbd424a535ed31be9e5b36f37f8f9 +Author: Jehan +Date: Wed Apr 11 02:09:21 2018 +0200 + + Bug 768872 - Tiling Symmetry doesn't wrap vertical coordinates over... + + ... edges for MyPaint brush. + + Adding the concept of "stateful" symmetry when a tool needs to + make sure + of corresponding stroke numbers and orders while painting + (i.e. stroke N + at time T+1 is the continuation of stroke N at time T). This is + the case + for the MyPaint brushes and the ink tool. + + app/core/gimpsymmetry-tiling.c | 117 + +++++++++++++++++++++++++++++++---------- + app/core/gimpsymmetry.c | 27 ++++++++++ + app/core/gimpsymmetry.h | 3 ++ + app/paint/gimpink.c | 2 + + app/paint/gimpmybrushcore.c | 2 + + 5 files changed, 123 insertions(+), 28 deletions(-) + +commit 12ec7976d5ff9815c1371f24f3ccf8715587813d +Author: Jehan +Date: Wed Apr 11 01:15:52 2018 +0200 + + NEWS, desktop: small fixes in NEWS and in appdata. + + NEWS | 5 +++-- + desktop/org.gimp.GIMP.appdata.xml.in.in | 11 ++++++----- + 2 files changed, 9 insertions(+), 7 deletions(-) + +commit 0a1dd3771922af526ac9cb709c28d0d7d410303e +Author: Jehan +Date: Wed Apr 11 01:12:19 2018 +0200 + + desktop: preparing a new tag for 2.10.0 RC2. + + desktop/org.gimp.GIMP.appdata.xml.in.in | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + +commit 4b725c6c031c8d581f21508b8b58da5144eda53f +Author: Alexandre Prokoudine +Date: Wed Apr 11 01:07:38 2018 +0300 + + NEWS: more updates + + NEWS | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a627d4795186016c24810f45f604f84df1bbbf10 +Author: Alexandre Prokoudine +Date: Wed Apr 11 01:05:08 2018 +0300 + + NEWS: update + + NEWS | 3 +++ + 1 file changed, 3 insertions(+) + +commit 9f55de0b25f7a01253338e8530086569934228a4 +Author: Alexandre Prokoudine +Date: Wed Apr 11 01:00:58 2018 +0300 + + Update Russian translation + + po/ru.po | 491 + +++++++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 304 insertions(+), 187 deletions(-) + +commit 087d2462bca3d4f479928287a327c136baba2384 +Author: Øyvind Kolås +Date: Tue Apr 10 23:29:41 2018 +0200 + + configure/app: depend on babl 0.1.46 + + app/sanity.c | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit dd77b0596717648e4a2a4078cf9cd9ef63f76d34 +Author: Alexandre Prokoudine +Date: Tue Apr 10 21:18:09 2018 +0300 + + 2.10: updates for appdata + + desktop/org.gimp.GIMP.appdata.xml.in.in | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +commit 6453b371a95cd38279d0279072b9607ec0f52c99 +Author: Ell +Date: Tue Apr 10 11:07:53 2018 -0400 + + app: fix status message of GimpToolGyroscope + + app/display/gimptoolgyroscope.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f6255ae70b8c87d59745e002ea86cafcae2327f7 +Author: Jehan +Date: Tue Apr 10 16:56:27 2018 +0200 + + desktop: changes in appdata and 2.10 now uncommented. + + I was hoping others would review this text before submitting + it to translators, but no such luck there. Anyway let's uncomment now + because translators need to get the text sooner than later if we + want as + many localized version of the appdata text as possible at release. + Everyone if you want to review the English and the contents of + this tag, + do it now! + + desktop/org.gimp.GIMP.appdata.xml.in.in | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit 698253329228d80a482997186c303d7c210ed3ae +Author: Ell +Date: Tue Apr 10 09:53:42 2018 -0400 + + app: add custom GUI for gegl:panorama-projection + + ... which uses a gyroscope controller to control the op's rotation + angles and zoom. + + app/propgui/Makefile.am | 2 + + app/propgui/gimppropgui-panorama-projection.c | 144 + ++++++++++++++++++++++++++ + app/propgui/gimppropgui-panorama-projection.h | 35 +++++++ + app/propgui/gimppropgui.c | 3 + + po/POTFILES.in | 1 + + 5 files changed, 185 insertions(+) + +commit 8738d2f22b7940e9ff8a5fb2b486e928e912b4e9 +Author: Ell +Date: Tue Apr 10 09:51:48 2018 -0400 + + app: add a gyroscope controller to prop-gui + + Add a gyroscope controller, providing a prop-gui interface to + GimpToolGyroscope. + + Implement the gyroscope controller in GimpFilterTool. + + app/propgui/propgui-types.h | 10 ++++- + app/tools/gimpfiltertool-widgets.c | 91 + ++++++++++++++++++++++++++++++++++++++ + app/tools/gimpfiltertool.c | 16 ++++--- + 3 files changed, 109 insertions(+), 8 deletions(-) + +commit 634d5ae57d7178eb5f8f451e2040b02cf542d9c3 +Author: Ell +Date: Tue Apr 10 09:41:41 2018 -0400 + + app: add GimpToolGyroscope + + GimpToolGyroscope is a tool widget providing canvas interaction for + 3D rotation. The widget doesn't preset a UI, but rather + facilitates panning, rotation, and zoom, by dragging the canvas, or + using the keyboard. + + Rotation is expressed using yaw/pitch/roll angles (performed in + this order). A zoom factor can be specified, which affects the + magnitude of the rotation per distance traveled. The widget can + operate in inverse mode, performing an inverse transformation. + + app/display/Makefile.am | 2 + + app/display/gimptoolgyroscope.c | 857 + ++++++++++++++++++++++++++++++++++++++++ + app/display/gimptoolgyroscope.h | 58 +++ + po/POTFILES.in | 1 + + 4 files changed, 918 insertions(+) + +commit 2c1f1c507c2711ddc565292b95a4252484da959c +Author: Ell +Date: Tue Apr 10 09:40:55 2018 -0400 + + app, cursors: add zoom cursor modifier + + To be used by GimpToolGyroscope. + + app/widgets/gimpcursor.c | 1 + + app/widgets/widgets-enums.h | 1 + + cursors/Makefile.am | 1 + + cursors/gimp-tool-cursors.xcf | Bin 77739 -> 78346 bytes + cursors/modifier-zoom.png | Bin 0 -> 173 bytes + 5 files changed, 3 insertions(+) + +commit f81542e5c90dcef192c46d74b203cea59013dc51 +Author: Ell +Date: Tue Apr 10 09:40:15 2018 -0400 + + app, cursors: add rotate cursor modifier + + To be used by GimpToolGyroscope. + + app/widgets/gimpcursor.c | 1 + + app/widgets/widgets-enums.h | 1 + + cursors/Makefile.am | 1 + + cursors/gimp-tool-cursors.xcf | Bin 77065 -> 77739 bytes + cursors/modifier-rotate.png | Bin 0 -> 183 bytes + 5 files changed, 3 insertions(+) + +commit ae6a7bf98f409d184e13ddfd18581777339c45eb +Author: Jehan +Date: Tue Apr 10 14:36:51 2018 +0200 + + libgimpbase: improve multi-threaded stack traces. + + Since commit bb52431cdd, we get multi-thread traces in functions + gimp_stack_trace_*(). Adding now the LLDB equivalent improvement. + + Also adding the process and thread id information, from which + the trace + order was made, atop the listing, as well as the thread list. This + would + allow to easily find and associate the threads. + The problem is that sometimes the thread where we got a trace from may + not matter (for instance signals, even such as SIGABRT or SIGSEGV, + seem + to sent a bit randomly to either the thread which provoked them or the + main thread; there is a bit of contradictory info on this when reading + on the topic, in my case I experienced this), in such case, + getting all + thread stack is important to find the origin of the signal. + Other times it will highly matter, in particular when getting a trace + for a WARNING or CRITICAL. This information will help to discriminate + between thread traces. + + libgimpbase/gimputils.c | 70 + ++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 49 insertions(+), 21 deletions(-) + +commit 4bc982b84abdf95e00f994b0bcf07aaa3f9cd760 +Author: Jehan +Date: Tue Apr 10 14:16:33 2018 +0200 + + Bug 795123 - plug-in crash starts neverending loop. + + Since commit 9c8a8ae576, we don't run gimp_quit(), which properly + quits + the plug-in executable, to make sure that GIMP gets the information + that + it crashed. Instead quit with `exit (EXIT_FAILURE)`. + + libgimp/gimp.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit 3f95dc52d3232cac64283d9514e6d8bcf32df951 +Author: Michael Natterer +Date: Tue Apr 10 02:00:23 2018 +0200 + + Bug 791519 - Unexpected selection from channel + + Make sure a channel -> selection -> channel roundtrip never does any + gamma conversion. + + In gimp_channel_duplicate(), make sure a created channel has the + right format, and the right data. Fixes selection -> channel. + + When switching off quick mask, call gimp_item_to_selection() instead + if gimp_selection_load(), the latter was implementing a shortcut which + is now wrong. + + Remove gimp_selection_load() which is now unused. + + Unrelated: also remove gimp_selection_save(), it was an obvious + 3-liner used only twice. + + app/actions/select-commands.c | 14 ++++++++--- + app/core/gimpchannel.c | 32 +++++++++++++++++++++++++ + app/core/gimpimage-quick-mask.c | 6 ++--- + app/core/gimpselection.c | 53 + ----------------------------------------- + app/core/gimpselection.h | 4 ---- + app/pdb/selection-cmds.c | 13 ++++++++-- + pdb/groups/selection.pdb | 13 ++++++++-- + 7 files changed, 68 insertions(+), 67 deletions(-) + +commit 6effffba93c4d981e20df128ab9dd6a3f9308bb0 +Author: Michael Natterer +Date: Tue Apr 10 01:58:12 2018 +0200 + + pdb: one of the recent typo fixes was in a generated file + + pdb/groups/plug_in_compat.pdb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bba8f695941fa52b1bef60c3c5cf8f251229fb18 +Author: Michael Natterer +Date: Tue Apr 10 00:26:01 2018 +0200 + + Revert "Bug 791512 - make the selection boundary detection the same + as 2.8" + + This commit was fixing only a symptom of our channel/selection + problem, making it appear things were fine. + + This reverts commit 27512d802b221df14b7c805e4ceccf710fcd0e4e. + + app/core/gimpboundary.h | 3 +-- + app/core/gimpchannel.c | 4 ++-- + app/core/gimplayer-floating-selection.c | 2 +- + app/tools/gimpregionselecttool.c | 2 +- + 4 files changed, 5 insertions(+), 6 deletions(-) + +commit 54ca0a7f68332b3a1195343bb9c6719dbf4579ec +Author: Elle Stone +Date: Sat Apr 7 01:46:07 2018 -0400 + + Add Gray theme back to GIMP + + that was removed by commit 7aecc90e10aa48bcbc73a5199c9591c16ff5b022 + + configure.ac | 1 + + themes/Gray/.gitignore | 2 + + themes/Gray/Makefile.am | 132 + + themes/Gray/gtkrc | 2523 + ++++++++++++++++++++ + themes/Gray/ui/arrow-down-insens.png | Bin 0 -> 232 bytes + themes/Gray/ui/arrow-down-prelight.png | Bin 0 -> 221 bytes + themes/Gray/ui/arrow-down-small-insens.png | Bin 0 -> 231 bytes + themes/Gray/ui/arrow-down-small-prelight.png | Bin 0 -> 207 bytes + themes/Gray/ui/arrow-down-small.png | Bin 0 -> 207 bytes + themes/Gray/ui/arrow-down.png | Bin 0 -> 221 bytes + themes/Gray/ui/arrow-left-insens.png | Bin 0 -> 228 bytes + themes/Gray/ui/arrow-left-prelight.png | Bin 0 -> 227 bytes + themes/Gray/ui/arrow-left.png | Bin 0 -> 227 bytes + themes/Gray/ui/arrow-right-insens.png | Bin 0 -> 236 bytes + themes/Gray/ui/arrow-right-prelight.png | Bin 0 -> 225 bytes + themes/Gray/ui/arrow-right.png | Bin 0 -> 225 bytes + themes/Gray/ui/arrow-up-insens.png | Bin 0 -> 231 bytes + themes/Gray/ui/arrow-up-prelight.png | Bin 0 -> 221 bytes + themes/Gray/ui/arrow-up-small-insens.png | Bin 0 -> 208 bytes + themes/Gray/ui/arrow-up-small-prelight.png | Bin 0 -> 199 bytes + themes/Gray/ui/arrow-up-small.png | Bin 0 -> 199 bytes + themes/Gray/ui/arrow-up.png | Bin 0 -> 221 bytes + themes/Gray/ui/bar-h.png | Bin 0 -> 162 bytes + themes/Gray/ui/bar-v.png | Bin 0 -> 170 bytes + themes/Gray/ui/button-default.png | Bin 0 -> 515 bytes + themes/Gray/ui/button-insensitive.png | Bin 0 -> 380 bytes + themes/Gray/ui/button-normal.png | Bin 0 -> 422 bytes + themes/Gray/ui/button-prelight.png | Bin 0 -> 414 bytes + themes/Gray/ui/button-pressed.png | Bin 0 -> 419 bytes + themes/Gray/ui/check1.png | Bin 0 -> 288 bytes + themes/Gray/ui/check2.png | Bin 0 -> 290 bytes + themes/Gray/ui/check3.png | Bin 0 -> 272 bytes + themes/Gray/ui/combo-entry-border-active-bg.png | Bin 0 -> 153 bytes + .../Gray/ui/combo-entry-border-active-notebook.png | Bin 0 -> 153 bytes + .../ui/combo-entry-border-active-rtl-notebook.png | Bin 0 -> 152 bytes + themes/Gray/ui/combo-entry-border-bg.png | Bin 0 -> 153 bytes + themes/Gray/ui/combo-entry-border-disabled-bg.png | Bin 0 -> 153 bytes + .../ui/combo-entry-border-disabled-notebook.png | Bin 0 -> 153 bytes + .../Gray/ui/combo-entry-border-disabled-rtl-bg.png | Bin 0 -> 152 bytes + .../combo-entry-border-disabled-rtl-notebook.png | Bin 0 -> 152 bytes + themes/Gray/ui/combo-entry-border-notebook.png | Bin 0 -> 153 bytes + themes/Gray/ui/combo-entry-border-rtl-bg.png | Bin 0 -> 152 bytes + themes/Gray/ui/combo-entry-border-rtl-notebook.png | Bin 0 -> 152 bytes + themes/Gray/ui/combo-entry-button-active-rtl.png | Bin 0 -> 147 bytes + themes/Gray/ui/combo-entry-button-active.png | Bin 0 -> 148 bytes + themes/Gray/ui/combo-entry-button-disabled-rtl.png | Bin 0 -> 153 bytes + themes/Gray/ui/combo-entry-button-disabled.png | Bin 0 -> 152 bytes + themes/Gray/ui/combo-entry-button-rtl.png | Bin 0 -> 153 bytes + themes/Gray/ui/combo-entry-button.png | Bin 0 -> 152 bytes + themes/Gray/ui/down-pre.png | Bin 0 -> 159 bytes + themes/Gray/ui/down.png | Bin 0 -> 160 bytes + themes/Gray/ui/entry-border-active-bg.png | Bin 0 -> 154 bytes + themes/Gray/ui/entry-border-active-notebook.png | Bin 0 -> 154 bytes + themes/Gray/ui/entry-border-disabled-bg.png | Bin 0 -> 171 bytes + themes/Gray/ui/entry-border-disabled-notebook.png | Bin 0 -> 171 bytes + themes/Gray/ui/entry-border-fill-active-item.png | Bin 0 -> 125 bytes + themes/Gray/ui/entry-border-fill-active.png | Bin 0 -> 141 bytes + themes/Gray/ui/entry-border-fill.png | Bin 0 -> 141 bytes + themes/Gray/ui/entry-border-notebook-null.png | Bin 0 -> 4013 bytes + themes/Gray/ui/entry-border-notebook.png | Bin 0 -> 193 bytes + themes/Gray/ui/ext-bottom.png | Bin 0 -> 166 bytes + themes/Gray/ui/ext-left.png | Bin 0 -> 165 bytes + themes/Gray/ui/ext-right.png | Bin 0 -> 164 bytes + themes/Gray/ui/ext-top.png | Bin 0 -> 166 bytes + themes/Gray/ui/extension-bottom.png | Bin 0 -> 166 bytes + themes/Gray/ui/extension-left.png | Bin 0 -> 165 bytes + themes/Gray/ui/extension-right.png | Bin 0 -> 164 bytes + themes/Gray/ui/extension-top.png | Bin 0 -> 166 bytes + themes/Gray/ui/frame-gap-end.png | Bin 0 -> 168 bytes + themes/Gray/ui/frame-gap-start.png | Bin 0 -> 168 bytes + themes/Gray/ui/frame.png | Bin 0 -> 212 bytes + themes/Gray/ui/gap_bottom.png | Bin 0 -> 186 bytes + themes/Gray/ui/gap_left.png | Bin 0 -> 189 bytes + themes/Gray/ui/gap_right.png | Bin 0 -> 186 bytes + themes/Gray/ui/gap_top.png | Bin 0 -> 187 bytes + themes/Gray/ui/gimp-arrow-down-insensitive.png | Bin 0 -> 236 bytes + themes/Gray/ui/gimp-arrow-down-insenstive.png | Bin 0 -> 236 bytes + themes/Gray/ui/gimp-arrow-down.png | Bin 0 -> 218 bytes + themes/Gray/ui/gimp-arrow-left.png | Bin 0 -> 220 bytes + themes/Gray/ui/gimp-arrow-right-dark.png | Bin 0 -> 232 bytes + themes/Gray/ui/gimp-arrow-right-prelight.png | Bin 0 -> 179 bytes + themes/Gray/ui/gimp-arrow-right.png | Bin 0 -> 221 bytes + themes/Gray/ui/gimp-arrow-up.png | Bin 0 -> 216 bytes + themes/Gray/ui/gimp-button-default.png | Bin 0 -> 515 bytes + themes/Gray/ui/gimp-button-insensitive.png | Bin 0 -> 380 bytes + themes/Gray/ui/gimp-button-normal.png | Bin 0 -> 422 bytes + themes/Gray/ui/gimp-button-prelight.png | Bin 0 -> 4184 bytes + themes/Gray/ui/gimp-button-pressed.png | Bin 0 -> 4030 bytes + themes/Gray/ui/gimp-handle-h.png | Bin 0 -> 4962 bytes + themes/Gray/ui/gimp-handle-v.png | Bin 0 -> 4969 bytes + themes/Gray/ui/gimp-line-h.png | Bin 0 -> 185 bytes + themes/Gray/ui/gimp-line-v.png | Bin 0 -> 184 bytes + themes/Gray/ui/gimp-menu-line-h.png | Bin 0 -> 183 bytes + themes/Gray/ui/gimp-tooltip-bg.png | Bin 0 -> 438 bytes + themes/Gray/ui/list_header-pressed.png | Bin 0 -> 203 bytes + themes/Gray/ui/list_header.png | Bin 0 -> 214 bytes + themes/Gray/ui/menu-arrow-prelight.png | Bin 0 -> 179 bytes + themes/Gray/ui/menu-arrow.png | Bin 0 -> 180 bytes + themes/Gray/ui/menu-prelight.png | Bin 0 -> 154 bytes + themes/Gray/ui/menu.png | Bin 0 -> 140 bytes + themes/Gray/ui/menubar.png | Bin 0 -> 157 bytes + themes/Gray/ui/menuitem-prelight.png | Bin 0 -> 146 bytes + themes/Gray/ui/menuitem.png | Bin 0 -> 146 bytes + themes/Gray/ui/minus.png | Bin 0 -> 264 bytes + themes/Gray/ui/notebook.png | Bin 0 -> 3722 bytes + themes/Gray/ui/null.png | Bin 0 -> 173 bytes + themes/Gray/ui/option1.png | Bin 0 -> 371 bytes + themes/Gray/ui/option2.png | Bin 0 -> 367 bytes + themes/Gray/ui/option3.png | Bin 0 -> 360 bytes + themes/Gray/ui/plus.png | Bin 0 -> 269 bytes + themes/Gray/ui/progressbar-trough.png | Bin 0 -> 3493 bytes + themes/Gray/ui/progressbar.png | Bin 0 -> 4409 bytes + themes/Gray/ui/shadow-in-alt.png | Bin 0 -> 206 bytes + themes/Gray/ui/shadow-in.png | Bin 0 -> 219 bytes + themes/Gray/ui/shadow-null.png | Bin 0 -> 146 bytes + themes/Gray/ui/shadow-out.png | Bin 0 -> 228 bytes + themes/Gray/ui/slider-h.png | Bin 0 -> 168 bytes + themes/Gray/ui/slider-v.png | Bin 0 -> 149 bytes + themes/Gray/ui/spin-down-insensitive.png | Bin 0 -> 213 bytes + themes/Gray/ui/spin-down-normal.png | Bin 0 -> 200 bytes + themes/Gray/ui/spin-down-pressed.png | Bin 0 -> 204 bytes + themes/Gray/ui/spin-fill-bg.png | Bin 0 -> 3397 bytes + themes/Gray/ui/spin-insensitive.png | Bin 0 -> 224 bytes + themes/Gray/ui/spin-up-insensitive.png | Bin 0 -> 194 bytes + themes/Gray/ui/spin-up-normal.png | Bin 0 -> 202 bytes + themes/Gray/ui/spin-up-pressed.png | Bin 0 -> 194 bytes + themes/Gray/ui/spin.png | Bin 0 -> 244 bytes + themes/Gray/ui/toolbar.png | Bin 0 -> 130 bytes + themes/Gray/ui/transparent.png | Bin 0 -> 179 bytes + themes/Makefile.am | 2 +- + 130 files changed, 2659 insertions(+), 1 deletion(-) + +commit f5cb1fed85341a9d0a46fb1391b19fa9ea3ccb42 +Author: Ell +Date: Mon Apr 9 14:25:57 2018 -0400 + + Bug 795081 - Crash when using a brush combined with a dynamics + + In GimpPaintTool, brush outline generation took place during + gimp_paint_tool_draw() even while painting. This function is run + concurrently with the paint thread. When using dynamics, this + introduced a race conidition between updating the brush mask in the + paint thread, and updating the brush boundary in the main thread. + + Move brush outline generation during painting to + gimppainttool-paint.c, and perform it in the display-update + timeout, while the main thread and the paint thread are + synchronized. + + app/core/gimpdrawable.c | 8 +++++++ + app/core/gimpdrawable.h | 1 + + app/tools/gimppainttool-paint.c | 47 + ++++++++++++++++++++++++++++++++++++++--- + app/tools/gimppainttool.c | 28 ++++++++++++++++-------- + app/tools/gimppainttool.h | 32 +++++++++++++++------------- + 5 files changed, 89 insertions(+), 27 deletions(-) + +commit e98506b0007af9e6d81bba2c89f1d8b0b7cb6e52 +Author: Ell +Date: Mon Apr 9 12:16:50 2018 -0400 + + app: remove option for paint tools to opt out of a separate thread + + After last commit, all paint tools work correctly with a separate + paint thread, so we can remove the option for specific paint tools + to opt out. Particularly, GimpMybrushTool now uses a separate + paint thread too. + + Note that the separate paint thread can still be disabled through + the GIMP_NO_PAINT_THREAD environment variable. + + app/tools/gimpmybrushtool.c | 5 ++--- + app/tools/gimppainttool-paint.c | 3 +-- + app/tools/gimppainttool.c | 2 -- + app/tools/gimppainttool.h | 2 -- + 4 files changed, 3 insertions(+), 9 deletions(-) + +commit 2ae16ca6045d3c8c1efbf8e624335bd7d8f25cc6 +Author: Ell +Date: Mon Apr 9 12:09:51 2018 -0400 + + app: reorganize gimppaintool-paint + + Reorganize/clean up gimppainttool-paint. In particular, move all + paint-core interaction during painting to gimppainttool-paint.c, so + that we can have more control over what's going on; specifically, + enter the drawable into paint mode *before* starting the paint + core, so that it picks up the correct buffer. This fixes painting + with the paint thread using GimpApplicator, and enables us to use + the paint thread with GimpMybrushTool. + + app/tools/gimppainttool-paint.c | 310 + ++++++++++++++++++++++++++++++---------- + app/tools/gimppainttool-paint.h | 17 ++- + app/tools/gimppainttool.c | 127 +++------------- + app/tools/gimppainttool.h | 3 + + 4 files changed, 269 insertions(+), 188 deletions(-) + +commit f77edcdf193e8c7b3117f797ec3daddccb5e4b20 +Author: Jehan +Date: Mon Apr 9 06:08:48 2018 +0200 + + app: do not use gimp_filename_to_utf8() in the signal handler. + + This function is unsafe during signal handling. And in any case, when + printing to stderr, I don't think we need to convert to UTF-8. Quite + the + contrary, the system encoding may be more appropriate. + + app/errors.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit ab7c3d2b2407f50c3d045e85032e1e7e1e59c444 +Author: Jehan +Date: Mon Apr 9 04:40:48 2018 +0200 + + libgimpbase: oups, I lost the "full" option in my backtrace. + + Quite useful to get values of local variables when possible. + + libgimpbase/gimputils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9dfd35be054125ab7ba8b5201490ffae96a74056 +Author: Jehan +Date: Mon Apr 9 04:02:36 2018 +0200 + + build: update base dependencies to fix flatpak. + + build/flatpak/flathub | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bb52431cdd424a9068069977549e5eab66768bad +Author: Jehan +Date: Mon Apr 9 02:15:37 2018 +0200 + + libgimpbase: gimp_stack_trace_*() should get backtraces for all + threads. + + Now that GIMP core is multi-threaded, let's get traces for all + threads, + otherwise we may get some useless traces in some cases. + + libgimpbase/gimputils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 53fae39aeed4634dde5377da777d09b26744c9f4 +Author: Michael Natterer +Date: Sun Apr 8 22:55:19 2018 +0200 + + Bug 795057 - Insensitive text in plug-ins is unreadable with dark + themes + + Copy the fix from app/gui/themes.c to libgimp/gimpui.c so insensitive + labels look right in plug-ins too. + + libgimp/gimpui.c | 113 + +++++++++++++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 106 insertions(+), 7 deletions(-) + +commit c4975dd8937921c22d368867b05e2a4705c7f18f +Author: Piotr Drąg +Date: Sun Apr 8 22:20:05 2018 +0200 + + Update Polish translation + + po-libgimp/pl.po | 55 +-- + po-plug-ins/pl.po | 8 +- + po/pl.po | 1294 + +++++++++++++++++++++++++++-------------------------- + 3 files changed, 698 insertions(+), 659 deletions(-) + +commit 7fdb963e018c5413036bc1dd547c7a812e20302d +Author: luz.paz +Date: Sat Mar 24 16:49:01 2018 -0400 + + Bug 794996 - Misc. typo fixes in comments in app/ + + Found via `codespell -q 3 --skip="./po*"` + + app/actions/debug-commands.c | 2 +- + app/app.c | 2 +- + app/core/gimpboundary.c | 4 ++-- + app/core/gimpbrush.c | 4 ++-- + app/core/gimpdrawable-preview.h | 2 +- + app/core/gimpdrawablefilter.c | 2 +- + app/core/gimpdynamicsoutput.c | 2 +- + app/core/gimpimage-convert-indexed.c | 2 +- + app/core/gimpimage-guides.h | 2 +- + app/core/gimpimage-preview.h | 2 +- + app/core/gimpimage-sample-points.h | 2 +- + app/core/gimpimageundo.c | 2 +- + app/core/gimpitem-preview.h | 2 +- + app/core/gimppickable-contiguous-region.c | 2 +- + app/core/gimptag.c | 2 +- + app/core/gimpviewable.c | 4 ++-- + app/display/gimpdisplayshell.c | 2 +- + app/display/gimpimagewindow.c | 2 +- + app/display/gimpmotionbuffer.c | 2 +- + app/display/gimpmotionbuffer.h | 2 +- + app/display/gimptoolrectangle.c | 8 ++++---- + app/gegl/gimp-babl.c | 2 +- + app/gui/gui-message.c | 2 +- + app/gui/gui-unique.c | 2 +- + app/gui/gui.c | 2 +- + app/operations/gimpoperationborder.c | 2 +- + app/operations/gimpoperationgrow.c | 2 +- + app/paint/gimpbrushcore.c | 8 ++++---- + app/paint/gimpmybrushsurface.c | 2 +- + app/paint/gimppaintcore.c | 6 +++--- + app/pdb/plug-in-compat-cmds.c | 2 +- + app/plug-in/gimppluginmanager-file-procedure.c | 2 +- + app/plug-in/gimppluginmanager.c | 2 +- + app/tests/test-ui.c | 2 +- + app/tools/gimpcagetool.h | 2 +- + app/tools/gimpfliptool.c | 4 ++-- + app/tools/gimpiscissorstool.c | 2 +- + app/tools/gimpoperationtool.c | 2 +- + app/tools/gimppainttool.c | 2 +- + app/tools/gimpseamlessclonetool.c | 6 +++--- + app/tools/gimptransformtool.c | 2 +- + app/tools/gimpwarptool.c | 2 +- + app/vectors/gimpbezierstroke.c | 2 +- + app/vectors/gimpvectors-preview.h | 2 +- + app/widgets/gimpaction-history.c | 2 +- + app/widgets/gimpdnd.c | 2 +- + app/widgets/gimpdock.c | 2 +- + app/widgets/gimpdockbook.c | 2 +- + app/widgets/gimphistogramview.c | 2 +- + app/widgets/gimppaletteview.c | 2 +- + app/widgets/gimppanedbox.c | 4 ++-- + app/widgets/gimpsearchpopup.c | 2 +- + app/widgets/gimpselectiondata.c | 2 +- + app/xcf/xcf-save.c | 2 +- + 54 files changed, 69 insertions(+), 69 deletions(-) + +commit 8994246be259d05c33942a5c908c0907f96e0c5b +Author: Michael Natterer +Date: Sun Apr 8 20:26:32 2018 +0200 + + Bug 791519 - Unexpected selection from channel + + One additional fix for the gimp-channel-combine-masks procedure, + it needs both the combined *and* combined-to buffer in + gimp_gegl_mask_combine_buffer() to be treated specially. + + app/gegl/gimp-gegl-mask-combine.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit bb4ac7c8293ad994f82b257b32fc27c3eafd2b26 +Author: Michael Natterer +Date: Sun Apr 8 19:16:58 2018 +0200 + + Bug 791519 - Unexpected selection from channel + + Storing selections and layer masks as linear grayscale, but channels + as whatever-the-layers-are caused severe problems in images with + gamma-corrected layers: when combining channels with the selection, + they would go thorugh a gamma conversion before being combined, giving + unexpected results. + + This commit changes all channels to always be linear, except in 8-bit + images, where they continue to be "Y' u8", for compatibility with old + XCF files, and because linear 8-bit can't really be used in + compositing (channels can be visible too). + + To fix channel -> selection combinations also for these images, add a + small hack to gimp_gegl_mask_combine_buffer() which makes sure the + to-be-combined channel's pixels are always read as-is, without any + gamma conversion. After changing channels to linear, this makes no + difference except in the 8-bit images where we need this hack. + + app/core/gimpimage.c | 13 ++++++++++--- + app/gegl/gimp-gegl-mask-combine.c | 19 ++++++++++++++++++- + 2 files changed, 28 insertions(+), 4 deletions(-) + +commit 8e7a34297fe993c1e8de9d85ecd61c73a1e4afd4 +Author: Ell +Date: Sun Apr 8 09:28:23 2018 -0400 + + app: move painting to a separate thread + + Add gimppainttool-paint.[ch], which takes care of painting during + motion events in GimpPaintTool. Perform the actual painting in a + separate thread, so that display updates, which can have a + significant synchronization overhead, don't stall painting. + + Allow specific paint tools to opt-out of a separate paint thread, + and avoid it in GimpMybrushTool, since it doesn't seem to work. + + The separate paint thread can be explicitly disabled by setting the + GIMP_NO_PAINT_THREAD environment variable. + + app/tools/Makefile.am | 2 + + app/tools/gimpmybrushtool.c | 5 +- + app/tools/gimppainttool-paint.c | 312 + ++++++++++++++++++++++++++++++++++++++++ + app/tools/gimppainttool-paint.h | 30 ++++ + app/tools/gimppainttool.c | 19 +-- + app/tools/gimppainttool.h | 2 + + 6 files changed, 359 insertions(+), 11 deletions(-) + +commit ce9ca03ed47eb2e2fe6cd18a467d02e1bcff5fe2 +Author: Ell +Date: Sun Apr 8 09:21:46 2018 -0400 + + app: add gimp_drawable_{start,end,flush}_paint() + + gimp_drawable_start/end_paint() are used to enter/exit paint mode + for a given drawable. While the drawable is in paint mode, + gimp_drawable_get_buffer() returns a copy of the real drawable's + buffer, referred to as the paint buffer, so that modifications to + the returned buffer don't immediately affect the projection, and + calls to gimp_drawable_update() queue the updated region, instead + of emitting an "update" signal. + + gimp_drawable_flush_paint() can be called while the drawable is in + paint mode, in order to copy the updated region of the paint buffer + back to the drawable's real buffer, and to emit "update" signals + for the queued region. + + We use these functions in the next commit, to move painting to a + separate thread in the paint tools. + + app/core/gimpdrawable-filters.c | 1 + + app/core/gimpdrawable-private.h | 5 ++ + app/core/gimpdrawable-shadow.c | 1 + + app/core/gimpdrawable.c | 169 + +++++++++++++++++++++++++++++++++++++++- + app/core/gimpdrawable.h | 4 + + app/text/gimptextlayer-xcf.c | 1 + + 6 files changed, 178 insertions(+), 3 deletions(-) + +commit db50c72c24fffd07d3bdcadc6a633b864d065fac +Author: Ell +Date: Sun Apr 8 09:16:53 2018 -0400 + + app: align display paint area to a coarse grid + + Align rectangles added to the display paint area, in + gimp_display_paint_area(), to a coarse grid, to reduce the + complexity of ther overall area. This is similar to commit + 49285463e6c0cc03c361902df4e3006fa135dde3, however the alignment + happens in display space, instead of image space. + + app/display/gimpdisplay.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +commit 440be88035812bfbe290c203b396b24b88de1eb5 +Author: Thomas Manni +Date: Sun Apr 8 13:03:11 2018 +0200 + + Bug 794926 - Foreground select tool: several critical errors when ... + + ... double click during trimap painting + + Disable double click when the tool is in trimap paint state. + + app/tools/gimpforegroundselecttool.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 6ebc3f1b090194e02b6e5f6d4fd20e4f856a861f +Author: Ell +Date: Sun Apr 8 03:59:49 2018 -0400 + + Makefiles: don't use -xobjective-c when linking files on Mac + + Last commit caused -xobjective-c to be passed during linking on + Mac, causing object files to be treated as source files. Add a + -xnone flag to AM_LDFLAGS, canceling the effect of -xobjective-c. + + Additinally, add a -xobjective-c++ flag to AM_CXXFLAGS, so that we + can use Objective-C in C++ files on Mac, if we ever need to. + + app-tools/Makefile.am | 8 ++++++++ + app/core/Makefile.am | 8 ++++++++ + app/display/Makefile.am | 8 ++++++++ + app/gui/Makefile.am | 8 ++++++++ + app/widgets/Makefile.am | 8 ++++++++ + libgimp/Makefile.am | 14 ++++++++++++-- + libgimpbase/Makefile.am | 11 ++++++++++- + libgimpthumb/Makefile.am | 11 ++++++++++- + libgimpwidgets/Makefile.am | 11 ++++++++++- + plug-ins/script-fu/Makefile.am | 24 +++++++++++++++--------- + tools/Makefile.am | 8 ++++++++ + 11 files changed, 105 insertions(+), 14 deletions(-) + +commit 06950be7f0a10145c9e7c4f60d0afcb58dba89a5 +Author: Ell +Date: Sat Apr 7 16:39:13 2018 -0400 + + Makefiles: don't use -xobjective-c when compiling C++ files on Mac + + On Mac, pass -xobjective-c to the compiler through AM_CFLAGS, not + AM_CPPFLAGS, so that it's only used for C sources, and not C++ + sources. In the latter case, it clashes with the -std=... flag, + spewing an error. Thanks, Partha :) + + app-tools/Makefile.am | 4 +++- + app/core/Makefile.am | 4 +++- + app/display/Makefile.am | 4 +++- + app/gui/Makefile.am | 4 +++- + app/widgets/Makefile.am | 4 +++- + libgimp/Makefile.am | 4 +++- + libgimpbase/Makefile.am | 4 +++- + libgimpthumb/Makefile.am | 4 +++- + libgimpwidgets/Makefile.am | 4 +++- + plug-ins/script-fu/Makefile.am | 6 +++--- + tools/Makefile.am | 4 +++- + 11 files changed, 33 insertions(+), 13 deletions(-) + +commit bea27171ad56179e89fbace3ef1614e35565cbb1 +Author: Ell +Date: Sat Apr 7 11:46:58 2018 -0400 + + app: throttle statusbar progress updates + + Statusbar progress updates that update the progress bar are + relatively expensive, slowing down operations that report progress + frequently. Only update the progress bar if a certain amount of + time has passed since the last update, to counter that. + + app/display/gimpstatusbar.c | 71 + ++++++++++++++++++++++++++++++--------------- + app/display/gimpstatusbar.h | 1 + + 2 files changed, 48 insertions(+), 24 deletions(-) + +commit 87a10aaf9e75a1b65d1630a7e2539186e4d67b78 +Author: Ell +Date: Sat Apr 7 11:35:25 2018 -0400 + + Bug 795048 - Image->mode->Grayscale results in a black or transparent + image + + In gimp_gegl_convert_color_profile(), when src/dest_rect is NULL, + use the extents of src/dest_buffer, instead of passing a NULL area + to gimp_parallel_distribute_area(), which results in a CRITICAL. + + Additionally, only report progress on the main thread. + + app/gegl/gimp-gegl-loops.cc | 23 ++++++++++++++++++++--- + 1 file changed, 20 insertions(+), 3 deletions(-) + +commit 81e1e3967d0395c2f10ffc312c8409327041cf0c +Author: Massimo Valentini +Date: Sat Apr 7 14:30:30 2018 +0200 + + app: silence gcc warning + + gimp-templates.c:143:15: warning: ‘strncpy’ output truncated + before terminating nul copying 3 bytes from a string of the same + length [-Wstringop-truncation] + strncpy (dpi, "ppi", 3); + ^~~~~~~~~~~~~~~~~~~~~~~ + + app/core/gimp-templates.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2dd2f2f371120a6eda501a3c3230b1f394eccb7a +Author: Michael Natterer +Date: Sat Apr 7 12:27:53 2018 +0200 + + Bug 770424 - Themes: insensitive menu item are not readable + + Need to check if we must override PixbufStyle's draw_layout() after + each theme change, not only at the beginning of themes_init(), so it + works also when the the pixbuf engine was not already loaded at + startup. + + app/gui/themes.c | 83 + ++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 48 insertions(+), 35 deletions(-) + +commit 0ae8e356d185ebbbb92fe53940512dc0a70acf8c +Author: Jehan +Date: Sat Apr 7 01:19:57 2018 +0200 + + po: fix desktop file keywords syntax for Basque translation. + + Some tool in flatpak-build was failing to validate the keywords + because + of this localization. It was complaining that: + + > key "Keywords[eu]" in group "Desktop Entry" does not have a + semicolon + > (';') as trailing character + + po/eu.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d907898c65c706fc5417e3c7c90d5c8299263385 +Author: Jehan +Date: Sat Apr 7 01:17:09 2018 +0200 + + build: update dev and nightly flatpak manifests. + + Dev flatpak now builds the 2.10.0 RC1. + Both manifest tested and working. + + build/flatpak/org.gimp.GIMP-dev.json | 39 + ++++++++++++++++++++++++++------ + build/flatpak/org.gimp.GIMP-nightly.json | 7 ++---- + 2 files changed, 34 insertions(+), 12 deletions(-) + +commit d2c4db1984d5266be76b5698c09e323c4bae13f5 +Author: Jehan +Date: Fri Apr 6 21:08:34 2018 +0200 + + build: upstream flathub build and base modules updated too. + + build/flatpak/flathub | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 494f68418a0809eeb496eb8b6575dee37f3b2ee7 +Author: Jehan +Date: Fri Apr 6 20:59:16 2018 +0200 + + build: do not bundle glib anymore. + + We now use the GNOME 3.28 runtime and glib 2.56.0 is bundled with it. + + build/flatpak/org.gimp.GIMP-nightly.json | 29 + ----------------------------- + 1 file changed, 29 deletions(-) + +commit 43549b7a385e0e6975ae9c2a08ee34e0eb2c9785 +Author: Michael Natterer +Date: Fri Apr 6 12:56:31 2018 +0200 + + app: remove some references to TileManager from xcf-load.c comments + + and minor whitepace cleanup. + + app/xcf/xcf-load.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit f7c2ce9b1359e414ca53273bcea9787bdb51dc3d +Author: Ell +Date: Thu Apr 5 19:14:59 2018 -0400 + + app: fix smudge tool artifacts + + Commit cb239e60f6ef91ba66373a285ab2f5cbeb700eb8 introduced + artifacts when using the smudge tool with multithreads. Fix this + (caused by a wrong offset passed to an iterator) plus indentation + fixes. + + app/gegl/gimp-gegl-loops.cc | 28 ++++++++++++++++------------ + 1 file changed, 16 insertions(+), 12 deletions(-) + +commit d66839993d2d7db47276e2fa964d0802ecc7430a +Author: Alexandre Prokoudine +Date: Fri Apr 6 02:09:48 2018 +0300 + + Updated Russian translation + + po/ru.po | 1747 + ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 896 insertions(+), 851 deletions(-) + +commit 87b96116289b56d1410fab58ef28fd8def5fd571 +Author: Jehan +Date: Thu Apr 5 23:57:34 2018 +0200 + + app: fix build error "‘memset’ was not declared in this scope". + + app/paint/gimpbrushcore-loops.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 299a258237f3b5309068b73b310cbd49a10d8fe7 +Author: Alexandre Prokoudine +Date: Fri Apr 6 00:44:15 2018 +0300 + + NEWS: keep updated + + NEWS | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 4336e2e52a5bd5dfdc31ccdf2e0594cf93b3ca90 +Author: Ell +Date: Thu Apr 5 17:30:51 2018 -0400 + + app: parallelize gimpbrushcore-loops.cc + + Use gimp_parallel_distribute_foo() to parallelize the brush core + loops. + + app/paint/gimpbrushcore-loops.cc | 204 + ++++++++++++++++++++++++--------------- + 1 file changed, 126 insertions(+), 78 deletions(-) + +commit 6e314b5090b2d75603f919fb5d9306f822ead285 +Author: Ell +Date: Thu Apr 5 14:05:10 2018 -0400 + + app: move brush-core loops to a separate file + + Move gimp_brush_core_{subsample,pressurize,solidify}_mask() to a + separate gimpbrushcore-loops.cc file, so that they can be C++-ified + independently from the rest of the code. The next commit + parallelizes them. + + app/paint/Makefile.am | 2 + + app/paint/gimpbrushcore-loops.cc | 379 + +++++++++++++++++++++++++++++++++++++++ + app/paint/gimpbrushcore-loops.h | 37 ++++ + app/paint/gimpbrushcore.c | 359 + +----------------------------------- + 4 files changed, 419 insertions(+), 358 deletions(-) + +commit f7ea9abc732f925fdf1604d275d659c790ce304b +Author: Ell +Date: Thu Apr 5 13:41:36 2018 -0400 + + app: add include guards to gimppatincore-loops.h + + app/paint/gimppaintcore-loops.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit cf21dcbe374475ef9f9f19cf491a1be39b9c5dd8 +Author: Ville Pätsi +Date: Thu Apr 5 18:24:44 2018 +0300 + + Rework and rename the default Dark theme + + app/config/gimpguiconfig.h | 2 +- + docs/gimprc.5.in | 2 +- + etc/gimprc.in | 2 +- + themes/Dark/Makefile.am | 4 +- + themes/Dark/gtkrc | 266 + ++++++++++++++------- + themes/Dark/ui/arrow-right.png | Bin 226 -> + 4994 bytes + themes/Dark/ui/button-default.png | Bin 517 -> + 1134 bytes + themes/Dark/ui/button-prelight.png | Bin 369 -> + 1835 bytes + themes/Dark/ui/button-pressed.png | Bin 377 -> + 1653 bytes + themes/Dark/ui/check1.png | Bin 247 -> + 1758 bytes + themes/Dark/ui/check2.png | Bin 7436 -> + 4223 bytes + themes/Dark/ui/check3.png | Bin 5978 -> + 6348 bytes + themes/Dark/ui/combo-entry-border-active-bg.png | Bin 191 -> + 4930 bytes + .../Dark/ui/combo-entry-border-active-notebook.png | Bin 185 -> + 4929 bytes + .../ui/combo-entry-border-active-rtl-notebook.png | Bin 185 -> + 4932 bytes + themes/Dark/ui/combo-entry-border-bg.png | Bin 191 -> + 4926 bytes + themes/Dark/ui/combo-entry-border-disabled-bg.png | Bin 191 -> + 4928 bytes + .../ui/combo-entry-border-disabled-notebook.png | Bin 185 -> + 4928 bytes + .../Dark/ui/combo-entry-border-disabled-rtl-bg.png | Bin 191 -> + 4933 bytes + .../combo-entry-border-disabled-rtl-notebook.png | Bin 185 -> + 4931 bytes + themes/Dark/ui/combo-entry-border-notebook.png | Bin 185 -> 942 bytes + themes/Dark/ui/combo-entry-border-rtl-bg.png | Bin 191 -> + 4931 bytes + themes/Dark/ui/combo-entry-border-rtl-notebook.png | Bin 185 -> + 4932 bytes + themes/Dark/ui/combo-entry-button-active-rtl.png | Bin 175 -> + 4934 bytes + themes/Dark/ui/combo-entry-button-active.png | Bin 175 -> + 4935 bytes + themes/Dark/ui/combo-entry-button-disabled-rtl.png | Bin 191 -> + 4962 bytes + themes/Dark/ui/combo-entry-button-disabled.png | Bin 191 -> + 4937 bytes + themes/Dark/ui/combo-entry-button-rtl.png | Bin 191 -> + 4939 bytes + themes/Dark/ui/combo-entry-button.png | Bin 191 -> 972 bytes + themes/Dark/ui/entry-border-active-bg.png | Bin 197 -> + 4939 bytes + themes/Dark/ui/entry-border-active-notebook.png | Bin 168 -> + 4940 bytes + themes/Dark/ui/entry-border-disabled-bg.png | Bin 150 -> + 4941 bytes + themes/Dark/ui/entry-border-disabled-notebook.png | Bin 150 -> + 4939 bytes + themes/Dark/ui/entry-border-fill-active.png | Bin 125 -> + 4896 bytes + themes/Dark/ui/entry-border-fill.png | Bin 125 -> + 4891 bytes + themes/Dark/ui/entry-border-notebook.png | Bin 172 -> + 4924 bytes + themes/Dark/ui/ext-bottom.png | Bin 148 -> + 5205 bytes + themes/Dark/ui/ext-left.png | Bin 149 -> + 5355 bytes + themes/Dark/ui/extension-bottom.png | Bin 3911 -> + 5284 bytes + themes/Dark/ui/frame-gap-end.png | Bin 124 -> + 4892 bytes + themes/Dark/ui/frame-gap-start.png | Bin 124 -> + 4892 bytes + themes/Dark/ui/frame.png | Bin 168 -> + 5166 bytes + themes/Dark/ui/gimp-button-default.png | Bin 517 -> + 1149 bytes + themes/Dark/ui/gimp-button-insensitive.png | Bin 4068 -> + 1392 bytes + themes/Dark/ui/gimp-button-normal.png | Bin 4066 -> + 5419 bytes + themes/Dark/ui/gimp-button-prelight.png | Bin 4141 -> + 1308 bytes + themes/Dark/ui/gimp-button-pressed.png | Bin 4523 -> + 1216 bytes + themes/Dark/ui/gimp-line-h.png | Bin 141 -> + 4888 bytes + themes/Dark/ui/gimp-line-v.png | Bin 140 -> + 4887 bytes + themes/Dark/ui/gimp-menu-line-h.png | Bin 139 -> + 4908 bytes + themes/Dark/ui/list_header-pressed.png | Bin 159 -> + 5249 bytes + themes/Dark/ui/list_header.png | Bin 170 -> + 5248 bytes + themes/Dark/ui/menu-arrow.png | Bin 188 -> + 5173 bytes + themes/Dark/ui/menuitem.png | Bin 167 -> 862 bytes + themes/Dark/ui/minus.png | Bin 6041 -> + 5578 bytes + themes/Dark/ui/option1.png | Bin 333 -> + 5017 bytes + themes/Dark/ui/option2.png | Bin 8204 -> + 6701 bytes + themes/Dark/ui/option3.png | Bin 7622 -> + 6087 bytes + themes/Dark/ui/plus.png | Bin 6384 -> + 6023 bytes + themes/Dark/ui/shadow-in-alt.png | Bin 161 -> + 2407 bytes + themes/Dark/ui/slider-h.png | Bin 212 -> 897 bytes + themes/Dark/ui/slider-v.png | Bin 181 -> 900 bytes + themes/Dark/ui/spin-insensitive.png | Bin 180 -> + 1405 bytes + themes/Dark/ui/spin.png | Bin 201 -> + 1188 bytes + 64 files changed, 188 insertions(+), 88 deletions(-) + +commit 7aecc90e10aa48bcbc73a5199c9591c16ff5b022 +Author: Ville Pätsi +Date: Thu Apr 5 18:18:47 2018 +0300 + + Remove Lighter, Darker, and Gray themes + + configure.ac | 3 - + themes/Darker/.gitignore | 2 - + themes/Darker/Makefile.am | 131 - + themes/Darker/gtkrc | 2512 + ------------------- + themes/Darker/ui/arrow-down-insens.png | Bin 228 -> 0 bytes + themes/Darker/ui/arrow-down-prelight.png | Bin 223 -> 0 bytes + themes/Darker/ui/arrow-down-small-insens.png | Bin 224 -> 0 bytes + themes/Darker/ui/arrow-down-small-prelight.png | Bin 212 -> 0 bytes + themes/Darker/ui/arrow-down-small.png | Bin 212 -> 0 bytes + themes/Darker/ui/arrow-down.png | Bin 223 -> 0 bytes + themes/Darker/ui/arrow-left-insens.png | Bin 226 -> 0 bytes + themes/Darker/ui/arrow-left-prelight.png | Bin 226 -> 0 bytes + themes/Darker/ui/arrow-left.png | Bin 226 -> 0 bytes + themes/Darker/ui/arrow-right-insens.png | Bin 226 -> 0 bytes + themes/Darker/ui/arrow-right-prelight.png | Bin 226 -> 0 bytes + themes/Darker/ui/arrow-right.png | Bin 226 -> 0 bytes + themes/Darker/ui/arrow-up-insens.png | Bin 224 -> 0 bytes + themes/Darker/ui/arrow-up-prelight.png | Bin 219 -> 0 bytes + themes/Darker/ui/arrow-up-small-insens.png | Bin 202 -> 0 bytes + themes/Darker/ui/arrow-up-small-prelight.png | Bin 198 -> 0 bytes + themes/Darker/ui/arrow-up-small.png | Bin 198 -> 0 bytes + themes/Darker/ui/arrow-up.png | Bin 219 -> 0 bytes + themes/Darker/ui/bar-h.png | Bin 161 -> 0 bytes + themes/Darker/ui/bar-v.png | Bin 165 -> 0 bytes + themes/Darker/ui/button-default.png | Bin 517 -> 0 bytes + themes/Darker/ui/button-insensitive.png | Bin 334 -> 0 bytes + themes/Darker/ui/button-normal.png | Bin 375 -> 0 bytes + themes/Darker/ui/button-prelight.png | Bin 369 -> 0 bytes + themes/Darker/ui/button-pressed.png | Bin 377 -> 0 bytes + themes/Darker/ui/check1.png | Bin 247 -> 0 bytes + themes/Darker/ui/check2.png | Bin 7436 -> 0 bytes + themes/Darker/ui/check3.png | Bin 5978 -> 0 bytes + themes/Darker/ui/combo-entry-border-active-bg.png | Bin 191 -> 0 bytes + .../ui/combo-entry-border-active-notebook.png | Bin 185 -> 0 bytes + .../ui/combo-entry-border-active-rtl-notebook.png | Bin 185 -> 0 bytes + themes/Darker/ui/combo-entry-border-bg.png | Bin 191 -> 0 bytes + .../Darker/ui/combo-entry-border-disabled-bg.png | Bin 191 -> 0 bytes + .../ui/combo-entry-border-disabled-notebook.png | Bin 185 -> 0 bytes + .../ui/combo-entry-border-disabled-rtl-bg.png | Bin 191 -> 0 bytes + .../combo-entry-border-disabled-rtl-notebook.png | Bin 185 -> 0 bytes + themes/Darker/ui/combo-entry-border-notebook.png | Bin 185 -> 0 bytes + themes/Darker/ui/combo-entry-border-rtl-bg.png | Bin 191 -> 0 bytes + .../Darker/ui/combo-entry-border-rtl-notebook.png | Bin 185 -> 0 bytes + themes/Darker/ui/combo-entry-button-active-rtl.png | Bin 175 -> 0 bytes + themes/Darker/ui/combo-entry-button-active.png | Bin 175 -> 0 bytes + .../Darker/ui/combo-entry-button-disabled-rtl.png | Bin 191 -> 0 bytes + themes/Darker/ui/combo-entry-button-disabled.png | Bin 191 -> 0 bytes + themes/Darker/ui/combo-entry-button-rtl.png | Bin 191 -> 0 bytes + themes/Darker/ui/combo-entry-button.png | Bin 191 -> 0 bytes + themes/Darker/ui/down-pre.png | Bin 159 -> 0 bytes + themes/Darker/ui/down.png | Bin 160 -> 0 bytes + themes/Darker/ui/entry-border-active-bg.png | Bin 197 -> 0 bytes + themes/Darker/ui/entry-border-active-notebook.png | Bin 168 -> 0 bytes + themes/Darker/ui/entry-border-disabled-bg.png | Bin 150 -> 0 bytes + .../Darker/ui/entry-border-disabled-notebook.png | Bin 150 -> 0 bytes + themes/Darker/ui/entry-border-fill-active.png | Bin 125 -> 0 bytes + themes/Darker/ui/entry-border-fill.png | Bin 125 -> 0 bytes + themes/Darker/ui/entry-border-notebook-null.png | Bin 4013 -> 0 bytes + themes/Darker/ui/entry-border-notebook.png | Bin 172 -> 0 bytes + themes/Darker/ui/ext-bottom.png | Bin 148 -> 0 bytes + themes/Darker/ui/ext-left.png | Bin 149 -> 0 bytes + themes/Darker/ui/ext-right.png | Bin 148 -> 0 bytes + themes/Darker/ui/ext-top.png | Bin 148 -> 0 bytes + themes/Darker/ui/extension-bottom.png | Bin 148 -> 0 bytes + themes/Darker/ui/extension-left.png | Bin 149 -> 0 bytes + themes/Darker/ui/extension-right.png | Bin 148 -> 0 bytes + themes/Darker/ui/extension-top.png | Bin 148 -> 0 bytes + themes/Darker/ui/frame-gap-end.png | Bin 124 -> 0 bytes + themes/Darker/ui/frame-gap-start.png | Bin 124 -> 0 bytes + themes/Darker/ui/frame.png | Bin 168 -> 0 bytes + themes/Darker/ui/gap_bottom.png | Bin 142 -> 0 bytes + themes/Darker/ui/gap_left.png | Bin 144 -> 0 bytes + themes/Darker/ui/gap_right.png | Bin 141 -> 0 bytes + themes/Darker/ui/gap_top.png | Bin 143 -> 0 bytes + themes/Darker/ui/gimp-arrow-down-insensitive.png | Bin 185 -> 0 bytes + themes/Darker/ui/gimp-arrow-down-insenstive.png | Bin 185 -> 0 bytes + themes/Darker/ui/gimp-arrow-down.png | Bin 170 -> 0 bytes + themes/Darker/ui/gimp-arrow-left.png | Bin 166 -> 0 bytes + themes/Darker/ui/gimp-arrow-right-dark.png | Bin 173 -> 0 bytes + themes/Darker/ui/gimp-arrow-right.png | Bin 160 -> 0 bytes + themes/Darker/ui/gimp-arrow-up.png | Bin 171 -> 0 bytes + themes/Darker/ui/gimp-button-default.png | Bin 517 -> 0 bytes + themes/Darker/ui/gimp-button-insensitive.png | Bin 4068 -> 0 bytes + themes/Darker/ui/gimp-button-normal.png | Bin 4066 -> 0 bytes + themes/Darker/ui/gimp-button-prelight.png | Bin 4154 -> 0 bytes + themes/Darker/ui/gimp-button-pressed.png | Bin 4523 -> 0 bytes + themes/Darker/ui/gimp-handle-h.png | Bin 4927 -> 0 bytes + themes/Darker/ui/gimp-handle-v.png | Bin 4911 -> 0 bytes + themes/Darker/ui/gimp-line-h.png | Bin 141 -> 0 bytes + themes/Darker/ui/gimp-line-v.png | Bin 140 -> 0 bytes + themes/Darker/ui/gimp-menu-line-h.png | Bin 139 -> 0 bytes + themes/Darker/ui/gimp-tooltip-bg.png | Bin 393 -> 0 bytes + themes/Darker/ui/list_header-pressed.png | Bin 159 -> 0 bytes + themes/Darker/ui/list_header.png | Bin 170 -> 0 bytes + themes/Darker/ui/menu-arrow-prelight.png | Bin 179 -> 0 bytes + themes/Darker/ui/menu-arrow.png | Bin 188 -> 0 bytes + themes/Darker/ui/menu.png | Bin 141 -> 0 bytes + themes/Darker/ui/menubar.png | Bin 141 -> 0 bytes + themes/Darker/ui/menuitem-prelight.png | Bin 125 -> 0 bytes + themes/Darker/ui/menuitem.png | Bin 167 -> 0 bytes + themes/Darker/ui/minus.png | Bin 6041 -> 0 bytes + themes/Darker/ui/notebook.png | Bin 3675 -> 0 bytes + themes/Darker/ui/null.png | Bin 3398 -> 0 bytes + themes/Darker/ui/option1.png | Bin 333 -> 0 bytes + themes/Darker/ui/option2.png | Bin 8204 -> 0 bytes + themes/Darker/ui/option3.png | Bin 7622 -> 0 bytes + themes/Darker/ui/plus.png | Bin 6384 -> 0 bytes + themes/Darker/ui/progressbar-trough.png | Bin 130 -> 0 bytes + themes/Darker/ui/progressbar.png | Bin 145 -> 0 bytes + themes/Darker/ui/shadow-in-alt.png | Bin 161 -> 0 bytes + themes/Darker/ui/shadow-in.png | Bin 159 -> 0 bytes + themes/Darker/ui/shadow-null.png | Bin 146 -> 0 bytes + themes/Darker/ui/shadow-out.png | Bin 182 -> 0 bytes + themes/Darker/ui/slider-h.png | Bin 212 -> 0 bytes + themes/Darker/ui/slider-v.png | Bin 181 -> 0 bytes + themes/Darker/ui/spin-down-insensitive.png | Bin 151 -> 0 bytes + themes/Darker/ui/spin-down-normal.png | Bin 148 -> 0 bytes + themes/Darker/ui/spin-down-pressed.png | Bin 148 -> 0 bytes + themes/Darker/ui/spin-insensitive.png | Bin 180 -> 0 bytes + themes/Darker/ui/spin-up-insensitive.png | Bin 151 -> 0 bytes + themes/Darker/ui/spin-up-normal.png | Bin 151 -> 0 bytes + themes/Darker/ui/spin-up-pressed.png | Bin 151 -> 0 bytes + themes/Darker/ui/spin.png | Bin 201 -> 0 bytes + themes/Darker/ui/toolbar.png | Bin 326 -> 0 bytes + themes/Darker/ui/transparent.png | Bin 122 -> 0 bytes + themes/Gray/.gitignore | 2 - + themes/Gray/Makefile.am | 132 - + themes/Gray/gtkrc | 2523 + ------------------- + themes/Gray/ui/arrow-down-insens.png | Bin 232 -> 0 bytes + themes/Gray/ui/arrow-down-prelight.png | Bin 221 -> 0 bytes + themes/Gray/ui/arrow-down-small-insens.png | Bin 231 -> 0 bytes + themes/Gray/ui/arrow-down-small-prelight.png | Bin 207 -> 0 bytes + themes/Gray/ui/arrow-down-small.png | Bin 207 -> 0 bytes + themes/Gray/ui/arrow-down.png | Bin 221 -> 0 bytes + themes/Gray/ui/arrow-left-insens.png | Bin 228 -> 0 bytes + themes/Gray/ui/arrow-left-prelight.png | Bin 227 -> 0 bytes + themes/Gray/ui/arrow-left.png | Bin 227 -> 0 bytes + themes/Gray/ui/arrow-right-insens.png | Bin 236 -> 0 bytes + themes/Gray/ui/arrow-right-prelight.png | Bin 225 -> 0 bytes + themes/Gray/ui/arrow-right.png | Bin 225 -> 0 bytes + themes/Gray/ui/arrow-up-insens.png | Bin 231 -> 0 bytes + themes/Gray/ui/arrow-up-prelight.png | Bin 221 -> 0 bytes + themes/Gray/ui/arrow-up-small-insens.png | Bin 208 -> 0 bytes + themes/Gray/ui/arrow-up-small-prelight.png | Bin 199 -> 0 bytes + themes/Gray/ui/arrow-up-small.png | Bin 199 -> 0 bytes + themes/Gray/ui/arrow-up.png | Bin 221 -> 0 bytes + themes/Gray/ui/bar-h.png | Bin 162 -> 0 bytes + themes/Gray/ui/bar-v.png | Bin 170 -> 0 bytes + themes/Gray/ui/button-default.png | Bin 515 -> 0 bytes + themes/Gray/ui/button-insensitive.png | Bin 380 -> 0 bytes + themes/Gray/ui/button-normal.png | Bin 422 -> 0 bytes + themes/Gray/ui/button-prelight.png | Bin 414 -> 0 bytes + themes/Gray/ui/button-pressed.png | Bin 419 -> 0 bytes + themes/Gray/ui/check1.png | Bin 288 -> 0 bytes + themes/Gray/ui/check2.png | Bin 290 -> 0 bytes + themes/Gray/ui/check3.png | Bin 272 -> 0 bytes + themes/Gray/ui/combo-entry-border-active-bg.png | Bin 153 -> 0 bytes + .../Gray/ui/combo-entry-border-active-notebook.png | Bin 153 -> 0 bytes + .../ui/combo-entry-border-active-rtl-notebook.png | Bin 152 -> 0 bytes + themes/Gray/ui/combo-entry-border-bg.png | Bin 153 -> 0 bytes + themes/Gray/ui/combo-entry-border-disabled-bg.png | Bin 153 -> 0 bytes + .../ui/combo-entry-border-disabled-notebook.png | Bin 153 -> 0 bytes + .../Gray/ui/combo-entry-border-disabled-rtl-bg.png | Bin 152 -> 0 bytes + .../combo-entry-border-disabled-rtl-notebook.png | Bin 152 -> 0 bytes + themes/Gray/ui/combo-entry-border-notebook.png | Bin 153 -> 0 bytes + themes/Gray/ui/combo-entry-border-rtl-bg.png | Bin 152 -> 0 bytes + themes/Gray/ui/combo-entry-border-rtl-notebook.png | Bin 152 -> 0 bytes + themes/Gray/ui/combo-entry-button-active-rtl.png | Bin 147 -> 0 bytes + themes/Gray/ui/combo-entry-button-active.png | Bin 148 -> 0 bytes + themes/Gray/ui/combo-entry-button-disabled-rtl.png | Bin 153 -> 0 bytes + themes/Gray/ui/combo-entry-button-disabled.png | Bin 152 -> 0 bytes + themes/Gray/ui/combo-entry-button-rtl.png | Bin 153 -> 0 bytes + themes/Gray/ui/combo-entry-button.png | Bin 152 -> 0 bytes + themes/Gray/ui/entry-border-active-bg.png | Bin 154 -> 0 bytes + themes/Gray/ui/entry-border-active-notebook.png | Bin 154 -> 0 bytes + themes/Gray/ui/entry-border-disabled-bg.png | Bin 171 -> 0 bytes + themes/Gray/ui/entry-border-disabled-notebook.png | Bin 171 -> 0 bytes + themes/Gray/ui/entry-border-fill-active-item.png | Bin 125 -> 0 bytes + themes/Gray/ui/entry-border-fill-active.png | Bin 141 -> 0 bytes + themes/Gray/ui/entry-border-fill.png | Bin 141 -> 0 bytes + themes/Gray/ui/entry-border-notebook-null.png | Bin 4013 -> 0 bytes + themes/Gray/ui/entry-border-notebook.png | Bin 193 -> 0 bytes + themes/Gray/ui/ext-bottom.png | Bin 166 -> 0 bytes + themes/Gray/ui/ext-left.png | Bin 165 -> 0 bytes + themes/Gray/ui/ext-right.png | Bin 164 -> 0 bytes + themes/Gray/ui/ext-top.png | Bin 166 -> 0 bytes + themes/Gray/ui/extension-bottom.png | Bin 166 -> 0 bytes + themes/Gray/ui/extension-left.png | Bin 165 -> 0 bytes + themes/Gray/ui/extension-right.png | Bin 164 -> 0 bytes + themes/Gray/ui/extension-top.png | Bin 166 -> 0 bytes + themes/Gray/ui/frame-gap-end.png | Bin 168 -> 0 bytes + themes/Gray/ui/frame-gap-start.png | Bin 168 -> 0 bytes + themes/Gray/ui/frame.png | Bin 212 -> 0 bytes + themes/Gray/ui/gap_bottom.png | Bin 186 -> 0 bytes + themes/Gray/ui/gap_left.png | Bin 189 -> 0 bytes + themes/Gray/ui/gap_right.png | Bin 186 -> 0 bytes + themes/Gray/ui/gap_top.png | Bin 187 -> 0 bytes + themes/Gray/ui/gimp-arrow-down-insensitive.png | Bin 236 -> 0 bytes + themes/Gray/ui/gimp-arrow-down-insenstive.png | Bin 236 -> 0 bytes + themes/Gray/ui/gimp-arrow-down.png | Bin 218 -> 0 bytes + themes/Gray/ui/gimp-arrow-left.png | Bin 220 -> 0 bytes + themes/Gray/ui/gimp-arrow-right-dark.png | Bin 232 -> 0 bytes + themes/Gray/ui/gimp-arrow-right-prelight.png | Bin 179 -> 0 bytes + themes/Gray/ui/gimp-arrow-right.png | Bin 221 -> 0 bytes + themes/Gray/ui/gimp-arrow-up.png | Bin 216 -> 0 bytes + themes/Gray/ui/gimp-button-default.png | Bin 515 -> 0 bytes + themes/Gray/ui/gimp-button-insensitive.png | Bin 380 -> 0 bytes + themes/Gray/ui/gimp-button-normal.png | Bin 422 -> 0 bytes + themes/Gray/ui/gimp-button-prelight.png | Bin 4184 -> 0 bytes + themes/Gray/ui/gimp-button-pressed.png | Bin 4030 -> 0 bytes + themes/Gray/ui/gimp-handle-h.png | Bin 4962 -> 0 bytes + themes/Gray/ui/gimp-handle-v.png | Bin 4969 -> 0 bytes + themes/Gray/ui/gimp-line-h.png | Bin 185 -> 0 bytes + themes/Gray/ui/gimp-line-v.png | Bin 184 -> 0 bytes + themes/Gray/ui/gimp-menu-line-h.png | Bin 183 -> 0 bytes + themes/Gray/ui/gimp-tooltip-bg.png | Bin 438 -> 0 bytes + themes/Gray/ui/list_header-pressed.png | Bin 203 -> 0 bytes + themes/Gray/ui/list_header.png | Bin 214 -> 0 bytes + themes/Gray/ui/menu-arrow-prelight.png | Bin 179 -> 0 bytes + themes/Gray/ui/menu-arrow.png | Bin 180 -> 0 bytes + themes/Gray/ui/menu-prelight.png | Bin 154 -> 0 bytes + themes/Gray/ui/menu.png | Bin 140 -> 0 bytes + themes/Gray/ui/menubar.png | Bin 157 -> 0 bytes + themes/Gray/ui/menuitem-prelight.png | Bin 146 -> 0 bytes + themes/Gray/ui/menuitem.png | Bin 146 -> 0 bytes + themes/Gray/ui/minus.png | Bin 264 -> 0 bytes + themes/Gray/ui/notebook.png | Bin 3722 -> 0 bytes + themes/Gray/ui/null.png | Bin 173 -> 0 bytes + themes/Gray/ui/option1.png | Bin 371 -> 0 bytes + themes/Gray/ui/option2.png | Bin 367 -> 0 bytes + themes/Gray/ui/option3.png | Bin 360 -> 0 bytes + themes/Gray/ui/plus.png | Bin 269 -> 0 bytes + themes/Gray/ui/progressbar-trough.png | Bin 3493 -> 0 bytes + themes/Gray/ui/progressbar.png | Bin 4409 -> 0 bytes + themes/Gray/ui/shadow-in-alt.png | Bin 206 -> 0 bytes + themes/Gray/ui/shadow-in.png | Bin 219 -> 0 bytes + themes/Gray/ui/shadow-null.png | Bin 146 -> 0 bytes + themes/Gray/ui/shadow-out.png | Bin 228 -> 0 bytes + themes/Gray/ui/slider-h.png | Bin 168 -> 0 bytes + themes/Gray/ui/slider-v.png | Bin 149 -> 0 bytes + themes/Gray/ui/spin-down-insensitive.png | Bin 213 -> 0 bytes + themes/Gray/ui/spin-down-normal.png | Bin 200 -> 0 bytes + themes/Gray/ui/spin-down-pressed.png | Bin 204 -> 0 bytes + themes/Gray/ui/spin-insensitive.png | Bin 224 -> 0 bytes + themes/Gray/ui/spin-up-insensitive.png | Bin 194 -> 0 bytes + themes/Gray/ui/spin-up-normal.png | Bin 202 -> 0 bytes + themes/Gray/ui/spin-up-pressed.png | Bin 194 -> 0 bytes + themes/Gray/ui/spin.png | Bin 244 -> 0 bytes + themes/Gray/ui/toolbar.png | Bin 130 -> 0 bytes + themes/Gray/ui/transparent.png | Bin 179 -> 0 bytes + themes/Light/Makefile.am | 4 +- + themes/Lighter/.gitignore | 2 - + themes/Lighter/Makefile.am | 131 - + themes/Lighter/gtkrc | 2529 + -------------------- + themes/Lighter/ui/arrow-down-insens.png | Bin 232 -> 0 bytes + themes/Lighter/ui/arrow-down-prelight.png | Bin 221 -> 0 bytes + themes/Lighter/ui/arrow-down-small-insens.png | Bin 231 -> 0 bytes + themes/Lighter/ui/arrow-down-small-prelight.png | Bin 207 -> 0 bytes + themes/Lighter/ui/arrow-down-small.png | Bin 207 -> 0 bytes + themes/Lighter/ui/arrow-down.png | Bin 221 -> 0 bytes + themes/Lighter/ui/arrow-left-insens.png | Bin 228 -> 0 bytes + themes/Lighter/ui/arrow-left-prelight.png | Bin 227 -> 0 bytes + themes/Lighter/ui/arrow-left.png | Bin 227 -> 0 bytes + themes/Lighter/ui/arrow-right-insens.png | Bin 236 -> 0 bytes + themes/Lighter/ui/arrow-right-prelight.png | Bin 225 -> 0 bytes + themes/Lighter/ui/arrow-right.png | Bin 225 -> 0 bytes + themes/Lighter/ui/arrow-up-insens.png | Bin 231 -> 0 bytes + themes/Lighter/ui/arrow-up-prelight.png | Bin 221 -> 0 bytes + themes/Lighter/ui/arrow-up-small-insens.png | Bin 208 -> 0 bytes + themes/Lighter/ui/arrow-up-small-prelight.png | Bin 199 -> 0 bytes + themes/Lighter/ui/arrow-up-small.png | Bin 199 -> 0 bytes + themes/Lighter/ui/arrow-up.png | Bin 221 -> 0 bytes + themes/Lighter/ui/bar-h.png | Bin 175 -> 0 bytes + themes/Lighter/ui/bar-v.png | Bin 181 -> 0 bytes + themes/Lighter/ui/button-default.png | Bin 515 -> 0 bytes + themes/Lighter/ui/button-insensitive.png | Bin 380 -> 0 bytes + themes/Lighter/ui/button-normal.png | Bin 422 -> 0 bytes + themes/Lighter/ui/button-prelight.png | Bin 414 -> 0 bytes + themes/Lighter/ui/button-pressed.png | Bin 419 -> 0 bytes + themes/Lighter/ui/check1.png | Bin 288 -> 0 bytes + themes/Lighter/ui/check2.png | Bin 290 -> 0 bytes + themes/Lighter/ui/check3.png | Bin 272 -> 0 bytes + themes/Lighter/ui/combo-entry-border-active-bg.png | Bin 153 -> 0 bytes + .../ui/combo-entry-border-active-notebook.png | Bin 153 -> 0 bytes + .../ui/combo-entry-border-active-rtl-notebook.png | Bin 152 -> 0 bytes + themes/Lighter/ui/combo-entry-border-bg.png | Bin 3446 -> 0 bytes + .../Lighter/ui/combo-entry-border-disabled-bg.png | Bin 153 -> 0 bytes + .../ui/combo-entry-border-disabled-notebook.png | Bin 153 -> 0 bytes + .../ui/combo-entry-border-disabled-rtl-bg.png | Bin 152 -> 0 bytes + .../combo-entry-border-disabled-rtl-notebook.png | Bin 152 -> 0 bytes + themes/Lighter/ui/combo-entry-border-notebook.png | Bin 153 -> 0 bytes + themes/Lighter/ui/combo-entry-border-rtl-bg.png | Bin 152 -> 0 bytes + .../Lighter/ui/combo-entry-border-rtl-notebook.png | Bin 152 -> 0 bytes + .../Lighter/ui/combo-entry-button-active-rtl.png | Bin 147 -> 0 bytes + themes/Lighter/ui/combo-entry-button-active.png | Bin 148 -> 0 bytes + .../Lighter/ui/combo-entry-button-disabled-rtl.png | Bin 153 -> 0 bytes + themes/Lighter/ui/combo-entry-button-disabled.png | Bin 152 -> 0 bytes + themes/Lighter/ui/combo-entry-button-rtl.png | Bin 153 -> 0 bytes + themes/Lighter/ui/combo-entry-button.png | Bin 3485 -> 0 bytes + themes/Lighter/ui/entry-border-active-bg.png | Bin 154 -> 0 bytes + themes/Lighter/ui/entry-border-active-notebook.png | Bin 154 -> 0 bytes + themes/Lighter/ui/entry-border-disabled-bg.png | Bin 171 -> 0 bytes + .../Lighter/ui/entry-border-disabled-notebook.png | Bin 171 -> 0 bytes + .../Lighter/ui/entry-border-fill-active-item.png | Bin 125 -> 0 bytes + themes/Lighter/ui/entry-border-fill-active.png | Bin 141 -> 0 bytes + themes/Lighter/ui/entry-border-fill.png | Bin 141 -> 0 bytes + themes/Lighter/ui/entry-border-notebook-null.png | Bin 4013 -> 0 bytes + themes/Lighter/ui/entry-border-notebook.png | Bin 193 -> 0 bytes + themes/Lighter/ui/ext-bottom.png | Bin 166 -> 0 bytes + themes/Lighter/ui/ext-left.png | Bin 166 -> 0 bytes + themes/Lighter/ui/ext-right.png | Bin 164 -> 0 bytes + themes/Lighter/ui/ext-top.png | Bin 166 -> 0 bytes + themes/Lighter/ui/extension-bottom.png | Bin 166 -> 0 bytes + themes/Lighter/ui/extension-left.png | Bin 166 -> 0 bytes + themes/Lighter/ui/extension-right.png | Bin 164 -> 0 bytes + themes/Lighter/ui/extension-top.png | Bin 166 -> 0 bytes + themes/Lighter/ui/frame-gap-end.png | Bin 168 -> 0 bytes + themes/Lighter/ui/frame-gap-start.png | Bin 168 -> 0 bytes + themes/Lighter/ui/frame.png | Bin 212 -> 0 bytes + themes/Lighter/ui/gap_bottom.png | Bin 186 -> 0 bytes + themes/Lighter/ui/gap_left.png | Bin 189 -> 0 bytes + themes/Lighter/ui/gap_right.png | Bin 186 -> 0 bytes + themes/Lighter/ui/gap_top.png | Bin 187 -> 0 bytes + themes/Lighter/ui/gimp-arrow-down-insensitive.png | Bin 236 -> 0 bytes + themes/Lighter/ui/gimp-arrow-down-insenstive.png | Bin 236 -> 0 bytes + themes/Lighter/ui/gimp-arrow-down.png | Bin 218 -> 0 bytes + themes/Lighter/ui/gimp-arrow-left.png | Bin 220 -> 0 bytes + themes/Lighter/ui/gimp-arrow-right-dark.png | Bin 232 -> 0 bytes + themes/Lighter/ui/gimp-arrow-right-prelight.png | Bin 179 -> 0 bytes + themes/Lighter/ui/gimp-arrow-right.png | Bin 221 -> 0 bytes + themes/Lighter/ui/gimp-arrow-up.png | Bin 216 -> 0 bytes + themes/Lighter/ui/gimp-button-default.png | Bin 5763 -> 0 bytes + themes/Lighter/ui/gimp-button-insensitive.png | Bin 4124 -> 0 bytes + themes/Lighter/ui/gimp-button-normal.png | Bin 4205 -> 0 bytes + themes/Lighter/ui/gimp-button-prelight.png | Bin 4513 -> 0 bytes + themes/Lighter/ui/gimp-button-pressed.png | Bin 4092 -> 0 bytes + themes/Lighter/ui/gimp-handle-h.png | Bin 5112 -> 0 bytes + themes/Lighter/ui/gimp-handle-v.png | Bin 5062 -> 0 bytes + themes/Lighter/ui/gimp-line-h.png | Bin 185 -> 0 bytes + themes/Lighter/ui/gimp-line-v.png | Bin 184 -> 0 bytes + themes/Lighter/ui/gimp-menu-line-h.png | Bin 183 -> 0 bytes + themes/Lighter/ui/gimp-tooltip-bg.png | Bin 438 -> 0 bytes + themes/Lighter/ui/list_header-pressed.png | Bin 203 -> 0 bytes + themes/Lighter/ui/list_header.png | Bin 214 -> 0 bytes + themes/Lighter/ui/menu-arrow-prelight.png | Bin 3548 -> 0 bytes + themes/Lighter/ui/menu-arrow.png | Bin 3626 -> 0 bytes + themes/Lighter/ui/menu.png | Bin 3399 -> 0 bytes + themes/Lighter/ui/menubar.png | Bin 3402 -> 0 bytes + themes/Lighter/ui/menuitem.png | Bin 3412 -> 0 bytes + themes/Lighter/ui/minus.png | Bin 264 -> 0 bytes + themes/Lighter/ui/notebook.png | Bin 3657 -> 0 bytes + themes/Lighter/ui/null.png | Bin 173 -> 0 bytes + themes/Lighter/ui/option1.png | Bin 371 -> 0 bytes + themes/Lighter/ui/option2.png | Bin 367 -> 0 bytes + themes/Lighter/ui/option3.png | Bin 360 -> 0 bytes + themes/Lighter/ui/plus.png | Bin 269 -> 0 bytes + themes/Lighter/ui/progressbar-trough.png | Bin 164 -> 0 bytes + themes/Lighter/ui/progressbar.png | Bin 161 -> 0 bytes + themes/Lighter/ui/shadow-in-alt.png | Bin 206 -> 0 bytes + themes/Lighter/ui/shadow-in.png | Bin 219 -> 0 bytes + themes/Lighter/ui/shadow-null.png | Bin 146 -> 0 bytes + themes/Lighter/ui/shadow-out.png | Bin 228 -> 0 bytes + themes/Lighter/ui/slider-h.png | Bin 203 -> 0 bytes + themes/Lighter/ui/slider-v.png | Bin 190 -> 0 bytes + themes/Lighter/ui/spin-down-insensitive.png | Bin 213 -> 0 bytes + themes/Lighter/ui/spin-down-normal.png | Bin 200 -> 0 bytes + themes/Lighter/ui/spin-down-pressed.png | Bin 204 -> 0 bytes + themes/Lighter/ui/spin-fill-bg.png | Bin 3397 -> 0 bytes + themes/Lighter/ui/spin-insensitive.png | Bin 224 -> 0 bytes + themes/Lighter/ui/spin-up-insensitive.png | Bin 194 -> 0 bytes + themes/Lighter/ui/spin-up-normal.png | Bin 202 -> 0 bytes + themes/Lighter/ui/spin-up-pressed.png | Bin 194 -> 0 bytes + themes/Lighter/ui/spin.png | Bin 244 -> 0 bytes + themes/Lighter/ui/toolbar.png | Bin 326 -> 0 bytes + themes/Lighter/ui/transparent.png | Bin 179 -> 0 bytes + themes/Makefile.am | 2 +- + 376 files changed, 3 insertions(+), 7970 deletions(-) + +commit 0009794d9d788099409d215f88ab511925fc2f4c +Author: Jehan +Date: Thu Apr 5 11:46:49 2018 +0200 + + app: migrate tool-presets with + s/GimpImageMapOptions/GimpFilterOptions/. + + As requested! + + app/core/gimp-user-install.c | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +commit 082a6404c9613beeef4feafdb91ff43994c096dc +Author: Ell +Date: Thu Apr 5 02:14:29 2018 -0400 + + app: fix iterator area in canvas_buffer_to_paint_buf_alpha() + + The entire ROI was processed in all threads, instead of only the + thread-specific area, causing artifacts. + + app/paint/gimppaintcore-loops.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b88170b9e08d7004112a1128a25ff403581ef7e2 +Author: Jehan +Date: Thu Apr 5 01:37:26 2018 +0200 + + NEWS: keep up-to-date. + + NEWS | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit ba06a0fe86088b37cef3eeb3db1ce5bb39f2257c +Author: Jehan +Date: Thu Apr 5 00:12:00 2018 +0200 + + Bug 794949 - Plugin crash when opening png, jpeg or tiff with... + + ... non-latin unicode path. + g_win32_locale_filename_from_utf8() was sometimes returning NULL for + some paths on Windows. Then the call to gexiv2_metadata_open_path() + with + a NULL value was crashing plug-ins. + This commit only prevents from crashing by simply failing to load + metadata when this occurs, which means losing metadata support on + Windows depending on filenames. A proper solution will have to be + implemented. + + libgimpbase/gimpmetadata.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit cb239e60f6ef91ba66373a285ab2f5cbeb700eb8 +Author: Ell +Date: Wed Apr 4 17:12:21 2018 -0400 + + app: parallelize gimp-gegl-loops.cc + + Ditto. + + app/gegl/gimp-gegl-loops.cc | 827 + ++++++++++++++++++++++++-------------------- + 1 file changed, 448 insertions(+), 379 deletions(-) + +commit 828b99b5b33cc5a10f8e186cb477ef42563ce934 +Author: Ell +Date: Wed Apr 4 17:09:55 2018 -0400 + + app: switch gimp-gegl-loops.c to C++ + + Ditto. + + app/gegl/Makefile.am | 2 +- + app/gegl/{gimp-gegl-loops.c => gimp-gegl-loops.cc} | 62 + ++++++++++++---------- + 2 files changed, 35 insertions(+), 29 deletions(-) + +commit 3df757ffd7311e621817aa7aa66e61efecf80de6 +Author: Ell +Date: Wed Apr 4 17:02:34 2018 -0400 + + app: parallelize gimppaintcore-loops.cc + + Ditto. + + app/paint/gimppaintcore-loops.cc | 430 + +++++++++++++++++++++------------------ + 1 file changed, 229 insertions(+), 201 deletions(-) + +commit e8a14deecfd356be995d24a613293847c8de2fda +Author: Ell +Date: Wed Apr 4 16:59:24 2018 -0400 + + app: switch gimppaintcore-loops.c to C++ + + Ditto. + + app/paint/Makefile.am | 2 +- + app/paint/{gimppaintcore-loops.c => gimppaintcore-loops.cc} | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit c8d4c079a204dded5429f336e394e492a581226a +Author: Ell +Date: Wed Apr 4 16:57:35 2018 -0400 + + app: parallelize gimpbrush-transform.cc + + Use gimp_parallel_distribute_foo() to parallelize the brush + transform functions. + + app/core/gimpbrush-transform.cc | 683 + +++++++++++++++++++++------------------- + 1 file changed, 365 insertions(+), 318 deletions(-) + +commit 565f1f2aa45bc74581e707c25f5667aac69612c2 +Author: Ell +Date: Wed Apr 4 16:53:00 2018 -0400 + + app: switch gimpbrush-transform.c to C++ + + The next commit is going to parallelize gimpbrush-transform using + the gimp_parallel_distribute_foo() functions. To spare us a lot of + boilerplate code, we're going to use C++ lambdas as callback + arguments to these functions. + + This commit does the initial conversion of gimpbrush-transform.c to + C++, renaming it to gimpbrush-transform.cc. We do this in a + separate commit, so that the changes are small enough for git to + register this as a renamed file, rather than a new file, so that we + don't lose the file's history. + + app/core/Makefile.am | 2 +- + ...impbrush-transform.c => gimpbrush-transform.cc} | 61 + ++++++++++++---------- + 2 files changed, 34 insertions(+), 29 deletions(-) + +commit 86b89cf62a14b98056355d0c8ad2b27e29b3a56f +Author: Ell +Date: Wed Apr 4 15:16:42 2018 -0400 + + app: add gimp-parallel + + Add gimp-parallel.[cc,h], which provides a set of parallel + algorithms. + + These currently include: + + - gimp_parallel_distribute(): Calls a callback function in + parallel on multiple threads, passing it the current thread + index, and the total number of threads. Allows specifying the + maximal number of threads used. + + - gimp_parallel_distribute_range(): Splits a range of integers + between multiple threads, passing the sub-range to a callback + function. Allows specifying the minimal sub-range size. + + - gimp_parallel_distribute_area(): Splits a rectangular area + between multiple threads, passing the sub-area to a callback + function. Allows specifying the minimal sub-area. + + The callback function is passed using an appropriately-typed + function pointer, and a user-data pointer. Additionally, when used + in a C++ file, each of the above functions has an overloaded + template version, taking the callback through a generic parameter, + without a user-data pointer, which allows using function objects. + + app/Makefile.am | 4 +- + app/app.c | 2 + + app/core/Makefile.am | 2 + + app/core/gimp-parallel.cc | 355 + ++++++++++++++++++++++++++++++++++++++++++++++ + app/core/gimp-parallel.h | 112 +++++++++++++++ + app/gegl/gimp-gegl.c | 11 ++ + app/gegl/gimp-gegl.h | 1 + + 7 files changed, 486 insertions(+), 1 deletion(-) + +commit 700cc33bec157d81efd865189a55f9e6b9dee379 +Author: Ell +Date: Wed Apr 4 14:25:06 2018 -0400 + + configure.ac: require a C++11 compiler + + The following commits use C++11 lambdas. + + acinclude.m4 | 1 + + configure.ac | 1 + + m4macros/Makefile.am | 1 + + m4macros/ax_cxx_compile_stdcxx.m4 | 980 + ++++++++++++++++++++++++++++++++++++++ + 4 files changed, 983 insertions(+) + +commit 394c930fbe6c2004f4fb2c1f106a3fd686f38d22 +Author: Ell +Date: Wed Apr 4 13:00:40 2018 -0400 + + app: avoid potential division by 0 in dashboard CPU usage sampler + + app/widgets/gimpdashboard.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit fa02a2c64f5fcaaceff34cea2bd02c5e558c63ca +Author: Jehan +Date: Wed Apr 4 18:04:34 2018 +0200 + + libgimp: add an exception handler for Windows. + + Drmingw already added its own exception handler which generates crash + traces in a text file, for plug-ins as well. This additional + handler is + run after Drmingw handler and allows us to do things on our own, + and in + particular we could display the content of the debug traces. + + Right now it simply prints these to stderr, which actually won't be of + much use on Win32, first because the console is deactivated on stable + releases, also because after tests, it doesn't look like even running + GIMP from cmd outputs to console either. + + We currently don't use the same debug dialog as the core on purpose, + because we don't want everyone to send us traces for every + unmaintained + third party plug-ins out there. But we should definitely allow easier + trace possibilities at some point, first to improve/debug our own core + plug-ins, and also to help third party plug-in developers! + So this commit is not making visible changes yet but is actually + a first + step towards these debugging goals. + + libgimp/gimp.c | 80 + +++++++++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 68 insertions(+), 12 deletions(-) + +commit 76bce77d097c6ebec7f894cb81fc6cc138e0bec0 +Author: Jehan +Date: Wed Apr 4 06:30:36 2018 +0200 + + libgimp: various warning fixes for Win32. + + libgimp/gimp.c | 28 +++++++++++++++++++--------- + 1 file changed, 19 insertions(+), 9 deletions(-) + +commit 9c8a8ae57645ec60f1e072b4f7cb51917d14379d +Author: Jehan +Date: Wed Apr 4 04:45:27 2018 +0200 + + libgimp: do not end the fatal and signal handlers with gimp_quit(). + + When ending with gimp_quit(), GIMP was not displaying the "Plug-in + crashed" error dialog, which is not good, since we lose the crash + feedback for plug-ins. Just let the plug-in continue its normal run in + order to get the error dialog. + Also protect the tracing functions, which are not working on Win32. + + libgimp/gimp.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +commit e98b937643b005b9698ee042dc2250a5247fac23 +Author: Jehan +Date: Wed Apr 4 04:33:19 2018 +0200 + + libgimp: add a gimp_fatal_func() allowing stack tracing plug-ins on... + + ... various crashes. + + libgimp/gimp.c | 71 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 71 insertions(+) + +commit 6bcb30e1eeb556a9256729f9b9f219cf6c400d8e +Author: Jehan +Date: Wed Apr 4 04:13:28 2018 +0200 + + devel-docs: update debugging-tips.txt regarding --stack-trace-mode... + + ... for plug-in debugging as well. + + devel-docs/debugging-tips.txt | 3 +++ + 1 file changed, 3 insertions(+) + +commit c46211190fe4a4a74fec09dd3209fef89f2de5a8 +Author: Jehan +Date: Wed Apr 4 04:03:42 2018 +0200 + + libgimp: properly catch SIGABRT signal. + + SIGABRT was in the switch list in gimp_plugin_sigfatal_handler(), + but it + had not been properly handled with gimp_signal_private(), making this + switch case useless. Fix this oversight, and while doing so, move + it in + the "fatal error" list for which we may generate stack traces, + similarly + to core signal handling. Indeed this signal can definitely happen + during + various kinds of common bugs and needs to be debugged. + + libgimp/gimp.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 6936a655bdfb5c8ce4e9f683e2cbf04adf0a98e2 +Author: Jehan +Date: Wed Apr 4 02:21:47 2018 +0200 + + plug-ins: minor fix of an error string. + + Was reading this part of the code when I saw this: the error happens + when loading not exporting a PNG. + + plug-ins/common/file-png.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 33822c51c26412631206457a59eeae2a03c79a32 +Author: Jehan +Date: Wed Apr 4 00:26:41 2018 +0200 + + app: check if tool control is active before setting modifier state. + + Similar to commit 845eb522b6, I had a CRITICAL which happened on a + device_changed, triggering gimp_display_shell_update_focus(), + this time + in focus in. + + app/tools/tool_manager.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7230d5d777c98fb4896f1de76c147deb4f3ae692 +Author: Michael Natterer +Date: Tue Apr 3 22:36:17 2018 +0200 + + Bug 794356 - Rulers always shown for subsequent image views + + Remove the connect_after() hack from GimpImageWindow again and instead + add gimp_display_shell_canvas_realize_after() and restore the + configured + ruler visibility there. Should work for all cases now. + + app/display/gimpdisplayshell-callbacks.c | 14 ++++++++++++++ + app/display/gimpdisplayshell-callbacks.h | 2 ++ + app/display/gimpdisplayshell.c | 3 +++ + app/display/gimpimagewindow.c | 14 +++----------- + 4 files changed, 22 insertions(+), 11 deletions(-) + +commit 65a697ff67df9ce63b219af1a821fb9222279b7a +Author: Michael Natterer +Date: Tue Apr 3 21:57:43 2018 +0200 + + app: switch the first two args of gimp_channel_new_from_buffer() + + app/core/gimpchannel.c | 6 +++--- + app/core/gimpchannel.h | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit de0706f3f12165ec4548a49115945baef0c00a86 +Author: Julien Hardelin +Date: Tue Apr 3 11:47:17 2018 +0200 + + Updated French translation + + po/fr.po | 2847 + +++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 1683 insertions(+), 1164 deletions(-) + +commit cdc20c9c79226ee22cdd3a7d1e1cf9c2ecac301e +Author: Julien Hardelin +Date: Tue Apr 3 10:57:46 2018 +0200 + + Updated French translations + + po-libgimp/fr.po | 95 ++-- + po-plug-ins/fr.po | 297 ++++++----- + po-script-fu/fr.po | 1202 + +++++++++----------------------------------- + po-windows-installer/fr.po | 114 +++-- + 4 files changed, 519 insertions(+), 1189 deletions(-) + +commit bbd79f9d62a5b4ce1066358b2077742113d09e18 +Author: Ell +Date: Sat Mar 31 21:26:01 2018 -0400 + + app: fix Wilber's eyes + + Commit fd6d4931c8184825d642bfebe69d045ce36f89e7 accidentally + introduced a bug that caused Wilber's eyes to misbehave. This + commit is an attempt to fix this issue. Unfortunately, it seems + like the bug can still be triggered through a certain sequence of + actions... + + app/tools/tool_manager.c | 65 + ++++++++++++++++++++++++++++++++++++++++++ + app/widgets/gimpcairo-wilber.c | 34 +++++++++++++++++++++- + app/widgets/gimpcairo-wilber.h | 27 ++++++++++-------- + 3 files changed, 113 insertions(+), 13 deletions(-) + +commit b46b9d8921071b11fd0a2bf66a2003bdb9e42127 +Author: Michael Natterer +Date: Tue Apr 3 01:45:27 2018 +0200 + + Bug 772126 - Make GimpColorFrame handle very long numbers + + Add "ellipsize" property to GimpColorFrame and set it to + PANGO_ELLIPSIZE_END in the the pointer information dockable. + + Better cut off long numbers than make them expand the dock. + + app/display/gimpcursorview.c | 2 ++ + app/widgets/gimpcolorframe.c | 41 + +++++++++++++++++++++++++++++++++++++++-- + app/widgets/gimpcolorframe.h | 5 +++++ + 3 files changed, 46 insertions(+), 2 deletions(-) + +commit 5e2600db1eee6a7ed1d1341ab9341c63bc2dcc42 +Author: Jehan +Date: Tue Apr 3 00:49:56 2018 +0200 + + NEWS: keep up-to-date. + + NEWS | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit cad72b1432a536e366c9a010d0d77c596ed9c910 +Author: Michael Natterer +Date: Mon Apr 2 23:23:54 2018 +0200 + + app: remove unused variable in gimp_tile_handler_validate_command() + + app/gegl/gimptilehandlervalidate.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 4acdc7392af74d09a281f334d06841e32c006547 +Author: Ell +Date: Sat Mar 31 11:49:01 2018 -0400 + + app: use gegl_tile_handler_damage_rect() in TileHandlerValidate + + Use the recently-added gegl_tile_handler_damage_rect() function + during GimpTileHandlerValidate invalidation, instead of manually + voiding the tile pyramid. This function avoids voiding mipmapped + tiles entirely when only a subarea of the tile needs to be redrawn. + + See GEGL commit 3210f4ffc3c569a2acd9483811cb141070112bc6. + + app/gegl/gimptilehandlervalidate.c | 28 +--------------------------- + app/gegl/gimptilehandlervalidate.h | 1 - + 2 files changed, 1 insertion(+), 28 deletions(-) + +commit da3c96f541d1ab9fb62b527625b30c13d2f34181 +Author: Ell +Date: Sat Mar 31 11:43:15 2018 -0400 + + app: add "misc" group to the dashboard + + ... which currently has a single "mipmapped" field, which shows the + total size of processed mipmapped data. + + app/widgets/gimpdashboard.c | 38 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 36 insertions(+), 2 deletions(-) + +commit 4c041b2e8acb2f9edfa3e206d62e54831f15e3dc +Author: Ell +Date: Mon Apr 2 16:24:09 2018 -0400 + + app: allow hiding groups in the dashboard + + Add a "groups" submenu to the dashboard popup menu, which can be + used to control which groups are shown in the dashboard. + + app/actions/dashboard-actions.c | 2 + + app/menus/menus.c | 4 +- + app/widgets/gimpdashboard.c | 192 + ++++++++++++++++++++++++++++++++++++---- + app/widgets/gimpdashboard.h | 3 + + app/widgets/gimphelp-ids.h | 1 + + menus/dashboard-menu.xml | 7 +- + 6 files changed, 188 insertions(+), 21 deletions(-) + +commit ea48b9f31ca3460611530b6a8297386d9acdaf92 +Author: Michael Natterer +Date: Mon Apr 2 22:21:41 2018 +0200 + + Bug 794356 - Rulers always shown for subsequent image views + + gimp_image_window_constructed(): connect_after to the notebook's + "switch-page" signal so gimp_display_shell_appearance_update() is + called after gimp_display_shell_canvas_realize(). Just another hack + to fix the hack... + + app/display/gimpimagewindow.c | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +commit 8a24de6557869585f9609080758ce612e4d09348 +Author: Jehan +Date: Mon Apr 2 18:51:41 2018 +0200 + + app: fix dashboard help id. + + It was using the errors dialog help id. Probably just copy-paste + error. + + app/dialogs/dialogs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d779c138914167d6cf66f76900a3dad8d7d772b7 +Author: Jehan +Date: Mon Apr 2 18:49:23 2018 +0200 + + app: do not edit symmetry variables but properties. + + If variables are edited directly, in some cases, the GUI and the + symmetries may end up out-of-sync. The variable can only be edited + through property setting. + + app/core/gimpsymmetry-mirror.c | 48 + ++++++++++++++++++++++++++---------------- + 1 file changed, 30 insertions(+), 18 deletions(-) + +commit 3c1516ea5023b77fcfbed430b1308f56737d4a26 +Author: Jehan +Date: Mon Apr 2 17:34:22 2018 +0200 + + app: mirror positions 0.0 are accepted. + + This value is actually used as a special value when removing a + guide to + get rid of a symmetry, in particular it is set in the guides' callback + gimp_mirror_guide_removed_cb() for "removed" signal. + If not setting to 0, when adding back a symmetry, it starts with weird + low or high values near to border (whereas when set to 0, it is + reset to + default position afterwards). + + app/core/gimpsymmetry-mirror.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6501faf90d42aa080307790b561b6c36435eccf4 +Author: Anders Jonsson +Date: Mon Apr 2 14:34:53 2018 +0000 + + Update Swedish translation + + po-plug-ins/sv.po | 84 + ++++++++++++++++++++++++++++--------------------------- + 1 file changed, 43 insertions(+), 41 deletions(-) + +commit f242bf4d926e40e2e46b59dcb043b609a971216e +Author: Jeremy Bicha +Date: Sun Apr 1 18:58:30 2018 -0400 + + appdata: Install appstream metadata to non-deprecated directory + + https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location + + https://bugzilla.gnome.org/show_bug.cgi?id=794884 + + desktop/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 15041e8ff7698e977acd0149a81cd5db25dbbc6b +Author: Jehan +Date: Mon Apr 2 00:16:50 2018 +0200 + + NEWS: starting the news for 2.10.0. + + Note that it might be a 2.10.0 RC2 instead. It will depend on + whether we + decide to make a second release candidate (better process and + safer) or + release earlier and go forward. + + NEWS | 41 +++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 39 insertions(+), 2 deletions(-) + +commit 617d0c455061d36e41f40b0e99e6307a60590660 +Author: Jehan +Date: Sun Apr 1 23:44:22 2018 +0200 + + etc: add 4K Ultra HD template and fix DCI 4K. + + The dimension currently set in DCI 4K were rather ones of common 5K. + + etc/templaterc | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +commit c9df2a6879615bee0d0f1f3ae75ebe09a98f397f +Author: Jehan +Date: Sun Apr 1 18:16:54 2018 +0200 + + app: do not raise a warning when failing to deserialize symmetry... + + ... parasite. + Not sure if that should be considered a bug. On one hand, it should + because that's core code. On the other hand, symmetry saving currently + uses parasites, which is a feature which can also be used by people + randomly. So "theoretically", there could be any data in a parasite + and + we should not assume specific format. + Anyway still keep the error message but just print to standard error + output instead. Also print a bit more details (parasite name and + contents) as it would help for debugging when such a case were + to occur. + + app/core/gimpsymmetry.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit e0029d31b476da4e93760e4eac0a006d51f02a96 +Author: Jehan +Date: Sun Apr 1 17:51:07 2018 +0200 + + Bug 792520 - Image symmetries should be saved: version the properties. + + Care for future changes of symmetries, by adding a version + property. For + now, all symmetries are at version 0, and no real check is done. If + any + symmetry bumps its settings in the future, it will have to override + also + update_version() to change settings properly if necessary, + according to + any new behavior. + + app/core/gimpsymmetry.c | 64 + +++++++++++++++++++++++++++++++++++++++++++++++++ + app/core/gimpsymmetry.h | 3 +++ + 2 files changed, 67 insertions(+) + +commit 65717041edc22ba8bec33d8b1c98ee65d69f57cf +Author: Jehan +Date: Wed Jan 27 19:18:53 2016 +0100 + + app: save image symmetries in the XCF file. + + Symmetries are saved in a parasite, which is backward compatible. + + app/xcf/xcf-load.c | 37 +++++++++++++++++++++++++++++++++++++ + app/xcf/xcf-save.c | 31 +++++++++++++++++++++++++++++++ + 2 files changed, 68 insertions(+) + +commit 9090a98498e5399a06c395880505d3b157cfda1f +Author: Michael Natterer +Date: Sun Apr 1 14:55:11 2018 +0200 + + app: fix new g_object_ref() warnings in gimp_filter_tool_edit_as() + + g_object_ref() now returns the same type that was passed in. Cast the + argument to GObject* to match the variable the return value is + assigned to. + + app/tools/gimpfiltertool.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fe932fe7ad5acd3a05be2bb6e934583881c26e7a +Author: Michael Natterer +Date: Sun Apr 1 14:41:20 2018 +0200 + + Bug 794826 - Do not default to last used filter settings + + Add GimpGuiConfig::filter-tool-use-last-settings wchich defaults + to FALSE. + + Honor the new option in gimp_gegl_procedure_execute_async() and add + it to prefs -> dialog defaults. + + app/actions/gimpgeglprocedure.c | 6 +++++- + app/config/gimpguiconfig.c | 14 ++++++++++++++ + app/config/gimpguiconfig.h | 1 + + app/config/gimprc-blurbs.h | 3 +++ + app/dialogs/preferences-dialog.c | 4 ++++ + 5 files changed, 27 insertions(+), 1 deletion(-) + +commit 14a054e980882bbe7c8fef2d6b422fb4d54e791f +Author: Michael Natterer +Date: Sun Apr 1 14:15:13 2018 +0200 + + app: add a "Filter Dialogs" section to prefs -> dialog defaults + + app/dialogs/preferences-dialog.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit 62ec4831db080aeb6c4e285c83a9f036156b4824 +Author: Michael Natterer +Date: Sun Apr 1 14:01:14 2018 +0200 + + app: ...and a mnemonic. + + app/dialogs/preferences-dialog.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 44ce8b4dd8ad08f0b73f6ad15b49a8a42829dca8 +Author: Michael Natterer +Date: Sun Apr 1 13:58:42 2018 +0200 + + app: a colon was missing after "Debug Policy" in preferences + + and it's "Debug policy" (capitalization). + + app/dialogs/preferences-dialog.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f586aac43af440ff909ec164405d579fd182fae5 +Author: Michael Natterer +Date: Sun Apr 1 13:54:47 2018 +0200 + + app: use g_clear_foo() in gimp_gegl_procedure_finalize() + + app/actions/gimpgeglprocedure.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit e55c94eff0a9b2715b052b61fdc95bb071882c8c +Author: shark0r +Date: Fri Mar 30 01:53:12 2018 +0800 + + Bug 794854 - Brush color is not added to color history in smudge tool + + Add the color in gimp_smudge_paint(INIT) like GimpPaintbrush does. + + Achieve this by calling gimp_palettes_add_color_history() directly, + not by inheriting GimpPaintbrush because GimpPaintbrush and GimpSmudge + seem to share few common features. + + app/paint/gimpsmudge.c | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +commit 019af3dacb92e18179d60951cad890b4c87ab7c8 +Author: Edward E +Date: Sat Mar 31 12:03:51 2018 -0500 + + file-open-location: don't close dialog if no file was opened + + app/dialogs/file-open-location-dialog.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit a4b366f49440e8755cfb7ff63efe5c2a1c955a8f +Author: Edward E +Date: Sat Mar 31 12:00:05 2018 -0500 + + file-open-location: disable widgets only while opening a file + + app/dialogs/file-open-location-dialog.c | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +commit 33b7d8e3349bf68a97eddfce3ef9f6140097e1d0 +Author: Edward E +Date: Sat Mar 31 11:48:18 2018 -0500 + + file-open-location: create only one progress bar + + app/dialogs/file-open-location-dialog.c | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +commit fd6d4931c8184825d642bfebe69d045ce36f89e7 +Author: Ell +Date: Sun Apr 1 01:18:35 2018 +0000 + + It's alive! + + app/widgets/gimpcairo-wilber.c | 352 + +++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 336 insertions(+), 16 deletions(-) + +commit a3071d26207608263fd07f65a176f0dad10f0342 +Author: Michael Natterer +Date: Sat Mar 31 18:39:53 2018 +0200 + + configure.ac: require babl >= 0.1.45 and GEGL => 0.3.31 + + and set gimp_version to "2.10.0-RC1-git" so we can distinguish it + from the RC1 tarball. + + app/sanity.c | 4 ++-- + configure.ac | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 04a798d786617257ffa2b75ad24a14afd7b5c087 +Author: Jehan +Date: Sat Mar 31 16:36:55 2018 +0200 + + app: do not copy needlessly paint_mask GimpTempBuf. + + We are not doing any write operation on this mask data so copying all + the data just to read it and unreffing it in the end is only a cost on + performance. + See also bug 694917. + + app/paint/gimppaintcore-loops.c | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +commit 49285463e6c0cc03c361902df4e3006fa135dde3 +Author: Ell +Date: Sat Mar 31 08:13:36 2018 -0400 + + app: align projection update area to coarse grid + + When adding a rectangle to a projection's update area, align the + rectangle to a coarse grid, to reduce the complexity of the overall + area. We currently align the rectangle to a 32x32 grid, which + seems to be a good tradeoff between the overhead of processing a + complex area, and the overhead of processing a large area. + + app/core/gimpprojection.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit 7be2d1457ce2e5fbb313569af4e62c7bee252a5f +Author: Michael Natterer +Date: Sat Mar 31 11:28:12 2018 +0200 + + app: use gimp_config_writer_string() to output the mypaint-brush-path + + so it is properly escaped. + + app/config/gimpconfig-dump.c | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) + +commit 2aa4426d4f30f576bb04c90ef573fdc4a88ee046 +Author: Massimo Valentini +Date: Thu Mar 29 16:50:15 2018 +0200 + + app: improvements in code executed a lot while painting. + + This keeps the same rectangle packing behaviour, so to behave + exactly as + before for what concerns batching the updates, but should be lighter + when looping to find the first good rectangle to use. + + In rtree_insert(), some conditions in the if tests are implied by + previous conditions. And therefore the 2 successive for loops are + actually identical. + + In rtree_node_insert(), it is wrong/harmful to insert zero sized + rectangles in the tree because they can never be selected and + just make + the list longer. So rtree_node_create() should just return NULL when w + or h are 0. + + See bug 694917, comments 51 to 61. + + app/display/gimpdisplayxfer.c | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +commit 31086ae2118d169206be5ba3e0fec42ad489ad31 +Author: Piotr Drąg +Date: Fri Mar 30 22:00:14 2018 +0200 + + Update Polish translation + + po/pl.po | 120 + +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 63 insertions(+), 57 deletions(-) + +commit 347acb16d335536fd5cb482d403696842bd62c72 +Author: Michael Natterer +Date: Fri Mar 30 15:53:19 2018 +0200 + + desktop: add gimp-data-extras.metainfo.xml to .gitignore + + and some cosmetic cleanup in Makefile.am + + desktop/.gitignore | 1 + + desktop/Makefile.am | 9 +++++++-- + 2 files changed, 8 insertions(+), 2 deletions(-) + +commit 29d7cee1008b1b52e03a1c53fd801b9d9c3dbe22 +Author: Michael Natterer +Date: Fri Mar 30 14:41:13 2018 +0200 + + configure.ac: add new option --enable-bundled-mypaint-brushes + + because a simple platform dependency in gimpcoreconfig.c doesn't do + the trick (there can be both manual builds and bundled builds on + windows and macos). Use an AC_DEFINE() instead. + + Also, make sure the system gimprc and its manpage are generated with + the correct values. + + app/config/gimpcoreconfig.c | 2 +- + configure.ac | 72 + +++++++++++++++++++++++++++------------------ + 2 files changed, 45 insertions(+), 29 deletions(-) + +commit 452b1bd5584b619ae6c575fd2a19dd767222f96d +Author: Michael Natterer +Date: Fri Mar 30 12:45:27 2018 +0200 + + Stop leaking properties of the distcheck machine into the tarball + + Some gimprc properties' default values depend on the machine where + "make dist" in run. We had an ugly hack in place to force + (num-processors 1) in the installed system gimprc and its manpage, but + were still leaking "tile-cache-size" and "mypaint-brush-path". + + The files are generated by the hidden options --dump-gimprc-system + and --dump-gimprc-manpage which exist only for this purpose. + + In gimpconfig-dump.c, special case the three properties in + dump_gimprc_system() and dump_gimprc_manpage() to output constant + default values for "num-processors" and "tile-cache-size" and + output @mypaint_brushes_dir@ in "mypaint-brush-path" which can + be replaced at configure time. + + Also introduce etc/gimprc.in so @mypaint_brushes_dir@ can actually be + substituted for the installed system gimprc. + + app/Makefile.am | 16 +++++------- + app/config/gimpconfig-dump.c | 61 + ++++++++++++++++++++++++++++++++++++++++++-- + configure.ac | 1 + + docs/gimprc.5.in | 2 +- + etc/.gitignore | 1 + + etc/Makefile.am | 9 ++++--- + etc/{gimprc => gimprc.in} | 4 +-- + 7 files changed, 76 insertions(+), 18 deletions(-) + +commit 4698529dbe9bf6ffdf44da21ce65fcec5dee6c41 +Author: Jehan +Date: Thu Mar 29 22:22:51 2018 +0200 + + app: make MyPaint brushes path relative on Win32 and macOS. + + Otherwise the brushes won't be found when bundling on macOS or + with the + Windows installer. Build-time path from configuration is still used on + other platforms. + + app/config/gimpcoreconfig.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +commit 8811e31419229c21f803dbdc0153ae22102b389d +Author: Jehan +Date: Thu Mar 29 17:47:48 2018 +0200 + + app: cleaning out some if-0 variables. + + app/config/gimpcoreconfig.c | 4 ---- + 1 file changed, 4 deletions(-) + +commit 479bcaafdd61c02d329c5a9b09b5bd9896ed79b2 +Author: Jehan +Date: Thu Mar 29 17:22:15 2018 +0200 + + configure, docs: set correct "mypaint-brush-path" value in man page. + + This was hard-coded to what I guess was a personal prefix (commit + 368c7c0511), which is obviously wrong. This has to be constructed at + compilation and the man must mirror whatever is the actual + installation + path of mypaint-brushes package. + + configure.ac | 4 ++++ + docs/gimprc.5.in | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 5d83c7697ef6477f619f86e5e5b2ec75d53a7a7a +Author: Jehan +Date: Wed Mar 28 19:54:30 2018 +0200 + + devel-docs: minor typo. + + devel-docs/contexts.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7c1ea0345ef2d7c47824204990597c46eb2e1b16 +Author: Michael Natterer +Date: Thu Mar 29 12:25:27 2018 +0200 + + configure.ac: fix check for freetype2 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dbb9fdb3335e56df171299a0144b7aad00b43d31 +Author: Jordi Mas +Date: Thu Mar 29 11:58:12 2018 +0200 + + Update Catalan translation + + po/ca.po | 852 + ++++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 512 insertions(+), 340 deletions(-) + +commit 53c145c0be4ad7ad52c3be40537b3032175f0856 +Author: Ell +Date: Thu Mar 29 05:20:20 2018 -0400 + + app: add --show-debug-menu command-line option + + The debug menu is currently not included in stable versions. + + Include the menu unconditionally, but hide it, and its associated + actions, by default in stable versions. Allow enabling the menu + using a new --show-debug-menu command-line option, in the same vein + as --show-playground. + + app/actions/debug-actions.c | 16 ++++++++++------ + app/actions/debug-commands.c | 5 ----- + app/actions/debug-commands.h | 10 ---------- + app/app.c | 2 ++ + app/app.h | 1 + + app/core/gimp.c | 2 ++ + app/core/gimp.h | 2 ++ + app/main.c | 8 ++++++++ + app/tests.c | 4 ++-- + menus/image-menu.xml.in | 2 +- + menus/menus.xsl | 6 ------ + 11 files changed, 28 insertions(+), 30 deletions(-) + +commit c3efb1b0deca09ca3bb2337dd9d138a1b7d7964f +Author: Ell +Date: Thu Mar 29 05:16:52 2018 -0400 + + app: don't show invisible actions in search dialog + + app/dialogs/action-search-dialog.c | 5 +++-- + app/widgets/gimpaction-history.c | 5 +++-- + 2 files changed, 6 insertions(+), 4 deletions(-) + +commit 3265797f3e057f8411cefc015954969fbe5e2fdf +Author: Ell +Date: Thu Mar 29 03:03:51 2018 -0400 + + Bug 794753 - do not dither image mask and channels for imported images + + By the same logic of commit + 44f293bcdb241f49b22a8df00d7f90f350f24005, we shouldn't dither the + alpha channel either. + + app/core/gimpimage-convert-precision.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +commit 9cabee5451bed56631db060d2eed19f664989766 +Author: Ell +Date: Thu Mar 29 03:01:23 2018 -0400 + + app: call gimp_progress_end() at gimp_image_convert_dither_u8() exit + + app/core/gimpimage-convert-precision.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 527ad94a7e2f27113b9c33c1fffe77947c93e993 +Author: Jehan +Date: Wed Mar 28 19:43:17 2018 +0200 + + Bug 794772 - detect freetype2 using pkg-config. + + I hesitated keeping both the pkg-config and freetype-config (which is + mostly a wrapper to pkg-config nowadays apparently) as fallback, but + anyway I can see in their repositories that they have a pkg-config + file + since 2003. Really I don't think it makes sense to hold onto such old + and deprecated dependency configuration systems. + + configure.ac | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +commit 44f293bcdb241f49b22a8df00d7f90f350f24005 +Author: Thomas Manni +Date: Wed Mar 28 09:02:12 2018 +0200 + + Bug 794753 - do not dither image mask and channels for imported images + + When "Dither images when promoting to floating point" is checked in + Preferences, apply dithering on layers and keep image mask and + channels + unaltered. + + app/core/gimpimage-convert-precision.c | 3 --- + 1 file changed, 3 deletions(-) + +commit c5ebf29065a84ec778f65485512d853d882483e7 +Author: Michael Natterer +Date: Wed Mar 28 14:45:11 2018 +0200 + + Bug 794747 - Multiple GIMP-WARNINGs about duplicate accelerators + on startup + + Turn the g_warning() into a g_printerr(). + + Duplicate accelerators should not trigger a WARNING, because they come + from a config file and there is nothing that can be fixed in the code + to prevent that. + + app/gui/gui.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 60e01f5593ebf2ba9bef52ec1322fad4b6531a6c +Author: Michael Natterer +Date: Wed Mar 28 01:17:39 2018 +0200 + + app: fix error reporting in gimp_tool_preset_deserialize_property() + + when setting a custom parse error with g_scanner_error() we *must* + return G_TOKEN_NONE as expected token, or general GimpConfig error + handling will try to overwrite our error with its generic "unexpected + token" message, which triggers a warning. + + app/core/gimptoolpreset.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 69d5201d59e8bdac21003c7a6da06b535997a629 +Author: Michael Natterer +Date: Wed Mar 28 00:44:33 2018 +0200 + + app: fix formatting in previous commit + + app/display/gimpdisplayshell-render.c | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +commit a7b0d55fc5f7d6569ed98154e0311c96225d1e22 +Author: Øyvind Kolås +Date: Wed Mar 28 00:35:08 2018 +0200 + + app: only create GeglBuffer wrapper for cairo-data when used + + As suggested by massimo in bug #694917, move unconditional + creation/destruction + of a wrapper GeglBuffer object from top-level scope of the function + to the + single conditional scope where it is used. + + app/display/gimpdisplayshell-render.c | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +commit 0fe50c76f80b5f9d7eed46ead865ce734e1fa0db +Author: Khaled Hosny +Date: Tue Mar 27 15:47:08 2018 +0200 + + Update Arabic translation + + po/ar.po | 29317 + +++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 17040 insertions(+), 12277 deletions(-) + +commit 5614cd444dc03226fc44b5fa0139c8e1eb71cbc3 +Author: Ell +Date: Tue Mar 27 09:36:28 2018 -0400 + + app: in gimp_image_convert_precision(), report progress for selection + mask + + app/core/gimpimage-convert-precision.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit cf658f64b5e91e1c3c741e0188b2505e6c970447 +Author: Ell +Date: Tue Mar 27 09:34:42 2018 -0400 + + Bug 794721 - CRITICAL converting image precision + + In gimp_image_convert_precision(), don't overwrite the 'progress' + parameter with the object queue, since we need to call + gimp_progress_end() on it at the end of the process. + + app/core/gimpimage-convert-precision.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 7f96c9e7c62d602fbccddfa98dbf6b9afe5e3cc4 +Author: Marco Ciampa +Date: Tue Mar 27 12:25:33 2018 +0200 + + Updated Italian translation + + po-libgimp/it.po | 109 ++++--- + po-plug-ins/it.po | 268 +++++++++-------- + po-tips/it.po | 403 ++++++++++++------------- + po-windows-installer/it.po | 26 +- + po/it.po | 729 + ++++++++++++++++++++++++++------------------- + 5 files changed, 831 insertions(+), 704 deletions(-) + commit 956ca8e3a39cc93d8fae439a8e5eb073059db011 Author: Ell Date: Mon Mar 26 19:14:02 2018 -0400 diff --git a/INSTALL b/INSTALL index 0b8b3dc95b..79373cbaf1 100644 --- a/INSTALL +++ b/INSTALL @@ -38,8 +38,8 @@ header files installed. You are recommended to install gettext version 0.19 or over. Earlier gettext had issues with script-fu localization, ending up in incomplete GIMP localization. - 3. You need to have GEGL version 0.3.30 or newer and babl version - 0.1.44 or newer. You can get them from http://gegl.org/ or clone + 3. You need to have GEGL version 0.3.34 or newer and babl version + 0.1.46 or newer. You can get them from http://gegl.org/ or clone them from the GNOME git repository: git://git.gnome.org/babl @@ -84,7 +84,11 @@ header files installed. https://github.com/mypaint/libmypaint - We also need the mypaint-brushes data package with is currently + If installing from repository, do not install the master branch! + Checkout the tag "v1.3.0" instead, or simply install from a tarball + or from your favorite package manager. + + 11. We also need the mypaint-brushes data package with is currently hosted by Jehan, until the MyPaint project takes care of it: https://github.com/Jehan/mypaint-brushes @@ -99,44 +103,44 @@ header files installed. have to make sure your $PKG_CONFIG_PATH environment variable also lists `$PREFIX/share/pkgconfig/`. - 11. You may want to install other third party libraries or programs + 12. You may want to install other third party libraries or programs that are needed for some of the available plug-ins. We recommend to check that the following libraries are installed: libjasper, webkit, libmng, librsvg, libwmf, libaa and libgs (Ghostscript). - 12. The Python extension requires Python 2 development headers (2.5.0 + 13. The Python extension requires Python 2 development headers (2.5.0 or newer) to be present. You will also need PyGTK and the respective development headers. - 13. Windows builds can now generate backtrace logs upon a crash. + 14. Windows builds can now generate backtrace logs upon a crash. The logs will be available in: %APPDATA%\GIMP\2.10\CrashLog\ The feature depends on Dr.MinGW's ExcHndl library: https://github.com/jrfonseca/drmingw - 14. Configure GIMP by running the `configure' script. You may want + 15. Configure GIMP by running the `configure' script. You may want to pass some options to it, see below. - 15. Build GIMP by running `make'. The use of GNU make is recommended. + 16. Build GIMP by running `make'. The use of GNU make is recommended. If you need to tweak the build to make it work with other flavours of make, we'd appreciate if you'd send us a patch with the changes. - 16. Install GIMP by running `make install'. In order to avoid clashes + 17. Install GIMP by running `make install'. In order to avoid clashes with other versions of GIMP, we install a binary called gimp-2.10. By default there's also a link created so that you can type 'gimp' to start gimp-2.10. - 17. Summary of required packages and what version you need: + 18. Summary of required packages and what version you need: Package Name Version ATK 2.2.0 - babl 0.1.44 + babl 0.1.46 cairo 1.12.2 Fontconfig 2.12.4 freetype2 2.1.7 GDK-PixBuf 2.30.8 - GEGL 0.3.30 + GEGL 0.3.34 GIO GLib 2.54.2 glib-networking @@ -156,7 +160,7 @@ header files installed. poppler-data 0.4.7 zlib - 18. Summary of optional packages: + 19. Summary of optional packages: Package Name Version Feature @@ -174,7 +178,7 @@ header files installed. python 2 2.5.0 Python plug-ins webkit 1.6.1 Help browser & webpage - 19. Summary of optional runtime dependencies: + 20. Summary of optional runtime dependencies: darktable >= 1.7, with lua support enabled for raw loading RawTherapee >= 5.2 for raw loading @@ -192,8 +196,8 @@ packages are included below. Here is an illustration of commands that might be used to build and install GIMP. The actual configuration, compilation and installation output is not shown. - % tar xvfz gimp-2.10.0-RC1.tar.gz # unpack the sources - % cd gimp-2.10.0-RC1 # change to the toplevel directory + % tar xvfz gimp-2.10.0-RC2.tar.gz # unpack the sources + % cd gimp-2.10.0-RC2 # change to the toplevel directory % ./configure # run the `configure' script % make # build GIMP % make install # install GIMP diff --git a/INSTALL.in b/INSTALL.in index f4f0c48a34..13535506d1 100644 --- a/INSTALL.in +++ b/INSTALL.in @@ -84,7 +84,11 @@ header files installed. https://github.com/mypaint/libmypaint - We also need the mypaint-brushes data package with is currently + If installing from repository, do not install the master branch! + Checkout the tag "v1.3.0" instead, or simply install from a tarball + or from your favorite package manager. + + 11. We also need the mypaint-brushes data package with is currently hosted by Jehan, until the MyPaint project takes care of it: https://github.com/Jehan/mypaint-brushes @@ -99,34 +103,34 @@ header files installed. have to make sure your $PKG_CONFIG_PATH environment variable also lists `$PREFIX/share/pkgconfig/`. - 11. You may want to install other third party libraries or programs + 12. You may want to install other third party libraries or programs that are needed for some of the available plug-ins. We recommend to check that the following libraries are installed: libjasper, webkit, libmng, librsvg, libwmf, libaa and libgs (Ghostscript). - 12. The Python extension requires Python 2 development headers (@PYTHON2_REQUIRED_VERSION@ + 13. The Python extension requires Python 2 development headers (@PYTHON2_REQUIRED_VERSION@ or newer) to be present. You will also need PyGTK and the respective development headers. - 13. Windows builds can now generate backtrace logs upon a crash. + 14. Windows builds can now generate backtrace logs upon a crash. The logs will be available in: %APPDATA%\GIMP\@GIMP_APP_VERSION@\CrashLog\ The feature depends on Dr.MinGW's ExcHndl library: https://github.com/jrfonseca/drmingw - 14. Configure GIMP by running the `configure' script. You may want + 15. Configure GIMP by running the `configure' script. You may want to pass some options to it, see below. - 15. Build GIMP by running `make'. The use of GNU make is recommended. + 16. Build GIMP by running `make'. The use of GNU make is recommended. If you need to tweak the build to make it work with other flavours of make, we'd appreciate if you'd send us a patch with the changes. - 16. Install GIMP by running `make install'. In order to avoid clashes + 17. Install GIMP by running `make install'. In order to avoid clashes with other versions of GIMP, we install a binary called gimp-@GIMP_APP_VERSION@. By default there's also a link created so that you can type 'gimp' to start gimp-@GIMP_APP_VERSION@. - 17. Summary of required packages and what version you need: + 18. Summary of required packages and what version you need: Package Name Version @@ -156,7 +160,7 @@ header files installed. poppler-data @POPPLER_DATA_REQUIRED_VERSION@ zlib - 18. Summary of optional packages: + 19. Summary of optional packages: Package Name Version Feature @@ -174,7 +178,7 @@ header files installed. python 2 @PYTHON2_REQUIRED_VERSION@ Python plug-ins webkit @WEBKIT_REQUIRED_VERSION@ Help browser & webpage - 19. Summary of optional runtime dependencies: + 20. Summary of optional runtime dependencies: darktable >= 1.7, with lua support enabled for raw loading RawTherapee >= 5.2 for raw loading diff --git a/Makefile.in b/Makefile.in index c24e8f1c9b..2a18f578c7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -335,7 +336,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -408,6 +409,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -636,6 +638,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/NEWS b/NEWS index b914516ba8..eee7d324b0 100644 --- a/NEWS +++ b/NEWS @@ -11,8 +11,87 @@ branch are also applied here, but they are usually not mentioned in NEWS. -Overview of Changes from GIMP 2.9.8 to GIMP 2.10 RC1 -==================================================== +Overview of Changes from GIMP 2.10.0 RC1 to GIMP 2.10.0 RC2 +=========================================================== + +Core: + + - Symmetries are now preserved in XCF files (saved as image parasites). + - New runtime option --show-debug-menu in order to make the File > + Debug menu visible. + - Do not show invisible actions in search dialog. + - Do not dither image mask and channels for imported images. + - Various optimizations for painting and display (WIP), including + parallelized painting code. + - New "Misc" group to the Dashboard dock, with currently only a + "Mipmapped" field showing the total size of processed mipmapped + data. + - Plug-ins debugging on crashes through --stack-trace-mode CLI option + improved to handle more case. + - Fix selection -> channel -> selection roundtrips by never doing + any gamma conversion when converting between an image's selection, + channels, masks. Also, make all channels linear in all images with + >8bit. + +Libgimp: + + - New group "drawable_edit" which contains all functions from "edit" + that are not cut/copy/paste. The new functions have much less + arguments and take them from the context instead. The respective + functions in "edit" have been deprecated. + - New functions in "context" to configure aspects of gradient + drawing, and to set the built-in gradients (the new gradient + function in "drawable_edit" doesn't have a parameter for the + gradient type any longer). + +User interface: + + - Lighter and Darker themes removed for now, Light and Dark themes + rewritten from scratch to get rid of various usability issues and + glitches. Only Gray theme from previous set kept as-is. + - New GimpToolGyroscope on-canvas control, currently used for + the Panorama Projection filter. The widget provides on-canvas + interaction for 3D rotation (yaw, pitch, roll). + +Configurability: + + - In Preferences > Dialog Defaults, new section "Filter Dialogs" + created to customize various common features of filters, such as + recent settings and advanced color options. + - Do not default to last used filter settings, but allow this behavior + in Preferences > Dialog Defaults, with checkbox "Default to the last + used settings". + +Tools: + + - Color used in the Smudge tool is now added to the color history. + - "Blend" tool renamed to much more consistent "Gradient" tool. + Also it can now work in linear RGB matching capabilities CSS/SVG + specification without gamma-errors in color blending and CIE Lab + which in addition keeps a perceptual graylevel. + +Assets / Resources: + + - Adding 4K UHD in document templates (and fixing 4K DCI). + +Building: + + - New --enable-bundled-mypaint-brushes option in configure to decide + whether to use the configure-time installation path of MyPaint + brushes, or use a path relative to GIMP installation prefix + (typically for bundled binaries, such as on Windows or macOS). + - Detect freetype2 using pkg-config (`freetype-config` is on its way + out in various distributions apparently). + - Appdata now installed to $PREFIX/share/metainfo/ + +Translations: + + - 8 translations were updated: Arabic, Catalan, Chinese, French, Italian, + Polish, Russian, Swedish. + + +Overview of Changes from GIMP 2.9.8 to GIMP 2.10.0 RC1 +====================================================== Core: diff --git a/acinclude.m4 b/acinclude.m4 index 34c0b313a6..2984fe97cf 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,5 +1,6 @@ m4_include([m4macros/alsa.m4]) m4_include([m4macros/ax_compare_version.m4]) +m4_include([m4macros/ax_cxx_compile_stdcxx.m4]) m4_include([m4macros/ax_gcc_func_attribute.m4]) m4_include([m4macros/ax_prog_cc_for_build.m4]) m4_include([m4macros/ax_prog_perl_version.m4]) diff --git a/app-tools/Makefile.am b/app-tools/Makefile.am index 7195d364f5..d0f6e9445d 100644 --- a/app-tools/Makefile.am +++ b/app-tools/Makefile.am @@ -7,6 +7,8 @@ libappwidgets = $(top_builddir)/app/widgets/libappwidgets.a if PLATFORM_OSX xobjective_c = "-xobjective-c" +xobjective_cxx = "-xobjective-c++" +xnone = "-xnone" endif if OS_WIN32 @@ -67,5 +69,13 @@ AM_CPPFLAGS = \ -DGIMP_PLUGIN_VERSION=\""$(GIMP_PLUGIN_VERSION)"\" \ -I$(top_srcdir) \ $(GTK_CFLAGS) \ - -I$(includedir) \ + -I$(includedir) + +AM_CFLAGS = \ $(xobjective_c) + +AM_CXXFLAGS = \ + $(xobjective_cxx) + +AM_LDFLAGS = \ + $(xnone) diff --git a/app-tools/Makefile.in b/app-tools/Makefile.in index 0b2749d61a..fa2cf00771 100644 --- a/app-tools/Makefile.in +++ b/app-tools/Makefile.in @@ -103,6 +103,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -254,7 +255,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -327,6 +328,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -555,6 +557,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -577,6 +580,8 @@ AUTOMAKE_OPTIONS = subdir-objects libapp = $(top_builddir)/app/libapp.a libappwidgets = $(top_builddir)/app/widgets/libappwidgets.a @PLATFORM_OSX_TRUE@xobjective_c = "-xobjective-c" +@PLATFORM_OSX_TRUE@xobjective_cxx = "-xobjective-c++" +@PLATFORM_OSX_TRUE@xnone = "-xnone" gimp_debug_tool_@GIMP_TOOL_VERSION@_SOURCES = \ gimp-debug-tool.c @@ -621,9 +626,17 @@ AM_CPPFLAGS = \ -DGIMP_PLUGIN_VERSION=\""$(GIMP_PLUGIN_VERSION)"\" \ -I$(top_srcdir) \ $(GTK_CFLAGS) \ - -I$(includedir) \ + -I$(includedir) + +AM_CFLAGS = \ $(xobjective_c) +AM_CXXFLAGS = \ + $(xobjective_cxx) + +AM_LDFLAGS = \ + $(xnone) + all: all-am .SUFFIXES: diff --git a/app/Makefile.am b/app/Makefile.am index 5cc6dfba1c..f0a9536f2c 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -127,7 +127,9 @@ AM_LDFLAGS = \ -Wl,-u,$(SYMPREFIX)internal_procs_init \ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec \ - -Wl,-u,$(SYMPREFIX)gimp_layer_mode_is_legacy + -Wl,-u,$(SYMPREFIX)gimp_layer_mode_is_legacy \ + -Wl,-u,$(SYMPREFIX)gimp_parallel_init \ + -Wl,-u,$(SYMPREFIX)gimp_parallel_exit gimpconsoleldadd = \ xcf/libappxcf.a \ @@ -245,16 +247,12 @@ endif # dist-dump-gimprc: gimp-console-$(GIMP_APP_VERSION)$(EXEEXT) ./$< --dump-gimprc-system > gimprc.tmp \ - && sed -e "s/num-processors [0-9]*/num-processors 1/" \ - gimprc.tmp > gimprc.tmp2 \ - && (cmp -s gimprc.tmp2 $(top_srcdir)/etc/gimprc || \ - cp gimprc.tmp2 $(top_srcdir)/etc/gimprc) \ - && rm gimprc.tmp gimprc.tmp2 + && (cmp -s gimprc.tmp $(top_srcdir)/etc/gimprc.in || \ + cp gimprc.tmp $(top_srcdir)/etc/gimprc.in) \ + && rm gimprc.tmp ./$< --dump-gimprc-manpage > gimprc.tmp \ - && sed -e "s/num-processors [0-9]*/num-processors 1/" \ - gimprc.tmp > gimprc.tmp2 \ - && (cmp -s gimprc.tmp2 $(top_srcdir)/docs/gimprc.5.in ||\ - cp gimprc.tmp2 $(top_srcdir)/docs/gimprc.5.in) \ - && rm gimprc.tmp gimprc.tmp2 + && (cmp -s gimprc.tmp $(top_srcdir)/docs/gimprc.5.in ||\ + cp gimprc.tmp $(top_srcdir)/docs/gimprc.5.in) \ + && rm gimprc.tmp dist-hook: dist-check-gimp-console dist-dump-gimprc diff --git a/app/Makefile.in b/app/Makefile.in index 05417f8ea4..93a1a8de4a 100644 --- a/app/Makefile.in +++ b/app/Makefile.in @@ -107,6 +107,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -383,7 +384,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -456,6 +457,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -684,6 +686,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -804,7 +807,9 @@ AM_LDFLAGS = \ -Wl,-u,$(SYMPREFIX)internal_procs_init \ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec \ - -Wl,-u,$(SYMPREFIX)gimp_layer_mode_is_legacy + -Wl,-u,$(SYMPREFIX)gimp_layer_mode_is_legacy \ + -Wl,-u,$(SYMPREFIX)gimp_parallel_init \ + -Wl,-u,$(SYMPREFIX)gimp_parallel_exit gimpconsoleldadd = \ xcf/libappxcf.a \ @@ -1512,17 +1517,13 @@ uninstall-local: # dist-dump-gimprc: gimp-console-$(GIMP_APP_VERSION)$(EXEEXT) ./$< --dump-gimprc-system > gimprc.tmp \ - && sed -e "s/num-processors [0-9]*/num-processors 1/" \ - gimprc.tmp > gimprc.tmp2 \ - && (cmp -s gimprc.tmp2 $(top_srcdir)/etc/gimprc || \ - cp gimprc.tmp2 $(top_srcdir)/etc/gimprc) \ - && rm gimprc.tmp gimprc.tmp2 + && (cmp -s gimprc.tmp $(top_srcdir)/etc/gimprc.in || \ + cp gimprc.tmp $(top_srcdir)/etc/gimprc.in) \ + && rm gimprc.tmp ./$< --dump-gimprc-manpage > gimprc.tmp \ - && sed -e "s/num-processors [0-9]*/num-processors 1/" \ - gimprc.tmp > gimprc.tmp2 \ - && (cmp -s gimprc.tmp2 $(top_srcdir)/docs/gimprc.5.in ||\ - cp gimprc.tmp2 $(top_srcdir)/docs/gimprc.5.in) \ - && rm gimprc.tmp gimprc.tmp2 + && (cmp -s gimprc.tmp $(top_srcdir)/docs/gimprc.5.in ||\ + cp gimprc.tmp $(top_srcdir)/docs/gimprc.5.in) \ + && rm gimprc.tmp dist-hook: dist-check-gimp-console dist-dump-gimprc diff --git a/app/actions/Makefile.in b/app/actions/Makefile.in index 598089d7c6..fe6f0192d2 100644 --- a/app/actions/Makefile.in +++ b/app/actions/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -316,7 +317,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -389,6 +390,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -617,6 +619,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/actions/dashboard-actions.c b/app/actions/dashboard-actions.c index 9ed2f4bbf5..f62cee35bb 100644 --- a/app/actions/dashboard-actions.c +++ b/app/actions/dashboard-actions.c @@ -40,6 +40,8 @@ static const GimpActionEntry dashboard_actions[] = NC_("dashboard-action", "Dashboard Menu"), NULL, NULL, NULL, GIMP_HELP_DASHBOARD_DIALOG }, + { "dashboard-groups", NULL, + NC_("dashboard-action", "Groups") }, { "dashboard-update-interval", NULL, NC_("dashboard-action", "Update Interval") }, { "dashboard-history-duration", NULL, diff --git a/app/actions/debug-actions.c b/app/actions/debug-actions.c index 5debf3b04b..79d5539c2a 100644 --- a/app/actions/debug-actions.c +++ b/app/actions/debug-actions.c @@ -32,8 +32,6 @@ #include "debug-commands.h" -#ifdef ENABLE_DEBUG_MENU - static const GimpActionEntry debug_actions[] = { { "debug-menu", NULL, "_Debug" }, @@ -78,16 +76,22 @@ static const GimpActionEntry debug_actions[] = NULL } }; -#endif - void debug_actions_setup (GimpActionGroup *group) { -#ifdef ENABLE_DEBUG_MENU + gint i; + gimp_action_group_add_actions (group, NULL, debug_actions, G_N_ELEMENTS (debug_actions)); -#endif + +#define SET_VISIBLE(action,condition) \ + gimp_action_group_set_action_visible (group, action, (condition) != 0) + + for (i = 0; i < G_N_ELEMENTS (debug_actions); i++) + SET_VISIBLE (debug_actions[i].name, group->gimp->show_debug_menu); + +#undef SET_VISIBLE } void diff --git a/app/actions/debug-commands.c b/app/actions/debug-commands.c index 85de856d70..8eb9f8d54a 100644 --- a/app/actions/debug-commands.c +++ b/app/actions/debug-commands.c @@ -49,8 +49,6 @@ #include "debug-commands.h" -#ifdef ENABLE_DEBUG_MENU - /* local function prototypes */ static gboolean debug_benchmark_projection (GimpDisplay *display); @@ -193,7 +191,7 @@ debug_dump_keyboard_shortcuts_cmd_callback (GtkAction *action, accel_group = gtk_ui_manager_get_accel_group (manager); - /* Gather formated strings of keyboard shortcuts */ + /* Gather formatted strings of keyboard shortcuts */ for (group_it = gtk_ui_manager_get_action_groups (manager); group_it; group_it = g_list_next (group_it)) @@ -425,6 +423,3 @@ debug_accel_find_func (GtkAccelKey *key, { return (GClosure *) data == closure; } - - -#endif /* ENABLE_DEBUG_MENU */ diff --git a/app/actions/debug-commands.h b/app/actions/debug-commands.h index 42cb218ef6..0504e20d08 100644 --- a/app/actions/debug-commands.h +++ b/app/actions/debug-commands.h @@ -19,13 +19,6 @@ #define __DEBUG_COMMANDS_H__ -#ifdef GIMP_UNSTABLE -#define ENABLE_DEBUG_MENU 1 -#endif - - -#ifdef ENABLE_DEBUG_MENU - void debug_mem_profile_cmd_callback (GtkAction *action, gpointer data); void debug_benchmark_projection_cmd_callback (GtkAction *action, @@ -43,7 +36,4 @@ void debug_dump_attached_data_cmd_callback (GtkAction *action, void debug_benchmark_projection_cmd_callback (GtkAction *action, gpointer data); -#endif /* ENABLE_DEBUG_MENU */ - - #endif /* __DEBUG_COMMANDS_H__ */ diff --git a/app/actions/gimpgeglprocedure.c b/app/actions/gimpgeglprocedure.c index 183efc16d4..587ec9e5a5 100644 --- a/app/actions/gimpgeglprocedure.c +++ b/app/actions/gimpgeglprocedure.c @@ -30,6 +30,8 @@ #include "actions-types.h" +#include "config/gimpguiconfig.h" + #include "operations/gimp-operation-config.h" #include "core/gimp.h" @@ -119,12 +121,11 @@ gimp_gegl_procedure_finalize (GObject *object) { GimpGeglProcedure *proc = GIMP_GEGL_PROCEDURE (object); - if (proc->default_settings) - g_object_unref (proc->default_settings); + g_clear_object (&proc->default_settings); - g_free (proc->menu_label); - g_free (proc->label); - g_free (proc->help_id); + g_clear_pointer (&proc->menu_label, g_free); + g_clear_pointer (&proc->label, g_free); + g_clear_pointer (&proc->help_id, g_free); G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -277,7 +278,9 @@ gimp_gegl_procedure_execute_async (GimpProcedure *procedure, run_mode = g_value_get_int (gimp_value_array_index (args, 0)); settings = g_value_get_object (gimp_value_array_index (args, 3)); - if (! settings) + if (! settings && + (run_mode != GIMP_RUN_INTERACTIVE || + GIMP_GUI_CONFIG (gimp->config)->filter_tool_use_last_settings)) { /* if we didn't get settings passed, get the last used settings */ diff --git a/app/actions/gradient-editor-commands.c b/app/actions/gradient-editor-commands.c index 1e7e06f3d9..9ffc70e623 100644 --- a/app/actions/gradient-editor-commands.c +++ b/app/actions/gradient-editor-commands.c @@ -539,6 +539,7 @@ gradient_editor_split_midpoint_cmd_callback (GtkAction *action, data_editor->context, editor->control_sel_l, editor->control_sel_r, + editor->blend_color_space, &editor->control_sel_l, &editor->control_sel_r); } @@ -911,6 +912,7 @@ gradient_editor_split_uniform_response (GtkWidget *widget, editor->control_sel_l, editor->control_sel_r, editor->split_parts, + editor->blend_color_space, &editor->control_sel_l, &editor->control_sel_r); } diff --git a/app/actions/select-commands.c b/app/actions/select-commands.c index 99df95fc64..acf90f3194 100644 --- a/app/actions/select-commands.c +++ b/app/actions/select-commands.c @@ -386,12 +386,20 @@ void select_save_cmd_callback (GtkAction *action, gpointer data) { - GimpImage *image; - GtkWidget *widget; + GimpImage *image; + GimpChannel *channel; + GtkWidget *widget; return_if_no_image (image, data); return_if_no_widget (widget, data); - gimp_selection_save (GIMP_SELECTION (gimp_image_get_mask (image))); + channel = GIMP_CHANNEL (gimp_item_duplicate (GIMP_ITEM (gimp_image_get_mask (image)), + GIMP_TYPE_CHANNEL)); + + /* saved selections are not visible by default */ + gimp_item_set_visible (GIMP_ITEM (channel), FALSE, FALSE); + + gimp_image_add_channel (image, channel, + GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE); gimp_image_flush (image); gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (image->gimp)), diff --git a/app/app.c b/app/app.c index 7296b0b3c5..23bec66170 100644 --- a/app/app.c +++ b/app/app.c @@ -176,6 +176,7 @@ app_run (const gchar *full_prog_name, gboolean console_messages, gboolean use_debug_handler, gboolean show_playground, + gboolean show_debug_menu, GimpStackTraceMode stack_trace_mode, GimpPDBCompatMode pdb_compat_mode, const gchar *backtrace_file) @@ -211,7 +212,7 @@ app_run (const gchar *full_prog_name, } /* Language needs to be determined first, before any GimpContext is - * instanciated (which happens when the Gimp object is created) + * instantiated (which happens when the Gimp object is created) * because its properties need to be properly localized in the * settings language (if different from system language). Otherwise we * end up with pieces of GUI always using the system language (cf. bug @@ -244,6 +245,7 @@ app_run (const gchar *full_prog_name, use_cpu_accel, console_messages, show_playground, + show_debug_menu, stack_trace_mode, pdb_compat_mode); @@ -425,6 +427,8 @@ app_run (const gchar *full_prog_name, g_main_loop_unref (loop); + gimp_gegl_exit (gimp); + g_object_unref (gimp); gimp_debug_instances (); diff --git a/app/app.h b/app/app.h index 47d9ebf6a0..4c5baecf0c 100644 --- a/app/app.h +++ b/app/app.h @@ -48,6 +48,7 @@ void app_run (const gchar *full_prog_name, gboolean console_messages, gboolean use_debug_handler, gboolean show_playground, + gboolean show_debug_menu, GimpStackTraceMode stack_trace_mode, GimpPDBCompatMode pdb_compat_mode, const gchar *backtrace_file); diff --git a/app/config/Makefile.in b/app/config/Makefile.in index bc1e747c30..4e565704a6 100644 --- a/app/config/Makefile.in +++ b/app/config/Makefile.in @@ -101,6 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -490,7 +491,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -563,6 +564,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -791,6 +793,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/config/gimpconfig-dump.c b/app/config/gimpconfig-dump.c index ee1bad3bd0..2107bdd9e9 100644 --- a/app/config/gimpconfig-dump.c +++ b/app/config/gimpconfig-dump.c @@ -159,7 +159,34 @@ dump_gimprc_system (GimpConfig *rc, gimp_config_writer_comment_mode (writer, TRUE); gimp_config_writer_linefeed (writer); - gimp_config_serialize_property (rc, prop_spec, writer); + if (! strcmp (prop_spec->name, "num-processors")) + { + gimp_config_writer_open (writer, "num-processors"); + gimp_config_writer_printf (writer, "1"); + gimp_config_writer_close (writer); + } + else if (! strcmp (prop_spec->name, "tile-cache-size")) + { + gimp_config_writer_open (writer, "tile-cache-size"); + gimp_config_writer_printf (writer, "2g"); + gimp_config_writer_close (writer); + } + else if (! strcmp (prop_spec->name, "mypaint-brush-path")) + { + gchar *path = g_strdup_printf ("@mypaint_brushes_dir@%s" + "~/.mypaint/brushes", + G_SEARCHPATH_SEPARATOR_S); + + gimp_config_writer_open (writer, "mypaint-brush-path"); + gimp_config_writer_string (writer, path); + gimp_config_writer_close (writer); + + g_free (path); + } + else + { + gimp_config_serialize_property (rc, prop_spec, writer); + } gimp_config_writer_comment_mode (writer, FALSE); gimp_config_writer_linefeed (writer); @@ -273,6 +300,7 @@ dump_gimprc_manpage (GimpConfig *rc, { GParamSpec *prop_spec = property_specs[i]; gchar *desc; + gboolean success; if (! (prop_spec->flags & GIMP_CONFIG_PARAM_SERIALIZE)) continue; @@ -283,7 +311,42 @@ dump_gimprc_manpage (GimpConfig *rc, g_output_stream_printf (output, NULL, NULL, NULL, ".TP\n"); - if (gimp_config_serialize_property (rc, prop_spec, writer)) + if (! strcmp (prop_spec->name, "num-processors")) + { + gimp_config_writer_open (writer, "num-processors"); + gimp_config_writer_printf (writer, "1"); + gimp_config_writer_close (writer); + + success = TRUE; + } + else if (! strcmp (prop_spec->name, "tile-cache-size")) + { + gimp_config_writer_open (writer, "tile-cache-size"); + gimp_config_writer_printf (writer, "2g"); + gimp_config_writer_close (writer); + + success = TRUE; + } + else if (! strcmp (prop_spec->name, "mypaint-brush-path")) + { + gchar *path = g_strdup_printf ("@mypaint_brushes_dir@%s" + "~/.mypaint/brushes", + G_SEARCHPATH_SEPARATOR_S); + + gimp_config_writer_open (writer, "mypaint-brush-path"); + gimp_config_writer_string (writer, path); + gimp_config_writer_close (writer); + + g_free (path); + + success = TRUE; + } + else + { + success = gimp_config_serialize_property (rc, prop_spec, writer); + } + + if (success) { g_output_stream_printf (output, NULL, NULL, NULL, "\n"); diff --git a/app/config/gimpcoreconfig.c b/app/config/gimpcoreconfig.c index 72324973ed..b2d596579b 100644 --- a/app/config/gimpcoreconfig.c +++ b/app/config/gimpcoreconfig.c @@ -151,10 +151,7 @@ gimp_core_config_class_init (GimpCoreConfigClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); gchar *path; -#if 0 - gchar *dir1; - gchar *dir2; -#endif + gchar *mypaint_brushes; GimpRGB red = { 1.0, 0, 0, 0.5 }; guint64 undo_size; @@ -265,10 +262,20 @@ gimp_core_config_class_init (GimpCoreConfigClass *klass) GIMP_CONFIG_PARAM_RESTART); g_free (path); +#ifdef ENABLE_BUNDLED_MYPAINT_BRUSHES + mypaint_brushes = g_build_filename ("${gimp_installation_dir}", + "share", "mypaint-data", + "1.0", "brushes", NULL); +#else + mypaint_brushes = g_strdup (MYPAINT_BRUSHES_DIR); +#endif + path = g_build_path (G_SEARCHPATH_SEPARATOR_S, - MYPAINT_BRUSHES_DIR, + mypaint_brushes, "~/.mypaint/brushes", NULL); + g_free (mypaint_brushes); + GIMP_CONFIG_PROP_PATH (object_class, PROP_MYPAINT_BRUSH_PATH, "mypaint-brush-path", "MyPaint brush path", diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c index 31d932e057..72e263d1d8 100644 --- a/app/config/gimpguiconfig.c +++ b/app/config/gimpguiconfig.c @@ -54,6 +54,7 @@ enum PROP_0, PROP_MOVE_TOOL_CHANGES_ACTIVE, PROP_FILTER_TOOL_MAX_RECENT, + PROP_FILTER_TOOL_USE_LAST_SETTINGS, PROP_FILTER_TOOL_SHOW_COLOR_OPTIONS, PROP_TRUST_DIRTY_FLAG, PROP_SAVE_DEVICE_STATUS, @@ -163,6 +164,13 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass) 0, 255, 10, GIMP_PARAM_STATIC_STRINGS); + GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FILTER_TOOL_USE_LAST_SETTINGS, + "filter-tool-use-last-settings", + "Use last used settings in filters", + FILTER_TOOL_USE_LAST_SETTINGS_BLURB, + FALSE, + GIMP_PARAM_STATIC_STRINGS); + GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FILTER_TOOL_SHOW_COLOR_OPTIONS, "filter-tool-show-color-options", "Show avanced color options in filters", @@ -569,6 +577,9 @@ gimp_gui_config_set_property (GObject *object, case PROP_IMAGE_MAP_TOOL_MAX_RECENT: gui_config->filter_tool_max_recent = g_value_get_int (value); break; + case PROP_FILTER_TOOL_USE_LAST_SETTINGS: + gui_config->filter_tool_use_last_settings = g_value_get_boolean (value); + break; case PROP_FILTER_TOOL_SHOW_COLOR_OPTIONS: gui_config->filter_tool_show_color_options = g_value_get_boolean (value); break; @@ -751,6 +762,9 @@ gimp_gui_config_get_property (GObject *object, case PROP_IMAGE_MAP_TOOL_MAX_RECENT: g_value_set_int (value, gui_config->filter_tool_max_recent); break; + case PROP_FILTER_TOOL_USE_LAST_SETTINGS: + g_value_set_boolean (value, gui_config->filter_tool_use_last_settings); + break; case PROP_FILTER_TOOL_SHOW_COLOR_OPTIONS: g_value_set_boolean (value, gui_config->filter_tool_show_color_options); break; diff --git a/app/config/gimpguiconfig.h b/app/config/gimpguiconfig.h index bbb81306ac..316f1d2004 100644 --- a/app/config/gimpguiconfig.h +++ b/app/config/gimpguiconfig.h @@ -24,7 +24,7 @@ #include "config/gimpdisplayconfig.h" -#define GIMP_CONFIG_DEFAULT_THEME "03-Dark" +#define GIMP_CONFIG_DEFAULT_THEME "Dark" #define GIMP_CONFIG_DEFAULT_ICON_THEME "Symbolic" @@ -43,6 +43,7 @@ struct _GimpGuiConfig gboolean move_tool_changes_active; gint filter_tool_max_recent; + gboolean filter_tool_use_last_settings; gboolean filter_tool_show_color_options; gboolean trust_dirty_flag; gboolean save_device_status; diff --git a/app/config/gimprc-blurbs.h b/app/config/gimprc-blurbs.h index 384b528674..5cd0dd4973 100644 --- a/app/config/gimprc-blurbs.h +++ b/app/config/gimprc-blurbs.h @@ -178,6 +178,9 @@ _("Sets the browser used by the help system.") #define FILTER_TOOL_MAX_RECENT_BLURB \ _("How many recent settings to keep around in filter tools.") +#define FILTER_TOOL_USE_LAST_SETTINGS_BLURB \ +_("Default to the last used settings in filter tools.") + #define FILTER_TOOL_SHOW_COLOR_OPTIONS_BLURB \ _("Show advanced color options in filter tools.") diff --git a/app/core/Makefile.am b/app/core/Makefile.am index 0e19108810..b64468551b 100644 --- a/app/core/Makefile.am +++ b/app/core/Makefile.am @@ -2,6 +2,8 @@ if PLATFORM_OSX xobjective_c = "-xobjective-c" +xobjective_cxx = "-xobjective-c++" +xnone = "-xnone" endif AM_CPPFLAGS = \ @@ -18,9 +20,17 @@ AM_CPPFLAGS = \ $(GDK_PIXBUF_CFLAGS) \ $(LIBMYPAINT_CFLAGS) \ $(GEXIV2_CFLAGS) \ - -I$(includedir) \ + -I$(includedir) + +AM_CFLAGS = \ $(xobjective_c) +AM_CXXFLAGS = \ + $(xobjective_cxx) + +AM_LDFLAGS = \ + $(xnone) + noinst_LIBRARIES = libappcore.a libappcore_a_sources = \ @@ -52,6 +62,8 @@ libappcore_a_sources = \ gimp-modules.h \ gimp-palettes.c \ gimp-palettes.h \ + gimp-parallel.cc \ + gimp-parallel.h \ gimp-parasites.c \ gimp-parasites.h \ gimp-spawn.c \ @@ -82,7 +94,7 @@ libappcore_a_sources = \ gimpbrush-load.c \ gimpbrush-load.h \ gimpbrush-private.h \ - gimpbrush-transform.c \ + gimpbrush-transform.cc \ gimpbrush-transform.h \ gimpbrushcache.c \ gimpbrushcache.h \ @@ -138,8 +150,6 @@ libappcore_a_sources = \ gimpdocumentlist.h \ gimpdrawable.c \ gimpdrawable.h \ - gimpdrawable-blend.c \ - gimpdrawable-blend.h \ gimpdrawable-bucket-fill.c \ gimpdrawable-bucket-fill.h \ gimpdrawable-combine.c \ @@ -154,6 +164,8 @@ libappcore_a_sources = \ gimpdrawable-floating-selection.h \ gimpdrawable-foreground-extract.c \ gimpdrawable-foreground-extract.h \ + gimpdrawable-gradient.c \ + gimpdrawable-gradient.h \ gimpdrawable-histogram.c \ gimpdrawable-histogram.h \ gimpdrawable-levels.c \ diff --git a/app/core/Makefile.in b/app/core/Makefile.in index 8c65394397..687fd65ee0 100644 --- a/app/core/Makefile.in +++ b/app/core/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -127,16 +128,17 @@ am__objects_2 = gimp.$(OBJEXT) gimp-batch.$(OBJEXT) \ gimp-filter-history.$(OBJEXT) gimp-gradients.$(OBJEXT) \ gimp-gui.$(OBJEXT) gimp-internal-data.$(OBJEXT) \ gimp-memsize.$(OBJEXT) gimp-modules.$(OBJEXT) \ - gimp-palettes.$(OBJEXT) gimp-parasites.$(OBJEXT) \ - gimp-spawn.$(OBJEXT) gimp-tags.$(OBJEXT) \ - gimp-templates.$(OBJEXT) gimp-transform-resize.$(OBJEXT) \ - gimp-transform-utils.$(OBJEXT) gimp-units.$(OBJEXT) \ - gimp-user-install.$(OBJEXT) gimp-utils.$(OBJEXT) \ - gimpbezierdesc.$(OBJEXT) gimpboundary.$(OBJEXT) \ - gimpbrush.$(OBJEXT) gimpbrush-boundary.$(OBJEXT) \ - gimpbrush-load.$(OBJEXT) gimpbrush-transform.$(OBJEXT) \ - gimpbrushcache.$(OBJEXT) gimpbrushclipboard.$(OBJEXT) \ - gimpbrushgenerated.$(OBJEXT) gimpbrushgenerated-load.$(OBJEXT) \ + gimp-palettes.$(OBJEXT) gimp-parallel.$(OBJEXT) \ + gimp-parasites.$(OBJEXT) gimp-spawn.$(OBJEXT) \ + gimp-tags.$(OBJEXT) gimp-templates.$(OBJEXT) \ + gimp-transform-resize.$(OBJEXT) gimp-transform-utils.$(OBJEXT) \ + gimp-units.$(OBJEXT) gimp-user-install.$(OBJEXT) \ + gimp-utils.$(OBJEXT) gimpbezierdesc.$(OBJEXT) \ + gimpboundary.$(OBJEXT) gimpbrush.$(OBJEXT) \ + gimpbrush-boundary.$(OBJEXT) gimpbrush-load.$(OBJEXT) \ + gimpbrush-transform.$(OBJEXT) gimpbrushcache.$(OBJEXT) \ + gimpbrushclipboard.$(OBJEXT) gimpbrushgenerated.$(OBJEXT) \ + gimpbrushgenerated-load.$(OBJEXT) \ gimpbrushgenerated-save.$(OBJEXT) gimpbrushpipe.$(OBJEXT) \ gimpbrushpipe-load.$(OBJEXT) gimpbuffer.$(OBJEXT) \ gimpchannel.$(OBJEXT) gimpchannel-combine.$(OBJEXT) \ @@ -148,12 +150,12 @@ am__objects_2 = gimp.$(OBJEXT) gimp-batch.$(OBJEXT) \ gimpcurve-map.$(OBJEXT) gimpcurve-save.$(OBJEXT) \ gimpdashpattern.$(OBJEXT) gimpdata.$(OBJEXT) \ gimpdatafactory.$(OBJEXT) gimpdocumentlist.$(OBJEXT) \ - gimpdrawable.$(OBJEXT) gimpdrawable-blend.$(OBJEXT) \ - gimpdrawable-bucket-fill.$(OBJEXT) \ + gimpdrawable.$(OBJEXT) gimpdrawable-bucket-fill.$(OBJEXT) \ gimpdrawable-combine.$(OBJEXT) gimpdrawable-equalize.$(OBJEXT) \ gimpdrawable-fill.$(OBJEXT) gimpdrawable-filters.$(OBJEXT) \ gimpdrawable-floating-selection.$(OBJEXT) \ gimpdrawable-foreground-extract.$(OBJEXT) \ + gimpdrawable-gradient.$(OBJEXT) \ gimpdrawable-histogram.$(OBJEXT) gimpdrawable-levels.$(OBJEXT) \ gimpdrawable-offset.$(OBJEXT) gimpdrawable-operation.$(OBJEXT) \ gimpdrawable-preview.$(OBJEXT) gimpdrawable-shadow.$(OBJEXT) \ @@ -262,6 +264,24 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(libappcore_a_SOURCES) DIST_SOURCES = $(libappcore_a_SOURCES) am__can_run_installinfo = \ @@ -370,7 +390,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -443,6 +463,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -671,6 +692,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -690,6 +712,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @PLATFORM_OSX_TRUE@xobjective_c = "-xobjective-c" +@PLATFORM_OSX_TRUE@xobjective_cxx = "-xobjective-c++" +@PLATFORM_OSX_TRUE@xnone = "-xnone" AM_CPPFLAGS = \ -DGIMPDIR=\""$(gimpdir)"\" \ -DGIMP_APP_VERSION=\"$(GIMP_APP_VERSION)\" \ @@ -704,9 +728,17 @@ AM_CPPFLAGS = \ $(GDK_PIXBUF_CFLAGS) \ $(LIBMYPAINT_CFLAGS) \ $(GEXIV2_CFLAGS) \ - -I$(includedir) \ + -I$(includedir) + +AM_CFLAGS = \ $(xobjective_c) +AM_CXXFLAGS = \ + $(xobjective_cxx) + +AM_LDFLAGS = \ + $(xnone) + noinst_LIBRARIES = libappcore.a libappcore_a_sources = \ core-enums.h \ @@ -737,6 +769,8 @@ libappcore_a_sources = \ gimp-modules.h \ gimp-palettes.c \ gimp-palettes.h \ + gimp-parallel.cc \ + gimp-parallel.h \ gimp-parasites.c \ gimp-parasites.h \ gimp-spawn.c \ @@ -767,7 +801,7 @@ libappcore_a_sources = \ gimpbrush-load.c \ gimpbrush-load.h \ gimpbrush-private.h \ - gimpbrush-transform.c \ + gimpbrush-transform.cc \ gimpbrush-transform.h \ gimpbrushcache.c \ gimpbrushcache.h \ @@ -823,8 +857,6 @@ libappcore_a_sources = \ gimpdocumentlist.h \ gimpdrawable.c \ gimpdrawable.h \ - gimpdrawable-blend.c \ - gimpdrawable-blend.h \ gimpdrawable-bucket-fill.c \ gimpdrawable-bucket-fill.h \ gimpdrawable-combine.c \ @@ -839,6 +871,8 @@ libappcore_a_sources = \ gimpdrawable-floating-selection.h \ gimpdrawable-foreground-extract.c \ gimpdrawable-foreground-extract.h \ + gimpdrawable-gradient.c \ + gimpdrawable-gradient.h \ gimpdrawable-histogram.c \ gimpdrawable-histogram.h \ gimpdrawable-levels.c \ @@ -1134,7 +1168,7 @@ CLEANFILES = $(gen_sources) all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .cc .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -1192,6 +1226,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-memsize.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-modules.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-palettes.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-parallel.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-parasites.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-spawn.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-tags.Po@am__quote@ @@ -1234,7 +1269,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdata.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdatafactory.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdocumentlist.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-blend.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-bucket-fill.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-combine.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-equalize.Po@am__quote@ @@ -1242,6 +1276,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-filters.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-floating-selection.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-foreground-extract.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-gradient.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-histogram.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-levels.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-offset.Po@am__quote@ @@ -1399,6 +1434,27 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +.cc.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cc.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cc.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + mostlyclean-libtool: -rm -f *.lo diff --git a/app/core/gimp-parallel.cc b/app/core/gimp-parallel.cc new file mode 100644 index 0000000000..82a9c862dd --- /dev/null +++ b/app/core/gimp-parallel.cc @@ -0,0 +1,355 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * gimp-parallel.c + * Copyright (C) 2018 Ell + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +#include "config.h" + +#include +#include + +extern "C" +{ + +#include "core-types.h" + +#include "config/gimpgeglconfig.h" + +#include "gimp.h" +#include "gimp-parallel.h" + + +#define GIMP_PARALLEL_MAX_THREADS 64 + + +typedef struct +{ + GimpParallelDistributeFunc func; + gint n; + gpointer user_data; +} GimpParallelTask; + +typedef struct +{ + GThread *thread; + GMutex mutex; + GCond cond; + + gboolean quit; + + GimpParallelTask *volatile task; + volatile gint i; +} GimpParallelThread; + + +/* local function prototypes */ + +static void gimp_parallel_notify_num_processors (GimpGeglConfig *config); + +static void gimp_parallel_set_n_threads (gint n_threads); +static gpointer gimp_parallel_thread_func (GimpParallelThread *thread); + + +/* local variables */ + +static gint gimp_parallel_n_threads = 1; +static GimpParallelThread gimp_parallel_threads[GIMP_PARALLEL_MAX_THREADS]; + +static GMutex gimp_parallel_completion_mutex; +static GCond gimp_parallel_completion_cond; +static volatile gint gimp_parallel_completion_counter; +static volatile gint gimp_parallel_busy; + + +/* public functions */ + + +void +gimp_parallel_init (Gimp *gimp) +{ + GimpGeglConfig *config; + + g_return_if_fail (GIMP_IS_GIMP (gimp)); + + config = GIMP_GEGL_CONFIG (gimp->config); + + g_signal_connect (config, "notify::num-processors", + G_CALLBACK (gimp_parallel_notify_num_processors), + NULL); + + gimp_parallel_notify_num_processors (config); +} + +void +gimp_parallel_exit (Gimp *gimp) +{ + g_return_if_fail (GIMP_IS_GIMP (gimp)); + + g_signal_handlers_disconnect_by_func (gimp->config, + (gpointer) gimp_parallel_notify_num_processors, + NULL); + + /* stop all threads */ + gimp_parallel_set_n_threads (1); +} + +void +gimp_parallel_distribute (gint max_n, + GimpParallelDistributeFunc func, + gpointer user_data) +{ + GimpParallelTask task; + gint i; + + g_return_if_fail (func != NULL); + + if (max_n == 0) + return; + + if (max_n < 0) + max_n = gimp_parallel_n_threads; + else + max_n = MIN (max_n, gimp_parallel_n_threads); + + if (max_n == 1 || + ! g_atomic_int_compare_and_exchange (&gimp_parallel_busy, 0, 1)) + { + func (0, 1, user_data); + + return; + } + + task.n = max_n; + task.func = func; + task.user_data = user_data; + + g_atomic_int_set (&gimp_parallel_completion_counter, task.n - 1); + + for (i = 0; i < task.n - 1; i++) + { + GimpParallelThread *thread = &gimp_parallel_threads[i]; + + g_mutex_lock (&thread->mutex); + + thread->task = &task; + thread->i = i; + + g_cond_signal (&thread->cond); + + g_mutex_unlock (&thread->mutex); + } + + func (i, task.n, user_data); + + if (g_atomic_int_get (&gimp_parallel_completion_counter)) + { + g_mutex_lock (&gimp_parallel_completion_mutex); + + while (g_atomic_int_get (&gimp_parallel_completion_counter)) + { + g_cond_wait (&gimp_parallel_completion_cond, + &gimp_parallel_completion_mutex); + } + + g_mutex_unlock (&gimp_parallel_completion_mutex); + } + + g_atomic_int_set (&gimp_parallel_busy, 0); +} + +void +gimp_parallel_distribute_range (gsize size, + gsize min_sub_size, + GimpParallelDistributeRangeFunc func, + gpointer user_data) +{ + gsize n = size; + + g_return_if_fail (func != NULL); + + if (size == 0) + return; + + if (min_sub_size > 1) + n /= min_sub_size; + + n = CLAMP (n, 1, gimp_parallel_n_threads); + + gimp_parallel_distribute (n, [=] (gint i, gint n) + { + gsize offset; + gsize sub_size; + + offset = (2 * i * size + n) / (2 * n); + sub_size = (2 * (i + 1) * size + n) / (2 * n) - offset; + + func (offset, sub_size, user_data); + }); +} + +void +gimp_parallel_distribute_area (const GeglRectangle *area, + gsize min_sub_area, + GimpParallelDistributeAreaFunc func, + gpointer user_data) +{ + gsize n; + + g_return_if_fail (area != NULL); + g_return_if_fail (func != NULL); + + if (area->width <= 0 || area->height <= 0) + return; + + n = (gsize) area->width * (gsize) area->height; + + if (min_sub_area > 1) + n /= min_sub_area; + + n = CLAMP (n, 1, gimp_parallel_n_threads); + + gimp_parallel_distribute (n, [=] (gint i, gint n) + { + GeglRectangle sub_area; + + if (area->width <= area->height) + { + sub_area.x = area->x; + sub_area.width = area->width; + + sub_area.y = (2 * i * area->height + n) / (2 * n); + sub_area.height = (2 * (i + 1) * area->height + n) / (2 * n); + + sub_area.height -= sub_area.y; + sub_area.y += area->y; + } + else + { + sub_area.y = area->y; + sub_area.height = area->height; + + sub_area.x = (2 * i * area->width + n) / (2 * n); + sub_area.width = (2 * (i + 1) * area->width + n) / (2 * n); + + sub_area.width -= sub_area.x; + sub_area.x += area->x; + } + + func (&sub_area, user_data); + }); +} + + +/* private functions */ + + +static void +gimp_parallel_notify_num_processors (GimpGeglConfig *config) +{ + gimp_parallel_set_n_threads (config->num_processors); +} + +static void +gimp_parallel_set_n_threads (gint n_threads) +{ + gint i; + + if (! g_atomic_int_compare_and_exchange (&gimp_parallel_busy, 0, 1)) + g_return_if_reached (); + + n_threads = CLAMP (n_threads, 1, GIMP_PARALLEL_MAX_THREADS + 1); + + if (n_threads > gimp_parallel_n_threads) /* need more threads */ + { + for (i = gimp_parallel_n_threads - 1; i < n_threads - 1; i++) + { + GimpParallelThread *thread = &gimp_parallel_threads[i]; + + thread->quit = FALSE; + thread->task = NULL; + + thread->thread = g_thread_new ("worker", + (GThreadFunc) gimp_parallel_thread_func, + thread); + } + } + else if (n_threads < gimp_parallel_n_threads) /* need less threads */ + { + for (i = n_threads - 1; i < gimp_parallel_n_threads - 1; i++) + { + GimpParallelThread *thread = &gimp_parallel_threads[i]; + + g_mutex_lock (&thread->mutex); + + thread->quit = TRUE; + g_cond_signal (&thread->cond); + + g_mutex_unlock (&thread->mutex); + } + + for (i = n_threads - 1; i < gimp_parallel_n_threads - 1; i++) + { + GimpParallelThread *thread = &gimp_parallel_threads[i]; + + g_thread_join (thread->thread); + } + } + + gimp_parallel_n_threads = n_threads; + + g_atomic_int_set (&gimp_parallel_busy, 0); +} + +static gpointer +gimp_parallel_thread_func (GimpParallelThread *thread) +{ + g_mutex_lock (&thread->mutex); + + while (TRUE) + { + g_cond_wait (&thread->cond, &thread->mutex); + + if (thread->quit) + { + break; + } + else if (thread->task) + { + thread->task->func (thread->i, thread->task->n, + thread->task->user_data); + + if (g_atomic_int_dec_and_test (&gimp_parallel_completion_counter)) + { + g_mutex_lock (&gimp_parallel_completion_mutex); + + g_cond_signal (&gimp_parallel_completion_cond); + + g_mutex_unlock (&gimp_parallel_completion_mutex); + } + + thread->task = NULL; + } + } + + g_mutex_unlock (&thread->mutex); + + return NULL; +} + +} /* extern "C" */ diff --git a/app/core/gimp-parallel.h b/app/core/gimp-parallel.h new file mode 100644 index 0000000000..3c93526e14 --- /dev/null +++ b/app/core/gimp-parallel.h @@ -0,0 +1,112 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * gimp-parallel.h + * Copyright (C) 2018 Ell + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __GIMP_PARALLEL_H__ +#define __GIMP_PARALLEL_H__ + + +typedef void (* GimpParallelDistributeFunc) (gint i, + gint n, + gpointer user_data); +typedef void (* GimpParallelDistributeRangeFunc) (gsize offset, + gsize size, + gpointer user_data); +typedef void (* GimpParallelDistributeAreaFunc) (const GeglRectangle *area, + gpointer user_data); + + +void gimp_parallel_init (Gimp *gimp); +void gimp_parallel_exit (Gimp *gimp); + +void gimp_parallel_distribute (gint max_n, + GimpParallelDistributeFunc func, + gpointer user_data); +void gimp_parallel_distribute_range (gsize size, + gsize min_sub_size, + GimpParallelDistributeRangeFunc func, + gpointer user_data); +void gimp_parallel_distribute_area (const GeglRectangle *area, + gsize min_sub_area, + GimpParallelDistributeAreaFunc func, + gpointer user_data); + +#ifdef __cplusplus + +extern "C++" +{ + +template +inline void +gimp_parallel_distribute (gint max_n, + ParallelDistributeFunc func) +{ + gimp_parallel_distribute (max_n, + [] (gint i, + gint n, + gpointer user_data) + { + ParallelDistributeFunc func_copy ( + *(const ParallelDistributeFunc *) user_data); + + func_copy (i, n); + }, &func); +} + +template +inline void +gimp_parallel_distribute_range (gsize size, + gsize min_sub_size, + ParallelDistributeRangeFunc func) +{ + gimp_parallel_distribute_range (size, min_sub_size, + [] (gsize offset, + gsize size, + gpointer user_data) + { + ParallelDistributeRangeFunc func_copy ( + *(const ParallelDistributeRangeFunc *) user_data); + + func_copy (offset, size); + }, &func); +} + +template +inline void +gimp_parallel_distribute_area (const GeglRectangle *area, + gsize min_sub_area, + ParallelDistributeAreaFunc func) +{ + gimp_parallel_distribute_area (area, min_sub_area, + [] (const GeglRectangle *area, + gpointer user_data) + { + ParallelDistributeAreaFunc func_copy ( + *(const ParallelDistributeAreaFunc *) user_data); + + func_copy (area); + }, &func); +} + +} + +#endif /* __cplusplus */ + + +#endif /* __GIMP_PARALLEL_H__ */ diff --git a/app/core/gimp-templates.c b/app/core/gimp-templates.c index a3c9393ed0..da5536490e 100644 --- a/app/core/gimp-templates.c +++ b/app/core/gimp-templates.c @@ -140,7 +140,7 @@ gimp_templates_migrate_get_child_by_name (GimpContainer *container, if (dpi) { - strncpy (dpi, "ppi", 3); + memcpy (dpi, "ppi", 3); g_print ("replaced: %s\n", str1); diff --git a/app/core/gimp-user-install.c b/app/core/gimp-user-install.c index 0d90875ca6..f5077c8ecd 100644 --- a/app/core/gimp-user-install.c +++ b/app/core/gimp-user-install.c @@ -492,7 +492,8 @@ user_install_mkdir_with_parents (GimpUserInstall *install, "\"/layers/layers-text-tool\"" "|" \ "\"/plug-in/plug-in-gauss\"" "|" \ "\"/tools/tools-value-[1-4]-.*\"" "|" \ - "\"/vectors/vectors-path-tool\"" + "\"/vectors/vectors-path-tool\"" "|" \ + "\"/tools/tools-blend\"" /** * callback to use for updating a menurc from GIMP over 2.0. @@ -566,6 +567,10 @@ user_update_menurc_over20 (const GMatchInfo *matched_value, { g_string_append (new_value, "\"/vectors/vectors-edit\""); } + else if (g_strcmp0 (match, "\"/tools/tools-blend\"") == 0) + { + g_string_append (new_value, "\"/tools/tools-gradient\""); + } /* Should not happen. Just in case we match something unexpected by * mistake. */ @@ -646,6 +651,72 @@ user_update_gimpressionist (const GMatchInfo *matched_value, return FALSE; } +#define TOOL_PRESETS_UPDATE_PATTERN \ + "GimpImageMapOptions" "|" \ + "GimpBlendOptions" "|" \ + "gimp-blend-tool" "|" \ + "gimp-tool-blend" + +static gboolean +user_update_tool_presets (const GMatchInfo *matched_value, + GString *new_value, + gpointer data) +{ + gchar *match = g_match_info_fetch (matched_value, 0); + + if (g_strcmp0 (match, "GimpImageMapOptions") == 0) + { + g_string_append (new_value, "GimpFilterOptions"); + } + else if (g_strcmp0 (match, "GimpBlendOptions") == 0) + { + g_string_append (new_value, "GimpGradientOptions"); + } + else if (g_strcmp0 (match, "gimp-blend-tool") == 0) + { + g_string_append (new_value, "gimp-gradient-tool"); + } + else if (g_strcmp0 (match, "gimp-tool-blend") == 0) + { + g_string_append (new_value, "gimp-tool-gradient"); + } + else + { + g_message ("(WARNING) %s: invalid match \"%s\"", G_STRFUNC, match); + g_string_append (new_value, match); + } + + g_free (match); + return FALSE; +} + +/* Actually not only for contextrc, but all other files where + * gimp-blend-tool may appear. Apparently that is also "devicerc", as + * well as "toolrc" (but this one is skipped anyway). + */ +#define CONTEXTRC_UPDATE_PATTERN "gimp-blend-tool" + +static gboolean +user_update_contextrc_over20 (const GMatchInfo *matched_value, + GString *new_value, + gpointer data) +{ + gchar *match = g_match_info_fetch (matched_value, 0); + + if (g_strcmp0 (match, "gimp-blend-tool") == 0) + { + g_string_append (new_value, "gimp-gradient-tool"); + } + else + { + g_message ("(WARNING) %s: invalid match \"%s\"", G_STRFUNC, match); + g_string_append (new_value, match); + } + + g_free (match); + return FALSE; +} + static gboolean user_install_dir_copy (GimpUserInstall *install, gint level, @@ -844,6 +915,12 @@ user_install_migrate_files (GimpUserInstall *install) update_pattern = GIMPRC_UPDATE_PATTERN; update_callback = user_update_gimprc; } + else if (strcmp (basename, "contextrc") == 0 || + strcmp (basename, "devicerc") == 0) + { + update_pattern = CONTEXTRC_UPDATE_PATTERN; + update_callback = user_update_contextrc_over20; + } g_snprintf (dest, sizeof (dest), "%s%c%s", gimp_directory (), G_DIR_SEPARATOR, basename); @@ -869,6 +946,11 @@ user_install_migrate_files (GimpUserInstall *install) update_pattern = GIMPRESSIONIST_UPDATE_PATTERN; update_callback = user_update_gimpressionist; } + else if (strcmp (basename, "tool-presets") == 0) + { + update_pattern = TOOL_PRESETS_UPDATE_PATTERN; + update_callback = user_update_tool_presets; + } user_install_dir_copy (install, 0, source, gimp_directory (), update_pattern, update_callback); } diff --git a/app/core/gimp.c b/app/core/gimp.c index ef3c9333dc..8acf88a898 100644 --- a/app/core/gimp.c +++ b/app/core/gimp.c @@ -576,6 +576,7 @@ gimp_new (const gchar *name, gboolean use_cpu_accel, gboolean console_messages, gboolean show_playground, + gboolean show_debug_menu, GimpStackTraceMode stack_trace_mode, GimpPDBCompatMode pdb_compat_mode) { @@ -599,6 +600,7 @@ gimp_new (const gchar *name, gimp->use_cpu_accel = use_cpu_accel ? TRUE : FALSE; gimp->console_messages = console_messages ? TRUE : FALSE; gimp->show_playground = show_playground ? TRUE : FALSE; + gimp->show_debug_menu = show_debug_menu ? TRUE : FALSE; gimp->stack_trace_mode = stack_trace_mode; gimp->pdb_compat_mode = pdb_compat_mode; diff --git a/app/core/gimp.h b/app/core/gimp.h index 289be8e064..ad5d6e464c 100644 --- a/app/core/gimp.h +++ b/app/core/gimp.h @@ -53,6 +53,7 @@ struct _Gimp GimpMessageHandlerType message_handler; gboolean console_messages; gboolean show_playground; + gboolean show_debug_menu; GimpStackTraceMode stack_trace_mode; GimpPDBCompatMode pdb_compat_mode; @@ -161,6 +162,7 @@ Gimp * gimp_new (const gchar *name, gboolean use_cpu_accel, gboolean console_messages, gboolean show_playground, + gboolean show_debug_menu, GimpStackTraceMode stack_trace_mode, GimpPDBCompatMode pdb_compat_mode); void gimp_set_show_gui (Gimp *gimp, diff --git a/app/core/gimpboundary.c b/app/core/gimpboundary.c index 51becefe29..4f063b7e50 100644 --- a/app/core/gimpboundary.c +++ b/app/core/gimpboundary.c @@ -146,7 +146,7 @@ static void simplify_subdivide (const GimpBoundSeg *segs, * outlines along pixel value @threahold, optionally within specified * bounds instead of the whole region. * - * The @maskPR paramater can be any PixelRegion. If the region has + * The @maskPR parameter can be any PixelRegion. If the region has * more than 1 bytes/pixel, the last byte of each pixel is used to * determine the boundary outline. * @@ -394,7 +394,7 @@ gimp_boundary_offset (GimpBoundSeg *segs, for (i = 0; i < num_segs; i++) { - /* dont offset sorting sentinels */ + /* don't offset sorting sentinels */ if (!(segs[i].x1 == -1 && segs[i].y1 == -1 && segs[i].x2 == -1 && diff --git a/app/core/gimpboundary.h b/app/core/gimpboundary.h index c2adc0aeda..29049ad932 100644 --- a/app/core/gimpboundary.h +++ b/app/core/gimpboundary.h @@ -20,8 +20,7 @@ /* half intensity for mask */ -#define GIMP_BOUNDARY_HALF_WAY_PERCEPTUAL 0.5 -#define GIMP_BOUNDARY_HALF_WAY_LINEAR 0.214041 +#define GIMP_BOUNDARY_HALF_WAY 0.5 typedef enum diff --git a/app/core/gimpbrush-transform.c b/app/core/gimpbrush-transform.cc similarity index 54% rename from app/core/gimpbrush-transform.c rename to app/core/gimpbrush-transform.cc index e1e9fd4f04..fc83488882 100644 --- a/app/core/gimpbrush-transform.c +++ b/app/core/gimpbrush-transform.cc @@ -24,17 +24,25 @@ #include #include +extern "C" +{ + #include "libgimpmath/gimpmath.h" #include "core-types.h" #include "gegl/gimp-gegl-loops.h" +#include "gimp-parallel.h" #include "gimpbrush.h" #include "gimpbrush-transform.h" #include "gimptempbuf.h" +#define MIN_PARALLEL_SUB_SIZE 64 +#define MIN_PARALLEL_SUB_AREA (MIN_PARALLEL_SUB_SIZE * MIN_PARALLEL_SUB_SIZE) + + /* local function prototypes */ static void gimp_brush_transform_bounding_box (GimpBrush *brush, @@ -112,7 +120,6 @@ gimp_brush_real_transform_mask (GimpBrush *brush, { GimpTempBuf *result; GimpTempBuf *source; - guchar *dest; const guchar *src; GimpMatrix3 matrix; gint src_width; @@ -123,8 +130,8 @@ gimp_brush_real_transform_mask (GimpBrush *brush, gint dest_height; gint blur_radius; gint x, y; - gdouble blx, brx, tlx, trx; - gdouble bly, bry, tly, try; + gdouble b_lx, b_rx, t_lx, t_rx; + gdouble b_ly, b_ry, t_ly, t_ry; gdouble src_tl_to_tr_delta_x; gdouble src_tl_to_tr_delta_y; gdouble src_tl_to_bl_delta_x; @@ -133,18 +140,6 @@ gimp_brush_real_transform_mask (GimpBrush *brush, gint src_walk_uy_i; gint src_walk_vx_i; gint src_walk_vy_i; - gint src_space_cur_pos_x; - gint src_space_cur_pos_y; - gint src_space_cur_pos_x_i; - gint src_space_cur_pos_y_i; - gint src_space_row_start_x_i; - gint src_space_row_start_y_i; - const guchar *src_walker; - const guchar *pixel_next; - const guchar *pixel_below; - const guchar *pixel_below_next; - gint opposite_x, distance_from_true_x; - gint opposite_y, distance_from_true_y; /* * tl, tr etc are used because it is easier to visualize top left, @@ -226,8 +221,7 @@ gimp_brush_real_transform_mask (GimpBrush *brush, result = gimp_temp_buf_new (dest_width, dest_height, gimp_temp_buf_get_format (source)); - dest = gimp_temp_buf_get_data (result); - src = gimp_temp_buf_get_data (source); + src = gimp_temp_buf_get_data (source); /* prevent disappearance of 1x1 pixel brush at some rotations when scaling < 1 */ @@ -238,23 +232,23 @@ gimp_brush_real_transform_mask (GimpBrush *brush, return result; }*/ - gimp_matrix3_transform_point (&matrix, 0, 0, &tlx, &tly); - gimp_matrix3_transform_point (&matrix, dest_width, 0, &trx, &try); - gimp_matrix3_transform_point (&matrix, 0, dest_height, &blx, &bly); - gimp_matrix3_transform_point (&matrix, dest_width, dest_height, &brx, &bry); + gimp_matrix3_transform_point (&matrix, 0, 0, &t_lx, &t_ly); + gimp_matrix3_transform_point (&matrix, dest_width, 0, &t_rx, &t_ry); + gimp_matrix3_transform_point (&matrix, 0, dest_height, &b_lx, &b_ly); + gimp_matrix3_transform_point (&matrix, dest_width, dest_height, &b_rx, &b_ry); /* in image space, calc U (what was horizontal originally) * note: double precision */ - src_tl_to_tr_delta_x = trx - tlx; - src_tl_to_tr_delta_y = try - tly; + src_tl_to_tr_delta_x = t_rx - t_lx; + src_tl_to_tr_delta_y = t_ry - t_ly; /* in image space, calc V (what was vertical originally) * note: double precision */ - src_tl_to_bl_delta_x = blx - tlx; - src_tl_to_bl_delta_y = bly - tly; + src_tl_to_bl_delta_x = b_lx - t_lx; + src_tl_to_bl_delta_y = b_ly - t_ly; /* speed optimized, note conversion to int precision */ src_walk_ux_i = (gint) ((src_tl_to_tr_delta_x / dest_width) * int_multiple); @@ -262,103 +256,124 @@ gimp_brush_real_transform_mask (GimpBrush *brush, src_walk_vx_i = (gint) ((src_tl_to_bl_delta_x / dest_height) * int_multiple); src_walk_vy_i = (gint) ((src_tl_to_bl_delta_y / dest_height) * int_multiple); - /* initialize current position in source space to the start position (tl) - * speed optimized, note conversion to int precision - */ - src_space_cur_pos_x_i = (gint) (tlx* int_multiple); - src_space_cur_pos_y_i = (gint) (tly* int_multiple); - src_space_cur_pos_x = (gint) (src_space_cur_pos_x_i >> fraction_bits); - src_space_cur_pos_y = (gint) (src_space_cur_pos_y_i >> fraction_bits); - src_space_row_start_x_i = (gint) (tlx* int_multiple); - src_space_row_start_y_i = (gint) (tly* int_multiple); - - - for (y = 0; y < dest_height; y++) + gimp_parallel_distribute_area (GEGL_RECTANGLE (0, 0, dest_width, dest_height), + MIN_PARALLEL_SUB_AREA, + [=] (const GeglRectangle *area) { - for (x = 0; x < dest_width; x++) + guchar *dest; + gint src_space_cur_pos_x; + gint src_space_cur_pos_y; + gint src_space_cur_pos_x_i; + gint src_space_cur_pos_y_i; + gint src_space_row_start_x_i; + gint src_space_row_start_y_i; + const guchar *src_walker; + const guchar *pixel_next; + const guchar *pixel_below; + const guchar *pixel_below_next; + gint opposite_x, distance_from_true_x; + gint opposite_y, distance_from_true_y; + gint u, v; + + dest = gimp_temp_buf_get_data (result) + + dest_width * area->y + area->x; + + /* initialize current position in source space to the start position (tl) + * speed optimized, note conversion to int precision + */ + src_space_row_start_x_i = (gint) (t_lx * int_multiple) + + src_walk_vx_i * area->y + + src_walk_ux_i * area->x; + src_space_row_start_y_i = (gint) (t_ly * int_multiple) + + src_walk_vy_i * area->y + + src_walk_uy_i * area->x; + + for (v = 0; v < area->height; v++) { - if (src_space_cur_pos_x > src_width_minus_one || - src_space_cur_pos_x < 0 || - src_space_cur_pos_y > src_height_minus_one || - src_space_cur_pos_y < 0) - /* no corresponding pixel in source space */ + src_space_cur_pos_x_i = src_space_row_start_x_i; + src_space_cur_pos_y_i = src_space_row_start_y_i; + + for (u = 0; u < area->width; u++) { - *dest = 0; - } - else /* reverse transformed point hits source pixel */ - { - src_walker = src - + src_space_cur_pos_y * src_width - + src_space_cur_pos_x; + src_space_cur_pos_x = src_space_cur_pos_x_i >> fraction_bits; + src_space_cur_pos_y = src_space_cur_pos_y_i >> fraction_bits; - /* bottom right corner - * no pixel below, reuse current pixel instead - * no next pixel to the right so reuse current pixel instead - */ - if (src_space_cur_pos_y == src_height_minus_one && - src_space_cur_pos_x == src_width_minus_one ) + if (src_space_cur_pos_x > src_width_minus_one || + src_space_cur_pos_x < 0 || + src_space_cur_pos_y > src_height_minus_one || + src_space_cur_pos_y < 0) + /* no corresponding pixel in source space */ { - pixel_next = src_walker; - pixel_below = src_walker; - pixel_below_next = src_walker; + *dest = 0; + } + else /* reverse transformed point hits source pixel */ + { + src_walker = src + + src_space_cur_pos_y * src_width + + src_space_cur_pos_x; + + /* bottom right corner + * no pixel below, reuse current pixel instead + * no next pixel to the right so reuse current pixel instead + */ + if (src_space_cur_pos_y == src_height_minus_one && + src_space_cur_pos_x == src_width_minus_one ) + { + pixel_next = src_walker; + pixel_below = src_walker; + pixel_below_next = src_walker; + } + + /* bottom edge pixel row, except rightmost corner + * no pixel below, reuse current pixel instead */ + else if (src_space_cur_pos_y == src_height_minus_one) + { + pixel_next = src_walker + 1; + pixel_below = src_walker; + pixel_below_next = src_walker + 1; + } + + /* right edge pixel column, except bottom corner + * no next pixel to the right so reuse current pixel instead */ + else if (src_space_cur_pos_x == src_width_minus_one) + { + pixel_next = src_walker; + pixel_below = src_walker + src_width; + pixel_below_next = pixel_below; + } + + /* neither on bottom edge nor on right edge */ + else + { + pixel_next = src_walker + 1; + pixel_below = src_walker + src_width; + pixel_below_next = pixel_below + 1; + } + + distance_from_true_x = src_space_cur_pos_x_i & fraction_bitmask; + distance_from_true_y = src_space_cur_pos_y_i & fraction_bitmask; + opposite_x = int_multiple - distance_from_true_x; + opposite_y = int_multiple - distance_from_true_y; + + *dest = ((src_walker[0] * opposite_x + + pixel_next[0] * distance_from_true_x) * opposite_y + + (pixel_below[0] * opposite_x + + pixel_below_next[0] *distance_from_true_x) * distance_from_true_y + ) >> recovery_bits; } - /* bottom edge pixel row, except rightmost corner - * no pixel below, reuse current pixel instead */ - else if (src_space_cur_pos_y == src_height_minus_one) - { - pixel_next = src_walker + 1; - pixel_below = src_walker; - pixel_below_next = src_walker + 1; - } + src_space_cur_pos_x_i += src_walk_ux_i; + src_space_cur_pos_y_i += src_walk_uy_i; - /* right edge pixel column, except bottom corner - * no next pixel to the right so reuse current pixel instead */ - else if (src_space_cur_pos_x == src_width_minus_one) - { - pixel_next = src_walker; - pixel_below = src_walker + src_width; - pixel_below_next = pixel_below; - } + dest++; + } /* end for x */ - /* neither on bottom edge nor on right edge */ - else - { - pixel_next = src_walker + 1; - pixel_below = src_walker + src_width; - pixel_below_next = pixel_below + 1; - } + src_space_row_start_x_i += src_walk_vx_i; + src_space_row_start_y_i += src_walk_vy_i; - distance_from_true_x = src_space_cur_pos_x_i & fraction_bitmask; - distance_from_true_y = src_space_cur_pos_y_i & fraction_bitmask; - opposite_x = int_multiple - distance_from_true_x; - opposite_y = int_multiple - distance_from_true_y; - - *dest = ((src_walker[0] * opposite_x + - pixel_next[0] * distance_from_true_x) * opposite_y + - (pixel_below[0] * opposite_x + - pixel_below_next[0] *distance_from_true_x) * distance_from_true_y - ) >> recovery_bits; - } - - src_space_cur_pos_x_i+=src_walk_ux_i; - src_space_cur_pos_y_i+=src_walk_uy_i; - - src_space_cur_pos_x = src_space_cur_pos_x_i >> fraction_bits; - src_space_cur_pos_y = src_space_cur_pos_y_i >> fraction_bits; - - dest ++; - } /* end for x */ - - src_space_row_start_x_i +=src_walk_vx_i; - src_space_row_start_y_i +=src_walk_vy_i; - src_space_cur_pos_x_i = src_space_row_start_x_i; - src_space_cur_pos_y_i = src_space_row_start_y_i; - - src_space_cur_pos_x = src_space_cur_pos_x_i >> fraction_bits; - src_space_cur_pos_y = src_space_cur_pos_y_i >> fraction_bits; - - } /* end for y */ + dest += dest_width - area->width; + } /* end for y */ + }); gimp_brush_transform_blur (result, blur_radius); @@ -405,7 +420,6 @@ gimp_brush_real_transform_pixmap (GimpBrush *brush, { GimpTempBuf *result; GimpTempBuf *source; - guchar *dest; const guchar *src; GimpMatrix3 matrix; gint src_width; @@ -416,8 +430,8 @@ gimp_brush_real_transform_pixmap (GimpBrush *brush, gint dest_height; gint blur_radius; gint x, y; - gdouble blx, brx, tlx, trx; - gdouble bly, bry, tly, try; + gdouble b_lx, b_rx, t_lx, t_rx; + gdouble b_ly, b_ry, t_ly, t_ry; gdouble src_tl_to_tr_delta_x; gdouble src_tl_to_tr_delta_y; gdouble src_tl_to_bl_delta_x; @@ -426,18 +440,6 @@ gimp_brush_real_transform_pixmap (GimpBrush *brush, gint src_walk_uy_i; gint src_walk_vx_i; gint src_walk_vy_i; - gint src_space_cur_pos_x; - gint src_space_cur_pos_y; - gint src_space_cur_pos_x_i; - gint src_space_cur_pos_y_i; - gint src_space_row_start_x_i; - gint src_space_row_start_y_i; - const guchar *src_walker; - const guchar *pixel_next; - const guchar *pixel_below; - const guchar *pixel_below_next; - gint opposite_x, distance_from_true_x; - gint opposite_y, distance_from_true_y; /* * tl, tr etc are used because it is easier to visualize top left, @@ -445,7 +447,7 @@ gimp_brush_real_transform_pixmap (GimpBrush *brush, * rectangle. */ const gint fraction_bits = 12; - const gint int_multiple = pow(2,fraction_bits); + const gint int_multiple = pow (2, fraction_bits); /* In inner loop's bilinear calculation, two numbers that were each * previously multiplied by int_multiple are multiplied together. @@ -467,7 +469,7 @@ gimp_brush_real_transform_pixmap (GimpBrush *brush, * 2^9 = 0010 0000 0000 * 2^9 - 1 = 0001 1111 1111 */ - const guint fraction_bitmask = pow(2, fraction_bits)- 1 ; + const guint fraction_bitmask = pow(2, fraction_bits) - 1 ; source = gimp_brush_get_pixmap (brush); @@ -480,7 +482,6 @@ gimp_brush_real_transform_pixmap (GimpBrush *brush, if (gimp_matrix3_is_identity (&matrix) && hardness == 1.0) return gimp_temp_buf_copy (source); - src_width_minus_one = src_width - 1; src_height_minus_one = src_height - 1; @@ -520,144 +521,173 @@ gimp_brush_real_transform_pixmap (GimpBrush *brush, result = gimp_temp_buf_new (dest_width, dest_height, gimp_temp_buf_get_format (source)); - dest = gimp_temp_buf_get_data (result); - src = gimp_temp_buf_get_data (source); + src = gimp_temp_buf_get_data (source); - gimp_matrix3_transform_point (&matrix, 0, 0, &tlx, &tly); - gimp_matrix3_transform_point (&matrix, dest_width, 0, &trx, &try); - gimp_matrix3_transform_point (&matrix, 0, dest_height, &blx, &bly); - gimp_matrix3_transform_point (&matrix, dest_width, dest_height, &brx, &bry); + /* prevent disappearance of 1x1 pixel brush at some rotations when + scaling < 1 */ + /* + if (src_width == 1 && src_height == 1 && scale_x < 1 && scale_y < 1 ) + { + *dest = src[0]; + return result; + }*/ + + gimp_matrix3_transform_point (&matrix, 0, 0, &t_lx, &t_ly); + gimp_matrix3_transform_point (&matrix, dest_width, 0, &t_rx, &t_ry); + gimp_matrix3_transform_point (&matrix, 0, dest_height, &b_lx, &b_ly); + gimp_matrix3_transform_point (&matrix, dest_width, dest_height, &b_rx, &b_ry); /* in image space, calc U (what was horizontal originally) * note: double precision */ - src_tl_to_tr_delta_x = trx - tlx; - src_tl_to_tr_delta_y = try - tly; + src_tl_to_tr_delta_x = t_rx - t_lx; + src_tl_to_tr_delta_y = t_ry - t_ly; /* in image space, calc V (what was vertical originally) * note: double precision */ - src_tl_to_bl_delta_x = blx - tlx; - src_tl_to_bl_delta_y = bly - tly; + src_tl_to_bl_delta_x = b_lx - t_lx; + src_tl_to_bl_delta_y = b_ly - t_ly; /* speed optimized, note conversion to int precision */ - src_walk_ux_i = (gint) ((src_tl_to_tr_delta_x / dest_width)* int_multiple); - src_walk_uy_i = (gint) ((src_tl_to_tr_delta_y / dest_width)* int_multiple); - src_walk_vx_i = (gint) ((src_tl_to_bl_delta_x / dest_height)* int_multiple); - src_walk_vy_i = (gint) ((src_tl_to_bl_delta_y / dest_height)* int_multiple); + src_walk_ux_i = (gint) ((src_tl_to_tr_delta_x / dest_width) * int_multiple); + src_walk_uy_i = (gint) ((src_tl_to_tr_delta_y / dest_width) * int_multiple); + src_walk_vx_i = (gint) ((src_tl_to_bl_delta_x / dest_height) * int_multiple); + src_walk_vy_i = (gint) ((src_tl_to_bl_delta_y / dest_height) * int_multiple); - /* initialize current position in source space to the start position (tl) - * speed optimized, note conversion to int precision - */ - src_space_cur_pos_x_i = (gint) (tlx* int_multiple); - src_space_cur_pos_y_i = (gint) (tly* int_multiple); - src_space_cur_pos_x = (gint) (src_space_cur_pos_x_i >> fraction_bits); - src_space_cur_pos_y = (gint) (src_space_cur_pos_y_i >> fraction_bits); - src_space_row_start_x_i = (gint) (tlx* int_multiple); - src_space_row_start_y_i = (gint) (tly* int_multiple); - - - for (y = 0; y < dest_height; y++) + gimp_parallel_distribute_area (GEGL_RECTANGLE (0, 0, dest_width, dest_height), + MIN_PARALLEL_SUB_AREA, + [=] (const GeglRectangle *area) { - for (x = 0; x < dest_width; x++) + guchar *dest; + gint src_space_cur_pos_x; + gint src_space_cur_pos_y; + gint src_space_cur_pos_x_i; + gint src_space_cur_pos_y_i; + gint src_space_row_start_x_i; + gint src_space_row_start_y_i; + const guchar *src_walker; + const guchar *pixel_next; + const guchar *pixel_below; + const guchar *pixel_below_next; + gint opposite_x, distance_from_true_x; + gint opposite_y, distance_from_true_y; + gint u, v; + + dest = gimp_temp_buf_get_data (result) + + 3 * (dest_width * area->y + area->x); + + /* initialize current position in source space to the start position (tl) + * speed optimized, note conversion to int precision + */ + src_space_row_start_x_i = (gint) (t_lx * int_multiple) + + src_walk_vx_i * area->y + + src_walk_ux_i * area->x; + src_space_row_start_y_i = (gint) (t_ly * int_multiple) + + src_walk_vy_i * area->y + + src_walk_uy_i * area->x; + + for (v = 0; v < area->height; v++) { - if (src_space_cur_pos_x > src_width_minus_one || - src_space_cur_pos_x < 0 || - src_space_cur_pos_y > src_height_minus_one || - src_space_cur_pos_y < 0) - /* no corresponding pixel in source space */ + src_space_cur_pos_x_i = src_space_row_start_x_i; + src_space_cur_pos_y_i = src_space_row_start_y_i; + + for (u = 0; u < area->width; u++) { - dest[0] = 0; - dest[1] = 0; - dest[2] = 0; - } - else /* reverse transformed point hits source pixel */ - { - src_walker = src - + 3 * ( - src_space_cur_pos_y * src_width - + src_space_cur_pos_x); + src_space_cur_pos_x = src_space_cur_pos_x_i >> fraction_bits; + src_space_cur_pos_y = src_space_cur_pos_y_i >> fraction_bits; - /* bottom right corner - * no pixel below, reuse current pixel instead - * no next pixel to the right so reuse current pixel instead - */ - if (src_space_cur_pos_y == src_height_minus_one && - src_space_cur_pos_x == src_width_minus_one ) + if (src_space_cur_pos_x > src_width_minus_one || + src_space_cur_pos_x < 0 || + src_space_cur_pos_y > src_height_minus_one || + src_space_cur_pos_y < 0) + /* no corresponding pixel in source space */ { - pixel_next = src_walker; - pixel_below = src_walker; - pixel_below_next = src_walker; + dest[0] = 0; + dest[1] = 0; + dest[2] = 0; + } + else /* reverse transformed point hits source pixel */ + { + src_walker = src + + 3 * (src_space_cur_pos_y * src_width + + src_space_cur_pos_x); + + /* bottom right corner + * no pixel below, reuse current pixel instead + * no next pixel to the right so reuse current pixel instead + */ + if (src_space_cur_pos_y == src_height_minus_one && + src_space_cur_pos_x == src_width_minus_one ) + { + pixel_next = src_walker; + pixel_below = src_walker; + pixel_below_next = src_walker; + } + + /* bottom edge pixel row, except rightmost corner + * no pixel below, reuse current pixel instead */ + else if (src_space_cur_pos_y == src_height_minus_one) + { + pixel_next = src_walker + 3; + pixel_below = src_walker; + pixel_below_next = src_walker + 3; + } + + /* right edge pixel column, except bottom corner + * no next pixel to the right so reuse current pixel instead */ + else if (src_space_cur_pos_x == src_width_minus_one) + { + pixel_next = src_walker; + pixel_below = src_walker + src_width * 3; + pixel_below_next = pixel_below; + } + + /* neither on bottom edge nor on right edge */ + else + { + pixel_next = src_walker + 3; + pixel_below = src_walker + src_width * 3; + pixel_below_next = pixel_below + 3; + } + + distance_from_true_x = src_space_cur_pos_x_i & fraction_bitmask; + distance_from_true_y = src_space_cur_pos_y_i & fraction_bitmask; + opposite_x = int_multiple - distance_from_true_x; + opposite_y = int_multiple - distance_from_true_y; + + dest[0] = ((src_walker[0] * opposite_x + + pixel_next[0] * distance_from_true_x) * opposite_y + + (pixel_below[0] * opposite_x + + pixel_below_next[0] *distance_from_true_x) * distance_from_true_y + ) >> recovery_bits; + + dest[1] = ((src_walker[1] * opposite_x + + pixel_next[1] * distance_from_true_x) * opposite_y + + (pixel_below[1] * opposite_x + + pixel_below_next[1] *distance_from_true_x) * distance_from_true_y + ) >> recovery_bits; + + dest[2] = ((src_walker[2] * opposite_x + + pixel_next[2] * distance_from_true_x) * opposite_y + + (pixel_below[2] * opposite_x + + pixel_below_next[2] *distance_from_true_x) * distance_from_true_y + ) >> recovery_bits; } - /* bottom edge pixel row, except rightmost corner - * no pixel below, reuse current pixel instead */ - else if (src_space_cur_pos_y == src_height_minus_one) - { - pixel_next = src_walker + 3; - pixel_below = src_walker; - pixel_below_next = src_walker + 3; - } + src_space_cur_pos_x_i += src_walk_ux_i; + src_space_cur_pos_y_i += src_walk_uy_i; - /* right edge pixel column, except bottom corner - * no next pixel to the right so reuse current pixel instead */ - else if (src_space_cur_pos_x == src_width_minus_one) - { - pixel_next = src_walker; - pixel_below = src_walker + src_width * 3; - pixel_below_next = pixel_below; - } + dest += 3; + } /* end for x */ - /* neither on bottom edge nor on right edge */ - else - { - pixel_next = src_walker + 3; - pixel_below = src_walker + src_width * 3; - pixel_below_next = pixel_below + 3; - } + src_space_row_start_x_i += src_walk_vx_i; + src_space_row_start_y_i += src_walk_vy_i; - distance_from_true_x = src_space_cur_pos_x_i & fraction_bitmask; - distance_from_true_y = src_space_cur_pos_y_i & fraction_bitmask; - opposite_x = int_multiple - distance_from_true_x; - opposite_y = int_multiple - distance_from_true_y; - - dest[0] = ((src_walker[0] * opposite_x + - pixel_next[0] * distance_from_true_x) * opposite_y + - (pixel_below[0] * opposite_x + - pixel_below_next[0] *distance_from_true_x) * distance_from_true_y - ) >> recovery_bits; - - dest[1] = ((src_walker[1] * opposite_x + - pixel_next[1] * distance_from_true_x) * opposite_y + - (pixel_below[1] * opposite_x + - pixel_below_next[1] *distance_from_true_x) * distance_from_true_y - ) >> recovery_bits; - - dest[2] = ((src_walker[2] * opposite_x + - pixel_next[2] * distance_from_true_x) * opposite_y + - (pixel_below[2] * opposite_x + - pixel_below_next[2] *distance_from_true_x) * distance_from_true_y - ) >> recovery_bits; - } - - src_space_cur_pos_x_i += src_walk_ux_i; - src_space_cur_pos_y_i += src_walk_uy_i; - - src_space_cur_pos_x = src_space_cur_pos_x_i >> fraction_bits; - src_space_cur_pos_y = src_space_cur_pos_y_i >> fraction_bits; - - dest += 3; - } /* end for x */ - - src_space_row_start_x_i +=src_walk_vx_i; - src_space_row_start_y_i +=src_walk_vy_i; - src_space_cur_pos_x_i = src_space_row_start_x_i; - src_space_cur_pos_y_i = src_space_row_start_y_i; - - src_space_cur_pos_x = src_space_cur_pos_x_i >> fraction_bits; - src_space_cur_pos_y = src_space_cur_pos_y_i >> fraction_bits; - } /* end for y */ + dest += 3 * (dest_width - area->width); + } /* end for y */ + }); gimp_brush_transform_blur (result, blur_radius); @@ -771,157 +801,177 @@ gimp_brush_transform_blur (GimpTempBuf *buf, gfloat n_r = n * r; gfloat weight = floor (n * n / 2) * (floor (n * n / 2) + 1); gfloat weight_inv = 1 / weight; - gint x; - gint y; - gint c; Sums *sums; - guchar *d; - Sums *s; if (rw <= 0 || rh <= 0) return; sums = g_new (Sums, width * height * components); - d = data; - s = sums; - - for (y = 0; y < height; y++) + gimp_parallel_distribute_range (height, MIN_PARALLEL_SUB_SIZE, + [=] (gint y0, gint height) { - const guchar *p; + gint x; + gint y; + gint c; + const guchar *d; + Sums *s; - struct - { - gint sum; - gint weighted_sum; - gint leading_sum; - gint leading_weighted_sum; - } acc[components]; - - memset (acc, 0, sizeof (acc)); - - p = d; - - for (x = 0; x <= rw; x++) - { - for (c = 0; c < components; c++) - { - acc[c].sum += *p; - acc[c].weighted_sum += -x * *p; - - p++; - } - } - - for (x = 0; x < width; x++) - { - for (c = 0; c < components; c++) - { - if (x > 0) - { - acc[c].weighted_sum += acc[c].sum; - acc[c].leading_weighted_sum += acc[c].leading_sum; - - if (x < width - r) - { - acc[c].sum += d[components_r]; - acc[c].weighted_sum += -r * d[components_r]; - } - } - - acc[c].leading_sum += d[0]; - - s->sum = acc[c].sum; - s->weighted_sum = acc[c].weighted_sum; - s->middle_sum = 2 * acc[c].leading_weighted_sum - - acc[c].weighted_sum; - - if (x >= r) - { - acc[c].sum -= d[-components_r]; - acc[c].weighted_sum -= r * d[-components_r]; - acc[c].leading_sum -= d[-components_r]; - acc[c].leading_weighted_sum -= r * d[-components_r]; - } - - d++; - s++; - } - } - } - - for (x = 0; x < width; x++) - { - const Sums *p; - gfloat n_y; - - struct - { - gfloat weighted_sum; - gint leading_sum; - gint trailing_sum; - } acc[components]; - - memset (acc, 0, sizeof (acc)); - - d = data + components * x; - s = sums + components * x; - - p = s + stride; - - for (y = 1, n_y = n; y <= rh; y++, n_y += n) - { - for (c = 0; c < components; c++) - { - acc[c].weighted_sum += n_y * p->sum - p->weighted_sum; - acc[c].trailing_sum += p->sum; - - p++; - } - - p += stride - components; - } + d = data + y0 * stride; + s = sums + y0 * stride; for (y = 0; y < height; y++) { - for (c = 0; c < components; c++) + const guchar *p; + + struct + { + gint sum; + gint weighted_sum; + gint leading_sum; + gint leading_weighted_sum; + } acc[components]; + + memset (acc, 0, sizeof (acc)); + + p = d; + + for (x = 0; x <= rw; x++) { - if (y > 0) + for (c = 0; c < components; c++) { - acc[c].weighted_sum += s->weighted_sum + - n * (acc[c].leading_sum - - acc[c].trailing_sum); - acc[c].trailing_sum -= s->sum; + acc[c].sum += *p; + acc[c].weighted_sum += -x * *p; - if (y < height - r) - { - acc[c].weighted_sum += n_r * s[stride_r].sum - - s[stride_r].weighted_sum; - acc[c].trailing_sum += s[stride_r].sum; - } + p++; } - - acc[c].leading_sum += s->sum; - - *d = (acc[c].weighted_sum + s->middle_sum) * weight_inv + 0.5f; - - acc[c].weighted_sum += s->weighted_sum; - - if (y >= r) - { - acc[c].weighted_sum -= n_r * s[-stride_r].sum + - s[-stride_r].weighted_sum; - acc[c].leading_sum -= s[-stride_r].sum; - } - - d++; - s++; } - d += stride - components; - s += stride - components; + for (x = 0; x < width; x++) + { + for (c = 0; c < components; c++) + { + if (x > 0) + { + acc[c].weighted_sum += acc[c].sum; + acc[c].leading_weighted_sum += acc[c].leading_sum; + + if (x < width - r) + { + acc[c].sum += d[components_r]; + acc[c].weighted_sum += -r * d[components_r]; + } + } + + acc[c].leading_sum += d[0]; + + s->sum = acc[c].sum; + s->weighted_sum = acc[c].weighted_sum; + s->middle_sum = 2 * acc[c].leading_weighted_sum - + acc[c].weighted_sum; + + if (x >= r) + { + acc[c].sum -= d[-components_r]; + acc[c].weighted_sum -= r * d[-components_r]; + acc[c].leading_sum -= d[-components_r]; + acc[c].leading_weighted_sum -= r * d[-components_r]; + } + + d++; + s++; + } + } } - } + }); + + gimp_parallel_distribute_range (width, MIN_PARALLEL_SUB_SIZE, + [=] (gint x0, gint width) + { + gint x; + gint y; + gint c; + guchar *d0; + const Sums *s0; + guchar *d; + const Sums *s; + + d0 = data + x0 * components; + s0 = sums + x0 * components; + + for (x = 0; x < width; x++) + { + const Sums *p; + gfloat n_y; + + struct + { + gfloat weighted_sum; + gint leading_sum; + gint trailing_sum; + } acc[components]; + + memset (acc, 0, sizeof (acc)); + + d = d0 + components * x; + s = s0 + components * x; + + p = s + stride; + + for (y = 1, n_y = n; y <= rh; y++, n_y += n) + { + for (c = 0; c < components; c++) + { + acc[c].weighted_sum += n_y * p->sum - p->weighted_sum; + acc[c].trailing_sum += p->sum; + + p++; + } + + p += stride - components; + } + + for (y = 0; y < height; y++) + { + for (c = 0; c < components; c++) + { + if (y > 0) + { + acc[c].weighted_sum += s->weighted_sum + + n * (acc[c].leading_sum - + acc[c].trailing_sum); + acc[c].trailing_sum -= s->sum; + + if (y < height - r) + { + acc[c].weighted_sum += n_r * s[stride_r].sum - + s[stride_r].weighted_sum; + acc[c].trailing_sum += s[stride_r].sum; + } + } + + acc[c].leading_sum += s->sum; + + *d = (acc[c].weighted_sum + s->middle_sum) * weight_inv + 0.5f; + + acc[c].weighted_sum += s->weighted_sum; + + if (y >= r) + { + acc[c].weighted_sum -= n_r * s[-stride_r].sum + + s[-stride_r].weighted_sum; + acc[c].leading_sum -= s[-stride_r].sum; + } + + d++; + s++; + } + + d += stride - components; + s += stride - components; + } + } + }); g_free (sums); } @@ -952,3 +1002,5 @@ gimp_brush_transform_adjust_hardness_matrix (gdouble width, (1.0 - scale) * width / 2.0, (1.0 - scale) * height / 2.0); } + +} /* extern "C" */ diff --git a/app/core/gimpbrush.c b/app/core/gimpbrush.c index c8de559979..12359c81be 100644 --- a/app/core/gimpbrush.c +++ b/app/core/gimpbrush.c @@ -631,7 +631,7 @@ gimp_brush_transform_mask (GimpBrush *brush, * This is intentional. Confoliving for each stamp is too expensive.*/ if (! brush->priv->blured_mask && ! GIMP_IS_BRUSH_GENERATED(brush) && - ! GIMP_IS_BRUSH_PIPE(brush) && /*Cant cache pipes. Sanely anway*/ + ! GIMP_IS_BRUSH_PIPE(brush) && /*Can't cache pipes. Sanely anyway*/ hardness < 1.0) { brush->priv->blured_mask = GIMP_BRUSH_GET_CLASS (brush)->transform_mask (brush, @@ -724,7 +724,7 @@ gimp_brush_transform_pixmap (GimpBrush *brush, #if 0 if (! brush->priv->blured_pixmap && ! GIMP_IS_BRUSH_GENERATED(brush) && - ! GIMP_IS_BRUSH_PIPE(brush) /*Cant cache pipes. Sanely anway*/ + ! GIMP_IS_BRUSH_PIPE(brush) /*Can't cache pipes. Sanely anyway*/ && hardness < 1.0) { brush->priv->blured_pixmap = GIMP_BRUSH_GET_CLASS (brush)->transform_pixmap (brush, diff --git a/app/core/gimpchannel.c b/app/core/gimpchannel.c index 956a80a40c..6934c96fe0 100644 --- a/app/core/gimpchannel.c +++ b/app/core/gimpchannel.c @@ -529,6 +529,38 @@ gimp_channel_duplicate (GimpItem *item, new_channel->y1 = channel->y1; new_channel->x2 = channel->x2; new_channel->y2 = channel->y2; + + if (new_type == GIMP_TYPE_CHANNEL) + { + /* 8-bit channel hack: make sure pixels between all sorts + * of channels of an image is always copied without any + * gamma conversion + */ + GimpDrawable *new_drawable = GIMP_DRAWABLE (new_item); + GimpImage *image = gimp_item_get_image (item); + const Babl *format = gimp_image_get_channel_format (image); + + if (format != gimp_drawable_get_format (new_drawable)) + { + GeglBuffer *new_buffer; + + new_buffer = + gegl_buffer_new (GEGL_RECTANGLE (0, 0, + gimp_item_get_width (new_item), + gimp_item_get_height (new_item)), + format); + + gegl_buffer_set_format (new_buffer, + gimp_drawable_get_format (new_drawable)); + gegl_buffer_copy (gimp_drawable_get_buffer (new_drawable), NULL, + GEGL_ABYSS_NONE, + new_buffer, NULL); + gegl_buffer_set_format (new_buffer, NULL); + + gimp_drawable_set_buffer (new_drawable, FALSE, NULL, new_buffer); + g_object_unref (new_buffer); + } + } } return new_item; @@ -1088,7 +1120,7 @@ gimp_channel_real_boundary (GimpChannel *channel, babl_format ("Y float"), GIMP_BOUNDARY_IGNORE_BOUNDS, x1, y1, x2, y2, - GIMP_BOUNDARY_HALF_WAY_LINEAR, + GIMP_BOUNDARY_HALF_WAY, &channel->num_segs_out); x1 = MAX (x1, x3); y1 = MAX (y1, y3); @@ -1101,7 +1133,7 @@ gimp_channel_real_boundary (GimpChannel *channel, babl_format ("Y float"), GIMP_BOUNDARY_WITHIN_BOUNDS, x1, y1, x2, y2, - GIMP_BOUNDARY_HALF_WAY_LINEAR, + GIMP_BOUNDARY_HALF_WAY, &channel->num_segs_in); } else @@ -1559,16 +1591,16 @@ gimp_channel_new (GimpImage *image, } GimpChannel * -gimp_channel_new_from_buffer (GeglBuffer *buffer, - GimpImage *image, +gimp_channel_new_from_buffer (GimpImage *image, + GeglBuffer *buffer, const gchar *name, const GimpRGB *color) { GimpChannel *channel; GeglBuffer *dest; - g_return_val_if_fail (GEGL_IS_BUFFER (buffer), NULL); g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL); + g_return_val_if_fail (GEGL_IS_BUFFER (buffer), NULL); channel = gimp_channel_new (image, gegl_buffer_get_width (buffer), diff --git a/app/core/gimpchannel.h b/app/core/gimpchannel.h index ef8526f4fb..e14ed4071f 100644 --- a/app/core/gimpchannel.h +++ b/app/core/gimpchannel.h @@ -126,8 +126,8 @@ GimpChannel * gimp_channel_new (GimpImage *image, gint height, const gchar *name, const GimpRGB *color); -GimpChannel * gimp_channel_new_from_buffer (GeglBuffer *buffer, - GimpImage *image, +GimpChannel * gimp_channel_new_from_buffer (GimpImage *image, + GeglBuffer *buffer, const gchar *name, const GimpRGB *color); GimpChannel * gimp_channel_new_from_alpha (GimpImage *image, diff --git a/app/core/gimpdrawable-blend.h b/app/core/gimpdrawable-blend.h deleted file mode 100644 index c9a6bf95a0..0000000000 --- a/app/core/gimpdrawable-blend.h +++ /dev/null @@ -1,49 +0,0 @@ -/* GIMP - The GNU Image Manipulation Program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __GIMP_DRAWABLE_BLEND_H__ -#define __GIMP_DRAWABLE_BLEND_H__ - - -void gimp_drawable_blend (GimpDrawable *drawable, - GimpContext *context, - GimpGradient *gradient, - GeglDistanceMetric metric, - GimpLayerMode paint_mode, - GimpGradientType gradient_type, - gdouble opacity, - gdouble offset, - GimpRepeatMode repeat, - gboolean reverse, - gboolean supersample, - gint max_depth, - gdouble threshold, - gboolean dither, - gdouble startx, - gdouble starty, - gdouble endx, - gdouble endy, - GimpProgress *progress); - -GeglBuffer * -gimp_drawable_blend_shapeburst_distmap (GimpDrawable *drawable, - GeglDistanceMetric metric, - const GeglRectangle *region, - GimpProgress *progress); - - -#endif /* __GIMP_DRAWABLE_BLEND_H__ */ diff --git a/app/core/gimpdrawable-filters.c b/app/core/gimpdrawable-filters.c index a1c7288b6a..08c20f6cca 100644 --- a/app/core/gimpdrawable-filters.c +++ b/app/core/gimpdrawable-filters.c @@ -21,6 +21,7 @@ #include #include +#include #include "core-types.h" diff --git a/app/core/gimpdrawable-blend.c b/app/core/gimpdrawable-gradient.c similarity index 65% rename from app/core/gimpdrawable-blend.c rename to app/core/gimpdrawable-gradient.c index 76311e3c5f..696d7a6bb8 100644 --- a/app/core/gimpdrawable-blend.c +++ b/app/core/gimpdrawable-gradient.c @@ -29,7 +29,7 @@ #include "gimp.h" #include "gimpchannel.h" #include "gimpcontext.h" -#include "gimpdrawable-blend.h" +#include "gimpdrawable-gradient.h" #include "gimpgradient.h" #include "gimpimage.h" #include "gimpprogress.h" @@ -40,25 +40,26 @@ /* public functions */ void -gimp_drawable_blend (GimpDrawable *drawable, - GimpContext *context, - GimpGradient *gradient, - GeglDistanceMetric metric, - GimpLayerMode paint_mode, - GimpGradientType gradient_type, - gdouble opacity, - gdouble offset, - GimpRepeatMode repeat, - gboolean reverse, - gboolean supersample, - gint max_depth, - gdouble threshold, - gboolean dither, - gdouble startx, - gdouble starty, - gdouble endx, - gdouble endy, - GimpProgress *progress) +gimp_drawable_gradient (GimpDrawable *drawable, + GimpContext *context, + GimpGradient *gradient, + GeglDistanceMetric metric, + GimpLayerMode paint_mode, + GimpGradientType gradient_type, + gdouble opacity, + gdouble offset, + GimpRepeatMode repeat, + gboolean reverse, + GimpGradientBlendColorSpace blend_color_space, + gboolean supersample, + gint max_depth, + gdouble threshold, + gboolean dither, + gdouble startx, + gdouble starty, + gdouble endx, + gdouble endy, + GimpProgress *progress) { GimpImage *image; GeglBuffer *buffer; @@ -87,27 +88,28 @@ gimp_drawable_blend (GimpDrawable *drawable, gradient_type <= GIMP_GRADIENT_SHAPEBURST_DIMPLED) { shapeburst = - gimp_drawable_blend_shapeburst_distmap (drawable, metric, - GEGL_RECTANGLE (x, y, width, height), - progress); + gimp_drawable_gradient_shapeburst_distmap (drawable, metric, + GEGL_RECTANGLE (x, y, width, height), + progress); } render = gegl_node_new_child (NULL, - "operation", "gimp:blend", - "context", context, - "gradient", gradient, - "start-x", startx, - "start-y", starty, - "end-x", endx, - "end-y", endy, - "gradient-type", gradient_type, - "gradient-repeat", repeat, - "offset", offset, - "gradient-reverse", reverse, - "supersample", supersample, - "supersample-depth", max_depth, - "supersample-threshold", threshold, - "dither", dither, + "operation", "gimp:gradient", + "context", context, + "gradient", gradient, + "start-x", startx, + "start-y", starty, + "end-x", endx, + "end-y", endy, + "gradient-type", gradient_type, + "gradient-repeat", repeat, + "offset", offset, + "gradient-reverse", reverse, + "gradient-blend-color-space", blend_color_space, + "supersample", supersample, + "supersample-depth", max_depth, + "supersample-threshold", threshold, + "dither", dither, NULL); gimp_gegl_apply_operation (shapeburst, progress, NULL, @@ -122,7 +124,7 @@ gimp_drawable_blend (GimpDrawable *drawable, gimp_drawable_apply_buffer (drawable, buffer, GEGL_RECTANGLE (x, y, width, height), - TRUE, C_("undo-type", "Blend"), + TRUE, C_("undo-type", "Gradient"), opacity, paint_mode, GIMP_LAYER_COLOR_SPACE_AUTO, GIMP_LAYER_COLOR_SPACE_AUTO, @@ -137,10 +139,10 @@ gimp_drawable_blend (GimpDrawable *drawable, } GeglBuffer * -gimp_drawable_blend_shapeburst_distmap (GimpDrawable *drawable, - GeglDistanceMetric metric, - const GeglRectangle *region, - GimpProgress *progress) +gimp_drawable_gradient_shapeburst_distmap (GimpDrawable *drawable, + GeglDistanceMetric metric, + const GeglRectangle *region, + GimpProgress *progress) { GimpChannel *mask; GimpImage *image; diff --git a/app/core/gimpdrawable-gradient.h b/app/core/gimpdrawable-gradient.h new file mode 100644 index 0000000000..75fe93d09c --- /dev/null +++ b/app/core/gimpdrawable-gradient.h @@ -0,0 +1,50 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __GIMP_DRAWABLE_GRADIENT_H__ +#define __GIMP_DRAWABLE_GRADIENT_H__ + + +void gimp_drawable_gradient (GimpDrawable *drawable, + GimpContext *context, + GimpGradient *gradient, + GeglDistanceMetric metric, + GimpLayerMode paint_mode, + GimpGradientType gradient_type, + gdouble opacity, + gdouble offset, + GimpRepeatMode repeat, + gboolean reverse, + GimpGradientBlendColorSpace blend_color_space, + gboolean supersample, + gint max_depth, + gdouble threshold, + gboolean dither, + gdouble startx, + gdouble starty, + gdouble endx, + gdouble endy, + GimpProgress *progress); + +GeglBuffer * +gimp_drawable_gradient_shapeburst_distmap (GimpDrawable *drawable, + GeglDistanceMetric metric, + const GeglRectangle *region, + GimpProgress *progress); + + +#endif /* __GIMP_DRAWABLE_GRADIENT_H__ */ diff --git a/app/core/gimpdrawable-preview.h b/app/core/gimpdrawable-preview.h index e058934fb8..8c714b5c3d 100644 --- a/app/core/gimpdrawable-preview.h +++ b/app/core/gimpdrawable-preview.h @@ -20,7 +20,7 @@ /* - * virtual functions of GimpDrawable -- dont't call directly + * virtual functions of GimpDrawable -- don't call directly */ GimpTempBuf * gimp_drawable_get_new_preview (GimpViewable *viewable, GimpContext *context, diff --git a/app/core/gimpdrawable-private.h b/app/core/gimpdrawable-private.h index c821e7d199..c84c66547a 100644 --- a/app/core/gimpdrawable-private.h +++ b/app/core/gimpdrawable-private.h @@ -33,6 +33,11 @@ struct _GimpDrawablePrivate GimpApplicator *fs_applicator; GeglNode *mode_node; + + gint paint_count; + GeglBuffer *paint_buffer; + cairo_region_t *paint_copy_region; + cairo_region_t *paint_update_region; }; #endif /* __GIMP_DRAWABLE_PRIVATE_H__ */ diff --git a/app/core/gimpdrawable-shadow.c b/app/core/gimpdrawable-shadow.c index 25b8dc99bf..e826e6f370 100644 --- a/app/core/gimpdrawable-shadow.c +++ b/app/core/gimpdrawable-shadow.c @@ -19,6 +19,7 @@ #include #include +#include #include "core-types.h" diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c index abdd285476..cc411165e6 100644 --- a/app/core/gimpdrawable.c +++ b/app/core/gimpdrawable.c @@ -23,6 +23,7 @@ #include "libgimpbase/gimpbase.h" #include "libgimpcolor/gimpcolor.h" +#include "libgimpmath/gimpmath.h" #include "core-types.h" @@ -54,6 +55,13 @@ #include "gimp-intl.h" +#define PAINT_COPY_CHUNK_WIDTH 128 +#define PAINT_COPY_CHUNK_HEIGHT 128 + +#define PAINT_UPDATE_CHUNK_WIDTH 32 +#define PAINT_UPDATE_CHUNK_HEIGHT 32 + + enum { UPDATE, @@ -312,6 +320,9 @@ gimp_drawable_finalize (GObject *object) { GimpDrawable *drawable = GIMP_DRAWABLE (object); + while (drawable->private->paint_count) + gimp_drawable_end_paint (drawable); + g_clear_object (&drawable->private->buffer); gimp_drawable_free_shadow_buffer (drawable); @@ -944,8 +955,59 @@ gimp_drawable_update (GimpDrawable *drawable, if (height == -1) height = gimp_item_get_height (GIMP_ITEM (drawable)); - g_signal_emit (drawable, gimp_drawable_signals[UPDATE], 0, - x, y, width, height); + if (drawable->private->paint_count == 0) + { + g_signal_emit (drawable, gimp_drawable_signals[UPDATE], 0, + x, y, width, height); + } + else + { + GeglRectangle rect; + + rect.x = floor ((gdouble) x / PAINT_COPY_CHUNK_WIDTH) * PAINT_COPY_CHUNK_WIDTH; + rect.y = floor ((gdouble) y / PAINT_COPY_CHUNK_HEIGHT) * PAINT_COPY_CHUNK_HEIGHT; + rect.width = ceil ((gdouble) (x + width) / PAINT_COPY_CHUNK_WIDTH) * PAINT_COPY_CHUNK_WIDTH - rect.x; + rect.height = ceil ((gdouble) (y + height) / PAINT_COPY_CHUNK_HEIGHT) * PAINT_COPY_CHUNK_HEIGHT - rect.y; + + if (gegl_rectangle_intersect ( + &rect, + &rect, + GEGL_RECTANGLE (0, 0, + gimp_item_get_width (GIMP_ITEM (drawable)), + gimp_item_get_height (GIMP_ITEM (drawable))))) + { + if (drawable->private->paint_copy_region) + { + cairo_region_union_rectangle ( + drawable->private->paint_copy_region, + (const cairo_rectangle_int_t *) &rect); + } + else + { + drawable->private->paint_copy_region = + cairo_region_create_rectangle ( + (const cairo_rectangle_int_t *) &rect); + } + + rect.x = floor ((gdouble) x / PAINT_UPDATE_CHUNK_WIDTH) * PAINT_UPDATE_CHUNK_WIDTH; + rect.y = floor ((gdouble) y / PAINT_UPDATE_CHUNK_HEIGHT) * PAINT_UPDATE_CHUNK_HEIGHT; + rect.width = ceil ((gdouble) (x + width) / PAINT_UPDATE_CHUNK_WIDTH) * PAINT_UPDATE_CHUNK_WIDTH - rect.x; + rect.height = ceil ((gdouble) (y + height) / PAINT_UPDATE_CHUNK_HEIGHT) * PAINT_UPDATE_CHUNK_HEIGHT - rect.y; + + if (drawable->private->paint_update_region) + { + cairo_region_union_rectangle ( + drawable->private->paint_update_region, + (const cairo_rectangle_int_t *) &rect); + } + else + { + drawable->private->paint_update_region = + cairo_region_create_rectangle ( + (const cairo_rectangle_int_t *) &rect); + } + } + } } void @@ -1123,7 +1185,10 @@ gimp_drawable_get_buffer (GimpDrawable *drawable) { g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL); - return GIMP_DRAWABLE_GET_CLASS (drawable)->get_buffer (drawable); + if (drawable->private->paint_count == 0) + return GIMP_DRAWABLE_GET_CLASS (drawable)->get_buffer (drawable); + else + return drawable->private->paint_buffer; } void @@ -1506,3 +1571,109 @@ gimp_drawable_get_colormap (GimpDrawable *drawable) return image ? gimp_image_get_colormap (image) : NULL; } + +void +gimp_drawable_start_paint (GimpDrawable *drawable) +{ + g_return_if_fail (GIMP_IS_DRAWABLE (drawable)); + + if (drawable->private->paint_count == 0) + { + GeglBuffer *buffer = gimp_drawable_get_buffer (drawable); + + g_return_if_fail (buffer != NULL); + g_return_if_fail (drawable->private->paint_buffer == NULL); + g_return_if_fail (drawable->private->paint_copy_region == NULL); + g_return_if_fail (drawable->private->paint_update_region == NULL); + + drawable->private->paint_buffer = gegl_buffer_dup (buffer); + } + + drawable->private->paint_count++; +} + +gboolean +gimp_drawable_end_paint (GimpDrawable *drawable) +{ + gboolean result = FALSE; + + g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE); + g_return_val_if_fail (drawable->private->paint_count > 0, FALSE); + + if (drawable->private->paint_count == 1) + { + result = gimp_drawable_flush_paint (drawable); + + g_clear_object (&drawable->private->paint_buffer); + } + + drawable->private->paint_count--; + + return result; +} + +gboolean +gimp_drawable_flush_paint (GimpDrawable *drawable) +{ + g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE); + g_return_val_if_fail (drawable->private->paint_count > 0, FALSE); + + if (drawable->private->paint_copy_region) + { + GeglBuffer *buffer; + gint n_rects; + gint i; + + buffer = GIMP_DRAWABLE_GET_CLASS (drawable)->get_buffer (drawable); + + g_return_val_if_fail (buffer != NULL, FALSE); + g_return_val_if_fail (drawable->private->paint_buffer != NULL, FALSE); + + n_rects = cairo_region_num_rectangles ( + drawable->private->paint_copy_region); + + for (i = 0; i < n_rects; i++) + { + GeglRectangle rect; + + cairo_region_get_rectangle (drawable->private->paint_copy_region, + i, (cairo_rectangle_int_t *) &rect); + + gegl_buffer_copy ( + drawable->private->paint_buffer, &rect, GEGL_ABYSS_NONE, + buffer, NULL); + } + + g_clear_pointer (&drawable->private->paint_copy_region, + cairo_region_destroy); + + n_rects = cairo_region_num_rectangles ( + drawable->private->paint_update_region); + + for (i = 0; i < n_rects; i++) + { + GeglRectangle rect; + + cairo_region_get_rectangle (drawable->private->paint_update_region, + i, (cairo_rectangle_int_t *) &rect); + + g_signal_emit (drawable, gimp_drawable_signals[UPDATE], 0, + rect.x, rect.y, rect.width, rect.height); + } + + g_clear_pointer (&drawable->private->paint_update_region, + cairo_region_destroy); + + return TRUE; + } + + return FALSE; +} + +gboolean +gimp_drawable_is_painting (GimpDrawable *drawable) +{ + g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE); + + return drawable->private->paint_count > 0; +} diff --git a/app/core/gimpdrawable.h b/app/core/gimpdrawable.h index abd1e455f9..c4b6c2e73b 100644 --- a/app/core/gimpdrawable.h +++ b/app/core/gimpdrawable.h @@ -228,5 +228,10 @@ gint gimp_drawable_get_component_index (GimpDrawable *drawable, const guchar * gimp_drawable_get_colormap (GimpDrawable *drawable); +void gimp_drawable_start_paint (GimpDrawable *drawable); +gboolean gimp_drawable_end_paint (GimpDrawable *drawable); +gboolean gimp_drawable_flush_paint (GimpDrawable *drawable); +gboolean gimp_drawable_is_painting (GimpDrawable *drawable); + #endif /* __GIMP_DRAWABLE_H__ */ diff --git a/app/core/gimpdrawablefilter.c b/app/core/gimpdrawablefilter.c index bf08596506..3ac9a44059 100644 --- a/app/core/gimpdrawablefilter.c +++ b/app/core/gimpdrawablefilter.c @@ -18,7 +18,7 @@ /* This file contains the code necessary for generating on canvas * previews, by connecting a specified GEGL operation to do the * processing. It uses drawable filters that allow for non-destructive - * manupulation of drawable data, with live preview on screen. + * manipulation of drawable data, with live preview on screen. * * To create a tool that uses this, see app/tools/gimpfiltertool.c for * the interface and e.g. app/tools/gimpcolorbalancetool.c for an diff --git a/app/core/gimpdynamicsoutput.c b/app/core/gimpdynamicsoutput.c index 48c23db91c..4c0fdcea4a 100644 --- a/app/core/gimpdynamicsoutput.c +++ b/app/core/gimpdynamicsoutput.c @@ -534,7 +534,7 @@ gimp_dynamics_output_get_angular_value (GimpDynamicsOutput *output, { GimpDynamicsOutputPrivate *private = GET_PRIVATE (output); gdouble total = 0.0; - gdouble result = 0.0; /* angles are additive, so we retun zero for no change. */ + gdouble result = 0.0; /* angles are additive, so we return zero for no change. */ gint factors = 0; if (private->use_pressure) diff --git a/app/core/gimpgradient.c b/app/core/gimpgradient.c index a84e6f0117..1d9e2fcd75 100644 --- a/app/core/gimpgradient.c +++ b/app/core/gimpgradient.c @@ -98,6 +98,11 @@ G_DEFINE_TYPE_WITH_CODE (GimpGradient, gimp_gradient, GIMP_TYPE_DATA, #define parent_class gimp_gradient_parent_class +static const Babl *fish_srgb_to_linear_rgb = NULL; +static const Babl *fish_linear_rgb_to_srgb = NULL; +static const Babl *fish_srgb_to_cie_lab = NULL; +static const Babl *fish_cie_lab_to_srgb = NULL; + static void gimp_gradient_class_init (GimpGradientClass *klass) @@ -111,7 +116,7 @@ gimp_gradient_class_init (GimpGradientClass *klass) gimp_object_class->get_memsize = gimp_gradient_get_memsize; - viewable_class->default_icon_name = "gimp-tool-blend"; + viewable_class->default_icon_name = "gimp-tool-gradient"; viewable_class->get_preview_size = gimp_gradient_get_preview_size; viewable_class->get_popup_size = gimp_gradient_get_popup_size; viewable_class->get_new_preview = gimp_gradient_get_new_preview; @@ -120,6 +125,15 @@ gimp_gradient_class_init (GimpGradientClass *klass) data_class->get_extension = gimp_gradient_get_extension; data_class->copy = gimp_gradient_copy; data_class->compare = gimp_gradient_compare; + + fish_srgb_to_linear_rgb = babl_fish (babl_format ("R'G'B' double"), + babl_format ("RGB double")); + fish_linear_rgb_to_srgb = babl_fish (babl_format ("RGB double"), + babl_format ("R'G'B' double")); + fish_srgb_to_cie_lab = babl_fish (babl_format ("R'G'B' double"), + babl_format ("CIE Lab double")); + fish_cie_lab_to_srgb = babl_fish (babl_format ("CIE Lab double"), + babl_format ("R'G'B' double")); } static void @@ -219,7 +233,9 @@ gimp_gradient_get_new_preview (GimpViewable *viewable, for (x = 0; x < width; x++) { seg = gimp_gradient_get_color_at (gradient, context, seg, cur_x, - FALSE, &color); + FALSE, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, + &color); *p++ = ROUND (color.r * 255.0); *p++ = ROUND (color.g * 255.0); @@ -413,12 +429,13 @@ gimp_gradient_get_extension (GimpData *data) /** * gimp_gradient_get_color_at: - * @gradient: a gradient - * @context: a context - * @seg: a segment to seed the search with (or %NULL) - * @pos: position in the gradient (between 0.0 and 1.0) - * @reverse: when %TRUE, use the reversed gradient - * @color: returns the color + * @gradient: a gradient + * @context: a context + * @seg: a segment to seed the search with (or %NULL) + * @pos: position in the gradient (between 0.0 and 1.0) + * @reverse: when %TRUE, use the reversed gradient + * @blend_color_space: color space to use for blending RGB segments + * @color: returns the color * * If you are iterating over an gradient, you should pass the the * return value from the last call for @seg. @@ -426,12 +443,13 @@ gimp_gradient_get_extension (GimpData *data) * Return value: the gradient segment the color is from **/ GimpGradientSegment * -gimp_gradient_get_color_at (GimpGradient *gradient, - GimpContext *context, - GimpGradientSegment *seg, - gdouble pos, - gboolean reverse, - GimpRGB *color) +gimp_gradient_get_color_at (GimpGradient *gradient, + GimpContext *context, + GimpGradientSegment *seg, + gdouble pos, + gboolean reverse, + GimpGradientBlendColorSpace blend_color_space, + GimpRGB *color) { gdouble factor = 0.0; gdouble seg_len; @@ -502,9 +520,43 @@ gimp_gradient_get_color_at (GimpGradient *gradient, if (seg->color == GIMP_GRADIENT_SEGMENT_RGB) { + switch (blend_color_space) + { + case GIMP_GRADIENT_BLEND_CIE_LAB: + babl_process (fish_srgb_to_cie_lab, + &left_color, &left_color, 1); + babl_process (fish_srgb_to_cie_lab, + &right_color, &right_color, 1); + break; + + case GIMP_GRADIENT_BLEND_RGB_LINEAR: + babl_process (fish_srgb_to_linear_rgb, + &left_color, &left_color, 1); + babl_process (fish_srgb_to_linear_rgb, + &right_color, &right_color, 1); + + case GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL: + break; + } + rgb.r = left_color.r + (right_color.r - left_color.r) * factor; rgb.g = left_color.g + (right_color.g - left_color.g) * factor; rgb.b = left_color.b + (right_color.b - left_color.b) * factor; + + switch (blend_color_space) + { + case GIMP_GRADIENT_BLEND_CIE_LAB: + babl_process (fish_cie_lab_to_srgb, + &rgb, &rgb, 1); + break; + + case GIMP_GRADIENT_BLEND_RGB_LINEAR: + babl_process (fish_linear_rgb_to_srgb, + &rgb, &rgb, 1); + + case GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL: + break; + } } else { @@ -590,12 +642,13 @@ gimp_gradient_has_fg_bg_segments (GimpGradient *gradient) } void -gimp_gradient_split_at (GimpGradient *gradient, - GimpContext *context, - GimpGradientSegment *seg, - gdouble pos, - GimpGradientSegment **newl, - GimpGradientSegment **newr) +gimp_gradient_split_at (GimpGradient *gradient, + GimpContext *context, + GimpGradientSegment *seg, + gdouble pos, + GimpGradientBlendColorSpace blend_color_space, + GimpGradientSegment **newl, + GimpGradientSegment **newr) { GimpRGB color; GimpGradientSegment *newseg; @@ -610,7 +663,7 @@ gimp_gradient_split_at (GimpGradient *gradient, /* Get color at pos */ gimp_gradient_get_color_at (gradient, context, seg, pos, - FALSE, &color); + FALSE, blend_color_space, &color); /* Create a new segment and insert it in the list */ @@ -779,11 +832,12 @@ gimp_gradient_segment_get_nth (GimpGradientSegment *seg, } void -gimp_gradient_segment_split_midpoint (GimpGradient *gradient, - GimpContext *context, - GimpGradientSegment *lseg, - GimpGradientSegment **newl, - GimpGradientSegment **newr) +gimp_gradient_segment_split_midpoint (GimpGradient *gradient, + GimpContext *context, + GimpGradientSegment *lseg, + GimpGradientBlendColorSpace blend_color_space, + GimpGradientSegment **newl, + GimpGradientSegment **newr) { g_return_if_fail (GIMP_IS_GRADIENT (gradient)); g_return_if_fail (GIMP_IS_CONTEXT (context)); @@ -791,16 +845,18 @@ gimp_gradient_segment_split_midpoint (GimpGradient *gradient, g_return_if_fail (newl != NULL); g_return_if_fail (newr != NULL); - gimp_gradient_split_at (gradient, context, lseg, lseg->middle, newl, newr); + gimp_gradient_split_at (gradient, context, lseg, lseg->middle, + blend_color_space, newl, newr); } void -gimp_gradient_segment_split_uniform (GimpGradient *gradient, - GimpContext *context, - GimpGradientSegment *lseg, - gint parts, - GimpGradientSegment **newl, - GimpGradientSegment **newr) +gimp_gradient_segment_split_uniform (GimpGradient *gradient, + GimpContext *context, + GimpGradientSegment *lseg, + gint parts, + GimpGradientBlendColorSpace blend_color_space, + GimpGradientSegment **newl, + GimpGradientSegment **newr) { GimpGradientSegment *seg, *prev, *tmp; gdouble seg_len; @@ -835,9 +891,11 @@ gimp_gradient_segment_split_uniform (GimpGradient *gradient, seg->right_color_type = GIMP_GRADIENT_COLOR_FIXED; gimp_gradient_get_color_at (gradient, context, lseg, - seg->left, FALSE, &seg->left_color); + seg->left, FALSE, blend_color_space, + &seg->left_color); gimp_gradient_get_color_at (gradient, context, lseg, - seg->right, FALSE, &seg->right_color); + seg->right, FALSE, blend_color_space, + &seg->right_color); seg->type = lseg->type; seg->color = lseg->color; @@ -1626,12 +1684,13 @@ gimp_gradient_segment_range_replicate (GimpGradient *gradient, } void -gimp_gradient_segment_range_split_midpoint (GimpGradient *gradient, - GimpContext *context, - GimpGradientSegment *start_seg, - GimpGradientSegment *end_seg, - GimpGradientSegment **final_start_seg, - GimpGradientSegment **final_end_seg) +gimp_gradient_segment_range_split_midpoint (GimpGradient *gradient, + GimpContext *context, + GimpGradientSegment *start_seg, + GimpGradientSegment *end_seg, + GimpGradientBlendColorSpace blend_color_space, + GimpGradientSegment **final_start_seg, + GimpGradientSegment **final_end_seg) { GimpGradientSegment *seg, *lseg, *rseg; @@ -1648,7 +1707,8 @@ gimp_gradient_segment_range_split_midpoint (GimpGradient *gradient, do { gimp_gradient_segment_split_midpoint (gradient, context, - seg, &lseg, &rseg); + seg, blend_color_space, + &lseg, &rseg); seg = rseg->next; } while (lseg != end_seg); @@ -1663,13 +1723,14 @@ gimp_gradient_segment_range_split_midpoint (GimpGradient *gradient, } void -gimp_gradient_segment_range_split_uniform (GimpGradient *gradient, - GimpContext *context, - GimpGradientSegment *start_seg, - GimpGradientSegment *end_seg, - gint parts, - GimpGradientSegment **final_start_seg, - GimpGradientSegment **final_end_seg) +gimp_gradient_segment_range_split_uniform (GimpGradient *gradient, + GimpContext *context, + GimpGradientSegment *start_seg, + GimpGradientSegment *end_seg, + gint parts, + GimpGradientBlendColorSpace blend_color_space, + GimpGradientSegment **final_start_seg, + GimpGradientSegment **final_end_seg) { GimpGradientSegment *seg, *aseg, *lseg, *rseg, *lsel; @@ -1696,7 +1757,7 @@ gimp_gradient_segment_range_split_uniform (GimpGradient *gradient, aseg = seg; gimp_gradient_segment_split_uniform (gradient, context, seg, - parts, + parts, blend_color_space, &lseg, &rseg); if (seg == start_seg) diff --git a/app/core/gimpgradient.h b/app/core/gimpgradient.h index c550ba10e1..e228ec4b96 100644 --- a/app/core/gimpgradient.h +++ b/app/core/gimpgradient.h @@ -76,6 +76,7 @@ GimpGradientSegment * gimp_gradient_get_color_at (GimpGradient *gradien GimpGradientSegment *seg, gdouble pos, gboolean reverse, + GimpGradientBlendColorSpace blend_color_space, GimpRGB *color); GimpGradientSegment * gimp_gradient_get_segment_at (GimpGradient *grad, gdouble pos); @@ -83,6 +84,7 @@ void gimp_gradient_split_at (GimpGradient *gradie GimpContext *context, GimpGradientSegment *seg, gdouble pos, + GimpGradientBlendColorSpace blend_color_space, GimpGradientSegment **newl, GimpGradientSegment **newr); @@ -105,12 +107,14 @@ void gimp_gradient_segments_free (GimpGradientSegment *seg) void gimp_gradient_segment_split_midpoint (GimpGradient *gradient, GimpContext *context, GimpGradientSegment *lseg, + GimpGradientBlendColorSpace blend_color_space, GimpGradientSegment **newl, GimpGradientSegment **newr); void gimp_gradient_segment_split_uniform (GimpGradient *gradient, GimpContext *context, GimpGradientSegment *lseg, gint parts, + GimpGradientBlendColorSpace blend_color_space, GimpGradientSegment **newl, GimpGradientSegment **newr); @@ -247,6 +251,7 @@ void gimp_gradient_segment_range_split_midpoint GimpContext *context, GimpGradientSegment *start_seg, GimpGradientSegment *end_seg, + GimpGradientBlendColorSpace blend_color_space, GimpGradientSegment **final_start_seg, GimpGradientSegment **final_end_seg); @@ -256,6 +261,7 @@ void gimp_gradient_segment_range_split_uniform GimpGradientSegment *start_seg, GimpGradientSegment *end_seg, gint parts, + GimpGradientBlendColorSpace blend_color_space, GimpGradientSegment **final_start_seg, GimpGradientSegment **final_end_seg); diff --git a/app/core/gimpimage-convert-indexed.c b/app/core/gimpimage-convert-indexed.c index f6963cf80d..954fb6ef29 100644 --- a/app/core/gimpimage-convert-indexed.c +++ b/app/core/gimpimage-convert-indexed.c @@ -630,7 +630,7 @@ make_remap_table (const guchar old_palette[], } } - /* Third pass - rank all used indicies to the beginning of the + /* Third pass - rank all used indices to the beginning of the * palette. */ palentries = g_new (PalEntry, used); diff --git a/app/core/gimpimage-convert-precision.c b/app/core/gimpimage-convert-precision.c index 64838aefad..41579e24ea 100644 --- a/app/core/gimpimage-convert-precision.c +++ b/app/core/gimpimage-convert-precision.c @@ -59,6 +59,7 @@ gimp_image_convert_precision (GimpImage *image, const Babl *old_format; const Babl *new_format; GimpObjectQueue *queue; + GimpProgress *sub_progress; GList *layers; GimpDrawable *drawable; const gchar *undo_desc = NULL; @@ -112,8 +113,8 @@ gimp_image_convert_precision (GimpImage *image, if (progress) gimp_progress_start (progress, FALSE, "%s", undo_desc); - queue = gimp_object_queue_new (progress); - progress = GIMP_PROGRESS (queue); + queue = gimp_object_queue_new (progress); + sub_progress = GIMP_PROGRESS (queue); layers = gimp_image_get_layer_list (image); gimp_object_queue_push_list (queue, layers); @@ -194,6 +195,8 @@ gimp_image_convert_precision (GimpImage *image, gimp_drawable_set_buffer (drawable, FALSE, NULL, buffer); g_object_unref (buffer); + + gimp_progress_set_value (sub_progress, 1.0); } else { @@ -211,7 +214,7 @@ gimp_image_convert_precision (GimpImage *image, new_profile, dither_type, mask_dither_type, - TRUE, progress); + TRUE, sub_progress); } } @@ -245,17 +248,17 @@ gimp_image_convert_dither_u8 (GimpImage *image, dither = gegl_node_new_child (NULL, "operation", "gegl:noise-rgb", - "red", 1.0 / 256.0, - "green", 1.0 / 256.0, - "blue", 1.0 / 256.0, - "alpha", 1.0 / 256.0, - "linear", FALSE, - "gaussian", FALSE, + "red", 1.0 / 256.0, + "green", 1.0 / 256.0, + "blue", 1.0 / 256.0, + "linear", FALSE, + "gaussian", FALSE, NULL); if (dither) { GimpObjectQueue *queue; + GimpProgress *sub_progress; GList *layers; GList *list; GimpDrawable *drawable; @@ -263,8 +266,8 @@ gimp_image_convert_dither_u8 (GimpImage *image, if (progress) gimp_progress_start (progress, FALSE, "%s", _("Dithering")); - queue = gimp_object_queue_new (progress); - progress = GIMP_PROGRESS (queue); + queue = gimp_object_queue_new (progress); + sub_progress = GIMP_PROGRESS (queue); layers = gimp_image_get_layer_list (image); @@ -279,18 +282,18 @@ gimp_image_convert_dither_u8 (GimpImage *image, g_list_free (layers); - gimp_object_queue_push (queue, gimp_image_get_mask (image)); - gimp_object_queue_push_container (queue, gimp_image_get_channels (image)); - while ((drawable = gimp_object_queue_pop (queue))) { - gimp_drawable_apply_operation (drawable, progress, + gimp_drawable_apply_operation (drawable, sub_progress, _("Dithering"), dither); } g_object_unref (queue); + if (progress) + gimp_progress_end (progress); + g_object_unref (dither); } } diff --git a/app/core/gimpimage-guides.h b/app/core/gimpimage-guides.h index 89c3a5517f..e98a1cea2a 100644 --- a/app/core/gimpimage-guides.h +++ b/app/core/gimpimage-guides.h @@ -29,7 +29,7 @@ GimpGuide * gimp_image_add_vguide (GimpImage *image, gboolean push_undo); /* internal guide adding API, does not check the guide's position and - * is publically declared only to be used from undo + * is publicly declared only to be used from undo */ void gimp_image_add_guide (GimpImage *image, GimpGuide *guide, diff --git a/app/core/gimpimage-preview.h b/app/core/gimpimage-preview.h index e6515d08f3..3ed7e14783 100644 --- a/app/core/gimpimage-preview.h +++ b/app/core/gimpimage-preview.h @@ -20,7 +20,7 @@ /* - * virtual functions of GimpImage -- dont't call directly + * virtual functions of GimpImage -- don't call directly */ void gimp_image_get_preview_size (GimpViewable *viewable, diff --git a/app/core/gimpimage-quick-mask.c b/app/core/gimpimage-quick-mask.c index babaa9174c..55ebcaaa7b 100644 --- a/app/core/gimpimage-quick-mask.c +++ b/app/core/gimpimage-quick-mask.c @@ -34,7 +34,6 @@ #include "gimpimage-undo-push.h" #include "gimplayer.h" #include "gimplayer-floating-selection.h" -#include "gimpselection.h" #include "gimp-intl.h" @@ -127,8 +126,9 @@ gimp_image_set_quick_mask_state (GimpImage *image, gimp_layer_get_floating_sel_drawable (floating_sel) == GIMP_DRAWABLE (mask)) floating_sel_anchor (floating_sel); - gimp_selection_load (GIMP_SELECTION (gimp_image_get_mask (image)), - mask); + gimp_item_to_selection (GIMP_ITEM (mask), + GIMP_CHANNEL_OP_REPLACE, + TRUE, FALSE, 0.0, 0.0); gimp_image_remove_channel (image, mask, TRUE, NULL); if (! channel_was_active) diff --git a/app/core/gimpimage-sample-points.h b/app/core/gimpimage-sample-points.h index 6fd7cd8a63..687d06ca47 100644 --- a/app/core/gimpimage-sample-points.h +++ b/app/core/gimpimage-sample-points.h @@ -27,7 +27,7 @@ GimpSamplePoint * gimp_image_add_sample_point_at_pos (GimpImage *image, gboolean push_undo); /* internal sample point adding API, does not check the sample - * point's position and is publically declared only to be used from + * point's position and is publicly declared only to be used from * undo */ void gimp_image_add_sample_point (GimpImage *image, diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c index 2ba4b3d0c6..7176369841 100644 --- a/app/core/gimpimage.c +++ b/app/core/gimpimage.c @@ -1836,11 +1836,18 @@ gimp_image_get_layer_format (GimpImage *image, const Babl * gimp_image_get_channel_format (GimpImage *image) { + GimpPrecision precision; + g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL); - return gimp_image_get_format (image, GIMP_GRAY, - gimp_image_get_precision (image), - FALSE); + precision = gimp_image_get_precision (image); + + if (precision == GIMP_PRECISION_U8_GAMMA) + return gimp_image_get_format (image, GIMP_GRAY, + gimp_image_get_precision (image), + FALSE); + + return gimp_babl_mask_format (precision); } const Babl * diff --git a/app/core/gimpimageundo.c b/app/core/gimpimageundo.c index 83d356bd1b..c81b73e21b 100644 --- a/app/core/gimpimageundo.c +++ b/app/core/gimpimageundo.c @@ -335,7 +335,7 @@ gimp_image_undo_pop (GimpUndo *undo, if ((image_undo->base_type == GIMP_GRAY) || (gimp_image_get_base_type (image) == GIMP_GRAY)) { - /* in case ther was no profile undo, we need to emit + /* in case there was no profile undo, we need to emit * profile-changed anyway */ gimp_color_managed_profile_changed (GIMP_COLOR_MANAGED (image)); diff --git a/app/core/gimpitem-preview.h b/app/core/gimpitem-preview.h index 740baf9dca..0669417b51 100644 --- a/app/core/gimpitem-preview.h +++ b/app/core/gimpitem-preview.h @@ -20,7 +20,7 @@ /* - * virtual functions of GimpItem -- dont't call directly + * virtual functions of GimpItem -- don't call directly */ void gimp_item_get_preview_size (GimpViewable *viewable, diff --git a/app/core/gimplayer-floating-selection.c b/app/core/gimplayer-floating-selection.c index 236356a624..b1bac93393 100644 --- a/app/core/gimplayer-floating-selection.c +++ b/app/core/gimplayer-floating-selection.c @@ -267,7 +267,7 @@ floating_sel_boundary (GimpLayer *layer, babl_format ("A float"), GIMP_BOUNDARY_WITHIN_BOUNDS, 0, 0, width, height, - GIMP_BOUNDARY_HALF_WAY_LINEAR, + GIMP_BOUNDARY_HALF_WAY, &layer->fs.num_segs); /* offset the segments */ diff --git a/app/core/gimppalette-import.c b/app/core/gimppalette-import.c index 166669357c..b48a8382f8 100644 --- a/app/core/gimppalette-import.c +++ b/app/core/gimppalette-import.c @@ -46,11 +46,12 @@ /* create a palette from a gradient ****************************************/ GimpPalette * -gimp_palette_import_from_gradient (GimpGradient *gradient, - GimpContext *context, - gboolean reverse, - const gchar *palette_name, - gint n_colors) +gimp_palette_import_from_gradient (GimpGradient *gradient, + GimpContext *context, + gboolean reverse, + GimpGradientBlendColorSpace blend_color_space, + const gchar *palette_name, + gint n_colors) { GimpPalette *palette; GimpGradientSegment *seg = NULL; @@ -70,7 +71,8 @@ gimp_palette_import_from_gradient (GimpGradient *gradient, for (i = 0, cur_x = 0; i < n_colors; i++, cur_x += dx) { seg = gimp_gradient_get_color_at (gradient, context, - seg, cur_x, reverse, &color); + seg, cur_x, reverse, blend_color_space, + &color); gimp_palette_add_entry (palette, -1, NULL, &color); } diff --git a/app/core/gimppalette-import.h b/app/core/gimppalette-import.h index 2597842de5..69dcc1cc36 100644 --- a/app/core/gimppalette-import.h +++ b/app/core/gimppalette-import.h @@ -22,6 +22,7 @@ GimpPalette * gimp_palette_import_from_gradient (GimpGradient *gradient, GimpContext *context, gboolean reverse, + GimpGradientBlendColorSpace blend_color_space, const gchar *palette_name, gint n_colors); GimpPalette * gimp_palette_import_from_image (GimpImage *image, diff --git a/app/core/gimpparamspecs-duplicate.c b/app/core/gimpparamspecs-duplicate.c index 595c9f8a21..135f230f21 100644 --- a/app/core/gimpparamspecs-duplicate.c +++ b/app/core/gimpparamspecs-duplicate.c @@ -160,11 +160,20 @@ gimp_param_spec_duplicate (GParamSpec *pspec) } else if (GEGL_IS_PARAM_SPEC_SEED (pspec)) { + GParamSpecUInt *spec = G_PARAM_SPEC_UINT (pspec); + GeglParamSpecSeed *gspec = GEGL_PARAM_SPEC_SEED (pspec); + copy = gegl_param_spec_seed (pspec->name, g_param_spec_get_nick (pspec), g_param_spec_get_blurb (pspec), pspec->flags | GIMP_CONFIG_PARAM_SERIALIZE); + + G_PARAM_SPEC_UINT (copy)->minimum = spec->minimum; + G_PARAM_SPEC_UINT (copy)->maximum = spec->maximum; + + GEGL_PARAM_SPEC_SEED (copy)->ui_minimum = gspec->ui_minimum; + GEGL_PARAM_SPEC_SEED (copy)->ui_maximum = gspec->ui_maximum; } else if (G_IS_PARAM_SPEC_INT (pspec)) { diff --git a/app/core/gimppickable-contiguous-region.c b/app/core/gimppickable-contiguous-region.c index 3e0606e454..8672d5f3aa 100644 --- a/app/core/gimppickable-contiguous-region.c +++ b/app/core/gimppickable-contiguous-region.c @@ -201,7 +201,7 @@ gimp_pickable_contiguous_region_by_color (GimpPickable *pickable, { if (select_transparent) { - /* don't select transparancy if "color" isn't fully transparent + /* don't select transparency if "color" isn't fully transparent */ if (start_col[n_components - 1] > 0.0) select_transparent = FALSE; diff --git a/app/core/gimpprojection.c b/app/core/gimpprojection.c index e5311244cd..fcf330a308 100644 --- a/app/core/gimpprojection.c +++ b/app/core/gimpprojection.c @@ -25,6 +25,7 @@ #include #include "libgimpbase/gimpbase.h" +#include "libgimpmath/gimpmath.h" #include "core-types.h" @@ -48,6 +49,10 @@ static gint GIMP_PROJECTION_CHUNK_WIDTH = 256; static gint GIMP_PROJECTION_CHUNK_HEIGHT = 128; +/* chunk size for area updates */ +static gint GIMP_PROJECTION_UPDATE_CHUNK_WIDTH = 32; +static gint GIMP_PROJECTION_UPDATE_CHUNK_HEIGHT = 32; + /* how much time, in seconds, do we allow chunk rendering to take, * aiming for 15fps */ @@ -679,6 +684,17 @@ gimp_projection_add_update_area (GimpProjection *proj, x -= off_x; y -= off_y; + /* align the rectangle to the UPDATE_CHUNK_WIDTH x UPDATE_CHUNK_HEIGHT grid, + * to decrease the complexity of the update area. + */ + w = ceil ((gdouble) (x + w) / GIMP_PROJECTION_UPDATE_CHUNK_WIDTH ) * GIMP_PROJECTION_UPDATE_CHUNK_WIDTH; + h = ceil ((gdouble) (y + h) / GIMP_PROJECTION_UPDATE_CHUNK_HEIGHT) * GIMP_PROJECTION_UPDATE_CHUNK_HEIGHT; + x = floor ((gdouble) x / GIMP_PROJECTION_UPDATE_CHUNK_WIDTH ) * GIMP_PROJECTION_UPDATE_CHUNK_WIDTH; + y = floor ((gdouble) y / GIMP_PROJECTION_UPDATE_CHUNK_HEIGHT) * GIMP_PROJECTION_UPDATE_CHUNK_HEIGHT; + + w -= x; + h -= y; + if (gimp_rectangle_intersect (x, y, w, h, 0, 0, width, height, &rect.x, &rect.y, &rect.width, &rect.height)) diff --git a/app/core/gimpselection.c b/app/core/gimpselection.c index 4bfe1c2a84..1f693018e8 100644 --- a/app/core/gimpselection.c +++ b/app/core/gimpselection.c @@ -634,59 +634,6 @@ gimp_selection_resume (GimpSelection *selection) return selection->suspend_count; } -void -gimp_selection_load (GimpSelection *selection, - GimpChannel *channel) -{ - gint width; - gint height; - - g_return_if_fail (GIMP_IS_SELECTION (selection)); - g_return_if_fail (GIMP_IS_CHANNEL (channel)); - - width = gimp_item_get_width (GIMP_ITEM (selection)); - height = gimp_item_get_height (GIMP_ITEM (selection)); - - g_return_if_fail (width == gimp_item_get_width (GIMP_ITEM (channel))); - g_return_if_fail (height == gimp_item_get_height (GIMP_ITEM (channel))); - - gimp_channel_push_undo (GIMP_CHANNEL (selection), - C_("undo-type", "Channel to Selection")); - - /* copy the channel to the mask */ - gegl_buffer_copy (gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)), - NULL, - GEGL_ABYSS_NONE, - gimp_drawable_get_buffer (GIMP_DRAWABLE (selection)), - NULL); - - GIMP_CHANNEL (selection)->bounds_known = FALSE; - - gimp_drawable_update (GIMP_DRAWABLE (selection), 0, 0, -1, -1); -} - -GimpChannel * -gimp_selection_save (GimpSelection *selection) -{ - GimpImage *image; - GimpChannel *new_channel; - - g_return_val_if_fail (GIMP_IS_SELECTION (selection), NULL); - - image = gimp_item_get_image (GIMP_ITEM (selection)); - - new_channel = GIMP_CHANNEL (gimp_item_duplicate (GIMP_ITEM (selection), - GIMP_TYPE_CHANNEL)); - - /* saved selections are not visible by default */ - gimp_item_set_visible (GIMP_ITEM (new_channel), FALSE, FALSE); - - gimp_image_add_channel (image, new_channel, - GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE); - - return new_channel; -} - GeglBuffer * gimp_selection_extract (GimpSelection *selection, GimpPickable *pickable, diff --git a/app/core/gimpselection.h b/app/core/gimpselection.h index f7de1ecf67..b0936a295b 100644 --- a/app/core/gimpselection.h +++ b/app/core/gimpselection.h @@ -54,10 +54,6 @@ GimpChannel * gimp_selection_new (GimpImage *image, gint gimp_selection_suspend (GimpSelection *selection); gint gimp_selection_resume (GimpSelection *selection); -void gimp_selection_load (GimpSelection *selection, - GimpChannel *channel); -GimpChannel * gimp_selection_save (GimpSelection *selection); - GeglBuffer * gimp_selection_extract (GimpSelection *selection, GimpPickable *pickable, GimpContext *context, diff --git a/app/core/gimpsymmetry-mirror.c b/app/core/gimpsymmetry-mirror.c index 0c6010e6a6..0f7b09ad02 100644 --- a/app/core/gimpsymmetry-mirror.c +++ b/app/core/gimpsymmetry-mirror.c @@ -243,7 +243,7 @@ gimp_mirror_set_property (GObject *object, break; case PROP_MIRROR_POSITION_X: - if (g_value_get_double (value) > 0.0 && + if (g_value_get_double (value) >= 0.0 && g_value_get_double (value) < (gdouble) gimp_image_get_width (image)) { mirror->mirror_position_x = g_value_get_double (value); @@ -264,7 +264,7 @@ gimp_mirror_set_property (GObject *object, break; case PROP_MIRROR_POSITION_Y: - if (g_value_get_double (value) > 0.0 && + if (g_value_get_double (value) >= 0.0 && g_value_get_double (value) < (gdouble) gimp_image_get_height (image)) { mirror->mirror_position_y = g_value_get_double (value); @@ -520,20 +520,24 @@ gimp_mirror_remove_guide (GimpMirror *mirror, guide = (orientation == GIMP_ORIENTATION_HORIZONTAL) ? mirror->horizontal_guide : mirror->vertical_guide; - g_signal_handlers_disconnect_by_func (G_OBJECT (guide), - gimp_mirror_guide_removed_cb, - mirror); - g_signal_handlers_disconnect_by_func (G_OBJECT (guide), - gimp_mirror_guide_position_cb, - mirror); + /* The guide may have already been removed, for instance from GUI. */ + if (guide) + { + g_signal_handlers_disconnect_by_func (G_OBJECT (guide), + gimp_mirror_guide_removed_cb, + mirror); + g_signal_handlers_disconnect_by_func (G_OBJECT (guide), + gimp_mirror_guide_position_cb, + mirror); - gimp_image_remove_guide (image, guide, FALSE); - g_object_unref (guide); + gimp_image_remove_guide (image, guide, FALSE); + g_object_unref (guide); - if (orientation == GIMP_ORIENTATION_HORIZONTAL) - mirror->horizontal_guide = NULL; - else - mirror->vertical_guide = NULL; + if (orientation == GIMP_ORIENTATION_HORIZONTAL) + mirror->horizontal_guide = NULL; + else + mirror->vertical_guide = NULL; + } } static void @@ -554,8 +558,12 @@ gimp_mirror_guide_removed_cb (GObject *object, g_object_unref (mirror->horizontal_guide); mirror->horizontal_guide = NULL; - mirror->horizontal_mirror = FALSE; - mirror->point_symmetry = FALSE; + g_object_set (mirror, + "horizontal-symmetry", FALSE, + NULL); + g_object_set (mirror, + "point-symmetry", FALSE, + NULL); g_object_set (mirror, "mirror-position-y", 0.0, NULL); @@ -581,8 +589,12 @@ gimp_mirror_guide_removed_cb (GObject *object, g_object_unref (mirror->vertical_guide); mirror->vertical_guide = NULL; - mirror->vertical_mirror = FALSE; - mirror->point_symmetry = FALSE; + g_object_set (mirror, + "vertical-symmetry", FALSE, + NULL); + g_object_set (mirror, + "point-symmetry", FALSE, + NULL); g_object_set (mirror, "mirror-position-x", 0.0, NULL); diff --git a/app/core/gimpsymmetry-tiling.c b/app/core/gimpsymmetry-tiling.c index 7b519f83d1..dfd2db3d28 100644 --- a/app/core/gimpsymmetry-tiling.c +++ b/app/core/gimpsymmetry-tiling.c @@ -324,45 +324,106 @@ gimp_tiling_update_strokes (GimpSymmetry *sym, width = gimp_item_get_width (GIMP_ITEM (drawable)); height = gimp_item_get_height (GIMP_ITEM (drawable)); - if (origin->x > 0 && tiling->max_x == 0 && tiling->interval_x >= 1.0) - startx = fmod (origin->x, tiling->interval_x) - tiling->interval_x; - - if (origin->y > 0 && tiling->max_y == 0 && tiling->interval_y >= 1.0) + if (sym->stateful) { - starty = fmod (origin->y, tiling->interval_y) - tiling->interval_y; + /* While I can compute exactly the right number of strokes to + * paint on-canvas for stateless tools, stateful tools need to + * always have the same number and order of strokes. For this + * reason, I compute strokes to fill 2 times the width and height. + * This makes the symmetry less efficient with stateful tools, but + * also weird behavior may happen if you decide to paint out of + * canvas and expect tiling to work in-canvas since it won't + * actually be infinite (as no new strokes can be added while + * painting since we are stateful). + */ + gint i, j; - if (tiling->shift > 0.0) - startx -= tiling->shift * floor (origin->y / tiling->interval_y + 1); - } - - for (y_count = 0, y = starty; y < height + tiling->interval_y; - y_count++, y += tiling->interval_y) - { - if (tiling->max_y && y_count >= tiling->max_y) - break; - - for (x_count = 0, x = startx; x < width + tiling->interval_x; - x_count++, x += tiling->interval_x) + if (tiling->interval_x < 1.0) { - if (tiling->max_x && x_count >= tiling->max_x) - break; - - coords = g_memdup (origin, sizeof (GimpCoords)); - coords->x = x; - coords->y = y; - strokes = g_list_prepend (strokes, coords); - - if (tiling->interval_x < 1.0) - break; + x_count = 1; + } + else if (tiling->max_x == 0) + { + x_count = (gint) ceil (width / tiling->interval_x); + startx -= tiling->interval_x * (gdouble) x_count; + x_count = 2 * x_count + 1; + } + else + { + x_count = tiling->max_x; } - if (tiling->max_x || startx + tiling->shift <= 0.0) - startx = startx + tiling->shift; - else - startx = startx - tiling->interval_x + tiling->shift; - if (tiling->interval_y < 1.0) - break; + { + y_count = 1; + } + else if (tiling->max_y == 0) + { + y_count = (gint) ceil (height / tiling->interval_y); + starty -= tiling->interval_y * (gdouble) y_count; + y_count = 2 * y_count + 1; + } + else + { + y_count = tiling->max_y; + } + + for (i = 0, x = startx; i < x_count; i++) + { + for (j = 0, y = starty; j < y_count; j++) + { + coords = g_memdup (origin, sizeof (GimpCoords)); + coords->x = x; + coords->y = y; + strokes = g_list_prepend (strokes, coords); + + y += tiling->interval_y; + } + x += tiling->interval_x; + } + } + else + { + if (origin->x > 0 && tiling->max_x == 0 && tiling->interval_x >= 1.0) + startx = fmod (origin->x, tiling->interval_x) - tiling->interval_x; + + if (origin->y > 0 && tiling->max_y == 0 && tiling->interval_y >= 1.0) + { + starty = fmod (origin->y, tiling->interval_y) - tiling->interval_y; + + if (tiling->shift > 0.0) + startx -= tiling->shift * floor (origin->y / tiling->interval_y + 1); + } + + for (y_count = 0, y = starty; y < height + tiling->interval_y; + y_count++, y += tiling->interval_y) + { + if (tiling->max_y && y_count >= tiling->max_y) + break; + + for (x_count = 0, x = startx; x < width + tiling->interval_x; + x_count++, x += tiling->interval_x) + { + if (tiling->max_x && x_count >= tiling->max_x) + break; + + coords = g_memdup (origin, sizeof (GimpCoords)); + coords->x = x; + coords->y = y; + strokes = g_list_prepend (strokes, coords); + + if (tiling->interval_x < 1.0) + break; + } + + if (tiling->max_x || startx + tiling->shift <= 0.0) + startx = startx + tiling->shift; + else + startx = startx - tiling->interval_x + tiling->shift; + + if (tiling->interval_y < 1.0) + break; + } } sym->strokes = strokes; diff --git a/app/core/gimpsymmetry.c b/app/core/gimpsymmetry.c index d78aeafefa..d2d875aeba 100644 --- a/app/core/gimpsymmetry.c +++ b/app/core/gimpsymmetry.c @@ -52,6 +52,7 @@ enum PROP_0, PROP_IMAGE, PROP_ACTIVE, + PROP_VERSION, }; @@ -74,6 +75,7 @@ static GeglNode * gimp_symmetry_real_get_op (GimpSymmetry *sym, gint stroke, gint paint_width, gint paint_height); +static gboolean gimp_symmetry_real_update_version (GimpSymmetry *sym); G_DEFINE_TYPE_WITH_CODE (GimpSymmetry, gimp_symmetry, GIMP_TYPE_OBJECT, @@ -133,6 +135,7 @@ gimp_symmetry_class_init (GimpSymmetryClass *klass) klass->update_strokes = gimp_symmetry_real_update_strokes; klass->get_operation = gimp_symmetry_real_get_op; klass->active_changed = NULL; + klass->update_version = gimp_symmetry_real_update_version; g_object_class_install_property (object_class, PROP_IMAGE, g_param_spec_object ("image", @@ -146,6 +149,13 @@ gimp_symmetry_class_init (GimpSymmetryClass *klass) _("Activate symmetry painting"), FALSE, GIMP_PARAM_STATIC_STRINGS); + + GIMP_CONFIG_PROP_INT (object_class, PROP_VERSION, + "version", + "Symmetry version", + "Version of the symmetry object", + -1, G_MAXINT, 0, + GIMP_PARAM_STATIC_STRINGS); } static void @@ -186,6 +196,9 @@ gimp_symmetry_set_property (GObject *object, g_signal_emit (sym, gimp_symmetry_signals[ACTIVE_CHANGED], 0, sym->active); break; + case PROP_VERSION: + sym->version = g_value_get_int (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -208,6 +221,9 @@ gimp_symmetry_get_property (GObject *object, case PROP_ACTIVE: g_value_set_boolean (value, sym->active); break; + case PROP_VERSION: + g_value_set_int (value, sym->version); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -235,9 +251,54 @@ gimp_symmetry_real_get_op (GimpSymmetry *sym, return NULL; } +static gboolean +gimp_symmetry_real_update_version (GimpSymmetry *symmetry) +{ + /* Currently all symmetries are at version 0. So all this check has to + * do is verify that we are at version 0. + * If one of the child symmetry bumps its version, it will have to + * override the update_version() virtual function and do any necessary + * update there (for instance new properties, modified properties, or + * whatnot). + */ + gint version; + + g_object_get (symmetry, + "version", &version, + NULL); + + return (version == 0); +} /***** Public Functions *****/ +/** + * gimp_symmetry_set_stateful: + * @sym: the #GimpSymmetry + * @stateful: whether the symmetry should be stateful or stateless. + * + * By default, symmetry is made stateless, which means in particular + * that the size of points can change from one stroke to the next, and + * in particular you cannot map the coordinates from a stroke to the + * next. I.e. stroke N at time T+1 is not necessarily the continuation + * of stroke N at time T. + * To obtain corresponding strokes, stateful tools, such as MyPaint + * brushes or the ink tool, need to run this function. They should reset + * to stateless behavior once finished painting. + * + * One of the first consequence of being stateful is that the number of + * strokes cannot be changed, so more strokes than possible on canvas + * may be computed, and oppositely it will be possible to end up in + * cases with missing strokes (e.g. a tiling, theoretically infinite, + * won't be for the ink tool if one draws too far out of canvas). + **/ +void +gimp_symmetry_set_stateful (GimpSymmetry *symmetry, + gboolean stateful) +{ + symmetry->stateful = stateful; +} + /** * gimp_symmetry_set_origin: * @sym: the #GimpSymmetry @@ -394,21 +455,53 @@ gimp_symmetry_from_parasite (const GimpParasite *parasite, g_return_val_if_fail (strcmp (gimp_parasite_name (parasite), parasite_name) == 0, NULL); - g_free (parasite_name); str = gimp_parasite_data (parasite); g_return_val_if_fail (str != NULL, NULL); symmetry = gimp_image_symmetry_new (image, type); + g_object_set (symmetry, + "version", -1, + NULL); + if (! gimp_config_deserialize_string (GIMP_CONFIG (symmetry), str, gimp_parasite_data_size (parasite), NULL, &error)) { - g_warning ("Failed to deserialize symmetry parasite: %s", error->message); + g_printerr ("Failed to deserialize symmetry parasite: %s\n" + "\t- parasite name: %s\n\t- parasite data: %s\n", + error->message, parasite_name, str); g_error_free (error); + + g_object_unref (symmetry); + symmetry = NULL; + } + g_free (parasite_name); + + if (symmetry) + { + gint version; + + g_object_get (symmetry, + "version", &version, + NULL); + if (version == -1) + { + /* If version has not been updated, let's assume this parasite was + * not representing symmetry settings. + */ + g_object_unref (symmetry); + symmetry = NULL; + } + else if (GIMP_SYMMETRY_GET_CLASS (symmetry)->update_version (symmetry) && + ! GIMP_SYMMETRY_GET_CLASS (symmetry)->update_version (symmetry)) + { + g_object_unref (symmetry); + symmetry = NULL; + } } return symmetry; diff --git a/app/core/gimpsymmetry.h b/app/core/gimpsymmetry.h index 52a9bc73d1..9cd0317abe 100644 --- a/app/core/gimpsymmetry.h +++ b/app/core/gimpsymmetry.h @@ -47,8 +47,10 @@ struct _GimpSymmetry GimpDrawable *drawable; GimpCoords *origin; gboolean active; + gint version; GList *strokes; + gboolean stateful; }; struct _GimpSymmetryClass @@ -66,11 +68,15 @@ struct _GimpSymmetryClass gint paint_width, gint paint_height); void (* active_changed) (GimpSymmetry *symmetry); + + gboolean (* update_version) (GimpSymmetry *symmetry); }; GType gimp_symmetry_get_type (void) G_GNUC_CONST; +void gimp_symmetry_set_stateful (GimpSymmetry *symmetry, + gboolean stateful); void gimp_symmetry_set_origin (GimpSymmetry *symmetry, GimpDrawable *drawable, GimpCoords *origin); diff --git a/app/core/gimptag.c b/app/core/gimptag.c index e732f927ea..1d1ceff581 100644 --- a/app/core/gimptag.c +++ b/app/core/gimptag.c @@ -157,7 +157,7 @@ gimp_tag_get_internal (GimpTag *tag) * @tag: a gimp tag. * @inernal: desired tag internal status * - * Set internal status of the tag. Internal tags are usually automaticaly + * Set internal status of the tag. Internal tags are usually automatically * generated and will not be saved into users tag cache. * **/ diff --git a/app/core/gimptoolpreset.c b/app/core/gimptoolpreset.c index b99c7a2709..d26cafd2fc 100644 --- a/app/core/gimptoolpreset.c +++ b/app/core/gimptoolpreset.c @@ -36,7 +36,7 @@ /* The defaults are "everything except color", which is problematic - * with gradients, which is why we special case the blend tool in + * with gradients, which is why we special case the gradient tool in * gimp_tool_preset_set_options(). */ #define DEFAULT_USE_FG_BG FALSE @@ -397,7 +397,7 @@ gimp_tool_preset_deserialize_property (GimpConfig *config, g_scanner_error (scanner, "unable to determine type of '%s'", type_name); - *expected = G_TOKEN_STRING; + *expected = G_TOKEN_NONE; g_free (type_name); break; } @@ -407,7 +407,7 @@ gimp_tool_preset_deserialize_property (GimpConfig *config, g_scanner_error (scanner, "'%s' is not a subclass of GimpToolOptions", type_name); - *expected = G_TOKEN_STRING; + *expected = G_TOKEN_NONE; g_free (type_name); break; } @@ -541,7 +541,7 @@ gimp_tool_preset_set_options (GimpToolPreset *preset, g_object_set (preset, "use-font", FALSE, NULL); /* see comment above the DEFAULT defines at the top of the file */ - if (! g_strcmp0 ("gimp-blend-tool", + if (! g_strcmp0 ("gimp-gradient-tool", gimp_object_get_name (preset->tool_options->tool_info))) g_object_set (preset, "use-gradient", TRUE, NULL); diff --git a/app/core/gimpviewable.c b/app/core/gimpviewable.c index 678ccefbf5..21187e7d00 100644 --- a/app/core/gimpviewable.c +++ b/app/core/gimpviewable.c @@ -848,7 +848,7 @@ gimp_viewable_get_popup_size (GimpViewable *viewable, * method, and executes it, caching the result. If everything fails, * #NULL is returned. * - * Returns: A #GimpTempBuf containg the preview image, or #NULL if + * Returns: A #GimpTempBuf containing the preview image, or #NULL if * none can be found or created. **/ GimpTempBuf * @@ -911,7 +911,7 @@ gimp_viewable_get_preview (GimpViewable *viewable, * then if that fails for a "get_preview" method. This function does * not look for a cached preview. * - * Returns: A #GimpTempBuf containg the preview image, or #NULL if + * Returns: A #GimpTempBuf containing the preview image, or #NULL if * none can be found or created. **/ GimpTempBuf * diff --git a/app/dialogs/Makefile.in b/app/dialogs/Makefile.in index c7868b50bd..697b9de6b2 100644 --- a/app/dialogs/Makefile.in +++ b/app/dialogs/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -296,7 +297,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -369,6 +370,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -597,6 +599,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/dialogs/action-search-dialog.c b/app/dialogs/action-search-dialog.c index 78b1468247..b42a96bb4a 100644 --- a/app/dialogs/action-search-dialog.c +++ b/app/dialogs/action-search-dialog.c @@ -129,8 +129,9 @@ action_search_history_and_actions (GimpSearchPopup *popup, if (gimp_action_history_is_blacklisted_action (name)) continue; - if (! gtk_action_is_sensitive (action) && - ! GIMP_GUI_CONFIG (gimp->config)->search_show_unavailable) + if (! gtk_action_is_visible (action) || + (! gtk_action_is_sensitive (action) && + ! GIMP_GUI_CONFIG (gimp->config)->search_show_unavailable)) continue; if (action_search_match_keyword (action, keyword, §ion, gimp)) diff --git a/app/dialogs/dialogs.c b/app/dialogs/dialogs.c index ee744b868c..0445962e06 100644 --- a/app/dialogs/dialogs.c +++ b/app/dialogs/dialogs.c @@ -223,7 +223,6 @@ static GtkWidget * dialogs_restore_window (GimpDialogFactory *factory, static const GimpDialogFactoryEntry entries[] = { /* foreign toplevels without constructor */ - FOREIGN ("gimp-blend-tool-dialog", TRUE, FALSE), FOREIGN ("gimp-brightness-contrast-tool-dialog", TRUE, FALSE), FOREIGN ("gimp-color-balance-tool-dialog", TRUE, FALSE), FOREIGN ("gimp-color-picker-tool-dialog", TRUE, TRUE), @@ -233,6 +232,7 @@ static const GimpDialogFactoryEntry entries[] = FOREIGN ("gimp-desaturate-tool-dialog", TRUE, FALSE), FOREIGN ("gimp-foreground-select-tool-dialog", TRUE, FALSE), FOREIGN ("gimp-gegl-tool-dialog", TRUE, FALSE), + FOREIGN ("gimp-gradient-tool-dialog", TRUE, FALSE), FOREIGN ("gimp-hue-saturation-tool-dialog", TRUE, FALSE), FOREIGN ("gimp-levels-tool-dialog", TRUE, TRUE), FOREIGN ("gimp-measure-tool-dialog", TRUE, FALSE), @@ -324,7 +324,7 @@ static const GimpDialogFactoryEntry entries[] = dialogs_cursor_view_new, 0, TRUE), DOCKABLE ("gimp-dashboard", N_("Dashboard"), N_("Dashboard"), GIMP_ICON_DIALOG_DASHBOARD, - GIMP_HELP_ERRORS_DIALOG, + GIMP_HELP_DASHBOARD_DIALOG, dialogs_dashboard_new, 0, TRUE), /* list & grid views */ diff --git a/app/dialogs/file-open-location-dialog.c b/app/dialogs/file-open-location-dialog.c index a7b00b218a..1c8fc8b110 100644 --- a/app/dialogs/file-open-location-dialog.c +++ b/app/dialogs/file-open-location-dialog.c @@ -149,10 +149,10 @@ file_open_location_response (GtkDialog *dialog, GtkWidget *box; const gchar *text = NULL; + box = g_object_get_data (G_OBJECT (dialog), "progress-box"); + if (response_id != GTK_RESPONSE_OK) { - box = g_object_get_data (G_OBJECT (dialog), "progress-box"); - if (box && GIMP_PROGRESS_BOX (box)->active) gimp_progress_cancel (GIMP_PROGRESS (box)); else @@ -162,10 +162,6 @@ file_open_location_response (GtkDialog *dialog, } entry = g_object_get_data (G_OBJECT (dialog), "location-entry"); - - gtk_editable_set_editable (GTK_EDITABLE (entry), FALSE); - gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_OK, FALSE); - text = gtk_entry_get_text (GTK_ENTRY (entry)); if (text && strlen (text)) @@ -188,12 +184,15 @@ file_open_location_response (GtkDialog *dialog, file = file_utils_filename_to_file (gimp, text, &error); } - box = gimp_progress_box_new (); - gtk_container_set_border_width (GTK_CONTAINER (box), 12); - gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), - box, FALSE, FALSE, 0); + if (!box) + { + box = gimp_progress_box_new (); + gtk_container_set_border_width (GTK_CONTAINER (box), 12); + gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + box, FALSE, FALSE, 0); - g_object_set_data (G_OBJECT (dialog), "progress-box", box); + g_object_set_data (G_OBJECT (dialog), "progress-box", box); + } if (file) { @@ -201,6 +200,9 @@ file_open_location_response (GtkDialog *dialog, gtk_widget_show (box); + gtk_editable_set_editable (GTK_EDITABLE (entry), FALSE); + gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_OK, FALSE); + image = file_open_with_proc_and_display (gimp, gimp_get_user_context (gimp), GIMP_PROGRESS (box), @@ -210,6 +212,9 @@ file_open_location_response (GtkDialog *dialog, gimp_widget_get_monitor (entry), &status, &error); + gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_OK, TRUE); + gtk_editable_set_editable (GTK_EDITABLE (entry), TRUE); + g_object_unref (entered_file); if (image == NULL && status != GIMP_PDB_CANCEL) @@ -221,6 +226,12 @@ file_open_location_response (GtkDialog *dialog, } g_object_unref (file); + + if (image != NULL) + { + gtk_widget_destroy (GTK_WIDGET (dialog)); + return; + } } else { @@ -228,15 +239,8 @@ file_open_location_response (GtkDialog *dialog, _("Opening '%s' failed:\n\n%s"), text, error->message); g_clear_error (&error); - - gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_OK, TRUE); - gtk_editable_set_editable (GTK_EDITABLE (entry), TRUE); - - return; } } - - gtk_widget_destroy (GTK_WIDGET (dialog)); } static gboolean diff --git a/app/dialogs/palette-import-dialog.c b/app/dialogs/palette-import-dialog.c index 261b125cf1..4ca95b835d 100644 --- a/app/dialogs/palette-import-dialog.c +++ b/app/dialogs/palette-import-dialog.c @@ -792,6 +792,7 @@ palette_import_make_palette (ImportDialog *private) palette = gimp_palette_import_from_gradient (gradient, private->context, FALSE, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, palette_name, n_colors); } diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index e676ce34f9..f061cb5b81 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -476,6 +476,10 @@ prefs_dialog_defaults_reset (GtkWidget *widget, gimp_config_reset_property (config, pspec->name); } + gimp_config_reset_property (config, "filter-tool-max-recent"); + gimp_config_reset_property (config, "filter-tool-use-last-settings"); + gimp_config_reset_property (config, "filter-tool-show-color-options"); + g_object_thaw_notify (config); g_free (pspecs); @@ -1236,7 +1240,7 @@ prefs_dialog_new (Gimp *gimp, table = prefs_table_new (1, GTK_CONTAINER (vbox2)); button = prefs_enum_combo_box_add (object, "debug-policy", 0, 0, - _("Debug Policy"), + _("Debug _policy:"), GTK_TABLE (table), 0, size_group); /* Check existence of gdb or lldb to activate the preference, as a @@ -2163,6 +2167,22 @@ prefs_dialog_new (Gimp *gimp, _("Enable dithering of text layers"), GTK_BOX (vbox2)); + /* Filter Dialogs */ + vbox2 = prefs_frame_new (_("Filter Dialogs"), + GTK_CONTAINER (vbox), FALSE); + table = prefs_table_new (1, GTK_CONTAINER (vbox2)); + + prefs_spin_button_add (object, "filter-tool-max-recent", 1.0, 8.0, 0, + _("Keep recent settings:"), + GTK_TABLE (table), 1, size_group); + + button = prefs_check_button_add (object, "filter-tool-use-last-settings", + _("Default to the last used settings"), + GTK_BOX (vbox2)); + button = prefs_check_button_add (object, "filter-tool-show-color-options", + _("Show advanced color options"), + GTK_BOX (vbox2)); + /* Canvas Size Dialog */ vbox2 = prefs_frame_new (_("Canvas Size Dialog"), GTK_CONTAINER (vbox), FALSE); diff --git a/app/display/Makefile.am b/app/display/Makefile.am index 5df014ed6f..5cc0a7debb 100644 --- a/app/display/Makefile.am +++ b/app/display/Makefile.am @@ -2,6 +2,8 @@ if PLATFORM_OSX xobjective_c = "-xobjective-c" +xobjective_cxx = "-xobjective-c++" +xnone = "-xnone" endif AM_CPPFLAGS = \ @@ -12,9 +14,17 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/app \ $(GEGL_CFLAGS) \ $(GTK_CFLAGS) \ - -I$(includedir) \ + -I$(includedir) + +AM_CFLAGS = \ $(xobjective_c) +AM_CXXFLAGS = \ + $(xobjective_cxx) + +AM_LDFLAGS = \ + $(xnone) + noinst_LIBRARIES = libappdisplay.a libappdisplay_a_sources = \ @@ -168,6 +178,8 @@ libappdisplay_a_sources = \ gimptoolgui.h \ gimptoolcompass.c \ gimptoolcompass.h \ + gimptoolgyroscope.c \ + gimptoolgyroscope.h \ gimptoolhandlegrid.c \ gimptoolhandlegrid.h \ gimptoolline.c \ diff --git a/app/display/Makefile.in b/app/display/Makefile.in index 1fc65c311c..daf06f578e 100644 --- a/app/display/Makefile.in +++ b/app/display/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -174,11 +175,12 @@ am__objects_2 = gimpcanvas.$(OBJEXT) gimpcanvas-style.$(OBJEXT) \ gimpnavigationeditor.$(OBJEXT) gimpscalecombobox.$(OBJEXT) \ gimpsinglewindowstrategy.$(OBJEXT) gimpstatusbar.$(OBJEXT) \ gimptooldialog.$(OBJEXT) gimptoolgui.$(OBJEXT) \ - gimptoolcompass.$(OBJEXT) gimptoolhandlegrid.$(OBJEXT) \ - gimptoolline.$(OBJEXT) gimptoolpath.$(OBJEXT) \ - gimptoolpolygon.$(OBJEXT) gimptoolrectangle.$(OBJEXT) \ - gimptoolrotategrid.$(OBJEXT) gimptoolsheargrid.$(OBJEXT) \ - gimptooltransformgrid.$(OBJEXT) gimptoolwidget.$(OBJEXT) + gimptoolcompass.$(OBJEXT) gimptoolgyroscope.$(OBJEXT) \ + gimptoolhandlegrid.$(OBJEXT) gimptoolline.$(OBJEXT) \ + gimptoolpath.$(OBJEXT) gimptoolpolygon.$(OBJEXT) \ + gimptoolrectangle.$(OBJEXT) gimptoolrotategrid.$(OBJEXT) \ + gimptoolsheargrid.$(OBJEXT) gimptooltransformgrid.$(OBJEXT) \ + gimptoolwidget.$(OBJEXT) am_libappdisplay_a_OBJECTS = $(am__objects_1) $(am__objects_2) libappdisplay_a_OBJECTS = $(am_libappdisplay_a_OBJECTS) AM_V_P = $(am__v_P_@AM_V@) @@ -327,7 +329,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -400,6 +402,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -628,6 +631,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -647,6 +651,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @PLATFORM_OSX_TRUE@xobjective_c = "-xobjective-c" +@PLATFORM_OSX_TRUE@xobjective_cxx = "-xobjective-c++" +@PLATFORM_OSX_TRUE@xnone = "-xnone" AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"Gimp-Display\" \ -I$(top_builddir) \ @@ -655,9 +661,17 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/app \ $(GEGL_CFLAGS) \ $(GTK_CFLAGS) \ - -I$(includedir) \ + -I$(includedir) + +AM_CFLAGS = \ $(xobjective_c) +AM_CXXFLAGS = \ + $(xobjective_cxx) + +AM_LDFLAGS = \ + $(xnone) + noinst_LIBRARIES = libappdisplay.a libappdisplay_a_sources = \ display-enums.h \ @@ -810,6 +824,8 @@ libappdisplay_a_sources = \ gimptoolgui.h \ gimptoolcompass.c \ gimptoolcompass.h \ + gimptoolgyroscope.c \ + gimptoolgyroscope.h \ gimptoolhandlegrid.c \ gimptoolhandlegrid.h \ gimptoolline.c \ @@ -964,6 +980,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolcompass.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptooldialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolgui.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolgyroscope.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolhandlegrid.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolline.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolpath.Po@am__quote@ diff --git a/app/display/gimpcursorview.c b/app/display/gimpcursorview.c index 4b8ccfa5ed..6ec54da09b 100644 --- a/app/display/gimpcursorview.c +++ b/app/display/gimpcursorview.c @@ -320,6 +320,8 @@ gimp_cursor_view_init (GimpCursorView *view) view->priv->color_frame_1 = gimp_color_frame_new (); gimp_color_frame_set_mode (GIMP_COLOR_FRAME (view->priv->color_frame_1), GIMP_COLOR_FRAME_MODE_PIXEL); + gimp_color_frame_set_ellipsize (GIMP_COLOR_FRAME (view->priv->color_frame_1), + PANGO_ELLIPSIZE_END); gtk_box_pack_start (GTK_BOX (view->priv->color_hbox), view->priv->color_frame_1, TRUE, TRUE, 0); gtk_widget_show (view->priv->color_frame_1); diff --git a/app/display/gimpdisplay.c b/app/display/gimpdisplay.c index 0ed57dedd4..5966b6607b 100644 --- a/app/display/gimpdisplay.c +++ b/app/display/gimpdisplay.c @@ -50,7 +50,10 @@ #include "gimp-intl.h" -#define FLUSH_NOW_INTERVAL 20000 /* 20 ms in microseconds */ +#define FLUSH_NOW_INTERVAL 20000 /* 20 ms in microseconds */ + +#define PAINT_AREA_CHUNK_WIDTH 32 +#define PAINT_AREA_CHUNK_HEIGHT 32 enum @@ -902,5 +905,13 @@ gimp_display_paint_area (GimpDisplay *display, x2 = ceil (x2_f + 0.5); y2 = ceil (y2_f + 0.5); + /* align transformed area to a coarse grid, to simplify the + * invalidated area + */ + x1 = floor ((gdouble) x1 / PAINT_AREA_CHUNK_WIDTH) * PAINT_AREA_CHUNK_WIDTH; + y1 = floor ((gdouble) y1 / PAINT_AREA_CHUNK_HEIGHT) * PAINT_AREA_CHUNK_HEIGHT; + x2 = ceil ((gdouble) x2 / PAINT_AREA_CHUNK_WIDTH) * PAINT_AREA_CHUNK_WIDTH; + y2 = ceil ((gdouble) y2 / PAINT_AREA_CHUNK_HEIGHT) * PAINT_AREA_CHUNK_HEIGHT; + gimp_display_shell_expose_area (shell, x1, y1, x2 - x1, y2 - y1); } diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c index 590c491ac6..b6bdd96f81 100644 --- a/app/display/gimpdisplayshell-callbacks.c +++ b/app/display/gimpdisplayshell-callbacks.c @@ -129,6 +129,20 @@ gimp_display_shell_canvas_realize (GtkWidget *canvas, gtk_widget_show (shell->vrule); } +void +gimp_display_shell_canvas_realize_after (GtkWidget *canvas, + GimpDisplayShell *shell) +{ + GimpImageWindow *window = gimp_display_shell_get_window (shell); + + /* HACK: see above: must go with GTK+ 3.x too. Restore the rulers' + * intended visibility again. + */ + gimp_image_window_suspend_keep_pos (window); + gimp_display_shell_appearance_update (shell); + gimp_image_window_resume_keep_pos (window); +} + void gimp_display_shell_canvas_size_allocate (GtkWidget *widget, GtkAllocation *allocation, diff --git a/app/display/gimpdisplayshell-callbacks.h b/app/display/gimpdisplayshell-callbacks.h index 2fca4e5ff7..9764f56a8b 100644 --- a/app/display/gimpdisplayshell-callbacks.h +++ b/app/display/gimpdisplayshell-callbacks.h @@ -21,6 +21,8 @@ void gimp_display_shell_canvas_realize (GtkWidget *widget, GimpDisplayShell *shell); +void gimp_display_shell_canvas_realize_after (GtkWidget *widget, + GimpDisplayShell *shell); void gimp_display_shell_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc, GimpDisplayShell *shell); diff --git a/app/display/gimpdisplayshell-render.c b/app/display/gimpdisplayshell-render.c index 58e7c239c7..a3851371f6 100644 --- a/app/display/gimpdisplayshell-render.c +++ b/app/display/gimpdisplayshell-render.c @@ -66,7 +66,6 @@ gimp_display_shell_render (GimpDisplayShell *shell, gint mask_src_y = 0; gint cairo_stride; guchar *cairo_data; - GeglBuffer *cairo_buffer; g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); g_return_if_fail (cr != NULL); @@ -89,12 +88,6 @@ gimp_display_shell_render (GimpDisplayShell *shell, cairo_data = cairo_image_surface_get_data (xfer) + xfer_src_y * cairo_stride + xfer_src_x * 4; - cairo_buffer = gegl_buffer_linear_new_from_data (cairo_data, - babl_format ("cairo-ARGB32"), - GEGL_RECTANGLE (0, 0, w, h), - cairo_stride, - NULL, NULL); - if (shell->profile_transform || gimp_display_shell_has_filter (shell)) { @@ -234,14 +227,22 @@ gimp_display_shell_render (GimpDisplayShell *shell, } else { + GeglBuffer *buffer = + gegl_buffer_linear_new_from_data (cairo_data, + babl_format ("cairo-ARGB32"), + GEGL_RECTANGLE (0, 0, w, h), + cairo_stride, + NULL, NULL); + /* otherwise, convert the profile_buffer directly into * the cairo_buffer */ gimp_color_transform_process_buffer (shell->profile_transform, shell->profile_buffer, GEGL_RECTANGLE (0, 0, w, h), - cairo_buffer, + buffer, GEGL_RECTANGLE (0, 0, w, h)); + g_object_unref (buffer); } } @@ -277,8 +278,6 @@ gimp_display_shell_render (GimpDisplayShell *shell, #endif } - g_object_unref (cairo_buffer); - #ifdef USE_NODE_BLIT gimp_projectable_end_render (GIMP_PROJECTABLE (image)); #endif diff --git a/app/display/gimpdisplayshell-tool-events.c b/app/display/gimpdisplayshell-tool-events.c index da4d7ba67a..4325bf3f86 100644 --- a/app/display/gimpdisplayshell-tool-events.c +++ b/app/display/gimpdisplayshell-tool-events.c @@ -100,7 +100,7 @@ static void gimp_display_shell_handle_scrolling (GimpDisplayShe static void gimp_display_shell_space_pressed (GimpDisplayShell *shell, const GdkEvent *event); -static void gimp_display_shell_space_released (GimpDisplayShell *shell, +static void gimp_display_shell_released (GimpDisplayShell *shell, const GdkEvent *event, const GimpCoords *image_coords); @@ -205,7 +205,9 @@ gimp_display_shell_events (GtkWidget *widget, break; default: - if (shell->space_release_pending || shell->scrolling) + if (shell->space_release_pending || + shell->button1_release_pending || + shell->scrolling) return TRUE; break; } @@ -679,7 +681,9 @@ gimp_display_shell_canvas_tool_events_internal (GtkWidget *canvas, GdkModifierType button_state; /* ignore new mouse events */ - if (gimp->busy || shell->scrolling || shell->pointer_grabbed) + if (gimp->busy || shell->scrolling || + shell->pointer_grabbed || + shell->button1_release_pending) return TRUE; button_state = gimp_display_shell_button_to_state (bevent->button); @@ -846,6 +850,12 @@ gimp_display_shell_canvas_tool_events_internal (GtkWidget *canvas, gimp_display_shell_autoscroll_stop (shell); + if (bevent->button == 1 && shell->button1_release_pending) + { + gimp_display_shell_released (shell, event, NULL); + return TRUE; + } + if (gimp->busy) return TRUE; @@ -1263,7 +1273,10 @@ gimp_display_shell_canvas_tool_events_internal (GtkWidget *canvas, case GDK_KEY_space: case GDK_KEY_KP_Space: - gimp_display_shell_space_pressed (shell, event); + if (shell->button1_release_pending) + shell->space_release_pending = TRUE; + else + gimp_display_shell_space_pressed (shell, event); return_val = TRUE; break; @@ -1364,7 +1377,20 @@ gimp_display_shell_canvas_tool_events_internal (GtkWidget *canvas, { case GDK_KEY_space: case GDK_KEY_KP_Space: - gimp_display_shell_space_released (shell, event, NULL); + if ((state & GDK_BUTTON1_MASK)) + { + shell->button1_release_pending = TRUE; + shell->space_release_pending = FALSE; + /* We need to ungrab the pointer in order to catch + * button release events. + */ + if (shell->pointer_grabbed) + gimp_display_shell_pointer_ungrab (shell, event); + } + else + { + gimp_display_shell_released (shell, event, NULL); + } return_val = TRUE; break; @@ -1535,7 +1561,11 @@ gimp_display_shell_stop_scrolling (GimpDisplayShell *shell, shell->rotate_drag_angle = 0.0; shell->scaling = FALSE; - gimp_display_shell_pointer_ungrab (shell, event); + /* We may have ungrabbed the pointer when space was released while + * mouse was down, to be able to catch a GDK_BUTTON_RELEASE event. + */ + if (shell->pointer_grabbed) + gimp_display_shell_pointer_ungrab (shell, event); } static void @@ -1638,13 +1668,14 @@ gimp_display_shell_space_pressed (GimpDisplayShell *shell, } static void -gimp_display_shell_space_released (GimpDisplayShell *shell, - const GdkEvent *event, - const GimpCoords *image_coords) +gimp_display_shell_released (GimpDisplayShell *shell, + const GdkEvent *event, + const GimpCoords *image_coords) { Gimp *gimp = gimp_display_get_gimp (shell->display); - if (! shell->space_release_pending) + if (! shell->space_release_pending && + ! shell->button1_release_pending) return; switch (shell->display->config->space_bar_action) @@ -1684,7 +1715,8 @@ gimp_display_shell_space_released (GimpDisplayShell *shell, gimp_display_shell_keyboard_ungrab (shell, event); - shell->space_release_pending = FALSE; + shell->space_release_pending = FALSE; + shell->button1_release_pending = FALSE; } static gboolean diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c index e7f896526d..0e39aafa25 100644 --- a/app/display/gimpdisplayshell.c +++ b/app/display/gimpdisplayshell.c @@ -604,6 +604,9 @@ gimp_display_shell_constructed (GObject *object) g_signal_connect (shell->canvas, "realize", G_CALLBACK (gimp_display_shell_canvas_realize), shell); + g_signal_connect (shell->canvas, "realize", + G_CALLBACK (gimp_display_shell_canvas_realize_after), + shell); g_signal_connect (shell->canvas, "size-allocate", G_CALLBACK (gimp_display_shell_canvas_size_allocate), shell); @@ -773,7 +776,7 @@ gimp_display_shell_constructed (GObject *object) gimp_display_shell_connect (shell); /* After connecting to the image we want to center it. Since we - * not even finnished creating the display shell, we can safely + * not even finished creating the display shell, we can safely * assume we will get a size-allocate later. */ gimp_display_shell_scroll_center_image_on_size_allocate (shell, diff --git a/app/display/gimpdisplayshell.h b/app/display/gimpdisplayshell.h index d5aababa8c..b00f975f04 100644 --- a/app/display/gimpdisplayshell.h +++ b/app/display/gimpdisplayshell.h @@ -189,7 +189,13 @@ struct _GimpDisplayShell gboolean inferior_ignore_mode; + /* Two states are possible when the shell is grabbed: it can be + * grabbed with space (or space+button1 which is the same state), + * then if space is released but button1 was still pressed, we wait + * for button1 to be released as well. + */ gboolean space_release_pending; + gboolean button1_release_pending; const gchar *space_shaded_tool; gboolean scrolling; diff --git a/app/display/gimpdisplayxfer.c b/app/display/gimpdisplayxfer.c index 3932377d41..1d5207054b 100644 --- a/app/display/gimpdisplayxfer.c +++ b/app/display/gimpdisplayxfer.c @@ -72,10 +72,11 @@ rtree_node_create (RTree *rtree, gimp_assert (x >= 0 && x+w <= rtree->root.w); gimp_assert (y >= 0 && y+h <= rtree->root.h); - node = g_slice_alloc (sizeof (*node)); - if (node == NULL) + if (w <= 0 || h <= 0) return NULL; + node = g_slice_alloc (sizeof (*node)); + node->children[0] = NULL; node->children[1] = NULL; node->x = x; @@ -148,10 +149,6 @@ rtree_insert (RTree *rtree, { RTreeNode *node, **prev; - for (prev = &rtree->available; (node = *prev); prev = &node->next) - if (node->w >= w && w < 2 * node->w && node->h >= h && h < 2 * node->h) - return rtree_node_insert (rtree, prev, node, w, h); - for (prev = &rtree->available; (node = *prev); prev = &node->next) if (node->w >= w && node->h >= h) return rtree_node_insert (rtree, prev, node, w, h); diff --git a/app/display/gimpimagewindow.c b/app/display/gimpimagewindow.c index 7040e8fada..51a7c913b9 100644 --- a/app/display/gimpimagewindow.c +++ b/app/display/gimpimagewindow.c @@ -478,6 +478,7 @@ gimp_image_window_constructed (GObject *object) gtk_paned_pack1 (GTK_PANED (private->right_hpane), private->notebook, TRUE, TRUE); + g_signal_connect (private->notebook, "switch-page", G_CALLBACK (gimp_image_window_switch_page), window); @@ -1641,7 +1642,7 @@ gimp_image_window_get_first_dockbook (GimpDockColumns *columns) * dockables should be put in single-window mode. * * Returns: The default dockbook for new dockables, or NULL if no - * dockbook were avaialble. + * dockbook were available. **/ GtkWidget * gimp_image_window_get_default_dockbook (GimpImageWindow *window) diff --git a/app/display/gimpmotionbuffer.c b/app/display/gimpmotionbuffer.c index 23b6be0aec..e69bb680a3 100644 --- a/app/display/gimpmotionbuffer.c +++ b/app/display/gimpmotionbuffer.c @@ -243,7 +243,7 @@ gimp_motion_buffer_end_stroke (GimpMotionBuffer *buffer) * tilt values, to allow for even more dynamic brushes. Calculated * distance to last event is stored in GimpCoords because its a * sideproduct of velocity calculation and is currently calculated in - * each tool. If they were to use this distance, more resouces on + * each tool. If they were to use this distance, more resources on * recalculating the same value would be saved. * * Return value: %TRUE if the motion was significant enough to be diff --git a/app/display/gimpmotionbuffer.h b/app/display/gimpmotionbuffer.h index 29373871e6..e03027d0a3 100644 --- a/app/display/gimpmotionbuffer.h +++ b/app/display/gimpmotionbuffer.h @@ -50,7 +50,7 @@ struct _GimpMotionBuffer GArray *event_history; GArray *event_queue; - gboolean event_delay; /* TRUE if theres an unsent event in + gboolean event_delay; /* TRUE if there's an unsent event in * the history buffer */ diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c index 224ebee3a9..49684d2b79 100644 --- a/app/display/gimpstatusbar.c +++ b/app/display/gimpstatusbar.c @@ -46,17 +46,20 @@ #include "gimp-intl.h" -/* maximal width of the string holding the cursor-coordinates */ -#define CURSOR_LEN 256 +/* maximal width of the string holding the cursor-coordinates */ +#define CURSOR_LEN 256 -/* the spacing of the hbox */ -#define HBOX_SPACING 1 +/* the spacing of the hbox */ +#define HBOX_SPACING 1 -/* spacing between the icon and the statusbar label */ -#define ICON_SPACING 2 +/* spacing between the icon and the statusbar label */ +#define ICON_SPACING 2 -/* timeout (in milliseconds) for temporary statusbar messages */ -#define MESSAGE_TIMEOUT 8000 +/* timeout (in milliseconds) for temporary statusbar messages */ +#define MESSAGE_TIMEOUT 8000 + +/* minimal interval (in microseconds) between progress updates */ +#define MIN_PROGRESS_UPDATE_INTERVAL 50000 typedef struct _GimpStatusbarMsg GimpStatusbarMsg; @@ -442,8 +445,9 @@ gimp_statusbar_progress_start (GimpProgress *progress, GtkWidget *bar = statusbar->progressbar; GtkAllocation allocation; - statusbar->progress_active = TRUE; - statusbar->progress_value = 0.0; + statusbar->progress_active = TRUE; + statusbar->progress_value = 0.0; + statusbar->progress_last_update_time = g_get_monotonic_time (); gimp_statusbar_push (statusbar, "progress", NULL, "%s", message); gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), 0.0); @@ -557,21 +561,32 @@ gimp_statusbar_progress_set_value (GimpProgress *progress, if (statusbar->progress_active) { - GtkWidget *bar = statusbar->progressbar; - GtkAllocation allocation; + guint64 time = g_get_monotonic_time (); - gtk_widget_get_allocation (bar, &allocation); - - statusbar->progress_value = percentage; - - /* only update the progress bar if this causes a visible change */ - if (fabs (allocation.width * - (percentage - - gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (bar)))) > 1.0) + if (time - statusbar->progress_last_update_time >= + MIN_PROGRESS_UPDATE_INTERVAL) { - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), percentage); + GtkWidget *bar = statusbar->progressbar; + GtkAllocation allocation; + gdouble diff; - gimp_widget_flush_expose (bar); + gtk_widget_get_allocation (bar, &allocation); + + statusbar->progress_value = percentage; + + diff = fabs (percentage - + gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (bar))); + + /* only update the progress bar if this causes a visible change */ + if (allocation.width * diff >= 1.0) + { + statusbar->progress_last_update_time = time; + + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), + percentage); + + gimp_widget_flush_expose (bar); + } } } } @@ -594,11 +609,19 @@ gimp_statusbar_progress_pulse (GimpProgress *progress) if (statusbar->progress_active) { - GtkWidget *bar = statusbar->progressbar; + guint64 time = g_get_monotonic_time (); - gtk_progress_bar_pulse (GTK_PROGRESS_BAR (bar)); + if (time - statusbar->progress_last_update_time >= + MIN_PROGRESS_UPDATE_INTERVAL) + { + GtkWidget *bar = statusbar->progressbar; - gimp_widget_flush_expose (bar); + statusbar->progress_last_update_time = time; + + gtk_progress_bar_pulse (GTK_PROGRESS_BAR (bar)); + + gimp_widget_flush_expose (bar); + } } } diff --git a/app/display/gimpstatusbar.h b/app/display/gimpstatusbar.h index f6fe69540e..4e7a8079a7 100644 --- a/app/display/gimpstatusbar.h +++ b/app/display/gimpstatusbar.h @@ -68,6 +68,7 @@ struct _GimpStatusbar gboolean progress_active; gboolean progress_shown; gdouble progress_value; + guint64 progress_last_update_time; }; struct _GimpStatusbarClass diff --git a/app/display/gimptoolgyroscope.c b/app/display/gimptoolgyroscope.c new file mode 100644 index 0000000000..ebd22dbea2 --- /dev/null +++ b/app/display/gimptoolgyroscope.c @@ -0,0 +1,868 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * gimptoolgyroscope.c + * Copyright (C) 2018 Ell + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "config.h" + +#include +#include +#include + +#include "libgimpmath/gimpmath.h" + +#include "display-types.h" + +#include "widgets/gimpwidgets-utils.h" + +#include "gimpdisplayshell.h" +#include "gimpdisplayshell-transform.h" +#include "gimptoolgyroscope.h" + +#include "gimp-intl.h" + + +#define EPSILON 1e-6 +#define DEG_TO_RAD (G_PI / 180.0) + + +typedef enum +{ + MODE_NONE, + MODE_PAN, + MODE_ROTATE, + MODE_ZOOM +} Mode; + +typedef enum +{ + CONSTRAINT_NONE, + CONSTRAINT_UNKNOWN, + CONSTRAINT_HORIZONTAL, + CONSTRAINT_VERTICAL +} Constraint; + +enum +{ + PROP_0, + PROP_YAW, + PROP_PITCH, + PROP_ROLL, + PROP_ZOOM, + PROP_INVERT, + PROP_SPEED, + PROP_PIVOT_X, + PROP_PIVOT_Y +}; + +struct _GimpToolGyroscopePrivate +{ + gdouble yaw; + gdouble pitch; + gdouble roll; + gdouble zoom; + + gdouble orig_yaw; + gdouble orig_pitch; + gdouble orig_roll; + gdouble orig_zoom; + + gboolean invert; + + gdouble speed; + + gdouble pivot_x; + gdouble pivot_y; + + Mode mode; + Constraint constraint; + + gdouble last_x; + gdouble last_y; + + gdouble last_angle; + gdouble curr_angle; + + gdouble last_zoom; +}; + + +/* local function prototypes */ + +static void gimp_tool_gyroscope_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); +static void gimp_tool_gyroscope_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec); + +static gint gimp_tool_gyroscope_button_press (GimpToolWidget *widget, + const GimpCoords *coords, + guint32 time, + GdkModifierType state, + GimpButtonPressType press_type); +static void gimp_tool_gyroscope_button_release (GimpToolWidget *widget, + const GimpCoords *coords, + guint32 time, + GdkModifierType state, + GimpButtonReleaseType release_type); +static void gimp_tool_gyroscope_motion (GimpToolWidget *widget, + const GimpCoords *coords, + guint32 time, + GdkModifierType state); +static void gimp_tool_gyroscope_hover (GimpToolWidget *widget, + const GimpCoords *coords, + GdkModifierType state, + gboolean proximity); +static gboolean gimp_tool_gyroscope_key_press (GimpToolWidget *widget, + GdkEventKey *kevent); +static void gimp_tool_gyroscope_motion_modifier (GimpToolWidget *widget, + GdkModifierType key, + gboolean press, + GdkModifierType state); +static gboolean gimp_tool_gyroscope_get_cursor (GimpToolWidget *widget, + const GimpCoords *coords, + GdkModifierType state, + GimpCursorType *cursor, + GimpToolCursorType *tool_cursor, + GimpCursorModifier *modifier); + +static void gimp_tool_gyroscope_update_status (GimpToolGyroscope *gyroscope, + GdkModifierType state); + +static void gimp_tool_gyroscope_save (GimpToolGyroscope *gyroscope); +static void gimp_tool_gyroscope_restore (GimpToolGyroscope *gyroscope); + +static void gimp_tool_gyroscope_rotate (GimpToolGyroscope *gyroscope, + const GimpVector3 *axis); +static void gimp_tool_gyroscope_rotate_vector (GimpVector3 *vector, + const GimpVector3 *axis); + + +G_DEFINE_TYPE (GimpToolGyroscope, gimp_tool_gyroscope, GIMP_TYPE_TOOL_WIDGET) + +#define parent_class gimp_tool_gyroscope_parent_class + + +static void +gimp_tool_gyroscope_class_init (GimpToolGyroscopeClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + GimpToolWidgetClass *widget_class = GIMP_TOOL_WIDGET_CLASS (klass); + + object_class->set_property = gimp_tool_gyroscope_set_property; + object_class->get_property = gimp_tool_gyroscope_get_property; + + widget_class->button_press = gimp_tool_gyroscope_button_press; + widget_class->button_release = gimp_tool_gyroscope_button_release; + widget_class->motion = gimp_tool_gyroscope_motion; + widget_class->hover = gimp_tool_gyroscope_hover; + widget_class->key_press = gimp_tool_gyroscope_key_press; + widget_class->motion_modifier = gimp_tool_gyroscope_motion_modifier; + widget_class->get_cursor = gimp_tool_gyroscope_get_cursor; + + g_object_class_install_property (object_class, PROP_YAW, + g_param_spec_double ("yaw", NULL, NULL, + -G_MAXDOUBLE, + +G_MAXDOUBLE, + 0.0, + GIMP_PARAM_READWRITE | + G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, PROP_PITCH, + g_param_spec_double ("pitch", NULL, NULL, + -G_MAXDOUBLE, + +G_MAXDOUBLE, + 0.0, + GIMP_PARAM_READWRITE | + G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, PROP_ROLL, + g_param_spec_double ("roll", NULL, NULL, + -G_MAXDOUBLE, + +G_MAXDOUBLE, + 0.0, + GIMP_PARAM_READWRITE | + G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, PROP_ZOOM, + g_param_spec_double ("zoom", NULL, NULL, + 0.0, + +G_MAXDOUBLE, + 1.0, + GIMP_PARAM_READWRITE | + G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, PROP_INVERT, + g_param_spec_boolean ("invert", NULL, NULL, + FALSE, + GIMP_PARAM_READWRITE | + G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, PROP_SPEED, + g_param_spec_double ("speed", NULL, NULL, + -G_MAXDOUBLE, + +G_MAXDOUBLE, + 1.0, + GIMP_PARAM_READWRITE | + G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, PROP_PIVOT_X, + g_param_spec_double ("pivot-x", NULL, NULL, + -G_MAXDOUBLE, + +G_MAXDOUBLE, + 0.0, + GIMP_PARAM_READWRITE | + G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, PROP_PIVOT_Y, + g_param_spec_double ("pivot-y", NULL, NULL, + -G_MAXDOUBLE, + +G_MAXDOUBLE, + 0.0, + GIMP_PARAM_READWRITE | + G_PARAM_CONSTRUCT)); + + g_type_class_add_private (klass, sizeof (GimpToolGyroscopePrivate)); +} + +static void +gimp_tool_gyroscope_init (GimpToolGyroscope *gyroscope) +{ + gyroscope->private = G_TYPE_INSTANCE_GET_PRIVATE (gyroscope, + GIMP_TYPE_TOOL_GYROSCOPE, + GimpToolGyroscopePrivate); +} + +static void +gimp_tool_gyroscope_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + GimpToolGyroscope *gyroscope = GIMP_TOOL_GYROSCOPE (object); + GimpToolGyroscopePrivate *private = gyroscope->private; + + switch (property_id) + { + case PROP_YAW: + private->yaw = g_value_get_double (value); + break; + case PROP_PITCH: + private->pitch = g_value_get_double (value); + break; + case PROP_ROLL: + private->roll = g_value_get_double (value); + break; + case PROP_ZOOM: + private->zoom = g_value_get_double (value); + break; + case PROP_INVERT: + private->invert = g_value_get_boolean (value); + break; + case PROP_SPEED: + private->speed = g_value_get_double (value); + break; + case PROP_PIVOT_X: + private->pivot_x = g_value_get_double (value); + break; + case PROP_PIVOT_Y: + private->pivot_y = g_value_get_double (value); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +gimp_tool_gyroscope_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + GimpToolGyroscope *gyroscope = GIMP_TOOL_GYROSCOPE (object); + GimpToolGyroscopePrivate *private = gyroscope->private; + + switch (property_id) + { + case PROP_YAW: + g_value_set_double (value, private->yaw); + break; + case PROP_PITCH: + g_value_set_double (value, private->pitch); + break; + case PROP_ROLL: + g_value_set_double (value, private->roll); + break; + case PROP_ZOOM: + g_value_set_double (value, private->zoom); + break; + case PROP_INVERT: + g_value_set_boolean (value, private->invert); + break; + case PROP_SPEED: + g_value_set_double (value, private->speed); + break; + case PROP_PIVOT_X: + g_value_set_double (value, private->pivot_x); + break; + case PROP_PIVOT_Y: + g_value_set_double (value, private->pivot_y); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static gint +gimp_tool_gyroscope_button_press (GimpToolWidget *widget, + const GimpCoords *coords, + guint32 time, + GdkModifierType state, + GimpButtonPressType press_type) +{ + GimpToolGyroscope *gyroscope = GIMP_TOOL_GYROSCOPE (widget); + GimpToolGyroscopePrivate *private = gyroscope->private; + + gimp_tool_gyroscope_save (gyroscope); + + if (state & GDK_MOD1_MASK) + { + private->mode = MODE_ZOOM; + + private->last_zoom = private->zoom; + } + else if (state & gimp_get_extend_selection_mask ()) + { + private->mode = MODE_ROTATE; + + private->last_angle = atan2 (coords->y - private->pivot_y, + coords->x - private->pivot_x); + private->curr_angle = private->last_angle; + } + else + { + private->mode = MODE_PAN; + + if (state & gimp_get_constrain_behavior_mask ()) + private->constraint = CONSTRAINT_UNKNOWN; + else + private->constraint = CONSTRAINT_NONE; + } + + private->last_x = coords->x; + private->last_y = coords->y; + + gimp_tool_gyroscope_update_status (gyroscope, state); + + return 1; +} + +static void +gimp_tool_gyroscope_button_release (GimpToolWidget *widget, + const GimpCoords *coords, + guint32 time, + GdkModifierType state, + GimpButtonReleaseType release_type) +{ + GimpToolGyroscope *gyroscope = GIMP_TOOL_GYROSCOPE (widget); + GimpToolGyroscopePrivate *private = gyroscope->private; + + if (release_type == GIMP_BUTTON_RELEASE_CANCEL) + gimp_tool_gyroscope_restore (gyroscope); + + private->mode = MODE_NONE; + + gimp_tool_gyroscope_update_status (gyroscope, state); +} + +static void +gimp_tool_gyroscope_motion (GimpToolWidget *widget, + const GimpCoords *coords, + guint32 time, + GdkModifierType state) +{ + GimpToolGyroscope *gyroscope = GIMP_TOOL_GYROSCOPE (widget); + GimpToolGyroscopePrivate *private = gyroscope->private; + GimpDisplayShell *shell = gimp_tool_widget_get_shell (widget); + GimpVector3 axis = {}; + + switch (private->mode) + { + case MODE_PAN: + { + gdouble x1 = private->last_x; + gdouble y1 = private->last_y; + gdouble x2 = coords->x; + gdouble y2 = coords->y; + gdouble factor = 1.0 / private->zoom; + + if (private->constraint != CONSTRAINT_NONE) + { + gimp_display_shell_rotate_xy_f (shell, x1, y1, &x1, &y1); + gimp_display_shell_rotate_xy_f (shell, x2, y2, &x2, &y2); + + if (private->constraint == CONSTRAINT_UNKNOWN) + { + if (fabs (x2 - x1) > fabs (y2 - y1)) + private->constraint = CONSTRAINT_HORIZONTAL; + else if (fabs (y2 - y1) > fabs (x2 - x1)) + private->constraint = CONSTRAINT_VERTICAL; + } + + if (private->constraint == CONSTRAINT_HORIZONTAL) + y2 = y1; + else if (private->constraint == CONSTRAINT_VERTICAL) + x2 = x1; + + gimp_display_shell_unrotate_xy_f (shell, x1, y1, &x1, &y1); + gimp_display_shell_unrotate_xy_f (shell, x2, y2, &x2, &y2); + } + + if (private->invert) + factor = 1.0 / factor; + + gimp_vector3_set (&axis, y2 - y1, x2 - x1, 0.0); + gimp_vector3_mul (&axis, factor * private->speed); + } + break; + + case MODE_ROTATE: + { + gdouble angle; + + angle = atan2 (coords->y - private->pivot_y, + coords->x - private->pivot_x); + + private->curr_angle = angle; + + angle -= private->last_angle; + + if (state & gimp_get_constrain_behavior_mask ()) + angle = RINT (angle / (G_PI / 6.0)) * (G_PI / 6.0); + + gimp_vector3_set (&axis, 0.0, 0.0, angle); + + private->last_angle += angle; + } + break; + + case MODE_ZOOM: + { + gdouble x1, y1; + gdouble x2, y2; + gdouble zoom; + + gimp_display_shell_transform_xy_f (shell, + private->last_x, private->last_y, + &x1, &y1); + gimp_display_shell_transform_xy_f (shell, + coords->x, coords->y, + &x2, &y2); + + zoom = (y1 - y2) * shell->scale_y / 128.0; + + if (private->invert) + zoom = -zoom; + + private->last_zoom *= pow (2.0, zoom); + + zoom = log (private->last_zoom / private->zoom) / G_LN2; + + if (state & gimp_get_constrain_behavior_mask ()) + zoom = RINT (zoom * 2.0) / 2.0; + + g_object_set (gyroscope, + "zoom", private->zoom * pow (2.0, zoom), + NULL); + } + break; + + case MODE_NONE: + g_return_if_reached (); + } + + private->last_x = coords->x; + private->last_y = coords->y; + + gimp_tool_gyroscope_rotate (gyroscope, &axis); +} + +static void +gimp_tool_gyroscope_hover (GimpToolWidget *widget, + const GimpCoords *coords, + GdkModifierType state, + gboolean proximity) +{ + gimp_tool_gyroscope_update_status (GIMP_TOOL_GYROSCOPE (widget), state); +} + +static gboolean +gimp_tool_gyroscope_key_press (GimpToolWidget *widget, + GdkEventKey *kevent) +{ + GimpToolGyroscope *gyroscope = GIMP_TOOL_GYROSCOPE (widget); + GimpToolGyroscopePrivate *private = gyroscope->private; + GimpDisplayShell *shell = gimp_tool_widget_get_shell (widget); + GimpVector3 axis = {}; + gboolean fast; + gboolean result = FALSE; + + fast = (kevent->state & gimp_get_constrain_behavior_mask ()); + + if (kevent->state & GDK_MOD1_MASK) + { + /* zoom */ + gdouble zoom = 0.0; + + switch (kevent->keyval) + { + case GDK_KEY_Up: + zoom = fast ? +1.0 : +1.0 / 8.0; + result = TRUE; + break; + + case GDK_KEY_Down: + zoom = fast ? -1.0 : -1.0 / 8.0; + result = TRUE; + break; + } + + if (private->invert) + zoom = -zoom; + + if (zoom) + { + g_object_set (gyroscope, + "zoom", private->zoom * pow (2.0, zoom), + NULL); + } + } + else if (kevent->state & gimp_get_extend_selection_mask ()) + { + /* rotate */ + gdouble angle = 0.0; + + switch (kevent->keyval) + { + case GDK_KEY_Left: + angle = fast ? +15.0 : +1.0; + result = TRUE; + break; + + case GDK_KEY_Right: + angle = fast ? -15.0 : -1.0; + result = TRUE; + break; + } + + if (shell->flip_horizontally ^ shell->flip_vertically) + angle = -angle; + + gimp_vector3_set (&axis, 0.0, 0.0, angle * DEG_TO_RAD); + } + else + { + /* pan */ + gdouble x0 = 0.0; + gdouble y0 = 0.0; + gdouble x = 0.0; + gdouble y = 0.0; + gdouble factor = 1.0 / private->zoom; + + if (private->invert) + factor = 1.0 / factor; + + switch (kevent->keyval) + { + case GDK_KEY_Left: + x = fast ? +15.0 : +1.0; + result = TRUE; + break; + + case GDK_KEY_Right: + x = fast ? -15.0 : -1.0; + result = TRUE; + break; + + case GDK_KEY_Up: + y = fast ? +15.0 : +1.0; + result = TRUE; + break; + + case GDK_KEY_Down: + y = fast ? -15.0 : -1.0; + result = TRUE; + break; + } + + gimp_display_shell_unrotate_xy_f (shell, x0, y0, &x0, &y0); + gimp_display_shell_unrotate_xy_f (shell, x, y, &x, &y); + + gimp_vector3_set (&axis, + (y - y0) * DEG_TO_RAD, + (x - x0) * DEG_TO_RAD, + 0.0); + gimp_vector3_mul (&axis, factor); + } + + gimp_tool_gyroscope_rotate (gyroscope, &axis); + + return result; +} + +static void +gimp_tool_gyroscope_motion_modifier (GimpToolWidget *widget, + GdkModifierType key, + gboolean press, + GdkModifierType state) +{ + GimpToolGyroscope *gyroscope = GIMP_TOOL_GYROSCOPE (widget); + GimpToolGyroscopePrivate *private = gyroscope->private; + + gimp_tool_gyroscope_update_status (gyroscope, state); + + if (key == gimp_get_constrain_behavior_mask ()) + { + switch (private->mode) + { + case MODE_PAN: + if (state & gimp_get_constrain_behavior_mask ()) + private->constraint = CONSTRAINT_UNKNOWN; + else + private->constraint = CONSTRAINT_NONE; + break; + + case MODE_ROTATE: + if (! (state & gimp_get_constrain_behavior_mask ())) + private->last_angle = private->curr_angle; + break; + + case MODE_ZOOM: + if (! (state & gimp_get_constrain_behavior_mask ())) + private->last_zoom = private->zoom; + break; + + case MODE_NONE: + break; + } + } +} + +static gboolean +gimp_tool_gyroscope_get_cursor (GimpToolWidget *widget, + const GimpCoords *coords, + GdkModifierType state, + GimpCursorType *cursor, + GimpToolCursorType *tool_cursor, + GimpCursorModifier *modifier) +{ + if (state & GDK_MOD1_MASK) + *modifier = GIMP_CURSOR_MODIFIER_ZOOM; + else if (state & gimp_get_extend_selection_mask ()) + *modifier = GIMP_CURSOR_MODIFIER_ROTATE; + else + *modifier = GIMP_CURSOR_MODIFIER_MOVE; + + return TRUE; +} + +static void +gimp_tool_gyroscope_update_status (GimpToolGyroscope *gyroscope, + GdkModifierType state) +{ + GimpToolGyroscopePrivate *private = gyroscope->private; + gchar *status; + + if (private->mode == MODE_ZOOM || + (private->mode == MODE_NONE && + state & GDK_MOD1_MASK)) + { + status = gimp_suggest_modifiers (_("Click-Drag to zoom"), + gimp_get_toggle_behavior_mask () & + ~state, + NULL, + _("%s for constrained steps"), + NULL); + } + else if (private->mode == MODE_ROTATE || + (private->mode == MODE_NONE && + state & gimp_get_extend_selection_mask ())) + { + status = gimp_suggest_modifiers (_("Click-Drag to rotate"), + gimp_get_toggle_behavior_mask () & + ~state, + NULL, + _("%s for constrained angles"), + NULL); + } + else + { + status = gimp_suggest_modifiers (_("Click-Drag to pan"), + (((gimp_get_extend_selection_mask () | + GDK_MOD1_MASK) * + (private->mode == MODE_NONE)) | + gimp_get_toggle_behavior_mask ()) & + ~state, + _("%s to rotate"), + _("%s for a constrained axis"), + _("%s to zoom")); + } + + gimp_tool_widget_set_status (GIMP_TOOL_WIDGET (gyroscope), status); + + g_free (status); +} + +static void +gimp_tool_gyroscope_save (GimpToolGyroscope *gyroscope) +{ + GimpToolGyroscopePrivate *private = gyroscope->private; + + private->orig_yaw = private->yaw; + private->orig_pitch = private->pitch; + private->orig_roll = private->roll; + private->orig_zoom = private->zoom; +} + +static void +gimp_tool_gyroscope_restore (GimpToolGyroscope *gyroscope) +{ + GimpToolGyroscopePrivate *private = gyroscope->private; + + g_object_set (gyroscope, + "yaw", private->orig_yaw, + "pitch", private->orig_pitch, + "roll", private->orig_roll, + "zoom", private->orig_zoom, + NULL); +} + +static void +gimp_tool_gyroscope_rotate (GimpToolGyroscope *gyroscope, + const GimpVector3 *axis) +{ + GimpToolGyroscopePrivate *private = gyroscope->private; + GimpVector3 real_axis; + GimpVector3 basis[2]; + gdouble yaw; + gdouble pitch; + gdouble roll; + gint i; + + if (gimp_vector3_length (axis) < EPSILON) + return; + + real_axis = *axis; + + if (private->invert) + gimp_vector3_neg (&real_axis); + + for (i = 0; i < 2; i++) + { + gimp_vector3_set (&basis[i], i == 0, i == 1, 0.0); + + if (private->invert) + gimp_tool_gyroscope_rotate_vector (&basis[i], &real_axis); + + gimp_tool_gyroscope_rotate_vector ( + &basis[i], &(GimpVector3) {0.0, private->yaw * DEG_TO_RAD, 0.0}); + gimp_tool_gyroscope_rotate_vector ( + &basis[i], &(GimpVector3) {private->pitch * DEG_TO_RAD, 0.0, 0.0}); + gimp_tool_gyroscope_rotate_vector ( + &basis[i], &(GimpVector3) {0.0, 0.0, private->roll * DEG_TO_RAD}); + + if (! private->invert) + gimp_tool_gyroscope_rotate_vector (&basis[i], &real_axis); + } + + roll = atan2 (basis[1].x, basis[1].y); + + for (i = 0; i < 2; i++) + { + gimp_tool_gyroscope_rotate_vector ( + &basis[i], &(GimpVector3) {0.0, 0.0, -roll}); + } + + pitch = atan2 (-basis[1].z, basis[1].y); + + for (i = 0; i < 1; i++) + { + gimp_tool_gyroscope_rotate_vector ( + &basis[i], &(GimpVector3) {-pitch, 0.0, 0.0}); + } + + yaw = atan2 (basis[0].z, basis[0].x); + + g_object_set (gyroscope, + "yaw", yaw / DEG_TO_RAD, + "pitch", pitch / DEG_TO_RAD, + "roll", roll / DEG_TO_RAD, + NULL); +} + +static void +gimp_tool_gyroscope_rotate_vector (GimpVector3 *vector, + const GimpVector3 *axis) +{ + GimpVector3 normalized_axis; + GimpVector3 projection; + GimpVector3 u; + GimpVector3 v; + gdouble angle; + + angle = gimp_vector3_length (axis); + + if (angle < EPSILON) + return; + + normalized_axis = gimp_vector3_mul_val (*axis, 1.0 / angle); + + projection = gimp_vector3_mul_val ( + normalized_axis, + gimp_vector3_inner_product (vector, &normalized_axis)); + + u = gimp_vector3_sub_val (*vector, projection); + v = gimp_vector3_cross_product (&u, &normalized_axis); + + gimp_vector3_mul (&u, cos (angle)); + gimp_vector3_mul (&v, sin (angle)); + + gimp_vector3_add (vector, &u, &v); + gimp_vector3_add (vector, vector, &projection); +} + + +/* public functions */ + + +GimpToolWidget * +gimp_tool_gyroscope_new (GimpDisplayShell *shell) +{ + g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL); + + return g_object_new (GIMP_TYPE_TOOL_GYROSCOPE, + "shell", shell, + NULL); +} diff --git a/app/display/gimptoolgyroscope.h b/app/display/gimptoolgyroscope.h new file mode 100644 index 0000000000..da006206eb --- /dev/null +++ b/app/display/gimptoolgyroscope.h @@ -0,0 +1,58 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * gimptoolgyroscope.h + * Copyright (C) 2018 Ell + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __GIMP_TOOL_GYROSCOPE_H__ +#define __GIMP_TOOL_GYROSCOPE_H__ + + +#include "gimptoolwidget.h" + + +#define GIMP_TYPE_TOOL_GYROSCOPE (gimp_tool_gyroscope_get_type ()) +#define GIMP_TOOL_GYROSCOPE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_GYROSCOPE, GimpToolGyroscope)) +#define GIMP_TOOL_GYROSCOPE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_GYROSCOPE, GimpToolGyroscopeClass)) +#define GIMP_IS_TOOL_GYROSCOPE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_GYROSCOPE)) +#define GIMP_IS_TOOL_GYROSCOPE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_GYROSCOPE)) +#define GIMP_TOOL_GYROSCOPE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_GYROSCOPE, GimpToolGyroscopeClass)) + + +typedef struct _GimpToolGyroscope GimpToolGyroscope; +typedef struct _GimpToolGyroscopePrivate GimpToolGyroscopePrivate; +typedef struct _GimpToolGyroscopeClass GimpToolGyroscopeClass; + +struct _GimpToolGyroscope +{ + GimpToolWidget parent_instance; + + GimpToolGyroscopePrivate *private; +}; + +struct _GimpToolGyroscopeClass +{ + GimpToolWidgetClass parent_class; +}; + + +GType gimp_tool_gyroscope_get_type (void) G_GNUC_CONST; + +GimpToolWidget * gimp_tool_gyroscope_new (GimpDisplayShell *shell); + + +#endif /* __GIMP_TOOL_GYROSCOPE_H__ */ diff --git a/app/display/gimptoolrectangle.c b/app/display/gimptoolrectangle.c index ccfbbe207f..e726258551 100644 --- a/app/display/gimptoolrectangle.c +++ b/app/display/gimptoolrectangle.c @@ -1445,7 +1445,7 @@ gimp_tool_rectangle_button_press (GimpToolWidget *widget, * what coordinates the "other side" should have. If we are * creating a rectangle, use the current mouse coordinates as * the coordinate of the "other side", otherwise use the - * immidiate "other side" for that. + * immediate "other side" for that. */ private->other_side_x = snapped_x; private->other_side_y = snapped_y; @@ -1868,7 +1868,7 @@ gimp_tool_rectangle_motion_modifier (GimpToolWidget *widget, if (key == gimp_get_extend_selection_mask ()) { #if 0 - /* Here we want to handle manualy when to update the rectangle, so we + /* Here we want to handle manually when to update the rectangle, so we * don't want gimp_tool_rectangle_options_notify to do anything. */ g_signal_handlers_block_by_func (options, @@ -2299,7 +2299,7 @@ gimp_tool_rectangle_check_function (GimpToolRectangle *rectangle) /** * gimp_tool_rectangle_coord_outside: * - * Returns: %TRUE if the coord is outside the rectange bounds + * Returns: %TRUE if the coord is outside the rectangle bounds * including any outside handles. */ static gboolean @@ -3695,7 +3695,7 @@ gimp_tool_rectangle_get_constraints (GimpToolRectangle *rectangle, * gimp_tool_rectangle_handle_general_clamping: * @rectangle: A #GimpToolRectangle. * - * Make sure that contraints are applied to the rectangle, either by + * Make sure that constraints are applied to the rectangle, either by * manually doing it, or by looking at the rectangle tool options and * concluding it will be done later. */ diff --git a/app/errors.c b/app/errors.c index 6d63b2dd2b..ff0b8e08cc 100644 --- a/app/errors.c +++ b/app/errors.c @@ -325,8 +325,7 @@ gimp_eek (const gchar *reason, /* Let's just always output on stdout at least so that there is a * trace if the rest fails. */ - g_printerr ("%s: %s: %s\n", gimp_filename_to_utf8 (full_prog_name), - reason, message); + g_printerr ("%s: %s: %s\n", full_prog_name, reason, message); #if ! defined (G_OS_WIN32) || defined (HAVE_EXCHNDL) diff --git a/app/file/Makefile.in b/app/file/Makefile.in index 4d269c2c2b..c32a56e631 100644 --- a/app/file/Makefile.in +++ b/app/file/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -269,7 +270,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -342,6 +343,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -570,6 +572,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/gegl/Makefile.am b/app/gegl/Makefile.am index b62cc96b33..f7fca48d67 100644 --- a/app/gegl/Makefile.am +++ b/app/gegl/Makefile.am @@ -27,7 +27,7 @@ libappgegl_generic_a_sources = \ gimp-gegl.h \ gimp-gegl-apply-operation.c \ gimp-gegl-apply-operation.h \ - gimp-gegl-loops.c \ + gimp-gegl-loops.cc \ gimp-gegl-loops.h \ gimp-gegl-mask.c \ gimp-gegl-mask.h \ diff --git a/app/gegl/Makefile.in b/app/gegl/Makefile.in index be9949879c..fd40108630 100644 --- a/app/gegl/Makefile.in +++ b/app/gegl/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -176,6 +177,24 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(libappgegl_generic_a_SOURCES) $(libappgegl_sse2_a_SOURCES) \ $(libappgegl_a_SOURCES) DIST_SOURCES = $(libappgegl_generic_a_SOURCES) \ @@ -286,7 +305,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -359,6 +378,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -587,6 +607,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -632,7 +653,7 @@ libappgegl_generic_a_sources = \ gimp-gegl.h \ gimp-gegl-apply-operation.c \ gimp-gegl-apply-operation.h \ - gimp-gegl-loops.c \ + gimp-gegl-loops.cc \ gimp-gegl-loops.h \ gimp-gegl-mask.c \ gimp-gegl-mask.h \ @@ -668,7 +689,7 @@ CLEANFILES = $(gen_sources) all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .cc .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -768,6 +789,27 @@ libappgegl_sse2_a-gimp-gegl-loops-sse2.obj: gimp-gegl-loops-sse2.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappgegl_sse2_a_CFLAGS) $(CFLAGS) -c -o libappgegl_sse2_a-gimp-gegl-loops-sse2.obj `if test -f 'gimp-gegl-loops-sse2.c'; then $(CYGPATH_W) 'gimp-gegl-loops-sse2.c'; else $(CYGPATH_W) '$(srcdir)/gimp-gegl-loops-sse2.c'; fi` +.cc.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cc.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cc.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + mostlyclean-libtool: -rm -f *.lo diff --git a/app/gegl/gimp-babl.c b/app/gegl/gimp-babl.c index c29f39d4e7..129d53e265 100644 --- a/app/gegl/gimp-babl.c +++ b/app/gegl/gimp-babl.c @@ -257,7 +257,7 @@ void gimp_babl_init_fishes (GimpInitStatusFunc status_callback) { /* create a bunch of fishes - to decrease the initial lazy - * intialization cost for some interactions + * initialization cost for some interactions */ static const struct { diff --git a/app/gegl/gimp-gegl-loops.c b/app/gegl/gimp-gegl-loops.c deleted file mode 100644 index 62a2c55441..0000000000 --- a/app/gegl/gimp-gegl-loops.c +++ /dev/null @@ -1,823 +0,0 @@ -/* GIMP - The GNU Image Manipulation Program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * gimp-gegl-loops.c - * Copyright (C) 2012 Michael Natterer - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "config.h" - -#include - -#include -#include -#include - -#include "libgimpbase/gimpbase.h" -#include "libgimpcolor/gimpcolor.h" -#include "libgimpmath/gimpmath.h" - -#include "gimp-gegl-types.h" - -#include "gimp-babl.h" -#include "gimp-gegl-loops.h" -#include "gimp-gegl-loops-sse2.h" - -#include "core/gimp-utils.h" -#include "core/gimpprogress.h" - - -void -gimp_gegl_convolve (GeglBuffer *src_buffer, - const GeglRectangle *src_rect, - GeglBuffer *dest_buffer, - const GeglRectangle *dest_rect, - const gfloat *kernel, - gint kernel_size, - gdouble divisor, - GimpConvolutionType mode, - gboolean alpha_weighting) -{ - GeglBufferIterator *dest_iter; - gfloat *src; - gint src_rowstride; - - const Babl *src_format; - const Babl *dest_format; - gint src_components; - gint dest_components; - - src_format = gegl_buffer_get_format (src_buffer); - - if (babl_format_is_palette (src_format)) - src_format = gimp_babl_format (GIMP_RGB, - GIMP_PRECISION_FLOAT_LINEAR, - babl_format_has_alpha (src_format)); - else - src_format = gimp_babl_format (gimp_babl_format_get_base_type (src_format), - GIMP_PRECISION_FLOAT_LINEAR, - babl_format_has_alpha (src_format)); - - dest_format = gegl_buffer_get_format (dest_buffer); - - if (babl_format_is_palette (dest_format)) - dest_format = gimp_babl_format (GIMP_RGB, - GIMP_PRECISION_FLOAT_LINEAR, - babl_format_has_alpha (dest_format)); - else - dest_format = gimp_babl_format (gimp_babl_format_get_base_type (dest_format), - GIMP_PRECISION_FLOAT_LINEAR, - babl_format_has_alpha (dest_format)); - - src_components = babl_format_get_n_components (src_format); - dest_components = babl_format_get_n_components (dest_format); - - /* Set up dest iterator */ - dest_iter = gegl_buffer_iterator_new (dest_buffer, dest_rect, 0, dest_format, - GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE); - - /* Get source pixel data */ - src_rowstride = src_components * src_rect->width; - src = g_malloc (sizeof(gfloat) * src_rowstride * src_rect->height); - gegl_buffer_get (src_buffer, src_rect, 1.0, src_format, src, - GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE); - - while (gegl_buffer_iterator_next (dest_iter)) - { - /* Convolve the src image using the convolution kernel, writing - * to dest Convolve is not tile-enabled--use accordingly - */ - gfloat *dest = dest_iter->data[0]; - const gint components = src_components; - const gint a_component = components - 1; - const gint margin = kernel_size / 2; - const gint x1 = 0; - const gint y1 = 0; - const gint x2 = src_rect->width - 1; - const gint y2 = src_rect->height - 1; - const gint dest_x1 = dest_iter->roi[0].x; - const gint dest_y1 = dest_iter->roi[0].y; - const gint dest_x2 = dest_iter->roi[0].x + dest_iter->roi[0].width; - const gint dest_y2 = dest_iter->roi[0].y + dest_iter->roi[0].height; - gint x, y; - gfloat offset; - - /* If the mode is NEGATIVE_CONVOL, the offset should be 128 */ - if (mode == GIMP_NEGATIVE_CONVOL) - { - offset = 0.5; - mode = GIMP_NORMAL_CONVOL; - } - else - { - offset = 0.0; - } - - for (y = dest_y1; y < dest_y2; y++) - { - gfloat *d = dest; - - if (alpha_weighting) - { - for (x = dest_x1; x < dest_x2; x++) - { - const gfloat *m = kernel; - gdouble total[4] = { 0.0, 0.0, 0.0, 0.0 }; - gdouble weighted_divisor = 0.0; - gint i, j, b; - - for (j = y - margin; j <= y + margin; j++) - { - for (i = x - margin; i <= x + margin; i++, m++) - { - gint xx = CLAMP (i, x1, x2); - gint yy = CLAMP (j, y1, y2); - const gfloat *s = src + yy * src_rowstride + xx * components; - const gfloat a = s[a_component]; - - if (a) - { - gdouble mult_alpha = *m * a; - - weighted_divisor += mult_alpha; - - for (b = 0; b < a_component; b++) - total[b] += mult_alpha * s[b]; - - total[a_component] += mult_alpha; - } - } - } - - if (weighted_divisor == 0.0) - weighted_divisor = divisor; - - for (b = 0; b < a_component; b++) - total[b] /= weighted_divisor; - - total[a_component] /= divisor; - - for (b = 0; b < components; b++) - { - total[b] += offset; - - if (mode != GIMP_NORMAL_CONVOL && total[b] < 0.0) - total[b] = - total[b]; - - *d++ = CLAMP (total[b], 0.0, 1.0); - } - } - } - else - { - for (x = dest_x1; x < dest_x2; x++) - { - const gfloat *m = kernel; - gdouble total[4] = { 0.0, 0.0, 0.0, 0.0 }; - gint i, j, b; - - for (j = y - margin; j <= y + margin; j++) - { - for (i = x - margin; i <= x + margin; i++, m++) - { - gint xx = CLAMP (i, x1, x2); - gint yy = CLAMP (j, y1, y2); - const gfloat *s = src + yy * src_rowstride + xx * components; - - for (b = 0; b < components; b++) - total[b] += *m * s[b]; - } - } - - for (b = 0; b < components; b++) - { - total[b] = total[b] / divisor + offset; - - if (mode != GIMP_NORMAL_CONVOL && total[b] < 0.0) - total[b] = - total[b]; - - *d++ = CLAMP (total[b], 0.0, 1.0); - } - } - } - - dest += dest_iter->roi[0].width * dest_components; - } - } - - g_free (src); -} - -static inline gfloat -odd_powf (gfloat x, - gfloat y) -{ - if (x >= 0.0f) - return powf ( x, y); - else - return -powf (-x, y); -} - -void -gimp_gegl_dodgeburn (GeglBuffer *src_buffer, - const GeglRectangle *src_rect, - GeglBuffer *dest_buffer, - const GeglRectangle *dest_rect, - gdouble exposure, - GimpDodgeBurnType type, - GimpTransferMode mode) -{ - GeglBufferIterator *iter; - - if (type == GIMP_DODGE_BURN_TYPE_BURN) - exposure = -exposure; - - iter = gegl_buffer_iterator_new (src_buffer, src_rect, 0, - babl_format ("R'G'B'A float"), - GEGL_ACCESS_READ, GEGL_ABYSS_NONE); - - gegl_buffer_iterator_add (iter, dest_buffer, dest_rect, 0, - babl_format ("R'G'B'A float"), - GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE); - - switch (mode) - { - gfloat factor; - - case GIMP_TRANSFER_HIGHLIGHTS: - factor = 1.0 + exposure * (0.333333); - - while (gegl_buffer_iterator_next (iter)) - { - gfloat *src = iter->data[0]; - gfloat *dest = iter->data[1]; - gint count = iter->length; - - while (count--) - { - *dest++ = *src++ * factor; - *dest++ = *src++ * factor; - *dest++ = *src++ * factor; - - *dest++ = *src++; - } - } - break; - - case GIMP_TRANSFER_MIDTONES: - if (exposure < 0) - factor = 1.0 - exposure * (0.333333); - else - factor = 1.0 / (1.0 + exposure); - - while (gegl_buffer_iterator_next (iter)) - { - gfloat *src = iter->data[0]; - gfloat *dest = iter->data[1]; - gint count = iter->length; - - while (count--) - { - *dest++ = odd_powf (*src++, factor); - *dest++ = odd_powf (*src++, factor); - *dest++ = odd_powf (*src++, factor); - - *dest++ = *src++; - } - } - break; - - case GIMP_TRANSFER_SHADOWS: - if (exposure >= 0) - factor = 0.333333 * exposure; - else - factor = -0.333333 * exposure; - - while (gegl_buffer_iterator_next (iter)) - { - gfloat *src = iter->data[0]; - gfloat *dest = iter->data[1]; - gint count = iter->length; - - while (count--) - { - if (exposure >= 0) - { - gfloat s; - - s = *src++; *dest++ = factor + s - factor * s; - s = *src++; *dest++ = factor + s - factor * s; - s = *src++; *dest++ = factor + s - factor * s; - } - else - { - gfloat s; - - s = *src++; - if (s < factor) - *dest++ = 0; - else /* factor <= value <=1 */ - *dest++ = (s - factor) / (1.0 - factor); - - s = *src++; - if (s < factor) - *dest++ = 0; - else /* factor <= value <=1 */ - *dest++ = (s - factor) / (1.0 - factor); - - s = *src++; - if (s < factor) - *dest++ = 0; - else /* factor <= value <=1 */ - *dest++ = (s - factor) / (1.0 - factor); - } - - *dest++ = *src++; - } - } - break; - } -} - -/* helper function of gimp_gegl_smudge_with_paint_process() - src and dest can be the same address - */ -static inline void -gimp_gegl_smudge_with_paint_blend (const gfloat *src1, - gfloat src1_rate, - const gfloat *src2, - gfloat src2_rate, - gfloat *dest, - gboolean no_erasing_src2) -{ - gfloat orginal_src2_alpha; - gfloat src1_alpha; - gfloat src2_alpha; - gfloat result_alpha; - gint b; - - orginal_src2_alpha = src2[3]; - src1_alpha = src1_rate * src1[3]; - src2_alpha = src2_rate * orginal_src2_alpha; - result_alpha = src1_alpha + src2_alpha; - - if (result_alpha == 0) - { - memset (dest, 0, sizeof (gfloat) * 4); - return; - } - - for (b = 0; b < 3; b++) - dest[b] = (src1[b] * src1_alpha + src2[b] * src2_alpha) / result_alpha; - - if (no_erasing_src2) - { - result_alpha = MAX (result_alpha, orginal_src2_alpha); - } - - dest[3] = result_alpha; -} - -/* helper function of gimp_gegl_smudge_with_paint() */ -static void -gimp_gegl_smudge_with_paint_process (gfloat *accum, - const gfloat *canvas, - gfloat *paint, - gint count, - const gfloat *brush_color, - gfloat brush_a, - gboolean no_erasing, - gfloat flow, - gfloat rate) -{ - while (count--) - { - /* blend accum_buffer and canvas_buffer to accum_buffer */ - gimp_gegl_smudge_with_paint_blend (accum, rate, canvas, 1 - rate, - accum, no_erasing); - - /* blend accum_buffer and brush color/pixmap to paint_buffer */ - if (brush_a == 0) /* pure smudge */ - { - memcpy (paint, accum, sizeof (gfloat) * 4); - } - else - { - const gfloat *src1 = brush_color ? brush_color : paint; - - gimp_gegl_smudge_with_paint_blend (src1, flow, accum, 1 - flow, - paint, no_erasing); - } - - accum += 4; - canvas += 4; - paint += 4; - } -} - -/* smudge painting calculation. Currently only smudge tool uses this function - * Accum = rate*Accum + (1-rate)*Canvas - * if brush_color!=NULL - * Paint = flow*brushColor + (1-flow)*Accum - * else - * Paint = flow*Paint + (1-flow)*Accum - */ -void -gimp_gegl_smudge_with_paint (GeglBuffer *accum_buffer, - const GeglRectangle *accum_rect, - GeglBuffer *canvas_buffer, - const GeglRectangle *canvas_rect, - const GimpRGB *brush_color, - GeglBuffer *paint_buffer, - gboolean no_erasing, - gdouble flow, - gdouble rate) -{ - GeglBufferIterator *iter; - gfloat brush_color_float[4]; - gfloat brush_a = flow; - GeglAccessMode paint_buffer_access_mode = (brush_color ? - GEGL_ACCESS_WRITE : - GEGL_ACCESS_READWRITE); - gboolean sse2 = (gimp_cpu_accel_get_support () & - GIMP_CPU_ACCEL_X86_SSE2); - - iter = gegl_buffer_iterator_new (accum_buffer, accum_rect, 0, - babl_format ("RGBA float"), - GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE); - - gegl_buffer_iterator_add (iter, canvas_buffer, canvas_rect, 0, - babl_format ("RGBA float"), - GEGL_ACCESS_READ, GEGL_ABYSS_NONE); - - gegl_buffer_iterator_add (iter, paint_buffer, GEGL_RECTANGLE (0, 0, 0, 0), 0, - babl_format ("RGBA float"), - paint_buffer_access_mode, GEGL_ABYSS_NONE); - - /* convert brush color from double to float */ - if (brush_color) - { - const gdouble *brush_color_ptr = &brush_color->r; - gint b; - - for (b = 0; b < 4; b++) - brush_color_float[b] = brush_color_ptr[b]; - - brush_a *= brush_color_ptr[3]; - } - - while (gegl_buffer_iterator_next (iter)) - { - gfloat *accum = iter->data[0]; - const gfloat *canvas = iter->data[1]; - gfloat *paint = iter->data[2]; - gint count = iter->length; - -#if COMPILE_SSE2_INTRINISICS - if (sse2 && ((guintptr) accum | - (guintptr) canvas | - (guintptr) (brush_color ? brush_color_float : paint) | - (guintptr) paint) % 16 == 0) - { - gimp_gegl_smudge_with_paint_process_sse2 (accum, canvas, paint, count, - brush_color ? brush_color_float : - NULL, - brush_a, - no_erasing, flow, rate); - } - else -#endif - { - gimp_gegl_smudge_with_paint_process (accum, canvas, paint, count, - brush_color ? brush_color_float : - NULL, - brush_a, - no_erasing, flow, rate); - } - } -} - -void -gimp_gegl_apply_mask (GeglBuffer *mask_buffer, - const GeglRectangle *mask_rect, - GeglBuffer *dest_buffer, - const GeglRectangle *dest_rect, - gdouble opacity) -{ - GeglBufferIterator *iter; - - iter = gegl_buffer_iterator_new (mask_buffer, mask_rect, 0, - babl_format ("Y float"), - GEGL_ACCESS_READ, GEGL_ABYSS_NONE); - - gegl_buffer_iterator_add (iter, dest_buffer, dest_rect, 0, - babl_format ("RGBA float"), - GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE); - - while (gegl_buffer_iterator_next (iter)) - { - const gfloat *mask = iter->data[0]; - gfloat *dest = iter->data[1]; - gint count = iter->length; - - while (count--) - { - dest[3] *= *mask * opacity; - - mask += 1; - dest += 4; - } - } -} - -void -gimp_gegl_combine_mask (GeglBuffer *mask_buffer, - const GeglRectangle *mask_rect, - GeglBuffer *dest_buffer, - const GeglRectangle *dest_rect, - gdouble opacity) -{ - GeglBufferIterator *iter; - - iter = gegl_buffer_iterator_new (mask_buffer, mask_rect, 0, - babl_format ("Y float"), - GEGL_ACCESS_READ, GEGL_ABYSS_NONE); - - gegl_buffer_iterator_add (iter, dest_buffer, dest_rect, 0, - babl_format ("Y float"), - GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE); - - while (gegl_buffer_iterator_next (iter)) - { - const gfloat *mask = iter->data[0]; - gfloat *dest = iter->data[1]; - gint count = iter->length; - - while (count--) - { - *dest *= *mask * opacity; - - mask += 1; - dest += 1; - } - } -} - -void -gimp_gegl_combine_mask_weird (GeglBuffer *mask_buffer, - const GeglRectangle *mask_rect, - GeglBuffer *dest_buffer, - const GeglRectangle *dest_rect, - gdouble opacity, - gboolean stipple) -{ - GeglBufferIterator *iter; - - iter = gegl_buffer_iterator_new (mask_buffer, mask_rect, 0, - babl_format ("Y float"), - GEGL_ACCESS_READ, GEGL_ABYSS_NONE); - - gegl_buffer_iterator_add (iter, dest_buffer, dest_rect, 0, - babl_format ("Y float"), - GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE); - - while (gegl_buffer_iterator_next (iter)) - { - const gfloat *mask = iter->data[0]; - gfloat *dest = iter->data[1]; - gint count = iter->length; - - if (stipple) - { - while (count--) - { - dest[0] += (1.0 - dest[0]) * *mask * opacity; - - mask += 1; - dest += 1; - } - } - else - { - while (count--) - { - if (opacity > dest[0]) - dest[0] += (opacity - dest[0]) * *mask * opacity; - - mask += 1; - dest += 1; - } - } - } -} - -void -gimp_gegl_replace (GeglBuffer *top_buffer, - const GeglRectangle *top_rect, - GeglBuffer *bottom_buffer, - const GeglRectangle *bottom_rect, - GeglBuffer *mask_buffer, - const GeglRectangle *mask_rect, - GeglBuffer *dest_buffer, - const GeglRectangle *dest_rect, - gdouble opacity, - const gboolean *affect) -{ - GeglBufferIterator *iter; - - iter = gegl_buffer_iterator_new (top_buffer, top_rect, 0, - babl_format ("RGBA float"), - GEGL_ACCESS_READ, GEGL_ABYSS_NONE); - - gegl_buffer_iterator_add (iter, bottom_buffer, bottom_rect, 0, - babl_format ("RGBA float"), - GEGL_ACCESS_READ, GEGL_ABYSS_NONE); - - gegl_buffer_iterator_add (iter, mask_buffer, mask_rect, 0, - babl_format ("Y float"), - GEGL_ACCESS_READ, GEGL_ABYSS_NONE); - - gegl_buffer_iterator_add (iter, dest_buffer, dest_rect, 0, - babl_format ("RGBA float"), - GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE); - - while (gegl_buffer_iterator_next (iter)) - { - const gfloat *top = iter->data[0]; - const gfloat *bottom = iter->data[1]; - const gfloat *mask = iter->data[2]; - gfloat *dest = iter->data[3]; - gint count = iter->length; - - while (count--) - { - gint b; - gdouble mask_val = *mask * opacity; - - /* calculate new alpha first. */ - gfloat s1_a = bottom[3]; - gfloat s2_a = top[3]; - gdouble a_val = s1_a + mask_val * (s2_a - s1_a); - - if (a_val == 0.0) - { - /* In any case, write out versions of the blending - * function that result when combinations of s1_a, s2_a, - * and mask_val --> 0 (or mask_val -->1) - */ - - /* 1: s1_a, s2_a, AND mask_val all approach 0+: */ - /* 2: s1_a AND s2_a both approach 0+, regardless of mask_val: */ - if (s1_a + s2_a == 0.0) - { - for (b = 0; b < 3; b++) - { - gfloat new_val; - - new_val = bottom[b] + mask_val * (top[b] - bottom[b]); - - dest[b] = affect[b] ? new_val : bottom[b]; - } - } - - /* 3: mask_val AND s1_a both approach 0+, regardless of s2_a */ - else if (s1_a + mask_val == 0.0) - { - for (b = 0; b < 3; b++) - dest[b] = bottom[b]; - } - - /* 4: mask_val -->1 AND s2_a -->0, regardless of s1_a */ - else if (1.0 - mask_val + s2_a == 0.0) - { - for (b = 0; b < 3; b++) - dest[b] = affect[b] ? top[b] : bottom[b]; - } - } - else - { - gdouble a_recip = 1.0 / a_val; - - /* possible optimization: fold a_recip into s1_a and s2_a */ - for (b = 0; b < 3; b++) - { - gfloat new_val = a_recip * (bottom[b] * s1_a + mask_val * - (top[b] * s2_a - bottom[b] * s1_a)); - dest[b] = affect[b] ? new_val : bottom[b]; - } - } - - dest[3] = affect[3] ? a_val : s1_a; - - top += 4; - bottom += 4; - mask += 1; - dest += 4; - } - } -} - -void -gimp_gegl_index_to_mask (GeglBuffer *indexed_buffer, - const GeglRectangle *indexed_rect, - const Babl *indexed_format, - GeglBuffer *mask_buffer, - const GeglRectangle *mask_rect, - gint index) -{ - GeglBufferIterator *iter; - - iter = gegl_buffer_iterator_new (indexed_buffer, indexed_rect, 0, - indexed_format, - GEGL_ACCESS_READ, GEGL_ABYSS_NONE); - - gegl_buffer_iterator_add (iter, mask_buffer, mask_rect, 0, - babl_format ("Y float"), - GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE); - - while (gegl_buffer_iterator_next (iter)) - { - const guchar *indexed = iter->data[0]; - gfloat *mask = iter->data[1]; - gint count = iter->length; - - while (count--) - { - if (*indexed == index) - *mask = 1.0; - else - *mask = 0.0; - - indexed++; - mask++; - } - } -} - -void -gimp_gegl_convert_color_profile (GeglBuffer *src_buffer, - const GeglRectangle *src_rect, - GimpColorProfile *src_profile, - GeglBuffer *dest_buffer, - const GeglRectangle *dest_rect, - GimpColorProfile *dest_profile, - GimpColorRenderingIntent intent, - gboolean bpc, - GimpProgress *progress) -{ - GimpColorTransform *transform; - GimpColorTransformFlags flags = 0; - const Babl *src_format; - const Babl *dest_format; - - src_format = gegl_buffer_get_format (src_buffer); - dest_format = gegl_buffer_get_format (dest_buffer); - - if (bpc) - flags |= GIMP_COLOR_TRANSFORM_FLAGS_BLACK_POINT_COMPENSATION; - - flags |= GIMP_COLOR_TRANSFORM_FLAGS_NOOPTIMIZE; - - transform = gimp_color_transform_new (src_profile, src_format, - dest_profile, dest_format, - intent, flags); - - if (transform) - { - if (progress) - g_signal_connect_swapped (transform, "progress", - G_CALLBACK (gimp_progress_set_value), - progress); - - GIMP_TIMER_START (); - - gimp_color_transform_process_buffer (transform, - src_buffer, src_rect, - dest_buffer, dest_rect); - - GIMP_TIMER_END ("converting buffer"); - - g_object_unref (transform); - } - else - { - gegl_buffer_copy (src_buffer, src_rect, GEGL_ABYSS_NONE, - dest_buffer, dest_rect); - - if (progress) - gimp_progress_set_value (progress, 1.0); - } -} diff --git a/app/gegl/gimp-gegl-loops.cc b/app/gegl/gimp-gegl-loops.cc new file mode 100644 index 0000000000..d8f7503a6e --- /dev/null +++ b/app/gegl/gimp-gegl-loops.cc @@ -0,0 +1,919 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * gimp-gegl-loops.c + * Copyright (C) 2012 Michael Natterer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "config.h" + +#include + +#include +#include +#include + +extern "C" +{ + +#include "libgimpbase/gimpbase.h" +#include "libgimpcolor/gimpcolor.h" +#include "libgimpmath/gimpmath.h" + +#include "gimp-gegl-types.h" + +#include "gimp-babl.h" +#include "gimp-gegl-loops.h" +#include "gimp-gegl-loops-sse2.h" + +#include "core/gimp-parallel.h" +#include "core/gimp-utils.h" +#include "core/gimpprogress.h" + + +#define MIN_PARALLEL_SUB_SIZE 64 +#define MIN_PARALLEL_SUB_AREA (MIN_PARALLEL_SUB_SIZE * MIN_PARALLEL_SUB_SIZE) + +#define SHIFTED_AREA(dest, src) \ + const GeglRectangle dest##_area_ = { \ + src##_area->x + (dest##_rect->x - src##_rect->x), \ + src##_area->y + (dest##_rect->y - src##_rect->y), \ + src##_area->width, src##_area->height \ + }; \ + const GeglRectangle * const dest##_area = &dest##_area_ + + +void +gimp_gegl_convolve (GeglBuffer *src_buffer, + const GeglRectangle *src_rect, + GeglBuffer *dest_buffer, + const GeglRectangle *dest_rect, + const gfloat *kernel, + gint kernel_size, + gdouble divisor, + GimpConvolutionType mode, + gboolean alpha_weighting) +{ + gfloat *src; + gint src_rowstride; + + const Babl *src_format; + const Babl *dest_format; + gint src_components; + gint dest_components; + gfloat offset; + + src_format = gegl_buffer_get_format (src_buffer); + + if (babl_format_is_palette (src_format)) + src_format = gimp_babl_format (GIMP_RGB, + GIMP_PRECISION_FLOAT_LINEAR, + babl_format_has_alpha (src_format)); + else + src_format = gimp_babl_format (gimp_babl_format_get_base_type (src_format), + GIMP_PRECISION_FLOAT_LINEAR, + babl_format_has_alpha (src_format)); + + dest_format = gegl_buffer_get_format (dest_buffer); + + if (babl_format_is_palette (dest_format)) + dest_format = gimp_babl_format (GIMP_RGB, + GIMP_PRECISION_FLOAT_LINEAR, + babl_format_has_alpha (dest_format)); + else + dest_format = gimp_babl_format (gimp_babl_format_get_base_type (dest_format), + GIMP_PRECISION_FLOAT_LINEAR, + babl_format_has_alpha (dest_format)); + + src_components = babl_format_get_n_components (src_format); + dest_components = babl_format_get_n_components (dest_format); + + /* Get source pixel data */ + src_rowstride = src_components * src_rect->width; + src = g_new (gfloat, src_rowstride * src_rect->height); + gegl_buffer_get (src_buffer, src_rect, 1.0, src_format, src, + GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE); + + /* If the mode is NEGATIVE_CONVOL, the offset should be 0.5 */ + if (mode == GIMP_NEGATIVE_CONVOL) + { + offset = 0.5; + mode = GIMP_NORMAL_CONVOL; + } + else + { + offset = 0.0; + } + + gimp_parallel_distribute_area (dest_rect, MIN_PARALLEL_SUB_AREA, + [=] (const GeglRectangle *dest_area) + { + const gint components = src_components; + const gint a_component = components - 1; + const gint margin = kernel_size / 2; + GeglBufferIterator *dest_iter; + + /* Set up dest iterator */ + dest_iter = gegl_buffer_iterator_new (dest_buffer, dest_area, 0, dest_format, + GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE); + + while (gegl_buffer_iterator_next (dest_iter)) + { + /* Convolve the src image using the convolution kernel, writing + * to dest Convolve is not tile-enabled--use accordingly + */ + gfloat *dest = (gfloat *) dest_iter->data[0]; + const gint x1 = 0; + const gint y1 = 0; + const gint x2 = src_rect->width - 1; + const gint y2 = src_rect->height - 1; + const gint dest_x1 = dest_iter->roi[0].x; + const gint dest_y1 = dest_iter->roi[0].y; + const gint dest_x2 = dest_iter->roi[0].x + dest_iter->roi[0].width; + const gint dest_y2 = dest_iter->roi[0].y + dest_iter->roi[0].height; + gint x, y; + + for (y = dest_y1; y < dest_y2; y++) + { + gfloat *d = dest; + + if (alpha_weighting) + { + for (x = dest_x1; x < dest_x2; x++) + { + const gfloat *m = kernel; + gdouble total[4] = { 0.0, 0.0, 0.0, 0.0 }; + gdouble weighted_divisor = 0.0; + gint i, j, b; + + for (j = y - margin; j <= y + margin; j++) + { + for (i = x - margin; i <= x + margin; i++, m++) + { + gint xx = CLAMP (i, x1, x2); + gint yy = CLAMP (j, y1, y2); + const gfloat *s = src + yy * src_rowstride + xx * components; + const gfloat a = s[a_component]; + + if (a) + { + gdouble mult_alpha = *m * a; + + weighted_divisor += mult_alpha; + + for (b = 0; b < a_component; b++) + total[b] += mult_alpha * s[b]; + + total[a_component] += mult_alpha; + } + } + } + + if (weighted_divisor == 0.0) + weighted_divisor = divisor; + + for (b = 0; b < a_component; b++) + total[b] /= weighted_divisor; + + total[a_component] /= divisor; + + for (b = 0; b < components; b++) + { + total[b] += offset; + + if (mode != GIMP_NORMAL_CONVOL && total[b] < 0.0) + total[b] = - total[b]; + + *d++ = CLAMP (total[b], 0.0, 1.0); + } + } + } + else + { + for (x = dest_x1; x < dest_x2; x++) + { + const gfloat *m = kernel; + gdouble total[4] = { 0.0, 0.0, 0.0, 0.0 }; + gint i, j, b; + + for (j = y - margin; j <= y + margin; j++) + { + for (i = x - margin; i <= x + margin; i++, m++) + { + gint xx = CLAMP (i, x1, x2); + gint yy = CLAMP (j, y1, y2); + const gfloat *s = src + yy * src_rowstride + xx * components; + + for (b = 0; b < components; b++) + total[b] += *m * s[b]; + } + } + + for (b = 0; b < components; b++) + { + total[b] = total[b] / divisor + offset; + + if (mode != GIMP_NORMAL_CONVOL && total[b] < 0.0) + total[b] = - total[b]; + + *d++ = CLAMP (total[b], 0.0, 1.0); + } + } + } + + dest += dest_iter->roi[0].width * dest_components; + } + } + }); + + g_free (src); +} + +static inline gfloat +odd_powf (gfloat x, + gfloat y) +{ + if (x >= 0.0f) + return powf ( x, y); + else + return -powf (-x, y); +} + +void +gimp_gegl_dodgeburn (GeglBuffer *src_buffer, + const GeglRectangle *src_rect, + GeglBuffer *dest_buffer, + const GeglRectangle *dest_rect, + gdouble exposure, + GimpDodgeBurnType type, + GimpTransferMode mode) +{ + if (type == GIMP_DODGE_BURN_TYPE_BURN) + exposure = -exposure; + + gimp_parallel_distribute_area (src_rect, MIN_PARALLEL_SUB_AREA, + [=] (const GeglRectangle *src_area) + { + GeglBufferIterator *iter; + + SHIFTED_AREA (dest, src); + + iter = gegl_buffer_iterator_new (src_buffer, src_area, 0, + babl_format ("R'G'B'A float"), + GEGL_ACCESS_READ, GEGL_ABYSS_NONE); + + gegl_buffer_iterator_add (iter, dest_buffer, dest_area, 0, + babl_format ("R'G'B'A float"), + GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE); + + switch (mode) + { + gfloat factor; + + case GIMP_TRANSFER_HIGHLIGHTS: + factor = 1.0 + exposure * (0.333333); + + while (gegl_buffer_iterator_next (iter)) + { + gfloat *src = (gfloat *) iter->data[0]; + gfloat *dest = (gfloat *) iter->data[1]; + gint count = iter->length; + + while (count--) + { + *dest++ = *src++ * factor; + *dest++ = *src++ * factor; + *dest++ = *src++ * factor; + + *dest++ = *src++; + } + } + break; + + case GIMP_TRANSFER_MIDTONES: + if (exposure < 0) + factor = 1.0 - exposure * (0.333333); + else + factor = 1.0 / (1.0 + exposure); + + while (gegl_buffer_iterator_next (iter)) + { + gfloat *src = (gfloat *) iter->data[0]; + gfloat *dest = (gfloat *) iter->data[1]; + gint count = iter->length; + + while (count--) + { + *dest++ = odd_powf (*src++, factor); + *dest++ = odd_powf (*src++, factor); + *dest++ = odd_powf (*src++, factor); + + *dest++ = *src++; + } + } + break; + + case GIMP_TRANSFER_SHADOWS: + if (exposure >= 0) + factor = 0.333333 * exposure; + else + factor = -0.333333 * exposure; + + while (gegl_buffer_iterator_next (iter)) + { + gfloat *src = (gfloat *) iter->data[0]; + gfloat *dest = (gfloat *) iter->data[1]; + gint count = iter->length; + + while (count--) + { + if (exposure >= 0) + { + gfloat s; + + s = *src++; *dest++ = factor + s - factor * s; + s = *src++; *dest++ = factor + s - factor * s; + s = *src++; *dest++ = factor + s - factor * s; + } + else + { + gfloat s; + + s = *src++; + if (s < factor) + *dest++ = 0; + else /* factor <= value <=1 */ + *dest++ = (s - factor) / (1.0 - factor); + + s = *src++; + if (s < factor) + *dest++ = 0; + else /* factor <= value <=1 */ + *dest++ = (s - factor) / (1.0 - factor); + + s = *src++; + if (s < factor) + *dest++ = 0; + else /* factor <= value <=1 */ + *dest++ = (s - factor) / (1.0 - factor); + } + + *dest++ = *src++; + } + } + break; + } + }); +} + +/* helper function of gimp_gegl_smudge_with_paint_process() + src and dest can be the same address + */ +static inline void +gimp_gegl_smudge_with_paint_blend (const gfloat *src1, + gfloat src1_rate, + const gfloat *src2, + gfloat src2_rate, + gfloat *dest, + gboolean no_erasing_src2) +{ + gfloat orginal_src2_alpha; + gfloat src1_alpha; + gfloat src2_alpha; + gfloat result_alpha; + gint b; + + orginal_src2_alpha = src2[3]; + src1_alpha = src1_rate * src1[3]; + src2_alpha = src2_rate * orginal_src2_alpha; + result_alpha = src1_alpha + src2_alpha; + + if (result_alpha == 0) + { + memset (dest, 0, sizeof (gfloat) * 4); + return; + } + + for (b = 0; b < 3; b++) + dest[b] = (src1[b] * src1_alpha + src2[b] * src2_alpha) / result_alpha; + + if (no_erasing_src2) + { + result_alpha = MAX (result_alpha, orginal_src2_alpha); + } + + dest[3] = result_alpha; +} + +/* helper function of gimp_gegl_smudge_with_paint() */ +static void +gimp_gegl_smudge_with_paint_process (gfloat *accum, + const gfloat *canvas, + gfloat *paint, + gint count, + const gfloat *brush_color, + gfloat brush_a, + gboolean no_erasing, + gfloat flow, + gfloat rate) +{ + while (count--) + { + /* blend accum_buffer and canvas_buffer to accum_buffer */ + gimp_gegl_smudge_with_paint_blend (accum, rate, canvas, 1 - rate, + accum, no_erasing); + + /* blend accum_buffer and brush color/pixmap to paint_buffer */ + if (brush_a == 0) /* pure smudge */ + { + memcpy (paint, accum, sizeof (gfloat) * 4); + } + else + { + const gfloat *src1 = brush_color ? brush_color : paint; + + gimp_gegl_smudge_with_paint_blend (src1, flow, accum, 1 - flow, + paint, no_erasing); + } + + accum += 4; + canvas += 4; + paint += 4; + } +} + +/* smudge painting calculation. Currently only smudge tool uses this function + * Accum = rate*Accum + (1-rate)*Canvas + * if brush_color!=NULL + * Paint = flow*brushColor + (1-flow)*Accum + * else + * Paint = flow*Paint + (1-flow)*Accum + */ +void +gimp_gegl_smudge_with_paint (GeglBuffer *accum_buffer, + const GeglRectangle *accum_rect, + GeglBuffer *canvas_buffer, + const GeglRectangle *canvas_rect, + const GimpRGB *brush_color, + GeglBuffer *paint_buffer, + gboolean no_erasing, + gdouble flow, + gdouble rate) +{ + gfloat brush_color_float[4]; + gfloat brush_a = flow; + GeglAccessMode paint_buffer_access_mode = (brush_color ? + GEGL_ACCESS_WRITE : + GEGL_ACCESS_READWRITE); + gboolean sse2 = (gimp_cpu_accel_get_support () & + GIMP_CPU_ACCEL_X86_SSE2); + + /* convert brush color from double to float */ + if (brush_color) + { + const gdouble *brush_color_ptr = &brush_color->r; + gint b; + + for (b = 0; b < 4; b++) + brush_color_float[b] = brush_color_ptr[b]; + + brush_a *= brush_color_ptr[3]; + } + + gimp_parallel_distribute_area (accum_rect, MIN_PARALLEL_SUB_AREA, + [=] (const GeglRectangle *accum_area) + { + GeglBufferIterator *iter; + + SHIFTED_AREA (canvas, accum); + + iter = gegl_buffer_iterator_new (accum_buffer, accum_area, 0, + babl_format ("RGBA float"), + GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE); + + gegl_buffer_iterator_add (iter, canvas_buffer, canvas_area, 0, + babl_format ("RGBA float"), + GEGL_ACCESS_READ, GEGL_ABYSS_NONE); + + gegl_buffer_iterator_add (iter, paint_buffer, + GEGL_RECTANGLE (accum_area->x - accum_rect->x, + accum_area->y - accum_rect->y, + 0, 0), + 0, + babl_format ("RGBA float"), + paint_buffer_access_mode, GEGL_ABYSS_NONE); + + while (gegl_buffer_iterator_next (iter)) + { + gfloat *accum = (gfloat *) iter->data[0]; + const gfloat *canvas = (const gfloat *) iter->data[1]; + gfloat *paint = (gfloat *) iter->data[2]; + gint count = iter->length; + +#if COMPILE_SSE2_INTRINISICS + if (sse2 && ((guintptr) accum | + (guintptr) canvas | + (guintptr) (brush_color ? brush_color_float : paint) | + (guintptr) paint) % 16 == 0) + { + gimp_gegl_smudge_with_paint_process_sse2 (accum, canvas, paint, count, + brush_color ? brush_color_float : + NULL, + brush_a, + no_erasing, flow, rate); + } + else +#endif + { + gimp_gegl_smudge_with_paint_process (accum, canvas, paint, count, + brush_color ? brush_color_float : + NULL, + brush_a, + no_erasing, flow, rate); + } + } + }); +} + +void +gimp_gegl_apply_mask (GeglBuffer *mask_buffer, + const GeglRectangle *mask_rect, + GeglBuffer *dest_buffer, + const GeglRectangle *dest_rect, + gdouble opacity) +{ + gimp_parallel_distribute_area (mask_rect, MIN_PARALLEL_SUB_AREA, + [=] (const GeglRectangle *mask_area) + { + GeglBufferIterator *iter; + + SHIFTED_AREA (dest, mask); + + iter = gegl_buffer_iterator_new (mask_buffer, mask_area, 0, + babl_format ("Y float"), + GEGL_ACCESS_READ, GEGL_ABYSS_NONE); + + gegl_buffer_iterator_add (iter, dest_buffer, dest_area, 0, + babl_format ("RGBA float"), + GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE); + + while (gegl_buffer_iterator_next (iter)) + { + const gfloat *mask = (const gfloat *) iter->data[0]; + gfloat *dest = (gfloat *) iter->data[1]; + gint count = iter->length; + + while (count--) + { + dest[3] *= *mask * opacity; + + mask += 1; + dest += 4; + } + } + }); +} + +void +gimp_gegl_combine_mask (GeglBuffer *mask_buffer, + const GeglRectangle *mask_rect, + GeglBuffer *dest_buffer, + const GeglRectangle *dest_rect, + gdouble opacity) +{ + gimp_parallel_distribute_area (mask_rect, MIN_PARALLEL_SUB_AREA, + [=] (const GeglRectangle *mask_area) + { + GeglBufferIterator *iter; + + SHIFTED_AREA (dest, mask); + + iter = gegl_buffer_iterator_new (mask_buffer, mask_area, 0, + babl_format ("Y float"), + GEGL_ACCESS_READ, GEGL_ABYSS_NONE); + + gegl_buffer_iterator_add (iter, dest_buffer, dest_area, 0, + babl_format ("Y float"), + GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE); + + while (gegl_buffer_iterator_next (iter)) + { + const gfloat *mask = (const gfloat *) iter->data[0]; + gfloat *dest = (gfloat *) iter->data[1]; + gint count = iter->length; + + while (count--) + { + *dest *= *mask * opacity; + + mask += 1; + dest += 1; + } + } + }); +} + +void +gimp_gegl_combine_mask_weird (GeglBuffer *mask_buffer, + const GeglRectangle *mask_rect, + GeglBuffer *dest_buffer, + const GeglRectangle *dest_rect, + gdouble opacity, + gboolean stipple) +{ + gimp_parallel_distribute_area (mask_rect, MIN_PARALLEL_SUB_AREA, + [=] (const GeglRectangle *mask_area) + { + GeglBufferIterator *iter; + + SHIFTED_AREA (dest, mask); + + iter = gegl_buffer_iterator_new (mask_buffer, mask_area, 0, + babl_format ("Y float"), + GEGL_ACCESS_READ, GEGL_ABYSS_NONE); + + gegl_buffer_iterator_add (iter, dest_buffer, dest_area, 0, + babl_format ("Y float"), + GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE); + + while (gegl_buffer_iterator_next (iter)) + { + const gfloat *mask = (const gfloat *) iter->data[0]; + gfloat *dest = (gfloat *) iter->data[1]; + gint count = iter->length; + + if (stipple) + { + while (count--) + { + dest[0] += (1.0 - dest[0]) * *mask * opacity; + + mask += 1; + dest += 1; + } + } + else + { + while (count--) + { + if (opacity > dest[0]) + dest[0] += (opacity - dest[0]) * *mask * opacity; + + mask += 1; + dest += 1; + } + } + } + }); +} + +void +gimp_gegl_replace (GeglBuffer *top_buffer, + const GeglRectangle *top_rect, + GeglBuffer *bottom_buffer, + const GeglRectangle *bottom_rect, + GeglBuffer *mask_buffer, + const GeglRectangle *mask_rect, + GeglBuffer *dest_buffer, + const GeglRectangle *dest_rect, + gdouble opacity, + const gboolean *affect) +{ + gimp_parallel_distribute_area (top_rect, MIN_PARALLEL_SUB_AREA, + [=] (const GeglRectangle *top_area) + { + GeglBufferIterator *iter; + + SHIFTED_AREA (bottom, top); + SHIFTED_AREA (mask, top); + SHIFTED_AREA (dest, top); + + iter = gegl_buffer_iterator_new (top_buffer, top_area, 0, + babl_format ("RGBA float"), + GEGL_ACCESS_READ, GEGL_ABYSS_NONE); + + gegl_buffer_iterator_add (iter, bottom_buffer, bottom_area, 0, + babl_format ("RGBA float"), + GEGL_ACCESS_READ, GEGL_ABYSS_NONE); + + gegl_buffer_iterator_add (iter, mask_buffer, mask_area, 0, + babl_format ("Y float"), + GEGL_ACCESS_READ, GEGL_ABYSS_NONE); + + gegl_buffer_iterator_add (iter, dest_buffer, dest_area, 0, + babl_format ("RGBA float"), + GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE); + + while (gegl_buffer_iterator_next (iter)) + { + const gfloat *top = (const gfloat *) iter->data[0]; + const gfloat *bottom = (const gfloat *) iter->data[1]; + const gfloat *mask = (const gfloat *) iter->data[2]; + gfloat *dest = (gfloat *) iter->data[3]; + gint count = iter->length; + + while (count--) + { + gint b; + gdouble mask_val = *mask * opacity; + + /* calculate new alpha first. */ + gfloat s1_a = bottom[3]; + gfloat s2_a = top[3]; + gdouble a_val = s1_a + mask_val * (s2_a - s1_a); + + if (a_val == 0.0) + { + /* In any case, write out versions of the blending + * function that result when combinations of s1_a, s2_a, + * and mask_val --> 0 (or mask_val -->1) + */ + + /* 1: s1_a, s2_a, AND mask_val all approach 0+: */ + /* 2: s1_a AND s2_a both approach 0+, regardless of mask_val: */ + if (s1_a + s2_a == 0.0) + { + for (b = 0; b < 3; b++) + { + gfloat new_val; + + new_val = bottom[b] + mask_val * (top[b] - bottom[b]); + + dest[b] = affect[b] ? new_val : bottom[b]; + } + } + + /* 3: mask_val AND s1_a both approach 0+, regardless of s2_a */ + else if (s1_a + mask_val == 0.0) + { + for (b = 0; b < 3; b++) + dest[b] = bottom[b]; + } + + /* 4: mask_val -->1 AND s2_a -->0, regardless of s1_a */ + else if (1.0 - mask_val + s2_a == 0.0) + { + for (b = 0; b < 3; b++) + dest[b] = affect[b] ? top[b] : bottom[b]; + } + } + else + { + gdouble a_recip = 1.0 / a_val; + + /* possible optimization: fold a_recip into s1_a and s2_a */ + for (b = 0; b < 3; b++) + { + gfloat new_val = a_recip * (bottom[b] * s1_a + mask_val * + (top[b] * s2_a - bottom[b] * s1_a)); + dest[b] = affect[b] ? new_val : bottom[b]; + } + } + + dest[3] = affect[3] ? a_val : s1_a; + + top += 4; + bottom += 4; + mask += 1; + dest += 4; + } + } + }); +} + +void +gimp_gegl_index_to_mask (GeglBuffer *indexed_buffer, + const GeglRectangle *indexed_rect, + const Babl *indexed_format, + GeglBuffer *mask_buffer, + const GeglRectangle *mask_rect, + gint index) +{ + gimp_parallel_distribute_area (indexed_rect, MIN_PARALLEL_SUB_AREA, + [=] (const GeglRectangle *indexed_area) + { + GeglBufferIterator *iter; + + SHIFTED_AREA (mask, indexed); + + iter = gegl_buffer_iterator_new (indexed_buffer, indexed_area, 0, + indexed_format, + GEGL_ACCESS_READ, GEGL_ABYSS_NONE); + + gegl_buffer_iterator_add (iter, mask_buffer, mask_area, 0, + babl_format ("Y float"), + GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE); + + while (gegl_buffer_iterator_next (iter)) + { + const guchar *indexed = (const guchar *) iter->data[0]; + gfloat *mask = (gfloat *) iter->data[1]; + gint count = iter->length; + + while (count--) + { + if (*indexed == index) + *mask = 1.0; + else + *mask = 0.0; + + indexed++; + mask++; + } + } + }); +} + +static void +gimp_gegl_convert_color_profile_progress (GimpProgress *progress, + gdouble value) +{ + if (gegl_is_main_thread ()) + gimp_progress_set_value (progress, value); +} + +void +gimp_gegl_convert_color_profile (GeglBuffer *src_buffer, + const GeglRectangle *src_rect, + GimpColorProfile *src_profile, + GeglBuffer *dest_buffer, + const GeglRectangle *dest_rect, + GimpColorProfile *dest_profile, + GimpColorRenderingIntent intent, + gboolean bpc, + GimpProgress *progress) +{ + GimpColorTransform *transform; + guint flags = 0; + const Babl *src_format; + const Babl *dest_format; + + src_format = gegl_buffer_get_format (src_buffer); + dest_format = gegl_buffer_get_format (dest_buffer); + + if (bpc) + flags |= GIMP_COLOR_TRANSFORM_FLAGS_BLACK_POINT_COMPENSATION; + + flags |= GIMP_COLOR_TRANSFORM_FLAGS_NOOPTIMIZE; + + transform = gimp_color_transform_new (src_profile, src_format, + dest_profile, dest_format, + intent, + (GimpColorTransformFlags) flags); + + if (! src_rect) + src_rect = gegl_buffer_get_extent (src_buffer); + + if (! dest_rect) + dest_rect = gegl_buffer_get_extent (dest_buffer); + + if (transform) + { + if (progress) + { + g_signal_connect_swapped ( + transform, "progress", + G_CALLBACK (gimp_gegl_convert_color_profile_progress), + progress); + } + + GIMP_TIMER_START (); + + gimp_parallel_distribute_area (src_rect, MIN_PARALLEL_SUB_AREA, + [=] (const GeglRectangle *src_area) + { + SHIFTED_AREA (dest, src); + + gimp_color_transform_process_buffer (transform, + src_buffer, src_area, + dest_buffer, dest_area); + }); + + GIMP_TIMER_END ("converting buffer"); + + g_object_unref (transform); + } + else + { + gegl_buffer_copy (src_buffer, src_rect, GEGL_ABYSS_NONE, + dest_buffer, dest_rect); + + if (progress) + gimp_progress_set_value (progress, 1.0); + } +} + +} /* extern "C" */ diff --git a/app/gegl/gimp-gegl-mask-combine.c b/app/gegl/gimp-gegl-mask-combine.c index ec8f1799a0..9ab0494493 100644 --- a/app/gegl/gimp-gegl-mask-combine.c +++ b/app/gegl/gimp-gegl-mask-combine.c @@ -27,6 +27,7 @@ #include "gimp-gegl-types.h" +#include "gimp-babl.h" #include "gimp-gegl-mask-combine.h" @@ -376,6 +377,8 @@ gimp_gegl_mask_combine_buffer (GeglBuffer *mask, { GeglBufferIterator *iter; GeglRectangle rect; + const Babl *mask_format; + const Babl *add_on_format; gint x, y, w, h; g_return_val_if_fail (GEGL_IS_BUFFER (mask), FALSE); @@ -395,15 +398,39 @@ gimp_gegl_mask_combine_buffer (GeglBuffer *mask, rect.width = w; rect.height = h; + /* See below: this additional hack is only needed for the + * gimp-channel-combine-masks procedure, it's the only place that + * allows to combine arbitrary channels with each other. + */ + if (gimp_babl_format_get_linear (gegl_buffer_get_format (mask))) + mask_format = babl_format ("Y float"); + else + mask_format = babl_format ("Y' float"); + iter = gegl_buffer_iterator_new (mask, &rect, 0, - babl_format ("Y float"), + mask_format, GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE); rect.x -= off_x; rect.y -= off_y; + /* This is a hack: all selections/layer masks/channels are always + * linear except for channels in 8-bit images. We don't want these + * "Y' u8" to be converted to "Y float" because that would cause a + * gamma canversion and give unexpected results for + * "add/subtract/etc channel from selection". Instead, use all + * channel values "as-is", which makes no differce except in the + * 8-bit case where we need it. + * + * See https://bugzilla.gnome.org/show_bug.cgi?id=791519 + */ + if (gimp_babl_format_get_linear (gegl_buffer_get_format (add_on))) + add_on_format = babl_format ("Y float"); + else + add_on_format = babl_format ("Y' float"); + gegl_buffer_iterator_add (iter, add_on, &rect, 0, - babl_format ("Y float"), + add_on_format, GEGL_ACCESS_READ, GEGL_ABYSS_NONE); switch (op) diff --git a/app/gegl/gimp-gegl.c b/app/gegl/gimp-gegl.c index 502809531d..48fea1caf5 100644 --- a/app/gegl/gimp-gegl.c +++ b/app/gegl/gimp-gegl.c @@ -30,6 +30,7 @@ #include "operations/gimp-operations.h" #include "core/gimp.h" +#include "core/gimp-parallel.h" #include "gimp-babl.h" #include "gimp-gegl.h" @@ -66,11 +67,21 @@ gimp_gegl_init (Gimp *gimp) G_CALLBACK (gimp_gegl_notify_use_opencl), NULL); + gimp_parallel_init (gimp); + gimp_babl_init (); gimp_operations_init (gimp); } +void +gimp_gegl_exit (Gimp *gimp) +{ + g_return_if_fail (GIMP_IS_GIMP (gimp)); + + gimp_parallel_exit (gimp); +} + static void gimp_gegl_notify_tile_cache_size (GimpGeglConfig *config) { diff --git a/app/gegl/gimp-gegl.h b/app/gegl/gimp-gegl.h index 532f17814b..e14f49d9f8 100644 --- a/app/gegl/gimp-gegl.h +++ b/app/gegl/gimp-gegl.h @@ -23,6 +23,7 @@ void gimp_gegl_init (Gimp *gimp); +void gimp_gegl_exit (Gimp *gimp); #endif /* __GIMP_GEGL_H__ */ diff --git a/app/gegl/gimptilehandlervalidate.c b/app/gegl/gimptilehandlervalidate.c index f62a6add8d..ecf1ceb682 100644 --- a/app/gegl/gimptilehandlervalidate.c +++ b/app/gegl/gimptilehandlervalidate.c @@ -313,10 +313,7 @@ gimp_tile_handler_validate_command (GeglTileSource *source, gint z, gpointer data) { - GimpTileHandlerValidate *validate = GIMP_TILE_HANDLER_VALIDATE (source); - gpointer retval; - - validate->max_z = MAX (validate->max_z, z); + gpointer retval; retval = gegl_tile_handler_source_command (source, command, x, y, z, data); @@ -382,31 +379,7 @@ gimp_tile_handler_validate_invalidate (GimpTileHandlerValidate *validate, cairo_region_union_rectangle (validate->dirty_region, (cairo_rectangle_int_t *) rect); - if (validate->max_z > 0) - { - GeglTileSource *source = GEGL_TILE_SOURCE (validate); - gint tile_x1 = rect->x / validate->tile_width; - gint tile_y1 = rect->y / validate->tile_height; - gint tile_x2 = (rect->x + rect->width - 1) / - validate->tile_width + 1; - gint tile_y2 = (rect->y + rect->height - 1) / - validate->tile_height + 1; - gint tile_x; - gint tile_y; - gint tile_z; - - for (tile_z = 1; tile_z <= validate->max_z; tile_z++) - { - tile_y1 = tile_y1 / 2; - tile_y2 = (tile_y2 + 1) / 2; - tile_x1 = tile_x1 / 2; - tile_x2 = (tile_x2 + 1) / 2; - - for (tile_y = tile_y1; tile_y < tile_y2; tile_y++) - for (tile_x = tile_x1; tile_x < tile_x2; tile_x++) - gegl_tile_source_void (source, tile_x, tile_y, tile_z); - } - } + gegl_tile_handler_damage_rect (GEGL_TILE_HANDLER (validate), rect); } void diff --git a/app/gegl/gimptilehandlervalidate.h b/app/gegl/gimptilehandlervalidate.h index fa3f00ddd7..225ce846b1 100644 --- a/app/gegl/gimptilehandlervalidate.h +++ b/app/gegl/gimptilehandlervalidate.h @@ -47,7 +47,6 @@ struct _GimpTileHandlerValidate const Babl *format; gint tile_width; gint tile_height; - gint max_z; gboolean whole_tile; }; diff --git a/app/gui/Makefile.am b/app/gui/Makefile.am index 0ea4d0d771..50def4fef8 100644 --- a/app/gui/Makefile.am +++ b/app/gui/Makefile.am @@ -2,6 +2,8 @@ if PLATFORM_OSX xobjective_c = "-xobjective-c" +xobjective_cxx = "-xobjective-c++" +xnone = "-xnone" endif AM_CPPFLAGS = \ @@ -11,7 +13,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir)/app \ -I$(top_srcdir)/app \ - $(xobjective_c) \ $(GIO_UNIX_CFLAGS) \ $(GEGL_CFLAGS) \ $(GTK_CFLAGS) \ @@ -19,6 +20,15 @@ AM_CPPFLAGS = \ $(DBUS_GLIB_CFLAGS) \ -I$(includedir) +AM_CFLAGS = \ + $(xobjective_c) + +AM_CXXFLAGS = \ + $(xobjective_cxx) + +AM_LDFLAGS = \ + $(xnone) + noinst_LIBRARIES = libappgui.a libappgui_a_sources = \ diff --git a/app/gui/Makefile.in b/app/gui/Makefile.in index 3e9079c12f..9ba5720a8d 100644 --- a/app/gui/Makefile.in +++ b/app/gui/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -273,7 +274,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -346,6 +347,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -574,6 +576,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -593,6 +596,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @PLATFORM_OSX_TRUE@xobjective_c = "-xobjective-c" +@PLATFORM_OSX_TRUE@xobjective_cxx = "-xobjective-c++" +@PLATFORM_OSX_TRUE@xnone = "-xnone" AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"Gimp-GUI\" \ -DGIMP_COMMAND=\"@GIMP_COMMAND@\" \ @@ -600,7 +605,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir)/app \ -I$(top_srcdir)/app \ - $(xobjective_c) \ $(GIO_UNIX_CFLAGS) \ $(GEGL_CFLAGS) \ $(GTK_CFLAGS) \ @@ -608,6 +612,15 @@ AM_CPPFLAGS = \ $(DBUS_GLIB_CFLAGS) \ -I$(includedir) +AM_CFLAGS = \ + $(xobjective_c) + +AM_CXXFLAGS = \ + $(xobjective_cxx) + +AM_LDFLAGS = \ + $(xnone) + noinst_LIBRARIES = libappgui.a libappgui_a_sources = \ gimpdbusservice.c \ diff --git a/app/gui/gui-message.c b/app/gui/gui-message.c index 6e93b223e1..93b231c788 100644 --- a/app/gui/gui-message.c +++ b/app/gui/gui-message.c @@ -361,7 +361,7 @@ gui_message_error_dialog (Gimp *gimp, gimp_enum_get_value (GIMP_TYPE_MESSAGE_SEVERITY, severity, NULL, NULL, &reason, NULL); - /* Since we overrided glib default's WARNING and CRITICAL + /* Since we overridden glib default's WARNING and CRITICAL * handler, if we decide not to handle this error in the end, * let's just print it in terminal in a similar fashion as * glib's default handler (though without the fancy terminal diff --git a/app/gui/gui-unique.c b/app/gui/gui-unique.c index 7eb9517f4d..41d59a2b14 100644 --- a/app/gui/gui-unique.c +++ b/app/gui/gui-unique.c @@ -334,7 +334,7 @@ gui_unique_quartz_init (Gimp *gimp) G_CALLBACK (gui_unique_quartz_nsopen_file_callback), gimp); - /* Using the event handler is a hack, it is neccesary becuase + /* Using the event handler is a hack, it is necessary because * gtkosx_application will drop the file open events if any * event processing is done before gtkosx_application_ready is * called, which we unfortuantly can't avoid doing right now. diff --git a/app/gui/gui.c b/app/gui/gui.c index b23e4cb7e9..81116a674e 100644 --- a/app/gui/gui.c +++ b/app/gui/gui.c @@ -237,7 +237,7 @@ gui_init (Gimp *gimp, /* Normally this should have been taken care of during command line * parsing as a post-parse hook of gtk_get_option_group(), using the * system locales. - * But user config may have overriden the language, therefore we must + * But user config may have overridden the language, therefore we must * check the widget directions again. */ gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL); @@ -974,9 +974,9 @@ gui_compare_accelerator (gpointer data, if (accel->key == accel_key && accel->mods == accel_mods && g_strcmp0 (accel->path, accel_path)) { - g_warning ("Actions \"%s\" and \"%s\" use the same accelerator.\n" - "Disable the accelerator on \"%s\".", - accel->path, accel_path, accel_path); + g_printerr ("Actions \"%s\" and \"%s\" use the same accelerator.\n" + " Disabling the accelerator on \"%s\".\n", + accel->path, accel_path, accel_path); gtk_accel_map_change_entry (accel_path, 0, 0, FALSE); } } diff --git a/app/gui/splash.c b/app/gui/splash.c index 92eeabd76e..c923c6771d 100644 --- a/app/gui/splash.c +++ b/app/gui/splash.c @@ -293,6 +293,7 @@ splash_position_layouts (GimpSplash *splash, { PangoRectangle ink; PangoRectangle logical; + gint text_height = 0; if (text1) { @@ -305,10 +306,7 @@ splash_position_layouts (GimpSplash *splash, pango_layout_get_pixel_extents (splash->upper, &ink, &logical); splash->upper_x = (splash->width - logical.width) / 2; - splash->upper_y = splash->height - (2 * logical.height + 6); - - if (area) - splash_rectangle_union (area, &ink, splash->upper_x, splash->upper_y); + text_height += logical.height; } if (text2) @@ -322,7 +320,36 @@ splash_position_layouts (GimpSplash *splash, pango_layout_get_pixel_extents (splash->lower, &ink, &logical); splash->lower_x = (splash->width - logical.width) / 2; - splash->lower_y = splash->height - (logical.height + 6); + text_height += logical.height; + } + + /* For pretty printing, let's say we want at least double space. */ + text_height *= 2; + + /* The ordinates are computed in 2 steps, because we are first + * checking the minimal height needed for text (text_height). + * + * Ideally we are printing in the bottom quarter of the splash image, + * with well centered positions. But if this zone appears to be too + * small, we will end up using this previously computed text_height + * instead. Since splash images are designed to have text in the lower + * quarter, this may end up a bit uglier, but at least top and bottom + * texts won't overlay each other. + */ + if (text1) + { + pango_layout_get_pixel_extents (splash->upper, &ink, &logical); + splash->upper_y = MIN (splash->height - text_height, + splash->height * 13 / 16 - logical.height / 2); + + if (area) + splash_rectangle_union (area, &ink, splash->upper_x, splash->upper_y); + } + if (text2) + { + pango_layout_get_pixel_extents (splash->lower, &ink, &logical); + splash->lower_y = MIN (splash->height - text_height / 2, + splash->height * 15 / 16 - logical.height / 2); if (area) splash_rectangle_union (area, &ink, splash->lower_x, splash->lower_y); diff --git a/app/gui/themes.c b/app/gui/themes.c index e449c83f4b..8bf9d61df4 100644 --- a/app/gui/themes.c +++ b/app/gui/themes.c @@ -52,7 +52,8 @@ static void themes_theme_change_notify (GimpGuiConfig *config, GParamSpec *pspec, Gimp *gimp); -static void themes_draw_layout (GtkStyle *style, +static void themes_fix_pixbuf_style (void); +static void themes_draw_pixbuf_layout (GtkStyle *style, GdkWindow *window, GtkStateType state_type, gboolean use_text, @@ -65,8 +66,8 @@ static void themes_draw_layout (GtkStyle *style, /* private variables */ -static GHashTable *themes_hash = NULL; -static gpointer pixbuf_style_type_class = NULL; +static GHashTable *themes_hash = NULL; +static GtkStyleClass *pixbuf_style_class = NULL; /* public functions */ @@ -79,23 +80,6 @@ themes_init (Gimp *gimp) g_return_if_fail (GIMP_IS_GIMP (gimp)); - /* This is a "quick'n dirty" trick to get appropriate colors for - * themes in GTK+2, and in particular dark themes which would display - * insensitive items with a barely readable layout. - * This piece of code partly duplicates code from GTK+2 (slightly - * modified to get readable insensitive items) and will likely have to - * be removed for GIMP 3. - * See https://bugzilla.gnome.org/show_bug.cgi?id=770424 - */ - if (g_type_from_name ("PixbufStyle")) - { - pixbuf_style_type_class = g_type_class_ref (g_type_from_name ("PixbufStyle")); - if (pixbuf_style_type_class) - { - GTK_STYLE_CLASS (pixbuf_style_type_class)->draw_layout = themes_draw_layout; - } - } - config = GIMP_GUI_CONFIG (gimp->config); themes_hash = g_hash_table_new_full (g_str_hash, @@ -165,6 +149,8 @@ themes_init (Gimp *gimp) gtk_rc_parse (themerc); g_free (themerc); + themes_fix_pixbuf_style (); + g_signal_connect (config, "notify::theme", G_CALLBACK (themes_theme_change_notify), gimp); @@ -184,11 +170,8 @@ themes_exit (Gimp *gimp) g_hash_table_destroy (themes_hash); themes_hash = NULL; } - if (pixbuf_style_type_class) - { - g_type_class_unref (pixbuf_style_type_class); - pixbuf_style_type_class = NULL; - } + + g_clear_pointer (&pixbuf_style_class, g_type_class_unref); } gchar ** @@ -400,19 +383,49 @@ themes_theme_change_notify (GimpGuiConfig *config, themes_apply_theme (gimp, config->theme); gtk_rc_reparse_all (); + + themes_fix_pixbuf_style (); } static void -themes_draw_layout (GtkStyle *style, - GdkWindow *window, - GtkStateType state_type, - gboolean use_text, - GdkRectangle *area, - GtkWidget *widget, - const gchar *detail, - gint x, - gint y, - PangoLayout *layout) +themes_fix_pixbuf_style (void) +{ + /* This is a "quick'n dirty" trick to get appropriate colors for + * themes in GTK+2, and in particular dark themes which would display + * insensitive items with a barely readable layout. + * + * This piece of code partly duplicates code from GTK+2 (slightly + * modified to get readable insensitive items) and will likely have to + * be removed for GIMP 3. + * + * See https://bugzilla.gnome.org/show_bug.cgi?id=770424 + */ + + if (! pixbuf_style_class) + { + GType type = g_type_from_name ("PixbufStyle"); + + if (type) + { + pixbuf_style_class = g_type_class_ref (type); + + if (pixbuf_style_class) + pixbuf_style_class->draw_layout = themes_draw_pixbuf_layout; + } + } +} + +static void +themes_draw_pixbuf_layout (GtkStyle *style, + GdkWindow *window, + GtkStateType state_type, + gboolean use_text, + GdkRectangle *area, + GtkWidget *widget, + const gchar *detail, + gint x, + gint y, + PangoLayout *layout) { GdkGC *gc; diff --git a/app/main.c b/app/main.c index 7c0bdac73d..60e846b4e0 100644 --- a/app/main.c +++ b/app/main.c @@ -139,10 +139,12 @@ static gboolean use_debug_handler = FALSE; #ifdef GIMP_UNSTABLE static gboolean show_playground = TRUE; +static gboolean show_debug_menu = TRUE; static GimpStackTraceMode stack_trace_mode = GIMP_STACK_TRACE_QUERY; static GimpPDBCompatMode pdb_compat_mode = GIMP_PDB_COMPAT_WARN; #else static gboolean show_playground = FALSE; +static gboolean show_debug_menu = FALSE; static GimpStackTraceMode stack_trace_mode = GIMP_STACK_TRACE_NEVER; static GimpPDBCompatMode pdb_compat_mode = GIMP_PDB_COMPAT_ON; #endif @@ -282,6 +284,11 @@ static const GOptionEntry main_entries[] = G_OPTION_ARG_NONE, &show_playground, N_("Show a preferences page with experimental features"), NULL }, + { + "show-debug-menu", 0, G_OPTION_FLAG_HIDDEN, + G_OPTION_ARG_NONE, &show_debug_menu, + N_("Show an image submenu with debug actions"), NULL + }, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, @@ -532,6 +539,7 @@ main (int argc, console_messages, use_debug_handler, show_playground, + show_debug_menu, stack_trace_mode, pdb_compat_mode, backtrace_file); diff --git a/app/menus/Makefile.in b/app/menus/Makefile.in index 7da8342a9e..fb654f8b75 100644 --- a/app/menus/Makefile.in +++ b/app/menus/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -272,7 +273,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -345,6 +346,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -573,6 +575,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/menus/menus.c b/app/menus/menus.c index 2c7ff98e31..0726bb878e 100644 --- a/app/menus/menus.c +++ b/app/menus/menus.c @@ -30,6 +30,7 @@ #include "core/gimp.h" #include "widgets/gimpactionfactory.h" +#include "widgets/gimpdashboard.h" #include "widgets/gimpmenufactory.h" #include "dockable-menu.h" @@ -392,8 +393,7 @@ menus_init (Gimp *gimp, "dashboard", NULL, "/dashboard-popup", - "dashboard-menu.xml", - NULL, + "dashboard-menu.xml", gimp_dashboard_menu_setup, NULL); } diff --git a/app/operations/Makefile.am b/app/operations/Makefile.am index 7fe28c11d6..de9a042a76 100644 --- a/app/operations/Makefile.am +++ b/app/operations/Makefile.am @@ -40,8 +40,6 @@ libappoperations_a_sources = \ gimplevelsconfig.c \ gimplevelsconfig.h \ \ - gimpoperationblend.c \ - gimpoperationblend.h \ gimpoperationborder.c \ gimpoperationborder.h \ gimpoperationbuffersourcevalidate.c \ @@ -56,6 +54,8 @@ libappoperations_a_sources = \ gimpoperationequalize.h \ gimpoperationflood.c \ gimpoperationflood.h \ + gimpoperationgradient.c \ + gimpoperationgradient.h \ gimpoperationgrow.c \ gimpoperationgrow.h \ gimpoperationhistogramsink.c \ diff --git a/app/operations/Makefile.in b/app/operations/Makefile.in index cbb49676fe..d1ef7c35cf 100644 --- a/app/operations/Makefile.in +++ b/app/operations/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -126,14 +127,13 @@ am__objects_2 = gimp-operations.$(OBJEXT) \ gimpbrightnesscontrastconfig.$(OBJEXT) \ gimpcageconfig.$(OBJEXT) gimpcolorbalanceconfig.$(OBJEXT) \ gimpcurvesconfig.$(OBJEXT) gimphuesaturationconfig.$(OBJEXT) \ - gimplevelsconfig.$(OBJEXT) gimpoperationblend.$(OBJEXT) \ - gimpoperationborder.$(OBJEXT) \ + gimplevelsconfig.$(OBJEXT) gimpoperationborder.$(OBJEXT) \ gimpoperationbuffersourcevalidate.$(OBJEXT) \ gimpoperationcagecoefcalc.$(OBJEXT) \ gimpoperationcagetransform.$(OBJEXT) \ gimpoperationcomposecrop.$(OBJEXT) \ gimpoperationequalize.$(OBJEXT) gimpoperationflood.$(OBJEXT) \ - gimpoperationgrow.$(OBJEXT) \ + gimpoperationgradient.$(OBJEXT) gimpoperationgrow.$(OBJEXT) \ gimpoperationhistogramsink.$(OBJEXT) \ gimpoperationmaskcomponents.$(OBJEXT) \ gimpoperationprofiletransform.$(OBJEXT) \ @@ -339,7 +339,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -412,6 +412,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -640,6 +641,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -698,8 +700,6 @@ libappoperations_a_sources = \ gimplevelsconfig.c \ gimplevelsconfig.h \ \ - gimpoperationblend.c \ - gimpoperationblend.h \ gimpoperationborder.c \ gimpoperationborder.h \ gimpoperationbuffersourcevalidate.c \ @@ -714,6 +714,8 @@ libappoperations_a_sources = \ gimpoperationequalize.h \ gimpoperationflood.c \ gimpoperationflood.h \ + gimpoperationgradient.c \ + gimpoperationgradient.h \ gimpoperationgrow.c \ gimpoperationgrow.h \ gimpoperationhistogramsink.c \ @@ -822,7 +824,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcurvesconfig.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimphuesaturationconfig.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplevelsconfig.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationblend.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationborder.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationbrightnesscontrast.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationbuffersourcevalidate.Po@am__quote@ @@ -835,6 +836,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationdesaturate.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationequalize.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationflood.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationgradient.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationgrow.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationhistogramsink.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationhuesaturation.Po@am__quote@ diff --git a/app/operations/gimp-operations.c b/app/operations/gimp-operations.c index 4c651f45f2..a432abf991 100644 --- a/app/operations/gimp-operations.c +++ b/app/operations/gimp-operations.c @@ -30,7 +30,6 @@ #include "gimp-operations.h" -#include "gimpoperationblend.h" #include "gimpoperationborder.h" #include "gimpoperationbuffersourcevalidate.h" #include "gimpoperationcagecoefcalc.h" @@ -38,6 +37,7 @@ #include "gimpoperationcomposecrop.h" #include "gimpoperationequalize.h" #include "gimpoperationflood.h" +#include "gimpoperationgradient.h" #include "gimpoperationgrow.h" #include "gimpoperationhistogramsink.h" #include "gimpoperationmaskcomponents.h" @@ -123,7 +123,6 @@ gimp_operations_init (Gimp *gimp) gimp_layer_modes_init (); - g_type_class_ref (GIMP_TYPE_OPERATION_BLEND); g_type_class_ref (GIMP_TYPE_OPERATION_BORDER); g_type_class_ref (GIMP_TYPE_OPERATION_BUFFER_SOURCE_VALIDATE); g_type_class_ref (GIMP_TYPE_OPERATION_CAGE_COEF_CALC); @@ -131,6 +130,7 @@ gimp_operations_init (Gimp *gimp) g_type_class_ref (GIMP_TYPE_OPERATION_COMPOSE_CROP); g_type_class_ref (GIMP_TYPE_OPERATION_EQUALIZE); g_type_class_ref (GIMP_TYPE_OPERATION_FLOOD); + g_type_class_ref (GIMP_TYPE_OPERATION_GRADIENT); g_type_class_ref (GIMP_TYPE_OPERATION_GROW); g_type_class_ref (GIMP_TYPE_OPERATION_HISTOGRAM_SINK); g_type_class_ref (GIMP_TYPE_OPERATION_MASK_COMPONENTS); diff --git a/app/operations/gimpoperationblend.h b/app/operations/gimpoperationblend.h deleted file mode 100644 index 61bd31977f..0000000000 --- a/app/operations/gimpoperationblend.h +++ /dev/null @@ -1,68 +0,0 @@ -/* GIMP - The GNU Image Manipulation Program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * gimpoperationblend.h - * Copyright (C) 2014 Michael Henning - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __GIMP_OPERATION_BLEND_H__ -#define __GIMP_OPERATION_BLEND_H__ - - -#include - - -#define GIMP_TYPE_OPERATION_BLEND (gimp_operation_blend_get_type ()) -#define GIMP_OPERATION_BLEND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_BLEND, GimpOperationBlend)) -#define GIMP_OPERATION_BLEND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_OPERATION_BLEND, GimpOperationBlendClass)) -#define GIMP_IS_OPERATION_BLEND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_BLEND)) -#define GIMP_IS_OPERATION_BLEND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OPERATION_BLEND)) -#define GIMP_OPERATION_BLEND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_OPERATION_BLEND, GimpOperationBlendClass)) - - -typedef struct _GimpOperationBlend GimpOperationBlend; -typedef struct _GimpOperationBlendClass GimpOperationBlendClass; - -struct _GimpOperationBlend -{ - GeglOperationFilter parent_instance; - - GimpContext *context; - - GimpGradient *gradient; - gdouble start_x, start_y, end_x, end_y; - GimpGradientType gradient_type; - GimpRepeatMode gradient_repeat; - gdouble offset; - gboolean gradient_reverse; - - gboolean supersample; - gint supersample_depth; - gdouble supersample_threshold; - - gboolean dither; -}; - -struct _GimpOperationBlendClass -{ - GeglOperationFilterClass parent_class; -}; - - -GType gimp_operation_blend_get_type (void) G_GNUC_CONST; - - -#endif /* __GIMP_OPERATION_BLEND_H__ */ diff --git a/app/operations/gimpoperationborder.c b/app/operations/gimpoperationborder.c index 3146154204..377fc4b669 100644 --- a/app/operations/gimpoperationborder.c +++ b/app/operations/gimpoperationborder.c @@ -451,7 +451,7 @@ gimp_operation_border_process (GeglOperation *operation, g_free (transition); - /* Finnished handling the radius = 1 special case, return here. */ + /* Finished handling the radius = 1 special case, return here. */ return TRUE; } diff --git a/app/operations/gimpoperationblend.c b/app/operations/gimpoperationgradient.c similarity index 85% rename from app/operations/gimpoperationblend.c rename to app/operations/gimpoperationgradient.c index 0ad5494b8e..8382285946 100644 --- a/app/operations/gimpoperationblend.c +++ b/app/operations/gimpoperationgradient.c @@ -1,9 +1,9 @@ /* GIMP - The GNU Image Manipulation Program * Copyright (C) 1995 Spencer Kimball and Peter Mattis * - * Largely based on gimpdrawable-blend.c + * Largely based on gimpdrawable-gradient.c * - * gimpoperationblend.c + * gimpoperationgradient.c * Copyright (C) 2014 Michael Henning * * This program is free software: you can redistribute it and/or modify @@ -33,9 +33,7 @@ #include "core/gimpgradient.h" -#include "gimpoperationblend.h" - -#include "gimp-intl.h" +#include "gimpoperationgradient.h" //#define USE_GRADIENT_CACHE 1 @@ -53,6 +51,7 @@ enum PROP_GRADIENT_REPEAT, PROP_OFFSET, PROP_GRADIENT_REVERSE, + PROP_GRADIENT_BLEND_COLOR_SPACE, PROP_SUPERSAMPLE, PROP_SUPERSAMPLE_DEPTH, PROP_SUPERSAMPLE_THRESHOLD, @@ -61,24 +60,25 @@ enum typedef struct { - GimpGradient *gradient; - gboolean reverse; + GimpGradient *gradient; + gboolean reverse; + GimpGradientBlendColorSpace blend_color_space; #ifdef USE_GRADIENT_CACHE - GimpRGB *gradient_cache; - gint gradient_cache_size; + GimpRGB *gradient_cache; + gint gradient_cache_size; #else - GimpGradientSegment *last_seg; + GimpGradientSegment *last_seg; #endif - gdouble offset; - gdouble sx, sy; - GimpGradientType gradient_type; - gdouble dist; - gdouble vec[2]; - GimpRepeatMode repeat; - GimpRGB leftmost_color; - GimpRGB rightmost_color; - GRand *seed; - GeglBuffer *dist_buffer; + gdouble offset; + gdouble sx, sy; + GimpGradientType gradient_type; + gdouble dist; + gdouble vec[2]; + GimpRepeatMode repeat; + GimpRGB leftmost_color; + GimpRGB rightmost_color; + GRand *seed; + GeglBuffer *dist_buffer; } RenderBlendData; @@ -94,19 +94,19 @@ typedef struct /* local function prototypes */ -static void gimp_operation_blend_dispose (GObject *gobject); -static void gimp_operation_blend_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec); -static void gimp_operation_blend_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec); +static void gimp_operation_gradient_dispose (GObject *gobject); +static void gimp_operation_gradient_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec); +static void gimp_operation_gradient_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); -static void gimp_operation_blend_prepare (GeglOperation *operation); +static void gimp_operation_gradient_prepare (GeglOperation *operation); -static GeglRectangle gimp_operation_blend_get_bounding_box (GeglOperation *operation); +static GeglRectangle gimp_operation_gradient_get_bounding_box (GeglOperation *operation); static gdouble gradient_calc_conical_sym_factor (gdouble dist, gdouble *axis, @@ -163,39 +163,39 @@ static void gradient_put_pixel (gint x, GimpRGB *color, gpointer put_pixel_data); -static gboolean gimp_operation_blend_process (GeglOperation *operation, - GeglBuffer *input, - GeglBuffer *output, - const GeglRectangle *result, - gint level); +static gboolean gimp_operation_gradient_process (GeglOperation *operation, + GeglBuffer *input, + GeglBuffer *output, + const GeglRectangle *result, + gint level); -G_DEFINE_TYPE (GimpOperationBlend, gimp_operation_blend, +G_DEFINE_TYPE (GimpOperationGradient, gimp_operation_gradient, GEGL_TYPE_OPERATION_FILTER) -#define parent_class gimp_operation_blend_parent_class +#define parent_class gimp_operation_gradient_parent_class static void -gimp_operation_blend_class_init (GimpOperationBlendClass *klass) +gimp_operation_gradient_class_init (GimpOperationGradientClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass); GeglOperationFilterClass *filter_class = GEGL_OPERATION_FILTER_CLASS (klass); - object_class->dispose = gimp_operation_blend_dispose; - object_class->set_property = gimp_operation_blend_set_property; - object_class->get_property = gimp_operation_blend_get_property; + object_class->dispose = gimp_operation_gradient_dispose; + object_class->set_property = gimp_operation_gradient_set_property; + object_class->get_property = gimp_operation_gradient_get_property; - operation_class->prepare = gimp_operation_blend_prepare; - operation_class->get_bounding_box = gimp_operation_blend_get_bounding_box; + operation_class->prepare = gimp_operation_gradient_prepare; + operation_class->get_bounding_box = gimp_operation_gradient_get_bounding_box; - filter_class->process = gimp_operation_blend_process; + filter_class->process = gimp_operation_gradient_process; gegl_operation_class_set_keys (operation_class, - "name", "gimp:blend", + "name", "gimp:gradient", "categories", "gimp", - "description", "GIMP Blend operation", + "description", "GIMP Gradient operation", NULL); g_object_class_install_property (object_class, PROP_CONTEXT, @@ -281,6 +281,15 @@ gimp_operation_blend_class_init (GimpOperationBlendClass *klass) G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + g_object_class_install_property (object_class, PROP_GRADIENT_BLEND_COLOR_SPACE, + g_param_spec_enum ("gradient-blend-color-space", + "Blend Color Space", + "Which color space to use when blending RGB gradient segments", + GIMP_TYPE_GRADIENT_BLEND_COLOR_SPACE, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT)); + g_object_class_install_property (object_class, PROP_SUPERSAMPLE, g_param_spec_boolean ("supersample", "Supersample", @@ -315,14 +324,14 @@ gimp_operation_blend_class_init (GimpOperationBlendClass *klass) } static void -gimp_operation_blend_init (GimpOperationBlend *self) +gimp_operation_gradient_init (GimpOperationGradient *self) { } static void -gimp_operation_blend_dispose (GObject *object) +gimp_operation_gradient_dispose (GObject *object) { - GimpOperationBlend *self = GIMP_OPERATION_BLEND (object); + GimpOperationGradient *self = GIMP_OPERATION_GRADIENT (object); g_clear_object (&self->gradient); g_clear_object (&self->context); @@ -331,12 +340,12 @@ gimp_operation_blend_dispose (GObject *object) } static void -gimp_operation_blend_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec) +gimp_operation_gradient_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) { - GimpOperationBlend *self = GIMP_OPERATION_BLEND (object); + GimpOperationGradient *self = GIMP_OPERATION_GRADIENT (object); switch (property_id) { @@ -380,6 +389,10 @@ gimp_operation_blend_get_property (GObject *object, g_value_set_boolean (value, self->gradient_reverse); break; + case PROP_GRADIENT_BLEND_COLOR_SPACE: + g_value_set_enum (value, self->gradient_blend_color_space); + break; + case PROP_SUPERSAMPLE: g_value_set_boolean (value, self->supersample); break; @@ -403,12 +416,12 @@ gimp_operation_blend_get_property (GObject *object, } static void -gimp_operation_blend_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec) +gimp_operation_gradient_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) { - GimpOperationBlend *self = GIMP_OPERATION_BLEND (object); + GimpOperationGradient *self = GIMP_OPERATION_GRADIENT (object); switch (property_id) { @@ -423,11 +436,7 @@ gimp_operation_blend_set_property (GObject *object, { GimpGradient *gradient = g_value_get_object (value); - if (self->gradient) - { - g_object_unref (self->gradient); - self->gradient = NULL; - } + g_clear_object (&self->gradient); if (gradient) { @@ -471,6 +480,10 @@ gimp_operation_blend_set_property (GObject *object, self->gradient_reverse = g_value_get_boolean (value); break; + case PROP_GRADIENT_BLEND_COLOR_SPACE: + self->gradient_blend_color_space = g_value_get_enum (value); + break; + case PROP_SUPERSAMPLE: self->supersample = g_value_get_boolean (value); break; @@ -494,13 +507,13 @@ gimp_operation_blend_set_property (GObject *object, } static void -gimp_operation_blend_prepare (GeglOperation *operation) +gimp_operation_gradient_prepare (GeglOperation *operation) { gegl_operation_set_format (operation, "output", babl_format ("R'G'B'A float")); } static GeglRectangle -gimp_operation_blend_get_bounding_box (GeglOperation *operation) +gimp_operation_gradient_get_bounding_box (GeglOperation *operation) { return gegl_rectangle_infinite_plane (); } @@ -928,7 +941,9 @@ gradient_render_pixel (gdouble x, #else rbd->last_seg = gimp_gradient_get_color_at (rbd->gradient, NULL, rbd->last_seg, factor, - rbd->reverse, color); + rbd->reverse, + rbd->blend_color_space, + color); #endif } } @@ -978,13 +993,13 @@ gradient_put_pixel (gint x, } static gboolean -gimp_operation_blend_process (GeglOperation *operation, - GeglBuffer *input, - GeglBuffer *output, - const GeglRectangle *result, - gint level) +gimp_operation_gradient_process (GeglOperation *operation, + GeglBuffer *input, + GeglBuffer *output, + const GeglRectangle *result, + gint level) { - GimpOperationBlend *self = GIMP_OPERATION_BLEND (operation); + GimpOperationGradient *self = GIMP_OPERATION_GRADIENT (operation); const gdouble sx = self->start_x; const gdouble sy = self->start_y; @@ -993,13 +1008,14 @@ gimp_operation_blend_process (GeglOperation *operation, RenderBlendData rbd = { 0, }; - rbd.gradient = NULL; - rbd.reverse = self->gradient_reverse; + rbd.gradient = NULL; + rbd.reverse = self->gradient_reverse; + rbd.blend_color_space = self->gradient_blend_color_space; if (self->gradient) rbd.gradient = g_object_ref (self->gradient); else - rbd.gradient = GIMP_GRADIENT (gimp_gradient_new (NULL, "Blend-Temp")); + rbd.gradient = GIMP_GRADIENT (gimp_gradient_new (NULL, "Gradient-Temp")); #ifdef USE_GRADIENT_CACHE { @@ -1014,7 +1030,9 @@ gimp_operation_blend_process (GeglOperation *operation, gdouble factor = (gdouble) i / (gdouble) (rbd.gradient_cache_size - 1); last_seg = gimp_gradient_get_color_at (rbd.gradient, NULL, last_seg, - factor, rbd.reverse, + factor, + rbd.reverse, + rbd.blend_color_space, rbd.gradient_cache + i); } } diff --git a/app/operations/gimpoperationgradient.h b/app/operations/gimpoperationgradient.h new file mode 100644 index 0000000000..b63686a43b --- /dev/null +++ b/app/operations/gimpoperationgradient.h @@ -0,0 +1,69 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * gimpoperationgradient.h + * Copyright (C) 2014 Michael Henning + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __GIMP_OPERATION_GRADIENT_H__ +#define __GIMP_OPERATION_GRADIENT_H__ + + +#include + + +#define GIMP_TYPE_OPERATION_GRADIENT (gimp_operation_gradient_get_type ()) +#define GIMP_OPERATION_GRADIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_GRADIENT, GimpOperationGradient)) +#define GIMP_OPERATION_GRADIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_OPERATION_GRADIENT, GimpOperationGradientClass)) +#define GIMP_IS_OPERATION_GRADIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_GRADIENT)) +#define GIMP_IS_OPERATION_GRADIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OPERATION_GRADIENT)) +#define GIMP_OPERATION_GRADIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_OPERATION_GRADIENT, GimpOperationGradientClass)) + + +typedef struct _GimpOperationGradient GimpOperationGradient; +typedef struct _GimpOperationGradientClass GimpOperationGradientClass; + +struct _GimpOperationGradient +{ + GeglOperationFilter parent_instance; + + GimpContext *context; + + GimpGradient *gradient; + gdouble start_x, start_y, end_x, end_y; + GimpGradientType gradient_type; + GimpRepeatMode gradient_repeat; + gdouble offset; + gboolean gradient_reverse; + GimpGradientBlendColorSpace gradient_blend_color_space; + + gboolean supersample; + gint supersample_depth; + gdouble supersample_threshold; + + gboolean dither; +}; + +struct _GimpOperationGradientClass +{ + GeglOperationFilterClass parent_class; +}; + + +GType gimp_operation_gradient_get_type (void) G_GNUC_CONST; + + +#endif /* __GIMP_OPERATION_GRADIENT_H__ */ diff --git a/app/operations/gimpoperationgrow.c b/app/operations/gimpoperationgrow.c index 6ed26552d6..9b7f413239 100644 --- a/app/operations/gimpoperationgrow.c +++ b/app/operations/gimpoperationgrow.c @@ -231,7 +231,7 @@ gimp_operation_grow_process (GeglOperation *operation, const GeglRectangle *roi, gint level) { - /* Any bugs in this fuction are probably also in thin_region. + /* Any bugs in this function are probably also in thin_region. * Blame all bugs in this function on jaycox@gimp.org */ GimpOperationGrow *self = GIMP_OPERATION_GROW (operation); diff --git a/app/operations/layer-modes-legacy/Makefile.in b/app/operations/layer-modes-legacy/Makefile.in index 80e31b9482..5682bb130d 100644 --- a/app/operations/layer-modes-legacy/Makefile.in +++ b/app/operations/layer-modes-legacy/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -287,7 +288,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -360,6 +361,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -588,6 +590,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/operations/layer-modes/Makefile.in b/app/operations/layer-modes/Makefile.in index 342d92e172..1215c3b891 100644 --- a/app/operations/layer-modes/Makefile.in +++ b/app/operations/layer-modes/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -302,7 +303,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -375,6 +376,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -603,6 +605,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/operations/tests/Makefile.in b/app/operations/tests/Makefile.in index 56c9b108a8..087d38e6e5 100644 --- a/app/operations/tests/Makefile.in +++ b/app/operations/tests/Makefile.in @@ -101,6 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -216,7 +217,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -289,6 +290,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -517,6 +519,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/paint/Makefile.am b/app/paint/Makefile.am index 149edba289..1cc625e896 100644 --- a/app/paint/Makefile.am +++ b/app/paint/Makefile.am @@ -25,6 +25,8 @@ libapppaint_a_sources = \ gimpairbrushoptions.h \ gimpbrushcore.c \ gimpbrushcore.h \ + gimpbrushcore-loops.cc \ + gimpbrushcore-loops.h \ gimpbrushcore-kernels.h \ gimpclone.c \ gimpclone.h \ @@ -60,7 +62,7 @@ libapppaint_a_sources = \ gimpmybrushsurface.h \ gimppaintcore.c \ gimppaintcore.h \ - gimppaintcore-loops.c \ + gimppaintcore-loops.cc \ gimppaintcore-loops.h \ gimppaintcore-stroke.c \ gimppaintcore-stroke.h \ diff --git a/app/paint/Makefile.in b/app/paint/Makefile.in index 72d3ae2d3c..5f92d6a536 100644 --- a/app/paint/Makefile.in +++ b/app/paint/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -123,11 +124,12 @@ libapppaint_a_LIBADD = am__objects_1 = paint-enums.$(OBJEXT) am__objects_2 = gimp-paint.$(OBJEXT) gimpairbrush.$(OBJEXT) \ gimpairbrushoptions.$(OBJEXT) gimpbrushcore.$(OBJEXT) \ - gimpclone.$(OBJEXT) gimpcloneoptions.$(OBJEXT) \ - gimpconvolve.$(OBJEXT) gimpconvolveoptions.$(OBJEXT) \ - gimpdodgeburn.$(OBJEXT) gimpdodgeburnoptions.$(OBJEXT) \ - gimperaser.$(OBJEXT) gimperaseroptions.$(OBJEXT) \ - gimpheal.$(OBJEXT) gimpink.$(OBJEXT) gimpink-blob.$(OBJEXT) \ + gimpbrushcore-loops.$(OBJEXT) gimpclone.$(OBJEXT) \ + gimpcloneoptions.$(OBJEXT) gimpconvolve.$(OBJEXT) \ + gimpconvolveoptions.$(OBJEXT) gimpdodgeburn.$(OBJEXT) \ + gimpdodgeburnoptions.$(OBJEXT) gimperaser.$(OBJEXT) \ + gimperaseroptions.$(OBJEXT) gimpheal.$(OBJEXT) \ + gimpink.$(OBJEXT) gimpink-blob.$(OBJEXT) \ gimpinkoptions.$(OBJEXT) gimpinkundo.$(OBJEXT) \ gimpmybrushcore.$(OBJEXT) gimpmybrushoptions.$(OBJEXT) \ gimpmybrushsurface.$(OBJEXT) gimppaintcore.$(OBJEXT) \ @@ -178,6 +180,24 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(libapppaint_a_SOURCES) DIST_SOURCES = $(libapppaint_a_SOURCES) am__can_run_installinfo = \ @@ -286,7 +306,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -359,6 +379,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -587,6 +608,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -629,6 +651,8 @@ libapppaint_a_sources = \ gimpairbrushoptions.h \ gimpbrushcore.c \ gimpbrushcore.h \ + gimpbrushcore-loops.cc \ + gimpbrushcore-loops.h \ gimpbrushcore-kernels.h \ gimpclone.c \ gimpclone.h \ @@ -664,7 +688,7 @@ libapppaint_a_sources = \ gimpmybrushsurface.h \ gimppaintcore.c \ gimppaintcore.h \ - gimppaintcore-loops.c \ + gimppaintcore-loops.cc \ gimppaintcore-loops.h \ gimppaintcore-stroke.c \ gimppaintcore-stroke.h \ @@ -703,7 +727,7 @@ CLEANFILES = $(gen_sources) all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .cc .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -751,6 +775,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-paint.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpairbrush.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpairbrushoptions.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrushcore-loops.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrushcore.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpclone.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcloneoptions.Po@am__quote@ @@ -805,6 +830,27 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +.cc.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cc.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cc.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + mostlyclean-libtool: -rm -f *.lo diff --git a/app/paint/gimpairbrush.c b/app/paint/gimpairbrush.c index 8ba5e9737e..042cb2b33b 100644 --- a/app/paint/gimpairbrush.c +++ b/app/paint/gimpairbrush.c @@ -36,6 +36,13 @@ #include "gimp-intl.h" +enum +{ + TIMEOUT, + LAST_SIGNAL +}; + + static void gimp_airbrush_finalize (GObject *object); static void gimp_airbrush_paint (GimpPaintCore *paint_core, @@ -56,6 +63,8 @@ G_DEFINE_TYPE (GimpAirbrush, gimp_airbrush, GIMP_TYPE_PAINTBRUSH) #define parent_class gimp_airbrush_parent_class +static guint airbrush_signals[LAST_SIGNAL] = { 0 }; + void gimp_airbrush_register (Gimp *gimp, @@ -78,6 +87,15 @@ gimp_airbrush_class_init (GimpAirbrushClass *klass) object_class->finalize = gimp_airbrush_finalize; paint_core_class->paint = gimp_airbrush_paint; + + airbrush_signals[TIMEOUT] = + g_signal_new ("timeout", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimpAirbrushClass, timeout), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); } static void @@ -96,8 +114,6 @@ gimp_airbrush_finalize (GObject *object) airbrush->timeout_id = 0; } - g_clear_object (&airbrush->sym); - G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -142,13 +158,6 @@ gimp_airbrush_paint (GimpPaintCore *paint_core, fade_point = gimp_paint_options_get_fade (paint_options, image, paint_core->pixel_dist); - airbrush->drawable = drawable; - airbrush->paint_options = paint_options; - - if (airbrush->sym) - g_object_unref (airbrush->sym); - airbrush->sym = g_object_ref (sym); - /* Base our timeout on the original stroke. */ coords = gimp_symmetry_get_origin (sym); @@ -171,8 +180,6 @@ gimp_airbrush_paint (GimpPaintCore *paint_core, paint_options, sym, paint_state, time); - - g_clear_object (&airbrush->sym); break; } } @@ -212,13 +219,9 @@ gimp_airbrush_timeout (gpointer data) { GimpAirbrush *airbrush = GIMP_AIRBRUSH (data); - gimp_airbrush_paint (GIMP_PAINT_CORE (airbrush), - airbrush->drawable, - airbrush->paint_options, - airbrush->sym, - GIMP_PAINT_STATE_MOTION, 0); + airbrush->timeout_id = 0; - gimp_image_flush (gimp_item_get_image (GIMP_ITEM (airbrush->drawable))); + g_signal_emit (airbrush, airbrush_signals[TIMEOUT], 0); return G_SOURCE_REMOVE; } diff --git a/app/paint/gimpairbrush.h b/app/paint/gimpairbrush.h index a3f9a8a03c..7aa802cc53 100644 --- a/app/paint/gimpairbrush.h +++ b/app/paint/gimpairbrush.h @@ -34,18 +34,17 @@ typedef struct _GimpAirbrushClass GimpAirbrushClass; struct _GimpAirbrush { - GimpPaintbrush parent_instance; + GimpPaintbrush parent_instance; - guint timeout_id; - - GimpSymmetry *sym; - GimpDrawable *drawable; - GimpPaintOptions *paint_options; + guint timeout_id; }; struct _GimpAirbrushClass { GimpPaintbrushClass parent_class; + + /* signals */ + void (* timeout) (GimpAirbrush *airbrush); }; diff --git a/app/paint/gimpbrushcore-loops.cc b/app/paint/gimpbrushcore-loops.cc new file mode 100644 index 0000000000..ecb01b778e --- /dev/null +++ b/app/paint/gimpbrushcore-loops.cc @@ -0,0 +1,429 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "config.h" + +#include + +#include +#include + +#include "libgimpmath/gimpmath.h" + +extern "C" +{ + +#include "paint-types.h" + +#include "core/gimp-parallel.h" +#include "core/gimptempbuf.h" + +#include "gimpbrushcore.h" +#include "gimpbrushcore-loops.h" +#include "gimpbrushcore-kernels.h" + + +#define MIN_PARALLEL_SUB_SIZE 64 +#define MIN_PARALLEL_SUB_AREA (MIN_PARALLEL_SUB_SIZE * MIN_PARALLEL_SUB_SIZE) + + +static inline void +rotate_pointers (gulong **p, + guint32 n) +{ + guint32 i; + gulong *tmp; + + tmp = p[0]; + + for (i = 0; i < n-1; i++) + p[i] = p[i+1]; + + p[i] = tmp; +} + +const GimpTempBuf * +gimp_brush_core_subsample_mask (GimpBrushCore *core, + const GimpTempBuf *mask, + gdouble x, + gdouble y) +{ + GimpTempBuf *dest; + gdouble left; + gint index1; + gint index2; + gint dest_offset_x = 0; + gint dest_offset_y = 0; + const gint *kernel; + gint mask_width = gimp_temp_buf_get_width (mask); + gint mask_height = gimp_temp_buf_get_height (mask); + gint dest_width; + gint dest_height; + + left = x - floor (x); + index1 = (gint) (left * (gdouble) (KERNEL_SUBSAMPLE + 1)); + + left = y - floor (y); + index2 = (gint) (left * (gdouble) (KERNEL_SUBSAMPLE + 1)); + + + if ((mask_width % 2) == 0) + { + index1 += KERNEL_SUBSAMPLE >> 1; + + if (index1 > KERNEL_SUBSAMPLE) + { + index1 -= KERNEL_SUBSAMPLE + 1; + dest_offset_x = 1; + } + } + + if ((mask_height % 2) == 0) + { + index2 += KERNEL_SUBSAMPLE >> 1; + + if (index2 > KERNEL_SUBSAMPLE) + { + index2 -= KERNEL_SUBSAMPLE + 1; + dest_offset_y = 1; + } + } + + kernel = subsample[index2][index1]; + + if (mask == core->last_subsample_brush_mask && + ! core->subsample_cache_invalid) + { + if (core->subsample_brushes[index2][index1]) + return core->subsample_brushes[index2][index1]; + } + else + { + gint i, j; + + for (i = 0; i < KERNEL_SUBSAMPLE + 1; i++) + for (j = 0; j < KERNEL_SUBSAMPLE + 1; j++) + g_clear_pointer (&core->subsample_brushes[i][j], gimp_temp_buf_unref); + + core->last_subsample_brush_mask = mask; + core->subsample_cache_invalid = FALSE; + } + + dest = gimp_temp_buf_new (mask_width + 2, + mask_height + 2, + gimp_temp_buf_get_format (mask)); + gimp_temp_buf_data_clear (dest); + + dest_width = gimp_temp_buf_get_width (dest); + dest_height = gimp_temp_buf_get_height (dest); + + core->subsample_brushes[index2][index1] = dest; + + gimp_parallel_distribute_range (mask_height, MIN_PARALLEL_SUB_SIZE, + [=] (gint y, gint height) + { + const guchar *m; + guchar *d; + const gint *k; + gint y0; + gint i, j; + gint r, s; + gint offs; + gulong *accum[KERNEL_HEIGHT]; + + /* Allocate and initialize the accum buffer */ + for (i = 0; i < KERNEL_HEIGHT ; i++) + accum[i] = g_new0 (gulong, dest_width + 1); + + y0 = MAX (y - (KERNEL_HEIGHT - 1), 0); + + m = gimp_temp_buf_get_data (mask) + y0 * mask_width; + + for (i = y0; i < y; i++) + { + for (j = 0; j < mask_width; j++) + { + k = kernel + KERNEL_WIDTH * (y - i); + for (r = y - i; r < KERNEL_HEIGHT; r++) + { + offs = j + dest_offset_x; + s = KERNEL_WIDTH; + while (s--) + accum[r][offs++] += *m * *k++; + } + m++; + } + + rotate_pointers (accum, KERNEL_HEIGHT); + } + + for (i = y; i < y + height; i++) + { + for (j = 0; j < mask_width; j++) + { + k = kernel; + for (r = 0; r < KERNEL_HEIGHT; r++) + { + offs = j + dest_offset_x; + s = KERNEL_WIDTH; + while (s--) + accum[r][offs++] += *m * *k++; + } + m++; + } + + /* store the accum buffer into the destination mask */ + d = gimp_temp_buf_get_data (dest) + (i + dest_offset_y) * dest_width; + for (j = 0; j < dest_width; j++) + *d++ = (accum[0][j] + 127) / KERNEL_SUM; + + rotate_pointers (accum, KERNEL_HEIGHT); + + memset (accum[KERNEL_HEIGHT - 1], 0, sizeof (gulong) * dest_width); + } + + if (y + height == mask_height) + { + /* store the rest of the accum buffer into the dest mask */ + while (i + dest_offset_y < dest_height) + { + d = gimp_temp_buf_get_data (dest) + (i + dest_offset_y) * dest_width; + for (j = 0; j < dest_width; j++) + *d++ = (accum[0][j] + (KERNEL_SUM / 2)) / KERNEL_SUM; + + rotate_pointers (accum, KERNEL_HEIGHT); + i++; + } + } + + for (i = 0; i < KERNEL_HEIGHT ; i++) + g_free (accum[i]); + }); + + return dest; +} + +/* #define FANCY_PRESSURE */ + +const GimpTempBuf * +gimp_brush_core_pressurize_mask (GimpBrushCore *core, + const GimpTempBuf *brush_mask, + gdouble x, + gdouble y, + gdouble pressure) +{ + static guchar mapi[256]; + const GimpTempBuf *subsample_mask; + gint i; + + /* Get the raw subsampled mask */ + subsample_mask = gimp_brush_core_subsample_mask (core, + brush_mask, + x, y); + + /* Special case pressure = 0.5 */ + if ((gint) (pressure * 100 + 0.5) == 50) + return subsample_mask; + + g_clear_pointer (&core->pressure_brush, gimp_temp_buf_unref); + + core->pressure_brush = + gimp_temp_buf_new (gimp_temp_buf_get_width (brush_mask) + 2, + gimp_temp_buf_get_height (brush_mask) + 2, + gimp_temp_buf_get_format (brush_mask)); + gimp_temp_buf_data_clear (core->pressure_brush); + +#ifdef FANCY_PRESSURE + + /* Create the pressure profile + * + * It is: I'(I) = tanh (20 * (pressure - 0.5) * I) : pressure > 0.5 + * I'(I) = 1 - tanh (20 * (0.5 - pressure) * (1 - I)) : pressure < 0.5 + * + * It looks like: + * + * low pressure medium pressure high pressure + * + * | / -- + * | / / + * / / | + * -- / | + */ + { + gdouble map[256]; + gdouble ds, s, c; + + ds = (pressure - 0.5) * (20.0 / 256.0); + s = 0; + c = 1.0; + + if (ds > 0) + { + for (i = 0; i < 256; i++) + { + map[i] = s / c; + s += c * ds; + c += s * ds; + } + + for (i = 0; i < 256; i++) + mapi[i] = (gint) (255 * map[i] / map[255]); + } + else + { + ds = -ds; + + for (i = 255; i >= 0; i--) + { + map[i] = s / c; + s += c * ds; + c += s * ds; + } + + for (i = 0; i < 256; i++) + mapi[i] = (gint) (255 * (1 - map[i] / map[0])); + } + } + +#else /* ! FANCY_PRESSURE */ + + { + gdouble j, k; + + j = pressure + pressure; + k = 0; + + for (i = 0; i < 256; i++) + { + if (k > 255) + mapi[i] = 255; + else + mapi[i] = (guchar) k; + + k += j; + } + } + +#endif /* FANCY_PRESSURE */ + + /* Now convert the brush */ + + gimp_parallel_distribute_range (gimp_temp_buf_get_width (subsample_mask) * + gimp_temp_buf_get_height (subsample_mask), + MIN_PARALLEL_SUB_AREA, + [=] (gint offset, gint size) + { + const guchar *source; + guchar *dest; + gint i; + + source = gimp_temp_buf_get_data (subsample_mask) + offset; + dest = gimp_temp_buf_get_data (core->pressure_brush) + offset; + + for (i = 0; i < size; i++) + *dest++ = mapi[(*source++)]; + }); + + return core->pressure_brush; +} + +const GimpTempBuf * +gimp_brush_core_solidify_mask (GimpBrushCore *core, + const GimpTempBuf *brush_mask, + gdouble x, + gdouble y) +{ + GimpTempBuf *dest; + gint dest_offset_x = 0; + gint dest_offset_y = 0; + gint brush_mask_width = gimp_temp_buf_get_width (brush_mask); + gint brush_mask_height = gimp_temp_buf_get_height (brush_mask); + + if ((brush_mask_width % 2) == 0) + { + while (x < 0) + x += brush_mask_width; + + if ((x - floor (x)) >= 0.5) + dest_offset_x++; + } + + if ((brush_mask_height % 2) == 0) + { + while (y < 0) + y += brush_mask_height; + + if ((y - floor (y)) >= 0.5) + dest_offset_y++; + } + + if (! core->solid_cache_invalid && + brush_mask == core->last_solid_brush_mask) + { + if (core->solid_brushes[dest_offset_y][dest_offset_x]) + return core->solid_brushes[dest_offset_y][dest_offset_x]; + } + else + { + gint i, j; + + for (i = 0; i < BRUSH_CORE_SOLID_SUBSAMPLE; i++) + for (j = 0; j < BRUSH_CORE_SOLID_SUBSAMPLE; j++) + g_clear_pointer (&core->solid_brushes[i][j], gimp_temp_buf_unref); + + core->last_solid_brush_mask = brush_mask; + core->solid_cache_invalid = FALSE; + } + + dest = gimp_temp_buf_new (brush_mask_width + 2, + brush_mask_height + 2, + babl_format ("Y float")); + gimp_temp_buf_data_clear (dest); + + core->solid_brushes[dest_offset_y][dest_offset_x] = dest; + + gimp_parallel_distribute_area (GEGL_RECTANGLE (0, + 0, + brush_mask_width, + brush_mask_height), + MIN_PARALLEL_SUB_AREA, + [=] (const GeglRectangle *area) + { + const guchar *m; + gfloat *d; + gint i, j; + + m = gimp_temp_buf_get_data (brush_mask) + + area->y * brush_mask_width + area->x; + d = ((gfloat *) gimp_temp_buf_get_data (dest) + + ((dest_offset_y + 1 + area->y) * gimp_temp_buf_get_width (dest) + + (dest_offset_x + 1 + area->x))); + + for (i = 0; i < area->height; i++) + { + for (j = 0; j < area->width; j++) + *d++ = (*m++) ? 1.0 : 0.0; + + m += brush_mask_width - area->width; + d += brush_mask_width + 2 - area->width; + } + }); + + return dest; +} + +} /* extern "C" */ diff --git a/app/paint/gimpbrushcore-loops.h b/app/paint/gimpbrushcore-loops.h new file mode 100644 index 0000000000..8230e5d6cc --- /dev/null +++ b/app/paint/gimpbrushcore-loops.h @@ -0,0 +1,37 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __GIMP_BRUSH_CORE_LOOPS_H__ +#define __GIMP_BRUSH_CORE_LOOPS_H__ + + +const GimpTempBuf * gimp_brush_core_subsample_mask (GimpBrushCore *core, + const GimpTempBuf *mask, + gdouble x, + gdouble y); +const GimpTempBuf * gimp_brush_core_pressurize_mask (GimpBrushCore *core, + const GimpTempBuf *brush_mask, + gdouble x, + gdouble y, + gdouble pressure); +const GimpTempBuf * gimp_brush_core_solidify_mask (GimpBrushCore *core, + const GimpTempBuf *brush_mask, + gdouble x, + gdouble y); + + +#endif /* __GIMP_BRUSH_CORE_LOOPS_H__ */ diff --git a/app/paint/gimpbrushcore.c b/app/paint/gimpbrushcore.c index 079ecc008a..3baa5b0875 100644 --- a/app/paint/gimpbrushcore.c +++ b/app/paint/gimpbrushcore.c @@ -41,6 +41,7 @@ #include "core/gimptempbuf.h" #include "gimpbrushcore.h" +#include "gimpbrushcore-loops.h" #include "gimpbrushcore-kernels.h" #include "gimppaintoptions.h" @@ -97,22 +98,6 @@ static void gimp_brush_core_real_set_brush (GimpBrushCore *core, static void gimp_brush_core_real_set_dynamics (GimpBrushCore *core, GimpDynamics *dynamics); -static const GimpTempBuf * - gimp_brush_core_subsample_mask (GimpBrushCore *core, - const GimpTempBuf *mask, - gdouble x, - gdouble y); -static const GimpTempBuf * - gimp_brush_core_pressurize_mask (GimpBrushCore *core, - const GimpTempBuf *brush_mask, - gdouble x, - gdouble y, - gdouble pressure); -static const GimpTempBuf * - gimp_brush_core_solidify_mask (GimpBrushCore *core, - const GimpTempBuf *brush_mask, - gdouble x, - gdouble y); static const GimpTempBuf * gimp_brush_core_transform_mask (GimpBrushCore *core, GimpBrush *brush, @@ -520,7 +505,7 @@ gimp_brush_core_interpolate (GimpPaintCore *paint_core, gimp_paint_core_paint (paint_core, drawable, paint_options, GIMP_PAINT_STATE_MOTION, time); - paint_core->pixel_dist = pixel_initial + pixel_dist; /* Dont forget to update pixel distance*/ + paint_core->pixel_dist = pixel_initial + pixel_dist; /* Don't forget to update pixel distance*/ return; } @@ -674,7 +659,7 @@ gimp_brush_core_interpolate (GimpPaintCore *paint_core, { /* Exception A: If the first stripe's brush position is * EXTRApolated into a different pixel square than the - * ideal starting point, dont't plot it. + * ideal starting point, don't plot it. */ s0 += direction; } @@ -1049,348 +1034,6 @@ gimp_brush_core_invalidate_cache (GimpBrush *brush, * LOCAL FUNCTION DEFINITIONS * ************************************************************/ -static inline void -rotate_pointers (gulong **p, - guint32 n) -{ - guint32 i; - gulong *tmp; - - tmp = p[0]; - - for (i = 0; i < n-1; i++) - p[i] = p[i+1]; - - p[i] = tmp; -} - -static const GimpTempBuf * -gimp_brush_core_subsample_mask (GimpBrushCore *core, - const GimpTempBuf *mask, - gdouble x, - gdouble y) -{ - GimpTempBuf *dest; - gdouble left; - const guchar *m; - guchar *d; - const gint *k; - gint index1; - gint index2; - gint dest_offset_x = 0; - gint dest_offset_y = 0; - const gint *kernel; - gint i, j; - gint r, s; - gulong *accum[KERNEL_HEIGHT]; - gint offs; - gint mask_width = gimp_temp_buf_get_width (mask); - gint mask_height = gimp_temp_buf_get_height (mask); - gint dest_width; - gint dest_height; - - while (x < 0) - x += mask_width; - - left = x - floor (x); - index1 = (gint) (left * (gdouble) (KERNEL_SUBSAMPLE + 1)); - - while (y < 0) - y += mask_height; - - left = y - floor (y); - index2 = (gint) (left * (gdouble) (KERNEL_SUBSAMPLE + 1)); - - - if ((mask_width % 2) == 0) - { - index1 += KERNEL_SUBSAMPLE >> 1; - - if (index1 > KERNEL_SUBSAMPLE) - { - index1 -= KERNEL_SUBSAMPLE + 1; - dest_offset_x = 1; - } - } - - if ((mask_height % 2) == 0) - { - index2 += KERNEL_SUBSAMPLE >> 1; - - if (index2 > KERNEL_SUBSAMPLE) - { - index2 -= KERNEL_SUBSAMPLE + 1; - dest_offset_y = 1; - } - } - - - kernel = subsample[index2][index1]; - - if (mask == core->last_subsample_brush_mask && - ! core->subsample_cache_invalid) - { - if (core->subsample_brushes[index2][index1]) - return core->subsample_brushes[index2][index1]; - } - else - { - for (i = 0; i < KERNEL_SUBSAMPLE + 1; i++) - for (j = 0; j < KERNEL_SUBSAMPLE + 1; j++) - g_clear_pointer (&core->subsample_brushes[i][j], gimp_temp_buf_unref); - - core->last_subsample_brush_mask = mask; - core->subsample_cache_invalid = FALSE; - } - - dest = gimp_temp_buf_new (mask_width + 2, - mask_height + 2, - gimp_temp_buf_get_format (mask)); - gimp_temp_buf_data_clear (dest); - - dest_width = gimp_temp_buf_get_width (dest); - dest_height = gimp_temp_buf_get_height (dest); - - /* Allocate and initialize the accum buffer */ - for (i = 0; i < KERNEL_HEIGHT ; i++) - accum[i] = g_new0 (gulong, dest_width + 1); - - core->subsample_brushes[index2][index1] = dest; - - m = gimp_temp_buf_get_data (mask); - for (i = 0; i < mask_height; i++) - { - for (j = 0; j < mask_width; j++) - { - k = kernel; - for (r = 0; r < KERNEL_HEIGHT; r++) - { - offs = j + dest_offset_x; - s = KERNEL_WIDTH; - while (s--) - accum[r][offs++] += *m * *k++; - } - m++; - } - - /* store the accum buffer into the destination mask */ - d = gimp_temp_buf_get_data (dest) + (i + dest_offset_y) * dest_width; - for (j = 0; j < dest_width; j++) - *d++ = (accum[0][j] + 127) / KERNEL_SUM; - - rotate_pointers (accum, KERNEL_HEIGHT); - - memset (accum[KERNEL_HEIGHT - 1], 0, sizeof (gulong) * dest_width); - } - - /* store the rest of the accum buffer into the dest mask */ - while (i + dest_offset_y < dest_height) - { - d = gimp_temp_buf_get_data (dest) + (i + dest_offset_y) * dest_width; - for (j = 0; j < dest_width; j++) - *d++ = (accum[0][j] + (KERNEL_SUM / 2)) / KERNEL_SUM; - - rotate_pointers (accum, KERNEL_HEIGHT); - i++; - } - - for (i = 0; i < KERNEL_HEIGHT ; i++) - g_free (accum[i]); - - return dest; -} - -/* #define FANCY_PRESSURE */ - -static const GimpTempBuf * -gimp_brush_core_pressurize_mask (GimpBrushCore *core, - const GimpTempBuf *brush_mask, - gdouble x, - gdouble y, - gdouble pressure) -{ - static guchar mapi[256]; - const guchar *source; - guchar *dest; - const GimpTempBuf *subsample_mask; - gint i; - - /* Get the raw subsampled mask */ - subsample_mask = gimp_brush_core_subsample_mask (core, - brush_mask, - x, y); - - /* Special case pressure = 0.5 */ - if ((gint) (pressure * 100 + 0.5) == 50) - return subsample_mask; - - g_clear_pointer (&core->pressure_brush, gimp_temp_buf_unref); - - core->pressure_brush = - gimp_temp_buf_new (gimp_temp_buf_get_width (brush_mask) + 2, - gimp_temp_buf_get_height (brush_mask) + 2, - gimp_temp_buf_get_format (brush_mask)); - gimp_temp_buf_data_clear (core->pressure_brush); - -#ifdef FANCY_PRESSURE - - /* Create the pressure profile - * - * It is: I'(I) = tanh (20 * (pressure - 0.5) * I) : pressure > 0.5 - * I'(I) = 1 - tanh (20 * (0.5 - pressure) * (1 - I)) : pressure < 0.5 - * - * It looks like: - * - * low pressure medium pressure high pressure - * - * | / -- - * | / / - * / / | - * -- / | - */ - { - gdouble map[256]; - gdouble ds, s, c; - - ds = (pressure - 0.5) * (20.0 / 256.0); - s = 0; - c = 1.0; - - if (ds > 0) - { - for (i = 0; i < 256; i++) - { - map[i] = s / c; - s += c * ds; - c += s * ds; - } - - for (i = 0; i < 256; i++) - mapi[i] = (gint) (255 * map[i] / map[255]); - } - else - { - ds = -ds; - - for (i = 255; i >= 0; i--) - { - map[i] = s / c; - s += c * ds; - c += s * ds; - } - - for (i = 0; i < 256; i++) - mapi[i] = (gint) (255 * (1 - map[i] / map[0])); - } - } - -#else /* ! FANCY_PRESSURE */ - - { - gdouble j, k; - - j = pressure + pressure; - k = 0; - - for (i = 0; i < 256; i++) - { - if (k > 255) - mapi[i] = 255; - else - mapi[i] = (guchar) k; - - k += j; - } - } - -#endif /* FANCY_PRESSURE */ - - /* Now convert the brush */ - - source = gimp_temp_buf_get_data (subsample_mask); - dest = gimp_temp_buf_get_data (core->pressure_brush); - - i = gimp_temp_buf_get_width (subsample_mask) * - gimp_temp_buf_get_height (subsample_mask); - - while (i--) - *dest++ = mapi[(*source++)]; - - return core->pressure_brush; -} - -static const GimpTempBuf * -gimp_brush_core_solidify_mask (GimpBrushCore *core, - const GimpTempBuf *brush_mask, - gdouble x, - gdouble y) -{ - GimpTempBuf *dest; - const guchar *m; - gfloat *d; - gint dest_offset_x = 0; - gint dest_offset_y = 0; - gint brush_mask_width = gimp_temp_buf_get_width (brush_mask); - gint brush_mask_height = gimp_temp_buf_get_height (brush_mask); - gint i, j; - - if ((brush_mask_width % 2) == 0) - { - while (x < 0) - x += brush_mask_width; - - if ((x - floor (x)) >= 0.5) - dest_offset_x++; - } - - if ((brush_mask_height % 2) == 0) - { - while (y < 0) - y += brush_mask_height; - - if ((y - floor (y)) >= 0.5) - dest_offset_y++; - } - - if (! core->solid_cache_invalid && - brush_mask == core->last_solid_brush_mask) - { - if (core->solid_brushes[dest_offset_y][dest_offset_x]) - return core->solid_brushes[dest_offset_y][dest_offset_x]; - } - else - { - for (i = 0; i < BRUSH_CORE_SOLID_SUBSAMPLE; i++) - for (j = 0; j < BRUSH_CORE_SOLID_SUBSAMPLE; j++) - g_clear_pointer (&core->solid_brushes[i][j], gimp_temp_buf_unref); - - core->last_solid_brush_mask = brush_mask; - core->solid_cache_invalid = FALSE; - } - - dest = gimp_temp_buf_new (brush_mask_width + 2, - brush_mask_height + 2, - babl_format ("Y float")); - gimp_temp_buf_data_clear (dest); - - core->solid_brushes[dest_offset_y][dest_offset_x] = dest; - - m = gimp_temp_buf_get_data (brush_mask); - d = ((gfloat *) gimp_temp_buf_get_data (dest) + - ((dest_offset_y + 1) * gimp_temp_buf_get_width (dest) + - (dest_offset_x + 1))); - - for (i = 0; i < brush_mask_height; i++) - { - for (j = 0; j < brush_mask_width; j++) - *d++ = (*m++) ? 1.0 : 0.0; - - d += 2; - } - - return dest; -} - static const GimpTempBuf * gimp_brush_core_transform_mask (GimpBrushCore *core, GimpBrush *brush, @@ -1576,7 +1219,7 @@ gimp_brush_core_eval_transform_dynamics (GimpBrushCore *core, /* Zero aspect ratio is special cased to half of all ar range, * to force dynamics to have any effect. Forcing to full results - * in disapearing stamp if applied to maximum. + * in disappearing stamp if applied to maximum. */ if (core->aspect_ratio == 0.0) core->aspect_ratio = 10.0 * dyn_aspect; @@ -1717,7 +1360,7 @@ gimp_brush_core_paint_line_pixmap_mask (const Babl *fish, pixmap_format = gimp_temp_buf_get_format (pixmap_mask); pixmap_bytes = babl_format_get_bytes_per_pixel (pixmap_format); - /* Point to the approriate scanline */ + /* Point to the appropriate scanline */ b = (gimp_temp_buf_get_data (pixmap_mask) + y * pixmap_width * pixmap_bytes); diff --git a/app/paint/gimpink.c b/app/paint/gimpink.c index 3a3e6d8150..32af20a720 100644 --- a/app/paint/gimpink.c +++ b/app/paint/gimpink.c @@ -168,6 +168,7 @@ gimp_ink_paint (GimpPaintCore *paint_core, GimpContext *context = GIMP_CONTEXT (paint_options); GimpRGB foreground; + gimp_symmetry_set_stateful (sym, TRUE); gimp_context_get_foreground (context, &foreground); gimp_palettes_add_color_history (context->gimp, &foreground); @@ -217,6 +218,7 @@ gimp_ink_paint (GimpPaintCore *paint_core, break; case GIMP_PAINT_STATE_FINISH: + gimp_symmetry_set_stateful (sym, FALSE); break; } } diff --git a/app/paint/gimpmybrushcore.c b/app/paint/gimpmybrushcore.c index eb650570e1..52ef69e1ab 100644 --- a/app/paint/gimpmybrushcore.c +++ b/app/paint/gimpmybrushcore.c @@ -212,6 +212,7 @@ gimp_mybrush_core_paint (GimpPaintCore *paint_core, case GIMP_PAINT_STATE_INIT: gimp_context_get_foreground (context, &fg); gimp_palettes_add_color_history (context->gimp, &fg); + gimp_symmetry_set_stateful (sym, TRUE); mybrush->private->surface = gimp_mypaint_surface_new (gimp_drawable_get_buffer (drawable), @@ -233,6 +234,7 @@ gimp_mybrush_core_paint (GimpPaintCore *paint_core, break; case GIMP_PAINT_STATE_FINISH: + gimp_symmetry_set_stateful (sym, FALSE); mypaint_surface_unref ((MyPaintSurface *) mybrush->private->surface); mybrush->private->surface = NULL; diff --git a/app/paint/gimpmybrushsurface.c b/app/paint/gimpmybrushsurface.c index add4277847..aba6b55782 100644 --- a/app/paint/gimpmybrushsurface.c +++ b/app/paint/gimpmybrushsurface.c @@ -436,7 +436,7 @@ gimp_mypaint_surface_draw_dab (MyPaintSurface *base_surface, if (a > 0.0f) { /* By definition the ratio between each color[] and pixel[] component in a non-pre-multipled blend always sums to 1.0f. - * Originaly this would have been "(color[n] * alpha * color_a + pixel[n] * dst_alpha * (1.0f - alpha)) / a", + * Originally this would have been "(color[n] * alpha * color_a + pixel[n] * dst_alpha * (1.0f - alpha)) / a", * instead we only calculate the cheaper term. */ float src_term = (alpha * color_a) / a; float dst_term = 1.0f - src_term; diff --git a/app/paint/gimppaintcore-loops.c b/app/paint/gimppaintcore-loops.c deleted file mode 100644 index a58b3f3759..0000000000 --- a/app/paint/gimppaintcore-loops.c +++ /dev/null @@ -1,440 +0,0 @@ -/* GIMP - The GNU Image Manipulation Program - * Copyright (C) 2013 Daniel Sabo - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "config.h" - -#include -#include - -#include "paint-types.h" - -#include "operations/layer-modes/gimp-layer-modes.h" - -#include "core/gimptempbuf.h" - -#include "operations/layer-modes/gimpoperationlayermode.h" - -#include "gimppaintcore-loops.h" - - -void -combine_paint_mask_to_canvas_mask (const GimpTempBuf *paint_mask, - gint mask_x_offset, - gint mask_y_offset, - GeglBuffer *canvas_buffer, - gint x_offset, - gint y_offset, - gfloat opacity, - gboolean stipple) -{ - GeglRectangle roi; - GeglBufferIterator *iter; - - const gint mask_stride = gimp_temp_buf_get_width (paint_mask); - const gint mask_start_offset = mask_y_offset * mask_stride + mask_x_offset; - const Babl *mask_format = gimp_temp_buf_get_format (paint_mask); - GimpTempBuf *modified_mask = gimp_temp_buf_copy (paint_mask); - gint width; - gint height; - - width = gimp_temp_buf_get_width (modified_mask); - height = gimp_temp_buf_get_height (modified_mask); - - roi.x = x_offset; - roi.y = y_offset; - roi.width = width - mask_x_offset; - roi.height = height - mask_y_offset; - - iter = gegl_buffer_iterator_new (canvas_buffer, &roi, 0, - babl_format ("Y float"), - GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE); - - if (stipple) - { - if (mask_format == babl_format ("Y u8")) - { - const guint8 *mask_data = (const guint8 *) gimp_temp_buf_get_data (modified_mask); - mask_data += mask_start_offset; - - while (gegl_buffer_iterator_next (iter)) - { - gfloat *out_pixel = (gfloat *)iter->data[0]; - int iy, ix; - - for (iy = 0; iy < iter->roi[0].height; iy++) - { - int mask_offset = (iy + iter->roi[0].y - roi.y) * mask_stride + iter->roi[0].x - roi.x; - const guint8 *mask_pixel = &mask_data[mask_offset]; - - for (ix = 0; ix < iter->roi[0].width; ix++) - { - out_pixel[0] += (1.0 - out_pixel[0]) * (*mask_pixel / 255.0f) * opacity; - - mask_pixel += 1; - out_pixel += 1; - } - } - } - } - else if (mask_format == babl_format ("Y float")) - { - const gfloat *mask_data = (const gfloat *) gimp_temp_buf_get_data (modified_mask); - mask_data += mask_start_offset; - - while (gegl_buffer_iterator_next (iter)) - { - gfloat *out_pixel = (gfloat *)iter->data[0]; - int iy, ix; - - for (iy = 0; iy < iter->roi[0].height; iy++) - { - int mask_offset = (iy + iter->roi[0].y - roi.y) * mask_stride + iter->roi[0].x - roi.x; - const gfloat *mask_pixel = &mask_data[mask_offset]; - - for (ix = 0; ix < iter->roi[0].width; ix++) - { - out_pixel[0] += (1.0 - out_pixel[0]) * (*mask_pixel) * opacity; - - mask_pixel += 1; - out_pixel += 1; - } - } - } - } - else - { - g_warning("Mask format not supported: %s", babl_get_name (mask_format)); - } - } - else - { - if (mask_format == babl_format ("Y u8")) - { - const guint8 *mask_data = (const guint8 *) gimp_temp_buf_get_data (modified_mask); - mask_data += mask_start_offset; - - while (gegl_buffer_iterator_next (iter)) - { - gfloat *out_pixel = (gfloat *)iter->data[0]; - int iy, ix; - - for (iy = 0; iy < iter->roi[0].height; iy++) - { - int mask_offset = (iy + iter->roi[0].y - roi.y) * mask_stride + iter->roi[0].x - roi.x; - const guint8 *mask_pixel = &mask_data[mask_offset]; - - for (ix = 0; ix < iter->roi[0].width; ix++) - { - if (opacity > out_pixel[0]) - out_pixel[0] += (opacity - out_pixel[0]) * (*mask_pixel / 255.0f) * opacity; - - mask_pixel += 1; - out_pixel += 1; - } - } - } - } - else if (mask_format == babl_format ("Y float")) - { - const gfloat *mask_data = (const gfloat *) gimp_temp_buf_get_data (modified_mask); - mask_data += mask_start_offset; - - while (gegl_buffer_iterator_next (iter)) - { - gfloat *out_pixel = (gfloat *)iter->data[0]; - int iy, ix; - - for (iy = 0; iy < iter->roi[0].height; iy++) - { - int mask_offset = (iy + iter->roi[0].y - roi.y) * mask_stride + iter->roi[0].x - roi.x; - const gfloat *mask_pixel = &mask_data[mask_offset]; - - for (ix = 0; ix < iter->roi[0].width; ix++) - { - if (opacity > out_pixel[0]) - out_pixel[0] += (opacity - out_pixel[0]) * (*mask_pixel) * opacity; - - mask_pixel += 1; - out_pixel += 1; - } - } - } - } - else - { - g_warning("Mask format not supported: %s", babl_get_name (mask_format)); - } - } - gimp_temp_buf_unref (modified_mask); -} - -void -canvas_buffer_to_paint_buf_alpha (GimpTempBuf *paint_buf, - GeglBuffer *canvas_buffer, - gint x_offset, - gint y_offset) -{ - /* Copy the canvas buffer in rect to the paint buffer's alpha channel */ - GeglRectangle roi; - GeglBufferIterator *iter; - - const guint paint_stride = gimp_temp_buf_get_width (paint_buf); - gfloat *paint_data = (gfloat *) gimp_temp_buf_get_data (paint_buf); - - roi.x = x_offset; - roi.y = y_offset; - roi.width = gimp_temp_buf_get_width (paint_buf); - roi.height = gimp_temp_buf_get_height (paint_buf); - - iter = gegl_buffer_iterator_new (canvas_buffer, &roi, 0, - babl_format ("Y float"), - GEGL_ACCESS_READ, GEGL_ABYSS_NONE); - - while (gegl_buffer_iterator_next (iter)) - { - gfloat *canvas_pixel = (gfloat *)iter->data[0]; - int iy, ix; - - for (iy = 0; iy < iter->roi[0].height; iy++) - { - int paint_offset = (iy + iter->roi[0].y - roi.y) * paint_stride + iter->roi[0].x - roi.x; - float *paint_pixel = &paint_data[paint_offset * 4]; - - for (ix = 0; ix < iter->roi[0].width; ix++) - { - paint_pixel[3] *= *canvas_pixel; - - canvas_pixel += 1; - paint_pixel += 4; - } - } - } -} - -void -paint_mask_to_paint_buffer (const GimpTempBuf *paint_mask, - gint mask_x_offset, - gint mask_y_offset, - GimpTempBuf *paint_buf, - gfloat paint_opacity) -{ - gint width = gimp_temp_buf_get_width (paint_buf); - gint height = gimp_temp_buf_get_height (paint_buf); - - const gint mask_stride = gimp_temp_buf_get_width (paint_mask); - const gint mask_start_offset = mask_y_offset * mask_stride + mask_x_offset; - const Babl *mask_format = gimp_temp_buf_get_format (paint_mask); - - int iy, ix; - gfloat *paint_pixel = (gfloat *)gimp_temp_buf_get_data (paint_buf); - - /* Validate that the paint buffer is withing the bounds of the paint mask */ - g_return_if_fail (width <= gimp_temp_buf_get_width (paint_mask) - mask_x_offset); - g_return_if_fail (height <= gimp_temp_buf_get_height (paint_mask) - mask_y_offset); - - if (mask_format == babl_format ("Y u8")) - { - const guint8 *mask_data = (const guint8 *) gimp_temp_buf_get_data (paint_mask); - mask_data += mask_start_offset; - - for (iy = 0; iy < height; iy++) - { - int mask_offset = iy * mask_stride; - const guint8 *mask_pixel = &mask_data[mask_offset]; - - for (ix = 0; ix < width; ix++) - { - paint_pixel[3] *= (((gfloat)*mask_pixel) / 255.0f) * paint_opacity; - - mask_pixel += 1; - paint_pixel += 4; - } - } - } - else if (mask_format == babl_format ("Y float")) - { - const gfloat *mask_data = (const gfloat *) gimp_temp_buf_get_data (paint_mask); - mask_data += mask_start_offset; - - for (iy = 0; iy < height; iy++) - { - int mask_offset = iy * mask_stride; - const gfloat *mask_pixel = &mask_data[mask_offset]; - - for (ix = 0; ix < width; ix++) - { - paint_pixel[3] *= (*mask_pixel) * paint_opacity; - - mask_pixel += 1; - paint_pixel += 4; - } - } - } -} - -void -do_layer_blend (GeglBuffer *src_buffer, - GeglBuffer *dst_buffer, - GimpTempBuf *paint_buf, - GeglBuffer *mask_buffer, - gfloat opacity, - gint x_offset, - gint y_offset, - gint mask_x_offset, - gint mask_y_offset, - GimpLayerMode paint_mode) -{ - GeglRectangle roi; - GeglRectangle mask_roi; - GeglRectangle process_roi; - const Babl *iterator_format; - GeglBufferIterator *iter; - guint paint_stride; - gfloat *paint_data; - GimpOperationLayerMode layer_mode; - - paint_stride = gimp_temp_buf_get_width (paint_buf); - paint_data = (gfloat *) gimp_temp_buf_get_data (paint_buf); - - layer_mode.layer_mode = paint_mode; - layer_mode.opacity = opacity; - layer_mode.function = gimp_layer_mode_get_function (paint_mode); - layer_mode.blend_function = gimp_layer_mode_get_blend_function (paint_mode); - layer_mode.blend_space = gimp_layer_mode_get_blend_space (paint_mode); - layer_mode.composite_space = gimp_layer_mode_get_composite_space (paint_mode); - layer_mode.composite_mode = gimp_layer_mode_get_paint_composite_mode (paint_mode); - layer_mode.real_composite_mode = layer_mode.composite_mode; - - iterator_format = gimp_layer_mode_get_format (paint_mode, - layer_mode.composite_space, - layer_mode.blend_space, - gimp_temp_buf_get_format (paint_buf)); - - roi.x = x_offset; - roi.y = y_offset; - roi.width = gimp_temp_buf_get_width (paint_buf); - roi.height = gimp_temp_buf_get_height (paint_buf); - - mask_roi.x = roi.x - mask_x_offset; - mask_roi.y = roi.y - mask_y_offset; - mask_roi.width = roi.width; - mask_roi.height = roi.height; - - g_return_if_fail (gimp_temp_buf_get_format (paint_buf) == iterator_format); - - iter = gegl_buffer_iterator_new (dst_buffer, &roi, 0, - iterator_format, - GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE); - - gegl_buffer_iterator_add (iter, src_buffer, &roi, 0, - iterator_format, - GEGL_ACCESS_READ, GEGL_ABYSS_NONE); - - if (mask_buffer) - { - gegl_buffer_iterator_add (iter, mask_buffer, &mask_roi, 0, - babl_format ("Y float"), - GEGL_ACCESS_READ, GEGL_ABYSS_NONE); - } - - while (gegl_buffer_iterator_next (iter)) - { - gfloat *out_pixel = (gfloat *) iter->data[0]; - gfloat *in_pixel = (gfloat *) iter->data[1]; - gfloat *mask_pixel = NULL; - gfloat *paint_pixel; - gint iy; - - paint_pixel = paint_data + ((iter->roi[0].y - roi.y) * paint_stride + iter->roi[0].x - roi.x) * 4; - - if (mask_buffer) - mask_pixel = (gfloat *)iter->data[2]; - - process_roi.x = iter->roi[0].x; - process_roi.width = iter->roi[0].width; - process_roi.height = 1; - - for (iy = 0; iy < iter->roi[0].height; iy++) - { - process_roi.y = iter->roi[0].y + iy; - - layer_mode.function ((GeglOperation*) &layer_mode, - in_pixel, - paint_pixel, - mask_pixel, - out_pixel, - iter->roi[0].width, - &process_roi, - 0); - - in_pixel += iter->roi[0].width * 4; - out_pixel += iter->roi[0].width * 4; - if (mask_buffer) - mask_pixel += iter->roi[0].width; - paint_pixel += paint_stride * 4; - } - } -} - -void -mask_components_onto (GeglBuffer *src_buffer, - GeglBuffer *aux_buffer, - GeglBuffer *dst_buffer, - GeglRectangle *roi, - GimpComponentMask mask, - gboolean linear_mode) -{ - GeglBufferIterator *iter; - const Babl *iterator_format; - - if (linear_mode) - iterator_format = babl_format ("RGBA float"); - else - iterator_format = babl_format ("R'G'B'A float"); - - iter = gegl_buffer_iterator_new (dst_buffer, roi, 0, - iterator_format, - GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE); - - gegl_buffer_iterator_add (iter, src_buffer, roi, 0, - iterator_format, - GEGL_ACCESS_READ, GEGL_ABYSS_NONE); - - gegl_buffer_iterator_add (iter, aux_buffer, roi, 0, - iterator_format, - GEGL_ACCESS_READ, GEGL_ABYSS_NONE); - - while (gegl_buffer_iterator_next (iter)) - { - gfloat *dest = (gfloat *)iter->data[0]; - gfloat *src = (gfloat *)iter->data[1]; - gfloat *aux = (gfloat *)iter->data[2]; - glong samples = iter->length; - - while (samples--) - { - dest[RED] = (mask & GIMP_COMPONENT_MASK_RED) ? aux[RED] : src[RED]; - dest[GREEN] = (mask & GIMP_COMPONENT_MASK_GREEN) ? aux[GREEN] : src[GREEN]; - dest[BLUE] = (mask & GIMP_COMPONENT_MASK_BLUE) ? aux[BLUE] : src[BLUE]; - dest[ALPHA] = (mask & GIMP_COMPONENT_MASK_ALPHA) ? aux[ALPHA] : src[ALPHA]; - - src += 4; - aux += 4; - dest += 4; - } - } -} diff --git a/app/paint/gimppaintcore-loops.cc b/app/paint/gimppaintcore-loops.cc new file mode 100644 index 0000000000..c02335dca0 --- /dev/null +++ b/app/paint/gimppaintcore-loops.cc @@ -0,0 +1,471 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 2013 Daniel Sabo + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "config.h" + +#include +#include + +extern "C" +{ + +#include "paint-types.h" + +#include "operations/layer-modes/gimp-layer-modes.h" + +#include "core/gimp-parallel.h" +#include "core/gimptempbuf.h" + +#include "operations/layer-modes/gimpoperationlayermode.h" + +#include "gimppaintcore-loops.h" + + +#define MIN_PARALLEL_SUB_SIZE 64 +#define MIN_PARALLEL_SUB_AREA (MIN_PARALLEL_SUB_SIZE * MIN_PARALLEL_SUB_SIZE) + + +void +combine_paint_mask_to_canvas_mask (const GimpTempBuf *paint_mask, + gint mask_x_offset, + gint mask_y_offset, + GeglBuffer *canvas_buffer, + gint x_offset, + gint y_offset, + gfloat opacity, + gboolean stipple) +{ + GeglRectangle roi; + + const gint mask_stride = gimp_temp_buf_get_width (paint_mask); + const gint mask_start_offset = mask_y_offset * mask_stride + mask_x_offset; + const Babl *mask_format = gimp_temp_buf_get_format (paint_mask); + gint width; + gint height; + + width = gimp_temp_buf_get_width (paint_mask); + height = gimp_temp_buf_get_height (paint_mask); + + roi.x = x_offset; + roi.y = y_offset; + roi.width = width - mask_x_offset; + roi.height = height - mask_y_offset; + + gimp_parallel_distribute_area (&roi, MIN_PARALLEL_SUB_AREA, + [=] (const GeglRectangle *area) + { + GeglBufferIterator *iter; + + iter = gegl_buffer_iterator_new (canvas_buffer, area, 0, + babl_format ("Y float"), + GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE); + + if (stipple) + { + if (mask_format == babl_format ("Y u8")) + { + const guint8 *mask_data = (const guint8 *) gimp_temp_buf_get_data (paint_mask); + mask_data += mask_start_offset; + + while (gegl_buffer_iterator_next (iter)) + { + gfloat *out_pixel = (gfloat *)iter->data[0]; + int iy, ix; + + for (iy = 0; iy < iter->roi[0].height; iy++) + { + int mask_offset = (iy + iter->roi[0].y - roi.y) * mask_stride + iter->roi[0].x - roi.x; + const guint8 *mask_pixel = &mask_data[mask_offset]; + + for (ix = 0; ix < iter->roi[0].width; ix++) + { + out_pixel[0] += (1.0 - out_pixel[0]) * (*mask_pixel / 255.0f) * opacity; + + mask_pixel += 1; + out_pixel += 1; + } + } + } + } + else if (mask_format == babl_format ("Y float")) + { + const gfloat *mask_data = (const gfloat *) gimp_temp_buf_get_data (paint_mask); + mask_data += mask_start_offset; + + while (gegl_buffer_iterator_next (iter)) + { + gfloat *out_pixel = (gfloat *)iter->data[0]; + int iy, ix; + + for (iy = 0; iy < iter->roi[0].height; iy++) + { + int mask_offset = (iy + iter->roi[0].y - roi.y) * mask_stride + iter->roi[0].x - roi.x; + const gfloat *mask_pixel = &mask_data[mask_offset]; + + for (ix = 0; ix < iter->roi[0].width; ix++) + { + out_pixel[0] += (1.0 - out_pixel[0]) * (*mask_pixel) * opacity; + + mask_pixel += 1; + out_pixel += 1; + } + } + } + } + else + { + g_warning("Mask format not supported: %s", babl_get_name (mask_format)); + } + } + else + { + if (mask_format == babl_format ("Y u8")) + { + const guint8 *mask_data = (const guint8 *) gimp_temp_buf_get_data (paint_mask); + mask_data += mask_start_offset; + + while (gegl_buffer_iterator_next (iter)) + { + gfloat *out_pixel = (gfloat *)iter->data[0]; + int iy, ix; + + for (iy = 0; iy < iter->roi[0].height; iy++) + { + int mask_offset = (iy + iter->roi[0].y - roi.y) * mask_stride + iter->roi[0].x - roi.x; + const guint8 *mask_pixel = &mask_data[mask_offset]; + + for (ix = 0; ix < iter->roi[0].width; ix++) + { + if (opacity > out_pixel[0]) + out_pixel[0] += (opacity - out_pixel[0]) * (*mask_pixel / 255.0f) * opacity; + + mask_pixel += 1; + out_pixel += 1; + } + } + } + } + else if (mask_format == babl_format ("Y float")) + { + const gfloat *mask_data = (const gfloat *) gimp_temp_buf_get_data (paint_mask); + mask_data += mask_start_offset; + + while (gegl_buffer_iterator_next (iter)) + { + gfloat *out_pixel = (gfloat *)iter->data[0]; + int iy, ix; + + for (iy = 0; iy < iter->roi[0].height; iy++) + { + int mask_offset = (iy + iter->roi[0].y - roi.y) * mask_stride + iter->roi[0].x - roi.x; + const gfloat *mask_pixel = &mask_data[mask_offset]; + + for (ix = 0; ix < iter->roi[0].width; ix++) + { + if (opacity > out_pixel[0]) + out_pixel[0] += (opacity - out_pixel[0]) * (*mask_pixel) * opacity; + + mask_pixel += 1; + out_pixel += 1; + } + } + } + } + else + { + g_warning("Mask format not supported: %s", babl_get_name (mask_format)); + } + } + }); +} + +void +canvas_buffer_to_paint_buf_alpha (GimpTempBuf *paint_buf, + GeglBuffer *canvas_buffer, + gint x_offset, + gint y_offset) +{ + /* Copy the canvas buffer in rect to the paint buffer's alpha channel */ + GeglRectangle roi; + + const guint paint_stride = gimp_temp_buf_get_width (paint_buf); + gfloat *paint_data = (gfloat *) gimp_temp_buf_get_data (paint_buf); + + roi.x = x_offset; + roi.y = y_offset; + roi.width = gimp_temp_buf_get_width (paint_buf); + roi.height = gimp_temp_buf_get_height (paint_buf); + + gimp_parallel_distribute_area (&roi, MIN_PARALLEL_SUB_AREA, + [=] (const GeglRectangle *area) + { + GeglBufferIterator *iter; + + iter = gegl_buffer_iterator_new (canvas_buffer, area, 0, + babl_format ("Y float"), + GEGL_ACCESS_READ, GEGL_ABYSS_NONE); + + while (gegl_buffer_iterator_next (iter)) + { + gfloat *canvas_pixel = (gfloat *)iter->data[0]; + int iy, ix; + + for (iy = 0; iy < iter->roi[0].height; iy++) + { + int paint_offset = (iy + iter->roi[0].y - roi.y) * paint_stride + iter->roi[0].x - roi.x; + float *paint_pixel = &paint_data[paint_offset * 4]; + + for (ix = 0; ix < iter->roi[0].width; ix++) + { + paint_pixel[3] *= *canvas_pixel; + + canvas_pixel += 1; + paint_pixel += 4; + } + } + } + }); +} + +void +paint_mask_to_paint_buffer (const GimpTempBuf *paint_mask, + gint mask_x_offset, + gint mask_y_offset, + GimpTempBuf *paint_buf, + gfloat paint_opacity) +{ + gint width = gimp_temp_buf_get_width (paint_buf); + gint height = gimp_temp_buf_get_height (paint_buf); + + const gint mask_stride = gimp_temp_buf_get_width (paint_mask); + const gint mask_start_offset = mask_y_offset * mask_stride + mask_x_offset; + const Babl *mask_format = gimp_temp_buf_get_format (paint_mask); + + /* Validate that the paint buffer is withing the bounds of the paint mask */ + g_return_if_fail (width <= gimp_temp_buf_get_width (paint_mask) - mask_x_offset); + g_return_if_fail (height <= gimp_temp_buf_get_height (paint_mask) - mask_y_offset); + + gimp_parallel_distribute_range (height, MIN_PARALLEL_SUB_SIZE, + [=] (gint y, gint height) + { + int iy, ix; + gfloat *paint_pixel = (gfloat *)gimp_temp_buf_get_data (paint_buf) + + y * width * 4; + + if (mask_format == babl_format ("Y u8")) + { + const guint8 *mask_data = (const guint8 *) gimp_temp_buf_get_data (paint_mask); + mask_data += mask_start_offset + y * mask_stride; + + for (iy = 0; iy < height; iy++) + { + int mask_offset = iy * mask_stride; + const guint8 *mask_pixel = &mask_data[mask_offset]; + + for (ix = 0; ix < width; ix++) + { + paint_pixel[3] *= (((gfloat)*mask_pixel) / 255.0f) * paint_opacity; + + mask_pixel += 1; + paint_pixel += 4; + } + } + } + else if (mask_format == babl_format ("Y float")) + { + const gfloat *mask_data = (const gfloat *) gimp_temp_buf_get_data (paint_mask); + mask_data += mask_start_offset + y * mask_stride; + + for (iy = 0; iy < height; iy++) + { + int mask_offset = iy * mask_stride; + const gfloat *mask_pixel = &mask_data[mask_offset]; + + for (ix = 0; ix < width; ix++) + { + paint_pixel[3] *= (*mask_pixel) * paint_opacity; + + mask_pixel += 1; + paint_pixel += 4; + } + } + } + }); +} + +void +do_layer_blend (GeglBuffer *src_buffer, + GeglBuffer *dst_buffer, + GimpTempBuf *paint_buf, + GeglBuffer *mask_buffer, + gfloat opacity, + gint x_offset, + gint y_offset, + gint mask_x_offset, + gint mask_y_offset, + GimpLayerMode paint_mode) +{ + GeglRectangle roi; + const Babl *iterator_format; + guint paint_stride; + gfloat *paint_data; + GimpOperationLayerMode layer_mode; + + paint_stride = gimp_temp_buf_get_width (paint_buf); + paint_data = (gfloat *) gimp_temp_buf_get_data (paint_buf); + + layer_mode.layer_mode = paint_mode; + layer_mode.opacity = opacity; + layer_mode.function = gimp_layer_mode_get_function (paint_mode); + layer_mode.blend_function = gimp_layer_mode_get_blend_function (paint_mode); + layer_mode.blend_space = gimp_layer_mode_get_blend_space (paint_mode); + layer_mode.composite_space = gimp_layer_mode_get_composite_space (paint_mode); + layer_mode.composite_mode = gimp_layer_mode_get_paint_composite_mode (paint_mode); + layer_mode.real_composite_mode = layer_mode.composite_mode; + + iterator_format = gimp_layer_mode_get_format (paint_mode, + layer_mode.composite_space, + layer_mode.blend_space, + gimp_temp_buf_get_format (paint_buf)); + + roi.x = x_offset; + roi.y = y_offset; + roi.width = gimp_temp_buf_get_width (paint_buf); + roi.height = gimp_temp_buf_get_height (paint_buf); + + g_return_if_fail (gimp_temp_buf_get_format (paint_buf) == iterator_format); + + gimp_parallel_distribute_area (&roi, MIN_PARALLEL_SUB_AREA, + [=] (const GeglRectangle *area) + { + GeglBufferIterator *iter; + GeglRectangle mask_area = *area; + + mask_area.x -= mask_x_offset; + mask_area.y -= mask_y_offset; + + iter = gegl_buffer_iterator_new (dst_buffer, area, 0, + iterator_format, + GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE); + + gegl_buffer_iterator_add (iter, src_buffer, area, 0, + iterator_format, + GEGL_ACCESS_READ, GEGL_ABYSS_NONE); + + if (mask_buffer) + { + gegl_buffer_iterator_add (iter, mask_buffer, &mask_area, 0, + babl_format ("Y float"), + GEGL_ACCESS_READ, GEGL_ABYSS_NONE); + } + + while (gegl_buffer_iterator_next (iter)) + { + GeglRectangle process_roi; + gfloat *out_pixel = (gfloat *) iter->data[0]; + gfloat *in_pixel = (gfloat *) iter->data[1]; + gfloat *mask_pixel = NULL; + gfloat *paint_pixel; + gint iy; + + paint_pixel = paint_data + ((iter->roi[0].y - roi.y) * paint_stride + iter->roi[0].x - roi.x) * 4; + + if (mask_buffer) + mask_pixel = (gfloat *)iter->data[2]; + + process_roi.x = iter->roi[0].x; + process_roi.width = iter->roi[0].width; + process_roi.height = 1; + + for (iy = 0; iy < iter->roi[0].height; iy++) + { + process_roi.y = iter->roi[0].y + iy; + + layer_mode.function ((GeglOperation*) &layer_mode, + in_pixel, + paint_pixel, + mask_pixel, + out_pixel, + iter->roi[0].width, + &process_roi, + 0); + + in_pixel += iter->roi[0].width * 4; + out_pixel += iter->roi[0].width * 4; + if (mask_buffer) + mask_pixel += iter->roi[0].width; + paint_pixel += paint_stride * 4; + } + } + }); +} + +void +mask_components_onto (GeglBuffer *src_buffer, + GeglBuffer *aux_buffer, + GeglBuffer *dst_buffer, + GeglRectangle *roi, + GimpComponentMask mask, + gboolean linear_mode) +{ + const Babl *iterator_format; + + if (linear_mode) + iterator_format = babl_format ("RGBA float"); + else + iterator_format = babl_format ("R'G'B'A float"); + + gimp_parallel_distribute_area (roi, MIN_PARALLEL_SUB_AREA, + [=] (const GeglRectangle *area) + { + GeglBufferIterator *iter; + + iter = gegl_buffer_iterator_new (dst_buffer, area, 0, + iterator_format, + GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE); + + gegl_buffer_iterator_add (iter, src_buffer, area, 0, + iterator_format, + GEGL_ACCESS_READ, GEGL_ABYSS_NONE); + + gegl_buffer_iterator_add (iter, aux_buffer, area, 0, + iterator_format, + GEGL_ACCESS_READ, GEGL_ABYSS_NONE); + + while (gegl_buffer_iterator_next (iter)) + { + gfloat *dest = (gfloat *)iter->data[0]; + gfloat *src = (gfloat *)iter->data[1]; + gfloat *aux = (gfloat *)iter->data[2]; + glong samples = iter->length; + + while (samples--) + { + dest[RED] = (mask & GIMP_COMPONENT_MASK_RED) ? aux[RED] : src[RED]; + dest[GREEN] = (mask & GIMP_COMPONENT_MASK_GREEN) ? aux[GREEN] : src[GREEN]; + dest[BLUE] = (mask & GIMP_COMPONENT_MASK_BLUE) ? aux[BLUE] : src[BLUE]; + dest[ALPHA] = (mask & GIMP_COMPONENT_MASK_ALPHA) ? aux[ALPHA] : src[ALPHA]; + + src += 4; + aux += 4; + dest += 4; + } + } + }); +} + +} /* extern "C" */ diff --git a/app/paint/gimppaintcore-loops.h b/app/paint/gimppaintcore-loops.h index 45c48d62f6..746d2a59ea 100644 --- a/app/paint/gimppaintcore-loops.h +++ b/app/paint/gimppaintcore-loops.h @@ -15,6 +15,10 @@ * along with this program. If not, see . */ +#ifndef __GIMP_PAINT_CORE_LOOPS_H__ +#define __GIMP_PAINT_CORE_LOOPS_H__ + + void combine_paint_mask_to_canvas_mask (const GimpTempBuf *paint_mask, gint mask_x_offset, gint mask_y_offset, @@ -52,3 +56,6 @@ void mask_components_onto (GeglBuffer *src_buffer, GeglRectangle *roi, GimpComponentMask mask, gboolean linear_mode); + + +#endif /* __GIMP_PAINT_CORE_LOOPS_H__ */ diff --git a/app/paint/gimppaintcore.c b/app/paint/gimppaintcore.c index 5b740b19e4..79b8e48353 100644 --- a/app/paint/gimppaintcore.c +++ b/app/paint/gimppaintcore.c @@ -678,7 +678,7 @@ gimp_paint_core_get_last_coords (GimpPaintCore *core, * * Adjusts core->last_coords and core_cur_coords in preparation to * drawing a straight line. If @center_pixels is TRUE the endpoints - * get pushed to the center of the pixels. This avoids artefacts + * get pushed to the center of the pixels. This avoids artifacts * for e.g. the hard mode. The rounding of the slope to 15 degree * steps if ctrl is pressed happens, as does rounding the start and * end coordinates (which may be fractional in high zoom modes) to @@ -1090,7 +1090,7 @@ gimp_paint_core_smooth_coords (GimpPaintCore *core, GArray *history = core->stroke_buffer; if (core->stroke_buffer == NULL) - return; /* Paint core has not initalized yet */ + return; /* Paint core has not initialized yet */ if (smoothing_options->use_smoothing && smoothing_options->smoothing_quality > 0) @@ -1106,7 +1106,7 @@ gimp_paint_core_smooth_coords (GimpPaintCore *core, g_array_append_val (history, *coords); if (history->len < 2) - return; /* Just dont bother, nothing to do */ + return; /* Just don't bother, nothing to do */ coords->x = coords->y = 0.0; diff --git a/app/paint/gimppaintoptions.c b/app/paint/gimppaintoptions.c index 53290cd7e1..0c13501c96 100644 --- a/app/paint/gimppaintoptions.c +++ b/app/paint/gimppaintoptions.c @@ -68,6 +68,7 @@ #define DEFAULT_FADE_UNIT GIMP_UNIT_PIXEL #define DEFAULT_GRADIENT_REVERSE FALSE +#define DEFAULT_GRADIENT_BLEND_SPACE GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL #define DEFAULT_GRADIENT_REPEAT GIMP_REPEAT_TRIANGULAR #define DEFAULT_GRADIENT_LENGTH 100.0 #define DEFAULT_GRADIENT_UNIT GIMP_UNIT_PIXEL @@ -115,6 +116,7 @@ enum PROP_FADE_UNIT, PROP_GRADIENT_REVERSE, + PROP_GRADIENT_BLEND_COLOR_SPACE, PROP_BRUSH_VIEW_TYPE, PROP_BRUSH_VIEW_SIZE, @@ -335,6 +337,13 @@ gimp_paint_options_class_init (GimpPaintOptionsClass *klass) NULL, NULL, DEFAULT_GRADIENT_REVERSE, GIMP_PARAM_STATIC_STRINGS); + GIMP_CONFIG_PROP_ENUM (object_class, PROP_GRADIENT_BLEND_COLOR_SPACE, + "gradient-blend-color-space", + _("Blend Color Space"), + _("Which color space to use when blending RGB gradient segments"), + GIMP_TYPE_GRADIENT_BLEND_COLOR_SPACE, + DEFAULT_GRADIENT_BLEND_SPACE, + GIMP_PARAM_STATIC_STRINGS); GIMP_CONFIG_PROP_ENUM (object_class, PROP_BRUSH_VIEW_TYPE, "brush-view-type", @@ -436,7 +445,7 @@ gimp_paint_options_init (GimpPaintOptions *options) options->jitter_options = g_slice_new0 (GimpJitterOptions); options->fade_options = g_slice_new0 (GimpFadeOptions); - options->gradient_options = g_slice_new0 (GimpGradientOptions); + options->gradient_options = g_slice_new0 (GimpGradientPaintOptions); options->smoothing_options = g_slice_new0 (GimpSmoothingOptions); } @@ -459,10 +468,10 @@ gimp_paint_options_finalize (GObject *object) { GimpPaintOptions *options = GIMP_PAINT_OPTIONS (object); - g_slice_free (GimpJitterOptions, options->jitter_options); - g_slice_free (GimpFadeOptions, options->fade_options); - g_slice_free (GimpGradientOptions, options->gradient_options); - g_slice_free (GimpSmoothingOptions, options->smoothing_options); + g_slice_free (GimpJitterOptions, options->jitter_options); + g_slice_free (GimpFadeOptions, options->fade_options); + g_slice_free (GimpGradientPaintOptions, options->gradient_options); + g_slice_free (GimpSmoothingOptions, options->smoothing_options); G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -473,11 +482,11 @@ gimp_paint_options_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GimpPaintOptions *options = GIMP_PAINT_OPTIONS (object); - GimpFadeOptions *fade_options = options->fade_options; - GimpJitterOptions *jitter_options = options->jitter_options; - GimpGradientOptions *gradient_options = options->gradient_options; - GimpSmoothingOptions *smoothing_options = options->smoothing_options; + GimpPaintOptions *options = GIMP_PAINT_OPTIONS (object); + GimpFadeOptions *fade_options = options->fade_options; + GimpJitterOptions *jitter_options = options->jitter_options; + GimpGradientPaintOptions *gradient_options = options->gradient_options; + GimpSmoothingOptions *smoothing_options = options->smoothing_options; switch (property_id) { @@ -576,6 +585,9 @@ gimp_paint_options_set_property (GObject *object, case PROP_GRADIENT_REVERSE: gradient_options->gradient_reverse = g_value_get_boolean (value); break; + case PROP_GRADIENT_BLEND_COLOR_SPACE: + gradient_options->gradient_blend_color_space = g_value_get_enum (value); + break; case PROP_BRUSH_VIEW_TYPE: options->brush_view_type = g_value_get_enum (value); @@ -633,11 +645,11 @@ gimp_paint_options_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GimpPaintOptions *options = GIMP_PAINT_OPTIONS (object); - GimpFadeOptions *fade_options = options->fade_options; - GimpJitterOptions *jitter_options = options->jitter_options; - GimpGradientOptions *gradient_options = options->gradient_options; - GimpSmoothingOptions *smoothing_options = options->smoothing_options; + GimpPaintOptions *options = GIMP_PAINT_OPTIONS (object); + GimpFadeOptions *fade_options = options->fade_options; + GimpJitterOptions *jitter_options = options->jitter_options; + GimpGradientPaintOptions *gradient_options = options->gradient_options; + GimpSmoothingOptions *smoothing_options = options->smoothing_options; switch (property_id) { @@ -736,6 +748,9 @@ gimp_paint_options_get_property (GObject *object, case PROP_GRADIENT_REVERSE: g_value_set_boolean (value, gradient_options->gradient_reverse); break; + case PROP_GRADIENT_BLEND_COLOR_SPACE: + g_value_set_enum (value, gradient_options->gradient_blend_color_space); + break; case PROP_BRUSH_VIEW_TYPE: g_value_set_enum (value, options->brush_view_type); @@ -943,14 +958,15 @@ gimp_paint_options_get_gradient_color (GimpPaintOptions *paint_options, if (gimp_dynamics_is_output_enabled (dynamics, GIMP_DYNAMICS_OUTPUT_COLOR)) { - GimpGradientOptions *gradient_options = paint_options->gradient_options; - GimpGradient *gradient; + GimpGradientPaintOptions *gradient_options = paint_options->gradient_options; + GimpGradient *gradient; gradient = gimp_context_get_gradient (GIMP_CONTEXT (paint_options)); gimp_gradient_get_color_at (gradient, GIMP_CONTEXT (paint_options), NULL, grad_point, gradient_options->gradient_reverse, + gradient_options->gradient_blend_color_space, color); return TRUE; @@ -1192,16 +1208,19 @@ void gimp_paint_options_copy_gradient_props (GimpPaintOptions *src, GimpPaintOptions *dest) { - gboolean gradient_reverse; + gboolean gradient_reverse; + GimpGradientBlendColorSpace gradient_blend_color_space; g_return_if_fail (GIMP_IS_PAINT_OPTIONS (src)); g_return_if_fail (GIMP_IS_PAINT_OPTIONS (dest)); g_object_get (src, - "gradient-reverse", &gradient_reverse, + "gradient-reverse", &gradient_reverse, + "gradient-blend-color-space", &gradient_blend_color_space, NULL); g_object_set (dest, - "gradient-reverse", gradient_reverse, + "gradient-reverse", gradient_reverse, + "gradient-blend-color-space", gradient_blend_color_space, NULL); } diff --git a/app/paint/gimppaintoptions.h b/app/paint/gimppaintoptions.h index 6ae02c0e0a..7933d64c42 100644 --- a/app/paint/gimppaintoptions.h +++ b/app/paint/gimppaintoptions.h @@ -31,10 +31,10 @@ GIMP_CONTEXT_PROP_MASK_PALETTE -typedef struct _GimpJitterOptions GimpJitterOptions; -typedef struct _GimpFadeOptions GimpFadeOptions; -typedef struct _GimpGradientOptions GimpGradientOptions; -typedef struct _GimpSmoothingOptions GimpSmoothingOptions; +typedef struct _GimpJitterOptions GimpJitterOptions; +typedef struct _GimpFadeOptions GimpFadeOptions; +typedef struct _GimpGradientPaintOptions GimpGradientPaintOptions; +typedef struct _GimpSmoothingOptions GimpSmoothingOptions; struct _GimpJitterOptions { @@ -50,10 +50,11 @@ struct _GimpFadeOptions GimpRepeatMode fade_repeat; }; -struct _GimpGradientOptions +struct _GimpGradientPaintOptions { - gboolean gradient_reverse; - GimpRepeatMode gradient_repeat; + gboolean gradient_reverse; + GimpGradientBlendColorSpace gradient_blend_color_space; + GimpRepeatMode gradient_repeat; }; struct _GimpSmoothingOptions @@ -108,7 +109,7 @@ struct _GimpPaintOptions gboolean dynamics_expanded; GimpFadeOptions *fade_options; - GimpGradientOptions *gradient_options; + GimpGradientPaintOptions *gradient_options; GimpSmoothingOptions *smoothing_options; GimpViewType brush_view_type; diff --git a/app/paint/gimpsmudge.c b/app/paint/gimpsmudge.c index b15da03e40..5c31703424 100644 --- a/app/paint/gimpsmudge.c +++ b/app/paint/gimpsmudge.c @@ -27,6 +27,7 @@ #include "gegl/gimp-gegl-loops.h" #include "gegl/gimp-gegl-utils.h" +#include "core/gimp-palettes.h" #include "core/gimpbrush.h" #include "core/gimpdrawable.h" #include "core/gimpdynamics.h" @@ -141,6 +142,29 @@ gimp_smudge_paint (GimpPaintCore *paint_core, switch (paint_state) { + case GIMP_PAINT_STATE_INIT: + { + GimpContext *context = GIMP_CONTEXT (paint_options); + GimpSmudgeOptions *options = GIMP_SMUDGE_OPTIONS (paint_options); + GimpBrushCore *brush_core = GIMP_BRUSH_CORE (paint_core); + GimpDynamics *dynamics = gimp_context_get_dynamics (context); + + /* Don't add to color history when + * 1. pure smudging (flow=0) + * 2. color is from gradient or pixmap brushes + */ + if (options->flow > 0.0 && + ! gimp_dynamics_is_output_enabled (dynamics, GIMP_DYNAMICS_OUTPUT_COLOR) && + ! (brush_core->brush && gimp_brush_get_pixmap (brush_core->brush))) + { + GimpRGB foreground; + + gimp_context_get_foreground (context, &foreground); + gimp_palettes_add_color_history (context->gimp, &foreground); + } + } + break; + case GIMP_PAINT_STATE_MOTION: /* initialization fails if the user starts outside the drawable */ if (! smudge->initialized) diff --git a/app/paint/gimpsourcecore.c b/app/paint/gimpsourcecore.c index b271510d8d..1551d8d1be 100644 --- a/app/paint/gimpsourcecore.c +++ b/app/paint/gimpsourcecore.c @@ -418,8 +418,6 @@ gimp_source_core_motion (GimpSourceCore *source_core, base_src_offset_x += off_x; base_src_offset_y += off_y; } - - gimp_pickable_flush (src_pickable); } gimp_brush_core_eval_transform_dynamics (GIMP_BRUSH_CORE (paint_core), diff --git a/app/pdb/Makefile.am b/app/pdb/Makefile.am index 645d323248..f4b9dcd4e7 100644 --- a/app/pdb/Makefile.am +++ b/app/pdb/Makefile.am @@ -45,6 +45,7 @@ libappinternal_procs_a_SOURCES = \ display-cmds.c \ drawable-cmds.c \ drawable-color-cmds.c \ + drawable-edit-cmds.c \ drawable-transform-cmds.c \ dynamics-cmds.c \ edit-cmds.c \ diff --git a/app/pdb/Makefile.in b/app/pdb/Makefile.in index 19743e4e1e..6db5b5d2e4 100644 --- a/app/pdb/Makefile.in +++ b/app/pdb/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -126,7 +127,7 @@ am_libappinternal_procs_a_OBJECTS = internal-procs.$(OBJEXT) \ channel-cmds.$(OBJEXT) color-cmds.$(OBJEXT) \ context-cmds.$(OBJEXT) debug-cmds.$(OBJEXT) \ display-cmds.$(OBJEXT) drawable-cmds.$(OBJEXT) \ - drawable-color-cmds.$(OBJEXT) \ + drawable-color-cmds.$(OBJEXT) drawable-edit-cmds.$(OBJEXT) \ drawable-transform-cmds.$(OBJEXT) dynamics-cmds.$(OBJEXT) \ edit-cmds.$(OBJEXT) fileops-cmds.$(OBJEXT) \ floating-sel-cmds.$(OBJEXT) font-select-cmds.$(OBJEXT) \ @@ -304,7 +305,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -377,6 +378,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -605,6 +607,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -667,6 +670,7 @@ libappinternal_procs_a_SOURCES = \ display-cmds.c \ drawable-cmds.c \ drawable-color-cmds.c \ + drawable-edit-cmds.c \ drawable-transform-cmds.c \ dynamics-cmds.c \ edit-cmds.c \ @@ -777,6 +781,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/display-cmds.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawable-cmds.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawable-color-cmds.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawable-edit-cmds.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawable-transform-cmds.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dynamics-cmds.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edit-cmds.Po@am__quote@ diff --git a/app/pdb/context-cmds.c b/app/pdb/context-cmds.c index e30cd43a0d..9099a7e236 100644 --- a/app/pdb/context-cmds.c +++ b/app/pdb/context-cmds.c @@ -32,10 +32,12 @@ #include "pdb-types.h" +#include "core/gimp-gradients.h" #include "core/gimp.h" #include "core/gimpcontainer.h" #include "core/gimpdashpattern.h" #include "core/gimpdatafactory.h" +#include "core/gimplist.h" #include "core/gimpparamspecs.h" #include "core/gimpstrokeoptions.h" #include "paint/gimppaintoptions.h" @@ -1561,6 +1563,251 @@ context_set_gradient_invoker (GimpProcedure *procedure, error ? *error : NULL); } +static GimpValueArray * +context_set_gradient_fg_bg_rgb_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) +{ + gimp_context_set_gradient (context, + gimp_gradients_get_fg_bg_rgb (gimp)); + + return gimp_procedure_get_return_values (procedure, TRUE, NULL); +} + +static GimpValueArray * +context_set_gradient_fg_bg_hsv_cw_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) +{ + gimp_context_set_gradient (context, + gimp_gradients_get_fg_bg_hsv_cw (gimp)); + + return gimp_procedure_get_return_values (procedure, TRUE, NULL); +} + +static GimpValueArray * +context_set_gradient_fg_bg_hsv_ccw_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) +{ + gimp_context_set_gradient (context, + gimp_gradients_get_fg_bg_hsv_ccw (gimp)); + + return gimp_procedure_get_return_values (procedure, TRUE, NULL); +} + +static GimpValueArray * +context_set_gradient_fg_transparent_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) +{ + gimp_context_set_gradient (context, + gimp_gradients_get_fg_transparent (gimp)); + + return gimp_procedure_get_return_values (procedure, TRUE, NULL); +} + +static GimpValueArray * +context_get_gradient_blend_color_space_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GimpValueArray *return_vals; + gint32 blend_color_space = 0; + + /* all options should have the same value, so pick a random one */ + GimpPaintOptions *options = + gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), + "gimp-paintbrush"); + + if (options) + g_object_get (options, + "gradient-blend-color-space", &blend_color_space, + NULL); + else + success = FALSE; + + return_vals = gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); + + if (success) + g_value_set_enum (gimp_value_array_index (return_vals, 1), blend_color_space); + + return return_vals; +} + +static GimpValueArray * +context_set_gradient_blend_color_space_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) +{ + gboolean success = TRUE; + gint32 blend_color_space; + + blend_color_space = g_value_get_enum (gimp_value_array_index (args, 0)); + + if (success) + { + GimpContainer *options; + GList *list; + + options = gimp_pdb_context_get_paint_options_list (GIMP_PDB_CONTEXT (context)); + + for (list = GIMP_LIST (options)->queue->head; list; list = g_list_next (list)) + g_object_set (list->data, + "gradient-blend-color-space", blend_color_space, + NULL); + } + + return gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); +} + +static GimpValueArray * +context_get_gradient_repeat_mode_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GimpValueArray *return_vals; + gint32 repeat_mode = 0; + + /* all options should have the same value, so pick a random one */ + GimpPaintOptions *options = + gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), + "gimp-paintbrush"); + + if (options) + g_object_get (options, + "gradient-repeat", &repeat_mode, + NULL); + else + success = FALSE; + + return_vals = gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); + + if (success) + g_value_set_enum (gimp_value_array_index (return_vals, 1), repeat_mode); + + return return_vals; +} + +static GimpValueArray * +context_set_gradient_repeat_mode_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) +{ + gboolean success = TRUE; + gint32 repeat_mode; + + repeat_mode = g_value_get_enum (gimp_value_array_index (args, 0)); + + if (success) + { + GimpContainer *options; + GList *list; + + options = gimp_pdb_context_get_paint_options_list (GIMP_PDB_CONTEXT (context)); + + for (list = GIMP_LIST (options)->queue->head; list; list = g_list_next (list)) + g_object_set (list->data, + "gradient-repeat", repeat_mode, + NULL); + } + + return gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); +} + +static GimpValueArray * +context_get_gradient_reverse_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GimpValueArray *return_vals; + gboolean reverse = FALSE; + + /* all options should have the same value, so pick a random one */ + GimpPaintOptions *options = + gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), + "gimp-paintbrush"); + + if (options) + g_object_get (options, + "gradient-reverse", &reverse, + NULL); + else + success = FALSE; + + return_vals = gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); + + if (success) + g_value_set_boolean (gimp_value_array_index (return_vals, 1), reverse); + + return return_vals; +} + +static GimpValueArray * +context_set_gradient_reverse_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) +{ + gboolean success = TRUE; + gboolean reverse; + + reverse = g_value_get_boolean (gimp_value_array_index (args, 0)); + + if (success) + { + GimpContainer *options; + GList *list; + + options = gimp_pdb_context_get_paint_options_list (GIMP_PDB_CONTEXT (context)); + + for (list = GIMP_LIST (options)->queue->head; list; list = g_list_next (list)) + g_object_set (list->data, + "gradient-reverse", reverse, + NULL); + } + + return gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); +} + static GimpValueArray * context_get_palette_invoker (GimpProcedure *procedure, Gimp *gimp, @@ -2087,6 +2334,51 @@ context_set_diagonal_neighbors_invoker (GimpProcedure *procedure, error ? *error : NULL); } +static GimpValueArray * +context_get_distance_metric_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) +{ + GimpValueArray *return_vals; + gint32 metric = 0; + + g_object_get (context, + "distance-metric", &metric, + NULL); + + return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL); + g_value_set_enum (gimp_value_array_index (return_vals, 1), metric); + + return return_vals; +} + +static GimpValueArray * +context_set_distance_metric_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) +{ + gboolean success = TRUE; + gint32 metric; + + metric = g_value_get_enum (gimp_value_array_index (args, 0)); + + if (success) + { + g_object_set (context, + "distance-metric", metric, + NULL); + } + + return gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); +} + static GimpValueArray * context_get_interpolation_invoker (GimpProcedure *procedure, Gimp *gimp, @@ -2764,51 +3056,6 @@ context_set_ink_blob_angle_invoker (GimpProcedure *procedure, error ? *error : NULL); } -static GimpValueArray * -context_get_distance_metric_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GimpValueArray *args, - GError **error) -{ - GimpValueArray *return_vals; - gint32 metric = 0; - - g_object_get (context, - "distance-metric", &metric, - NULL); - - return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL); - g_value_set_enum (gimp_value_array_index (return_vals, 1), metric); - - return return_vals; -} - -static GimpValueArray * -context_set_distance_metric_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GimpValueArray *args, - GError **error) -{ - gboolean success = TRUE; - gint32 metric; - - metric = g_value_get_enum (gimp_value_array_index (args, 0)); - - if (success) - { - g_object_set (context, - "distance-metric", metric, - NULL); - } - - return gimp_procedure_get_return_values (procedure, success, - error ? *error : NULL); -} - void register_context_procs (GimpPDB *pdb) { @@ -3246,7 +3493,8 @@ register_context_procs (GimpPDB *pdb) "gimp-context-set-line-width", "Set the line width setting.", "This procedure modifies the line width setting for stroking lines.\n" - "This setting affects the following procedures: 'gimp-edit-stroke', 'gimp-edit-stroke-vectors'.", + "\n" + "This setting affects the following procedures: 'gimp-drawable-edit-stroke-selection', 'gimp-drawable-edit-stroke-item'.", "Michael Natterer ", "Michael Natterer", "2015", @@ -3295,7 +3543,8 @@ register_context_procs (GimpPDB *pdb) "gimp-context-set-line-width-unit", "Set the line width unit setting.", "This procedure modifies the line width unit setting for stroking lines.\n" - "This setting affects the following procedures: 'gimp-edit-stroke', 'gimp-edit-stroke-vectors'.", + "\n" + "This setting affects the following procedures: 'gimp-drawable-edit-stroke-selection', 'gimp-drawable-edit-stroke-item'.", "Michael Natterer ", "Michael Natterer", "2015", @@ -3345,7 +3594,8 @@ register_context_procs (GimpPDB *pdb) "gimp-context-set-line-cap-style", "Set the line cap style setting.", "This procedure modifies the line cap style setting for stroking lines.\n" - "This setting affects the following procedures: 'gimp-edit-stroke', 'gimp-edit-stroke-vectors'.", + "\n" + "This setting affects the following procedures: 'gimp-drawable-edit-stroke-selection', 'gimp-drawable-edit-stroke-item'.", "Michael Natterer ", "Michael Natterer", "2015", @@ -3394,7 +3644,8 @@ register_context_procs (GimpPDB *pdb) "gimp-context-set-line-join-style", "Set the line join style setting.", "This procedure modifies the line join style setting for stroking lines.\n" - "This setting affects the following procedures: 'gimp-edit-stroke', 'gimp-edit-stroke-vectors'.", + "\n" + "This setting affects the following procedures: 'gimp-drawable-edit-stroke-selection', 'gimp-drawable-edit-stroke-item'.", "Michael Natterer ", "Michael Natterer", "2015", @@ -3443,7 +3694,8 @@ register_context_procs (GimpPDB *pdb) "Set the line miter limit setting.", "This procedure modifies the line miter limit setting for stroking lines.\n" "A mitered join is converted to a bevelled join if the miter would extend to a distance of more than (miter-limit * line-width) from the actual join point.\n" - "This setting affects the following procedures: 'gimp-edit-stroke', 'gimp-edit-stroke-vectors'.", + "\n" + "This setting affects the following procedures: 'gimp-drawable-edit-stroke-selection', 'gimp-drawable-edit-stroke-item'.", "Michael Natterer ", "Michael Natterer", "2015", @@ -3490,7 +3742,8 @@ register_context_procs (GimpPDB *pdb) "gimp-context-set-line-dash-offset", "Set the line dash offset setting.", "This procedure modifies the line dash offset setting for stroking lines.\n" - "This setting affects the following procedures: 'gimp-edit-stroke', 'gimp-edit-stroke-vectors'.", + "\n" + "This setting affects the following procedures: 'gimp-drawable-edit-stroke-selection', 'gimp-drawable-edit-stroke-item'.", "Michael Natterer ", "Michael Natterer", "2015", @@ -3542,8 +3795,10 @@ register_context_procs (GimpPDB *pdb) "gimp-context-set-line-dash-pattern", "Set the line dash pattern setting.", "This procedure modifies the line dash pattern setting for stroking lines.\n" + "\n" "The unit of the dash pattern segments is the actual line width used for the stroke operation, in other words a segment length of 1.0 results in a square segment shape (or gap shape).\n" - "This setting affects the following procedures: 'gimp-edit-stroke', 'gimp-edit-stroke-vectors'.", + "\n" + "This setting affects the following procedures: 'gimp-drawable-edit-stroke-selection-', 'gimp-drawable-edit-stroke-item'.", "Michael Natterer ", "Michael Natterer", "2015", @@ -4129,6 +4384,216 @@ register_context_procs (GimpPDB *pdb) gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); + /* + * gimp-context-set-gradient-fg-bg-rgb + */ + procedure = gimp_procedure_new (context_set_gradient_fg_bg_rgb_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-context-set-gradient-fg-bg-rgb"); + gimp_procedure_set_static_strings (procedure, + "gimp-context-set-gradient-fg-bg-rgb", + "Sets the built-in FG-BG RGB gradient as the active gradient.", + "This procedure sets the built-in FG-BG RGB gradient as the active gradient. The gradient will be used for subsequent gradient operations.", + "Michael Natterer ", + "Michael Natterer", + "2018", + NULL); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-context-set-gradient-fg-bg-hsv-cw + */ + procedure = gimp_procedure_new (context_set_gradient_fg_bg_hsv_cw_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-context-set-gradient-fg-bg-hsv-cw"); + gimp_procedure_set_static_strings (procedure, + "gimp-context-set-gradient-fg-bg-hsv-cw", + "Sets the built-in FG-BG HSV (cw) gradient as the active gradient.", + "This procedure sets the built-in FG-BG HSV (cw) gradient as the active gradient. The gradient will be used for subsequent gradient operations.", + "Michael Natterer ", + "Michael Natterer", + "2018", + NULL); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-context-set-gradient-fg-bg-hsv-ccw + */ + procedure = gimp_procedure_new (context_set_gradient_fg_bg_hsv_ccw_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-context-set-gradient-fg-bg-hsv-ccw"); + gimp_procedure_set_static_strings (procedure, + "gimp-context-set-gradient-fg-bg-hsv-ccw", + "Sets the built-in FG-BG HSV (ccw) gradient as the active gradient.", + "This procedure sets the built-in FG-BG HSV (ccw) gradient as the active gradient. The gradient will be used for subsequent gradient operations.", + "Michael Natterer ", + "Michael Natterer", + "2018", + NULL); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-context-set-gradient-fg-transparent + */ + procedure = gimp_procedure_new (context_set_gradient_fg_transparent_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-context-set-gradient-fg-transparent"); + gimp_procedure_set_static_strings (procedure, + "gimp-context-set-gradient-fg-transparent", + "Sets the built-in FG-Transparent gradient as the active gradient.", + "This procedure sets the built-in FG-Transparent gradient as the active gradient. The gradient will be used for subsequent gradient operations.", + "Michael Natterer ", + "Michael Natterer", + "2018", + NULL); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-context-get-gradient-blend-color-space + */ + procedure = gimp_procedure_new (context_get_gradient_blend_color_space_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-context-get-gradient-blend-color-space"); + gimp_procedure_set_static_strings (procedure, + "gimp-context-get-gradient-blend-color-space", + "Get the gradient blend color space.", + "Get the gradient blend color space for paint tools and the gradient tool.", + "Michael Natterer ", + "Michael Natterer", + "2018", + NULL); + gimp_procedure_add_return_value (procedure, + g_param_spec_enum ("blend-color-space", + "blend color space", + "Color blend space", + GIMP_TYPE_GRADIENT_BLEND_COLOR_SPACE, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-context-set-gradient-blend-color-space + */ + procedure = gimp_procedure_new (context_set_gradient_blend_color_space_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-context-set-gradient-blend-color-space"); + gimp_procedure_set_static_strings (procedure, + "gimp-context-set-gradient-blend-color-space", + "Set the gradient blend color space.", + "Set the gradient blend color space for paint tools and the gradient tool.", + "Michael Natterer ", + "Michael Natterer", + "2018", + NULL); + gimp_procedure_add_argument (procedure, + g_param_spec_enum ("blend-color-space", + "blend color space", + "Blend color space", + GIMP_TYPE_GRADIENT_BLEND_COLOR_SPACE, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-context-get-gradient-repeat-mode + */ + procedure = gimp_procedure_new (context_get_gradient_repeat_mode_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-context-get-gradient-repeat-mode"); + gimp_procedure_set_static_strings (procedure, + "gimp-context-get-gradient-repeat-mode", + "Get the gradient repeat mode.", + "Get the gradient repeat mode for paint tools and the gradient tool.", + "Michael Natterer ", + "Michael Natterer", + "2018", + NULL); + gimp_procedure_add_return_value (procedure, + g_param_spec_enum ("repeat-mode", + "repeat mode", + "Repeat mode", + GIMP_TYPE_REPEAT_MODE, + GIMP_REPEAT_NONE, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-context-set-gradient-repeat-mode + */ + procedure = gimp_procedure_new (context_set_gradient_repeat_mode_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-context-set-gradient-repeat-mode"); + gimp_procedure_set_static_strings (procedure, + "gimp-context-set-gradient-repeat-mode", + "Set the gradient repeat mode.", + "Set the gradient repeat mode for paint tools and the gradient tool.", + "Michael Natterer ", + "Michael Natterer", + "2018", + NULL); + gimp_procedure_add_argument (procedure, + g_param_spec_enum ("repeat-mode", + "repeat mode", + "Repeat mode", + GIMP_TYPE_REPEAT_MODE, + GIMP_REPEAT_NONE, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-context-get-gradient-reverse + */ + procedure = gimp_procedure_new (context_get_gradient_reverse_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-context-get-gradient-reverse"); + gimp_procedure_set_static_strings (procedure, + "gimp-context-get-gradient-reverse", + "Get the gradient reverse setting.", + "Get the gradient reverse setting for paint tools and the gradient tool.", + "Michael Natterer ", + "Michael Natterer", + "2018", + NULL); + gimp_procedure_add_return_value (procedure, + g_param_spec_boolean ("reverse", + "reverse", + "Reverse", + FALSE, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-context-set-gradient-reverse + */ + procedure = gimp_procedure_new (context_set_gradient_reverse_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-context-set-gradient-reverse"); + gimp_procedure_set_static_strings (procedure, + "gimp-context-set-gradient-reverse", + "Set the gradient reverse setting.", + "Set the gradient reverse setting for paint tools and the gradient tool.", + "Michael Natterer ", + "Michael Natterer", + "2018", + NULL); + gimp_procedure_add_argument (procedure, + g_param_spec_boolean ("reverse", + "reverse", + "Reverse", + FALSE, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + /* * gimp-context-get-palette */ @@ -4258,7 +4723,8 @@ register_context_procs (GimpPDB *pdb) "gimp-context-set-antialias", "Set the antialias setting.", "This procedure modifies the antialias setting. If antialiasing is turned on, the edges of selected region will contain intermediate values which give the appearance of a sharper, less pixelized edge. This should be set as TRUE most of the time unless a binary-only selection is wanted.\n" - "This setting affects the following procedures: 'gimp-image-select-color', 'gimp-image-select-contiguous-color', 'gimp-image-select-round-rectangle', 'gimp-image-select-ellipse', 'gimp-image-select-polygon', 'gimp-image-select-item'.", + "\n" + "This setting affects the following procedures: 'gimp-image-select-color', 'gimp-image-select-contiguous-color', 'gimp-image-select-round-rectangle', 'gimp-image-select-ellipse', 'gimp-image-select-polygon', 'gimp-image-select-item', 'gimp-drawable-edit-bucket-fill'.", "Michael Natterer ", "Michael Natterer", "2010", @@ -4305,6 +4771,7 @@ register_context_procs (GimpPDB *pdb) "gimp-context-set-feather", "Set the feather setting.", "This procedure modifies the feather setting. If the feather option is enabled, selections will be blurred before combining. The blur is a gaussian blur; its radii can be controlled using 'gimp-context-set-feather-radius'.\n" + "\n" "This setting affects the following procedures: 'gimp-image-select-color', 'gimp-image-select-contiguous-color', 'gimp-image-select-rectangle', 'gimp-image-select-round-rectangle', 'gimp-image-select-ellipse', 'gimp-image-select-polygon', 'gimp-image-select-item'.", "Michael Natterer ", "Michael Natterer", @@ -4358,6 +4825,7 @@ register_context_procs (GimpPDB *pdb) "gimp-context-set-feather-radius", "Set the feather radius setting.", "This procedure modifies the feather radius setting.\n" + "\n" "This setting affects all procedures that are affected by 'gimp-context-set-feather'.", "Michael Natterer ", "Michael Natterer", @@ -4411,7 +4879,8 @@ register_context_procs (GimpPDB *pdb) "gimp-context-set-sample-merged", "Set the sample merged setting.", "This procedure modifies the sample merged setting. If an operation depends on the colors of the pixels present in a drawable, like when doing a seed fill, this setting controls whether the pixel data from the specified drawable is used ('sample-merged' is FALSE), or the pixel data from the composite image ('sample-merged' is TRUE. This is equivalent to sampling for colors after merging all visible layers).\n" - "This setting affects the following procedures: 'gimp-image-select-color', 'gimp-image-select-contiguous-color'.", + "\n" + "This setting affects the following procedures: 'gimp-image-select-color', 'gimp-image-select-contiguous-color', 'gimp-drawable-edit-bucket-fill'.", "Michael Natterer ", "Michael Natterer", "2011", @@ -4459,7 +4928,8 @@ register_context_procs (GimpPDB *pdb) "gimp-context-set-sample-criterion", "Set the sample criterion setting.", "This procedure modifies the sample criterion setting. If an operation depends on the colors of the pixels present in a drawable, like when doing a seed fill, this setting controls how color similarity is determined. SELECT_CRITERION_COMPOSITE is the default value.\n" - "This setting affects the following procedures: 'gimp-image-select-color', 'gimp-image-select-contiguous-color'.", + "\n" + "This setting affects the following procedures: 'gimp-image-select-color', 'gimp-image-select-contiguous-color', 'gimp-drawable-edit-bucket-fill'.", "Michael Natterer ", "Michael Natterer", "2011", @@ -4507,7 +4977,8 @@ register_context_procs (GimpPDB *pdb) "gimp-context-set-sample-threshold", "Set the sample threshold setting.", "This procedure modifies the sample threshold setting. If an operation depends on the colors of the pixels present in a drawable, like when doing a seed fill, this setting controls what is \"sufficiently close\" to be considered a similar color. If the sample threshold has not been set explicitly, the default threshold set in gimprc will be used.\n" - "This setting affects the following procedures: 'gimp-image-select-color', 'gimp-image-select-contiguous-color'.", + "\n" + "This setting affects the following procedures: 'gimp-image-select-color', 'gimp-image-select-contiguous-color', 'gimp-drawable-edit-bucket-fill'.", "Michael Natterer ", "Michael Natterer", "2011", @@ -4600,7 +5071,8 @@ register_context_procs (GimpPDB *pdb) "gimp-context-set-sample-transparent", "Set the sample transparent setting.", "This procedure modifies the sample transparent setting. If an operation depends on the colors of the pixels present in a drawable, like when doing a seed fill, this setting controls whether transparency is considered to be a unique selectable color. When this setting is TRUE, transparent areas can be selected or filled.\n" - "This setting affects the following procedures: 'gimp-image-select-color', 'gimp-image-select-contiguous-color'.", + "\n" + "This setting affects the following procedures: 'gimp-image-select-color', 'gimp-image-select-contiguous-color', 'gimp-drawable-edit-bucket-fill'.", "Michael Natterer ", "Michael Natterer", "2011", @@ -4647,7 +5119,8 @@ register_context_procs (GimpPDB *pdb) "gimp-context-set-diagonal-neighbors", "Set the diagonal neighbors setting.", "This procedure modifies the diagonal neighbors setting. If the affected region of an operation is based on a seed point, like when doing a seed fill, then, when this setting is TRUE, all eight neighbors of each pixel are considered when calculating the affected region; in contrast, when this setting is FALSE, only the four orthogonal neighbors of each pixel are considered.\n" - "This setting affects the following procedures: 'gimp-image-select-contiguous-color'.", + "\n" + "This setting affects the following procedures: 'gimp-image-select-contiguous-color', 'gimp-drawable-edit-bucket-fill'.", "Ell", "Ell", "2016", @@ -4661,6 +5134,56 @@ register_context_procs (GimpPDB *pdb) gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); + /* + * gimp-context-get-distance-metric + */ + procedure = gimp_procedure_new (context_get_distance_metric_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-context-get-distance-metric"); + gimp_procedure_set_static_strings (procedure, + "gimp-context-get-distance-metric", + "Get the distance metric used in some computations.", + "This procedure returns the distance metric in the current context. See 'gimp-context-set-distance-metric' to know more about its usage.", + "Jehan", + "Jehan", + "2018", + NULL); + gimp_procedure_add_return_value (procedure, + g_param_spec_enum ("metric", + "metric", + "The distance metric", + GEGL_TYPE_DISTANCE_METRIC, + GEGL_DISTANCE_METRIC_EUCLIDEAN, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-context-set-distance-metric + */ + procedure = gimp_procedure_new (context_set_distance_metric_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-context-set-distance-metric"); + gimp_procedure_set_static_strings (procedure, + "gimp-context-set-distance-metric", + "Set the distance metric used in some computations.", + "This procedure modifies the distance metric used in some computations, such as 'gimp-drawable-edit-gradient-fill'. In particular, it does not change the metric used in generic distance computation on canvas, as in the Measure tool.\n" + "\n" + "This setting affects the following procedures: 'gimp-drawable-edit-gradient-fill'.", + "Jehan", + "Jehan", + "2018", + NULL); + gimp_procedure_add_argument (procedure, + g_param_spec_enum ("metric", + "metric", + "The distance metric", + GEGL_TYPE_DISTANCE_METRIC, + GEGL_DISTANCE_METRIC_EUCLIDEAN, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + /* * gimp-context-get-interpolation */ @@ -4695,6 +5218,7 @@ register_context_procs (GimpPDB *pdb) "gimp-context-set-interpolation", "Set the interpolation type.", "This procedure modifies the interpolation setting.\n" + "\n" "This setting affects affects the following procedures: 'gimp-item-transform-flip', 'gimp-item-transform-perspective', 'gimp-item-transform-rotate', 'gimp-item-transform-scale', 'gimp-item-transform-shear', 'gimp-item-transform-2d', 'gimp-item-transform-matrix', 'gimp-image-scale', 'gimp-layer-scale'.", "Michael Natterer ", "Michael Natterer", @@ -4744,6 +5268,7 @@ register_context_procs (GimpPDB *pdb) "gimp-context-set-transform-direction", "Set the transform direction.", "This procedure modifies the transform direction setting.\n" + "\n" "This setting affects affects the following procedures: 'gimp-item-transform-flip', 'gimp-item-transform-perspective', 'gimp-item-transform-rotate', 'gimp-item-transform-scale', 'gimp-item-transform-shear', 'gimp-item-transform-2d', 'gimp-item-transform-matrix'.", "Michael Natterer ", "Michael Natterer", @@ -4793,6 +5318,7 @@ register_context_procs (GimpPDB *pdb) "gimp-context-set-transform-resize", "Set the transform resize type.", "This procedure modifies the transform resize setting. When transforming pixels, if the result of a transform operation has a different size than the original area, this setting determines how the resulting area is sized.\n" + "\n" "This setting affects affects the following procedures: 'gimp-item-transform-flip', 'gimp-item-transform-flip-simple', 'gimp-item-transform-perspective', 'gimp-item-transform-rotate', 'gimp-item-transform-rotate-simple', 'gimp-item-transform-scale', 'gimp-item-transform-shear', 'gimp-item-transform-2d', 'gimp-item-transform-matrix'.", "Michael Natterer ", "Michael Natterer", @@ -5223,52 +5749,4 @@ register_context_procs (GimpPDB *pdb) GIMP_PARAM_READWRITE)); gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); - - /* - * gimp-context-get-distance-metric - */ - procedure = gimp_procedure_new (context_get_distance_metric_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-context-get-distance-metric"); - gimp_procedure_set_static_strings (procedure, - "gimp-context-get-distance-metric", - "Get the distance metric used in some computations.", - "This procedure returns the distance metric in the current context. See 'gimp-context-set-distance-metric' to know more about its usage.", - "Jehan", - "Jehan", - "2018", - NULL); - gimp_procedure_add_return_value (procedure, - g_param_spec_enum ("metric", - "metric", - "The distance metric", - GEGL_TYPE_DISTANCE_METRIC, - GEGL_DISTANCE_METRIC_EUCLIDEAN, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - - /* - * gimp-context-set-distance-metric - */ - procedure = gimp_procedure_new (context_set_distance_metric_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-context-set-distance-metric"); - gimp_procedure_set_static_strings (procedure, - "gimp-context-set-distance-metric", - "Set the distance metric used in some computations.", - "This procedure modifies the distance metric used in some computations, such as 'gimp-edit-blend'. In particular, it does not change the metric used in generic distance computation on canvas, as in the Measure tool.", - "Jehan", - "Jehan", - "2018", - NULL); - gimp_procedure_add_argument (procedure, - g_param_spec_enum ("metric", - "metric", - "The distance metric", - GEGL_TYPE_DISTANCE_METRIC, - GEGL_DISTANCE_METRIC_EUCLIDEAN, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); } diff --git a/app/pdb/drawable-edit-cmds.c b/app/pdb/drawable-edit-cmds.c new file mode 100644 index 0000000000..d9106e4240 --- /dev/null +++ b/app/pdb/drawable-edit-cmds.c @@ -0,0 +1,623 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* NOTE: This file is auto-generated by pdbgen.pl. */ + +#include "config.h" + +#include + +#include + +#include "libgimpconfig/gimpconfig.h" + +#include "libgimpbase/gimpbase.h" + +#include "pdb-types.h" + +#include "core/gimp-edit.h" +#include "core/gimp-gradients.h" +#include "core/gimp.h" +#include "core/gimpbuffer.h" +#include "core/gimpdrawable-bucket-fill.h" +#include "core/gimpdrawable-gradient.h" +#include "core/gimpdrawable.h" +#include "core/gimpimage.h" +#include "core/gimpitem.h" +#include "core/gimpparamspecs.h" +#include "core/gimpprogress.h" +#include "core/gimpstrokeoptions.h" +#include "paint/gimppaintoptions.h" + +#include "gimppdb.h" +#include "gimppdb-utils.h" +#include "gimppdbcontext.h" +#include "gimpprocedure.h" +#include "internal-procs.h" + +#include "gimp-intl.h" + + +static GimpValueArray * +drawable_edit_clear_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GimpDrawable *drawable; + + drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp); + + if (success) + { + if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, + GIMP_PDB_ITEM_CONTENT, error) && + gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error)) + { + GimpImage *image = gimp_item_get_image (GIMP_ITEM (drawable)); + + gimp_edit_clear (image, drawable, context); + } + else + success = FALSE; + } + + return gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); +} + +static GimpValueArray * +drawable_edit_fill_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GimpDrawable *drawable; + gint32 fill_type; + + drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp); + fill_type = g_value_get_enum (gimp_value_array_index (args, 1)); + + if (success) + { + if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, + GIMP_PDB_ITEM_CONTENT, error) && + gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error)) + { + GimpImage *image = gimp_item_get_image (GIMP_ITEM (drawable)); + GimpFillOptions *options = gimp_fill_options_new (gimp, NULL, FALSE); + + gimp_context_set_opacity (GIMP_CONTEXT (options), + gimp_context_get_opacity (context)); + gimp_context_set_paint_mode (GIMP_CONTEXT (options), + gimp_context_get_paint_mode (context)); + + if (gimp_fill_options_set_by_fill_type (options, context, + fill_type, error)) + { + gimp_edit_fill (image, drawable, options, NULL); + } + else + success = FALSE; + + g_object_unref (options); + } + else + success = FALSE; + } + + return gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); +} + +static GimpValueArray * +drawable_edit_bucket_fill_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GimpDrawable *drawable; + gint32 fill_type; + gdouble x; + gdouble y; + + drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp); + fill_type = g_value_get_enum (gimp_value_array_index (args, 1)); + x = g_value_get_double (gimp_value_array_index (args, 2)); + y = g_value_get_double (gimp_value_array_index (args, 3)); + + if (success) + { + if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, + GIMP_PDB_ITEM_CONTENT, error) && + gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error)) + { + GimpFillOptions *options = gimp_fill_options_new (gimp, NULL, FALSE); + + gimp_context_set_opacity (GIMP_CONTEXT (options), + gimp_context_get_opacity (context)); + gimp_context_set_paint_mode (GIMP_CONTEXT (options), + gimp_context_get_paint_mode (context)); + + gimp_fill_options_set_antialias (options, + GIMP_PDB_CONTEXT (context)->antialias); + + if (gimp_fill_options_set_by_fill_type (options, context, + fill_type, error)) + { + gimp_drawable_bucket_fill (drawable, options, + GIMP_PDB_CONTEXT (context)->sample_transparent, + GIMP_PDB_CONTEXT (context)->sample_criterion, + GIMP_PDB_CONTEXT (context)->sample_threshold, + GIMP_PDB_CONTEXT (context)->sample_merged, + GIMP_PDB_CONTEXT (context)->diagonal_neighbors, + x, y); + } + else + success = FALSE; + + g_object_unref (options); + } + else + success = FALSE; + } + + return gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); +} + +static GimpValueArray * +drawable_edit_gradient_fill_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GimpDrawable *drawable; + gint32 gradient_type; + gdouble offset; + gboolean supersample; + gint32 supersample_max_depth; + gdouble supersample_threshold; + gboolean dither; + gdouble x1; + gdouble y1; + gdouble x2; + gdouble y2; + + drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp); + gradient_type = g_value_get_enum (gimp_value_array_index (args, 1)); + offset = g_value_get_double (gimp_value_array_index (args, 2)); + supersample = g_value_get_boolean (gimp_value_array_index (args, 3)); + supersample_max_depth = g_value_get_int (gimp_value_array_index (args, 4)); + supersample_threshold = g_value_get_double (gimp_value_array_index (args, 5)); + dither = g_value_get_boolean (gimp_value_array_index (args, 6)); + x1 = g_value_get_double (gimp_value_array_index (args, 7)); + y1 = g_value_get_double (gimp_value_array_index (args, 8)); + x2 = g_value_get_double (gimp_value_array_index (args, 9)); + y2 = g_value_get_double (gimp_value_array_index (args, 10)); + + if (success) + { + success = (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, + GIMP_PDB_ITEM_CONTENT, error) && + gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error)); + + if (success) + { + if (supersample) + { + if (supersample_max_depth < 1 || supersample_max_depth > 9) + success = FALSE; + + if (supersample_threshold < 0.0 || supersample_threshold > 4.0) + success = FALSE; + } + else + { + supersample_max_depth = CLAMP (supersample_max_depth, 1, 9); + supersample_threshold = CLAMP (supersample_threshold, 0.0, 4.0); + } + } + + if (success) + { + /* all options should have the same value, so pick a random one */ + GimpPaintOptions *options = + gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), + "gimp-paintbrush"); + + if (progress) + gimp_progress_start (progress, FALSE, _("Gradient")); + + gimp_drawable_gradient (drawable, + context, + gimp_context_get_gradient (context), + GIMP_PDB_CONTEXT (context)->distance_metric, + gimp_context_get_paint_mode (context), + gradient_type, + gimp_context_get_opacity (context), + offset, + options->gradient_options->gradient_repeat, + options->gradient_options->gradient_reverse, + options->gradient_options->gradient_blend_color_space, + supersample, + supersample_max_depth, + supersample_threshold, + dither, + x1, y1, x2, y2, + progress); + + if (progress) + gimp_progress_end (progress); + } + } + + return gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); +} + +static GimpValueArray * +drawable_edit_stroke_selection_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GimpDrawable *drawable; + + drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp); + + if (success) + { + if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, + GIMP_PDB_ITEM_CONTENT, error) && + gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error)) + { + GimpImage *image = gimp_item_get_image (GIMP_ITEM (drawable)); + GimpStrokeOptions *options; + GimpPaintOptions *paint_options; + + options = gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context)); + + paint_options = + gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), NULL); + paint_options = gimp_config_duplicate (GIMP_CONFIG (paint_options)); + + success = gimp_item_stroke (GIMP_ITEM (gimp_image_get_mask (image)), + drawable, context, options, paint_options, + TRUE, progress, error); + + g_object_unref (paint_options); + } + else + success = FALSE; + } + + return gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); +} + +static GimpValueArray * +drawable_edit_stroke_item_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GimpDrawable *drawable; + GimpItem *item; + + drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp); + item = gimp_value_get_item (gimp_value_array_index (args, 1), gimp); + + if (success) + { + if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, + GIMP_PDB_ITEM_CONTENT, error) && + gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) && + gimp_pdb_item_is_attached (item, + gimp_item_get_image (GIMP_ITEM (drawable)), + 0, error)) + { + GimpStrokeOptions *options; + GimpPaintOptions *paint_options; + + options = gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context)); + + paint_options = + gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), NULL); + paint_options = gimp_config_duplicate (GIMP_CONFIG (paint_options)); + + success = gimp_item_stroke (item, drawable, + context, options, paint_options, + TRUE, progress, error); + + g_object_unref (paint_options); + } + else + success = FALSE; + } + + return gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); +} + +void +register_drawable_edit_procs (GimpPDB *pdb) +{ + GimpProcedure *procedure; + + /* + * gimp-drawable-edit-clear + */ + procedure = gimp_procedure_new (drawable_edit_clear_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-drawable-edit-clear"); + gimp_procedure_set_static_strings (procedure, + "gimp-drawable-edit-clear", + "Clear selected area of drawable.", + "This procedure clears the specified drawable. If the drawable has an alpha channel, the cleared pixels will become transparent. If the drawable does not have an alpha channel, cleared pixels will be set to the background color. This procedure only affects regions within a selection if there is a selection active.\n" + "\n" + "This procedure is affected by the following context setters: 'gimp-context-set-background'.", + "Spencer Kimball & Peter Mattis", + "Spencer Kimball & Peter Mattis", + "1995-1996", + NULL); + gimp_procedure_add_argument (procedure, + gimp_param_spec_drawable_id ("drawable", + "drawable", + "The drawable to clear from", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-drawable-edit-fill + */ + procedure = gimp_procedure_new (drawable_edit_fill_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-drawable-edit-fill"); + gimp_procedure_set_static_strings (procedure, + "gimp-drawable-edit-fill", + "Fill selected area of drawable.", + "This procedure fills the specified drawable according to fill mode. This procedure only affects regions within a selection if there is a selection active. If you want to fill the whole drawable, regardless of the selection, use 'gimp-drawable-fill'.\n" + "\n" + "This procedure is affected by the following context setters: 'gimp-context-set-opacity', 'gimp-context-set-paint-mode', 'gimp-context-set-foreground', 'gimp-context-set-background', 'gimp-context-set-pattern'.", + "Spencer Kimball & Peter Mattis & Raphael Quinet", + "Spencer Kimball & Peter Mattis", + "1995-2000", + NULL); + gimp_procedure_add_argument (procedure, + gimp_param_spec_drawable_id ("drawable", + "drawable", + "The drawable to fill to", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + g_param_spec_enum ("fill-type", + "fill type", + "The type of fill", + GIMP_TYPE_FILL_TYPE, + GIMP_FILL_FOREGROUND, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-drawable-edit-bucket-fill + */ + procedure = gimp_procedure_new (drawable_edit_bucket_fill_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-drawable-edit-bucket-fill"); + gimp_procedure_set_static_strings (procedure, + "gimp-drawable-edit-bucket-fill", + "Fill the area by a seed fill starting at the specified coordinates.", + "This procedure does a seed fill at the specified coordinates, using various parameters from the current context.\n" + "In the case of merged sampling, the x and y coordinates are relative to the image's origin; otherwise, they are relative to the drawable's origin.\n" + "\n" + "This procedure is affected by the following context setters: 'gimp-context-set-opacity', 'gimp-context-set-paint-mode', 'gimp-context-set-foreground', 'gimp-context-set-background', 'gimp-context-set-pattern', 'gimp-context-set-sample-threshold', 'gimp-context-set-sample-merged', 'gimp-context-set-sample-criterion', 'gimp-context-set-diagonal-neighbors', 'gimp-context-set-antialias'.", + "Michael Natterer ", + "Michael Natterer", + "2018", + NULL); + gimp_procedure_add_argument (procedure, + gimp_param_spec_drawable_id ("drawable", + "drawable", + "The affected drawable", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + g_param_spec_enum ("fill-type", + "fill type", + "The type of fill", + GIMP_TYPE_FILL_TYPE, + GIMP_FILL_FOREGROUND, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + g_param_spec_double ("x", + "x", + "The x coordinate of this bucket fill's application.", + -G_MAXDOUBLE, G_MAXDOUBLE, 0, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + g_param_spec_double ("y", + "y", + "The y coordinate of this bucket fill's application.", + -G_MAXDOUBLE, G_MAXDOUBLE, 0, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-drawable-edit-gradient-fill + */ + procedure = gimp_procedure_new (drawable_edit_gradient_fill_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-drawable-edit-gradient-fill"); + gimp_procedure_set_static_strings (procedure, + "gimp-drawable-edit-gradient-fill", + "Draw a gradient between the starting and ending coordinates with the specified gradient type.", + "This tool requires information on the gradient type. It creates the specified variety of gradient using the starting and ending coordinates as defined for each gradient type. For shapeburst gradient types, the context's distance metric is also relevant and can be updated with 'gimp-context-set-distance-metric'.\n" + "\n" + "This procedure is affected by the following context setters: 'gimp-context-set-opacity', 'gimp-context-set-paint-mode', 'gimp-context-set-foreground', 'gimp-context-set-background', 'gimp-context-set-gradient' and all gradient property settings, 'gimp-context-set-distance-metric'.", + "Michael Natterer ", + "Michael Natterer", + "2018", + NULL); + gimp_procedure_add_argument (procedure, + gimp_param_spec_drawable_id ("drawable", + "drawable", + "The affected drawable", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + g_param_spec_enum ("gradient-type", + "gradient type", + "The type of gradient", + GIMP_TYPE_GRADIENT_TYPE, + GIMP_GRADIENT_LINEAR, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + g_param_spec_double ("offset", + "offset", + "Offset relates to the starting and ending coordinates specified for the blend. This parameter is mode dependent.", + 0, G_MAXDOUBLE, 0, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + g_param_spec_boolean ("supersample", + "supersample", + "Do adaptive supersampling", + FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_int32 ("supersample-max-depth", + "supersample max depth", + "Maximum recursion levels for supersampling", + 1, 9, 1, + GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE)); + gimp_procedure_add_argument (procedure, + g_param_spec_double ("supersample-threshold", + "supersample threshold", + "Supersampling threshold", + 0, 4, 0, + GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE)); + gimp_procedure_add_argument (procedure, + g_param_spec_boolean ("dither", + "dither", + "Use dithering to reduce banding", + FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + g_param_spec_double ("x1", + "x1", + "The x coordinate of this gradient's starting point", + -G_MAXDOUBLE, G_MAXDOUBLE, 0, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + g_param_spec_double ("y1", + "y1", + "The y coordinate of this gradient's starting point", + -G_MAXDOUBLE, G_MAXDOUBLE, 0, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + g_param_spec_double ("x2", + "x2", + "The x coordinate of this gradient's ending point", + -G_MAXDOUBLE, G_MAXDOUBLE, 0, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + g_param_spec_double ("y2", + "y2", + "The y coordinate of this gradient's ending point", + -G_MAXDOUBLE, G_MAXDOUBLE, 0, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-drawable-edit-stroke-selection + */ + procedure = gimp_procedure_new (drawable_edit_stroke_selection_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-drawable-edit-stroke-selection"); + gimp_procedure_set_static_strings (procedure, + "gimp-drawable-edit-stroke-selection", + "Stroke the current selection", + "This procedure strokes the current selection, painting along the selection boundary with the active paint method and brush, or using a plain line with configurable properties. The paint is applied to the specified drawable regardless of the active selection.\n" + "\n" + "This procedure is affected by the following context setters: 'gimp-context-set-opacity', 'gimp-context-set-paint-mode', 'gimp-context-set-paint-method', 'gimp-context-set-stroke-method', 'gimp-context-set-foreground', 'gimp-context-set-brush' and all brush property settings, 'gimp-context-set-gradient' and all gradient property settings, 'gimp-context-set-line-width' and all line property settings.", + "Spencer Kimball & Peter Mattis", + "Spencer Kimball & Peter Mattis", + "1995-1996", + NULL); + gimp_procedure_add_argument (procedure, + gimp_param_spec_drawable_id ("drawable", + "drawable", + "The drawable to stroke to", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + + /* + * gimp-drawable-edit-stroke-item + */ + procedure = gimp_procedure_new (drawable_edit_stroke_item_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "gimp-drawable-edit-stroke-item"); + gimp_procedure_set_static_strings (procedure, + "gimp-drawable-edit-stroke-item", + "Stroke the specified item", + "This procedure strokes the specified item, painting along its outline (e.g. along a path, or along a channel's boundary), with the active paint method and brush, or using a plain line with configurable properties.\n" + "\n" + "This procedure is affected by the following context setters: 'gimp-context-set-opacity', 'gimp-context-set-paint-mode', 'gimp-context-set-paint-method', 'gimp-context-set-stroke-method', 'gimp-context-set-foreground', 'gimp-context-set-brush' and all brush property settings, 'gimp-context-set-gradient' and all gradient property settings, 'gimp-context-set-line-width' and all line property settings.", + "Michael Natterer ", + "Michael Natterer", + "2018", + NULL); + gimp_procedure_add_argument (procedure, + gimp_param_spec_drawable_id ("drawable", + "drawable", + "The drawable to stroke to", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_item_id ("item", + "item", + "The item to stroke", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); +} diff --git a/app/pdb/edit-cmds.c b/app/pdb/edit-cmds.c index a40df04118..ddf8894346 100644 --- a/app/pdb/edit-cmds.c +++ b/app/pdb/edit-cmds.c @@ -34,8 +34,8 @@ #include "core/gimp.h" #include "core/gimpbuffer.h" #include "core/gimpchannel.h" -#include "core/gimpdrawable-blend.h" #include "core/gimpdrawable-bucket-fill.h" +#include "core/gimpdrawable-gradient.h" #include "core/gimpdrawable.h" #include "core/gimpimage.h" #include "core/gimplayer.h" @@ -777,13 +777,21 @@ edit_blend_invoker (GimpProcedure *procedure, GIMP_PDB_ITEM_CONTENT, error) && gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error)); - if (success && supersample) + if (success) { - if (max_depth < 1 || max_depth > 9) - success = FALSE; + if (supersample) + { + if (max_depth < 1 || max_depth > 9) + success = FALSE; - if (threshold < 0.0 || threshold > 4.0) - success = FALSE; + if (threshold < 0.0 || threshold > 4.0) + success = FALSE; + } + else + { + max_depth = CLAMP (max_depth, 1, 9); + threshold = CLAMP (threshold, 0.0, 4.0); + } } if (success) @@ -794,7 +802,7 @@ edit_blend_invoker (GimpProcedure *procedure, paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY; if (progress) - gimp_progress_start (progress, FALSE, _("Blending")); + gimp_progress_start (progress, FALSE, _("Gradient")); switch (blend_mode) { @@ -816,18 +824,19 @@ edit_blend_invoker (GimpProcedure *procedure, break; } - gimp_drawable_blend (drawable, - context, - gradient, - GIMP_PDB_CONTEXT (context)->distance_metric, - paint_mode, - gradient_type, - opacity / 100.0, - offset, repeat, reverse, - supersample, max_depth, - threshold, dither, - x1, y1, x2, y2, - progress); + gimp_drawable_gradient (drawable, + context, + gradient, + GIMP_PDB_CONTEXT (context)->distance_metric, + paint_mode, + gradient_type, + opacity / 100.0, + offset, repeat, reverse, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, + supersample, max_depth, + threshold, dither, + x1, y1, x2, y2, + progress); if (progress) gimp_progress_end (progress); @@ -1270,11 +1279,13 @@ register_edit_procs (GimpPDB *pdb) gimp_procedure_set_static_strings (procedure, "gimp-edit-clear", "Clear selected area of drawable.", - "This procedure clears the specified drawable. If the drawable has an alpha channel, the cleared pixels will become transparent. If the drawable does not have an alpha channel, cleared pixels will be set to the background color. This procedure only affects regions within a selection if there is a selection active.", + "This procedure clears the specified drawable. If the drawable has an alpha channel, the cleared pixels will become transparent. If the drawable does not have an alpha channel, cleared pixels will be set to the background color. This procedure only affects regions within a selection if there is a selection active.\n" + "\n" + "Deprecated: Use 'gimp-drawable-edit-clear' instead.", "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", - NULL); + "gimp-drawable-edit-clear"); gimp_procedure_add_argument (procedure, gimp_param_spec_drawable_id ("drawable", "drawable", @@ -1293,11 +1304,13 @@ register_edit_procs (GimpPDB *pdb) gimp_procedure_set_static_strings (procedure, "gimp-edit-fill", "Fill selected area of drawable.", - "This procedure fills the specified drawable with the fill mode. If the fill mode is foreground, the current foreground color is used. If the fill mode is background, the current background color is used. Other fill modes should not be used. This procedure only affects regions within a selection if there is a selection active. If you want to fill the whole drawable, regardless of the selection, use 'gimp-drawable-fill'.", + "This procedure fills the specified drawable with the fill mode. If the fill mode is foreground, the current foreground color is used. If the fill mode is background, the current background color is used. Other fill modes should not be used. This procedure only affects regions within a selection if there is a selection active. If you want to fill the whole drawable, regardless of the selection, use 'gimp-drawable-fill'.\n" + "\n" + "Deprecated: Use 'gimp-drawable-edit-fill' instead.", "Spencer Kimball & Peter Mattis & Raphael Quinet", "Spencer Kimball & Peter Mattis", "1995-2000", - NULL); + "gimp-drawable-edit-fill"); gimp_procedure_add_argument (procedure, gimp_param_spec_drawable_id ("drawable", "drawable", @@ -1323,11 +1336,13 @@ register_edit_procs (GimpPDB *pdb) gimp_procedure_set_static_strings (procedure, "gimp-edit-bucket-fill", "Fill the area specified either by the current selection if there is one, or by a seed fill starting at the specified coordinates.", - "This tool requires information on the paint application mode, and the fill mode, which can either be in the foreground color, or in the currently active pattern. If there is no selection, a seed fill is executed at the specified coordinates and extends outward in keeping with the threshold parameter. If there is a selection in the target image, the threshold, sample merged, x, and y arguments are unused. If the sample_merged parameter is TRUE, the data of the composite image will be used instead of that for the specified drawable. This is equivalent to sampling for colors after merging all visible layers. In the case of merged sampling, the x and y coordinates are relative to the image's origin; otherwise, they are relative to the drawable's origin.", + "This tool requires information on the paint application mode, and the fill mode, which can either be in the foreground color, or in the currently active pattern. If there is no selection, a seed fill is executed at the specified coordinates and extends outward in keeping with the threshold parameter. If there is a selection in the target image, the threshold, sample merged, x, and y arguments are unused. If the sample_merged parameter is TRUE, the data of the composite image will be used instead of that for the specified drawable. This is equivalent to sampling for colors after merging all visible layers. In the case of merged sampling, the x and y coordinates are relative to the image's origin; otherwise, they are relative to the drawable's origin.\n" + "\n" + "Deprecated: Use 'gimp-drawable-edit-bucket-fill' instead.", "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", - NULL); + "gimp-drawable-edit-bucket-fill"); gimp_procedure_add_argument (procedure, gimp_param_spec_drawable_id ("drawable", "drawable", @@ -1390,11 +1405,13 @@ register_edit_procs (GimpPDB *pdb) gimp_procedure_set_static_strings (procedure, "gimp-edit-bucket-fill-full", "Fill the area specified either by the current selection if there is one, or by a seed fill starting at the specified coordinates.", - "This tool requires information on the paint application mode, and the fill mode, which can either be in the foreground color, or in the currently active pattern. If there is no selection, a seed fill is executed at the specified coordinates and extends outward in keeping with the threshold parameter. If there is a selection in the target image, the threshold, sample merged, x, and y arguments are unused. If the sample_merged parameter is TRUE, the data of the composite image will be used instead of that for the specified drawable. This is equivalent to sampling for colors after merging all visible layers. In the case of merged sampling, the x and y coordinates are relative to the image's origin; otherwise, they are relative to the drawable's origin.", + "This tool requires information on the paint application mode, and the fill mode, which can either be in the foreground color, or in the currently active pattern. If there is no selection, a seed fill is executed at the specified coordinates and extends outward in keeping with the threshold parameter. If there is a selection in the target image, the threshold, sample merged, x, and y arguments are unused. If the sample_merged parameter is TRUE, the data of the composite image will be used instead of that for the specified drawable. This is equivalent to sampling for colors after merging all visible layers. In the case of merged sampling, the x and y coordinates are relative to the image's origin; otherwise, they are relative to the drawable's origin.\n" + "\n" + "Deprecated: Use 'gimp-drawable-edit-bucket-fill' instead.", "David Gowers", "David Gowers", "2006", - NULL); + "gimp-drawable-edit-bucket-fill"); gimp_procedure_add_argument (procedure, gimp_param_spec_drawable_id ("drawable", "drawable", @@ -1470,11 +1487,13 @@ register_edit_procs (GimpPDB *pdb) gimp_procedure_set_static_strings (procedure, "gimp-edit-blend", "Blend between the starting and ending coordinates with the specified blend mode and gradient type.", - "This tool requires information on the paint application mode, the blend mode, and the gradient type. It creates the specified variety of blend using the starting and ending coordinates as defined for each gradient type. For shapeburst gradient types, the context's distance metric is also relevant and can be updated with 'gimp-context-set-distance-metric'.", + "This tool requires information on the paint application mode, the blend mode, and the gradient type. It creates the specified variety of blend using the starting and ending coordinates as defined for each gradient type. For shapeburst gradient types, the context's distance metric is also relevant and can be updated with 'gimp-context-set-distance-metric'.\n" + "\n" + "Deprecated: Use 'gimp-drawable-edit-gradient-fill' instead.", "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", - NULL); + "gimp-drawable-edit-gradient-fill"); gimp_procedure_add_argument (procedure, gimp_param_spec_drawable_id ("drawable", "drawable", @@ -1587,11 +1606,13 @@ register_edit_procs (GimpPDB *pdb) gimp_procedure_set_static_strings (procedure, "gimp-edit-stroke", "Stroke the current selection", - "This procedure strokes the current selection, painting along the selection boundary with the active brush and foreground color. The paint is applied to the specified drawable regardless of the active selection.", + "This procedure strokes the current selection, painting along the selection boundary with the active brush and foreground color. The paint is applied to the specified drawable regardless of the active selection.\n" + "\n" + "Deprecated: Use 'gimp-drawable-edit-stroke-selection' instead.", "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", - NULL); + "gimp-drawable-edit-stroke-selection"); gimp_procedure_add_argument (procedure, gimp_param_spec_drawable_id ("drawable", "drawable", @@ -1610,11 +1631,13 @@ register_edit_procs (GimpPDB *pdb) gimp_procedure_set_static_strings (procedure, "gimp-edit-stroke-vectors", "Stroke the specified vectors object", - "This procedure strokes the specified vectors object, painting along the path with the active brush and foreground color.", + "This procedure strokes the specified vectors object, painting along the path with the active brush and foreground color.\n" + "\n" + "Deprecated: Use 'gimp-drawable-edit-stroke-item' instead.", "Simon Budig", "Simon Budig", "2006", - NULL); + "gimp-drawable-edit-stroke-item"); gimp_procedure_add_argument (procedure, gimp_param_spec_drawable_id ("drawable", "drawable", diff --git a/app/pdb/gimppdbcontext.c b/app/pdb/gimppdbcontext.c index 086e04d14c..07aa801e8c 100644 --- a/app/pdb/gimppdbcontext.c +++ b/app/pdb/gimppdbcontext.c @@ -503,6 +503,14 @@ gimp_pdb_context_new (Gimp *gimp, return GIMP_CONTEXT (context); } +GimpContainer * +gimp_pdb_context_get_paint_options_list (GimpPDBContext *context) +{ + g_return_val_if_fail (GIMP_IS_PDB_CONTEXT (context), NULL); + + return context->paint_options_list; +} + GimpPaintOptions * gimp_pdb_context_get_paint_options (GimpPDBContext *context, const gchar *name) diff --git a/app/pdb/gimppdbcontext.h b/app/pdb/gimppdbcontext.h index 42d6db2c96..3e659dbc0d 100644 --- a/app/pdb/gimppdbcontext.h +++ b/app/pdb/gimppdbcontext.h @@ -71,6 +71,8 @@ GimpContext * gimp_pdb_context_new (Gimp *gimp, GimpContext *parent, gboolean set_parent); +GimpContainer * gimp_pdb_context_get_paint_options_list + (GimpPDBContext *context); GimpPaintOptions * gimp_pdb_context_get_paint_options (GimpPDBContext *context, const gchar *name); GList * gimp_pdb_context_get_brush_options (GimpPDBContext *context); diff --git a/app/pdb/gradient-cmds.c b/app/pdb/gradient-cmds.c index cfce30debf..84b843c65a 100644 --- a/app/pdb/gradient-cmds.c +++ b/app/pdb/gradient-cmds.c @@ -335,7 +335,9 @@ gradient_get_uniform_samples_invoker (GimpProcedure *procedure, if (success) { - GimpGradient *gradient = gimp_pdb_get_gradient (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error); + GimpGradient *gradient = gimp_pdb_get_gradient (gimp, name, + GIMP_PDB_DATA_ACCESS_READ, + error); if (gradient) { @@ -353,7 +355,9 @@ gradient_get_uniform_samples_invoker (GimpProcedure *procedure, GimpRGB color; seg = gimp_gradient_get_color_at (gradient, context, seg, - pos, reverse, &color); + pos, reverse, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, + &color); *sample++ = color.r; *sample++ = color.g; @@ -403,7 +407,9 @@ gradient_get_custom_samples_invoker (GimpProcedure *procedure, if (success) { - GimpGradient *gradient = gimp_pdb_get_gradient (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error); + GimpGradient *gradient = gimp_pdb_get_gradient (gimp, name, + GIMP_PDB_DATA_ACCESS_READ, + error); if (gradient) { @@ -420,7 +426,9 @@ gradient_get_custom_samples_invoker (GimpProcedure *procedure, seg = gimp_gradient_get_color_at (gradient, context, seg, *positions, - reverse, &color); + reverse, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, + &color); *sample++ = color.r; *sample++ = color.g; @@ -469,7 +477,8 @@ gradient_segment_get_left_color_invoker (GimpProcedure *procedure, GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, + &seg, error); if (seg) { @@ -516,7 +525,8 @@ gradient_segment_set_left_color_invoker (GimpProcedure *procedure, GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment, + &seg, error); if (seg) { @@ -554,7 +564,8 @@ gradient_segment_get_right_color_invoker (GimpProcedure *procedure, GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, + &seg, error); if (seg) { @@ -601,7 +612,8 @@ gradient_segment_set_right_color_invoker (GimpProcedure *procedure, GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment, + &seg, error); if (seg) { @@ -638,7 +650,8 @@ gradient_segment_get_left_pos_invoker (GimpProcedure *procedure, GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, + &seg, error); if (seg) { @@ -681,7 +694,8 @@ gradient_segment_set_left_pos_invoker (GimpProcedure *procedure, GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment, + &seg, error); if (seg) { @@ -722,7 +736,8 @@ gradient_segment_get_middle_pos_invoker (GimpProcedure *procedure, GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, + &seg, error); if (seg) { @@ -765,7 +780,8 @@ gradient_segment_set_middle_pos_invoker (GimpProcedure *procedure, GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment, + &seg, error); if (seg) { @@ -807,7 +823,8 @@ gradient_segment_get_right_pos_invoker (GimpProcedure *procedure, GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, + &seg, error); if (seg) { @@ -850,7 +867,8 @@ gradient_segment_set_right_pos_invoker (GimpProcedure *procedure, GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment, + &seg, error); if (seg) { @@ -892,7 +910,8 @@ gradient_segment_get_blending_function_invoker (GimpProcedure *procedure GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, + &seg, error); if (seg) { @@ -933,7 +952,8 @@ gradient_segment_get_coloring_type_invoker (GimpProcedure *procedure, GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, + &seg, error); if (seg) { @@ -1149,6 +1169,7 @@ gradient_segment_range_split_midpoint_invoker (GimpProcedure *procedure, { gimp_gradient_segment_range_split_midpoint (gradient, context, start_seg, end_seg, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, NULL, NULL); } else @@ -1192,6 +1213,7 @@ gradient_segment_range_split_uniform_invoker (GimpProcedure *procedure, gimp_gradient_segment_range_split_uniform (gradient, context, start_seg, end_seg, split_parts, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, NULL, NULL); } else diff --git a/app/pdb/gradients-cmds.c b/app/pdb/gradients-cmds.c index a6002e7b16..12002abc4b 100644 --- a/app/pdb/gradients-cmds.c +++ b/app/pdb/gradients-cmds.c @@ -127,7 +127,9 @@ gradients_sample_uniform_invoker (GimpProcedure *procedure, while (num_samples--) { seg = gimp_gradient_get_color_at (gradient, context, seg, - pos, reverse, &color); + pos, reverse, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, + &color); *pv++ = color.r; *pv++ = color.g; @@ -186,7 +188,9 @@ gradients_sample_custom_invoker (GimpProcedure *procedure, while (num_samples--) { seg = gimp_gradient_get_color_at (gradient, context, seg, - *positions, reverse, &color); + *positions, reverse, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, + &color); *pv++ = color.r; *pv++ = color.g; @@ -261,7 +265,9 @@ gradients_get_gradient_data_invoker (GimpProcedure *procedure, while (sample_size--) { seg = gimp_gradient_get_color_at (gradient, context, seg, - pos, reverse, &color); + pos, reverse, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, + &color); *pv++ = color.r; *pv++ = color.g; diff --git a/app/pdb/image-select-cmds.c b/app/pdb/image-select-cmds.c index 823e4f21ce..13c0d9e774 100644 --- a/app/pdb/image-select-cmds.c +++ b/app/pdb/image-select-cmds.c @@ -366,7 +366,9 @@ register_image_select_procs (GimpPDB *pdb) "gimp-image-select-color", "Create a selection by selecting all pixels (in the specified drawable) with the same (or similar) color to that specified.", "This tool creates a selection over the specified image. A by-color selection is determined by the supplied color under the constraints of the current context settings. Essentially, all pixels (in the drawable) that have color sufficiently close to the specified color (as determined by the threshold and criterion context values) are included in the selection. To select transparent regions, the color specified must also have minimum alpha.\n" + "\n" "This procedure is affected by the following context setters: 'gimp-context-set-antialias', 'gimp-context-set-feather', 'gimp-context-set-feather-radius', 'gimp-context-set-sample-merged', 'gimp-context-set-sample-criterion', 'gimp-context-set-sample-threshold', 'gimp-context-set-sample-transparent'.\n" + "\n" "In the case of a merged sampling, the supplied drawable is ignored.", "David Gowers", "David Gowers", @@ -411,7 +413,9 @@ register_image_select_procs (GimpPDB *pdb) "gimp-image-select-contiguous-color", "Create a selection by selecting all pixels around specified coordinates with the same (or similar) color to that at the coordinates.", "This tool creates a contiguous selection over the specified image. A contiguous color selection is determined by a seed fill under the constraints of the current context settings. Essentially, the color at the specified coordinates (in the drawable) is measured and the selection expands outwards from that point to any adjacent pixels which are not significantly different (as determined by the threshold and criterion context settings). This process continues until no more expansion is possible. If antialiasing is turned on, the final selection mask will contain intermediate values based on close misses to the threshold bar at pixels along the seed fill boundary.\n" + "\n" "This procedure is affected by the following context setters: 'gimp-context-set-antialias', 'gimp-context-set-feather', 'gimp-context-set-feather-radius', 'gimp-context-set-sample-merged', 'gimp-context-set-sample-criterion', 'gimp-context-set-sample-threshold', 'gimp-context-set-sample-transparent', 'gimp-context-set-diagonal-neighbors'.\n" + "\n" "In the case of a merged sampling, the supplied drawable is ignored. If the sample is merged, the specified coordinates are relative to the image origin; otherwise, they are relative to the drawable's origin.", "David Gowers", "David Gowers", @@ -461,6 +465,7 @@ register_image_select_procs (GimpPDB *pdb) "gimp-image-select-rectangle", "Create a rectangular selection over the specified image;", "This tool creates a rectangular selection over the specified image. The rectangular region can be either added to, subtracted from, or replace the contents of the previous selection mask.\n" + "\n" "This procedure is affected by the following context setters: 'gimp-context-set-feather', 'gimp-context-set-feather-radius'.", "Michael Natterer ", "Michael Natterer", @@ -516,6 +521,7 @@ register_image_select_procs (GimpPDB *pdb) "gimp-image-select-round-rectangle", "Create a rectangular selection with round corners over the specified image;", "This tool creates a rectangular selection with round corners over the specified image. The rectangular region can be either added to, subtracted from, or replace the contents of the previous selection mask.\n" + "\n" "This procedure is affected by the following context setters: 'gimp-context-set-antialias', 'gimp-context-set-feather', 'gimp-context-set-feather-radius'.", "Martin Nordholts", "Martin Nordholts", @@ -583,6 +589,7 @@ register_image_select_procs (GimpPDB *pdb) "gimp-image-select-ellipse", "Create an elliptical selection over the specified image.", "This tool creates an elliptical selection over the specified image. The elliptical region can be either added to, subtracted from, or replace the contents of the previous selection mask.\n" + "\n" "This procedure is affected by the following context setters: 'gimp-context-set-antialias', 'gimp-context-set-feather', 'gimp-context-set-feather-radius'.", "Michael Natterer ", "Michael Natterer", @@ -638,6 +645,7 @@ register_image_select_procs (GimpPDB *pdb) "gimp-image-select-polygon", "Create a polygonal selection over the specified image.", "This tool creates a polygonal selection over the specified image. The polygonal region can be either added to, subtracted from, or replace the contents of the previous selection mask. The polygon is specified through an array of floating point numbers and its length. The length of array must be 2n, where n is the number of points. Each point is defined by 2 floating point values which correspond to the x and y coordinates. If the final point does not connect to the starting point, a connecting segment is automatically added.\n" + "\n" "This procedure is affected by the following context setters: 'gimp-context-set-antialias', 'gimp-context-set-feather', 'gimp-context-set-feather-radius'.", "Michael Natterer ", "Michael Natterer", @@ -680,6 +688,7 @@ register_image_select_procs (GimpPDB *pdb) "gimp-image-select-item", "Transforms the specified item into a selection", "This procedure renders the item's outline into the current selection of the image the item belongs to. What exactly the item's outline is depends on the item type: for layers, it's the layer's alpha channel, for vectors the vector's shape.\n" + "\n" "This procedure is affected by the following context setters: 'gimp-context-set-antialias', 'gimp-context-set-feather', 'gimp-context-set-feather-radius'.", "Michael Natterer ", "Michael Natterer", diff --git a/app/pdb/internal-procs.c b/app/pdb/internal-procs.c index 48c0c3b72a..d2cc538624 100644 --- a/app/pdb/internal-procs.c +++ b/app/pdb/internal-procs.c @@ -28,7 +28,7 @@ #include "internal-procs.h" -/* 816 procedures registered total */ +/* 832 procedures registered total */ void internal_procs_init (GimpPDB *pdb) @@ -46,6 +46,7 @@ internal_procs_init (GimpPDB *pdb) register_display_procs (pdb); register_drawable_procs (pdb); register_drawable_color_procs (pdb); + register_drawable_edit_procs (pdb); register_drawable_transform_procs (pdb); register_dynamics_procs (pdb); register_edit_procs (pdb); diff --git a/app/pdb/internal-procs.h b/app/pdb/internal-procs.h index 3dd0b14f61..ff6611691c 100644 --- a/app/pdb/internal-procs.h +++ b/app/pdb/internal-procs.h @@ -35,6 +35,7 @@ void register_debug_procs (GimpPDB *pdb); void register_display_procs (GimpPDB *pdb); void register_drawable_procs (GimpPDB *pdb); void register_drawable_color_procs (GimpPDB *pdb); +void register_drawable_edit_procs (GimpPDB *pdb); void register_drawable_transform_procs (GimpPDB *pdb); void register_dynamics_procs (GimpPDB *pdb); void register_edit_procs (GimpPDB *pdb); diff --git a/app/pdb/plug-in-compat-cmds.c b/app/pdb/plug-in-compat-cmds.c index a7d140b0c4..7cc87e2263 100644 --- a/app/pdb/plug-in-compat-cmds.c +++ b/app/pdb/plug-in-compat-cmds.c @@ -3154,7 +3154,7 @@ plug_in_randomize_hurl_invoker (GimpProcedure *procedure, GeglNode *node; if (randomize) - seed = g_random_int (); + seed = (gint32) g_random_int (); node = gegl_node_new_child (NULL, @@ -3207,7 +3207,7 @@ plug_in_randomize_pick_invoker (GimpProcedure *procedure, GeglNode *node; if (randomize) - seed = g_random_int (); + seed = (gint32) g_random_int (); node = gegl_node_new_child (NULL, @@ -3260,7 +3260,7 @@ plug_in_randomize_slur_invoker (GimpProcedure *procedure, GeglNode *node; if (randomize) - seed = g_random_int (); + seed = (gint32) g_random_int (); node = gegl_node_new_child (NULL, @@ -3340,7 +3340,7 @@ plug_in_rgb_noise_invoker (GimpProcedure *procedure, "green", g, "blue", b, "alpha", a, - "seed", g_random_int_range (0, G_MAXINT), + "seed", g_random_int (), NULL); node = wrap_in_gamma_cast (node, drawable); @@ -3463,7 +3463,7 @@ plug_in_noisify_invoker (GimpProcedure *procedure, "green", g, "blue", b, "alpha", a, - "seed", g_random_int_range (0, G_MAXINT), + "seed", g_random_int (), NULL); node = wrap_in_gamma_cast (node, drawable); @@ -3852,7 +3852,7 @@ plug_in_spread_invoker (GimpProcedure *procedure, "operation", "gegl:noise-spread", "amount-x", (gint) spread_amount_x, "amount-y", (gint) spread_amount_y, - "seed", (guint) g_random_int (), + "seed", g_random_int (), NULL); gimp_drawable_apply_operation (drawable, progress, @@ -7904,7 +7904,7 @@ register_plug_in_compat_procs (GimpPDB *pdb) gimp_procedure_add_argument (procedure, g_param_spec_double ("blend-power", "blend power", - "Power used to strech the blend", + "Power used to stretch the blend", -G_MAXDOUBLE, G_MAXDOUBLE, 0, GIMP_PARAM_READWRITE)); gimp_pdb_register_procedure (pdb, procedure); diff --git a/app/pdb/selection-cmds.c b/app/pdb/selection-cmds.c index 4f48e5c944..43f9d97547 100644 --- a/app/pdb/selection-cmds.c +++ b/app/pdb/selection-cmds.c @@ -516,9 +516,18 @@ selection_save_invoker (GimpProcedure *procedure, if (success) { - channel = gimp_selection_save (GIMP_SELECTION (gimp_image_get_mask (image))); + channel = GIMP_CHANNEL (gimp_item_duplicate (GIMP_ITEM (gimp_image_get_mask (image)), + GIMP_TYPE_CHANNEL)); - if (! channel) + if (channel) + { + /* saved selections are not visible by default */ + gimp_item_set_visible (GIMP_ITEM (channel), FALSE, FALSE); + + gimp_image_add_channel (image, channel, + GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE); + } + else success = FALSE; } diff --git a/app/pdb/text-layer-cmds.c b/app/pdb/text-layer-cmds.c index 30e7c22060..95c749ecbd 100644 --- a/app/pdb/text-layer-cmds.c +++ b/app/pdb/text-layer-cmds.c @@ -2166,7 +2166,9 @@ register_text_layer_procs (GimpPDB *pdb) gimp_procedure_set_static_strings (procedure, "gimp-text-layer-set-hinting", "Enable/disable the use of hinting in a text layer.", - "This procedure enables or disables hinting on the text of a text layer. If you enable 'auto-hint', FreeType\'s automatic hinter will be used and hinting information from the font will be ignored.", + "This procedure enables or disables hinting on the text of a text layer. If you enable 'auto-hint', FreeType\'s automatic hinter will be used and hinting information from the font will be ignored.\n" + "\n" + "Deprecated: Use 'gimp-text-layer-set-hint-style' instead.", "Marcus Heese ", "Marcus Heese", "2008", diff --git a/app/plug-in/Makefile.in b/app/plug-in/Makefile.in index 32602cff4c..e070b8e458 100644 --- a/app/plug-in/Makefile.in +++ b/app/plug-in/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -286,7 +287,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -359,6 +360,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -587,6 +589,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/plug-in/gimppluginmanager-file-procedure.c b/app/plug-in/gimppluginmanager-file-procedure.c index 845b939c68..510319fd12 100644 --- a/app/plug-in/gimppluginmanager-file-procedure.c +++ b/app/plug-in/gimppluginmanager-file-procedure.c @@ -42,7 +42,7 @@ typedef enum { - /* positive values indicate the lenght of a matching magic */ + /* positive values indicate the length of a matching magic */ FILE_MATCH_NONE = 0, FILE_MATCH_SIZE = -1 diff --git a/app/plug-in/gimppluginmanager.c b/app/plug-in/gimppluginmanager.c index 705eeb9e3f..c5638cfacb 100644 --- a/app/plug-in/gimppluginmanager.c +++ b/app/plug-in/gimppluginmanager.c @@ -257,7 +257,7 @@ gimp_plug_in_manager_exit (GimpPlugInManager *manager) while (manager->open_plug_ins) gimp_plug_in_close (manager->open_plug_ins->data, TRUE); - /* need to deatch from shared memory, we can't rely on exit() + /* need to detach from shared memory, we can't rely on exit() * cleaning up behind us (see bug #609026) */ if (manager->shm) diff --git a/app/plug-in/gimppluginprocframe.c b/app/plug-in/gimppluginprocframe.c index 56a91fc4cf..60f6886674 100644 --- a/app/plug-in/gimppluginprocframe.c +++ b/app/plug-in/gimppluginprocframe.c @@ -77,7 +77,7 @@ gimp_plug_in_proc_frame_init (GimpPlugInProcFrame *proc_frame, proc_frame->main_context = g_object_ref (context); proc_frame->context_stack = NULL; - proc_frame->procedure = procedure ? g_object_ref (procedure) : NULL; + proc_frame->procedure = procedure ? g_object_ref (GIMP_PROCEDURE (procedure)) : NULL; proc_frame->main_loop = NULL; proc_frame->return_vals = NULL; proc_frame->progress = progress ? g_object_ref (progress) : NULL; diff --git a/app/propgui/Makefile.am b/app/propgui/Makefile.am index ebfbeed8cc..a15c04b1e3 100644 --- a/app/propgui/Makefile.am +++ b/app/propgui/Makefile.am @@ -37,6 +37,8 @@ libapppropgui_a_SOURCES = \ gimppropgui-generic.h \ gimppropgui-hue-saturation.c \ gimppropgui-hue-saturation.h \ + gimppropgui-panorama-projection.c \ + gimppropgui-panorama-projection.h \ gimppropgui-recursive-transform.c \ gimppropgui-recursive-transform.h \ gimppropgui-shadows-highlights.c \ diff --git a/app/propgui/Makefile.in b/app/propgui/Makefile.in index 083b5f042e..afacb5323e 100644 --- a/app/propgui/Makefile.in +++ b/app/propgui/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -129,6 +130,7 @@ am_libapppropgui_a_OBJECTS = gimppropgui.$(OBJEXT) \ gimppropgui-diffraction-patterns.$(OBJEXT) \ gimppropgui-eval.$(OBJEXT) gimppropgui-generic.$(OBJEXT) \ gimppropgui-hue-saturation.$(OBJEXT) \ + gimppropgui-panorama-projection.$(OBJEXT) \ gimppropgui-recursive-transform.$(OBJEXT) \ gimppropgui-shadows-highlights.$(OBJEXT) \ gimppropgui-spiral.$(OBJEXT) gimppropgui-supernova.$(OBJEXT) \ @@ -280,7 +282,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -353,6 +355,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -581,6 +584,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -635,6 +639,8 @@ libapppropgui_a_SOURCES = \ gimppropgui-generic.h \ gimppropgui-hue-saturation.c \ gimppropgui-hue-saturation.h \ + gimppropgui-panorama-projection.c \ + gimppropgui-panorama-projection.h \ gimppropgui-recursive-transform.c \ gimppropgui-recursive-transform.h \ gimppropgui-shadows-highlights.c \ @@ -703,6 +709,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-eval.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-generic.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-hue-saturation.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-panorama-projection.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-recursive-transform.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-shadows-highlights.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-spiral.Po@am__quote@ diff --git a/app/propgui/gimppropgui-panorama-projection.c b/app/propgui/gimppropgui-panorama-projection.c new file mode 100644 index 0000000000..41f011ca08 --- /dev/null +++ b/app/propgui/gimppropgui-panorama-projection.c @@ -0,0 +1,144 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis + * + * gimppropgui-panorama-projection.c + * Copyright (C) 2018 Ell + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "config.h" + +#include +#include + +#include "libgimpmath/gimpmath.h" +#include "libgimpwidgets/gimpwidgets.h" + +#include "propgui-types.h" + +#include "core/gimpcontext.h" + +#include "gimppropgui.h" +#include "gimppropgui-generic.h" +#include "gimppropgui-panorama-projection.h" + +#include "gimp-intl.h" + + +static void +gyroscope_callback (GObject *config, + GeglRectangle *area, + gdouble yaw, + gdouble pitch, + gdouble roll, + gdouble zoom, + gboolean invert) +{ + g_object_set_data_full (G_OBJECT (config), "area", + g_memdup (area, sizeof (GeglRectangle)), + (GDestroyNotify) g_free); + + g_object_set (config, + "pan", -yaw, + "tilt", -pitch, + "spin", -roll, + "zoom", CLAMP (100.0 * zoom, 0.01, 1000.0), + "inverse", invert, + NULL); +} + +static void +config_notify (GObject *config, + const GParamSpec *pspec, + gpointer set_data) +{ + GimpControllerGyroscopeCallback set_func; + GeglRectangle *area; + gdouble pan; + gdouble tilt; + gdouble spin; + gdouble zoom; + gboolean inverse; + + set_func = g_object_get_data (G_OBJECT (config), "set-func"); + area = g_object_get_data (G_OBJECT (config), "area"); + + g_object_get (config, + "pan", &pan, + "tilt", &tilt, + "spin", &spin, + "zoom", &zoom, + "inverse", &inverse, + NULL); + + set_func (set_data, + area, + -pan, -tilt, -spin, + zoom / 100.0, + inverse); +} + +GtkWidget * +_gimp_prop_gui_new_panorama_projection (GObject *config, + GParamSpec **param_specs, + guint n_param_specs, + GeglRectangle *area, + GimpContext *context, + GimpCreatePickerFunc create_picker_func, + GimpCreateControllerFunc create_controller_func, + gpointer creator) +{ + GtkWidget *vbox; + + g_return_val_if_fail (G_IS_OBJECT (config), NULL); + g_return_val_if_fail (param_specs != NULL, NULL); + g_return_val_if_fail (n_param_specs > 0, NULL); + g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL); + + vbox = _gimp_prop_gui_new_generic (config, + param_specs, n_param_specs, + area, context, + create_picker_func, + create_controller_func, + creator); + + + if (create_controller_func) + { + GCallback set_func; + gpointer set_data; + + set_func = create_controller_func (creator, + GIMP_CONTROLLER_TYPE_GYROSCOPE, + _("Panorama Projection: "), + (GCallback) gyroscope_callback, + config, + &set_data); + + g_object_set_data (G_OBJECT (config), "set-func", set_func); + + g_object_set_data_full (G_OBJECT (config), "area", + g_memdup (area, sizeof (GeglRectangle)), + (GDestroyNotify) g_free); + + config_notify (config, NULL, set_data); + + g_signal_connect (config, "notify", + G_CALLBACK (config_notify), + set_data); + } + + return vbox; +} diff --git a/app/propgui/gimppropgui-panorama-projection.h b/app/propgui/gimppropgui-panorama-projection.h new file mode 100644 index 0000000000..6b170d267e --- /dev/null +++ b/app/propgui/gimppropgui-panorama-projection.h @@ -0,0 +1,35 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis + * + * gimppropgui-panorama-projection.h + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __GIMP_PROP_GUI_PANORAMA_PROJECTION_H__ +#define __GIMP_PROP_GUI_PANORAMA_PROJECTION_H__ + + +GtkWidget * +_gimp_prop_gui_new_panorama_projection (GObject *config, + GParamSpec **param_specs, + guint n_param_specs, + GeglRectangle *area, + GimpContext *context, + GimpCreatePickerFunc create_picker_func, + GimpCreateControllerFunc create_controller_func, + gpointer creator); + + +#endif /* __GIMP_PROP_GUI_PANORAMA_PROJECTION_H__ */ diff --git a/app/propgui/gimppropgui.c b/app/propgui/gimppropgui.c index 1369779d65..5f63fc7868 100644 --- a/app/propgui/gimppropgui.c +++ b/app/propgui/gimppropgui.c @@ -54,6 +54,7 @@ #include "gimppropgui-eval.h" #include "gimppropgui-generic.h" #include "gimppropgui-hue-saturation.h" +#include "gimppropgui-panorama-projection.h" #include "gimppropgui-recursive-transform.h" #include "gimppropgui-shadows-highlights.h" #include "gimppropgui-spiral.h" @@ -451,6 +452,8 @@ gui_new_funcs[] = _gimp_prop_gui_new_channel_mixer }, { "GimpGegl-gegl-diffraction-patterns-config", _gimp_prop_gui_new_diffraction_patterns }, + { "GimpGegl-gegl-panorama-projection-config", + _gimp_prop_gui_new_panorama_projection }, { "GimpGegl-gegl-recursive-transform-config", _gimp_prop_gui_new_recursive_transform }, { "GimpGegl-gegl-shadows-highlights-config", diff --git a/app/propgui/propgui-types.h b/app/propgui/propgui-types.h index 8e61327115..83127f2061 100644 --- a/app/propgui/propgui-types.h +++ b/app/propgui/propgui-types.h @@ -30,7 +30,8 @@ typedef enum { GIMP_CONTROLLER_TYPE_LINE, GIMP_CONTROLLER_TYPE_SLIDER_LINE, - GIMP_CONTROLLER_TYPE_TRANSFORM_GRID + GIMP_CONTROLLER_TYPE_TRANSFORM_GRID, + GIMP_CONTROLLER_TYPE_GYROSCOPE } GimpControllerType; @@ -100,6 +101,13 @@ typedef void (* GimpControllerSliderLineCallback) (gpointer typedef void (* GimpControllerTransformGridCallback) (gpointer data, GeglRectangle *area, const GimpMatrix3 *transform); +typedef void (* GimpControllerGyroscopeCallback) (gpointer data, + GeglRectangle *area, + gdouble yaw, + gdouble pitch, + gdouble roll, + gdouble zoom, + gboolean invert); typedef GtkWidget * (* GimpCreatePickerFunc) (gpointer creator, diff --git a/app/sanity.c b/app/sanity.c index 085bfb5743..a3e217b707 100644 --- a/app/sanity.c +++ b/app/sanity.c @@ -480,7 +480,7 @@ sanity_check_babl (void) #define BABL_REQUIRED_MAJOR 0 #define BABL_REQUIRED_MINOR 1 -#define BABL_REQUIRED_MICRO 44 +#define BABL_REQUIRED_MICRO 46 babl_get_version (&babl_major_version, &babl_minor_version, @@ -518,7 +518,7 @@ sanity_check_gegl (void) #define GEGL_REQUIRED_MAJOR 0 #define GEGL_REQUIRED_MINOR 3 -#define GEGL_REQUIRED_MICRO 30 +#define GEGL_REQUIRED_MICRO 34 gegl_get_version (&gegl_major_version, &gegl_minor_version, diff --git a/app/tests.c b/app/tests.c index d822c30fc5..bb52e380cd 100644 --- a/app/tests.c +++ b/app/tests.c @@ -65,7 +65,7 @@ gimp_init_for_testing (void) gegl_init (NULL, NULL); gimp = gimp_new ("Unit Tested GIMP", NULL, NULL, FALSE, TRUE, TRUE, TRUE, - FALSE, FALSE, TRUE, FALSE, + FALSE, FALSE, TRUE, FALSE, FALSE, GIMP_STACK_TRACE_QUERY, GIMP_PDB_COMPAT_OFF); gimp_load_config (gimp, NULL, NULL); @@ -119,7 +119,7 @@ gimp_init_for_gui_testing_internal (gboolean show_gui, /* from app_run() */ gimp = gimp_new ("Unit Tested GIMP", NULL, NULL, FALSE, TRUE, TRUE, !show_gui, - FALSE, FALSE, TRUE, FALSE, + FALSE, FALSE, TRUE, FALSE, FALSE, GIMP_STACK_TRACE_QUERY, GIMP_PDB_COMPAT_OFF); gimp_set_show_gui (gimp, show_gui); diff --git a/app/tests/Makefile.in b/app/tests/Makefile.in index 5c154f5126..53dea48d46 100644 --- a/app/tests/Makefile.in +++ b/app/tests/Makefile.in @@ -110,6 +110,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -806,7 +807,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -879,6 +880,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -1107,6 +1109,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/tests/files/Makefile.in b/app/tests/files/Makefile.in index 18476a449b..face45542c 100644 --- a/app/tests/files/Makefile.in +++ b/app/tests/files/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -213,7 +214,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -286,6 +287,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -514,6 +516,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/tests/gimpdir-empty/Makefile.in b/app/tests/gimpdir-empty/Makefile.in index b2c4761dea..6e0abff2ce 100644 --- a/app/tests/gimpdir-empty/Makefile.in +++ b/app/tests/gimpdir-empty/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -273,7 +274,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -346,6 +347,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -574,6 +576,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/tests/gimpdir-empty/brushes/Makefile.in b/app/tests/gimpdir-empty/brushes/Makefile.in index 0fce4b7e12..4acd1d0045 100644 --- a/app/tests/gimpdir-empty/brushes/Makefile.in +++ b/app/tests/gimpdir-empty/brushes/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -213,7 +214,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -286,6 +287,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -514,6 +516,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/tests/gimpdir-empty/gradients/Makefile.in b/app/tests/gimpdir-empty/gradients/Makefile.in index 0d53d60ce6..40c852fa91 100644 --- a/app/tests/gimpdir-empty/gradients/Makefile.in +++ b/app/tests/gimpdir-empty/gradients/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -213,7 +214,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -286,6 +287,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -514,6 +516,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/tests/gimpdir-empty/patterns/Makefile.in b/app/tests/gimpdir-empty/patterns/Makefile.in index 77d799e7cb..3178a4e512 100644 --- a/app/tests/gimpdir-empty/patterns/Makefile.in +++ b/app/tests/gimpdir-empty/patterns/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -213,7 +214,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -286,6 +287,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -514,6 +516,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/tests/gimpdir/Makefile.in b/app/tests/gimpdir/Makefile.in index 326f5dcf8a..ea0cb18186 100644 --- a/app/tests/gimpdir/Makefile.in +++ b/app/tests/gimpdir/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -273,7 +274,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -346,6 +347,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -574,6 +576,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/tests/gimpdir/brushes/Makefile.in b/app/tests/gimpdir/brushes/Makefile.in index 6bf700bc39..633e08ffff 100644 --- a/app/tests/gimpdir/brushes/Makefile.in +++ b/app/tests/gimpdir/brushes/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -213,7 +214,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -286,6 +287,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -514,6 +516,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/tests/gimpdir/gradients/Makefile.in b/app/tests/gimpdir/gradients/Makefile.in index fdddcdf693..a01e94027e 100644 --- a/app/tests/gimpdir/gradients/Makefile.in +++ b/app/tests/gimpdir/gradients/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -213,7 +214,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -286,6 +287,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -514,6 +516,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/tests/gimpdir/patterns/Makefile.in b/app/tests/gimpdir/patterns/Makefile.in index 1b4a41dd3e..45c2e44e0e 100644 --- a/app/tests/gimpdir/patterns/Makefile.in +++ b/app/tests/gimpdir/patterns/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -213,7 +214,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -286,6 +287,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -514,6 +516,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/tests/test-ui.c b/app/tests/test-ui.c index 1dd996ac7d..39ca748118 100644 --- a/app/tests/test-ui.c +++ b/app/tests/test-ui.c @@ -433,7 +433,7 @@ restore_recently_closed_multi_column_dock (gconstpointer data) #warning FIXME test disabled until we depend on GTK+ >= 2.24.11 #endif #if 0 - /* Restore the (only avaiable) closed dock and make sure the session + /* Restore the (only available) closed dock and make sure the session * infos in the global dock factory are increased again */ gimp_ui_manager_activate_action (gimp_test_utils_get_ui_manager (gimp), diff --git a/app/text/Makefile.in b/app/text/Makefile.in index e104072d9d..47625b9c96 100644 --- a/app/text/Makefile.in +++ b/app/text/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -276,7 +277,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -349,6 +350,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -577,6 +579,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/text/gimptextlayer-xcf.c b/app/text/gimptextlayer-xcf.c index 8e9734e72f..abfcd6b66e 100644 --- a/app/text/gimptextlayer-xcf.c +++ b/app/text/gimptextlayer-xcf.c @@ -22,6 +22,7 @@ #include #include +#include #include "libgimpbase/gimpbase.h" #include "text-types.h" diff --git a/app/tools/Makefile.am b/app/tools/Makefile.am index 4b33a4c660..46770cd7bd 100644 --- a/app/tools/Makefile.am +++ b/app/tools/Makefile.am @@ -26,12 +26,6 @@ libapptools_a_sources = \ gimpalignoptions.h \ gimpaligntool.c \ gimpaligntool.h \ - gimpblendoptions.c \ - gimpblendoptions.h \ - gimpblendtool.c \ - gimpblendtool.h \ - gimpblendtool-editor.c \ - gimpblendtool-editor.h \ gimpbrightnesscontrasttool.c \ gimpbrightnesscontrasttool.h \ gimpbrushtool.c \ @@ -102,6 +96,12 @@ libapptools_a_sources = \ gimpgegltool.h \ gimpgenerictransformtool.c \ gimpgenerictransformtool.h \ + gimpgradientoptions.c \ + gimpgradientoptions.h \ + gimpgradienttool.c \ + gimpgradienttool.h \ + gimpgradienttool-editor.c \ + gimpgradienttool-editor.h \ gimpguidetool.c \ gimpguidetool.h \ gimphandletransformoptions.c \ @@ -150,6 +150,8 @@ libapptools_a_sources = \ gimppaintoptions-gui.h \ gimppainttool.c \ gimppainttool.h \ + gimppainttool-paint.c \ + gimppainttool-paint.h \ gimppenciltool.c \ gimppenciltool.h \ gimpperspectiveclonetool.c \ diff --git a/app/tools/Makefile.in b/app/tools/Makefile.in index 82febef45a..cc10fa92ba 100644 --- a/app/tools/Makefile.in +++ b/app/tools/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -123,18 +124,17 @@ libapptools_a_LIBADD = am__objects_1 = tools-enums.$(OBJEXT) am__objects_2 = gimp-tools.$(OBJEXT) tool_manager.$(OBJEXT) \ gimpairbrushtool.$(OBJEXT) gimpalignoptions.$(OBJEXT) \ - gimpaligntool.$(OBJEXT) gimpblendoptions.$(OBJEXT) \ - gimpblendtool.$(OBJEXT) gimpblendtool-editor.$(OBJEXT) \ - gimpbrightnesscontrasttool.$(OBJEXT) gimpbrushtool.$(OBJEXT) \ - gimpbucketfilloptions.$(OBJEXT) gimpbucketfilltool.$(OBJEXT) \ - gimpbycolorselecttool.$(OBJEXT) gimpcageoptions.$(OBJEXT) \ - gimpcagetool.$(OBJEXT) gimpcloneoptions-gui.$(OBJEXT) \ - gimpclonetool.$(OBJEXT) gimpcoloroptions.$(OBJEXT) \ - gimpcolortool.$(OBJEXT) gimpcolorpickeroptions.$(OBJEXT) \ - gimpcolorpickertool.$(OBJEXT) gimpconvolvetool.$(OBJEXT) \ - gimpcropoptions.$(OBJEXT) gimpcroptool.$(OBJEXT) \ - gimpcurvestool.$(OBJEXT) gimpdodgeburntool.$(OBJEXT) \ - gimpdrawtool.$(OBJEXT) gimpeditselectiontool.$(OBJEXT) \ + gimpaligntool.$(OBJEXT) gimpbrightnesscontrasttool.$(OBJEXT) \ + gimpbrushtool.$(OBJEXT) gimpbucketfilloptions.$(OBJEXT) \ + gimpbucketfilltool.$(OBJEXT) gimpbycolorselecttool.$(OBJEXT) \ + gimpcageoptions.$(OBJEXT) gimpcagetool.$(OBJEXT) \ + gimpcloneoptions-gui.$(OBJEXT) gimpclonetool.$(OBJEXT) \ + gimpcoloroptions.$(OBJEXT) gimpcolortool.$(OBJEXT) \ + gimpcolorpickeroptions.$(OBJEXT) gimpcolorpickertool.$(OBJEXT) \ + gimpconvolvetool.$(OBJEXT) gimpcropoptions.$(OBJEXT) \ + gimpcroptool.$(OBJEXT) gimpcurvestool.$(OBJEXT) \ + gimpdodgeburntool.$(OBJEXT) gimpdrawtool.$(OBJEXT) \ + gimpeditselectiontool.$(OBJEXT) \ gimpellipseselecttool.$(OBJEXT) gimperasertool.$(OBJEXT) \ gimpfilteroptions.$(OBJEXT) gimpfiltertool.$(OBJEXT) \ gimpfiltertool-settings.$(OBJEXT) \ @@ -144,7 +144,9 @@ am__objects_2 = gimp-tools.$(OBJEXT) tool_manager.$(OBJEXT) \ gimpforegroundselecttool.$(OBJEXT) \ gimpforegroundselecttoolundo.$(OBJEXT) \ gimpfuzzyselecttool.$(OBJEXT) gimpgegltool.$(OBJEXT) \ - gimpgenerictransformtool.$(OBJEXT) gimpguidetool.$(OBJEXT) \ + gimpgenerictransformtool.$(OBJEXT) \ + gimpgradientoptions.$(OBJEXT) gimpgradienttool.$(OBJEXT) \ + gimpgradienttool-editor.$(OBJEXT) gimpguidetool.$(OBJEXT) \ gimphandletransformoptions.$(OBJEXT) \ gimphandletransformtool.$(OBJEXT) gimphealtool.$(OBJEXT) \ gimphistogramoptions.$(OBJEXT) gimpinkoptions-gui.$(OBJEXT) \ @@ -158,8 +160,8 @@ am__objects_2 = gimp-tools.$(OBJEXT) tool_manager.$(OBJEXT) \ gimpnpointdeformationoptions.$(OBJEXT) \ gimpnpointdeformationtool.$(OBJEXT) \ gimppaintbrushtool.$(OBJEXT) gimppaintoptions-gui.$(OBJEXT) \ - gimppainttool.$(OBJEXT) gimppenciltool.$(OBJEXT) \ - gimpperspectiveclonetool.$(OBJEXT) \ + gimppainttool.$(OBJEXT) gimppainttool-paint.$(OBJEXT) \ + gimppenciltool.$(OBJEXT) gimpperspectiveclonetool.$(OBJEXT) \ gimpperspectivetool.$(OBJEXT) \ gimprectangleselecttool.$(OBJEXT) \ gimprectangleselectoptions.$(OBJEXT) \ @@ -328,7 +330,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -401,6 +403,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -629,6 +632,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -672,12 +676,6 @@ libapptools_a_sources = \ gimpalignoptions.h \ gimpaligntool.c \ gimpaligntool.h \ - gimpblendoptions.c \ - gimpblendoptions.h \ - gimpblendtool.c \ - gimpblendtool.h \ - gimpblendtool-editor.c \ - gimpblendtool-editor.h \ gimpbrightnesscontrasttool.c \ gimpbrightnesscontrasttool.h \ gimpbrushtool.c \ @@ -748,6 +746,12 @@ libapptools_a_sources = \ gimpgegltool.h \ gimpgenerictransformtool.c \ gimpgenerictransformtool.h \ + gimpgradientoptions.c \ + gimpgradientoptions.h \ + gimpgradienttool.c \ + gimpgradienttool.h \ + gimpgradienttool-editor.c \ + gimpgradienttool-editor.h \ gimpguidetool.c \ gimpguidetool.h \ gimphandletransformoptions.c \ @@ -796,6 +800,8 @@ libapptools_a_sources = \ gimppaintoptions-gui.h \ gimppainttool.c \ gimppainttool.h \ + gimppainttool-paint.c \ + gimppainttool-paint.h \ gimppenciltool.c \ gimppenciltool.h \ gimpperspectiveclonetool.c \ @@ -928,9 +934,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpairbrushtool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpalignoptions.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpaligntool.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpblendoptions.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpblendtool-editor.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpblendtool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrightnesscontrasttool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrushtool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbucketfilloptions.Po@am__quote@ @@ -966,6 +969,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfuzzyselecttool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgegltool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgenerictransformtool.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgradientoptions.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgradienttool-editor.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgradienttool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpguidetool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimphandletransformoptions.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimphandletransformtool.Po@am__quote@ @@ -989,6 +995,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationtool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppaintbrushtool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppaintoptions-gui.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppainttool-paint.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppainttool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppenciltool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpperspectiveclonetool.Po@am__quote@ diff --git a/app/tools/gimp-tools.c b/app/tools/gimp-tools.c index 9b9c4d0c1c..d511e743d4 100644 --- a/app/tools/gimp-tools.c +++ b/app/tools/gimp-tools.c @@ -41,7 +41,6 @@ #include "gimpairbrushtool.h" #include "gimpaligntool.h" -#include "gimpblendtool.h" #include "gimpbrightnesscontrasttool.h" #include "gimpbucketfilltool.h" #include "gimpbycolorselecttool.h" @@ -59,6 +58,7 @@ #include "gimpforegroundselecttool.h" #include "gimpfuzzyselecttool.h" #include "gimpgegltool.h" +#include "gimpgradienttool.h" #include "gimphandletransformtool.h" #include "gimphealtool.h" #include "gimpinktool.h" @@ -159,7 +159,7 @@ gimp_tools_init (Gimp *gimp) gimp_seamless_clone_tool_register, gimp_text_tool_register, gimp_bucket_fill_tool_register, - gimp_blend_tool_register, + gimp_gradient_tool_register, gimp_pencil_tool_register, gimp_paintbrush_tool_register, gimp_eraser_tool_register, diff --git a/app/tools/gimpairbrushtool.c b/app/tools/gimpairbrushtool.c index 62796a77f9..2374a372c5 100644 --- a/app/tools/gimpairbrushtool.c +++ b/app/tools/gimpairbrushtool.c @@ -31,16 +31,24 @@ #include "gimpairbrushtool.h" #include "gimppaintoptions-gui.h" +#include "gimppainttool-paint.h" #include "gimptoolcontrol.h" #include "gimp-intl.h" -static GtkWidget * gimp_airbrush_options_gui (GimpToolOptions *tool_options); +static void gimp_airbrush_tool_constructed (GObject *object); + +static void gimp_airbrush_tool_airbrush_timeout (GimpAirbrush *airbrush, + GimpAirbrushTool *airbrush_tool); + +static GtkWidget * gimp_airbrush_options_gui (GimpToolOptions *tool_options); G_DEFINE_TYPE (GimpAirbrushTool, gimp_airbrush_tool, GIMP_TYPE_PAINTBRUSH_TOOL) +#define parent_class gimp_airbrush_tool_parent_class + void gimp_airbrush_tool_register (GimpToolRegisterCallback callback, @@ -63,6 +71,9 @@ gimp_airbrush_tool_register (GimpToolRegisterCallback callback, static void gimp_airbrush_tool_class_init (GimpAirbrushToolClass *klass) { + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->constructed = gimp_airbrush_tool_constructed; } static void @@ -73,6 +84,26 @@ gimp_airbrush_tool_init (GimpAirbrushTool *airbrush) gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_AIRBRUSH); } +static void +gimp_airbrush_tool_constructed (GObject *object) +{ + GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (object); + + G_OBJECT_CLASS (parent_class)->constructed (object); + + g_signal_connect_object (paint_tool->core, "timeout", + G_CALLBACK (gimp_airbrush_tool_airbrush_timeout), + object, 0); +} + +static void +gimp_airbrush_tool_airbrush_timeout (GimpAirbrush *airbrush, + GimpAirbrushTool *airbrush_tool) +{ + gimp_paint_tool_paint_core_paint (GIMP_PAINT_TOOL (airbrush_tool), + GIMP_PAINT_STATE_MOTION, 0); +} + /* tool options stuff */ diff --git a/app/tools/gimpblendtool-editor.c b/app/tools/gimpblendtool-editor.c deleted file mode 100644 index 62d57dfc5d..0000000000 --- a/app/tools/gimpblendtool-editor.c +++ /dev/null @@ -1,2515 +0,0 @@ -/* GIMP - The GNU Image Manipulation Program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "config.h" - -#include -#include -#include - -#include "libgimpbase/gimpbase.h" -#include "libgimpmath/gimpmath.h" -#include "libgimpwidgets/gimpwidgets.h" - -#include "tools-types.h" - -#include "operations/gimp-operation-config.h" - -#include "core/gimpdata.h" -#include "core/gimpgradient.h" -#include "core/gimp-gradients.h" -#include "core/gimpimage.h" - -#include "widgets/gimpcolorpanel.h" -#include "widgets/gimpeditor.h" -#include "widgets/gimpwidgets-utils.h" - -#include "display/gimpdisplay.h" -#include "display/gimpdisplayshell.h" -#include "display/gimptoolgui.h" -#include "display/gimptoolline.h" - -#include "gimpblendoptions.h" -#include "gimpblendtool.h" -#include "gimpblendtool-editor.h" - -#include "gimp-intl.h" - - -#define EPSILON 2e-10 - - -typedef enum -{ - DIRECTION_NONE, - DIRECTION_LEFT, - DIRECTION_RIGHT -} Direction; - - -typedef struct -{ - /* line endpoints at the beginning of the operation */ - gdouble start_x; - gdouble start_y; - gdouble end_x; - gdouble end_y; - - /* copy of the gradient at the beginning of the operation, owned by the blend - * info, or NULL, if the gradient isn't affected - */ - GimpGradient *gradient; - - /* handle added by the operation, or HANDLE_NONE */ - gint added_handle; - /* handle removed by the operation, or HANDLE_NONE */ - gint removed_handle; - /* selected handle at the end of the operation, or HANDLE_NONE */ - gint selected_handle; -} BlendInfo; - - -/* local function prototypes */ - -static gboolean gimp_blend_tool_editor_line_can_add_slider (GimpToolLine *line, - gdouble value, - GimpBlendTool *blend_tool); -static gint gimp_blend_tool_editor_line_add_slider (GimpToolLine *line, - gdouble value, - GimpBlendTool *blend_tool); -static void gimp_blend_tool_editor_line_prepare_to_remove_slider (GimpToolLine *line, - gint slider, - gboolean remove, - GimpBlendTool *blend_tool); -static void gimp_blend_tool_editor_line_remove_slider (GimpToolLine *line, - gint slider, - GimpBlendTool *blend_tool); -static void gimp_blend_tool_editor_line_selection_changed (GimpToolLine *line, - GimpBlendTool *blend_tool); -static gboolean gimp_blend_tool_editor_line_handle_clicked (GimpToolLine *line, - gint handle, - GdkModifierType state, - GimpButtonPressType press_type, - GimpBlendTool *blend_tool); - -static void gimp_blend_tool_editor_gui_response (GimpToolGui *gui, - gint response_id, - GimpBlendTool *blend_tool); - -static void gimp_blend_tool_editor_color_entry_color_clicked (GimpColorButton *button, - GimpBlendTool *blend_tool); -static void gimp_blend_tool_editor_color_entry_color_changed (GimpColorButton *button, - GimpBlendTool *blend_tool); -static void gimp_blend_tool_editor_color_entry_color_response (GimpColorButton *button, - GimpColorDialogState state, - GimpBlendTool *blend_tool); - -static void gimp_blend_tool_editor_color_entry_type_changed (GtkComboBox *combo, - GimpBlendTool *blend_tool); - -static void gimp_blend_tool_editor_endpoint_se_value_changed (GimpSizeEntry *se, - GimpBlendTool *blend_tool); - -static void gimp_blend_tool_editor_stop_se_value_changed (GimpSizeEntry *se, - GimpBlendTool *blend_tool); - -static void gimp_blend_tool_editor_stop_delete_clicked (GtkWidget *button, - GimpBlendTool *blend_tool); - -static void gimp_blend_tool_editor_midpoint_se_value_changed (GimpSizeEntry *se, - GimpBlendTool *blend_tool); - -static void gimp_blend_tool_editor_midpoint_type_changed (GtkComboBox *combo, - GimpBlendTool *blend_tool); - -static void gimp_blend_tool_editor_midpoint_color_changed (GtkComboBox *combo, - GimpBlendTool *blend_tool); - -static void gimp_blend_tool_editor_midpoint_new_stop_clicked (GtkWidget *button, - GimpBlendTool *blend_tool); -static void gimp_blend_tool_editor_midpoint_center_clicked (GtkWidget *button, - GimpBlendTool *blend_tool); - -static gboolean gimp_blend_tool_editor_flush_idle (GimpBlendTool *blend_tool); - -static gboolean gimp_blend_tool_editor_is_gradient_editable (GimpBlendTool *blend_tool); - -static gboolean gimp_blend_tool_editor_handle_is_endpoint (GimpBlendTool *blend_tool, - gint handle); -static gboolean gimp_blend_tool_editor_handle_is_stop (GimpBlendTool *blend_tool, - gint handle); -static gboolean gimp_blend_tool_editor_handle_is_midpoint (GimpBlendTool *blend_tool, - gint handle); -static GimpGradientSegment * gimp_blend_tool_editor_handle_get_segment (GimpBlendTool *blend_tool, - gint handle); - -static void gimp_blend_tool_editor_block_handlers (GimpBlendTool *blend_tool); -static void gimp_blend_tool_editor_unblock_handlers (GimpBlendTool *blend_tool); -static gboolean gimp_blend_tool_editor_are_handlers_blocked (GimpBlendTool *blend_tool); - -static void gimp_blend_tool_editor_freeze_gradient (GimpBlendTool *blend_tool); -static void gimp_blend_tool_editor_thaw_gradient (GimpBlendTool *blend_tool); - -static gint gimp_blend_tool_editor_add_stop (GimpBlendTool *blend_tool, - gdouble value); -static void gimp_blend_tool_editor_delete_stop (GimpBlendTool *blend_tool, - gint slider); -static gint gimp_blend_tool_editor_midpoint_to_stop (GimpBlendTool *blend_tool, - gint slider); - -static void gimp_blend_tool_editor_update_sliders (GimpBlendTool *blend_tool); - -static void gimp_blend_tool_editor_purge_gradient_history (GSList **stack); -static void gimp_blend_tool_editor_purge_gradient (GimpBlendTool *blend_tool); - -static GtkWidget * gimp_blend_tool_editor_color_entry_new (GimpBlendTool *blend_tool, - const gchar *title, - Direction direction, - GtkWidget *chain_button, - GtkWidget **color_panel, - GtkWidget **type_combo); -static void gimp_blend_tool_editor_init_endpoint_gui (GimpBlendTool *blend_tool); -static void gimp_blend_tool_editor_init_stop_gui (GimpBlendTool *blend_tool); -static void gimp_blend_tool_editor_init_midpoint_gui (GimpBlendTool *blend_tool); -static void gimp_blend_tool_editor_update_endpoint_gui (GimpBlendTool *blend_tool, - gint selection); -static void gimp_blend_tool_editor_update_stop_gui (GimpBlendTool *blend_tool, - gint selection); -static void gimp_blend_tool_editor_update_midpoint_gui (GimpBlendTool *blend_tool, - gint selection); -static void gimp_blend_tool_editor_update_gui (GimpBlendTool *blend_tool); - -static BlendInfo * gimp_blend_tool_editor_blend_info_new (GimpBlendTool *blend_tool); -static void gimp_blend_tool_editor_blend_info_free (BlendInfo *info); -static void gimp_blend_tool_editor_blend_info_apply (GimpBlendTool *blend_tool, - const BlendInfo *info, - gboolean set_selection); -static gboolean gimp_blend_tool_editor_blend_info_is_trivial (GimpBlendTool *blend_tool, - const BlendInfo *info); - - -/* private functions */ - - -static gboolean -gimp_blend_tool_editor_line_can_add_slider (GimpToolLine *line, - gdouble value, - GimpBlendTool *blend_tool) -{ - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool); - gdouble offset = options->offset / 100.0; - - return gimp_blend_tool_editor_is_gradient_editable (blend_tool) && - value >= offset; -} - -static gint -gimp_blend_tool_editor_line_add_slider (GimpToolLine *line, - gdouble value, - GimpBlendTool *blend_tool) -{ - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool); - GimpPaintOptions *paint_options = GIMP_PAINT_OPTIONS (options); - gdouble offset = options->offset / 100.0; - - /* adjust slider value according to the offset */ - value = (value - offset) / (1.0 - offset); - - /* flip the slider value, if necessary */ - if (paint_options->gradient_options->gradient_reverse) - value = 1.0 - value; - - return gimp_blend_tool_editor_add_stop (blend_tool, value); -} - -static void -gimp_blend_tool_editor_line_prepare_to_remove_slider (GimpToolLine *line, - gint slider, - gboolean remove, - GimpBlendTool *blend_tool) -{ - if (remove) - { - BlendInfo *info; - GimpGradient *tentative_gradient; - - /* show a tentative gradient, demonstrating the result of actually - * removing the slider - */ - - info = blend_tool->undo_stack->data; - - if (info->added_handle == slider) - { - /* see comment in gimp_blend_tool_editor_delete_stop() */ - - gimp_assert (info->gradient != NULL); - - tentative_gradient = g_object_ref (info->gradient); - } - else - { - GimpGradientSegment *seg; - gint i; - - tentative_gradient = - GIMP_GRADIENT (gimp_data_duplicate (GIMP_DATA (blend_tool->gradient))); - - seg = gimp_blend_tool_editor_handle_get_segment (blend_tool, slider); - - i = gimp_gradient_segment_range_get_n_segments (blend_tool->gradient, - blend_tool->gradient->segments, - seg) - 1; - - seg = gimp_gradient_segment_get_nth (tentative_gradient->segments, i); - - gimp_gradient_segment_range_merge (tentative_gradient, - seg, seg->next, NULL, NULL); - } - - gimp_blend_tool_set_tentative_gradient (blend_tool, tentative_gradient); - - g_object_unref (tentative_gradient); - } - else - { - gimp_blend_tool_set_tentative_gradient (blend_tool, NULL); - } -} - -static void -gimp_blend_tool_editor_line_remove_slider (GimpToolLine *line, - gint slider, - GimpBlendTool *blend_tool) -{ - gimp_blend_tool_editor_delete_stop (blend_tool, slider); - gimp_blend_tool_set_tentative_gradient (blend_tool, NULL); -} - -static void -gimp_blend_tool_editor_line_selection_changed (GimpToolLine *line, - GimpBlendTool *blend_tool) -{ - gint selection; - - selection = - gimp_tool_line_get_selection (GIMP_TOOL_LINE (blend_tool->widget)); - - if (blend_tool->gui) - { - /* hide all color dialogs */ - gimp_color_panel_dialog_response ( - GIMP_COLOR_PANEL (blend_tool->endpoint_color_panel), - GIMP_COLOR_DIALOG_OK); - gimp_color_panel_dialog_response ( - GIMP_COLOR_PANEL (blend_tool->stop_left_color_panel), - GIMP_COLOR_DIALOG_OK); - gimp_color_panel_dialog_response ( - GIMP_COLOR_PANEL (blend_tool->stop_right_color_panel), - GIMP_COLOR_DIALOG_OK); - - /* reset the stop colors chain button */ - if (gimp_blend_tool_editor_handle_is_stop (blend_tool, selection)) - { - const GimpGradientSegment *seg; - gboolean homogeneous; - - seg = gimp_blend_tool_editor_handle_get_segment (blend_tool, - selection); - - homogeneous = seg->right_color.r == seg->next->left_color.r && - seg->right_color.g == seg->next->left_color.g && - seg->right_color.b == seg->next->left_color.b && - seg->right_color.a == seg->next->left_color.a && - seg->right_color_type == seg->next->left_color_type; - - gimp_chain_button_set_active ( - GIMP_CHAIN_BUTTON (blend_tool->stop_chain_button), homogeneous); - } - } - - gimp_blend_tool_editor_update_gui (blend_tool); -} - -static gboolean -gimp_blend_tool_editor_line_handle_clicked (GimpToolLine *line, - gint handle, - GdkModifierType state, - GimpButtonPressType press_type, - GimpBlendTool *blend_tool) -{ - if (gimp_blend_tool_editor_handle_is_midpoint (blend_tool, handle)) - { - if (press_type == GIMP_BUTTON_PRESS_DOUBLE && - gimp_blend_tool_editor_is_gradient_editable (blend_tool)) - { - gint stop; - - stop = gimp_blend_tool_editor_midpoint_to_stop (blend_tool, handle); - - gimp_tool_line_set_selection (line, stop); - - /* return FALSE, so that the new slider can be dragged immediately */ - return FALSE; - } - } - - return FALSE; -} - - -static void -gimp_blend_tool_editor_gui_response (GimpToolGui *gui, - gint response_id, - GimpBlendTool *blend_tool) -{ - switch (response_id) - { - default: - gimp_tool_line_set_selection (GIMP_TOOL_LINE (blend_tool->widget), - GIMP_TOOL_LINE_HANDLE_NONE); - break; - } -} - -static void -gimp_blend_tool_editor_color_entry_color_clicked (GimpColorButton *button, - GimpBlendTool *blend_tool) -{ - gimp_blend_tool_editor_start_edit (blend_tool); -} - -static void -gimp_blend_tool_editor_color_entry_color_changed (GimpColorButton *button, - GimpBlendTool *blend_tool) -{ - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool); - GimpPaintOptions *paint_options = GIMP_PAINT_OPTIONS (options); - gint selection; - GimpRGB color; - Direction direction; - GtkWidget *chain_button; - GimpGradientSegment *seg; - - if (gimp_blend_tool_editor_are_handlers_blocked (blend_tool)) - return; - - selection = - gimp_tool_line_get_selection (GIMP_TOOL_LINE (blend_tool->widget)); - - gimp_color_button_get_color (button, &color); - - direction = - GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), - "gimp-blend-tool-editor-direction")); - chain_button = g_object_get_data (G_OBJECT (button), - "gimp-blend-tool-editor-chain-button"); - - gimp_blend_tool_editor_start_edit (blend_tool); - gimp_blend_tool_editor_freeze_gradient (blend_tool); - - /* swap the endpoint handles, if necessary */ - if (paint_options->gradient_options->gradient_reverse) - { - switch (selection) - { - case GIMP_TOOL_LINE_HANDLE_START: - selection = GIMP_TOOL_LINE_HANDLE_END; - break; - - case GIMP_TOOL_LINE_HANDLE_END: - selection = GIMP_TOOL_LINE_HANDLE_START; - break; - } - } - - seg = gimp_blend_tool_editor_handle_get_segment (blend_tool, selection); - - switch (selection) - { - case GIMP_TOOL_LINE_HANDLE_START: - seg->left_color = color; - seg->left_color_type = GIMP_GRADIENT_COLOR_FIXED; - break; - - case GIMP_TOOL_LINE_HANDLE_END: - seg->right_color = color; - seg->right_color_type = GIMP_GRADIENT_COLOR_FIXED; - break; - - default: - if (direction == DIRECTION_LEFT || - (chain_button && - gimp_chain_button_get_active (GIMP_CHAIN_BUTTON (chain_button)))) - { - seg->right_color = color; - seg->right_color_type = GIMP_GRADIENT_COLOR_FIXED; - } - - if (direction == DIRECTION_RIGHT || - (chain_button && - gimp_chain_button_get_active (GIMP_CHAIN_BUTTON (chain_button)))) - { - seg->next->left_color = color; - seg->next->left_color_type = GIMP_GRADIENT_COLOR_FIXED; - } - } - - gimp_blend_tool_editor_thaw_gradient (blend_tool); - gimp_blend_tool_editor_end_edit (blend_tool, FALSE); -} - -static void -gimp_blend_tool_editor_color_entry_color_response (GimpColorButton *button, - GimpColorDialogState state, - GimpBlendTool *blend_tool) -{ - gimp_blend_tool_editor_end_edit (blend_tool, FALSE); -} - -static void -gimp_blend_tool_editor_color_entry_type_changed (GtkComboBox *combo, - GimpBlendTool *blend_tool) -{ - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool); - GimpPaintOptions *paint_options = GIMP_PAINT_OPTIONS (options); - gint selection; - gint color_type; - Direction direction; - GtkWidget *chain_button; - GimpGradientSegment *seg; - - if (gimp_blend_tool_editor_are_handlers_blocked (blend_tool)) - return; - - selection = - gimp_tool_line_get_selection (GIMP_TOOL_LINE (blend_tool->widget)); - - if (! gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (combo), &color_type)) - return; - - direction = - GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo), - "gimp-blend-tool-editor-direction")); - chain_button = g_object_get_data (G_OBJECT (combo), - "gimp-blend-tool-editor-chain-button"); - - gimp_blend_tool_editor_start_edit (blend_tool); - gimp_blend_tool_editor_freeze_gradient (blend_tool); - - /* swap the endpoint handles, if necessary */ - if (paint_options->gradient_options->gradient_reverse) - { - switch (selection) - { - case GIMP_TOOL_LINE_HANDLE_START: - selection = GIMP_TOOL_LINE_HANDLE_END; - break; - - case GIMP_TOOL_LINE_HANDLE_END: - selection = GIMP_TOOL_LINE_HANDLE_START; - break; - } - } - - seg = gimp_blend_tool_editor_handle_get_segment (blend_tool, selection); - - switch (selection) - { - case GIMP_TOOL_LINE_HANDLE_START: - seg->left_color_type = color_type; - break; - - case GIMP_TOOL_LINE_HANDLE_END: - seg->right_color_type = color_type; - break; - - default: - if (direction == DIRECTION_LEFT || - (chain_button && - gimp_chain_button_get_active (GIMP_CHAIN_BUTTON (chain_button)))) - { - seg->right_color_type = color_type; - } - - if (direction == DIRECTION_RIGHT || - (chain_button && - gimp_chain_button_get_active (GIMP_CHAIN_BUTTON (chain_button)))) - { - seg->next->left_color_type = color_type; - } - } - - gimp_blend_tool_editor_thaw_gradient (blend_tool); - gimp_blend_tool_editor_end_edit (blend_tool, FALSE); -} - -static void -gimp_blend_tool_editor_endpoint_se_value_changed (GimpSizeEntry *se, - GimpBlendTool *blend_tool) -{ - gint selection; - gdouble x; - gdouble y; - - if (gimp_blend_tool_editor_are_handlers_blocked (blend_tool)) - return; - - selection = - gimp_tool_line_get_selection (GIMP_TOOL_LINE (blend_tool->widget)); - - x = gimp_size_entry_get_refval (se, 0); - y = gimp_size_entry_get_refval (se, 1); - - gimp_blend_tool_editor_start_edit (blend_tool); - gimp_blend_tool_editor_block_handlers (blend_tool); - - switch (selection) - { - case GIMP_TOOL_LINE_HANDLE_START: - g_object_set (blend_tool->widget, - "x1", x, - "y1", y, - NULL); - break; - - case GIMP_TOOL_LINE_HANDLE_END: - g_object_set (blend_tool->widget, - "x2", x, - "y2", y, - NULL); - break; - - default: - gimp_assert_not_reached (); - } - - gimp_blend_tool_editor_unblock_handlers (blend_tool); - gimp_blend_tool_editor_end_edit (blend_tool, FALSE); -} - -static void -gimp_blend_tool_editor_stop_se_value_changed (GimpSizeEntry *se, - GimpBlendTool *blend_tool) -{ - gint selection; - gdouble value; - GimpGradientSegment *seg; - - if (gimp_blend_tool_editor_are_handlers_blocked (blend_tool)) - return; - - selection = - gimp_tool_line_get_selection (GIMP_TOOL_LINE (blend_tool->widget)); - - if (selection == GIMP_TOOL_LINE_HANDLE_NONE) - return; - - value = gimp_size_entry_get_refval (se, 0) / 100.0; - - gimp_blend_tool_editor_start_edit (blend_tool); - gimp_blend_tool_editor_freeze_gradient (blend_tool); - - seg = gimp_blend_tool_editor_handle_get_segment (blend_tool, selection); - - gimp_gradient_segment_range_compress (blend_tool->gradient, - seg, seg, - seg->left, value); - gimp_gradient_segment_range_compress (blend_tool->gradient, - seg->next, seg->next, - value, seg->next->right); - - gimp_blend_tool_editor_thaw_gradient (blend_tool); - gimp_blend_tool_editor_end_edit (blend_tool, FALSE); -} - -static void -gimp_blend_tool_editor_stop_delete_clicked (GtkWidget *button, - GimpBlendTool *blend_tool) -{ - gint selection; - - selection = - gimp_tool_line_get_selection (GIMP_TOOL_LINE (blend_tool->widget)); - - gimp_blend_tool_editor_delete_stop (blend_tool, selection); -} - -static void -gimp_blend_tool_editor_midpoint_se_value_changed (GimpSizeEntry *se, - GimpBlendTool *blend_tool) -{ - gint selection; - gdouble value; - GimpGradientSegment *seg; - - if (gimp_blend_tool_editor_are_handlers_blocked (blend_tool)) - return; - - selection = - gimp_tool_line_get_selection (GIMP_TOOL_LINE (blend_tool->widget)); - - if (selection == GIMP_TOOL_LINE_HANDLE_NONE) - return; - - value = gimp_size_entry_get_refval (se, 0) / 100.0; - - gimp_blend_tool_editor_start_edit (blend_tool); - gimp_blend_tool_editor_freeze_gradient (blend_tool); - - seg = gimp_blend_tool_editor_handle_get_segment (blend_tool, selection); - - seg->middle = value; - - gimp_blend_tool_editor_thaw_gradient (blend_tool); - gimp_blend_tool_editor_end_edit (blend_tool, FALSE); -} - -static void -gimp_blend_tool_editor_midpoint_type_changed (GtkComboBox *combo, - GimpBlendTool *blend_tool) -{ - gint selection; - gint type; - GimpGradientSegment *seg; - - if (gimp_blend_tool_editor_are_handlers_blocked (blend_tool)) - return; - - selection = - gimp_tool_line_get_selection (GIMP_TOOL_LINE (blend_tool->widget)); - - if (! gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (combo), &type)) - return; - - gimp_blend_tool_editor_start_edit (blend_tool); - gimp_blend_tool_editor_freeze_gradient (blend_tool); - - seg = gimp_blend_tool_editor_handle_get_segment (blend_tool, selection); - - seg->type = type; - - gimp_blend_tool_editor_thaw_gradient (blend_tool); - gimp_blend_tool_editor_end_edit (blend_tool, FALSE); -} - -static void -gimp_blend_tool_editor_midpoint_color_changed (GtkComboBox *combo, - GimpBlendTool *blend_tool) -{ - gint selection; - gint color; - GimpGradientSegment *seg; - - if (gimp_blend_tool_editor_are_handlers_blocked (blend_tool)) - return; - - selection = - gimp_tool_line_get_selection (GIMP_TOOL_LINE (blend_tool->widget)); - - if (! gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (combo), &color)) - return; - - gimp_blend_tool_editor_start_edit (blend_tool); - gimp_blend_tool_editor_freeze_gradient (blend_tool); - - seg = gimp_blend_tool_editor_handle_get_segment (blend_tool, selection); - - seg->color = color; - - gimp_blend_tool_editor_thaw_gradient (blend_tool); - gimp_blend_tool_editor_end_edit (blend_tool, FALSE); -} - -static void -gimp_blend_tool_editor_midpoint_new_stop_clicked (GtkWidget *button, - GimpBlendTool *blend_tool) -{ - gint selection; - gint stop; - - selection = - gimp_tool_line_get_selection (GIMP_TOOL_LINE (blend_tool->widget)); - - stop = gimp_blend_tool_editor_midpoint_to_stop (blend_tool, selection); - - gimp_tool_line_set_selection (GIMP_TOOL_LINE (blend_tool->widget), stop); -} - -static void -gimp_blend_tool_editor_midpoint_center_clicked (GtkWidget *button, - GimpBlendTool *blend_tool) -{ - gint selection; - GimpGradientSegment *seg; - - selection = - gimp_tool_line_get_selection (GIMP_TOOL_LINE (blend_tool->widget)); - - gimp_blend_tool_editor_start_edit (blend_tool); - gimp_blend_tool_editor_freeze_gradient (blend_tool); - - seg = gimp_blend_tool_editor_handle_get_segment (blend_tool, selection); - - gimp_gradient_segment_range_recenter_handles (blend_tool->gradient, seg, seg); - - gimp_blend_tool_editor_thaw_gradient (blend_tool); - gimp_blend_tool_editor_end_edit (blend_tool, FALSE); -} - -static gboolean -gimp_blend_tool_editor_flush_idle (GimpBlendTool *blend_tool) -{ - GimpDisplay *display = GIMP_TOOL (blend_tool)->display; - - gimp_image_flush (gimp_display_get_image (display)); - - blend_tool->flush_idle_id = 0; - - return G_SOURCE_REMOVE; -} - -static gboolean -gimp_blend_tool_editor_is_gradient_editable (GimpBlendTool *blend_tool) -{ - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool); - - return ! options->modify_active || - gimp_data_is_writable (GIMP_DATA (blend_tool->gradient)); -} - -static gboolean -gimp_blend_tool_editor_handle_is_endpoint (GimpBlendTool *blend_tool, - gint handle) -{ - return handle == GIMP_TOOL_LINE_HANDLE_START || - handle == GIMP_TOOL_LINE_HANDLE_END; -} - -static gboolean -gimp_blend_tool_editor_handle_is_stop (GimpBlendTool *blend_tool, - gint handle) -{ - gint n_sliders; - - gimp_tool_line_get_sliders (GIMP_TOOL_LINE (blend_tool->widget), &n_sliders); - - return handle >= 0 && handle < n_sliders / 2; -} - -static gboolean -gimp_blend_tool_editor_handle_is_midpoint (GimpBlendTool *blend_tool, - gint handle) -{ - gint n_sliders; - - gimp_tool_line_get_sliders (GIMP_TOOL_LINE (blend_tool->widget), &n_sliders); - - return handle >= n_sliders / 2; -} - -static GimpGradientSegment * -gimp_blend_tool_editor_handle_get_segment (GimpBlendTool *blend_tool, - gint handle) -{ - switch (handle) - { - case GIMP_TOOL_LINE_HANDLE_START: - return blend_tool->gradient->segments; - - case GIMP_TOOL_LINE_HANDLE_END: - return gimp_gradient_segment_get_last (blend_tool->gradient->segments); - - default: - { - const GimpControllerSlider *sliders; - gint n_sliders; - gint seg_i; - - sliders = gimp_tool_line_get_sliders (GIMP_TOOL_LINE (blend_tool->widget), - &n_sliders); - - gimp_assert (handle >= 0 && handle < n_sliders); - - seg_i = GPOINTER_TO_INT (sliders[handle].data); - - return gimp_gradient_segment_get_nth (blend_tool->gradient->segments, - seg_i); - } - } -} - -static void -gimp_blend_tool_editor_block_handlers (GimpBlendTool *blend_tool) -{ - blend_tool->block_handlers_count++; -} - -static void -gimp_blend_tool_editor_unblock_handlers (GimpBlendTool *blend_tool) -{ - gimp_assert (blend_tool->block_handlers_count > 0); - - blend_tool->block_handlers_count--; -} - -static gboolean -gimp_blend_tool_editor_are_handlers_blocked (GimpBlendTool *blend_tool) -{ - return blend_tool->block_handlers_count > 0; -} - -static void -gimp_blend_tool_editor_freeze_gradient (GimpBlendTool *blend_tool) -{ - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool); - GimpGradient *custom; - BlendInfo *info; - - gimp_blend_tool_editor_block_handlers (blend_tool); - - custom = gimp_gradients_get_custom (GIMP_CONTEXT (options)->gimp); - - if (blend_tool->gradient == custom || options->modify_active) - { - gimp_assert (gimp_blend_tool_editor_is_gradient_editable (blend_tool)); - - gimp_data_freeze (GIMP_DATA (blend_tool->gradient)); - } - else - { - /* copy the active gradient to the custom gradient, and make the custom - * gradient active. - */ - gimp_data_freeze (GIMP_DATA (custom)); - - gimp_data_copy (GIMP_DATA (custom), GIMP_DATA (blend_tool->gradient)); - - gimp_context_set_gradient (GIMP_CONTEXT (options), custom); - - gimp_assert (blend_tool->gradient == custom); - gimp_assert (gimp_blend_tool_editor_is_gradient_editable (blend_tool)); - } - - if (blend_tool->edit_count > 0) - { - info = blend_tool->undo_stack->data; - - if (! info->gradient) - { - info->gradient = - GIMP_GRADIENT (gimp_data_duplicate (GIMP_DATA (blend_tool->gradient))); - } - } -} - -static void -gimp_blend_tool_editor_thaw_gradient(GimpBlendTool *blend_tool) -{ - gimp_data_thaw (GIMP_DATA (blend_tool->gradient)); - - gimp_blend_tool_editor_update_sliders (blend_tool); - gimp_blend_tool_editor_update_gui (blend_tool); - - gimp_blend_tool_editor_unblock_handlers (blend_tool); -} - -static gint -gimp_blend_tool_editor_add_stop (GimpBlendTool *blend_tool, - gdouble value) -{ - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool); - GimpGradientSegment *seg; - gint stop; - BlendInfo *info; - - gimp_blend_tool_editor_start_edit (blend_tool); - gimp_blend_tool_editor_freeze_gradient (blend_tool); - - gimp_gradient_split_at (blend_tool->gradient, - GIMP_CONTEXT (options), NULL, value, &seg, NULL); - - stop = - gimp_gradient_segment_range_get_n_segments (blend_tool->gradient, - blend_tool->gradient->segments, - seg) - 1; - - info = blend_tool->undo_stack->data; - info->added_handle = stop; - - gimp_blend_tool_editor_thaw_gradient (blend_tool); - gimp_blend_tool_editor_end_edit (blend_tool, FALSE); - - return stop; -} - -static void -gimp_blend_tool_editor_delete_stop (GimpBlendTool *blend_tool, - gint slider) -{ - BlendInfo *info; - - gimp_assert (gimp_blend_tool_editor_handle_is_stop (blend_tool, slider)); - - gimp_blend_tool_editor_start_edit (blend_tool); - gimp_blend_tool_editor_freeze_gradient (blend_tool); - - info = blend_tool->undo_stack->data; - - if (info->added_handle == slider) - { - /* when removing a stop that was added as part of the current action, - * restore the original gradient at the beginning of the action, rather - * than deleting the stop from the current gradient, so that the affected - * midpoint returns to its state at the beginning of the action, instead - * of being reset. - * - * note that this assumes that the gradient hasn't changed in any other - * way during the action, which is ugly, but currently always true. - */ - - gimp_assert (info->gradient != NULL); - - gimp_data_copy (GIMP_DATA (blend_tool->gradient), - GIMP_DATA (info->gradient)); - - g_clear_object (&info->gradient); - - info->added_handle = GIMP_TOOL_LINE_HANDLE_NONE; - } - else - { - GimpGradientSegment *seg; - - seg = gimp_blend_tool_editor_handle_get_segment (blend_tool, slider); - - gimp_gradient_segment_range_merge (blend_tool->gradient, - seg, seg->next, NULL, NULL); - - info->removed_handle = slider; - } - - gimp_blend_tool_editor_thaw_gradient (blend_tool); - gimp_blend_tool_editor_end_edit (blend_tool, FALSE); -} - -static gint -gimp_blend_tool_editor_midpoint_to_stop (GimpBlendTool *blend_tool, - gint slider) -{ - const GimpControllerSlider *sliders; - - gimp_assert (gimp_blend_tool_editor_handle_is_midpoint (blend_tool, slider)); - - sliders = gimp_tool_line_get_sliders (GIMP_TOOL_LINE (blend_tool->widget), - NULL); - - if (sliders[slider].value > sliders[slider].min + EPSILON && - sliders[slider].value < sliders[slider].max - EPSILON) - { - const GimpGradientSegment *seg; - gint stop; - BlendInfo *info; - - seg = gimp_blend_tool_editor_handle_get_segment (blend_tool, slider); - - stop = gimp_blend_tool_editor_add_stop (blend_tool, seg->middle); - - info = blend_tool->undo_stack->data; - info->removed_handle = slider; - - slider = stop; - } - - return slider; -} - -static void -gimp_blend_tool_editor_update_sliders (GimpBlendTool *blend_tool) -{ - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool); - GimpPaintOptions *paint_options = GIMP_PAINT_OPTIONS (options); - gdouble offset = options->offset / 100.0; - gboolean editable; - GimpControllerSlider *sliders; - gint n_sliders; - gint n_segments; - GimpGradientSegment *seg; - GimpControllerSlider *slider; - gint i; - - if (! blend_tool->widget || options->instant) - return; - - editable = gimp_blend_tool_editor_is_gradient_editable (blend_tool); - - n_segments = gimp_gradient_segment_range_get_n_segments ( - blend_tool->gradient, blend_tool->gradient->segments, NULL); - - n_sliders = (n_segments - 1) + /* gradient stops, between each adjacent - * pair of segments */ - (n_segments); /* midpoints, inside each segment */ - - sliders = g_new (GimpControllerSlider, n_sliders); - - slider = sliders; - - /* initialize the gradient-stop sliders */ - for (seg = blend_tool->gradient->segments, i = 0; - seg->next; - seg = seg->next, i++) - { - *slider = GIMP_CONTROLLER_SLIDER_DEFAULT; - - slider->value = seg->right; - slider->min = seg->left; - slider->max = seg->next->right; - - slider->movable = editable; - slider->removable = editable; - - slider->data = GINT_TO_POINTER (i); - - slider++; - } - - /* initialize the midpoint sliders */ - for (seg = blend_tool->gradient->segments, i = 0; - seg; - seg = seg->next, i++) - { - *slider = GIMP_CONTROLLER_SLIDER_DEFAULT; - - slider->value = seg->middle; - slider->min = seg->left; - slider->max = seg->right; - - /* hide midpoints of zero-length segments, since they'd otherwise - * prevent the segment's endpoints from being selected - */ - slider->visible = fabs (slider->max - slider->min) > EPSILON; - slider->movable = editable; - - slider->autohide = TRUE; - slider->type = GIMP_HANDLE_FILLED_CIRCLE; - slider->size = 0.6; - - slider->data = GINT_TO_POINTER (i); - - slider++; - } - - /* flip the slider limits and values, if necessary */ - if (paint_options->gradient_options->gradient_reverse) - { - for (i = 0; i < n_sliders; i++) - { - gdouble temp; - - sliders[i].value = 1.0 - sliders[i].value; - temp = sliders[i].min; - sliders[i].min = 1.0 - sliders[i].max; - sliders[i].max = 1.0 - temp; - } - } - - /* adjust the sliders according to the offset */ - for (i = 0; i < n_sliders; i++) - { - sliders[i].value = (1.0 - offset) * sliders[i].value + offset; - sliders[i].min = (1.0 - offset) * sliders[i].min + offset; - sliders[i].max = (1.0 - offset) * sliders[i].max + offset; - } - - /* avoid updating the gradient in gimp_blend_tool_editor_line_changed() */ - gimp_blend_tool_editor_block_handlers (blend_tool); - - gimp_tool_line_set_sliders (GIMP_TOOL_LINE (blend_tool->widget), - sliders, n_sliders); - - gimp_blend_tool_editor_unblock_handlers (blend_tool); - - g_free (sliders); -} - -static void -gimp_blend_tool_editor_purge_gradient_history (GSList **stack) -{ - GSList *link; - - /* eliminate all history steps that modify the gradient */ - while ((link = *stack)) - { - BlendInfo *info = link->data; - - if (info->gradient) - { - gimp_blend_tool_editor_blend_info_free (info); - - *stack = g_slist_delete_link (*stack, link); - } - else - { - stack = &link->next; - } - } -} - -static void -gimp_blend_tool_editor_purge_gradient (GimpBlendTool *blend_tool) -{ - if (blend_tool->widget) - { - gimp_blend_tool_editor_update_sliders (blend_tool); - - gimp_tool_line_set_selection (GIMP_TOOL_LINE (blend_tool->widget), - GIMP_TOOL_LINE_HANDLE_NONE); - } - - gimp_blend_tool_editor_purge_gradient_history (&blend_tool->undo_stack); - gimp_blend_tool_editor_purge_gradient_history (&blend_tool->redo_stack); -} - -static GtkWidget * -gimp_blend_tool_editor_color_entry_new (GimpBlendTool *blend_tool, - const gchar *title, - Direction direction, - GtkWidget *chain_button, - GtkWidget **color_panel, - GtkWidget **type_combo) -{ - GimpContext *context = GIMP_CONTEXT (GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool)); - GtkWidget *hbox; - GtkWidget *button; - GtkWidget *combo; - GimpRGB color = {}; - - hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); - - /* the color panel */ - *color_panel = button = gimp_color_panel_new (title, &color, - GIMP_COLOR_AREA_SMALL_CHECKS, - 24, 24); - gimp_color_button_set_update (GIMP_COLOR_BUTTON (button), TRUE); - gimp_color_panel_set_context (GIMP_COLOR_PANEL (button), context); - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); - gtk_widget_show (button); - - g_object_set_data (G_OBJECT (button), - "gimp-blend-tool-editor-direction", - GINT_TO_POINTER (direction)); - g_object_set_data (G_OBJECT (button), - "gimp-blend-tool-editor-chain-button", - chain_button); - - g_signal_connect (button, "clicked", - G_CALLBACK (gimp_blend_tool_editor_color_entry_color_clicked), - blend_tool); - g_signal_connect (button, "color-changed", - G_CALLBACK (gimp_blend_tool_editor_color_entry_color_changed), - blend_tool); - g_signal_connect (button, "response", - G_CALLBACK (gimp_blend_tool_editor_color_entry_color_response), - blend_tool); - - /* the color type combo */ - *type_combo = combo = gimp_enum_combo_box_new (GIMP_TYPE_GRADIENT_COLOR); - gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, TRUE, 0); - gtk_widget_show (combo); - - g_object_set_data (G_OBJECT (combo), - "gimp-blend-tool-editor-direction", - GINT_TO_POINTER (direction)); - g_object_set_data (G_OBJECT (combo), - "gimp-blend-tool-editor-chain-button", - chain_button); - - g_signal_connect (combo, "changed", - G_CALLBACK (gimp_blend_tool_editor_color_entry_type_changed), - blend_tool); - - return hbox; -} - -static void -gimp_blend_tool_editor_init_endpoint_gui (GimpBlendTool *blend_tool) -{ - GimpDisplay *display = GIMP_TOOL (blend_tool)->display; - GimpDisplayShell *shell = gimp_display_get_shell (display); - GimpImage *image = gimp_display_get_image (display); - gdouble xres; - gdouble yres; - GtkWidget *editor; - GtkWidget *table; - GtkWidget *label; - GtkWidget *spinbutton; - GtkWidget *se; - GtkWidget *hbox; - gint row = 0; - - gimp_image_get_resolution (image, &xres, &yres); - - /* the endpoint editor */ - blend_tool->endpoint_editor = - editor = gimp_editor_new (); - gtk_box_pack_start (GTK_BOX (gimp_tool_gui_get_vbox (blend_tool->gui)), - editor, FALSE, TRUE, 0); - - /* the main table */ - table = gtk_table_new (1, 2, FALSE); - gtk_table_set_row_spacings (GTK_TABLE (table), 4); - gtk_table_set_col_spacings (GTK_TABLE (table), 4); - gtk_box_pack_start (GTK_BOX (editor), table, FALSE, TRUE, 0); - gtk_widget_show (table); - - /* the position labels */ - label = gtk_label_new (_("X:")); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, - GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); - gtk_widget_show (label); - - label = gtk_label_new (_("Y:")); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, row + 1, row + 2, - GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); - gtk_widget_show (label); - - /* the position size entry */ - spinbutton = gtk_spin_button_new_with_range (0.0, 0.0, 1.0); - gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); - gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 6); - - blend_tool->endpoint_se = - se = gimp_size_entry_new (1, GIMP_UNIT_PIXEL, "%a", - TRUE, TRUE, FALSE, 6, - GIMP_SIZE_ENTRY_UPDATE_SIZE); - gtk_table_set_row_spacings (GTK_TABLE (se), 4); - gtk_table_set_col_spacings (GTK_TABLE (se), 2); - - gimp_size_entry_add_field (GIMP_SIZE_ENTRY (se), - GTK_SPIN_BUTTON (spinbutton), NULL); - gtk_table_attach_defaults (GTK_TABLE (se), spinbutton, 1, 2, 0, 1); - gtk_widget_show (spinbutton); - - gtk_table_attach (GTK_TABLE (table), se, 1, 2, row, row + 2, - GTK_SHRINK | GTK_FILL | GTK_EXPAND, - GTK_SHRINK | GTK_FILL, - 0, 0); - gtk_widget_show (se); - - gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (se), shell->unit); - - gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (se), 0, xres, FALSE); - gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (se), 1, yres, FALSE); - - gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (se), 0, - -GIMP_MAX_IMAGE_SIZE, - GIMP_MAX_IMAGE_SIZE); - gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (se), 1, - -GIMP_MAX_IMAGE_SIZE, - GIMP_MAX_IMAGE_SIZE); - - gimp_size_entry_set_size (GIMP_SIZE_ENTRY (se), 0, - 0, gimp_image_get_width (image)); - gimp_size_entry_set_size (GIMP_SIZE_ENTRY (se), 1, - 0, gimp_image_get_height (image)); - - g_signal_connect (se, "value-changed", - G_CALLBACK (gimp_blend_tool_editor_endpoint_se_value_changed), - blend_tool); - - row += 2; - - /* the color label */ - label = gtk_label_new (_("Color:")); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, - GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); - gtk_widget_show (label); - - /* the color entry */ - hbox = gimp_blend_tool_editor_color_entry_new ( - blend_tool, _("Change Endpoint Color"), DIRECTION_NONE, NULL, - &blend_tool->endpoint_color_panel, &blend_tool->endpoint_type_combo); - gtk_table_attach (GTK_TABLE (table), hbox, 1, 2, row, row + 1, - GTK_SHRINK | GTK_FILL | GTK_EXPAND, - GTK_SHRINK | GTK_FILL, - 0, 0); - gtk_widget_show (hbox); - - row++; -} - -static void -gimp_blend_tool_editor_init_stop_gui (GimpBlendTool *blend_tool) -{ - GtkWidget *editor; - GtkWidget *table; - GtkWidget *label; - GtkWidget *se; - GtkWidget *table2; - GtkWidget *button; - GtkWidget *hbox; - GtkWidget *separator; - gint row = 0; - - /* the stop editor */ - blend_tool->stop_editor = - editor = gimp_editor_new (); - gtk_box_pack_start (GTK_BOX (gimp_tool_gui_get_vbox (blend_tool->gui)), - editor, FALSE, TRUE, 0); - - /* the main table */ - table = gtk_table_new (1, 2, FALSE); - gtk_table_set_row_spacings (GTK_TABLE (table), 4); - gtk_table_set_col_spacings (GTK_TABLE (table), 4); - gtk_box_pack_start (GTK_BOX (editor), table, FALSE, TRUE, 0); - gtk_widget_show (table); - - /* the position label */ - label = gtk_label_new (_("Position:")); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, - GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); - gtk_widget_show (label); - - /* the position size entry */ - blend_tool->stop_se = - se = gimp_size_entry_new (1, GIMP_UNIT_PERCENT, "%a", - FALSE, TRUE, FALSE, 6, - GIMP_SIZE_ENTRY_UPDATE_SIZE); - gimp_size_entry_show_unit_menu (GIMP_SIZE_ENTRY (se), FALSE); - gtk_table_attach (GTK_TABLE (table), se, 1, 2, row, row + 1, - GTK_SHRINK | GTK_FILL | GTK_EXPAND, - GTK_SHRINK | GTK_FILL, - 0, 0); - gtk_widget_show (se); - - g_signal_connect (se, "value-changed", - G_CALLBACK (gimp_blend_tool_editor_stop_se_value_changed), - blend_tool); - - row++; - - /* the color labels */ - label = gtk_label_new (_("Left color:")); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, - GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); - gtk_widget_show (label); - - label = gtk_label_new (_("Right color:")); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, row + 1, row + 2, - GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); - gtk_widget_show (label); - - /* the color entries table */ - table2 = gtk_table_new (1, 2, FALSE); - gtk_table_set_row_spacings (GTK_TABLE (table2), 4); - gtk_table_set_col_spacings (GTK_TABLE (table2), 2); - gtk_table_attach (GTK_TABLE (table), table2, 1, 2, row, row + 2, - GTK_SHRINK | GTK_FILL | GTK_EXPAND, - GTK_SHRINK | GTK_FILL, - 0, 0); - gtk_widget_show (table2); - - /* the color entries chain button */ - blend_tool->stop_chain_button = - button = gimp_chain_button_new (GIMP_CHAIN_RIGHT); - gtk_table_attach (GTK_TABLE (table2), button, 1, 2, 0, 2, - GTK_SHRINK | GTK_FILL, - GTK_SHRINK | GTK_FILL | GTK_EXPAND, - 0, 0); - gtk_widget_show (button); - - /* the color entries */ - hbox = gimp_blend_tool_editor_color_entry_new ( - blend_tool, _("Change Stop Color"), DIRECTION_LEFT, button, - &blend_tool->stop_left_color_panel, &blend_tool->stop_left_type_combo); - gtk_table_attach (GTK_TABLE (table2), hbox, 0, 1, 0, 1, - GTK_SHRINK | GTK_FILL | GTK_EXPAND, - GTK_SHRINK | GTK_FILL, - 0, 0); - gtk_widget_show (hbox); - - hbox = gimp_blend_tool_editor_color_entry_new ( - blend_tool, _("Change Stop Color"), DIRECTION_RIGHT, button, - &blend_tool->stop_right_color_panel, &blend_tool->stop_right_type_combo); - gtk_table_attach (GTK_TABLE (table2), hbox, 0, 1, 1, 2, - GTK_SHRINK | GTK_FILL | GTK_EXPAND, - GTK_SHRINK | GTK_FILL, - 0, 0); - gtk_widget_show (hbox); - - row += 2; - - /* the action buttons separator */ - separator = gtk_hseparator_new (); - gtk_table_attach (GTK_TABLE (table), separator, 0, 2, row, row + 1, - GTK_SHRINK | GTK_FILL | GTK_EXPAND, - GTK_SHRINK | GTK_FILL, - 0, 0); - gtk_widget_show (separator); - - row++; - - /* the delete button */ - gimp_editor_add_button (GIMP_EDITOR (editor), - GIMP_ICON_EDIT_DELETE, _("Delete stop"), - NULL, - G_CALLBACK (gimp_blend_tool_editor_stop_delete_clicked), - NULL, blend_tool); -} - -static void -gimp_blend_tool_editor_init_midpoint_gui (GimpBlendTool *blend_tool) -{ - GtkWidget *editor; - GtkWidget *table; - GtkWidget *label; - GtkWidget *se; - GtkWidget *combo; - GtkWidget *separator; - gint row = 0; - - /* the stop editor */ - blend_tool->midpoint_editor = - editor = gimp_editor_new (); - gtk_box_pack_start (GTK_BOX (gimp_tool_gui_get_vbox (blend_tool->gui)), - editor, FALSE, TRUE, 0); - - /* the main table */ - table = gtk_table_new (1, 2, FALSE); - gtk_table_set_row_spacings (GTK_TABLE (table), 4); - gtk_table_set_col_spacings (GTK_TABLE (table), 4); - gtk_box_pack_start (GTK_BOX (editor), table, FALSE, TRUE, 0); - gtk_widget_show (table); - - /* the position label */ - label = gtk_label_new (_("Position:")); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, - GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); - gtk_widget_show (label); - - /* the position size entry */ - blend_tool->midpoint_se = - se = gimp_size_entry_new (1, GIMP_UNIT_PERCENT, "%a", - FALSE, TRUE, FALSE, 6, - GIMP_SIZE_ENTRY_UPDATE_SIZE); - gimp_size_entry_show_unit_menu (GIMP_SIZE_ENTRY (se), FALSE); - gtk_table_attach (GTK_TABLE (table), se, 1, 2, row, row + 1, - GTK_SHRINK | GTK_FILL | GTK_EXPAND, - GTK_SHRINK | GTK_FILL, - 0, 0); - gtk_widget_show (se); - - g_signal_connect (se, "value-changed", - G_CALLBACK (gimp_blend_tool_editor_midpoint_se_value_changed), - blend_tool); - - row++; - - /* the type label */ - label = gtk_label_new (_("Blending:")); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, - GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); - gtk_widget_show (label); - - /* the type combo */ - blend_tool->midpoint_type_combo = - combo = gimp_enum_combo_box_new (GIMP_TYPE_GRADIENT_SEGMENT_TYPE); - gtk_table_attach (GTK_TABLE (table), combo, 1, 2, row, row + 1, - GTK_SHRINK | GTK_FILL | GTK_EXPAND, - GTK_SHRINK | GTK_FILL, - 0, 0); - gtk_widget_show (combo); - - g_signal_connect (combo, "changed", - G_CALLBACK (gimp_blend_tool_editor_midpoint_type_changed), - blend_tool); - - row++; - - /* the color label */ - label = gtk_label_new (_("Coloring:")); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, - GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); - gtk_widget_show (label); - - /* the color combo */ - blend_tool->midpoint_color_combo = - combo = gimp_enum_combo_box_new (GIMP_TYPE_GRADIENT_SEGMENT_COLOR); - gtk_table_attach (GTK_TABLE (table), combo, 1, 2, row, row + 1, - GTK_SHRINK | GTK_FILL | GTK_EXPAND, - GTK_SHRINK | GTK_FILL, - 0, 0); - gtk_widget_show (combo); - - g_signal_connect (combo, "changed", - G_CALLBACK (gimp_blend_tool_editor_midpoint_color_changed), - blend_tool); - - row++; - - /* the action buttons separator */ - separator = gtk_hseparator_new (); - gtk_table_attach (GTK_TABLE (table), separator, 0, 2, row, row + 1, - GTK_SHRINK | GTK_FILL | GTK_EXPAND, - GTK_SHRINK | GTK_FILL, - 0, 0); - gtk_widget_show (separator); - - row++; - - /* the new stop button */ - blend_tool->midpoint_new_stop_button = - gimp_editor_add_button (GIMP_EDITOR (editor), - GIMP_ICON_DOCUMENT_NEW, _("New stop at midpoint"), - NULL, - G_CALLBACK (gimp_blend_tool_editor_midpoint_new_stop_clicked), - NULL, blend_tool); - - /* the center button */ - blend_tool->midpoint_center_button = - gimp_editor_add_button (GIMP_EDITOR (editor), - GIMP_ICON_CENTER_HORIZONTAL, _("Center midpoint"), - NULL, - G_CALLBACK (gimp_blend_tool_editor_midpoint_center_clicked), - NULL, blend_tool); -} - -static void -gimp_blend_tool_editor_update_endpoint_gui (GimpBlendTool *blend_tool, - gint selection) -{ - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool); - GimpPaintOptions *paint_options = GIMP_PAINT_OPTIONS (options); - GimpContext *context = GIMP_CONTEXT (options); - gboolean editable; - GimpGradientSegment *seg; - const gchar *title; - gdouble x; - gdouble y; - GimpRGB color; - GimpGradientColor color_type; - - editable = gimp_blend_tool_editor_is_gradient_editable (blend_tool); - - switch (selection) - { - case GIMP_TOOL_LINE_HANDLE_START: - g_object_get (blend_tool->widget, - "x1", &x, - "y1", &y, - NULL); - break; - - case GIMP_TOOL_LINE_HANDLE_END: - g_object_get (blend_tool->widget, - "x2", &x, - "y2", &y, - NULL); - break; - - default: - gimp_assert_not_reached (); - } - - /* swap the endpoint handles, if necessary */ - if (paint_options->gradient_options->gradient_reverse) - { - switch (selection) - { - case GIMP_TOOL_LINE_HANDLE_START: - selection = GIMP_TOOL_LINE_HANDLE_END; - break; - - case GIMP_TOOL_LINE_HANDLE_END: - selection = GIMP_TOOL_LINE_HANDLE_START; - break; - } - } - - seg = gimp_blend_tool_editor_handle_get_segment (blend_tool, selection); - - switch (selection) - { - case GIMP_TOOL_LINE_HANDLE_START: - title = _("Start Endpoint"); - - gimp_gradient_segment_get_left_flat_color (blend_tool->gradient, context, - seg, &color); - color_type = seg->left_color_type; - break; - - case GIMP_TOOL_LINE_HANDLE_END: - title = _("End Endpoint"); - - gimp_gradient_segment_get_right_flat_color (blend_tool->gradient, context, - seg, &color); - color_type = seg->right_color_type; - break; - - default: - gimp_assert_not_reached (); - } - - gimp_tool_gui_set_title (blend_tool->gui, title); - - gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (blend_tool->endpoint_se), 0, x); - gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (blend_tool->endpoint_se), 1, y); - - gimp_color_button_set_color ( - GIMP_COLOR_BUTTON (blend_tool->endpoint_color_panel), &color); - gimp_int_combo_box_set_active ( - GIMP_INT_COMBO_BOX (blend_tool->endpoint_type_combo), color_type); - - gtk_widget_set_sensitive (blend_tool->endpoint_color_panel, editable); - gtk_widget_set_sensitive (blend_tool->endpoint_type_combo, editable); - - gtk_widget_show (blend_tool->endpoint_editor); -} - -static void -gimp_blend_tool_editor_update_stop_gui (GimpBlendTool *blend_tool, - gint selection) -{ - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool); - GimpContext *context = GIMP_CONTEXT (options); - gboolean editable; - GimpGradientSegment *seg; - gint index; - gchar *title; - gdouble min; - gdouble max; - gdouble value; - GimpRGB left_color; - GimpGradientColor left_color_type; - GimpRGB right_color; - GimpGradientColor right_color_type; - - editable = gimp_blend_tool_editor_is_gradient_editable (blend_tool); - - seg = gimp_blend_tool_editor_handle_get_segment (blend_tool, selection); - - index = GPOINTER_TO_INT ( - gimp_tool_line_get_sliders (GIMP_TOOL_LINE (blend_tool->widget), - NULL)[selection].data); - - title = g_strdup_printf (_("Stop %d"), index + 1); - - min = seg->left; - max = seg->next->right; - value = seg->right; - - gimp_gradient_segment_get_right_flat_color (blend_tool->gradient, context, - seg, &left_color); - left_color_type = seg->right_color_type; - - gimp_gradient_segment_get_left_flat_color (blend_tool->gradient, context, - seg->next, &right_color); - right_color_type = seg->next->left_color_type; - - gimp_tool_gui_set_title (blend_tool->gui, title); - - gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (blend_tool->stop_se), - 0, 100.0 * min, 100.0 * max); - gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (blend_tool->stop_se), - 0, 100.0 * value); - - gimp_color_button_set_color ( - GIMP_COLOR_BUTTON (blend_tool->stop_left_color_panel), &left_color); - gimp_int_combo_box_set_active ( - GIMP_INT_COMBO_BOX (blend_tool->stop_left_type_combo), left_color_type); - - gimp_color_button_set_color ( - GIMP_COLOR_BUTTON (blend_tool->stop_right_color_panel), &right_color); - gimp_int_combo_box_set_active ( - GIMP_INT_COMBO_BOX (blend_tool->stop_right_type_combo), right_color_type); - - gtk_widget_set_sensitive (blend_tool->stop_se, editable); - gtk_widget_set_sensitive (blend_tool->stop_left_color_panel, editable); - gtk_widget_set_sensitive (blend_tool->stop_left_type_combo, editable); - gtk_widget_set_sensitive (blend_tool->stop_right_color_panel, editable); - gtk_widget_set_sensitive (blend_tool->stop_right_type_combo, editable); - gtk_widget_set_sensitive (blend_tool->stop_chain_button, editable); - gtk_widget_set_sensitive ( - GTK_WIDGET (gimp_editor_get_button_box (GIMP_EDITOR (blend_tool->stop_editor))), - editable); - - g_free (title); - - gtk_widget_show (blend_tool->stop_editor); -} - -static void -gimp_blend_tool_editor_update_midpoint_gui (GimpBlendTool *blend_tool, - gint selection) -{ - gboolean editable; - const GimpGradientSegment *seg; - gint index; - gchar *title; - gdouble min; - gdouble max; - gdouble value; - GimpGradientSegmentType type; - GimpGradientSegmentColor color; - - editable = gimp_blend_tool_editor_is_gradient_editable (blend_tool); - - seg = gimp_blend_tool_editor_handle_get_segment (blend_tool, selection); - - index = GPOINTER_TO_INT ( - gimp_tool_line_get_sliders (GIMP_TOOL_LINE (blend_tool->widget), - NULL)[selection].data); - - title = g_strdup_printf (_("Midpoint %d"), index + 1); - - min = seg->left; - max = seg->right; - value = seg->middle; - type = seg->type; - color = seg->color; - - gimp_tool_gui_set_title (blend_tool->gui, title); - - gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (blend_tool->midpoint_se), - 0, 100.0 * min, 100.0 * max); - gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (blend_tool->midpoint_se), - 0, 100.0 * value); - - gimp_int_combo_box_set_active ( - GIMP_INT_COMBO_BOX (blend_tool->midpoint_type_combo), type); - - gimp_int_combo_box_set_active ( - GIMP_INT_COMBO_BOX (blend_tool->midpoint_color_combo), color); - - gtk_widget_set_sensitive (blend_tool->midpoint_new_stop_button, - value > min + EPSILON && value < max - EPSILON); - gtk_widget_set_sensitive (blend_tool->midpoint_center_button, - fabs (value - (min + max) / 2.0) > EPSILON); - - gtk_widget_set_sensitive (blend_tool->midpoint_se, editable); - gtk_widget_set_sensitive (blend_tool->midpoint_type_combo, editable); - gtk_widget_set_sensitive (blend_tool->midpoint_color_combo, editable); - gtk_widget_set_sensitive ( - GTK_WIDGET (gimp_editor_get_button_box (GIMP_EDITOR (blend_tool->midpoint_editor))), - editable); - - g_free (title); - - gtk_widget_show (blend_tool->midpoint_editor); -} - -static void -gimp_blend_tool_editor_update_gui (GimpBlendTool *blend_tool) -{ - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool); - - if (blend_tool->gradient && blend_tool->widget && ! options->instant) - { - gint selection; - - selection = - gimp_tool_line_get_selection (GIMP_TOOL_LINE (blend_tool->widget)); - - if (selection != GIMP_TOOL_LINE_HANDLE_NONE) - { - if (! blend_tool->gui) - { - GimpDisplayShell *shell; - - shell = gimp_tool_widget_get_shell (blend_tool->widget); - - blend_tool->gui = - gimp_tool_gui_new (GIMP_TOOL (blend_tool)->tool_info, - NULL, NULL, NULL, NULL, - gtk_widget_get_screen (GTK_WIDGET (shell)), - gimp_widget_get_monitor (GTK_WIDGET (shell)), - TRUE, - - _("_Close"), GTK_RESPONSE_CLOSE, - - NULL); - - gimp_tool_gui_set_shell (blend_tool->gui, shell); - gimp_tool_gui_set_viewable (blend_tool->gui, - GIMP_VIEWABLE (blend_tool->gradient)); - gimp_tool_gui_set_auto_overlay (blend_tool->gui, TRUE); - - g_signal_connect (blend_tool->gui, "response", - G_CALLBACK (gimp_blend_tool_editor_gui_response), - blend_tool); - - gimp_blend_tool_editor_init_endpoint_gui (blend_tool); - gimp_blend_tool_editor_init_stop_gui (blend_tool); - gimp_blend_tool_editor_init_midpoint_gui (blend_tool); - } - - gimp_blend_tool_editor_block_handlers (blend_tool); - - if (gimp_blend_tool_editor_handle_is_endpoint (blend_tool, selection)) - gimp_blend_tool_editor_update_endpoint_gui (blend_tool, selection); - else - gtk_widget_hide (blend_tool->endpoint_editor); - - if (gimp_blend_tool_editor_handle_is_stop (blend_tool, selection)) - gimp_blend_tool_editor_update_stop_gui (blend_tool, selection); - else - gtk_widget_hide (blend_tool->stop_editor); - - if (gimp_blend_tool_editor_handle_is_midpoint (blend_tool, selection)) - gimp_blend_tool_editor_update_midpoint_gui (blend_tool, selection); - else - gtk_widget_hide (blend_tool->midpoint_editor); - - gimp_blend_tool_editor_unblock_handlers (blend_tool); - - gimp_tool_gui_show (blend_tool->gui); - - return; - } - } - - if (blend_tool->gui) - gimp_tool_gui_hide (blend_tool->gui); -} - -static BlendInfo * -gimp_blend_tool_editor_blend_info_new (GimpBlendTool *blend_tool) -{ - BlendInfo *info = g_slice_new (BlendInfo); - - info->start_x = blend_tool->start_x; - info->start_y = blend_tool->start_y; - info->end_x = blend_tool->end_x; - info->end_y = blend_tool->end_y; - - info->gradient = NULL; - - info->added_handle = GIMP_TOOL_LINE_HANDLE_NONE; - info->removed_handle = GIMP_TOOL_LINE_HANDLE_NONE; - info->selected_handle = GIMP_TOOL_LINE_HANDLE_NONE; - - return info; -} - -static void -gimp_blend_tool_editor_blend_info_free (BlendInfo *info) -{ - if (info->gradient) - g_object_unref (info->gradient); - - g_slice_free (BlendInfo, info); -} - -static void -gimp_blend_tool_editor_blend_info_apply (GimpBlendTool *blend_tool, - const BlendInfo *info, - gboolean set_selection) -{ - gint selection; - - gimp_assert (blend_tool->widget != NULL); - gimp_assert (blend_tool->gradient != NULL); - - /* pick the handle to select */ - if (info->gradient) - { - if (info->removed_handle != GIMP_TOOL_LINE_HANDLE_NONE) - { - /* we're undoing a stop-deletion or midpoint-to-stop operation; - * select the removed handle - */ - selection = info->removed_handle; - } - else if (info->added_handle != GIMP_TOOL_LINE_HANDLE_NONE) - { - /* we're undoing a stop addition operation */ - gimp_assert (gimp_blend_tool_editor_handle_is_stop (blend_tool, - info->added_handle)); - - selection = - gimp_tool_line_get_selection (GIMP_TOOL_LINE (blend_tool->widget)); - - /* if the selected handle is a stop... */ - if (gimp_blend_tool_editor_handle_is_stop (blend_tool, selection)) - { - /* if the added handle is selected, clear the selection */ - if (selection == info->added_handle) - selection = GIMP_TOOL_LINE_HANDLE_NONE; - /* otherwise, keep the currently selected stop, possibly - * adjusting its handle index - */ - else if (selection > info->added_handle) - selection--; - } - /* otherwise, if the selected handle is a midpoint... */ - else if (gimp_blend_tool_editor_handle_is_midpoint (blend_tool, selection)) - { - const GimpControllerSlider *sliders; - gint seg_i; - - sliders = - gimp_tool_line_get_sliders (GIMP_TOOL_LINE (blend_tool->widget), - NULL); - - seg_i = GPOINTER_TO_INT (sliders[selection].data); - - /* if the midpoint belongs to one of the two segments incident to - * the added stop, clear the selection - */ - if (seg_i == info->added_handle || - seg_i == info->added_handle + 1) - { - selection = GIMP_TOOL_LINE_HANDLE_NONE; - } - /* otherwise, keep the currently selected stop, adjusting its - * handle index - */ - else - { - /* midpoint handles follow stop handles; since we removed a - * stop, we must decrement the handle index - */ - selection--; - - if (seg_i > info->added_handle) - selection--; - } - } - /* otherwise, don't change the selection */ - else - { - set_selection = FALSE; - } - } - else if (info->selected_handle != GIMP_TOOL_LINE_HANDLE_NONE) - { - /* we're undoing a property change operation; select the handle - * corresponding to the affected object - */ - selection = info->selected_handle; - } - else - { - /* something went wrong... */ - g_warn_if_reached (); - - set_selection = FALSE; - } - } - else if ((info->start_x != blend_tool->start_x || - info->start_y != blend_tool->start_y) && - (info->end_x == blend_tool->end_x && - info->end_y == blend_tool->end_y)) - { - /* we're undoing a start-endpoint move operation; select the start - * endpoint - */ - selection = GIMP_TOOL_LINE_HANDLE_START; - } - else if ((info->end_x != blend_tool->end_x || - info->end_y != blend_tool->end_y) && - (info->start_x == blend_tool->start_x && - info->start_y == blend_tool->start_y)) - - { - /* we're undoing am end-endpoint move operation; select the end - * endpoint - */ - selection = GIMP_TOOL_LINE_HANDLE_END; - } - else - { - /* we're undoing a line move operation; don't change the selection */ - set_selection = FALSE; - } - - gimp_blend_tool_editor_block_handlers (blend_tool); - - g_object_set (blend_tool->widget, - "x1", info->start_x, - "y1", info->start_y, - "x2", info->end_x, - "y2", info->end_y, - NULL); - - if (info->gradient) - { - gimp_blend_tool_editor_freeze_gradient (blend_tool); - - gimp_data_copy (GIMP_DATA (blend_tool->gradient), - GIMP_DATA (info->gradient)); - - gimp_blend_tool_editor_thaw_gradient (blend_tool); - } - - if (set_selection) - { - gimp_tool_line_set_selection (GIMP_TOOL_LINE (blend_tool->widget), - selection); - } - - gimp_blend_tool_editor_update_gui (blend_tool); - - gimp_blend_tool_editor_unblock_handlers (blend_tool); -} - -static gboolean -gimp_blend_tool_editor_blend_info_is_trivial (GimpBlendTool *blend_tool, - const BlendInfo *info) -{ - const GimpGradientSegment *seg1; - const GimpGradientSegment *seg2; - - if (info->start_x != blend_tool->start_x || - info->start_y != blend_tool->start_y || - info->end_x != blend_tool->end_x || - info->end_y != blend_tool->end_y) - { - return FALSE; - } - - if (info->gradient) - { - for (seg1 = info->gradient->segments, seg2 = blend_tool->gradient->segments; - seg1 && seg2; - seg1 = seg1->next, seg2 = seg2->next) - { - if (memcmp (seg1, seg2, G_STRUCT_OFFSET (GimpGradientSegment, prev))) - return FALSE; - } - - if (seg1 || seg2) - return FALSE; - } - - return TRUE; -} - - -/* public functions */ - - -void -gimp_blend_tool_editor_options_notify (GimpBlendTool *blend_tool, - GimpToolOptions *options, - const GParamSpec *pspec) -{ - if (! strcmp (pspec->name, "modify-active")) - { - gimp_blend_tool_editor_update_sliders (blend_tool); - gimp_blend_tool_editor_update_gui (blend_tool); - } - else if (! strcmp (pspec->name, "gradient-reverse")) - { - gimp_blend_tool_editor_update_sliders (blend_tool); - - /* if an endpoint is selected, swap the selected endpoint */ - if (blend_tool->widget) - { - gint selection; - - selection = - gimp_tool_line_get_selection (GIMP_TOOL_LINE (blend_tool->widget)); - - switch (selection) - { - case GIMP_TOOL_LINE_HANDLE_START: - gimp_tool_line_set_selection (GIMP_TOOL_LINE (blend_tool->widget), - GIMP_TOOL_LINE_HANDLE_END); - break; - - case GIMP_TOOL_LINE_HANDLE_END: - gimp_tool_line_set_selection (GIMP_TOOL_LINE (blend_tool->widget), - GIMP_TOOL_LINE_HANDLE_START); - break; - } - } - } - else if (blend_tool->render_node && - gegl_node_find_property (blend_tool->render_node, pspec->name)) - { - gimp_blend_tool_editor_update_sliders (blend_tool); - } -} - -void -gimp_blend_tool_editor_start (GimpBlendTool *blend_tool) -{ - g_signal_connect (blend_tool->widget, "can-add-slider", - G_CALLBACK (gimp_blend_tool_editor_line_can_add_slider), - blend_tool); - g_signal_connect (blend_tool->widget, "add-slider", - G_CALLBACK (gimp_blend_tool_editor_line_add_slider), - blend_tool); - g_signal_connect (blend_tool->widget, "prepare-to-remove-slider", - G_CALLBACK (gimp_blend_tool_editor_line_prepare_to_remove_slider), - blend_tool); - g_signal_connect (blend_tool->widget, "remove-slider", - G_CALLBACK (gimp_blend_tool_editor_line_remove_slider), - blend_tool); - g_signal_connect (blend_tool->widget, "selection-changed", - G_CALLBACK (gimp_blend_tool_editor_line_selection_changed), - blend_tool); - g_signal_connect (blend_tool->widget, "handle-clicked", - G_CALLBACK (gimp_blend_tool_editor_line_handle_clicked), - blend_tool); -} - -void -gimp_blend_tool_editor_halt (GimpBlendTool *blend_tool) -{ - g_clear_object (&blend_tool->gui); - - blend_tool->edit_count = 0; - - if (blend_tool->undo_stack) - { - g_slist_free_full (blend_tool->undo_stack, - (GDestroyNotify) gimp_blend_tool_editor_blend_info_free); - blend_tool->undo_stack = NULL; - } - - if (blend_tool->redo_stack) - { - g_slist_free_full (blend_tool->redo_stack, - (GDestroyNotify) gimp_blend_tool_editor_blend_info_free); - blend_tool->redo_stack = NULL; - } - - if (blend_tool->flush_idle_id) - { - g_source_remove (blend_tool->flush_idle_id); - blend_tool->flush_idle_id = 0; - } -} - -gboolean -gimp_blend_tool_editor_line_changed (GimpBlendTool *blend_tool) -{ - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool); - GimpPaintOptions *paint_options = GIMP_PAINT_OPTIONS (options); - gdouble offset = options->offset / 100.0; - const GimpControllerSlider *sliders; - gint n_sliders; - gint i; - GimpGradientSegment *seg; - gboolean changed = FALSE; - - if (gimp_blend_tool_editor_are_handlers_blocked (blend_tool)) - return FALSE; - - if (! blend_tool->gradient || offset == 1.0) - return FALSE; - - sliders = gimp_tool_line_get_sliders (GIMP_TOOL_LINE (blend_tool->widget), - &n_sliders); - - if (n_sliders == 0) - return FALSE; - - /* update the midpoints first, since moving the gradient stops may change the - * gradient's midpoints w.r.t. the sliders, but not the other way around. - */ - for (seg = blend_tool->gradient->segments, i = n_sliders / 2; - seg; - seg = seg->next, i++) - { - gdouble value; - - value = sliders[i].value; - - /* adjust slider value according to the offset */ - value = (value - offset) / (1.0 - offset); - - /* flip the slider value, if necessary */ - if (paint_options->gradient_options->gradient_reverse) - value = 1.0 - value; - - if (fabs (value - seg->middle) > EPSILON) - { - if (! changed) - { - gimp_blend_tool_editor_start_edit (blend_tool); - gimp_blend_tool_editor_freeze_gradient (blend_tool); - - /* refetch the segment, since the gradient might have changed */ - seg = gimp_blend_tool_editor_handle_get_segment (blend_tool, i); - - changed = TRUE; - } - - seg->middle = value; - } - } - - /* update the gradient stops */ - for (seg = blend_tool->gradient->segments, i = 0; - seg->next; - seg = seg->next, i++) - { - gdouble value; - - value = sliders[i].value; - - /* adjust slider value according to the offset */ - value = (value - offset) / (1.0 - offset); - - /* flip the slider value, if necessary */ - if (paint_options->gradient_options->gradient_reverse) - value = 1.0 - value; - - if (fabs (value - seg->right) > EPSILON) - { - if (! changed) - { - gimp_blend_tool_editor_start_edit (blend_tool); - gimp_blend_tool_editor_freeze_gradient (blend_tool); - - /* refetch the segment, since the gradient might have changed */ - seg = gimp_blend_tool_editor_handle_get_segment (blend_tool, i); - - changed = TRUE; - } - - gimp_gradient_segment_range_compress (blend_tool->gradient, - seg, seg, - seg->left, value); - gimp_gradient_segment_range_compress (blend_tool->gradient, - seg->next, seg->next, - value, seg->next->right); - } - } - - if (changed) - { - gimp_blend_tool_editor_thaw_gradient (blend_tool); - gimp_blend_tool_editor_end_edit (blend_tool, FALSE); - } - - gimp_blend_tool_editor_update_gui (blend_tool); - - return changed; -} - -void -gimp_blend_tool_editor_fg_bg_changed (GimpBlendTool *blend_tool) -{ - gimp_blend_tool_editor_update_gui (blend_tool); -} - -void -gimp_blend_tool_editor_gradient_dirty (GimpBlendTool *blend_tool) -{ - if (gimp_blend_tool_editor_are_handlers_blocked (blend_tool)) - return; - - gimp_blend_tool_editor_purge_gradient (blend_tool); -} - -void -gimp_blend_tool_editor_gradient_changed (GimpBlendTool *blend_tool) -{ - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool); - GimpContext *context = GIMP_CONTEXT (options); - - if (options->modify_active_frame) - { - gtk_widget_set_sensitive (options->modify_active_frame, - blend_tool->gradient != - gimp_gradients_get_custom (context->gimp)); - } - - if (options->modify_active_hint) - { - gtk_widget_set_visible (options->modify_active_hint, - blend_tool->gradient && - ! gimp_data_is_writable (GIMP_DATA (blend_tool->gradient))); - } - - if (gimp_blend_tool_editor_are_handlers_blocked (blend_tool)) - return; - - gimp_blend_tool_editor_purge_gradient (blend_tool); -} - -const gchar * -gimp_blend_tool_editor_can_undo (GimpBlendTool *blend_tool) -{ - if (! blend_tool->undo_stack || blend_tool->edit_count > 0) - return NULL; - - return _("Blend Step"); -} - -const gchar * -gimp_blend_tool_editor_can_redo (GimpBlendTool *blend_tool) -{ - if (! blend_tool->redo_stack || blend_tool->edit_count > 0) - return NULL; - - return _("Blend Step"); -} - -gboolean -gimp_blend_tool_editor_undo (GimpBlendTool *blend_tool) -{ - GimpTool *tool = GIMP_TOOL (blend_tool); - BlendInfo *info; - BlendInfo *new_info; - - gimp_assert (blend_tool->undo_stack != NULL); - gimp_assert (blend_tool->edit_count == 0); - - info = blend_tool->undo_stack->data; - - new_info = gimp_blend_tool_editor_blend_info_new (blend_tool); - - if (info->gradient) - { - new_info->gradient = - GIMP_GRADIENT (gimp_data_duplicate (GIMP_DATA (blend_tool->gradient))); - - /* swap the added and removed handles, so that blend_info_apply() does - * the right thing on redo - */ - new_info->added_handle = info->removed_handle; - new_info->removed_handle = info->added_handle; - new_info->selected_handle = info->selected_handle; - } - - blend_tool->undo_stack = g_slist_remove (blend_tool->undo_stack, info); - blend_tool->redo_stack = g_slist_prepend (blend_tool->redo_stack, new_info); - - gimp_blend_tool_editor_blend_info_apply (blend_tool, info, TRUE); - gimp_blend_tool_editor_blend_info_free (info); - - /* the initial state of the blend tool is not useful; we might as well halt */ - if (! blend_tool->undo_stack) - gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display); - - return TRUE; -} - -gboolean -gimp_blend_tool_editor_redo (GimpBlendTool *blend_tool) -{ - BlendInfo *info; - BlendInfo *new_info; - - gimp_assert (blend_tool->redo_stack != NULL); - gimp_assert (blend_tool->edit_count == 0); - - info = blend_tool->redo_stack->data; - - new_info = gimp_blend_tool_editor_blend_info_new (blend_tool); - - if (info->gradient) - { - new_info->gradient = - GIMP_GRADIENT (gimp_data_duplicate (GIMP_DATA (blend_tool->gradient))); - - /* swap the added and removed handles, so that blend_info_apply() does - * the right thing on undo - */ - new_info->added_handle = info->removed_handle; - new_info->removed_handle = info->added_handle; - new_info->selected_handle = info->selected_handle; - } - - blend_tool->redo_stack = g_slist_remove (blend_tool->redo_stack, info); - blend_tool->undo_stack = g_slist_prepend (blend_tool->undo_stack, new_info); - - gimp_blend_tool_editor_blend_info_apply (blend_tool, info, TRUE); - gimp_blend_tool_editor_blend_info_free (info); - - return TRUE; -} - -void -gimp_blend_tool_editor_start_edit (GimpBlendTool *blend_tool) -{ - if (blend_tool->edit_count++ == 0) - { - BlendInfo *info; - - info = gimp_blend_tool_editor_blend_info_new (blend_tool); - - blend_tool->undo_stack = g_slist_prepend (blend_tool->undo_stack, info); - - /* update the undo actions / menu items */ - if (! blend_tool->flush_idle_id) - { - blend_tool->flush_idle_id = - g_idle_add ((GSourceFunc) gimp_blend_tool_editor_flush_idle, - blend_tool); - } - } -} - -void -gimp_blend_tool_editor_end_edit (GimpBlendTool *blend_tool, - gboolean cancel) -{ - /* can happen when halting using esc */ - if (blend_tool->edit_count == 0) - return; - - if (--blend_tool->edit_count == 0) - { - BlendInfo *info = blend_tool->undo_stack->data; - - info->selected_handle = - gimp_tool_line_get_selection (GIMP_TOOL_LINE (blend_tool->widget)); - - if (cancel || - gimp_blend_tool_editor_blend_info_is_trivial (blend_tool, info)) - { - /* if the edit is canceled, or if nothing changed, undo the last - * step - */ - gimp_blend_tool_editor_blend_info_apply (blend_tool, info, FALSE); - - blend_tool->undo_stack = g_slist_remove (blend_tool->undo_stack, - info); - gimp_blend_tool_editor_blend_info_free (info); - } - else - { - /* otherwise, blow the redo stack */ - g_slist_free_full (blend_tool->redo_stack, - (GDestroyNotify) gimp_blend_tool_editor_blend_info_free); - blend_tool->redo_stack = NULL; - } - - /* update the undo actions / menu items */ - if (! blend_tool->flush_idle_id) - { - blend_tool->flush_idle_id = - g_idle_add ((GSourceFunc) gimp_blend_tool_editor_flush_idle, - blend_tool); - } - } -} diff --git a/app/tools/gimpblendtool-editor.h b/app/tools/gimpblendtool-editor.h deleted file mode 100644 index 33883716c3..0000000000 --- a/app/tools/gimpblendtool-editor.h +++ /dev/null @@ -1,48 +0,0 @@ -/* GIMP - The GNU Image Manipulation Program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __GIMP_BLEND_TOOL_EDITOR_H__ -#define __GIMP_BLEND_TOOL_EDITOR_H__ - - -void gimp_blend_tool_editor_options_notify (GimpBlendTool *blend_tool, - GimpToolOptions *options, - const GParamSpec *pspec); - -void gimp_blend_tool_editor_start (GimpBlendTool *blend_tool); -void gimp_blend_tool_editor_halt (GimpBlendTool *blend_tool); - -gboolean gimp_blend_tool_editor_line_changed (GimpBlendTool *blend_tool); - -void gimp_blend_tool_editor_fg_bg_changed (GimpBlendTool *blend_tool); - -void gimp_blend_tool_editor_gradient_dirty (GimpBlendTool *blend_tool); - -void gimp_blend_tool_editor_gradient_changed (GimpBlendTool *blend_tool); - -const gchar * gimp_blend_tool_editor_can_undo (GimpBlendTool *blend_tool); -const gchar * gimp_blend_tool_editor_can_redo (GimpBlendTool *blend_tool); - -gboolean gimp_blend_tool_editor_undo (GimpBlendTool *blend_tool); -gboolean gimp_blend_tool_editor_redo (GimpBlendTool *blend_tool); - -void gimp_blend_tool_editor_start_edit (GimpBlendTool *blend_tool); -void gimp_blend_tool_editor_end_edit (GimpBlendTool *blend_tool, - gboolean cancel); - - -#endif /* __GIMP_BLEND_TOOL_EDITOR_H__ */ diff --git a/app/tools/gimpblendtool.c b/app/tools/gimpblendtool.c deleted file mode 100644 index 27e73b44ee..0000000000 --- a/app/tools/gimpblendtool.c +++ /dev/null @@ -1,1072 +0,0 @@ -/* GIMP - The GNU Image Manipulation Program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * Major improvements for interactivity - * Copyright (C) 2014 Michael Henning - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "config.h" - -#include -#include -#include - -#include "libgimpwidgets/gimpwidgets.h" - -#include "tools-types.h" - -#include "operations/gimp-operation-config.h" - -#include "core/gimpdrawable.h" -#include "core/gimpdrawable-blend.h" -#include "core/gimpdrawablefilter.h" -#include "core/gimperror.h" -#include "core/gimpgradient.h" -#include "core/gimpimage.h" -#include "core/gimpprogress.h" -#include "core/gimpprojection.h" - -#include "widgets/gimphelp-ids.h" -#include "widgets/gimpwidgets-utils.h" - -#include "display/gimpdisplay.h" -#include "display/gimptoolline.h" - -#include "gimpblendoptions.h" -#include "gimpblendtool.h" -#include "gimpblendtool-editor.h" -#include "gimptoolcontrol.h" - -#include "gimp-intl.h" - - -/* local function prototypes */ - -static void gimp_blend_tool_dispose (GObject *object); - -static gboolean gimp_blend_tool_initialize (GimpTool *tool, - GimpDisplay *display, - GError **error); -static void gimp_blend_tool_control (GimpTool *tool, - GimpToolAction action, - GimpDisplay *display); -static void gimp_blend_tool_button_press (GimpTool *tool, - const GimpCoords *coords, - guint32 time, - GdkModifierType state, - GimpButtonPressType press_type, - GimpDisplay *display); -static void gimp_blend_tool_button_release (GimpTool *tool, - const GimpCoords *coords, - guint32 time, - GdkModifierType state, - GimpButtonReleaseType release_type, - GimpDisplay *display); -static void gimp_blend_tool_motion (GimpTool *tool, - const GimpCoords *coords, - guint32 time, - GdkModifierType state, - GimpDisplay *display); -static gboolean gimp_blend_tool_key_press (GimpTool *tool, - GdkEventKey *kevent, - GimpDisplay *display); -static void gimp_blend_tool_modifier_key (GimpTool *tool, - GdkModifierType key, - gboolean press, - GdkModifierType state, - GimpDisplay *display); -static void gimp_blend_tool_cursor_update (GimpTool *tool, - const GimpCoords *coords, - GdkModifierType state, - GimpDisplay *display); -static const gchar * gimp_blend_tool_can_undo (GimpTool *tool, - GimpDisplay *display); -static const gchar * gimp_blend_tool_can_redo (GimpTool *tool, - GimpDisplay *display); -static gboolean gimp_blend_tool_undo (GimpTool *tool, - GimpDisplay *display); -static gboolean gimp_blend_tool_redo (GimpTool *tool, - GimpDisplay *display); -static void gimp_blend_tool_options_notify (GimpTool *tool, - GimpToolOptions *options, - const GParamSpec *pspec); - -static void gimp_blend_tool_start (GimpBlendTool *blend_tool, - const GimpCoords *coords, - GimpDisplay *display); -static void gimp_blend_tool_halt (GimpBlendTool *blend_tool); -static void gimp_blend_tool_commit (GimpBlendTool *blend_tool); - -static void gimp_blend_tool_line_changed (GimpToolWidget *widget, - GimpBlendTool *blend_tool); -static void gimp_blend_tool_line_response (GimpToolWidget *widget, - gint response_id, - GimpBlendTool *blend_tool); - -static void gimp_blend_tool_precalc_shapeburst (GimpBlendTool *blend_tool); - -static void gimp_blend_tool_create_graph (GimpBlendTool *blend_tool); -static void gimp_blend_tool_update_graph (GimpBlendTool *blend_tool); - -static void gimp_blend_tool_fg_bg_changed (GimpBlendTool *blend_tool); - -static void gimp_blend_tool_gradient_dirty (GimpBlendTool *blend_tool); -static void gimp_blend_tool_set_gradient (GimpBlendTool *blend_tool, - GimpGradient *gradient); - -static gboolean gimp_blend_tool_is_shapeburst (GimpBlendTool *blend_tool); - -static void gimp_blend_tool_create_filter (GimpBlendTool *blend_tool, - GimpDrawable *drawable); -static void gimp_blend_tool_filter_flush (GimpDrawableFilter *filter, - GimpTool *tool); - - -G_DEFINE_TYPE (GimpBlendTool, gimp_blend_tool, GIMP_TYPE_DRAW_TOOL) - -#define parent_class gimp_blend_tool_parent_class - - -void -gimp_blend_tool_register (GimpToolRegisterCallback callback, - gpointer data) -{ - (* callback) (GIMP_TYPE_BLEND_TOOL, - GIMP_TYPE_BLEND_OPTIONS, - gimp_blend_options_gui, - GIMP_CONTEXT_PROP_MASK_FOREGROUND | - GIMP_CONTEXT_PROP_MASK_BACKGROUND | - GIMP_CONTEXT_PROP_MASK_OPACITY | - GIMP_CONTEXT_PROP_MASK_PAINT_MODE | - GIMP_CONTEXT_PROP_MASK_GRADIENT, - "gimp-blend-tool", - _("Blend"), - _("Blend Tool: Fill selected area with a color gradient"), - N_("Blen_d"), "L", - NULL, GIMP_HELP_TOOL_BLEND, - GIMP_ICON_TOOL_BLEND, - data); -} - -static void -gimp_blend_tool_class_init (GimpBlendToolClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass); - - object_class->dispose = gimp_blend_tool_dispose; - - tool_class->initialize = gimp_blend_tool_initialize; - tool_class->control = gimp_blend_tool_control; - tool_class->button_press = gimp_blend_tool_button_press; - tool_class->button_release = gimp_blend_tool_button_release; - tool_class->motion = gimp_blend_tool_motion; - tool_class->key_press = gimp_blend_tool_key_press; - tool_class->modifier_key = gimp_blend_tool_modifier_key; - tool_class->cursor_update = gimp_blend_tool_cursor_update; - tool_class->can_undo = gimp_blend_tool_can_undo; - tool_class->can_redo = gimp_blend_tool_can_redo; - tool_class->undo = gimp_blend_tool_undo; - tool_class->redo = gimp_blend_tool_redo; - tool_class->options_notify = gimp_blend_tool_options_notify; -} - -static void -gimp_blend_tool_init (GimpBlendTool *blend_tool) -{ - GimpTool *tool = GIMP_TOOL (blend_tool); - - gimp_tool_control_set_scroll_lock (tool->control, TRUE); - gimp_tool_control_set_preserve (tool->control, FALSE); - gimp_tool_control_set_dirty_mask (tool->control, - GIMP_DIRTY_IMAGE | - GIMP_DIRTY_IMAGE_STRUCTURE | - GIMP_DIRTY_DRAWABLE | - GIMP_DIRTY_ACTIVE_DRAWABLE); - gimp_tool_control_set_wants_click (tool->control, TRUE); - gimp_tool_control_set_wants_double_click (tool->control, TRUE); - gimp_tool_control_set_active_modifiers (tool->control, - GIMP_TOOL_ACTIVE_MODIFIERS_SEPARATE); - gimp_tool_control_set_precision (tool->control, - GIMP_CURSOR_PRECISION_SUBPIXEL); - gimp_tool_control_set_tool_cursor (tool->control, - GIMP_TOOL_CURSOR_BLEND); - gimp_tool_control_set_action_opacity (tool->control, - "context/context-opacity-set"); - gimp_tool_control_set_action_object_1 (tool->control, - "context/context-gradient-select-set"); - - gimp_draw_tool_set_default_status (GIMP_DRAW_TOOL (tool), - _("Click-Drag to draw a gradient")); -} - -static void -gimp_blend_tool_dispose (GObject *object) -{ - GimpBlendTool *blend_tool = GIMP_BLEND_TOOL (object); - - gimp_blend_tool_set_gradient (blend_tool, NULL); - - G_OBJECT_CLASS (parent_class)->dispose (object); -} - -static gboolean -gimp_blend_tool_initialize (GimpTool *tool, - GimpDisplay *display, - GError **error) -{ - GimpImage *image = gimp_display_get_image (display); - GimpDrawable *drawable = gimp_image_get_active_drawable (image); - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (tool); - - if (! GIMP_TOOL_CLASS (parent_class)->initialize (tool, display, error)) - { - return FALSE; - } - - if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable))) - { - g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED, - _("Cannot modify the pixels of layer groups.")); - return FALSE; - } - - if (gimp_item_is_content_locked (GIMP_ITEM (drawable))) - { - g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED, - _("The active layer's pixels are locked.")); - return FALSE; - } - - if (! gimp_item_is_visible (GIMP_ITEM (drawable))) - { - g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED, - _("The active layer is not visible.")); - return FALSE; - } - - if (! gimp_context_get_gradient (GIMP_CONTEXT (options))) - { - g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED, - _("No gradient available for use with this tool.")); - return FALSE; - } - - return TRUE; -} - -static void -gimp_blend_tool_control (GimpTool *tool, - GimpToolAction action, - GimpDisplay *display) -{ - GimpBlendTool *blend_tool = GIMP_BLEND_TOOL (tool); - - switch (action) - { - case GIMP_TOOL_ACTION_PAUSE: - case GIMP_TOOL_ACTION_RESUME: - break; - - case GIMP_TOOL_ACTION_HALT: - gimp_blend_tool_halt (blend_tool); - break; - - case GIMP_TOOL_ACTION_COMMIT: - gimp_blend_tool_commit (blend_tool); - break; - } - - GIMP_TOOL_CLASS (parent_class)->control (tool, action, display); -} - -static void -gimp_blend_tool_button_press (GimpTool *tool, - const GimpCoords *coords, - guint32 time, - GdkModifierType state, - GimpButtonPressType press_type, - GimpDisplay *display) -{ - GimpBlendTool *blend_tool = GIMP_BLEND_TOOL (tool); - - if (tool->display && display != tool->display) - gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display); - - if (! blend_tool->widget) - { - gimp_blend_tool_start (blend_tool, coords, display); - - gimp_tool_widget_hover (blend_tool->widget, coords, state, TRUE); - } - - /* call start_edit() before widget_button_press(), because we need to record - * the undo state before widget_button_press() potentially changes it. note - * that if widget_button_press() return FALSE, nothing changes and no undo - * step is created. - */ - if (press_type == GIMP_BUTTON_PRESS_NORMAL) - gimp_blend_tool_editor_start_edit (blend_tool); - - if (gimp_tool_widget_button_press (blend_tool->widget, coords, time, state, - press_type)) - { - blend_tool->grab_widget = blend_tool->widget; - } - - if (press_type == GIMP_BUTTON_PRESS_NORMAL) - gimp_tool_control_activate (tool->control); -} - -static void -gimp_blend_tool_button_release (GimpTool *tool, - const GimpCoords *coords, - guint32 time, - GdkModifierType state, - GimpButtonReleaseType release_type, - GimpDisplay *display) -{ - GimpBlendTool *blend_tool = GIMP_BLEND_TOOL (tool); - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (tool); - - gimp_tool_pop_status (tool, display); - - gimp_tool_control_halt (tool->control); - - if (blend_tool->grab_widget) - { - gimp_tool_widget_button_release (blend_tool->grab_widget, - coords, time, state, release_type); - blend_tool->grab_widget = NULL; - - if (options->instant) - { - if (release_type == GIMP_BUTTON_RELEASE_CANCEL) - gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display); - else - gimp_tool_control (tool, GIMP_TOOL_ACTION_COMMIT, display); - } - } - - if (! options->instant) - { - gimp_blend_tool_editor_end_edit (blend_tool, - release_type == - GIMP_BUTTON_RELEASE_CANCEL); - } -} - -static void -gimp_blend_tool_motion (GimpTool *tool, - const GimpCoords *coords, - guint32 time, - GdkModifierType state, - GimpDisplay *display) -{ - GimpBlendTool *blend_tool = GIMP_BLEND_TOOL (tool); - - if (blend_tool->grab_widget) - { - gimp_tool_widget_motion (blend_tool->grab_widget, coords, time, state); - } -} - -static gboolean -gimp_blend_tool_key_press (GimpTool *tool, - GdkEventKey *kevent, - GimpDisplay *display) -{ - GimpBlendTool *blend_tool = GIMP_BLEND_TOOL (tool); - GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool); - gboolean result; - - /* call start_edit() before widget_key_press(), because we need to record the - * undo state before widget_key_press() potentially changes it. note that if - * widget_key_press() return FALSE, nothing changes and no undo step is - * created. - */ - if (display == draw_tool->display) - gimp_blend_tool_editor_start_edit (blend_tool); - - result = GIMP_TOOL_CLASS (parent_class)->key_press (tool, kevent, display); - - if (display == draw_tool->display) - gimp_blend_tool_editor_end_edit (blend_tool, FALSE); - - return result; -} - -static void -gimp_blend_tool_modifier_key (GimpTool *tool, - GdkModifierType key, - gboolean press, - GdkModifierType state, - GimpDisplay *display) -{ - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (tool); - - if (key == gimp_get_extend_selection_mask ()) - { - if (options->instant_toggle && - gtk_widget_get_sensitive (options->instant_toggle)) - { - g_object_set (options, - "instant", ! options->instant, - NULL); - } - } -} - -static void -gimp_blend_tool_cursor_update (GimpTool *tool, - const GimpCoords *coords, - GdkModifierType state, - GimpDisplay *display) -{ - GimpImage *image = gimp_display_get_image (display); - GimpDrawable *drawable = gimp_image_get_active_drawable (image); - - if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) || - gimp_item_is_content_locked (GIMP_ITEM (drawable)) || - ! gimp_item_is_visible (GIMP_ITEM (drawable))) - { - gimp_tool_set_cursor (tool, display, - gimp_tool_control_get_cursor (tool->control), - gimp_tool_control_get_tool_cursor (tool->control), - GIMP_CURSOR_MODIFIER_BAD); - return; - } - - GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display); -} - -static const gchar * -gimp_blend_tool_can_undo (GimpTool *tool, - GimpDisplay *display) -{ - return gimp_blend_tool_editor_can_undo (GIMP_BLEND_TOOL (tool)); -} - -static const gchar * -gimp_blend_tool_can_redo (GimpTool *tool, - GimpDisplay *display) -{ - return gimp_blend_tool_editor_can_redo (GIMP_BLEND_TOOL (tool)); -} - -static gboolean -gimp_blend_tool_undo (GimpTool *tool, - GimpDisplay *display) -{ - return gimp_blend_tool_editor_undo (GIMP_BLEND_TOOL (tool)); -} - -static gboolean -gimp_blend_tool_redo (GimpTool *tool, - GimpDisplay *display) -{ - return gimp_blend_tool_editor_redo (GIMP_BLEND_TOOL (tool)); -} - -static void -gimp_blend_tool_options_notify (GimpTool *tool, - GimpToolOptions *options, - const GParamSpec *pspec) -{ - GimpContext *context = GIMP_CONTEXT (options); - GimpBlendTool *blend_tool = GIMP_BLEND_TOOL (tool); - - if (! strcmp (pspec->name, "gradient")) - { - gimp_blend_tool_set_gradient (blend_tool, context->gradient); - - if (blend_tool->filter) - gimp_drawable_filter_apply (blend_tool->filter, NULL); - } - else if (blend_tool->render_node && - gegl_node_find_property (blend_tool->render_node, pspec->name)) - { - /* Sync any property changes on the config object that match the op */ - GValue value = G_VALUE_INIT; - - g_value_init (&value, pspec->value_type); - - g_object_get_property (G_OBJECT (options), pspec->name, &value); - gegl_node_set_property (blend_tool->render_node, pspec->name, &value); - - g_value_unset (&value); - - if (! strcmp (pspec->name, "gradient-type")) - { - GimpRepeatMode gradient_repeat; - GimpRepeatMode node_repeat; - GimpGradientType gradient_type; - - gradient_repeat = GIMP_PAINT_OPTIONS (options)->gradient_options->gradient_repeat; - gradient_type = GIMP_BLEND_OPTIONS (options)->gradient_type; - gegl_node_get (blend_tool->render_node, - "gradient-repeat", &node_repeat, - NULL); - - if (gradient_type >= GIMP_GRADIENT_SHAPEBURST_ANGULAR) - { - /* These gradient types are only meant to work with repeat - * value of "none" so these are the only ones where we - * don't keep the render node and the blend options in - * sync. - * We could instead reset the "gradient-repeat" value on - * GimpBlendOptions, but I assume one would want to revert - * back to the last set value if changing back the - * gradient type. So instead we just make the option - * insensitive (both in GUI and in render). - */ - if (node_repeat != GIMP_REPEAT_NONE) - gegl_node_set (blend_tool->render_node, - "gradient-repeat", GIMP_REPEAT_NONE, - NULL); - } - else if (node_repeat != gradient_repeat) - { - gegl_node_set (blend_tool->render_node, - "gradient-repeat", gradient_repeat, - NULL); - } - - if (gimp_blend_tool_is_shapeburst (blend_tool)) - gimp_blend_tool_precalc_shapeburst (blend_tool); - - gimp_blend_tool_update_graph (blend_tool); - } - - gimp_drawable_filter_apply (blend_tool->filter, NULL); - } - else if (blend_tool->render_node && - gimp_blend_tool_is_shapeburst (blend_tool) && - g_strcmp0 (pspec->name, "distance-metric") == 0) - { - g_clear_object (&blend_tool->dist_buffer); - gimp_blend_tool_precalc_shapeburst (blend_tool); - gimp_blend_tool_update_graph (blend_tool); - gimp_drawable_filter_apply (blend_tool->filter, NULL); - } - else if (blend_tool->filter && - ! strcmp (pspec->name, "opacity")) - { - gimp_drawable_filter_set_opacity (blend_tool->filter, - gimp_context_get_opacity (context)); - } - else if (blend_tool->filter && - ! strcmp (pspec->name, "paint-mode")) - { - gimp_drawable_filter_set_mode (blend_tool->filter, - gimp_context_get_paint_mode (context), - GIMP_LAYER_COLOR_SPACE_AUTO, - GIMP_LAYER_COLOR_SPACE_AUTO, - GIMP_LAYER_COMPOSITE_AUTO); - } - - gimp_blend_tool_editor_options_notify (blend_tool, options, pspec); -} - -static void -gimp_blend_tool_start (GimpBlendTool *blend_tool, - const GimpCoords *coords, - GimpDisplay *display) -{ - GimpTool *tool = GIMP_TOOL (blend_tool); - GimpDisplayShell *shell = gimp_display_get_shell (display); - GimpImage *image = gimp_display_get_image (display); - GimpDrawable *drawable = gimp_image_get_active_drawable (image); - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool); - GimpContext *context = GIMP_CONTEXT (options); - - if (options->instant_toggle) - gtk_widget_set_sensitive (options->instant_toggle, FALSE); - - tool->display = display; - tool->drawable = drawable; - - blend_tool->start_x = coords->x; - blend_tool->start_y = coords->y; - blend_tool->end_x = coords->x; - blend_tool->end_y = coords->y; - - blend_tool->widget = gimp_tool_line_new (shell, - blend_tool->start_x, - blend_tool->start_y, - blend_tool->end_x, - blend_tool->end_y); - - g_object_set (blend_tool->widget, - "status-title", _("Blend: "), - NULL); - - gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (tool), blend_tool->widget); - - g_signal_connect (blend_tool->widget, "changed", - G_CALLBACK (gimp_blend_tool_line_changed), - blend_tool); - g_signal_connect (blend_tool->widget, "response", - G_CALLBACK (gimp_blend_tool_line_response), - blend_tool); - - g_signal_connect_swapped (context, "background-changed", - G_CALLBACK (gimp_blend_tool_fg_bg_changed), - blend_tool); - g_signal_connect_swapped (context, "foreground-changed", - G_CALLBACK (gimp_blend_tool_fg_bg_changed), - blend_tool); - - gimp_blend_tool_create_filter (blend_tool, drawable); - - /* Initially sync all of the properties */ - gimp_operation_config_sync_node (G_OBJECT (options), - blend_tool->render_node); - - /* We don't allow repeat values for some shapes. */ - if (options->gradient_type >= GIMP_GRADIENT_SHAPEBURST_ANGULAR) - gegl_node_set (blend_tool->render_node, - "gradient-repeat", GIMP_REPEAT_NONE, - NULL); - - /* Connect signal handlers for the gradient */ - gimp_blend_tool_set_gradient (blend_tool, context->gradient); - - if (gimp_blend_tool_is_shapeburst (blend_tool)) - gimp_blend_tool_precalc_shapeburst (blend_tool); - - gimp_draw_tool_start (GIMP_DRAW_TOOL (blend_tool), display); - - gimp_blend_tool_editor_start (blend_tool); -} - -static void -gimp_blend_tool_halt (GimpBlendTool *blend_tool) -{ - GimpTool *tool = GIMP_TOOL (blend_tool); - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool); - GimpContext *context = GIMP_CONTEXT (options); - - gimp_blend_tool_editor_halt (blend_tool); - - if (blend_tool->graph) - { - g_clear_object (&blend_tool->graph); - blend_tool->render_node = NULL; -#if 0 - blend_tool->subtract_node = NULL; - blend_tool->divide_node = NULL; -#endif - blend_tool->dist_node = NULL; - } - - g_clear_object (&blend_tool->dist_buffer); - - if (blend_tool->filter) - { - gimp_tool_control_push_preserve (tool->control, TRUE); - - gimp_drawable_filter_abort (blend_tool->filter); - g_object_unref (blend_tool->filter); - blend_tool->filter = NULL; - - gimp_tool_control_pop_preserve (tool->control); - - gimp_image_flush (gimp_display_get_image (tool->display)); - } - - gimp_blend_tool_set_tentative_gradient (blend_tool, NULL); - - g_signal_handlers_disconnect_by_func (context, - G_CALLBACK (gimp_blend_tool_fg_bg_changed), - blend_tool); - - if (tool->display) - gimp_tool_pop_status (tool, tool->display); - - if (gimp_draw_tool_is_active (GIMP_DRAW_TOOL (blend_tool))) - gimp_draw_tool_stop (GIMP_DRAW_TOOL (blend_tool)); - - gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (tool), NULL); - g_clear_object (&blend_tool->widget); - - tool->display = NULL; - tool->drawable = NULL; - - if (options->instant_toggle) - gtk_widget_set_sensitive (options->instant_toggle, TRUE); -} - -static void -gimp_blend_tool_commit (GimpBlendTool *blend_tool) -{ - GimpTool *tool = GIMP_TOOL (blend_tool); - - if (blend_tool->filter) - { - gimp_tool_control_push_preserve (tool->control, TRUE); - - gimp_drawable_filter_commit (blend_tool->filter, - GIMP_PROGRESS (tool), FALSE); - g_clear_object (&blend_tool->filter); - - gimp_tool_control_pop_preserve (tool->control); - - gimp_image_flush (gimp_display_get_image (tool->display)); - } -} - -static void -gimp_blend_tool_line_changed (GimpToolWidget *widget, - GimpBlendTool *blend_tool) -{ - gdouble start_x; - gdouble start_y; - gdouble end_x; - gdouble end_y; - gboolean update = FALSE; - - g_object_get (widget, - "x1", &start_x, - "y1", &start_y, - "x2", &end_x, - "y2", &end_y, - NULL); - - if (start_x != blend_tool->start_x || - start_y != blend_tool->start_y || - end_x != blend_tool->end_x || - end_y != blend_tool->end_y) - { - blend_tool->start_x = start_x; - blend_tool->start_y = start_y; - blend_tool->end_x = end_x; - blend_tool->end_y = end_y; - - update = TRUE; - } - - if (gimp_blend_tool_editor_line_changed (blend_tool)) - update = TRUE; - - if (update) - { - gimp_blend_tool_update_graph (blend_tool); - gimp_drawable_filter_apply (blend_tool->filter, NULL); - } -} - -static void -gimp_blend_tool_line_response (GimpToolWidget *widget, - gint response_id, - GimpBlendTool *blend_tool) -{ - GimpTool *tool = GIMP_TOOL (blend_tool); - - switch (response_id) - { - case GIMP_TOOL_WIDGET_RESPONSE_CONFIRM: - gimp_tool_control (tool, GIMP_TOOL_ACTION_COMMIT, tool->display); - break; - - case GIMP_TOOL_WIDGET_RESPONSE_CANCEL: - gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display); - break; - } -} - -static void -gimp_blend_tool_precalc_shapeburst (GimpBlendTool *blend_tool) -{ - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool); - GimpTool *tool = GIMP_TOOL (blend_tool); - gint x, y, width, height; - - if (blend_tool->dist_buffer || ! tool->drawable) - return; - - if (! gimp_item_mask_intersect (GIMP_ITEM (tool->drawable), - &x, &y, &width, &height)) - return; - - blend_tool->dist_buffer = - gimp_drawable_blend_shapeburst_distmap (tool->drawable, options->distance_metric, - GEGL_RECTANGLE (x, y, width, height), - GIMP_PROGRESS (blend_tool)); - - if (blend_tool->dist_node) - gegl_node_set (blend_tool->dist_node, - "buffer", blend_tool->dist_buffer, - NULL); - - gimp_progress_end (GIMP_PROGRESS (blend_tool)); -} - - -/* gegl graph stuff */ - -static void -gimp_blend_tool_create_graph (GimpBlendTool *blend_tool) -{ - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool); - GimpContext *context = GIMP_CONTEXT (options); - GeglNode *output; - - /* render_node is not supposed to be recreated */ - g_return_if_fail (blend_tool->graph == NULL); - - blend_tool->graph = gegl_node_new (); - - blend_tool->dist_node = - gegl_node_new_child (blend_tool->graph, - "operation", "gegl:buffer-source", - "buffer", blend_tool->dist_buffer, - NULL); - -#if 0 - blend_tool->subtract_node = - gegl_node_new_child (blend_tool->graph, - "operation", "gegl:subtract", - NULL); - - blend_tool->divide_node = - gegl_node_new_child (blend_tool->graph, - "operation", "gegl:divide", - NULL); -#endif - - blend_tool->render_node = - gegl_node_new_child (blend_tool->graph, - "operation", "gimp:blend", - "context", context, - NULL); - - output = gegl_node_get_output_proxy (blend_tool->graph, "output"); - - gegl_node_link_many (blend_tool->dist_node, -#if 0 - blend_tool->subtract_node, - blend_tool->divide_node, -#endif - blend_tool->render_node, - output, - NULL); - - gimp_blend_tool_update_graph (blend_tool); -} - -static void -gimp_blend_tool_update_graph (GimpBlendTool *blend_tool) -{ - GimpTool *tool = GIMP_TOOL (blend_tool); - gint off_x, off_y; - - gimp_item_get_offset (GIMP_ITEM (tool->drawable), &off_x, &off_y); - -#if 0 - if (gimp_blend_tool_is_shapeburst (blend_tool)) - { - gfloat start, end; - - gegl_buffer_get (blend_tool->dist_buffer, - GEGL_RECTANGLE (blend_tool->start_x - off_x, - blend_tool->start_y - off_y, - 1, 1), - 1.0, babl_format("Y float"), &start, - GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE); - - gegl_buffer_get (blend_tool->dist_buffer, - GEGL_RECTANGLE (blend_tool->end_x - off_x, - blend_tool->end_y - off_y, - 1, 1), - 1.0, babl_format("Y float"), &end, - GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE); - - if (start != end) - { - gegl_node_set (blend_tool->subtract_node, - "value", (gdouble) start, - NULL); - gegl_node_set (blend_tool->divide_node, - "value", (gdouble) (end - start), - NULL); - } - } - else -#endif - { - gegl_node_set (blend_tool->render_node, - "start_x", blend_tool->start_x - off_x, - "start_y", blend_tool->start_y - off_y, - "end_x", blend_tool->end_x - off_x, - "end_y", blend_tool->end_y - off_y, - NULL); - } -} - -static void -gimp_blend_tool_fg_bg_changed (GimpBlendTool *blend_tool) -{ - if (! blend_tool->filter || ! blend_tool->gradient) - return; - - if (gimp_gradient_has_fg_bg_segments (blend_tool->gradient)) - { - /* Set a property on the node. Otherwise it will cache and refuse to update */ - gegl_node_set (blend_tool->render_node, - "gradient", blend_tool->gradient, - NULL); - - /* Update the filter */ - gimp_drawable_filter_apply (blend_tool->filter, NULL); - - gimp_blend_tool_editor_fg_bg_changed (blend_tool); - } -} - -static void -gimp_blend_tool_gradient_dirty (GimpBlendTool *blend_tool) -{ - if (! blend_tool->filter) - return; - - if (! blend_tool->tentative_gradient) - { - /* Set a property on the node. Otherwise it will cache and refuse to update */ - gegl_node_set (blend_tool->render_node, - "gradient", blend_tool->gradient, - NULL); - - /* Update the filter */ - gimp_drawable_filter_apply (blend_tool->filter, NULL); - } - - gimp_blend_tool_editor_gradient_dirty (blend_tool); -} - -static void -gimp_blend_tool_set_gradient (GimpBlendTool *blend_tool, - GimpGradient *gradient) -{ - if (blend_tool->gradient) - { - g_signal_handlers_disconnect_by_func (blend_tool->gradient, - G_CALLBACK (gimp_blend_tool_gradient_dirty), - blend_tool); - - g_object_unref (blend_tool->gradient); - } - - blend_tool->gradient = gradient; - - if (blend_tool->gradient) - { - g_object_ref (gradient); - - g_signal_connect_swapped (blend_tool->gradient, "dirty", - G_CALLBACK (gimp_blend_tool_gradient_dirty), - blend_tool); - - if (blend_tool->render_node) - gegl_node_set (blend_tool->render_node, - "gradient", blend_tool->gradient, - NULL); - } - - gimp_blend_tool_editor_gradient_changed (blend_tool); -} - -static gboolean -gimp_blend_tool_is_shapeburst (GimpBlendTool *blend_tool) -{ - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool); - - return options->gradient_type >= GIMP_GRADIENT_SHAPEBURST_ANGULAR && - options->gradient_type <= GIMP_GRADIENT_SHAPEBURST_DIMPLED; -} - - -/* image map stuff */ - -static void -gimp_blend_tool_create_filter (GimpBlendTool *blend_tool, - GimpDrawable *drawable) -{ - GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (blend_tool); - GimpContext *context = GIMP_CONTEXT (options); - - if (! blend_tool->graph) - gimp_blend_tool_create_graph (blend_tool); - - blend_tool->filter = gimp_drawable_filter_new (drawable, - C_("undo-type", "Blend"), - blend_tool->graph, - GIMP_ICON_TOOL_BLEND); - - gimp_drawable_filter_set_region (blend_tool->filter, - GIMP_FILTER_REGION_DRAWABLE); - gimp_drawable_filter_set_opacity (blend_tool->filter, - gimp_context_get_opacity (context)); - gimp_drawable_filter_set_mode (blend_tool->filter, - gimp_context_get_paint_mode (context), - GIMP_LAYER_COLOR_SPACE_AUTO, - GIMP_LAYER_COLOR_SPACE_AUTO, - GIMP_LAYER_COMPOSITE_AUTO); - - g_signal_connect (blend_tool->filter, "flush", - G_CALLBACK (gimp_blend_tool_filter_flush), - blend_tool); -} - -static void -gimp_blend_tool_filter_flush (GimpDrawableFilter *filter, - GimpTool *tool) -{ - GimpImage *image = gimp_display_get_image (tool->display); - - gimp_projection_flush (gimp_image_get_projection (image)); -} - - -/* protected functions */ - - -void -gimp_blend_tool_set_tentative_gradient (GimpBlendTool *blend_tool, - GimpGradient *gradient) -{ - g_return_if_fail (GIMP_IS_BLEND_TOOL (blend_tool)); - g_return_if_fail (gradient == NULL || GIMP_IS_GRADIENT (gradient)); - - if (gradient != blend_tool->tentative_gradient) - { - g_clear_object (&blend_tool->tentative_gradient); - - blend_tool->tentative_gradient = gradient; - - if (gradient) - g_object_ref (gradient); - - if (blend_tool->render_node) - { - gegl_node_set (blend_tool->render_node, - "gradient", gradient ? gradient : blend_tool->gradient, - NULL); - - gimp_drawable_filter_apply (blend_tool->filter, NULL); - } - } -} diff --git a/app/tools/gimpbrushtool.c b/app/tools/gimpbrushtool.c index 7cd9fe6a21..9972f5d503 100644 --- a/app/tools/gimpbrushtool.c +++ b/app/tools/gimpbrushtool.c @@ -43,6 +43,7 @@ #include "display/gimpdisplayshell.h" #include "gimpbrushtool.h" +#include "gimppainttool-paint.h" #include "gimptoolcontrol.h" @@ -61,6 +62,9 @@ static void gimp_brush_tool_options_notify (GimpTool *tool, GimpToolOptions *options, const GParamSpec *pspec); +static void gimp_brush_tool_paint_start (GimpPaintTool *paint_tool); +static void gimp_brush_tool_paint_end (GimpPaintTool *paint_tool); +static void gimp_brush_tool_paint_flush (GimpPaintTool *paint_tool); static GimpCanvasItem * gimp_brush_tool_get_outline (GimpPaintTool *paint_tool, GimpDisplay *display, @@ -74,6 +78,11 @@ static void gimp_brush_tool_set_brush (GimpBrushCore *brush_core, GimpBrush *brush, GimpBrushTool *brush_tool); +static const GimpBezierDesc * + gimp_brush_tool_get_boundary (GimpBrushTool *brush_tool, + gint *width, + gint *height); + G_DEFINE_TYPE (GimpBrushTool, gimp_brush_tool, GIMP_TYPE_PAINT_TOOL) @@ -93,6 +102,9 @@ gimp_brush_tool_class_init (GimpBrushToolClass *klass) tool_class->cursor_update = gimp_brush_tool_cursor_update; tool_class->options_notify = gimp_brush_tool_options_notify; + paint_tool_class->paint_start = gimp_brush_tool_paint_start; + paint_tool_class->paint_end = gimp_brush_tool_paint_end; + paint_tool_class->paint_flush = gimp_brush_tool_paint_flush; paint_tool_class->get_outline = gimp_brush_tool_get_outline; } @@ -221,6 +233,74 @@ gimp_brush_tool_options_notify (GimpTool *tool, } } +static void +gimp_brush_tool_paint_start (GimpPaintTool *paint_tool) +{ + GimpBrushTool *brush_tool = GIMP_BRUSH_TOOL (paint_tool); + GimpBrushCore *brush_core = GIMP_BRUSH_CORE (paint_tool->core); + const GimpBezierDesc *boundary; + + if (GIMP_PAINT_TOOL_CLASS (parent_class)->paint_start) + GIMP_PAINT_TOOL_CLASS (parent_class)->paint_start (paint_tool); + + boundary = gimp_brush_tool_get_boundary (brush_tool, + &brush_tool->boundary_width, + &brush_tool->boundary_height); + + if (boundary) + brush_tool->boundary = gimp_bezier_desc_copy (boundary); + + brush_tool->boundary_scale = brush_core->scale; + brush_tool->boundary_aspect_ratio = brush_core->aspect_ratio; + brush_tool->boundary_angle = brush_core->angle; + brush_tool->boundary_reflect = brush_core->reflect; + brush_tool->boundary_hardness = brush_core->hardness; +} + +static void +gimp_brush_tool_paint_end (GimpPaintTool *paint_tool) +{ + GimpBrushTool *brush_tool = GIMP_BRUSH_TOOL (paint_tool); + + g_clear_pointer (&brush_tool->boundary, gimp_bezier_desc_free); + + if (GIMP_PAINT_TOOL_CLASS (parent_class)->paint_end) + GIMP_PAINT_TOOL_CLASS (parent_class)->paint_end (paint_tool); +} + +static void +gimp_brush_tool_paint_flush (GimpPaintTool *paint_tool) +{ + GimpBrushTool *brush_tool = GIMP_BRUSH_TOOL (paint_tool); + GimpBrushCore *brush_core = GIMP_BRUSH_CORE (paint_tool->core); + const GimpBezierDesc *boundary; + + if (GIMP_PAINT_TOOL_CLASS (parent_class)->paint_flush) + GIMP_PAINT_TOOL_CLASS (parent_class)->paint_flush (paint_tool); + + if (brush_tool->boundary_scale != brush_core->scale || + brush_tool->boundary_aspect_ratio != brush_core->aspect_ratio || + brush_tool->boundary_angle != brush_core->angle || + brush_tool->boundary_reflect != brush_core->reflect || + brush_tool->boundary_hardness != brush_core->hardness) + { + g_clear_pointer (&brush_tool->boundary, gimp_bezier_desc_free); + + boundary = gimp_brush_tool_get_boundary (brush_tool, + &brush_tool->boundary_width, + &brush_tool->boundary_height); + + if (boundary) + brush_tool->boundary = gimp_bezier_desc_copy (boundary); + + brush_tool->boundary_scale = brush_core->scale; + brush_tool->boundary_aspect_ratio = brush_core->aspect_ratio; + brush_tool->boundary_angle = brush_core->angle; + brush_tool->boundary_reflect = brush_core->reflect; + brush_tool->boundary_hardness = brush_core->hardness; + } +} + static GimpCanvasItem * gimp_brush_tool_get_outline (GimpPaintTool *paint_tool, GimpDisplay *display, @@ -259,7 +339,6 @@ gimp_brush_tool_create_outline (GimpBrushTool *brush_tool, gdouble x, gdouble y) { - GimpBrushCore *brush_core; GimpPaintOptions *options; GimpDisplayShell *shell; const GimpBezierDesc *boundary = NULL; @@ -269,29 +348,25 @@ gimp_brush_tool_create_outline (GimpBrushTool *brush_tool, g_return_val_if_fail (GIMP_IS_BRUSH_TOOL (brush_tool), NULL); g_return_val_if_fail (GIMP_IS_DISPLAY (display), NULL); - if (! GIMP_PAINT_TOOL (brush_tool)->draw_brush) + if (gimp_paint_tool_paint_is_active (GIMP_PAINT_TOOL (brush_tool))) + { + boundary = brush_tool->boundary; + width = brush_tool->boundary_width; + height = brush_tool->boundary_height; + } + else + { + boundary = gimp_brush_tool_get_boundary (brush_tool, &width, &height); + } + + if (! boundary) return NULL; - brush_core = GIMP_BRUSH_CORE (GIMP_PAINT_TOOL (brush_tool)->core); - options = GIMP_PAINT_TOOL_GET_OPTIONS (brush_tool); - shell = gimp_display_get_shell (display); - - if (! brush_core->main_brush || ! brush_core->dynamics) - return NULL; - - if (brush_core->scale > 0.0) - boundary = gimp_brush_transform_boundary (brush_core->main_brush, - brush_core->scale, - brush_core->aspect_ratio, - brush_core->angle, - brush_core->reflect, - brush_core->hardness, - &width, - &height); + options = GIMP_PAINT_TOOL_GET_OPTIONS (brush_tool); + shell = gimp_display_get_shell (display); /* don't draw the boundary if it becomes too small */ - if (boundary && - SCALEX (shell, width) > 4 && + if (SCALEX (shell, width) > 4 && SCALEY (shell, height) > 4) { x -= width / 2.0; @@ -347,3 +422,29 @@ gimp_brush_tool_set_brush (GimpBrushCore *brush_core, gimp_draw_tool_resume (GIMP_DRAW_TOOL (brush_tool)); } + +static const GimpBezierDesc * +gimp_brush_tool_get_boundary (GimpBrushTool *brush_tool, + gint *width, + gint *height) +{ + GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (brush_tool); + GimpBrushCore *brush_core = GIMP_BRUSH_CORE (paint_tool->core); + + if (paint_tool->draw_brush && + brush_core->main_brush && + brush_core->dynamics && + brush_core->scale > 0.0) + { + return gimp_brush_transform_boundary (brush_core->main_brush, + brush_core->scale, + brush_core->aspect_ratio, + brush_core->angle, + brush_core->reflect, + brush_core->hardness, + width, + height); + } + + return NULL; +} diff --git a/app/tools/gimpbrushtool.h b/app/tools/gimpbrushtool.h index 79225f39b0..6f49df53cd 100644 --- a/app/tools/gimpbrushtool.h +++ b/app/tools/gimpbrushtool.h @@ -34,7 +34,16 @@ typedef struct _GimpBrushToolClass GimpBrushToolClass; struct _GimpBrushTool { - GimpPaintTool parent_instance; + GimpPaintTool parent_instance; + + GimpBezierDesc *boundary; + gint boundary_width; + gint boundary_height; + gdouble boundary_scale; + gdouble boundary_aspect_ratio; + gdouble boundary_angle; + gboolean boundary_reflect; + gdouble boundary_hardness; }; struct _GimpBrushToolClass diff --git a/app/tools/gimpcagetool.h b/app/tools/gimpcagetool.h index 3f9f3692b9..0a4e6b3335 100644 --- a/app/tools/gimpcagetool.h +++ b/app/tools/gimpcagetool.h @@ -61,7 +61,7 @@ struct _GimpCageTool GeglBuffer *coef; /* Gegl buffer where the coefficient of the transformation are stored */ gboolean dirty_coef; /* Indicate if the coef are still valid */ - GeglNode *render_node; /* Gegl node graph to render the transfromation */ + GeglNode *render_node; /* Gegl node graph to render the transformation */ GeglNode *cage_node; /* Gegl node that compute the cage transform */ GeglNode *coef_node; /* Gegl node that read in the coef buffer */ diff --git a/app/tools/gimpfiltertool-widgets.c b/app/tools/gimpfiltertool-widgets.c index 2f78286959..f4a285ba9f 100644 --- a/app/tools/gimpfiltertool-widgets.c +++ b/app/tools/gimpfiltertool-widgets.c @@ -29,6 +29,7 @@ #include "core/gimpitem.h" #include "display/gimpdisplay.h" +#include "display/gimptoolgyroscope.h" #include "display/gimptoolline.h" #include "display/gimptooltransformgrid.h" @@ -77,6 +78,16 @@ static void gimp_filter_tool_set_transform_grid (Controller static void gimp_filter_tool_transform_grid_changed (GimpToolWidget *widget, Controller *controller); +static void gimp_filter_tool_set_gyroscope (Controller *controller, + GeglRectangle *area, + gdouble yaw, + gdouble pitch, + gdouble roll, + gdouble zoom, + gboolean invert); +static void gimp_filter_tool_gyroscope_changed (GimpToolWidget *widget, + Controller *controller); + /* public functions */ @@ -180,6 +191,30 @@ gimp_filter_tool_create_widget (GimpFilterTool *filter_tool, *set_func_data = controller; } break; + + case GIMP_CONTROLLER_TYPE_GYROSCOPE: + { + GeglRectangle area; + gint off_x, off_y; + + gimp_filter_tool_get_drawable_area (filter_tool, &off_x, &off_y, &area); + + controller->widget = gimp_tool_gyroscope_new (shell); + + g_object_set (controller->widget, + "speed", 1.0 / MAX (area.width, area.height), + "pivot-x", off_x + area.x + area.width / 2.0, + "pivot-y", off_y + area.y + area.height / 2.0, + NULL); + + g_signal_connect (controller->widget, "changed", + G_CALLBACK (gimp_filter_tool_gyroscope_changed), + controller); + + *set_func = (GCallback) gimp_filter_tool_set_gyroscope; + *set_func_data = controller; + } + break; } g_object_set_data_full (G_OBJECT (controller->widget), @@ -480,3 +515,59 @@ gimp_filter_tool_transform_grid_changed (GimpToolWidget *widget, g_free (transform); } + +static void +gimp_filter_tool_set_gyroscope (Controller *controller, + GeglRectangle *area, + gdouble yaw, + gdouble pitch, + gdouble roll, + gdouble zoom, + gboolean invert) +{ + g_signal_handlers_block_by_func (controller->widget, + gimp_filter_tool_gyroscope_changed, + controller); + + g_object_set (controller->widget, + "yaw", yaw, + "pitch", pitch, + "roll", roll, + "zoom", zoom, + "invert", invert, + NULL); + + g_signal_handlers_unblock_by_func (controller->widget, + gimp_filter_tool_gyroscope_changed, + controller); +} + +static void gimp_filter_tool_gyroscope_changed (GimpToolWidget *widget, + Controller *controller) +{ + GimpFilterTool *filter_tool = controller->filter_tool; + GimpControllerGyroscopeCallback gyroscope_callback; + gint off_x, off_y; + GeglRectangle area; + gdouble yaw; + gdouble pitch; + gdouble roll; + gdouble zoom; + gboolean invert; + + gyroscope_callback = + (GimpControllerGyroscopeCallback) controller->creator_callback; + + gimp_filter_tool_get_drawable_area (filter_tool, &off_x, &off_y, &area); + + g_object_get (widget, + "yaw", &yaw, + "pitch", &pitch, + "roll", &roll, + "zoom", &zoom, + "invert", &invert, + NULL); + + gyroscope_callback (controller->creator_data, + &area, yaw, pitch, roll, zoom, invert); +} diff --git a/app/tools/gimpfiltertool.c b/app/tools/gimpfiltertool.c index a090c3a99b..7b04949879 100644 --- a/app/tools/gimpfiltertool.c +++ b/app/tools/gimpfiltertool.c @@ -220,13 +220,15 @@ gimp_filter_tool_init (GimpFilterTool *filter_tool) { GimpTool *tool = GIMP_TOOL (filter_tool); - gimp_tool_control_set_scroll_lock (tool->control, TRUE); - gimp_tool_control_set_preserve (tool->control, FALSE); - gimp_tool_control_set_dirty_mask (tool->control, - GIMP_DIRTY_IMAGE | - GIMP_DIRTY_IMAGE_STRUCTURE | - GIMP_DIRTY_DRAWABLE | - GIMP_DIRTY_ACTIVE_DRAWABLE); + gimp_tool_control_set_scroll_lock (tool->control, TRUE); + gimp_tool_control_set_preserve (tool->control, FALSE); + gimp_tool_control_set_dirty_mask (tool->control, + GIMP_DIRTY_IMAGE | + GIMP_DIRTY_IMAGE_STRUCTURE | + GIMP_DIRTY_DRAWABLE | + GIMP_DIRTY_ACTIVE_DRAWABLE); + gimp_tool_control_set_active_modifiers (tool->control, + GIMP_TOOL_ACTIVE_MODIFIERS_SEPARATE); } static void @@ -1489,7 +1491,7 @@ gimp_filter_tool_edit_as (GimpFilterTool *filter_tool, new_tool = tool_manager_get_active (display->gimp); - GIMP_FILTER_TOOL (new_tool)->default_config = g_object_ref (config); + GIMP_FILTER_TOOL (new_tool)->default_config = g_object_ref (G_OBJECT (config)); gimp_filter_tool_reset (GIMP_FILTER_TOOL (new_tool)); } diff --git a/app/tools/gimpfliptool.c b/app/tools/gimpfliptool.c index 3df877ffab..4eb52f791a 100644 --- a/app/tools/gimpfliptool.c +++ b/app/tools/gimpfliptool.c @@ -155,7 +155,7 @@ static GimpDisplay * gimp_flip_tool_has_image (GimpTool *tool, GimpImage *image) { - /* avoid comitting, and hence flipping, when changing tools */ + /* avoid committing, and hence flipping, when changing tools */ return NULL; } @@ -372,7 +372,7 @@ gimp_flip_tool_transform (GimpTransformTool *trans_tool, * normal drawable, or the selection */ - /* always clip the selction and unfloated channels + /* always clip the selection and unfloated channels * so they keep their size */ if (GIMP_IS_CHANNEL (active_item) && diff --git a/app/tools/gimpforegroundselecttool.c b/app/tools/gimpforegroundselecttool.c index 8e0ad815c7..c98a0a48f8 100644 --- a/app/tools/gimpforegroundselecttool.c +++ b/app/tools/gimpforegroundselecttool.c @@ -291,6 +291,12 @@ gimp_foreground_select_tool_initialize (GimpTool *tool, tool->display = display; + /* enable double click for the FreeSelectTool, because it may have been + * disabled if the tool has switched to MATTING_STATE_PAINT_TRIMAP, + * in gimp_foreground_select_tool_set_trimap(). + */ + gimp_tool_control_set_wants_double_click (tool->control, TRUE); + fg_select->state = MATTING_STATE_FREE_SELECT; if (! fg_select->gui) @@ -1019,6 +1025,9 @@ gimp_foreground_select_tool_set_trimap (GimpForegroundSelectTool *fg_select) gimp_tool_control_set_toggled (tool->control, FALSE); + /* disable double click in paint trimap state */ + gimp_tool_control_set_wants_double_click (tool->control, FALSE); + fg_select->state = MATTING_STATE_PAINT_TRIMAP; gimp_foreground_select_tool_update_gui (fg_select); diff --git a/app/tools/gimpblendoptions.c b/app/tools/gimpgradientoptions.c similarity index 74% rename from app/tools/gimpblendoptions.c rename to app/tools/gimpgradientoptions.c index 40ecd29896..391db53c56 100644 --- a/app/tools/gimpblendoptions.c +++ b/app/tools/gimpgradientoptions.c @@ -33,7 +33,7 @@ #include "widgets/gimpviewablebox.h" #include "widgets/gimpwidgets-utils.h" -#include "gimpblendoptions.h" +#include "gimpgradientoptions.h" #include "gimppaintoptions-gui.h" #include "gimp-intl.h" @@ -55,33 +55,34 @@ enum }; -static void gimp_blend_options_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec); -static void gimp_blend_options_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec); +static void gimp_gradient_options_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); +static void gimp_gradient_options_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec); -static void blend_options_repeat_gradient_type_notify (GimpBlendOptions *options, - GParamSpec *pspec, - GtkWidget *repeat_combo); -static void blend_options_metric_gradient_type_notify (GimpBlendOptions *options, - GParamSpec *pspec, - GtkWidget *repeat_combo); +static void gradient_options_repeat_gradient_type_notify (GimpGradientOptions *options, + GParamSpec *pspec, + GtkWidget *repeat_combo); +static void gradient_options_metric_gradient_type_notify (GimpGradientOptions *options, + GParamSpec *pspec, + GtkWidget *repeat_combo); -G_DEFINE_TYPE (GimpBlendOptions, gimp_blend_options, GIMP_TYPE_PAINT_OPTIONS) +G_DEFINE_TYPE (GimpGradientOptions, gimp_gradient_options, + GIMP_TYPE_PAINT_OPTIONS) static void -gimp_blend_options_class_init (GimpBlendOptionsClass *klass) +gimp_gradient_options_class_init (GimpGradientOptionsClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->set_property = gimp_blend_options_set_property; - object_class->get_property = gimp_blend_options_get_property; + object_class->set_property = gimp_gradient_options_set_property; + object_class->get_property = gimp_gradient_options_get_property; GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_OFFSET, "offset", @@ -153,17 +154,17 @@ gimp_blend_options_class_init (GimpBlendOptionsClass *klass) } static void -gimp_blend_options_init (GimpBlendOptions *options) +gimp_gradient_options_init (GimpGradientOptions *options) { } static void -gimp_blend_options_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec) +gimp_gradient_options_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) { - GimpBlendOptions *options = GIMP_BLEND_OPTIONS (object); + GimpGradientOptions *options = GIMP_GRADIENT_OPTIONS (object); switch (property_id) { @@ -209,12 +210,12 @@ gimp_blend_options_set_property (GObject *object, } static void -gimp_blend_options_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec) +gimp_gradient_options_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) { - GimpBlendOptions *options = GIMP_BLEND_OPTIONS (object); + GimpGradientOptions *options = GIMP_GRADIENT_OPTIONS (object); switch (property_id) { @@ -260,21 +261,21 @@ gimp_blend_options_get_property (GObject *object, } GtkWidget * -gimp_blend_options_gui (GimpToolOptions *tool_options) +gimp_gradient_options_gui (GimpToolOptions *tool_options) { - GObject *config = G_OBJECT (tool_options); - GimpContext *context = GIMP_CONTEXT (tool_options); - GimpBlendOptions *options = GIMP_BLEND_OPTIONS (tool_options); - GtkWidget *vbox = gimp_paint_options_gui (tool_options); - GtkWidget *vbox2; - GtkWidget *frame; - GtkWidget *scale; - GtkWidget *combo; - GtkWidget *button; - GtkWidget *label; - gchar *str; - GdkModifierType extend_mask; - GimpGradient *gradient; + GObject *config = G_OBJECT (tool_options); + GimpContext *context = GIMP_CONTEXT (tool_options); + GimpGradientOptions *options = GIMP_GRADIENT_OPTIONS (tool_options); + GtkWidget *vbox = gimp_paint_options_gui (tool_options); + GtkWidget *vbox2; + GtkWidget *frame; + GtkWidget *scale; + GtkWidget *combo; + GtkWidget *button; + GtkWidget *label; + gchar *str; + GdkModifierType extend_mask; + GimpGradient *gradient; extend_mask = gimp_get_extend_selection_mask (); @@ -284,11 +285,21 @@ gimp_blend_options_gui (GimpToolOptions *tool_options) "gradient-view-type", "gradient-view-size", "gradient-reverse", + "gradient-blend-color-space", "gimp-gradient-editor", _("Edit this gradient")); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_widget_show (button); + /* the blend color space */ + combo = gimp_prop_enum_combo_box_new (config, "gradient-blend-color-space", + 0, 0); + gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), + _("Blend Color Space")); + g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL); + gtk_box_pack_start (GTK_BOX (vbox), combo, TRUE, TRUE, 0); + gtk_widget_show (combo); + /* the gradient type menu */ combo = gimp_prop_enum_combo_box_new (config, "gradient-type", 0, 0); gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Shape")); @@ -306,9 +317,9 @@ gimp_blend_options_gui (GimpToolOptions *tool_options) gtk_widget_show (combo); g_signal_connect (config, "notify::gradient-type", - G_CALLBACK (blend_options_metric_gradient_type_notify), + G_CALLBACK (gradient_options_metric_gradient_type_notify), combo); - blend_options_metric_gradient_type_notify (options, NULL, combo); + gradient_options_metric_gradient_type_notify (options, NULL, combo); /* the repeat option */ combo = gimp_prop_enum_combo_box_new (config, "gradient-repeat", 0, 0); @@ -318,9 +329,9 @@ gimp_blend_options_gui (GimpToolOptions *tool_options) gtk_widget_show (combo); g_signal_connect (config, "notify::gradient-type", - G_CALLBACK (blend_options_repeat_gradient_type_notify), + G_CALLBACK (gradient_options_repeat_gradient_type_notify), combo); - blend_options_repeat_gradient_type_notify (options, NULL, combo); + gradient_options_repeat_gradient_type_notify (options, NULL, combo); /* the offset scale */ scale = gimp_prop_spin_scale_new (config, "offset", NULL, @@ -400,18 +411,18 @@ gimp_blend_options_gui (GimpToolOptions *tool_options) } static void -blend_options_repeat_gradient_type_notify (GimpBlendOptions *options, - GParamSpec *pspec, - GtkWidget *repeat_combo) +gradient_options_repeat_gradient_type_notify (GimpGradientOptions *options, + GParamSpec *pspec, + GtkWidget *repeat_combo) { gtk_widget_set_sensitive (repeat_combo, options->gradient_type < GIMP_GRADIENT_SHAPEBURST_ANGULAR); } static void -blend_options_metric_gradient_type_notify (GimpBlendOptions *options, - GParamSpec *pspec, - GtkWidget *repeat_combo) +gradient_options_metric_gradient_type_notify (GimpGradientOptions *options, + GParamSpec *pspec, + GtkWidget *repeat_combo) { gtk_widget_set_sensitive (repeat_combo, options->gradient_type >= GIMP_GRADIENT_SHAPEBURST_ANGULAR && diff --git a/app/tools/gimpblendoptions.h b/app/tools/gimpgradientoptions.h similarity index 52% rename from app/tools/gimpblendoptions.h rename to app/tools/gimpgradientoptions.h index 7974a78e0a..0a6e596ccd 100644 --- a/app/tools/gimpblendoptions.h +++ b/app/tools/gimpgradientoptions.h @@ -15,27 +15,27 @@ * along with this program. If not, see . */ -#ifndef __GIMP_BLEND_OPTIONS_H__ -#define __GIMP_BLEND_OPTIONS_H__ +#ifndef __GIMP_GRADIENT_OPTIONS_H__ +#define __GIMP_GRADIENT_OPTIONS_H__ #include "paint/gimppaintoptions.h" -#define GIMP_TYPE_BLEND_OPTIONS (gimp_blend_options_get_type ()) -#define GIMP_BLEND_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BLEND_OPTIONS, GimpBlendOptions)) -#define GIMP_BLEND_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BLEND_OPTIONS, GimpBlendOptionsClass)) -#define GIMP_IS_BLEND_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BLEND_OPTIONS)) -#define GIMP_IS_BLEND_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BLEND_OPTIONS)) -#define GIMP_BLEND_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BLEND_OPTIONS, GimpBlendOptionsClass)) +#define GIMP_TYPE_GRADIENT_OPTIONS (gimp_gradient_options_get_type ()) +#define GIMP_GRADIENT_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GRADIENT_OPTIONS, GimpGradientOptions)) +#define GIMP_GRADIENT_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GRADIENT_OPTIONS, GimpGradientOptionsClass)) +#define GIMP_IS_GRADIENT_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GRADIENT_OPTIONS)) +#define GIMP_IS_GRADIENT_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GRADIENT_OPTIONS)) +#define GIMP_GRADIENT_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_GRADIENT_OPTIONS, GimpGradientOptionsClass)) -typedef struct _GimpBlendOptions GimpBlendOptions; -typedef struct _GimpPaintOptionsClass GimpBlendOptionsClass; +typedef struct _GimpGradientOptions GimpGradientOptions; +typedef struct _GimpPaintOptionsClass GimpGradientOptionsClass; -struct _GimpBlendOptions +struct _GimpGradientOptions { - GimpPaintOptions paint_options; + GimpPaintOptions paint_options; gdouble offset; GimpGradientType gradient_type; @@ -57,9 +57,9 @@ struct _GimpBlendOptions }; -GType gimp_blend_options_get_type (void) G_GNUC_CONST; +GType gimp_gradient_options_get_type (void) G_GNUC_CONST; -GtkWidget * gimp_blend_options_gui (GimpToolOptions *tool_options); +GtkWidget * gimp_gradient_options_gui (GimpToolOptions *tool_options); -#endif /* __GIMP_BLEND_OPTIONS_H__ */ +#endif /* __GIMP_GRADIENT_OPTIONS_H__ */ diff --git a/app/tools/gimpgradienttool-editor.c b/app/tools/gimpgradienttool-editor.c new file mode 100644 index 0000000000..ab284c97bd --- /dev/null +++ b/app/tools/gimpgradienttool-editor.c @@ -0,0 +1,2517 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "config.h" + +#include +#include +#include + +#include "libgimpbase/gimpbase.h" +#include "libgimpmath/gimpmath.h" +#include "libgimpwidgets/gimpwidgets.h" + +#include "tools-types.h" + +#include "operations/gimp-operation-config.h" + +#include "core/gimpdata.h" +#include "core/gimpgradient.h" +#include "core/gimp-gradients.h" +#include "core/gimpimage.h" + +#include "widgets/gimpcolorpanel.h" +#include "widgets/gimpeditor.h" +#include "widgets/gimpwidgets-utils.h" + +#include "display/gimpdisplay.h" +#include "display/gimpdisplayshell.h" +#include "display/gimptoolgui.h" +#include "display/gimptoolline.h" + +#include "gimpgradientoptions.h" +#include "gimpgradienttool.h" +#include "gimpgradienttool-editor.h" + +#include "gimp-intl.h" + + +#define EPSILON 2e-10 + + +typedef enum +{ + DIRECTION_NONE, + DIRECTION_LEFT, + DIRECTION_RIGHT +} Direction; + + +typedef struct +{ + /* line endpoints at the beginning of the operation */ + gdouble start_x; + gdouble start_y; + gdouble end_x; + gdouble end_y; + + /* copy of the gradient at the beginning of the operation, owned by the gradient + * info, or NULL, if the gradient isn't affected + */ + GimpGradient *gradient; + + /* handle added by the operation, or HANDLE_NONE */ + gint added_handle; + /* handle removed by the operation, or HANDLE_NONE */ + gint removed_handle; + /* selected handle at the end of the operation, or HANDLE_NONE */ + gint selected_handle; +} GradientInfo; + + +/* local function prototypes */ + +static gboolean gimp_gradient_tool_editor_line_can_add_slider (GimpToolLine *line, + gdouble value, + GimpGradientTool *gradient_tool); +static gint gimp_gradient_tool_editor_line_add_slider (GimpToolLine *line, + gdouble value, + GimpGradientTool *gradient_tool); +static void gimp_gradient_tool_editor_line_prepare_to_remove_slider (GimpToolLine *line, + gint slider, + gboolean remove, + GimpGradientTool *gradient_tool); +static void gimp_gradient_tool_editor_line_remove_slider (GimpToolLine *line, + gint slider, + GimpGradientTool *gradient_tool); +static void gimp_gradient_tool_editor_line_selection_changed (GimpToolLine *line, + GimpGradientTool *gradient_tool); +static gboolean gimp_gradient_tool_editor_line_handle_clicked (GimpToolLine *line, + gint handle, + GdkModifierType state, + GimpButtonPressType press_type, + GimpGradientTool *gradient_tool); + +static void gimp_gradient_tool_editor_gui_response (GimpToolGui *gui, + gint response_id, + GimpGradientTool *gradient_tool); + +static void gimp_gradient_tool_editor_color_entry_color_clicked (GimpColorButton *button, + GimpGradientTool *gradient_tool); +static void gimp_gradient_tool_editor_color_entry_color_changed (GimpColorButton *button, + GimpGradientTool *gradient_tool); +static void gimp_gradient_tool_editor_color_entry_color_response (GimpColorButton *button, + GimpColorDialogState state, + GimpGradientTool *gradient_tool); + +static void gimp_gradient_tool_editor_color_entry_type_changed (GtkComboBox *combo, + GimpGradientTool *gradient_tool); + +static void gimp_gradient_tool_editor_endpoint_se_value_changed (GimpSizeEntry *se, + GimpGradientTool *gradient_tool); + +static void gimp_gradient_tool_editor_stop_se_value_changed (GimpSizeEntry *se, + GimpGradientTool *gradient_tool); + +static void gimp_gradient_tool_editor_stop_delete_clicked (GtkWidget *button, + GimpGradientTool *gradient_tool); + +static void gimp_gradient_tool_editor_midpoint_se_value_changed (GimpSizeEntry *se, + GimpGradientTool *gradient_tool); + +static void gimp_gradient_tool_editor_midpoint_type_changed (GtkComboBox *combo, + GimpGradientTool *gradient_tool); + +static void gimp_gradient_tool_editor_midpoint_color_changed (GtkComboBox *combo, + GimpGradientTool *gradient_tool); + +static void gimp_gradient_tool_editor_midpoint_new_stop_clicked (GtkWidget *button, + GimpGradientTool *gradient_tool); +static void gimp_gradient_tool_editor_midpoint_center_clicked (GtkWidget *button, + GimpGradientTool *gradient_tool); + +static gboolean gimp_gradient_tool_editor_flush_idle (GimpGradientTool *gradient_tool); + +static gboolean gimp_gradient_tool_editor_is_gradient_editable (GimpGradientTool *gradient_tool); + +static gboolean gimp_gradient_tool_editor_handle_is_endpoint (GimpGradientTool *gradient_tool, + gint handle); +static gboolean gimp_gradient_tool_editor_handle_is_stop (GimpGradientTool *gradient_tool, + gint handle); +static gboolean gimp_gradient_tool_editor_handle_is_midpoint (GimpGradientTool *gradient_tool, + gint handle); +static GimpGradientSegment * gimp_gradient_tool_editor_handle_get_segment (GimpGradientTool *gradient_tool, + gint handle); + +static void gimp_gradient_tool_editor_block_handlers (GimpGradientTool *gradient_tool); +static void gimp_gradient_tool_editor_unblock_handlers (GimpGradientTool *gradient_tool); +static gboolean gimp_gradient_tool_editor_are_handlers_blocked (GimpGradientTool *gradient_tool); + +static void gimp_gradient_tool_editor_freeze_gradient (GimpGradientTool *gradient_tool); +static void gimp_gradient_tool_editor_thaw_gradient (GimpGradientTool *gradient_tool); + +static gint gimp_gradient_tool_editor_add_stop (GimpGradientTool *gradient_tool, + gdouble value); +static void gimp_gradient_tool_editor_delete_stop (GimpGradientTool *gradient_tool, + gint slider); +static gint gimp_gradient_tool_editor_midpoint_to_stop (GimpGradientTool *gradient_tool, + gint slider); + +static void gimp_gradient_tool_editor_update_sliders (GimpGradientTool *gradient_tool); + +static void gimp_gradient_tool_editor_purge_gradient_history (GSList **stack); +static void gimp_gradient_tool_editor_purge_gradient (GimpGradientTool *gradient_tool); + +static GtkWidget * gimp_gradient_tool_editor_color_entry_new (GimpGradientTool *gradient_tool, + const gchar *title, + Direction direction, + GtkWidget *chain_button, + GtkWidget **color_panel, + GtkWidget **type_combo); +static void gimp_gradient_tool_editor_init_endpoint_gui (GimpGradientTool *gradient_tool); +static void gimp_gradient_tool_editor_init_stop_gui (GimpGradientTool *gradient_tool); +static void gimp_gradient_tool_editor_init_midpoint_gui (GimpGradientTool *gradient_tool); +static void gimp_gradient_tool_editor_update_endpoint_gui (GimpGradientTool *gradient_tool, + gint selection); +static void gimp_gradient_tool_editor_update_stop_gui (GimpGradientTool *gradient_tool, + gint selection); +static void gimp_gradient_tool_editor_update_midpoint_gui (GimpGradientTool *gradient_tool, + gint selection); +static void gimp_gradient_tool_editor_update_gui (GimpGradientTool *gradient_tool); + +static GradientInfo * gimp_gradient_tool_editor_gradient_info_new (GimpGradientTool *gradient_tool); +static void gimp_gradient_tool_editor_gradient_info_free (GradientInfo *info); +static void gimp_gradient_tool_editor_gradient_info_apply (GimpGradientTool *gradient_tool, + const GradientInfo *info, + gboolean set_selection); +static gboolean gimp_gradient_tool_editor_gradient_info_is_trivial (GimpGradientTool *gradient_tool, + const GradientInfo *info); + + +/* private functions */ + + +static gboolean +gimp_gradient_tool_editor_line_can_add_slider (GimpToolLine *line, + gdouble value, + GimpGradientTool *gradient_tool) +{ + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool); + gdouble offset = options->offset / 100.0; + + return gimp_gradient_tool_editor_is_gradient_editable (gradient_tool) && + value >= offset; +} + +static gint +gimp_gradient_tool_editor_line_add_slider (GimpToolLine *line, + gdouble value, + GimpGradientTool *gradient_tool) +{ + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool); + GimpPaintOptions *paint_options = GIMP_PAINT_OPTIONS (options); + gdouble offset = options->offset / 100.0; + + /* adjust slider value according to the offset */ + value = (value - offset) / (1.0 - offset); + + /* flip the slider value, if necessary */ + if (paint_options->gradient_options->gradient_reverse) + value = 1.0 - value; + + return gimp_gradient_tool_editor_add_stop (gradient_tool, value); +} + +static void +gimp_gradient_tool_editor_line_prepare_to_remove_slider (GimpToolLine *line, + gint slider, + gboolean remove, + GimpGradientTool *gradient_tool) +{ + if (remove) + { + GradientInfo *info; + GimpGradient *tentative_gradient; + + /* show a tentative gradient, demonstrating the result of actually + * removing the slider + */ + + info = gradient_tool->undo_stack->data; + + if (info->added_handle == slider) + { + /* see comment in gimp_gradient_tool_editor_delete_stop() */ + + gimp_assert (info->gradient != NULL); + + tentative_gradient = g_object_ref (info->gradient); + } + else + { + GimpGradientSegment *seg; + gint i; + + tentative_gradient = + GIMP_GRADIENT (gimp_data_duplicate (GIMP_DATA (gradient_tool->gradient))); + + seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, slider); + + i = gimp_gradient_segment_range_get_n_segments (gradient_tool->gradient, + gradient_tool->gradient->segments, + seg) - 1; + + seg = gimp_gradient_segment_get_nth (tentative_gradient->segments, i); + + gimp_gradient_segment_range_merge (tentative_gradient, + seg, seg->next, NULL, NULL); + } + + gimp_gradient_tool_set_tentative_gradient (gradient_tool, tentative_gradient); + + g_object_unref (tentative_gradient); + } + else + { + gimp_gradient_tool_set_tentative_gradient (gradient_tool, NULL); + } +} + +static void +gimp_gradient_tool_editor_line_remove_slider (GimpToolLine *line, + gint slider, + GimpGradientTool *gradient_tool) +{ + gimp_gradient_tool_editor_delete_stop (gradient_tool, slider); + gimp_gradient_tool_set_tentative_gradient (gradient_tool, NULL); +} + +static void +gimp_gradient_tool_editor_line_selection_changed (GimpToolLine *line, + GimpGradientTool *gradient_tool) +{ + gint selection; + + selection = + gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget)); + + if (gradient_tool->gui) + { + /* hide all color dialogs */ + gimp_color_panel_dialog_response ( + GIMP_COLOR_PANEL (gradient_tool->endpoint_color_panel), + GIMP_COLOR_DIALOG_OK); + gimp_color_panel_dialog_response ( + GIMP_COLOR_PANEL (gradient_tool->stop_left_color_panel), + GIMP_COLOR_DIALOG_OK); + gimp_color_panel_dialog_response ( + GIMP_COLOR_PANEL (gradient_tool->stop_right_color_panel), + GIMP_COLOR_DIALOG_OK); + + /* reset the stop colors chain button */ + if (gimp_gradient_tool_editor_handle_is_stop (gradient_tool, selection)) + { + const GimpGradientSegment *seg; + gboolean homogeneous; + + seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, + selection); + + homogeneous = seg->right_color.r == seg->next->left_color.r && + seg->right_color.g == seg->next->left_color.g && + seg->right_color.b == seg->next->left_color.b && + seg->right_color.a == seg->next->left_color.a && + seg->right_color_type == seg->next->left_color_type; + + gimp_chain_button_set_active ( + GIMP_CHAIN_BUTTON (gradient_tool->stop_chain_button), homogeneous); + } + } + + gimp_gradient_tool_editor_update_gui (gradient_tool); +} + +static gboolean +gimp_gradient_tool_editor_line_handle_clicked (GimpToolLine *line, + gint handle, + GdkModifierType state, + GimpButtonPressType press_type, + GimpGradientTool *gradient_tool) +{ + if (gimp_gradient_tool_editor_handle_is_midpoint (gradient_tool, handle)) + { + if (press_type == GIMP_BUTTON_PRESS_DOUBLE && + gimp_gradient_tool_editor_is_gradient_editable (gradient_tool)) + { + gint stop; + + stop = gimp_gradient_tool_editor_midpoint_to_stop (gradient_tool, handle); + + gimp_tool_line_set_selection (line, stop); + + /* return FALSE, so that the new slider can be dragged immediately */ + return FALSE; + } + } + + return FALSE; +} + + +static void +gimp_gradient_tool_editor_gui_response (GimpToolGui *gui, + gint response_id, + GimpGradientTool *gradient_tool) +{ + switch (response_id) + { + default: + gimp_tool_line_set_selection (GIMP_TOOL_LINE (gradient_tool->widget), + GIMP_TOOL_LINE_HANDLE_NONE); + break; + } +} + +static void +gimp_gradient_tool_editor_color_entry_color_clicked (GimpColorButton *button, + GimpGradientTool *gradient_tool) +{ + gimp_gradient_tool_editor_start_edit (gradient_tool); +} + +static void +gimp_gradient_tool_editor_color_entry_color_changed (GimpColorButton *button, + GimpGradientTool *gradient_tool) +{ + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool); + GimpPaintOptions *paint_options = GIMP_PAINT_OPTIONS (options); + gint selection; + GimpRGB color; + Direction direction; + GtkWidget *chain_button; + GimpGradientSegment *seg; + + if (gimp_gradient_tool_editor_are_handlers_blocked (gradient_tool)) + return; + + selection = + gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget)); + + gimp_color_button_get_color (button, &color); + + direction = + GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), + "gimp-gradient-tool-editor-direction")); + chain_button = g_object_get_data (G_OBJECT (button), + "gimp-gradient-tool-editor-chain-button"); + + gimp_gradient_tool_editor_start_edit (gradient_tool); + gimp_gradient_tool_editor_freeze_gradient (gradient_tool); + + /* swap the endpoint handles, if necessary */ + if (paint_options->gradient_options->gradient_reverse) + { + switch (selection) + { + case GIMP_TOOL_LINE_HANDLE_START: + selection = GIMP_TOOL_LINE_HANDLE_END; + break; + + case GIMP_TOOL_LINE_HANDLE_END: + selection = GIMP_TOOL_LINE_HANDLE_START; + break; + } + } + + seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, selection); + + switch (selection) + { + case GIMP_TOOL_LINE_HANDLE_START: + seg->left_color = color; + seg->left_color_type = GIMP_GRADIENT_COLOR_FIXED; + break; + + case GIMP_TOOL_LINE_HANDLE_END: + seg->right_color = color; + seg->right_color_type = GIMP_GRADIENT_COLOR_FIXED; + break; + + default: + if (direction == DIRECTION_LEFT || + (chain_button && + gimp_chain_button_get_active (GIMP_CHAIN_BUTTON (chain_button)))) + { + seg->right_color = color; + seg->right_color_type = GIMP_GRADIENT_COLOR_FIXED; + } + + if (direction == DIRECTION_RIGHT || + (chain_button && + gimp_chain_button_get_active (GIMP_CHAIN_BUTTON (chain_button)))) + { + seg->next->left_color = color; + seg->next->left_color_type = GIMP_GRADIENT_COLOR_FIXED; + } + } + + gimp_gradient_tool_editor_thaw_gradient (gradient_tool); + gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE); +} + +static void +gimp_gradient_tool_editor_color_entry_color_response (GimpColorButton *button, + GimpColorDialogState state, + GimpGradientTool *gradient_tool) +{ + gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE); +} + +static void +gimp_gradient_tool_editor_color_entry_type_changed (GtkComboBox *combo, + GimpGradientTool *gradient_tool) +{ + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool); + GimpPaintOptions *paint_options = GIMP_PAINT_OPTIONS (options); + gint selection; + gint color_type; + Direction direction; + GtkWidget *chain_button; + GimpGradientSegment *seg; + + if (gimp_gradient_tool_editor_are_handlers_blocked (gradient_tool)) + return; + + selection = + gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget)); + + if (! gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (combo), &color_type)) + return; + + direction = + GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo), + "gimp-gradient-tool-editor-direction")); + chain_button = g_object_get_data (G_OBJECT (combo), + "gimp-gradient-tool-editor-chain-button"); + + gimp_gradient_tool_editor_start_edit (gradient_tool); + gimp_gradient_tool_editor_freeze_gradient (gradient_tool); + + /* swap the endpoint handles, if necessary */ + if (paint_options->gradient_options->gradient_reverse) + { + switch (selection) + { + case GIMP_TOOL_LINE_HANDLE_START: + selection = GIMP_TOOL_LINE_HANDLE_END; + break; + + case GIMP_TOOL_LINE_HANDLE_END: + selection = GIMP_TOOL_LINE_HANDLE_START; + break; + } + } + + seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, selection); + + switch (selection) + { + case GIMP_TOOL_LINE_HANDLE_START: + seg->left_color_type = color_type; + break; + + case GIMP_TOOL_LINE_HANDLE_END: + seg->right_color_type = color_type; + break; + + default: + if (direction == DIRECTION_LEFT || + (chain_button && + gimp_chain_button_get_active (GIMP_CHAIN_BUTTON (chain_button)))) + { + seg->right_color_type = color_type; + } + + if (direction == DIRECTION_RIGHT || + (chain_button && + gimp_chain_button_get_active (GIMP_CHAIN_BUTTON (chain_button)))) + { + seg->next->left_color_type = color_type; + } + } + + gimp_gradient_tool_editor_thaw_gradient (gradient_tool); + gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE); +} + +static void +gimp_gradient_tool_editor_endpoint_se_value_changed (GimpSizeEntry *se, + GimpGradientTool *gradient_tool) +{ + gint selection; + gdouble x; + gdouble y; + + if (gimp_gradient_tool_editor_are_handlers_blocked (gradient_tool)) + return; + + selection = + gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget)); + + x = gimp_size_entry_get_refval (se, 0); + y = gimp_size_entry_get_refval (se, 1); + + gimp_gradient_tool_editor_start_edit (gradient_tool); + gimp_gradient_tool_editor_block_handlers (gradient_tool); + + switch (selection) + { + case GIMP_TOOL_LINE_HANDLE_START: + g_object_set (gradient_tool->widget, + "x1", x, + "y1", y, + NULL); + break; + + case GIMP_TOOL_LINE_HANDLE_END: + g_object_set (gradient_tool->widget, + "x2", x, + "y2", y, + NULL); + break; + + default: + gimp_assert_not_reached (); + } + + gimp_gradient_tool_editor_unblock_handlers (gradient_tool); + gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE); +} + +static void +gimp_gradient_tool_editor_stop_se_value_changed (GimpSizeEntry *se, + GimpGradientTool *gradient_tool) +{ + gint selection; + gdouble value; + GimpGradientSegment *seg; + + if (gimp_gradient_tool_editor_are_handlers_blocked (gradient_tool)) + return; + + selection = + gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget)); + + if (selection == GIMP_TOOL_LINE_HANDLE_NONE) + return; + + value = gimp_size_entry_get_refval (se, 0) / 100.0; + + gimp_gradient_tool_editor_start_edit (gradient_tool); + gimp_gradient_tool_editor_freeze_gradient (gradient_tool); + + seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, selection); + + gimp_gradient_segment_range_compress (gradient_tool->gradient, + seg, seg, + seg->left, value); + gimp_gradient_segment_range_compress (gradient_tool->gradient, + seg->next, seg->next, + value, seg->next->right); + + gimp_gradient_tool_editor_thaw_gradient (gradient_tool); + gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE); +} + +static void +gimp_gradient_tool_editor_stop_delete_clicked (GtkWidget *button, + GimpGradientTool *gradient_tool) +{ + gint selection; + + selection = + gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget)); + + gimp_gradient_tool_editor_delete_stop (gradient_tool, selection); +} + +static void +gimp_gradient_tool_editor_midpoint_se_value_changed (GimpSizeEntry *se, + GimpGradientTool *gradient_tool) +{ + gint selection; + gdouble value; + GimpGradientSegment *seg; + + if (gimp_gradient_tool_editor_are_handlers_blocked (gradient_tool)) + return; + + selection = + gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget)); + + if (selection == GIMP_TOOL_LINE_HANDLE_NONE) + return; + + value = gimp_size_entry_get_refval (se, 0) / 100.0; + + gimp_gradient_tool_editor_start_edit (gradient_tool); + gimp_gradient_tool_editor_freeze_gradient (gradient_tool); + + seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, selection); + + seg->middle = value; + + gimp_gradient_tool_editor_thaw_gradient (gradient_tool); + gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE); +} + +static void +gimp_gradient_tool_editor_midpoint_type_changed (GtkComboBox *combo, + GimpGradientTool *gradient_tool) +{ + gint selection; + gint type; + GimpGradientSegment *seg; + + if (gimp_gradient_tool_editor_are_handlers_blocked (gradient_tool)) + return; + + selection = + gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget)); + + if (! gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (combo), &type)) + return; + + gimp_gradient_tool_editor_start_edit (gradient_tool); + gimp_gradient_tool_editor_freeze_gradient (gradient_tool); + + seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, selection); + + seg->type = type; + + gimp_gradient_tool_editor_thaw_gradient (gradient_tool); + gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE); +} + +static void +gimp_gradient_tool_editor_midpoint_color_changed (GtkComboBox *combo, + GimpGradientTool *gradient_tool) +{ + gint selection; + gint color; + GimpGradientSegment *seg; + + if (gimp_gradient_tool_editor_are_handlers_blocked (gradient_tool)) + return; + + selection = + gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget)); + + if (! gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (combo), &color)) + return; + + gimp_gradient_tool_editor_start_edit (gradient_tool); + gimp_gradient_tool_editor_freeze_gradient (gradient_tool); + + seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, selection); + + seg->color = color; + + gimp_gradient_tool_editor_thaw_gradient (gradient_tool); + gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE); +} + +static void +gimp_gradient_tool_editor_midpoint_new_stop_clicked (GtkWidget *button, + GimpGradientTool *gradient_tool) +{ + gint selection; + gint stop; + + selection = + gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget)); + + stop = gimp_gradient_tool_editor_midpoint_to_stop (gradient_tool, selection); + + gimp_tool_line_set_selection (GIMP_TOOL_LINE (gradient_tool->widget), stop); +} + +static void +gimp_gradient_tool_editor_midpoint_center_clicked (GtkWidget *button, + GimpGradientTool *gradient_tool) +{ + gint selection; + GimpGradientSegment *seg; + + selection = + gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget)); + + gimp_gradient_tool_editor_start_edit (gradient_tool); + gimp_gradient_tool_editor_freeze_gradient (gradient_tool); + + seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, selection); + + gimp_gradient_segment_range_recenter_handles (gradient_tool->gradient, seg, seg); + + gimp_gradient_tool_editor_thaw_gradient (gradient_tool); + gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE); +} + +static gboolean +gimp_gradient_tool_editor_flush_idle (GimpGradientTool *gradient_tool) +{ + GimpDisplay *display = GIMP_TOOL (gradient_tool)->display; + + gimp_image_flush (gimp_display_get_image (display)); + + gradient_tool->flush_idle_id = 0; + + return G_SOURCE_REMOVE; +} + +static gboolean +gimp_gradient_tool_editor_is_gradient_editable (GimpGradientTool *gradient_tool) +{ + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool); + + return ! options->modify_active || + gimp_data_is_writable (GIMP_DATA (gradient_tool->gradient)); +} + +static gboolean +gimp_gradient_tool_editor_handle_is_endpoint (GimpGradientTool *gradient_tool, + gint handle) +{ + return handle == GIMP_TOOL_LINE_HANDLE_START || + handle == GIMP_TOOL_LINE_HANDLE_END; +} + +static gboolean +gimp_gradient_tool_editor_handle_is_stop (GimpGradientTool *gradient_tool, + gint handle) +{ + gint n_sliders; + + gimp_tool_line_get_sliders (GIMP_TOOL_LINE (gradient_tool->widget), &n_sliders); + + return handle >= 0 && handle < n_sliders / 2; +} + +static gboolean +gimp_gradient_tool_editor_handle_is_midpoint (GimpGradientTool *gradient_tool, + gint handle) +{ + gint n_sliders; + + gimp_tool_line_get_sliders (GIMP_TOOL_LINE (gradient_tool->widget), &n_sliders); + + return handle >= n_sliders / 2; +} + +static GimpGradientSegment * +gimp_gradient_tool_editor_handle_get_segment (GimpGradientTool *gradient_tool, + gint handle) +{ + switch (handle) + { + case GIMP_TOOL_LINE_HANDLE_START: + return gradient_tool->gradient->segments; + + case GIMP_TOOL_LINE_HANDLE_END: + return gimp_gradient_segment_get_last (gradient_tool->gradient->segments); + + default: + { + const GimpControllerSlider *sliders; + gint n_sliders; + gint seg_i; + + sliders = gimp_tool_line_get_sliders (GIMP_TOOL_LINE (gradient_tool->widget), + &n_sliders); + + gimp_assert (handle >= 0 && handle < n_sliders); + + seg_i = GPOINTER_TO_INT (sliders[handle].data); + + return gimp_gradient_segment_get_nth (gradient_tool->gradient->segments, + seg_i); + } + } +} + +static void +gimp_gradient_tool_editor_block_handlers (GimpGradientTool *gradient_tool) +{ + gradient_tool->block_handlers_count++; +} + +static void +gimp_gradient_tool_editor_unblock_handlers (GimpGradientTool *gradient_tool) +{ + gimp_assert (gradient_tool->block_handlers_count > 0); + + gradient_tool->block_handlers_count--; +} + +static gboolean +gimp_gradient_tool_editor_are_handlers_blocked (GimpGradientTool *gradient_tool) +{ + return gradient_tool->block_handlers_count > 0; +} + +static void +gimp_gradient_tool_editor_freeze_gradient (GimpGradientTool *gradient_tool) +{ + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool); + GimpGradient *custom; + GradientInfo *info; + + gimp_gradient_tool_editor_block_handlers (gradient_tool); + + custom = gimp_gradients_get_custom (GIMP_CONTEXT (options)->gimp); + + if (gradient_tool->gradient == custom || options->modify_active) + { + gimp_assert (gimp_gradient_tool_editor_is_gradient_editable (gradient_tool)); + + gimp_data_freeze (GIMP_DATA (gradient_tool->gradient)); + } + else + { + /* copy the active gradient to the custom gradient, and make the custom + * gradient active. + */ + gimp_data_freeze (GIMP_DATA (custom)); + + gimp_data_copy (GIMP_DATA (custom), GIMP_DATA (gradient_tool->gradient)); + + gimp_context_set_gradient (GIMP_CONTEXT (options), custom); + + gimp_assert (gradient_tool->gradient == custom); + gimp_assert (gimp_gradient_tool_editor_is_gradient_editable (gradient_tool)); + } + + if (gradient_tool->edit_count > 0) + { + info = gradient_tool->undo_stack->data; + + if (! info->gradient) + { + info->gradient = + GIMP_GRADIENT (gimp_data_duplicate (GIMP_DATA (gradient_tool->gradient))); + } + } +} + +static void +gimp_gradient_tool_editor_thaw_gradient (GimpGradientTool *gradient_tool) +{ + gimp_data_thaw (GIMP_DATA (gradient_tool->gradient)); + + gimp_gradient_tool_editor_update_sliders (gradient_tool); + gimp_gradient_tool_editor_update_gui (gradient_tool); + + gimp_gradient_tool_editor_unblock_handlers (gradient_tool); +} + +static gint +gimp_gradient_tool_editor_add_stop (GimpGradientTool *gradient_tool, + gdouble value) +{ + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool); + GimpPaintOptions *paint_options = GIMP_PAINT_OPTIONS (options); + GimpGradientSegment *seg; + gint stop; + GradientInfo *info; + + gimp_gradient_tool_editor_start_edit (gradient_tool); + gimp_gradient_tool_editor_freeze_gradient (gradient_tool); + + gimp_gradient_split_at (gradient_tool->gradient, + GIMP_CONTEXT (options), NULL, value, + paint_options->gradient_options->gradient_blend_color_space, + &seg, NULL); + + stop = + gimp_gradient_segment_range_get_n_segments (gradient_tool->gradient, + gradient_tool->gradient->segments, + seg) - 1; + + info = gradient_tool->undo_stack->data; + info->added_handle = stop; + + gimp_gradient_tool_editor_thaw_gradient (gradient_tool); + gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE); + + return stop; +} + +static void +gimp_gradient_tool_editor_delete_stop (GimpGradientTool *gradient_tool, + gint slider) +{ + GradientInfo *info; + + gimp_assert (gimp_gradient_tool_editor_handle_is_stop (gradient_tool, slider)); + + gimp_gradient_tool_editor_start_edit (gradient_tool); + gimp_gradient_tool_editor_freeze_gradient (gradient_tool); + + info = gradient_tool->undo_stack->data; + + if (info->added_handle == slider) + { + /* when removing a stop that was added as part of the current action, + * restore the original gradient at the beginning of the action, rather + * than deleting the stop from the current gradient, so that the affected + * midpoint returns to its state at the beginning of the action, instead + * of being reset. + * + * note that this assumes that the gradient hasn't changed in any other + * way during the action, which is ugly, but currently always true. + */ + + gimp_assert (info->gradient != NULL); + + gimp_data_copy (GIMP_DATA (gradient_tool->gradient), + GIMP_DATA (info->gradient)); + + g_clear_object (&info->gradient); + + info->added_handle = GIMP_TOOL_LINE_HANDLE_NONE; + } + else + { + GimpGradientSegment *seg; + + seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, slider); + + gimp_gradient_segment_range_merge (gradient_tool->gradient, + seg, seg->next, NULL, NULL); + + info->removed_handle = slider; + } + + gimp_gradient_tool_editor_thaw_gradient (gradient_tool); + gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE); +} + +static gint +gimp_gradient_tool_editor_midpoint_to_stop (GimpGradientTool *gradient_tool, + gint slider) +{ + const GimpControllerSlider *sliders; + + gimp_assert (gimp_gradient_tool_editor_handle_is_midpoint (gradient_tool, slider)); + + sliders = gimp_tool_line_get_sliders (GIMP_TOOL_LINE (gradient_tool->widget), + NULL); + + if (sliders[slider].value > sliders[slider].min + EPSILON && + sliders[slider].value < sliders[slider].max - EPSILON) + { + const GimpGradientSegment *seg; + gint stop; + GradientInfo *info; + + seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, slider); + + stop = gimp_gradient_tool_editor_add_stop (gradient_tool, seg->middle); + + info = gradient_tool->undo_stack->data; + info->removed_handle = slider; + + slider = stop; + } + + return slider; +} + +static void +gimp_gradient_tool_editor_update_sliders (GimpGradientTool *gradient_tool) +{ + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool); + GimpPaintOptions *paint_options = GIMP_PAINT_OPTIONS (options); + gdouble offset = options->offset / 100.0; + gboolean editable; + GimpControllerSlider *sliders; + gint n_sliders; + gint n_segments; + GimpGradientSegment *seg; + GimpControllerSlider *slider; + gint i; + + if (! gradient_tool->widget || options->instant) + return; + + editable = gimp_gradient_tool_editor_is_gradient_editable (gradient_tool); + + n_segments = gimp_gradient_segment_range_get_n_segments ( + gradient_tool->gradient, gradient_tool->gradient->segments, NULL); + + n_sliders = (n_segments - 1) + /* gradient stops, between each adjacent + * pair of segments */ + (n_segments); /* midpoints, inside each segment */ + + sliders = g_new (GimpControllerSlider, n_sliders); + + slider = sliders; + + /* initialize the gradient-stop sliders */ + for (seg = gradient_tool->gradient->segments, i = 0; + seg->next; + seg = seg->next, i++) + { + *slider = GIMP_CONTROLLER_SLIDER_DEFAULT; + + slider->value = seg->right; + slider->min = seg->left; + slider->max = seg->next->right; + + slider->movable = editable; + slider->removable = editable; + + slider->data = GINT_TO_POINTER (i); + + slider++; + } + + /* initialize the midpoint sliders */ + for (seg = gradient_tool->gradient->segments, i = 0; + seg; + seg = seg->next, i++) + { + *slider = GIMP_CONTROLLER_SLIDER_DEFAULT; + + slider->value = seg->middle; + slider->min = seg->left; + slider->max = seg->right; + + /* hide midpoints of zero-length segments, since they'd otherwise + * prevent the segment's endpoints from being selected + */ + slider->visible = fabs (slider->max - slider->min) > EPSILON; + slider->movable = editable; + + slider->autohide = TRUE; + slider->type = GIMP_HANDLE_FILLED_CIRCLE; + slider->size = 0.6; + + slider->data = GINT_TO_POINTER (i); + + slider++; + } + + /* flip the slider limits and values, if necessary */ + if (paint_options->gradient_options->gradient_reverse) + { + for (i = 0; i < n_sliders; i++) + { + gdouble temp; + + sliders[i].value = 1.0 - sliders[i].value; + temp = sliders[i].min; + sliders[i].min = 1.0 - sliders[i].max; + sliders[i].max = 1.0 - temp; + } + } + + /* adjust the sliders according to the offset */ + for (i = 0; i < n_sliders; i++) + { + sliders[i].value = (1.0 - offset) * sliders[i].value + offset; + sliders[i].min = (1.0 - offset) * sliders[i].min + offset; + sliders[i].max = (1.0 - offset) * sliders[i].max + offset; + } + + /* avoid updating the gradient in gimp_gradient_tool_editor_line_changed() */ + gimp_gradient_tool_editor_block_handlers (gradient_tool); + + gimp_tool_line_set_sliders (GIMP_TOOL_LINE (gradient_tool->widget), + sliders, n_sliders); + + gimp_gradient_tool_editor_unblock_handlers (gradient_tool); + + g_free (sliders); +} + +static void +gimp_gradient_tool_editor_purge_gradient_history (GSList **stack) +{ + GSList *link; + + /* eliminate all history steps that modify the gradient */ + while ((link = *stack)) + { + GradientInfo *info = link->data; + + if (info->gradient) + { + gimp_gradient_tool_editor_gradient_info_free (info); + + *stack = g_slist_delete_link (*stack, link); + } + else + { + stack = &link->next; + } + } +} + +static void +gimp_gradient_tool_editor_purge_gradient (GimpGradientTool *gradient_tool) +{ + if (gradient_tool->widget) + { + gimp_gradient_tool_editor_update_sliders (gradient_tool); + + gimp_tool_line_set_selection (GIMP_TOOL_LINE (gradient_tool->widget), + GIMP_TOOL_LINE_HANDLE_NONE); + } + + gimp_gradient_tool_editor_purge_gradient_history (&gradient_tool->undo_stack); + gimp_gradient_tool_editor_purge_gradient_history (&gradient_tool->redo_stack); +} + +static GtkWidget * +gimp_gradient_tool_editor_color_entry_new (GimpGradientTool *gradient_tool, + const gchar *title, + Direction direction, + GtkWidget *chain_button, + GtkWidget **color_panel, + GtkWidget **type_combo) +{ + GimpContext *context = GIMP_CONTEXT (GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool)); + GtkWidget *hbox; + GtkWidget *button; + GtkWidget *combo; + GimpRGB color = {}; + + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); + + /* the color panel */ + *color_panel = button = gimp_color_panel_new (title, &color, + GIMP_COLOR_AREA_SMALL_CHECKS, + 24, 24); + gimp_color_button_set_update (GIMP_COLOR_BUTTON (button), TRUE); + gimp_color_panel_set_context (GIMP_COLOR_PANEL (button), context); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); + gtk_widget_show (button); + + g_object_set_data (G_OBJECT (button), + "gimp-gradient-tool-editor-direction", + GINT_TO_POINTER (direction)); + g_object_set_data (G_OBJECT (button), + "gimp-gradient-tool-editor-chain-button", + chain_button); + + g_signal_connect (button, "clicked", + G_CALLBACK (gimp_gradient_tool_editor_color_entry_color_clicked), + gradient_tool); + g_signal_connect (button, "color-changed", + G_CALLBACK (gimp_gradient_tool_editor_color_entry_color_changed), + gradient_tool); + g_signal_connect (button, "response", + G_CALLBACK (gimp_gradient_tool_editor_color_entry_color_response), + gradient_tool); + + /* the color type combo */ + *type_combo = combo = gimp_enum_combo_box_new (GIMP_TYPE_GRADIENT_COLOR); + gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, TRUE, 0); + gtk_widget_show (combo); + + g_object_set_data (G_OBJECT (combo), + "gimp-gradient-tool-editor-direction", + GINT_TO_POINTER (direction)); + g_object_set_data (G_OBJECT (combo), + "gimp-gradient-tool-editor-chain-button", + chain_button); + + g_signal_connect (combo, "changed", + G_CALLBACK (gimp_gradient_tool_editor_color_entry_type_changed), + gradient_tool); + + return hbox; +} + +static void +gimp_gradient_tool_editor_init_endpoint_gui (GimpGradientTool *gradient_tool) +{ + GimpDisplay *display = GIMP_TOOL (gradient_tool)->display; + GimpDisplayShell *shell = gimp_display_get_shell (display); + GimpImage *image = gimp_display_get_image (display); + gdouble xres; + gdouble yres; + GtkWidget *editor; + GtkWidget *table; + GtkWidget *label; + GtkWidget *spinbutton; + GtkWidget *se; + GtkWidget *hbox; + gint row = 0; + + gimp_image_get_resolution (image, &xres, &yres); + + /* the endpoint editor */ + gradient_tool->endpoint_editor = + editor = gimp_editor_new (); + gtk_box_pack_start (GTK_BOX (gimp_tool_gui_get_vbox (gradient_tool->gui)), + editor, FALSE, TRUE, 0); + + /* the main table */ + table = gtk_table_new (1, 2, FALSE); + gtk_table_set_row_spacings (GTK_TABLE (table), 4); + gtk_table_set_col_spacings (GTK_TABLE (table), 4); + gtk_box_pack_start (GTK_BOX (editor), table, FALSE, TRUE, 0); + gtk_widget_show (table); + + /* the position labels */ + label = gtk_label_new (_("X:")); + gtk_label_set_xalign (GTK_LABEL (label), 0.0); + gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, + GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); + gtk_widget_show (label); + + label = gtk_label_new (_("Y:")); + gtk_label_set_xalign (GTK_LABEL (label), 0.0); + gtk_table_attach (GTK_TABLE (table), label, 0, 1, row + 1, row + 2, + GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); + gtk_widget_show (label); + + /* the position size entry */ + spinbutton = gtk_spin_button_new_with_range (0.0, 0.0, 1.0); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); + gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 6); + + gradient_tool->endpoint_se = + se = gimp_size_entry_new (1, GIMP_UNIT_PIXEL, "%a", + TRUE, TRUE, FALSE, 6, + GIMP_SIZE_ENTRY_UPDATE_SIZE); + gtk_table_set_row_spacings (GTK_TABLE (se), 4); + gtk_table_set_col_spacings (GTK_TABLE (se), 2); + + gimp_size_entry_add_field (GIMP_SIZE_ENTRY (se), + GTK_SPIN_BUTTON (spinbutton), NULL); + gtk_table_attach_defaults (GTK_TABLE (se), spinbutton, 1, 2, 0, 1); + gtk_widget_show (spinbutton); + + gtk_table_attach (GTK_TABLE (table), se, 1, 2, row, row + 2, + GTK_SHRINK | GTK_FILL | GTK_EXPAND, + GTK_SHRINK | GTK_FILL, + 0, 0); + gtk_widget_show (se); + + gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (se), shell->unit); + + gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (se), 0, xres, FALSE); + gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (se), 1, yres, FALSE); + + gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (se), 0, + -GIMP_MAX_IMAGE_SIZE, + GIMP_MAX_IMAGE_SIZE); + gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (se), 1, + -GIMP_MAX_IMAGE_SIZE, + GIMP_MAX_IMAGE_SIZE); + + gimp_size_entry_set_size (GIMP_SIZE_ENTRY (se), 0, + 0, gimp_image_get_width (image)); + gimp_size_entry_set_size (GIMP_SIZE_ENTRY (se), 1, + 0, gimp_image_get_height (image)); + + g_signal_connect (se, "value-changed", + G_CALLBACK (gimp_gradient_tool_editor_endpoint_se_value_changed), + gradient_tool); + + row += 2; + + /* the color label */ + label = gtk_label_new (_("Color:")); + gtk_label_set_xalign (GTK_LABEL (label), 0.0); + gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, + GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); + gtk_widget_show (label); + + /* the color entry */ + hbox = gimp_gradient_tool_editor_color_entry_new ( + gradient_tool, _("Change Endpoint Color"), DIRECTION_NONE, NULL, + &gradient_tool->endpoint_color_panel, &gradient_tool->endpoint_type_combo); + gtk_table_attach (GTK_TABLE (table), hbox, 1, 2, row, row + 1, + GTK_SHRINK | GTK_FILL | GTK_EXPAND, + GTK_SHRINK | GTK_FILL, + 0, 0); + gtk_widget_show (hbox); + + row++; +} + +static void +gimp_gradient_tool_editor_init_stop_gui (GimpGradientTool *gradient_tool) +{ + GtkWidget *editor; + GtkWidget *table; + GtkWidget *label; + GtkWidget *se; + GtkWidget *table2; + GtkWidget *button; + GtkWidget *hbox; + GtkWidget *separator; + gint row = 0; + + /* the stop editor */ + gradient_tool->stop_editor = + editor = gimp_editor_new (); + gtk_box_pack_start (GTK_BOX (gimp_tool_gui_get_vbox (gradient_tool->gui)), + editor, FALSE, TRUE, 0); + + /* the main table */ + table = gtk_table_new (1, 2, FALSE); + gtk_table_set_row_spacings (GTK_TABLE (table), 4); + gtk_table_set_col_spacings (GTK_TABLE (table), 4); + gtk_box_pack_start (GTK_BOX (editor), table, FALSE, TRUE, 0); + gtk_widget_show (table); + + /* the position label */ + label = gtk_label_new (_("Position:")); + gtk_label_set_xalign (GTK_LABEL (label), 0.0); + gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, + GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); + gtk_widget_show (label); + + /* the position size entry */ + gradient_tool->stop_se = + se = gimp_size_entry_new (1, GIMP_UNIT_PERCENT, "%a", + FALSE, TRUE, FALSE, 6, + GIMP_SIZE_ENTRY_UPDATE_SIZE); + gimp_size_entry_show_unit_menu (GIMP_SIZE_ENTRY (se), FALSE); + gtk_table_attach (GTK_TABLE (table), se, 1, 2, row, row + 1, + GTK_SHRINK | GTK_FILL | GTK_EXPAND, + GTK_SHRINK | GTK_FILL, + 0, 0); + gtk_widget_show (se); + + g_signal_connect (se, "value-changed", + G_CALLBACK (gimp_gradient_tool_editor_stop_se_value_changed), + gradient_tool); + + row++; + + /* the color labels */ + label = gtk_label_new (_("Left color:")); + gtk_label_set_xalign (GTK_LABEL (label), 0.0); + gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, + GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); + gtk_widget_show (label); + + label = gtk_label_new (_("Right color:")); + gtk_label_set_xalign (GTK_LABEL (label), 0.0); + gtk_table_attach (GTK_TABLE (table), label, 0, 1, row + 1, row + 2, + GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); + gtk_widget_show (label); + + /* the color entries table */ + table2 = gtk_table_new (1, 2, FALSE); + gtk_table_set_row_spacings (GTK_TABLE (table2), 4); + gtk_table_set_col_spacings (GTK_TABLE (table2), 2); + gtk_table_attach (GTK_TABLE (table), table2, 1, 2, row, row + 2, + GTK_SHRINK | GTK_FILL | GTK_EXPAND, + GTK_SHRINK | GTK_FILL, + 0, 0); + gtk_widget_show (table2); + + /* the color entries chain button */ + gradient_tool->stop_chain_button = + button = gimp_chain_button_new (GIMP_CHAIN_RIGHT); + gtk_table_attach (GTK_TABLE (table2), button, 1, 2, 0, 2, + GTK_SHRINK | GTK_FILL, + GTK_SHRINK | GTK_FILL | GTK_EXPAND, + 0, 0); + gtk_widget_show (button); + + /* the color entries */ + hbox = gimp_gradient_tool_editor_color_entry_new ( + gradient_tool, _("Change Stop Color"), DIRECTION_LEFT, button, + &gradient_tool->stop_left_color_panel, &gradient_tool->stop_left_type_combo); + gtk_table_attach (GTK_TABLE (table2), hbox, 0, 1, 0, 1, + GTK_SHRINK | GTK_FILL | GTK_EXPAND, + GTK_SHRINK | GTK_FILL, + 0, 0); + gtk_widget_show (hbox); + + hbox = gimp_gradient_tool_editor_color_entry_new ( + gradient_tool, _("Change Stop Color"), DIRECTION_RIGHT, button, + &gradient_tool->stop_right_color_panel, &gradient_tool->stop_right_type_combo); + gtk_table_attach (GTK_TABLE (table2), hbox, 0, 1, 1, 2, + GTK_SHRINK | GTK_FILL | GTK_EXPAND, + GTK_SHRINK | GTK_FILL, + 0, 0); + gtk_widget_show (hbox); + + row += 2; + + /* the action buttons separator */ + separator = gtk_hseparator_new (); + gtk_table_attach (GTK_TABLE (table), separator, 0, 2, row, row + 1, + GTK_SHRINK | GTK_FILL | GTK_EXPAND, + GTK_SHRINK | GTK_FILL, + 0, 0); + gtk_widget_show (separator); + + row++; + + /* the delete button */ + gimp_editor_add_button (GIMP_EDITOR (editor), + GIMP_ICON_EDIT_DELETE, _("Delete stop"), + NULL, + G_CALLBACK (gimp_gradient_tool_editor_stop_delete_clicked), + NULL, gradient_tool); +} + +static void +gimp_gradient_tool_editor_init_midpoint_gui (GimpGradientTool *gradient_tool) +{ + GtkWidget *editor; + GtkWidget *table; + GtkWidget *label; + GtkWidget *se; + GtkWidget *combo; + GtkWidget *separator; + gint row = 0; + + /* the stop editor */ + gradient_tool->midpoint_editor = + editor = gimp_editor_new (); + gtk_box_pack_start (GTK_BOX (gimp_tool_gui_get_vbox (gradient_tool->gui)), + editor, FALSE, TRUE, 0); + + /* the main table */ + table = gtk_table_new (1, 2, FALSE); + gtk_table_set_row_spacings (GTK_TABLE (table), 4); + gtk_table_set_col_spacings (GTK_TABLE (table), 4); + gtk_box_pack_start (GTK_BOX (editor), table, FALSE, TRUE, 0); + gtk_widget_show (table); + + /* the position label */ + label = gtk_label_new (_("Position:")); + gtk_label_set_xalign (GTK_LABEL (label), 0.0); + gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, + GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); + gtk_widget_show (label); + + /* the position size entry */ + gradient_tool->midpoint_se = + se = gimp_size_entry_new (1, GIMP_UNIT_PERCENT, "%a", + FALSE, TRUE, FALSE, 6, + GIMP_SIZE_ENTRY_UPDATE_SIZE); + gimp_size_entry_show_unit_menu (GIMP_SIZE_ENTRY (se), FALSE); + gtk_table_attach (GTK_TABLE (table), se, 1, 2, row, row + 1, + GTK_SHRINK | GTK_FILL | GTK_EXPAND, + GTK_SHRINK | GTK_FILL, + 0, 0); + gtk_widget_show (se); + + g_signal_connect (se, "value-changed", + G_CALLBACK (gimp_gradient_tool_editor_midpoint_se_value_changed), + gradient_tool); + + row++; + + /* the type label */ + label = gtk_label_new (_("Blending:")); + gtk_label_set_xalign (GTK_LABEL (label), 0.0); + gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, + GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); + gtk_widget_show (label); + + /* the type combo */ + gradient_tool->midpoint_type_combo = + combo = gimp_enum_combo_box_new (GIMP_TYPE_GRADIENT_SEGMENT_TYPE); + gtk_table_attach (GTK_TABLE (table), combo, 1, 2, row, row + 1, + GTK_SHRINK | GTK_FILL | GTK_EXPAND, + GTK_SHRINK | GTK_FILL, + 0, 0); + gtk_widget_show (combo); + + g_signal_connect (combo, "changed", + G_CALLBACK (gimp_gradient_tool_editor_midpoint_type_changed), + gradient_tool); + + row++; + + /* the color label */ + label = gtk_label_new (_("Coloring:")); + gtk_label_set_xalign (GTK_LABEL (label), 0.0); + gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, + GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); + gtk_widget_show (label); + + /* the color combo */ + gradient_tool->midpoint_color_combo = + combo = gimp_enum_combo_box_new (GIMP_TYPE_GRADIENT_SEGMENT_COLOR); + gtk_table_attach (GTK_TABLE (table), combo, 1, 2, row, row + 1, + GTK_SHRINK | GTK_FILL | GTK_EXPAND, + GTK_SHRINK | GTK_FILL, + 0, 0); + gtk_widget_show (combo); + + g_signal_connect (combo, "changed", + G_CALLBACK (gimp_gradient_tool_editor_midpoint_color_changed), + gradient_tool); + + row++; + + /* the action buttons separator */ + separator = gtk_hseparator_new (); + gtk_table_attach (GTK_TABLE (table), separator, 0, 2, row, row + 1, + GTK_SHRINK | GTK_FILL | GTK_EXPAND, + GTK_SHRINK | GTK_FILL, + 0, 0); + gtk_widget_show (separator); + + row++; + + /* the new stop button */ + gradient_tool->midpoint_new_stop_button = + gimp_editor_add_button (GIMP_EDITOR (editor), + GIMP_ICON_DOCUMENT_NEW, _("New stop at midpoint"), + NULL, + G_CALLBACK (gimp_gradient_tool_editor_midpoint_new_stop_clicked), + NULL, gradient_tool); + + /* the center button */ + gradient_tool->midpoint_center_button = + gimp_editor_add_button (GIMP_EDITOR (editor), + GIMP_ICON_CENTER_HORIZONTAL, _("Center midpoint"), + NULL, + G_CALLBACK (gimp_gradient_tool_editor_midpoint_center_clicked), + NULL, gradient_tool); +} + +static void +gimp_gradient_tool_editor_update_endpoint_gui (GimpGradientTool *gradient_tool, + gint selection) +{ + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool); + GimpPaintOptions *paint_options = GIMP_PAINT_OPTIONS (options); + GimpContext *context = GIMP_CONTEXT (options); + gboolean editable; + GimpGradientSegment *seg; + const gchar *title; + gdouble x; + gdouble y; + GimpRGB color; + GimpGradientColor color_type; + + editable = gimp_gradient_tool_editor_is_gradient_editable (gradient_tool); + + switch (selection) + { + case GIMP_TOOL_LINE_HANDLE_START: + g_object_get (gradient_tool->widget, + "x1", &x, + "y1", &y, + NULL); + break; + + case GIMP_TOOL_LINE_HANDLE_END: + g_object_get (gradient_tool->widget, + "x2", &x, + "y2", &y, + NULL); + break; + + default: + gimp_assert_not_reached (); + } + + /* swap the endpoint handles, if necessary */ + if (paint_options->gradient_options->gradient_reverse) + { + switch (selection) + { + case GIMP_TOOL_LINE_HANDLE_START: + selection = GIMP_TOOL_LINE_HANDLE_END; + break; + + case GIMP_TOOL_LINE_HANDLE_END: + selection = GIMP_TOOL_LINE_HANDLE_START; + break; + } + } + + seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, selection); + + switch (selection) + { + case GIMP_TOOL_LINE_HANDLE_START: + title = _("Start Endpoint"); + + gimp_gradient_segment_get_left_flat_color (gradient_tool->gradient, context, + seg, &color); + color_type = seg->left_color_type; + break; + + case GIMP_TOOL_LINE_HANDLE_END: + title = _("End Endpoint"); + + gimp_gradient_segment_get_right_flat_color (gradient_tool->gradient, context, + seg, &color); + color_type = seg->right_color_type; + break; + + default: + gimp_assert_not_reached (); + } + + gimp_tool_gui_set_title (gradient_tool->gui, title); + + gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (gradient_tool->endpoint_se), 0, x); + gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (gradient_tool->endpoint_se), 1, y); + + gimp_color_button_set_color ( + GIMP_COLOR_BUTTON (gradient_tool->endpoint_color_panel), &color); + gimp_int_combo_box_set_active ( + GIMP_INT_COMBO_BOX (gradient_tool->endpoint_type_combo), color_type); + + gtk_widget_set_sensitive (gradient_tool->endpoint_color_panel, editable); + gtk_widget_set_sensitive (gradient_tool->endpoint_type_combo, editable); + + gtk_widget_show (gradient_tool->endpoint_editor); +} + +static void +gimp_gradient_tool_editor_update_stop_gui (GimpGradientTool *gradient_tool, + gint selection) +{ + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool); + GimpContext *context = GIMP_CONTEXT (options); + gboolean editable; + GimpGradientSegment *seg; + gint index; + gchar *title; + gdouble min; + gdouble max; + gdouble value; + GimpRGB left_color; + GimpGradientColor left_color_type; + GimpRGB right_color; + GimpGradientColor right_color_type; + + editable = gimp_gradient_tool_editor_is_gradient_editable (gradient_tool); + + seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, selection); + + index = GPOINTER_TO_INT ( + gimp_tool_line_get_sliders (GIMP_TOOL_LINE (gradient_tool->widget), + NULL)[selection].data); + + title = g_strdup_printf (_("Stop %d"), index + 1); + + min = seg->left; + max = seg->next->right; + value = seg->right; + + gimp_gradient_segment_get_right_flat_color (gradient_tool->gradient, context, + seg, &left_color); + left_color_type = seg->right_color_type; + + gimp_gradient_segment_get_left_flat_color (gradient_tool->gradient, context, + seg->next, &right_color); + right_color_type = seg->next->left_color_type; + + gimp_tool_gui_set_title (gradient_tool->gui, title); + + gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (gradient_tool->stop_se), + 0, 100.0 * min, 100.0 * max); + gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (gradient_tool->stop_se), + 0, 100.0 * value); + + gimp_color_button_set_color ( + GIMP_COLOR_BUTTON (gradient_tool->stop_left_color_panel), &left_color); + gimp_int_combo_box_set_active ( + GIMP_INT_COMBO_BOX (gradient_tool->stop_left_type_combo), left_color_type); + + gimp_color_button_set_color ( + GIMP_COLOR_BUTTON (gradient_tool->stop_right_color_panel), &right_color); + gimp_int_combo_box_set_active ( + GIMP_INT_COMBO_BOX (gradient_tool->stop_right_type_combo), right_color_type); + + gtk_widget_set_sensitive (gradient_tool->stop_se, editable); + gtk_widget_set_sensitive (gradient_tool->stop_left_color_panel, editable); + gtk_widget_set_sensitive (gradient_tool->stop_left_type_combo, editable); + gtk_widget_set_sensitive (gradient_tool->stop_right_color_panel, editable); + gtk_widget_set_sensitive (gradient_tool->stop_right_type_combo, editable); + gtk_widget_set_sensitive (gradient_tool->stop_chain_button, editable); + gtk_widget_set_sensitive ( + GTK_WIDGET (gimp_editor_get_button_box (GIMP_EDITOR (gradient_tool->stop_editor))), + editable); + + g_free (title); + + gtk_widget_show (gradient_tool->stop_editor); +} + +static void +gimp_gradient_tool_editor_update_midpoint_gui (GimpGradientTool *gradient_tool, + gint selection) +{ + gboolean editable; + const GimpGradientSegment *seg; + gint index; + gchar *title; + gdouble min; + gdouble max; + gdouble value; + GimpGradientSegmentType type; + GimpGradientSegmentColor color; + + editable = gimp_gradient_tool_editor_is_gradient_editable (gradient_tool); + + seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, selection); + + index = GPOINTER_TO_INT ( + gimp_tool_line_get_sliders (GIMP_TOOL_LINE (gradient_tool->widget), + NULL)[selection].data); + + title = g_strdup_printf (_("Midpoint %d"), index + 1); + + min = seg->left; + max = seg->right; + value = seg->middle; + type = seg->type; + color = seg->color; + + gimp_tool_gui_set_title (gradient_tool->gui, title); + + gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (gradient_tool->midpoint_se), + 0, 100.0 * min, 100.0 * max); + gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (gradient_tool->midpoint_se), + 0, 100.0 * value); + + gimp_int_combo_box_set_active ( + GIMP_INT_COMBO_BOX (gradient_tool->midpoint_type_combo), type); + + gimp_int_combo_box_set_active ( + GIMP_INT_COMBO_BOX (gradient_tool->midpoint_color_combo), color); + + gtk_widget_set_sensitive (gradient_tool->midpoint_new_stop_button, + value > min + EPSILON && value < max - EPSILON); + gtk_widget_set_sensitive (gradient_tool->midpoint_center_button, + fabs (value - (min + max) / 2.0) > EPSILON); + + gtk_widget_set_sensitive (gradient_tool->midpoint_se, editable); + gtk_widget_set_sensitive (gradient_tool->midpoint_type_combo, editable); + gtk_widget_set_sensitive (gradient_tool->midpoint_color_combo, editable); + gtk_widget_set_sensitive ( + GTK_WIDGET (gimp_editor_get_button_box (GIMP_EDITOR (gradient_tool->midpoint_editor))), + editable); + + g_free (title); + + gtk_widget_show (gradient_tool->midpoint_editor); +} + +static void +gimp_gradient_tool_editor_update_gui (GimpGradientTool *gradient_tool) +{ + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool); + + if (gradient_tool->gradient && gradient_tool->widget && ! options->instant) + { + gint selection; + + selection = + gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget)); + + if (selection != GIMP_TOOL_LINE_HANDLE_NONE) + { + if (! gradient_tool->gui) + { + GimpDisplayShell *shell; + + shell = gimp_tool_widget_get_shell (gradient_tool->widget); + + gradient_tool->gui = + gimp_tool_gui_new (GIMP_TOOL (gradient_tool)->tool_info, + NULL, NULL, NULL, NULL, + gtk_widget_get_screen (GTK_WIDGET (shell)), + gimp_widget_get_monitor (GTK_WIDGET (shell)), + TRUE, + + _("_Close"), GTK_RESPONSE_CLOSE, + + NULL); + + gimp_tool_gui_set_shell (gradient_tool->gui, shell); + gimp_tool_gui_set_viewable (gradient_tool->gui, + GIMP_VIEWABLE (gradient_tool->gradient)); + gimp_tool_gui_set_auto_overlay (gradient_tool->gui, TRUE); + + g_signal_connect (gradient_tool->gui, "response", + G_CALLBACK (gimp_gradient_tool_editor_gui_response), + gradient_tool); + + gimp_gradient_tool_editor_init_endpoint_gui (gradient_tool); + gimp_gradient_tool_editor_init_stop_gui (gradient_tool); + gimp_gradient_tool_editor_init_midpoint_gui (gradient_tool); + } + + gimp_gradient_tool_editor_block_handlers (gradient_tool); + + if (gimp_gradient_tool_editor_handle_is_endpoint (gradient_tool, selection)) + gimp_gradient_tool_editor_update_endpoint_gui (gradient_tool, selection); + else + gtk_widget_hide (gradient_tool->endpoint_editor); + + if (gimp_gradient_tool_editor_handle_is_stop (gradient_tool, selection)) + gimp_gradient_tool_editor_update_stop_gui (gradient_tool, selection); + else + gtk_widget_hide (gradient_tool->stop_editor); + + if (gimp_gradient_tool_editor_handle_is_midpoint (gradient_tool, selection)) + gimp_gradient_tool_editor_update_midpoint_gui (gradient_tool, selection); + else + gtk_widget_hide (gradient_tool->midpoint_editor); + + gimp_gradient_tool_editor_unblock_handlers (gradient_tool); + + gimp_tool_gui_show (gradient_tool->gui); + + return; + } + } + + if (gradient_tool->gui) + gimp_tool_gui_hide (gradient_tool->gui); +} + +static GradientInfo * +gimp_gradient_tool_editor_gradient_info_new (GimpGradientTool *gradient_tool) +{ + GradientInfo *info = g_slice_new (GradientInfo); + + info->start_x = gradient_tool->start_x; + info->start_y = gradient_tool->start_y; + info->end_x = gradient_tool->end_x; + info->end_y = gradient_tool->end_y; + + info->gradient = NULL; + + info->added_handle = GIMP_TOOL_LINE_HANDLE_NONE; + info->removed_handle = GIMP_TOOL_LINE_HANDLE_NONE; + info->selected_handle = GIMP_TOOL_LINE_HANDLE_NONE; + + return info; +} + +static void +gimp_gradient_tool_editor_gradient_info_free (GradientInfo *info) +{ + if (info->gradient) + g_object_unref (info->gradient); + + g_slice_free (GradientInfo, info); +} + +static void +gimp_gradient_tool_editor_gradient_info_apply (GimpGradientTool *gradient_tool, + const GradientInfo *info, + gboolean set_selection) +{ + gint selection; + + gimp_assert (gradient_tool->widget != NULL); + gimp_assert (gradient_tool->gradient != NULL); + + /* pick the handle to select */ + if (info->gradient) + { + if (info->removed_handle != GIMP_TOOL_LINE_HANDLE_NONE) + { + /* we're undoing a stop-deletion or midpoint-to-stop operation; + * select the removed handle + */ + selection = info->removed_handle; + } + else if (info->added_handle != GIMP_TOOL_LINE_HANDLE_NONE) + { + /* we're undoing a stop addition operation */ + gimp_assert (gimp_gradient_tool_editor_handle_is_stop (gradient_tool, + info->added_handle)); + + selection = + gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget)); + + /* if the selected handle is a stop... */ + if (gimp_gradient_tool_editor_handle_is_stop (gradient_tool, selection)) + { + /* if the added handle is selected, clear the selection */ + if (selection == info->added_handle) + selection = GIMP_TOOL_LINE_HANDLE_NONE; + /* otherwise, keep the currently selected stop, possibly + * adjusting its handle index + */ + else if (selection > info->added_handle) + selection--; + } + /* otherwise, if the selected handle is a midpoint... */ + else if (gimp_gradient_tool_editor_handle_is_midpoint (gradient_tool, selection)) + { + const GimpControllerSlider *sliders; + gint seg_i; + + sliders = + gimp_tool_line_get_sliders (GIMP_TOOL_LINE (gradient_tool->widget), + NULL); + + seg_i = GPOINTER_TO_INT (sliders[selection].data); + + /* if the midpoint belongs to one of the two segments incident to + * the added stop, clear the selection + */ + if (seg_i == info->added_handle || + seg_i == info->added_handle + 1) + { + selection = GIMP_TOOL_LINE_HANDLE_NONE; + } + /* otherwise, keep the currently selected stop, adjusting its + * handle index + */ + else + { + /* midpoint handles follow stop handles; since we removed a + * stop, we must decrement the handle index + */ + selection--; + + if (seg_i > info->added_handle) + selection--; + } + } + /* otherwise, don't change the selection */ + else + { + set_selection = FALSE; + } + } + else if (info->selected_handle != GIMP_TOOL_LINE_HANDLE_NONE) + { + /* we're undoing a property change operation; select the handle + * corresponding to the affected object + */ + selection = info->selected_handle; + } + else + { + /* something went wrong... */ + g_warn_if_reached (); + + set_selection = FALSE; + } + } + else if ((info->start_x != gradient_tool->start_x || + info->start_y != gradient_tool->start_y) && + (info->end_x == gradient_tool->end_x && + info->end_y == gradient_tool->end_y)) + { + /* we're undoing a start-endpoint move operation; select the start + * endpoint + */ + selection = GIMP_TOOL_LINE_HANDLE_START; + } + else if ((info->end_x != gradient_tool->end_x || + info->end_y != gradient_tool->end_y) && + (info->start_x == gradient_tool->start_x && + info->start_y == gradient_tool->start_y)) + + { + /* we're undoing am end-endpoint move operation; select the end + * endpoint + */ + selection = GIMP_TOOL_LINE_HANDLE_END; + } + else + { + /* we're undoing a line move operation; don't change the selection */ + set_selection = FALSE; + } + + gimp_gradient_tool_editor_block_handlers (gradient_tool); + + g_object_set (gradient_tool->widget, + "x1", info->start_x, + "y1", info->start_y, + "x2", info->end_x, + "y2", info->end_y, + NULL); + + if (info->gradient) + { + gimp_gradient_tool_editor_freeze_gradient (gradient_tool); + + gimp_data_copy (GIMP_DATA (gradient_tool->gradient), + GIMP_DATA (info->gradient)); + + gimp_gradient_tool_editor_thaw_gradient (gradient_tool); + } + + if (set_selection) + { + gimp_tool_line_set_selection (GIMP_TOOL_LINE (gradient_tool->widget), + selection); + } + + gimp_gradient_tool_editor_update_gui (gradient_tool); + + gimp_gradient_tool_editor_unblock_handlers (gradient_tool); +} + +static gboolean +gimp_gradient_tool_editor_gradient_info_is_trivial (GimpGradientTool *gradient_tool, + const GradientInfo *info) +{ + const GimpGradientSegment *seg1; + const GimpGradientSegment *seg2; + + if (info->start_x != gradient_tool->start_x || + info->start_y != gradient_tool->start_y || + info->end_x != gradient_tool->end_x || + info->end_y != gradient_tool->end_y) + { + return FALSE; + } + + if (info->gradient) + { + for (seg1 = info->gradient->segments, seg2 = gradient_tool->gradient->segments; + seg1 && seg2; + seg1 = seg1->next, seg2 = seg2->next) + { + if (memcmp (seg1, seg2, G_STRUCT_OFFSET (GimpGradientSegment, prev))) + return FALSE; + } + + if (seg1 || seg2) + return FALSE; + } + + return TRUE; +} + + +/* public functions */ + +void +gimp_gradient_tool_editor_options_notify (GimpGradientTool *gradient_tool, + GimpToolOptions *options, + const GParamSpec *pspec) +{ + if (! strcmp (pspec->name, "modify-active")) + { + gimp_gradient_tool_editor_update_sliders (gradient_tool); + gimp_gradient_tool_editor_update_gui (gradient_tool); + } + else if (! strcmp (pspec->name, "gradient-reverse")) + { + gimp_gradient_tool_editor_update_sliders (gradient_tool); + + /* if an endpoint is selected, swap the selected endpoint */ + if (gradient_tool->widget) + { + gint selection; + + selection = + gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget)); + + switch (selection) + { + case GIMP_TOOL_LINE_HANDLE_START: + gimp_tool_line_set_selection (GIMP_TOOL_LINE (gradient_tool->widget), + GIMP_TOOL_LINE_HANDLE_END); + break; + + case GIMP_TOOL_LINE_HANDLE_END: + gimp_tool_line_set_selection (GIMP_TOOL_LINE (gradient_tool->widget), + GIMP_TOOL_LINE_HANDLE_START); + break; + } + } + } + else if (gradient_tool->render_node && + gegl_node_find_property (gradient_tool->render_node, pspec->name)) + { + gimp_gradient_tool_editor_update_sliders (gradient_tool); + } +} + +void +gimp_gradient_tool_editor_start (GimpGradientTool *gradient_tool) +{ + g_signal_connect (gradient_tool->widget, "can-add-slider", + G_CALLBACK (gimp_gradient_tool_editor_line_can_add_slider), + gradient_tool); + g_signal_connect (gradient_tool->widget, "add-slider", + G_CALLBACK (gimp_gradient_tool_editor_line_add_slider), + gradient_tool); + g_signal_connect (gradient_tool->widget, "prepare-to-remove-slider", + G_CALLBACK (gimp_gradient_tool_editor_line_prepare_to_remove_slider), + gradient_tool); + g_signal_connect (gradient_tool->widget, "remove-slider", + G_CALLBACK (gimp_gradient_tool_editor_line_remove_slider), + gradient_tool); + g_signal_connect (gradient_tool->widget, "selection-changed", + G_CALLBACK (gimp_gradient_tool_editor_line_selection_changed), + gradient_tool); + g_signal_connect (gradient_tool->widget, "handle-clicked", + G_CALLBACK (gimp_gradient_tool_editor_line_handle_clicked), + gradient_tool); +} + +void +gimp_gradient_tool_editor_halt (GimpGradientTool *gradient_tool) +{ + g_clear_object (&gradient_tool->gui); + + gradient_tool->edit_count = 0; + + if (gradient_tool->undo_stack) + { + g_slist_free_full (gradient_tool->undo_stack, + (GDestroyNotify) gimp_gradient_tool_editor_gradient_info_free); + gradient_tool->undo_stack = NULL; + } + + if (gradient_tool->redo_stack) + { + g_slist_free_full (gradient_tool->redo_stack, + (GDestroyNotify) gimp_gradient_tool_editor_gradient_info_free); + gradient_tool->redo_stack = NULL; + } + + if (gradient_tool->flush_idle_id) + { + g_source_remove (gradient_tool->flush_idle_id); + gradient_tool->flush_idle_id = 0; + } +} + +gboolean +gimp_gradient_tool_editor_line_changed (GimpGradientTool *gradient_tool) +{ + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool); + GimpPaintOptions *paint_options = GIMP_PAINT_OPTIONS (options); + gdouble offset = options->offset / 100.0; + const GimpControllerSlider *sliders; + gint n_sliders; + gint i; + GimpGradientSegment *seg; + gboolean changed = FALSE; + + if (gimp_gradient_tool_editor_are_handlers_blocked (gradient_tool)) + return FALSE; + + if (! gradient_tool->gradient || offset == 1.0) + return FALSE; + + sliders = gimp_tool_line_get_sliders (GIMP_TOOL_LINE (gradient_tool->widget), + &n_sliders); + + if (n_sliders == 0) + return FALSE; + + /* update the midpoints first, since moving the gradient stops may change the + * gradient's midpoints w.r.t. the sliders, but not the other way around. + */ + for (seg = gradient_tool->gradient->segments, i = n_sliders / 2; + seg; + seg = seg->next, i++) + { + gdouble value; + + value = sliders[i].value; + + /* adjust slider value according to the offset */ + value = (value - offset) / (1.0 - offset); + + /* flip the slider value, if necessary */ + if (paint_options->gradient_options->gradient_reverse) + value = 1.0 - value; + + if (fabs (value - seg->middle) > EPSILON) + { + if (! changed) + { + gimp_gradient_tool_editor_start_edit (gradient_tool); + gimp_gradient_tool_editor_freeze_gradient (gradient_tool); + + /* refetch the segment, since the gradient might have changed */ + seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, i); + + changed = TRUE; + } + + seg->middle = value; + } + } + + /* update the gradient stops */ + for (seg = gradient_tool->gradient->segments, i = 0; + seg->next; + seg = seg->next, i++) + { + gdouble value; + + value = sliders[i].value; + + /* adjust slider value according to the offset */ + value = (value - offset) / (1.0 - offset); + + /* flip the slider value, if necessary */ + if (paint_options->gradient_options->gradient_reverse) + value = 1.0 - value; + + if (fabs (value - seg->right) > EPSILON) + { + if (! changed) + { + gimp_gradient_tool_editor_start_edit (gradient_tool); + gimp_gradient_tool_editor_freeze_gradient (gradient_tool); + + /* refetch the segment, since the gradient might have changed */ + seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, i); + + changed = TRUE; + } + + gimp_gradient_segment_range_compress (gradient_tool->gradient, + seg, seg, + seg->left, value); + gimp_gradient_segment_range_compress (gradient_tool->gradient, + seg->next, seg->next, + value, seg->next->right); + } + } + + if (changed) + { + gimp_gradient_tool_editor_thaw_gradient (gradient_tool); + gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE); + } + + gimp_gradient_tool_editor_update_gui (gradient_tool); + + return changed; +} + +void +gimp_gradient_tool_editor_fg_bg_changed (GimpGradientTool *gradient_tool) +{ + gimp_gradient_tool_editor_update_gui (gradient_tool); +} + +void +gimp_gradient_tool_editor_gradient_dirty (GimpGradientTool *gradient_tool) +{ + if (gimp_gradient_tool_editor_are_handlers_blocked (gradient_tool)) + return; + + gimp_gradient_tool_editor_purge_gradient (gradient_tool); +} + +void +gimp_gradient_tool_editor_gradient_changed (GimpGradientTool *gradient_tool) +{ + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool); + GimpContext *context = GIMP_CONTEXT (options); + + if (options->modify_active_frame) + { + gtk_widget_set_sensitive (options->modify_active_frame, + gradient_tool->gradient != + gimp_gradients_get_custom (context->gimp)); + } + + if (options->modify_active_hint) + { + gtk_widget_set_visible (options->modify_active_hint, + gradient_tool->gradient && + ! gimp_data_is_writable (GIMP_DATA (gradient_tool->gradient))); + } + + if (gimp_gradient_tool_editor_are_handlers_blocked (gradient_tool)) + return; + + gimp_gradient_tool_editor_purge_gradient (gradient_tool); +} + +const gchar * +gimp_gradient_tool_editor_can_undo (GimpGradientTool *gradient_tool) +{ + if (! gradient_tool->undo_stack || gradient_tool->edit_count > 0) + return NULL; + + return _("Gradient Step"); +} + +const gchar * +gimp_gradient_tool_editor_can_redo (GimpGradientTool *gradient_tool) +{ + if (! gradient_tool->redo_stack || gradient_tool->edit_count > 0) + return NULL; + + return _("Gradient Step"); +} + +gboolean +gimp_gradient_tool_editor_undo (GimpGradientTool *gradient_tool) +{ + GimpTool *tool = GIMP_TOOL (gradient_tool); + GradientInfo *info; + GradientInfo *new_info; + + gimp_assert (gradient_tool->undo_stack != NULL); + gimp_assert (gradient_tool->edit_count == 0); + + info = gradient_tool->undo_stack->data; + + new_info = gimp_gradient_tool_editor_gradient_info_new (gradient_tool); + + if (info->gradient) + { + new_info->gradient = + GIMP_GRADIENT (gimp_data_duplicate (GIMP_DATA (gradient_tool->gradient))); + + /* swap the added and removed handles, so that gradient_info_apply() does + * the right thing on redo + */ + new_info->added_handle = info->removed_handle; + new_info->removed_handle = info->added_handle; + new_info->selected_handle = info->selected_handle; + } + + gradient_tool->undo_stack = g_slist_remove (gradient_tool->undo_stack, info); + gradient_tool->redo_stack = g_slist_prepend (gradient_tool->redo_stack, new_info); + + gimp_gradient_tool_editor_gradient_info_apply (gradient_tool, info, TRUE); + gimp_gradient_tool_editor_gradient_info_free (info); + + /* the initial state of the gradient tool is not useful; we might as well halt */ + if (! gradient_tool->undo_stack) + gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display); + + return TRUE; +} + +gboolean +gimp_gradient_tool_editor_redo (GimpGradientTool *gradient_tool) +{ + GradientInfo *info; + GradientInfo *new_info; + + gimp_assert (gradient_tool->redo_stack != NULL); + gimp_assert (gradient_tool->edit_count == 0); + + info = gradient_tool->redo_stack->data; + + new_info = gimp_gradient_tool_editor_gradient_info_new (gradient_tool); + + if (info->gradient) + { + new_info->gradient = + GIMP_GRADIENT (gimp_data_duplicate (GIMP_DATA (gradient_tool->gradient))); + + /* swap the added and removed handles, so that gradient_info_apply() does + * the right thing on undo + */ + new_info->added_handle = info->removed_handle; + new_info->removed_handle = info->added_handle; + new_info->selected_handle = info->selected_handle; + } + + gradient_tool->redo_stack = g_slist_remove (gradient_tool->redo_stack, info); + gradient_tool->undo_stack = g_slist_prepend (gradient_tool->undo_stack, new_info); + + gimp_gradient_tool_editor_gradient_info_apply (gradient_tool, info, TRUE); + gimp_gradient_tool_editor_gradient_info_free (info); + + return TRUE; +} + +void +gimp_gradient_tool_editor_start_edit (GimpGradientTool *gradient_tool) +{ + if (gradient_tool->edit_count++ == 0) + { + GradientInfo *info; + + info = gimp_gradient_tool_editor_gradient_info_new (gradient_tool); + + gradient_tool->undo_stack = g_slist_prepend (gradient_tool->undo_stack, info); + + /* update the undo actions / menu items */ + if (! gradient_tool->flush_idle_id) + { + gradient_tool->flush_idle_id = + g_idle_add ((GSourceFunc) gimp_gradient_tool_editor_flush_idle, + gradient_tool); + } + } +} + +void +gimp_gradient_tool_editor_end_edit (GimpGradientTool *gradient_tool, + gboolean cancel) +{ + /* can happen when halting using esc */ + if (gradient_tool->edit_count == 0) + return; + + if (--gradient_tool->edit_count == 0) + { + GradientInfo *info = gradient_tool->undo_stack->data; + + info->selected_handle = + gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget)); + + if (cancel || + gimp_gradient_tool_editor_gradient_info_is_trivial (gradient_tool, info)) + { + /* if the edit is canceled, or if nothing changed, undo the last + * step + */ + gimp_gradient_tool_editor_gradient_info_apply (gradient_tool, info, FALSE); + + gradient_tool->undo_stack = g_slist_remove (gradient_tool->undo_stack, + info); + gimp_gradient_tool_editor_gradient_info_free (info); + } + else + { + /* otherwise, blow the redo stack */ + g_slist_free_full (gradient_tool->redo_stack, + (GDestroyNotify) gimp_gradient_tool_editor_gradient_info_free); + gradient_tool->redo_stack = NULL; + } + + /* update the undo actions / menu items */ + if (! gradient_tool->flush_idle_id) + { + gradient_tool->flush_idle_id = + g_idle_add ((GSourceFunc) gimp_gradient_tool_editor_flush_idle, + gradient_tool); + } + } +} diff --git a/app/tools/gimpgradienttool-editor.h b/app/tools/gimpgradienttool-editor.h new file mode 100644 index 0000000000..d27a2fd3df --- /dev/null +++ b/app/tools/gimpgradienttool-editor.h @@ -0,0 +1,48 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __GIMP_GRADIENT_TOOL_EDITOR_H__ +#define __GIMP_GRADIENT_TOOL_EDITOR_H__ + + +void gimp_gradient_tool_editor_options_notify (GimpGradientTool *gradient_tool, + GimpToolOptions *options, + const GParamSpec *pspec); + +void gimp_gradient_tool_editor_start (GimpGradientTool *gradient_tool); +void gimp_gradient_tool_editor_halt (GimpGradientTool *gradient_tool); + +gboolean gimp_gradient_tool_editor_line_changed (GimpGradientTool *gradient_tool); + +void gimp_gradient_tool_editor_fg_bg_changed (GimpGradientTool *gradient_tool); + +void gimp_gradient_tool_editor_gradient_dirty (GimpGradientTool *gradient_tool); + +void gimp_gradient_tool_editor_gradient_changed (GimpGradientTool *gradient_tool); + +const gchar * gimp_gradient_tool_editor_can_undo (GimpGradientTool *gradient_tool); +const gchar * gimp_gradient_tool_editor_can_redo (GimpGradientTool *gradient_tool); + +gboolean gimp_gradient_tool_editor_undo (GimpGradientTool *gradient_tool); +gboolean gimp_gradient_tool_editor_redo (GimpGradientTool *gradient_tool); + +void gimp_gradient_tool_editor_start_edit (GimpGradientTool *gradient_tool); +void gimp_gradient_tool_editor_end_edit (GimpGradientTool *gradient_tool, + gboolean cancel); + + +#endif /* __GIMP_GRADIENT_TOOL_EDITOR_H__ */ diff --git a/app/tools/gimpgradienttool.c b/app/tools/gimpgradienttool.c new file mode 100644 index 0000000000..b66b15b9ff --- /dev/null +++ b/app/tools/gimpgradienttool.c @@ -0,0 +1,1073 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * Major improvements for interactivity + * Copyright (C) 2014 Michael Henning + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "config.h" + +#include +#include +#include + +#include "libgimpwidgets/gimpwidgets.h" + +#include "tools-types.h" + +#include "operations/gimp-operation-config.h" + +#include "core/gimpdrawable.h" +#include "core/gimpdrawable-gradient.h" +#include "core/gimpdrawablefilter.h" +#include "core/gimperror.h" +#include "core/gimpgradient.h" +#include "core/gimpimage.h" +#include "core/gimpprogress.h" +#include "core/gimpprojection.h" + +#include "widgets/gimphelp-ids.h" +#include "widgets/gimpwidgets-utils.h" + +#include "display/gimpdisplay.h" +#include "display/gimptoolline.h" + +#include "gimpgradientoptions.h" +#include "gimpgradienttool.h" +#include "gimpgradienttool-editor.h" +#include "gimptoolcontrol.h" + +#include "gimp-intl.h" + + +/* local function prototypes */ + +static void gimp_gradient_tool_dispose (GObject *object); + +static gboolean gimp_gradient_tool_initialize (GimpTool *tool, + GimpDisplay *display, + GError **error); +static void gimp_gradient_tool_control (GimpTool *tool, + GimpToolAction action, + GimpDisplay *display); +static void gimp_gradient_tool_button_press (GimpTool *tool, + const GimpCoords *coords, + guint32 time, + GdkModifierType state, + GimpButtonPressType press_type, + GimpDisplay *display); +static void gimp_gradient_tool_button_release (GimpTool *tool, + const GimpCoords *coords, + guint32 time, + GdkModifierType state, + GimpButtonReleaseType release_type, + GimpDisplay *display); +static void gimp_gradient_tool_motion (GimpTool *tool, + const GimpCoords *coords, + guint32 time, + GdkModifierType state, + GimpDisplay *display); +static gboolean gimp_gradient_tool_key_press (GimpTool *tool, + GdkEventKey *kevent, + GimpDisplay *display); +static void gimp_gradient_tool_modifier_key (GimpTool *tool, + GdkModifierType key, + gboolean press, + GdkModifierType state, + GimpDisplay *display); +static void gimp_gradient_tool_cursor_update (GimpTool *tool, + const GimpCoords *coords, + GdkModifierType state, + GimpDisplay *display); +static const gchar * gimp_gradient_tool_can_undo (GimpTool *tool, + GimpDisplay *display); +static const gchar * gimp_gradient_tool_can_redo (GimpTool *tool, + GimpDisplay *display); +static gboolean gimp_gradient_tool_undo (GimpTool *tool, + GimpDisplay *display); +static gboolean gimp_gradient_tool_redo (GimpTool *tool, + GimpDisplay *display); +static void gimp_gradient_tool_options_notify (GimpTool *tool, + GimpToolOptions *options, + const GParamSpec *pspec); + +static void gimp_gradient_tool_start (GimpGradientTool *gradient_tool, + const GimpCoords *coords, + GimpDisplay *display); +static void gimp_gradient_tool_halt (GimpGradientTool *gradient_tool); +static void gimp_gradient_tool_commit (GimpGradientTool *gradient_tool); + +static void gimp_gradient_tool_line_changed (GimpToolWidget *widget, + GimpGradientTool *gradient_tool); +static void gimp_gradient_tool_line_response (GimpToolWidget *widget, + gint response_id, + GimpGradientTool *gradient_tool); + +static void gimp_gradient_tool_precalc_shapeburst (GimpGradientTool *gradient_tool); + +static void gimp_gradient_tool_create_graph (GimpGradientTool *gradient_tool); +static void gimp_gradient_tool_update_graph (GimpGradientTool *gradient_tool); + +static void gimp_gradient_tool_fg_bg_changed (GimpGradientTool *gradient_tool); + +static void gimp_gradient_tool_gradient_dirty (GimpGradientTool *gradient_tool); +static void gimp_gradient_tool_set_gradient (GimpGradientTool *gradient_tool, + GimpGradient *gradient); + +static gboolean gimp_gradient_tool_is_shapeburst (GimpGradientTool *gradient_tool); + +static void gimp_gradient_tool_create_filter (GimpGradientTool *gradient_tool, + GimpDrawable *drawable); +static void gimp_gradient_tool_filter_flush (GimpDrawableFilter *filter, + GimpTool *tool); + + +G_DEFINE_TYPE (GimpGradientTool, gimp_gradient_tool, GIMP_TYPE_DRAW_TOOL) + +#define parent_class gimp_gradient_tool_parent_class + + +void +gimp_gradient_tool_register (GimpToolRegisterCallback callback, + gpointer data) +{ + (* callback) (GIMP_TYPE_GRADIENT_TOOL, + GIMP_TYPE_GRADIENT_OPTIONS, + gimp_gradient_options_gui, + GIMP_CONTEXT_PROP_MASK_FOREGROUND | + GIMP_CONTEXT_PROP_MASK_BACKGROUND | + GIMP_CONTEXT_PROP_MASK_OPACITY | + GIMP_CONTEXT_PROP_MASK_PAINT_MODE | + GIMP_CONTEXT_PROP_MASK_GRADIENT, + "gimp-gradient-tool", + _("Gradient"), + _("Gradient Tool: Fill selected area with a color gradient"), + N_("Gra_dient"), "G", + NULL, GIMP_HELP_TOOL_GRADIENT, + GIMP_ICON_TOOL_GRADIENT, + data); +} + +static void +gimp_gradient_tool_class_init (GimpGradientToolClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass); + + object_class->dispose = gimp_gradient_tool_dispose; + + tool_class->initialize = gimp_gradient_tool_initialize; + tool_class->control = gimp_gradient_tool_control; + tool_class->button_press = gimp_gradient_tool_button_press; + tool_class->button_release = gimp_gradient_tool_button_release; + tool_class->motion = gimp_gradient_tool_motion; + tool_class->key_press = gimp_gradient_tool_key_press; + tool_class->modifier_key = gimp_gradient_tool_modifier_key; + tool_class->cursor_update = gimp_gradient_tool_cursor_update; + tool_class->can_undo = gimp_gradient_tool_can_undo; + tool_class->can_redo = gimp_gradient_tool_can_redo; + tool_class->undo = gimp_gradient_tool_undo; + tool_class->redo = gimp_gradient_tool_redo; + tool_class->options_notify = gimp_gradient_tool_options_notify; +} + +static void +gimp_gradient_tool_init (GimpGradientTool *gradient_tool) +{ + GimpTool *tool = GIMP_TOOL (gradient_tool); + + gimp_tool_control_set_scroll_lock (tool->control, TRUE); + gimp_tool_control_set_preserve (tool->control, FALSE); + gimp_tool_control_set_dirty_mask (tool->control, + GIMP_DIRTY_IMAGE | + GIMP_DIRTY_IMAGE_STRUCTURE | + GIMP_DIRTY_DRAWABLE | + GIMP_DIRTY_ACTIVE_DRAWABLE); + gimp_tool_control_set_wants_click (tool->control, TRUE); + gimp_tool_control_set_wants_double_click (tool->control, TRUE); + gimp_tool_control_set_active_modifiers (tool->control, + GIMP_TOOL_ACTIVE_MODIFIERS_SEPARATE); + gimp_tool_control_set_precision (tool->control, + GIMP_CURSOR_PRECISION_SUBPIXEL); + gimp_tool_control_set_tool_cursor (tool->control, + GIMP_TOOL_CURSOR_GRADIENT); + gimp_tool_control_set_action_opacity (tool->control, + "context/context-opacity-set"); + gimp_tool_control_set_action_object_1 (tool->control, + "context/context-gradient-select-set"); + + gimp_draw_tool_set_default_status (GIMP_DRAW_TOOL (tool), + _("Click-Drag to draw a gradient")); +} + +static void +gimp_gradient_tool_dispose (GObject *object) +{ + GimpGradientTool *gradient_tool = GIMP_GRADIENT_TOOL (object); + + gimp_gradient_tool_set_gradient (gradient_tool, NULL); + + G_OBJECT_CLASS (parent_class)->dispose (object); +} + +static gboolean +gimp_gradient_tool_initialize (GimpTool *tool, + GimpDisplay *display, + GError **error) +{ + GimpImage *image = gimp_display_get_image (display); + GimpDrawable *drawable = gimp_image_get_active_drawable (image); + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (tool); + + if (! GIMP_TOOL_CLASS (parent_class)->initialize (tool, display, error)) + { + return FALSE; + } + + if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable))) + { + g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED, + _("Cannot modify the pixels of layer groups.")); + return FALSE; + } + + if (gimp_item_is_content_locked (GIMP_ITEM (drawable))) + { + g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED, + _("The active layer's pixels are locked.")); + return FALSE; + } + + if (! gimp_item_is_visible (GIMP_ITEM (drawable))) + { + g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED, + _("The active layer is not visible.")); + return FALSE; + } + + if (! gimp_context_get_gradient (GIMP_CONTEXT (options))) + { + g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED, + _("No gradient available for use with this tool.")); + return FALSE; + } + + return TRUE; +} + +static void +gimp_gradient_tool_control (GimpTool *tool, + GimpToolAction action, + GimpDisplay *display) +{ + GimpGradientTool *gradient_tool = GIMP_GRADIENT_TOOL (tool); + + switch (action) + { + case GIMP_TOOL_ACTION_PAUSE: + case GIMP_TOOL_ACTION_RESUME: + break; + + case GIMP_TOOL_ACTION_HALT: + gimp_gradient_tool_halt (gradient_tool); + break; + + case GIMP_TOOL_ACTION_COMMIT: + gimp_gradient_tool_commit (gradient_tool); + break; + } + + GIMP_TOOL_CLASS (parent_class)->control (tool, action, display); +} + +static void +gimp_gradient_tool_button_press (GimpTool *tool, + const GimpCoords *coords, + guint32 time, + GdkModifierType state, + GimpButtonPressType press_type, + GimpDisplay *display) +{ + GimpGradientTool *gradient_tool = GIMP_GRADIENT_TOOL (tool); + + if (tool->display && display != tool->display) + gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display); + + if (! gradient_tool->widget) + { + gimp_gradient_tool_start (gradient_tool, coords, display); + + gimp_tool_widget_hover (gradient_tool->widget, coords, state, TRUE); + } + + /* call start_edit() before widget_button_press(), because we need to record + * the undo state before widget_button_press() potentially changes it. note + * that if widget_button_press() return FALSE, nothing changes and no undo + * step is created. + */ + if (press_type == GIMP_BUTTON_PRESS_NORMAL) + gimp_gradient_tool_editor_start_edit (gradient_tool); + + if (gimp_tool_widget_button_press (gradient_tool->widget, coords, time, state, + press_type)) + { + gradient_tool->grab_widget = gradient_tool->widget; + } + + if (press_type == GIMP_BUTTON_PRESS_NORMAL) + gimp_tool_control_activate (tool->control); +} + +static void +gimp_gradient_tool_button_release (GimpTool *tool, + const GimpCoords *coords, + guint32 time, + GdkModifierType state, + GimpButtonReleaseType release_type, + GimpDisplay *display) +{ + GimpGradientTool *gradient_tool = GIMP_GRADIENT_TOOL (tool); + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (tool); + + gimp_tool_pop_status (tool, display); + + gimp_tool_control_halt (tool->control); + + if (gradient_tool->grab_widget) + { + gimp_tool_widget_button_release (gradient_tool->grab_widget, + coords, time, state, release_type); + gradient_tool->grab_widget = NULL; + + if (options->instant) + { + if (release_type == GIMP_BUTTON_RELEASE_CANCEL) + gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display); + else + gimp_tool_control (tool, GIMP_TOOL_ACTION_COMMIT, display); + } + } + + if (! options->instant) + { + gimp_gradient_tool_editor_end_edit (gradient_tool, + release_type == + GIMP_BUTTON_RELEASE_CANCEL); + } +} + +static void +gimp_gradient_tool_motion (GimpTool *tool, + const GimpCoords *coords, + guint32 time, + GdkModifierType state, + GimpDisplay *display) +{ + GimpGradientTool *gradient_tool = GIMP_GRADIENT_TOOL (tool); + + if (gradient_tool->grab_widget) + { + gimp_tool_widget_motion (gradient_tool->grab_widget, coords, time, state); + } +} + +static gboolean +gimp_gradient_tool_key_press (GimpTool *tool, + GdkEventKey *kevent, + GimpDisplay *display) +{ + GimpGradientTool *gradient_tool = GIMP_GRADIENT_TOOL (tool); + GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool); + gboolean result; + + /* call start_edit() before widget_key_press(), because we need to record the + * undo state before widget_key_press() potentially changes it. note that if + * widget_key_press() return FALSE, nothing changes and no undo step is + * created. + */ + if (display == draw_tool->display) + gimp_gradient_tool_editor_start_edit (gradient_tool); + + result = GIMP_TOOL_CLASS (parent_class)->key_press (tool, kevent, display); + + if (display == draw_tool->display) + gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE); + + return result; +} + +static void +gimp_gradient_tool_modifier_key (GimpTool *tool, + GdkModifierType key, + gboolean press, + GdkModifierType state, + GimpDisplay *display) +{ + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (tool); + + if (key == gimp_get_extend_selection_mask ()) + { + if (options->instant_toggle && + gtk_widget_get_sensitive (options->instant_toggle)) + { + g_object_set (options, + "instant", ! options->instant, + NULL); + } + } +} + +static void +gimp_gradient_tool_cursor_update (GimpTool *tool, + const GimpCoords *coords, + GdkModifierType state, + GimpDisplay *display) +{ + GimpImage *image = gimp_display_get_image (display); + GimpDrawable *drawable = gimp_image_get_active_drawable (image); + + if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) || + gimp_item_is_content_locked (GIMP_ITEM (drawable)) || + ! gimp_item_is_visible (GIMP_ITEM (drawable))) + { + gimp_tool_set_cursor (tool, display, + gimp_tool_control_get_cursor (tool->control), + gimp_tool_control_get_tool_cursor (tool->control), + GIMP_CURSOR_MODIFIER_BAD); + return; + } + + GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display); +} + +static const gchar * +gimp_gradient_tool_can_undo (GimpTool *tool, + GimpDisplay *display) +{ + return gimp_gradient_tool_editor_can_undo (GIMP_GRADIENT_TOOL (tool)); +} + +static const gchar * +gimp_gradient_tool_can_redo (GimpTool *tool, + GimpDisplay *display) +{ + return gimp_gradient_tool_editor_can_redo (GIMP_GRADIENT_TOOL (tool)); +} + +static gboolean +gimp_gradient_tool_undo (GimpTool *tool, + GimpDisplay *display) +{ + return gimp_gradient_tool_editor_undo (GIMP_GRADIENT_TOOL (tool)); +} + +static gboolean +gimp_gradient_tool_redo (GimpTool *tool, + GimpDisplay *display) +{ + return gimp_gradient_tool_editor_redo (GIMP_GRADIENT_TOOL (tool)); +} + +static void +gimp_gradient_tool_options_notify (GimpTool *tool, + GimpToolOptions *options, + const GParamSpec *pspec) +{ + GimpContext *context = GIMP_CONTEXT (options); + GimpGradientTool *gradient_tool = GIMP_GRADIENT_TOOL (tool); + + if (! strcmp (pspec->name, "gradient")) + { + gimp_gradient_tool_set_gradient (gradient_tool, context->gradient); + + if (gradient_tool->filter) + gimp_drawable_filter_apply (gradient_tool->filter, NULL); + } + else if (gradient_tool->render_node && + gegl_node_find_property (gradient_tool->render_node, pspec->name)) + { + /* Sync any property changes on the config object that match the op */ + GValue value = G_VALUE_INIT; + + g_value_init (&value, pspec->value_type); + + g_object_get_property (G_OBJECT (options), pspec->name, &value); + gegl_node_set_property (gradient_tool->render_node, pspec->name, &value); + + g_value_unset (&value); + + if (! strcmp (pspec->name, "gradient-type")) + { + GimpRepeatMode gradient_repeat; + GimpRepeatMode node_repeat; + GimpGradientType gradient_type; + + gradient_repeat = GIMP_PAINT_OPTIONS (options)->gradient_options->gradient_repeat; + gradient_type = GIMP_GRADIENT_OPTIONS (options)->gradient_type; + gegl_node_get (gradient_tool->render_node, + "gradient-repeat", &node_repeat, + NULL); + + if (gradient_type >= GIMP_GRADIENT_SHAPEBURST_ANGULAR) + { + /* These gradient types are only meant to work with repeat + * value of "none" so these are the only ones where we + * don't keep the render node and the gradient options in + * sync. + * We could instead reset the "gradient-repeat" value on + * GimpGradientOptions, but I assume one would want to revert + * back to the last set value if changing back the + * gradient type. So instead we just make the option + * insensitive (both in GUI and in render). + */ + if (node_repeat != GIMP_REPEAT_NONE) + gegl_node_set (gradient_tool->render_node, + "gradient-repeat", GIMP_REPEAT_NONE, + NULL); + } + else if (node_repeat != gradient_repeat) + { + gegl_node_set (gradient_tool->render_node, + "gradient-repeat", gradient_repeat, + NULL); + } + + if (gimp_gradient_tool_is_shapeburst (gradient_tool)) + gimp_gradient_tool_precalc_shapeburst (gradient_tool); + + gimp_gradient_tool_update_graph (gradient_tool); + } + + gimp_drawable_filter_apply (gradient_tool->filter, NULL); + } + else if (gradient_tool->render_node && + gimp_gradient_tool_is_shapeburst (gradient_tool) && + g_strcmp0 (pspec->name, "distance-metric") == 0) + { + g_clear_object (&gradient_tool->dist_buffer); + gimp_gradient_tool_precalc_shapeburst (gradient_tool); + gimp_gradient_tool_update_graph (gradient_tool); + gimp_drawable_filter_apply (gradient_tool->filter, NULL); + } + else if (gradient_tool->filter && + ! strcmp (pspec->name, "opacity")) + { + gimp_drawable_filter_set_opacity (gradient_tool->filter, + gimp_context_get_opacity (context)); + } + else if (gradient_tool->filter && + ! strcmp (pspec->name, "paint-mode")) + { + gimp_drawable_filter_set_mode (gradient_tool->filter, + gimp_context_get_paint_mode (context), + GIMP_LAYER_COLOR_SPACE_AUTO, + GIMP_LAYER_COLOR_SPACE_AUTO, + GIMP_LAYER_COMPOSITE_AUTO); + } + + gimp_gradient_tool_editor_options_notify (gradient_tool, options, pspec); +} + +static void +gimp_gradient_tool_start (GimpGradientTool *gradient_tool, + const GimpCoords *coords, + GimpDisplay *display) +{ + GimpTool *tool = GIMP_TOOL (gradient_tool); + GimpDisplayShell *shell = gimp_display_get_shell (display); + GimpImage *image = gimp_display_get_image (display); + GimpDrawable *drawable = gimp_image_get_active_drawable (image); + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool); + GimpContext *context = GIMP_CONTEXT (options); + + if (options->instant_toggle) + gtk_widget_set_sensitive (options->instant_toggle, FALSE); + + tool->display = display; + tool->drawable = drawable; + + gradient_tool->start_x = coords->x; + gradient_tool->start_y = coords->y; + gradient_tool->end_x = coords->x; + gradient_tool->end_y = coords->y; + + gradient_tool->widget = gimp_tool_line_new (shell, + gradient_tool->start_x, + gradient_tool->start_y, + gradient_tool->end_x, + gradient_tool->end_y); + + g_object_set (gradient_tool->widget, + "status-title", _("Gradient: "), + NULL); + + gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (tool), gradient_tool->widget); + + g_signal_connect (gradient_tool->widget, "changed", + G_CALLBACK (gimp_gradient_tool_line_changed), + gradient_tool); + g_signal_connect (gradient_tool->widget, "response", + G_CALLBACK (gimp_gradient_tool_line_response), + gradient_tool); + + g_signal_connect_swapped (context, "background-changed", + G_CALLBACK (gimp_gradient_tool_fg_bg_changed), + gradient_tool); + g_signal_connect_swapped (context, "foreground-changed", + G_CALLBACK (gimp_gradient_tool_fg_bg_changed), + gradient_tool); + + gimp_gradient_tool_create_filter (gradient_tool, drawable); + + /* Initially sync all of the properties */ + gimp_operation_config_sync_node (G_OBJECT (options), + gradient_tool->render_node); + + /* We don't allow repeat values for some shapes. */ + if (options->gradient_type >= GIMP_GRADIENT_SHAPEBURST_ANGULAR) + gegl_node_set (gradient_tool->render_node, + "gradient-repeat", GIMP_REPEAT_NONE, + NULL); + + /* Connect signal handlers for the gradient */ + gimp_gradient_tool_set_gradient (gradient_tool, context->gradient); + + if (gimp_gradient_tool_is_shapeburst (gradient_tool)) + gimp_gradient_tool_precalc_shapeburst (gradient_tool); + + gimp_draw_tool_start (GIMP_DRAW_TOOL (gradient_tool), display); + + gimp_gradient_tool_editor_start (gradient_tool); +} + +static void +gimp_gradient_tool_halt (GimpGradientTool *gradient_tool) +{ + GimpTool *tool = GIMP_TOOL (gradient_tool); + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool); + GimpContext *context = GIMP_CONTEXT (options); + + gimp_gradient_tool_editor_halt (gradient_tool); + + if (gradient_tool->graph) + { + g_clear_object (&gradient_tool->graph); + gradient_tool->render_node = NULL; +#if 0 + gradient_tool->subtract_node = NULL; + gradient_tool->divide_node = NULL; +#endif + gradient_tool->dist_node = NULL; + } + + g_clear_object (&gradient_tool->dist_buffer); + + if (gradient_tool->filter) + { + gimp_tool_control_push_preserve (tool->control, TRUE); + + gimp_drawable_filter_abort (gradient_tool->filter); + g_object_unref (gradient_tool->filter); + gradient_tool->filter = NULL; + + gimp_tool_control_pop_preserve (tool->control); + + gimp_image_flush (gimp_display_get_image (tool->display)); + } + + gimp_gradient_tool_set_tentative_gradient (gradient_tool, NULL); + + g_signal_handlers_disconnect_by_func (context, + G_CALLBACK (gimp_gradient_tool_fg_bg_changed), + gradient_tool); + + if (tool->display) + gimp_tool_pop_status (tool, tool->display); + + if (gimp_draw_tool_is_active (GIMP_DRAW_TOOL (gradient_tool))) + gimp_draw_tool_stop (GIMP_DRAW_TOOL (gradient_tool)); + + gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (tool), NULL); + g_clear_object (&gradient_tool->widget); + + tool->display = NULL; + tool->drawable = NULL; + + if (options->instant_toggle) + gtk_widget_set_sensitive (options->instant_toggle, TRUE); +} + +static void +gimp_gradient_tool_commit (GimpGradientTool *gradient_tool) +{ + GimpTool *tool = GIMP_TOOL (gradient_tool); + + if (gradient_tool->filter) + { + gimp_tool_control_push_preserve (tool->control, TRUE); + + gimp_drawable_filter_commit (gradient_tool->filter, + GIMP_PROGRESS (tool), FALSE); + g_clear_object (&gradient_tool->filter); + + gimp_tool_control_pop_preserve (tool->control); + + gimp_image_flush (gimp_display_get_image (tool->display)); + } +} + +static void +gimp_gradient_tool_line_changed (GimpToolWidget *widget, + GimpGradientTool *gradient_tool) +{ + gdouble start_x; + gdouble start_y; + gdouble end_x; + gdouble end_y; + gboolean update = FALSE; + + g_object_get (widget, + "x1", &start_x, + "y1", &start_y, + "x2", &end_x, + "y2", &end_y, + NULL); + + if (start_x != gradient_tool->start_x || + start_y != gradient_tool->start_y || + end_x != gradient_tool->end_x || + end_y != gradient_tool->end_y) + { + gradient_tool->start_x = start_x; + gradient_tool->start_y = start_y; + gradient_tool->end_x = end_x; + gradient_tool->end_y = end_y; + + update = TRUE; + } + + if (gimp_gradient_tool_editor_line_changed (gradient_tool)) + update = TRUE; + + if (update) + { + gimp_gradient_tool_update_graph (gradient_tool); + gimp_drawable_filter_apply (gradient_tool->filter, NULL); + } +} + +static void +gimp_gradient_tool_line_response (GimpToolWidget *widget, + gint response_id, + GimpGradientTool *gradient_tool) +{ + GimpTool *tool = GIMP_TOOL (gradient_tool); + + switch (response_id) + { + case GIMP_TOOL_WIDGET_RESPONSE_CONFIRM: + gimp_tool_control (tool, GIMP_TOOL_ACTION_COMMIT, tool->display); + break; + + case GIMP_TOOL_WIDGET_RESPONSE_CANCEL: + gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display); + break; + } +} + +static void +gimp_gradient_tool_precalc_shapeburst (GimpGradientTool *gradient_tool) +{ + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool); + GimpTool *tool = GIMP_TOOL (gradient_tool); + gint x, y, width, height; + + if (gradient_tool->dist_buffer || ! tool->drawable) + return; + + if (! gimp_item_mask_intersect (GIMP_ITEM (tool->drawable), + &x, &y, &width, &height)) + return; + + gradient_tool->dist_buffer = + gimp_drawable_gradient_shapeburst_distmap (tool->drawable, + options->distance_metric, + GEGL_RECTANGLE (x, y, width, height), + GIMP_PROGRESS (gradient_tool)); + + if (gradient_tool->dist_node) + gegl_node_set (gradient_tool->dist_node, + "buffer", gradient_tool->dist_buffer, + NULL); + + gimp_progress_end (GIMP_PROGRESS (gradient_tool)); +} + + +/* gegl graph stuff */ + +static void +gimp_gradient_tool_create_graph (GimpGradientTool *gradient_tool) +{ + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool); + GimpContext *context = GIMP_CONTEXT (options); + GeglNode *output; + + /* render_node is not supposed to be recreated */ + g_return_if_fail (gradient_tool->graph == NULL); + + gradient_tool->graph = gegl_node_new (); + + gradient_tool->dist_node = + gegl_node_new_child (gradient_tool->graph, + "operation", "gegl:buffer-source", + "buffer", gradient_tool->dist_buffer, + NULL); + +#if 0 + gradient_tool->subtract_node = + gegl_node_new_child (gradient_tool->graph, + "operation", "gegl:subtract", + NULL); + + gradient_tool->divide_node = + gegl_node_new_child (gradient_tool->graph, + "operation", "gegl:divide", + NULL); +#endif + + gradient_tool->render_node = + gegl_node_new_child (gradient_tool->graph, + "operation", "gimp:gradient", + "context", context, + NULL); + + output = gegl_node_get_output_proxy (gradient_tool->graph, "output"); + + gegl_node_link_many (gradient_tool->dist_node, +#if 0 + gradient_tool->subtract_node, + gradient_tool->divide_node, +#endif + gradient_tool->render_node, + output, + NULL); + + gimp_gradient_tool_update_graph (gradient_tool); +} + +static void +gimp_gradient_tool_update_graph (GimpGradientTool *gradient_tool) +{ + GimpTool *tool = GIMP_TOOL (gradient_tool); + gint off_x, off_y; + + gimp_item_get_offset (GIMP_ITEM (tool->drawable), &off_x, &off_y); + +#if 0 + if (gimp_gradient_tool_is_shapeburst (gradient_tool)) + { + gfloat start, end; + + gegl_buffer_get (gradient_tool->dist_buffer, + GEGL_RECTANGLE (gradient_tool->start_x - off_x, + gradient_tool->start_y - off_y, + 1, 1), + 1.0, babl_format("Y float"), &start, + GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE); + + gegl_buffer_get (gradient_tool->dist_buffer, + GEGL_RECTANGLE (gradient_tool->end_x - off_x, + gradient_tool->end_y - off_y, + 1, 1), + 1.0, babl_format("Y float"), &end, + GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE); + + if (start != end) + { + gegl_node_set (gradient_tool->subtract_node, + "value", (gdouble) start, + NULL); + gegl_node_set (gradient_tool->divide_node, + "value", (gdouble) (end - start), + NULL); + } + } + else +#endif + { + gegl_node_set (gradient_tool->render_node, + "start_x", gradient_tool->start_x - off_x, + "start_y", gradient_tool->start_y - off_y, + "end_x", gradient_tool->end_x - off_x, + "end_y", gradient_tool->end_y - off_y, + NULL); + } +} + +static void +gimp_gradient_tool_fg_bg_changed (GimpGradientTool *gradient_tool) +{ + if (! gradient_tool->filter || ! gradient_tool->gradient) + return; + + if (gimp_gradient_has_fg_bg_segments (gradient_tool->gradient)) + { + /* Set a property on the node. Otherwise it will cache and refuse to update */ + gegl_node_set (gradient_tool->render_node, + "gradient", gradient_tool->gradient, + NULL); + + /* Update the filter */ + gimp_drawable_filter_apply (gradient_tool->filter, NULL); + + gimp_gradient_tool_editor_fg_bg_changed (gradient_tool); + } +} + +static void +gimp_gradient_tool_gradient_dirty (GimpGradientTool *gradient_tool) +{ + if (! gradient_tool->filter) + return; + + if (! gradient_tool->tentative_gradient) + { + /* Set a property on the node. Otherwise it will cache and refuse to update */ + gegl_node_set (gradient_tool->render_node, + "gradient", gradient_tool->gradient, + NULL); + + /* Update the filter */ + gimp_drawable_filter_apply (gradient_tool->filter, NULL); + } + + gimp_gradient_tool_editor_gradient_dirty (gradient_tool); +} + +static void +gimp_gradient_tool_set_gradient (GimpGradientTool *gradient_tool, + GimpGradient *gradient) +{ + if (gradient_tool->gradient) + { + g_signal_handlers_disconnect_by_func (gradient_tool->gradient, + G_CALLBACK (gimp_gradient_tool_gradient_dirty), + gradient_tool); + + g_object_unref (gradient_tool->gradient); + } + + gradient_tool->gradient = gradient; + + if (gradient_tool->gradient) + { + g_object_ref (gradient); + + g_signal_connect_swapped (gradient_tool->gradient, "dirty", + G_CALLBACK (gimp_gradient_tool_gradient_dirty), + gradient_tool); + + if (gradient_tool->render_node) + gegl_node_set (gradient_tool->render_node, + "gradient", gradient_tool->gradient, + NULL); + } + + gimp_gradient_tool_editor_gradient_changed (gradient_tool); +} + +static gboolean +gimp_gradient_tool_is_shapeburst (GimpGradientTool *gradient_tool) +{ + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool); + + return options->gradient_type >= GIMP_GRADIENT_SHAPEBURST_ANGULAR && + options->gradient_type <= GIMP_GRADIENT_SHAPEBURST_DIMPLED; +} + + +/* image map stuff */ + +static void +gimp_gradient_tool_create_filter (GimpGradientTool *gradient_tool, + GimpDrawable *drawable) +{ + GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool); + GimpContext *context = GIMP_CONTEXT (options); + + if (! gradient_tool->graph) + gimp_gradient_tool_create_graph (gradient_tool); + + gradient_tool->filter = gimp_drawable_filter_new (drawable, + C_("undo-type", "Gradient"), + gradient_tool->graph, + GIMP_ICON_TOOL_GRADIENT); + + gimp_drawable_filter_set_region (gradient_tool->filter, + GIMP_FILTER_REGION_DRAWABLE); + gimp_drawable_filter_set_opacity (gradient_tool->filter, + gimp_context_get_opacity (context)); + gimp_drawable_filter_set_mode (gradient_tool->filter, + gimp_context_get_paint_mode (context), + GIMP_LAYER_COLOR_SPACE_AUTO, + GIMP_LAYER_COLOR_SPACE_AUTO, + GIMP_LAYER_COMPOSITE_AUTO); + + g_signal_connect (gradient_tool->filter, "flush", + G_CALLBACK (gimp_gradient_tool_filter_flush), + gradient_tool); +} + +static void +gimp_gradient_tool_filter_flush (GimpDrawableFilter *filter, + GimpTool *tool) +{ + GimpImage *image = gimp_display_get_image (tool->display); + + gimp_projection_flush (gimp_image_get_projection (image)); +} + + +/* protected functions */ + + +void +gimp_gradient_tool_set_tentative_gradient (GimpGradientTool *gradient_tool, + GimpGradient *gradient) +{ + g_return_if_fail (GIMP_IS_GRADIENT_TOOL (gradient_tool)); + g_return_if_fail (gradient == NULL || GIMP_IS_GRADIENT (gradient)); + + if (gradient != gradient_tool->tentative_gradient) + { + g_clear_object (&gradient_tool->tentative_gradient); + + gradient_tool->tentative_gradient = gradient; + + if (gradient) + g_object_ref (gradient); + + if (gradient_tool->render_node) + { + gegl_node_set (gradient_tool->render_node, + "gradient", gradient ? gradient : gradient_tool->gradient, + NULL); + + gimp_drawable_filter_apply (gradient_tool->filter, NULL); + } + } +} diff --git a/app/tools/gimpblendtool.h b/app/tools/gimpgradienttool.h similarity index 62% rename from app/tools/gimpblendtool.h rename to app/tools/gimpgradienttool.h index 08862bc65b..23d68558eb 100644 --- a/app/tools/gimpblendtool.h +++ b/app/tools/gimpgradienttool.h @@ -15,27 +15,27 @@ * along with this program. If not, see . */ -#ifndef __GIMP_BLEND_TOOL_H__ -#define __GIMP_BLEND_TOOL_H__ +#ifndef __GIMP_GRADIENT_TOOL_H__ +#define __GIMP_GRADIENT_TOOL_H__ #include "gimpdrawtool.h" -#define GIMP_TYPE_BLEND_TOOL (gimp_blend_tool_get_type ()) -#define GIMP_BLEND_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BLEND_TOOL, GimpBlendTool)) -#define GIMP_BLEND_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BLEND_TOOL, GimpBlendToolClass)) -#define GIMP_IS_BLEND_TOOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BLEND_TOOL)) -#define GIMP_IS_BLEND_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BLEND_TOOL)) -#define GIMP_BLEND_TOOL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BLEND_TOOL, GimpBlendToolClass)) +#define GIMP_TYPE_GRADIENT_TOOL (gimp_gradient_tool_get_type ()) +#define GIMP_GRADIENT_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GRADIENT_TOOL, GimpGradientTool)) +#define GIMP_GRADIENT_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GRADIENT_TOOL, GimpGradientToolClass)) +#define GIMP_IS_GRADIENT_TOOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GRADIENT_TOOL)) +#define GIMP_IS_GRADIENT_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GRADIENT_TOOL)) +#define GIMP_GRADIENT_TOOL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_GRADIENT_TOOL, GimpGradientToolClass)) -#define GIMP_BLEND_TOOL_GET_OPTIONS(t) (GIMP_BLEND_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t)))) +#define GIMP_GRADIENT_TOOL_GET_OPTIONS(t) (GIMP_GRADIENT_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t)))) -typedef struct _GimpBlendTool GimpBlendTool; -typedef struct _GimpBlendToolClass GimpBlendToolClass; +typedef struct _GimpGradientTool GimpGradientTool; +typedef struct _GimpGradientToolClass GimpGradientToolClass; -struct _GimpBlendTool +struct _GimpGradientTool { GimpDrawTool parent_instance; @@ -90,22 +90,22 @@ struct _GimpBlendTool GtkWidget *midpoint_center_button; }; -struct _GimpBlendToolClass +struct _GimpGradientToolClass { GimpDrawToolClass parent_class; }; -void gimp_blend_tool_register (GimpToolRegisterCallback callback, - gpointer data); +void gimp_gradient_tool_register (GimpToolRegisterCallback callback, + gpointer data); -GType gimp_blend_tool_get_type (void) G_GNUC_CONST; +GType gimp_gradient_tool_get_type (void) G_GNUC_CONST; /* protected functions */ -void gimp_blend_tool_set_tentative_gradient (GimpBlendTool *blend_tool, - GimpGradient *gradient); +void gimp_gradient_tool_set_tentative_gradient (GimpGradientTool *gradient_tool, + GimpGradient *gradient); -#endif /* __GIMP_BLEND_TOOL_H__ */ +#endif /* __GIMP_GRADIENT_TOOL_H__ */ diff --git a/app/tools/gimpiscissorstool.c b/app/tools/gimpiscissorstool.c index 7b05a29137..7a7afd1a9b 100644 --- a/app/tools/gimpiscissorstool.c +++ b/app/tools/gimpiscissorstool.c @@ -335,7 +335,7 @@ gimp_iscissors_tool_class_init (GimpIscissorsToolClass *klass) direction_value[i][3] = abs (63 - i) * 2; } - /* set the 256th index of the direction_values to the hightest cost */ + /* set the 256th index of the direction_values to the highest cost */ direction_value[255][0] = 255; direction_value[255][1] = 255; direction_value[255][2] = 255; diff --git a/app/tools/gimpoperationtool.c b/app/tools/gimpoperationtool.c index 04b26a0607..b02627e070 100644 --- a/app/tools/gimpoperationtool.c +++ b/app/tools/gimpoperationtool.c @@ -254,7 +254,7 @@ gimp_operation_tool_options_notify (GimpTool *tool, * controller to move to a new position, or the operation to * change its properties to match the on-canvas controller? * - * decided to leave the on-canvas controler where it is and + * decided to leave the on-canvas controller where it is and * pretend it has changed, so the operation is updated * accordingly... */ diff --git a/app/tools/gimppaintoptions-gui.c b/app/tools/gimppaintoptions-gui.c index f9fecbf8f3..12093df8ae 100644 --- a/app/tools/gimppaintoptions-gui.c +++ b/app/tools/gimppaintoptions-gui.c @@ -370,15 +370,29 @@ dynamics_options_gui (GimpPaintOptions *paint_options, gtk_box_pack_start (GTK_BOX (vbox), inner_frame, FALSE, FALSE, 0); gtk_widget_show (inner_frame); + inner_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); + gtk_container_add (GTK_CONTAINER (inner_frame), inner_vbox); + gtk_widget_show (inner_vbox); + box = gimp_prop_gradient_box_new (NULL, GIMP_CONTEXT (config), _("Gradient"), 2, "gradient-view-type", "gradient-view-size", "gradient-reverse", + "gradient-blend-color-space", "gimp-gradient-editor", _("Edit this gradient")); - gtk_container_add (GTK_CONTAINER (inner_frame), box); + gtk_box_pack_start (GTK_BOX (inner_vbox), box, FALSE, FALSE, 0); gtk_widget_show (box); + + /* the blend color space */ + combo = gimp_prop_enum_combo_box_new (config, "gradient-blend-color-space", + 0, 0); + gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), + _("Blend Color Space")); + g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL); + gtk_box_pack_start (GTK_BOX (inner_vbox), combo, TRUE, TRUE, 0); + gtk_widget_show (combo); } return frame; diff --git a/app/tools/gimppainttool-paint.c b/app/tools/gimppainttool-paint.c new file mode 100644 index 0000000000..869c2d6142 --- /dev/null +++ b/app/tools/gimppainttool-paint.c @@ -0,0 +1,588 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "config.h" + +#include +#include + +#include "libgimpmath/gimpmath.h" + +#include "tools-types.h" + +#include "core/gimpdrawable.h" +#include "core/gimpimage.h" +#include "core/gimpprojection.h" + +#include "paint/gimppaintcore.h" +#include "paint/gimppaintoptions.h" + +#include "display/gimpdisplay.h" +#include "display/gimpdisplayshell-utils.h" + +#include "gimppainttool.h" +#include "gimppainttool-paint.h" + + +#define DISPLAY_UPDATE_INTERVAL 10000 /* microseconds */ + + +typedef enum +{ + PAINT_ITEM_TYPE_CORE_PAINT, + PAINT_ITEM_TYPE_CORE_INTERPOLATE, + PAINT_ITEM_TYPE_FINISH +} PaintItemType; + + +typedef struct +{ + PaintItemType type; + + union + { + struct + { + GimpPaintTool *paint_tool; + + union + { + GimpPaintState state; + GimpCoords coords; + }; + + guint32 time; + }; + + gboolean *finished; + }; +} PaintItem; + + +/* local function prototypes */ + +static gboolean gimp_paint_tool_paint_use_thread (GimpPaintTool *paint_tool); +static gpointer gimp_paint_tool_paint_thread (gpointer data); + +static gboolean gimp_paint_tool_paint_timeout (GimpPaintTool *paint_tool); + + +/* static variables */ + +static GThread *paint_thread; + +static GMutex paint_mutex; +static GCond paint_cond; + +static GQueue paint_queue = G_QUEUE_INIT; +static GMutex paint_queue_mutex; +static GCond paint_queue_cond; + +static guint paint_timeout_id; +static volatile gboolean paint_timeout_pending; + + +/* private functions */ + + +static gboolean +gimp_paint_tool_paint_use_thread (GimpPaintTool *paint_tool) +{ + if (! paint_tool->draw_line) + { + if (! paint_thread) + { + static gint use_paint_thread = -1; + + if (use_paint_thread < 0) + use_paint_thread = g_getenv ("GIMP_NO_PAINT_THREAD") == NULL; + + if (use_paint_thread) + { + paint_thread = g_thread_new ("paint", + gimp_paint_tool_paint_thread, NULL); + } + } + + return paint_thread != NULL; + } + + return FALSE; +} + +static gpointer +gimp_paint_tool_paint_thread (gpointer data) +{ + g_mutex_lock (&paint_queue_mutex); + + while (TRUE) + { + PaintItem *item; + + while (! (item = g_queue_pop_head (&paint_queue))) + g_cond_wait (&paint_queue_cond, &paint_queue_mutex); + + switch (item->type) + { + case PAINT_ITEM_TYPE_CORE_PAINT: + { + GimpPaintTool *paint_tool = item->paint_tool; + GimpPaintOptions *paint_options = GIMP_PAINT_TOOL_GET_OPTIONS (paint_tool); + GimpPaintCore *core = paint_tool->core; + GimpDrawable *drawable = paint_tool->drawable; + + g_mutex_unlock (&paint_queue_mutex); + g_mutex_lock (&paint_mutex); + + while (paint_timeout_pending) + g_cond_wait (&paint_cond, &paint_mutex); + + gimp_paint_core_paint (core, drawable, paint_options, + item->state, item->time); + + g_mutex_unlock (&paint_mutex); + g_mutex_lock (&paint_queue_mutex); + } + break; + + case PAINT_ITEM_TYPE_CORE_INTERPOLATE: + { + GimpPaintTool *paint_tool = item->paint_tool; + GimpPaintOptions *paint_options = GIMP_PAINT_TOOL_GET_OPTIONS (paint_tool); + GimpPaintCore *core = paint_tool->core; + GimpDrawable *drawable = paint_tool->drawable; + + g_mutex_unlock (&paint_queue_mutex); + g_mutex_lock (&paint_mutex); + + while (paint_timeout_pending) + g_cond_wait (&paint_cond, &paint_mutex); + + gimp_paint_core_interpolate (core, drawable, paint_options, + &item->coords, item->time); + + g_mutex_unlock (&paint_mutex); + g_mutex_lock (&paint_queue_mutex); + } + break; + + case PAINT_ITEM_TYPE_FINISH: + { + *item->finished = TRUE; + g_cond_signal (&paint_queue_cond); + } + break; + } + + g_slice_free (PaintItem, item); + } + + g_mutex_unlock (&paint_queue_mutex); + + return NULL; +} + +static gboolean +gimp_paint_tool_paint_timeout (GimpPaintTool *paint_tool) +{ + GimpDrawable *drawable = paint_tool->drawable; + gboolean update; + + paint_timeout_pending = TRUE; + + g_mutex_lock (&paint_mutex); + + update = gimp_drawable_flush_paint (drawable); + + if (update && GIMP_PAINT_TOOL_GET_CLASS (paint_tool)->paint_flush) + GIMP_PAINT_TOOL_GET_CLASS (paint_tool)->paint_flush (paint_tool); + + paint_timeout_pending = FALSE; + g_cond_signal (&paint_cond); + + g_mutex_unlock (&paint_mutex); + + if (update) + { + GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (paint_tool); + GimpDisplay *display = paint_tool->display; + GimpImage *image = gimp_display_get_image (display); + + gimp_draw_tool_pause (draw_tool); + + gimp_projection_flush_now (gimp_image_get_projection (image)); + gimp_display_flush_now (display); + + gimp_draw_tool_resume (draw_tool); + } + + return G_SOURCE_CONTINUE; +} + + +/* public functions */ + + +gboolean +gimp_paint_tool_paint_start (GimpPaintTool *paint_tool, + GimpDisplay *display, + const GimpCoords *coords, + guint32 time, + gboolean constrain, + GError **error) +{ + GimpTool *tool; + GimpPaintOptions *paint_options; + GimpPaintCore *core; + GimpDisplayShell *shell; + GimpImage *image; + GimpDrawable *drawable; + GimpCoords curr_coords; + gint off_x, off_y; + + g_return_val_if_fail (GIMP_IS_PAINT_TOOL (paint_tool), FALSE); + g_return_val_if_fail (GIMP_IS_DISPLAY (display), FALSE); + g_return_val_if_fail (coords != NULL, FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + g_return_val_if_fail (paint_tool->display == NULL, FALSE); + + tool = GIMP_TOOL (paint_tool); + paint_tool = GIMP_PAINT_TOOL (paint_tool); + paint_options = GIMP_PAINT_TOOL_GET_OPTIONS (paint_tool); + core = paint_tool->core; + shell = gimp_display_get_shell (display); + image = gimp_display_get_image (display); + drawable = gimp_image_get_active_drawable (image); + + curr_coords = *coords; + + gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y); + + curr_coords.x -= off_x; + curr_coords.y -= off_y; + + /* If we use a separate paint thread, enter paint mode before starting the + * paint core + */ + if (gimp_paint_tool_paint_use_thread (paint_tool)) + gimp_drawable_start_paint (drawable); + + /* Start the paint core */ + if (! gimp_paint_core_start (core, + drawable, paint_options, &curr_coords, + error)) + { + gimp_drawable_end_paint (drawable); + + return FALSE; + } + + paint_tool->display = display; + paint_tool->drawable = drawable; + + if ((display != tool->display) || ! paint_tool->draw_line) + { + /* If this is a new display, resest the "last stroke's endpoint" + * because there is none + */ + if (display != tool->display) + core->start_coords = core->cur_coords; + + core->last_coords = core->cur_coords; + + core->distance = 0.0; + core->pixel_dist = 0.0; + } + else if (paint_tool->draw_line) + { + /* If shift is down and this is not the first paint + * stroke, then draw a line from the last coords to the pointer + */ + gimp_paint_core_round_line ( + core, paint_options, + constrain, + gimp_display_shell_get_constrained_line_offset_angle (shell)); + } + + /* Notify subclasses */ + if (gimp_paint_tool_paint_use_thread (paint_tool) && + GIMP_PAINT_TOOL_GET_CLASS (paint_tool)->paint_start) + { + GIMP_PAINT_TOOL_GET_CLASS (paint_tool)->paint_start (paint_tool); + } + + /* Let the specific painting function initialize itself */ + gimp_paint_core_paint (core, drawable, paint_options, + GIMP_PAINT_STATE_INIT, time); + + /* Paint to the image */ + if (paint_tool->draw_line) + { + gimp_paint_core_interpolate (core, drawable, paint_options, + &core->cur_coords, time); + } + else + { + gimp_paint_core_paint (core, drawable, paint_options, + GIMP_PAINT_STATE_MOTION, time); + } + + gimp_projection_flush_now (gimp_image_get_projection (image)); + gimp_display_flush_now (display); + + /* Start the display update timeout */ + if (gimp_paint_tool_paint_use_thread (paint_tool)) + { + paint_timeout_id = g_timeout_add_full ( + G_PRIORITY_HIGH_IDLE, + DISPLAY_UPDATE_INTERVAL / 1000, + (GSourceFunc) gimp_paint_tool_paint_timeout, + paint_tool, NULL); + } + + return TRUE; +} + +void +gimp_paint_tool_paint_end (GimpPaintTool *paint_tool, + guint32 time, + gboolean cancel) +{ + GimpPaintOptions *paint_options; + GimpPaintCore *core; + GimpDrawable *drawable; + + g_return_if_fail (GIMP_IS_PAINT_TOOL (paint_tool)); + g_return_if_fail (paint_tool->display != NULL); + + paint_options = GIMP_PAINT_TOOL_GET_OPTIONS (paint_tool); + core = paint_tool->core; + drawable = paint_tool->drawable; + + /* Process remaining paint items */ + if (gimp_paint_tool_paint_use_thread (paint_tool)) + { + PaintItem *item; + gboolean finished = FALSE; + guint64 end_time; + + g_source_remove (paint_timeout_id); + paint_timeout_id = 0; + + item = g_slice_new (PaintItem); + + item->type = PAINT_ITEM_TYPE_FINISH; + item->finished = &finished; + + g_mutex_lock (&paint_queue_mutex); + + g_queue_push_tail (&paint_queue, item); + g_cond_signal (&paint_queue_cond); + + end_time = g_get_monotonic_time () + DISPLAY_UPDATE_INTERVAL; + + while (! finished) + { + if (! g_cond_wait_until (&paint_queue_cond, &paint_queue_mutex, + end_time)) + { + g_mutex_unlock (&paint_queue_mutex); + + gimp_paint_tool_paint_timeout (paint_tool); + + g_mutex_lock (&paint_queue_mutex); + + end_time = g_get_monotonic_time () + DISPLAY_UPDATE_INTERVAL; + } + } + + g_mutex_unlock (&paint_queue_mutex); + } + + /* Let the specific painting function finish up */ + gimp_paint_core_paint (core, drawable, paint_options, + GIMP_PAINT_STATE_FINISH, time); + + if (cancel) + gimp_paint_core_cancel (core, drawable); + else + gimp_paint_core_finish (core, drawable, TRUE); + + /* Notify subclasses */ + if (gimp_paint_tool_paint_use_thread (paint_tool) && + GIMP_PAINT_TOOL_GET_CLASS (paint_tool)->paint_end) + { + GIMP_PAINT_TOOL_GET_CLASS (paint_tool)->paint_end (paint_tool); + } + + /* Exit paint mode */ + if (gimp_paint_tool_paint_use_thread (paint_tool)) + gimp_drawable_end_paint (drawable); + + paint_tool->display = NULL; + paint_tool->drawable = NULL; +} + +gboolean +gimp_paint_tool_paint_is_active (GimpPaintTool *paint_tool) +{ + g_return_val_if_fail (GIMP_IS_PAINT_TOOL (paint_tool), FALSE); + + return paint_tool->drawable != NULL && + gimp_drawable_is_painting (paint_tool->drawable); +} + + +void +gimp_paint_tool_paint_motion (GimpPaintTool *paint_tool, + const GimpCoords *coords, + guint32 time) +{ + GimpPaintOptions *paint_options; + GimpPaintCore *core; + GimpDrawable *drawable; + GimpCoords curr_coords; + gint off_x, off_y; + + g_return_if_fail (GIMP_IS_PAINT_TOOL (paint_tool)); + g_return_if_fail (coords != NULL); + g_return_if_fail (paint_tool->display != NULL); + + paint_options = GIMP_PAINT_TOOL_GET_OPTIONS (paint_tool); + core = paint_tool->core; + drawable = paint_tool->drawable; + + curr_coords = *coords; + + gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y); + + curr_coords.x -= off_x; + curr_coords.y -= off_y; + + gimp_paint_core_smooth_coords (core, paint_options, &curr_coords); + + /* Don't paint while the Shift key is pressed for line drawing */ + if (paint_tool->draw_line) + { + gimp_paint_core_set_current_coords (core, &curr_coords); + + return; + } + + gimp_paint_tool_paint_core_interpolate (paint_tool, &curr_coords, time); +} + +void +gimp_paint_tool_paint_core_paint (GimpPaintTool *paint_tool, + GimpPaintState state, + guint32 time) +{ + g_return_if_fail (GIMP_IS_PAINT_TOOL (paint_tool)); + + if (gimp_paint_tool_paint_use_thread (paint_tool)) + { + PaintItem *item; + + /* Push an item to the queue, to be processed by the paint thread */ + + item = g_slice_new (PaintItem); + + item->type = PAINT_ITEM_TYPE_CORE_PAINT; + item->paint_tool = paint_tool; + item->state = state; + item->time = time; + + g_mutex_lock (&paint_queue_mutex); + + g_queue_push_tail (&paint_queue, item); + g_cond_signal (&paint_queue_cond); + + g_mutex_unlock (&paint_queue_mutex); + } + else + { + GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (paint_tool); + GimpPaintOptions *paint_options = GIMP_PAINT_TOOL_GET_OPTIONS (paint_tool); + GimpPaintCore *core = paint_tool->core; + GimpDisplay *display = paint_tool->display; + GimpImage *image = gimp_display_get_image (display); + GimpDrawable *drawable = paint_tool->drawable; + + /* Paint directly */ + + gimp_draw_tool_pause (draw_tool); + + gimp_paint_core_paint (core, + drawable, paint_options, state, time); + + gimp_projection_flush_now (gimp_image_get_projection (image)); + gimp_display_flush_now (display); + + gimp_draw_tool_resume (draw_tool); + } +} + +void +gimp_paint_tool_paint_core_interpolate (GimpPaintTool *paint_tool, + const GimpCoords *coords, + guint32 time) +{ + g_return_if_fail (GIMP_IS_PAINT_TOOL (paint_tool)); + g_return_if_fail (coords != NULL); + + if (gimp_paint_tool_paint_use_thread (paint_tool)) + { + PaintItem *item; + + /* Push an item to the queue, to be processed by the paint thread */ + + item = g_slice_new (PaintItem); + + item->type = PAINT_ITEM_TYPE_CORE_INTERPOLATE; + item->paint_tool = paint_tool; + item->coords = *coords; + item->time = time; + + g_mutex_lock (&paint_queue_mutex); + + g_queue_push_tail (&paint_queue, item); + g_cond_signal (&paint_queue_cond); + + g_mutex_unlock (&paint_queue_mutex); + } + else + { + GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (paint_tool); + GimpPaintOptions *paint_options = GIMP_PAINT_TOOL_GET_OPTIONS (paint_tool); + GimpPaintCore *core = paint_tool->core; + GimpDisplay *display = paint_tool->display; + GimpImage *image = gimp_display_get_image (display); + GimpDrawable *drawable = paint_tool->drawable; + + /* Paint directly */ + + gimp_draw_tool_pause (draw_tool); + + gimp_paint_core_interpolate (core, + drawable, paint_options, coords, time); + + gimp_projection_flush_now (gimp_image_get_projection (image)); + gimp_display_flush_now (display); + + gimp_draw_tool_resume (draw_tool); + } +} diff --git a/app/tools/gimppainttool-paint.h b/app/tools/gimppainttool-paint.h new file mode 100644 index 0000000000..8dcc056867 --- /dev/null +++ b/app/tools/gimppainttool-paint.h @@ -0,0 +1,46 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __GIMP_PAINT_TOOL_PAINT_H__ +#define __GIMP_PAINT_TOOL_PAINT_H__ + + +gboolean gimp_paint_tool_paint_start (GimpPaintTool *tool, + GimpDisplay *display, + const GimpCoords *coords, + guint32 time, + gboolean constrain, + GError **error); +void gimp_paint_tool_paint_end (GimpPaintTool *tool, + guint32 time, + gboolean cancel); + +gboolean gimp_paint_tool_paint_is_active (GimpPaintTool *tool); + +void gimp_paint_tool_paint_motion (GimpPaintTool *tool, + const GimpCoords *coords, + guint32 time); + +void gimp_paint_tool_paint_core_paint (GimpPaintTool *tool, + GimpPaintState state, + guint32 time); +void gimp_paint_tool_paint_core_interpolate (GimpPaintTool *tool, + const GimpCoords *coords, + guint32 time); + + +#endif /* __GIMP_PAINT_TOOL_PAINT_H__ */ diff --git a/app/tools/gimppainttool.c b/app/tools/gimppainttool.c index a0f3f9d84a..77ef265f18 100644 --- a/app/tools/gimppainttool.c +++ b/app/tools/gimppainttool.c @@ -49,6 +49,7 @@ #include "gimpcoloroptions.h" #include "gimppainttool.h" +#include "gimppainttool-paint.h" #include "gimptoolcontrol.h" #include "gimp-intl.h" @@ -248,15 +249,12 @@ gimp_paint_tool_button_press (GimpTool *tool, GimpButtonPressType press_type, GimpDisplay *display) { - GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool); - GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (tool); - GimpPaintOptions *paint_options = GIMP_PAINT_TOOL_GET_OPTIONS (tool); - GimpPaintCore *core = paint_tool->core; - GimpDisplayShell *shell = gimp_display_get_shell (display); - GimpImage *image = gimp_display_get_image (display); - GimpDrawable *drawable = gimp_image_get_active_drawable (image); - GimpCoords curr_coords; - gint off_x, off_y; + GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool); + GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (tool); + GimpDisplayShell *shell = gimp_display_get_shell (display); + GimpImage *image = gimp_display_get_image (display); + GimpDrawable *drawable = gimp_image_get_active_drawable (image); + gboolean constrain; GError *error = NULL; if (gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool))) @@ -287,13 +285,6 @@ gimp_paint_tool_button_press (GimpTool *tool, return; } - curr_coords = *coords; - - gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y); - - curr_coords.x -= off_x; - curr_coords.y -= off_y; - if (gimp_draw_tool_is_active (draw_tool)) gimp_draw_tool_stop (draw_tool); @@ -310,65 +301,23 @@ gimp_paint_tool_button_press (GimpTool *tool, tool->display = display; } - if (! gimp_paint_core_start (core, drawable, paint_options, &curr_coords, - &error)) + constrain = (state & gimp_get_constrain_behavior_mask ()) != 0; + + if (! gimp_paint_tool_paint_start (paint_tool, + display, coords, time, constrain, + &error)) { gimp_tool_message_literal (tool, display, error->message); g_clear_error (&error); return; } - if ((display != tool->display) || ! paint_tool->draw_line) - { - /* if this is a new display, resest the "last stroke's endpoint" - * because there is none - */ - if (display != tool->display) - core->start_coords = core->cur_coords; - - core->last_coords = core->cur_coords; - - core->distance = 0.0; - core->pixel_dist = 0.0; - } - else if (paint_tool->draw_line) - { - gboolean constrain = (state & gimp_get_constrain_behavior_mask ()) != 0; - - /* If shift is down and this is not the first paint - * stroke, then draw a line from the last coords to the pointer - */ - gimp_paint_core_round_line ( - core, paint_options, - constrain, - gimp_display_shell_get_constrained_line_offset_angle (shell)); - } - tool->display = display; tool->drawable = drawable; /* pause the current selection */ gimp_display_shell_selection_pause (shell); - /* Let the specific painting function initialize itself */ - gimp_paint_core_paint (core, drawable, paint_options, - GIMP_PAINT_STATE_INIT, time); - - /* Paint to the image */ - if (paint_tool->draw_line) - { - gimp_paint_core_interpolate (core, drawable, paint_options, - &core->cur_coords, time); - } - else - { - gimp_paint_core_paint (core, drawable, paint_options, - GIMP_PAINT_STATE_MOTION, time); - } - - gimp_projection_flush_now (gimp_image_get_projection (image)); - gimp_display_flush_now (display); - gimp_draw_tool_start (draw_tool, display); gimp_tool_control_activate (tool->control); @@ -382,12 +331,10 @@ gimp_paint_tool_button_release (GimpTool *tool, GimpButtonReleaseType release_type, GimpDisplay *display) { - GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (tool); - GimpPaintOptions *paint_options = GIMP_PAINT_TOOL_GET_OPTIONS (tool); - GimpPaintCore *core = paint_tool->core; - GimpDisplayShell *shell = gimp_display_get_shell (display); - GimpImage *image = gimp_display_get_image (display); - GimpDrawable *drawable = gimp_image_get_active_drawable (image); + GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (tool); + GimpDisplayShell *shell = gimp_display_get_shell (display); + GimpImage *image = gimp_display_get_image (display); + gboolean cancel; if (gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool))) { @@ -397,22 +344,17 @@ gimp_paint_tool_button_release (GimpTool *tool, return; } + cancel = (release_type == GIMP_BUTTON_RELEASE_CANCEL); + + gimp_paint_tool_paint_end (paint_tool, time, cancel); + gimp_tool_control_halt (tool->control); gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool)); - /* Let the specific painting function finish up */ - gimp_paint_core_paint (core, drawable, paint_options, - GIMP_PAINT_STATE_FINISH, time); - /* resume the current selection */ gimp_display_shell_selection_resume (shell); - if (release_type == GIMP_BUTTON_RELEASE_CANCEL) - gimp_paint_core_cancel (core, drawable); - else - gimp_paint_core_finish (core, drawable, TRUE); - gimp_image_flush (image); gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool)); @@ -425,44 +367,14 @@ gimp_paint_tool_motion (GimpTool *tool, GdkModifierType state, GimpDisplay *display) { - GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (tool); - GimpPaintOptions *paint_options = GIMP_PAINT_TOOL_GET_OPTIONS (tool); - GimpPaintCore *core = paint_tool->core; - GimpImage *image = gimp_display_get_image (display); - GimpDrawable *drawable = gimp_image_get_active_drawable (image); - GimpCoords curr_coords; - gint off_x, off_y; + GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (tool); GIMP_TOOL_CLASS (parent_class)->motion (tool, coords, time, state, display); if (gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool))) return; - curr_coords = *coords; - - gimp_paint_core_smooth_coords (core, paint_options, &curr_coords); - - gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y); - - curr_coords.x -= off_x; - curr_coords.y -= off_y; - - /* don't paint while the Shift key is pressed for line drawing */ - if (paint_tool->draw_line) - { - gimp_paint_core_set_current_coords (core, &curr_coords); - return; - } - - gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool)); - - gimp_paint_core_interpolate (core, drawable, paint_options, - &curr_coords, time); - - gimp_projection_flush_now (gimp_image_get_projection (image)); - gimp_display_flush_now (display); - - gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool)); + gimp_paint_tool_paint_motion (paint_tool, coords, time); } static void @@ -574,7 +486,7 @@ gimp_paint_tool_cursor_update (GimpTool *tool, GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display); - /* reset old stuff here so we are not interferring with the modifiers + /* reset old stuff here so we are not interfering with the modifiers * set by our subclasses */ gimp_tool_control_set_cursor_modifier (tool->control, diff --git a/app/tools/gimppainttool.h b/app/tools/gimppainttool.h index 9841771a56..cd4d7b4178 100644 --- a/app/tools/gimppainttool.h +++ b/app/tools/gimppainttool.h @@ -56,12 +56,19 @@ struct _GimpPaintTool const gchar *status_ctrl; /* additional message for the ctrl modifier */ GimpPaintCore *core; + + GimpDisplay *display; + GimpDrawable *drawable; }; struct _GimpPaintToolClass { GimpColorToolClass parent_class; + void (* paint_start) (GimpPaintTool *paint_tool); + void (* paint_end) (GimpPaintTool *paint_tool); + void (* paint_flush) (GimpPaintTool *paint_tool); + GimpCanvasItem * (* get_outline) (GimpPaintTool *paint_tool, GimpDisplay *display, gdouble x, @@ -69,16 +76,18 @@ struct _GimpPaintToolClass }; -GType gimp_paint_tool_get_type (void) G_GNUC_CONST; +GType gimp_paint_tool_get_type (void) G_GNUC_CONST; -void gimp_paint_tool_enable_color_picker (GimpPaintTool *tool, - GimpColorPickMode mode); +void gimp_paint_tool_enable_color_picker (GimpPaintTool *tool, + GimpColorPickMode mode); + +void gimp_paint_tool_set_draw_fallback (GimpPaintTool *tool, + gboolean draw_fallback, + gint fallback_size); + +void gimp_paint_tool_set_draw_circle (GimpPaintTool *tool, + gboolean draw_circle, + gint circle_size); -void gimp_paint_tool_set_draw_fallback (GimpPaintTool *tool, - gboolean draw_fallback, - gint fallback_size); -void gimp_paint_tool_set_draw_circle (GimpPaintTool *tool, - gboolean draw_circle, - gint circle_size); #endif /* __GIMP_PAINT_TOOL_H__ */ diff --git a/app/tools/gimpregionselecttool.c b/app/tools/gimpregionselecttool.c index c1674b4c8d..f1604a8660 100644 --- a/app/tools/gimpregionselecttool.c +++ b/app/tools/gimpregionselecttool.c @@ -310,7 +310,7 @@ gimp_region_select_tool_draw (GimpDrawTool *draw_tool) 0, 0, gegl_buffer_get_width (region_sel->region_mask), gegl_buffer_get_height (region_sel->region_mask), - GIMP_BOUNDARY_HALF_WAY_LINEAR, + GIMP_BOUNDARY_HALF_WAY, ®ion_sel->n_segs); } diff --git a/app/tools/gimpseamlessclonetool.c b/app/tools/gimpseamlessclonetool.c index 10755d83c1..2f78959277 100644 --- a/app/tools/gimpseamlessclonetool.c +++ b/app/tools/gimpseamlessclonetool.c @@ -267,10 +267,10 @@ gimp_seamless_clone_tool_control (GimpTool *tool, * @display: The display to initialize the tool for * * A utility function to initialize a tool for working on a given - * display. At the begining of each function, we can check if the event's + * display. At the beginning of each function, we can check if the event's * display is the same as the tool's one, and if not call this. This is * not required by the gimptool interface or anything like that, but - * this is a convinient way to do all the initialization work in one + * this is a convenient way to do all the initialization work in one * place, and this is how the base class (GimpDrawTool) does that */ static void @@ -632,7 +632,7 @@ gimp_seamless_clone_tool_draw (GimpDrawTool *draw_tool) /** * gimp_seamless_clone_tool_create_render_node: - * @sc: The GimpSeamlessCloneTool to intialize + * @sc: The GimpSeamlessCloneTool to initialize * * This function creates a Gegl node graph of the composition which is * needed to render the drawable. The graph should have an "input" pad diff --git a/app/tools/gimptransformoptions.c b/app/tools/gimptransformoptions.c index 7decf77fa5..5fd7a1e05f 100644 --- a/app/tools/gimptransformoptions.c +++ b/app/tools/gimptransformoptions.c @@ -254,6 +254,14 @@ gimp_transform_options_set_property (GObject *object, break; case PROP_DIRECTION: options->direction = g_value_get_enum (value); + + /* Expected default for corrective transform is to see the + * original image only. + */ + g_object_set (options, + "show-preview", + options->direction != GIMP_TRANSFORM_BACKWARD, + NULL); break; case PROP_INTERPOLATION: options->interpolation = g_value_get_enum (value); diff --git a/app/tools/gimptransformtool.c b/app/tools/gimptransformtool.c index 08ce1bc843..6673e7e62c 100644 --- a/app/tools/gimptransformtool.c +++ b/app/tools/gimptransformtool.c @@ -617,12 +617,26 @@ gimp_transform_tool_options_notify (GimpTool *tool, { if (tr_tool->preview) { - gboolean show_preview; + GimpDisplay *display; + GimpImage *image; + GimpItem *item; + gboolean show_preview; show_preview = gimp_transform_options_show_preview (tr_options) && tr_tool->transform_valid; gimp_canvas_item_set_visible (tr_tool->preview, show_preview); + + display = tool->display; + image = gimp_display_get_image (display); + item = gimp_transform_tool_check_active_item (tr_tool, image, TRUE, NULL); + if (item) + { + if (show_preview) + gimp_transform_tool_hide_active_item (tr_tool, item); + else + gimp_transform_tool_show_active_item (tr_tool); + } } } else if (g_str_has_prefix (pspec->name, "constrain-") || @@ -777,7 +791,7 @@ gimp_transform_tool_real_transform (GimpTransformTool *tr_tool, * normal drawable, or the selection */ - /* always clip the selction and unfloated channels + /* always clip the selection and unfloated channels * so they keep their size */ if (GIMP_IS_CHANNEL (active_item) && diff --git a/app/tools/gimpwarptool.c b/app/tools/gimpwarptool.c index ecedf40845..9e3737b447 100644 --- a/app/tools/gimpwarptool.c +++ b/app/tools/gimpwarptool.c @@ -815,7 +815,7 @@ static void gimp_warp_tool_create_graph (GimpWarpTool *wt) { GimpWarpOptions *options = GIMP_WARP_TOOL_GET_OPTIONS (wt); - GeglNode *graph; /* Wraper to be returned */ + GeglNode *graph; /* Wrapper to be returned */ GeglNode *input, *output; /* Proxy nodes */ GeglNode *coords, *render; /* Render nodes */ diff --git a/app/tools/tool_manager.c b/app/tools/tool_manager.c index ccc1560cbf..3bd698bf63 100644 --- a/app/tools/tool_manager.c +++ b/app/tools/tool_manager.c @@ -39,6 +39,8 @@ #include "display/gimpdisplay.h" +#include "widgets/gimpcairo-wilber.h" + #include "gimptool.h" #include "gimptoolcontrol.h" #include "tool_manager.h" @@ -81,6 +83,8 @@ static void tool_manager_disconnect_options (GimpToolManager *tool_manager, GimpContext *user_context, GimpToolInfo *tool_info); +static void tool_manager_cast_spell (GimpToolInfo *tool_info); + /* public functions */ @@ -409,7 +413,8 @@ tool_manager_modifier_state_active (Gimp *gimp, tool_manager = tool_manager_get (gimp); - if (tool_manager->active_tool) + if (tool_manager->active_tool && + ! gimp_tool_control_is_active (tool_manager->active_tool->control)) { gimp_tool_set_modifier_state (tool_manager->active_tool, state, @@ -714,6 +719,9 @@ tool_manager_tool_changed (GimpContext *user_context, tool_manager_select_tool (user_context->gimp, new_tool); g_object_unref (new_tool); + + /* ??? */ + tool_manager_cast_spell (tool_info); } static void @@ -872,3 +880,61 @@ tool_manager_disconnect_options (GimpToolManager *tool_manager, gimp_context_set_parent (GIMP_CONTEXT (tool_info->tool_options), NULL); } } + +static void +tool_manager_cast_spell (GimpToolInfo *tool_info) +{ + typedef struct + { + const gchar *sequence; + GCallback func; + } Spell; + + static const Spell spells[] = + { + { .sequence = "gimp-warp-tool\0" + "gimp-iscissors-tool\0" + "gimp-gradient-tool\0" + "gimp-vector-tool\0" + "gimp-ellipse-select-tool\0" + "gimp-rect-select-tool\0", + .func = gimp_cairo_wilber_toggle_pointer_eyes + } + }; + + static const gchar *spell_progress[G_N_ELEMENTS (spells)]; + const gchar *tool_name; + gint i; + + tool_name = gimp_object_get_name (GIMP_OBJECT (tool_info)); + + for (i = 0; i < G_N_ELEMENTS (spells); i++) + { + if (! spell_progress[i]) + spell_progress[i] = spells[i].sequence; + + while (spell_progress[i]) + { + if (! strcmp (tool_name, spell_progress[i])) + { + spell_progress[i] += strlen (spell_progress[i]) + 1; + + if (! *spell_progress[i]) + { + spell_progress[i] = NULL; + + spells[i].func (); + } + + break; + } + else + { + if (spell_progress[i] == spells[i].sequence) + spell_progress[i] = NULL; + else + spell_progress[i] = spells[i].sequence; + } + } + } +} diff --git a/app/vectors/Makefile.in b/app/vectors/Makefile.in index c5c9a9b14b..ff70d60546 100644 --- a/app/vectors/Makefile.in +++ b/app/vectors/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -274,7 +275,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -347,6 +348,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -575,6 +577,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/vectors/gimpbezierstroke.c b/app/vectors/gimpbezierstroke.c index 54712fed35..9adcb1592c 100644 --- a/app/vectors/gimpbezierstroke.c +++ b/app/vectors/gimpbezierstroke.c @@ -2108,7 +2108,7 @@ gimp_bezier_stroke_arcto (GimpStroke *bez_stroke, if (lambda < 0.00001) { - /* dont bother with it - endpoint is too close to startpoint */ + /* don't bother with it - endpoint is too close to startpoint */ return; } diff --git a/app/vectors/gimpvectors-preview.h b/app/vectors/gimpvectors-preview.h index 23ba3af83b..959fd3fd54 100644 --- a/app/vectors/gimpvectors-preview.h +++ b/app/vectors/gimpvectors-preview.h @@ -20,7 +20,7 @@ /* - * virtual function of GimpVectors -- dont't call directly + * virtual function of GimpVectors -- don't call directly */ GimpTempBuf * gimp_vectors_get_new_preview (GimpViewable *viewable, diff --git a/app/widgets/Makefile.am b/app/widgets/Makefile.am index 4118712933..1066b88ca7 100644 --- a/app/widgets/Makefile.am +++ b/app/widgets/Makefile.am @@ -2,6 +2,8 @@ if PLATFORM_OSX xobjective_c = "-xobjective-c" +xobjective_cxx = "-xobjective-c++" +xnone = "-xnone" endif AM_CPPFLAGS = \ @@ -14,9 +16,17 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/app \ $(GEGL_CFLAGS) \ $(GTK_CFLAGS) \ - -I$(includedir) \ + -I$(includedir) + +AM_CFLAGS = \ $(xobjective_c) +AM_CXXFLAGS = \ + $(xobjective_cxx) + +AM_LDFLAGS = \ + $(xnone) + noinst_LIBRARIES = libappwidgets.a libappwidgets_a_sources = \ diff --git a/app/widgets/Makefile.in b/app/widgets/Makefile.in index 89651cf58b..4fee1308c7 100644 --- a/app/widgets/Makefile.in +++ b/app/widgets/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -385,7 +386,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -458,6 +459,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -686,6 +688,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -705,6 +708,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @PLATFORM_OSX_TRUE@xobjective_c = "-xobjective-c" +@PLATFORM_OSX_TRUE@xobjective_cxx = "-xobjective-c++" +@PLATFORM_OSX_TRUE@xnone = "-xnone" AM_CPPFLAGS = \ -DISO_CODES_LOCATION=\"$(ISO_CODES_LOCATION)\" \ -DISO_CODES_LOCALEDIR=\"$(ISO_CODES_LOCALEDIR)\" \ @@ -715,9 +720,17 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/app \ $(GEGL_CFLAGS) \ $(GTK_CFLAGS) \ - -I$(includedir) \ + -I$(includedir) + +AM_CFLAGS = \ $(xobjective_c) +AM_CXXFLAGS = \ + $(xobjective_cxx) + +AM_LDFLAGS = \ + $(xnone) + noinst_LIBRARIES = libappwidgets.a libappwidgets_a_sources = \ widgets-enums.h \ diff --git a/app/widgets/gimpaction-history.c b/app/widgets/gimpaction-history.c index 65786eb32f..675966a34d 100644 --- a/app/widgets/gimpaction-history.c +++ b/app/widgets/gimpaction-history.c @@ -294,8 +294,9 @@ gimp_action_history_search (Gimp *gimp, if (action == NULL) continue; - if (! gtk_action_is_sensitive (action) && - ! config->search_show_unavailable) + if (! gtk_action_is_visible (action) || + (! gtk_action_is_sensitive (action) && + ! config->search_show_unavailable)) continue; if (match_func (action, keyword, NULL, gimp)) @@ -384,7 +385,7 @@ gimp_action_history_activate_callback (GtkAction *action, link = g_hash_table_lookup (history.links, action_name); /* If the action is not in the history, insert it - * at the back of the hisory queue, possibly + * at the back of the history queue, possibly * replacing the last item. */ if (! link) diff --git a/app/widgets/gimpcairo-wilber.c b/app/widgets/gimpcairo-wilber.c index 45196405f0..74d8b0957f 100644 --- a/app/widgets/gimpcairo-wilber.c +++ b/app/widgets/gimpcairo-wilber.c @@ -34,11 +34,40 @@ #include "gimpcairo-wilber.h" -static void gimp_cairo_eyes (cairo_t *cr, - gdouble x, - gdouble y); +static void gimp_cairo_wilber_internal (GtkWidget *widget, + cairo_t *cr, + gdouble x, + gdouble y, + gdouble factor, + gdouble max_eye_angle); +static void gimp_cairo_eyes (GtkWidget *widget, + cairo_t *cr, + gdouble x, + gdouble y, + gdouble factor, + gdouble max_eye_angle); +static gboolean pointer_eyes = FALSE; +static GSList *cairo_wilber_widgets = NULL; + + +void +gimp_cairo_wilber_toggle_pointer_eyes (void) +{ + GSList *iter; + + pointer_eyes = ! pointer_eyes; + + for (iter = cairo_wilber_widgets; iter; iter = g_slist_next (iter)) + { + if (pointer_eyes) + g_object_set_data (G_OBJECT (iter->data), "wilber-eyes-state", NULL); + + gtk_widget_queue_draw (GTK_WIDGET (iter->data)); + } +} + void gimp_cairo_draw_toolbox_wilber (GtkWidget *widget, cairo_t *cr) @@ -67,9 +96,10 @@ gimp_cairo_draw_toolbox_wilber (GtkWidget *widget, cairo_scale (cr, factor, factor); - gimp_cairo_wilber (cr, - (allocation.width / factor - wilber_width) / 2.0, - (allocation.height / factor - wilber_height) / 2.0); + gimp_cairo_wilber_internal (widget, cr, + (allocation.width / factor - wilber_width) / 2.0, + (allocation.height / factor - wilber_height) / 2.0, + factor, 30.0 * G_PI / 180.0); cairo_set_source_rgba (cr, style->fg[state].red / 65535.0, @@ -122,9 +152,10 @@ gimp_cairo_draw_drop_wilber (GtkWidget *widget, /* magic factors depend on the image used, everything else is generic */ - gimp_cairo_wilber (cr, - - wilber_width * 0.6, - allocation.height / factor - wilber_height * 1.1); + gimp_cairo_wilber_internal (widget, cr, + - wilber_width * 0.6, + allocation.height / factor - wilber_height * 1.1, + factor, 50.0 * G_PI / 180.0); cairo_set_source_rgba (cr, style->fg[state].red / 65535.0, @@ -135,9 +166,10 @@ gimp_cairo_draw_drop_wilber (GtkWidget *widget, if (blink) { - gimp_cairo_eyes (cr, + gimp_cairo_eyes (widget, cr, - wilber_width * 0.6, - allocation.height / factor - wilber_height * 1.1); + allocation.height / factor - wilber_height * 1.1, + factor, 50.0 * G_PI / 180.0); cairo_set_source_rgba (cr, style->fg[state].red / 65535.0, @@ -155,7 +187,7 @@ gimp_cairo_draw_drop_wilber (GtkWidget *widget, * function to do that. */ static const gchar wilber_path[] = - "M 509.72445,438.68864 C 501.47706,469.77945 464.95038,491.54566 431.85915,497.74874 C 438.5216,503.01688 442.87782,511.227 442.87782,520.37375 C 442.87783,536.24746 429.95607,549.0223 414.08235,549.0223 C 398.20863,549.0223 385.28688,536.24746 385.28688,520.37375 C 385.28688,511.52403 389.27666,503.61286 395.57098,498.3364 C 359.36952,495.90384 343.70976,463.95812 343.70975,463.95814 L 342.68134,509.64891 C 342.68134,514.35021 342.08391,519.96098 340.18378,528.3072 C 339.84664,527.80364 339.51399,527.33515 339.15537,526.83804 C 330.25511,514.5011 317.25269,507.81431 306.39317,508.76741 C 302.77334,509.08511 299.47017,510.33348 296.54982,512.4403 C 284.86847,520.86757 284.97665,540.94721 296.84366,557.3965 C 306.96274,571.42287 322.32232,578.25612 333.8664,574.73254 C 391.94635,615.17624 532.16931,642.41915 509.72445,438.68864 z M 363.24953,501.1278 C 373.83202,501.12778 382.49549,509.79127 382.49549,520.37375 C 382.49549,530.95624 373.83201,539.47279 363.24953,539.47279 C 352.66706,539.47279 344.1505,530.95624 344.1505,520.37375 C 344.15049,509.79129 352.66706,501.1278 363.24953,501.1278 z M 305.80551,516.1132 C 311.68466,516.11318 316.38344,521.83985 316.38344,528.89486 C 316.38345,535.94982 311.68467,541.67652 305.80551,541.67652 C 299.92636,541.67652 295.08067,535.94987 295.08067,528.89486 C 295.08065,521.83985 299.92636,516.1132 305.80551,516.1132 z M 440.821,552.54828 C 440.821,552.54828 448.7504,554.02388 453.8965,559.45332 C 457.41881,563.16951 457.75208,569.15506 456.98172,577.37703 C 456.21143,573.8833 454.89571,571.76659 453.8965,569.29666 C 443.01388,582.47662 413.42981,583.08929 376.0312,569.88433 C 416.63248,578.00493 437.38806,570.56014 449.48903,561.2163 C 446.29383,557.08917 440.821,552.54828 440.821,552.54828 z M 434.64723,524.59684 C 434.64723,532.23974 428.44429,538.44268 420.80139,538.44268 C 413.15849,538.44268 406.95555,532.23974 406.95555,524.59684 C 406.95555,516.95394 413.15849,510.751 420.80139,510.751 C 428.44429,510.751 434.64723,516.95394 434.64723,524.59684 z M 378.00043,522.99931 C 378.00043,527.70264 374.18324,531.51984 369.47991,531.51984 C 364.77658,531.51984 360.95939,527.70264 360.95939,522.99931 C 360.95939,518.29599 364.77658,514.47879 369.47991,514.47879 C 374.18324,514.47879 378.00043,518.29599 378.00043,522.99931 z "; + "M 509.72445,438.68864 C 501.47706,469.77945 464.95038,491.54566 431.85915,497.74874 C 438.5216,503.01688 442.87782,511.227 442.87782,520.37375 C 442.87783,536.24746 429.95607,549.0223 414.08235,549.0223 C 398.20863,549.0223 385.28688,536.24746 385.28688,520.37375 C 385.28688,511.52403 389.27666,503.61286 395.57098,498.3364 C 359.36952,495.90384 343.70976,463.95812 343.70975,463.95814 L 342.68134,509.64891 C 342.68134,514.35021 342.08391,519.96098 340.18378,528.3072 C 339.84664,527.80364 339.51399,527.33515 339.15537,526.83804 C 330.25511,514.5011 317.25269,507.81431 306.39317,508.76741 C 302.77334,509.08511 299.47017,510.33348 296.54982,512.4403 C 284.86847,520.86757 284.97665,540.94721 296.84366,557.3965 C 306.96274,571.42287 322.32232,578.25612 333.8664,574.73254 C 391.94635,615.17624 532.16931,642.41915 509.72445,438.68864 z M 363.24953,501.1278 C 373.83202,501.12778 382.49549,509.79127 382.49549,520.37375 C 382.49549,530.95624 373.83201,539.47279 363.24953,539.47279 C 352.66706,539.47279 344.1505,530.95624 344.1505,520.37375 C 344.15049,509.79129 352.66706,501.1278 363.24953,501.1278 z M 305.80551,516.1132 C 311.68466,516.11318 316.38344,521.83985 316.38344,528.89486 C 316.38345,535.94982 311.68467,541.67652 305.80551,541.67652 C 299.92636,541.67652 295.08067,535.94987 295.08067,528.89486 C 295.08065,521.83985 299.92636,516.1132 305.80551,516.1132 z M 440.821,552.54828 C 440.821,552.54828 448.7504,554.02388 453.8965,559.45332 C 457.41881,563.16951 457.75208,569.15506 456.98172,577.37703 C 456.21143,573.8833 454.89571,571.76659 453.8965,569.29666 C 443.01388,582.47662 413.42981,583.08929 376.0312,569.88433 C 416.63248,578.00493 437.38806,570.56014 449.48903,561.2163 C 446.29383,557.08917 440.821,552.54828 440.821,552.54828 z "; static const gchar eyes_path[] = "M 434.64723,524.59684 C 434.64723,532.23974 428.44429,538.44268 420.80139,538.44268 C 413.15849,538.44268 406.95555,532.23974 406.95555,524.59684 C 406.95555,516.95394 413.15849,510.751 420.80139,510.751 C 428.44429,510.751 434.64723,516.95394 434.64723,524.59684 z M 378.00043,522.99931 C 378.00043,527.70264 374.18324,531.51984 369.47991,531.51984 C 364.77658,531.51984 360.95939,527.70264 360.95939,522.99931 C 360.95939,518.29599 364.77658,514.47879 369.47991,514.47879 C 374.18324,514.47879 378.00043,518.29599 378.00043,522.99931 z "; @@ -187,6 +219,24 @@ void gimp_cairo_wilber (cairo_t *cr, gdouble x, gdouble y) +{ + gimp_cairo_wilber_internal (NULL, cr, x, y, 1.0, 0.0); +} + +static void +gimp_cairo_wilber_weak_notify (gpointer data, + GObject *widget) +{ + cairo_wilber_widgets = g_slist_remove (cairo_wilber_widgets, widget); +} + +static void +gimp_cairo_wilber_internal (GtkWidget *widget, + cairo_t *cr, + gdouble x, + gdouble y, + gdouble factor, + gdouble max_eye_angle) { wilber_get_extents (cr); @@ -196,12 +246,305 @@ gimp_cairo_wilber (cairo_t *cr, cairo_append_path (cr, wilber_cairo_path); cairo_restore (cr); + + gimp_cairo_eyes (widget, cr, x, y, factor, max_eye_angle); + + if (widget && ! g_slist_find (cairo_wilber_widgets, widget)) + { + cairo_wilber_widgets = g_slist_prepend (cairo_wilber_widgets, widget); + + g_object_weak_ref (G_OBJECT (widget), + gimp_cairo_wilber_weak_notify, NULL); + } +} + +typedef struct +{ + gdouble x; + gdouble y; + gdouble radius; + + gdouble a; + gdouble b; + gdouble r; +} Eye; + +static const Eye eyes[2] = +{ + { .x = (344.151 + 382.496) / 2.0, + .y = (501.128 + 539.473) / 2.0, + .radius = (382.496 - 344.151) / 2.0, + + .a = 25.0 * G_PI / 180.0, + .b = 24.0 * G_PI / 180.0, + .r = 0.475 + }, + + { .x = (385.287 + 442.878) / 2.0, + .y = (491.431 + 549.022) / 2.0, + .radius = (442.878 - 385.287) / 2.0, + + .a = 34.0 * G_PI / 180.0, + .b = 19.0 * G_PI / 180.0, + .r = 0.5 + } +}; + +typedef struct +{ + gdouble a; + gdouble b; +} EyeState; + +typedef struct +{ + EyeState eyes[2]; + gdouble x; + gdouble y; + gdouble factor; + gdouble max_eye_angle; + gdouble t; + gint timeout_id; +} EyesState; + +static EyesState * +eyes_state_new (void) +{ + EyesState *state = g_slice_new0 (EyesState); + gint i; + + for (i = 0; i < 2; i++) + { + state->eyes[i].a = eyes[i].a; + state->eyes[i].b = eyes[i].b; + } + + state->t = (gdouble) g_get_monotonic_time () / G_TIME_SPAN_SECOND; + + return state; } static void -gimp_cairo_eyes (cairo_t *cr, - gdouble x, - gdouble y) +eyes_state_free (EyesState *state) +{ + if (state->timeout_id) + g_source_remove (state->timeout_id); + + g_slice_free (EyesState, state); +} + +static gboolean +gimp_cairo_pointer_eyes_timeout (GtkWidget *widget) +{ + EyesState *state; + gdouble t; + gint pointer_x; + gint pointer_y; + GtkAllocation allocation; + GdkWindow *window; + gint window_x; + gint window_y; + gint redraw = 2; + gint i; + + state = g_object_get_data (G_OBJECT (widget), "wilber-eyes-state"); + + t = (gdouble) g_get_monotonic_time () / G_TIME_SPAN_SECOND; + + gdk_display_get_pointer (gtk_widget_get_display (widget), + NULL, &pointer_x, &pointer_y, NULL); + + gtk_widget_get_allocation (widget, &allocation); + + window = gtk_widget_get_window (widget); + + if (window) + gdk_window_get_origin (window, &window_x, &window_y); + + for (i = 0; i < 2; i++) + { + const Eye *eye = &eyes[i]; + gdouble a; + gdouble b; + gdouble c; + GimpVector3 u; + GimpVector3 v; + GimpVector3 w; + + if (pointer_eyes) + { + gdouble screen_x; + gdouble screen_y; + gdouble z = 220.0 * state->factor; + gdouble d; + + screen_x = (eye->x + state->x - wilber_x1) * state->factor; + screen_y = (eye->y + state->y - wilber_y1) * state->factor; + + if (! gtk_widget_get_has_window (widget)) + { + screen_x += allocation.x; + screen_y += allocation.y; + } + + if (window) + { + screen_x += window_x; + screen_y += window_y; + } + + d = sqrt (SQR (pointer_x - screen_x) + SQR (pointer_y - screen_y)); + a = atan2 (pointer_y - screen_y, pointer_x - screen_x); + b = atan (d / z); + b = MIN (b, state->max_eye_angle); + } + else + { + a = eyes[i].a; + b = eyes[i].b; + } + + if (a == state->eyes[i].a && b == state->eyes[i].b) + { + redraw--; + + continue; + } + + u.x = sin (state->eyes[i].b) * cos (state->eyes[i].a); + u.y = sin (state->eyes[i].b) * sin (state->eyes[i].a); + u.z = cos (state->eyes[i].b); + + v.x = sin (b) * cos (a); + v.y = sin (b) * sin (a); + v.z = cos (b); + + c = acos (gimp_vector3_inner_product (&u, &v)); + + if (c < 1e-2) + { + state->eyes[i].a = a; + state->eyes[i].b = b; + + continue; + } + + c *= 1.0 - exp (-(t - state->t) * 15.0); + + w = gimp_vector3_cross_product (&u, &v); + w = gimp_vector3_cross_product (&w, &u); + gimp_vector3_normalize (&w); + + v.x = u.x * cos (c) + w.x * sin (c); + v.y = u.y * cos (c) + w.y * sin (c); + v.z = u.z * cos (c) + w.z * sin (c); + + a = atan2 (v.y, v.x); + b = acos (v.z); + + state->eyes[i].a = a; + state->eyes[i].b = b; + } + + state->t = t; + + if (redraw) + { + state->timeout_id = 0; + + gtk_widget_queue_draw (widget); + + return G_SOURCE_REMOVE; + } + else if (! pointer_eyes) + { + state->timeout_id = 0; + + g_object_set_data (G_OBJECT (widget), "wilber-eyes-state", NULL); + gtk_widget_queue_draw (widget); + + return G_SOURCE_REMOVE; + } + + return G_SOURCE_CONTINUE; +} + +static void +gimp_cairo_pointer_eyes (GtkWidget *widget, + cairo_t *cr, + gdouble x, + gdouble y, + gdouble factor, + gdouble max_eye_angle) +{ + EyesState *state; + gint i; + + state = g_object_get_data (G_OBJECT (widget), "wilber-eyes-state"); + + if (! state) + { + state = eyes_state_new (); + + g_object_set_data_full (G_OBJECT (widget), "wilber-eyes-state", state, + (GDestroyNotify) eyes_state_free); + } + + for (i = 0; i < 2; i++) + { + const Eye *eye = &eyes[i]; + gdouble R = eye->radius; + gdouble r = eye->r * eye->radius; + gint j; + + cairo_save (cr); + + cairo_translate (cr, eye->x, eye->y); + cairo_rotate (cr, state->eyes[i].a); + + for (j = 0; j < 32; j++) + { + gdouble a = -2.0 * G_PI * j / 32.0; + gdouble u = r * cos (a); + gdouble v = r * sin (a); + gdouble w = sqrt (SQR (R) - SQR (v)); + gdouble b = asin (u / w); + + b = CLAMP (b + state->eyes[i].b, -G_PI / 2.0, +G_PI / 2.0); + u = w * sin (b); + + if (j == 0) + cairo_move_to (cr, u, v); + else + cairo_line_to (cr, u, v); + } + + cairo_close_path (cr); + + cairo_restore (cr); + } + + state->x = x; + state->y = y; + state->factor = factor; + state->max_eye_angle = max_eye_angle; + + if (! state->timeout_id) + { + state->timeout_id = + g_timeout_add (17, + (GSourceFunc) gimp_cairo_pointer_eyes_timeout, + widget); + } +} + +static void +gimp_cairo_eyes (GtkWidget *widget, + cairo_t *cr, + gdouble x, + gdouble y, + gdouble factor, + gdouble max_eye_angle) { wilber_get_extents (cr); eyes_get_extents (cr); @@ -209,7 +552,16 @@ gimp_cairo_eyes (cairo_t *cr, cairo_save (cr); cairo_translate (cr, x - wilber_x1, y - wilber_y1); - cairo_append_path (cr, eyes_cairo_path); + if (widget && + (pointer_eyes || + g_object_get_data (G_OBJECT (widget), "wilber-eyes-state"))) + { + gimp_cairo_pointer_eyes (widget, cr, x, y, factor, max_eye_angle); + } + else + { + cairo_append_path (cr, eyes_cairo_path); + } cairo_restore (cr); } diff --git a/app/widgets/gimpcairo-wilber.h b/app/widgets/gimpcairo-wilber.h index 72dd5923f9..f4804e1823 100644 --- a/app/widgets/gimpcairo-wilber.h +++ b/app/widgets/gimpcairo-wilber.h @@ -25,18 +25,21 @@ #define __GIMP_CAIRO_WILBER_H__ -void gimp_cairo_draw_toolbox_wilber (GtkWidget *widget, - cairo_t *cr); -void gimp_cairo_draw_drop_wilber (GtkWidget *widget, - cairo_t *cr, - gboolean blink); +void gimp_cairo_wilber_toggle_pointer_eyes (void); -void gimp_cairo_wilber (cairo_t *cr, - gdouble x, - gdouble y); -void gimp_cairo_wilber_get_size (cairo_t *cr, - gdouble *width, - gdouble *height); + +void gimp_cairo_draw_toolbox_wilber (GtkWidget *widget, + cairo_t *cr); +void gimp_cairo_draw_drop_wilber (GtkWidget *widget, + cairo_t *cr, + gboolean blink); + +void gimp_cairo_wilber (cairo_t *cr, + gdouble x, + gdouble y); +void gimp_cairo_wilber_get_size (cairo_t *cr, + gdouble *width, + gdouble *height); #endif /* __GIMP_CAIRO_WILBER_H__ */ diff --git a/app/widgets/gimpcolorframe.c b/app/widgets/gimpcolorframe.c index ab831aef06..07586e75ed 100644 --- a/app/widgets/gimpcolorframe.c +++ b/app/widgets/gimpcolorframe.c @@ -43,7 +43,8 @@ enum PROP_HAS_NUMBER, PROP_NUMBER, PROP_HAS_COLOR_AREA, - PROP_HAS_COORDS + PROP_HAS_COORDS, + PROP_ELLIPSIZE, }; @@ -122,6 +123,13 @@ gimp_color_frame_class_init (GimpColorFrameClass *klass) NULL, NULL, FALSE, GIMP_PARAM_READWRITE)); + + g_object_class_install_property (object_class, PROP_ELLIPSIZE, + g_param_spec_enum ("ellipsize", + NULL, NULL, + PANGO_TYPE_ELLIPSIZE_MODE, + PANGO_ELLIPSIZE_NONE, + GIMP_PARAM_READWRITE)); } static void @@ -182,7 +190,7 @@ gimp_color_frame_init (GimpColorFrame *frame) gtk_label_set_selectable (GTK_LABEL (frame->value_labels[i]), TRUE); gtk_label_set_xalign (GTK_LABEL (frame->value_labels[i]), 1.0); gtk_box_pack_end (GTK_BOX (hbox), frame->value_labels[i], - FALSE, FALSE, 0); + TRUE, TRUE, 0); gtk_widget_show (frame->value_labels[i]); } @@ -249,6 +257,10 @@ gimp_color_frame_get_property (GObject *object, g_value_set_enum (value, frame->frame_mode); break; + case PROP_ELLIPSIZE: + g_value_set_enum (value, frame->ellipsize); + break; + case PROP_HAS_NUMBER: g_value_set_boolean (value, frame->has_number); break; @@ -285,6 +297,10 @@ gimp_color_frame_set_property (GObject *object, gimp_color_frame_set_mode (frame, g_value_get_enum (value)); break; + case PROP_ELLIPSIZE: + gimp_color_frame_set_ellipsize (frame, g_value_get_enum (value)); + break; + case PROP_HAS_NUMBER: gimp_color_frame_set_has_number (frame, g_value_get_boolean (value)); break; @@ -417,6 +433,27 @@ gimp_color_frame_set_mode (GimpColorFrame *frame, gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (frame->menu), mode); } +void +gimp_color_frame_set_ellipsize (GimpColorFrame *frame, + PangoEllipsizeMode ellipsize) +{ + gint i; + + g_return_if_fail (GIMP_IS_COLOR_FRAME (frame)); + + if (ellipsize != frame->ellipsize) + { + frame->ellipsize = ellipsize; + + for (i = 0; i < GIMP_COLOR_FRAME_ROWS; i++) + { + if (frame->value_labels[i]) + gtk_label_set_ellipsize (GTK_LABEL (frame->value_labels[i]), + ellipsize); + } + } +} + void gimp_color_frame_set_has_number (GimpColorFrame *frame, gboolean has_number) diff --git a/app/widgets/gimpcolorframe.h b/app/widgets/gimpcolorframe.h index 430c0546dd..8b3dc29301 100644 --- a/app/widgets/gimpcolorframe.h +++ b/app/widgets/gimpcolorframe.h @@ -46,6 +46,8 @@ struct _GimpColorFrame GimpColorFrameMode frame_mode; + PangoEllipsizeMode ellipsize; + gboolean has_number; gint number; @@ -80,6 +82,9 @@ GtkWidget * gimp_color_frame_new (void); void gimp_color_frame_set_mode (GimpColorFrame *frame, GimpColorFrameMode mode); +void gimp_color_frame_set_ellipsize (GimpColorFrame *frame, + PangoEllipsizeMode ellipsize); + void gimp_color_frame_set_has_number (GimpColorFrame *frame, gboolean has_number); void gimp_color_frame_set_number (GimpColorFrame *frame, diff --git a/app/widgets/gimpcursor.c b/app/widgets/gimpcursor.c index 30d887baa5..8e1838b2e5 100644 --- a/app/widgets/gimpcursor.c +++ b/app/widgets/gimpcursor.c @@ -179,7 +179,7 @@ static GimpCursor gimp_tool_cursors[] = { "tool-text.png" }, { "tool-color-picker.png" }, { "tool-bucket-fill.png" }, - { "tool-blend.png" }, + { "tool-gradient.png" }, { "tool-pencil.png" }, { "tool-paintbrush.png" }, { "tool-airbrush.png" }, @@ -207,6 +207,8 @@ static GimpCursor gimp_cursor_modifiers[] = { "modifier-intersect.png" }, { "modifier-move.png" }, { "modifier-resize.png" }, + { "modifier-rotate.png" }, + { "modifier-zoom.png" }, { "modifier-control.png" }, { "modifier-anchor.png" }, { "modifier-foreground.png" }, diff --git a/app/widgets/gimpcurveview.c b/app/widgets/gimpcurveview.c index 36b9d953ce..2acd166c55 100644 --- a/app/widgets/gimpcurveview.c +++ b/app/widgets/gimpcurveview.c @@ -511,7 +511,7 @@ gimp_curve_view_expose (GtkWidget *widget, cairo_translate (cr, 0.5, 0.5); /* Draw the grid lines */ - gdk_cairo_set_source_color (cr, &style->dark[GTK_STATE_NORMAL]); + gdk_cairo_set_source_color (cr, &style->text_aa[GTK_STATE_NORMAL]); gimp_curve_view_draw_grid (view, cr, width, height, border); diff --git a/app/widgets/gimpdashboard.c b/app/widgets/gimpdashboard.c index f0cbd49d20..07e1d7a1d3 100644 --- a/app/widgets/gimpdashboard.c +++ b/app/widgets/gimpdashboard.c @@ -42,12 +42,14 @@ #include "core/gimp.h" +#include "gimpactiongroup.h" #include "gimpdocked.h" #include "gimpdashboard.h" #include "gimpdialogfactory.h" #include "gimphelp-ids.h" #include "gimpmeter.h" #include "gimpsessioninfo-aux.h" +#include "gimpuimanager.h" #include "gimpwidgets-utils.h" #include "gimpwindowstrategy.h" @@ -93,6 +95,9 @@ typedef enum VARIABLE_CPU_ACTIVE_TIME, #endif + /* misc */ + VARIABLE_MIPMAPED, + N_VARIABLES, @@ -118,6 +123,7 @@ typedef enum #ifdef HAVE_CPU_GROUP GROUP_CPU, #endif + GROUP_MISC, N_GROUPS } Group; @@ -160,6 +166,7 @@ struct _GroupInfo const gchar *name; const gchar *title; const gchar *description; + gboolean default_active; gboolean default_expanded; gboolean has_meter; Variable meter_limit; @@ -200,19 +207,21 @@ struct _FieldData struct _GroupData { - gint n_fields; - gint n_meter_values; + gint n_fields; + gint n_meter_values; - gdouble limit; + gboolean active; + gdouble limit; - GtkExpander *expander; - GtkLabel *header_values_label; - GtkButton *menu_button; - GtkMenu *menu; - GimpMeter *meter; - GtkTable *table; + GtkToggleAction *action; + GtkExpander *expander; + GtkLabel *header_values_label; + GtkButton *menu_button; + GtkMenu *menu; + GimpMeter *meter; + GtkTable *table; - FieldData *fields; + FieldData *fields; }; struct _GimpDashboardPrivate @@ -256,7 +265,9 @@ static gboolean gimp_dashboard_group_expander_button_press (GimpDashboard GdkEventButton *bevent, GtkWidget *widget); -static void gimp_dashboard_group_menu_item_toggled (GimpDashboard *dashboard, +static void gimp_dashboard_group_action_toggled (GimpDashboard *dashboard, + GtkToggleAction *action); +static void gimp_dashboard_field_menu_item_toggled (GimpDashboard *dashboard, GtkCheckMenuItem *item); static gpointer gimp_dashboard_sample (GimpDashboard *dashboard); @@ -302,6 +313,9 @@ static void gimp_dashboard_update_group (GimpDashboard static void gimp_dashboard_update_group_values (GimpDashboard *dashboard, Group group); +static void gimp_dashboard_group_set_active (GimpDashboard *dashboard, + Group group, + gboolean active); static void gimp_dashboard_field_set_active (GimpDashboard *dashboard, Group group, gint field, @@ -448,8 +462,20 @@ static const VariableInfo variables[] = .color = {0.8, 0.7, 0.2, 0.4}, .sample_func = gimp_dashboard_sample_cpu_active_time, .reset_func = gimp_dashboard_reset_cpu_active_time - } + }, #endif /* HAVE_CPU_GROUP */ + + + /* misc variables */ + + [VARIABLE_MIPMAPED] = + { .name = "mipmapped", + .title = NC_("dashboard-variable", "Mipmapped"), + .description = N_("Total size of processed mipmapped data"), + .type = VARIABLE_TYPE_SIZE, + .sample_func = gimp_dashboard_sample_gegl_stats, + .data = "zoom-total" + }, }; static const GroupInfo groups[] = @@ -459,6 +485,7 @@ static const GroupInfo groups[] = { .name = "cache", .title = NC_("dashboard-group", "Cache"), .description = N_("In-memory tile cache"), + .default_active = TRUE, .default_expanded = TRUE, .has_meter = TRUE, .meter_limit = VARIABLE_CACHE_LIMIT, @@ -495,6 +522,7 @@ static const GroupInfo groups[] = { .name = "swap", .title = NC_("dashboard-group", "Swap"), .description = N_("On-disk tile swap"), + .default_active = TRUE, .default_expanded = TRUE, .has_meter = TRUE, .meter_limit = VARIABLE_SWAP_LIMIT, @@ -524,6 +552,7 @@ static const GroupInfo groups[] = { .name = "cpu", .title = NC_("dashboard-group", "CPU"), .description = N_("CPU usage"), + .default_active = TRUE, .default_expanded = FALSE, .has_meter = TRUE, .meter_led = VARIABLE_CPU_ACTIVE, @@ -545,8 +574,26 @@ static const GroupInfo groups[] = {} } - } + }, #endif /* HAVE_CPU_GROUP */ + + /* misc group */ + [GROUP_MISC] = + { .name = "misc", + .title = NC_("dashboard-group", "Misc"), + .description = N_("Miscellaneous information"), + .default_active = FALSE, + .default_expanded = FALSE, + .has_meter = FALSE, + .fields = (const FieldInfo[]) + { + { .variable = VARIABLE_MIPMAPED, + .default_active = TRUE + }, + + {} + } + }, }; @@ -655,7 +702,6 @@ gimp_dashboard_init (GimpDashboard *dashboard) group_info->default_expanded); gtk_expander_set_label_fill (GTK_EXPANDER (expander), TRUE); gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE, 0); - gtk_widget_show (expander); g_object_set_data (G_OBJECT (expander), "gimp-dashboard-group", GINT_TO_POINTER (group)); @@ -736,7 +782,7 @@ gimp_dashboard_init (GimpDashboard *dashboard) g_object_set_data (G_OBJECT (item), "gimp-dashboard-field", GINT_TO_POINTER (field)); g_signal_connect_swapped (item, "toggled", - G_CALLBACK (gimp_dashboard_group_menu_item_toggled), + G_CALLBACK (gimp_dashboard_field_menu_item_toggled), dashboard); gimp_dashboard_field_set_active (dashboard, group, field, @@ -819,6 +865,8 @@ gimp_dashboard_init (GimpDashboard *dashboard) gtk_box_pack_start (GTK_BOX (vbox2), table, FALSE, FALSE, 0); gtk_widget_show (table); + gimp_dashboard_group_set_active (dashboard, group, + group_info->default_active); gimp_dashboard_update_group (dashboard, group); } @@ -847,10 +895,46 @@ gimp_dashboard_docked_iface_init (GimpDockedInterface *iface) static void gimp_dashboard_constructed (GObject *object) { - GimpDashboard *dashboard = GIMP_DASHBOARD (object); + GimpDashboard *dashboard = GIMP_DASHBOARD (object); + GimpDashboardPrivate *priv = dashboard->priv; + GimpUIManager *ui_manager; + GimpActionGroup *action_group; + Group group; G_OBJECT_CLASS (parent_class)->constructed (object); + ui_manager = gimp_editor_get_ui_manager (GIMP_EDITOR (dashboard)); + action_group = gimp_ui_manager_get_action_group (ui_manager, "dashboard"); + + /* group actions */ + for (group = FIRST_GROUP; group < N_GROUPS; group++) + { + const GroupInfo *group_info = &groups[group]; + GroupData *group_data = &priv->groups[group]; + GimpToggleActionEntry entry = {}; + GtkAction *action; + + entry.name = g_strdup_printf ("dashboard-group-%s", group_info->name); + entry.label = g_dpgettext2 (NULL, "dashboard-group", group_info->title); + entry.tooltip = g_dgettext (NULL, group_info->description); + entry.help_id = GIMP_HELP_DASHBOARD_GROUPS; + entry.is_active = group_data->active; + + gimp_action_group_add_toggle_actions (action_group, "dashboard-groups", + &entry, 1); + + action = gimp_ui_manager_find_action (ui_manager, "dashboard", entry.name); + group_data->action = GTK_TOGGLE_ACTION (action); + + g_object_set_data (G_OBJECT (action), + "gimp-dashboard-group", GINT_TO_POINTER (group)); + g_signal_connect_swapped (action, "toggled", + G_CALLBACK (gimp_dashboard_group_action_toggled), + dashboard); + + g_free ((gpointer) entry.name); + } + gimp_editor_add_action_button (GIMP_EDITOR (dashboard), "dashboard", "dashboard-reset", NULL); } @@ -991,6 +1075,20 @@ gimp_dashboard_set_aux_info (GimpDocked *docked, const GroupInfo *group_info = &groups[group]; GroupData *group_data = &priv->groups[group]; + name = g_strdup_printf ("%s-active", group_info->name); + + if (! strcmp (aux->name, name)) + { + gboolean active = ! strcmp (aux->value, "yes"); + + gimp_dashboard_group_set_active (dashboard, group, active); + + g_free (name); + goto next_aux_info; + } + + g_free (name); + name = g_strdup_printf ("%s-expanded", group_info->name); if (! strcmp (aux->name, name)) @@ -1081,8 +1179,18 @@ gimp_dashboard_get_aux_info (GimpDocked *docked) { const GroupInfo *group_info = &groups[group]; GroupData *group_data = &priv->groups[group]; + gboolean active = group_data->active; gboolean expanded = gtk_expander_get_expanded (group_data->expander); + if (active != group_info->default_active) + { + name = g_strdup_printf ("%s-active", group_info->name); + value = active ? "yes" : "no"; + aux = gimp_session_info_aux_new (name, value); + aux_info = g_list_append (aux_info, aux); + g_free (name); + } + if (expanded != group_info->default_expanded) { name = g_strdup_printf ("%s-expanded", group_info->name); @@ -1161,7 +1269,24 @@ gimp_dashboard_group_expander_button_press (GimpDashboard *dashboard, } static void -gimp_dashboard_group_menu_item_toggled (GimpDashboard *dashboard, +gimp_dashboard_group_action_toggled (GimpDashboard *dashboard, + GtkToggleAction *action) +{ + GimpDashboardPrivate *priv = dashboard->priv; + Group group; + GroupData *group_data; + + group = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (action), + "gimp-dashboard-group")); + group_data = &priv->groups[group]; + + group_data->active = gtk_toggle_action_get_active (action); + + gimp_dashboard_update_group (dashboard, group); +} + +static void +gimp_dashboard_field_menu_item_toggled (GimpDashboard *dashboard, GtkCheckMenuItem *item) { GimpDashboardPrivate *priv = dashboard->priv; @@ -1519,7 +1644,7 @@ gimp_dashboard_sample_cpu_usage (GimpDashboard *dashboard, curr_usage = tms.tms_utime + tms.tms_stime; - if (prev_clock) + if (prev_clock && curr_clock != prev_clock) { variable_data->available = TRUE; variable_data->value.percentage = (gdouble) (curr_usage - prev_usage) / @@ -1576,7 +1701,7 @@ gimp_dashboard_sample_cpu_usage (GimpDashboard *dashboard, curr_usage += ((guint64) process_user_time.dwHighDateTime << 32) | (guint64) process_user_time.dwLowDateTime; - if (prev_time) + if (prev_time && curr_time != prev_time) { variable_data->available = TRUE; variable_data->value.percentage = (gdouble) (curr_usage - prev_usage) / @@ -1806,6 +1931,12 @@ gimp_dashboard_update_group (GimpDashboard *dashboard, gboolean add_separator; gint field; + gtk_widget_set_visible (GTK_WIDGET (group_data->expander), + group_data->active); + + if (! group_data->active) + return; + n_rows = 0; add_separator = FALSE; @@ -1949,6 +2080,9 @@ gimp_dashboard_update_group_values (GimpDashboard *dashboard, GString *header_values; gint field; + if (! group_data->active) + return; + if (group_info->has_meter) { if (group_info->meter_limit) @@ -2038,6 +2172,33 @@ gimp_dashboard_update_group_values (GimpDashboard *dashboard, g_string_free (header_values, TRUE); } +static void +gimp_dashboard_group_set_active (GimpDashboard *dashboard, + Group group, + gboolean active) +{ + GimpDashboardPrivate *priv = dashboard->priv; + GroupData *group_data = &priv->groups[group]; + + if (active != group_data->active) + { + group_data->active = active; + + if (group_data->action) + { + g_signal_handlers_block_by_func (group_data->action, + gimp_dashboard_group_action_toggled, + dashboard); + + gtk_toggle_action_set_active (group_data->action, active); + + g_signal_handlers_unblock_by_func (group_data->action, + gimp_dashboard_group_action_toggled, + dashboard); + } + } +} + static void gimp_dashboard_field_set_active (GimpDashboard *dashboard, Group group, @@ -2053,13 +2214,13 @@ gimp_dashboard_field_set_active (GimpDashboard *dashboard, field_data->active = active; g_signal_handlers_block_by_func (field_data->menu_item, - gimp_dashboard_group_menu_item_toggled, + gimp_dashboard_field_menu_item_toggled, dashboard); gtk_check_menu_item_set_active (field_data->menu_item, active); g_signal_handlers_unblock_by_func (field_data->menu_item, - gimp_dashboard_group_menu_item_toggled, + gimp_dashboard_field_menu_item_toggled, dashboard); } } @@ -2467,3 +2628,34 @@ gimp_dashboard_get_low_swap_space_warning (GimpDashboard *dashboard) return dashboard->priv->low_swap_space_warning; } + +void +gimp_dashboard_menu_setup (GimpUIManager *manager, + const gchar *ui_path) +{ + guint merge_id; + Group group; + + g_return_if_fail (GIMP_IS_UI_MANAGER (manager)); + g_return_if_fail (ui_path != NULL); + + merge_id = gtk_ui_manager_new_merge_id (GTK_UI_MANAGER (manager)); + + for (group = FIRST_GROUP; group < N_GROUPS; group++) + { + const GroupInfo *group_info = &groups[group]; + gchar *action_name; + gchar *action_path; + + action_name = g_strdup_printf ("dashboard-group-%s", group_info->name); + action_path = g_strdup_printf ("%s/Groups/Groups", ui_path); + + gtk_ui_manager_add_ui (GTK_UI_MANAGER (manager), merge_id, + action_path, action_name, action_name, + GTK_UI_MANAGER_MENUITEM, + FALSE); + + g_free (action_name); + g_free (action_path); + } +} diff --git a/app/widgets/gimpdashboard.h b/app/widgets/gimpdashboard.h index e8e92493cb..b0daffbe1a 100644 --- a/app/widgets/gimpdashboard.h +++ b/app/widgets/gimpdashboard.h @@ -68,5 +68,8 @@ void gimp_dashboard_set_low_swap_space_warning (GimpDa gboolean low_swap_space_warning); gboolean gimp_dashboard_get_low_swap_space_warning (GimpDashboard *dashboard); +void gimp_dashboard_menu_setup (GimpUIManager *manager, + const gchar *ui_path); + #endif /* __GIMP_DASHBOARD_H__ */ diff --git a/app/widgets/gimpdnd.c b/app/widgets/gimpdnd.c index 3f8967526d..d0f372f149 100644 --- a/app/widgets/gimpdnd.c +++ b/app/widgets/gimpdnd.c @@ -1158,7 +1158,7 @@ gimp_dnd_uri_list_dest_add (GtkWidget *widget, { g_return_if_fail (GTK_IS_WIDGET (widget)); - /* Set a default drag dest if not already done. Explicitely set + /* Set a default drag dest if not already done. Explicitly set * COPY and MOVE for file drag destinations. Some file managers * such as Konqueror only offer MOVE by default. */ diff --git a/app/widgets/gimpdock.c b/app/widgets/gimpdock.c index cd487ea06c..44bd0ed940 100644 --- a/app/widgets/gimpdock.c +++ b/app/widgets/gimpdock.c @@ -759,7 +759,7 @@ gimp_dock_temp_add (GimpDock *dock, * @dock: * @child: * - * Removes a temporarly child added with gimp_dock_temp_add(). + * Removes a temporary child added with gimp_dock_temp_add(). **/ void gimp_dock_temp_remove (GimpDock *dock, diff --git a/app/widgets/gimpdockbook.c b/app/widgets/gimpdockbook.c index 3895a0f77f..1cf11f4291 100644 --- a/app/widgets/gimpdockbook.c +++ b/app/widgets/gimpdockbook.c @@ -999,7 +999,7 @@ gimp_dockbook_add (GimpDockbook *dockbook, * @identifiers: The dockable identifier(s) * @position: The insert position * - * Add a dockable from the dialog factory associated wth the dockbook. + * Add a dockable from the dialog factory associated with the dockbook. **/ GtkWidget * gimp_dockbook_add_from_dialog_factory (GimpDockbook *dockbook, diff --git a/app/widgets/gimpgradienteditor.c b/app/widgets/gimpgradienteditor.c index ed2cd5e5a1..0d4ccd414f 100644 --- a/app/widgets/gimpgradienteditor.c +++ b/app/widgets/gimpgradienteditor.c @@ -678,7 +678,9 @@ gradient_editor_drop_color (GtkWidget *widget, gimp_gradient_segment_split_midpoint (gradient, GIMP_DATA_EDITOR (editor)->context, - seg, &lseg, &rseg); + seg, + editor->blend_color_space, + &lseg, &rseg); if (lseg) { @@ -948,7 +950,7 @@ view_set_hint (GimpGradientEditor *editor, gimp_gradient_get_color_at (GIMP_GRADIENT (data_editor->data), data_editor->context, NULL, - xpos, FALSE, &rgb); + xpos, FALSE, FALSE, &rgb); gimp_color_area_set_color (GIMP_COLOR_AREA (editor->current_color), &rgb); @@ -987,7 +989,7 @@ view_pick_color (GimpGradientEditor *editor, gimp_gradient_get_color_at (GIMP_GRADIENT (data_editor->data), data_editor->context, NULL, - xpos, FALSE, &color); + xpos, FALSE, FALSE, &color); gimp_color_area_set_color (GIMP_COLOR_AREA (editor->current_color), &color); diff --git a/app/widgets/gimpgradienteditor.h b/app/widgets/gimpgradienteditor.h index 6387c33793..8f0429a0c3 100644 --- a/app/widgets/gimpgradienteditor.h +++ b/app/widgets/gimpgradienteditor.h @@ -81,6 +81,8 @@ struct _GimpGradientEditor gdouble control_last_gx; /* Last position (wrt gradient) when dragging */ gdouble control_orig_pos; /* Original click position when dragging */ + GimpGradientBlendColorSpace blend_color_space; + /* Split uniformly dialog */ gint split_parts; diff --git a/app/widgets/gimpgradientselect.c b/app/widgets/gimpgradientselect.c index e54a0ba7d1..79ca895dc4 100644 --- a/app/widgets/gimpgradientselect.c +++ b/app/widgets/gimpgradientselect.c @@ -160,7 +160,9 @@ gimp_gradient_select_run_callback (GimpPdbDialog *dialog, while (i--) { seg = gimp_gradient_get_color_at (gradient, dialog->caller_context, - seg, pos, FALSE, &color); + seg, pos, FALSE, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, + &color); *pv++ = color.r; *pv++ = color.g; diff --git a/app/widgets/gimphelp-ids.h b/app/widgets/gimphelp-ids.h index f58690d1c8..254e9394f0 100644 --- a/app/widgets/gimphelp-ids.h +++ b/app/widgets/gimphelp-ids.h @@ -287,7 +287,6 @@ #define GIMP_HELP_TOOL_AIRBRUSH "gimp-tool-airbrush" #define GIMP_HELP_TOOL_ALIGN "gimp-tool-align" -#define GIMP_HELP_TOOL_BLEND "gimp-tool-blend" #define GIMP_HELP_TOOL_BRIGHTNESS_CONTRAST "gimp-tool-brightness-contrast" #define GIMP_HELP_TOOL_BUCKET_FILL "gimp-tool-bucket-fill" #define GIMP_HELP_TOOL_BY_COLOR_SELECT "gimp-tool-by-color-select" @@ -308,6 +307,7 @@ #define GIMP_HELP_TOOL_FOREGROUND_SELECT "gimp-tool-foreground-select" #define GIMP_HELP_TOOL_FUZZY_SELECT "gimp-tool-fuzzy-select" #define GIMP_HELP_TOOL_GEGL "gimp-tool-gegl" +#define GIMP_HELP_TOOL_GRADIENT "gimp-tool-gradient" #define GIMP_HELP_TOOL_HANDLE_TRANSFORM "gimp-tool-handle-transform" #define GIMP_HELP_TOOL_HEAL "gimp-tool-heal" #define GIMP_HELP_TOOL_HUE_SATURATION "gimp-tool-hue-saturation" @@ -665,6 +665,7 @@ #define GIMP_HELP_SAMPLE_POINT_SAMPLE_MERGED "gimp-sample-point-sample-merged" #define GIMP_HELP_DASHBOARD_DIALOG "gimp-dashboard-dialog" +#define GIMP_HELP_DASHBOARD_GROUPS "gimp-dashboard-groups" #define GIMP_HELP_DASHBOARD_UPDATE_INTERVAL "gimp-dashboard-update-interval" #define GIMP_HELP_DASHBOARD_HISTORY_DURATION "gimp-dashboard-history-duration" #define GIMP_HELP_DASHBOARD_RESET "gimp-dashboard-reset" diff --git a/app/widgets/gimphistogramview.c b/app/widgets/gimphistogramview.c index e45b68c8ad..a9f75797df 100644 --- a/app/widgets/gimphistogramview.c +++ b/app/widgets/gimphistogramview.c @@ -316,7 +316,7 @@ gimp_histogram_view_expose (GtkWidget *widget, cairo_translate (cr, 0.5, 0.5); /* Draw the outer border */ - gdk_cairo_set_source_color (cr, &style->dark[GTK_STATE_NORMAL]); + gdk_cairo_set_source_color (cr, &style->text_aa[GTK_STATE_NORMAL]); cairo_rectangle (cr, border, border, width - 1, height - 1); cairo_stroke (cr); @@ -373,7 +373,7 @@ gimp_histogram_view_expose (GtkWidget *widget, if (view->subdivisions > 1 && x >= (xstop * width / view->subdivisions)) { - gdk_cairo_set_source_color (cr, &style->dark[GTK_STATE_NORMAL]); + gdk_cairo_set_source_color (cr, &style->text_aa[GTK_STATE_NORMAL]); cairo_move_to (cr, x + border, border); cairo_line_to (cr, x + border, border + height - 1); @@ -589,7 +589,7 @@ gimp_histogram_view_motion_notify (GtkWidget *widget, } -/* public funcions */ +/* public functions */ GtkWidget * gimp_histogram_view_new (gboolean range) diff --git a/app/widgets/gimppaletteview.c b/app/widgets/gimppaletteview.c index 8b8fad2a34..9858b2bc0b 100644 --- a/app/widgets/gimppaletteview.c +++ b/app/widgets/gimppaletteview.c @@ -419,7 +419,7 @@ gimp_palette_view_select_entry (GimpPaletteView *view, } -/* private funcions */ +/* private functions */ static GimpPaletteEntry * gimp_palette_view_find_entry (GimpPaletteView *view, diff --git a/app/widgets/gimppanedbox.c b/app/widgets/gimppanedbox.c index 5317965591..4e378dd810 100644 --- a/app/widgets/gimppanedbox.c +++ b/app/widgets/gimppanedbox.c @@ -218,7 +218,7 @@ gimp_paned_box_set_widget_drag_handler (GtkWidget *widget, * dock and a toolbox for example, in which case we want to set a * drag handler in two ways * - * We so need to introduce som abstractions here... + * We so need to introduce some abstractions here... */ if (GIMP_IS_DOCKBOOK (widget)) @@ -573,7 +573,7 @@ gimp_paned_box_add_widget (GimpPanedBox *paned_box, parent = grandparent; } - /* Deatch the widget and bulid up a new hierarchy */ + /* Detach the widget and build up a new hierarchy */ g_object_ref (old_widget); gtk_container_remove (GTK_CONTAINER (parent), old_widget); diff --git a/app/widgets/gimpsearchpopup.c b/app/widgets/gimpsearchpopup.c index 404ccb2c93..490afe7481 100644 --- a/app/widgets/gimpsearchpopup.c +++ b/app/widgets/gimpsearchpopup.c @@ -458,7 +458,7 @@ gimp_search_popup_size_allocate (GtkWidget *widget, GdkScreen *screen = gdk_screen_get_default (); /* Save the window height when results are shown so that resizes - * by the user are saved accross searches. + * by the user are saved across searches. */ window_height = MAX (gdk_screen_get_height (screen) / 4, allocation->height); diff --git a/app/widgets/gimpselectiondata.c b/app/widgets/gimpselectiondata.c index cb88122246..264d09242c 100644 --- a/app/widgets/gimpselectiondata.c +++ b/app/widgets/gimpselectiondata.c @@ -384,7 +384,7 @@ gimp_selection_data_get_xcf (GtkSelectionData *selection, } else { - g_warning ("Recieved invalid XCF data: %s", error->message); + g_warning ("Received invalid XCF data: %s", error->message); g_clear_error (&error); } diff --git a/app/widgets/gimpviewablebox.c b/app/widgets/gimpviewablebox.c index d5642d3a15..a85a6f0ff5 100644 --- a/app/widgets/gimpviewablebox.c +++ b/app/widgets/gimpviewablebox.c @@ -67,6 +67,9 @@ static void gimp_viewable_box_edit_clicked (GtkWidget *widget, static void gimp_gradient_box_reverse_notify (GObject *object, GParamSpec *pspec, GimpView *view); +static void gimp_gradient_box_blend_notify (GObject *object, + GParamSpec *pspec, + GimpView *view); /* brush boxes */ @@ -341,6 +344,7 @@ gradient_box_new (GimpContainer *container, GimpViewType view_type, GimpViewSize view_size, const gchar *reverse_prop, + const gchar *blend_color_space_prop, const gchar *editor_id, const gchar *editor_tooltip) { @@ -402,6 +406,24 @@ gradient_box_new (GimpContainer *container, GIMP_VIEW (view)); } + if (blend_color_space_prop) + { + GtkWidget *view; + gchar *signal_name; + + view = gtk_bin_get_child (GTK_BIN (button)); + + signal_name = g_strconcat ("notify::", blend_color_space_prop, NULL); + g_signal_connect_object (context, signal_name, + G_CALLBACK (gimp_gradient_box_blend_notify), + G_OBJECT (view), 0); + g_free (signal_name); + + gimp_gradient_box_blend_notify (G_OBJECT (context), + NULL, + GIMP_VIEW (view)); + } + return hbox; } @@ -410,7 +432,8 @@ gimp_gradient_box_new (GimpContainer *container, GimpContext *context, const gchar *label, gint spacing, - const gchar *reverse_prop) + const gchar *reverse_prop, + const gchar *blend_color_space_prop) { g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container), NULL); @@ -418,7 +441,7 @@ gimp_gradient_box_new (GimpContainer *container, return gradient_box_new (container, context, label, spacing, GIMP_VIEW_TYPE_LIST, GIMP_VIEW_SIZE_LARGE, - reverse_prop, + reverse_prop, blend_color_space_prop, NULL, NULL); } @@ -430,6 +453,7 @@ gimp_prop_gradient_box_new (GimpContainer *container, const gchar *view_type_prop, const gchar *view_size_prop, const gchar *reverse_prop, + const gchar *blend_color_space_prop, const gchar *editor_id, const gchar *editor_tooltip) { @@ -448,6 +472,7 @@ gimp_prop_gradient_box_new (GimpContainer *container, return view_props_connect (gradient_box_new (container, context, label, spacing, view_type, view_size, reverse_prop, + blend_color_space_prop, editor_id, editor_tooltip), context, view_type_prop, view_size_prop); @@ -604,7 +629,6 @@ gimp_viewable_box_new (GimpContainer *container, GtkWidget *button; GtkWidget *vbox; GtkWidget *l; - GtkWidget *entry_hbox = NULL; GtkWidget *entry; hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, spacing); @@ -636,25 +660,13 @@ gimp_viewable_box_new (GimpContainer *container, gtk_widget_show (l); } - if (editor_id) - { - entry_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, spacing); - gtk_box_pack_end (GTK_BOX (vbox), entry_hbox, FALSE, FALSE, 0); - gtk_widget_show (entry_hbox); - } - entry = gimp_container_entry_new (container, context, view_size, 1); /* set a silly smally size request on the entry to disable * GtkEntry's minimal width of 150 pixels. */ gtk_entry_set_width_chars (GTK_ENTRY (entry), 4); - - if (entry_hbox) - gtk_box_pack_start (GTK_BOX (entry_hbox), entry, TRUE, TRUE, 0); - else - gtk_box_pack_end (GTK_BOX (vbox), entry, label ? FALSE : TRUE, FALSE, 0); - + gtk_box_pack_end (GTK_BOX (vbox), entry, label ? FALSE : TRUE, FALSE, 0); gtk_widget_show (entry); if (editor_id) @@ -664,7 +676,7 @@ gimp_viewable_box_new (GimpContainer *container, edit_button = gtk_button_new (); gtk_button_set_relief (GTK_BUTTON (edit_button), GTK_RELIEF_NONE); - gtk_box_pack_end (GTK_BOX (entry_hbox), edit_button, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX (hbox), edit_button, FALSE, FALSE, 0); gtk_widget_show (edit_button); if (editor_tooltip) @@ -737,3 +749,21 @@ gimp_gradient_box_reverse_notify (GObject *object, gimp_view_renderer_gradient_set_reverse (rendergrad, reverse); } + +static void +gimp_gradient_box_blend_notify (GObject *object, + GParamSpec *pspec, + GimpView *view) +{ + GimpViewRendererGradient *rendergrad; + GimpGradientBlendColorSpace blend_color_space; + + rendergrad = GIMP_VIEW_RENDERER_GRADIENT (view->renderer); + + g_object_get (object, + "gradient-blend-color-space", &blend_color_space, + NULL); + + gimp_view_renderer_gradient_set_blend_color_space (rendergrad, + blend_color_space); +} diff --git a/app/widgets/gimpviewablebox.h b/app/widgets/gimpviewablebox.h index 8ac22be80e..56c84d5444 100644 --- a/app/widgets/gimpviewablebox.h +++ b/app/widgets/gimpviewablebox.h @@ -70,7 +70,8 @@ GtkWidget * gimp_gradient_box_new (GimpContainer *container, GimpContext *context, const gchar *label, gint scacing, - const gchar *reverse_prop); + const gchar *reverse_prop, + const gchar *blend_color_space_prop); GtkWidget * gimp_prop_gradient_box_new (GimpContainer *container, GimpContext *context, const gchar *label, @@ -78,6 +79,7 @@ GtkWidget * gimp_prop_gradient_box_new (GimpContainer *container, const gchar *view_type_prop, const gchar *view_size_prop, const gchar *reverse_prop, + const gchar *blend_color_space_prop, const gchar *editor_id, const gchar *editor_tooltip); diff --git a/app/widgets/gimpviewrenderergradient.c b/app/widgets/gimpviewrenderergradient.c index 3094842e46..a82895c404 100644 --- a/app/widgets/gimpviewrenderergradient.c +++ b/app/widgets/gimpviewrenderergradient.c @@ -63,9 +63,8 @@ gimp_view_renderer_gradient_class_init (GimpViewRendererGradientClass *klass) static void gimp_view_renderer_gradient_init (GimpViewRendererGradient *renderer) { - renderer->left = 0.0; - renderer->right = 1.0; - renderer->reverse = FALSE; + renderer->left = 0.0; + renderer->right = 1.0; } static void @@ -177,7 +176,10 @@ gimp_view_renderer_gradient_render (GimpViewRenderer *renderer, guchar r, g, b, a; seg = gimp_gradient_get_color_at (gradient, renderer->context, seg, - cur_x, rendergrad->reverse, &color); + cur_x, + rendergrad->reverse, + rendergrad->blend_color_space, + &color); cur_x += dx; gimp_rgba_get_uchar (&color, &r, &g, &b, &a); @@ -246,3 +248,18 @@ gimp_view_renderer_gradient_set_reverse (GimpViewRendererGradient *renderer, gimp_view_renderer_update (GIMP_VIEW_RENDERER (renderer)); } } + +void +gimp_view_renderer_gradient_set_blend_color_space (GimpViewRendererGradient *renderer, + GimpGradientBlendColorSpace blend_color_space) +{ + g_return_if_fail (GIMP_IS_VIEW_RENDERER_GRADIENT (renderer)); + + if (blend_color_space != renderer->blend_color_space) + { + renderer->blend_color_space = blend_color_space; + + gimp_view_renderer_invalidate (GIMP_VIEW_RENDERER (renderer)); + gimp_view_renderer_update (GIMP_VIEW_RENDERER (renderer)); + } +} diff --git a/app/widgets/gimpviewrenderergradient.h b/app/widgets/gimpviewrenderergradient.h index c1edbc3231..6d082a9893 100644 --- a/app/widgets/gimpviewrenderergradient.h +++ b/app/widgets/gimpviewrenderergradient.h @@ -35,12 +35,13 @@ typedef struct _GimpViewRendererGradientClass GimpViewRendererGradientClass; struct _GimpViewRendererGradient { - GimpViewRenderer parent_instance; + GimpViewRenderer parent_instance; - gdouble left; - gdouble right; - gboolean reverse; - gboolean has_fg_bg_segments; + gdouble left; + gdouble right; + gboolean reverse; + GimpGradientBlendColorSpace blend_color_space; + gboolean has_fg_bg_segments; }; struct _GimpViewRendererGradientClass @@ -51,11 +52,14 @@ struct _GimpViewRendererGradientClass GType gimp_view_renderer_gradient_get_type (void) G_GNUC_CONST; -void gimp_view_renderer_gradient_set_offsets (GimpViewRendererGradient *renderer, - gdouble left, - gdouble right); -void gimp_view_renderer_gradient_set_reverse (GimpViewRendererGradient *renderer, - gboolean reverse); +void gimp_view_renderer_gradient_set_offsets (GimpViewRendererGradient *renderer, + gdouble left, + gdouble right); +void gimp_view_renderer_gradient_set_reverse (GimpViewRendererGradient *renderer, + gboolean reverse); +void gimp_view_renderer_gradient_set_blend_color_space + (GimpViewRendererGradient *renderer, + GimpGradientBlendColorSpace blend_color_space); #endif /* __GIMP_VIEW_RENDERER_GRADIENT_H__ */ diff --git a/app/widgets/widgets-enums.h b/app/widgets/widgets-enums.h index 74ae105379..f0187b7a86 100644 --- a/app/widgets/widgets-enums.h +++ b/app/widgets/widgets-enums.h @@ -249,7 +249,7 @@ typedef enum /*< skip >*/ GIMP_TOOL_CURSOR_TEXT, GIMP_TOOL_CURSOR_COLOR_PICKER, GIMP_TOOL_CURSOR_BUCKET_FILL, - GIMP_TOOL_CURSOR_BLEND, + GIMP_TOOL_CURSOR_GRADIENT, GIMP_TOOL_CURSOR_PENCIL, GIMP_TOOL_CURSOR_PAINTBRUSH, GIMP_TOOL_CURSOR_AIRBRUSH, @@ -276,6 +276,8 @@ typedef enum /*< skip >*/ GIMP_CURSOR_MODIFIER_INTERSECT, GIMP_CURSOR_MODIFIER_MOVE, GIMP_CURSOR_MODIFIER_RESIZE, + GIMP_CURSOR_MODIFIER_ROTATE, + GIMP_CURSOR_MODIFIER_ZOOM, GIMP_CURSOR_MODIFIER_CONTROL, GIMP_CURSOR_MODIFIER_ANCHOR, GIMP_CURSOR_MODIFIER_FOREGROUND, diff --git a/app/xcf/Makefile.in b/app/xcf/Makefile.in index b103e969bd..24a677b95a 100644 --- a/app/xcf/Makefile.in +++ b/app/xcf/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -270,7 +271,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -343,6 +344,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -571,6 +573,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/app/xcf/xcf-load.c b/app/xcf/xcf-load.c index f5d6930ce4..c964e2c771 100644 --- a/app/xcf/xcf-load.c +++ b/app/xcf/xcf-load.c @@ -45,6 +45,7 @@ #include "core/gimpimage-metadata.h" #include "core/gimpimage-private.h" #include "core/gimpimage-sample-points.h" +#include "core/gimpimage-symmetry.h" #include "core/gimpimage-undo.h" #include "core/gimpitemstack.h" #include "core/gimplayer-floating-selection.h" @@ -53,6 +54,7 @@ #include "core/gimpparasitelist.h" #include "core/gimpprogress.h" #include "core/gimpselection.h" +#include "core/gimpsymmetry.h" #include "core/gimptemplate.h" #include "operations/layer-modes/gimp-layer-modes.h" @@ -160,6 +162,8 @@ xcf_load_image (Gimp *gimp, gint image_type; GimpPrecision precision = GIMP_PRECISION_U8_GAMMA; gint num_successful_elements = 0; + GList *syms; + GList *iter; /* read in the image width, height and type */ xcf_read_int32 (info, (guint32 *) &width, 1); @@ -272,6 +276,39 @@ xcf_load_image (Gimp *gimp, gimp_parasite_name (parasite)); } + /* check for symmetry parasites */ + syms = gimp_image_symmetry_list (); + for (iter = syms; iter; iter = g_list_next (iter)) + { + GType type = (GType) iter->data; + gchar *parasite_name = gimp_symmetry_parasite_name (type); + + parasite = gimp_image_parasite_find (image, + parasite_name); + g_free (parasite_name); + if (parasite) + { + GimpSymmetry *sym = gimp_symmetry_from_parasite (parasite, + image, + type); + + if (sym) + { + GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image); + + gimp_parasite_list_remove (private->parasites, + gimp_parasite_name (parasite)); + + gimp_image_symmetry_add (image, sym); + + g_signal_emit_by_name (sym, "active-changed", NULL); + if (sym->active) + gimp_image_set_active_symmetry (image, type); + } + } + } + g_list_free (syms); + /* migrate the old "exif-data" parasite */ parasite = gimp_image_parasite_find (GIMP_IMAGE (image), "exif-data"); @@ -1866,7 +1903,7 @@ xcf_load_buffer (XcfInfo *info, xcf_read_int32 (info, (guint32 *) &bpp, 1); /* make sure the values in the file correspond to the values - * calculated when the TileManager was created. + * calculated when the GeglBuffer was created. */ if (width != gegl_buffer_get_width (buffer) || height != gegl_buffer_get_height (buffer) || @@ -1980,7 +2017,7 @@ xcf_load_level (XcfInfo *info, return FALSE; } - /* get the tile from the tile manager */ + /* get buffer rectangle to write to */ gimp_gegl_buffer_get_tile_rect (buffer, XCF_TILE_WIDTH, XCF_TILE_HEIGHT, i, &rect); @@ -1991,17 +2028,17 @@ xcf_load_level (XcfInfo *info, switch (info->compression) { case COMPRESS_NONE: - if (!xcf_load_tile (info, buffer, &rect, format)) + if (! xcf_load_tile (info, buffer, &rect, format)) fail = TRUE; break; case COMPRESS_RLE: - if (!xcf_load_tile_rle (info, buffer, &rect, format, - offset2 - offset)) + if (! xcf_load_tile_rle (info, buffer, &rect, format, + offset2 - offset)) fail = TRUE; break; case COMPRESS_ZLIB: - if (!xcf_load_tile_zlib (info, buffer, &rect, format, - offset2 - offset)) + if (! xcf_load_tile_zlib (info, buffer, &rect, format, + offset2 - offset)) fail = TRUE; break; case COMPRESS_FRACTAL: diff --git a/app/xcf/xcf-save.c b/app/xcf/xcf-save.c index b0e034c222..026014b9bf 100644 --- a/app/xcf/xcf-save.c +++ b/app/xcf/xcf-save.c @@ -45,11 +45,13 @@ #include "core/gimpimage-metadata.h" #include "core/gimpimage-private.h" #include "core/gimpimage-sample-points.h" +#include "core/gimpimage-symmetry.h" #include "core/gimplayer.h" #include "core/gimplayermask.h" #include "core/gimpparasitelist.h" #include "core/gimpprogress.h" #include "core/gimpsamplepoint.h" +#include "core/gimpsymmetry.h" #include "operations/layer-modes/gimp-layer-modes.h" @@ -358,6 +360,8 @@ xcf_save_image_props (XcfInfo *info, GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image); GimpParasite *grid_parasite = NULL; GimpParasite *meta_parasite = NULL; + GList *symmetry_parasites = NULL; + GList *iter; GimpUnit unit = gimp_image_get_unit (image); gdouble xres; gdouble yres; @@ -428,6 +432,23 @@ xcf_save_image_props (XcfInfo *info, } } + if (g_list_length (gimp_image_symmetry_get (image))) + { + GimpParasite *parasite = NULL; + GimpSymmetry *symmetry; + + for (iter = gimp_image_symmetry_get (image); iter; iter = g_list_next (iter)) + { + symmetry = GIMP_SYMMETRY (iter->data); + if (G_TYPE_FROM_INSTANCE (symmetry) == GIMP_TYPE_SYMMETRY) + /* Do not save the identity symmetry. */ + continue; + parasite = gimp_symmetry_to_parasite (GIMP_SYMMETRY (iter->data)); + gimp_parasite_list_add (private->parasites, parasite); + symmetry_parasites = g_list_prepend (symmetry_parasites, parasite); + } + } + if (gimp_parasite_list_length (private->parasites) > 0) { xcf_check_error (xcf_save_prop (info, image, PROP_PARASITES, error, @@ -448,6 +469,16 @@ xcf_save_image_props (XcfInfo *info, gimp_parasite_free (meta_parasite); } + for (iter = symmetry_parasites; iter; iter = g_list_next (iter)) + { + GimpParasite *parasite = iter->data; + + gimp_parasite_list_remove (private->parasites, + gimp_parasite_name (parasite)); + } + g_list_free_full (symmetry_parasites, + (GDestroyNotify) gimp_parasite_free); + xcf_check_error (xcf_save_prop (info, image, PROP_END, error)); return TRUE; @@ -1990,7 +2021,7 @@ xcf_save_old_paths (XcfInfo *info, /* if no points are generated because of a faulty path we should * skip saving the path - this is unfortunately impossible, because - * we already saved the number of paths and I wont start seeking + * we already saved the number of paths and I won't start seeking * around to fix that cruft */ name = (gchar *) gimp_object_get_name (vectors); diff --git a/build/Makefile.in b/build/Makefile.in index b8d6bd39c3..1e0b21759a 100644 --- a/build/Makefile.in +++ b/build/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -273,7 +274,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -346,6 +347,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -574,6 +576,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/build/windows/Makefile.in b/build/windows/Makefile.in index 60ff4fd3f4..e88258103a 100644 --- a/build/windows/Makefile.in +++ b/build/windows/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -274,7 +275,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -347,6 +348,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -575,6 +577,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/build/windows/installer/Makefile.in b/build/windows/installer/Makefile.in index 68b7968330..f885d0a159 100644 --- a/build/windows/installer/Makefile.in +++ b/build/windows/installer/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -273,7 +274,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -346,6 +347,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -574,6 +576,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/build/windows/installer/lang/Makefile.am b/build/windows/installer/lang/Makefile.am index fa9dcaa7dc..f740bf3f67 100644 --- a/build/windows/installer/lang/Makefile.am +++ b/build/windows/installer/lang/Makefile.am @@ -28,7 +28,8 @@ languages = \ ru:[ru]:WINDOWS-1251 \ sl:[sl]:WINDOWS-1250 \ sv:[sv]:WINDOWS-1252 \ - tr:[tr]:WINDOWS-1254 + tr:[tr]:WINDOWS-1254 \ + zh_CN:[zh_CN]:WINDOWS-936 stamp-isl: setup.isl Makefile.am @ \ diff --git a/build/windows/installer/lang/Makefile.in b/build/windows/installer/lang/Makefile.in index eb609d2fe2..37664deae7 100644 --- a/build/windows/installer/lang/Makefile.in +++ b/build/windows/installer/lang/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -213,7 +214,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -286,6 +287,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -514,6 +516,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -561,7 +564,8 @@ languages = \ ru:[ru]:WINDOWS-1251 \ sl:[sl]:WINDOWS-1250 \ sv:[sv]:WINDOWS-1252 \ - tr:[tr]:WINDOWS-1254 + tr:[tr]:WINDOWS-1254 \ + zh_CN:[zh_CN]:WINDOWS-936 all: all-am diff --git a/config.h.in b/config.h.in index 148a41c723..30a43ea53b 100644 --- a/config.h.in +++ b/config.h.in @@ -26,6 +26,9 @@ /* Define to 1 if using `alloca.c'. */ #undef C_ALLOCA +/* Define to 1 to if MyPaint brushes are bundled with GIMP */ +#undef ENABLE_BUNDLED_MYPAINT_BRUSHES + /* Define to 1 to enable support for multiple processors. */ #undef ENABLE_MP @@ -68,6 +71,9 @@ the CoreFoundation framework. */ #undef HAVE_CFPREFERENCESCOPYAPPVALUE +/* define if the compiler supports basic C++11 syntax */ +#undef HAVE_CXX11 + /* Define to 1 if you have the `dcgettext' function. */ #undef HAVE_DCGETTEXT diff --git a/configure b/configure index ae992ed15f..45eacbbb0c 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GIMP 2.10.0-RC1. +# Generated by GNU Autoconf 2.69 for GIMP 2.10.0-RC2. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GIMP' PACKAGE_TARNAME='gimp' -PACKAGE_VERSION='2.10.0-RC1' -PACKAGE_STRING='GIMP 2.10.0-RC1' +PACKAGE_VERSION='2.10.0-RC2' +PACKAGE_STRING='GIMP 2.10.0-RC2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP' PACKAGE_URL='' @@ -769,6 +769,7 @@ HAVE_WEBKIT_TRUE WEB_PAGE WEBKIT_LIBS WEBKIT_CFLAGS +mypaint_brushes_dir MYPAINT_BRUSHES_LIBS MYPAINT_BRUSHES_CFLAGS LIBMYPAINT_LIBS @@ -829,7 +830,7 @@ GEXIV2_CFLAGS HARFBUZZ_LIBS HARFBUZZ_CFLAGS FREETYPE_LIBS -FREETYPE_CONFIG +FREETYPE_CFLAGS FONTCONFIG_LIBS FONTCONFIG_CFLAGS PANGOCAIRO_LIBS @@ -977,6 +978,7 @@ LIBTOOL OBJDUMP DLLTOOL AS +HAVE_CXX11 am__fastdepCXX_FALSE am__fastdepCXX_TRUE CXXDEPMODE @@ -1170,6 +1172,7 @@ with_aa with_libxpm with_openexr with_webp +enable_bundled_mypaint_brushes with_webkit with_print with_cairo_pdf @@ -1245,6 +1248,8 @@ PANGOCAIRO_CFLAGS PANGOCAIRO_LIBS FONTCONFIG_CFLAGS FONTCONFIG_LIBS +FREETYPE_CFLAGS +FREETYPE_LIBS HARFBUZZ_CFLAGS HARFBUZZ_LIBS GEXIV2_CFLAGS @@ -1846,7 +1851,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GIMP 2.10.0-RC1 to adapt to many kinds of systems. +\`configure' configures GIMP 2.10.0-RC2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1921,7 +1926,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GIMP 2.10.0-RC1:";; + short | recursive ) echo "Configuration of GIMP 2.10.0-RC2:";; esac cat <<\_ACEOF @@ -1958,6 +1963,9 @@ Optional Features: --enable-sse enable SSE support (default=auto) --enable-altivec enable AltiVec support (default=auto) --disable-mp disable support for multiple processors + --enable-bundled-mypaint-brushes + treat MyPaint brushes as bundled in the install prefix + (default=no) --disable-alsatest Do not try to compile and run a test Alsa program --disable-python do not build the python extension --disable-vector-icons use raster icons rather than vector ones (default=auto) @@ -2073,6 +2081,10 @@ Some influential environment variables: C compiler flags for FONTCONFIG, overriding pkg-config FONTCONFIG_LIBS linker flags for FONTCONFIG, overriding pkg-config + FREETYPE_CFLAGS + C compiler flags for FREETYPE, overriding pkg-config + FREETYPE_LIBS + linker flags for FREETYPE, overriding pkg-config HARFBUZZ_CFLAGS C compiler flags for HARFBUZZ, overriding pkg-config HARFBUZZ_LIBS @@ -2224,7 +2236,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GIMP configure 2.10.0-RC1 +GIMP configure 2.10.0-RC2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2768,7 +2780,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GIMP $as_me 2.10.0-RC1, which was +It was created by GIMP $as_me 2.10.0-RC2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3637,7 +3649,7 @@ fi # Define the identity of the package. PACKAGE='gimp' - VERSION='2.10.0-RC1' + VERSION='2.10.0-RC2' # Some tools Automake needs. @@ -3770,7 +3782,7 @@ GIMP_MINOR_VERSION=10 GIMP_MICRO_VERSION=0 GIMP_INTERFACE_AGE=0 GIMP_BINARY_AGE=1000 -GIMP_VERSION=2.10.0-RC1 +GIMP_VERSION=2.10.0-RC2 GIMP_REAL_VERSION=2.10.0 GIMP_API_VERSION=2.0 GIMP_APP_VERSION=2.10 @@ -3808,14 +3820,14 @@ GTK_REQUIRED_VERSION=2.24.10 GTK_WIN32_RECOMMENDED_VERSION=2.24.32 CAIRO_REQUIRED_VERSION=1.12.2 CAIRO_PDF_REQUIRED_VERSION=1.12.2 -GEGL_REQUIRED_VERSION=0.3.30 +GEGL_REQUIRED_VERSION=0.3.34 GEXIV2_REQUIRED_VERSION=0.10.6 LCMS_REQUIRED_VERSION=2.8 LIBPNG_REQUIRED_VERSION=1.6.25 LIBLZMA_REQUIRED_VERSION=5.0.0 LIBMYPAINT_REQUIRED_VERSION=1.3.0 PANGOCAIRO_REQUIRED_VERSION=1.29.4 -BABL_REQUIRED_VERSION=0.1.44 +BABL_REQUIRED_VERSION=0.1.46 FONTCONFIG_REQUIRED_VERSION=2.12.4 FREETYPE2_REQUIRED_VERSION=2.1.7 HARFBUZZ_REQUIRED_VERSION=0.9.19 @@ -6428,6 +6440,991 @@ fi + ax_cxx_compile_alternatives="11 0x" ax_cxx_compile_cxx11_required=true + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + ac_success=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features by default" >&5 +$as_echo_n "checking whether $CXX supports C++11 features by default... " >&6; } +if ${ax_cv_cxx_compile_cxx11+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +// If the compiler admits that it is not ready for C++11, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201103L + +#error "This is not a C++11 compiler" + +#else + +namespace cxx11 +{ + + namespace test_static_assert + { + + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + } + + namespace test_final_override + { + + struct Base + { + virtual void f() {} + }; + + struct Derived : public Base + { + virtual void f() override {} + }; + + } + + namespace test_double_right_angle_brackets + { + + template < typename T > + struct check {}; + + typedef check single_type; + typedef check> double_type; + typedef check>> triple_type; + typedef check>>> quadruple_type; + + } + + namespace test_decltype + { + + int + f() + { + int a = 1; + decltype(a) b = 2; + return a + b; + } + + } + + namespace test_type_deduction + { + + template < typename T1, typename T2 > + struct is_same + { + static const bool value = false; + }; + + template < typename T > + struct is_same + { + static const bool value = true; + }; + + template < typename T1, typename T2 > + auto + add(T1 a1, T2 a2) -> decltype(a1 + a2) + { + return a1 + a2; + } + + int + test(const int c, volatile int v) + { + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == false, ""); + auto ac = c; + auto av = v; + auto sumi = ac + av + 'x'; + auto sumf = ac + av + 1.0; + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == true, ""); + return (sumf > 0.0) ? sumi : add(c, v); + } + + } + + namespace test_noexcept + { + + int f() { return 0; } + int g() noexcept { return 0; } + + static_assert(noexcept(f()) == false, ""); + static_assert(noexcept(g()) == true, ""); + + } + + namespace test_constexpr + { + + template < typename CharT > + unsigned long constexpr + strlen_c_r(const CharT *const s, const unsigned long acc) noexcept + { + return *s ? strlen_c_r(s + 1, acc + 1) : acc; + } + + template < typename CharT > + unsigned long constexpr + strlen_c(const CharT *const s) noexcept + { + return strlen_c_r(s, 0UL); + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("1") == 1UL, ""); + static_assert(strlen_c("example") == 7UL, ""); + static_assert(strlen_c("another\0example") == 7UL, ""); + + } + + namespace test_rvalue_references + { + + template < int N > + struct answer + { + static constexpr int value = N; + }; + + answer<1> f(int&) { return answer<1>(); } + answer<2> f(const int&) { return answer<2>(); } + answer<3> f(int&&) { return answer<3>(); } + + void + test() + { + int i = 0; + const int c = 0; + static_assert(decltype(f(i))::value == 1, ""); + static_assert(decltype(f(c))::value == 2, ""); + static_assert(decltype(f(0))::value == 3, ""); + } + + } + + namespace test_uniform_initialization + { + + struct test + { + static const int zero {}; + static const int one {1}; + }; + + static_assert(test::zero == 0, ""); + static_assert(test::one == 1, ""); + + } + + namespace test_lambdas + { + + void + test1() + { + auto lambda1 = [](){}; + auto lambda2 = lambda1; + lambda1(); + lambda2(); + } + + int + test2() + { + auto a = [](int i, int j){ return i + j; }(1, 2); + auto b = []() -> int { return '0'; }(); + auto c = [=](){ return a + b; }(); + auto d = [&](){ return c; }(); + auto e = [a, &b](int x) mutable { + const auto identity = [](int y){ return y; }; + for (auto i = 0; i < a; ++i) + a += b--; + return x + identity(a + b); + }(0); + return a + b + c + d + e; + } + + int + test3() + { + const auto nullary = [](){ return 0; }; + const auto unary = [](int x){ return x; }; + using nullary_t = decltype(nullary); + using unary_t = decltype(unary); + const auto higher1st = [](nullary_t f){ return f(); }; + const auto higher2nd = [unary](nullary_t f1){ + return [unary, f1](unary_t f2){ return f2(unary(f1())); }; + }; + return higher1st(nullary) + higher2nd(nullary)(unary); + } + + } + + namespace test_variadic_templates + { + + template + struct sum; + + template + struct sum + { + static constexpr auto value = N0 + sum::value; + }; + + template <> + struct sum<> + { + static constexpr auto value = 0; + }; + + static_assert(sum<>::value == 0, ""); + static_assert(sum<1>::value == 1, ""); + static_assert(sum<23>::value == 23, ""); + static_assert(sum<1, 2>::value == 3, ""); + static_assert(sum<5, 5, 11>::value == 21, ""); + static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); + + } + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function + // because of this. + namespace test_template_alias_sfinae + { + + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { func(0); } + + } + +} // namespace cxx11 + +#endif // __cplusplus >= 201103L + + + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ax_cv_cxx_compile_cxx11=yes +else + ax_cv_cxx_compile_cxx11=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx11" >&5 +$as_echo "$ax_cv_cxx_compile_cxx11" >&6; } + if test x$ax_cv_cxx_compile_cxx11 = xyes; then + ac_success=yes + fi + + if test x$ac_success = xno; then + for alternative in ${ax_cxx_compile_alternatives}; do + switch="-std=gnu++${alternative}" + cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5 +$as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; } +if eval \${$cachevar+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_CXX="$CXX" + CXX="$CXX $switch" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +// If the compiler admits that it is not ready for C++11, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201103L + +#error "This is not a C++11 compiler" + +#else + +namespace cxx11 +{ + + namespace test_static_assert + { + + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + } + + namespace test_final_override + { + + struct Base + { + virtual void f() {} + }; + + struct Derived : public Base + { + virtual void f() override {} + }; + + } + + namespace test_double_right_angle_brackets + { + + template < typename T > + struct check {}; + + typedef check single_type; + typedef check> double_type; + typedef check>> triple_type; + typedef check>>> quadruple_type; + + } + + namespace test_decltype + { + + int + f() + { + int a = 1; + decltype(a) b = 2; + return a + b; + } + + } + + namespace test_type_deduction + { + + template < typename T1, typename T2 > + struct is_same + { + static const bool value = false; + }; + + template < typename T > + struct is_same + { + static const bool value = true; + }; + + template < typename T1, typename T2 > + auto + add(T1 a1, T2 a2) -> decltype(a1 + a2) + { + return a1 + a2; + } + + int + test(const int c, volatile int v) + { + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == false, ""); + auto ac = c; + auto av = v; + auto sumi = ac + av + 'x'; + auto sumf = ac + av + 1.0; + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == true, ""); + return (sumf > 0.0) ? sumi : add(c, v); + } + + } + + namespace test_noexcept + { + + int f() { return 0; } + int g() noexcept { return 0; } + + static_assert(noexcept(f()) == false, ""); + static_assert(noexcept(g()) == true, ""); + + } + + namespace test_constexpr + { + + template < typename CharT > + unsigned long constexpr + strlen_c_r(const CharT *const s, const unsigned long acc) noexcept + { + return *s ? strlen_c_r(s + 1, acc + 1) : acc; + } + + template < typename CharT > + unsigned long constexpr + strlen_c(const CharT *const s) noexcept + { + return strlen_c_r(s, 0UL); + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("1") == 1UL, ""); + static_assert(strlen_c("example") == 7UL, ""); + static_assert(strlen_c("another\0example") == 7UL, ""); + + } + + namespace test_rvalue_references + { + + template < int N > + struct answer + { + static constexpr int value = N; + }; + + answer<1> f(int&) { return answer<1>(); } + answer<2> f(const int&) { return answer<2>(); } + answer<3> f(int&&) { return answer<3>(); } + + void + test() + { + int i = 0; + const int c = 0; + static_assert(decltype(f(i))::value == 1, ""); + static_assert(decltype(f(c))::value == 2, ""); + static_assert(decltype(f(0))::value == 3, ""); + } + + } + + namespace test_uniform_initialization + { + + struct test + { + static const int zero {}; + static const int one {1}; + }; + + static_assert(test::zero == 0, ""); + static_assert(test::one == 1, ""); + + } + + namespace test_lambdas + { + + void + test1() + { + auto lambda1 = [](){}; + auto lambda2 = lambda1; + lambda1(); + lambda2(); + } + + int + test2() + { + auto a = [](int i, int j){ return i + j; }(1, 2); + auto b = []() -> int { return '0'; }(); + auto c = [=](){ return a + b; }(); + auto d = [&](){ return c; }(); + auto e = [a, &b](int x) mutable { + const auto identity = [](int y){ return y; }; + for (auto i = 0; i < a; ++i) + a += b--; + return x + identity(a + b); + }(0); + return a + b + c + d + e; + } + + int + test3() + { + const auto nullary = [](){ return 0; }; + const auto unary = [](int x){ return x; }; + using nullary_t = decltype(nullary); + using unary_t = decltype(unary); + const auto higher1st = [](nullary_t f){ return f(); }; + const auto higher2nd = [unary](nullary_t f1){ + return [unary, f1](unary_t f2){ return f2(unary(f1())); }; + }; + return higher1st(nullary) + higher2nd(nullary)(unary); + } + + } + + namespace test_variadic_templates + { + + template + struct sum; + + template + struct sum + { + static constexpr auto value = N0 + sum::value; + }; + + template <> + struct sum<> + { + static constexpr auto value = 0; + }; + + static_assert(sum<>::value == 0, ""); + static_assert(sum<1>::value == 1, ""); + static_assert(sum<23>::value == 23, ""); + static_assert(sum<1, 2>::value == 3, ""); + static_assert(sum<5, 5, 11>::value == 21, ""); + static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); + + } + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function + // because of this. + namespace test_template_alias_sfinae + { + + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { func(0); } + + } + +} // namespace cxx11 + +#endif // __cplusplus >= 201103L + + + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + eval $cachevar=yes +else + eval $cachevar=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CXX="$ac_save_CXX" +fi +eval ac_res=\$$cachevar + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + fi + + if test x$ac_success = xno; then + for alternative in ${ax_cxx_compile_alternatives}; do + for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do + cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5 +$as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; } +if eval \${$cachevar+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_CXX="$CXX" + CXX="$CXX $switch" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +// If the compiler admits that it is not ready for C++11, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201103L + +#error "This is not a C++11 compiler" + +#else + +namespace cxx11 +{ + + namespace test_static_assert + { + + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + } + + namespace test_final_override + { + + struct Base + { + virtual void f() {} + }; + + struct Derived : public Base + { + virtual void f() override {} + }; + + } + + namespace test_double_right_angle_brackets + { + + template < typename T > + struct check {}; + + typedef check single_type; + typedef check> double_type; + typedef check>> triple_type; + typedef check>>> quadruple_type; + + } + + namespace test_decltype + { + + int + f() + { + int a = 1; + decltype(a) b = 2; + return a + b; + } + + } + + namespace test_type_deduction + { + + template < typename T1, typename T2 > + struct is_same + { + static const bool value = false; + }; + + template < typename T > + struct is_same + { + static const bool value = true; + }; + + template < typename T1, typename T2 > + auto + add(T1 a1, T2 a2) -> decltype(a1 + a2) + { + return a1 + a2; + } + + int + test(const int c, volatile int v) + { + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == false, ""); + auto ac = c; + auto av = v; + auto sumi = ac + av + 'x'; + auto sumf = ac + av + 1.0; + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == true, ""); + return (sumf > 0.0) ? sumi : add(c, v); + } + + } + + namespace test_noexcept + { + + int f() { return 0; } + int g() noexcept { return 0; } + + static_assert(noexcept(f()) == false, ""); + static_assert(noexcept(g()) == true, ""); + + } + + namespace test_constexpr + { + + template < typename CharT > + unsigned long constexpr + strlen_c_r(const CharT *const s, const unsigned long acc) noexcept + { + return *s ? strlen_c_r(s + 1, acc + 1) : acc; + } + + template < typename CharT > + unsigned long constexpr + strlen_c(const CharT *const s) noexcept + { + return strlen_c_r(s, 0UL); + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("1") == 1UL, ""); + static_assert(strlen_c("example") == 7UL, ""); + static_assert(strlen_c("another\0example") == 7UL, ""); + + } + + namespace test_rvalue_references + { + + template < int N > + struct answer + { + static constexpr int value = N; + }; + + answer<1> f(int&) { return answer<1>(); } + answer<2> f(const int&) { return answer<2>(); } + answer<3> f(int&&) { return answer<3>(); } + + void + test() + { + int i = 0; + const int c = 0; + static_assert(decltype(f(i))::value == 1, ""); + static_assert(decltype(f(c))::value == 2, ""); + static_assert(decltype(f(0))::value == 3, ""); + } + + } + + namespace test_uniform_initialization + { + + struct test + { + static const int zero {}; + static const int one {1}; + }; + + static_assert(test::zero == 0, ""); + static_assert(test::one == 1, ""); + + } + + namespace test_lambdas + { + + void + test1() + { + auto lambda1 = [](){}; + auto lambda2 = lambda1; + lambda1(); + lambda2(); + } + + int + test2() + { + auto a = [](int i, int j){ return i + j; }(1, 2); + auto b = []() -> int { return '0'; }(); + auto c = [=](){ return a + b; }(); + auto d = [&](){ return c; }(); + auto e = [a, &b](int x) mutable { + const auto identity = [](int y){ return y; }; + for (auto i = 0; i < a; ++i) + a += b--; + return x + identity(a + b); + }(0); + return a + b + c + d + e; + } + + int + test3() + { + const auto nullary = [](){ return 0; }; + const auto unary = [](int x){ return x; }; + using nullary_t = decltype(nullary); + using unary_t = decltype(unary); + const auto higher1st = [](nullary_t f){ return f(); }; + const auto higher2nd = [unary](nullary_t f1){ + return [unary, f1](unary_t f2){ return f2(unary(f1())); }; + }; + return higher1st(nullary) + higher2nd(nullary)(unary); + } + + } + + namespace test_variadic_templates + { + + template + struct sum; + + template + struct sum + { + static constexpr auto value = N0 + sum::value; + }; + + template <> + struct sum<> + { + static constexpr auto value = 0; + }; + + static_assert(sum<>::value == 0, ""); + static_assert(sum<1>::value == 1, ""); + static_assert(sum<23>::value == 23, ""); + static_assert(sum<1, 2>::value == 3, ""); + static_assert(sum<5, 5, 11>::value == 21, ""); + static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); + + } + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function + // because of this. + namespace test_template_alias_sfinae + { + + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { func(0); } + + } + +} // namespace cxx11 + +#endif // __cplusplus >= 201103L + + + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + eval $cachevar=yes +else + eval $cachevar=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CXX="$ac_save_CXX" +fi +eval ac_res=\$$cachevar + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + if test x$ac_success = xyes; then + break + fi + done + fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + if test x$ax_cxx_compile_cxx11_required = xtrue; then + if test x$ac_success = xno; then + as_fn_error $? "*** A compiler with support for C++11 language features is required." "$LINENO" 5 + fi + fi + if test x$ac_success = xno; then + HAVE_CXX11=0 + { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5 +$as_echo "$as_me: No compiler with C++11 support was found" >&6;} + else + HAVE_CXX11=1 + +$as_echo "#define HAVE_CXX11 1" >>confdefs.h + + fi + + + # Initialize libtool case `pwd` in @@ -9987,7 +10984,6 @@ done - func_stripname_cnf () { case $2 in @@ -21657,12 +22653,12 @@ if test -n "$BABL_CFLAGS"; then pkg_cv_BABL_CFLAGS="$BABL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"babl >= 0.1.44\""; } >&5 - ($PKG_CONFIG --exists --print-errors "babl >= 0.1.44") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"babl >= 0.1.46\""; } >&5 + ($PKG_CONFIG --exists --print-errors "babl >= 0.1.46") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_BABL_CFLAGS=`$PKG_CONFIG --cflags "babl >= 0.1.44" 2>/dev/null` + pkg_cv_BABL_CFLAGS=`$PKG_CONFIG --cflags "babl >= 0.1.46" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -21674,12 +22670,12 @@ if test -n "$BABL_LIBS"; then pkg_cv_BABL_LIBS="$BABL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"babl >= 0.1.44\""; } >&5 - ($PKG_CONFIG --exists --print-errors "babl >= 0.1.44") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"babl >= 0.1.46\""; } >&5 + ($PKG_CONFIG --exists --print-errors "babl >= 0.1.46") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_BABL_LIBS=`$PKG_CONFIG --libs "babl >= 0.1.44" 2>/dev/null` + pkg_cv_BABL_LIBS=`$PKG_CONFIG --libs "babl >= 0.1.46" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -21700,27 +22696,27 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - BABL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "babl >= 0.1.44" 2>&1` + BABL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "babl >= 0.1.46" 2>&1` else - BABL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "babl >= 0.1.44" 2>&1` + BABL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "babl >= 0.1.46" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$BABL_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: babl >= 0.1.44" >&5 -$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: babl >= 0.1.44" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: babl >= 0.1.46" >&5 +$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: babl >= 0.1.46" >&6;} required_deps="$required_deps - - Error: missing dependency babl >= 0.1.44" + - Error: missing dependency babl >= 0.1.46" elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: babl >= 0.1.44" >&5 -$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: babl >= 0.1.44" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: babl >= 0.1.46" >&5 +$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: babl >= 0.1.46" >&6;} required_deps="$required_deps - - Error: missing dependency babl >= 0.1.44" + - Error: missing dependency babl >= 0.1.46" else BABL_CFLAGS=$pkg_cv_BABL_CFLAGS @@ -21738,12 +22734,12 @@ if test -n "$GEGL_CFLAGS"; then pkg_cv_GEGL_CFLAGS="$GEGL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.3 >= 0.3.30\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gegl-0.3 >= 0.3.30") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.3 >= 0.3.34\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gegl-0.3 >= 0.3.34") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GEGL_CFLAGS=`$PKG_CONFIG --cflags "gegl-0.3 >= 0.3.30" 2>/dev/null` + pkg_cv_GEGL_CFLAGS=`$PKG_CONFIG --cflags "gegl-0.3 >= 0.3.34" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -21755,12 +22751,12 @@ if test -n "$GEGL_LIBS"; then pkg_cv_GEGL_LIBS="$GEGL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.3 >= 0.3.30\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gegl-0.3 >= 0.3.30") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.3 >= 0.3.34\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gegl-0.3 >= 0.3.34") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GEGL_LIBS=`$PKG_CONFIG --libs "gegl-0.3 >= 0.3.30" 2>/dev/null` + pkg_cv_GEGL_LIBS=`$PKG_CONFIG --libs "gegl-0.3 >= 0.3.34" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -21781,27 +22777,27 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GEGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gegl-0.3 >= 0.3.30" 2>&1` + GEGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gegl-0.3 >= 0.3.34" 2>&1` else - GEGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gegl-0.3 >= 0.3.30" 2>&1` + GEGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gegl-0.3 >= 0.3.34" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GEGL_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.3 >= 0.3.30" >&5 -$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.3 >= 0.3.30" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.3 >= 0.3.34" >&5 +$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.3 >= 0.3.34" >&6;} required_deps="$required_deps - - Error: missing dependency gegl-0.3 >= 0.3.30" + - Error: missing dependency gegl-0.3 >= 0.3.34" elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.3 >= 0.3.30" >&5 -$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.3 >= 0.3.30" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.3 >= 0.3.34" >&5 +$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.3 >= 0.3.34" >&6;} required_deps="$required_deps - - Error: missing dependency gegl-0.3 >= 0.3.30" + - Error: missing dependency gegl-0.3 >= 0.3.34" else GEGL_CFLAGS=$pkg_cv_GEGL_CFLAGS @@ -24446,57 +25442,89 @@ if test "x$fontconfig_ok" = xno; then fi -# Extract the first word of "freetype-config", so it can be a program name with args. -set dummy freetype-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_FREETYPE_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $FREETYPE_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_FREETYPE_CONFIG="$FREETYPE_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_FREETYPE_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - test -z "$ac_cv_path_FREETYPE_CONFIG" && ac_cv_path_FREETYPE_CONFIG="no" - ;; -esac -fi -FREETYPE_CONFIG=$ac_cv_path_FREETYPE_CONFIG -if test -n "$FREETYPE_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_CONFIG" >&5 -$as_echo "$FREETYPE_CONFIG" >&6; } +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREETYPE" >&5 +$as_echo_n "checking for FREETYPE... " >&6; } + +if test -n "$FREETYPE_CFLAGS"; then + pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 >= 2.1.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "freetype2 >= 2.1.7") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 2.1.7" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$FREETYPE_LIBS"; then + pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 >= 2.1.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "freetype2 >= 2.1.7") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 >= 2.1.7" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "freetype2 >= 2.1.7" 2>&1` + else + FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "freetype2 >= 2.1.7" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$FREETYPE_PKG_ERRORS" >&5 -if test "x$FREETYPE_CONFIG" != "xno" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype libraries" >&5 -$as_echo_n "checking for freetype libraries... " >&6; } - FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIBS" >&5 -$as_echo "$FREETYPE_LIBS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: 2.1.7 >= 2.1.7" >&5 +$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: 2.1.7 >= 2.1.7" >&6;} + required_deps="$required_deps + - Error: missing dependency 2.1.7 >= 2.1.7" + +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: 2.1.7 >= 2.1.7" >&5 +$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: 2.1.7 >= 2.1.7" >&6;} + required_deps="$required_deps + - Error: missing dependency 2.1.7 >= 2.1.7" + +else + FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS + FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + fi - pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HARFBUZZ" >&5 $as_echo_n "checking for HARFBUZZ... " >&6; } @@ -27635,6 +28663,30 @@ $as_echo "yes" >&6; } fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to treat MyPaint brushes as bundled" >&5 +$as_echo_n "checking whether to treat MyPaint brushes as bundled... " >&6; } +# Check whether --enable-bundled-mypaint-brushes was given. +if test "${enable_bundled_mypaint_brushes+set}" = set; then : + enableval=$enable_bundled_mypaint_brushes; +else + enable_bundled_mypaint_brushes=no +fi + + +if test "x$enable_bundled_mypaint_brushes" != xno; then + +$as_echo "#define ENABLE_BUNDLED_MYPAINT_BRUSHES 1" >>confdefs.h + + mypaint_brushes_dir='${gimp_installation_dir}/share/mypaint-data/1.0/brushes' +else + mypaint_brushes_dir=`$PKG_CONFIG --variable=brushesdir mypaint-brushes-1.0` +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_bundled_mypaint_brushes" >&5 +$as_echo "$enable_bundled_mypaint_brushes" >&6; } + + + ################## # Check for webkit ################## @@ -31077,7 +32129,7 @@ GIMP_MODULES=modules ac_config_commands="$ac_config_commands libgimpbase/gimpversion.h" -ac_config_files="$ac_config_files INSTALL tools/Makefile pdb/Makefile libgimp/Makefile libgimpbase/Makefile libgimpconfig/Makefile libgimpcolor/Makefile libgimpmath/Makefile libgimpmodule/Makefile libgimpthumb/Makefile libgimpwidgets/Makefile app/Makefile app/actions/Makefile app/config/Makefile app/core/Makefile app/operations/Makefile app/operations/layer-modes/Makefile app/operations/layer-modes-legacy/Makefile app/operations/tests/Makefile app/gegl/Makefile app/dialogs/Makefile app/display/Makefile app/file/Makefile app/gui/Makefile app/menus/Makefile app/paint/Makefile app/pdb/Makefile app/plug-in/Makefile app/propgui/Makefile app/text/Makefile app/tools/Makefile app/vectors/Makefile app/widgets/Makefile app/xcf/Makefile app/tests/Makefile app/tests/files/Makefile app/tests/gimpdir-empty/Makefile app/tests/gimpdir-empty/brushes/Makefile app/tests/gimpdir-empty/gradients/Makefile app/tests/gimpdir-empty/patterns/Makefile app/tests/gimpdir/Makefile app/tests/gimpdir/brushes/Makefile app/tests/gimpdir/gradients/Makefile app/tests/gimpdir/patterns/Makefile app-tools/Makefile build/Makefile build/windows/Makefile build/windows/gimp.rc build/windows/gimp-plug-ins.rc build/windows/installer/Makefile build/windows/installer/lang/Makefile plug-ins/Makefile plug-ins/file-bmp/Makefile plug-ins/file-exr/Makefile plug-ins/file-faxg3/Makefile plug-ins/file-fits/Makefile plug-ins/file-fli/Makefile plug-ins/file-ico/Makefile plug-ins/file-jpeg/Makefile plug-ins/file-psd/Makefile plug-ins/file-raw/Makefile plug-ins/file-sgi/Makefile plug-ins/file-tiff/Makefile plug-ins/file-webp/Makefile plug-ins/flame/Makefile plug-ins/fractal-explorer/Makefile plug-ins/fractal-explorer/examples/Makefile plug-ins/gfig/Makefile plug-ins/gfig/gfig-examples/Makefile plug-ins/gfig/images/Makefile plug-ins/ui/Makefile plug-ins/gimpressionist/Brushes/Makefile plug-ins/gimpressionist/Makefile plug-ins/gimpressionist/Paper/Makefile plug-ins/gimpressionist/Presets/Makefile plug-ins/gradient-flare/Makefile plug-ins/gradient-flare/flares/Makefile plug-ins/help-browser/Makefile plug-ins/help/Makefile plug-ins/ifs-compose/Makefile plug-ins/imagemap/Makefile plug-ins/imagemap/images/Makefile plug-ins/lighting/Makefile plug-ins/lighting/images/Makefile plug-ins/map-object/Makefile plug-ins/metadata/Makefile plug-ins/pagecurl/Makefile plug-ins/print/Makefile plug-ins/pygimp/Makefile plug-ins/pygimp/plug-ins/Makefile plug-ins/screenshot/Makefile plug-ins/script-fu/Makefile plug-ins/script-fu/ftx/Makefile plug-ins/script-fu/scripts/Makefile plug-ins/script-fu/scripts/images/Makefile plug-ins/script-fu/tinyscheme/Makefile plug-ins/selection-to-path/Makefile plug-ins/twain/Makefile plug-ins/common/Makefile modules/Makefile devel-docs/Makefile devel-docs/app/Makefile devel-docs/app/version devel-docs/libgimp/Makefile devel-docs/libgimp/version devel-docs/libgimpbase/Makefile devel-docs/libgimpbase/version devel-docs/libgimpconfig/Makefile devel-docs/libgimpconfig/version devel-docs/libgimpcolor/Makefile devel-docs/libgimpcolor/version devel-docs/libgimpmath/Makefile devel-docs/libgimpmath/version devel-docs/libgimpmodule/Makefile devel-docs/libgimpmodule/version devel-docs/libgimpthumb/Makefile devel-docs/libgimpthumb/version devel-docs/libgimpwidgets/Makefile devel-docs/libgimpwidgets/version devel-docs/tools/Makefile docs/Makefile menus/Makefile cursors/Makefile icons/Makefile icons/Color/Makefile icons/Legacy/Makefile icons/Symbolic/Makefile icons/Symbolic-Inverted/Makefile themes/Makefile themes/System/Makefile themes/Darker/Makefile themes/Dark/Makefile themes/Gray/Makefile themes/Light/Makefile themes/Lighter/Makefile data/Makefile data/brushes/Makefile data/brushes/Basic/Makefile data/brushes/gimp-obsolete-files/Makefile data/brushes/Media/Makefile data/brushes/Legacy/Makefile data/brushes/Sketch/Makefile data/brushes/Splatters/Makefile data/brushes/Texture/Makefile data/dynamics/Makefile data/dynamics/Basic/Makefile data/dynamics/FX/Makefile data/environ/Makefile data/gradients/Makefile data/images/Makefile data/interpreters/Makefile data/palettes/Makefile data/patterns/Makefile data/patterns/Animal/Makefile data/patterns/Fabric/Makefile data/patterns/Food/Makefile data/patterns/Legacy/Makefile data/patterns/Paper/Makefile data/patterns/Plant/Makefile data/patterns/Sky/Makefile data/patterns/Stone/Makefile data/patterns/Water/Makefile data/patterns/Wood/Makefile data/tags/Makefile data/tips/Makefile data/tool-presets/Makefile data/tool-presets/Crop/Makefile data/tool-presets/FX/Makefile data/tool-presets/Paint/Makefile data/tool-presets/Selection/Makefile data/tool-presets/Sketch/Makefile desktop/Makefile desktop/gimp.desktop.in desktop/org.gimp.GIMP.appdata.xml.in etc/Makefile m4macros/Makefile po/Makefile.in po-libgimp/Makefile.in po-plug-ins/Makefile.in po-python/Makefile.in po-script-fu/Makefile.in po-tips/Makefile.in po-windows-installer/Makefile.in gimp-zip Makefile" +ac_config_files="$ac_config_files INSTALL tools/Makefile pdb/Makefile libgimp/Makefile libgimpbase/Makefile libgimpconfig/Makefile libgimpcolor/Makefile libgimpmath/Makefile libgimpmodule/Makefile libgimpthumb/Makefile libgimpwidgets/Makefile app/Makefile app/actions/Makefile app/config/Makefile app/core/Makefile app/operations/Makefile app/operations/layer-modes/Makefile app/operations/layer-modes-legacy/Makefile app/operations/tests/Makefile app/gegl/Makefile app/dialogs/Makefile app/display/Makefile app/file/Makefile app/gui/Makefile app/menus/Makefile app/paint/Makefile app/pdb/Makefile app/plug-in/Makefile app/propgui/Makefile app/text/Makefile app/tools/Makefile app/vectors/Makefile app/widgets/Makefile app/xcf/Makefile app/tests/Makefile app/tests/files/Makefile app/tests/gimpdir-empty/Makefile app/tests/gimpdir-empty/brushes/Makefile app/tests/gimpdir-empty/gradients/Makefile app/tests/gimpdir-empty/patterns/Makefile app/tests/gimpdir/Makefile app/tests/gimpdir/brushes/Makefile app/tests/gimpdir/gradients/Makefile app/tests/gimpdir/patterns/Makefile app-tools/Makefile build/Makefile build/windows/Makefile build/windows/gimp.rc build/windows/gimp-plug-ins.rc build/windows/installer/Makefile build/windows/installer/lang/Makefile plug-ins/Makefile plug-ins/file-bmp/Makefile plug-ins/file-exr/Makefile plug-ins/file-faxg3/Makefile plug-ins/file-fits/Makefile plug-ins/file-fli/Makefile plug-ins/file-ico/Makefile plug-ins/file-jpeg/Makefile plug-ins/file-psd/Makefile plug-ins/file-raw/Makefile plug-ins/file-sgi/Makefile plug-ins/file-tiff/Makefile plug-ins/file-webp/Makefile plug-ins/flame/Makefile plug-ins/fractal-explorer/Makefile plug-ins/fractal-explorer/examples/Makefile plug-ins/gfig/Makefile plug-ins/gfig/gfig-examples/Makefile plug-ins/gfig/images/Makefile plug-ins/ui/Makefile plug-ins/gimpressionist/Brushes/Makefile plug-ins/gimpressionist/Makefile plug-ins/gimpressionist/Paper/Makefile plug-ins/gimpressionist/Presets/Makefile plug-ins/gradient-flare/Makefile plug-ins/gradient-flare/flares/Makefile plug-ins/help-browser/Makefile plug-ins/help/Makefile plug-ins/ifs-compose/Makefile plug-ins/imagemap/Makefile plug-ins/imagemap/images/Makefile plug-ins/lighting/Makefile plug-ins/lighting/images/Makefile plug-ins/map-object/Makefile plug-ins/metadata/Makefile plug-ins/pagecurl/Makefile plug-ins/print/Makefile plug-ins/pygimp/Makefile plug-ins/pygimp/plug-ins/Makefile plug-ins/screenshot/Makefile plug-ins/script-fu/Makefile plug-ins/script-fu/ftx/Makefile plug-ins/script-fu/scripts/Makefile plug-ins/script-fu/scripts/images/Makefile plug-ins/script-fu/tinyscheme/Makefile plug-ins/selection-to-path/Makefile plug-ins/twain/Makefile plug-ins/common/Makefile modules/Makefile devel-docs/Makefile devel-docs/app/Makefile devel-docs/app/version devel-docs/libgimp/Makefile devel-docs/libgimp/version devel-docs/libgimpbase/Makefile devel-docs/libgimpbase/version devel-docs/libgimpconfig/Makefile devel-docs/libgimpconfig/version devel-docs/libgimpcolor/Makefile devel-docs/libgimpcolor/version devel-docs/libgimpmath/Makefile devel-docs/libgimpmath/version devel-docs/libgimpmodule/Makefile devel-docs/libgimpmodule/version devel-docs/libgimpthumb/Makefile devel-docs/libgimpthumb/version devel-docs/libgimpwidgets/Makefile devel-docs/libgimpwidgets/version devel-docs/tools/Makefile docs/Makefile menus/Makefile cursors/Makefile icons/Makefile icons/Color/Makefile icons/Legacy/Makefile icons/Symbolic/Makefile icons/Symbolic-Inverted/Makefile themes/Makefile themes/System/Makefile themes/Dark/Makefile themes/Gray/Makefile themes/Light/Makefile data/Makefile data/brushes/Makefile data/brushes/Basic/Makefile data/brushes/gimp-obsolete-files/Makefile data/brushes/Media/Makefile data/brushes/Legacy/Makefile data/brushes/Sketch/Makefile data/brushes/Splatters/Makefile data/brushes/Texture/Makefile data/dynamics/Makefile data/dynamics/Basic/Makefile data/dynamics/FX/Makefile data/environ/Makefile data/gradients/Makefile data/images/Makefile data/interpreters/Makefile data/palettes/Makefile data/patterns/Makefile data/patterns/Animal/Makefile data/patterns/Fabric/Makefile data/patterns/Food/Makefile data/patterns/Legacy/Makefile data/patterns/Paper/Makefile data/patterns/Plant/Makefile data/patterns/Sky/Makefile data/patterns/Stone/Makefile data/patterns/Water/Makefile data/patterns/Wood/Makefile data/tags/Makefile data/tips/Makefile data/tool-presets/Makefile data/tool-presets/Crop/Makefile data/tool-presets/FX/Makefile data/tool-presets/Paint/Makefile data/tool-presets/Selection/Makefile data/tool-presets/Sketch/Makefile desktop/Makefile desktop/gimp.desktop.in desktop/org.gimp.GIMP.appdata.xml.in etc/Makefile etc/gimprc m4macros/Makefile po/Makefile.in po-libgimp/Makefile.in po-plug-ins/Makefile.in po-python/Makefile.in po-script-fu/Makefile.in po-tips/Makefile.in po-windows-installer/Makefile.in gimp-zip Makefile" # Files with versions in their names @@ -31135,40 +32187,41 @@ $as_echo "$as_me: Generating POTFILES and Makefile for po-windows-installer" >&6 # Print a summary of features enabled/disabled: optional_deps=" Extra Binaries: - gimp-console: $enable_gimp_console + gimp-console: $enable_gimp_console Optional Features: - Language selection: $have_iso_codes - Vector icons: $enable_vector_icons - Dr. Mingw (Win32): $enable_drmingw + Language selection: $have_iso_codes + Vector icons: $enable_vector_icons + Dr. Mingw (Win32): $enable_drmingw + Bundled MyPaint Brushes: $enable_bundled_mypaint_brushes (at $mypaint_brushes_dir) Optional Plug-Ins: - Ascii Art: $have_libaa - Ghostscript: $have_gs - Help Browser: $have_webkit - JPEG 2000: $have_openjpeg - MNG: $have_libmng - OpenEXR: $have_openexr - WebP: $have_webp - PDF (export): $have_cairo_pdf - Print: $enable_print - Python 2: $enable_python - Script-Fu: $have_script_fu - TWAIN (Win32): $os_win32 - Webpage: $have_webkit - WMF: $have_libwmf - X11 Mouse Cursor: $have_xmc - XPM: $have_libxpm - Email: $have_email + Ascii Art: $have_libaa + Ghostscript: $have_gs + Help Browser: $have_webkit + JPEG 2000: $have_openjpeg + MNG: $have_libmng + OpenEXR: $have_openexr + WebP: $have_webp + PDF (export): $have_cairo_pdf + Print: $enable_print + Python 2: $enable_python + Script-Fu: $have_script_fu + TWAIN (Win32): $os_win32 + Webpage: $have_webkit + WMF: $have_libwmf + X11 Mouse Cursor: $have_xmc + XPM: $have_libxpm + Email: $have_email Optional Modules: - ALSA (MIDI Input): $have_alsa - Linux Input: $have_linux_input (GUdev support: $have_libgudev) - DirectInput (Win32): $have_dx_dinput + ALSA (MIDI Input): $have_alsa + Linux Input: $have_linux_input (GUdev support: $have_libgudev) + DirectInput (Win32): $have_dx_dinput Tests: - Use xvfb-run $have_xvfb_run - Test appdata $have_appstream_util + Use xvfb-run $have_xvfb_run + Test appdata $have_appstream_util $have_recommended_xgettext$have_recommended_gtk$warning_vector_icons_windows$warning_glib_networking$warning_gcc" if test "x$required_deps" = "x"; then @@ -31878,7 +32931,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GIMP $as_me 2.10.0-RC1, which was +This file was extended by GIMP $as_me 2.10.0-RC2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31944,7 +32997,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GIMP config.status 2.10.0-RC1 +GIMP config.status 2.10.0-RC2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -32452,7 +33505,7 @@ fi gimp_major_ver=2 gimp_minor_ver=10 gimp_micro_ver=0 - gimp_ver=2.10.0-RC1 + gimp_ver=2.10.0-RC2 gimp_api_ver=2.0 @@ -32599,11 +33652,9 @@ do "icons/Symbolic-Inverted/Makefile") CONFIG_FILES="$CONFIG_FILES icons/Symbolic-Inverted/Makefile" ;; "themes/Makefile") CONFIG_FILES="$CONFIG_FILES themes/Makefile" ;; "themes/System/Makefile") CONFIG_FILES="$CONFIG_FILES themes/System/Makefile" ;; - "themes/Darker/Makefile") CONFIG_FILES="$CONFIG_FILES themes/Darker/Makefile" ;; "themes/Dark/Makefile") CONFIG_FILES="$CONFIG_FILES themes/Dark/Makefile" ;; "themes/Gray/Makefile") CONFIG_FILES="$CONFIG_FILES themes/Gray/Makefile" ;; "themes/Light/Makefile") CONFIG_FILES="$CONFIG_FILES themes/Light/Makefile" ;; - "themes/Lighter/Makefile") CONFIG_FILES="$CONFIG_FILES themes/Lighter/Makefile" ;; "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; "data/brushes/Makefile") CONFIG_FILES="$CONFIG_FILES data/brushes/Makefile" ;; "data/brushes/Basic/Makefile") CONFIG_FILES="$CONFIG_FILES data/brushes/Basic/Makefile" ;; @@ -32644,6 +33695,7 @@ do "desktop/gimp.desktop.in") CONFIG_FILES="$CONFIG_FILES desktop/gimp.desktop.in" ;; "desktop/org.gimp.GIMP.appdata.xml.in") CONFIG_FILES="$CONFIG_FILES desktop/org.gimp.GIMP.appdata.xml.in" ;; "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;; + "etc/gimprc") CONFIG_FILES="$CONFIG_FILES etc/gimprc" ;; "m4macros/Makefile") CONFIG_FILES="$CONFIG_FILES m4macros/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "po-libgimp/Makefile.in") CONFIG_FILES="$CONFIG_FILES po-libgimp/Makefile.in" ;; diff --git a/configure.ac b/configure.ac index 6b27bb1195..c9f195a71e 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ m4_define([gimp_binary_age], [m4_eval(100 * gimp_minor_version + gimp_micro_version)]) # For overriding the version string. Comment out if not needed. -m4_define([gimp_version], [2.10.0-RC1]) +m4_define([gimp_version], [2.10.0-RC2]) # This is the X.Y used in -lgimp-X.Y m4_define([gimp_api_version], [2.0]) @@ -43,8 +43,8 @@ m4_define([gimp_stable], m4_define([gimp_full_name], [GNU Image Manipulation Program]) # required versions of other packages -m4_define([babl_required_version], [0.1.44]) -m4_define([gegl_required_version], [0.3.30]) +m4_define([babl_required_version], [0.1.46]) +m4_define([gegl_required_version], [0.3.34]) m4_define([glib_required_version], [2.54.2]) m4_define([atk_required_version], [2.2.0]) m4_define([gtk_required_version], [2.24.10]) @@ -237,6 +237,7 @@ AM_PROG_CC_C_O # Determine a C++ compiler to use AC_PROG_CXX +AX_CXX_COMPILE_STDCXX([11], , [mandatory]) # Initialize libtool LT_PREREQ([2.2]) @@ -863,13 +864,8 @@ if test "x$fontconfig_ok" = xno; then fi -AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) -if test "x$FREETYPE_CONFIG" != "xno" ; then - AC_MSG_CHECKING([for freetype libraries]) - FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` - AC_MSG_RESULT($FREETYPE_LIBS) -fi -AC_SUBST(FREETYPE_LIBS) +PKG_CHECK_MODULES(FREETYPE, freetype2 >= freetype2_required_version,, + [add_deps_error([freetype2_required_version >= freetype2_required_version])]) PKG_CHECK_MODULES(HARFBUZZ, harfbuzz >= harfbuzz_required_version,, [add_deps_error([harfbuzz >= harfbuzz_required_version])]) @@ -1672,6 +1668,25 @@ PKG_CHECK_MODULES(LIBMYPAINT, libmypaint >= libmypaint_required_version,, PKG_CHECK_MODULES(MYPAINT_BRUSHES, mypaint-brushes-1.0,, [add_deps_error([mypaint-brushes-1.0])]) +AC_MSG_CHECKING([whether to treat MyPaint brushes as bundled]) +AC_ARG_ENABLE(bundled-mypaint-brushes, + [ --enable-bundled-mypaint-brushes + treat MyPaint brushes as bundled in the install prefix + (default=no)],, + enable_bundled_mypaint_brushes=no) + +if test "x$enable_bundled_mypaint_brushes" != xno; then + AC_DEFINE(ENABLE_BUNDLED_MYPAINT_BRUSHES, 1, + [Define to 1 to if MyPaint brushes are bundled with GIMP]) + mypaint_brushes_dir='${gimp_installation_dir}/share/mypaint-data/1.0/brushes' +else + mypaint_brushes_dir=`$PKG_CONFIG --variable=brushesdir mypaint-brushes-1.0` +fi + +AC_MSG_RESULT([$enable_bundled_mypaint_brushes]) +AC_SUBST(mypaint_brushes_dir) + + ################## # Check for webkit ################## @@ -2624,11 +2639,9 @@ icons/Symbolic/Makefile icons/Symbolic-Inverted/Makefile themes/Makefile themes/System/Makefile -themes/Darker/Makefile themes/Dark/Makefile themes/Gray/Makefile themes/Light/Makefile -themes/Lighter/Makefile data/Makefile data/brushes/Makefile data/brushes/Basic/Makefile @@ -2669,6 +2682,7 @@ desktop/Makefile desktop/gimp.desktop.in desktop/org.gimp.GIMP.appdata.xml.in etc/Makefile +etc/gimprc m4macros/Makefile po/Makefile.in po-libgimp/Makefile.in @@ -2725,40 +2739,41 @@ generate_po_makefile([po-windows-installer]) # Print a summary of features enabled/disabled: optional_deps=" Extra Binaries: - gimp-console: $enable_gimp_console + gimp-console: $enable_gimp_console Optional Features: - Language selection: $have_iso_codes - Vector icons: $enable_vector_icons - Dr. Mingw (Win32): $enable_drmingw + Language selection: $have_iso_codes + Vector icons: $enable_vector_icons + Dr. Mingw (Win32): $enable_drmingw + Bundled MyPaint Brushes: $enable_bundled_mypaint_brushes (at $mypaint_brushes_dir) Optional Plug-Ins: - Ascii Art: $have_libaa - Ghostscript: $have_gs - Help Browser: $have_webkit - JPEG 2000: $have_openjpeg - MNG: $have_libmng - OpenEXR: $have_openexr - WebP: $have_webp - PDF (export): $have_cairo_pdf - Print: $enable_print - Python 2: $enable_python - Script-Fu: $have_script_fu - TWAIN (Win32): $os_win32 - Webpage: $have_webkit - WMF: $have_libwmf - X11 Mouse Cursor: $have_xmc - XPM: $have_libxpm - Email: $have_email + Ascii Art: $have_libaa + Ghostscript: $have_gs + Help Browser: $have_webkit + JPEG 2000: $have_openjpeg + MNG: $have_libmng + OpenEXR: $have_openexr + WebP: $have_webp + PDF (export): $have_cairo_pdf + Print: $enable_print + Python 2: $enable_python + Script-Fu: $have_script_fu + TWAIN (Win32): $os_win32 + Webpage: $have_webkit + WMF: $have_libwmf + X11 Mouse Cursor: $have_xmc + XPM: $have_libxpm + Email: $have_email Optional Modules: - ALSA (MIDI Input): $have_alsa - Linux Input: $have_linux_input (GUdev support: $have_libgudev) - DirectInput (Win32): $have_dx_dinput + ALSA (MIDI Input): $have_alsa + Linux Input: $have_linux_input (GUdev support: $have_libgudev) + DirectInput (Win32): $have_dx_dinput Tests: - Use xvfb-run $have_xvfb_run - Test appdata $have_appstream_util + Use xvfb-run $have_xvfb_run + Test appdata $have_appstream_util $have_recommended_xgettext$have_recommended_gtk$warning_vector_icons_windows$warning_glib_networking$warning_gcc" if test "x$required_deps" = "x"; then diff --git a/cursors/Makefile.am b/cursors/Makefile.am index a4f82bbd81..1865769de9 100644 --- a/cursors/Makefile.am +++ b/cursors/Makefile.am @@ -38,10 +38,11 @@ CURSOR_IMAGES = \ modifier-pattern.png \ modifier-plus.png \ modifier-resize.png \ + modifier-rotate.png \ modifier-select.png \ + modifier-zoom.png \ \ tool-airbrush.png \ - tool-blend.png \ tool-blur.png \ tool-bucket-fill.png \ tool-burn.png \ @@ -55,6 +56,7 @@ CURSOR_IMAGES = \ tool-flip-vertical.png \ tool-free-select.png \ tool-fuzzy-select.png \ + tool-gradient.png \ tool-hand.png \ tool-heal.png \ tool-ink.png \ diff --git a/cursors/Makefile.in b/cursors/Makefile.in index fe51d4ef83..ab10aa719a 100644 --- a/cursors/Makefile.in +++ b/cursors/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -215,7 +216,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -288,6 +289,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -516,6 +518,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -572,10 +575,11 @@ CURSOR_IMAGES = \ modifier-pattern.png \ modifier-plus.png \ modifier-resize.png \ + modifier-rotate.png \ modifier-select.png \ + modifier-zoom.png \ \ tool-airbrush.png \ - tool-blend.png \ tool-blur.png \ tool-bucket-fill.png \ tool-burn.png \ @@ -589,6 +593,7 @@ CURSOR_IMAGES = \ tool-flip-vertical.png \ tool-free-select.png \ tool-fuzzy-select.png \ + tool-gradient.png \ tool-hand.png \ tool-heal.png \ tool-ink.png \ diff --git a/cursors/gimp-tool-cursors.xcf b/cursors/gimp-tool-cursors.xcf index b76288b908..5092f680ad 100644 Binary files a/cursors/gimp-tool-cursors.xcf and b/cursors/gimp-tool-cursors.xcf differ diff --git a/cursors/modifier-rotate.png b/cursors/modifier-rotate.png new file mode 100644 index 0000000000..9e3c4c22a7 Binary files /dev/null and b/cursors/modifier-rotate.png differ diff --git a/cursors/modifier-zoom.png b/cursors/modifier-zoom.png new file mode 100644 index 0000000000..8bbf07db84 Binary files /dev/null and b/cursors/modifier-zoom.png differ diff --git a/cursors/tool-blend.png b/cursors/tool-gradient.png similarity index 100% rename from cursors/tool-blend.png rename to cursors/tool-gradient.png diff --git a/data/Makefile.in b/data/Makefile.in index 2b9f73f483..8f659b33d7 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -273,7 +274,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -346,6 +347,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -574,6 +576,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/brushes/Basic/Makefile.in b/data/brushes/Basic/Makefile.in index df56eee093..58a8dcbd10 100644 --- a/data/brushes/Basic/Makefile.in +++ b/data/brushes/Basic/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/brushes/Legacy/Makefile.in b/data/brushes/Legacy/Makefile.in index b6437954f8..3919425ec4 100644 --- a/data/brushes/Legacy/Makefile.in +++ b/data/brushes/Legacy/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/brushes/Makefile.in b/data/brushes/Makefile.in index 0f976bd330..b6b6430a79 100644 --- a/data/brushes/Makefile.in +++ b/data/brushes/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -273,7 +274,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -346,6 +347,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -574,6 +576,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/brushes/Media/Makefile.in b/data/brushes/Media/Makefile.in index 2306edf9dc..384ab75498 100644 --- a/data/brushes/Media/Makefile.in +++ b/data/brushes/Media/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/brushes/Sketch/Makefile.in b/data/brushes/Sketch/Makefile.in index 5cbda5e769..42b39b392d 100644 --- a/data/brushes/Sketch/Makefile.in +++ b/data/brushes/Sketch/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/brushes/Splatters/Makefile.in b/data/brushes/Splatters/Makefile.in index 4756e3ada6..0b7567298f 100644 --- a/data/brushes/Splatters/Makefile.in +++ b/data/brushes/Splatters/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/brushes/Texture/Makefile.in b/data/brushes/Texture/Makefile.in index 10b6210e44..63a01c7dbc 100644 --- a/data/brushes/Texture/Makefile.in +++ b/data/brushes/Texture/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/brushes/gimp-obsolete-files/Makefile.am b/data/brushes/gimp-obsolete-files/Makefile.am index 02724cee42..26100833d6 100644 --- a/data/brushes/gimp-obsolete-files/Makefile.am +++ b/data/brushes/gimp-obsolete-files/Makefile.am @@ -35,6 +35,9 @@ obsoletebrushdata_DATA = \ Diagonal-Star-11.vbr \ Diagonal-Star-17.vbr \ Diagonal-Star-25.vbr \ + dunes.gbr \ + galaxy.gbr \ + galaxy-big.gbr \ Grass1.gih \ SketchBrush-16.gih \ SketchBrush-32.gih \ diff --git a/data/brushes/gimp-obsolete-files/Makefile.in b/data/brushes/gimp-obsolete-files/Makefile.in index f605752909..d33fed309c 100644 --- a/data/brushes/gimp-obsolete-files/Makefile.in +++ b/data/brushes/gimp-obsolete-files/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -596,6 +599,9 @@ obsoletebrushdata_DATA = \ Diagonal-Star-11.vbr \ Diagonal-Star-17.vbr \ Diagonal-Star-25.vbr \ + dunes.gbr \ + galaxy.gbr \ + galaxy-big.gbr \ Grass1.gih \ SketchBrush-16.gih \ SketchBrush-32.gih \ diff --git a/data/brushes/gimp-obsolete-files/dunes.gbr b/data/brushes/gimp-obsolete-files/dunes.gbr new file mode 100644 index 0000000000..fc7eed2346 Binary files /dev/null and b/data/brushes/gimp-obsolete-files/dunes.gbr differ diff --git a/data/brushes/gimp-obsolete-files/galaxy-big.gbr b/data/brushes/gimp-obsolete-files/galaxy-big.gbr new file mode 100644 index 0000000000..c62cfc0d9f Binary files /dev/null and b/data/brushes/gimp-obsolete-files/galaxy-big.gbr differ diff --git a/data/brushes/gimp-obsolete-files/galaxy.gbr b/data/brushes/gimp-obsolete-files/galaxy.gbr new file mode 100644 index 0000000000..0ed58e8f24 Binary files /dev/null and b/data/brushes/gimp-obsolete-files/galaxy.gbr differ diff --git a/data/dynamics/Basic/Makefile.in b/data/dynamics/Basic/Makefile.in index cd83dc8278..b4ba9a2155 100644 --- a/data/dynamics/Basic/Makefile.in +++ b/data/dynamics/Basic/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/dynamics/FX/Makefile.in b/data/dynamics/FX/Makefile.in index bbd2e0100d..1a5fbae161 100644 --- a/data/dynamics/FX/Makefile.in +++ b/data/dynamics/FX/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/dynamics/Makefile.in b/data/dynamics/Makefile.in index 510aef62cb..a4936883dd 100644 --- a/data/dynamics/Makefile.in +++ b/data/dynamics/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -303,7 +304,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -376,6 +377,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -604,6 +606,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/environ/Makefile.in b/data/environ/Makefile.in index cacf4540a4..c048e18f87 100644 --- a/data/environ/Makefile.in +++ b/data/environ/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/gradients/Makefile.in b/data/gradients/Makefile.in index f6506c669a..8b128adc79 100644 --- a/data/gradients/Makefile.in +++ b/data/gradients/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -244,7 +245,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -317,6 +318,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -545,6 +547,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/images/Makefile.in b/data/images/Makefile.in index 3fca0e546e..46cfaf73d8 100644 --- a/data/images/Makefile.in +++ b/data/images/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/interpreters/Makefile.in b/data/interpreters/Makefile.in index cba4bd8ebe..cf4dcb8d29 100644 --- a/data/interpreters/Makefile.in +++ b/data/interpreters/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/palettes/Makefile.in b/data/palettes/Makefile.in index 4000766fb6..933e12814c 100644 --- a/data/palettes/Makefile.in +++ b/data/palettes/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/patterns/Animal/Makefile.in b/data/patterns/Animal/Makefile.in index c38835ced6..c17dc6d7e1 100644 --- a/data/patterns/Animal/Makefile.in +++ b/data/patterns/Animal/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/patterns/Fabric/Makefile.in b/data/patterns/Fabric/Makefile.in index 6f22e241bd..65052f871b 100644 --- a/data/patterns/Fabric/Makefile.in +++ b/data/patterns/Fabric/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/patterns/Food/Makefile.in b/data/patterns/Food/Makefile.in index 4d229f91a1..f38c24219e 100644 --- a/data/patterns/Food/Makefile.in +++ b/data/patterns/Food/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/patterns/Legacy/Makefile.in b/data/patterns/Legacy/Makefile.in index 8a458e5193..70e011374d 100644 --- a/data/patterns/Legacy/Makefile.in +++ b/data/patterns/Legacy/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/patterns/Makefile.in b/data/patterns/Makefile.in index 7db9771b32..043f7c9590 100644 --- a/data/patterns/Makefile.in +++ b/data/patterns/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -273,7 +274,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -346,6 +347,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -574,6 +576,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/patterns/Paper/Makefile.in b/data/patterns/Paper/Makefile.in index 3244bd8531..9cf8cd1524 100644 --- a/data/patterns/Paper/Makefile.in +++ b/data/patterns/Paper/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/patterns/Plant/Makefile.in b/data/patterns/Plant/Makefile.in index 8d5d7f13e7..3bc43d4924 100644 --- a/data/patterns/Plant/Makefile.in +++ b/data/patterns/Plant/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/patterns/Sky/Makefile.in b/data/patterns/Sky/Makefile.in index b61dbf5ae4..a219a03ab0 100644 --- a/data/patterns/Sky/Makefile.in +++ b/data/patterns/Sky/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/patterns/Stone/Makefile.in b/data/patterns/Stone/Makefile.in index 30b3fd7b46..8db4473113 100644 --- a/data/patterns/Stone/Makefile.in +++ b/data/patterns/Stone/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/patterns/Water/Makefile.in b/data/patterns/Water/Makefile.in index e9a5db6db2..bab71e0e33 100644 --- a/data/patterns/Water/Makefile.in +++ b/data/patterns/Water/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/patterns/Wood/Makefile.in b/data/patterns/Wood/Makefile.in index d2d2592106..dd693c15b3 100644 --- a/data/patterns/Wood/Makefile.in +++ b/data/patterns/Wood/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/tags/Makefile.in b/data/tags/Makefile.in index c7d4d16422..9e0e6fd9e5 100644 --- a/data/tags/Makefile.in +++ b/data/tags/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/tips/Makefile.in b/data/tips/Makefile.in index 06814b7f5a..9e81f453bb 100644 --- a/data/tips/Makefile.in +++ b/data/tips/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/tips/gimp-tips.xml b/data/tips/gimp-tips.xml index 5d24d6e14e..5e059e9cd2 100644 --- a/data/tips/gimp-tips.xml +++ b/data/tips/gimp-tips.xml @@ -193,6 +193,7 @@ Speichert ein Bild mittels XCF, GIMPs eigenem Dateiformat (mit der Endung .xcf), ab. So bleiben die Ebenen und viele Aspekte des aktuellen Projektstatus erhalten. Wenn Sie ein Projekt abgeschlossen haben, können Sie es als JPEG, PNG, GIF usw. speichern. Αποθήκευση εικόνας που χρησιμοποιεί την εγγενή μορφή αρχείου XCF του GIMP (επέκταση αρχείου .xcf). Αυτό διατηρεί τις στρώσεις και πολλές όψεις της εργασίας σε εξέλιξη, επιτρέποντας την επεξεργασία αργότερα. Μόλις ολοκληρωθεί ένα έργο, μπορείτε να το εξάγετε ως JPEG, PNG, GIF, κλπ. Kép mentése XCF, a GIMP saját fájlformátuma (.xcf fájlkiterjesztés) használatával. Ez megőrzi a rétegeket és a folyamatban lévő munka sok tulajdonságát, lehetővé téve, hogy később tovább dolgozzon velük. Amikor egy projekt befejeződött, akkor exportálhatja JPEG, PNG, GIF, stb. formátumba. + Il salvataggio di un'immagine usa il formato nativo di GIMP, l'XCF (con estensione .xcf). Esso manterrà i livelli e ogni altro aspetto del lavoro, consentendone la successiva continuazione. Una volta che il progetto sarà finito, sarà sempre possibile esportarlo come JPEG, PNG, GIF, ecc. Attēla saglabāšana izmanto XCF — GIMP formātā ar paplašinājumu .xcf. Tas nodrošina slāņu un citu rediģēšanas aspektu saglabāšanu, kas ļauj darbu pie tā turpināt vēlāk. Kad darbs ir pabeigts, to var eksportēt JPG, PNG, GIF un citos formātos. Zapisywanie obrazu używa formatu XCF, własnego formatu programu GIMP (rozszerzenie .xcf). Zachowuje to warstwy i wielu innych rzeczy dotyczących danego projektu, umożliwiając wznowienie nad nim pracy w późniejszym czasie. Po ukończeniu pracy można wyeksportować obraz do docelowego formatu, takiego jak JPEG, PNG, GIF itp. Att spara en bild använder XCF, GIMP:s inbyggda filformat (filändelsen .xcf). Detta bevarar lagren och många aspekter av ditt pågående arbete, vilket låter dig arbeta med det igen senare. När ett projekt väl är färdigt kan du spara det som JPEG, PNG, GIF, etc. diff --git a/data/tool-presets/Crop/Makefile.in b/data/tool-presets/Crop/Makefile.in index 81860fb800..866c960faa 100644 --- a/data/tool-presets/Crop/Makefile.in +++ b/data/tool-presets/Crop/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/tool-presets/FX/FX-Radial-Softlight.gtp b/data/tool-presets/FX/FX-Radial-Softlight.gtp index 3d642bf7cc..8c277af174 100644 --- a/data/tool-presets/FX/FX-Radial-Softlight.gtp +++ b/data/tool-presets/FX/FX-Radial-Softlight.gtp @@ -1,9 +1,9 @@ # GIMP tool preset file -(icon-name "gimp-tool-blend") +(icon-name "gimp-tool-gradient") (name "FX Radial Softlight") -(tool-options "GimpBlendOptions" - (tool "gimp-blend-tool") +(tool-options "GimpGradientOptions" + (tool "gimp-gradient-tool") (foreground (color-rgb 0.102075 0.183901 0.594317)) (paint-mode softlight-mode) (gradient "FG to Transparent") diff --git a/data/tool-presets/FX/Makefile.in b/data/tool-presets/FX/Makefile.in index 9661daf0b4..ca33edf345 100644 --- a/data/tool-presets/FX/Makefile.in +++ b/data/tool-presets/FX/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/tool-presets/FX/Vignette.gtp b/data/tool-presets/FX/Vignette.gtp index 34948364dd..476312ac21 100644 --- a/data/tool-presets/FX/Vignette.gtp +++ b/data/tool-presets/FX/Vignette.gtp @@ -1,9 +1,9 @@ # GIMP tool preset file -(icon-name "gimp-tool-blend") +(icon-name "gimp-tool-gradient") (name "Vignette") -(tool-options "GimpBlendOptions" - (tool "gimp-blend-tool") +(tool-options "GimpGradientOptions" + (tool "gimp-gradient-tool") (opacity 0.750000) (paint-mode multiply-mode) (gradient "FG to Transparent") diff --git a/data/tool-presets/Makefile.in b/data/tool-presets/Makefile.in index 6cdec5b7ba..057d7f879d 100644 --- a/data/tool-presets/Makefile.in +++ b/data/tool-presets/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -273,7 +274,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -346,6 +347,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -574,6 +576,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/tool-presets/Paint/Makefile.in b/data/tool-presets/Paint/Makefile.in index 16d8634d77..56a773b8ff 100644 --- a/data/tool-presets/Paint/Makefile.in +++ b/data/tool-presets/Paint/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/tool-presets/Selection/Makefile.in b/data/tool-presets/Selection/Makefile.in index 2306e79c54..8960465934 100644 --- a/data/tool-presets/Selection/Makefile.in +++ b/data/tool-presets/Selection/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/data/tool-presets/Sketch/Makefile.in b/data/tool-presets/Sketch/Makefile.in index 012d925983..255739af2c 100644 --- a/data/tool-presets/Sketch/Makefile.in +++ b/data/tool-presets/Sketch/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/desktop/Makefile.am b/desktop/Makefile.am index d7911707fd..d69330a528 100644 --- a/desktop/Makefile.am +++ b/desktop/Makefile.am @@ -1,9 +1,14 @@ ## Makefile.am for gimp/desktop -desktop_in_files = gimp.desktop.in.in +desktop_in_files = \ + gimp.desktop.in.in + desktop_files = $(desktop_in_files:.desktop.in.in=.desktop) -appstream_in_files = org.gimp.GIMP.appdata.xml.in gimp-data-extras.metainfo.xml.in +appstream_in_files = \ + org.gimp.GIMP.appdata.xml.in \ + gimp-data-extras.metainfo.xml.in + appstream_files = $(appstream_in_files:.xml.in=.xml) if DESKTOP_DATADIR @@ -11,7 +16,7 @@ if DESKTOP_DATADIR applicationsdir = $(DESKTOP_DATADIR)/applications applications_DATA = $(desktop_files) -appdatadir = $(DESKTOP_DATADIR)/appdata +appdatadir = $(DESKTOP_DATADIR)/metainfo appdata_DATA = $(appstream_files) icons16dir = $(DESKTOP_DATADIR)/icons/hicolor/16x16/apps diff --git a/desktop/Makefile.in b/desktop/Makefile.in index b33c86bb1f..36a24d6f2d 100644 --- a/desktop/Makefile.in +++ b/desktop/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -428,7 +429,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -501,6 +502,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -729,6 +731,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -747,13 +750,18 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -desktop_in_files = gimp.desktop.in.in +desktop_in_files = \ + gimp.desktop.in.in + desktop_files = $(desktop_in_files:.desktop.in.in=.desktop) -appstream_in_files = org.gimp.GIMP.appdata.xml.in gimp-data-extras.metainfo.xml.in +appstream_in_files = \ + org.gimp.GIMP.appdata.xml.in \ + gimp-data-extras.metainfo.xml.in + appstream_files = $(appstream_in_files:.xml.in=.xml) @DESKTOP_DATADIR_TRUE@applicationsdir = $(DESKTOP_DATADIR)/applications @DESKTOP_DATADIR_TRUE@applications_DATA = $(desktop_files) -@DESKTOP_DATADIR_TRUE@appdatadir = $(DESKTOP_DATADIR)/appdata +@DESKTOP_DATADIR_TRUE@appdatadir = $(DESKTOP_DATADIR)/metainfo @DESKTOP_DATADIR_TRUE@appdata_DATA = $(appstream_files) @DESKTOP_DATADIR_TRUE@icons16dir = $(DESKTOP_DATADIR)/icons/hicolor/16x16/apps @DESKTOP_DATADIR_TRUE@icons16_DATA = 16x16/gimp.png diff --git a/desktop/org.gimp.GIMP.appdata.xml.in b/desktop/org.gimp.GIMP.appdata.xml.in index 885f93acd4..58445a8aa5 100644 --- a/desktop/org.gimp.GIMP.appdata.xml.in +++ b/desktop/org.gimp.GIMP.appdata.xml.in @@ -72,7 +72,6 @@ - + + + <_p> + In this second release candidate before GIMP 2.10.0, while + debugging is still a prime target, a new focus has been put on + speed and optimization in order to provide a smoother painting + experience. Bigger changes are: + +
    + <_li>Major core optimizations for painting and display, + including parallelized painting code. + <_li>Symmetries are now preserved in XCF files (saved as image + parasites). + <_li>"Light" and "Dark" themes rewritten from scratch to get + rid of various usability issues. "Lighter" and "Darker" themes + removed. + <_li> New GimpToolGyroscope on-canvas control, currently used + for the Panorama Projection filter. The widget provides + on-canvas interaction for 3D rotation (yaw, pitch, roll). + <_li>Plug-in debugging improved to output stack traces from + plug-ins with --stack-trace-mode command line option not only + on receiving signals but also on warnings and critical errors + when "fatal-warnings" debug key is set. +
+ <_p>For more information, see https://www.gimp.org/news/2018/04/14/gimp-2-10-rc2-released/ + + <_p> diff --git a/desktop/org.gimp.GIMP.appdata.xml.in.in b/desktop/org.gimp.GIMP.appdata.xml.in.in index c853716302..42a8386bee 100644 --- a/desktop/org.gimp.GIMP.appdata.xml.in.in +++ b/desktop/org.gimp.GIMP.appdata.xml.in.in @@ -72,7 +72,6 @@ - + + + <_p> + In this second release candidate before GIMP 2.10.0, while + debugging is still a prime target, a new focus has been put on + speed and optimization in order to provide a smoother painting + experience. Bigger changes are: + +
    + <_li>Major core optimizations for painting and display, + including parallelized painting code. + <_li>Symmetries are now preserved in XCF files (saved as image + parasites). + <_li>"Light" and "Dark" themes rewritten from scratch to get + rid of various usability issues. "Lighter" and "Darker" themes + removed. + <_li> New GimpToolGyroscope on-canvas control, currently used + for the Panorama Projection filter. The widget provides + on-canvas interaction for 3D rotation (yaw, pitch, roll). + <_li>Plug-in debugging improved to output stack traces from + plug-ins with --stack-trace-mode command line option not only + on receiving signals but also on warnings and critical errors + when "fatal-warnings" debug key is set. +
+ <_p>For more information, see https://www.gimp.org/news/2018/04/14/gimp-2-10-rc2-released/ + + <_p> diff --git a/devel-docs/Makefile.in b/devel-docs/Makefile.in index 132d3bd20b..b332878af1 100644 --- a/devel-docs/Makefile.in +++ b/devel-docs/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -275,7 +276,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -348,6 +349,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -576,6 +578,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/devel-docs/app/Makefile.in b/devel-docs/app/Makefile.in index 8d4cec4b2a..1c0e6824a4 100644 --- a/devel-docs/app/Makefile.in +++ b/devel-docs/app/Makefile.in @@ -122,6 +122,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -238,7 +239,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -311,6 +312,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -539,6 +541,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -865,11 +868,11 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_GTK_DOC_APP_FALSE@uninstall-local: -@ENABLE_GTK_DOC_APP_FALSE@install-data-local: @ENABLE_GTK_DOC_APP_FALSE@distclean-local: @ENABLE_GTK_DOC_APP_FALSE@maintainer-clean-local: @ENABLE_GTK_DOC_APP_FALSE@clean-local: +@ENABLE_GTK_DOC_APP_FALSE@install-data-local: +@ENABLE_GTK_DOC_APP_FALSE@uninstall-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am diff --git a/devel-docs/contexts.txt b/devel-docs/contexts.txt index 9dcaa5cf66..014320c284 100644 --- a/devel-docs/contexts.txt +++ b/devel-docs/contexts.txt @@ -10,7 +10,7 @@ This file describes how GimpContexts are used in GIMP. Overview -------- -One imporant context is the so called "user context", +One important context is the so called "user context", gimp_get_user_context(). This context keeps track on what image the user currently has active, for example. Dock windows have their own context which does not necessarily mirror the user context. A dock diff --git a/devel-docs/libgimp/Makefile.in b/devel-docs/libgimp/Makefile.in index 5b78858aeb..12b37b7af6 100644 --- a/devel-docs/libgimp/Makefile.in +++ b/devel-docs/libgimp/Makefile.in @@ -122,6 +122,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -238,7 +239,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -311,6 +312,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -539,6 +541,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/devel-docs/libgimp/html/GimpAspectPreview.html b/devel-docs/libgimp/html/GimpAspectPreview.html index 7b7d96478c..055692aa6e 100644 --- a/devel-docs/libgimp/html/GimpAspectPreview.html +++ b/devel-docs/libgimp/html/GimpAspectPreview.html @@ -8,7 +8,7 @@ - + @@ -226,6 +226,6 @@ gimp_aspect_preview_new_from_drawable_id
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpBrushSelectButton.html b/devel-docs/libgimp/html/GimpBrushSelectButton.html index 30f76a1cf1..f122e7772c 100644 --- a/devel-docs/libgimp/html/GimpBrushSelectButton.html +++ b/devel-docs/libgimp/html/GimpBrushSelectButton.html @@ -8,7 +8,7 @@ - + @@ -451,6 +451,6 @@ user_function ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpDrawablePreview.html b/devel-docs/libgimp/html/GimpDrawablePreview.html index 950060dc83..7bae1099a2 100644 --- a/devel-docs/libgimp/html/GimpDrawablePreview.html +++ b/devel-docs/libgimp/html/GimpDrawablePreview.html @@ -8,7 +8,7 @@ - + @@ -340,6 +340,6 @@ gimp_drawable_preview_draw_region (
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpFontSelectButton.html b/devel-docs/libgimp/html/GimpFontSelectButton.html index 314fb6ef4b..ddee33d7a2 100644 --- a/devel-docs/libgimp/html/GimpFontSelectButton.html +++ b/devel-docs/libgimp/html/GimpFontSelectButton.html @@ -8,7 +8,7 @@ - + @@ -315,6 +315,6 @@ user_function ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpGradientSelectButton.html b/devel-docs/libgimp/html/GimpGradientSelectButton.html index 405a279aa8..cb2bf05f3b 100644 --- a/devel-docs/libgimp/html/GimpGradientSelectButton.html +++ b/devel-docs/libgimp/html/GimpGradientSelectButton.html @@ -8,7 +8,7 @@ - + @@ -329,6 +329,6 @@ user_function ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpImageComboBox.html b/devel-docs/libgimp/html/GimpImageComboBox.html index 6f54546caa..c4c29ab7c0 100644 --- a/devel-docs/libgimp/html/GimpImageComboBox.html +++ b/devel-docs/libgimp/html/GimpImageComboBox.html @@ -8,7 +8,7 @@ - + @@ -158,6 +158,6 @@ ID of the selected image.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpPaletteSelectButton.html b/devel-docs/libgimp/html/GimpPaletteSelectButton.html index 1273c9bd64..65549da5eb 100644 --- a/devel-docs/libgimp/html/GimpPaletteSelectButton.html +++ b/devel-docs/libgimp/html/GimpPaletteSelectButton.html @@ -8,7 +8,7 @@ - + @@ -317,6 +317,6 @@ user_function ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpPatternSelectButton.html b/devel-docs/libgimp/html/GimpPatternSelectButton.html index 9e85fb012c..5326bec951 100644 --- a/devel-docs/libgimp/html/GimpPatternSelectButton.html +++ b/devel-docs/libgimp/html/GimpPatternSelectButton.html @@ -8,7 +8,7 @@ - + @@ -341,6 +341,6 @@ user_function ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpProcBrowserDialog.html b/devel-docs/libgimp/html/GimpProcBrowserDialog.html index 90c4d0fa8b..7bf551947f 100644 --- a/devel-docs/libgimp/html/GimpProcBrowserDialog.html +++ b/devel-docs/libgimp/html/GimpProcBrowserDialog.html @@ -8,7 +8,7 @@ - + @@ -277,6 +277,6 @@ user_function ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpProgressBar.html b/devel-docs/libgimp/html/GimpProgressBar.html index 01c87bb240..16eb0111a4 100644 --- a/devel-docs/libgimp/html/GimpProgressBar.html +++ b/devel-docs/libgimp/html/GimpProgressBar.html @@ -8,7 +8,7 @@ - + @@ -108,6 +108,6 @@ gimp_progress_bar_new (void
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpSelectButton.html b/devel-docs/libgimp/html/GimpSelectButton.html index 2bb2c999e9..9b23aaa10e 100644 --- a/devel-docs/libgimp/html/GimpSelectButton.html +++ b/devel-docs/libgimp/html/GimpSelectButton.html @@ -8,7 +8,7 @@ - + @@ -125,6 +125,6 @@ gimp_select_button_close_popup (
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpZoomPreview.html b/devel-docs/libgimp/html/GimpZoomPreview.html index 7a057af83f..71cbe6429f 100644 --- a/devel-docs/libgimp/html/GimpZoomPreview.html +++ b/devel-docs/libgimp/html/GimpZoomPreview.html @@ -8,7 +8,7 @@ - + @@ -542,6 +542,6 @@ gimp_zoom_preview_get_model ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/api-index-2-10.html b/devel-docs/libgimp/html/api-index-2-10.html index d169bacc7c..a59ae5cdbc 100644 --- a/devel-docs/libgimp/html/api-index-2-10.html +++ b/devel-docs/libgimp/html/api-index-2-10.html @@ -8,7 +8,7 @@ - + @@ -69,6 +69,22 @@
+gimp_context_get_distance_metric, function in gimpcontext +
+
+
+gimp_context_get_gradient_blend_color_space, function in gimpcontext +
+
+
+gimp_context_get_gradient_repeat_mode, function in gimpcontext +
+
+
+gimp_context_get_gradient_reverse, function in gimpcontext +
+
+
gimp_context_get_line_cap_style, function in gimpcontext
@@ -129,6 +145,38 @@
+gimp_context_set_distance_metric, function in gimpcontext +
+
+
+gimp_context_set_gradient_blend_color_space, function in gimpcontext +
+
+
+gimp_context_set_gradient_fg_bg_hsv_ccw, function in gimpcontext +
+
+
+gimp_context_set_gradient_fg_bg_hsv_cw, function in gimpcontext +
+
+
+gimp_context_set_gradient_fg_bg_rgb, function in gimpcontext +
+
+
+gimp_context_set_gradient_fg_transparent, function in gimpcontext +
+
+
+gimp_context_set_gradient_repeat_mode, function in gimpcontext +
+
+
+gimp_context_set_gradient_reverse, function in gimpcontext +
+
+
gimp_context_set_line_cap_style, function in gimpcontext
@@ -194,6 +242,18 @@
+gimp_drawable_edit_bucket_fill, function in gimpdrawableedit +
+
+
+gimp_drawable_edit_gradient_fill, function in gimpdrawableedit +
+
+
+gimp_drawable_edit_stroke_item, function in gimpdrawableedit +
+
+
gimp_drawable_equalize, function in gimpdrawablecolor
@@ -254,11 +314,27 @@ gimp_edit_paste_as_new_image, function in gimpedit
+
+gimp_export_exif, function in gimp +
+
+
+gimp_export_iptc, function in gimp +
+
+
+gimp_export_xmp, function in gimp +
+

G

gimp_get_icon_theme_dir, function in gimpgimprc
+
+gimp_get_pdb_status, function in gimp +
+

I

gimp_image_add_sample_point, function in gimpimagesamplepoints @@ -289,6 +365,10 @@
+gimp_image_get_default_new_layer_mode, function in gimpimage +
+
+
gimp_image_get_effective_color_profile, function in gimpimagecolorprofile
@@ -341,6 +421,10 @@
+gimp_item_get_expanded, function in gimpitem +
+
+
gimp_item_get_lock_position, function in gimpitem
@@ -349,6 +433,10 @@
+gimp_item_set_expanded, function in gimpitem +
+
+
gimp_item_set_lock_position, function in gimpitem
@@ -419,6 +507,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/api-index-2-2.html b/devel-docs/libgimp/html/api-index-2-2.html index f7aa6474e3..1973fb32d2 100644 --- a/devel-docs/libgimp/html/api-index-2-2.html +++ b/devel-docs/libgimp/html/api-index-2-2.html @@ -8,7 +8,7 @@ - + @@ -531,6 +531,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/api-index-2-4.html b/devel-docs/libgimp/html/api-index-2-4.html index 5bfc4c196e..b49b667795 100644 --- a/devel-docs/libgimp/html/api-index-2-4.html +++ b/devel-docs/libgimp/html/api-index-2-4.html @@ -8,7 +8,7 @@ - + @@ -749,6 +749,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/api-index-2-6.html b/devel-docs/libgimp/html/api-index-2-6.html index b227f0ec67..4bc237223d 100644 --- a/devel-docs/libgimp/html/api-index-2-6.html +++ b/devel-docs/libgimp/html/api-index-2-6.html @@ -8,7 +8,7 @@ - + @@ -218,6 +218,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/api-index-2-8.html b/devel-docs/libgimp/html/api-index-2-8.html index d468e7bb42..0c40f9b994 100644 --- a/devel-docs/libgimp/html/api-index-2-8.html +++ b/devel-docs/libgimp/html/api-index-2-8.html @@ -8,7 +8,7 @@ - + @@ -530,6 +530,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/api-index-deprecated.html b/devel-docs/libgimp/html/api-index-deprecated.html index 0589cdf1f3..8a35a8d9a5 100644 --- a/devel-docs/libgimp/html/api-index-deprecated.html +++ b/devel-docs/libgimp/html/api-index-deprecated.html @@ -7,7 +7,7 @@ - + @@ -399,6 +399,26 @@

E

+gimp_edit_blend, function in gimpedit +
+
+
+gimp_edit_bucket_fill, function in gimpedit +
+
+
+gimp_edit_bucket_fill_full, function in gimppainttools +
+
+
+gimp_edit_clear, function in gimpedit +
+
+
+gimp_edit_fill, function in gimpedit +
+
+
gimp_edit_named_paste_as_new, function in gimpedit
@@ -407,6 +427,14 @@
+gimp_edit_stroke, function in gimpedit +
+
+
+gimp_edit_stroke_vectors, function in gimpedit +
+
+
gimp_ellipse_select, function in gimpselectiontools
@@ -1166,6 +1194,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/api-index-full.html b/devel-docs/libgimp/html/api-index-full.html index 74f4f275c6..87325febec 100644 --- a/devel-docs/libgimp/html/api-index-full.html +++ b/devel-docs/libgimp/html/api-index-full.html @@ -8,7 +8,7 @@ - + @@ -492,6 +492,10 @@
+gimp_context_get_distance_metric, function in gimpcontext +
+
+
gimp_context_get_dynamics, function in gimpcontext
@@ -516,6 +520,18 @@
+gimp_context_get_gradient_blend_color_space, function in gimpcontext +
+
+
+gimp_context_get_gradient_repeat_mode, function in gimpcontext +
+
+
+gimp_context_get_gradient_reverse, function in gimpcontext +
+
+
gimp_context_get_ink_angle, function in gimpcontext
@@ -712,6 +728,10 @@
+gimp_context_set_distance_metric, function in gimpcontext +
+
+
gimp_context_set_dynamics, function in gimpcontext
@@ -736,6 +756,34 @@
+gimp_context_set_gradient_blend_color_space, function in gimpcontext +
+
+
+gimp_context_set_gradient_fg_bg_hsv_ccw, function in gimpcontext +
+
+
+gimp_context_set_gradient_fg_bg_hsv_cw, function in gimpcontext +
+
+
+gimp_context_set_gradient_fg_bg_rgb, function in gimpcontext +
+
+
+gimp_context_set_gradient_fg_transparent, function in gimpcontext +
+
+
+gimp_context_set_gradient_repeat_mode, function in gimpcontext +
+
+
+gimp_context_set_gradient_reverse, function in gimpcontext +
+
+
gimp_context_set_ink_angle, function in gimpcontext
@@ -1041,6 +1089,30 @@
+gimp_drawable_edit_bucket_fill, function in gimpdrawableedit +
+
+
+gimp_drawable_edit_clear, function in gimpdrawableedit +
+
+
+gimp_drawable_edit_fill, function in gimpdrawableedit +
+
+
+gimp_drawable_edit_gradient_fill, function in gimpdrawableedit +
+
+
+gimp_drawable_edit_stroke_item, function in gimpdrawableedit +
+
+
+gimp_drawable_edit_stroke_selection, function in gimpdrawableedit +
+
+
gimp_drawable_equalize, function in gimpdrawablecolor
@@ -1486,10 +1558,22 @@
+gimp_export_exif, function in gimp +
+
+
gimp_export_image, function in gimpexport
+gimp_export_iptc, function in gimp +
+
+
+gimp_export_xmp, function in gimp +
+
+
gimp_extension_ack, function in gimp
@@ -1700,6 +1784,10 @@
+gimp_get_pdb_status, function in gimp +
+
+
gimp_get_progname, function in gimp
@@ -2150,6 +2238,10 @@
+gimp_image_get_default_new_layer_mode, function in gimpimage +
+
+
gimp_image_get_effective_color_profile, function in gimpimagecolorprofile
@@ -2658,6 +2750,10 @@
+gimp_item_get_expanded, function in gimpitem +
+
+
gimp_item_get_image, function in gimpitem
@@ -2738,6 +2834,10 @@
+gimp_item_set_expanded, function in gimpitem +
+
+
gimp_item_set_linked, function in gimpitem
@@ -4424,6 +4524,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/home.png b/devel-docs/libgimp/html/home.png index effb5ea39b..e80e202ad8 100644 Binary files a/devel-docs/libgimp/html/home.png and b/devel-docs/libgimp/html/home.png differ diff --git a/devel-docs/libgimp/html/index.html b/devel-docs/libgimp/html/index.html index a4fe7c2866..6d3b94a09d 100644 --- a/devel-docs/libgimp/html/index.html +++ b/devel-docs/libgimp/html/index.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@

- for GIMP 2.10.0-RC1 + for GIMP 2.10.0-RC2

@@ -78,6 +78,9 @@ gimpdrawablecolor — Functions for manipulating a drawable's color.
+gimpdrawableedit — Drawable edit functions (clear, fill, gradient, stroke etc.) +
+
gimpdrawabletransform — Functions to perform transformatrions on drawables.
@@ -302,6 +305,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/left-insensitive.png b/devel-docs/libgimp/html/left-insensitive.png index 6290738b12..fea007e794 100644 Binary files a/devel-docs/libgimp/html/left-insensitive.png and b/devel-docs/libgimp/html/left-insensitive.png differ diff --git a/devel-docs/libgimp/html/left.png b/devel-docs/libgimp/html/left.png index d34a7bcff9..193905fc77 100644 Binary files a/devel-docs/libgimp/html/left.png and b/devel-docs/libgimp/html/left.png differ diff --git a/devel-docs/libgimp/html/libgimp-GimpItemComboBox.html b/devel-docs/libgimp/html/libgimp-GimpItemComboBox.html index ec4461351f..e53186b91a 100644 --- a/devel-docs/libgimp/html/libgimp-GimpItemComboBox.html +++ b/devel-docs/libgimp/html/libgimp-GimpItemComboBox.html @@ -8,7 +8,7 @@ - + @@ -363,6 +363,6 @@ of the selected vectors object.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-GimpProcView.html b/devel-docs/libgimp/html/libgimp-GimpProcView.html index f418ec0686..350b88c158 100644 --- a/devel-docs/libgimp/html/libgimp-GimpProcView.html +++ b/devel-docs/libgimp/html/libgimp-GimpProcView.html @@ -8,7 +8,7 @@ - + @@ -82,6 +82,6 @@ gimp_proc_view_new (const -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-data.html b/devel-docs/libgimp/html/libgimp-data.html index 4d17c0db38..c9157fcc29 100644 --- a/devel-docs/libgimp/html/libgimp-data.html +++ b/devel-docs/libgimp/html/libgimp-data.html @@ -8,7 +8,7 @@ - + @@ -56,6 +56,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-general.html b/devel-docs/libgimp/html/libgimp-general.html index 4cfff3c96f..6e15637277 100644 --- a/devel-docs/libgimp/html/libgimp-general.html +++ b/devel-docs/libgimp/html/libgimp-general.html @@ -8,7 +8,7 @@ - + @@ -59,6 +59,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimp.html b/devel-docs/libgimp/html/libgimp-gimp.html index 931e72086f..637ed98479 100644 --- a/devel-docs/libgimp/html/libgimp-gimp.html +++ b/devel-docs/libgimp/html/libgimp-gimp.html @@ -8,7 +8,7 @@ - + @@ -172,6 +172,14 @@ +GimpPDBStatusType + + +gimp_get_pdb_status () + + + + guint @@ -244,6 +252,30 @@ +gboolean + + +gimp_export_exif () + + + + +gboolean + + +gimp_export_iptc () + + + + +gboolean + + +gimp_export_xmp () + + + + GimpCheckSize @@ -1042,6 +1074,18 @@ modified.

+

gimp_get_pdb_status ()

+
GimpPDBStatusType
+gimp_get_pdb_status (void);
+

Retrieves the status from the last procedure call.

+
+

Returns

+

the GimpPDBStatusType.

+
+

Since: 2.10

+
+
+

gimp_tile_width ()

guint
 gimp_tile_width (void);
@@ -1167,6 +1211,48 @@ button if help_func and help_id are given.

+

gimp_export_exif ()

+
gboolean
+gimp_export_exif (void);
+

Returns whether file plug-ins should default to exporting Exif +metadata, according preferences (original settings is FALSE since +metadata can contain sensitive information).

+
+

Returns

+

TRUE if preferences are set to export Exif.

+
+

Since: 2.10

+
+
+
+

gimp_export_iptc ()

+
gboolean
+gimp_export_iptc (void);
+

Returns whether file plug-ins should default to exporting IPTC +metadata, according preferences (original settings is FALSE since +metadata can contain sensitive information).

+
+

Returns

+

TRUE if preferences are set to export IPTC.

+
+

Since: 2.10

+
+
+
+

gimp_export_xmp ()

+
gboolean
+gimp_export_xmp (void);
+

Returns whether file plug-ins should default to exporting XMP +metadata, according preferences (original settings is FALSE since +metadata can contain sensitive information).

+
+

Returns

+

TRUE if preferences are set to export XMP.

+
+

Since: 2.10

+
+
+

gimp_check_size ()

GimpCheckSize
 gimp_check_size (void);
@@ -1726,6 +1812,6 @@ procedure database.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpbrush.html b/devel-docs/libgimp/html/libgimp-gimpbrush.html index f05399ade1..ccdb93c284 100644 --- a/devel-docs/libgimp/html/libgimp-gimpbrush.html +++ b/devel-docs/libgimp/html/libgimp-gimpbrush.html @@ -8,7 +8,7 @@ - + @@ -1026,6 +1026,6 @@ gimp_brush_is_editable (const -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpbrushes.html b/devel-docs/libgimp/html/libgimp-gimpbrushes.html index 8c3e77a801..017117bb86 100644 --- a/devel-docs/libgimp/html/libgimp-gimpbrushes.html +++ b/devel-docs/libgimp/html/libgimp-gimpbrushes.html @@ -8,7 +8,7 @@ - + @@ -456,6 +456,6 @@ gimp_brushes_get_brush_data (const -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpbrushmenu.html b/devel-docs/libgimp/html/libgimp-gimpbrushmenu.html index c958afbfd3..f80c0c5bce 100644 --- a/devel-docs/libgimp/html/libgimp-gimpbrushmenu.html +++ b/devel-docs/libgimp/html/libgimp-gimpbrushmenu.html @@ -8,7 +8,7 @@ - + @@ -220,6 +220,6 @@ call to -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpbrushselect.html b/devel-docs/libgimp/html/libgimp-gimpbrushselect.html index 12cd64bcf0..a65d9f94f3 100644 --- a/devel-docs/libgimp/html/libgimp-gimpbrushselect.html +++ b/devel-docs/libgimp/html/libgimp-gimpbrushselect.html @@ -8,7 +8,7 @@ - + @@ -271,6 +271,6 @@ gimp_brushes_set_popup (const -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpbuffer.html b/devel-docs/libgimp/html/libgimp-gimpbuffer.html index f856234545..cf1a764ddd 100644 --- a/devel-docs/libgimp/html/libgimp-gimpbuffer.html +++ b/devel-docs/libgimp/html/libgimp-gimpbuffer.html @@ -8,7 +8,7 @@ - + @@ -323,6 +323,6 @@ gimp_buffer_get_image_type (const -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpchannel.html b/devel-docs/libgimp/html/libgimp-gimpchannel.html index a9f11cbf9c..6f79a1c72d 100644 --- a/devel-docs/libgimp/html/libgimp-gimpchannel.html +++ b/devel-docs/libgimp/html/libgimp-gimpchannel.html @@ -8,7 +8,7 @@ - + @@ -525,6 +525,6 @@ the first channel.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpcolor.html b/devel-docs/libgimp/html/libgimp-gimpcolor.html index 1499cc74bb..d0fb3d3b04 100644 --- a/devel-docs/libgimp/html/libgimp-gimpcolor.html +++ b/devel-docs/libgimp/html/libgimp-gimpcolor.html @@ -8,7 +8,7 @@ - + @@ -915,6 +915,6 @@ gimp_threshold ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpcontext.html b/devel-docs/libgimp/html/libgimp-gimpcontext.html index 27d8796be2..3415884a06 100644 --- a/devel-docs/libgimp/html/libgimp-gimpcontext.html +++ b/devel-docs/libgimp/html/libgimp-gimpcontext.html @@ -8,7 +8,7 @@ - + @@ -497,6 +497,86 @@ +gboolean + + +gimp_context_set_gradient_fg_bg_hsv_ccw () + + + + +gboolean + + +gimp_context_set_gradient_fg_bg_hsv_cw () + + + + +gboolean + + +gimp_context_set_gradient_fg_bg_rgb () + + + + +gboolean + + +gimp_context_set_gradient_fg_transparent () + + + + +GimpGradientBlendColorSpace + + +gimp_context_get_gradient_blend_color_space () + + + + +gboolean + + +gimp_context_set_gradient_blend_color_space () + + + + +GimpRepeatMode + + +gimp_context_get_gradient_repeat_mode () + + + + +gboolean + + +gimp_context_set_gradient_repeat_mode () + + + + +gboolean + + +gimp_context_get_gradient_reverse () + + + + +gboolean + + +gimp_context_set_gradient_reverse () + + + + gchar * @@ -673,6 +753,22 @@ +GeglDistanceMetric + + +gimp_context_get_distance_metric () + + + + +gboolean + + +gimp_context_set_distance_metric () + + + + GimpInterpolationType @@ -1302,9 +1398,10 @@ gimp_context_get_line_width (void 
gboolean
 gimp_context_set_line_width (gdouble line_width);

Set the line width setting.

-

This procedure modifies the line width setting for stroking lines. -This setting affects the following procedures: gimp_edit_stroke(), -gimp_edit_stroke_vectors().

+

This procedure modifies the line width setting for stroking lines.

+

This setting affects the following procedures: +gimp_drawable_edit_stroke_selection(), +gimp_drawable_edit_stroke_item().

Parameters

@@ -1346,9 +1443,10 @@ gimp_context_get_line_width_unit (GimpUnit line_width_unit);

Set the line width unit setting.

This procedure modifies the line width unit setting for stroking -lines. -This setting affects the following procedures: gimp_edit_stroke(), -gimp_edit_stroke_vectors().

+lines.

+

This setting affects the following procedures: +gimp_drawable_edit_stroke_selection(), +gimp_drawable_edit_stroke_item().

Parameters

@@ -1390,9 +1488,10 @@ gimp_context_get_line_cap_style ( gimp_context_set_line_cap_style (GimpCapStyle cap_style);

Set the line cap style setting.

This procedure modifies the line cap style setting for stroking -lines. -This setting affects the following procedures: gimp_edit_stroke(), -gimp_edit_stroke_vectors().

+lines.

+

This setting affects the following procedures: +gimp_drawable_edit_stroke_selection(), +gimp_drawable_edit_stroke_item().

Parameters

@@ -1434,9 +1533,10 @@ gimp_context_get_line_join_style (GimpJoinStyle join_style);

Set the line join style setting.

This procedure modifies the line join style setting for stroking -lines. -This setting affects the following procedures: gimp_edit_stroke(), -gimp_edit_stroke_vectors().

+lines.

+

This setting affects the following procedures: +gimp_drawable_edit_stroke_selection(), +gimp_drawable_edit_stroke_item().

Parameters

@@ -1481,9 +1581,10 @@ gimp_context_set_line_miter_limit (gimp_edit_stroke(), -gimp_edit_stroke_vectors().

+the actual join point.

+

This setting affects the following procedures: +gimp_drawable_edit_stroke_selection(), +gimp_drawable_edit_stroke_item().

Parameters

@@ -1525,9 +1626,10 @@ gimp_context_get_line_dash_offset (gdouble dash_offset);

Set the line dash offset setting.

This procedure modifies the line dash offset setting for stroking -lines. -This setting affects the following procedures: gimp_edit_stroke(), -gimp_edit_stroke_vectors().

+lines.

+

This setting affects the following procedures: +gimp_drawable_edit_stroke_selection(), +gimp_drawable_edit_stroke_item().

Parameters

@@ -1593,12 +1695,13 @@ gimp_context_set_line_dash_pattern (const gdouble *dashes);

Set the line dash pattern setting.

This procedure modifies the line dash pattern setting for stroking -lines. -The unit of the dash pattern segments is the actual line width used +lines.

+

The unit of the dash pattern segments is the actual line width used for the stroke operation, in other words a segment length of 1.0 -results in a square segment shape (or gap shape). -This setting affects the following procedures: gimp_edit_stroke(), -gimp_edit_stroke_vectors().

+results in a square segment shape (or gap shape).

+

This setting affects the following procedures: +gimp_drawable_edit_stroke_selection_(), +gimp_drawable_edit_stroke_item().

Parameters

@@ -2157,6 +2260,198 @@ operations.

+

gimp_context_set_gradient_fg_bg_hsv_ccw ()

+
gboolean
+gimp_context_set_gradient_fg_bg_hsv_ccw
+                               (void);
+

Sets the built-in FG-BG HSV (ccw) gradient as the active gradient.

+

This procedure sets the built-in FG-BG HSV (ccw) gradient as the +active gradient. The gradient will be used for subsequent gradient +operations.

+
+

Returns

+

TRUE on success.

+
+

Since: 2.10

+
+
+
+

gimp_context_set_gradient_fg_bg_hsv_cw ()

+
gboolean
+gimp_context_set_gradient_fg_bg_hsv_cw
+                               (void);
+

Sets the built-in FG-BG HSV (cw) gradient as the active gradient.

+

This procedure sets the built-in FG-BG HSV (cw) gradient as the +active gradient. The gradient will be used for subsequent gradient +operations.

+
+

Returns

+

TRUE on success.

+
+

Since: 2.10

+
+
+
+

gimp_context_set_gradient_fg_bg_rgb ()

+
gboolean
+gimp_context_set_gradient_fg_bg_rgb (void);
+

Sets the built-in FG-BG RGB gradient as the active gradient.

+

This procedure sets the built-in FG-BG RGB gradient as the active +gradient. The gradient will be used for subsequent gradient +operations.

+
+

Returns

+

TRUE on success.

+
+

Since: 2.10

+
+
+
+

gimp_context_set_gradient_fg_transparent ()

+
gboolean
+gimp_context_set_gradient_fg_transparent
+                               (void);
+

Sets the built-in FG-Transparent gradient as the active gradient.

+

This procedure sets the built-in FG-Transparent gradient as the +active gradient. The gradient will be used for subsequent gradient +operations.

+
+

Returns

+

TRUE on success.

+
+

Since: 2.10

+
+
+
+

gimp_context_get_gradient_blend_color_space ()

+
GimpGradientBlendColorSpace
+gimp_context_get_gradient_blend_color_space
+                               (void);
+

Get the gradient blend color space.

+

Get the gradient blend color space for paint tools and the gradient +tool.

+
+

Returns

+

Color blend space.

+
+

Since: 2.10

+
+
+
+

gimp_context_set_gradient_blend_color_space ()

+
gboolean
+gimp_context_set_gradient_blend_color_space
+                               (GimpGradientBlendColorSpace blend_color_space);
+

Set the gradient blend color space.

+

Set the gradient blend color space for paint tools and the gradient +tool.

+
+

Parameters

+
+++++ + + + + + +

blend_color_space

Blend color space.

 
+
+
+

Returns

+

TRUE on success.

+
+

Since: 2.10

+ +
+
+

gimp_context_get_gradient_repeat_mode ()

+
GimpRepeatMode
+gimp_context_get_gradient_repeat_mode (void);
+

Get the gradient repeat mode.

+

Get the gradient repeat mode for paint tools and the gradient tool.

+
+

Returns

+

Repeat mode.

+
+

Since: 2.10

+
+
+
+

gimp_context_set_gradient_repeat_mode ()

+
gboolean
+gimp_context_set_gradient_repeat_mode (GimpRepeatMode repeat_mode);
+

Set the gradient repeat mode.

+

Set the gradient repeat mode for paint tools and the gradient tool.

+
+

Parameters

+
+++++ + + + + + +

repeat_mode

Repeat mode.

 
+
+
+

Returns

+

TRUE on success.

+
+

Since: 2.10

+
+
+
+

gimp_context_get_gradient_reverse ()

+
gboolean
+gimp_context_get_gradient_reverse (void);
+

Get the gradient reverse setting.

+

Get the gradient reverse setting for paint tools and the gradient +tool.

+
+

Returns

+

Reverse.

+
+

Since: 2.10

+
+
+
+

gimp_context_set_gradient_reverse ()

+
gboolean
+gimp_context_set_gradient_reverse (gboolean reverse);
+

Set the gradient reverse setting.

+

Set the gradient reverse setting for paint tools and the gradient +tool.

+
+

Parameters

+
+++++ + + + + + +

reverse

Reverse.

 
+
+
+

Returns

+

TRUE on success.

+
+

Since: 2.10

+
+
+

gimp_context_get_palette ()

gchar *
 gimp_context_get_palette (void);
@@ -2269,11 +2564,12 @@ gimp_context_set_antialias (gimp_image_select_color(), gimp_image_select_contiguous_color(), gimp_image_select_round_rectangle(), gimp_image_select_ellipse(), -gimp_image_select_polygon(), gimp_image_select_item().

+gimp_image_select_polygon(), gimp_image_select_item(), +gimp_drawable_edit_bucket_fill().

Parameters

@@ -2317,8 +2613,8 @@ gimp_context_set_feather (gimp_context_set_feather_radius(). -This setting affects the following procedures: +gimp_context_set_feather_radius().

+

This setting affects the following procedures: gimp_image_select_color(), gimp_image_select_contiguous_color(), gimp_image_select_rectangle(), gimp_image_select_round_rectangle(), gimp_image_select_ellipse(), gimp_image_select_polygon(), @@ -2387,8 +2683,8 @@ gimp_context_get_feather_radius (gdouble feather_radius_x, gdouble feather_radius_y);

Set the feather radius setting.

-

This procedure modifies the feather radius setting. -This setting affects all procedures that are affected by +

This procedure modifies the feather radius setting.

+

This setting affects all procedures that are affected by gimp_context_set_feather().

Parameters

@@ -2443,9 +2739,10 @@ doing a seed fill, this setting controls whether the pixel data from the specified drawable is used ('sample-merged' is FALSE), or the pixel data from the composite image ('sample-merged' is TRUE. This is equivalent to sampling for colors after merging all visible -layers). -This setting affects the following procedures: -gimp_image_select_color(), gimp_image_select_contiguous_color().

+layers).

+

This setting affects the following procedures: +gimp_image_select_color(), gimp_image_select_contiguous_color(), +gimp_drawable_edit_bucket_fill().

Parameters

@@ -2490,9 +2787,10 @@ gimp_context_set_sample_criterion (gimp_image_select_color(), gimp_image_select_contiguous_color().

+value.

+

This setting affects the following procedures: +gimp_image_select_color(), gimp_image_select_contiguous_color(), +gimp_drawable_edit_bucket_fill().

Parameters

@@ -2538,9 +2836,10 @@ operation depends on the colors of the pixels present in a drawable, like when doing a seed fill, this setting controls what is \"sufficiently close\" to be considered a similar color. If the sample threshold has not been set explicitly, the default threshold -set in gimprc will be used. -This setting affects the following procedures: -gimp_image_select_color(), gimp_image_select_contiguous_color().

+set in gimprc will be used.

+

This setting affects the following procedures: +gimp_image_select_color(), gimp_image_select_contiguous_color(), +gimp_drawable_edit_bucket_fill().

Parameters

@@ -2628,9 +2927,10 @@ gimp_context_set_sample_transparent (gimp_image_select_color(), gimp_image_select_contiguous_color().

+this setting is TRUE, transparent areas can be selected or filled.

+

This setting affects the following procedures: +gimp_image_select_color(), gimp_image_select_contiguous_color(), +gimp_drawable_edit_bucket_fill().

Parameters

@@ -2676,9 +2976,10 @@ affected region of an operation is based on a seed point, like when doing a seed fill, then, when this setting is TRUE, all eight neighbors of each pixel are considered when calculating the affected region; in contrast, when this setting is FALSE, only the four -orthogonal neighbors of each pixel are considered. -This setting affects the following procedures: -gimp_image_select_contiguous_color().

+orthogonal neighbors of each pixel are considered.

+

This setting affects the following procedures: +gimp_image_select_contiguous_color(), +gimp_drawable_edit_bucket_fill().

Parameters

@@ -2702,6 +3003,53 @@ This setting affects the following procedures:
+

gimp_context_get_distance_metric ()

+
GeglDistanceMetric
+gimp_context_get_distance_metric (void);
+

Get the distance metric used in some computations.

+

This procedure returns the distance metric in the current context. +See gimp_context_set_distance_metric() to know more about its usage.

+
+

Returns

+

The distance metric.

+
+

Since: 2.10

+
+
+
+

gimp_context_set_distance_metric ()

+
gboolean
+gimp_context_set_distance_metric (GeglDistanceMetric metric);
+

Set the distance metric used in some computations.

+

This procedure modifies the distance metric used in some +computations, such as gimp_drawable_edit_gradient_fill(). In +particular, it does not change the metric used in generic distance +computation on canvas, as in the Measure tool.

+

This setting affects the following procedures: +gimp_drawable_edit_gradient_fill().

+
+

Parameters

+
+++++ + + + + + +

metric

The distance metric.

 
+
+
+

Returns

+

TRUE on success.

+
+

Since: 2.10

+
+
+

gimp_context_get_interpolation ()

GimpInterpolationType
 gimp_context_get_interpolation (void);
@@ -2723,8 +3071,8 @@ gimprc will be used.

gboolean
 gimp_context_set_interpolation (GimpInterpolationType interpolation);

Set the interpolation type.

-

This procedure modifies the interpolation setting. -This setting affects affects the following procedures: +

This procedure modifies the interpolation setting.

+

This setting affects affects the following procedures: gimp_item_transform_flip(), gimp_item_transform_perspective(), gimp_item_transform_rotate(), gimp_item_transform_scale(), gimp_item_transform_shear(), gimp_item_transform_2d(), @@ -2772,8 +3120,8 @@ description.

gboolean
 gimp_context_set_transform_direction (GimpTransformDirection transform_direction);

Set the transform direction.

-

This procedure modifies the transform direction setting. -This setting affects affects the following procedures: +

This procedure modifies the transform direction setting.

+

This setting affects affects the following procedures: gimp_item_transform_flip(), gimp_item_transform_perspective(), gimp_item_transform_rotate(), gimp_item_transform_scale(), gimp_item_transform_shear(), gimp_item_transform_2d(), @@ -2823,8 +3171,8 @@ gimp_context_set_transform_resize (gimp_item_transform_flip(), gimp_item_transform_flip_simple(), gimp_item_transform_perspective(), gimp_item_transform_rotate(), gimp_item_transform_rotate_simple(), gimp_item_transform_scale(), @@ -3232,6 +3580,6 @@ gimp_context_set_ink_tilt_sensitivity ( -

Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpdebug.html b/devel-docs/libgimp/html/libgimp-gimpdebug.html index 29160ef5b2..907cf0ae9e 100644 --- a/devel-docs/libgimp/html/libgimp-gimpdebug.html +++ b/devel-docs/libgimp/html/libgimp-gimpdebug.html @@ -8,7 +8,7 @@ - + @@ -106,6 +106,6 @@ point, and should not be used in production.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpdisplay.html b/devel-docs/libgimp/html/libgimp-gimpdisplay.html index 2a70e231ff..bb6175085e 100644 --- a/devel-docs/libgimp/html/libgimp-gimpdisplay.html +++ b/devel-docs/libgimp/html/libgimp-gimpdisplay.html @@ -8,7 +8,7 @@ - + @@ -278,6 +278,6 @@ without success. You should rarely need to use this function.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpdrawable.html b/devel-docs/libgimp/html/libgimp-gimpdrawable.html index 4124c2ab6f..c41a5106d6 100644 --- a/devel-docs/libgimp/html/libgimp-gimpdrawable.html +++ b/devel-docs/libgimp/html/libgimp-gimpdrawable.html @@ -8,7 +8,7 @@ - + @@ -2247,6 +2247,6 @@ the new parasite.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpdrawablecolor.html b/devel-docs/libgimp/html/libgimp-gimpdrawablecolor.html index 1e47e0792a..e44c9d3c56 100644 --- a/devel-docs/libgimp/html/libgimp-gimpdrawablecolor.html +++ b/devel-docs/libgimp/html/libgimp-gimpdrawablecolor.html @@ -7,8 +7,8 @@ - - + + @@ -20,7 +20,7 @@ Home Up Prev -Next +Next
@@ -924,6 +924,6 @@ and all other pixels with black.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpdrawableedit.html b/devel-docs/libgimp/html/libgimp-gimpdrawableedit.html new file mode 100644 index 0000000000..8daa0c3ecd --- /dev/null +++ b/devel-docs/libgimp/html/libgimp-gimpdrawableedit.html @@ -0,0 +1,423 @@ + + + + +gimpdrawableedit: GIMP Library Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

gimpdrawableedit

+

gimpdrawableedit — Drawable edit functions (clear, fill, gradient, stroke etc.)

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+gboolean + +gimp_drawable_edit_clear () +
+gboolean + +gimp_drawable_edit_fill () +
+gboolean + +gimp_drawable_edit_bucket_fill () +
+gboolean + +gimp_drawable_edit_gradient_fill () +
+gboolean + +gimp_drawable_edit_stroke_selection () +
+gboolean + +gimp_drawable_edit_stroke_item () +
+
+
+

Description

+

Drawable edit functions (clear, fill, gradient, stroke etc.)

+
+
+

Functions

+
+

gimp_drawable_edit_clear ()

+
gboolean
+gimp_drawable_edit_clear (gint32 drawable_ID);
+

Clear selected area of drawable.

+

This procedure clears the specified drawable. If the drawable has an +alpha channel, the cleared pixels will become transparent. If the +drawable does not have an alpha channel, cleared pixels will be set +to the background color. This procedure only affects regions within +a selection if there is a selection active.

+

This procedure is affected by the following context setters: +gimp_context_set_background().

+
+

Parameters

+
+++++ + + + + + +

drawable_ID

The drawable to clear from.

 
+
+
+

Returns

+

TRUE on success.

+
+
+
+
+

gimp_drawable_edit_fill ()

+
gboolean
+gimp_drawable_edit_fill (gint32 drawable_ID,
+                         GimpFillType fill_type);
+

Fill selected area of drawable.

+

This procedure fills the specified drawable according to fill mode. +This procedure only affects regions within a selection if there is a +selection active. If you want to fill the whole drawable, regardless +of the selection, use gimp_drawable_fill().

+

This procedure is affected by the following context setters: +gimp_context_set_opacity(), gimp_context_set_paint_mode(), +gimp_context_set_foreground(), gimp_context_set_background(), +gimp_context_set_pattern().

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

drawable_ID

The drawable to fill to.

 

fill_type

The type of fill.

 
+
+
+

Returns

+

TRUE on success.

+
+
+
+
+

gimp_drawable_edit_bucket_fill ()

+
gboolean
+gimp_drawable_edit_bucket_fill (gint32 drawable_ID,
+                                GimpFillType fill_type,
+                                gdouble x,
+                                gdouble y);
+

Fill the area by a seed fill starting at the specified coordinates.

+

This procedure does a seed fill at the specified coordinates, using +various parameters from the current context. +In the case of merged sampling, the x and y coordinates are relative +to the image's origin; otherwise, they are relative to the +drawable's origin.

+

This procedure is affected by the following context setters: +gimp_context_set_opacity(), gimp_context_set_paint_mode(), +gimp_context_set_foreground(), gimp_context_set_background(), +gimp_context_set_pattern(), gimp_context_set_sample_threshold(), +gimp_context_set_sample_merged(), +gimp_context_set_sample_criterion(), +gimp_context_set_diagonal_neighbors(), gimp_context_set_antialias().

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

drawable_ID

The affected drawable.

 

fill_type

The type of fill.

 

x

The x coordinate of this bucket fill's application.

 

y

The y coordinate of this bucket fill's application.

 
+
+
+

Returns

+

TRUE on success.

+
+

Since: 2.10

+
+
+
+

gimp_drawable_edit_gradient_fill ()

+
gboolean
+gimp_drawable_edit_gradient_fill (gint32 drawable_ID,
+                                  GimpGradientType gradient_type,
+                                  gdouble offset,
+                                  gboolean supersample,
+                                  gint supersample_max_depth,
+                                  gdouble supersample_threshold,
+                                  gboolean dither,
+                                  gdouble x1,
+                                  gdouble y1,
+                                  gdouble x2,
+                                  gdouble y2);
+

Draw a gradient between the starting and ending coordinates with the +specified gradient type.

+

This tool requires information on the gradient type. It creates the +specified variety of gradient using the starting and ending +coordinates as defined for each gradient type. For shapeburst +gradient types, the context's distance metric is also relevant and +can be updated with gimp_context_set_distance_metric().

+

This procedure is affected by the following context setters: +gimp_context_set_opacity(), gimp_context_set_paint_mode(), +gimp_context_set_foreground(), gimp_context_set_background(), +gimp_context_set_gradient() and all gradient property settings, +gimp_context_set_distance_metric().

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

drawable_ID

The affected drawable.

 

gradient_type

The type of gradient.

 

offset

Offset relates to the starting and ending coordinates specified for the blend. This parameter is mode dependent.

 

supersample

Do adaptive supersampling.

 

supersample_max_depth

Maximum recursion levels for supersampling.

 

supersample_threshold

Supersampling threshold.

 

dither

Use dithering to reduce banding.

 

x1

The x coordinate of this gradient's starting point.

 

y1

The y coordinate of this gradient's starting point.

 

x2

The x coordinate of this gradient's ending point.

 

y2

The y coordinate of this gradient's ending point.

 
+
+
+

Returns

+

TRUE on success.

+
+

Since: 2.10

+
+
+
+

gimp_drawable_edit_stroke_selection ()

+
gboolean
+gimp_drawable_edit_stroke_selection (gint32 drawable_ID);
+

Stroke the current selection

+

This procedure strokes the current selection, painting along the +selection boundary with the active paint method and brush, or using +a plain line with configurable properties. The paint is applied to +the specified drawable regardless of the active selection.

+

This procedure is affected by the following context setters: +gimp_context_set_opacity(), gimp_context_set_paint_mode(), +gimp_context_set_paint_method(), gimp_context_set_stroke_method(), +gimp_context_set_foreground(), gimp_context_set_brush() and all +brush property settings, gimp_context_set_gradient() and all +gradient property settings, gimp_context_set_line_width() and all +line property settings.

+
+

Parameters

+
+++++ + + + + + +

drawable_ID

The drawable to stroke to.

 
+
+
+

Returns

+

TRUE on success.

+
+
+
+
+

gimp_drawable_edit_stroke_item ()

+
gboolean
+gimp_drawable_edit_stroke_item (gint32 drawable_ID,
+                                gint32 item_ID);
+

Stroke the specified item

+

This procedure strokes the specified item, painting along its +outline (e.g. along a path, or along a channel's boundary), with the +active paint method and brush, or using a plain line with +configurable properties.

+

This procedure is affected by the following context setters: +gimp_context_set_opacity(), gimp_context_set_paint_mode(), +gimp_context_set_paint_method(), gimp_context_set_stroke_method(), +gimp_context_set_foreground(), gimp_context_set_brush() and all +brush property settings, gimp_context_set_gradient() and all +gradient property settings, gimp_context_set_line_width() and all +line property settings.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

drawable_ID

The drawable to stroke to.

 

item_ID

The item to stroke.

 
+
+
+

Returns

+

TRUE on success.

+
+

Since: 2.10

+
+
+
+

Types and Values

+
+
+
+
Generated by GTK-Doc V1.28
+ + \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpdrawabletransform.html b/devel-docs/libgimp/html/libgimp-gimpdrawabletransform.html index a709adc7cb..3cd0cf2641 100644 --- a/devel-docs/libgimp/html/libgimp-gimpdrawabletransform.html +++ b/devel-docs/libgimp/html/libgimp-gimpdrawabletransform.html @@ -6,9 +6,9 @@ - + - + @@ -19,7 +19,7 @@ Home Up -Prev +Prev Next
@@ -1500,6 +1500,6 @@ gimp_drawable_transform_matrix_default
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpdynamics.html b/devel-docs/libgimp/html/libgimp-gimpdynamics.html index ae78d8b1ef..fd115a21db 100644 --- a/devel-docs/libgimp/html/libgimp-gimpdynamics.html +++ b/devel-docs/libgimp/html/libgimp-gimpdynamics.html @@ -8,7 +8,7 @@ - + @@ -122,6 +122,6 @@ accordingly.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpedit.html b/devel-docs/libgimp/html/libgimp-gimpedit.html index db4264dbac..3905e9bcb0 100644 --- a/devel-docs/libgimp/html/libgimp-gimpedit.html +++ b/devel-docs/libgimp/html/libgimp-gimpedit.html @@ -8,7 +8,7 @@ - + @@ -609,6 +609,10 @@ a named buffer instead of the global buffer.

gimp_edit_clear ()

gboolean
 gimp_edit_clear (gint32 drawable_ID);
+
+

gimp_edit_clear is deprecated and should not be used in newly-written code.

+

Use gimp_drawable_edit_clear() instead.

+

Clear selected area of drawable.

This procedure clears the specified drawable. If the drawable has an alpha channel, the cleared pixels will become transparent. If the @@ -641,6 +645,10 @@ a selection if there is a selection active.

gboolean
 gimp_edit_fill (gint32 drawable_ID,
                 GimpFillType fill_type);
+
+

gimp_edit_fill is deprecated and should not be used in newly-written code.

+

Use gimp_drawable_edit_fill() instead.

+

Fill selected area of drawable.

This procedure fills the specified drawable with the fill mode. If the fill mode is foreground, the current foreground color is used. @@ -688,6 +696,10 @@ gimp_edit_bucket_fill (gboolean sample_merged, gdouble x, gdouble y); +

+

gimp_edit_bucket_fill is deprecated and should not be used in newly-written code.

+

Use gimp_drawable_edit_bucket_fill() instead.

+

Fill the area specified either by the current selection if there is one, or by a seed fill starting at the specified coordinates.

This tool requires information on the paint application mode, and @@ -779,6 +791,10 @@ gimp_edit_blend (gdouble y1, gdouble x2, gdouble y2); +

+

gimp_edit_blend is deprecated and should not be used in newly-written code.

+

Use gimp_drawable_edit_gradient_fill() instead.

+

Blend between the starting and ending coordinates with the specified blend mode and gradient type.

This tool requires information on the paint application mode, the @@ -786,7 +802,7 @@ blend mode, and the gradient type. It creates the specified variety of blend using the starting and ending coordinates as defined for each gradient type. For shapeburst gradient types, the context's distance metric is also relevant and can be updated with -gimp_context_set_distance_metric().

+gimp_context_set_distance_metric().

Parameters

@@ -889,6 +905,10 @@ distance metric is also relevant and can be updated with

gimp_edit_stroke ()

gboolean
 gimp_edit_stroke (gint32 drawable_ID);
+
+

gimp_edit_stroke is deprecated and should not be used in newly-written code.

+

Use gimp_drawable_edit_stroke_selection() instead.

+

Stroke the current selection

This procedure strokes the current selection, painting along the selection boundary with the active brush and foreground color. The @@ -920,6 +940,10 @@ selection.

gboolean
 gimp_edit_stroke_vectors (gint32 drawable_ID,
                           gint32 vectors_ID);
+
+

gimp_edit_stroke_vectors is deprecated and should not be used in newly-written code.

+

Use gimp_drawable_edit_stroke_item() instead.

+

Stroke the specified vectors object

This procedure strokes the specified vectors object, painting along the path with the active brush and foreground color.

@@ -957,6 +981,6 @@ the path with the active brush and foreground color.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpenums.html b/devel-docs/libgimp/html/libgimp-gimpenums.html index 67e56e120b..ffa823ff63 100644 --- a/devel-docs/libgimp/html/libgimp-gimpenums.html +++ b/devel-docs/libgimp/html/libgimp-gimpenums.html @@ -8,7 +8,7 @@ - + @@ -955,6 +955,6 @@ The returned array is static and must not be modified.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpexport.html b/devel-docs/libgimp/html/libgimp-gimpexport.html index 61786baecd..3bcd88d7ee 100644 --- a/devel-docs/libgimp/html/libgimp-gimpexport.html +++ b/devel-docs/libgimp/html/libgimp-gimpexport.html @@ -8,7 +8,7 @@ - + @@ -338,6 +338,6 @@ export options.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpfileops.html b/devel-docs/libgimp/html/libgimp-gimpfileops.html index ecbdd0c4b2..51b2d986ce 100644 --- a/devel-docs/libgimp/html/libgimp-gimpfileops.html +++ b/devel-docs/libgimp/html/libgimp-gimpfileops.html @@ -8,7 +8,7 @@ - + @@ -702,6 +702,6 @@ using this function.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpfloatingsel.html b/devel-docs/libgimp/html/libgimp-gimpfloatingsel.html index bd2ea90f9c..2dce7e31b9 100644 --- a/devel-docs/libgimp/html/libgimp-gimpfloatingsel.html +++ b/devel-docs/libgimp/html/libgimp-gimpfloatingsel.html @@ -8,7 +8,7 @@ - + @@ -304,6 +304,6 @@ gimp_floating_sel_relax ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpfontmenu.html b/devel-docs/libgimp/html/libgimp-gimpfontmenu.html index 33e09203e8..dfe1bb26d6 100644 --- a/devel-docs/libgimp/html/libgimp-gimpfontmenu.html +++ b/devel-docs/libgimp/html/libgimp-gimpfontmenu.html @@ -8,7 +8,7 @@ - + @@ -184,6 +184,6 @@ callback function if one was supplied in the call to
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpfonts.html b/devel-docs/libgimp/html/libgimp-gimpfonts.html index 5c522d505d..a92965b54e 100644 --- a/devel-docs/libgimp/html/libgimp-gimpfonts.html +++ b/devel-docs/libgimp/html/libgimp-gimpfonts.html @@ -8,7 +8,7 @@ - + @@ -120,6 +120,6 @@ with
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpfontselect.html b/devel-docs/libgimp/html/libgimp-gimpfontselect.html index 465ad78ddf..d46072d757 100644 --- a/devel-docs/libgimp/html/libgimp-gimpfontselect.html +++ b/devel-docs/libgimp/html/libgimp-gimpfontselect.html @@ -8,7 +8,7 @@ - + @@ -226,6 +226,6 @@ gimp_fonts_set_popup (const -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpgimprc.html b/devel-docs/libgimp/html/libgimp-gimpgimprc.html index 04d6db9f80..f1b3325241 100644 --- a/devel-docs/libgimp/html/libgimp-gimpgimprc.html +++ b/devel-docs/libgimp/html/libgimp-gimpgimprc.html @@ -8,7 +8,7 @@ - + @@ -312,6 +312,6 @@ gimp_get_icon_theme_dir (void
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpgradient.html b/devel-docs/libgimp/html/libgimp-gimpgradient.html index 13de56a892..631995cc4c 100644 --- a/devel-docs/libgimp/html/libgimp-gimpgradient.html +++ b/devel-docs/libgimp/html/libgimp-gimpgradient.html @@ -8,7 +8,7 @@ - + @@ -1689,6 +1689,6 @@ control points of the neighboring segments.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpgradientmenu.html b/devel-docs/libgimp/html/libgimp-gimpgradientmenu.html index 6ae3590d68..7e96c9d649 100644 --- a/devel-docs/libgimp/html/libgimp-gimpgradientmenu.html +++ b/devel-docs/libgimp/html/libgimp-gimpgradientmenu.html @@ -8,7 +8,7 @@ - + @@ -185,6 +185,6 @@ callback function if one was supplied in the call to
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpgradients.html b/devel-docs/libgimp/html/libgimp-gimpgradients.html index fedcc320bd..2efef20df0 100644 --- a/devel-docs/libgimp/html/libgimp-gimpgradients.html +++ b/devel-docs/libgimp/html/libgimp-gimpgradients.html @@ -8,7 +8,7 @@ - + @@ -334,6 +334,6 @@ gimp_gradients_get_gradient_data (const -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpgradientselect.html b/devel-docs/libgimp/html/libgimp-gimpgradientselect.html index 608f0935e3..d6701e2257 100644 --- a/devel-docs/libgimp/html/libgimp-gimpgradientselect.html +++ b/devel-docs/libgimp/html/libgimp-gimpgradientselect.html @@ -8,7 +8,7 @@ - + @@ -235,6 +235,6 @@ gimp_gradients_set_popup (const -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimphelp.html b/devel-docs/libgimp/html/libgimp-gimphelp.html index 37b916456b..adac2ec625 100644 --- a/devel-docs/libgimp/html/libgimp-gimphelp.html +++ b/devel-docs/libgimp/html/libgimp-gimphelp.html @@ -8,7 +8,7 @@ - + @@ -99,6 +99,6 @@ the help domain of the main GIMP installation is used.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpimage.html b/devel-docs/libgimp/html/libgimp-gimpimage.html index aad4cd8e5d..85c3c276b5 100644 --- a/devel-docs/libgimp/html/libgimp-gimpimage.html +++ b/devel-docs/libgimp/html/libgimp-gimpimage.html @@ -8,7 +8,7 @@ - + @@ -137,6 +137,14 @@ + + + + + + + + @@ -169,6 +176,37 @@ gimp_flags_value_get_help () + + + + + + + + + + + + + + + +
+GimpLayerMode + +gimp_image_get_default_new_layer_mode () +
gint @@ -1243,6 +1251,34 @@ gimp_image_get_precision ( +

gimp_image_get_default_new_layer_mode ()

+
GimpLayerMode
+gimp_image_get_default_new_layer_mode (gint32 image_ID);
+

Get the default mode for newly created layers of this image.

+

Returns the default mode for newly created layers of this image.

+
+

Parameters

+
+++++ + + + + + +

image_ID

The image.

 
+
+
+

Returns

+

The layer mode.

+
+

Since: 2.10

+ +
+

gimp_image_width ()

gint
 gimp_image_width (gint32 image_ID);
@@ -4532,6 +4568,6 @@ gimp_image_get_vectors_position ( -
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpimagecolorprofile.html b/devel-docs/libgimp/html/libgimp-gimpimagecolorprofile.html index bf41b01c76..81356be9e7 100644 --- a/devel-docs/libgimp/html/libgimp-gimpimagecolorprofile.html +++ b/devel-docs/libgimp/html/libgimp-gimpimagecolorprofile.html @@ -8,7 +8,7 @@ - + @@ -343,6 +343,6 @@ accepted, according to the image's type.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpimageconvert.html b/devel-docs/libgimp/html/libgimp-gimpimageconvert.html index 3cbc59e429..55fcf9613b 100644 --- a/devel-docs/libgimp/html/libgimp-gimpimageconvert.html +++ b/devel-docs/libgimp/html/libgimp-gimpimageconvert.html @@ -8,7 +8,7 @@ - + @@ -315,6 +315,6 @@ GIMP_PRECISION_U8.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpimagegrid.html b/devel-docs/libgimp/html/libgimp-gimpimagegrid.html index d2bfe97707..4b6ccc92b9 100644 --- a/devel-docs/libgimp/html/libgimp-gimpimagegrid.html +++ b/devel-docs/libgimp/html/libgimp-gimpimagegrid.html @@ -8,7 +8,7 @@ - + @@ -514,6 +514,6 @@ and the new style as parameters.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpimageguides.html b/devel-docs/libgimp/html/libgimp-gimpimageguides.html index 288e8bbabd..2834c9f5f6 100644 --- a/devel-docs/libgimp/html/libgimp-gimpimageguides.html +++ b/devel-docs/libgimp/html/libgimp-gimpimageguides.html @@ -8,7 +8,7 @@ - + @@ -322,6 +322,6 @@ the position of the guide relative to the top or left of the image.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpimagesamplepoints.html b/devel-docs/libgimp/html/libgimp-gimpimagesamplepoints.html index 9c590393f5..b8f1bb51bb 100644 --- a/devel-docs/libgimp/html/libgimp-gimpimagesamplepoints.html +++ b/devel-docs/libgimp/html/libgimp-gimpimagesamplepoints.html @@ -8,7 +8,7 @@ - + @@ -251,6 +251,6 @@ left of the image.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpimageselect.html b/devel-docs/libgimp/html/libgimp-gimpimageselect.html index 59de80d87e..c58edf53df 100644 --- a/devel-docs/libgimp/html/libgimp-gimpimageselect.html +++ b/devel-docs/libgimp/html/libgimp-gimpimageselect.html @@ -8,7 +8,7 @@ - + @@ -119,14 +119,14 @@ of the current context settings. Essentially, all pixels (in the drawable) that have color sufficiently close to the specified color (as determined by the threshold and criterion context values) are included in the selection. To select transparent regions, the color -specified must also have minimum alpha. -This procedure is affected by the following context setters: +specified must also have minimum alpha.

+

This procedure is affected by the following context setters: gimp_context_set_antialias(), gimp_context_set_feather(), gimp_context_set_feather_radius(), gimp_context_set_sample_merged(), gimp_context_set_sample_criterion(), gimp_context_set_sample_threshold(), -gimp_context_set_sample_transparent(). -In the case of a merged sampling, the supplied drawable is ignored.

+gimp_context_set_sample_transparent().

+

In the case of a merged sampling, the supplied drawable is ignored.

Parameters

@@ -187,15 +187,15 @@ threshold and criterion context settings). This process continues until no more expansion is possible. If antialiasing is turned on, the final selection mask will contain intermediate values based on close misses to the threshold bar at pixels along the seed fill -boundary. -This procedure is affected by the following context setters: +boundary.

+

This procedure is affected by the following context setters: gimp_context_set_antialias(), gimp_context_set_feather(), gimp_context_set_feather_radius(), gimp_context_set_sample_merged(), gimp_context_set_sample_criterion(), gimp_context_set_sample_threshold(), gimp_context_set_sample_transparent(), -gimp_context_set_diagonal_neighbors(). -In the case of a merged sampling, the supplied drawable is ignored. +gimp_context_set_diagonal_neighbors().

+

In the case of a merged sampling, the supplied drawable is ignored. If the sample is merged, the specified coordinates are relative to the image origin; otherwise, they are relative to the drawable's origin.

@@ -255,8 +255,8 @@ gimp_image_select_rectangle (gimp_context_set_feather(), gimp_context_set_feather_radius().

Parameters

@@ -323,8 +323,8 @@ image;

This tool creates a rectangular selection with round corners over the specified image. The rectangular region can be either added to, subtracted from, or replace the contents of the previous selection -mask. -This procedure is affected by the following context setters: +mask.

+

This procedure is affected by the following context setters: gimp_context_set_antialias(), gimp_context_set_feather(), gimp_context_set_feather_radius().

@@ -398,8 +398,8 @@ gimp_image_select_ellipse (gimp_context_set_antialias(), gimp_context_set_feather(), gimp_context_set_feather_radius().

@@ -466,8 +466,8 @@ specified through an array of floating point numbers and its length. The length of array must be 2n, where n is the number of points. Each point is defined by 2 floating point values which correspond to the x and y coordinates. If the final point does not connect to the -starting point, a connecting segment is automatically added. -This procedure is affected by the following context setters: +starting point, a connecting segment is automatically added.

+

This procedure is affected by the following context setters: gimp_context_set_antialias(), gimp_context_set_feather(), gimp_context_set_feather_radius().

@@ -519,8 +519,8 @@ gimp_image_select_item (gimp_context_set_antialias(), gimp_context_set_feather(), gimp_context_set_feather_radius().

@@ -562,6 +562,6 @@ This procedure is affected by the following context setters:
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28
\ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpimagetransform.html b/devel-docs/libgimp/html/libgimp-gimpimagetransform.html index 3c4ee70969..010e5f136b 100644 --- a/devel-docs/libgimp/html/libgimp-gimpimagetransform.html +++ b/devel-docs/libgimp/html/libgimp-gimpimagetransform.html @@ -8,7 +8,7 @@ - + @@ -422,6 +422,6 @@ gimp_image_rotate ( -
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28
\ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpimageundo.html b/devel-docs/libgimp/html/libgimp-gimpimageundo.html index d7d1343c4d..2669d4fb33 100644 --- a/devel-docs/libgimp/html/libgimp-gimpimageundo.html +++ b/devel-docs/libgimp/html/libgimp-gimpimageundo.html @@ -8,7 +8,7 @@ - + @@ -331,6 +331,6 @@ responsibility of the caller.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpitem.html b/devel-docs/libgimp/html/libgimp-gimpitem.html index df71321a9e..177931e097 100644 --- a/devel-docs/libgimp/html/libgimp-gimpitem.html +++ b/devel-docs/libgimp/html/libgimp-gimpitem.html @@ -8,7 +8,7 @@ - + @@ -145,6 +145,22 @@ + + + + + + + + + + + + + + + + + + + + @@ -293,6 +317,25 @@ using +

gimp_metadata_get_guid ()

+
gchar *
+gimp_metadata_get_guid (void);
+

Generate Version 4 UUID/GUID.

+
+

Returns

+

The new GUID/UUID string.

+
+

Since: 2.10

+ +
+
+

gimp_metadata_add_xmp_history ()

+
void
+gimp_metadata_add_xmp_history (GimpMetadata *metadata,
+                               gchar *state_status);
+
+
+

gimp_metadata_load_from_file ()

GimpMetadata *
 gimp_metadata_load_from_file (GFile *file,
@@ -421,6 +464,55 @@ gimp_metadata_set_from_exif (
+
gimp_metadata_set_from_iptc ()

+
gboolean
+gimp_metadata_set_from_iptc (GimpMetadata *metadata,
+                             const guchar *iptc_data,
+                             gint iptc_data_length,
+                             GError **error);

+
Sets the tags from a piece of IPTC data on metadata
+.

+

+
Parameters

+
+gboolean + +gimp_item_get_expanded () +
+gboolean + +gimp_item_set_expanded () +
gchar * @@ -676,6 +692,70 @@ specified item. The order is topmost to bottommost.

+

gimp_item_get_expanded ()

+
gboolean
+gimp_item_get_expanded (gint32 item_ID);
+

Returns whether the item is expanded.

+

This procedure returns TRUE if the specified item is expanded.

+
+

Parameters

+
+++++ + + + + + +

item_ID

The item.

 
+
+
+

Returns

+

TRUE if the item is expanded, FALSE otherwise.

+
+

Since: 2.10

+
+
+
+

gimp_item_set_expanded ()

+
gboolean
+gimp_item_set_expanded (gint32 item_ID,
+                        gboolean expanded);
+

Sets the expanded state of the item.

+

This procedure expands or collapses the item.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

item_ID

The item.

 

expanded

TRUE to expand the item, FALSE to collapse the item.

 
+
+
+

Returns

+

TRUE on success.

+
+

Since: 2.10

+
+
+

gimp_item_get_name ()

gchar *
 gimp_item_get_name (gint32 item_ID);
@@ -1279,6 +1359,6 @@ value must be freed with -
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpitemtransform.html b/devel-docs/libgimp/html/libgimp-gimpitemtransform.html index 39177a6bb3..fa436e3d5c 100644 --- a/devel-docs/libgimp/html/libgimp-gimpitemtransform.html +++ b/devel-docs/libgimp/html/libgimp-gimpitemtransform.html @@ -8,7 +8,7 @@ - + @@ -780,6 +780,6 @@ This procedure is affected by the following context setters:
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimplayer.html b/devel-docs/libgimp/html/libgimp-gimplayer.html index 30be483d51..07c0094ae9 100644 --- a/devel-docs/libgimp/html/libgimp-gimplayer.html +++ b/devel-docs/libgimp/html/libgimp-gimplayer.html @@ -8,7 +8,7 @@ - + @@ -1937,6 +1937,6 @@ gimp_layer_set_composite_mode ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpmenu.html b/devel-docs/libgimp/html/libgimp-gimpmenu.html index 45be2b1010..87c5400905 100644 --- a/devel-docs/libgimp/html/libgimp-gimpmenu.html +++ b/devel-docs/libgimp/html/libgimp-gimpmenu.html @@ -8,7 +8,7 @@ - + @@ -315,6 +315,6 @@ gimp_drawable_menu_new ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpmessage.html b/devel-docs/libgimp/html/libgimp-gimpmessage.html index cf5b2f10bd..b1cb0f52b3 100644 --- a/devel-docs/libgimp/html/libgimp-gimpmessage.html +++ b/devel-docs/libgimp/html/libgimp-gimpmessage.html @@ -8,7 +8,7 @@ - + @@ -148,6 +148,6 @@ was started.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpmetadata.html b/devel-docs/libgimp/html/libgimp-gimpmetadata.html index 3716a5fa25..9b7eca34a9 100644 --- a/devel-docs/libgimp/html/libgimp-gimpmetadata.html +++ b/devel-docs/libgimp/html/libgimp-gimpmetadata.html @@ -8,7 +8,7 @@ - + @@ -321,6 +321,6 @@ gimp_image_metadata_load_thumbnail ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppainttools.html b/devel-docs/libgimp/html/libgimp-gimppainttools.html index d4c626c365..cfd698c17c 100644 --- a/devel-docs/libgimp/html/libgimp-gimppainttools.html +++ b/devel-docs/libgimp/html/libgimp-gimppainttools.html @@ -8,7 +8,7 @@ - + @@ -627,6 +627,10 @@ gimp_edit_bucket_fill_full (GimpSelectCriterion select_criterion, gdouble x, gdouble y); +
+

gimp_edit_bucket_fill_full is deprecated and should not be used in newly-written code.

+

Use gimp_drawable_edit_bucket_fill() instead.

+

Fill the area specified either by the current selection if there is one, or by a seed fill starting at the specified coordinates.

This tool requires information on the paint application mode, and @@ -1190,6 +1194,6 @@ tools option dialog has not been activated.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppalette.html b/devel-docs/libgimp/html/libgimp-gimppalette.html index fe390f1e7b..116b68e0ac 100644 --- a/devel-docs/libgimp/html/libgimp-gimppalette.html +++ b/devel-docs/libgimp/html/libgimp-gimppalette.html @@ -8,7 +8,7 @@ - + @@ -922,6 +922,6 @@ gimp_palette_is_editable (const -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppalettemenu.html b/devel-docs/libgimp/html/libgimp-gimppalettemenu.html index 0f9105ed65..f39a03f8b2 100644 --- a/devel-docs/libgimp/html/libgimp-gimppalettemenu.html +++ b/devel-docs/libgimp/html/libgimp-gimppalettemenu.html @@ -8,7 +8,7 @@ - + @@ -187,6 +187,6 @@ callback function if one was supplied in the call to
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppalettes.html b/devel-docs/libgimp/html/libgimp-gimppalettes.html index 7924d59f7f..0d214a3b23 100644 --- a/devel-docs/libgimp/html/libgimp-gimppalettes.html +++ b/devel-docs/libgimp/html/libgimp-gimppalettes.html @@ -8,7 +8,7 @@ - + @@ -249,6 +249,6 @@ gimp_palettes_get_palette_entry (const -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppaletteselect.html b/devel-docs/libgimp/html/libgimp-gimppaletteselect.html index 8cbf6328d3..d6932f9626 100644 --- a/devel-docs/libgimp/html/libgimp-gimppaletteselect.html +++ b/devel-docs/libgimp/html/libgimp-gimppaletteselect.html @@ -8,7 +8,7 @@ - + @@ -226,6 +226,6 @@ gimp_palettes_set_popup (const -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppaths.html b/devel-docs/libgimp/html/libgimp-gimppaths.html index 9bd4f77b03..6557c033a4 100644 --- a/devel-docs/libgimp/html/libgimp-gimppaths.html +++ b/devel-docs/libgimp/html/libgimp-gimppaths.html @@ -8,7 +8,7 @@ - + @@ -816,6 +816,6 @@ gimp_path_import ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppattern.html b/devel-docs/libgimp/html/libgimp-gimppattern.html index 240c009a6b..e147461240 100644 --- a/devel-docs/libgimp/html/libgimp-gimppattern.html +++ b/devel-docs/libgimp/html/libgimp-gimppattern.html @@ -8,7 +8,7 @@ - + @@ -180,6 +180,6 @@ pixel data.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppatternmenu.html b/devel-docs/libgimp/html/libgimp-gimppatternmenu.html index fd4d71099a..98dde30cae 100644 --- a/devel-docs/libgimp/html/libgimp-gimppatternmenu.html +++ b/devel-docs/libgimp/html/libgimp-gimppatternmenu.html @@ -8,7 +8,7 @@ - + @@ -184,6 +184,6 @@ callback function if one was supplied in the call to
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppatterns.html b/devel-docs/libgimp/html/libgimp-gimppatterns.html index 60e6d34d0b..dd738a9706 100644 --- a/devel-docs/libgimp/html/libgimp-gimppatterns.html +++ b/devel-docs/libgimp/html/libgimp-gimppatterns.html @@ -8,7 +8,7 @@ - + @@ -269,6 +269,6 @@ gimp_patterns_get_pattern_data (const -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppatternselect.html b/devel-docs/libgimp/html/libgimp-gimppatternselect.html index 0b3ba033c6..02cb402ce7 100644 --- a/devel-docs/libgimp/html/libgimp-gimppatternselect.html +++ b/devel-docs/libgimp/html/libgimp-gimppatternselect.html @@ -8,7 +8,7 @@ - + @@ -230,6 +230,6 @@ gimp_patterns_set_popup (const -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppixbuf.html b/devel-docs/libgimp/html/libgimp-gimppixbuf.html index 5b2f4795f7..ea213d0320 100644 --- a/devel-docs/libgimp/html/libgimp-gimppixbuf.html +++ b/devel-docs/libgimp/html/libgimp-gimppixbuf.html @@ -8,7 +8,7 @@ - + @@ -293,6 +293,6 @@ size.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppixelfetcher.html b/devel-docs/libgimp/html/libgimp-gimppixelfetcher.html index 558aaa43db..8e40088601 100644 --- a/devel-docs/libgimp/html/libgimp-gimppixelfetcher.html +++ b/devel-docs/libgimp/html/libgimp-gimppixelfetcher.html @@ -8,7 +8,7 @@ - + @@ -377,6 +377,6 @@ gimp_pixel_fetcher_destroy ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppixelrgn.html b/devel-docs/libgimp/html/libgimp-gimppixelrgn.html index 71697419e7..5544307eee 100644 --- a/devel-docs/libgimp/html/libgimp-gimppixelrgn.html +++ b/devel-docs/libgimp/html/libgimp-gimppixelrgn.html @@ -8,7 +8,7 @@ - + @@ -935,6 +935,6 @@ any tiles left.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpplugin.html b/devel-docs/libgimp/html/libgimp-gimpplugin.html index 0a2dc62731..2515f87582 100644 --- a/devel-docs/libgimp/html/libgimp-gimpplugin.html +++ b/devel-docs/libgimp/html/libgimp-gimpplugin.html @@ -8,7 +8,7 @@ - + @@ -372,6 +372,6 @@ drawables, which can be more than 8 bits per channel.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpproceduraldb.html b/devel-docs/libgimp/html/libgimp-gimpproceduraldb.html index 6fb37d551e..ee022cde78 100644 --- a/devel-docs/libgimp/html/libgimp-gimpproceduraldb.html +++ b/devel-docs/libgimp/html/libgimp-gimpproceduraldb.html @@ -8,7 +8,7 @@ - + @@ -609,6 +609,6 @@ associated with the identifier, an error is returned.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpprogress.html b/devel-docs/libgimp/html/libgimp-gimpprogress.html index 69e4ac9086..3ff2812be0 100644 --- a/devel-docs/libgimp/html/libgimp-gimpprogress.html +++ b/devel-docs/libgimp/html/libgimp-gimpprogress.html @@ -8,7 +8,7 @@ - + @@ -609,6 +609,6 @@ gimp_progress_cancel (const -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpregioniterator.html b/devel-docs/libgimp/html/libgimp-gimpregioniterator.html index 1e5238dd9c..860558e93e 100644 --- a/devel-docs/libgimp/html/libgimp-gimpregioniterator.html +++ b/devel-docs/libgimp/html/libgimp-gimpregioniterator.html @@ -8,7 +8,7 @@ - + @@ -325,6 +325,6 @@ gimp_rgn_iterate2 ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpselection.html b/devel-docs/libgimp/html/libgimp-gimpselection.html index 2c291fa01c..47d522d028 100644 --- a/devel-docs/libgimp/html/libgimp-gimpselection.html +++ b/devel-docs/libgimp/html/libgimp-gimpselection.html @@ -8,7 +8,7 @@ - + @@ -880,6 +880,6 @@ gimp_selection_combine ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpselectiontools.html b/devel-docs/libgimp/html/libgimp-gimpselectiontools.html index 306f56b004..9f4c45fa0b 100644 --- a/devel-docs/libgimp/html/libgimp-gimpselectiontools.html +++ b/devel-docs/libgimp/html/libgimp-gimpselectiontools.html @@ -8,7 +8,7 @@ - + @@ -776,6 +776,6 @@ gimp_round_rect_select ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimptextlayer.html b/devel-docs/libgimp/html/libgimp-gimptextlayer.html index 6919970f52..703236c3f1 100644 --- a/devel-docs/libgimp/html/libgimp-gimptextlayer.html +++ b/devel-docs/libgimp/html/libgimp-gimptextlayer.html @@ -8,7 +8,7 @@ - + @@ -644,6 +644,10 @@ gimp_text_layer_set_hinting (gimp_text_layer_set_hinting is deprecated and should not be used in newly-written code.

Use gimp_text_layer_set_hint_style() instead.

+

Enable/disable the use of hinting in a text layer.

+

This procedure enables or disables hinting on the text of a text +layer. If you enable 'auto-hint', FreeType\'s automatic hinter will +be used and hinting information from the font will be ignored.

Parameters

@@ -1395,6 +1399,6 @@ keeping it as a text layer and not converting it to a bitmap like
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimptexttool.html b/devel-docs/libgimp/html/libgimp-gimptexttool.html index bd1790039a..f36bf006da 100644 --- a/devel-docs/libgimp/html/libgimp-gimptexttool.html +++ b/devel-docs/libgimp/html/libgimp-gimptexttool.html @@ -8,7 +8,7 @@ - + @@ -500,6 +500,6 @@ gimp_text_get_extents (const -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimptile.html b/devel-docs/libgimp/html/libgimp-gimptile.html index 2a8c875aca..733f04b4e4 100644 --- a/devel-docs/libgimp/html/libgimp-gimptile.html +++ b/devel-docs/libgimp/html/libgimp-gimptile.html @@ -8,7 +8,7 @@ - + @@ -213,6 +213,6 @@ shadow tiles.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimptransformtools.html b/devel-docs/libgimp/html/libgimp-gimptransformtools.html index 366ce8f485..00dab6adcb 100644 --- a/devel-docs/libgimp/html/libgimp-gimptransformtools.html +++ b/devel-docs/libgimp/html/libgimp-gimptransformtools.html @@ -8,7 +8,7 @@ - + @@ -455,6 +455,6 @@ gimp_transform_2d ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpui.html b/devel-docs/libgimp/html/libgimp-gimpui.html index 61f192028c..aed13c6a38 100644 --- a/devel-docs/libgimp/html/libgimp-gimpui.html +++ b/devel-docs/libgimp/html/libgimp-gimpui.html @@ -8,7 +8,7 @@ - + @@ -254,6 +254,6 @@ display ID. See -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpvectors.html b/devel-docs/libgimp/html/libgimp-gimpvectors.html index db6670d09f..84739ef17e 100644 --- a/devel-docs/libgimp/html/libgimp-gimpvectors.html +++ b/devel-docs/libgimp/html/libgimp-gimpvectors.html @@ -8,7 +8,7 @@ - + @@ -2188,6 +2188,6 @@ gimp_vectors_bezier_stroke_new_moveto ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-image.html b/devel-docs/libgimp/html/libgimp-image.html index ed1d35474a..f9b682f417 100644 --- a/devel-docs/libgimp/html/libgimp-image.html +++ b/devel-docs/libgimp/html/libgimp-image.html @@ -8,7 +8,7 @@ - + @@ -39,6 +39,9 @@ gimpdrawablecolor — Functions for manipulating a drawable's color.
+gimpdrawableedit — Drawable edit functions (clear, fill, gradient, stroke etc.) +
+
gimpdrawabletransform — Functions to perform transformatrions on drawables.
@@ -131,6 +134,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-selectors.html b/devel-docs/libgimp/html/libgimp-selectors.html index 6eca13e5f6..d57b3a527f 100644 --- a/devel-docs/libgimp/html/libgimp-selectors.html +++ b/devel-docs/libgimp/html/libgimp-selectors.html @@ -8,7 +8,7 @@ - + @@ -59,6 +59,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp.devhelp2 b/devel-docs/libgimp/html/libgimp.devhelp2 index 27fb595348..9bb17e1bd2 100644 --- a/devel-docs/libgimp/html/libgimp.devhelp2 +++ b/devel-docs/libgimp/html/libgimp.devhelp2 @@ -21,6 +21,7 @@ + @@ -123,6 +124,7 @@ + @@ -132,6 +134,9 @@ + + + @@ -260,6 +265,16 @@ + + + + + + + + + + @@ -282,6 +297,8 @@ + + @@ -456,6 +473,12 @@ + + + + + + @@ -484,12 +507,12 @@ - - - - - - + + + + + + @@ -521,6 +544,7 @@ + @@ -678,6 +702,8 @@ + + @@ -869,7 +895,7 @@ - + diff --git a/devel-docs/libgimp/html/libgimp.html b/devel-docs/libgimp/html/libgimp.html index f6026995e3..e5ac5cce89 100644 --- a/devel-docs/libgimp/html/libgimp.html +++ b/devel-docs/libgimp/html/libgimp.html @@ -8,7 +8,7 @@ - + @@ -86,6 +86,9 @@ gimpdrawablecolor — Functions for manipulating a drawable's color.
+gimpdrawableedit — Drawable edit functions (clear, fill, gradient, stroke etc.) +
+
gimpdrawabletransform — Functions to perform transformatrions on drawables.
@@ -250,6 +253,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimpui-hierarchy.html b/devel-docs/libgimp/html/libgimpui-hierarchy.html index bbd5fe9c66..29eae9b91a 100644 --- a/devel-docs/libgimp/html/libgimpui-hierarchy.html +++ b/devel-docs/libgimp/html/libgimpui-hierarchy.html @@ -8,7 +8,7 @@ - + @@ -58,6 +58,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimpui.html b/devel-docs/libgimp/html/libgimpui.html index b374620c70..6d7781dc7a 100644 --- a/devel-docs/libgimp/html/libgimpui.html +++ b/devel-docs/libgimp/html/libgimpui.html @@ -8,7 +8,7 @@ - + @@ -80,6 +80,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimp/html/right-insensitive.png b/devel-docs/libgimp/html/right-insensitive.png index 179725a587..ef7d866a88 100644 Binary files a/devel-docs/libgimp/html/right-insensitive.png and b/devel-docs/libgimp/html/right-insensitive.png differ diff --git a/devel-docs/libgimp/html/right.png b/devel-docs/libgimp/html/right.png index bf5d8faa54..07fefed0d8 100644 Binary files a/devel-docs/libgimp/html/right.png and b/devel-docs/libgimp/html/right.png differ diff --git a/devel-docs/libgimp/html/style.css b/devel-docs/libgimp/html/style.css index 367542097b..4be4ede11b 100644 --- a/devel-docs/libgimp/html/style.css +++ b/devel-docs/libgimp/html/style.css @@ -30,6 +30,10 @@ body vertical-align: top; } +span.nowrap { + white-space: nowrap; +} + div.gallery-float { float: left; diff --git a/devel-docs/libgimp/html/up-insensitive.png b/devel-docs/libgimp/html/up-insensitive.png index 5ee049e4e3..99528f8c9e 100644 Binary files a/devel-docs/libgimp/html/up-insensitive.png and b/devel-docs/libgimp/html/up-insensitive.png differ diff --git a/devel-docs/libgimp/html/up.png b/devel-docs/libgimp/html/up.png index 3a816d0b31..aa6a2ae951 100644 Binary files a/devel-docs/libgimp/html/up.png and b/devel-docs/libgimp/html/up.png differ diff --git a/devel-docs/libgimp/libgimp-docs.sgml b/devel-docs/libgimp/libgimp-docs.sgml index 99c089875a..abd905b344 100644 --- a/devel-docs/libgimp/libgimp-docs.sgml +++ b/devel-docs/libgimp/libgimp-docs.sgml @@ -44,6 +44,7 @@ + diff --git a/devel-docs/libgimp/libgimp-sections.txt b/devel-docs/libgimp/libgimp-sections.txt index c1ea0403bc..d6a39c08bf 100644 --- a/devel-docs/libgimp/libgimp-sections.txt +++ b/devel-docs/libgimp/libgimp-sections.txt @@ -25,6 +25,7 @@ gimp_run_procedure2 gimp_destroy_params gimp_destroy_paramdefs gimp_get_pdb_error +gimp_get_pdb_status gimp_tile_width gimp_tile_height gimp_shm_ID @@ -34,6 +35,9 @@ gimp_install_cmap gimp_min_colors gimp_show_tool_tips gimp_show_help_button +gimp_export_exif +gimp_export_iptc +gimp_export_xmp gimp_check_size gimp_check_type gimp_default_display @@ -282,6 +286,16 @@ gimp_context_get_pattern gimp_context_set_pattern gimp_context_get_gradient gimp_context_set_gradient +gimp_context_set_gradient_fg_bg_hsv_ccw +gimp_context_set_gradient_fg_bg_hsv_cw +gimp_context_set_gradient_fg_bg_rgb +gimp_context_set_gradient_fg_transparent +gimp_context_get_gradient_blend_color_space +gimp_context_set_gradient_blend_color_space +gimp_context_get_gradient_repeat_mode +gimp_context_set_gradient_repeat_mode +gimp_context_get_gradient_reverse +gimp_context_set_gradient_reverse gimp_context_get_palette gimp_context_set_palette gimp_context_get_font @@ -304,6 +318,8 @@ gimp_context_get_sample_transparent gimp_context_set_sample_transparent gimp_context_get_diagonal_neighbors gimp_context_set_diagonal_neighbors +gimp_context_get_distance_metric +gimp_context_set_distance_metric gimp_context_get_interpolation gimp_context_set_interpolation gimp_context_get_transform_direction @@ -421,6 +437,16 @@ gimp_drawable_posterize gimp_drawable_threshold +
+gimpdrawableedit +gimp_drawable_edit_clear +gimp_drawable_edit_fill +gimp_drawable_edit_bucket_fill +gimp_drawable_edit_gradient_fill +gimp_drawable_edit_stroke_selection +gimp_drawable_edit_stroke_item +
+
gimpdrawabletransform gimp_drawable_transform_flip_simple @@ -600,6 +626,7 @@ gimp_image_delete gimp_image_is_valid gimp_image_base_type gimp_image_get_precision +gimp_image_get_default_new_layer_mode gimp_image_width gimp_image_height gimp_image_free_shadow @@ -797,6 +824,8 @@ gimp_item_is_vectors gimp_item_is_group gimp_item_get_parent gimp_item_get_children +gimp_item_get_expanded +gimp_item_set_expanded gimp_item_get_name gimp_item_set_name gimp_item_get_visible diff --git a/devel-docs/libgimpbase/Makefile.in b/devel-docs/libgimpbase/Makefile.in index 8fdd62bde2..480320df85 100644 --- a/devel-docs/libgimpbase/Makefile.in +++ b/devel-docs/libgimpbase/Makefile.in @@ -122,6 +122,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -238,7 +239,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -311,6 +312,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -539,6 +541,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/devel-docs/libgimpbase/html/api-index-2-10.html b/devel-docs/libgimpbase/html/api-index-2-10.html index 671925bb16..f705b948e0 100644 --- a/devel-docs/libgimpbase/html/api-index-2-10.html +++ b/devel-docs/libgimpbase/html/api-index-2-10.html @@ -8,13 +8,15 @@ - +
+ + + + @@ -1135,6 +1139,37 @@
+

enum GimpGradientBlendColorSpace

+
+

Members

+
 +++++ + + + + + + + + + + + + + + + + + +

GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL

  

GIMP_GRADIENT_BLEND_RGB_LINEAR

  

GIMP_GRADIENT_BLEND_CIE_LAB

  
+
+ +
+

enum GimpGradientSegmentColor

Members

@@ -2708,6 +2743,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpbasetypes.html b/devel-docs/libgimpbase/html/libgimpbase-gimpbasetypes.html index 43ace0eb51..60e0eade03 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpbasetypes.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpbasetypes.html @@ -8,7 +8,7 @@ - + @@ -494,6 +494,6 @@ help texts for flag values. See -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpchecks.html b/devel-docs/libgimpbase/html/libgimpbase-gimpchecks.html index 013d56ac75..9a904467a8 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpchecks.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpchecks.html @@ -8,7 +8,7 @@ - + @@ -154,6 +154,6 @@ should use this constant instead.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpcpuaccel.html b/devel-docs/libgimpbase/html/libgimpbase-gimpcpuaccel.html index c8419f72e1..a2822e51ca 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpcpuaccel.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpcpuaccel.html @@ -8,7 +8,7 @@ - + @@ -192,6 +192,6 @@ gimp_cpu_accel_set_use ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpdatafiles.html b/devel-docs/libgimpbase/html/libgimpbase-gimpdatafiles.html index 586da93114..196f3d4dd5 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpdatafiles.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpdatafiles.html @@ -8,7 +8,7 @@ - + @@ -173,6 +173,6 @@ data path.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpenv.html b/devel-docs/libgimpbase/html/libgimpbase-gimpenv.html index 3bd0f96f59..dd702118ae 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpenv.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpenv.html @@ -8,7 +8,7 @@ - + @@ -758,6 +758,6 @@ where the user has write permission.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimplimits.html b/devel-docs/libgimpbase/html/libgimpbase-gimplimits.html index 5b45c10e5f..7a8fad00c9 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimplimits.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimplimits.html @@ -8,7 +8,7 @@ - + @@ -122,6 +122,6 @@ values.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpmemsize.html b/devel-docs/libgimpbase/html/libgimpbase-gimpmemsize.html index 2367c32e6d..d795d87c78 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpmemsize.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpmemsize.html @@ -8,7 +8,7 @@ - + @@ -303,6 +303,6 @@ See
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpmetadata.html b/devel-docs/libgimpbase/html/libgimpbase-gimpmetadata.html index dc2c4001b7..f21b0768fd 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpmetadata.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpmetadata.html @@ -8,7 +8,7 @@ - + @@ -73,6 +73,22 @@
+gchar * + +gimp_metadata_get_guid () +
+void + +gimp_metadata_add_xmp_history () +
GimpMetadata * @@ -100,6 +116,14 @@ gboolean +gimp_metadata_set_from_iptc () +
+gboolean + gimp_metadata_set_from_xmp ()
+++++ + + + + + + + + + + + + + + + + + + + + + + +

metadata

A GimpMetadata instance.

 

iptc_data

The blob of Ipc data to set

 

iptc_data_length

Length of iptc_data +, in bytes

 

error

Return location for error message

 
+
+
+

Returns

+

TRUE on success, FALSE otherwise.

+
+

Since: 2.10

+ +
+

gimp_metadata_set_from_xmp ()

gboolean
 gimp_metadata_set_from_xmp (GimpMetadata *metadata,
@@ -870,6 +962,6 @@ supported with mime_type
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpparam.html b/devel-docs/libgimpbase/html/libgimpbase-gimpparam.html index 4bdc50af20..6af19a6cbc 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpparam.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpparam.html @@ -8,7 +8,7 @@ - + @@ -94,6 +94,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpparasite.html b/devel-docs/libgimpbase/html/libgimpbase-gimpparasite.html index 72d527df45..09b1309e70 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpparasite.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpparasite.html @@ -8,7 +8,7 @@ - + @@ -400,6 +400,6 @@ gimp_param_spec_parasite (const -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpparasiteio.html b/devel-docs/libgimpbase/html/libgimpbase-gimpparasiteio.html index e9798fb41f..911d4c40c2 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpparasiteio.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpparasiteio.html @@ -8,7 +8,7 @@ - + @@ -145,6 +145,6 @@ gimp_pixpipe_params_build ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimprectangle.html b/devel-docs/libgimpbase/html/libgimpbase-gimprectangle.html index 32128beaa8..cce249b02e 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimprectangle.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimprectangle.html @@ -8,7 +8,7 @@ - + @@ -255,6 +255,6 @@ gimp_rectangle_union ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpsignal.html b/devel-docs/libgimpbase/html/libgimpbase-gimpsignal.html index 0ac2285a2b..a34c2cd281 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpsignal.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpsignal.html @@ -8,7 +8,7 @@ - + @@ -162,6 +162,6 @@ active before the call to -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpunit.html b/devel-docs/libgimpbase/html/libgimpbase-gimpunit.html index 5921042d64..586318eae2 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpunit.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpunit.html @@ -8,7 +8,7 @@ - + @@ -1021,6 +1021,6 @@ See
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimputils.html b/devel-docs/libgimpbase/html/libgimpbase-gimputils.html index ec9294e356..967e5582fe 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimputils.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimputils.html @@ -8,7 +8,7 @@ - + @@ -140,6 +140,13 @@
const gchar * + +gimp_enum_value_get_abbrev () +
GimpFlagsDesc *
const gchar * + +gimp_flags_value_get_abbrev () +
+gboolean + +gimp_stack_trace_available () +
+gboolean + +gimp_stack_trace_print () +
+void + +gimp_stack_trace_query () +
@@ -710,6 +748,43 @@ gimp_enum_value_get_help ( +

gimp_enum_value_get_abbrev ()

+
const gchar *
+gimp_enum_value_get_abbrev (GEnumClass *enum_class,
+                            GEnumValue *enum_value);
+

Retrieves the translated abbreviation for a given enum_value +.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

enum_class

a GEnumClass

 

enum_value

a GEnumValue from enum_class +

 
+
+
+

Returns

+

the translated abbreviation of the enum value

+
+

Since: 2.10

+ +
+

gimp_flags_get_first_desc ()

GimpFlagsDesc *
 gimp_flags_get_first_desc (GFlagsClass *flags_class,
@@ -889,12 +964,163 @@ gimp_flags_value_get_help (Since: 2.2
+
+
+

gimp_flags_value_get_abbrev ()

+
const gchar *
+gimp_flags_value_get_abbrev (GFlagsClass *flags_class,
+                             GFlagsValue *flags_value);
+

Retrieves the translated abbreviation for a given flags_value +.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

flags_class

a GFlagsClass

 

flags_value

a GFlagsValue from flags_class +

 
+
+
+

Returns

+

the translated abbreviation of the flags value

+
+

Since: 2.10

+
+
+
+

gimp_stack_trace_available ()

+
gboolean
+gimp_stack_trace_available (gboolean optimal);
+

Returns TRUE if we have dependencies to generate backtraces. If +optimal + is TRUE, the function will return TRUE only when we +are able to generate optimal traces (i.e. with GDB or LLDB); +otherwise we return TRUE even if only backtrace() API is available.

+

On Win32, we return TRUE if Dr. Mingw is built-in, FALSE otherwise.

+
+

Parameters

+
+++++ + + + + + +

optimal

whether we get optimal traces.

 
+
+

Since: 2.10

+
+
+
+

gimp_stack_trace_print ()

+
gboolean
+gimp_stack_trace_print (const gchar *prog_name,
+                        gpointer stream,
+                        gchar **trace);
+

Attempts to generate a stack trace at current code position in +prog_name +. prog_name + is mostly a helper and can be set to NULL. +Nevertheless if set, it has to be the current program name (argv[0]). +This function is not meant to generate stack trace for third-party +programs, and will attach the current process id only. +Internally, this function uses gdb or lldb if they are available, +or the stacktrace() API on platforms where it is available. It always +fails on Win32.

+

The stack trace, once generated, will either be printed to stream + or +returned as a newly allocated string in trace +, if not NULL.

+

In some error cases (e.g. segmentation fault), trying to allocate +more memory will trigger more segmentation faults and therefore loop +our error handling (which is just wrong). Therefore printing to a +file description is an implementation without any memory allocation.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

prog_name

the program to attach to.

 

stream

a FILE * stream.

 

trace

location to store a newly allocated string of the trace.

 
+
+
+

Returns

+

TRUE if a stack trace could be generated, FALSE +otherwise.

+
+

Since: 2.10

+
+
+
+

gimp_stack_trace_query ()

+
void
+gimp_stack_trace_query (const gchar *prog_name);
+

This is mostly the same as g_on_error_query() except that we use our +own backtrace function, much more complete. +prog_name + must be the current program name (argv[0]). +It does nothing on Win32.

+
+

Parameters

+
+++++ + + + + + +

prog_name

the program to attach to.

 
+
+

Since: 2.10

+

Types and Values

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpversion.html b/devel-docs/libgimpbase/html/libgimpbase-gimpversion.html index adb412196d..1298b04bf9 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpversion.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpversion.html @@ -8,7 +8,7 @@ - + @@ -131,7 +131,7 @@ capabilities.

GIMP_VERSION

-
#define GIMP_VERSION                                    "2.10.0-RC1"
+
#define GIMP_VERSION                                    "2.10.0-RC2"
 

 
The GIMP version as a string.
@@ -169,6 +169,6 @@ capabilities.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase.devhelp2 b/devel-docs/libgimpbase/html/libgimpbase.devhelp2 index e7c908e092..353406ffb9 100644 --- a/devel-docs/libgimpbase/html/libgimpbase.devhelp2 +++ b/devel-docs/libgimpbase/html/libgimpbase.devhelp2 @@ -47,6 +47,7 @@ + @@ -160,9 +161,12 @@ + + + @@ -247,10 +251,15 @@ + + + + + @@ -378,6 +387,9 @@ + + + diff --git a/devel-docs/libgimpbase/html/pt01.html b/devel-docs/libgimpbase/html/pt01.html index 49b2b6fd4a..b73020fcad 100644 --- a/devel-docs/libgimpbase/html/pt01.html +++ b/devel-docs/libgimpbase/html/pt01.html @@ -8,7 +8,7 @@ - + @@ -91,6 +91,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/right-insensitive.png b/devel-docs/libgimpbase/html/right-insensitive.png index 179725a587..ef7d866a88 100644 Binary files a/devel-docs/libgimpbase/html/right-insensitive.png and b/devel-docs/libgimpbase/html/right-insensitive.png differ diff --git a/devel-docs/libgimpbase/html/right.png b/devel-docs/libgimpbase/html/right.png index bf5d8faa54..07fefed0d8 100644 Binary files a/devel-docs/libgimpbase/html/right.png and b/devel-docs/libgimpbase/html/right.png differ diff --git a/devel-docs/libgimpbase/html/style.css b/devel-docs/libgimpbase/html/style.css index 367542097b..4be4ede11b 100644 --- a/devel-docs/libgimpbase/html/style.css +++ b/devel-docs/libgimpbase/html/style.css @@ -30,6 +30,10 @@ body vertical-align: top; } +span.nowrap { + white-space: nowrap; +} + div.gallery-float { float: left; diff --git a/devel-docs/libgimpbase/html/up-insensitive.png b/devel-docs/libgimpbase/html/up-insensitive.png index 5ee049e4e3..99528f8c9e 100644 Binary files a/devel-docs/libgimpbase/html/up-insensitive.png and b/devel-docs/libgimpbase/html/up-insensitive.png differ diff --git a/devel-docs/libgimpbase/html/up.png b/devel-docs/libgimpbase/html/up.png index 3a816d0b31..aa6a2ae951 100644 Binary files a/devel-docs/libgimpbase/html/up.png and b/devel-docs/libgimpbase/html/up.png differ diff --git a/devel-docs/libgimpbase/libgimpbase-sections.txt b/devel-docs/libgimpbase/libgimpbase-sections.txt index bc54673502..0bb8ae7ab9 100644 --- a/devel-docs/libgimpbase/libgimpbase-sections.txt +++ b/devel-docs/libgimpbase/libgimpbase-sections.txt @@ -35,6 +35,7 @@ GimpDesaturateMode GimpDodgeBurnType GimpFillType GimpForegroundExtractMode +GimpGradientBlendColorSpace GimpGradientSegmentColor GimpGradientSegmentType GimpGradientType @@ -92,6 +93,7 @@ GIMP_TYPE_DESATURATE_MODE GIMP_TYPE_DODGE_BURN_TYPE GIMP_TYPE_FILL_TYPE GIMP_TYPE_FOREGROUND_EXTRACT_MODE +GIMP_TYPE_GRADIENT_BLEND_COLOR_SPACE GIMP_TYPE_GRADIENT_SEGMENT_COLOR GIMP_TYPE_GRADIENT_SEGMENT_TYPE GIMP_TYPE_GRADIENT_TYPE @@ -137,6 +139,7 @@ gimp_component_type_get_type gimp_convert_palette_type_get_type gimp_convolve_type_get_type gimp_fill_type_get_type +gimp_gradient_blend_color_space_get_type gimp_gradient_segment_color_get_type gimp_gradient_segment_type_get_type gimp_hue_range_get_type @@ -261,9 +264,12 @@ gimp_metadata_new gimp_metadata_duplicate gimp_metadata_deserialize gimp_metadata_serialize +gimp_metadata_get_guid +gimp_metadata_add_xmp_history gimp_metadata_load_from_file gimp_metadata_save_to_file gimp_metadata_set_from_exif +gimp_metadata_set_from_iptc gimp_metadata_set_from_xmp gimp_metadata_set_pixel_size gimp_metadata_set_bits_per_sample @@ -390,10 +396,15 @@ gimp_enum_get_desc gimp_enum_get_value gimp_enum_value_get_desc gimp_enum_value_get_help +gimp_enum_value_get_abbrev gimp_flags_get_first_desc gimp_flags_get_first_value gimp_flags_value_get_desc gimp_flags_value_get_help +gimp_flags_value_get_abbrev +gimp_stack_trace_available +gimp_stack_trace_print +gimp_stack_trace_query
diff --git a/devel-docs/libgimpcolor/Makefile.in b/devel-docs/libgimpcolor/Makefile.in index 78c5b003b5..52d51b415a 100644 --- a/devel-docs/libgimpcolor/Makefile.in +++ b/devel-docs/libgimpcolor/Makefile.in @@ -122,6 +122,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -238,7 +239,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -311,6 +312,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -539,6 +541,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/devel-docs/libgimpcolor/html/api-index-2-10.html b/devel-docs/libgimpcolor/html/api-index-2-10.html index d32766adeb..c09a0a767a 100644 --- a/devel-docs/libgimpcolor/html/api-index-2-10.html +++ b/devel-docs/libgimpcolor/html/api-index-2-10.html @@ -8,7 +8,7 @@ - + @@ -198,6 +198,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/api-index-2-2.html b/devel-docs/libgimpcolor/html/api-index-2-2.html index f22d47110f..517b07ba5d 100644 --- a/devel-docs/libgimpcolor/html/api-index-2-2.html +++ b/devel-docs/libgimpcolor/html/api-index-2-2.html @@ -8,7 +8,7 @@ - + @@ -45,6 +45,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/api-index-2-4.html b/devel-docs/libgimpcolor/html/api-index-2-4.html index 396c7f52e6..8c4888aa26 100644 --- a/devel-docs/libgimpcolor/html/api-index-2-4.html +++ b/devel-docs/libgimpcolor/html/api-index-2-4.html @@ -8,7 +8,7 @@ - + @@ -55,6 +55,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/api-index-2-6.html b/devel-docs/libgimpcolor/html/api-index-2-6.html index ccdb27a6a4..fe55beb220 100644 --- a/devel-docs/libgimpcolor/html/api-index-2-6.html +++ b/devel-docs/libgimpcolor/html/api-index-2-6.html @@ -8,7 +8,7 @@ - + @@ -45,6 +45,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/api-index-2-8.html b/devel-docs/libgimpcolor/html/api-index-2-8.html index 9d25f7b9bf..85c7a93753 100644 --- a/devel-docs/libgimpcolor/html/api-index-2-8.html +++ b/devel-docs/libgimpcolor/html/api-index-2-8.html @@ -8,7 +8,7 @@ - + @@ -40,6 +40,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/api-index-deprecated.html b/devel-docs/libgimpcolor/html/api-index-deprecated.html index f8c86b3701..d35d9f70c9 100644 --- a/devel-docs/libgimpcolor/html/api-index-deprecated.html +++ b/devel-docs/libgimpcolor/html/api-index-deprecated.html @@ -7,7 +7,7 @@ - + @@ -105,6 +105,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/api-index-full.html b/devel-docs/libgimpcolor/html/api-index-full.html index 7b3a655271..04893474d7 100644 --- a/devel-docs/libgimpcolor/html/api-index-full.html +++ b/devel-docs/libgimpcolor/html/api-index-full.html @@ -8,7 +8,7 @@ - + @@ -622,6 +622,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/home.png b/devel-docs/libgimpcolor/html/home.png index effb5ea39b..e80e202ad8 100644 Binary files a/devel-docs/libgimpcolor/html/home.png and b/devel-docs/libgimpcolor/html/home.png differ diff --git a/devel-docs/libgimpcolor/html/index.html b/devel-docs/libgimpcolor/html/index.html index f372de29ec..01fb9ad9d9 100644 --- a/devel-docs/libgimpcolor/html/index.html +++ b/devel-docs/libgimpcolor/html/index.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@

- for GIMP 2.10.0-RC1 + for GIMP 2.10.0-RC

@@ -70,6 +70,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/left-insensitive.png b/devel-docs/libgimpcolor/html/left-insensitive.png index 6290738b12..fea007e794 100644 Binary files a/devel-docs/libgimpcolor/html/left-insensitive.png and b/devel-docs/libgimpcolor/html/left-insensitive.png differ diff --git a/devel-docs/libgimpcolor/html/left.png b/devel-docs/libgimpcolor/html/left.png index d34a7bcff9..193905fc77 100644 Binary files a/devel-docs/libgimpcolor/html/left.png and b/devel-docs/libgimpcolor/html/left.png differ diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-GimpAdaptiveSupersample.html b/devel-docs/libgimpcolor/html/libgimpcolor-GimpAdaptiveSupersample.html index 1db2a95c94..3cf4b8d39a 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-GimpAdaptiveSupersample.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-GimpAdaptiveSupersample.html @@ -8,7 +8,7 @@ - + @@ -130,6 +130,6 @@ gimp_adaptive_supersample_area ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-GimpBilinear.html b/devel-docs/libgimpcolor/html/libgimpcolor-GimpBilinear.html index e3faadcd2d..2b559179d6 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-GimpBilinear.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-GimpBilinear.html @@ -8,7 +8,7 @@ - + @@ -224,6 +224,6 @@ bytes.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-GimpCMYK.html b/devel-docs/libgimpcolor/html/libgimpcolor-GimpCMYK.html index dc946953c7..a0f95f7db3 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-GimpCMYK.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-GimpCMYK.html @@ -8,7 +8,7 @@ - + @@ -486,6 +486,6 @@ going to CMYK and back can preserve alpha.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-GimpCairo.html b/devel-docs/libgimpcolor/html/libgimpcolor-GimpCairo.html index c95ed9741b..2b0358d900 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-GimpCairo.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-GimpCairo.html @@ -8,7 +8,7 @@ - + @@ -461,6 +461,6 @@ types is an error.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorManaged.html b/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorManaged.html index 3836f792be..4e0f2a36fe 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorManaged.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorManaged.html @@ -8,7 +8,7 @@ - + @@ -204,6 +204,6 @@ gimp_color_managed_profile_changed (
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorProfile.html b/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorProfile.html index b7a021874f..7850692f4a 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorProfile.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorProfile.html @@ -8,7 +8,7 @@ - + @@ -1027,6 +1027,6 @@ is not supported at all.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorSpace.html b/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorSpace.html index 4c527e4583..f4f01a2420 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorSpace.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorSpace.html @@ -8,7 +8,7 @@ - + @@ -866,6 +866,6 @@ rgb[2] is blue (0..255)

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorTransform.html b/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorTransform.html index ada78741cd..a6e369cdab 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorTransform.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorTransform.html @@ -8,7 +8,7 @@ - + @@ -416,6 +416,6 @@ by simply using
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-GimpHSV.html b/devel-docs/libgimpcolor/html/libgimpcolor-GimpHSV.html index adeb6c5576..6a74080fbd 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-GimpHSV.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-GimpHSV.html @@ -8,7 +8,7 @@ - + @@ -258,6 +258,6 @@ gimp_hsl_set_alpha ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-GimpPixbuf.html b/devel-docs/libgimpcolor/html/libgimpcolor-GimpPixbuf.html index 6e6781b170..943f72229d 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-GimpPixbuf.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-GimpPixbuf.html @@ -8,7 +8,7 @@ - + @@ -179,6 +179,6 @@ with
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-GimpRGB.html b/devel-docs/libgimpcolor/html/libgimpcolor-GimpRGB.html index 91810fec42..40f9589065 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-GimpRGB.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-GimpRGB.html @@ -8,7 +8,7 @@ - + @@ -1509,6 +1509,6 @@ gimp_value_set_rgb ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/pt01.html b/devel-docs/libgimpcolor/html/pt01.html index 51c56cceb1..5d1cddd669 100644 --- a/devel-docs/libgimpcolor/html/pt01.html +++ b/devel-docs/libgimpcolor/html/pt01.html @@ -8,7 +8,7 @@ - + @@ -64,6 +64,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/right-insensitive.png b/devel-docs/libgimpcolor/html/right-insensitive.png index 179725a587..ef7d866a88 100644 Binary files a/devel-docs/libgimpcolor/html/right-insensitive.png and b/devel-docs/libgimpcolor/html/right-insensitive.png differ diff --git a/devel-docs/libgimpcolor/html/right.png b/devel-docs/libgimpcolor/html/right.png index bf5d8faa54..07fefed0d8 100644 Binary files a/devel-docs/libgimpcolor/html/right.png and b/devel-docs/libgimpcolor/html/right.png differ diff --git a/devel-docs/libgimpcolor/html/style.css b/devel-docs/libgimpcolor/html/style.css index 367542097b..4be4ede11b 100644 --- a/devel-docs/libgimpcolor/html/style.css +++ b/devel-docs/libgimpcolor/html/style.css @@ -30,6 +30,10 @@ body vertical-align: top; } +span.nowrap { + white-space: nowrap; +} + div.gallery-float { float: left; diff --git a/devel-docs/libgimpcolor/html/up-insensitive.png b/devel-docs/libgimpcolor/html/up-insensitive.png index 5ee049e4e3..99528f8c9e 100644 Binary files a/devel-docs/libgimpcolor/html/up-insensitive.png and b/devel-docs/libgimpcolor/html/up-insensitive.png differ diff --git a/devel-docs/libgimpcolor/html/up.png b/devel-docs/libgimpcolor/html/up.png index 3a816d0b31..aa6a2ae951 100644 Binary files a/devel-docs/libgimpcolor/html/up.png and b/devel-docs/libgimpcolor/html/up.png differ diff --git a/devel-docs/libgimpconfig/Makefile.in b/devel-docs/libgimpconfig/Makefile.in index efb4b96428..61718034a0 100644 --- a/devel-docs/libgimpconfig/Makefile.in +++ b/devel-docs/libgimpconfig/Makefile.in @@ -122,6 +122,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -238,7 +239,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -311,6 +312,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -539,6 +541,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/devel-docs/libgimpconfig/html/GimpColorConfig.html b/devel-docs/libgimpconfig/html/GimpColorConfig.html index 6858d22369..dfe4a228b7 100644 --- a/devel-docs/libgimpconfig/html/GimpColorConfig.html +++ b/devel-docs/libgimpconfig/html/GimpColorConfig.html @@ -8,7 +8,7 @@ - + @@ -839,6 +839,6 @@ gimp_color_config_get_simulation_color_profile
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/api-index-2-10.html b/devel-docs/libgimpconfig/html/api-index-2-10.html index 7a3e5997a0..7caefa6b60 100644 --- a/devel-docs/libgimpconfig/html/api-index-2-10.html +++ b/devel-docs/libgimpconfig/html/api-index-2-10.html @@ -8,7 +8,7 @@ - + @@ -135,6 +135,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/api-index-2-4.html b/devel-docs/libgimpconfig/html/api-index-2-4.html index 46cbfec2ae..9003fcf6c5 100644 --- a/devel-docs/libgimpconfig/html/api-index-2-4.html +++ b/devel-docs/libgimpconfig/html/api-index-2-4.html @@ -8,7 +8,7 @@ - + @@ -247,6 +247,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/api-index-2-6.html b/devel-docs/libgimpconfig/html/api-index-2-6.html index 15d1a51adc..6caebdb69c 100644 --- a/devel-docs/libgimpconfig/html/api-index-2-6.html +++ b/devel-docs/libgimpconfig/html/api-index-2-6.html @@ -8,7 +8,7 @@ - + @@ -33,6 +33,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/api-index-2-8.html b/devel-docs/libgimpconfig/html/api-index-2-8.html index 957d8a2738..9f8d5c6fe8 100644 --- a/devel-docs/libgimpconfig/html/api-index-2-8.html +++ b/devel-docs/libgimpconfig/html/api-index-2-8.html @@ -8,7 +8,7 @@ - + @@ -40,6 +40,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/api-index-deprecated.html b/devel-docs/libgimpconfig/html/api-index-deprecated.html index 3b2c726745..083e37b5d5 100644 --- a/devel-docs/libgimpconfig/html/api-index-deprecated.html +++ b/devel-docs/libgimpconfig/html/api-index-deprecated.html @@ -7,7 +7,7 @@ - + @@ -84,6 +84,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/api-index-full.html b/devel-docs/libgimpconfig/html/api-index-full.html index 024925ea29..fdc2162e24 100644 --- a/devel-docs/libgimpconfig/html/api-index-full.html +++ b/devel-docs/libgimpconfig/html/api-index-full.html @@ -8,7 +8,7 @@ - + @@ -633,6 +633,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/home.png b/devel-docs/libgimpconfig/html/home.png index effb5ea39b..e80e202ad8 100644 Binary files a/devel-docs/libgimpconfig/html/home.png and b/devel-docs/libgimpconfig/html/home.png differ diff --git a/devel-docs/libgimpconfig/html/index.html b/devel-docs/libgimpconfig/html/index.html index 4a91ad5caf..6f749bcc39 100644 --- a/devel-docs/libgimpconfig/html/index.html +++ b/devel-docs/libgimpconfig/html/index.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@

- for GIMP 2.10.0-RC1 + for GIMP 2.10.0-RC

@@ -66,6 +66,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/left-insensitive.png b/devel-docs/libgimpconfig/html/left-insensitive.png index 6290738b12..fea007e794 100644 Binary files a/devel-docs/libgimpconfig/html/left-insensitive.png and b/devel-docs/libgimpconfig/html/left-insensitive.png differ diff --git a/devel-docs/libgimpconfig/html/left.png b/devel-docs/libgimpconfig/html/left.png index d34a7bcff9..193905fc77 100644 Binary files a/devel-docs/libgimpconfig/html/left.png and b/devel-docs/libgimpconfig/html/left.png differ diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-deserialize.html b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-deserialize.html index 2080b37fa9..c180666158 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-deserialize.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-deserialize.html @@ -8,7 +8,7 @@ - + @@ -158,6 +158,6 @@ found but couldn't be parsed.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-params.html b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-params.html index 6c7ed5f39c..5f976d588f 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-params.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-params.html @@ -8,7 +8,7 @@ - + @@ -477,6 +477,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-path.html b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-path.html index b68c5f4773..41dc0ebab6 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-path.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-path.html @@ -8,7 +8,7 @@ - + @@ -613,6 +613,6 @@ recode it using -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-serialize.html b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-serialize.html index 96602f6de3..03c1d78b79 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-serialize.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-serialize.html @@ -8,7 +8,7 @@ - + @@ -294,6 +294,6 @@ gimp_config_serialize_value (const -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-utils.html b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-utils.html index 533a5da02c..706cd45484 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-utils.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-utils.html @@ -8,7 +8,7 @@ - + @@ -292,6 +292,6 @@ strings. Only control characters and quotes are being escaped.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig.html b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig.html index 590bfbf7a5..af34f6d8c3 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig.html @@ -8,7 +8,7 @@ - + @@ -984,6 +984,6 @@ was modified,
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfigError.html b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfigError.html index e16fb2570c..4b066bfd18 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfigError.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfigError.html @@ -8,7 +8,7 @@ - + @@ -147,6 +147,6 @@ gimp_config_error_quark (void
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfigWriter.html b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfigWriter.html index ab8a3f0c0b..94b8949d0a 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfigWriter.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfigWriter.html @@ -8,7 +8,7 @@ - + @@ -758,6 +758,6 @@ the writer
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-GimpScanner.html b/devel-docs/libgimpconfig/html/libgimpconfig-GimpScanner.html index 04de7758b4..6486274970 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-GimpScanner.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-GimpScanner.html @@ -8,7 +8,7 @@ - + @@ -680,6 +680,6 @@ gimp_scanner_parse_matrix2 ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-hierarchy.html b/devel-docs/libgimpconfig/html/libgimpconfig-hierarchy.html index 72fe22a4f4..521edd26cd 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-hierarchy.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-hierarchy.html @@ -8,7 +8,7 @@ - + @@ -30,6 +30,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/pt01.html b/devel-docs/libgimpconfig/html/pt01.html index ae56fddfb7..e7dbe6729f 100644 --- a/devel-docs/libgimpconfig/html/pt01.html +++ b/devel-docs/libgimpconfig/html/pt01.html @@ -8,7 +8,7 @@ - + @@ -61,6 +61,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/right-insensitive.png b/devel-docs/libgimpconfig/html/right-insensitive.png index 179725a587..ef7d866a88 100644 Binary files a/devel-docs/libgimpconfig/html/right-insensitive.png and b/devel-docs/libgimpconfig/html/right-insensitive.png differ diff --git a/devel-docs/libgimpconfig/html/right.png b/devel-docs/libgimpconfig/html/right.png index bf5d8faa54..07fefed0d8 100644 Binary files a/devel-docs/libgimpconfig/html/right.png and b/devel-docs/libgimpconfig/html/right.png differ diff --git a/devel-docs/libgimpconfig/html/style.css b/devel-docs/libgimpconfig/html/style.css index 367542097b..4be4ede11b 100644 --- a/devel-docs/libgimpconfig/html/style.css +++ b/devel-docs/libgimpconfig/html/style.css @@ -30,6 +30,10 @@ body vertical-align: top; } +span.nowrap { + white-space: nowrap; +} + div.gallery-float { float: left; diff --git a/devel-docs/libgimpconfig/html/up-insensitive.png b/devel-docs/libgimpconfig/html/up-insensitive.png index 5ee049e4e3..99528f8c9e 100644 Binary files a/devel-docs/libgimpconfig/html/up-insensitive.png and b/devel-docs/libgimpconfig/html/up-insensitive.png differ diff --git a/devel-docs/libgimpconfig/html/up.png b/devel-docs/libgimpconfig/html/up.png index 3a816d0b31..aa6a2ae951 100644 Binary files a/devel-docs/libgimpconfig/html/up.png and b/devel-docs/libgimpconfig/html/up.png differ diff --git a/devel-docs/libgimpmath/Makefile.in b/devel-docs/libgimpmath/Makefile.in index 3b3dffeac5..c71d068a98 100644 --- a/devel-docs/libgimpmath/Makefile.in +++ b/devel-docs/libgimpmath/Makefile.in @@ -122,6 +122,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -238,7 +239,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -311,6 +312,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -539,6 +541,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/devel-docs/libgimpmath/html/api-index-2-10.html b/devel-docs/libgimpmath/html/api-index-2-10.html index 1e31288efe..726323c41c 100644 --- a/devel-docs/libgimpmath/html/api-index-2-10.html +++ b/devel-docs/libgimpmath/html/api-index-2-10.html @@ -8,7 +8,7 @@ - + @@ -25,6 +25,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/api-index-2-4.html b/devel-docs/libgimpmath/html/api-index-2-4.html index e9aea0b000..909f610193 100644 --- a/devel-docs/libgimpmath/html/api-index-2-4.html +++ b/devel-docs/libgimpmath/html/api-index-2-4.html @@ -8,7 +8,7 @@ - + @@ -36,6 +36,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/api-index-2-8.html b/devel-docs/libgimpmath/html/api-index-2-8.html index a4684064ce..d78df888f4 100644 --- a/devel-docs/libgimpmath/html/api-index-2-8.html +++ b/devel-docs/libgimpmath/html/api-index-2-8.html @@ -8,7 +8,7 @@ - + @@ -40,6 +40,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/api-index-deprecated.html b/devel-docs/libgimpmath/html/api-index-deprecated.html index 3a50b2a9cb..28cf7b629d 100644 --- a/devel-docs/libgimpmath/html/api-index-deprecated.html +++ b/devel-docs/libgimpmath/html/api-index-deprecated.html @@ -7,7 +7,7 @@ - + @@ -28,6 +28,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/api-index-full.html b/devel-docs/libgimpmath/html/api-index-full.html index efdd6f45e0..b96737ee44 100644 --- a/devel-docs/libgimpmath/html/api-index-full.html +++ b/devel-docs/libgimpmath/html/api-index-full.html @@ -8,7 +8,7 @@ - + @@ -401,6 +401,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/home.png b/devel-docs/libgimpmath/html/home.png index effb5ea39b..e80e202ad8 100644 Binary files a/devel-docs/libgimpmath/html/home.png and b/devel-docs/libgimpmath/html/home.png differ diff --git a/devel-docs/libgimpmath/html/index.html b/devel-docs/libgimpmath/html/index.html index f23b351db5..a2f419ec55 100644 --- a/devel-docs/libgimpmath/html/index.html +++ b/devel-docs/libgimpmath/html/index.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@

- for GIMP 2.10.0-RC1 + for GIMP 2.10.0-RC

@@ -46,6 +46,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/left-insensitive.png b/devel-docs/libgimpmath/html/left-insensitive.png index 6290738b12..fea007e794 100644 Binary files a/devel-docs/libgimpmath/html/left-insensitive.png and b/devel-docs/libgimpmath/html/left-insensitive.png differ diff --git a/devel-docs/libgimpmath/html/left.png b/devel-docs/libgimpmath/html/left.png index d34a7bcff9..193905fc77 100644 Binary files a/devel-docs/libgimpmath/html/left.png and b/devel-docs/libgimpmath/html/left.png differ diff --git a/devel-docs/libgimpmath/html/libgimpmath-GimpMD5.html b/devel-docs/libgimpmath/html/libgimpmath-GimpMD5.html index d9209dd169..49753d631b 100644 --- a/devel-docs/libgimpmath/html/libgimpmath-GimpMD5.html +++ b/devel-docs/libgimpmath/html/libgimpmath-GimpMD5.html @@ -8,7 +8,7 @@ - + @@ -100,6 +100,6 @@ is nul-terminated.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/libgimpmath-GimpMath.html b/devel-docs/libgimpmath/html/libgimpmath-GimpMath.html index 342d4617ae..695767886a 100644 --- a/devel-docs/libgimpmath/html/libgimpmath-GimpMath.html +++ b/devel-docs/libgimpmath/html/libgimpmath-GimpMath.html @@ -8,7 +8,7 @@ - + @@ -289,6 +289,6 @@ and 255 inclusive.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/libgimpmath-GimpMatrix.html b/devel-docs/libgimpmath/html/libgimpmath-GimpMatrix.html index 8c679f8dcd..8c97a1c26b 100644 --- a/devel-docs/libgimpmath/html/libgimpmath-GimpMatrix.html +++ b/devel-docs/libgimpmath/html/libgimpmath-GimpMatrix.html @@ -8,7 +8,7 @@ - + @@ -1059,6 +1059,6 @@ See
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/libgimpmath-GimpVector.html b/devel-docs/libgimpmath/html/libgimpmath-GimpVector.html index 496fd9e7e8..5233f4a942 100644 --- a/devel-docs/libgimpmath/html/libgimpmath-GimpVector.html +++ b/devel-docs/libgimpmath/html/libgimpmath-GimpVector.html @@ -8,7 +8,7 @@ - + @@ -2214,6 +2214,6 @@ observer is passed in vp.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/pt01.html b/devel-docs/libgimpmath/html/pt01.html index d0058870c5..4580d39281 100644 --- a/devel-docs/libgimpmath/html/pt01.html +++ b/devel-docs/libgimpmath/html/pt01.html @@ -8,7 +8,7 @@ - + @@ -42,6 +42,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/right-insensitive.png b/devel-docs/libgimpmath/html/right-insensitive.png index 179725a587..ef7d866a88 100644 Binary files a/devel-docs/libgimpmath/html/right-insensitive.png and b/devel-docs/libgimpmath/html/right-insensitive.png differ diff --git a/devel-docs/libgimpmath/html/right.png b/devel-docs/libgimpmath/html/right.png index bf5d8faa54..07fefed0d8 100644 Binary files a/devel-docs/libgimpmath/html/right.png and b/devel-docs/libgimpmath/html/right.png differ diff --git a/devel-docs/libgimpmath/html/style.css b/devel-docs/libgimpmath/html/style.css index 367542097b..4be4ede11b 100644 --- a/devel-docs/libgimpmath/html/style.css +++ b/devel-docs/libgimpmath/html/style.css @@ -30,6 +30,10 @@ body vertical-align: top; } +span.nowrap { + white-space: nowrap; +} + div.gallery-float { float: left; diff --git a/devel-docs/libgimpmath/html/up-insensitive.png b/devel-docs/libgimpmath/html/up-insensitive.png index 5ee049e4e3..99528f8c9e 100644 Binary files a/devel-docs/libgimpmath/html/up-insensitive.png and b/devel-docs/libgimpmath/html/up-insensitive.png differ diff --git a/devel-docs/libgimpmath/html/up.png b/devel-docs/libgimpmath/html/up.png index 3a816d0b31..aa6a2ae951 100644 Binary files a/devel-docs/libgimpmath/html/up.png and b/devel-docs/libgimpmath/html/up.png differ diff --git a/devel-docs/libgimpmodule/Makefile.in b/devel-docs/libgimpmodule/Makefile.in index b92162c3e9..47c417b61d 100644 --- a/devel-docs/libgimpmodule/Makefile.in +++ b/devel-docs/libgimpmodule/Makefile.in @@ -122,6 +122,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -238,7 +239,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -311,6 +312,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -539,6 +541,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/devel-docs/libgimpmodule/html/GimpModule.html b/devel-docs/libgimpmodule/html/GimpModule.html index 4eb1f4511f..6303d0bf26 100644 --- a/devel-docs/libgimpmodule/html/GimpModule.html +++ b/devel-docs/libgimpmodule/html/GimpModule.html @@ -8,7 +8,7 @@ - + @@ -779,6 +779,6 @@ user_function (
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpmodule/html/GimpModuleDB.html b/devel-docs/libgimpmodule/html/GimpModuleDB.html index f6dd08c5ac..6e3f04f688 100644 --- a/devel-docs/libgimpmodule/html/GimpModuleDB.html +++ b/devel-docs/libgimpmodule/html/GimpModuleDB.html @@ -8,7 +8,7 @@ - + @@ -334,6 +334,6 @@ user_function (
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpmodule/html/api-index-2-10.html b/devel-docs/libgimpmodule/html/api-index-2-10.html index 94aa560b18..20813bcda3 100644 --- a/devel-docs/libgimpmodule/html/api-index-2-10.html +++ b/devel-docs/libgimpmodule/html/api-index-2-10.html @@ -8,7 +8,7 @@ - + @@ -25,6 +25,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpmodule/html/api-index-2-8.html b/devel-docs/libgimpmodule/html/api-index-2-8.html index 7cc95c3455..1de5d71680 100644 --- a/devel-docs/libgimpmodule/html/api-index-2-8.html +++ b/devel-docs/libgimpmodule/html/api-index-2-8.html @@ -8,7 +8,7 @@ - + @@ -29,6 +29,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpmodule/html/api-index-deprecated.html b/devel-docs/libgimpmodule/html/api-index-deprecated.html index 7465dd39fd..a7836cb095 100644 --- a/devel-docs/libgimpmodule/html/api-index-deprecated.html +++ b/devel-docs/libgimpmodule/html/api-index-deprecated.html @@ -7,7 +7,7 @@ - + @@ -32,6 +32,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpmodule/html/api-index-full.html b/devel-docs/libgimpmodule/html/api-index-full.html index 3387c50daa..f0635f2171 100644 --- a/devel-docs/libgimpmodule/html/api-index-full.html +++ b/devel-docs/libgimpmodule/html/api-index-full.html @@ -8,7 +8,7 @@ - + @@ -141,6 +141,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpmodule/html/home.png b/devel-docs/libgimpmodule/html/home.png index effb5ea39b..e80e202ad8 100644 Binary files a/devel-docs/libgimpmodule/html/home.png and b/devel-docs/libgimpmodule/html/home.png differ diff --git a/devel-docs/libgimpmodule/html/index.html b/devel-docs/libgimpmodule/html/index.html index cc0d15977c..b6ab783f8b 100644 --- a/devel-docs/libgimpmodule/html/index.html +++ b/devel-docs/libgimpmodule/html/index.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@

- for GIMP 2.10.0-RC1 + for GIMP 2.10.0-RC

@@ -40,6 +40,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpmodule/html/left-insensitive.png b/devel-docs/libgimpmodule/html/left-insensitive.png index 6290738b12..fea007e794 100644 Binary files a/devel-docs/libgimpmodule/html/left-insensitive.png and b/devel-docs/libgimpmodule/html/left-insensitive.png differ diff --git a/devel-docs/libgimpmodule/html/left.png b/devel-docs/libgimpmodule/html/left.png index d34a7bcff9..193905fc77 100644 Binary files a/devel-docs/libgimpmodule/html/left.png and b/devel-docs/libgimpmodule/html/left.png differ diff --git a/devel-docs/libgimpmodule/html/pt01.html b/devel-docs/libgimpmodule/html/pt01.html index 6c0cda8803..ad1a2813ee 100644 --- a/devel-docs/libgimpmodule/html/pt01.html +++ b/devel-docs/libgimpmodule/html/pt01.html @@ -8,7 +8,7 @@ - + @@ -37,6 +37,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpmodule/html/right-insensitive.png b/devel-docs/libgimpmodule/html/right-insensitive.png index 179725a587..ef7d866a88 100644 Binary files a/devel-docs/libgimpmodule/html/right-insensitive.png and b/devel-docs/libgimpmodule/html/right-insensitive.png differ diff --git a/devel-docs/libgimpmodule/html/right.png b/devel-docs/libgimpmodule/html/right.png index bf5d8faa54..07fefed0d8 100644 Binary files a/devel-docs/libgimpmodule/html/right.png and b/devel-docs/libgimpmodule/html/right.png differ diff --git a/devel-docs/libgimpmodule/html/style.css b/devel-docs/libgimpmodule/html/style.css index 367542097b..4be4ede11b 100644 --- a/devel-docs/libgimpmodule/html/style.css +++ b/devel-docs/libgimpmodule/html/style.css @@ -30,6 +30,10 @@ body vertical-align: top; } +span.nowrap { + white-space: nowrap; +} + div.gallery-float { float: left; diff --git a/devel-docs/libgimpmodule/html/up-insensitive.png b/devel-docs/libgimpmodule/html/up-insensitive.png index 5ee049e4e3..99528f8c9e 100644 Binary files a/devel-docs/libgimpmodule/html/up-insensitive.png and b/devel-docs/libgimpmodule/html/up-insensitive.png differ diff --git a/devel-docs/libgimpmodule/html/up.png b/devel-docs/libgimpmodule/html/up.png index 3a816d0b31..aa6a2ae951 100644 Binary files a/devel-docs/libgimpmodule/html/up.png and b/devel-docs/libgimpmodule/html/up.png differ diff --git a/devel-docs/libgimpthumb/Makefile.in b/devel-docs/libgimpthumb/Makefile.in index 073715ac85..177401e935 100644 --- a/devel-docs/libgimpthumb/Makefile.in +++ b/devel-docs/libgimpthumb/Makefile.in @@ -122,6 +122,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -238,7 +239,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -311,6 +312,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -539,6 +541,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/devel-docs/libgimpthumb/html/GimpThumbnail.html b/devel-docs/libgimpthumb/html/GimpThumbnail.html index b79d1a24a7..902b902f92 100644 --- a/devel-docs/libgimpthumb/html/GimpThumbnail.html +++ b/devel-docs/libgimpthumb/html/GimpThumbnail.html @@ -8,7 +8,7 @@ - + @@ -882,6 +882,6 @@ using object properties.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/html/api-index-2-10.html b/devel-docs/libgimpthumb/html/api-index-2-10.html index a2a51e721c..579be1b62a 100644 --- a/devel-docs/libgimpthumb/html/api-index-2-10.html +++ b/devel-docs/libgimpthumb/html/api-index-2-10.html @@ -8,7 +8,7 @@ - + @@ -29,6 +29,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/html/api-index-2-2.html b/devel-docs/libgimpthumb/html/api-index-2-2.html index 2d352d909e..69f404f6ed 100644 --- a/devel-docs/libgimpthumb/html/api-index-2-2.html +++ b/devel-docs/libgimpthumb/html/api-index-2-2.html @@ -8,7 +8,7 @@ - + @@ -65,6 +65,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/html/api-index-deprecated.html b/devel-docs/libgimpthumb/html/api-index-deprecated.html index 311270d8c2..319fa0a425 100644 --- a/devel-docs/libgimpthumb/html/api-index-deprecated.html +++ b/devel-docs/libgimpthumb/html/api-index-deprecated.html @@ -7,7 +7,7 @@ - + @@ -24,6 +24,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/html/api-index-full.html b/devel-docs/libgimpthumb/html/api-index-full.html index 2863d8d9b5..b027981255 100644 --- a/devel-docs/libgimpthumb/html/api-index-full.html +++ b/devel-docs/libgimpthumb/html/api-index-full.html @@ -8,7 +8,7 @@ - + @@ -197,6 +197,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/html/home.png b/devel-docs/libgimpthumb/html/home.png index effb5ea39b..e80e202ad8 100644 Binary files a/devel-docs/libgimpthumb/html/home.png and b/devel-docs/libgimpthumb/html/home.png differ diff --git a/devel-docs/libgimpthumb/html/index.html b/devel-docs/libgimpthumb/html/index.html index e4b64d48f7..d3a38f579f 100644 --- a/devel-docs/libgimpthumb/html/index.html +++ b/devel-docs/libgimpthumb/html/index.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@

- for GIMP 2.10.0-RC1 + for GIMP 2.10.0-RC

@@ -44,6 +44,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/html/left-insensitive.png b/devel-docs/libgimpthumb/html/left-insensitive.png index 6290738b12..fea007e794 100644 Binary files a/devel-docs/libgimpthumb/html/left-insensitive.png and b/devel-docs/libgimpthumb/html/left-insensitive.png differ diff --git a/devel-docs/libgimpthumb/html/left.png b/devel-docs/libgimpthumb/html/left.png index d34a7bcff9..193905fc77 100644 Binary files a/devel-docs/libgimpthumb/html/left.png and b/devel-docs/libgimpthumb/html/left.png differ diff --git a/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-enums.html b/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-enums.html index f86d855b6a..0bb658e8de 100644 --- a/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-enums.html +++ b/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-enums.html @@ -8,7 +8,7 @@ - + @@ -231,6 +231,6 @@ Standard.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-error.html b/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-error.html index 743e19e137..c732b19672 100644 --- a/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-error.html +++ b/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-error.html @@ -8,7 +8,7 @@ - + @@ -134,6 +134,6 @@ libgimpthumb.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-utils.html b/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-utils.html index e7a89b934f..b02634f364 100644 --- a/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-utils.html +++ b/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-utils.html @@ -8,7 +8,7 @@ - + @@ -597,6 +597,6 @@ the local thumbnail repository.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/html/pt01.html b/devel-docs/libgimpthumb/html/pt01.html index 3f5153f242..7d110cbb53 100644 --- a/devel-docs/libgimpthumb/html/pt01.html +++ b/devel-docs/libgimpthumb/html/pt01.html @@ -8,7 +8,7 @@ - + @@ -41,6 +41,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/html/right-insensitive.png b/devel-docs/libgimpthumb/html/right-insensitive.png index 179725a587..ef7d866a88 100644 Binary files a/devel-docs/libgimpthumb/html/right-insensitive.png and b/devel-docs/libgimpthumb/html/right-insensitive.png differ diff --git a/devel-docs/libgimpthumb/html/right.png b/devel-docs/libgimpthumb/html/right.png index bf5d8faa54..07fefed0d8 100644 Binary files a/devel-docs/libgimpthumb/html/right.png and b/devel-docs/libgimpthumb/html/right.png differ diff --git a/devel-docs/libgimpthumb/html/style.css b/devel-docs/libgimpthumb/html/style.css index 367542097b..4be4ede11b 100644 --- a/devel-docs/libgimpthumb/html/style.css +++ b/devel-docs/libgimpthumb/html/style.css @@ -30,6 +30,10 @@ body vertical-align: top; } +span.nowrap { + white-space: nowrap; +} + div.gallery-float { float: left; diff --git a/devel-docs/libgimpthumb/html/up-insensitive.png b/devel-docs/libgimpthumb/html/up-insensitive.png index 5ee049e4e3..99528f8c9e 100644 Binary files a/devel-docs/libgimpthumb/html/up-insensitive.png and b/devel-docs/libgimpthumb/html/up-insensitive.png differ diff --git a/devel-docs/libgimpthumb/html/up.png b/devel-docs/libgimpthumb/html/up.png index 3a816d0b31..aa6a2ae951 100644 Binary files a/devel-docs/libgimpthumb/html/up.png and b/devel-docs/libgimpthumb/html/up.png differ diff --git a/devel-docs/libgimpwidgets/Makefile.in b/devel-docs/libgimpwidgets/Makefile.in index 7aac409322..60687a89c7 100644 --- a/devel-docs/libgimpwidgets/Makefile.in +++ b/devel-docs/libgimpwidgets/Makefile.in @@ -122,6 +122,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -238,7 +239,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -311,6 +312,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -539,6 +541,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/devel-docs/libgimpwidgets/html/GimpBrowser.html b/devel-docs/libgimpwidgets/html/GimpBrowser.html index 8b225ab47d..9e90bcd4e7 100644 --- a/devel-docs/libgimpwidgets/html/GimpBrowser.html +++ b/devel-docs/libgimpwidgets/html/GimpBrowser.html @@ -8,7 +8,7 @@ - + @@ -272,6 +272,6 @@ user_function (
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpButton.html b/devel-docs/libgimpwidgets/html/GimpButton.html index 2f6e2f86db..fe8feed089 100644 --- a/devel-docs/libgimpwidgets/html/GimpButton.html +++ b/devel-docs/libgimpwidgets/html/GimpButton.html @@ -8,7 +8,7 @@ - + @@ -206,6 +206,6 @@ key pressed.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpCellRendererColor.html b/devel-docs/libgimpwidgets/html/GimpCellRendererColor.html index 6255da7a0c..d95e13ff58 100644 --- a/devel-docs/libgimpwidgets/html/GimpCellRendererColor.html +++ b/devel-docs/libgimpwidgets/html/GimpCellRendererColor.html @@ -8,7 +8,7 @@ - + @@ -153,6 +153,6 @@ gimp_cell_renderer_color_new (voi
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpCellRendererToggle.html b/devel-docs/libgimpwidgets/html/GimpCellRendererToggle.html index 6c3cb51eda..e94ca25f3a 100644 --- a/devel-docs/libgimpwidgets/html/GimpCellRendererToggle.html +++ b/devel-docs/libgimpwidgets/html/GimpCellRendererToggle.html @@ -8,7 +8,7 @@ - + @@ -264,6 +264,6 @@ user_function ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpChainButton.html b/devel-docs/libgimpwidgets/html/GimpChainButton.html index 6c17eb88fb..a00f5a2297 100644 --- a/devel-docs/libgimpwidgets/html/GimpChainButton.html +++ b/devel-docs/libgimpwidgets/html/GimpChainButton.html @@ -8,7 +8,7 @@ - + @@ -324,6 +324,6 @@ user_function ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorArea.html b/devel-docs/libgimpwidgets/html/GimpColorArea.html index 5e4ebb244c..4bedbdc373 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorArea.html +++ b/devel-docs/libgimpwidgets/html/GimpColorArea.html @@ -8,7 +8,7 @@ - + @@ -516,6 +516,6 @@ user_function (<
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorButton.html b/devel-docs/libgimpwidgets/html/GimpColorButton.html index 1229cf4187..10e7d9934e 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorButton.html +++ b/devel-docs/libgimpwidgets/html/GimpColorButton.html @@ -8,7 +8,7 @@ - + @@ -691,6 +691,6 @@ user_function ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorDisplay.html b/devel-docs/libgimpwidgets/html/GimpColorDisplay.html index 46a2310a3b..12ef5b4ba4 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorDisplay.html +++ b/devel-docs/libgimpwidgets/html/GimpColorDisplay.html @@ -8,7 +8,7 @@ - + @@ -515,6 +515,6 @@ user_function ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorDisplayStack.html b/devel-docs/libgimpwidgets/html/GimpColorDisplayStack.html index 2242f1745d..5bdbff4830 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorDisplayStack.html +++ b/devel-docs/libgimpwidgets/html/GimpColorDisplayStack.html @@ -8,7 +8,7 @@ - + @@ -416,6 +416,6 @@ user_function ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorHexEntry.html b/devel-docs/libgimpwidgets/html/GimpColorHexEntry.html index bedb6015f4..2df7e5306f 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorHexEntry.html +++ b/devel-docs/libgimpwidgets/html/GimpColorHexEntry.html @@ -8,7 +8,7 @@ - + @@ -213,6 +213,6 @@ user_function ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorNotebook.html b/devel-docs/libgimpwidgets/html/GimpColorNotebook.html index 40cafcc790..665bef80ad 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorNotebook.html +++ b/devel-docs/libgimpwidgets/html/GimpColorNotebook.html @@ -8,7 +8,7 @@ - + @@ -185,6 +185,6 @@ was FA
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorProfileChooserDialog.html b/devel-docs/libgimpwidgets/html/GimpColorProfileChooserDialog.html index 88c441d290..35b91bd5be 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorProfileChooserDialog.html +++ b/devel-docs/libgimpwidgets/html/GimpColorProfileChooserDialog.html @@ -8,7 +8,7 @@ - + @@ -81,6 +81,6 @@ gimp_color_profile_chooser_dialog_new (const
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorProfileComboBox.html b/devel-docs/libgimpwidgets/html/GimpColorProfileComboBox.html index ac9572ef46..e669abc26b 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorProfileComboBox.html +++ b/devel-docs/libgimpwidgets/html/GimpColorProfileComboBox.html @@ -8,7 +8,7 @@ - + @@ -543,6 +543,6 @@ longer needed.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorProfileStore.html b/devel-docs/libgimpwidgets/html/GimpColorProfileStore.html index d0b45a41c3..1c3eee4a7e 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorProfileStore.html +++ b/devel-docs/libgimpwidgets/html/GimpColorProfileStore.html @@ -8,7 +8,7 @@ - + @@ -280,6 +280,6 @@ is N
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorProfileView.html b/devel-docs/libgimpwidgets/html/GimpColorProfileView.html index ee3a6480e5..41cb954725 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorProfileView.html +++ b/devel-docs/libgimpwidgets/html/GimpColorProfileView.html @@ -8,7 +8,7 @@ - + @@ -108,6 +108,6 @@ gimp_color_profile_view_set_error (
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorScale.html b/devel-docs/libgimpwidgets/html/GimpColorScale.html index 4408ca2a38..6347ee0eee 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorScale.html +++ b/devel-docs/libgimpwidgets/html/GimpColorScale.html @@ -8,7 +8,7 @@ - + @@ -281,6 +281,6 @@ gimp_color_scale_set_color_config (
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorScales.html b/devel-docs/libgimpwidgets/html/GimpColorScales.html index 7875103ad8..46aae2cab7 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorScales.html +++ b/devel-docs/libgimpwidgets/html/GimpColorScales.html @@ -8,7 +8,7 @@ - + @@ -109,6 +109,6 @@ that allow to adjust the HSV, LCH, and RGB color channels.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorSelect.html b/devel-docs/libgimpwidgets/html/GimpColorSelect.html index 0373ee660d..4dd9444641 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorSelect.html +++ b/devel-docs/libgimpwidgets/html/GimpColorSelect.html @@ -8,7 +8,7 @@ - + @@ -86,6 +86,6 @@ will then change the other two channels accordingly.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorSelection.html b/devel-docs/libgimpwidgets/html/GimpColorSelection.html index 60550d156e..d3cd0254aa 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorSelection.html +++ b/devel-docs/libgimpwidgets/html/GimpColorSelection.html @@ -8,7 +8,7 @@ - + @@ -495,6 +495,6 @@ user_function ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorSelector.html b/devel-docs/libgimpwidgets/html/GimpColorSelector.html index f7a4745e1c..5763e223b6 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorSelector.html +++ b/devel-docs/libgimpwidgets/html/GimpColorSelector.html @@ -8,7 +8,7 @@ - + @@ -846,6 +846,6 @@ user_function ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpController.html b/devel-docs/libgimpwidgets/html/GimpController.html index 226e254063..093da28e67 100644 --- a/devel-docs/libgimpwidgets/html/GimpController.html +++ b/devel-docs/libgimpwidgets/html/GimpController.html @@ -8,7 +8,7 @@ - + @@ -313,6 +313,6 @@ user_function (
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpDialog.html b/devel-docs/libgimpwidgets/html/GimpDialog.html index c1a08c20ba..cd41b00611 100644 --- a/devel-docs/libgimpwidgets/html/GimpDialog.html +++ b/devel-docs/libgimpwidgets/html/GimpDialog.html @@ -8,7 +8,7 @@ - + @@ -519,6 +519,6 @@ gimp_dialogs_show_help_button ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpEnumComboBox.html b/devel-docs/libgimpwidgets/html/GimpEnumComboBox.html index c8cf7da97c..a570472789 100644 --- a/devel-docs/libgimpwidgets/html/GimpEnumComboBox.html +++ b/devel-docs/libgimpwidgets/html/GimpEnumComboBox.html @@ -8,7 +8,7 @@ - + @@ -286,6 +286,6 @@ gimp_enum_combo_box_set_icon_prefix (
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpEnumLabel.html b/devel-docs/libgimpwidgets/html/GimpEnumLabel.html index 7b656f366e..400454ed3c 100644 --- a/devel-docs/libgimpwidgets/html/GimpEnumLabel.html +++ b/devel-docs/libgimpwidgets/html/GimpEnumLabel.html @@ -8,7 +8,7 @@ - + @@ -199,6 +199,6 @@ gimp_enum_label_set_value ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpEnumStore.html b/devel-docs/libgimpwidgets/html/GimpEnumStore.html index b4885a2773..6734be5c8c 100644 --- a/devel-docs/libgimpwidgets/html/GimpEnumStore.html +++ b/devel-docs/libgimpwidgets/html/GimpEnumStore.html @@ -8,7 +8,7 @@ - + @@ -397,6 +397,6 @@ the value's nick to the given icon_prefix
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpFileEntry.html b/devel-docs/libgimpwidgets/html/GimpFileEntry.html index 5f29ed7ed5..1550b01c98 100644 --- a/devel-docs/libgimpwidgets/html/GimpFileEntry.html +++ b/devel-docs/libgimpwidgets/html/GimpFileEntry.html @@ -8,7 +8,7 @@ - + @@ -280,6 +280,6 @@ user_function (<
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpFrame.html b/devel-docs/libgimpwidgets/html/GimpFrame.html index abdc061ace..882c6d92f9 100644 --- a/devel-docs/libgimpwidgets/html/GimpFrame.html +++ b/devel-docs/libgimpwidgets/html/GimpFrame.html @@ -8,7 +8,7 @@ - + @@ -170,6 +170,6 @@ the GNOME HIG (see http://developer.gnome.org/projects/gup/hig/).

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpIntComboBox.html b/devel-docs/libgimpwidgets/html/GimpIntComboBox.html index 23a0af8f94..510c07e97a 100644 --- a/devel-docs/libgimpwidgets/html/GimpIntComboBox.html +++ b/devel-docs/libgimpwidgets/html/GimpIntComboBox.html @@ -8,7 +8,7 @@ - + @@ -919,6 +919,6 @@ entire string.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpIntStore.html b/devel-docs/libgimpwidgets/html/GimpIntStore.html index e71740ec5c..b87d0a1b0a 100644 --- a/devel-docs/libgimpwidgets/html/GimpIntStore.html +++ b/devel-docs/libgimpwidgets/html/GimpIntStore.html @@ -8,7 +8,7 @@ - + @@ -330,6 +330,6 @@ handle ref-counting of your user data.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpMemsizeEntry.html b/devel-docs/libgimpwidgets/html/GimpMemsizeEntry.html index 2974e782c6..a6a8aaf999 100644 --- a/devel-docs/libgimpwidgets/html/GimpMemsizeEntry.html +++ b/devel-docs/libgimpwidgets/html/GimpMemsizeEntry.html @@ -8,7 +8,7 @@ - + @@ -242,6 +242,6 @@ user_function ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpNumberPairEntry.html b/devel-docs/libgimpwidgets/html/GimpNumberPairEntry.html index e690440703..472c991635 100644 --- a/devel-docs/libgimpwidgets/html/GimpNumberPairEntry.html +++ b/devel-docs/libgimpwidgets/html/GimpNumberPairEntry.html @@ -8,7 +8,7 @@ - + @@ -916,6 +916,6 @@ user_function ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpOffsetArea.html b/devel-docs/libgimpwidgets/html/GimpOffsetArea.html index 43d1390403..d398147b5c 100644 --- a/devel-docs/libgimpwidgets/html/GimpOffsetArea.html +++ b/devel-docs/libgimpwidgets/html/GimpOffsetArea.html @@ -8,7 +8,7 @@ - + @@ -291,6 +291,6 @@ user_function (
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpPageSelector.html b/devel-docs/libgimpwidgets/html/GimpPageSelector.html index 1bec9d1ae4..61bc1e984c 100644 --- a/devel-docs/libgimpwidgets/html/GimpPageSelector.html +++ b/devel-docs/libgimpwidgets/html/GimpPageSelector.html @@ -8,7 +8,7 @@ - + @@ -912,6 +912,6 @@ user_function ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpPathEditor.html b/devel-docs/libgimpwidgets/html/GimpPathEditor.html index 41c44d5b28..8e9d73b83d 100644 --- a/devel-docs/libgimpwidgets/html/GimpPathEditor.html +++ b/devel-docs/libgimpwidgets/html/GimpPathEditor.html @@ -8,7 +8,7 @@ - + @@ -356,6 +356,6 @@ is changed, either by the user clicking on it or by calling
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpPickButton.html b/devel-docs/libgimpwidgets/html/GimpPickButton.html index 9f52698b53..f214a16d42 100644 --- a/devel-docs/libgimpwidgets/html/GimpPickButton.html +++ b/devel-docs/libgimpwidgets/html/GimpPickButton.html @@ -8,7 +8,7 @@ - + @@ -164,6 +164,6 @@ user_function (
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpPixmap.html b/devel-docs/libgimpwidgets/html/GimpPixmap.html index c8e2f963bb..61f1d90529 100644 --- a/devel-docs/libgimpwidgets/html/GimpPixmap.html +++ b/devel-docs/libgimpwidgets/html/GimpPixmap.html @@ -8,7 +8,7 @@ - + @@ -174,6 +174,6 @@ gimp_pixmap_set ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpPreview.html b/devel-docs/libgimpwidgets/html/GimpPreview.html index 62ccf7d3a6..69cc4788b2 100644 --- a/devel-docs/libgimpwidgets/html/GimpPreview.html +++ b/devel-docs/libgimpwidgets/html/GimpPreview.html @@ -8,7 +8,7 @@ - + @@ -748,6 +748,6 @@ user_function (
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpPreviewArea.html b/devel-docs/libgimpwidgets/html/GimpPreviewArea.html index 36de2dc385..576f6f7bd8 100644 --- a/devel-docs/libgimpwidgets/html/GimpPreviewArea.html +++ b/devel-docs/libgimpwidgets/html/GimpPreviewArea.html @@ -8,7 +8,7 @@ - + @@ -742,6 +742,6 @@ gimp_preview_area_set_color_config (
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpRuler.html b/devel-docs/libgimpwidgets/html/GimpRuler.html index 1b81fad794..bc01a326d3 100644 --- a/devel-docs/libgimpwidgets/html/GimpRuler.html +++ b/devel-docs/libgimpwidgets/html/GimpRuler.html @@ -8,7 +8,7 @@ - + @@ -579,6 +579,6 @@ gimp_ruler_remove_track_widget (
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpScrolledPreview.html b/devel-docs/libgimpwidgets/html/GimpScrolledPreview.html index 7d3a68c3ab..b8b87426b8 100644 --- a/devel-docs/libgimpwidgets/html/GimpScrolledPreview.html +++ b/devel-docs/libgimpwidgets/html/GimpScrolledPreview.html @@ -8,7 +8,7 @@ - + @@ -249,6 +249,6 @@ response to scroll events.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpSizeEntry.html b/devel-docs/libgimpwidgets/html/GimpSizeEntry.html index 8d69ce5b3e..92c4150323 100644 --- a/devel-docs/libgimpwidgets/html/GimpSizeEntry.html +++ b/devel-docs/libgimpwidgets/html/GimpSizeEntry.html @@ -8,7 +8,7 @@ - + @@ -1195,6 +1195,6 @@ user_function (<
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpStringComboBox.html b/devel-docs/libgimpwidgets/html/GimpStringComboBox.html index 2f4f66cd1e..060ff03708 100644 --- a/devel-docs/libgimpwidgets/html/GimpStringComboBox.html +++ b/devel-docs/libgimpwidgets/html/GimpStringComboBox.html @@ -8,7 +8,7 @@ - + @@ -282,6 +282,6 @@ be used as labels in the combo-box.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpUnitComboBox.html b/devel-docs/libgimpwidgets/html/GimpUnitComboBox.html index edbc1cbf47..a29c103456 100644 --- a/devel-docs/libgimpwidgets/html/GimpUnitComboBox.html +++ b/devel-docs/libgimpwidgets/html/GimpUnitComboBox.html @@ -8,7 +8,7 @@ - + @@ -202,6 +202,6 @@ gimp_unit_combo_box_set_active (
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpUnitMenu.html b/devel-docs/libgimpwidgets/html/GimpUnitMenu.html index da53645ac2..275a46b435 100644 --- a/devel-docs/libgimpwidgets/html/GimpUnitMenu.html +++ b/devel-docs/libgimpwidgets/html/GimpUnitMenu.html @@ -8,7 +8,7 @@ - + @@ -371,6 +371,6 @@ the -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpUnitStore.html b/devel-docs/libgimpwidgets/html/GimpUnitStore.html index 7b71742229..8d4f627995 100644 --- a/devel-docs/libgimpwidgets/html/GimpUnitStore.html +++ b/devel-docs/libgimpwidgets/html/GimpUnitStore.html @@ -8,7 +8,7 @@ - + @@ -335,6 +335,6 @@ gimp_unit_store_get_values ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpZoomModel.html b/devel-docs/libgimpwidgets/html/GimpZoomModel.html index d87f2cee23..c6d8a58c52 100644 --- a/devel-docs/libgimpwidgets/html/GimpZoomModel.html +++ b/devel-docs/libgimpwidgets/html/GimpZoomModel.html @@ -8,7 +8,7 @@ - + @@ -575,6 +575,6 @@ user_function (<
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/api-index-2-10.html b/devel-docs/libgimpwidgets/html/api-index-2-10.html index ce6c195906..5e5e55e9e2 100644 --- a/devel-docs/libgimpwidgets/html/api-index-2-10.html +++ b/devel-docs/libgimpwidgets/html/api-index-2-10.html @@ -8,7 +8,7 @@ - + @@ -192,6 +192,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/api-index-2-2.html b/devel-docs/libgimpwidgets/html/api-index-2-2.html index 719645f4ba..2b6cddf65f 100644 --- a/devel-docs/libgimpwidgets/html/api-index-2-2.html +++ b/devel-docs/libgimpwidgets/html/api-index-2-2.html @@ -8,7 +8,7 @@ - + @@ -197,6 +197,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/api-index-2-4.html b/devel-docs/libgimpwidgets/html/api-index-2-4.html index da5737cc0c..a001258025 100644 --- a/devel-docs/libgimpwidgets/html/api-index-2-4.html +++ b/devel-docs/libgimpwidgets/html/api-index-2-4.html @@ -8,7 +8,7 @@ - + @@ -535,6 +535,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/api-index-2-6.html b/devel-docs/libgimpwidgets/html/api-index-2-6.html index fb0b15f087..8e77c29d4b 100644 --- a/devel-docs/libgimpwidgets/html/api-index-2-6.html +++ b/devel-docs/libgimpwidgets/html/api-index-2-6.html @@ -8,7 +8,7 @@ - + @@ -40,6 +40,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/api-index-2-8.html b/devel-docs/libgimpwidgets/html/api-index-2-8.html index 2e57b6c9c7..de2839ee62 100644 --- a/devel-docs/libgimpwidgets/html/api-index-2-8.html +++ b/devel-docs/libgimpwidgets/html/api-index-2-8.html @@ -8,7 +8,7 @@ - + @@ -116,6 +116,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/api-index-deprecated.html b/devel-docs/libgimpwidgets/html/api-index-deprecated.html index 0073c8055a..d6135d7e46 100644 --- a/devel-docs/libgimpwidgets/html/api-index-deprecated.html +++ b/devel-docs/libgimpwidgets/html/api-index-deprecated.html @@ -7,7 +7,7 @@ - + @@ -1063,6 +1063,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/api-index-full.html b/devel-docs/libgimpwidgets/html/api-index-full.html index f27ad5c7e7..f7cf8e0838 100644 --- a/devel-docs/libgimpwidgets/html/api-index-full.html +++ b/devel-docs/libgimpwidgets/html/api-index-full.html @@ -8,7 +8,7 @@ - + @@ -2016,10 +2016,6 @@ gtk_widget_get_modifier_mask, function in gimp3migration
-GIMP_ICON_TOOL_BLEND, macro in GimpIcons -
-
-
GIMP_ICON_TOOL_BLUR, macro in GimpIcons
@@ -2104,6 +2100,10 @@ gtk_widget_get_modifier_mask, function in gimp3migration
+GIMP_ICON_TOOL_GRADIENT, macro in GimpIcons +
+
+
GIMP_ICON_TOOL_HANDLE_TRANSFORM, macro in GimpIcons
@@ -4429,6 +4429,6 @@ gtk_widget_get_modifier_mask, function in gimp3migration
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/gimp-tool-blend.png b/devel-docs/libgimpwidgets/html/gimp-tool-gradient.png similarity index 100% rename from devel-docs/libgimpwidgets/html/gimp-tool-blend.png rename to devel-docs/libgimpwidgets/html/gimp-tool-gradient.png diff --git a/devel-docs/libgimpwidgets/html/home.png b/devel-docs/libgimpwidgets/html/home.png index effb5ea39b..e80e202ad8 100644 Binary files a/devel-docs/libgimpwidgets/html/home.png and b/devel-docs/libgimpwidgets/html/home.png differ diff --git a/devel-docs/libgimpwidgets/html/index.html b/devel-docs/libgimpwidgets/html/index.html index 886b9117b7..6a704af77e 100644 --- a/devel-docs/libgimpwidgets/html/index.html +++ b/devel-docs/libgimpwidgets/html/index.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@

- for GIMP 2.10.0-RC1 + for GIMP 2.10.0-RC

@@ -236,6 +236,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/left-insensitive.png b/devel-docs/libgimpwidgets/html/left-insensitive.png index 6290738b12..fea007e794 100644 Binary files a/devel-docs/libgimpwidgets/html/left-insensitive.png and b/devel-docs/libgimpwidgets/html/left-insensitive.png differ diff --git a/devel-docs/libgimpwidgets/html/left.png b/devel-docs/libgimpwidgets/html/left.png index d34a7bcff9..193905fc77 100644 Binary files a/devel-docs/libgimpwidgets/html/left.png and b/devel-docs/libgimpwidgets/html/left.png differ diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpCairoUtils.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpCairoUtils.html index 551e1dd61a..3b0de355bd 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpCairoUtils.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpCairoUtils.html @@ -8,7 +8,7 @@ - + @@ -138,6 +138,6 @@ efficient ways of achieving the result you are looking for.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpEnumWidgets.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpEnumWidgets.html index 381a4c16d3..f5ac1f3ca7 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpEnumWidgets.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpEnumWidgets.html @@ -8,7 +8,7 @@ - + @@ -740,6 +740,6 @@ gimp_enum_icon_box_set_child_padding ( -
Generated by GTK-Doc V1.27 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpHelpUI.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpHelpUI.html index d56aef2753..806bb4177c 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpHelpUI.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpHelpUI.html @@ -8,7 +8,7 @@ - + @@ -404,6 +404,6 @@ case at least for every window/dialog).

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpHintBox.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpHintBox.html index e8b19f5f29..a837117e62 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpHintBox.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpHintBox.html @@ -8,7 +8,7 @@ - + @@ -88,6 +88,6 @@ decorated with a GIMP_STOCK_INFO wilber icon.

-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpIcons.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpIcons.html index c2f08c899e..94e9bb50a6 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpIcons.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpIcons.html @@ -8,7 +8,7 @@ - + @@ -965,10 +965,6 @@ #define -GIMP_ICON_TOOL_BLEND - - -#define GIMP_ICON_TOOL_BLUR @@ -1053,6 +1049,10 @@ #define +GIMP_ICON_TOOL_GRADIENT + + +#define GIMP_ICON_TOOL_HANDLE_TRANSFORM @@ -2211,7 +2211,7 @@ gimp_icons_set_icon_theme (

GIMP_ICON_GRADIENT

-
#define GIMP_ICON_GRADIENT                  GIMP_ICON_TOOL_BLEND
+
#define GIMP_ICON_GRADIENT                  GIMP_ICON_TOOL_GRADIENT
 

 
 

@@ -3416,12 +3416,6 @@ gimp_icons_set_icon_theme (
-
GIMP_ICON_TOOL_BLEND

-
#define GIMP_ICON_TOOL_BLEND                "gimp-tool-blend"
-

-
-

-

 
GIMP_ICON_TOOL_BLUR

 
#define GIMP_ICON_TOOL_BLUR                 "gimp-tool-blur"
 

@@ -3548,6 +3542,12 @@ gimp_icons_set_icon_theme (
+
GIMP_ICON_TOOL_GRADIENT

+
#define GIMP_ICON_TOOL_GRADIENT             "gimp-tool-gradient"
+

+

+

+

 
GIMP_ICON_TOOL_HANDLE_TRANSFORM

 
#define GIMP_ICON_TOOL_HANDLE_TRANSFORM     "gimp-tool-handle-transform"
 

@@ -4798,7 +4798,7 @@ gimp_icons_set_icon_theme (
 
GIMP_STOCK_TOOL_BLEND

-
#define GIMP_STOCK_TOOL_BLEND               "gimp-tool-blend"
+
#define GIMP_STOCK_TOOL_BLEND               "gimp-tool-gradient"
 

 
GIMP_STOCK_TOOL_BLEND is deprecated and should not be used in newly-written code.

 

@@ -5239,6 +5239,6 @@ gimp_icons_set_icon_theme (
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28
 
 
\ No newline at end of file
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpOldWidgets.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpOldWidgets.html
index 1dad3c51b2..9c37107bcb 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpOldWidgets.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpOldWidgets.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -642,6 +642,6 @@ value.

 
 
 

-
Generated by GTK-Doc V1.27

+
Generated by GTK-Doc V1.28
 
 
\ No newline at end of file
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpPropWidgets.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpPropWidgets.html
index f73cec271f..5e5cd2775b 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpPropWidgets.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpPropWidgets.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -1986,6 +1986,6 @@ the unit strings.

 
 
 

-
Generated by GTK-Doc V1.27

+
Generated by GTK-Doc V1.28
 
 
\ No newline at end of file
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpQueryBox.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpQueryBox.html
index 7b01d5f55e..56a31bbd34 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpQueryBox.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpQueryBox.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -855,6 +855,6 @@ Useful if you want to add more widgets.

 
 
 

-
Generated by GTK-Doc V1.27

+
Generated by GTK-Doc V1.28
 
 
\ No newline at end of file
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpWidgets.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpWidgets.html
index 55ff74a66a..4a3315d933 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpWidgets.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpWidgets.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -1598,6 +1598,6 @@ gimp_widgets_error_quark (void
 
 

-
Generated by GTK-Doc V1.27

+
Generated by GTK-Doc V1.28
 
 
\ No newline at end of file
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpWidgetsUtils.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpWidgetsUtils.html
index 3f28191d0b..a8f2580064 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpWidgetsUtils.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpWidgetsUtils.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -353,6 +353,6 @@ gimp_widget_get_color_transform (
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28
 
 
\ No newline at end of file
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-cell-renderers.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-cell-renderers.html
index cf2a84bdfa..fcb86fcc37 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-cell-renderers.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-cell-renderers.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -36,6 +36,6 @@
 
 
 

-
Generated by GTK-Doc V1.27

+
Generated by GTK-Doc V1.28
 
 
\ No newline at end of file
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-colordisplay.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-colordisplay.html
index c6022839de..e306b55650 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-colordisplay.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-colordisplay.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -35,6 +35,6 @@
 
 
 

-
Generated by GTK-Doc V1.27

+
Generated by GTK-Doc V1.28
 
 
\ No newline at end of file
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-colorselector.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-colorselector.html
index 053b06e5b9..cc3ede1afc 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-colorselector.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-colorselector.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,6 +41,6 @@
 
 
 

-
Generated by GTK-Doc V1.27

+
Generated by GTK-Doc V1.28
 
 
\ No newline at end of file
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-controller.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-controller.html
index 2a7c065342..f6d78cced7 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-controller.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-controller.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -33,6 +33,6 @@
     

 
 

-
Generated by GTK-Doc V1.27

+
Generated by GTK-Doc V1.28
 
 
\ No newline at end of file
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-deprecated.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-deprecated.html
index 4e66fbbdd5..7bdcbb456a 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-deprecated.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-deprecated.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -39,6 +39,6 @@
 
 
 

-
Generated by GTK-Doc V1.27

+
Generated by GTK-Doc V1.28
 
 
\ No newline at end of file
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-gallery.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-gallery.html
index eeeb429180..14d9a95ca2 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-gallery.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-gallery.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -95,6 +95,6 @@
 
 
 

-
Generated by GTK-Doc V1.27

+
Generated by GTK-Doc V1.28
 
 
\ No newline at end of file
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-hierarchy.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-hierarchy.html
index efb1923bcb..232e2ad8c4 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-hierarchy.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-hierarchy.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -100,6 +100,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-utils.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-utils.html index 17c6a9e2d3..512378f872 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-utils.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-utils.html @@ -8,7 +8,7 @@ - + @@ -58,6 +58,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-widgets.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-widgets.html index 983a31ce23..1f060b8b3f 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-widgets.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-widgets.html @@ -8,7 +8,7 @@ - + @@ -147,6 +147,6 @@
-
Generated by GTK-Doc V1.27
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets.devhelp2 b/devel-docs/libgimpwidgets/html/libgimpwidgets.devhelp2 index 6666b9ddc5..ceab1652ee 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets.devhelp2 +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets.devhelp2 @@ -778,7 +778,6 @@ - @@ -800,6 +799,7 @@ + diff --git a/devel-docs/libgimpwidgets/html/right-insensitive.png b/devel-docs/libgimpwidgets/html/right-insensitive.png index 179725a587..ef7d866a88 100644 Binary files a/devel-docs/libgimpwidgets/html/right-insensitive.png and b/devel-docs/libgimpwidgets/html/right-insensitive.png differ diff --git a/devel-docs/libgimpwidgets/html/right.png b/devel-docs/libgimpwidgets/html/right.png index bf5d8faa54..07fefed0d8 100644 Binary files a/devel-docs/libgimpwidgets/html/right.png and b/devel-docs/libgimpwidgets/html/right.png differ diff --git a/devel-docs/libgimpwidgets/html/style.css b/devel-docs/libgimpwidgets/html/style.css index 367542097b..4be4ede11b 100644 --- a/devel-docs/libgimpwidgets/html/style.css +++ b/devel-docs/libgimpwidgets/html/style.css @@ -30,6 +30,10 @@ body vertical-align: top; } +span.nowrap { + white-space: nowrap; +} + div.gallery-float { float: left; diff --git a/devel-docs/libgimpwidgets/html/up-insensitive.png b/devel-docs/libgimpwidgets/html/up-insensitive.png index 5ee049e4e3..99528f8c9e 100644 Binary files a/devel-docs/libgimpwidgets/html/up-insensitive.png and b/devel-docs/libgimpwidgets/html/up-insensitive.png differ diff --git a/devel-docs/libgimpwidgets/html/up.png b/devel-docs/libgimpwidgets/html/up.png index 3a816d0b31..aa6a2ae951 100644 Binary files a/devel-docs/libgimpwidgets/html/up.png and b/devel-docs/libgimpwidgets/html/up.png differ diff --git a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt index 6b9fc0c0d6..402af87090 100644 --- a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt +++ b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt @@ -1008,7 +1008,6 @@ GIMP_ICON_SHAPE_SQUARE GIMP_ICON_SYSTEM_RUN GIMP_ICON_TOOL_AIRBRUSH GIMP_ICON_TOOL_ALIGN -GIMP_ICON_TOOL_BLEND GIMP_ICON_TOOL_BLUR GIMP_ICON_TOOL_BRIGHTNESS_CONTRAST GIMP_ICON_TOOL_BUCKET_FILL @@ -1030,6 +1029,7 @@ GIMP_ICON_TOOL_FLIP GIMP_ICON_TOOL_FOREGROUND_SELECT GIMP_ICON_TOOL_FREE_SELECT GIMP_ICON_TOOL_FUZZY_SELECT +GIMP_ICON_TOOL_GRADIENT GIMP_ICON_TOOL_HANDLE_TRANSFORM GIMP_ICON_TOOL_HEAL GIMP_ICON_TOOL_HUE_SATURATION diff --git a/devel-docs/release-howto.txt b/devel-docs/release-howto.txt index 39d54bf8e5..62e198e089 100644 --- a/devel-docs/release-howto.txt +++ b/devel-docs/release-howto.txt @@ -18,8 +18,8 @@ https://mail.gnome.org/archives/gnome-i18n/2016-October/msg00035.html ( ) Also notify the maintainers of the official builds for Windows, - Mac OS and flatpak of the upcoming release so they have some time - to sort out issues with their builds. + macOS and flatpak of the upcoming release so they have some time to + sort out issues with their builds. ( ) Make sure we have a tag inside desktop/org.gimp.GIMP.appdata.xml.in for this upcoming version, @@ -62,10 +62,12 @@ [ ] Accepted license: a libre license, such as CC 0, CC by, CC by-sa or Free Art. [ ] XCF file must be provided. - [ ] Minimum size: full HD (splash images will be scaled down to 2/3 - of the main display when too bug; but they won't be scaled up. + [ ] Minimum size: full HD (splash images will be scaled down to 1/2 + of the main display when too big; but they won't be scaled up. Therefore anything smaller than fullHD will look tiny and unsuited on a 4K or higher res display). + [ ] Loading text will appear in bottom quarter, so image contents + must be adapted. ( ) If ever the actual release date evolved and is different from the planned date, update the "date" in the tag of the appdata diff --git a/devel-docs/tools/Makefile.in b/devel-docs/tools/Makefile.in index 391ff376d7..65086f00a2 100644 --- a/devel-docs/tools/Makefile.in +++ b/devel-docs/tools/Makefile.in @@ -100,6 +100,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -269,7 +270,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -342,6 +343,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -570,6 +572,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/docs/Makefile.in b/docs/Makefile.in index 12c18486b6..c4a55b6f4a 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -247,7 +248,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -320,6 +321,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -548,6 +550,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/docs/gimprc.5.in b/docs/gimprc.5.in index fab18ab62f..7d8b051092 100644 --- a/docs/gimprc.5.in +++ b/docs/gimprc.5.in @@ -60,7 +60,7 @@ Sets how many threads GIMP should use for operations that support it. This is an integer value. .TP -(tile-cache-size 6115246k) +(tile-cache-size 2g) When the amount of pixel data exceeds this limit, GIMP will start to swap tiles to disk. This is a lot slower but it makes it possible to work on @@ -142,7 +142,7 @@ search. This is a colon-separated list of folders to search. .TP -(mypaint-brush-path "/local/head/share/mypaint-data/1.0/brushes:~/.mypaint/brushes") +(mypaint-brush-path "@mypaint_brushes_dir@:~/.mypaint/brushes") Sets the brush search path. This is a colon-separated list of folders to search. @@ -775,6 +775,12 @@ no. How many recent settings to keep around in filter tools. This is an integer value. +.TP +(filter-tool-use-last-settings no) + +Default to the last used settings in filter tools. Possible values are yes +and no. + .TP (filter-tool-show-color-options no) @@ -899,7 +905,7 @@ Sets the theme search path. This is a colon-separated list of folders to search. .TP -(theme "03-Dark") +(theme "Dark") The name of the theme to use. This is a string value. diff --git a/etc/Makefile.am b/etc/Makefile.am index 7ab896af81..2e8af80e39 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -1,13 +1,16 @@ ## Makefile.am for gimp/etc -gimpsysconf_DATA = \ +gimpsysconf = \ controllerrc \ - gimprc \ gtkrc \ menurc \ sessionrc \ templaterc \ unitrc +gimpsysconf_DATA = \ + $(gimpsysconf) \ + gimprc + EXTRA_DIST = \ - $(gimpsysconf_DATA) + $(gimpsysconf) diff --git a/etc/Makefile.in b/etc/Makefile.in index 4ba5f0f1e0..d7d6330688 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -110,7 +111,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = gimprc CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -161,7 +162,7 @@ am__uninstall_files_from_dir = { \ am__installdirs = "$(DESTDIR)$(gimpsysconfdir)" DATA = $(gimpsysconf_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(srcdir)/Makefile.in +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gimprc.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -562,17 +565,20 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -gimpsysconf_DATA = \ +gimpsysconf = \ controllerrc \ - gimprc \ gtkrc \ menurc \ sessionrc \ templaterc \ unitrc +gimpsysconf_DATA = \ + $(gimpsysconf) \ + gimprc + EXTRA_DIST = \ - $(gimpsysconf_DATA) + $(gimpsysconf) all: all-am @@ -606,6 +612,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +gimprc: $(top_builddir)/config.status $(srcdir)/gimprc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo diff --git a/etc/gimprc b/etc/gimprc.in similarity index 99% rename from etc/gimprc rename to etc/gimprc.in index 1f6245cbfa..8d6bd8db5d 100644 --- a/etc/gimprc +++ b/etc/gimprc.in @@ -42,7 +42,7 @@ # specified in bytes, kilobytes, megabytes or gigabytes. If no suffix is # specified the size defaults to being specified in kilobytes. # -# (tile-cache-size 6115246k) +# (tile-cache-size 2g) # When enabled, uses OpenCL for some operations. Possible values are yes and # no. @@ -108,7 +108,7 @@ # Sets the brush search path. This is a colon-separated list of folders to # search. # -# (mypaint-brush-path "/local/head/share/mypaint-data/1.0/brushes:~/.mypaint/brushes") +# (mypaint-brush-path "@mypaint_brushes_dir@:~/.mypaint/brushes") # This is a colon-separated list of folders to search. # @@ -603,6 +603,11 @@ # # (filter-tool-max-recent 10) +# Default to the last used settings in filter tools. Possible values are yes +# and no. +# +# (filter-tool-use-last-settings no) + # Show advanced color options in filter tools. Possible values are yes and # no. # @@ -709,7 +714,7 @@ # The name of the theme to use. This is a string value. # -# (theme "03-Dark") +# (theme "Dark") # Sets the icon theme search path. This is a colon-separated list of folders # to search. diff --git a/etc/templaterc b/etc/templaterc index 3ecd444fce..ab3d7d089b 100644 --- a/etc/templaterc +++ b/etc/templaterc @@ -259,10 +259,20 @@ (resolution-unit inches) (image-type rgb) (fill-type background-fill)) +(GimpTemplate "3840x2160 (4K UHD)" + (icon-name "gimp-video") + (width 3840) + (height 2160) + (unit pixels) + (xresolution 72.000000) + (yresolution 72.000000) + (resolution-unit inches) + (image-type rgb) + (fill-type background-fill)) (GimpTemplate "4096×2160 (Digital Cinema Initiatives 4K)" (icon-name "gimp-video") - (width 5120) - (height 2880) + (width 4096) + (height 2160) (unit pixels) (xresolution 72.000000) (yresolution 72.000000) diff --git a/git-version.h b/git-version.h index 95886a2b39..8a997ef094 100644 --- a/git-version.h +++ b/git-version.h @@ -1,6 +1,6 @@ #ifndef __GIT_VERSION_H__ #define __GIT_VERSION_H__ -#define GIMP_GIT_VERSION "GIMP_2_9_8-784-g956ca8e3a3" -#define GIMP_GIT_VERSION_ABBREV "956ca8e3a3" +#define GIMP_GIT_VERSION "GIMP_2_10_0_RC1-223-g6582692ec6" +#define GIMP_GIT_VERSION_ABBREV "6582692ec6" #define GIMP_GIT_LAST_COMMIT_YEAR "2018" #endif /* __GIT_VERSION_H__ */ diff --git a/icons/Color/16/gimp-tool-blend.png b/icons/Color/16/gimp-tool-gradient.png similarity index 100% rename from icons/Color/16/gimp-tool-blend.png rename to icons/Color/16/gimp-tool-gradient.png diff --git a/icons/Color/24/gimp-tool-blend.png b/icons/Color/24/gimp-tool-gradient.png similarity index 100% rename from icons/Color/24/gimp-tool-blend.png rename to icons/Color/24/gimp-tool-gradient.png diff --git a/icons/Color/24/gimp-tool-blend.svg b/icons/Color/24/gimp-tool-gradient.svg similarity index 99% rename from icons/Color/24/gimp-tool-blend.svg rename to icons/Color/24/gimp-tool-gradient.svg index 1515959358..7acce9ba15 100644 --- a/icons/Color/24/gimp-tool-blend.svg +++ b/icons/Color/24/gimp-tool-gradient.svg @@ -16,7 +16,7 @@ id="svg30571" version="1.1" inkscape:version="0.91+devel r" - sodipodi:docname="gimp-tool-blend-24.svg" + sodipodi:docname="gimp-tool-gradient-24.svg" inkscape:export-filename="/home/klaus/Bilder/icons/Symbolic/hicolor/24x24/apps/gimp-channel.png" inkscape:export-xdpi="98.181816" inkscape:export-ydpi="98.181816"> diff --git a/icons/Color/Makefile.in b/icons/Color/Makefile.in index b99472ebb5..855acde072 100644 --- a/icons/Color/Makefile.in +++ b/icons/Color/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -255,7 +256,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -328,6 +329,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -556,6 +558,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -838,7 +841,6 @@ scalable_images = \ scalable/gimp-toilet-paper.svg \ scalable/gimp-tool-airbrush.svg \ scalable/gimp-tool-align.svg \ - scalable/gimp-tool-blend.svg \ scalable/gimp-tool-blur.svg \ scalable/gimp-tool-brightness-contrast.svg \ scalable/gimp-tool-bucket-fill.svg \ @@ -860,6 +862,7 @@ scalable_images = \ scalable/gimp-tool-foreground-select.svg \ scalable/gimp-tool-free-select.svg \ scalable/gimp-tool-fuzzy-select.svg \ + scalable/gimp-tool-gradient.svg \ scalable/gimp-tool-handle-transform.svg \ scalable/gimp-tool-heal.svg \ scalable/gimp-tool-hue-saturation.svg \ @@ -1015,7 +1018,6 @@ vector24_images = \ 24/gimp-text-layer.svg \ 24/gimp-tool-airbrush.svg \ 24/gimp-tool-align.svg \ - 24/gimp-tool-blend.svg \ 24/gimp-tool-blur.svg \ 24/gimp-tool-brightness-contrast.svg \ 24/gimp-tool-bucket-fill.svg \ @@ -1036,6 +1038,7 @@ vector24_images = \ 24/gimp-tool-foreground-select.svg \ 24/gimp-tool-free-select.svg \ 24/gimp-tool-fuzzy-select.svg \ + 24/gimp-tool-gradient.svg \ 24/gimp-tool-handle-transform.svg \ 24/gimp-tool-heal.svg \ 24/gimp-tool-hue-saturation.svg \ @@ -1299,7 +1302,6 @@ icons16_images = \ 16/gimp-toilet-paper.png \ 16/gimp-tool-airbrush.png \ 16/gimp-tool-align.png \ - 16/gimp-tool-blend.png \ 16/gimp-tool-blur.png \ 16/gimp-tool-brightness-contrast.png \ 16/gimp-tool-bucket-fill.png \ @@ -1320,6 +1322,7 @@ icons16_images = \ 16/gimp-tool-foreground-select.png \ 16/gimp-tool-free-select.png \ 16/gimp-tool-fuzzy-select.png \ + 16/gimp-tool-gradient.png \ 16/gimp-tool-handle-transform.png \ 16/gimp-tool-heal.png \ 16/gimp-tool-hue-saturation.png \ @@ -1506,7 +1509,6 @@ icons24_images = \ 24/gimp-toilet-paper.png \ 24/gimp-tool-airbrush.png \ 24/gimp-tool-align.png \ - 24/gimp-tool-blend.png \ 24/gimp-tool-blur.png \ 24/gimp-tool-brightness-contrast.png \ 24/gimp-tool-bucket-fill.png \ @@ -1527,6 +1529,7 @@ icons24_images = \ 24/gimp-tool-foreground-select.png \ 24/gimp-tool-free-select.png \ 24/gimp-tool-fuzzy-select.png \ + 24/gimp-tool-gradient.png \ 24/gimp-tool-handle-transform.png \ 24/gimp-tool-heal.png \ 24/gimp-tool-hue-saturation.png \ diff --git a/icons/Color/color-scalable.svg b/icons/Color/color-scalable.svg index 8a4da95d9b..eb55767ecf 100644 --- a/icons/Color/color-scalable.svg +++ b/icons/Color/color-scalable.svg @@ -34971,7 +34971,7 @@ id="tspan6485-0-0-7-1-3-8-2-2">24px + id="gimp-tool-gradient-24"> + id="gimp-tool-gradient"> diff --git a/icons/Legacy/16/gimp-tool-blend.png b/icons/Legacy/16/gimp-tool-gradient.png similarity index 100% rename from icons/Legacy/16/gimp-tool-blend.png rename to icons/Legacy/16/gimp-tool-gradient.png diff --git a/icons/Legacy/22/gimp-tool-blend.png b/icons/Legacy/22/gimp-tool-gradient.png similarity index 100% rename from icons/Legacy/22/gimp-tool-blend.png rename to icons/Legacy/22/gimp-tool-gradient.png diff --git a/icons/Legacy/Makefile.am b/icons/Legacy/Makefile.am index 75043bff15..eec32304ec 100644 --- a/icons/Legacy/Makefile.am +++ b/icons/Legacy/Makefile.am @@ -171,7 +171,6 @@ icons16_DATA = \ 16/gimp-toilet-paper.png \ 16/gimp-tool-airbrush.png \ 16/gimp-tool-align.png \ - 16/gimp-tool-blend.png \ 16/gimp-tool-blur.png \ 16/gimp-tool-brightness-contrast.png \ 16/gimp-tool-bucket-fill.png \ @@ -191,6 +190,7 @@ icons16_DATA = \ 16/gimp-tool-foreground-select.png \ 16/gimp-tool-free-select.png \ 16/gimp-tool-fuzzy-select.png \ + 16/gimp-tool-gradient.png \ 16/gimp-tool-handle-transform.png \ 16/gimp-tool-heal.png \ 16/gimp-tool-hue-saturation.png \ @@ -289,7 +289,6 @@ tools22_DATA = \ 22/gimp-gegl.png \ 22/gimp-tool-airbrush.png \ 22/gimp-tool-align.png \ - 22/gimp-tool-blend.png \ 22/gimp-tool-blur.png \ 22/gimp-tool-brightness-contrast.png \ 22/gimp-tool-bucket-fill.png \ @@ -309,6 +308,7 @@ tools22_DATA = \ 22/gimp-tool-foreground-select.png \ 22/gimp-tool-free-select.png \ 22/gimp-tool-fuzzy-select.png \ + 22/gimp-tool-gradient.png \ 22/gimp-tool-handle-transform.png \ 22/gimp-tool-heal.png \ 22/gimp-tool-hue-saturation.png \ diff --git a/icons/Legacy/Makefile.in b/icons/Legacy/Makefile.in index e7aaf647fa..ae8eeb3dce 100644 --- a/icons/Legacy/Makefile.in +++ b/icons/Legacy/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -254,7 +255,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -327,6 +328,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -555,6 +557,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -741,7 +744,6 @@ icons16_DATA = \ 16/gimp-toilet-paper.png \ 16/gimp-tool-airbrush.png \ 16/gimp-tool-align.png \ - 16/gimp-tool-blend.png \ 16/gimp-tool-blur.png \ 16/gimp-tool-brightness-contrast.png \ 16/gimp-tool-bucket-fill.png \ @@ -761,6 +763,7 @@ icons16_DATA = \ 16/gimp-tool-foreground-select.png \ 16/gimp-tool-free-select.png \ 16/gimp-tool-fuzzy-select.png \ + 16/gimp-tool-gradient.png \ 16/gimp-tool-handle-transform.png \ 16/gimp-tool-heal.png \ 16/gimp-tool-hue-saturation.png \ @@ -859,7 +862,6 @@ tools22_DATA = \ 22/gimp-gegl.png \ 22/gimp-tool-airbrush.png \ 22/gimp-tool-align.png \ - 22/gimp-tool-blend.png \ 22/gimp-tool-blur.png \ 22/gimp-tool-brightness-contrast.png \ 22/gimp-tool-bucket-fill.png \ @@ -879,6 +881,7 @@ tools22_DATA = \ 22/gimp-tool-foreground-select.png \ 22/gimp-tool-free-select.png \ 22/gimp-tool-fuzzy-select.png \ + 22/gimp-tool-gradient.png \ 22/gimp-tool-handle-transform.png \ 22/gimp-tool-heal.png \ 22/gimp-tool-hue-saturation.png \ diff --git a/icons/Makefile.in b/icons/Makefile.in index 412b493b69..7df157c54c 100644 --- a/icons/Makefile.in +++ b/icons/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -303,7 +304,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -376,6 +377,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -604,6 +606,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/icons/Symbolic-Inverted/Makefile.in b/icons/Symbolic-Inverted/Makefile.in index c4146b1940..7caf625ff5 100644 --- a/icons/Symbolic-Inverted/Makefile.in +++ b/icons/Symbolic-Inverted/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -255,7 +256,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -328,6 +329,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -556,6 +558,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -838,7 +841,6 @@ scalable_images = \ scalable/gimp-toilet-paper.svg \ scalable/gimp-tool-airbrush.svg \ scalable/gimp-tool-align.svg \ - scalable/gimp-tool-blend.svg \ scalable/gimp-tool-blur.svg \ scalable/gimp-tool-brightness-contrast.svg \ scalable/gimp-tool-bucket-fill.svg \ @@ -860,6 +862,7 @@ scalable_images = \ scalable/gimp-tool-foreground-select.svg \ scalable/gimp-tool-free-select.svg \ scalable/gimp-tool-fuzzy-select.svg \ + scalable/gimp-tool-gradient.svg \ scalable/gimp-tool-handle-transform.svg \ scalable/gimp-tool-heal.svg \ scalable/gimp-tool-hue-saturation.svg \ @@ -1015,7 +1018,6 @@ vector24_images = \ 24/gimp-text-layer.svg \ 24/gimp-tool-airbrush.svg \ 24/gimp-tool-align.svg \ - 24/gimp-tool-blend.svg \ 24/gimp-tool-blur.svg \ 24/gimp-tool-brightness-contrast.svg \ 24/gimp-tool-bucket-fill.svg \ @@ -1036,6 +1038,7 @@ vector24_images = \ 24/gimp-tool-foreground-select.svg \ 24/gimp-tool-free-select.svg \ 24/gimp-tool-fuzzy-select.svg \ + 24/gimp-tool-gradient.svg \ 24/gimp-tool-handle-transform.svg \ 24/gimp-tool-heal.svg \ 24/gimp-tool-hue-saturation.svg \ @@ -1299,7 +1302,6 @@ icons16_images = \ 16/gimp-toilet-paper.png \ 16/gimp-tool-airbrush.png \ 16/gimp-tool-align.png \ - 16/gimp-tool-blend.png \ 16/gimp-tool-blur.png \ 16/gimp-tool-brightness-contrast.png \ 16/gimp-tool-bucket-fill.png \ @@ -1320,6 +1322,7 @@ icons16_images = \ 16/gimp-tool-foreground-select.png \ 16/gimp-tool-free-select.png \ 16/gimp-tool-fuzzy-select.png \ + 16/gimp-tool-gradient.png \ 16/gimp-tool-handle-transform.png \ 16/gimp-tool-heal.png \ 16/gimp-tool-hue-saturation.png \ @@ -1506,7 +1509,6 @@ icons24_images = \ 24/gimp-toilet-paper.png \ 24/gimp-tool-airbrush.png \ 24/gimp-tool-align.png \ - 24/gimp-tool-blend.png \ 24/gimp-tool-blur.png \ 24/gimp-tool-brightness-contrast.png \ 24/gimp-tool-bucket-fill.png \ @@ -1527,6 +1529,7 @@ icons24_images = \ 24/gimp-tool-foreground-select.png \ 24/gimp-tool-free-select.png \ 24/gimp-tool-fuzzy-select.png \ + 24/gimp-tool-gradient.png \ 24/gimp-tool-handle-transform.png \ 24/gimp-tool-heal.png \ 24/gimp-tool-hue-saturation.png \ diff --git a/icons/Symbolic/16/gimp-tool-blend.png b/icons/Symbolic/16/gimp-tool-gradient.png similarity index 100% rename from icons/Symbolic/16/gimp-tool-blend.png rename to icons/Symbolic/16/gimp-tool-gradient.png diff --git a/icons/Symbolic/24/gimp-tool-blend.png b/icons/Symbolic/24/gimp-tool-gradient.png similarity index 100% rename from icons/Symbolic/24/gimp-tool-blend.png rename to icons/Symbolic/24/gimp-tool-gradient.png diff --git a/icons/Symbolic/24/gimp-tool-blend.svg b/icons/Symbolic/24/gimp-tool-gradient.svg similarity index 99% rename from icons/Symbolic/24/gimp-tool-blend.svg rename to icons/Symbolic/24/gimp-tool-gradient.svg index 60f0d2669d..3b79cb2cc9 100644 --- a/icons/Symbolic/24/gimp-tool-blend.svg +++ b/icons/Symbolic/24/gimp-tool-gradient.svg @@ -13,8 +13,8 @@ id="svg30571" version="1.1" inkscape:version="0.91+devel r" - sodipodi:docname="gimp-tool-blend-24.svg" - inkscape:export-filename="/home/klaus/Bilder/icons/gimp-icons/gimp-tool-blend.png" + sodipodi:docname="gimp-tool-gradient-24.svg" + inkscape:export-filename="/home/klaus/Bilder/icons/gimp-icons/gimp-tool-gradient.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> + sodipodi:docname="gimp-tool-gradient.svg"> + id="gimp-tool-gradient"> @@ -34833,7 +34833,7 @@ #include #endif -#else #include #endif @@ -93,8 +94,16 @@ #endif #if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN) +# ifdef STRICT +# undef STRICT +# endif # define STRICT + +# ifdef _WIN32_WINNT +# undef _WIN32_WINNT +# endif # define _WIN32_WINNT 0x0601 + # include # include # undef RGB @@ -154,7 +163,15 @@ static void gimp_message_func (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer data); -#ifndef G_OS_WIN32 +static void gimp_fatal_func (const gchar *log_domain, + GLogLevelFlags flags, + const gchar *message, + gpointer data); +#ifdef G_OS_WIN32 +#ifdef HAVE_EXCHNDL +static LONG WINAPI gimp_plugin_sigfatal_handler (PEXCEPTION_POINTERS pExceptionInfo); +#endif +#else static void gimp_plugin_sigfatal_handler (gint sig_num); #endif static gboolean gimp_plugin_io_error_handler (GIOChannel *channel, @@ -180,8 +197,13 @@ static void gimp_set_pdb_error (const GimpParam *return_vals, gint n_return_vals); -static GIOChannel *_readchannel = NULL; -GIOChannel *_writechannel = NULL; +#if defined G_OS_WIN32 && defined HAVE_EXCHNDL +static LPTOP_LEVEL_EXCEPTION_FILTER _prevExceptionFilter = NULL; +static gchar *plug_in_backtrace_path = NULL; +#endif + +static GIOChannel *_readchannel = NULL; +GIOChannel *_writechannel = NULL; #ifdef USE_WIN32_SHM static HANDLE shm_handle; @@ -277,8 +299,8 @@ gimp_main (const GimpPlugInInfo *info, typedef BOOL (WINAPI *t_SetDllDirectoryA) (LPCSTR lpPathName); t_SetDllDirectoryA p_SetDllDirectoryA; - p_SetDllDirectoryA = GetProcAddress (GetModuleHandle ("kernel32.dll"), - "SetDllDirectoryA"); + p_SetDllDirectoryA = (t_SetDllDirectoryA) GetProcAddress (GetModuleHandle ("kernel32.dll"), + "SetDllDirectoryA"); if (p_SetDllDirectoryA) (*p_SetDllDirectoryA) (""); } @@ -319,10 +341,9 @@ gimp_main (const GimpPlugInInfo *info, #ifdef HAVE_EXCHNDL /* Use Dr. Mingw (dumps backtrace on crash) if it is available. */ { - time_t t; - gchar *filename; - gchar *dir; - gchar *path; + time_t t; + gchar *filename; + gchar *dir; /* This has to be the non-roaming directory (i.e., the local directory) as backtraces correspond to the binaries on this @@ -336,14 +357,18 @@ gimp_main (const GimpPlugInInfo *info, time (&t); filename = g_strdup_printf ("%s-crash-%" G_GUINT64_FORMAT ".txt", g_get_prgname(), t); - path = g_build_filename (dir, filename, NULL); + plug_in_backtrace_path = g_build_filename (dir, filename, NULL); g_free (filename); g_free (dir); - ExcHndlInit (); - ExcHndlSetLogFileNameA (path); + /* Similar to core crash handling in app/signals.c, the order here + * is very important! + */ + if (! _prevExceptionFilter) + _prevExceptionFilter = SetUnhandledExceptionFilter (gimp_plugin_sigfatal_handler); - g_free (path); + ExcHndlInit (); + ExcHndlSetLogFileNameA (plug_in_backtrace_path); } #endif @@ -364,8 +389,8 @@ gimp_main (const GimpPlugInInfo *info, typedef HRESULT (WINAPI *t_SetCurrentProcessExplicitAppUserModelID) (PCWSTR lpPathName); t_SetCurrentProcessExplicitAppUserModelID p_SetCurrentProcessExplicitAppUserModelID; - p_SetCurrentProcessExplicitAppUserModelID = GetProcAddress (GetModuleHandle ("shell32.dll"), - "SetCurrentProcessExplicitAppUserModelID"); + p_SetCurrentProcessExplicitAppUserModelID = (t_SetCurrentProcessExplicitAppUserModelID) GetProcAddress (GetModuleHandle ("shell32.dll"), + "SetCurrentProcessExplicitAppUserModelID"); if (p_SetCurrentProcessExplicitAppUserModelID) (*p_SetCurrentProcessExplicitAppUserModelID) (L"gimp.GimpApplication"); } @@ -486,9 +511,11 @@ gimp_main (const GimpPlugInInfo *info, gimp_signal_private (SIGHUP, gimp_plugin_sigfatal_handler, 0); gimp_signal_private (SIGINT, gimp_plugin_sigfatal_handler, 0); gimp_signal_private (SIGQUIT, gimp_plugin_sigfatal_handler, 0); + gimp_signal_private (SIGTERM, gimp_plugin_sigfatal_handler, 0); + + gimp_signal_private (SIGABRT, gimp_plugin_sigfatal_handler, 0); gimp_signal_private (SIGBUS, gimp_plugin_sigfatal_handler, 0); gimp_signal_private (SIGSEGV, gimp_plugin_sigfatal_handler, 0); - gimp_signal_private (SIGTERM, gimp_plugin_sigfatal_handler, 0); gimp_signal_private (SIGFPE, gimp_plugin_sigfatal_handler, 0); /* Ignore SIGPIPE from crashing Gimp */ @@ -587,6 +614,17 @@ gimp_main (const GimpPlugInInfo *info, fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK); fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL; g_log_set_always_fatal (fatal_mask); + + g_log_set_handler (NULL, + G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL | + G_LOG_LEVEL_ERROR | G_LOG_FLAG_FATAL, + gimp_fatal_func, NULL); + } + else + { + g_log_set_handler (NULL, + G_LOG_LEVEL_ERROR | G_LOG_FLAG_FATAL, + gimp_fatal_func, NULL); } if (strcmp (argv[ARG_MODE], "-query") == 0) @@ -646,6 +684,11 @@ gimp_quit (void) { gimp_close (); +#if defined G_OS_WIN32 && defined HAVE_EXCHNDL + if (plug_in_backtrace_path) + g_free (plug_in_backtrace_path); +#endif + exit (EXIT_SUCCESS); } @@ -1852,8 +1895,9 @@ gimp_debug_stop (void) THREADENTRY32 te32 = { 0 }; pid_t opid = getpid (); - g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Debugging (restart externally): %d", - opid); + g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, + "Debugging (restart externally): %ld", + (long int) opid); hThreadSnap = CreateToolhelp32Snapshot (TH32CS_SNAPTHREAD, 0); if (hThreadSnap == INVALID_HANDLE_VALUE) @@ -1898,7 +1942,108 @@ gimp_message_func (const gchar *log_domain, gimp_message (message); } +static void +gimp_fatal_func (const gchar *log_domain, + GLogLevelFlags flags, + const gchar *message, + gpointer data) +{ + const gchar *level; + + switch (flags & G_LOG_LEVEL_MASK) + { + case G_LOG_LEVEL_WARNING: + level = "WARNING"; + break; + case G_LOG_LEVEL_CRITICAL: + level = "CRITICAL"; + break; + case G_LOG_LEVEL_ERROR: + level = "ERROR"; + break; + default: + level = "FATAL"; + break; + } + + g_printerr ("%s: %s: %s\n", + progname, level, message); + #ifndef G_OS_WIN32 + switch (stack_trace_mode) + { + case GIMP_STACK_TRACE_NEVER: + break; + + case GIMP_STACK_TRACE_QUERY: + { + sigset_t sigset; + + sigemptyset (&sigset); + sigprocmask (SIG_SETMASK, &sigset, NULL); + gimp_stack_trace_query (progname); + } + break; + + case GIMP_STACK_TRACE_ALWAYS: + { + sigset_t sigset; + + sigemptyset (&sigset); + sigprocmask (SIG_SETMASK, &sigset, NULL); + gimp_stack_trace_print (progname, stdout, NULL); + } + break; + } +#endif + + /* Do not end with gimp_quit(). + * We want the plug-in to continue its normal crash course, otherwise + * we won't get the "Plug-in crashed" error in GIMP. + */ + exit (EXIT_FAILURE); +} + +#ifdef G_OS_WIN32 + +#ifdef HAVE_EXCHNDL +static LONG WINAPI +gimp_plugin_sigfatal_handler (PEXCEPTION_POINTERS pExceptionInfo) +{ + g_printerr ("%s: fatal error\n", progname); + + SetUnhandledExceptionFilter (_prevExceptionFilter); + + /* For simplicity, do not make a difference between QUERY and ALWAYS + * on Windows (at least not for now). + */ + if (stack_trace_mode != GIMP_STACK_TRACE_NEVER && + g_file_test (plug_in_backtrace_path, G_FILE_TEST_IS_REGULAR)) + { + FILE *stream; + guchar buffer[256]; + size_t read_len; + + stream = fopen (plug_in_backtrace_path, "r"); + do + { + /* Just read and output directly the file content. */ + read_len = fread (buffer, 1, sizeof (buffer) - 1, stream); + buffer[read_len] = '\0'; + g_printerr ("%s", buffer); + } + while (read_len); + fclose (stream); + } + + if (_prevExceptionFilter && _prevExceptionFilter != gimp_plugin_sigfatal_handler) + return _prevExceptionFilter (pExceptionInfo); + else + return EXCEPTION_CONTINUE_SEARCH; +} +#endif + +#else static void gimp_plugin_sigfatal_handler (gint sig_num) { @@ -1907,11 +2052,11 @@ gimp_plugin_sigfatal_handler (gint sig_num) case SIGHUP: case SIGINT: case SIGQUIT: - case SIGABRT: case SIGTERM: g_printerr ("%s terminated: %s\n", progname, g_strsignal (sig_num)); break; + case SIGABRT: case SIGBUS: case SIGSEGV: case SIGFPE: @@ -1946,7 +2091,11 @@ gimp_plugin_sigfatal_handler (gint sig_num) break; } - gimp_quit (); + /* Do not end with gimp_quit(). + * We want the plug-in to continue its normal crash course, otherwise + * we won't get the "Plug-in crashed" error in GIMP. + */ + exit (EXIT_FAILURE); } #endif @@ -2191,13 +2340,13 @@ gimp_config (GPConfig *config) /* Verify that we mapped our view */ if (!_shm_addr) { - g_error ("MapViewOfFile error: %d... " ERRMSG_SHM_FAILED, + g_error ("MapViewOfFile error: %lu... " ERRMSG_SHM_FAILED, GetLastError ()); } } else { - g_error ("OpenFileMapping error: %d... " ERRMSG_SHM_FAILED, + g_error ("OpenFileMapping error: %lu... " ERRMSG_SHM_FAILED, GetLastError ()); } diff --git a/libgimp/gimp.def b/libgimp/gimp.def index d495d436cf..fa75022fa9 100644 --- a/libgimp/gimp.def +++ b/libgimp/gimp.def @@ -85,6 +85,9 @@ EXPORTS gimp_context_get_font gimp_context_get_foreground gimp_context_get_gradient + gimp_context_get_gradient_blend_color_space + gimp_context_get_gradient_repeat_mode + gimp_context_get_gradient_reverse gimp_context_get_ink_angle gimp_context_get_ink_blob_angle gimp_context_get_ink_blob_aspect_ratio @@ -141,6 +144,13 @@ EXPORTS gimp_context_set_font gimp_context_set_foreground gimp_context_set_gradient + gimp_context_set_gradient_blend_color_space + gimp_context_set_gradient_fg_bg_hsv_ccw + gimp_context_set_gradient_fg_bg_hsv_cw + gimp_context_set_gradient_fg_bg_rgb + gimp_context_set_gradient_fg_transparent + gimp_context_set_gradient_repeat_mode + gimp_context_set_gradient_reverse gimp_context_set_ink_angle gimp_context_set_ink_blob_angle gimp_context_set_ink_blob_aspect_ratio @@ -205,6 +215,12 @@ EXPORTS gimp_drawable_delete gimp_drawable_desaturate gimp_drawable_detach + gimp_drawable_edit_bucket_fill + gimp_drawable_edit_clear + gimp_drawable_edit_fill + gimp_drawable_edit_gradient_fill + gimp_drawable_edit_stroke_item + gimp_drawable_edit_stroke_selection gimp_drawable_equalize gimp_drawable_fill gimp_drawable_flush diff --git a/libgimp/gimp_pdb_headers.h b/libgimp/gimp_pdb_headers.h index 000e4ef136..d18ffdd5e7 100644 --- a/libgimp/gimp_pdb_headers.h +++ b/libgimp/gimp_pdb_headers.h @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include diff --git a/libgimp/gimpcontext_pdb.c b/libgimp/gimpcontext_pdb.c index aebf13f4ff..8b352ce37f 100644 --- a/libgimp/gimpcontext_pdb.c +++ b/libgimp/gimpcontext_pdb.c @@ -672,8 +672,10 @@ gimp_context_get_line_width (void) * Set the line width setting. * * This procedure modifies the line width setting for stroking lines. - * This setting affects the following procedures: gimp_edit_stroke(), - * gimp_edit_stroke_vectors(). + * + * This setting affects the following procedures: + * gimp_drawable_edit_stroke_selection(), + * gimp_drawable_edit_stroke_item(). * * Returns: TRUE on success. * @@ -736,8 +738,10 @@ gimp_context_get_line_width_unit (void) * * This procedure modifies the line width unit setting for stroking * lines. - * This setting affects the following procedures: gimp_edit_stroke(), - * gimp_edit_stroke_vectors(). + * + * This setting affects the following procedures: + * gimp_drawable_edit_stroke_selection(), + * gimp_drawable_edit_stroke_item(). * * Returns: TRUE on success. * @@ -800,8 +804,10 @@ gimp_context_get_line_cap_style (void) * * This procedure modifies the line cap style setting for stroking * lines. - * This setting affects the following procedures: gimp_edit_stroke(), - * gimp_edit_stroke_vectors(). + * + * This setting affects the following procedures: + * gimp_drawable_edit_stroke_selection(), + * gimp_drawable_edit_stroke_item(). * * Returns: TRUE on success. * @@ -864,8 +870,10 @@ gimp_context_get_line_join_style (void) * * This procedure modifies the line join style setting for stroking * lines. - * This setting affects the following procedures: gimp_edit_stroke(), - * gimp_edit_stroke_vectors(). + * + * This setting affects the following procedures: + * gimp_drawable_edit_stroke_selection(), + * gimp_drawable_edit_stroke_item(). * * Returns: TRUE on success. * @@ -931,8 +939,10 @@ gimp_context_get_line_miter_limit (void) * A mitered join is converted to a bevelled join if the miter would * extend to a distance of more than (miter-limit * line-width) from * the actual join point. - * This setting affects the following procedures: gimp_edit_stroke(), - * gimp_edit_stroke_vectors(). + * + * This setting affects the following procedures: + * gimp_drawable_edit_stroke_selection(), + * gimp_drawable_edit_stroke_item(). * * Returns: TRUE on success. * @@ -995,8 +1005,10 @@ gimp_context_get_line_dash_offset (void) * * This procedure modifies the line dash offset setting for stroking * lines. - * This setting affects the following procedures: gimp_edit_stroke(), - * gimp_edit_stroke_vectors(). + * + * This setting affects the following procedures: + * gimp_drawable_edit_stroke_selection(), + * gimp_drawable_edit_stroke_item(). * * Returns: TRUE on success. * @@ -1074,11 +1086,14 @@ gimp_context_get_line_dash_pattern (gint *num_dashes, * * This procedure modifies the line dash pattern setting for stroking * lines. + * * The unit of the dash pattern segments is the actual line width used * for the stroke operation, in other words a segment length of 1.0 * results in a square segment shape (or gap shape). - * This setting affects the following procedures: gimp_edit_stroke(), - * gimp_edit_stroke_vectors(). + * + * This setting affects the following procedures: + * gimp_drawable_edit_stroke_selection_(), + * gimp_drawable_edit_stroke_item(). * * Returns: TRUE on success. * @@ -1899,6 +1914,317 @@ gimp_context_set_gradient (const gchar *name) return success; } +/** + * gimp_context_set_gradient_fg_bg_rgb: + * + * Sets the built-in FG-BG RGB gradient as the active gradient. + * + * This procedure sets the built-in FG-BG RGB gradient as the active + * gradient. The gradient will be used for subsequent gradient + * operations. + * + * Returns: TRUE on success. + * + * Since: 2.10 + **/ +gboolean +gimp_context_set_gradient_fg_bg_rgb (void) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-context-set-gradient-fg-bg-rgb", + &nreturn_vals, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} + +/** + * gimp_context_set_gradient_fg_bg_hsv_cw: + * + * Sets the built-in FG-BG HSV (cw) gradient as the active gradient. + * + * This procedure sets the built-in FG-BG HSV (cw) gradient as the + * active gradient. The gradient will be used for subsequent gradient + * operations. + * + * Returns: TRUE on success. + * + * Since: 2.10 + **/ +gboolean +gimp_context_set_gradient_fg_bg_hsv_cw (void) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-context-set-gradient-fg-bg-hsv-cw", + &nreturn_vals, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} + +/** + * gimp_context_set_gradient_fg_bg_hsv_ccw: + * + * Sets the built-in FG-BG HSV (ccw) gradient as the active gradient. + * + * This procedure sets the built-in FG-BG HSV (ccw) gradient as the + * active gradient. The gradient will be used for subsequent gradient + * operations. + * + * Returns: TRUE on success. + * + * Since: 2.10 + **/ +gboolean +gimp_context_set_gradient_fg_bg_hsv_ccw (void) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-context-set-gradient-fg-bg-hsv-ccw", + &nreturn_vals, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} + +/** + * gimp_context_set_gradient_fg_transparent: + * + * Sets the built-in FG-Transparent gradient as the active gradient. + * + * This procedure sets the built-in FG-Transparent gradient as the + * active gradient. The gradient will be used for subsequent gradient + * operations. + * + * Returns: TRUE on success. + * + * Since: 2.10 + **/ +gboolean +gimp_context_set_gradient_fg_transparent (void) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-context-set-gradient-fg-transparent", + &nreturn_vals, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} + +/** + * gimp_context_get_gradient_blend_color_space: + * + * Get the gradient blend color space. + * + * Get the gradient blend color space for paint tools and the gradient + * tool. + * + * Returns: Color blend space. + * + * Since: 2.10 + **/ +GimpGradientBlendColorSpace +gimp_context_get_gradient_blend_color_space (void) +{ + GimpParam *return_vals; + gint nreturn_vals; + GimpGradientBlendColorSpace blend_color_space = 0; + + return_vals = gimp_run_procedure ("gimp-context-get-gradient-blend-color-space", + &nreturn_vals, + GIMP_PDB_END); + + if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS) + blend_color_space = return_vals[1].data.d_int32; + + gimp_destroy_params (return_vals, nreturn_vals); + + return blend_color_space; +} + +/** + * gimp_context_set_gradient_blend_color_space: + * @blend_color_space: Blend color space. + * + * Set the gradient blend color space. + * + * Set the gradient blend color space for paint tools and the gradient + * tool. + * + * Returns: TRUE on success. + * + * Since: 2.10 + **/ +gboolean +gimp_context_set_gradient_blend_color_space (GimpGradientBlendColorSpace blend_color_space) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-context-set-gradient-blend-color-space", + &nreturn_vals, + GIMP_PDB_INT32, blend_color_space, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} + +/** + * gimp_context_get_gradient_repeat_mode: + * + * Get the gradient repeat mode. + * + * Get the gradient repeat mode for paint tools and the gradient tool. + * + * Returns: Repeat mode. + * + * Since: 2.10 + **/ +GimpRepeatMode +gimp_context_get_gradient_repeat_mode (void) +{ + GimpParam *return_vals; + gint nreturn_vals; + GimpRepeatMode repeat_mode = 0; + + return_vals = gimp_run_procedure ("gimp-context-get-gradient-repeat-mode", + &nreturn_vals, + GIMP_PDB_END); + + if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS) + repeat_mode = return_vals[1].data.d_int32; + + gimp_destroy_params (return_vals, nreturn_vals); + + return repeat_mode; +} + +/** + * gimp_context_set_gradient_repeat_mode: + * @repeat_mode: Repeat mode. + * + * Set the gradient repeat mode. + * + * Set the gradient repeat mode for paint tools and the gradient tool. + * + * Returns: TRUE on success. + * + * Since: 2.10 + **/ +gboolean +gimp_context_set_gradient_repeat_mode (GimpRepeatMode repeat_mode) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-context-set-gradient-repeat-mode", + &nreturn_vals, + GIMP_PDB_INT32, repeat_mode, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} + +/** + * gimp_context_get_gradient_reverse: + * + * Get the gradient reverse setting. + * + * Get the gradient reverse setting for paint tools and the gradient + * tool. + * + * Returns: Reverse. + * + * Since: 2.10 + **/ +gboolean +gimp_context_get_gradient_reverse (void) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean reverse = FALSE; + + return_vals = gimp_run_procedure ("gimp-context-get-gradient-reverse", + &nreturn_vals, + GIMP_PDB_END); + + if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS) + reverse = return_vals[1].data.d_int32; + + gimp_destroy_params (return_vals, nreturn_vals); + + return reverse; +} + +/** + * gimp_context_set_gradient_reverse: + * @reverse: Reverse. + * + * Set the gradient reverse setting. + * + * Set the gradient reverse setting for paint tools and the gradient + * tool. + * + * Returns: TRUE on success. + * + * Since: 2.10 + **/ +gboolean +gimp_context_set_gradient_reverse (gboolean reverse) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-context-set-gradient-reverse", + &nreturn_vals, + GIMP_PDB_INT32, reverse, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} + /** * gimp_context_get_palette: * @@ -2071,10 +2397,12 @@ gimp_context_get_antialias (void) * values which give the appearance of a sharper, less pixelized edge. * This should be set as TRUE most of the time unless a binary-only * selection is wanted. + * * This setting affects the following procedures: * gimp_image_select_color(), gimp_image_select_contiguous_color(), * gimp_image_select_round_rectangle(), gimp_image_select_ellipse(), - * gimp_image_select_polygon(), gimp_image_select_item(). + * gimp_image_select_polygon(), gimp_image_select_item(), + * gimp_drawable_edit_bucket_fill(). * * Returns: TRUE on success. * @@ -2139,6 +2467,7 @@ gimp_context_get_feather (void) * is enabled, selections will be blurred before combining. The blur is * a gaussian blur; its radii can be controlled using * gimp_context_set_feather_radius(). + * * This setting affects the following procedures: * gimp_image_select_color(), gimp_image_select_contiguous_color(), * gimp_image_select_rectangle(), gimp_image_select_round_rectangle(), @@ -2217,6 +2546,7 @@ gimp_context_get_feather_radius (gdouble *feather_radius_x, * Set the feather radius setting. * * This procedure modifies the feather radius setting. + * * This setting affects all procedures that are affected by * gimp_context_set_feather(). * @@ -2288,8 +2618,10 @@ gimp_context_get_sample_merged (void) * pixel data from the composite image ('sample-merged' is TRUE. This * is equivalent to sampling for colors after merging all visible * layers). + * * This setting affects the following procedures: - * gimp_image_select_color(), gimp_image_select_contiguous_color(). + * gimp_image_select_color(), gimp_image_select_contiguous_color(), + * gimp_drawable_edit_bucket_fill(). * * Returns: TRUE on success. * @@ -2355,8 +2687,10 @@ gimp_context_get_sample_criterion (void) * like when doing a seed fill, this setting controls how color * similarity is determined. SELECT_CRITERION_COMPOSITE is the default * value. + * * This setting affects the following procedures: - * gimp_image_select_color(), gimp_image_select_contiguous_color(). + * gimp_image_select_color(), gimp_image_select_contiguous_color(), + * gimp_drawable_edit_bucket_fill(). * * Returns: TRUE on success. * @@ -2423,8 +2757,10 @@ gimp_context_get_sample_threshold (void) * \"sufficiently close\" to be considered a similar color. If the * sample threshold has not been set explicitly, the default threshold * set in gimprc will be used. + * * This setting affects the following procedures: - * gimp_image_select_color(), gimp_image_select_contiguous_color(). + * gimp_image_select_color(), gimp_image_select_contiguous_color(), + * gimp_drawable_edit_bucket_fill(). * * Returns: TRUE on success. * @@ -2553,8 +2889,10 @@ gimp_context_get_sample_transparent (void) * like when doing a seed fill, this setting controls whether * transparency is considered to be a unique selectable color. When * this setting is TRUE, transparent areas can be selected or filled. + * * This setting affects the following procedures: - * gimp_image_select_color(), gimp_image_select_contiguous_color(). + * gimp_image_select_color(), gimp_image_select_contiguous_color(), + * gimp_drawable_edit_bucket_fill(). * * Returns: TRUE on success. * @@ -2621,8 +2959,10 @@ gimp_context_get_diagonal_neighbors (void) * neighbors of each pixel are considered when calculating the affected * region; in contrast, when this setting is FALSE, only the four * orthogonal neighbors of each pixel are considered. + * * This setting affects the following procedures: - * gimp_image_select_contiguous_color(). + * gimp_image_select_contiguous_color(), + * gimp_drawable_edit_bucket_fill(). * * Returns: TRUE on success. * @@ -2647,6 +2987,74 @@ gimp_context_set_diagonal_neighbors (gboolean diagonal_neighbors) return success; } +/** + * gimp_context_get_distance_metric: + * + * Get the distance metric used in some computations. + * + * This procedure returns the distance metric in the current context. + * See gimp_context_set_distance_metric() to know more about its usage. + * + * Returns: The distance metric. + * + * Since: 2.10 + **/ +GeglDistanceMetric +gimp_context_get_distance_metric (void) +{ + GimpParam *return_vals; + gint nreturn_vals; + GeglDistanceMetric metric = 0; + + return_vals = gimp_run_procedure ("gimp-context-get-distance-metric", + &nreturn_vals, + GIMP_PDB_END); + + if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS) + metric = return_vals[1].data.d_int32; + + gimp_destroy_params (return_vals, nreturn_vals); + + return metric; +} + +/** + * gimp_context_set_distance_metric: + * @metric: The distance metric. + * + * Set the distance metric used in some computations. + * + * This procedure modifies the distance metric used in some + * computations, such as gimp_drawable_edit_gradient_fill(). In + * particular, it does not change the metric used in generic distance + * computation on canvas, as in the Measure tool. + * + * This setting affects the following procedures: + * gimp_drawable_edit_gradient_fill(). + * + * Returns: TRUE on success. + * + * Since: 2.10 + **/ +gboolean +gimp_context_set_distance_metric (GeglDistanceMetric metric) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-context-set-distance-metric", + &nreturn_vals, + GIMP_PDB_INT32, metric, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} + /** * gimp_context_get_interpolation: * @@ -2688,6 +3096,7 @@ gimp_context_get_interpolation (void) * Set the interpolation type. * * This procedure modifies the interpolation setting. + * * This setting affects affects the following procedures: * gimp_item_transform_flip(), gimp_item_transform_perspective(), * gimp_item_transform_rotate(), gimp_item_transform_scale(), @@ -2757,6 +3166,7 @@ gimp_context_get_transform_direction (void) * Set the transform direction. * * This procedure modifies the transform direction setting. + * * This setting affects affects the following procedures: * gimp_item_transform_flip(), gimp_item_transform_perspective(), * gimp_item_transform_rotate(), gimp_item_transform_scale(), @@ -2828,6 +3238,7 @@ gimp_context_get_transform_resize (void) * transforming pixels, if the result of a transform operation has a * different size than the original area, this setting determines how * the resulting area is sized. + * * This setting affects affects the following procedures: * gimp_item_transform_flip(), gimp_item_transform_flip_simple(), * gimp_item_transform_perspective(), gimp_item_transform_rotate(), @@ -3398,68 +3809,3 @@ gimp_context_set_ink_blob_angle (gdouble angle) return success; } - -/** - * gimp_context_get_distance_metric: - * - * Get the distance metric used in some computations. - * - * This procedure returns the distance metric in the current context. - * See gimp_context_set_distance_metric() to know more about its usage. - * - * Returns: The distance metric. - * - * Since: 2.10 - **/ -GeglDistanceMetric -gimp_context_get_distance_metric (void) -{ - GimpParam *return_vals; - gint nreturn_vals; - GeglDistanceMetric metric = 0; - - return_vals = gimp_run_procedure ("gimp-context-get-distance-metric", - &nreturn_vals, - GIMP_PDB_END); - - if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS) - metric = return_vals[1].data.d_int32; - - gimp_destroy_params (return_vals, nreturn_vals); - - return metric; -} - -/** - * gimp_context_set_distance_metric: - * @metric: The distance metric. - * - * Set the distance metric used in some computations. - * - * This procedure modifies the distance metric used in some - * computations, such as gimp_edit_blend(). In particular, it does not - * change the metric used in generic distance computation on canvas, as - * in the Measure tool. - * - * Returns: TRUE on success. - * - * Since: 2.10 - **/ -gboolean -gimp_context_set_distance_metric (GeglDistanceMetric metric) -{ - GimpParam *return_vals; - gint nreturn_vals; - gboolean success = TRUE; - - return_vals = gimp_run_procedure ("gimp-context-set-distance-metric", - &nreturn_vals, - GIMP_PDB_INT32, metric, - GIMP_PDB_END); - - success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; - - gimp_destroy_params (return_vals, nreturn_vals); - - return success; -} diff --git a/libgimp/gimpcontext_pdb.h b/libgimp/gimpcontext_pdb.h index cc09532524..079604837e 100644 --- a/libgimp/gimpcontext_pdb.h +++ b/libgimp/gimpcontext_pdb.h @@ -32,118 +32,128 @@ G_BEGIN_DECLS /* For information look into the C source or the html documentation */ -gboolean gimp_context_push (void); -gboolean gimp_context_pop (void); -gboolean gimp_context_set_defaults (void); -gboolean gimp_context_list_paint_methods (gint *num_paint_methods, - gchar ***paint_methods); -gchar* gimp_context_get_paint_method (void); -gboolean gimp_context_set_paint_method (const gchar *name); -GimpStrokeMethod gimp_context_get_stroke_method (void); -gboolean gimp_context_set_stroke_method (GimpStrokeMethod stroke_method); -gboolean gimp_context_get_foreground (GimpRGB *foreground); -gboolean gimp_context_set_foreground (const GimpRGB *foreground); -gboolean gimp_context_get_background (GimpRGB *background); -gboolean gimp_context_set_background (const GimpRGB *background); -gboolean gimp_context_set_default_colors (void); -gboolean gimp_context_swap_colors (void); -gdouble gimp_context_get_opacity (void); -gboolean gimp_context_set_opacity (gdouble opacity); -GimpLayerMode gimp_context_get_paint_mode (void); -gboolean gimp_context_set_paint_mode (GimpLayerMode paint_mode); -gdouble gimp_context_get_line_width (void); -gboolean gimp_context_set_line_width (gdouble line_width); -GimpUnit gimp_context_get_line_width_unit (void); -gboolean gimp_context_set_line_width_unit (GimpUnit line_width_unit); -GimpCapStyle gimp_context_get_line_cap_style (void); -gboolean gimp_context_set_line_cap_style (GimpCapStyle cap_style); -GimpJoinStyle gimp_context_get_line_join_style (void); -gboolean gimp_context_set_line_join_style (GimpJoinStyle join_style); -gdouble gimp_context_get_line_miter_limit (void); -gboolean gimp_context_set_line_miter_limit (gdouble miter_limit); -gdouble gimp_context_get_line_dash_offset (void); -gboolean gimp_context_set_line_dash_offset (gdouble dash_offset); -gboolean gimp_context_get_line_dash_pattern (gint *num_dashes, - gdouble **dashes); -gboolean gimp_context_set_line_dash_pattern (gint num_dashes, - const gdouble *dashes); -gchar* gimp_context_get_brush (void); -gboolean gimp_context_set_brush (const gchar *name); -gdouble gimp_context_get_brush_size (void); -gboolean gimp_context_set_brush_size (gdouble size); -gboolean gimp_context_set_brush_default_size (void); -gdouble gimp_context_get_brush_aspect_ratio (void); -gboolean gimp_context_set_brush_aspect_ratio (gdouble aspect); -gdouble gimp_context_get_brush_angle (void); -gboolean gimp_context_set_brush_angle (gdouble angle); -gdouble gimp_context_get_brush_spacing (void); -gboolean gimp_context_set_brush_spacing (gdouble spacing); -gboolean gimp_context_set_brush_default_spacing (void); -gdouble gimp_context_get_brush_hardness (void); -gboolean gimp_context_set_brush_hardness (gdouble hardness); -gboolean gimp_context_set_brush_default_hardness (void); -gdouble gimp_context_get_brush_force (void); -gboolean gimp_context_set_brush_force (gdouble force); -gchar* gimp_context_get_dynamics (void); -gboolean gimp_context_set_dynamics (const gchar *name); -gchar* gimp_context_get_mypaint_brush (void); -gboolean gimp_context_set_mypaint_brush (const gchar *name); -gchar* gimp_context_get_pattern (void); -gboolean gimp_context_set_pattern (const gchar *name); -gchar* gimp_context_get_gradient (void); -gboolean gimp_context_set_gradient (const gchar *name); -gchar* gimp_context_get_palette (void); -gboolean gimp_context_set_palette (const gchar *name); -gchar* gimp_context_get_font (void); -gboolean gimp_context_set_font (const gchar *name); -gboolean gimp_context_get_antialias (void); -gboolean gimp_context_set_antialias (gboolean antialias); -gboolean gimp_context_get_feather (void); -gboolean gimp_context_set_feather (gboolean feather); -gboolean gimp_context_get_feather_radius (gdouble *feather_radius_x, - gdouble *feather_radius_y); -gboolean gimp_context_set_feather_radius (gdouble feather_radius_x, - gdouble feather_radius_y); -gboolean gimp_context_get_sample_merged (void); -gboolean gimp_context_set_sample_merged (gboolean sample_merged); -GimpSelectCriterion gimp_context_get_sample_criterion (void); -gboolean gimp_context_set_sample_criterion (GimpSelectCriterion sample_criterion); -gdouble gimp_context_get_sample_threshold (void); -gboolean gimp_context_set_sample_threshold (gdouble sample_threshold); -gint gimp_context_get_sample_threshold_int (void); -gboolean gimp_context_set_sample_threshold_int (gint sample_threshold); -gboolean gimp_context_get_sample_transparent (void); -gboolean gimp_context_set_sample_transparent (gboolean sample_transparent); -gboolean gimp_context_get_diagonal_neighbors (void); -gboolean gimp_context_set_diagonal_neighbors (gboolean diagonal_neighbors); -GimpInterpolationType gimp_context_get_interpolation (void); -gboolean gimp_context_set_interpolation (GimpInterpolationType interpolation); -GimpTransformDirection gimp_context_get_transform_direction (void); -gboolean gimp_context_set_transform_direction (GimpTransformDirection transform_direction); -GimpTransformResize gimp_context_get_transform_resize (void); -gboolean gimp_context_set_transform_resize (GimpTransformResize transform_resize); +gboolean gimp_context_push (void); +gboolean gimp_context_pop (void); +gboolean gimp_context_set_defaults (void); +gboolean gimp_context_list_paint_methods (gint *num_paint_methods, + gchar ***paint_methods); +gchar* gimp_context_get_paint_method (void); +gboolean gimp_context_set_paint_method (const gchar *name); +GimpStrokeMethod gimp_context_get_stroke_method (void); +gboolean gimp_context_set_stroke_method (GimpStrokeMethod stroke_method); +gboolean gimp_context_get_foreground (GimpRGB *foreground); +gboolean gimp_context_set_foreground (const GimpRGB *foreground); +gboolean gimp_context_get_background (GimpRGB *background); +gboolean gimp_context_set_background (const GimpRGB *background); +gboolean gimp_context_set_default_colors (void); +gboolean gimp_context_swap_colors (void); +gdouble gimp_context_get_opacity (void); +gboolean gimp_context_set_opacity (gdouble opacity); +GimpLayerMode gimp_context_get_paint_mode (void); +gboolean gimp_context_set_paint_mode (GimpLayerMode paint_mode); +gdouble gimp_context_get_line_width (void); +gboolean gimp_context_set_line_width (gdouble line_width); +GimpUnit gimp_context_get_line_width_unit (void); +gboolean gimp_context_set_line_width_unit (GimpUnit line_width_unit); +GimpCapStyle gimp_context_get_line_cap_style (void); +gboolean gimp_context_set_line_cap_style (GimpCapStyle cap_style); +GimpJoinStyle gimp_context_get_line_join_style (void); +gboolean gimp_context_set_line_join_style (GimpJoinStyle join_style); +gdouble gimp_context_get_line_miter_limit (void); +gboolean gimp_context_set_line_miter_limit (gdouble miter_limit); +gdouble gimp_context_get_line_dash_offset (void); +gboolean gimp_context_set_line_dash_offset (gdouble dash_offset); +gboolean gimp_context_get_line_dash_pattern (gint *num_dashes, + gdouble **dashes); +gboolean gimp_context_set_line_dash_pattern (gint num_dashes, + const gdouble *dashes); +gchar* gimp_context_get_brush (void); +gboolean gimp_context_set_brush (const gchar *name); +gdouble gimp_context_get_brush_size (void); +gboolean gimp_context_set_brush_size (gdouble size); +gboolean gimp_context_set_brush_default_size (void); +gdouble gimp_context_get_brush_aspect_ratio (void); +gboolean gimp_context_set_brush_aspect_ratio (gdouble aspect); +gdouble gimp_context_get_brush_angle (void); +gboolean gimp_context_set_brush_angle (gdouble angle); +gdouble gimp_context_get_brush_spacing (void); +gboolean gimp_context_set_brush_spacing (gdouble spacing); +gboolean gimp_context_set_brush_default_spacing (void); +gdouble gimp_context_get_brush_hardness (void); +gboolean gimp_context_set_brush_hardness (gdouble hardness); +gboolean gimp_context_set_brush_default_hardness (void); +gdouble gimp_context_get_brush_force (void); +gboolean gimp_context_set_brush_force (gdouble force); +gchar* gimp_context_get_dynamics (void); +gboolean gimp_context_set_dynamics (const gchar *name); +gchar* gimp_context_get_mypaint_brush (void); +gboolean gimp_context_set_mypaint_brush (const gchar *name); +gchar* gimp_context_get_pattern (void); +gboolean gimp_context_set_pattern (const gchar *name); +gchar* gimp_context_get_gradient (void); +gboolean gimp_context_set_gradient (const gchar *name); +gboolean gimp_context_set_gradient_fg_bg_rgb (void); +gboolean gimp_context_set_gradient_fg_bg_hsv_cw (void); +gboolean gimp_context_set_gradient_fg_bg_hsv_ccw (void); +gboolean gimp_context_set_gradient_fg_transparent (void); +GimpGradientBlendColorSpace gimp_context_get_gradient_blend_color_space (void); +gboolean gimp_context_set_gradient_blend_color_space (GimpGradientBlendColorSpace blend_color_space); +GimpRepeatMode gimp_context_get_gradient_repeat_mode (void); +gboolean gimp_context_set_gradient_repeat_mode (GimpRepeatMode repeat_mode); +gboolean gimp_context_get_gradient_reverse (void); +gboolean gimp_context_set_gradient_reverse (gboolean reverse); +gchar* gimp_context_get_palette (void); +gboolean gimp_context_set_palette (const gchar *name); +gchar* gimp_context_get_font (void); +gboolean gimp_context_set_font (const gchar *name); +gboolean gimp_context_get_antialias (void); +gboolean gimp_context_set_antialias (gboolean antialias); +gboolean gimp_context_get_feather (void); +gboolean gimp_context_set_feather (gboolean feather); +gboolean gimp_context_get_feather_radius (gdouble *feather_radius_x, + gdouble *feather_radius_y); +gboolean gimp_context_set_feather_radius (gdouble feather_radius_x, + gdouble feather_radius_y); +gboolean gimp_context_get_sample_merged (void); +gboolean gimp_context_set_sample_merged (gboolean sample_merged); +GimpSelectCriterion gimp_context_get_sample_criterion (void); +gboolean gimp_context_set_sample_criterion (GimpSelectCriterion sample_criterion); +gdouble gimp_context_get_sample_threshold (void); +gboolean gimp_context_set_sample_threshold (gdouble sample_threshold); +gint gimp_context_get_sample_threshold_int (void); +gboolean gimp_context_set_sample_threshold_int (gint sample_threshold); +gboolean gimp_context_get_sample_transparent (void); +gboolean gimp_context_set_sample_transparent (gboolean sample_transparent); +gboolean gimp_context_get_diagonal_neighbors (void); +gboolean gimp_context_set_diagonal_neighbors (gboolean diagonal_neighbors); +GeglDistanceMetric gimp_context_get_distance_metric (void); +gboolean gimp_context_set_distance_metric (GeglDistanceMetric metric); +GimpInterpolationType gimp_context_get_interpolation (void); +gboolean gimp_context_set_interpolation (GimpInterpolationType interpolation); +GimpTransformDirection gimp_context_get_transform_direction (void); +gboolean gimp_context_set_transform_direction (GimpTransformDirection transform_direction); +GimpTransformResize gimp_context_get_transform_resize (void); +gboolean gimp_context_set_transform_resize (GimpTransformResize transform_resize); GIMP_DEPRECATED -gint gimp_context_get_transform_recursion (void); +gint gimp_context_get_transform_recursion (void); GIMP_DEPRECATED -gboolean gimp_context_set_transform_recursion (gint transform_recursion); -gdouble gimp_context_get_ink_size (void); -gboolean gimp_context_set_ink_size (gdouble size); -gdouble gimp_context_get_ink_angle (void); -gboolean gimp_context_set_ink_angle (gdouble angle); -gdouble gimp_context_get_ink_size_sensitivity (void); -gboolean gimp_context_set_ink_size_sensitivity (gdouble size); -gdouble gimp_context_get_ink_tilt_sensitivity (void); -gboolean gimp_context_set_ink_tilt_sensitivity (gdouble tilt); -gdouble gimp_context_get_ink_speed_sensitivity (void); -gboolean gimp_context_set_ink_speed_sensitivity (gdouble speed); -GimpInkBlobType gimp_context_get_ink_blob_type (void); -gboolean gimp_context_set_ink_blob_type (GimpInkBlobType type); -gdouble gimp_context_get_ink_blob_aspect_ratio (void); -gboolean gimp_context_set_ink_blob_aspect_ratio (gdouble aspect); -gdouble gimp_context_get_ink_blob_angle (void); -gboolean gimp_context_set_ink_blob_angle (gdouble angle); -GeglDistanceMetric gimp_context_get_distance_metric (void); -gboolean gimp_context_set_distance_metric (GeglDistanceMetric metric); +gboolean gimp_context_set_transform_recursion (gint transform_recursion); +gdouble gimp_context_get_ink_size (void); +gboolean gimp_context_set_ink_size (gdouble size); +gdouble gimp_context_get_ink_angle (void); +gboolean gimp_context_set_ink_angle (gdouble angle); +gdouble gimp_context_get_ink_size_sensitivity (void); +gboolean gimp_context_set_ink_size_sensitivity (gdouble size); +gdouble gimp_context_get_ink_tilt_sensitivity (void); +gboolean gimp_context_set_ink_tilt_sensitivity (gdouble tilt); +gdouble gimp_context_get_ink_speed_sensitivity (void); +gboolean gimp_context_set_ink_speed_sensitivity (gdouble speed); +GimpInkBlobType gimp_context_get_ink_blob_type (void); +gboolean gimp_context_set_ink_blob_type (GimpInkBlobType type); +gdouble gimp_context_get_ink_blob_aspect_ratio (void); +gboolean gimp_context_set_ink_blob_aspect_ratio (gdouble aspect); +gdouble gimp_context_get_ink_blob_angle (void); +gboolean gimp_context_set_ink_blob_angle (gdouble angle); G_END_DECLS diff --git a/libgimp/gimpdrawableedit_pdb.c b/libgimp/gimpdrawableedit_pdb.c new file mode 100644 index 0000000000..cea956f839 --- /dev/null +++ b/libgimp/gimpdrawableedit_pdb.c @@ -0,0 +1,320 @@ +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-2003 Peter Mattis and Spencer Kimball + * + * gimpdrawableedit_pdb.c + * + * This library is free software: you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * . + */ + +/* NOTE: This file is auto-generated by pdbgen.pl */ + +#include "config.h" + +#include "gimp.h" + + +/** + * SECTION: gimpdrawableedit + * @title: gimpdrawableedit + * @short_description: Drawable edit functions (clear, fill, gradient, stroke etc.) + * + * Drawable edit functions (clear, fill, gradient, stroke etc.) + **/ + + +/** + * gimp_drawable_edit_clear: + * @drawable_ID: The drawable to clear from. + * + * Clear selected area of drawable. + * + * This procedure clears the specified drawable. If the drawable has an + * alpha channel, the cleared pixels will become transparent. If the + * drawable does not have an alpha channel, cleared pixels will be set + * to the background color. This procedure only affects regions within + * a selection if there is a selection active. + * + * This procedure is affected by the following context setters: + * gimp_context_set_background(). + * + * Returns: TRUE on success. + **/ +gboolean +gimp_drawable_edit_clear (gint32 drawable_ID) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-drawable-edit-clear", + &nreturn_vals, + GIMP_PDB_DRAWABLE, drawable_ID, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} + +/** + * gimp_drawable_edit_fill: + * @drawable_ID: The drawable to fill to. + * @fill_type: The type of fill. + * + * Fill selected area of drawable. + * + * This procedure fills the specified drawable according to fill mode. + * This procedure only affects regions within a selection if there is a + * selection active. If you want to fill the whole drawable, regardless + * of the selection, use gimp_drawable_fill(). + * + * This procedure is affected by the following context setters: + * gimp_context_set_opacity(), gimp_context_set_paint_mode(), + * gimp_context_set_foreground(), gimp_context_set_background(), + * gimp_context_set_pattern(). + * + * Returns: TRUE on success. + **/ +gboolean +gimp_drawable_edit_fill (gint32 drawable_ID, + GimpFillType fill_type) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-drawable-edit-fill", + &nreturn_vals, + GIMP_PDB_DRAWABLE, drawable_ID, + GIMP_PDB_INT32, fill_type, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} + +/** + * gimp_drawable_edit_bucket_fill: + * @drawable_ID: The affected drawable. + * @fill_type: The type of fill. + * @x: The x coordinate of this bucket fill's application. + * @y: The y coordinate of this bucket fill's application. + * + * Fill the area by a seed fill starting at the specified coordinates. + * + * This procedure does a seed fill at the specified coordinates, using + * various parameters from the current context. + * In the case of merged sampling, the x and y coordinates are relative + * to the image's origin; otherwise, they are relative to the + * drawable's origin. + * + * This procedure is affected by the following context setters: + * gimp_context_set_opacity(), gimp_context_set_paint_mode(), + * gimp_context_set_foreground(), gimp_context_set_background(), + * gimp_context_set_pattern(), gimp_context_set_sample_threshold(), + * gimp_context_set_sample_merged(), + * gimp_context_set_sample_criterion(), + * gimp_context_set_diagonal_neighbors(), gimp_context_set_antialias(). + * + * Returns: TRUE on success. + * + * Since: 2.10 + **/ +gboolean +gimp_drawable_edit_bucket_fill (gint32 drawable_ID, + GimpFillType fill_type, + gdouble x, + gdouble y) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-drawable-edit-bucket-fill", + &nreturn_vals, + GIMP_PDB_DRAWABLE, drawable_ID, + GIMP_PDB_INT32, fill_type, + GIMP_PDB_FLOAT, x, + GIMP_PDB_FLOAT, y, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} + +/** + * gimp_drawable_edit_gradient_fill: + * @drawable_ID: The affected drawable. + * @gradient_type: The type of gradient. + * @offset: Offset relates to the starting and ending coordinates specified for the blend. This parameter is mode dependent. + * @supersample: Do adaptive supersampling. + * @supersample_max_depth: Maximum recursion levels for supersampling. + * @supersample_threshold: Supersampling threshold. + * @dither: Use dithering to reduce banding. + * @x1: The x coordinate of this gradient's starting point. + * @y1: The y coordinate of this gradient's starting point. + * @x2: The x coordinate of this gradient's ending point. + * @y2: The y coordinate of this gradient's ending point. + * + * Draw a gradient between the starting and ending coordinates with the + * specified gradient type. + * + * This tool requires information on the gradient type. It creates the + * specified variety of gradient using the starting and ending + * coordinates as defined for each gradient type. For shapeburst + * gradient types, the context's distance metric is also relevant and + * can be updated with gimp_context_set_distance_metric(). + * + * This procedure is affected by the following context setters: + * gimp_context_set_opacity(), gimp_context_set_paint_mode(), + * gimp_context_set_foreground(), gimp_context_set_background(), + * gimp_context_set_gradient() and all gradient property settings, + * gimp_context_set_distance_metric(). + * + * Returns: TRUE on success. + * + * Since: 2.10 + **/ +gboolean +gimp_drawable_edit_gradient_fill (gint32 drawable_ID, + GimpGradientType gradient_type, + gdouble offset, + gboolean supersample, + gint supersample_max_depth, + gdouble supersample_threshold, + gboolean dither, + gdouble x1, + gdouble y1, + gdouble x2, + gdouble y2) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-drawable-edit-gradient-fill", + &nreturn_vals, + GIMP_PDB_DRAWABLE, drawable_ID, + GIMP_PDB_INT32, gradient_type, + GIMP_PDB_FLOAT, offset, + GIMP_PDB_INT32, supersample, + GIMP_PDB_INT32, supersample_max_depth, + GIMP_PDB_FLOAT, supersample_threshold, + GIMP_PDB_INT32, dither, + GIMP_PDB_FLOAT, x1, + GIMP_PDB_FLOAT, y1, + GIMP_PDB_FLOAT, x2, + GIMP_PDB_FLOAT, y2, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} + +/** + * gimp_drawable_edit_stroke_selection: + * @drawable_ID: The drawable to stroke to. + * + * Stroke the current selection + * + * This procedure strokes the current selection, painting along the + * selection boundary with the active paint method and brush, or using + * a plain line with configurable properties. The paint is applied to + * the specified drawable regardless of the active selection. + * + * This procedure is affected by the following context setters: + * gimp_context_set_opacity(), gimp_context_set_paint_mode(), + * gimp_context_set_paint_method(), gimp_context_set_stroke_method(), + * gimp_context_set_foreground(), gimp_context_set_brush() and all + * brush property settings, gimp_context_set_gradient() and all + * gradient property settings, gimp_context_set_line_width() and all + * line property settings. + * + * Returns: TRUE on success. + **/ +gboolean +gimp_drawable_edit_stroke_selection (gint32 drawable_ID) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-drawable-edit-stroke-selection", + &nreturn_vals, + GIMP_PDB_DRAWABLE, drawable_ID, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} + +/** + * gimp_drawable_edit_stroke_item: + * @drawable_ID: The drawable to stroke to. + * @item_ID: The item to stroke. + * + * Stroke the specified item + * + * This procedure strokes the specified item, painting along its + * outline (e.g. along a path, or along a channel's boundary), with the + * active paint method and brush, or using a plain line with + * configurable properties. + * + * This procedure is affected by the following context setters: + * gimp_context_set_opacity(), gimp_context_set_paint_mode(), + * gimp_context_set_paint_method(), gimp_context_set_stroke_method(), + * gimp_context_set_foreground(), gimp_context_set_brush() and all + * brush property settings, gimp_context_set_gradient() and all + * gradient property settings, gimp_context_set_line_width() and all + * line property settings. + * + * Returns: TRUE on success. + * + * Since: 2.10 + **/ +gboolean +gimp_drawable_edit_stroke_item (gint32 drawable_ID, + gint32 item_ID) +{ + GimpParam *return_vals; + gint nreturn_vals; + gboolean success = TRUE; + + return_vals = gimp_run_procedure ("gimp-drawable-edit-stroke-item", + &nreturn_vals, + GIMP_PDB_DRAWABLE, drawable_ID, + GIMP_PDB_ITEM, item_ID, + GIMP_PDB_END); + + success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; + + gimp_destroy_params (return_vals, nreturn_vals); + + return success; +} diff --git a/libgimp/gimpdrawableedit_pdb.h b/libgimp/gimpdrawableedit_pdb.h new file mode 100644 index 0000000000..16717c04bf --- /dev/null +++ b/libgimp/gimpdrawableedit_pdb.h @@ -0,0 +1,60 @@ +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-2003 Peter Mattis and Spencer Kimball + * + * gimpdrawableedit_pdb.h + * + * This library is free software: you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * . + */ + +/* NOTE: This file is auto-generated by pdbgen.pl */ + +#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION) +#error "Only can be included directly." +#endif + +#ifndef __GIMP_DRAWABLE_EDIT_PDB_H__ +#define __GIMP_DRAWABLE_EDIT_PDB_H__ + +G_BEGIN_DECLS + +/* For information look into the C source or the html documentation */ + + +gboolean gimp_drawable_edit_clear (gint32 drawable_ID); +gboolean gimp_drawable_edit_fill (gint32 drawable_ID, + GimpFillType fill_type); +gboolean gimp_drawable_edit_bucket_fill (gint32 drawable_ID, + GimpFillType fill_type, + gdouble x, + gdouble y); +gboolean gimp_drawable_edit_gradient_fill (gint32 drawable_ID, + GimpGradientType gradient_type, + gdouble offset, + gboolean supersample, + gint supersample_max_depth, + gdouble supersample_threshold, + gboolean dither, + gdouble x1, + gdouble y1, + gdouble x2, + gdouble y2); +gboolean gimp_drawable_edit_stroke_selection (gint32 drawable_ID); +gboolean gimp_drawable_edit_stroke_item (gint32 drawable_ID, + gint32 item_ID); + + +G_END_DECLS + +#endif /* __GIMP_DRAWABLE_EDIT_PDB_H__ */ diff --git a/libgimp/gimpedit_pdb.c b/libgimp/gimpedit_pdb.c index b61b80d068..3eb8340cf9 100644 --- a/libgimp/gimpedit_pdb.c +++ b/libgimp/gimpedit_pdb.c @@ -428,6 +428,8 @@ gimp_edit_named_paste_as_new_image (const gchar *buffer_name) * to the background color. This procedure only affects regions within * a selection if there is a selection active. * + * Deprecated: Use gimp_drawable_edit_clear() instead. + * * Returns: TRUE on success. **/ gboolean @@ -464,6 +466,8 @@ gimp_edit_clear (gint32 drawable_ID) * If you want to fill the whole drawable, regardless of the selection, * use gimp_drawable_fill(). * + * Deprecated: Use gimp_drawable_edit_fill() instead. + * * Returns: TRUE on success. **/ gboolean @@ -514,6 +518,8 @@ gimp_edit_fill (gint32 drawable_ID, * coordinates are relative to the image's origin; otherwise, they are * relative to the drawable's origin. * + * Deprecated: Use gimp_drawable_edit_bucket_fill() instead. + * * Returns: TRUE on success. **/ gboolean @@ -578,6 +584,8 @@ gimp_edit_bucket_fill (gint32 drawable_ID, * coordinates are relative to the image's origin; otherwise, they are * relative to the drawable's origin. * + * Deprecated: Use gimp_drawable_edit_bucket_fill() instead. + * * Returns: TRUE on success. * * Since: 2.4 @@ -648,6 +656,8 @@ gimp_edit_bucket_fill_full (gint32 drawable_ID, * distance metric is also relevant and can be updated with * gimp_context_set_distance_metric(). * + * Deprecated: Use gimp_drawable_edit_gradient_fill() instead. + * * Returns: TRUE on success. **/ gboolean @@ -710,6 +720,8 @@ gimp_edit_blend (gint32 drawable_ID, * paint is applied to the specified drawable regardless of the active * selection. * + * Deprecated: Use gimp_drawable_edit_stroke_selection() instead. + * * Returns: TRUE on success. **/ gboolean @@ -741,6 +753,8 @@ gimp_edit_stroke (gint32 drawable_ID) * This procedure strokes the specified vectors object, painting along * the path with the active brush and foreground color. * + * Deprecated: Use gimp_drawable_edit_stroke_item() instead. + * * Returns: TRUE on success. * * Since: 2.4 diff --git a/libgimp/gimpedit_pdb.h b/libgimp/gimpedit_pdb.h index 7a9f27d39e..0c64bb78e9 100644 --- a/libgimp/gimpedit_pdb.h +++ b/libgimp/gimpedit_pdb.h @@ -48,9 +48,12 @@ gint32 gimp_edit_named_paste (gint32 drawable_ID, const gchar *buffer_name, gboolean paste_into); gint32 gimp_edit_named_paste_as_new_image (const gchar *buffer_name); +GIMP_DEPRECATED_FOR(gimp_drawable_edit_clear) gboolean gimp_edit_clear (gint32 drawable_ID); +GIMP_DEPRECATED_FOR(gimp_drawable_edit_fill) gboolean gimp_edit_fill (gint32 drawable_ID, GimpFillType fill_type); +GIMP_DEPRECATED_FOR(gimp_drawable_edit_bucket_fill) gboolean gimp_edit_bucket_fill (gint32 drawable_ID, GimpBucketFillMode fill_mode, GimpLayerMode paint_mode, @@ -59,6 +62,7 @@ gboolean gimp_edit_bucket_fill (gint32 drawable_ID, gboolean sample_merged, gdouble x, gdouble y); +GIMP_DEPRECATED_FOR(gimp_drawable_edit_bucket_fill) gboolean gimp_edit_bucket_fill_full (gint32 drawable_ID, GimpBucketFillMode fill_mode, GimpLayerMode paint_mode, @@ -69,6 +73,7 @@ gboolean gimp_edit_bucket_fill_full (gint32 drawable_ID, GimpSelectCriterion select_criterion, gdouble x, gdouble y); +GIMP_DEPRECATED_FOR(gimp_drawable_edit_gradient_fill) gboolean gimp_edit_blend (gint32 drawable_ID, GimpBlendMode blend_mode, GimpLayerMode paint_mode, @@ -85,7 +90,9 @@ gboolean gimp_edit_blend (gint32 drawable_ID, gdouble y1, gdouble x2, gdouble y2); +GIMP_DEPRECATED_FOR(gimp_drawable_edit_stroke_selection) gboolean gimp_edit_stroke (gint32 drawable_ID); +GIMP_DEPRECATED_FOR(gimp_drawable_edit_stroke_item) gboolean gimp_edit_stroke_vectors (gint32 drawable_ID, gint32 vectors_ID); diff --git a/libgimp/gimpenums.c b/libgimp/gimpenums.c index 5a5dee9c4c..a5db36452f 100644 --- a/libgimp/gimpenums.c +++ b/libgimp/gimpenums.c @@ -360,6 +360,7 @@ static const GimpGetTypeFunc get_type_funcs[] = gimp_dodge_burn_type_get_type, gimp_fill_type_get_type, gimp_foreground_extract_mode_get_type, + gimp_gradient_blend_color_space_get_type, gimp_gradient_segment_color_get_type, gimp_gradient_segment_type_get_type, gimp_gradient_type_get_type, @@ -427,6 +428,7 @@ static const gchar * const type_names[] = "GimpDodgeBurnType", "GimpFillType", "GimpForegroundExtractMode", + "GimpGradientBlendColorSpace", "GimpGradientSegmentColor", "GimpGradientSegmentType", "GimpGradientType", diff --git a/libgimp/gimpenums.c.tail b/libgimp/gimpenums.c.tail index e1d1c96804..e8821e2313 100644 --- a/libgimp/gimpenums.c.tail +++ b/libgimp/gimpenums.c.tail @@ -24,6 +24,7 @@ static const GimpGetTypeFunc get_type_funcs[] = gimp_dodge_burn_type_get_type, gimp_fill_type_get_type, gimp_foreground_extract_mode_get_type, + gimp_gradient_blend_color_space_get_type, gimp_gradient_segment_color_get_type, gimp_gradient_segment_type_get_type, gimp_gradient_type_get_type, @@ -91,6 +92,7 @@ static const gchar * const type_names[] = "GimpDodgeBurnType", "GimpFillType", "GimpForegroundExtractMode", + "GimpGradientBlendColorSpace", "GimpGradientSegmentColor", "GimpGradientSegmentType", "GimpGradientType", diff --git a/libgimp/gimpexport.c b/libgimp/gimpexport.c index d064a0bc2d..af9f4dafae 100644 --- a/libgimp/gimpexport.c +++ b/libgimp/gimpexport.c @@ -100,7 +100,7 @@ export_merge (gint32 image_ID, 100.0, GIMP_LAYER_MODE_NORMAL); gimp_image_insert_layer (image_ID, transp, -1, 1); gimp_selection_none (image_ID); - gimp_edit_clear (transp); + gimp_drawable_edit_clear (transp); nvisible++; } diff --git a/libgimp/gimpimageselect_pdb.c b/libgimp/gimpimageselect_pdb.c index 59c969d9c5..ea1cea6c4d 100644 --- a/libgimp/gimpimageselect_pdb.c +++ b/libgimp/gimpimageselect_pdb.c @@ -51,12 +51,14 @@ * (as determined by the threshold and criterion context values) are * included in the selection. To select transparent regions, the color * specified must also have minimum alpha. + * * This procedure is affected by the following context setters: * gimp_context_set_antialias(), gimp_context_set_feather(), * gimp_context_set_feather_radius(), gimp_context_set_sample_merged(), * gimp_context_set_sample_criterion(), * gimp_context_set_sample_threshold(), * gimp_context_set_sample_transparent(). + * * In the case of a merged sampling, the supplied drawable is ignored. * * Returns: TRUE on success. @@ -111,6 +113,7 @@ gimp_image_select_color (gint32 image_ID, * the final selection mask will contain intermediate values based on * close misses to the threshold bar at pixels along the seed fill * boundary. + * * This procedure is affected by the following context setters: * gimp_context_set_antialias(), gimp_context_set_feather(), * gimp_context_set_feather_radius(), gimp_context_set_sample_merged(), @@ -118,6 +121,7 @@ gimp_image_select_color (gint32 image_ID, * gimp_context_set_sample_threshold(), * gimp_context_set_sample_transparent(), * gimp_context_set_diagonal_neighbors(). + * * In the case of a merged sampling, the supplied drawable is ignored. * If the sample is merged, the specified coordinates are relative to * the image origin; otherwise, they are relative to the drawable's @@ -168,6 +172,7 @@ gimp_image_select_contiguous_color (gint32 image_ID, * This tool creates a rectangular selection over the specified image. * The rectangular region can be either added to, subtracted from, or * replace the contents of the previous selection mask. + * * This procedure is affected by the following context setters: * gimp_context_set_feather(), gimp_context_set_feather_radius(). * @@ -222,6 +227,7 @@ gimp_image_select_rectangle (gint32 image_ID, * the specified image. The rectangular region can be either added to, * subtracted from, or replace the contents of the previous selection * mask. + * * This procedure is affected by the following context setters: * gimp_context_set_antialias(), gimp_context_set_feather(), * gimp_context_set_feather_radius(). @@ -277,6 +283,7 @@ gimp_image_select_round_rectangle (gint32 image_ID, * This tool creates an elliptical selection over the specified image. * The elliptical region can be either added to, subtracted from, or * replace the contents of the previous selection mask. + * * This procedure is affected by the following context setters: * gimp_context_set_antialias(), gimp_context_set_feather(), * gimp_context_set_feather_radius(). @@ -331,6 +338,7 @@ gimp_image_select_ellipse (gint32 image_ID, * Each point is defined by 2 floating point values which correspond to * the x and y coordinates. If the final point does not connect to the * starting point, a connecting segment is automatically added. + * * This procedure is affected by the following context setters: * gimp_context_set_antialias(), gimp_context_set_feather(), * gimp_context_set_feather_radius(). @@ -376,6 +384,7 @@ gimp_image_select_polygon (gint32 image_ID, * of the image the item belongs to. What exactly the item's outline is * depends on the item type: for layers, it's the layer's alpha * channel, for vectors the vector's shape. + * * This procedure is affected by the following context setters: * gimp_context_set_antialias(), gimp_context_set_feather(), * gimp_context_set_feather_radius(). diff --git a/libgimp/gimptextlayer_pdb.c b/libgimp/gimptextlayer_pdb.c index 5ef8af93ef..4634321324 100644 --- a/libgimp/gimptextlayer_pdb.c +++ b/libgimp/gimptextlayer_pdb.c @@ -1091,6 +1091,12 @@ gimp_text_layer_get_hinting (gint32 layer_ID, * @hinting: Enable/disable the use of hinting on the text. * @autohint: Force the use of the autohinter provided through FreeType. * + * Enable/disable the use of hinting in a text layer. + * + * This procedure enables or disables hinting on the text of a text + * layer. If you enable 'auto-hint', FreeType\'s automatic hinter will + * be used and hinting information from the font will be ignored. + * * Deprecated: Use gimp_text_layer_set_hint_style() instead. * * Returns: TRUE on success. diff --git a/libgimp/gimpui.c b/libgimp/gimpui.c index 20ccc98816..3f6422db10 100644 --- a/libgimp/gimpui.c +++ b/libgimp/gimpui.c @@ -18,6 +18,9 @@ #include "config.h" +#ifdef GDK_DISABLE_DEPRECATED +#undef GDK_DISABLE_DEPRECATED +#endif #include #ifdef GDK_WINDOWING_WIN32 @@ -57,13 +60,26 @@ /* local function prototypes */ -static void gimp_ui_help_func (const gchar *help_id, - gpointer help_data); +static void gimp_ui_help_func (const gchar *help_id, + gpointer help_data); static void gimp_ensure_modules (void); -static void gimp_window_transient_realized (GtkWidget *window, - GdkWindow *parent); -static gboolean gimp_window_set_transient_for (GtkWindow *window, - GdkWindow *parent); +static void gimp_window_transient_realized (GtkWidget *window, + GdkWindow *parent); +static gboolean gimp_window_set_transient_for (GtkWindow *window, + GdkWindow *parent); + +static void gimp_ui_theme_changed (void); +static void gimp_ui_fix_pixbuf_style (void); +static void gimp_ui_draw_pixbuf_layout (GtkStyle *style, + GdkWindow *window, + GtkStateType state_type, + gboolean use_text, + GdkRectangle *area, + GtkWidget *widget, + const gchar *detail, + gint x, + gint y, + PangoLayout *layout); static gboolean gimp_ui_initialized = FALSE; @@ -133,6 +149,8 @@ gimp_ui_init (const gchar *prog_name, themerc = gimp_personal_rc_file ("themerc"); gtk_rc_parse (themerc); + gimp_ui_fix_pixbuf_style (); + file = g_file_new_for_path (themerc); g_free (themerc); @@ -140,7 +158,7 @@ gimp_ui_init (const gchar *prog_name, g_object_unref (file); g_signal_connect (rc_monitor, "changed", - G_CALLBACK (gtk_rc_reparse_all), + G_CALLBACK (gimp_ui_theme_changed), NULL); gdk_set_program_class (gimp_wm_class ()); @@ -391,3 +409,84 @@ gimp_window_set_transient_for (GtkWindow *window, return FALSE; } + +static void +gimp_ui_theme_changed (void) +{ + gtk_rc_reparse_all (); + + gimp_ui_fix_pixbuf_style (); +} + +static void +gimp_ui_fix_pixbuf_style (void) +{ + /* Same hack as in app/gui/themes.c, to be removed for GTK+ 3.x */ + + static GtkStyleClass *pixbuf_style_class = NULL; + + if (! pixbuf_style_class) + { + GType type = g_type_from_name ("PixbufStyle"); + + if (type) + { + pixbuf_style_class = g_type_class_ref (type); + + if (pixbuf_style_class) + pixbuf_style_class->draw_layout = gimp_ui_draw_pixbuf_layout; + } + } +} + +static void +gimp_ui_draw_pixbuf_layout (GtkStyle *style, + GdkWindow *window, + GtkStateType state_type, + gboolean use_text, + GdkRectangle *area, + GtkWidget *widget, + const gchar *detail, + gint x, + gint y, + PangoLayout *layout) +{ + GdkGC *gc; + + gc = use_text ? style->text_gc[state_type] : style->fg_gc[state_type]; + + if (area) + gdk_gc_set_clip_rectangle (gc, area); + + if (state_type == GTK_STATE_INSENSITIVE) + { + GdkGC *copy = gdk_gc_new (window); + GdkGCValues orig; + GdkColor fore; + guint16 r, g, b; + + gdk_gc_copy (copy, gc); + gdk_gc_get_values (gc, &orig); + + r = 0x40 + (((orig.foreground.pixel >> 16) & 0xff) >> 1); + g = 0x40 + (((orig.foreground.pixel >> 8) & 0xff) >> 1); + b = 0x40 + (((orig.foreground.pixel >> 0) & 0xff) >> 1); + + fore.pixel = (r << 16) | (g << 8) | b; + fore.red = r * 257; + fore.green = g * 257; + fore.blue = b * 257; + + gdk_gc_set_foreground (copy, &fore); + gdk_draw_layout (window, copy, x, y, layout); + + g_object_unref (copy); + } + else + { + gdk_draw_layout (window, gc, x, y, layout); + } + + if (area) + gdk_gc_set_clip_rectangle (gc, NULL); +} diff --git a/libgimpbase/Makefile.am b/libgimpbase/Makefile.am index 2f3ac24d7c..2b735f9753 100644 --- a/libgimpbase/Makefile.am +++ b/libgimpbase/Makefile.am @@ -6,6 +6,8 @@ endif if PLATFORM_OSX xobjective_c = "-xobjective-c" +xobjective_cxx = "-xobjective-c++" +xnone = "-xnone" framework_cocoa = -framework Cocoa endif @@ -64,13 +66,21 @@ AM_CPPFLAGS = \ $(GIO_CFLAGS) \ $(GEXIV2_CFLAGS) \ $(BINRELOC_CFLAGS) \ - -I$(includedir) \ + -I$(includedir) + +AM_CFLAGS = \ $(xobjective_c) +AM_CXXFLAGS = \ + $(xobjective_cxx) + AM_CCASFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) +AM_LDFLAGS = \ + $(xnone) + EXTRA_DIST = \ gimpbase.def @@ -163,7 +173,8 @@ libgimpbase_@GIMP_API_VERSION@_la_LDFLAGS = \ -version-info $(LT_VERSION_INFO) \ $(no_undefined) \ $(libgimpbase_export_symbols) \ - $(framework_cocoa) + $(framework_cocoa) \ + $(xnone) EXTRA_libgimpbase_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpbase_def) diff --git a/libgimpbase/Makefile.in b/libgimpbase/Makefile.in index cd92a3292c..ed1c61ed32 100644 --- a/libgimpbase/Makefile.in +++ b/libgimpbase/Makefile.in @@ -103,6 +103,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -495,7 +496,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -568,6 +569,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -796,6 +798,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -816,6 +819,8 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined @PLATFORM_OSX_TRUE@xobjective_c = "-xobjective-c" +@PLATFORM_OSX_TRUE@xobjective_cxx = "-xobjective-c++" +@PLATFORM_OSX_TRUE@xnone = "-xnone" @PLATFORM_OSX_TRUE@framework_cocoa = -framework Cocoa @OS_WIN32_TRUE@ole32_lib = -lole32 @OS_WIN32_TRUE@gimpbase_def = gimpbase.def @@ -841,13 +846,21 @@ AM_CPPFLAGS = \ $(GIO_CFLAGS) \ $(GEXIV2_CFLAGS) \ $(BINRELOC_CFLAGS) \ - -I$(includedir) \ + -I$(includedir) + +AM_CFLAGS = \ $(xobjective_c) +AM_CXXFLAGS = \ + $(xobjective_cxx) + AM_CCASFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) +AM_LDFLAGS = \ + $(xnone) + EXTRA_DIST = \ gimpbase.def @@ -932,7 +945,8 @@ libgimpbase_@GIMP_API_VERSION@_la_LDFLAGS = \ -version-info $(LT_VERSION_INFO) \ $(no_undefined) \ $(libgimpbase_export_symbols) \ - $(framework_cocoa) + $(framework_cocoa) \ + $(xnone) EXTRA_libgimpbase_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpbase_def) libgimpbase_@GIMP_API_VERSION@_la_LIBADD = \ diff --git a/libgimpbase/gimpbase.def b/libgimpbase/gimpbase.def index 794ec4ce2b..3c7c6a47f4 100644 --- a/libgimpbase/gimpbase.def +++ b/libgimpbase/gimpbase.def @@ -61,6 +61,7 @@ EXPORTS gimp_flags_value_get_desc gimp_flags_value_get_help gimp_foreground_extract_mode_get_type + gimp_gradient_blend_color_space_get_type gimp_gradient_segment_color_get_type gimp_gradient_segment_type_get_type gimp_gradient_type_get_type diff --git a/libgimpbase/gimpbaseenums.c b/libgimpbase/gimpbaseenums.c index 648940da24..4e4fa63cb7 100644 --- a/libgimpbase/gimpbaseenums.c +++ b/libgimpbase/gimpbaseenums.c @@ -628,6 +628,38 @@ gimp_foreground_extract_mode_get_type (void) return type; } +GType +gimp_gradient_blend_color_space_get_type (void) +{ + static const GEnumValue values[] = + { + { GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, "GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL", "rgb-perceptual" }, + { GIMP_GRADIENT_BLEND_RGB_LINEAR, "GIMP_GRADIENT_BLEND_RGB_LINEAR", "rgb-linear" }, + { GIMP_GRADIENT_BLEND_CIE_LAB, "GIMP_GRADIENT_BLEND_CIE_LAB", "cie-lab" }, + { 0, NULL, NULL } + }; + + static const GimpEnumDesc descs[] = + { + { GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, NC_("gradient-blend-color-space", "Perceptual RGB"), NULL }, + { GIMP_GRADIENT_BLEND_RGB_LINEAR, NC_("gradient-blend-color-space", "Linear RGB"), NULL }, + { GIMP_GRADIENT_BLEND_CIE_LAB, NC_("gradient-blend-color-space", "CIE Lab"), NULL }, + { 0, NULL, NULL } + }; + + static GType type = 0; + + if (G_UNLIKELY (! type)) + { + type = g_enum_register_static ("GimpGradientBlendColorSpace", values); + gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp"); + gimp_type_set_translation_context (type, "gradient-blend-color-space"); + gimp_enum_set_value_descriptions (type, descs); + } + + return type; +} + GType gimp_gradient_segment_color_get_type (void) { diff --git a/libgimpbase/gimpbaseenums.h b/libgimpbase/gimpbaseenums.h index 5064d7df86..61de91ea38 100644 --- a/libgimpbase/gimpbaseenums.h +++ b/libgimpbase/gimpbaseenums.h @@ -290,6 +290,7 @@ typedef enum #endif /* GIMP_DISABLE_DEPRECATED */ } GimpDesaturateMode; + #define GIMP_TYPE_DODGE_BURN_TYPE (gimp_dodge_burn_type_get_type ()) GType gimp_dodge_burn_type_get_type (void) G_GNUC_CONST; @@ -339,6 +340,18 @@ typedef enum } GimpForegroundExtractMode; +#define GIMP_TYPE_GRADIENT_BLEND_COLOR_SPACE (gimp_gradient_blend_color_space_get_type ()) + +GType gimp_gradient_blend_color_space_get_type (void) G_GNUC_CONST; + +typedef enum +{ + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, /*< desc="Perceptual RGB", nick=rgb-perceptual >*/ + GIMP_GRADIENT_BLEND_RGB_LINEAR, /*< desc="Linear RGB", nick=rgb-linear >*/ + GIMP_GRADIENT_BLEND_CIE_LAB /*< desc="CIE Lab", nick=cie-lab >*/ +} GimpGradientBlendColorSpace; + + #define GIMP_TYPE_GRADIENT_SEGMENT_COLOR (gimp_gradient_segment_color_get_type ()) GType gimp_gradient_segment_color_get_type (void) G_GNUC_CONST; diff --git a/libgimpbase/gimpmetadata.c b/libgimpbase/gimpmetadata.c index 2c9e43d443..15c346c337 100644 --- a/libgimpbase/gimpmetadata.c +++ b/libgimpbase/gimpmetadata.c @@ -848,6 +848,17 @@ gimp_metadata_load_from_file (GFile *file, #ifdef G_OS_WIN32 filename = g_win32_locale_filename_from_utf8 (path); + /* FIXME! + * This call can return NULL, which later crashes the call to + * gexiv2_metadata_open_path(). + * See bug 794949. + */ + if (! filename) + { + g_set_error (error, GIMP_METADATA_ERROR, 0, + _("Conversion of the filename to system codepage failed.")); + return NULL; + } #else filename = g_strdup (path); #endif diff --git a/libgimpbase/gimputils.c b/libgimpbase/gimputils.c index 4b7c14faa3..eb2c5ad7dc 100644 --- a/libgimpbase/gimputils.c +++ b/libgimpbase/gimputils.c @@ -38,6 +38,7 @@ #include #if defined(G_OS_WIN32) + /* This is a hack for Windows known directory support. * DATADIR (autotools-generated constant) is a type defined in objidl.h * so we must #undef it before including shlobj.h in order to avoid a @@ -45,15 +46,22 @@ #undef DATADIR #include #include + #else /* G_OS_WIN32 */ + /* For waitpid() */ #include #include #include +/* For thread IDs. */ +#include +#include + #ifdef HAVE_SYS_PRCTL_H #include #endif + #endif /* G_OS_WIN32 */ #include "gimpbasetypes.h" @@ -1152,9 +1160,9 @@ gimp_stack_trace_available (gboolean optimal) * Since: 2.10 **/ gboolean -gimp_stack_trace_print (const gchar *prog_name, - gpointer stream, - gchar **trace) +gimp_stack_trace_print (const gchar *prog_name, + gpointer stream, + gchar **trace) { gboolean stack_printed = FALSE; @@ -1162,13 +1170,19 @@ gimp_stack_trace_print (const gchar *prog_name, #ifndef G_OS_WIN32 GString *gtrace = NULL; gchar gimp_pid[16]; - pid_t pid; gchar buffer[256]; ssize_t read_n; int sync_fd[2]; int out_fd[2]; + pid_t fork_pid; + pid_t pid = getpid(); +#if defined(G_OS_WIN32) + DWORD tid = GetCurrentThreadId (); +#else + long tid = syscall (SYS_gettid); +#endif - g_snprintf (gimp_pid, 16, "%u", (guint) getpid ()); + g_snprintf (gimp_pid, 16, "%u", (guint) pid); if (pipe (sync_fd) == -1) { @@ -1183,17 +1197,19 @@ gimp_stack_trace_print (const gchar *prog_name, return FALSE; } - pid = fork (); - if (pid == 0) + fork_pid = fork (); + if (fork_pid == 0) { /* Child process. */ - gchar *args[7] = { "gdb", "-batch", "-ex", "backtrace full", + gchar *args[9] = { "gdb", "-batch", + "-ex", "info threads", + "-ex", "thread apply all backtrace full", (gchar *) prog_name, NULL, NULL }; if (prog_name == NULL) - args[4] = "-p"; + args[6] = "-p"; - args[5] = gimp_pid; + args[7] = gimp_pid; /* Wait until the parent enabled us to ptrace it. */ { @@ -1220,8 +1236,10 @@ gimp_stack_trace_print (const gchar *prog_name, { /* LLDB as alternative if the GDB call failed or if it was in * a too-old version. */ - gchar *args_lldb[11] = { "lldb", "--attach-pid", NULL, "--batch", - "--one-line", "bt", + gchar *args_lldb[15] = { "lldb", "--attach-pid", NULL, "--batch", + "--one-line", "thread list", + "--one-line", "thread backtrace all", + "--one-line", "bt all", "--one-line-on-crash", "bt", "--one-line-on-crash", "quit", NULL }; @@ -1232,7 +1250,7 @@ gimp_stack_trace_print (const gchar *prog_name, _exit (0); } - else if (pid > 0) + else if (fork_pid > 0) { /* Main process */ int status; @@ -1240,7 +1258,7 @@ gimp_stack_trace_print (const gchar *prog_name, /* Allow the child to ptrace us, and signal it to start. */ close (sync_fd[0]); #ifdef PR_SET_PTRACER - prctl (PR_SET_PTRACER, pid, 0, 0, 0); + prctl (PR_SET_PTRACER, fork_pid, 0, 0, 0); #endif close (sync_fd[1]); @@ -1252,6 +1270,20 @@ gimp_stack_trace_print (const gchar *prog_name, while ((read_n = read (out_fd[0], buffer, 256)) > 0) { + if (! stack_printed) + { + if (stream) + g_fprintf (stream, + "\n# Stack traces obtained from PID %d - Thread %lu #\n\n", + pid, tid); + if (trace) + { + gtrace = g_string_new (NULL); + g_string_printf (gtrace, + "\n# Stack traces obtained from PID %d - Thread %lu #\n\n", + pid, tid); + } + } /* It's hard to know if the debugger was found since it * happened in the child. Let's just assume that any output * means it succeeded. @@ -1262,11 +1294,7 @@ gimp_stack_trace_print (const gchar *prog_name, if (stream) g_fprintf (stream, "%s", buffer); if (trace) - { - if (! gtrace) - gtrace = g_string_new (NULL); - g_string_append (gtrace, (const gchar *) buffer); - } + g_string_append (gtrace, (const gchar *) buffer); } close (out_fd[0]); @@ -1275,9 +1303,9 @@ gimp_stack_trace_print (const gchar *prog_name, prctl (PR_SET_PTRACER, 0, 0, 0, 0); #endif - waitpid (pid, &status, 0); + waitpid (fork_pid, &status, 0); } - /* else if (pid == (pid_t) -1) + /* else if (fork_pid == (pid_t) -1) * Fork failed! * Just continue, maybe the backtrace() API will succeed. */ diff --git a/libgimpbase/gimpversion.h b/libgimpbase/gimpversion.h index 701d76f469..18aecaeab0 100644 --- a/libgimpbase/gimpversion.h +++ b/libgimpbase/gimpversion.h @@ -49,7 +49,7 @@ G_BEGIN_DECLS * * The GIMP version as a string. **/ -#define GIMP_VERSION "2.10.0-RC1" +#define GIMP_VERSION "2.10.0-RC2" /** * GIMP_API_VERSION: diff --git a/libgimpcolor/Makefile.in b/libgimpcolor/Makefile.in index f67c7fccd7..a09f4c1a8e 100644 --- a/libgimpcolor/Makefile.in +++ b/libgimpcolor/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -492,7 +493,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -565,6 +566,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -793,6 +795,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/libgimpconfig/Makefile.in b/libgimpconfig/Makefile.in index b05772bf61..ff0a7e5ba8 100644 --- a/libgimpconfig/Makefile.in +++ b/libgimpconfig/Makefile.in @@ -101,6 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -312,7 +313,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -385,6 +386,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -613,6 +615,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/libgimpmath/Makefile.in b/libgimpmath/Makefile.in index 3932094806..b5f63cb680 100644 --- a/libgimpmath/Makefile.in +++ b/libgimpmath/Makefile.in @@ -101,6 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -304,7 +305,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -377,6 +378,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -605,6 +607,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/libgimpmodule/Makefile.in b/libgimpmodule/Makefile.in index 1c537b130a..16b6f1bc54 100644 --- a/libgimpmodule/Makefile.in +++ b/libgimpmodule/Makefile.in @@ -101,6 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -306,7 +307,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -379,6 +380,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -607,6 +609,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/libgimpthumb/Makefile.am b/libgimpthumb/Makefile.am index ecb9933c52..33eea1dedb 100644 --- a/libgimpthumb/Makefile.am +++ b/libgimpthumb/Makefile.am @@ -6,6 +6,8 @@ endif if PLATFORM_OSX xobjective_c = "-xobjective-c" +xobjective_cxx = "-xobjective-c++" +xnone = "-xnone" framework_cocoa = -framework Cocoa endif @@ -50,9 +52,17 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ $(GDK_PIXBUF_CFLAGS) \ $(GIO_CFLAGS) \ - -I$(includedir) \ + -I$(includedir) + +AM_CFLAGS = \ $(xobjective_c) +AM_CXXFLAGS = \ + $(xobjective_cxx) + +AM_LDFLAGS = \ + $(xnone) + EXTRA_DIST = \ gimpthumb.def @@ -82,7 +92,8 @@ libgimpthumb_@GIMP_API_VERSION@_la_LDFLAGS = \ -version-info $(LT_VERSION_INFO) \ $(no_undefined) \ $(libgimpthumb_export_symbols) \ - $(framework_cocoa) + $(framework_cocoa) \ + $(xnone) libgimpthumb_@GIMP_API_VERSION@_la_LIBADD = \ $(GDK_PIXBUF_LIBS) \ diff --git a/libgimpthumb/Makefile.in b/libgimpthumb/Makefile.in index 9615404a6c..57128e60e4 100644 --- a/libgimpthumb/Makefile.in +++ b/libgimpthumb/Makefile.in @@ -103,6 +103,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -314,7 +315,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -387,6 +388,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -615,6 +617,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -635,6 +638,8 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined @PLATFORM_OSX_TRUE@xobjective_c = "-xobjective-c" +@PLATFORM_OSX_TRUE@xobjective_cxx = "-xobjective-c++" +@PLATFORM_OSX_TRUE@xnone = "-xnone" @PLATFORM_OSX_TRUE@framework_cocoa = -framework Cocoa @OS_WIN32_TRUE@gimpthumb_def = gimpthumb.def @OS_WIN32_TRUE@libgimpthumb_export_symbols = -export-symbols $(srcdir)/gimpthumb.def @@ -646,9 +651,17 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ $(GDK_PIXBUF_CFLAGS) \ $(GIO_CFLAGS) \ - -I$(includedir) \ + -I$(includedir) + +AM_CFLAGS = \ $(xobjective_c) +AM_CXXFLAGS = \ + $(xobjective_cxx) + +AM_LDFLAGS = \ + $(xnone) + EXTRA_DIST = \ gimpthumb.def @@ -677,7 +690,8 @@ libgimpthumb_@GIMP_API_VERSION@_la_LDFLAGS = \ -version-info $(LT_VERSION_INFO) \ $(no_undefined) \ $(libgimpthumb_export_symbols) \ - $(framework_cocoa) + $(framework_cocoa) \ + $(xnone) libgimpthumb_@GIMP_API_VERSION@_la_LIBADD = \ $(GDK_PIXBUF_LIBS) \ diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am index 032be6ef8f..02f8ca677d 100644 --- a/libgimpwidgets/Makefile.am +++ b/libgimpwidgets/Makefile.am @@ -13,6 +13,8 @@ endif if PLATFORM_OSX xobjective_c = "-xobjective-c" +xobjective_cxx = "-xobjective-c++" +xnone = "-xnone" framework_cocoa = -framework Cocoa endif @@ -58,9 +60,17 @@ AM_CPPFLAGS = \ $(GEGL_CFLAGS) \ $(GTK_CFLAGS) \ $(LCMS_CFLAGS) \ - -I$(includedir) \ + -I$(includedir) + +AM_CFLAGS = \ $(xobjective_c) +AM_CXXFLAGS = \ + $(xobjective_cxx) + +AM_LDFLAGS = \ + $(xnone) + lib_LTLIBRARIES = libgimpwidgets-@GIMP_API_VERSION@.la libgimpwidgets_sources = \ @@ -268,7 +278,8 @@ libgimpwidgets_@GIMP_API_VERSION@_la_LDFLAGS = \ -version-info $(LT_VERSION_INFO) \ $(no_undefined) \ $(libgimpwidgets_export_symbols) \ - $(framework_cocoa) + $(framework_cocoa) \ + $(xnone) EXTRA_libgimpwidgets_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpwidgets_def) diff --git a/libgimpwidgets/Makefile.in b/libgimpwidgets/Makefile.in index cc413af660..5358080b72 100644 --- a/libgimpwidgets/Makefile.in +++ b/libgimpwidgets/Makefile.in @@ -114,6 +114,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -581,7 +582,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -654,6 +655,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -882,6 +884,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -907,6 +910,8 @@ libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION). @PLATFORM_WIN32_TRUE@libgdi32 = -lgdi32 @PLATFORM_WIN32_FALSE@libm = -lm @PLATFORM_OSX_TRUE@xobjective_c = "-xobjective-c" +@PLATFORM_OSX_TRUE@xobjective_cxx = "-xobjective-c++" +@PLATFORM_OSX_TRUE@xnone = "-xnone" @PLATFORM_OSX_TRUE@framework_cocoa = -framework Cocoa @OS_WIN32_TRUE@gimpwidgets_def = gimpwidgets.def @OS_WIN32_TRUE@libgimpwidgets_export_symbols = -export-symbols $(srcdir)/gimpwidgets.def @@ -914,8 +919,16 @@ libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION). libgimpwidgetsincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpwidgets AM_CPPFLAGS = -DG_LOG_DOMAIN=\"LibGimpWidgets\" \ -DGIMP_WIDGETS_COMPILATION -I$(top_srcdir) $(GEGL_CFLAGS) \ - $(GTK_CFLAGS) $(LCMS_CFLAGS) -I$(includedir) $(xobjective_c) \ - $(am__append_2) + $(GTK_CFLAGS) $(LCMS_CFLAGS) -I$(includedir) $(am__append_2) +AM_CFLAGS = \ + $(xobjective_c) + +AM_CXXFLAGS = \ + $(xobjective_cxx) + +AM_LDFLAGS = \ + $(xnone) + lib_LTLIBRARIES = libgimpwidgets-@GIMP_API_VERSION@.la libgimpwidgets_sources = gimpbrowser.c gimpbrowser.h gimpbutton.c \ gimpbutton.h gimpcairo-utils.c gimpcairo-utils.h \ @@ -1037,7 +1050,8 @@ libgimpwidgets_@GIMP_API_VERSION@_la_LDFLAGS = \ -version-info $(LT_VERSION_INFO) \ $(no_undefined) \ $(libgimpwidgets_export_symbols) \ - $(framework_cocoa) + $(framework_cocoa) \ + $(xnone) EXTRA_libgimpwidgets_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpwidgets_def) libgimpwidgets_@GIMP_API_VERSION@_la_LIBADD = \ diff --git a/libgimpwidgets/gimpicons.c b/libgimpwidgets/gimpicons.c index 5ab38941aa..010b681b78 100644 --- a/libgimpwidgets/gimpicons.c +++ b/libgimpwidgets/gimpicons.c @@ -574,6 +574,8 @@ gimp_icons_init (void) "gimp-qmask-off", GIMP_STOCK_QUICK_MASK_OFF); register_stock_icon (gimp_stock_factory, "gimp-qmask-on", GIMP_STOCK_QUICK_MASK_ON); + register_stock_icon (gimp_stock_factory, + "gimp-tool-blend", GIMP_STOCK_TOOL_BLEND); gtk_icon_factory_add_default (gimp_stock_factory); diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h index 5bcdb21257..1c19417782 100644 --- a/libgimpwidgets/gimpicons.h +++ b/libgimpwidgets/gimpicons.h @@ -63,7 +63,7 @@ G_BEGIN_DECLS #define GIMP_ICON_DYNAMICS "gimp-dynamics" #define GIMP_ICON_FILE_MANAGER "gimp-file-manager" #define GIMP_ICON_FONT "gtk-select-font" -#define GIMP_ICON_GRADIENT GIMP_ICON_TOOL_BLEND +#define GIMP_ICON_GRADIENT GIMP_ICON_TOOL_GRADIENT #define GIMP_ICON_GRID "gimp-grid" #define GIMP_ICON_INPUT_DEVICE "gimp-input-device" #define GIMP_ICON_MYPAINT_BRUSH GIMP_ICON_TOOL_MYPAINT_BRUSH @@ -322,7 +322,6 @@ G_BEGIN_DECLS #define GIMP_ICON_TOOL_AIRBRUSH "gimp-tool-airbrush" #define GIMP_ICON_TOOL_ALIGN "gimp-tool-align" -#define GIMP_ICON_TOOL_BLEND "gimp-tool-blend" #define GIMP_ICON_TOOL_BLUR "gimp-tool-blur" #define GIMP_ICON_TOOL_BRIGHTNESS_CONTRAST "gimp-tool-brightness-contrast" #define GIMP_ICON_TOOL_BUCKET_FILL "gimp-tool-bucket-fill" @@ -344,6 +343,7 @@ G_BEGIN_DECLS #define GIMP_ICON_TOOL_FOREGROUND_SELECT "gimp-tool-foreground-select" #define GIMP_ICON_TOOL_FREE_SELECT "gimp-tool-free-select" #define GIMP_ICON_TOOL_FUZZY_SELECT "gimp-tool-fuzzy-select" +#define GIMP_ICON_TOOL_GRADIENT "gimp-tool-gradient" #define GIMP_ICON_TOOL_HANDLE_TRANSFORM "gimp-tool-handle-transform" #define GIMP_ICON_TOOL_HEAL "gimp-tool-heal" #define GIMP_ICON_TOOL_HUE_SATURATION "gimp-tool-hue-saturation" @@ -462,7 +462,7 @@ G_BEGIN_DECLS #define GIMP_STOCK_TOOL_AIRBRUSH "gimp-tool-airbrush" #define GIMP_STOCK_TOOL_ALIGN "gimp-tool-align" -#define GIMP_STOCK_TOOL_BLEND "gimp-tool-blend" +#define GIMP_STOCK_TOOL_BLEND "gimp-tool-gradient" #define GIMP_STOCK_TOOL_BLUR "gimp-tool-blur" #define GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST "gimp-tool-brightness-contrast" #define GIMP_STOCK_TOOL_BUCKET_FILL "gimp-tool-bucket-fill" diff --git a/m4macros/Makefile.am b/m4macros/Makefile.am index 6d7c2d03e3..6254302329 100644 --- a/m4macros/Makefile.am +++ b/m4macros/Makefile.am @@ -5,6 +5,7 @@ installed_m4 = gimp-2.0.m4 uninstalled_m4 = \ alsa.m4 \ ax_compare_version.m4 \ + ax_cxx_compile_stdcxx.m4 \ ax_gcc_func_attribute.m4 \ ax_prog_cc_for_build.m4 \ ax_prog_perl_version.m4 \ diff --git a/m4macros/Makefile.in b/m4macros/Makefile.in index 60a1f94ed9..41f3db0006 100644 --- a/m4macros/Makefile.in +++ b/m4macros/Makefile.in @@ -101,6 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -245,7 +246,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -318,6 +319,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -546,6 +548,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -568,6 +571,7 @@ installed_m4 = gimp-2.0.m4 uninstalled_m4 = \ alsa.m4 \ ax_compare_version.m4 \ + ax_cxx_compile_stdcxx.m4 \ ax_gcc_func_attribute.m4 \ ax_prog_cc_for_build.m4 \ ax_prog_perl_version.m4 \ diff --git a/m4macros/ax_cxx_compile_stdcxx.m4 b/m4macros/ax_cxx_compile_stdcxx.m4 new file mode 100644 index 0000000000..85efc7cb8e --- /dev/null +++ b/m4macros/ax_cxx_compile_stdcxx.m4 @@ -0,0 +1,980 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional]) +# +# DESCRIPTION +# +# Check for baseline language coverage in the compiler for the specified +# version of the C++ standard. If necessary, add switches to CXX and +# CXXCPP to enable support. VERSION may be '11' (for the C++11 standard) +# or '14' (for the C++14 standard). +# +# The second argument, if specified, indicates whether you insist on an +# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. +# -std=c++11). If neither is specified, you get whatever works, with +# preference for an extended mode. +# +# The third argument, if specified 'mandatory' or if left unspecified, +# indicates that baseline support for the specified C++ standard is +# required and that the macro should error out if no mode with that +# support is found. If specified 'optional', then configuration proceeds +# regardless, after defining HAVE_CXX${VERSION} if and only if a +# supporting mode is found. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik +# Copyright (c) 2012 Zack Weinberg +# Copyright (c) 2013 Roy Stogner +# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov +# Copyright (c) 2015 Paul Norman +# Copyright (c) 2015 Moritz Klammler +# Copyright (c) 2016 Krzesimir Nowak +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro +dnl (serial version number 13). + +AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl + m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"], + [$1], [14], [ax_cxx_compile_alternatives="14 1y"], + [$1], [17], [ax_cxx_compile_alternatives="17 1z"], + [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl + m4_if([$2], [], [], + [$2], [ext], [], + [$2], [noext], [], + [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl + m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true], + [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true], + [$3], [optional], [ax_cxx_compile_cxx$1_required=false], + [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])]) + AC_LANG_PUSH([C++])dnl + ac_success=no + AC_CACHE_CHECK(whether $CXX supports C++$1 features by default, + ax_cv_cxx_compile_cxx$1, + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], + [ax_cv_cxx_compile_cxx$1=yes], + [ax_cv_cxx_compile_cxx$1=no])]) + if test x$ax_cv_cxx_compile_cxx$1 = xyes; then + ac_success=yes + fi + + m4_if([$2], [noext], [], [dnl + if test x$ac_success = xno; then + for alternative in ${ax_cxx_compile_alternatives}; do + switch="-std=gnu++${alternative}" + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) + AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, + $cachevar, + [ac_save_CXX="$CXX" + CXX="$CXX $switch" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], + [eval $cachevar=yes], + [eval $cachevar=no]) + CXX="$ac_save_CXX"]) + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + fi]) + + m4_if([$2], [ext], [], [dnl + if test x$ac_success = xno; then + dnl HP's aCC needs +std=c++11 according to: + dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf + dnl Cray's crayCC needs "-h std=c++11" + for alternative in ${ax_cxx_compile_alternatives}; do + for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) + AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, + $cachevar, + [ac_save_CXX="$CXX" + CXX="$CXX $switch" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], + [eval $cachevar=yes], + [eval $cachevar=no]) + CXX="$ac_save_CXX"]) + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + if test x$ac_success = xyes; then + break + fi + done + fi]) + AC_LANG_POP([C++]) + if test x$ax_cxx_compile_cxx$1_required = xtrue; then + if test x$ac_success = xno; then + AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.]) + fi + fi + if test x$ac_success = xno; then + HAVE_CXX$1=0 + AC_MSG_NOTICE([No compiler with C++$1 support was found]) + else + HAVE_CXX$1=1 + AC_DEFINE(HAVE_CXX$1,1, + [define if the compiler supports basic C++$1 syntax]) + fi + AC_SUBST(HAVE_CXX$1) +]) + + +dnl Test body for checking C++11 support + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 +) + + +dnl Test body for checking C++14 support + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 +) + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_17 +) + +dnl Tests for new features in C++11 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[ + +// If the compiler admits that it is not ready for C++11, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201103L + +#error "This is not a C++11 compiler" + +#else + +namespace cxx11 +{ + + namespace test_static_assert + { + + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + } + + namespace test_final_override + { + + struct Base + { + virtual void f() {} + }; + + struct Derived : public Base + { + virtual void f() override {} + }; + + } + + namespace test_double_right_angle_brackets + { + + template < typename T > + struct check {}; + + typedef check single_type; + typedef check> double_type; + typedef check>> triple_type; + typedef check>>> quadruple_type; + + } + + namespace test_decltype + { + + int + f() + { + int a = 1; + decltype(a) b = 2; + return a + b; + } + + } + + namespace test_type_deduction + { + + template < typename T1, typename T2 > + struct is_same + { + static const bool value = false; + }; + + template < typename T > + struct is_same + { + static const bool value = true; + }; + + template < typename T1, typename T2 > + auto + add(T1 a1, T2 a2) -> decltype(a1 + a2) + { + return a1 + a2; + } + + int + test(const int c, volatile int v) + { + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == false, ""); + auto ac = c; + auto av = v; + auto sumi = ac + av + 'x'; + auto sumf = ac + av + 1.0; + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == true, ""); + return (sumf > 0.0) ? sumi : add(c, v); + } + + } + + namespace test_noexcept + { + + int f() { return 0; } + int g() noexcept { return 0; } + + static_assert(noexcept(f()) == false, ""); + static_assert(noexcept(g()) == true, ""); + + } + + namespace test_constexpr + { + + template < typename CharT > + unsigned long constexpr + strlen_c_r(const CharT *const s, const unsigned long acc) noexcept + { + return *s ? strlen_c_r(s + 1, acc + 1) : acc; + } + + template < typename CharT > + unsigned long constexpr + strlen_c(const CharT *const s) noexcept + { + return strlen_c_r(s, 0UL); + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("1") == 1UL, ""); + static_assert(strlen_c("example") == 7UL, ""); + static_assert(strlen_c("another\0example") == 7UL, ""); + + } + + namespace test_rvalue_references + { + + template < int N > + struct answer + { + static constexpr int value = N; + }; + + answer<1> f(int&) { return answer<1>(); } + answer<2> f(const int&) { return answer<2>(); } + answer<3> f(int&&) { return answer<3>(); } + + void + test() + { + int i = 0; + const int c = 0; + static_assert(decltype(f(i))::value == 1, ""); + static_assert(decltype(f(c))::value == 2, ""); + static_assert(decltype(f(0))::value == 3, ""); + } + + } + + namespace test_uniform_initialization + { + + struct test + { + static const int zero {}; + static const int one {1}; + }; + + static_assert(test::zero == 0, ""); + static_assert(test::one == 1, ""); + + } + + namespace test_lambdas + { + + void + test1() + { + auto lambda1 = [](){}; + auto lambda2 = lambda1; + lambda1(); + lambda2(); + } + + int + test2() + { + auto a = [](int i, int j){ return i + j; }(1, 2); + auto b = []() -> int { return '0'; }(); + auto c = [=](){ return a + b; }(); + auto d = [&](){ return c; }(); + auto e = [a, &b](int x) mutable { + const auto identity = [](int y){ return y; }; + for (auto i = 0; i < a; ++i) + a += b--; + return x + identity(a + b); + }(0); + return a + b + c + d + e; + } + + int + test3() + { + const auto nullary = [](){ return 0; }; + const auto unary = [](int x){ return x; }; + using nullary_t = decltype(nullary); + using unary_t = decltype(unary); + const auto higher1st = [](nullary_t f){ return f(); }; + const auto higher2nd = [unary](nullary_t f1){ + return [unary, f1](unary_t f2){ return f2(unary(f1())); }; + }; + return higher1st(nullary) + higher2nd(nullary)(unary); + } + + } + + namespace test_variadic_templates + { + + template + struct sum; + + template + struct sum + { + static constexpr auto value = N0 + sum::value; + }; + + template <> + struct sum<> + { + static constexpr auto value = 0; + }; + + static_assert(sum<>::value == 0, ""); + static_assert(sum<1>::value == 1, ""); + static_assert(sum<23>::value == 23, ""); + static_assert(sum<1, 2>::value == 3, ""); + static_assert(sum<5, 5, 11>::value == 21, ""); + static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); + + } + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function + // because of this. + namespace test_template_alias_sfinae + { + + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { func(0); } + + } + +} // namespace cxx11 + +#endif // __cplusplus >= 201103L + +]]) + + +dnl Tests for new features in C++14 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[ + +// If the compiler admits that it is not ready for C++14, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201402L + +#error "This is not a C++14 compiler" + +#else + +namespace cxx14 +{ + + namespace test_polymorphic_lambdas + { + + int + test() + { + const auto lambda = [](auto&&... args){ + const auto istiny = [](auto x){ + return (sizeof(x) == 1UL) ? 1 : 0; + }; + const int aretiny[] = { istiny(args)... }; + return aretiny[0]; + }; + return lambda(1, 1L, 1.0f, '1'); + } + + } + + namespace test_binary_literals + { + + constexpr auto ivii = 0b0000000000101010; + static_assert(ivii == 42, "wrong value"); + + } + + namespace test_generalized_constexpr + { + + template < typename CharT > + constexpr unsigned long + strlen_c(const CharT *const s) noexcept + { + auto length = 0UL; + for (auto p = s; *p; ++p) + ++length; + return length; + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("x") == 1UL, ""); + static_assert(strlen_c("test") == 4UL, ""); + static_assert(strlen_c("another\0test") == 7UL, ""); + + } + + namespace test_lambda_init_capture + { + + int + test() + { + auto x = 0; + const auto lambda1 = [a = x](int b){ return a + b; }; + const auto lambda2 = [a = lambda1(x)](){ return a; }; + return lambda2(); + } + + } + + namespace test_digit_separators + { + + constexpr auto ten_million = 100'000'000; + static_assert(ten_million == 100000000, ""); + + } + + namespace test_return_type_deduction + { + + auto f(int& x) { return x; } + decltype(auto) g(int& x) { return x; } + + template < typename T1, typename T2 > + struct is_same + { + static constexpr auto value = false; + }; + + template < typename T > + struct is_same + { + static constexpr auto value = true; + }; + + int + test() + { + auto x = 0; + static_assert(is_same::value, ""); + static_assert(is_same::value, ""); + return x; + } + + } + +} // namespace cxx14 + +#endif // __cplusplus >= 201402L + +]]) + + +dnl Tests for new features in C++17 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[ + +// If the compiler admits that it is not ready for C++17, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus <= 201402L + +#error "This is not a C++17 compiler" + +#else + +#if defined(__clang__) + #define REALLY_CLANG +#else + #if defined(__GNUC__) + #define REALLY_GCC + #endif +#endif + +#include +#include +#include + +namespace cxx17 +{ + +#if !defined(REALLY_CLANG) + namespace test_constexpr_lambdas + { + + // TODO: test it with clang++ from git + + constexpr int foo = [](){return 42;}(); + + } +#endif // !defined(REALLY_CLANG) + + namespace test::nested_namespace::definitions + { + + } + + namespace test_fold_expression + { + + template + int multiply(Args... args) + { + return (args * ... * 1); + } + + template + bool all(Args... args) + { + return (args && ...); + } + + } + + namespace test_extended_static_assert + { + + static_assert (true); + + } + + namespace test_auto_brace_init_list + { + + auto foo = {5}; + auto bar {5}; + + static_assert(std::is_same, decltype(foo)>::value); + static_assert(std::is_same::value); + } + + namespace test_typename_in_template_template_parameter + { + + template typename X> struct D; + + } + + namespace test_fallthrough_nodiscard_maybe_unused_attributes + { + + int f1() + { + return 42; + } + + [[nodiscard]] int f2() + { + [[maybe_unused]] auto unused = f1(); + + switch (f1()) + { + case 17: + f1(); + [[fallthrough]]; + case 42: + f1(); + } + return f1(); + } + + } + + namespace test_extended_aggregate_initialization + { + + struct base1 + { + int b1, b2 = 42; + }; + + struct base2 + { + base2() { + b3 = 42; + } + int b3; + }; + + struct derived : base1, base2 + { + int d; + }; + + derived d1 {{1, 2}, {}, 4}; // full initialization + derived d2 {{}, {}, 4}; // value-initialized bases + + } + + namespace test_general_range_based_for_loop + { + + struct iter + { + int i; + + int& operator* () + { + return i; + } + + const int& operator* () const + { + return i; + } + + iter& operator++() + { + ++i; + return *this; + } + }; + + struct sentinel + { + int i; + }; + + bool operator== (const iter& i, const sentinel& s) + { + return i.i == s.i; + } + + bool operator!= (const iter& i, const sentinel& s) + { + return !(i == s); + } + + struct range + { + iter begin() const + { + return {0}; + } + + sentinel end() const + { + return {5}; + } + }; + + void f() + { + range r {}; + + for (auto i : r) + { + [[maybe_unused]] auto v = i; + } + } + + } + + namespace test_lambda_capture_asterisk_this_by_value + { + + struct t + { + int i; + int foo() + { + return [*this]() + { + return i; + }(); + } + }; + + } + + namespace test_enum_class_construction + { + + enum class byte : unsigned char + {}; + + byte foo {42}; + + } + + namespace test_constexpr_if + { + + template + int f () + { + if constexpr(cond) + { + return 13; + } + else + { + return 42; + } + } + + } + + namespace test_selection_statement_with_initializer + { + + int f() + { + return 13; + } + + int f2() + { + if (auto i = f(); i > 0) + { + return 3; + } + + switch (auto i = f(); i + 4) + { + case 17: + return 2; + + default: + return 1; + } + } + + } + +#if !defined(REALLY_CLANG) + namespace test_template_argument_deduction_for_class_templates + { + + // TODO: test it with clang++ from git + + template + struct pair + { + pair (T1 p1, T2 p2) + : m1 {p1}, + m2 {p2} + {} + + T1 m1; + T2 m2; + }; + + void f() + { + [[maybe_unused]] auto p = pair{13, 42u}; + } + + } +#endif // !defined(REALLY_CLANG) + + namespace test_non_type_auto_template_parameters + { + + template + struct B + {}; + + B<5> b1; + B<'a'> b2; + + } + +#if !defined(REALLY_CLANG) + namespace test_structured_bindings + { + + // TODO: test it with clang++ from git + + int arr[2] = { 1, 2 }; + std::pair pr = { 1, 2 }; + + auto f1() -> int(&)[2] + { + return arr; + } + + auto f2() -> std::pair& + { + return pr; + } + + struct S + { + int x1 : 2; + volatile double y1; + }; + + S f3() + { + return {}; + } + + auto [ x1, y1 ] = f1(); + auto& [ xr1, yr1 ] = f1(); + auto [ x2, y2 ] = f2(); + auto& [ xr2, yr2 ] = f2(); + const auto [ x3, y3 ] = f3(); + + } +#endif // !defined(REALLY_CLANG) + +#if !defined(REALLY_CLANG) + namespace test_exception_spec_type_system + { + + // TODO: test it with clang++ from git + + struct Good {}; + struct Bad {}; + + void g1() noexcept; + void g2(); + + template + Bad + f(T*, T*); + + template + Good + f(T1*, T2*); + + static_assert (std::is_same_v); + + } +#endif // !defined(REALLY_CLANG) + + namespace test_inline_variables + { + + template void f(T) + {} + + template inline T g(T) + { + return T{}; + } + + template<> inline void f<>(int) + {} + + template<> int g<>(int) + { + return 5; + } + + } + +} // namespace cxx17 + +#endif // __cplusplus <= 201402L + +]]) diff --git a/menus/Makefile.in b/menus/Makefile.in index 59dc77bdc7..52db2f2744 100644 --- a/menus/Makefile.in +++ b/menus/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/menus/dashboard-menu.xml b/menus/dashboard-menu.xml index 30548a79c4..21064ef7ff 100644 --- a/menus/dashboard-menu.xml +++ b/menus/dashboard-menu.xml @@ -3,14 +3,17 @@ - + + + + - + diff --git a/menus/image-menu.xml b/menus/image-menu.xml index 766d6a4bc4..dedfa1c201 100644 --- a/menus/image-menu.xml +++ b/menus/image-menu.xml @@ -24,8 +24,17 @@ - - + + + + + + + + + + + @@ -629,7 +638,7 @@ - + @@ -902,8 +911,17 @@ - - + + + + + + + + + + + @@ -1507,7 +1525,7 @@ - + diff --git a/menus/image-menu.xml.in b/menus/image-menu.xml.in index 77e4c337ea..13e6560005 100644 --- a/menus/image-menu.xml.in +++ b/menus/image-menu.xml.in @@ -23,7 +23,7 @@ - + @@ -637,7 +637,7 @@ - + diff --git a/menus/menus.xsl b/menus/menus.xsl index fdd65be2a0..68495c713c 100644 --- a/menus/menus.xsl +++ b/menus/menus.xsl @@ -38,12 +38,6 @@ - - - - - - diff --git a/modules/Makefile.in b/modules/Makefile.in index ee44f5be54..e7b92cd097 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -411,7 +412,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -484,6 +485,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -712,6 +714,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/pdb/Makefile.am b/pdb/Makefile.am index 31275dac8d..47d0564b0d 100644 --- a/pdb/Makefile.am +++ b/pdb/Makefile.am @@ -13,6 +13,7 @@ pdb_groups = \ groups/display.pdb \ groups/drawable.pdb \ groups/drawable_color.pdb \ + groups/drawable_edit.pdb \ groups/drawable_transform.pdb \ groups/dynamics.pdb \ groups/edit.pdb \ diff --git a/pdb/Makefile.in b/pdb/Makefile.in index f51ee91887..c1709b1d24 100644 --- a/pdb/Makefile.in +++ b/pdb/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -213,7 +214,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -286,6 +287,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -514,6 +516,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -546,6 +549,7 @@ pdb_groups = \ groups/display.pdb \ groups/drawable.pdb \ groups/drawable_color.pdb \ + groups/drawable_edit.pdb \ groups/drawable_transform.pdb \ groups/dynamics.pdb \ groups/edit.pdb \ diff --git a/pdb/app.pl b/pdb/app.pl index 4e710a5c14..6abb2b5650 100644 --- a/pdb/app.pl +++ b/pdb/app.pl @@ -585,12 +585,34 @@ sub generate { my @inargs = @{$proc->{inargs}} if (defined $proc->{inargs}); my @outargs = @{$proc->{outargs}} if (defined $proc->{outargs}); + my $blurb = $proc->{blurb}; my $help = $proc->{help}; my $procedure_name; local $success = 0; + if ($proc->{deprecated}) { + if ($proc->{deprecated} eq 'NONE') { + if (!$blurb) { + $blurb = "Deprecated: There is no replacement for this procedure."; + } + if ($help) { + $help .= "\n\n"; + } + $help .= "Deprecated: There is no replacement for this procedure."; + } + else { + if (!$blurb) { + $blurb = "Deprecated: Use '$proc->{deprecated}' instead."; + } + if ($help) { + $help .= "\n\n"; + } + $help .= "Deprecated: Use '$proc->{deprecated}' instead."; + } + } + $help =~ s/gimp(\w+)\(\s*\)/"'gimp".canonicalize($1)."'"/ge; if ($proc->{group} eq "plug_in_compat") { @@ -611,7 +633,7 @@ sub generate { "$procedure_name"); gimp_procedure_set_static_strings (procedure, "$procedure_name", - @{[ "ewrap($proc->{blurb}, 2, 37) ]}, + @{[ "ewrap($blurb, 2, 37) ]}, @{[ "ewrap($help, 2, 37) ]}, "$proc->{author}", "$proc->{copyright}", diff --git a/pdb/enums.pl b/pdb/enums.pl index 3926580e7f..503766967c 100644 --- a/pdb/enums.pl +++ b/pdb/enums.pl @@ -203,6 +203,16 @@ package Gimp::CodeGen::enums; mapping => { GIMP_FOREGROUND_EXTRACT_SIOX => '0', GIMP_FOREGROUND_EXTRACT_MATTING => '1' } }, + GimpGradientBlendColorSpace => + { contig => 1, + header => 'libgimpbase/gimpbaseenums.h', + symbols => [ qw(GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL + GIMP_GRADIENT_BLEND_RGB_LINEAR + GIMP_GRADIENT_BLEND_CIE_LAB) ], + mapping => { GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL => '0', + GIMP_GRADIENT_BLEND_RGB_LINEAR => '1', + GIMP_GRADIENT_BLEND_CIE_LAB => '2' } + }, GimpGradientSegmentColor => { contig => 1, header => 'libgimpbase/gimpbaseenums.h', diff --git a/pdb/groups.pl b/pdb/groups.pl index 504253e0f6..d5f9d16212 100644 --- a/pdb/groups.pl +++ b/pdb/groups.pl @@ -11,6 +11,7 @@ display drawable drawable_color + drawable_edit drawable_transform dynamics edit diff --git a/pdb/groups/context.pdb b/pdb/groups/context.pdb index 3637c1b7ca..0ae7b6290e 100644 --- a/pdb/groups/context.pdb +++ b/pdb/groups/context.pdb @@ -521,8 +521,9 @@ sub context_set_line_width { $help = <<'HELP'; This procedure modifies the line width setting for stroking lines. + This setting affects the following procedures: -gimp_edit_stroke(), gimp_edit_stroke_vectors(). +gimp_drawable_edit_stroke_selection(), gimp_drawable_edit_stroke_item(). HELP &mitch_pdb_misc('2015', '2.10'); @@ -580,8 +581,9 @@ sub context_set_line_width_unit { $help = <<'HELP'; This procedure modifies the line width unit setting for stroking lines. + This setting affects the following procedures: -gimp_edit_stroke(), gimp_edit_stroke_vectors(). +gimp_drawable_edit_stroke_selection(), gimp_drawable_edit_stroke_item(). HELP &mitch_pdb_misc('2015', '2.10'); @@ -639,8 +641,9 @@ sub context_set_line_cap_style { $help = <<'HELP'; This procedure modifies the line cap style setting for stroking lines. + This setting affects the following procedures: -gimp_edit_stroke(), gimp_edit_stroke_vectors(). +gimp_drawable_edit_stroke_selection(), gimp_drawable_edit_stroke_item(). HELP &mitch_pdb_misc('2015', '2.10'); @@ -698,8 +701,9 @@ sub context_set_line_join_style { $help = <<'HELP'; This procedure modifies the line join style setting for stroking lines. + This setting affects the following procedures: -gimp_edit_stroke(), gimp_edit_stroke_vectors(). +gimp_drawable_edit_stroke_selection(), gimp_drawable_edit_stroke_item(). HELP &mitch_pdb_misc('2015', '2.10'); @@ -761,8 +765,9 @@ A mitered join is converted to a bevelled join if the miter would extend to a distance of more than (miter-limit * line-width) from the actual join point. + This setting affects the following procedures: -gimp_edit_stroke(), gimp_edit_stroke_vectors(). +gimp_drawable_edit_stroke_selection(), gimp_drawable_edit_stroke_item(). HELP &mitch_pdb_misc('2015', '2.10'); @@ -820,8 +825,9 @@ sub context_set_line_dash_offset { $help = <<'HELP'; This procedure modifies the line dash offset setting for stroking lines. + This setting affects the following procedures: -gimp_edit_stroke(), gimp_edit_stroke_vectors(). +gimp_drawable_edit_stroke_selection(), gimp_drawable_edit_stroke_item(). HELP &mitch_pdb_misc('2015', '2.10'); @@ -880,12 +886,14 @@ sub context_set_line_dash_pattern { $help = <<'HELP'; This procedure modifies the line dash pattern setting for stroking lines. + The unit of the dash pattern segments is the actual line width used for the stroke operation, in other words a segment length of 1.0 results in a square segment shape (or gap shape). + This setting affects the following procedures: -gimp_edit_stroke(), gimp_edit_stroke_vectors(). +gimp_drawable_edit_stroke_selection_(), gimp_drawable_edit_stroke_item(). HELP &mitch_pdb_misc('2015', '2.10'); @@ -1692,6 +1700,260 @@ CODE ); } +sub context_set_gradient_fg_bg_rgb { + $blurb = 'Sets the built-in FG-BG RGB gradient as the active gradient.'; + + $help = <<'HELP'; +This procedure sets the built-in FG-BG RGB gradient as the active +gradient. The gradient will be used for subsequent gradient operations. +HELP + + &mitch_pdb_misc('2018', '2.10'); + + %invoke = ( + code => <<'CODE' +{ + gimp_context_set_gradient (context, + gimp_gradients_get_fg_bg_rgb (gimp)); +} +CODE + ); +} + +sub context_set_gradient_fg_bg_hsv_cw { + $blurb = 'Sets the built-in FG-BG HSV (cw) gradient as the active gradient.'; + + $help = <<'HELP'; +This procedure sets the built-in FG-BG HSV (cw) gradient as the active +gradient. The gradient will be used for subsequent gradient operations. +HELP + + &mitch_pdb_misc('2018', '2.10'); + + %invoke = ( + code => <<'CODE' +{ + gimp_context_set_gradient (context, + gimp_gradients_get_fg_bg_hsv_cw (gimp)); +} +CODE + ); +} + +sub context_set_gradient_fg_bg_hsv_ccw { + $blurb = 'Sets the built-in FG-BG HSV (ccw) gradient as the active gradient.'; + + $help = <<'HELP'; +This procedure sets the built-in FG-BG HSV (ccw) gradient as the active +gradient. The gradient will be used for subsequent gradient operations. +HELP + + &mitch_pdb_misc('2018', '2.10'); + + %invoke = ( + code => <<'CODE' +{ + gimp_context_set_gradient (context, + gimp_gradients_get_fg_bg_hsv_ccw (gimp)); +} +CODE + ); +} + +sub context_set_gradient_fg_transparent { + $blurb = 'Sets the built-in FG-Transparent gradient as the active gradient.'; + + $help = <<'HELP'; +This procedure sets the built-in FG-Transparent gradient as the active +gradient. The gradient will be used for subsequent gradient operations. +HELP + + &mitch_pdb_misc('2018', '2.10'); + + %invoke = ( + code => <<'CODE' +{ + gimp_context_set_gradient (context, + gimp_gradients_get_fg_transparent (gimp)); +} +CODE + ); +} + +sub context_set_gradient_blend_color_space { + $blurb = 'Set the gradient blend color space.'; + $help = 'Set the gradient blend color space for paint tools and the gradient tool.'; + + &mitch_pdb_misc('2018', '2.10'); + + @inargs = ( + { name => "blend_color_space", type => 'enum GimpGradientBlendColorSpace', + desc => "Blend color space" } + ); + + %invoke = ( + code => <<'CODE' +{ + GimpContainer *options; + GList *list; + + options = gimp_pdb_context_get_paint_options_list (GIMP_PDB_CONTEXT (context)); + + for (list = GIMP_LIST (options)->queue->head; list; list = g_list_next (list)) + g_object_set (list->data, + "gradient-blend-color-space", blend_color_space, + NULL); +} +CODE + ); +} + +sub context_get_gradient_blend_color_space { + $blurb = 'Get the gradient blend color space.'; + $help = 'Get the gradient blend color space for paint tools and the gradient tool.'; + + &mitch_pdb_misc('2018', '2.10'); + + @outargs = ( + { name => "blend_color_space", type => 'enum GimpGradientBlendColorSpace', + desc => "Color blend space" } + ); + + %invoke = ( + code => <<'CODE' +{ + /* all options should have the same value, so pick a random one */ + GimpPaintOptions *options = + gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), + "gimp-paintbrush"); + + if (options) + g_object_get (options, + "gradient-blend-color-space", &blend_color_space, + NULL); + else + success = FALSE; +} +CODE + ); +} + +sub context_set_gradient_repeat_mode { + $blurb = 'Set the gradient repeat mode.'; + $help = 'Set the gradient repeat mode for paint tools and the gradient tool.'; + + &mitch_pdb_misc('2018', '2.10'); + + @inargs = ( + { name => "repeat_mode", type => 'enum GimpRepeatMode', + desc => "Repeat mode" } + ); + + %invoke = ( + code => <<'CODE' +{ + GimpContainer *options; + GList *list; + + options = gimp_pdb_context_get_paint_options_list (GIMP_PDB_CONTEXT (context)); + + for (list = GIMP_LIST (options)->queue->head; list; list = g_list_next (list)) + g_object_set (list->data, + "gradient-repeat", repeat_mode, + NULL); +} +CODE + ); +} + +sub context_get_gradient_repeat_mode { + $blurb = 'Get the gradient repeat mode.'; + $help = 'Get the gradient repeat mode for paint tools and the gradient tool.'; + + &mitch_pdb_misc('2018', '2.10'); + + @outargs = ( + { name => "repeat_mode", type => 'enum GimpRepeatMode', + desc => "Repeat mode" } + ); + + %invoke = ( + code => <<'CODE' +{ + /* all options should have the same value, so pick a random one */ + GimpPaintOptions *options = + gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), + "gimp-paintbrush"); + + if (options) + g_object_get (options, + "gradient-repeat", &repeat_mode, + NULL); + else + success = FALSE; +} +CODE + ); +} + +sub context_set_gradient_reverse { + $blurb = 'Set the gradient reverse setting.'; + $help = 'Set the gradient reverse setting for paint tools and the gradient tool.'; + + &mitch_pdb_misc('2018', '2.10'); + + @inargs = ( + { name => "reverse", type => 'boolean', + desc => "Reverse" } + ); + + %invoke = ( + code => <<'CODE' +{ + GimpContainer *options; + GList *list; + + options = gimp_pdb_context_get_paint_options_list (GIMP_PDB_CONTEXT (context)); + + for (list = GIMP_LIST (options)->queue->head; list; list = g_list_next (list)) + g_object_set (list->data, + "gradient-reverse", reverse, + NULL); +} +CODE + ); +} + +sub context_get_gradient_reverse { + $blurb = 'Get the gradient reverse setting.'; + $help = 'Get the gradient reverse setting for paint tools and the gradient tool.'; + + &mitch_pdb_misc('2018', '2.10'); + + @outargs = ( + { name => "reverse", type => 'boolean', + desc => "Reverse" } + ); + + %invoke = ( + code => <<'CODE' +{ + /* all options should have the same value, so pick a random one */ + GimpPaintOptions *options = + gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), + "gimp-paintbrush"); + + if (options) + g_object_get (options, + "gradient-reverse", &reverse, + NULL); + else + success = FALSE; +} +CODE + ); +} + sub context_get_palette { $blurb = 'Retrieve the currently active palette.'; @@ -1847,10 +2109,12 @@ values which give the appearance of a sharper, less pixelized edge. This should be set as TRUE most of the time unless a binary-only selection is wanted. + This setting affects the following procedures: gimp_image_select_color(), gimp_image_select_contiguous_color(), gimp_image_select_round_rectangle(), gimp_image_select_ellipse(), -gimp_image_select_polygon(), gimp_image_select_item(). +gimp_image_select_polygon(), gimp_image_select_item(), +gimp_drawable_edit_bucket_fill(). HELP &mitch_pdb_misc('2010', '2.8'); @@ -1905,6 +2169,7 @@ enabled, selections will be blurred before combining. The blur is a gaussian blur; its radii can be controlled using gimp_context_set_feather_radius(). + This setting affects the following procedures: gimp_image_select_color(), gimp_image_select_contiguous_color(), gimp_image_select_rectangle(), gimp_image_select_round_rectangle(), @@ -1964,6 +2229,7 @@ sub context_set_feather_radius { $help = <<'HELP'; This procedure modifies the feather radius setting. + This setting affects all procedures that are affected by gimp_context_set_feather(). HELP @@ -2025,8 +2291,10 @@ the specified drawable is used ('sample-merged' is FALSE), or the pixel data from the composite image ('sample-merged' is TRUE. This is equivalent to sampling for colors after merging all visible layers). + This setting affects the following procedures: -gimp_image_select_color(), gimp_image_select_contiguous_color(). +gimp_image_select_color(), gimp_image_select_contiguous_color(), +gimp_drawable_edit_bucket_fill(). HELP &mitch_pdb_misc('2011', '2.8'); @@ -2081,8 +2349,10 @@ depends on the colors of the pixels present in a drawable, like when doing a seed fill, this setting controls how color similarity is determined. SELECT_CRITERION_COMPOSITE is the default value. + This setting affects the following procedures: -gimp_image_select_color(), gimp_image_select_contiguous_color(). +gimp_image_select_color(), gimp_image_select_contiguous_color(), +gimp_drawable_edit_bucket_fill(). HELP &mitch_pdb_misc('2011', '2.8'); @@ -2138,8 +2408,10 @@ doing a seed fill, this setting controls what is "sufficiently close" to be considered a similar color. If the sample threshold has not been set explicitly, the default threshold set in gimprc will be used. + This setting affects the following procedures: -gimp_image_select_color(), gimp_image_select_contiguous_color(). +gimp_image_select_color(), gimp_image_select_contiguous_color(), +gimp_drawable_edit_bucket_fill(). HELP &mitch_pdb_misc('2011', '2.8'); @@ -2251,8 +2523,10 @@ like when doing a seed fill, this setting controls whether transparency is considered to be a unique selectable color. When this setting is TRUE, transparent areas can be selected or filled. + This setting affects the following procedures: -gimp_image_select_color(), gimp_image_select_contiguous_color(). +gimp_image_select_color(), gimp_image_select_contiguous_color(), +gimp_drawable_edit_bucket_fill(). HELP &mitch_pdb_misc('2011', '2.8'); @@ -2312,8 +2586,9 @@ are considered when calculating the affected region; in contrast, when this setting is FALSE, only the four orthogonal neighbors of each pixel are considered. + This setting affects the following procedures: -gimp_image_select_contiguous_color(). +gimp_image_select_contiguous_color(), gimp_drawable_edit_bucket_fill(). HELP $author = 'Ell'; @@ -2337,6 +2612,64 @@ CODE ); } +sub context_get_distance_metric { + $blurb = 'Get the distance metric used in some computations.'; + + $help = <<'HELP'; +This procedure returns the distance metric in the current context. +See gimp_context_set_distance_metric() to know more about its usage. +HELP + + &jehan_pdb_misc('2018', '2.10'); + + @outargs = ( + { name => 'metric', type => 'enum GeglDistanceMetric', + desc => 'The distance metric' } + ); + + %invoke = ( + code => <<'CODE' +{ + g_object_get (context, + "distance-metric", &metric, + NULL); +} +CODE + ); +} + +sub context_set_distance_metric { + $blurb = 'Set the distance metric used in some computations.'; + + $help = <<'HELP'; +This procedure modifies the distance metric used in some computations, +such as gimp_drawable_edit_gradient_fill(). In particular, it does not +change the metric used in generic distance computation on canvas, as +in the Measure tool. + + +This setting affects the following procedures: +gimp_drawable_edit_gradient_fill(). +HELP + + &jehan_pdb_misc('2018', '2.10'); + + @inargs = ( + { name => 'metric', type => 'enum GeglDistanceMetric', + desc => 'The distance metric' } + ); + + %invoke = ( + code => <<'CODE' +{ + g_object_set (context, + "distance-metric", metric, + NULL); +} +CODE + ); +} + sub context_get_interpolation { $blurb = 'Get the interpolation type.'; @@ -2372,6 +2705,7 @@ sub context_set_interpolation { $help = <<'HELP'; This procedure modifies the interpolation setting. + This setting affects affects the following procedures: gimp_item_transform_flip(), gimp_item_transform_perspective(), gimp_item_transform_rotate(), gimp_item_transform_scale(), @@ -2430,6 +2764,7 @@ sub context_set_transform_direction { $help = <<'HELP'; This procedure modifies the transform direction setting. + This setting affects affects the following procedures: gimp_item_transform_flip(), gimp_item_transform_perspective(), gimp_item_transform_rotate(), gimp_item_transform_scale(), @@ -2491,6 +2826,7 @@ pixels, if the result of a transform operation has a different size than the original area, this setting determines how the resulting area is sized. + This setting affects affects the following procedures: gimp_item_transform_flip(), gimp_item_transform_flip_simple(), gimp_item_transform_perspective(), gimp_item_transform_rotate(), @@ -3032,63 +3368,12 @@ CODE ); } -sub context_get_distance_metric { - $blurb = 'Get the distance metric used in some computations.'; - - $help = <<'HELP'; -This procedure returns the distance metric in the current context. -See gimp_context_set_distance_metric() to know more about its usage. -HELP - - &jehan_pdb_misc('2018', '2.10'); - - @outargs = ( - { name => 'metric', type => 'enum GeglDistanceMetric', - desc => 'The distance metric' } - ); - - %invoke = ( - code => <<'CODE' -{ - g_object_get (context, - "distance-metric", &metric, - NULL); -} -CODE - ); -} - -sub context_set_distance_metric { - $blurb = 'Set the distance metric used in some computations.'; - - $help = <<'HELP'; -This procedure modifies the distance metric used in some computations, -such as gimp_edit_blend(). In particular, it does not change the metric used -in generic distance computation on canvas, as in the Measure tool. -HELP - - &jehan_pdb_misc('2018', '2.10'); - - @inargs = ( - { name => 'metric', type => 'enum GeglDistanceMetric', - desc => 'The distance metric' } - ); - - %invoke = ( - code => <<'CODE' -{ - g_object_set (context, - "distance-metric", metric, - NULL); -} -CODE - ); -} - @headers = qw("core/gimp.h" + "core/gimp-gradients.h" "core/gimpcontainer.h" "core/gimpdashpattern.h" "core/gimpdatafactory.h" + "core/gimplist.h" "core/gimpstrokeoptions.h" "paint/gimppaintoptions.h" "libgimpconfig/gimpconfig.h" @@ -3130,6 +3415,13 @@ CODE context_get_mypaint_brush context_set_mypaint_brush context_get_pattern context_set_pattern context_get_gradient context_set_gradient + context_set_gradient_fg_bg_rgb + context_set_gradient_fg_bg_hsv_cw + context_set_gradient_fg_bg_hsv_ccw + context_set_gradient_fg_transparent + context_get_gradient_blend_color_space context_set_gradient_blend_color_space + context_get_gradient_repeat_mode context_set_gradient_repeat_mode + context_get_gradient_reverse context_set_gradient_reverse context_get_palette context_set_palette context_get_font context_set_font context_get_antialias context_set_antialias @@ -3141,6 +3433,7 @@ CODE context_get_sample_threshold_int context_set_sample_threshold_int context_get_sample_transparent context_set_sample_transparent context_get_diagonal_neighbors context_set_diagonal_neighbors + context_get_distance_metric context_set_distance_metric context_get_interpolation context_set_interpolation context_get_transform_direction context_set_transform_direction context_get_transform_resize context_set_transform_resize @@ -3152,8 +3445,7 @@ CODE context_get_ink_speed_sensitivity context_set_ink_speed_sensitivity context_get_ink_blob_type context_set_ink_blob_type context_get_ink_blob_aspect_ratio context_set_ink_blob_aspect_ratio - context_get_ink_blob_angle context_set_ink_blob_angle - context_get_distance_metric context_set_distance_metric); + context_get_ink_blob_angle context_set_ink_blob_angle); %exports = (app => [@procs], lib => [@procs]); diff --git a/pdb/groups/drawable_edit.pdb b/pdb/groups/drawable_edit.pdb new file mode 100644 index 0000000000..87d10ff141 --- /dev/null +++ b/pdb/groups/drawable_edit.pdb @@ -0,0 +1,451 @@ +# GIMP - The GNU Image Manipulation Program +# Copyright (C) 1995 Spencer Kimball and Peter Mattis + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# "Perlized" from C source by Manish Singh + +sub drawable_edit_clear { + $blurb = 'Clear selected area of drawable.'; + + $help = <<'HELP'; +This procedure clears the specified drawable. If the drawable has an +alpha channel, the cleared pixels will become transparent. If the +drawable does not have an alpha channel, cleared pixels will be set to +the background color. This procedure only affects regions within a +selection if there is a selection active. + + +This procedure is affected by the following context setters: +gimp_context_set_background(). +HELP + + &std_pdb_misc; + + @inargs = ( + { name => 'drawable', type => 'drawable', + desc => 'The drawable to clear from' } + ); + + %invoke = ( + code => < 'drawable', type => 'drawable', + desc => "The drawable to fill to" }, + { name => 'fill_type', type => 'enum GimpFillType', + desc => 'The type of fill' } + ); + + %invoke = ( + code => < 'drawable', type => 'drawable', + desc => 'The affected drawable' }, + { name => 'fill_type', type => 'enum GimpFillType', + desc => 'The type of fill' }, + { name => 'x', type => 'float', + desc => "The x coordinate of this bucket fill's application." }, + { name => 'y', type => 'float', + desc => "The y coordinate of this bucket fill's application." } + ); + + %invoke = ( + headers => [ qw ("core/gimpdrawable-bucket-fill.h") ], + code => <<'CODE' +{ + if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, + GIMP_PDB_ITEM_CONTENT, error) && + gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error)) + { + GimpFillOptions *options = gimp_fill_options_new (gimp, NULL, FALSE); + + gimp_context_set_opacity (GIMP_CONTEXT (options), + gimp_context_get_opacity (context)); + gimp_context_set_paint_mode (GIMP_CONTEXT (options), + gimp_context_get_paint_mode (context)); + + gimp_fill_options_set_antialias (options, + GIMP_PDB_CONTEXT (context)->antialias); + + if (gimp_fill_options_set_by_fill_type (options, context, + fill_type, error)) + { + gimp_drawable_bucket_fill (drawable, options, + GIMP_PDB_CONTEXT (context)->sample_transparent, + GIMP_PDB_CONTEXT (context)->sample_criterion, + GIMP_PDB_CONTEXT (context)->sample_threshold, + GIMP_PDB_CONTEXT (context)->sample_merged, + GIMP_PDB_CONTEXT (context)->diagonal_neighbors, + x, y); + } + else + success = FALSE; + + g_object_unref (options); + } + else + success = FALSE; +} +CODE + ); +} + +sub drawable_edit_gradient_fill { + $blurb = <<'BLURB'; +Draw a gradient between the starting and ending coordinates with the +specified gradient type. +BLURB + + $help = <<'HELP'; +This tool requires information on the gradient type. It creates the +specified variety of gradient using the starting and ending +coordinates as defined for each gradient type. For shapeburst +gradient types, the context's distance metric is also relevant and can +be updated with gimp_context_set_distance_metric(). + + +This procedure is affected by the following context setters: +gimp_context_set_opacity(), gimp_context_set_paint_mode(), +gimp_context_set_foreground(), gimp_context_set_background(), +gimp_context_set_gradient() and all gradient property settings, +gimp_context_set_distance_metric(). +HELP + + &mitch_pdb_misc('2018', '2.10'); + + @inargs = ( + { name => 'drawable', type => 'drawable', + desc => 'The affected drawable' }, + { name => 'gradient_type', type => 'enum GimpGradientType', + desc => 'The type of gradient' }, + { name => 'offset', type => '0 <= float', + desc => 'Offset relates to the starting and ending coordinates + specified for the blend. This parameter is mode dependent.' }, + { name => 'supersample', type => 'boolean', + desc => 'Do adaptive supersampling' }, + { name => 'supersample_max_depth', type => '1 <= int32 <= 9', + no_validate => 1, + desc => 'Maximum recursion levels for supersampling' }, + { name => 'supersample_threshold', type => '0 <= float <= 4', + no_validate => 1, + desc => 'Supersampling threshold' }, + { name => 'dither', type => 'boolean', + desc => 'Use dithering to reduce banding' }, + { name => 'x1', type => 'float', + desc => "The x coordinate of this gradient's starting point" }, + { name => 'y1', type => 'float', + desc => "The y coordinate of this gradient's starting point" }, + { name => 'x2', type => 'float', + desc => "The x coordinate of this gradient's ending point" }, + { name => 'y2', type => 'float', + desc => "The y coordinate of this gradient's ending point" } + ); + + %invoke = ( + headers => [ qw("core/gimp-gradients.h" "core/gimpdrawable-gradient.h") ], + code => <<'CODE' +{ + success = (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, + GIMP_PDB_ITEM_CONTENT, error) && + gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error)); + + if (success) + { + if (supersample) + { + if (supersample_max_depth < 1 || supersample_max_depth > 9) + success = FALSE; + + if (supersample_threshold < 0.0 || supersample_threshold > 4.0) + success = FALSE; + } + else + { + supersample_max_depth = CLAMP (supersample_max_depth, 1, 9); + supersample_threshold = CLAMP (supersample_threshold, 0.0, 4.0); + } + } + + if (success) + { + /* all options should have the same value, so pick a random one */ + GimpPaintOptions *options = + gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), + "gimp-paintbrush"); + + if (progress) + gimp_progress_start (progress, FALSE, _("Gradient")); + + gimp_drawable_gradient (drawable, + context, + gimp_context_get_gradient (context), + GIMP_PDB_CONTEXT (context)->distance_metric, + gimp_context_get_paint_mode (context), + gradient_type, + gimp_context_get_opacity (context), + offset, + options->gradient_options->gradient_repeat, + options->gradient_options->gradient_reverse, + options->gradient_options->gradient_blend_color_space, + supersample, + supersample_max_depth, + supersample_threshold, + dither, + x1, y1, x2, y2, + progress); + + if (progress) + gimp_progress_end (progress); + } +} +CODE + ); +} + +sub drawable_edit_stroke_selection { + $blurb = 'Stroke the current selection'; + + $help = <<'HELP'; +This procedure strokes the current selection, painting along the +selection boundary with the active paint method and brush, or using a +plain line with configurable properties. The paint is applied to the +specified drawable regardless of the active selection. + + +This procedure is affected by the following context setters: +gimp_context_set_opacity(), gimp_context_set_paint_mode(), +gimp_context_set_paint_method(), gimp_context_set_stroke_method(), +gimp_context_set_foreground(), +gimp_context_set_brush() and all brush property settings, +gimp_context_set_gradient() and all gradient property settings, +gimp_context_set_line_width() and all line property settings. +HELP + + &std_pdb_misc; + + @inargs = ( + { name => 'drawable', type => 'drawable', + desc => 'The drawable to stroke to' } + ); + + %invoke = ( + headers => [ qw("core/gimpstrokeoptions.h") ], + code => <<'CODE' +{ + if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, + GIMP_PDB_ITEM_CONTENT, error) && + gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error)) + { + GimpImage *image = gimp_item_get_image (GIMP_ITEM (drawable)); + GimpStrokeOptions *options; + GimpPaintOptions *paint_options; + + options = gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context)); + + paint_options = + gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), NULL); + paint_options = gimp_config_duplicate (GIMP_CONFIG (paint_options)); + + success = gimp_item_stroke (GIMP_ITEM (gimp_image_get_mask (image)), + drawable, context, options, paint_options, + TRUE, progress, error); + + g_object_unref (paint_options); + } + else + success = FALSE; +} +CODE + ); +} + +sub drawable_edit_stroke_item { + $blurb = 'Stroke the specified item'; + + $help = <<'HELP'; +This procedure strokes the specified item, painting along its outline +(e.g. along a path, or along a channel's boundary), with the active +paint method and brush, or using a plain line with configurable +properties. + + +This procedure is affected by the following context setters: +gimp_context_set_opacity(), gimp_context_set_paint_mode(), +gimp_context_set_paint_method(), gimp_context_set_stroke_method(), +gimp_context_set_foreground(), +gimp_context_set_brush() and all brush property settings, +gimp_context_set_gradient() and all gradient property settings, +gimp_context_set_line_width() and all line property settings. +HELP + + &mitch_pdb_misc('2018', '2.10'); + + @inargs = ( + { name => 'drawable', type => 'drawable', + desc => 'The drawable to stroke to' }, + { name => 'item', type => 'item', + desc => 'The item to stroke' } + ); + + %invoke = ( + headers => [ qw("core/gimpstrokeoptions.h") ], + code => <<'CODE' +{ + if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, + GIMP_PDB_ITEM_CONTENT, error) && + gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) && + gimp_pdb_item_is_attached (item, + gimp_item_get_image (GIMP_ITEM (drawable)), + 0, error)) + { + GimpStrokeOptions *options; + GimpPaintOptions *paint_options; + + options = gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context)); + + paint_options = + gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), NULL); + paint_options = gimp_config_duplicate (GIMP_CONFIG (paint_options)); + + success = gimp_item_stroke (item, drawable, + context, options, paint_options, + TRUE, progress, error); + + g_object_unref (paint_options); + } + else + success = FALSE; +} +CODE + ); +} + + +@headers = qw("libgimpconfig/gimpconfig.h" + "paint/gimppaintoptions.h" + "core/gimp.h" + "core/gimp-edit.h" + "core/gimpbuffer.h" + "core/gimpimage.h" + "core/gimpprogress.h" + "gimppdb-utils.h" + "gimppdbcontext.h" + "gimp-intl.h"); + +@procs = qw(drawable_edit_clear + drawable_edit_fill + drawable_edit_bucket_fill + drawable_edit_gradient_fill + drawable_edit_stroke_selection + drawable_edit_stroke_item); + +%exports = (app => [@procs], lib => [@procs]); + +$desc = 'Drawable edit procedures'; +$doc_title = 'gimpdrawableedit'; +$doc_short_desc = 'Drawable edit functions (clear, fill, gradient, stroke etc.)'; +$doc_long_desc = 'Drawable edit functions (clear, fill, gradient, stroke etc.)'; + +1; diff --git a/pdb/groups/edit.pdb b/pdb/groups/edit.pdb index b150c077f0..3b04b045ba 100644 --- a/pdb/groups/edit.pdb +++ b/pdb/groups/edit.pdb @@ -519,6 +519,8 @@ HELP &std_pdb_misc; + $deprecated = 'gimp-drawable-edit-clear'; + @inargs = ( { name => 'drawable', type => 'drawable', desc => 'The drawable to clear from' } @@ -559,6 +561,8 @@ HELP $author .= ' & Raphael Quinet'; $date = '1995-2000'; + $deprecated = 'gimp-drawable-edit-fill'; + @inargs = ( { name => 'drawable', type => 'drawable', desc => "The drawable to fill to" }, @@ -616,6 +620,8 @@ HELP &std_pdb_misc; + $deprecated = 'gimp-drawable-edit-bucket-fill'; + @inargs = ( { name => 'drawable', type => 'drawable', desc => 'The affected drawable' }, @@ -714,6 +720,8 @@ HELP &david_pdb_misc('2006', '2.4'); + $deprecated = 'gimp-drawable-edit-bucket-fill'; + @inargs = ( { name => 'drawable', type => 'drawable', desc => 'The affected drawable' }, @@ -814,6 +822,8 @@ HELP &std_pdb_misc; + $deprecated = 'gimp-drawable-edit-gradient-fill'; + @inargs = ( { name => 'drawable', type => 'drawable', desc => 'The affected drawable' }, @@ -852,20 +862,28 @@ HELP ); %invoke = ( - headers => [ qw("core/gimp-gradients.h" "core/gimpdrawable-blend.h") ], + headers => [ qw("core/gimp-gradients.h" "core/gimpdrawable-gradient.h") ], code => <<'CODE' { success = (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, GIMP_PDB_ITEM_CONTENT, error) && gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error)); - if (success && supersample) + if (success) { - if (max_depth < 1 || max_depth > 9) - success = FALSE; + if (supersample) + { + if (max_depth < 1 || max_depth > 9) + success = FALSE; - if (threshold < 0.0 || threshold > 4.0) - success = FALSE; + if (threshold < 0.0 || threshold > 4.0) + success = FALSE; + } + else + { + max_depth = CLAMP (max_depth, 1, 9); + threshold = CLAMP (threshold, 0.0, 4.0); + } } if (success) @@ -876,7 +894,7 @@ HELP paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY; if (progress) - gimp_progress_start (progress, FALSE, _("Blending")); + gimp_progress_start (progress, FALSE, _("Gradient")); switch (blend_mode) { @@ -898,18 +916,19 @@ HELP break; } - gimp_drawable_blend (drawable, - context, - gradient, - GIMP_PDB_CONTEXT (context)->distance_metric, - paint_mode, - gradient_type, - opacity / 100.0, - offset, repeat, reverse, - supersample, max_depth, - threshold, dither, - x1, y1, x2, y2, - progress); + gimp_drawable_gradient (drawable, + context, + gradient, + GIMP_PDB_CONTEXT (context)->distance_metric, + paint_mode, + gradient_type, + opacity / 100.0, + offset, repeat, reverse, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, + supersample, max_depth, + threshold, dither, + x1, y1, x2, y2, + progress); if (progress) gimp_progress_end (progress); @@ -930,6 +949,8 @@ HELP &std_pdb_misc; + $deprecated = 'gimp-drawable-edit-stroke-selection'; + @inargs = ( { name => 'drawable', type => 'drawable', desc => 'The drawable to stroke to' } @@ -976,6 +997,8 @@ HELP &simon_pdb_misc('2006', '2.4'); + $deprecated = 'gimp-drawable-edit-stroke-item'; + @inargs = ( { name => 'drawable', type => 'drawable', desc => 'The drawable to stroke to' }, diff --git a/pdb/groups/gradient.pdb b/pdb/groups/gradient.pdb index 303c9f54a2..a6d84faa1a 100644 --- a/pdb/groups/gradient.pdb +++ b/pdb/groups/gradient.pdb @@ -251,7 +251,9 @@ HELP %invoke = ( code => <<'CODE' { - GimpGradient *gradient = gimp_pdb_get_gradient (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error); + GimpGradient *gradient = gimp_pdb_get_gradient (gimp, name, + GIMP_PDB_DATA_ACCESS_READ, + error); if (gradient) { @@ -269,7 +271,9 @@ HELP GimpRGB color; seg = gimp_gradient_get_color_at (gradient, context, seg, - pos, reverse, &color); + pos, reverse, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, + &color); *sample++ = color.r; *sample++ = color.g; @@ -321,7 +325,9 @@ HELP %invoke = ( code => <<'CODE' { - GimpGradient *gradient = gimp_pdb_get_gradient (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error); + GimpGradient *gradient = gimp_pdb_get_gradient (gimp, name, + GIMP_PDB_DATA_ACCESS_READ, + error); if (gradient) { @@ -338,7 +344,9 @@ HELP seg = gimp_gradient_get_color_at (gradient, context, seg, *positions, - reverse, &color); + reverse, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, + &color); *sample++ = color.r; *sample++ = color.g; @@ -385,7 +393,8 @@ HELP GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, + &seg, error); if (seg) { @@ -429,7 +438,8 @@ HELP GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, + &seg, error); if (seg) { @@ -470,7 +480,8 @@ HELP GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment, + &seg, error); if (seg) { @@ -511,7 +522,8 @@ HELP GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment, + &seg, error); if (seg) { @@ -553,7 +565,8 @@ HELP GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, + &seg, error); if (seg) { @@ -594,7 +607,8 @@ HELP GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, + &seg, error); if (seg) { @@ -635,7 +649,8 @@ HELP GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, + &seg, error); if (seg) { @@ -682,7 +697,8 @@ HELP GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment, + &seg, error); if (seg) { @@ -729,7 +745,8 @@ HELP GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment, + &seg, error); if (seg) { @@ -776,7 +793,8 @@ HELP GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment, + &seg, error); if (seg) { @@ -819,7 +837,8 @@ HELP GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, + &seg, error); if (seg) { @@ -861,7 +880,8 @@ HELP GimpGradient *gradient; GimpGradientSegment *seg; - gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, &seg, error); + gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment, + &seg, error); if (seg) { @@ -1083,6 +1103,7 @@ HELP { gimp_gradient_segment_range_split_midpoint (gradient, context, start_seg, end_seg, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, NULL, NULL); } else @@ -1129,6 +1150,7 @@ HELP gimp_gradient_segment_range_split_uniform (gradient, context, start_seg, end_seg, split_parts, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, NULL, NULL); } else diff --git a/pdb/groups/gradients.pdb b/pdb/groups/gradients.pdb index 336c412752..376de2f98f 100644 --- a/pdb/groups/gradients.pdb +++ b/pdb/groups/gradients.pdb @@ -108,7 +108,9 @@ sub gradients_sample_uniform { while (num_samples--) { seg = gimp_gradient_get_color_at (gradient, context, seg, - pos, reverse, &color); + pos, reverse, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, + &color); *pv++ = color.r; *pv++ = color.g; @@ -159,7 +161,9 @@ sub gradients_sample_custom { while (num_samples--) { seg = gimp_gradient_get_color_at (gradient, context, seg, - *positions, reverse, &color); + *positions, reverse, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, + &color); *pv++ = color.r; *pv++ = color.g; @@ -227,7 +231,9 @@ sub gradients_get_gradient_data { while (sample_size--) { seg = gimp_gradient_get_color_at (gradient, context, seg, - pos, reverse, &color); + pos, reverse, + GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL, + &color); *pv++ = color.r; *pv++ = color.g; diff --git a/pdb/groups/image_select.pdb b/pdb/groups/image_select.pdb index 1db4820054..f338313429 100644 --- a/pdb/groups/image_select.pdb +++ b/pdb/groups/image_select.pdb @@ -31,12 +31,14 @@ determined by the threshold and criterion context values) are included in the selection. To select transparent regions, the color specified must also have minimum alpha. + This procedure is affected by the following context setters: gimp_context_set_antialias(), gimp_context_set_feather(), gimp_context_set_feather_radius(), gimp_context_set_sample_merged(), gimp_context_set_sample_criterion(), gimp_context_set_sample_threshold(), gimp_context_set_sample_transparent(). + In the case of a merged sampling, the supplied drawable is ignored. HELP @@ -99,12 +101,14 @@ expansion is possible. If antialiasing is turned on, the final selection mask will contain intermediate values based on close misses to the threshold bar at pixels along the seed fill boundary. + This procedure is affected by the following context setters: gimp_context_set_antialias(), gimp_context_set_feather(), gimp_context_set_feather_radius(), gimp_context_set_sample_merged(), gimp_context_set_sample_criterion(), gimp_context_set_sample_threshold(), gimp_context_set_sample_transparent(), gimp_context_set_diagonal_neighbors(). + In the case of a merged sampling, the supplied drawable is ignored. If the sample is merged, the specified coordinates are relative to the image origin; otherwise, they are relative to the drawable's origin. @@ -166,6 +170,7 @@ This tool creates a rectangular selection over the specified image. The rectangular region can be either added to, subtracted from, or replace the contents of the previous selection mask. + This procedure is affected by the following context setters: gimp_context_set_feather(), gimp_context_set_feather_radius(). HELP @@ -215,6 +220,7 @@ specified image. The rectangular region can be either added to, subtracted from, or replace the contents of the previous selection mask. + This procedure is affected by the following context setters: gimp_context_set_antialias(), gimp_context_set_feather(), gimp_context_set_feather_radius(). @@ -271,6 +277,7 @@ This tool creates an elliptical selection over the specified image. The elliptical region can be either added to, subtracted from, or replace the contents of the previous selection mask. + This procedure is affected by the following context setters: gimp_context_set_antialias(), gimp_context_set_feather(), gimp_context_set_feather_radius(). @@ -326,6 +333,7 @@ defined by 2 floating point values which correspond to the x and y coordinates. If the final point does not connect to the starting point, a connecting segment is automatically added. + This procedure is affected by the following context setters: gimp_context_set_antialias(), gimp_context_set_feather(), gimp_context_set_feather_radius(). @@ -376,6 +384,7 @@ of the image the item belongs to. What exactly the item's outline is depends on the item type: for layers, it's the layer's alpha channel, for vectors the vector's shape. + This procedure is affected by the following context setters: gimp_context_set_antialias(), gimp_context_set_feather(), gimp_context_set_feather_radius(). diff --git a/pdb/groups/plug_in_compat.pdb b/pdb/groups/plug_in_compat.pdb index e7dabfae16..3f5af3404b 100644 --- a/pdb/groups/plug_in_compat.pdb +++ b/pdb/groups/plug_in_compat.pdb @@ -3140,7 +3140,7 @@ HELP GeglNode *node; if (randomize) - seed = g_random_int (); + seed = (gint32) g_random_int (); node = gegl_node_new_child (NULL, @@ -3201,7 +3201,7 @@ HELP GeglNode *node; if (randomize) - seed = g_random_int (); + seed = (gint32) g_random_int (); node = gegl_node_new_child (NULL, @@ -3262,7 +3262,7 @@ HELP GeglNode *node; if (randomize) - seed = g_random_int (); + seed = (gint32) g_random_int (); node = gegl_node_new_child (NULL, @@ -3400,7 +3400,7 @@ HELP "green", g, "blue", b, "alpha", a, - "seed", g_random_int_range (0, G_MAXINT), + "seed", g_random_int (), NULL); node = wrap_in_gamma_cast (node, drawable); @@ -3536,7 +3536,7 @@ HELP "green", g, "blue", b, "alpha", a, - "seed", g_random_int_range (0, G_MAXINT), + "seed", g_random_int (), NULL); node = wrap_in_gamma_cast (node, drawable); @@ -3747,7 +3747,7 @@ sub plug_in_sinus { { name => 'blend', type => '0 <= int32 <= 2', desc => '0=linear, 1=bilinear, 2=sinusoidal' }, { name => 'blend_power', type => 'float', - desc => 'Power used to strech the blend' } + desc => 'Power used to stretch the blend' } ); %invoke = ( @@ -3978,7 +3978,7 @@ HELP "operation", "gegl:noise-spread", "amount-x", (gint) spread_amount_x, "amount-y", (gint) spread_amount_y, - "seed", (guint) g_random_int (), + "seed", g_random_int (), NULL); gimp_drawable_apply_operation (drawable, progress, diff --git a/pdb/groups/selection.pdb b/pdb/groups/selection.pdb index 7622726925..1d8e33fd4f 100644 --- a/pdb/groups/selection.pdb +++ b/pdb/groups/selection.pdb @@ -547,9 +547,18 @@ HELP headers => [qw("core/gimpselection.h") ], code => <<'CODE' { - channel = gimp_selection_save (GIMP_SELECTION (gimp_image_get_mask (image))); + channel = GIMP_CHANNEL (gimp_item_duplicate (GIMP_ITEM (gimp_image_get_mask (image)), + GIMP_TYPE_CHANNEL)); - if (! channel) + if (channel) + { + /* saved selections are not visible by default */ + gimp_item_set_visible (GIMP_ITEM (channel), FALSE, FALSE); + + gimp_image_add_channel (image, channel, + GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE); + } + else success = FALSE; } CODE diff --git a/pdb/lib.pl b/pdb/lib.pl index 8159139232..9f8fa1abf2 100644 --- a/pdb/lib.pl +++ b/pdb/lib.pl @@ -459,17 +459,31 @@ CODE $sincedesc = "\n *\n * Since: $proc->{since}"; } + my $procdesc = ''; + if ($proc->{deprecated}) { if ($proc->{deprecated} eq 'NONE') { - $procdesc = &desc_wrap("Deprecated: There is no replacement " . - "for this procedure."); + if ($proc->{blurb}) { + $procdesc = &desc_wrap($proc->{blurb}) . "\n *\n"; + } + if ($proc->{help}) { + $procdesc .= &desc_wrap($proc->{help}) . "\n *\n"; + } + $procdesc .= &desc_wrap("Deprecated: There is no replacement " . + "for this procedure."); } else { my $underscores = $proc->{deprecated}; $underscores =~ s/-/_/g; - $procdesc = &desc_wrap("Deprecated: " . - "Use $underscores() instead."); + if ($proc->{blurb}) { + $procdesc = &desc_wrap($proc->{blurb}) . "\n *\n"; + } + if ($proc->{help}) { + $procdesc .= &desc_wrap($proc->{help}) . "\n *\n"; + } + $procdesc .= &desc_wrap("Deprecated: " . + "Use $underscores() instead."); } } else { diff --git a/pdb/stddefs.pdb b/pdb/stddefs.pdb index 22c24e014f..67178cf845 100644 --- a/pdb/stddefs.pdb +++ b/pdb/stddefs.pdb @@ -167,10 +167,10 @@ sub yosh_pdb_misc { sub std_pdb_deprecated { if (@_) { - $blurb = $help = "Deprecated: Use '@_' instead."; + $blurb = $help = ''; $deprecated = "@_"; } else { - $blurb = $help = "Deprecated: There is no replacement for this procedure."; + $blurb = $help = ''; $deprecated = "NONE"; } $author = $copyright = $date = ''; diff --git a/plug-ins/Makefile.in b/plug-ins/Makefile.in index 867cf32f46..f45a15878e 100644 --- a/plug-ins/Makefile.in +++ b/plug-ins/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -278,7 +279,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -351,6 +352,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -579,6 +581,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/common/Makefile.in b/plug-ins/common/Makefile.in index 404e58f67e..f5dc21c203 100644 --- a/plug-ins/common/Makefile.in +++ b/plug-ins/common/Makefile.in @@ -139,6 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -1073,7 +1074,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -1146,6 +1147,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -1374,6 +1376,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c index 4619fdd64f..266dc09d1d 100644 --- a/plug-ins/common/file-png.c +++ b/plug-ins/common/file-png.c @@ -876,13 +876,13 @@ load_image (const gchar *filename, struct read_error_data error_data; pp = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - if (!pp) + if (! pp) { /* this could happen if the compile time and run-time libpng versions do not match. */ g_set_error (error, 0, 0, - _("Error creating PNG read struct while exporting '%s'."), + _("Error creating PNG read struct while loading '%s'."), gimp_filename_to_utf8 (filename)); return -1; } diff --git a/plug-ins/common/file-pnm.c b/plug-ins/common/file-pnm.c index fadd035283..db53d27219 100644 --- a/plug-ins/common/file-pnm.c +++ b/plug-ins/common/file-pnm.c @@ -1488,8 +1488,8 @@ save_image (GFile *file, g_snprintf (buf, sizeof (buf), "%d %d\n%d\n", xres, yres, rowinfo.bpc == 1 ? 255 : 65535); else - g_snprintf (buf, sizeof (buf), "%d %d\n%f\n", xres, yres, - G_BYTE_ORDER == G_BIG_ENDIAN ? 1.0f : -1.0f); + g_snprintf (buf, sizeof (buf), "%d %d\n%s\n", xres, yres, + G_BYTE_ORDER == G_BIG_ENDIAN ? "1.0" : "-1.0"); if (! output_write (output, buf, strlen (buf), error)) goto out; diff --git a/plug-ins/file-bmp/Makefile.in b/plug-ins/file-bmp/Makefile.in index 0f7990dbad..df7e48ff1f 100644 --- a/plug-ins/file-bmp/Makefile.in +++ b/plug-ins/file-bmp/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -274,7 +275,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -347,6 +348,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -575,6 +577,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/file-exr/Makefile.in b/plug-ins/file-exr/Makefile.in index 383ca23578..697ae255d4 100644 --- a/plug-ins/file-exr/Makefile.in +++ b/plug-ins/file-exr/Makefile.in @@ -100,6 +100,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -287,7 +288,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -360,6 +361,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -588,6 +590,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/file-faxg3/Makefile.in b/plug-ins/file-faxg3/Makefile.in index 881205838a..a12a121b54 100644 --- a/plug-ins/file-faxg3/Makefile.in +++ b/plug-ins/file-faxg3/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -273,7 +274,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -346,6 +347,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -574,6 +576,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/file-fits/Makefile.in b/plug-ins/file-fits/Makefile.in index 4ba54a9543..e19cd85171 100644 --- a/plug-ins/file-fits/Makefile.in +++ b/plug-ins/file-fits/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -273,7 +274,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -346,6 +347,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -574,6 +576,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/file-fli/Makefile.in b/plug-ins/file-fli/Makefile.in index a76c641b63..d4a1c65bce 100644 --- a/plug-ins/file-fli/Makefile.in +++ b/plug-ins/file-fli/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -273,7 +274,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -346,6 +347,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -574,6 +576,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/file-ico/Makefile.in b/plug-ins/file-ico/Makefile.in index f216006107..0becbe4178 100644 --- a/plug-ins/file-ico/Makefile.in +++ b/plug-ins/file-ico/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -279,7 +280,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -352,6 +353,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -580,6 +582,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/file-jpeg/Makefile.in b/plug-ins/file-jpeg/Makefile.in index 90ded57b10..aadfd2e204 100644 --- a/plug-ins/file-jpeg/Makefile.in +++ b/plug-ins/file-jpeg/Makefile.in @@ -103,6 +103,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -281,7 +282,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -354,6 +355,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -582,6 +584,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/file-psd/Makefile.in b/plug-ins/file-psd/Makefile.in index 46ccd6d727..40c581b11d 100644 --- a/plug-ins/file-psd/Makefile.in +++ b/plug-ins/file-psd/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -275,7 +276,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -348,6 +349,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -576,6 +578,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/file-raw/Makefile.in b/plug-ins/file-raw/Makefile.in index 2e5161cc2d..d79fc3e6c2 100644 --- a/plug-ins/file-raw/Makefile.in +++ b/plug-ins/file-raw/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -315,7 +316,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -388,6 +389,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -616,6 +618,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/file-sgi/Makefile.in b/plug-ins/file-sgi/Makefile.in index 822f26786d..19eb4b92d3 100644 --- a/plug-ins/file-sgi/Makefile.in +++ b/plug-ins/file-sgi/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -273,7 +274,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -346,6 +347,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -574,6 +576,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/file-tiff/Makefile.in b/plug-ins/file-tiff/Makefile.in index b413126da1..59714bbf08 100644 --- a/plug-ins/file-tiff/Makefile.in +++ b/plug-ins/file-tiff/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -274,7 +275,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -347,6 +348,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -575,6 +577,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/file-webp/Makefile.in b/plug-ins/file-webp/Makefile.in index 3e4ae44acd..85413c2cfb 100644 --- a/plug-ins/file-webp/Makefile.in +++ b/plug-ins/file-webp/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -275,7 +276,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -348,6 +349,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -576,6 +578,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/flame/Makefile.in b/plug-ins/flame/Makefile.in index ccf8b99801..e2900d3fd3 100644 --- a/plug-ins/flame/Makefile.in +++ b/plug-ins/flame/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -274,7 +275,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -347,6 +348,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -575,6 +577,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/fractal-explorer/Makefile.in b/plug-ins/fractal-explorer/Makefile.in index f44669d070..b4ea317a7f 100644 --- a/plug-ins/fractal-explorer/Makefile.in +++ b/plug-ins/fractal-explorer/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -317,7 +318,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -390,6 +391,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -618,6 +620,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/fractal-explorer/examples/Makefile.in b/plug-ins/fractal-explorer/examples/Makefile.in index 33b94f8bf6..be516cc986 100644 --- a/plug-ins/fractal-explorer/examples/Makefile.in +++ b/plug-ins/fractal-explorer/examples/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/gfig/Makefile.in b/plug-ins/gfig/Makefile.in index e77e38ecd2..2c396c8421 100644 --- a/plug-ins/gfig/Makefile.in +++ b/plug-ins/gfig/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -321,7 +322,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -394,6 +395,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -622,6 +624,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/gfig/gfig-dialog.c b/plug-ins/gfig/gfig-dialog.c index 73b14cb55a..fe4b253c61 100644 --- a/plug-ins/gfig/gfig-dialog.c +++ b/plug-ins/gfig/gfig-dialog.c @@ -1902,82 +1902,72 @@ load_file_chooser_response (GtkFileChooser *chooser, void paint_layer_fill (gdouble x1, gdouble y1, gdouble x2, gdouble y2) { - GimpBucketFillMode fill_mode = GIMP_BUCKET_FILL_FG; + GimpFillType fill_type = GIMP_FILL_FOREGROUND; Style *current_style; current_style = gfig_context_get_current_style (); + gimp_context_push (); + + gimp_context_set_paint_mode (GIMP_LAYER_MODE_NORMAL_LEGACY); + gimp_context_set_opacity (100.0); + gimp_context_set_gradient_repeat_mode (GIMP_REPEAT_NONE); + gimp_context_set_gradient_reverse (FALSE); + switch (current_style->fill_type) { case FILL_NONE: return; case FILL_COLOR: - fill_mode = GIMP_BUCKET_FILL_FG; + fill_type = GIMP_FILL_FOREGROUND; break; case FILL_PATTERN: - fill_mode = GIMP_BUCKET_FILL_PATTERN; + fill_type = GIMP_FILL_PATTERN; break; case FILL_GRADIENT: - gimp_edit_blend (gfig_context->drawable_id, - GIMP_BLEND_CUSTOM, - GIMP_LAYER_MODE_NORMAL_LEGACY, - GIMP_GRADIENT_SHAPEBURST_DIMPLED, - 100.0, /* opacity */ - 0.0, /* offset */ - GIMP_REPEAT_NONE, - FALSE, /* reverse */ - FALSE, /* supersampling */ - 0, /* max_depth */ - 0.0, /* threshold */ - FALSE, /* dither */ - 0.0, 0.0, /* (x1, y1) - ignored */ - 0.0, 0.0); /* (x2, y2) - ignored */ + gimp_drawable_edit_gradient_fill (gfig_context->drawable_id, + GIMP_GRADIENT_SHAPEBURST_DIMPLED, + 0.0, /* offset */ + FALSE, /* supersampling */ + 0, /* max_depth */ + 0.0, /* threshold */ + FALSE, /* dither */ + 0.0, 0.0, /* (x1, y1) - ignored */ + 0.0, 0.0); /* (x2, y2) - ignored */ return; case FILL_VERTICAL: - gimp_edit_blend (gfig_context->drawable_id, - GIMP_BLEND_CUSTOM, - GIMP_LAYER_MODE_NORMAL_LEGACY, - GIMP_GRADIENT_LINEAR, - 100.0, - 0.0, - GIMP_REPEAT_NONE, - FALSE, - FALSE, - 0, - 0.0, - FALSE, - x1, y1, - x1, y2); + gimp_drawable_edit_gradient_fill (gfig_context->drawable_id, + GIMP_GRADIENT_LINEAR, + 0.0, + FALSE, + 0, + 0.0, + FALSE, + x1, y1, + x1, y2); return; case FILL_HORIZONTAL: - gimp_edit_blend (gfig_context->drawable_id, - GIMP_BLEND_CUSTOM, - GIMP_LAYER_MODE_NORMAL_LEGACY, - GIMP_GRADIENT_LINEAR, - 100.0, - 0.0, - GIMP_REPEAT_NONE, - FALSE, - FALSE, - 0, - 0.0, - FALSE, - x1, y1, - x2, y1); + gimp_drawable_edit_gradient_fill (gfig_context->drawable_id, + GIMP_GRADIENT_LINEAR, + 0.0, + FALSE, + 0, + 0.0, + FALSE, + x1, y1, + x2, y1); return; } - gimp_edit_bucket_fill (gfig_context->drawable_id, - fill_mode, /* Fill mode */ - GIMP_LAYER_MODE_NORMAL_LEGACY, - current_style->fill_opacity, /* Fill opacity */ - 0.0, /* threshold - ignored */ - FALSE, /* Sample merged - ignored */ - 0.0, /* x - ignored */ - 0.0); /* y - ignored */ + gimp_context_set_opacity (current_style->fill_opacity); + + gimp_drawable_edit_fill (gfig_context->drawable_id, + fill_type); + + gimp_context_pop (); } void diff --git a/plug-ins/gfig/gfig-examples/Makefile.in b/plug-ins/gfig/gfig-examples/Makefile.in index bd213050fa..80b3b50034 100644 --- a/plug-ins/gfig/gfig-examples/Makefile.in +++ b/plug-ins/gfig/gfig-examples/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/gfig/images/Makefile.in b/plug-ins/gfig/images/Makefile.in index da3fee1f01..f821170ede 100644 --- a/plug-ins/gfig/images/Makefile.in +++ b/plug-ins/gfig/images/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -215,7 +216,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -288,6 +289,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -516,6 +518,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/gimpressionist/Brushes/Makefile.in b/plug-ins/gimpressionist/Brushes/Makefile.in index 86ee1cb098..b2d49c1914 100644 --- a/plug-ins/gimpressionist/Brushes/Makefile.in +++ b/plug-ins/gimpressionist/Brushes/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/gimpressionist/Makefile.in b/plug-ins/gimpressionist/Makefile.in index 62221f10a2..24df9b6e5f 100644 --- a/plug-ins/gimpressionist/Makefile.in +++ b/plug-ins/gimpressionist/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -322,7 +323,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -395,6 +396,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -623,6 +625,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/gimpressionist/Paper/Makefile.in b/plug-ins/gimpressionist/Paper/Makefile.in index 273bff8cd4..00b9174df1 100644 --- a/plug-ins/gimpressionist/Paper/Makefile.in +++ b/plug-ins/gimpressionist/Paper/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/gimpressionist/Presets/Makefile.in b/plug-ins/gimpressionist/Presets/Makefile.in index bc1937a740..064f6005af 100644 --- a/plug-ins/gimpressionist/Presets/Makefile.in +++ b/plug-ins/gimpressionist/Presets/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/gradient-flare/Makefile.in b/plug-ins/gradient-flare/Makefile.in index 79a1c32391..d0e7e8665a 100644 --- a/plug-ins/gradient-flare/Makefile.in +++ b/plug-ins/gradient-flare/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -316,7 +317,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -389,6 +390,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -617,6 +619,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/gradient-flare/flares/Makefile.in b/plug-ins/gradient-flare/flares/Makefile.in index 4260445e8f..c111723f17 100644 --- a/plug-ins/gradient-flare/flares/Makefile.in +++ b/plug-ins/gradient-flare/flares/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/help-browser/Makefile.in b/plug-ins/help-browser/Makefile.in index de42b91942..850e08a903 100644 --- a/plug-ins/help-browser/Makefile.in +++ b/plug-ins/help-browser/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -276,7 +277,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -349,6 +350,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -577,6 +579,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/help/Makefile.in b/plug-ins/help/Makefile.in index e75b823726..0cd09a2aa8 100644 --- a/plug-ins/help/Makefile.in +++ b/plug-ins/help/Makefile.in @@ -104,6 +104,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -294,7 +295,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -367,6 +368,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -595,6 +597,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/ifs-compose/Makefile.in b/plug-ins/ifs-compose/Makefile.in index 41a31fe3c6..90611465a1 100644 --- a/plug-ins/ifs-compose/Makefile.in +++ b/plug-ins/ifs-compose/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -275,7 +276,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -348,6 +349,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -576,6 +578,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/imagemap/Makefile.in b/plug-ins/imagemap/Makefile.in index c4db248850..3eec9693f4 100644 --- a/plug-ins/imagemap/Makefile.in +++ b/plug-ins/imagemap/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -346,7 +347,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -419,6 +420,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -647,6 +649,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/imagemap/images/Makefile.in b/plug-ins/imagemap/images/Makefile.in index 940b46fdae..7f717dbfc0 100644 --- a/plug-ins/imagemap/images/Makefile.in +++ b/plug-ins/imagemap/images/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -215,7 +216,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -288,6 +289,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -516,6 +518,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/lighting/Makefile.in b/plug-ins/lighting/Makefile.in index 88c0a727c9..0a02c6a11d 100644 --- a/plug-ins/lighting/Makefile.in +++ b/plug-ins/lighting/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -318,7 +319,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -391,6 +392,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -619,6 +621,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/lighting/images/Makefile.in b/plug-ins/lighting/images/Makefile.in index dcf2457a75..4bd7d2ac61 100644 --- a/plug-ins/lighting/images/Makefile.in +++ b/plug-ins/lighting/images/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -215,7 +216,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -288,6 +289,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -516,6 +518,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/map-object/Makefile.in b/plug-ins/map-object/Makefile.in index 2ccaeaaea5..d5e191a9f4 100644 --- a/plug-ins/map-object/Makefile.in +++ b/plug-ins/map-object/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -276,7 +277,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -349,6 +350,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -577,6 +579,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/metadata/Makefile.in b/plug-ins/metadata/Makefile.in index 95f0f6bd48..41d969b512 100644 --- a/plug-ins/metadata/Makefile.in +++ b/plug-ins/metadata/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -281,7 +282,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -354,6 +355,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -582,6 +584,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/pagecurl/Makefile.in b/plug-ins/pagecurl/Makefile.in index f995b35ea2..cf2731954d 100644 --- a/plug-ins/pagecurl/Makefile.in +++ b/plug-ins/pagecurl/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -274,7 +275,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -347,6 +348,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -575,6 +577,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/print/Makefile.in b/plug-ins/print/Makefile.in index feccb023ef..a9c9a794ec 100644 --- a/plug-ins/print/Makefile.in +++ b/plug-ins/print/Makefile.in @@ -103,6 +103,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -277,7 +278,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -350,6 +351,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -578,6 +580,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/pygimp/Makefile.in b/plug-ins/pygimp/Makefile.in index 76b5e58ecb..83c2694122 100644 --- a/plug-ins/pygimp/Makefile.in +++ b/plug-ins/pygimp/Makefile.in @@ -100,6 +100,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -384,7 +385,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -457,6 +458,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -685,6 +687,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/pygimp/plug-ins/Makefile.in b/plug-ins/pygimp/plug-ins/Makefile.in index 68c09d7d4b..3a101182cc 100644 --- a/plug-ins/pygimp/plug-ins/Makefile.in +++ b/plug-ins/pygimp/plug-ins/Makefile.in @@ -100,6 +100,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -247,7 +248,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -320,6 +321,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -548,6 +550,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/screenshot/Makefile.in b/plug-ins/screenshot/Makefile.in index 98f17069b4..24e4d8d0bc 100644 --- a/plug-ins/screenshot/Makefile.in +++ b/plug-ins/screenshot/Makefile.in @@ -101,6 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -275,7 +276,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -348,6 +349,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -576,6 +578,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/screenshot/screenshot-x11.c b/plug-ins/screenshot/screenshot-x11.c index 620c2d8f9a..7dafc00579 100644 --- a/plug-ins/screenshot/screenshot-x11.c +++ b/plug-ins/screenshot/screenshot-x11.c @@ -433,7 +433,7 @@ create_image (cairo_surface_t *surface, if (! gimp_selection_is_empty (image)) { gimp_layer_add_alpha (layer); - gimp_edit_clear (layer); + gimp_drawable_edit_clear (layer); gimp_selection_none (image); } } diff --git a/plug-ins/script-fu/Makefile.am b/plug-ins/script-fu/Makefile.am index 90b449fba0..4db770575f 100644 --- a/plug-ins/script-fu/Makefile.am +++ b/plug-ins/script-fu/Makefile.am @@ -2,6 +2,8 @@ if PLATFORM_OSX xobjective_c = "-xobjective-c" +xobjective_cxx = "-xobjective-c++" +xnone = "-xnone" framework_cocoa = -framework Cocoa endif @@ -28,21 +30,25 @@ include $(top_srcdir)/build/windows/gimprc-plug-ins.rule script_fu_RC = script-fu.rc.o endif -AM_CFLAGS = \ +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + $(GTK_CFLAGS) \ + $(GEGL_CFLAGS) \ + -I$(includedir) \ -DSTANDALONE=0 \ -DUSE_INTERFACE=1 \ -DUSE_STRLWR=0 -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - $(GTK_CFLAGS) \ - $(GEGL_CFLAGS) \ - -I$(includedir) \ +AM_CFLAGS = \ $(xobjective_c) +AM_CXXFLAGS = \ + $(xobjective_cxx) + AM_LDFLAGS = \ - $(mwindows) \ - $(framework_cocoa) + $(mwindows) \ + $(framework_cocoa) \ + $(xnone) SUBDIRS = tinyscheme ftx scripts diff --git a/plug-ins/script-fu/Makefile.in b/plug-ins/script-fu/Makefile.in index 8f59bfd08e..232eafa292 100644 --- a/plug-ins/script-fu/Makefile.in +++ b/plug-ins/script-fu/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -325,7 +326,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -398,6 +399,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -626,6 +628,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -645,6 +648,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @PLATFORM_OSX_TRUE@xobjective_c = "-xobjective-c" +@PLATFORM_OSX_TRUE@xobjective_cxx = "-xobjective-c++" +@PLATFORM_OSX_TRUE@xnone = "-xnone" @PLATFORM_OSX_TRUE@framework_cocoa = -framework Cocoa @OS_WIN32_TRUE@mwindows = -mwindows @OS_WIN32_TRUE@WINSOCK_LIBS = -lws2_32 @@ -660,21 +665,25 @@ libtinyscheme = tinyscheme/libtinyscheme.a $(libm) libftx = ftx/libftx.a @HAVE_WINDRES_TRUE@GIMPPLUGINRC = $(top_builddir)/build/windows/gimp-plug-ins.rc @HAVE_WINDRES_TRUE@script_fu_RC = script-fu.rc.o -AM_CFLAGS = \ +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + $(GTK_CFLAGS) \ + $(GEGL_CFLAGS) \ + -I$(includedir) \ -DSTANDALONE=0 \ -DUSE_INTERFACE=1 \ -DUSE_STRLWR=0 -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - $(GTK_CFLAGS) \ - $(GEGL_CFLAGS) \ - -I$(includedir) \ +AM_CFLAGS = \ $(xobjective_c) +AM_CXXFLAGS = \ + $(xobjective_cxx) + AM_LDFLAGS = \ - $(mwindows) \ - $(framework_cocoa) + $(mwindows) \ + $(framework_cocoa) \ + $(xnone) SUBDIRS = tinyscheme ftx scripts script_fu_SOURCES = \ diff --git a/plug-ins/script-fu/ftx/Makefile.in b/plug-ins/script-fu/ftx/Makefile.in index f9857beb73..e0ed5c70ea 100644 --- a/plug-ins/script-fu/ftx/Makefile.in +++ b/plug-ins/script-fu/ftx/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -268,7 +269,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -341,6 +342,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -569,6 +571,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/script-fu/scripts/Makefile.in b/plug-ins/script-fu/scripts/Makefile.in index 4448fbace4..f9a7b86a4d 100644 --- a/plug-ins/script-fu/scripts/Makefile.in +++ b/plug-ins/script-fu/scripts/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -303,7 +304,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -376,6 +377,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -604,6 +606,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/script-fu/scripts/add-bevel.scm b/plug-ins/script-fu/scripts/add-bevel.scm index 7b8742ea3f..d4a1450324 100644 --- a/plug-ins/script-fu/scripts/add-bevel.scm +++ b/plug-ins/script-fu/scripts/add-bevel.scm @@ -121,15 +121,13 @@ (set! greyness (/ (* index 255) thickness)) (gimp-context-set-background (list greyness greyness greyness)) ;(gimp-selection-feather image 1) ;Stop the slopey jaggies? - (gimp-edit-bucket-fill bump-layer BUCKET-FILL-BG LAYER-MODE-NORMAL - 100 0 FALSE 0 0) + (gimp-drawable-edit-fill bump-layer FILL-BACKGROUND) (gimp-selection-shrink image 1) (set! index (+ index 1)) ) ; Now the white interior (gimp-context-set-background '(255 255 255)) - (gimp-edit-bucket-fill bump-layer BUCKET-FILL-BG LAYER-MODE-NORMAL - 100 0 FALSE 0 0) + (gimp-drawable-edit-fill bump-layer FILL-BACKGROUND) ;------------------------------------------------------------ ; diff --git a/plug-ins/script-fu/scripts/addborder.scm b/plug-ins/script-fu/scripts/addborder.scm index fd1f2eecb7..c0e6ccb468 100644 --- a/plug-ins/script-fu/scripts/addborder.scm +++ b/plug-ins/script-fu/scripts/addborder.scm @@ -108,6 +108,8 @@ _"Border Layer" 100 LAYER-MODE-NORMAL)))) (gimp-context-push) + (gimp-context-set-paint-mode LAYER-MODE-NORMAL) + (gimp-context-set-opacity 100.0) (gimp-context-set-antialias FALSE) (gimp-context-set-feather FALSE) @@ -127,27 +129,27 @@ CHANNEL-OP-REPLACE 10 (gen_top_array xsize ysize owidth oheight width height)) - (gimp-edit-fill layer FILL-BACKGROUND) + (gimp-drawable-edit-fill layer FILL-BACKGROUND) (gimp-context-set-background (adjcolor color (/ dvalue 2))) (gimp-image-select-polygon img CHANNEL-OP-REPLACE 10 (gen_left_array xsize ysize owidth oheight width height)) - (gimp-edit-fill layer FILL-BACKGROUND) + (gimp-drawable-edit-fill layer FILL-BACKGROUND) (gimp-context-set-background (adjcolor color (- 0 (/ dvalue 2)))) (gimp-image-select-polygon img CHANNEL-OP-REPLACE 10 (gen_right_array xsize ysize owidth oheight width height)) - (gimp-edit-fill layer FILL-BACKGROUND) + (gimp-drawable-edit-fill layer FILL-BACKGROUND) (gimp-context-set-background (adjcolor color (- 0 dvalue))) (gimp-image-select-polygon img CHANNEL-OP-REPLACE 10 (gen_bottom_array xsize ysize owidth oheight width height)) - (gimp-edit-fill layer FILL-BACKGROUND) + (gimp-drawableedit-fill layer FILL-BACKGROUND) (gimp-selection-none img) (gimp-image-undo-group-end img) (gimp-displays-flush) diff --git a/plug-ins/script-fu/scripts/burn-in-anim.scm b/plug-ins/script-fu/scripts/burn-in-anim.scm index e38efa2bcc..a1bdcd0e42 100644 --- a/plug-ins/script-fu/scripts/burn-in-anim.scm +++ b/plug-ins/script-fu/scripts/burn-in-anim.scm @@ -115,18 +115,20 @@ (if (= fadeout TRUE) (begin ; blend with 20% offset to get less transparency in the front - (gimp-edit-blend bl-mask BLEND-FG-BG-RGB LAYER-MODE-NORMAL - GRADIENT-LINEAR 100 20 REPEAT-NONE FALSE - FALSE 0 0 TRUE - (+ bl-x-off bl-width) 0 bl-x-off 0) + (gimp-context-set-gradient-fg-bg-rgb) + (gimp-drawable_edit-gradient-fill bl-mask + GRADIENT-LINEAR 20 + FALSE 0 0 + TRUE + (+ bl-x-off bl-width) 0 + bl-x-off 0) ) ) (if (= fadeout FALSE) (begin (gimp-context-set-foreground '(255 255 255)) - (gimp-edit-bucket-fill bl-mask BUCKET-FILL-FG LAYER-MODE-NORMAL - 100 255 0 0 0) + (gimp-drawable-edit-fill bl-mask FILL-FOREGROUND) ) ) @@ -140,28 +142,31 @@ (gimp-drawable-brightness-contrast bl-layer 0.787 0) ) - ;--- blend glow color inside the letters - (gimp-context-set-foreground glow-color) - (gimp-edit-blend bl-layer BLEND-FG-TRANSPARENT LAYER-MODE-NORMAL - GRADIENT-LINEAR 100 0 REPEAT-NONE FALSE - FALSE 0 0 TRUE - (+ bl-x-off bl-width) 0 - (- (+ bl-x-off bl-width) after-glow) 0) + ;--- blend glow color inside the letters + (gimp-context-set-foreground glow-color) + (gimp-context-set-gradient-fg-transparent) + (gimp-drawable-edit-gradient-fill bl-layer + GRADIENT-LINEAR 0 + FALSE 0 0 + TRUE + (+ bl-x-off bl-width) 0 + (- (+ bl-x-off bl-width) after-glow) 0) - ;--- add corona effect - (gimp-image-select-item img CHANNEL-OP-REPLACE bl-layer) - (gimp-selection-sharpen img) - (gimp-selection-grow img corona-width) - (gimp-layer-set-lock-alpha bl-layer FALSE) - (gimp-selection-feather img corona-width) - (gimp-context-set-foreground glow-color) - (gimp-edit-blend bl-layer BLEND-FG-TRANSPARENT LAYER-MODE-NORMAL - GRADIENT-LINEAR 100 0 REPEAT-NONE FALSE - FALSE 0 0 TRUE - (- (+ bl-x-off bl-width) corona-width) 0 - (- (+ bl-x-off bl-width) after-glow) 0) - ) - ) + ;--- add corona effect + (gimp-image-select-item img CHANNEL-OP-REPLACE bl-layer) + (gimp-selection-sharpen img) + (gimp-selection-grow img corona-width) + (gimp-layer-set-lock-alpha bl-layer FALSE) + (gimp-selection-feather img corona-width) + (gimp-context-set-foreground glow-color) + (gimp-drawable-edit-gradient-fill bl-layer + GRADIENT-LINEAR 0 + FALSE 0 0 + TRUE + (- (+ bl-x-off bl-width) corona-width) 0 + (- (+ bl-x-off bl-width) after-glow) 0) + ) + ) ;--- merge with bg layer (set! bg-layer (car (gimp-layer-copy bg-source-layer FALSE))) diff --git a/plug-ins/script-fu/scripts/carve-it.scm b/plug-ins/script-fu/scripts/carve-it.scm index 5aa5fa9648..cdcb529e9c 100644 --- a/plug-ins/script-fu/scripts/carve-it.scm +++ b/plug-ins/script-fu/scripts/carve-it.scm @@ -31,7 +31,7 @@ (define (copy-layer-carve-it dest-image dest-drawable source-image source-drawable) (gimp-selection-all dest-image) - (gimp-edit-clear dest-drawable) + (gimp-drawable-edit-clear dest-drawable) (gimp-selection-none dest-image) (gimp-selection-all source-image) (gimp-edit-copy source-drawable) @@ -84,7 +84,7 @@ (gimp-image-insert-layer img layer1 0 0) (gimp-selection-all img) - (gimp-edit-clear layer1) + (gimp-drawable-edit-clear layer1) (gimp-selection-none img) (copy-layer-carve-it img layer1 bg-image bg-layer) @@ -102,7 +102,7 @@ (gimp-image-select-item img CHANNEL-OP-REPLACE mask-fat) (gimp-context-set-brush (carve-brush brush-size)) (gimp-context-set-foreground '(255 255 255)) - (gimp-edit-stroke mask-fat) + (gimp-drawable-edit-stroke-selection mask-fat) (gimp-selection-none img) (set! mask-emboss (car (gimp-channel-copy mask-fat))) @@ -113,9 +113,9 @@ (gimp-context-set-background '(180 180 180)) (gimp-image-select-item img CHANNEL-OP-REPLACE mask-fat) (gimp-selection-invert img) - (gimp-edit-fill mask-emboss FILL-BACKGROUND) + (gimp-drawable-edit-fill mask-emboss FILL-BACKGROUND) (gimp-image-select-item img CHANNEL-OP-REPLACE mask) - (gimp-edit-fill mask-emboss FILL-BACKGROUND) + (gimp-drawable-edit-fill mask-emboss FILL-BACKGROUND) (gimp-selection-none img) (set! mask-highlight (car (gimp-channel-copy mask-emboss))) @@ -147,7 +147,7 @@ (gimp-layer-add-mask cast-shadow-layer csl-mask) (gimp-image-select-item img CHANNEL-OP-REPLACE mask) (gimp-context-set-background '(255 255 255)) - (gimp-edit-fill csl-mask FILL-BACKGROUND) + (gimp-drawable-edit-fill csl-mask FILL-BACKGROUND) (set! inset-layer (car (gimp-layer-copy layer1 TRUE))) (gimp-image-insert-layer img inset-layer 0 1) @@ -156,7 +156,7 @@ (gimp-layer-add-mask inset-layer il-mask) (gimp-image-select-item img CHANNEL-OP-REPLACE mask) (gimp-context-set-background '(255 255 255)) - (gimp-edit-fill il-mask FILL-BACKGROUND) + (gimp-drawable-edit-fill il-mask FILL-BACKGROUND) (gimp-selection-none img) (gimp-selection-none bg-image) (gimp-levels inset-layer 0 0 255 inset-gamma 0 255) diff --git a/plug-ins/script-fu/scripts/chrome-it.scm b/plug-ins/script-fu/scripts/chrome-it.scm index 527f5c2d9c..2c08d1882d 100644 --- a/plug-ins/script-fu/scripts/chrome-it.scm +++ b/plug-ins/script-fu/scripts/chrome-it.scm @@ -72,7 +72,7 @@ (define (copy-layer-chrome-it dest-image dest-drawable source-image source-drawable) (gimp-selection-all dest-image) - (gimp-edit-clear dest-drawable) + (gimp-drawable-edit-clear dest-drawable) (gimp-selection-none dest-image) (gimp-selection-all source-image) (gimp-edit-copy source-drawable) @@ -129,9 +129,9 @@ (gimp-context-set-background '(255 255 255)) (gimp-selection-none img) - (gimp-edit-fill layer2 FILL-BACKGROUND) - (gimp-edit-fill layer3 FILL-BACKGROUND) - (gimp-edit-clear shadow) + (gimp-drawable-edit-fill layer2 FILL-BACKGROUND) + (gimp-drawable-edit-fill layer3 FILL-BACKGROUND) + (gimp-drawable-edit-clear shadow) (gimp-item-set-visible bg-layer FALSE) (gimp-item-set-visible shadow FALSE) @@ -140,9 +140,9 @@ (gimp-context-set-background '(0 0 0)) (gimp-selection-translate img offx1 offy1) (gimp-selection-feather img feather) - (gimp-edit-fill layer2 FILL-BACKGROUND) + (gimp-drawable-edit-fill layer2 FILL-BACKGROUND) (gimp-selection-translate img (* 2 offx2) (* 2 offy2)) - (gimp-edit-fill layer3 FILL-BACKGROUND) + (gimp-drawable-edit-fill layer3 FILL-BACKGROUND) (gimp-selection-none img) (set! layer2 (car (gimp-image-merge-visible-layers img CLIP-TO-IMAGE))) (gimp-drawable-invert layer2 FALSE) @@ -160,22 +160,22 @@ (gimp-layer-add-mask layer1 layer-mask) (gimp-image-select-item img CHANNEL-OP-REPLACE mask) (gimp-context-set-background '(255 255 255)) - (gimp-edit-fill layer-mask FILL-BACKGROUND) + (gimp-drawable-edit-fill layer-mask FILL-BACKGROUND) (set! layer2 (car (gimp-layer-copy layer1 TRUE))) (gimp-image-insert-layer img layer2 0 0) (gimp-context-set-brush (brush brush-size)) (gimp-context-set-foreground '(255 255 255)) - (gimp-edit-stroke layer-mask) + (gimp-drawable-edit-stroke-selection layer-mask) (gimp-context-set-background '(0 0 0)) (gimp-selection-feather img (* feather 1.5)) (gimp-selection-translate img (* 2.5 offx1) (* 2.5 offy1)) - (gimp-edit-fill shadow FILL-BACKGROUND) + (gimp-drawable-edit-fill shadow FILL-BACKGROUND) (gimp-selection-all img) (gimp-context-set-pattern "Marble #1") - (gimp-edit-bucket-fill bg-layer BUCKET-FILL-PATTERN LAYER-MODE-NORMAL 100 0 FALSE 0 0) + (gimp-drawable-edit-fill bg-layer FILL-PATTERN) (gimp-selection-none img) (gimp-image-convert-rgb img) diff --git a/plug-ins/script-fu/scripts/circuit.scm b/plug-ins/script-fu/scripts/circuit.scm index 92480b0b97..3196299904 100644 --- a/plug-ins/script-fu/scripts/circuit.scm +++ b/plug-ins/script-fu/scripts/circuit.scm @@ -78,7 +78,7 @@ (gimp-image-insert-layer image effect-layer 0 -1) (gimp-layer-set-offsets effect-layer select-offset-x select-offset-y) (gimp-selection-none image) - (gimp-edit-clear effect-layer) + (gimp-drawable-edit-clear effect-layer) (gimp-image-select-item image CHANNEL-OP-REPLACE active-selection) (gimp-edit-copy drawable) @@ -107,7 +107,7 @@ (= separate-layer TRUE)) (begin (gimp-image-select-color image CHANNEL-OP-REPLACE active-layer '(0 0 0)) - (gimp-edit-clear active-layer))) + (gimp-drawable-edit-clear active-layer))) (if (= keep-selection FALSE) (gimp-selection-none image)) diff --git a/plug-ins/script-fu/scripts/clothify.scm b/plug-ins/script-fu/scripts/clothify.scm index ecf7c4e798..7b6f101061 100644 --- a/plug-ins/script-fu/scripts/clothify.scm +++ b/plug-ins/script-fu/scripts/clothify.scm @@ -16,13 +16,14 @@ ) (gimp-context-push) + (gimp-context-set-defaults) (gimp-image-undo-disable img) (gimp-image-insert-layer img layer-one 0 0) (gimp-context-set-background '(255 255 255)) - (gimp-edit-fill layer-one FILL-BACKGROUND) + (gimp-drawable-edit-fill layer-one FILL-BACKGROUND) (plug-in-noisify RUN-NONINTERACTIVE img layer-one FALSE 0.7 0.7 0.7 0.7) diff --git a/plug-ins/script-fu/scripts/coffee.scm b/plug-ins/script-fu/scripts/coffee.scm index 10e0cc747c..3d45312b5c 100644 --- a/plug-ins/script-fu/scripts/coffee.scm +++ b/plug-ins/script-fu/scripts/coffee.scm @@ -39,26 +39,27 @@ (gimp-image-insert-layer theImage theStain 0 0) (gimp-selection-all theImage) - (gimp-edit-clear theStain) + (gimp-drawable-edit-clear theStain) (let ((blobSize (/ (rand (- theSize 40)) (+ (rand 3) 1)))) (gimp-image-select-ellipse theImage - CHANNEL-OP-REPLACE - (/ (- theSize blobSize) 2) - (/ (- theSize blobSize) 2) - blobSize blobSize) + CHANNEL-OP-REPLACE + (/ (- theSize blobSize) 2) + (/ (- theSize blobSize) 2) + blobSize blobSize) ) (script-fu-distress-selection theImage theStain - (* (+ (rand 15) 1) (+ (rand 15) 1)) + (- (* (+ (rand 15) 1) (+ (rand 15) 1)) 1) (/ theSize 25) 4 2 TRUE TRUE) (gimp-context-set-gradient "Coffee") - (gimp-edit-blend theStain BLEND-CUSTOM LAYER-MODE-NORMAL - GRADIENT-SHAPEBURST-DIMPLED 100 0 REPEAT-NONE FALSE - FALSE 0 0 TRUE - 0 0 0 0) + (gimp-drawable-edit-gradient-fill theStain + GRADIENT-SHAPEBURST-DIMPLED 0 + FALSE 0 0 + TRUE + 0 0 0 0) (gimp-layer-set-offsets theStain (- (rand theWidth) (/ theSize 2)) diff --git a/plug-ins/script-fu/scripts/distress-selection.scm b/plug-ins/script-fu/scripts/distress-selection.scm index 70dcef71c1..c809460aef 100644 --- a/plug-ins/script-fu/scripts/distress-selection.scm +++ b/plug-ins/script-fu/scripts/distress-selection.scm @@ -57,13 +57,13 @@ (gimp-image-insert-layer theImage theLayer 0 0) (if (= FALSE (car (gimp-selection-is-empty theImage))) - (gimp-edit-fill theLayer FILL-BACKGROUND) + (gimp-drawable-edit-fill theLayer FILL-BACKGROUND) ) (gimp-selection-invert theImage) (if (= FALSE (car (gimp-selection-is-empty theImage))) - (gimp-edit-clear theLayer) + (gimp-drawable-edit-clear theLayer) ) (gimp-selection-invert theImage) diff --git a/plug-ins/script-fu/scripts/drop-shadow.scm b/plug-ins/script-fu/scripts/drop-shadow.scm index 38574f94a6..76435fecf1 100644 --- a/plug-ins/script-fu/scripts/drop-shadow.scm +++ b/plug-ins/script-fu/scripts/drop-shadow.scm @@ -21,7 +21,7 @@ ; 1.00 - initial release ; 1.01 - fixed the problem with a remaining copy of the selection ; 1.02 - some code cleanup, no real changes -; 1.03 - can't call gimp-edit-fill until layer is added to image! +; 1.03 - can't call gimp-drawable-edit-fill until layer is added to image! ; 1.04 ; 1.05 - replaced deprecated function calls with new ones for 2.8 ; @@ -136,7 +136,7 @@ (gimp-drawable-fill shadow-layer FILL-TRANSPARENT) (gimp-context-set-background shadow-color) - (gimp-edit-fill shadow-layer FILL-BACKGROUND) + (gimp-drawable-edit-fill shadow-layer FILL-BACKGROUND) (gimp-selection-none image) (gimp-layer-set-lock-alpha shadow-layer FALSE) (if (>= shadow-blur 1.0) (plug-in-gauss-rle RUN-NONINTERACTIVE @@ -150,7 +150,7 @@ (if (= from-selection TRUE) (begin (gimp-image-select-item image CHANNEL-OP-REPLACE active-selection) - (gimp-edit-clear shadow-layer) + (gimp-drawable-edit-clear shadow-layer) (gimp-image-remove-channel image active-selection))) (if (and diff --git a/plug-ins/script-fu/scripts/erase-rows.scm b/plug-ins/script-fu/scripts/erase-rows.scm index 99934d6de3..32ae591d78 100644 --- a/plug-ins/script-fu/scripts/erase-rows.scm +++ b/plug-ins/script-fu/scripts/erase-rows.scm @@ -7,6 +7,8 @@ ) (gimp-context-push) + (gimp-context-set-paint-mode LAYER-MODE-NORMAL) + (gimp-context-set-opacity 100.0) (gimp-context-set-feather FALSE) (gimp-image-undo-group-start img) @@ -17,8 +19,8 @@ (gimp-image-select-rectangle img CHANNEL-OP-REPLACE position-x (+ i position-y) width 1) (gimp-image-select-rectangle img CHANNEL-OP-REPLACE (+ i position-x) position-y 1 height)) (if (= type 0) - (gimp-edit-clear drawable) - (gimp-edit-fill drawable FILL-BACKGROUND)) + (gimp-drawable-edit-clear drawable) + (gimp-drawable-edit-fill drawable FILL-BACKGROUND)) (loop (+ i 2) max)))))) (loop (if (= which 0) 0 diff --git a/plug-ins/script-fu/scripts/font-map.scm b/plug-ins/script-fu/scripts/font-map.scm index ff2cddebfd..7481d28892 100644 --- a/plug-ins/script-fu/scripts/font-map.scm +++ b/plug-ins/script-fu/scripts/font-map.scm @@ -94,7 +94,7 @@ (gimp-context-set-foreground '(0 0 0)))) (gimp-image-insert-layer img drawable 0 0) - (gimp-edit-clear drawable) + (gimp-drawable-edit-clear drawable) (if (= labels TRUE) (begin @@ -103,7 +103,7 @@ GRAYA-IMAGE RGBA-IMAGE) "Labels" 100 LAYER-MODE-NORMAL))) (gimp-image-insert-layer img drawable 0 -1))) - (gimp-edit-clear drawable) + (gimp-drawable-edit-clear drawable) (while (< count num-fonts) (set! font (car font-list)) diff --git a/plug-ins/script-fu/scripts/fuzzyborder.scm b/plug-ins/script-fu/scripts/fuzzyborder.scm index 45a0f23ec8..9dbad0ac71 100644 --- a/plug-ins/script-fu/scripts/fuzzyborder.scm +++ b/plug-ins/script-fu/scripts/fuzzyborder.scm @@ -39,7 +39,7 @@ (gimp-selection-shrink inImage inSize) (gimp-selection-invert inImage) (gimp-context-set-background inColor) - (gimp-edit-fill inLayer FILL-BACKGROUND) + (gimp-drawable-edit-fill inLayer FILL-BACKGROUND) (gimp-selection-none inImage) ) @@ -74,7 +74,7 @@ (gimp-image-insert-layer theImage theLayer 0 0) - (gimp-edit-clear theLayer) + (gimp-drawable-edit-clear theLayer) (chris-color-edge theImage theLayer inColor inSize) (gimp-layer-scale theLayer @@ -92,11 +92,11 @@ (gimp-image-select-item theImage CHANNEL-OP-REPLACE theLayer) (gimp-selection-invert theImage) - (gimp-edit-clear theLayer) + (gimp-drawable-edit-clear theLayer) (gimp-selection-invert theImage) - (gimp-edit-clear theLayer) + (gimp-drawable-edit-clear theLayer) (gimp-context-set-background inColor) - (gimp-edit-fill theLayer FILL-BACKGROUND) + (gimp-drawable-edit-fill theLayer FILL-BACKGROUND) (gimp-selection-none inImage) (chris-color-edge theImage theLayer inColor 1) diff --git a/plug-ins/script-fu/scripts/gradient-example.scm b/plug-ins/script-fu/scripts/gradient-example.scm index 1f36ef1953..134f35093a 100644 --- a/plug-ins/script-fu/scripts/gradient-example.scm +++ b/plug-ins/script-fu/scripts/gradient-example.scm @@ -47,10 +47,16 @@ ; Render gradient - (gimp-edit-blend drawable BLEND-CUSTOM LAYER-MODE-NORMAL - GRADIENT-LINEAR 100 0 REPEAT-NONE gradient-reverse - FALSE 0 0 TRUE - 0 0 (- width 1) 0) + (gimp-context-push) + + (gimp-context-set-gradient-reverse gradient-reverse) + (gimp-drawable-edit-gradient-fill drawable + GRADIENT-LINEAR 0 + FALSE 0 0 + TRUE + 0 0 (- width 1) 0) + + (gimp-context-pop) ; Terminate diff --git a/plug-ins/script-fu/scripts/grid-system.scm b/plug-ins/script-fu/scripts/grid-system.scm index c3f5f378fc..6607a3ec52 100644 --- a/plug-ins/script-fu/scripts/grid-system.scm +++ b/plug-ins/script-fu/scripts/grid-system.scm @@ -53,7 +53,7 @@ (set! grid-layer (car (gimp-layer-copy drw TRUE))) (gimp-image-insert-layer img grid-layer 0 0) - (gimp-edit-clear grid-layer) + (gimp-drawable-edit-clear grid-layer) (gimp-item-set-name grid-layer "Grid Layer") (while (not (null? (cdr x-divides))) diff --git a/plug-ins/script-fu/scripts/images/Makefile.in b/plug-ins/script-fu/scripts/images/Makefile.in index bfdad359e7..9a1c9471f1 100644 --- a/plug-ins/script-fu/scripts/images/Makefile.in +++ b/plug-ins/script-fu/scripts/images/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/script-fu/scripts/lava.scm b/plug-ins/script-fu/scripts/lava.scm index d848c515b3..96bc35938e 100644 --- a/plug-ins/script-fu/scripts/lava.scm +++ b/plug-ins/script-fu/scripts/lava.scm @@ -79,7 +79,7 @@ (gimp-image-insert-layer image lava-layer 0 -1) (gimp-layer-set-offsets lava-layer select-offset-x select-offset-y) (gimp-selection-none image) - (gimp-edit-clear lava-layer) + (gimp-drawable-edit-clear lava-layer) (gimp-image-select-item image CHANNEL-OP-REPLACE drawable) (gimp-image-set-active-layer image lava-layer) diff --git a/plug-ins/script-fu/scripts/line-nova.scm b/plug-ins/script-fu/scripts/line-nova.scm index ad16ffda7e..8c5c35ba44 100644 --- a/plug-ins/script-fu/scripts/line-nova.scm +++ b/plug-ins/script-fu/scripts/line-nova.scm @@ -87,7 +87,7 @@ ) (set! index (+ index 1)) ) - (gimp-edit-bucket-fill drw BUCKET-FILL-FG LAYER-MODE-NORMAL 100 0 FALSE 0 0) + (gimp-drawable-edit-fill drw FILL-FOREGROUND) (if old-selection (begin diff --git a/plug-ins/script-fu/scripts/mkbrush.scm b/plug-ins/script-fu/scripts/mkbrush.scm index 2717988975..51db4a198c 100644 --- a/plug-ins/script-fu/scripts/mkbrush.scm +++ b/plug-ins/script-fu/scripts/mkbrush.scm @@ -47,7 +47,7 @@ (gimp-image-select-rectangle img CHANNEL-OP-REPLACE 0 0 width height) (gimp-context-set-background '(0 0 0)) - (gimp-edit-fill drawable FILL-BACKGROUND) + (gimp-drawable-edit-fill drawable FILL-BACKGROUND) (file-gbr-save 1 img drawable filename "" spacing name) (gimp-image-delete img) @@ -96,6 +96,8 @@ ) (gimp-context-push) + (gimp-context-set-paint-mode LAYER-MODE-NORMAL) + (gimp-context-set-opacity 100.0) (gimp-image-undo-disable img) (gimp-image-insert-layer img drawable 0 0) @@ -115,7 +117,7 @@ ) (gimp-context-set-background '(0 0 0)) - (gimp-edit-fill drawable FILL-BACKGROUND) + (gimp-drawable-edit-fill drawable FILL-BACKGROUND) (file-gbr-save 1 img drawable filename "" spacing name) (gimp-image-delete img) @@ -171,7 +173,7 @@ (gimp-context-set-background '(0 0 0)) (gimp-image-select-ellipse img CHANNEL-OP-REPLACE 0 0 width height) - (gimp-edit-fill drawable FILL-BACKGROUND) + (gimp-drawable-edit-fill drawable FILL-BACKGROUND) (file-gbr-save 1 img drawable filename "" spacing name) (gimp-image-delete img) @@ -240,7 +242,7 @@ (gimp-image-select-ellipse img CHANNEL-OP-REPLACE 0 0 width height))) (gimp-context-set-background '(0 0 0)) - (gimp-edit-fill drawable FILL-BACKGROUND) + (gimp-drawable-edit-fill drawable FILL-BACKGROUND) (file-gbr-save 1 img drawable filename "" spacing name) (gimp-image-delete img) diff --git a/plug-ins/script-fu/scripts/old-photo.scm b/plug-ins/script-fu/scripts/old-photo.scm index aafda6ee42..183f14d2df 100644 --- a/plug-ins/script-fu/scripts/old-photo.scm +++ b/plug-ins/script-fu/scripts/old-photo.scm @@ -64,7 +64,7 @@ (gimp-image-insert-layer theImage mLayer 0 0) (gimp-selection-all theImage) - (gimp-edit-clear mLayer) + (gimp-drawable-edit-clear mLayer) (gimp-selection-none theImage) (plug-in-noisify RUN-NONINTERACTIVE theImage mLayer TRUE 0 0 0 0.5) (plug-in-gauss-rle RUN-NONINTERACTIVE theImage mLayer 5 TRUE TRUE) diff --git a/plug-ins/script-fu/scripts/perspective-shadow.scm b/plug-ins/script-fu/scripts/perspective-shadow.scm index 785b4b0c25..3fe394bfba 100644 --- a/plug-ins/script-fu/scripts/perspective-shadow.scm +++ b/plug-ins/script-fu/scripts/perspective-shadow.scm @@ -107,7 +107,7 @@ (gimp-layer-set-offsets shadow-layer select-offset-x select-offset-y) (gimp-drawable-fill shadow-layer FILL-TRANSPARENT) (gimp-context-set-background shadow-color) - (gimp-edit-fill shadow-layer FILL-BACKGROUND) + (gimp-drawable-edit-fill shadow-layer FILL-BACKGROUND) (gimp-selection-none image) (if (= allow-resize TRUE) @@ -178,7 +178,7 @@ (if (= from-selection TRUE) (begin (gimp-image-select-item image CHANNEL-OP-REPLACE active-selection) - (gimp-edit-clear shadow-layer) + (gimp-drawable-edit-clear shadow-layer) (gimp-image-remove-channel image active-selection))) (if (and diff --git a/plug-ins/script-fu/scripts/predator.scm b/plug-ins/script-fu/scripts/predator.scm index ac3dc29471..544d691cfb 100644 --- a/plug-ins/script-fu/scripts/predator.scm +++ b/plug-ins/script-fu/scripts/predator.scm @@ -82,7 +82,7 @@ (gimp-layer-set-offsets effect-layer select-offset-x select-offset-y) (gimp-image-insert-layer image effect-layer 0 -1) (gimp-selection-none image) - (gimp-edit-clear effect-layer) + (gimp-drawable-edit-clear effect-layer) (gimp-image-select-item image CHANNEL-OP-REPLACE active-selection) (gimp-edit-copy drawable) diff --git a/plug-ins/script-fu/scripts/ripply-anim.scm b/plug-ins/script-fu/scripts/ripply-anim.scm index a97da21cfd..3a01fa7dd2 100644 --- a/plug-ins/script-fu/scripts/ripply-anim.scm +++ b/plug-ins/script-fu/scripts/ripply-anim.scm @@ -22,12 +22,14 @@ 100 LAYER-MODE-NORMAL)))) (gimp-context-push) + (gimp-context-set-paint-mode LAYER-MODE-NORMAL) + (gimp-context-set-opacity 100.0) (gimp-image-undo-disable work-image) ; Create a tile-able displacement map in the first layer (gimp-context-set-background '(127 127 127)) (gimp-image-insert-layer work-image map-layer 0 0) - (gimp-edit-fill map-layer FILL-BACKGROUND) + (gimp-drawable-edit-fill map-layer FILL-BACKGROUND) (plug-in-noisify RUN-NONINTERACTIVE work-image map-layer FALSE 1.0 1.0 1.0 0.0) (plug-in-tile RUN-NONINTERACTIVE work-image map-layer (* width 3) (* height 3) FALSE) (plug-in-gauss-iir RUN-NONINTERACTIVE work-image map-layer 35 TRUE TRUE) diff --git a/plug-ins/script-fu/scripts/round-corners.scm b/plug-ins/script-fu/scripts/round-corners.scm index 039bc8af89..d919251e73 100644 --- a/plug-ins/script-fu/scripts/round-corners.scm +++ b/plug-ins/script-fu/scripts/round-corners.scm @@ -81,7 +81,7 @@ radius radius) (gimp-image-select-ellipse image CHANNEL-OP-SUBTRACT (- width diam) (- height diam) diam diam) - (gimp-edit-clear pic-layer) + (gimp-drawable-edit-clear pic-layer) (gimp-selection-none image) ; optionally add a shadow diff --git a/plug-ins/script-fu/scripts/slide.scm b/plug-ins/script-fu/scripts/slide.scm index 900cd0e1d5..d42ee1381f 100644 --- a/plug-ins/script-fu/scripts/slide.scm +++ b/plug-ins/script-fu/scripts/slide.scm @@ -96,6 +96,8 @@ ) (gimp-context-push) + (gimp-context-set-paint-mode LAYER-MODE-NORMAL) + (gimp-context-set-opacity 100.0) (gimp-context-set-feather FALSE) (gimp-image-undo-disable image) @@ -202,7 +204,7 @@ ) (gimp-context-set-foreground '(0 0 0)) - (gimp-edit-fill film-mask FILL-BACKGROUND) + (gimp-drawable-edit-fill film-mask FILL-BACKGROUND) (gimp-selection-none image) (plug-in-gauss-rle RUN-NONINTERACTIVE image film-mask hole-radius TRUE TRUE) (gimp-threshold film-mask 127 255) diff --git a/plug-ins/script-fu/scripts/test-sphere.scm b/plug-ins/script-fu/scripts/test-sphere.scm index 72c9d85a3e..6b7b9cc909 100644 --- a/plug-ins/script-fu/scripts/test-sphere.scm +++ b/plug-ins/script-fu/scripts/test-sphere.scm @@ -205,7 +205,7 @@ (gimp-image-insert-layer img drawable 0 0) (gimp-context-set-foreground sphere-color) (gimp-context-set-background bg-color) - (gimp-edit-fill drawable FILL-BACKGROUND) + (gimp-drawable-edit-fill drawable FILL-BACKGROUND) (gimp-context-set-background '(20 20 20)) (if (and @@ -224,27 +224,32 @@ (gimp-context-set-feather-radius 7.5 7.5) (gimp-image-select-ellipse img CHANNEL-OP-REPLACE shadow-x shadow-y shadow-w shadow-h) (gimp-context-set-pattern pattern) - (gimp-edit-bucket-fill drawable BUCKET-FILL-PATTERN LAYER-MODE-MULTIPLY - 100 0 FALSE 0 0))) + (gimp-drawable-edit-fill drawable FILL-PATTERN))) (gimp-context-set-feather FALSE) (gimp-image-select-ellipse img CHANNEL-OP-REPLACE (- cx radius) (- cy radius) (* 2 radius) (* 2 radius)) - (gimp-edit-blend drawable BLEND-FG-BG-RGB LAYER-MODE-NORMAL - GRADIENT-RADIAL 100 offset REPEAT-NONE FALSE - FALSE 0 0 TRUE - light-x light-y light-end-x light-end-y) + (gimp-context-set-gradient-fg-bg-rgb) + (gimp-drawable-edit-gradient-fill drawable + GRADIENT-RADIAL offset + FALSE 0 0 + TRUE + light-x light-y + light-end-x light-end-y) (gimp-selection-none img) - (gimp-context-set-gradient gradient) (gimp-image-select-ellipse img CHANNEL-OP-REPLACE 10 10 50 50) - (gimp-edit-blend drawable BLEND-CUSTOM LAYER-MODE-NORMAL - GRADIENT-LINEAR 100 offset REPEAT-NONE gradient-reverse - FALSE 0 0 TRUE - 10 10 30 60) + (gimp-context-set-gradient gradient) + (gimp-context-set-gradient-reverse gradient-reverse) + (gimp-drawable-edit-gradient-fill drawable + GRADIENT-LINEAR offset + FALSE 0 0 + TRUE + 10 10 + 30 60) (gimp-selection-none img) diff --git a/plug-ins/script-fu/scripts/weave.scm b/plug-ins/script-fu/scripts/weave.scm index e80b4eaa5b..edf5778cd4 100644 --- a/plug-ins/script-fu/scripts/weave.scm +++ b/plug-ins/script-fu/scripts/weave.scm @@ -52,7 +52,7 @@ (gimp-image-insert-layer img drawable 0 0) (gimp-context-set-background '(0 0 0)) - (gimp-edit-fill drawable FILL-BACKGROUND) + (gimp-drawable-edit-fill drawable FILL-BACKGROUND) ; Create main horizontal ribbon @@ -66,10 +66,13 @@ (+ (* 2 ribbon-spacing) ribbon-width) ribbon-width) - (gimp-edit-blend drawable BLEND-FG-BG-RGB LAYER-MODE-NORMAL - GRADIENT-BILINEAR 100 (- 100 shadow-depth) REPEAT-NONE FALSE - FALSE 0 0 TRUE - (/ (+ (* 2 ribbon-spacing) ribbon-width -1) 2) 0 0 0) + (gimp-context-set-gradient-fg-bg-rgb) + (gimp-drawable-edit-gradient-fill drawable + GRADIENT-BILINEAR (- 100 shadow-depth) + FALSE 0 0 + TRUE + (/ (+ (* 2 ribbon-spacing) ribbon-width -1) 2) 0 + 0 0) ; Create main vertical ribbon @@ -80,10 +83,12 @@ ribbon-width (+ (* 2 ribbon-spacing) ribbon-width)) - (gimp-edit-blend drawable BLEND-FG-BG-RGB LAYER-MODE-NORMAL - GRADIENT-BILINEAR 100 (- 100 shadow-depth) REPEAT-NONE FALSE - FALSE 0 0 TRUE - 0 (/ (+ (* 2 ribbon-spacing) ribbon-width -1) 2) 0 0) + (gimp-drawable-edit-gradient-fill drawable + GRADIENT-BILINEAR (- 100 shadow-depth) + FALSE 0 0 + TRUE + 0 (/ (+ (* 2 ribbon-spacing) ribbon-width -1) 2) + 0 0) ; Create the secondary horizontal ribbon @@ -170,14 +175,14 @@ (gimp-image-insert-layer img drawable 0 0) (gimp-context-set-background '(0 0 0)) - (gimp-edit-fill drawable FILL-BACKGROUND) + (gimp-drawable-edit-fill drawable FILL-BACKGROUND) (gimp-image-select-rectangle img CHANNEL-OP-REPLACE r1-x1 r1-y1 r1-width r1-height) (gimp-image-select-rectangle img CHANNEL-OP-ADD r2-x1 r2-y1 r2-width r2-height) (gimp-image-select-rectangle img CHANNEL-OP-ADD r3-x1 r3-y1 r3-width r3-height) (gimp-context-set-background '(255 255 255)) - (gimp-edit-fill drawable FILL-BACKGROUND) + (gimp-drawable-edit-fill drawable FILL-BACKGROUND) (gimp-selection-none img) (gimp-image-undo-enable img) @@ -272,7 +277,7 @@ (dense (/ density 100.0))) (gimp-image-insert-layer img drawable 0 -1) (gimp-context-set-background '(255 255 255)) - (gimp-edit-fill drawable FILL-BACKGROUND) + (gimp-drawable-edit-fill drawable FILL-BACKGROUND) (plug-in-noisify RUN-NONINTERACTIVE img drawable FALSE dense dense dense dense) (plug-in-c-astretch RUN-NONINTERACTIVE img drawable) (cond ((eq? orientation 'horizontal) @@ -366,6 +371,8 @@ ) (gimp-context-push) + (gimp-context-set-paint-mode LAYER-MODE-NORMAL) + (gimp-context-set-opacity 100.0) (gimp-context-set-feather FALSE) (gimp-selection-all w-img) diff --git a/plug-ins/script-fu/scripts/xach-effect.scm b/plug-ins/script-fu/scripts/xach-effect.scm index 496ff36594..25422d8821 100644 --- a/plug-ins/script-fu/scripts/xach-effect.scm +++ b/plug-ins/script-fu/scripts/xach-effect.scm @@ -69,13 +69,13 @@ (gimp-image-insert-layer image hl-layer 0 -1) (gimp-selection-none image) - (gimp-edit-clear hl-layer) + (gimp-drawable-edit-clear hl-layer) (gimp-image-select-item image CHANNEL-OP-REPLACE active-selection) (gimp-context-set-background hl-color) - (gimp-edit-fill hl-layer FILL-BACKGROUND) + (gimp-drawable-edit-fill hl-layer FILL-BACKGROUND) (gimp-selection-translate image hl-offset-x hl-offset-y) - (gimp-edit-fill hl-layer FILL-BACKGROUND) + (gimp-drawable-edit-fill hl-layer FILL-BACKGROUND) (gimp-selection-none image) (gimp-image-select-item image CHANNEL-OP-REPLACE active-selection) @@ -83,7 +83,7 @@ (gimp-layer-add-mask hl-layer mask) (gimp-context-set-background hl-opacity) - (gimp-edit-fill mask FILL-BACKGROUND) + (gimp-drawable-edit-fill mask FILL-BACKGROUND) (set! shadow-layer (car (gimp-layer-new image image-width @@ -94,15 +94,15 @@ LAYER-MODE-NORMAL))) (gimp-image-insert-layer image shadow-layer 0 -1) (gimp-selection-none image) - (gimp-edit-clear shadow-layer) + (gimp-drawable-edit-clear shadow-layer) (gimp-image-select-item image CHANNEL-OP-REPLACE active-selection) (gimp-selection-translate image ds-offset-x ds-offset-y) (gimp-context-set-background ds-color) - (gimp-edit-fill shadow-layer FILL-BACKGROUND) + (gimp-drawable-edit-fill shadow-layer FILL-BACKGROUND) (gimp-selection-none image) (plug-in-gauss-rle RUN-NONINTERACTIVE image shadow-layer ds-blur TRUE TRUE) (gimp-image-select-item image CHANNEL-OP-REPLACE active-selection) - (gimp-edit-clear shadow-layer) + (gimp-drawable-edit-clear shadow-layer) (gimp-image-lower-item image shadow-layer) (if (= keep-selection FALSE) diff --git a/plug-ins/script-fu/tinyscheme/Makefile.in b/plug-ins/script-fu/tinyscheme/Makefile.in index f4174df55b..866644af83 100644 --- a/plug-ins/script-fu/tinyscheme/Makefile.in +++ b/plug-ins/script-fu/tinyscheme/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -269,7 +270,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -342,6 +343,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -570,6 +572,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/selection-to-path/Makefile.in b/plug-ins/selection-to-path/Makefile.in index a4aff4235d..07a75dac9e 100644 --- a/plug-ins/selection-to-path/Makefile.in +++ b/plug-ins/selection-to-path/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -277,7 +278,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -350,6 +351,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -578,6 +580,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/twain/Makefile.in b/plug-ins/twain/Makefile.in index a2e6dee598..195ddddea5 100644 --- a/plug-ins/twain/Makefile.in +++ b/plug-ins/twain/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -279,7 +280,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -352,6 +353,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -580,6 +582,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/plug-ins/ui/Makefile.in b/plug-ins/ui/Makefile.in index 234a33ea64..61a274b5ba 100644 --- a/plug-ins/ui/Makefile.in +++ b/plug-ins/ui/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/po-libgimp/fr.po b/po-libgimp/fr.po index 99917f1b33..d0b6379a5e 100644 --- a/po-libgimp/fr.po +++ b/po-libgimp/fr.po @@ -22,9 +22,9 @@ msgstr "" "Project-Id-Version: gimp-libgimp HEAD\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=Internationalisation\n" -"POT-Creation-Date: 2018-01-10 23:51+0000\n" -"PO-Revision-Date: 2018-01-10 14:51+0100\n" -"Last-Translator: Julien Hardelin \n" +"POT-Creation-Date: 2018-04-01 23:10+0000\n" +"PO-Revision-Date: 2018-04-02 07:59+0100\n" +"Last-Translator: julien \n" "Language-Team: GNOME French Team \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -33,22 +33,22 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. procedure executed successfully -#: ../libgimp/gimp.c:1206 +#: ../libgimp/gimp.c:1221 msgid "success" msgstr "succès" #. procedure execution failed -#: ../libgimp/gimp.c:1210 +#: ../libgimp/gimp.c:1225 msgid "execution error" msgstr "erreur d’exécution" #. procedure called incorrectly -#: ../libgimp/gimp.c:1214 +#: ../libgimp/gimp.c:1229 msgid "calling error" msgstr "erreur d’appel" #. procedure execution cancelled -#: ../libgimp/gimp.c:1218 +#: ../libgimp/gimp.c:1233 msgid "cancelled" msgstr "annulé" @@ -255,44 +255,44 @@ msgstr "Sélecteur de polices" msgid "Gradient Selection" msgstr "Sélecteur de dégradé" -#: ../libgimp/gimpimagemetadata.c:480 +#: ../libgimp/gimpimagemetadata.c:487 msgid "GIMP 2.9/2.10" msgstr "GIMP 2.9/2.10" -#: ../libgimp/gimpimagemetadata.c:664 +#: ../libgimp/gimpimagemetadata.c:671 msgid "Background" msgstr "Arrière-plan" -#: ../libgimp/gimpimagemetadata.c:853 +#: ../libgimp/gimpimagemetadata.c:860 #, c-format msgid "Rotate %s?" msgstr "Rotation de %s ?" -#: ../libgimp/gimpimagemetadata.c:859 +#: ../libgimp/gimpimagemetadata.c:866 msgid "_Keep Original" msgstr "_Conserver l’original" -#: ../libgimp/gimpimagemetadata.c:860 ../libgimpwidgets/gimpicons.c:271 +#: ../libgimp/gimpimagemetadata.c:867 ../libgimpwidgets/gimpicons.c:271 msgid "_Rotate" msgstr "_Rotation" -#: ../libgimp/gimpimagemetadata.c:901 +#: ../libgimp/gimpimagemetadata.c:908 msgid "Original" msgstr "Original" -#: ../libgimp/gimpimagemetadata.c:917 +#: ../libgimp/gimpimagemetadata.c:924 msgid "Rotated" msgstr "Rotation effectuée" -#: ../libgimp/gimpimagemetadata.c:935 +#: ../libgimp/gimpimagemetadata.c:942 msgid "This image contains Exif orientation metadata." msgstr "Cette image contient des métadonnées d’orientation Exif" -#: ../libgimp/gimpimagemetadata.c:953 +#: ../libgimp/gimpimagemetadata.c:960 msgid "Would you like to rotate the image?" msgstr "Désirez-vous effectuer une rotation de l’image ?" -#: ../libgimp/gimpimagemetadata.c:965 +#: ../libgimp/gimpimagemetadata.c:972 msgid "_Don't ask me again" msgstr "_Ne me posez plus la question" @@ -1445,33 +1445,33 @@ msgstr "L’analyse des données IPTC a échoué." msgid "Parsing XMP data failed." msgstr "L’analyse des données XMP a échoué." -#: ../libgimpbase/gimputils.c:192 ../libgimpbase/gimputils.c:197 +#: ../libgimpbase/gimputils.c:215 ../libgimpbase/gimputils.c:220 msgid "(invalid UTF-8 string)" msgstr "(chaîne de caractères UTF-8 non valide)" -#: ../libgimpbase/gimputils.c:367 +#: ../libgimpbase/gimputils.c:390 msgid "File path is NULL" msgstr "Le chemin de fichier est NULL" -#: ../libgimpbase/gimputils.c:376 ../libgimpbase/gimputils.c:387 +#: ../libgimpbase/gimputils.c:399 ../libgimpbase/gimputils.c:410 msgid "Error converting UTF-8 filename to wide char" msgstr "" "Erreur lors de la conversion du nom de fichier UTF-8 en caractères larges" -#: ../libgimpbase/gimputils.c:395 +#: ../libgimpbase/gimputils.c:418 msgid "ILCreateFromPath() failed" msgstr "ILCreateFromPath() a échoué" -#: ../libgimpbase/gimputils.c:432 +#: ../libgimpbase/gimputils.c:455 #, c-format msgid "Cannot convert '%s' into a valid NSURL." msgstr "Impossible de convertir « %s » en un NSURL valide" -#: ../libgimpbase/gimputils.c:460 +#: ../libgimpbase/gimputils.c:483 msgid "Connecting to org.freedesktop.FileManager1 failed: " msgstr "La connexion à org.freedesktop.FileManager1 a échoué :" -#: ../libgimpbase/gimputils.c:484 +#: ../libgimpbase/gimputils.c:507 msgid "Calling ShowItems failed: " msgstr "L’appel à ShowItems a échoué :" @@ -1940,23 +1940,23 @@ msgstr "Fabriquant : " msgid "Copyright: " msgstr "Copyright : " -#: ../libgimpwidgets/gimpcolorscales.c:201 +#: ../libgimpwidgets/gimpcolorscales.c:205 msgid "Scales" msgstr "Échelles" -#: ../libgimpwidgets/gimpcolorscales.c:439 +#: ../libgimpwidgets/gimpcolorscales.c:437 msgid "0..100" msgstr "0…100" -#: ../libgimpwidgets/gimpcolorscales.c:441 +#: ../libgimpwidgets/gimpcolorscales.c:439 msgid "0..255" msgstr "0…255" -#: ../libgimpwidgets/gimpcolorscales.c:462 +#: ../libgimpwidgets/gimpcolorscales.c:460 msgid "LCH" msgstr "LCH" -#: ../libgimpwidgets/gimpcolorscales.c:464 +#: ../libgimpwidgets/gimpcolorscales.c:462 msgid "HSV" msgstr "TSV" @@ -2174,7 +2174,7 @@ msgstr "Taille du damier" msgid "Check Style" msgstr "Style du damier" -#: ../libgimpwidgets/gimppropwidgets.c:2143 +#: ../libgimpwidgets/gimppropwidgets.c:2177 #, c-format msgid "This text input field is limited to %d character." msgid_plural "This text input field is limited to %d characters." @@ -2333,22 +2333,49 @@ msgstr "Chroma LCH" msgid "LCH Hue" msgstr "Teinte LCH" -#: ../libgimpwidgets/gimpwidgetsenums.c:167 +#: ../libgimpwidgets/gimpwidgetsenums.c:168 +msgctxt "color-selector-model" +msgid "RGB" +msgstr "RVB" + +#: ../libgimpwidgets/gimpwidgetsenums.c:168 +msgid "RGB color model" +msgstr "Modèle de couleurs RVB" + +#: ../libgimpwidgets/gimpwidgetsenums.c:169 +msgctxt "color-selector-model" +msgid "LCH" +msgstr "LCH" + +#: ../libgimpwidgets/gimpwidgetsenums.c:169 +msgid "CIELCh color model" +msgstr "Modèle de couleurs CIELCh" + +#: ../libgimpwidgets/gimpwidgetsenums.c:170 +msgctxt "color-selector-model" +msgid "HSV" +msgstr "TSV" + +#: ../libgimpwidgets/gimpwidgetsenums.c:170 +msgid "HSV color model" +msgstr "Modèle de couleurs TSV" + +#: ../libgimpwidgets/gimpwidgetsenums.c:199 msgctxt "page-selector-target" msgid "Layers" msgstr "Calques" -#: ../libgimpwidgets/gimpwidgetsenums.c:168 +#: ../libgimpwidgets/gimpwidgetsenums.c:200 msgctxt "page-selector-target" msgid "Images" msgstr "Images" -#: ../libgimpwidgets/gimpwidgetsenums.c:229 +#: ../libgimpwidgets/gimpwidgetsenums.c:261 msgctxt "zoom-type" msgid "Zoom in" msgstr "Zoom avant" -#: ../libgimpwidgets/gimpwidgetsenums.c:230 +#: ../libgimpwidgets/gimpwidgetsenums.c:262 msgctxt "zoom-type" msgid "Zoom out" msgstr "Zoom arrière" diff --git a/po-libgimp/it.po b/po-libgimp/it.po index 4de9f3a395..c2f7ce248e 100644 --- a/po-libgimp/it.po +++ b/po-libgimp/it.po @@ -31,8 +31,8 @@ msgid "" msgstr "" "Project-Id-Version: gimp 2.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-09 11:38+0100\n" -"PO-Revision-Date: 2018-01-09 11:54+0100\n" +"POT-Creation-Date: 2018-04-15 17:52+0200\n" +"PO-Revision-Date: 2018-04-15 17:53+0200\n" "Last-Translator: Luca Ferretti \n" "Language-Team: Italian \n" "Language: it\n" @@ -43,22 +43,22 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n!=1);\n" #. procedure executed successfully -#: ../libgimp/gimp.c:1206 +#: ../libgimp/gimp.c:1264 msgid "success" msgstr "azione riuscita" #. procedure execution failed -#: ../libgimp/gimp.c:1210 +#: ../libgimp/gimp.c:1268 msgid "execution error" msgstr "errore di esecuzione" #. procedure called incorrectly -#: ../libgimp/gimp.c:1214 +#: ../libgimp/gimp.c:1272 msgid "calling error" msgstr "errore di chiamata" #. procedure execution cancelled -#: ../libgimp/gimp.c:1218 +#: ../libgimp/gimp.c:1276 msgid "cancelled" msgstr "annullato" @@ -264,44 +264,44 @@ msgstr "Selezione tipo di carattere" msgid "Gradient Selection" msgstr "Selezione gradiente" -#: ../libgimp/gimpimagemetadata.c:477 +#: ../libgimp/gimpimagemetadata.c:487 msgid "GIMP 2.9/2.10" msgstr "GIMP 2.9/2.10" -#: ../libgimp/gimpimagemetadata.c:661 +#: ../libgimp/gimpimagemetadata.c:671 msgid "Background" msgstr "Sfondo" -#: ../libgimp/gimpimagemetadata.c:850 +#: ../libgimp/gimpimagemetadata.c:860 #, c-format msgid "Rotate %s?" msgstr "_Ruota %s?" -#: ../libgimp/gimpimagemetadata.c:856 +#: ../libgimp/gimpimagemetadata.c:866 msgid "_Keep Original" msgstr "_Mantieni l'originale" -#: ../libgimp/gimpimagemetadata.c:857 ../libgimpwidgets/gimpicons.c:271 +#: ../libgimp/gimpimagemetadata.c:867 ../libgimpwidgets/gimpicons.c:271 msgid "_Rotate" msgstr "_Ruota" -#: ../libgimp/gimpimagemetadata.c:898 +#: ../libgimp/gimpimagemetadata.c:908 msgid "Original" msgstr "Originale" -#: ../libgimp/gimpimagemetadata.c:914 +#: ../libgimp/gimpimagemetadata.c:924 msgid "Rotated" msgstr "Ruotato" -#: ../libgimp/gimpimagemetadata.c:932 +#: ../libgimp/gimpimagemetadata.c:942 msgid "This image contains Exif orientation metadata." msgstr "Questa immagine contiene metadati Exif di orientamento." -#: ../libgimp/gimpimagemetadata.c:950 +#: ../libgimp/gimpimagemetadata.c:960 msgid "Would you like to rotate the image?" msgstr "Volete ruotare l'immagine?" -#: ../libgimp/gimpimagemetadata.c:962 +#: ../libgimp/gimpimagemetadata.c:972 msgid "_Don't ask me again" msgstr "Non chie_dere più" @@ -811,685 +811,705 @@ msgid "Pattern" msgstr "Motivo" #: ../libgimpbase/gimpbaseenums.c:644 +msgctxt "gradient-blend-color-space" +msgid "Perceptual RGB" +msgstr "Percettivo RGB" + +#: ../libgimpbase/gimpbaseenums.c:645 +msgctxt "gradient-blend-color-space" +msgid "Linear RGB" +msgstr "Lineare RGB" + +#: ../libgimpbase/gimpbaseenums.c:646 +msgctxt "gradient-blend-color-space" +msgid "CIE Lab" +msgstr "CIE Lab" + +#: ../libgimpbase/gimpbaseenums.c:676 msgctxt "gradient-segment-color" msgid "RGB" msgstr "RGB" -#: ../libgimpbase/gimpbaseenums.c:645 +#: ../libgimpbase/gimpbaseenums.c:677 msgctxt "gradient-segment-color" msgid "HSV (counter-clockwise hue)" msgstr "HSV (tonalità antioraria)" #. Translators: this is an abbreviated version of "HSV (counter-clockwise hue)". #. Keep it short. -#: ../libgimpbase/gimpbaseenums.c:648 +#: ../libgimpbase/gimpbaseenums.c:680 msgctxt "gradient-segment-color" msgid "HSV (ccw)" msgstr "HSV (aor)" -#: ../libgimpbase/gimpbaseenums.c:649 +#: ../libgimpbase/gimpbaseenums.c:681 msgctxt "gradient-segment-color" msgid "HSV (clockwise hue)" msgstr "HSV (tonalità oraria)" #. Translators: this is an abbreviated version of "HSV (clockwise hue)". #. Keep it short. -#: ../libgimpbase/gimpbaseenums.c:652 +#: ../libgimpbase/gimpbaseenums.c:684 msgctxt "gradient-segment-color" msgid "HSV (cw)" msgstr "HSV (orario)" -#: ../libgimpbase/gimpbaseenums.c:684 +#: ../libgimpbase/gimpbaseenums.c:716 msgctxt "gradient-segment-type" msgid "Linear" msgstr "Lineare" -#: ../libgimpbase/gimpbaseenums.c:685 +#: ../libgimpbase/gimpbaseenums.c:717 msgctxt "gradient-segment-type" msgid "Curved" msgstr "Curvo" -#: ../libgimpbase/gimpbaseenums.c:686 +#: ../libgimpbase/gimpbaseenums.c:718 msgctxt "gradient-segment-type" msgid "Sinusoidal" msgstr "Sinusoidale" -#: ../libgimpbase/gimpbaseenums.c:687 +#: ../libgimpbase/gimpbaseenums.c:719 msgctxt "gradient-segment-type" msgid "Spherical (increasing)" msgstr "Sferico (incrementale)" #. Translators: this is an abbreviated version of "Spherical (increasing)". #. Keep it short. -#: ../libgimpbase/gimpbaseenums.c:690 +#: ../libgimpbase/gimpbaseenums.c:722 msgctxt "gradient-segment-type" msgid "Spherical (inc)" msgstr "Sferico (inc)" -#: ../libgimpbase/gimpbaseenums.c:691 +#: ../libgimpbase/gimpbaseenums.c:723 msgctxt "gradient-segment-type" msgid "Spherical (decreasing)" msgstr "Sferico (decrementale)" #. Translators: this is an abbreviated version of "Spherical (decreasing)". #. Keep it short. -#: ../libgimpbase/gimpbaseenums.c:694 +#: ../libgimpbase/gimpbaseenums.c:726 msgctxt "gradient-segment-type" msgid "Spherical (dec)" msgstr "Sferico (dec)" -#: ../libgimpbase/gimpbaseenums.c:732 +#: ../libgimpbase/gimpbaseenums.c:764 msgctxt "gradient-type" msgid "Linear" msgstr "Lineare" -#: ../libgimpbase/gimpbaseenums.c:733 +#: ../libgimpbase/gimpbaseenums.c:765 msgctxt "gradient-type" msgid "Bi-linear" msgstr "Bi-lineare" -#: ../libgimpbase/gimpbaseenums.c:734 +#: ../libgimpbase/gimpbaseenums.c:766 msgctxt "gradient-type" msgid "Radial" msgstr "Radiale" -#: ../libgimpbase/gimpbaseenums.c:735 +#: ../libgimpbase/gimpbaseenums.c:767 msgctxt "gradient-type" msgid "Square" msgstr "Quadrangolare" -#: ../libgimpbase/gimpbaseenums.c:736 +#: ../libgimpbase/gimpbaseenums.c:768 msgctxt "gradient-type" msgid "Conical (symmetric)" msgstr "Conico (simmetrico)" #. Translators: this is an abbreviated version of "Conical (symmetric)". #. Keep it short. -#: ../libgimpbase/gimpbaseenums.c:739 +#: ../libgimpbase/gimpbaseenums.c:771 msgctxt "gradient-type" msgid "Conical (sym)" msgstr "Conico (simm.)" -#: ../libgimpbase/gimpbaseenums.c:740 +#: ../libgimpbase/gimpbaseenums.c:772 msgctxt "gradient-type" msgid "Conical (asymmetric)" msgstr "Conico (asimmetrico)" #. Translators: this is an abbreviated version of "Conical (asymmetric)". #. Keep it short. -#: ../libgimpbase/gimpbaseenums.c:743 +#: ../libgimpbase/gimpbaseenums.c:775 msgctxt "gradient-type" msgid "Conical (asym)" msgstr "Conico (asimm.)" # era "Conformata", ma mi pare errato... -#: ../libgimpbase/gimpbaseenums.c:744 +#: ../libgimpbase/gimpbaseenums.c:776 msgctxt "gradient-type" msgid "Shaped (angular)" msgstr "Sagomato (angolare)" -#: ../libgimpbase/gimpbaseenums.c:745 +#: ../libgimpbase/gimpbaseenums.c:777 msgctxt "gradient-type" msgid "Shaped (spherical)" msgstr "Sagomato (sferico)" -#: ../libgimpbase/gimpbaseenums.c:746 +#: ../libgimpbase/gimpbaseenums.c:778 msgctxt "gradient-type" msgid "Shaped (dimpled)" msgstr "Sagomato (curvo)" -#: ../libgimpbase/gimpbaseenums.c:747 +#: ../libgimpbase/gimpbaseenums.c:779 msgctxt "gradient-type" msgid "Spiral (clockwise)" msgstr "Spiraliforme (orario)" #. Translators: this is an abbreviated version of "Spiral (clockwise)". #. Keep it short. -#: ../libgimpbase/gimpbaseenums.c:750 +#: ../libgimpbase/gimpbaseenums.c:782 msgctxt "gradient-type" msgid "Spiral (cw)" msgstr "Spirale (or)" -#: ../libgimpbase/gimpbaseenums.c:751 +#: ../libgimpbase/gimpbaseenums.c:783 msgctxt "gradient-type" msgid "Spiral (counter-clockwise)" msgstr "Spiraliforme (antiorario)" #. Translators: this is an abbreviated version of "Spiral (counter-clockwise)". #. Keep it short. -#: ../libgimpbase/gimpbaseenums.c:754 +#: ../libgimpbase/gimpbaseenums.c:786 msgctxt "gradient-type" msgid "Spiral (ccw)" msgstr "Spirale (aor)" -#: ../libgimpbase/gimpbaseenums.c:786 +#: ../libgimpbase/gimpbaseenums.c:818 msgctxt "grid-style" msgid "Intersections (dots)" msgstr "Intersezioni (punti)" -#: ../libgimpbase/gimpbaseenums.c:787 +#: ../libgimpbase/gimpbaseenums.c:819 msgctxt "grid-style" msgid "Intersections (crosshairs)" msgstr "Intersezioni (crocini)" # Tratteggiata? nel senso linea? -#: ../libgimpbase/gimpbaseenums.c:788 +#: ../libgimpbase/gimpbaseenums.c:820 msgctxt "grid-style" msgid "Dashed" msgstr "Tratteggio" # vedi sopra -#: ../libgimpbase/gimpbaseenums.c:789 +#: ../libgimpbase/gimpbaseenums.c:821 msgctxt "grid-style" msgid "Double dashed" msgstr "Doppio tratteggio" # vedi sopra -#: ../libgimpbase/gimpbaseenums.c:790 +#: ../libgimpbase/gimpbaseenums.c:822 msgctxt "grid-style" msgid "Solid" msgstr "Continuo" -#: ../libgimpbase/gimpbaseenums.c:860 +#: ../libgimpbase/gimpbaseenums.c:892 msgctxt "icon-type" msgid "Icon name" msgstr "Nome icona" -#: ../libgimpbase/gimpbaseenums.c:861 +#: ../libgimpbase/gimpbaseenums.c:893 msgctxt "icon-type" msgid "Inline pixbuf" msgstr "Pixbuf incorporata" -#: ../libgimpbase/gimpbaseenums.c:862 +#: ../libgimpbase/gimpbaseenums.c:894 msgctxt "icon-type" msgid "Image file" msgstr "File immagine" -#: ../libgimpbase/gimpbaseenums.c:892 +#: ../libgimpbase/gimpbaseenums.c:924 msgctxt "image-base-type" msgid "RGB color" msgstr "Colore RGB" -#: ../libgimpbase/gimpbaseenums.c:893 +#: ../libgimpbase/gimpbaseenums.c:925 msgctxt "image-base-type" msgid "Grayscale" msgstr "Scala di grigi" -#: ../libgimpbase/gimpbaseenums.c:894 +#: ../libgimpbase/gimpbaseenums.c:926 msgctxt "image-base-type" msgid "Indexed color" msgstr "Colore indicizzato" -#: ../libgimpbase/gimpbaseenums.c:927 +#: ../libgimpbase/gimpbaseenums.c:959 msgctxt "image-type" msgid "RGB" msgstr "RGB" -#: ../libgimpbase/gimpbaseenums.c:928 +#: ../libgimpbase/gimpbaseenums.c:960 msgctxt "image-type" msgid "RGB-alpha" msgstr "RGB-alfa" -#: ../libgimpbase/gimpbaseenums.c:929 +#: ../libgimpbase/gimpbaseenums.c:961 msgctxt "image-type" msgid "Grayscale" msgstr "Scala di grigi" -#: ../libgimpbase/gimpbaseenums.c:930 +#: ../libgimpbase/gimpbaseenums.c:962 msgctxt "image-type" msgid "Grayscale-alpha" msgstr "Scala di grigi-alfa" -#: ../libgimpbase/gimpbaseenums.c:931 +#: ../libgimpbase/gimpbaseenums.c:963 msgctxt "image-type" msgid "Indexed" msgstr "Indicizzata" -#: ../libgimpbase/gimpbaseenums.c:932 +#: ../libgimpbase/gimpbaseenums.c:964 msgctxt "image-type" msgid "Indexed-alpha" msgstr "Indicizzata-alfa" -#: ../libgimpbase/gimpbaseenums.c:962 +#: ../libgimpbase/gimpbaseenums.c:994 msgctxt "ink-blob-type" msgid "Circle" msgstr "Tondo" -#: ../libgimpbase/gimpbaseenums.c:963 +#: ../libgimpbase/gimpbaseenums.c:995 msgctxt "ink-blob-type" msgid "Square" msgstr "Quadrato" -#: ../libgimpbase/gimpbaseenums.c:964 +#: ../libgimpbase/gimpbaseenums.c:996 msgctxt "ink-blob-type" msgid "Diamond" msgstr "Rombo" -#: ../libgimpbase/gimpbaseenums.c:996 +#: ../libgimpbase/gimpbaseenums.c:1028 msgctxt "interpolation-type" msgid "None" msgstr "Nessuna" -#: ../libgimpbase/gimpbaseenums.c:997 +#: ../libgimpbase/gimpbaseenums.c:1029 msgctxt "interpolation-type" msgid "Linear" msgstr "Lineare" -#: ../libgimpbase/gimpbaseenums.c:998 +#: ../libgimpbase/gimpbaseenums.c:1030 msgctxt "interpolation-type" msgid "Cubic" msgstr "Cubica" -#: ../libgimpbase/gimpbaseenums.c:999 +#: ../libgimpbase/gimpbaseenums.c:1031 msgctxt "interpolation-type" msgid "NoHalo" msgstr "NoAura" -#: ../libgimpbase/gimpbaseenums.c:1000 +#: ../libgimpbase/gimpbaseenums.c:1032 msgctxt "interpolation-type" msgid "LoHalo" msgstr "BassAura" -#: ../libgimpbase/gimpbaseenums.c:1030 +#: ../libgimpbase/gimpbaseenums.c:1062 msgctxt "join-style" msgid "Miter" msgstr "Spigolo" -#: ../libgimpbase/gimpbaseenums.c:1031 +#: ../libgimpbase/gimpbaseenums.c:1063 msgctxt "join-style" msgid "Round" msgstr "Tondo" -#: ../libgimpbase/gimpbaseenums.c:1032 +#: ../libgimpbase/gimpbaseenums.c:1064 msgctxt "join-style" msgid "Bevel" msgstr "Smussato" -#: ../libgimpbase/gimpbaseenums.c:1093 +#: ../libgimpbase/gimpbaseenums.c:1125 msgctxt "merge-type" msgid "Expanded as necessary" msgstr "Espanso il necessario" -#: ../libgimpbase/gimpbaseenums.c:1094 +#: ../libgimpbase/gimpbaseenums.c:1126 msgctxt "merge-type" msgid "Clipped to image" msgstr "Ritagliato all'immagine" -#: ../libgimpbase/gimpbaseenums.c:1095 +#: ../libgimpbase/gimpbaseenums.c:1127 msgctxt "merge-type" msgid "Clipped to bottom layer" msgstr "Ritagliato al livello inferiore" -#: ../libgimpbase/gimpbaseenums.c:1096 +#: ../libgimpbase/gimpbaseenums.c:1128 msgctxt "merge-type" msgid "Flatten" msgstr "Appiattito" -#: ../libgimpbase/gimpbaseenums.c:1188 +#: ../libgimpbase/gimpbaseenums.c:1220 msgctxt "orientation-type" msgid "Horizontal" msgstr "Orizzontale" -#: ../libgimpbase/gimpbaseenums.c:1189 +#: ../libgimpbase/gimpbaseenums.c:1221 msgctxt "orientation-type" msgid "Vertical" msgstr "Verticale" -#: ../libgimpbase/gimpbaseenums.c:1190 +#: ../libgimpbase/gimpbaseenums.c:1222 msgctxt "orientation-type" msgid "Unknown" msgstr "Sconosciuto" # paint-application-mode -#: ../libgimpbase/gimpbaseenums.c:1219 +#: ../libgimpbase/gimpbaseenums.c:1251 msgctxt "paint-application-mode" msgid "Constant" msgstr "Costante" # paint-application-mode -#: ../libgimpbase/gimpbaseenums.c:1220 +#: ../libgimpbase/gimpbaseenums.c:1252 msgctxt "paint-application-mode" msgid "Incremental" msgstr "Incrementale" -#: ../libgimpbase/gimpbaseenums.c:1353 +#: ../libgimpbase/gimpbaseenums.c:1385 msgctxt "pdb-proc-type" msgid "Internal GIMP procedure" msgstr "Procedura interna di GIMP" -#: ../libgimpbase/gimpbaseenums.c:1354 +#: ../libgimpbase/gimpbaseenums.c:1386 msgctxt "pdb-proc-type" msgid "GIMP Plug-In" msgstr "Plug-in di GIMP" -#: ../libgimpbase/gimpbaseenums.c:1355 +#: ../libgimpbase/gimpbaseenums.c:1387 msgctxt "pdb-proc-type" msgid "GIMP Extension" msgstr "Estensione di GIMP" -#: ../libgimpbase/gimpbaseenums.c:1356 +#: ../libgimpbase/gimpbaseenums.c:1388 msgctxt "pdb-proc-type" msgid "Temporary Procedure" msgstr "Procedura temporanea" -#: ../libgimpbase/gimpbaseenums.c:1431 +#: ../libgimpbase/gimpbaseenums.c:1463 msgctxt "precision" msgid "8-bit linear integer" msgstr "interi a 8 bit lineari" -#: ../libgimpbase/gimpbaseenums.c:1432 +#: ../libgimpbase/gimpbaseenums.c:1464 msgctxt "precision" msgid "8-bit gamma integer" msgstr "interi a 8 bit gamma" -#: ../libgimpbase/gimpbaseenums.c:1433 +#: ../libgimpbase/gimpbaseenums.c:1465 msgctxt "precision" msgid "16-bit linear integer" msgstr "interi a 16 bit lineari" -#: ../libgimpbase/gimpbaseenums.c:1434 +#: ../libgimpbase/gimpbaseenums.c:1466 msgctxt "precision" msgid "16-bit gamma integer" msgstr "interi a 16 bit gamma" -#: ../libgimpbase/gimpbaseenums.c:1435 +#: ../libgimpbase/gimpbaseenums.c:1467 msgctxt "precision" msgid "32-bit linear integer" msgstr "interi a 32 bit lineari" -#: ../libgimpbase/gimpbaseenums.c:1436 +#: ../libgimpbase/gimpbaseenums.c:1468 msgctxt "precision" msgid "32-bit gamma integer" msgstr "interi a 32 bit gamma" -#: ../libgimpbase/gimpbaseenums.c:1437 +#: ../libgimpbase/gimpbaseenums.c:1469 msgctxt "precision" msgid "16-bit linear floating point" msgstr "virgola mobile a 16 bit lineari" -#: ../libgimpbase/gimpbaseenums.c:1438 +#: ../libgimpbase/gimpbaseenums.c:1470 msgctxt "precision" msgid "16-bit gamma floating point" msgstr "virgola mobile a 16 bit gamma" -#: ../libgimpbase/gimpbaseenums.c:1439 +#: ../libgimpbase/gimpbaseenums.c:1471 msgctxt "precision" msgid "32-bit linear floating point" msgstr "virgola mobile a 32 bit lineari" -#: ../libgimpbase/gimpbaseenums.c:1440 +#: ../libgimpbase/gimpbaseenums.c:1472 msgctxt "precision" msgid "32-bit gamma floating point" msgstr "virgola mobile a 32 bit gamma" -#: ../libgimpbase/gimpbaseenums.c:1441 +#: ../libgimpbase/gimpbaseenums.c:1473 msgctxt "precision" msgid "64-bit linear floating point" msgstr "virgola mobile a 64 bit lineari" -#: ../libgimpbase/gimpbaseenums.c:1442 +#: ../libgimpbase/gimpbaseenums.c:1474 msgctxt "precision" msgid "64-bit gamma floating point" msgstr "virgola mobile a 64 bit gamma" -#: ../libgimpbase/gimpbaseenums.c:1511 +#: ../libgimpbase/gimpbaseenums.c:1543 msgctxt "repeat-mode" msgid "None (extend)" msgstr "Nessuna (estesa)" # repeat-mode -#: ../libgimpbase/gimpbaseenums.c:1512 +#: ../libgimpbase/gimpbaseenums.c:1544 msgctxt "repeat-mode" msgid "Sawtooth wave" msgstr "Onda a dente di sega" # repeat-mode -#: ../libgimpbase/gimpbaseenums.c:1513 +#: ../libgimpbase/gimpbaseenums.c:1545 msgctxt "repeat-mode" msgid "Triangular wave" msgstr "Onda triangolare" -#: ../libgimpbase/gimpbaseenums.c:1514 +#: ../libgimpbase/gimpbaseenums.c:1546 msgctxt "repeat-mode" msgid "Truncate" msgstr "Troncata" -#: ../libgimpbase/gimpbaseenums.c:1576 +#: ../libgimpbase/gimpbaseenums.c:1608 msgctxt "run-mode" msgid "Run interactively" msgstr "Esegui interattivamente" -#: ../libgimpbase/gimpbaseenums.c:1577 +#: ../libgimpbase/gimpbaseenums.c:1609 msgctxt "run-mode" msgid "Run non-interactively" msgstr "Esegui non-interattivamente" -#: ../libgimpbase/gimpbaseenums.c:1578 +#: ../libgimpbase/gimpbaseenums.c:1610 msgctxt "run-mode" msgid "Run with last used values" msgstr "Esegui con gli ultimi parametri usati" -#: ../libgimpbase/gimpbaseenums.c:1616 +#: ../libgimpbase/gimpbaseenums.c:1648 msgctxt "select-criterion" msgid "Composite" msgstr "Composito" -#: ../libgimpbase/gimpbaseenums.c:1617 +#: ../libgimpbase/gimpbaseenums.c:1649 msgctxt "select-criterion" msgid "Red" msgstr "Rosso" -#: ../libgimpbase/gimpbaseenums.c:1618 +#: ../libgimpbase/gimpbaseenums.c:1650 msgctxt "select-criterion" msgid "Green" msgstr "Verde" -#: ../libgimpbase/gimpbaseenums.c:1619 +#: ../libgimpbase/gimpbaseenums.c:1651 msgctxt "select-criterion" msgid "Blue" msgstr "Blu" -#: ../libgimpbase/gimpbaseenums.c:1620 +#: ../libgimpbase/gimpbaseenums.c:1652 msgctxt "select-criterion" msgid "Hue (HSV)" msgstr "Tonalità (HSV)" -#: ../libgimpbase/gimpbaseenums.c:1621 +#: ../libgimpbase/gimpbaseenums.c:1653 msgctxt "select-criterion" msgid "Saturation (HSV)" msgstr "Saturazione (HSV)" -#: ../libgimpbase/gimpbaseenums.c:1622 +#: ../libgimpbase/gimpbaseenums.c:1654 msgctxt "select-criterion" msgid "Value (HSV)" msgstr "Valore (HSV)" -#: ../libgimpbase/gimpbaseenums.c:1623 +#: ../libgimpbase/gimpbaseenums.c:1655 msgctxt "select-criterion" msgid "Alpha" msgstr "Alfa" -#: ../libgimpbase/gimpbaseenums.c:1624 +#: ../libgimpbase/gimpbaseenums.c:1656 msgctxt "select-criterion" msgid "Lightness (LCH)" msgstr "Luminosità (LCH)" -#: ../libgimpbase/gimpbaseenums.c:1625 +#: ../libgimpbase/gimpbaseenums.c:1657 msgctxt "select-criterion" msgid "Chroma (LCH)" msgstr "Croma (LCH)" -#: ../libgimpbase/gimpbaseenums.c:1626 +#: ../libgimpbase/gimpbaseenums.c:1658 msgctxt "select-criterion" msgid "Hue (LCH)" msgstr "Tonalità (LCH)" -#: ../libgimpbase/gimpbaseenums.c:1655 +#: ../libgimpbase/gimpbaseenums.c:1687 msgctxt "size-type" msgid "Pixels" msgstr "Pixel" -#: ../libgimpbase/gimpbaseenums.c:1656 +#: ../libgimpbase/gimpbaseenums.c:1688 msgctxt "size-type" msgid "Points" msgstr "Punti" -#: ../libgimpbase/gimpbaseenums.c:1717 +#: ../libgimpbase/gimpbaseenums.c:1749 msgctxt "stroke-method" msgid "Stroke line" msgstr "Delinea linea" -#: ../libgimpbase/gimpbaseenums.c:1718 +#: ../libgimpbase/gimpbaseenums.c:1750 msgctxt "stroke-method" msgid "Stroke with a paint tool" msgstr "Delinea con uno strumento di disegno" -#: ../libgimpbase/gimpbaseenums.c:1747 +#: ../libgimpbase/gimpbaseenums.c:1779 msgctxt "text-direction" msgid "From left to right" msgstr "Da sinistra a destra" -#: ../libgimpbase/gimpbaseenums.c:1748 +#: ../libgimpbase/gimpbaseenums.c:1780 msgctxt "text-direction" msgid "From right to left" msgstr "Da destra a sinistra" -#: ../libgimpbase/gimpbaseenums.c:1779 +#: ../libgimpbase/gimpbaseenums.c:1811 msgctxt "text-hint-style" msgid "None" msgstr "Nessuno" -#: ../libgimpbase/gimpbaseenums.c:1780 +#: ../libgimpbase/gimpbaseenums.c:1812 msgctxt "text-hint-style" msgid "Slight" msgstr "Leggero" -#: ../libgimpbase/gimpbaseenums.c:1781 +#: ../libgimpbase/gimpbaseenums.c:1813 msgctxt "text-hint-style" msgid "Medium" msgstr "Medio" -#: ../libgimpbase/gimpbaseenums.c:1782 +#: ../libgimpbase/gimpbaseenums.c:1814 msgctxt "text-hint-style" msgid "Full" msgstr "Pieno" -#: ../libgimpbase/gimpbaseenums.c:1813 +#: ../libgimpbase/gimpbaseenums.c:1845 msgctxt "text-justification" msgid "Left justified" msgstr "Allineato a sinistra" -#: ../libgimpbase/gimpbaseenums.c:1814 +#: ../libgimpbase/gimpbaseenums.c:1846 msgctxt "text-justification" msgid "Right justified" msgstr "Allineato a destra" -#: ../libgimpbase/gimpbaseenums.c:1815 +#: ../libgimpbase/gimpbaseenums.c:1847 msgctxt "text-justification" msgid "Centered" msgstr "Centrato" -#: ../libgimpbase/gimpbaseenums.c:1816 +#: ../libgimpbase/gimpbaseenums.c:1848 msgctxt "text-justification" msgid "Filled" msgstr "Giustificato" -#: ../libgimpbase/gimpbaseenums.c:1846 +#: ../libgimpbase/gimpbaseenums.c:1878 msgctxt "transfer-mode" msgid "Shadows" msgstr "Ombre" -#: ../libgimpbase/gimpbaseenums.c:1847 +#: ../libgimpbase/gimpbaseenums.c:1879 msgctxt "transfer-mode" msgid "Midtones" msgstr "Mezzitoni" -#: ../libgimpbase/gimpbaseenums.c:1848 +#: ../libgimpbase/gimpbaseenums.c:1880 msgctxt "transfer-mode" msgid "Highlights" msgstr "Alteluci" -#: ../libgimpbase/gimpbaseenums.c:1877 +#: ../libgimpbase/gimpbaseenums.c:1909 msgctxt "transform-direction" msgid "Normal (Forward)" msgstr "Normale (avanti)" -#: ../libgimpbase/gimpbaseenums.c:1878 +#: ../libgimpbase/gimpbaseenums.c:1910 msgctxt "transform-direction" msgid "Corrective (Backward)" msgstr "Correttiva (indietro)" -#: ../libgimpbase/gimpbaseenums.c:1909 +#: ../libgimpbase/gimpbaseenums.c:1941 msgctxt "transform-resize" msgid "Adjust" msgstr "Regola" -#: ../libgimpbase/gimpbaseenums.c:1910 +#: ../libgimpbase/gimpbaseenums.c:1942 msgctxt "transform-resize" msgid "Clip" msgstr "Taglia" -#: ../libgimpbase/gimpbaseenums.c:1911 +#: ../libgimpbase/gimpbaseenums.c:1943 msgctxt "transform-resize" msgid "Crop to result" msgstr "Ritaglia al risultato" -#: ../libgimpbase/gimpbaseenums.c:1912 +#: ../libgimpbase/gimpbaseenums.c:1944 msgctxt "transform-resize" msgid "Crop with aspect" msgstr "Ritaglia all'aspetto" -#: ../libgimpbase/gimpmetadata.c:840 +#: ../libgimpbase/gimpmetadata.c:845 #, c-format msgid "Can load metadata only from local files" msgstr "È possibile caricare i metadati solo da file locali" -#: ../libgimpbase/gimpmetadata.c:900 +#: ../libgimpbase/gimpmetadata.c:859 +#, c-format +msgid "Conversion of the filename to system codepage failed." +msgstr "Conversione del nome del file alla codepage di sistema fallita." + +#: ../libgimpbase/gimpmetadata.c:916 #, c-format msgid "Can save metadata only to local files" msgstr "È possibile salvare i metadati sono su file locali" -#: ../libgimpbase/gimpmetadata.c:976 +#: ../libgimpbase/gimpmetadata.c:992 #, c-format msgid "Parsing Exif data failed." msgstr "Fallita l'analisi dei dati Exif." -#: ../libgimpbase/gimpmetadata.c:1027 +#: ../libgimpbase/gimpmetadata.c:1043 #, c-format msgid "Parsing IPTC data failed." msgstr "Fallita l'analisi dei dati IPTC." -#: ../libgimpbase/gimpmetadata.c:1076 +#: ../libgimpbase/gimpmetadata.c:1092 #, c-format msgid "Parsing XMP data failed." msgstr "Fallita l'analisi dei dati XMP." -#: ../libgimpbase/gimputils.c:192 ../libgimpbase/gimputils.c:197 +#: ../libgimpbase/gimputils.c:223 ../libgimpbase/gimputils.c:228 msgid "(invalid UTF-8 string)" msgstr "(stringa UTF-8 non valida)" -#: ../libgimpbase/gimputils.c:367 +#: ../libgimpbase/gimputils.c:398 msgid "File path is NULL" msgstr "Il percorso file è NULL" -#: ../libgimpbase/gimputils.c:376 ../libgimpbase/gimputils.c:387 +#: ../libgimpbase/gimputils.c:407 ../libgimpbase/gimputils.c:418 msgid "Error converting UTF-8 filename to wide char" msgstr "Errore durante la conversione di un nome file UTF-8 in wide char" -#: ../libgimpbase/gimputils.c:395 +#: ../libgimpbase/gimputils.c:426 msgid "ILCreateFromPath() failed" msgstr "ILCreateFromPath() è fallita" -#: ../libgimpbase/gimputils.c:432 +#: ../libgimpbase/gimputils.c:463 #, c-format msgid "Cannot convert '%s' into a valid NSURL." msgstr "Impossibile convertire \"%s\" in un valido NSURL." -#: ../libgimpbase/gimputils.c:460 +#: ../libgimpbase/gimputils.c:491 msgid "Connecting to org.freedesktop.FileManager1 failed: " msgstr "Connessione a org.freedesktop.FileManager1 fallita: " -#: ../libgimpbase/gimputils.c:484 +#: ../libgimpbase/gimputils.c:515 msgid "Calling ShowItems failed: " msgstr "Chiamata a ShowItems fallita: " @@ -1952,23 +1972,23 @@ msgstr "Produttore: " msgid "Copyright: " msgstr "Copyright: " -#: ../libgimpwidgets/gimpcolorscales.c:201 +#: ../libgimpwidgets/gimpcolorscales.c:205 msgid "Scales" msgstr "Scale" -#: ../libgimpwidgets/gimpcolorscales.c:439 +#: ../libgimpwidgets/gimpcolorscales.c:437 msgid "0..100" msgstr "0..100" -#: ../libgimpwidgets/gimpcolorscales.c:441 +#: ../libgimpwidgets/gimpcolorscales.c:439 msgid "0..255" msgstr "0..255" -#: ../libgimpwidgets/gimpcolorscales.c:462 +#: ../libgimpwidgets/gimpcolorscales.c:460 msgid "LCH" msgstr "LCH" -#: ../libgimpwidgets/gimpcolorscales.c:464 +#: ../libgimpwidgets/gimpcolorscales.c:462 msgid "HSV" msgstr "HSV" @@ -2191,7 +2211,7 @@ msgstr "Dimensione scacchi" msgid "Check Style" msgstr "Stile scacchi" -#: ../libgimpwidgets/gimppropwidgets.c:2143 +#: ../libgimpwidgets/gimppropwidgets.c:2177 #, c-format msgid "This text input field is limited to %d character." msgid_plural "This text input field is limited to %d characters." @@ -2350,22 +2370,49 @@ msgstr "Croma LCH" msgid "LCH Hue" msgstr "Tonalità LCH" -#: ../libgimpwidgets/gimpwidgetsenums.c:167 +#: ../libgimpwidgets/gimpwidgetsenums.c:168 +msgctxt "color-selector-model" +msgid "RGB" +msgstr "RGB" + +#: ../libgimpwidgets/gimpwidgetsenums.c:168 +msgid "RGB color model" +msgstr "Modello colore RGB" + +#: ../libgimpwidgets/gimpwidgetsenums.c:169 +msgctxt "color-selector-model" +msgid "LCH" +msgstr "LCH" + +#: ../libgimpwidgets/gimpwidgetsenums.c:169 +msgid "CIELCh color model" +msgstr "Modello colore CIELCh" + +#: ../libgimpwidgets/gimpwidgetsenums.c:170 +msgctxt "color-selector-model" +msgid "HSV" +msgstr "HSV" + +#: ../libgimpwidgets/gimpwidgetsenums.c:170 +msgid "HSV color model" +msgstr "Modello colore HSV" + +#: ../libgimpwidgets/gimpwidgetsenums.c:199 msgctxt "page-selector-target" msgid "Layers" msgstr "Livelli" -#: ../libgimpwidgets/gimpwidgetsenums.c:168 +#: ../libgimpwidgets/gimpwidgetsenums.c:200 msgctxt "page-selector-target" msgid "Images" msgstr "Immagini" -#: ../libgimpwidgets/gimpwidgetsenums.c:229 +#: ../libgimpwidgets/gimpwidgetsenums.c:261 msgctxt "zoom-type" msgid "Zoom in" msgstr "Aumenta ingrandimento" -#: ../libgimpwidgets/gimpwidgetsenums.c:230 +#: ../libgimpwidgets/gimpwidgetsenums.c:262 msgctxt "zoom-type" msgid "Zoom out" msgstr "Riduci ingrandimento" @@ -2813,7 +2860,8 @@ msgstr "Mostra alteluci" #: ../modules/display-filter-clip-warning.c:178 msgid "Show warning for pixels with a component greater than one" -msgstr "Mostra un avvertimento per i pixel con una componente più grande di uno" +msgstr "" +"Mostra un avvertimento per i pixel con una componente più grande di uno" #: ../modules/display-filter-clip-warning.c:184 msgid "Highlights color" @@ -2829,7 +2877,8 @@ msgstr "Mostra falso" #: ../modules/display-filter-clip-warning.c:198 msgid "Show warning for pixels with an infinite or NaN component" -msgstr "Mostra un avvertimento per i pixel con una componente infinita o non numerica" +msgstr "" +"Mostra un avvertimento per i pixel con una componente infinita o non numerica" #: ../modules/display-filter-clip-warning.c:204 msgid "Bogus color" diff --git a/po-libgimp/pl.po b/po-libgimp/pl.po index 4e3e292447..1abefc949e 100644 --- a/po-libgimp/pl.po +++ b/po-libgimp/pl.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: gimp-libgimp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-28 20:01+0100\n" -"PO-Revision-Date: 2018-01-28 20:02+0100\n" +"POT-Creation-Date: 2018-04-14 19:09+0200\n" +"PO-Revision-Date: 2018-04-14 19:10+0200\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -21,22 +21,22 @@ msgstr "" "|| n%100>=20) ? 1 : 2);\n" #. procedure executed successfully -#: ../libgimp/gimp.c:1209 +#: ../libgimp/gimp.c:1264 msgid "success" msgstr "powodzenie" #. procedure execution failed -#: ../libgimp/gimp.c:1213 +#: ../libgimp/gimp.c:1268 msgid "execution error" msgstr "błąd wykonania" #. procedure called incorrectly -#: ../libgimp/gimp.c:1217 +#: ../libgimp/gimp.c:1272 msgid "calling error" msgstr "błąd wywołania" #. procedure execution cancelled -#: ../libgimp/gimp.c:1221 +#: ../libgimp/gimp.c:1276 msgid "cancelled" msgstr "anulowano" @@ -784,622 +784,637 @@ msgid "Pattern" msgstr "Deseń" #: ../libgimpbase/gimpbaseenums.c:644 +msgctxt "gradient-blend-color-space" +msgid "Perceptual RGB" +msgstr "Percepcyjna RGB" + +#: ../libgimpbase/gimpbaseenums.c:645 +msgctxt "gradient-blend-color-space" +msgid "Linear RGB" +msgstr "Liniowa RGB" + +#: ../libgimpbase/gimpbaseenums.c:646 +msgctxt "gradient-blend-color-space" +msgid "CIE Lab" +msgstr "LAB CIE" + +#: ../libgimpbase/gimpbaseenums.c:676 msgctxt "gradient-segment-color" msgid "RGB" msgstr "RGB" -#: ../libgimpbase/gimpbaseenums.c:645 +#: ../libgimpbase/gimpbaseenums.c:677 msgctxt "gradient-segment-color" msgid "HSV (counter-clockwise hue)" msgstr "HSV (barwa lewoskrętna)" #. Translators: this is an abbreviated version of "HSV (counter-clockwise hue)". #. Keep it short. -#: ../libgimpbase/gimpbaseenums.c:648 +#: ../libgimpbase/gimpbaseenums.c:680 msgctxt "gradient-segment-color" msgid "HSV (ccw)" msgstr "HSV (lewoskrętna)" -#: ../libgimpbase/gimpbaseenums.c:649 +#: ../libgimpbase/gimpbaseenums.c:681 msgctxt "gradient-segment-color" msgid "HSV (clockwise hue)" msgstr "HSV (barwa prawoskrętna)" #. Translators: this is an abbreviated version of "HSV (clockwise hue)". #. Keep it short. -#: ../libgimpbase/gimpbaseenums.c:652 +#: ../libgimpbase/gimpbaseenums.c:684 msgctxt "gradient-segment-color" msgid "HSV (cw)" msgstr "HSV (prawoskrętna)" -#: ../libgimpbase/gimpbaseenums.c:684 +#: ../libgimpbase/gimpbaseenums.c:716 msgctxt "gradient-segment-type" msgid "Linear" msgstr "Liniowy" -#: ../libgimpbase/gimpbaseenums.c:685 +#: ../libgimpbase/gimpbaseenums.c:717 msgctxt "gradient-segment-type" msgid "Curved" msgstr "Łukowy" -#: ../libgimpbase/gimpbaseenums.c:686 +#: ../libgimpbase/gimpbaseenums.c:718 msgctxt "gradient-segment-type" msgid "Sinusoidal" msgstr "Sinusoidalny" -#: ../libgimpbase/gimpbaseenums.c:687 +#: ../libgimpbase/gimpbaseenums.c:719 msgctxt "gradient-segment-type" msgid "Spherical (increasing)" msgstr "Sferyczny (wzrastający)" #. Translators: this is an abbreviated version of "Spherical (increasing)". #. Keep it short. -#: ../libgimpbase/gimpbaseenums.c:690 +#: ../libgimpbase/gimpbaseenums.c:722 msgctxt "gradient-segment-type" msgid "Spherical (inc)" msgstr "Sferyczny (wzrast.)" -#: ../libgimpbase/gimpbaseenums.c:691 +#: ../libgimpbase/gimpbaseenums.c:723 msgctxt "gradient-segment-type" msgid "Spherical (decreasing)" msgstr "Sferyczny (opadający)" #. Translators: this is an abbreviated version of "Spherical (decreasing)". #. Keep it short. -#: ../libgimpbase/gimpbaseenums.c:694 +#: ../libgimpbase/gimpbaseenums.c:726 msgctxt "gradient-segment-type" msgid "Spherical (dec)" msgstr "Sferyczny (opad.)" -#: ../libgimpbase/gimpbaseenums.c:732 +#: ../libgimpbase/gimpbaseenums.c:764 msgctxt "gradient-type" msgid "Linear" msgstr "Liniowy" -#: ../libgimpbase/gimpbaseenums.c:733 +#: ../libgimpbase/gimpbaseenums.c:765 msgctxt "gradient-type" msgid "Bi-linear" msgstr "Dwuliniowy" -#: ../libgimpbase/gimpbaseenums.c:734 +#: ../libgimpbase/gimpbaseenums.c:766 msgctxt "gradient-type" msgid "Radial" msgstr "Promienisty" -#: ../libgimpbase/gimpbaseenums.c:735 +#: ../libgimpbase/gimpbaseenums.c:767 msgctxt "gradient-type" msgid "Square" msgstr "Prostokątny" -#: ../libgimpbase/gimpbaseenums.c:736 +#: ../libgimpbase/gimpbaseenums.c:768 msgctxt "gradient-type" msgid "Conical (symmetric)" msgstr "Stożkowy (symetryczny)" #. Translators: this is an abbreviated version of "Conical (symmetric)". #. Keep it short. -#: ../libgimpbase/gimpbaseenums.c:739 +#: ../libgimpbase/gimpbaseenums.c:771 msgctxt "gradient-type" msgid "Conical (sym)" msgstr "Stożkowy (symet.)" -#: ../libgimpbase/gimpbaseenums.c:740 +#: ../libgimpbase/gimpbaseenums.c:772 msgctxt "gradient-type" msgid "Conical (asymmetric)" msgstr "Stożkowy (asymetryczny)" #. Translators: this is an abbreviated version of "Conical (asymmetric)". #. Keep it short. -#: ../libgimpbase/gimpbaseenums.c:743 +#: ../libgimpbase/gimpbaseenums.c:775 msgctxt "gradient-type" msgid "Conical (asym)" msgstr "Stożkowy (asymet.)" -#: ../libgimpbase/gimpbaseenums.c:744 +#: ../libgimpbase/gimpbaseenums.c:776 msgctxt "gradient-type" msgid "Shaped (angular)" msgstr "Rozlany (kąt)" -#: ../libgimpbase/gimpbaseenums.c:745 +#: ../libgimpbase/gimpbaseenums.c:777 msgctxt "gradient-type" msgid "Shaped (spherical)" msgstr "Rozlany (sfera)" -#: ../libgimpbase/gimpbaseenums.c:746 +#: ../libgimpbase/gimpbaseenums.c:778 msgctxt "gradient-type" msgid "Shaped (dimpled)" msgstr "Rozlany (dół)" -#: ../libgimpbase/gimpbaseenums.c:747 +#: ../libgimpbase/gimpbaseenums.c:779 msgctxt "gradient-type" msgid "Spiral (clockwise)" msgstr "Spiralny (w prawo)" #. Translators: this is an abbreviated version of "Spiral (clockwise)". #. Keep it short. -#: ../libgimpbase/gimpbaseenums.c:750 +#: ../libgimpbase/gimpbaseenums.c:782 msgctxt "gradient-type" msgid "Spiral (cw)" msgstr "Spiralny (w prawo)" -#: ../libgimpbase/gimpbaseenums.c:751 +#: ../libgimpbase/gimpbaseenums.c:783 msgctxt "gradient-type" msgid "Spiral (counter-clockwise)" msgstr "Spiralny (w lewo)" #. Translators: this is an abbreviated version of "Spiral (counter-clockwise)". #. Keep it short. -#: ../libgimpbase/gimpbaseenums.c:754 +#: ../libgimpbase/gimpbaseenums.c:786 msgctxt "gradient-type" msgid "Spiral (ccw)" msgstr "Spiralny (w lewo)" -#: ../libgimpbase/gimpbaseenums.c:786 +#: ../libgimpbase/gimpbaseenums.c:818 msgctxt "grid-style" msgid "Intersections (dots)" msgstr "Przecięcia (kropki)" -#: ../libgimpbase/gimpbaseenums.c:787 +#: ../libgimpbase/gimpbaseenums.c:819 msgctxt "grid-style" msgid "Intersections (crosshairs)" msgstr "Przecięcia (krzyżyki)" -#: ../libgimpbase/gimpbaseenums.c:788 +#: ../libgimpbase/gimpbaseenums.c:820 msgctxt "grid-style" msgid "Dashed" msgstr "Kreskowany" -#: ../libgimpbase/gimpbaseenums.c:789 +#: ../libgimpbase/gimpbaseenums.c:821 msgctxt "grid-style" msgid "Double dashed" msgstr "Podwójnie kreskowany" -#: ../libgimpbase/gimpbaseenums.c:790 +#: ../libgimpbase/gimpbaseenums.c:822 msgctxt "grid-style" msgid "Solid" msgstr "Jednolity" -#: ../libgimpbase/gimpbaseenums.c:860 +#: ../libgimpbase/gimpbaseenums.c:892 msgctxt "icon-type" msgid "Icon name" msgstr "Nazwa ikony" -#: ../libgimpbase/gimpbaseenums.c:861 +#: ../libgimpbase/gimpbaseenums.c:893 msgctxt "icon-type" msgid "Inline pixbuf" msgstr "Osadzony bufor pikseli" -#: ../libgimpbase/gimpbaseenums.c:862 +#: ../libgimpbase/gimpbaseenums.c:894 msgctxt "icon-type" msgid "Image file" msgstr "Plik obrazu" -#: ../libgimpbase/gimpbaseenums.c:892 +#: ../libgimpbase/gimpbaseenums.c:924 msgctxt "image-base-type" msgid "RGB color" msgstr "Kolory RGB" -#: ../libgimpbase/gimpbaseenums.c:893 +#: ../libgimpbase/gimpbaseenums.c:925 msgctxt "image-base-type" msgid "Grayscale" msgstr "Odcienie szarości" -#: ../libgimpbase/gimpbaseenums.c:894 +#: ../libgimpbase/gimpbaseenums.c:926 msgctxt "image-base-type" msgid "Indexed color" msgstr "Tryb indeksowany" -#: ../libgimpbase/gimpbaseenums.c:927 +#: ../libgimpbase/gimpbaseenums.c:959 msgctxt "image-type" msgid "RGB" msgstr "RGB" -#: ../libgimpbase/gimpbaseenums.c:928 +#: ../libgimpbase/gimpbaseenums.c:960 msgctxt "image-type" msgid "RGB-alpha" msgstr "RGB (alfa)" -#: ../libgimpbase/gimpbaseenums.c:929 +#: ../libgimpbase/gimpbaseenums.c:961 msgctxt "image-type" msgid "Grayscale" msgstr "Odcienie szarości" -#: ../libgimpbase/gimpbaseenums.c:930 +#: ../libgimpbase/gimpbaseenums.c:962 msgctxt "image-type" msgid "Grayscale-alpha" msgstr "Odcienie szarości (alfa)" -#: ../libgimpbase/gimpbaseenums.c:931 +#: ../libgimpbase/gimpbaseenums.c:963 msgctxt "image-type" msgid "Indexed" msgstr "Indeksowany" -#: ../libgimpbase/gimpbaseenums.c:932 +#: ../libgimpbase/gimpbaseenums.c:964 msgctxt "image-type" msgid "Indexed-alpha" msgstr "Indeksowany (alfa)" -#: ../libgimpbase/gimpbaseenums.c:962 +#: ../libgimpbase/gimpbaseenums.c:994 msgctxt "ink-blob-type" msgid "Circle" msgstr "Okrągły" -#: ../libgimpbase/gimpbaseenums.c:963 +#: ../libgimpbase/gimpbaseenums.c:995 msgctxt "ink-blob-type" msgid "Square" msgstr "Prostokątny" -#: ../libgimpbase/gimpbaseenums.c:964 +#: ../libgimpbase/gimpbaseenums.c:996 msgctxt "ink-blob-type" msgid "Diamond" msgstr "Rombowy" -#: ../libgimpbase/gimpbaseenums.c:996 +#: ../libgimpbase/gimpbaseenums.c:1028 msgctxt "interpolation-type" msgid "None" msgstr "Brak" -#: ../libgimpbase/gimpbaseenums.c:997 +#: ../libgimpbase/gimpbaseenums.c:1029 msgctxt "interpolation-type" msgid "Linear" msgstr "Liniowa" -#: ../libgimpbase/gimpbaseenums.c:998 +#: ../libgimpbase/gimpbaseenums.c:1030 msgctxt "interpolation-type" msgid "Cubic" msgstr "Sześcienna" -#: ../libgimpbase/gimpbaseenums.c:999 +#: ../libgimpbase/gimpbaseenums.c:1031 msgctxt "interpolation-type" msgid "NoHalo" msgstr "NoHalo" -#: ../libgimpbase/gimpbaseenums.c:1000 +#: ../libgimpbase/gimpbaseenums.c:1032 msgctxt "interpolation-type" msgid "LoHalo" msgstr "LoHalo" -#: ../libgimpbase/gimpbaseenums.c:1030 +#: ../libgimpbase/gimpbaseenums.c:1062 msgctxt "join-style" msgid "Miter" msgstr "Zaostrzony" -#: ../libgimpbase/gimpbaseenums.c:1031 +#: ../libgimpbase/gimpbaseenums.c:1063 msgctxt "join-style" msgid "Round" msgstr "Zaokrąglony" -#: ../libgimpbase/gimpbaseenums.c:1032 +#: ../libgimpbase/gimpbaseenums.c:1064 msgctxt "join-style" msgid "Bevel" msgstr "Ścięty skośnie" -#: ../libgimpbase/gimpbaseenums.c:1093 +#: ../libgimpbase/gimpbaseenums.c:1125 msgctxt "merge-type" msgid "Expanded as necessary" msgstr "Rozszerzona w razie potrzeby" -#: ../libgimpbase/gimpbaseenums.c:1094 +#: ../libgimpbase/gimpbaseenums.c:1126 msgctxt "merge-type" msgid "Clipped to image" msgstr "Przycięta do obrazu" -#: ../libgimpbase/gimpbaseenums.c:1095 +#: ../libgimpbase/gimpbaseenums.c:1127 msgctxt "merge-type" msgid "Clipped to bottom layer" msgstr "Przycięta do najniższej warstwy" -#: ../libgimpbase/gimpbaseenums.c:1096 +#: ../libgimpbase/gimpbaseenums.c:1128 msgctxt "merge-type" msgid "Flatten" msgstr "Spłaszczona" -#: ../libgimpbase/gimpbaseenums.c:1188 +#: ../libgimpbase/gimpbaseenums.c:1220 msgctxt "orientation-type" msgid "Horizontal" msgstr "Poziomy" -#: ../libgimpbase/gimpbaseenums.c:1189 +#: ../libgimpbase/gimpbaseenums.c:1221 msgctxt "orientation-type" msgid "Vertical" msgstr "Pionowy" -#: ../libgimpbase/gimpbaseenums.c:1190 +#: ../libgimpbase/gimpbaseenums.c:1222 msgctxt "orientation-type" msgid "Unknown" msgstr "Nieznany" -#: ../libgimpbase/gimpbaseenums.c:1219 +#: ../libgimpbase/gimpbaseenums.c:1251 msgctxt "paint-application-mode" msgid "Constant" msgstr "Stałe" -#: ../libgimpbase/gimpbaseenums.c:1220 +#: ../libgimpbase/gimpbaseenums.c:1252 msgctxt "paint-application-mode" msgid "Incremental" msgstr "Przyrostowe" -#: ../libgimpbase/gimpbaseenums.c:1353 +#: ../libgimpbase/gimpbaseenums.c:1385 msgctxt "pdb-proc-type" msgid "Internal GIMP procedure" msgstr "Wewnętrzna procedura programu GIMP" -#: ../libgimpbase/gimpbaseenums.c:1354 +#: ../libgimpbase/gimpbaseenums.c:1386 msgctxt "pdb-proc-type" msgid "GIMP Plug-In" msgstr "Wtyczka programu GIMP" -#: ../libgimpbase/gimpbaseenums.c:1355 +#: ../libgimpbase/gimpbaseenums.c:1387 msgctxt "pdb-proc-type" msgid "GIMP Extension" msgstr "Rozszerzenie programu GIMP" -#: ../libgimpbase/gimpbaseenums.c:1356 +#: ../libgimpbase/gimpbaseenums.c:1388 msgctxt "pdb-proc-type" msgid "Temporary Procedure" msgstr "Procedura tymczasowa" -#: ../libgimpbase/gimpbaseenums.c:1431 +#: ../libgimpbase/gimpbaseenums.c:1463 msgctxt "precision" msgid "8-bit linear integer" msgstr "8-bitowa (liniowa, stałoprzecinkowa)" -#: ../libgimpbase/gimpbaseenums.c:1432 +#: ../libgimpbase/gimpbaseenums.c:1464 msgctxt "precision" msgid "8-bit gamma integer" msgstr "8-bitowa (gamma, stałoprzecinkowa)" -#: ../libgimpbase/gimpbaseenums.c:1433 +#: ../libgimpbase/gimpbaseenums.c:1465 msgctxt "precision" msgid "16-bit linear integer" msgstr "16-bitowa (liniowa, stałoprzecinkowa)" -#: ../libgimpbase/gimpbaseenums.c:1434 +#: ../libgimpbase/gimpbaseenums.c:1466 msgctxt "precision" msgid "16-bit gamma integer" msgstr "16-bitowa (gamma, stałoprzecinkowa)" -#: ../libgimpbase/gimpbaseenums.c:1435 +#: ../libgimpbase/gimpbaseenums.c:1467 msgctxt "precision" msgid "32-bit linear integer" msgstr "32-bitowa (liniowa, stałoprzecinkowa)" -#: ../libgimpbase/gimpbaseenums.c:1436 +#: ../libgimpbase/gimpbaseenums.c:1468 msgctxt "precision" msgid "32-bit gamma integer" msgstr "32-bitowa (gamma, stałoprzecinkowa)" -#: ../libgimpbase/gimpbaseenums.c:1437 +#: ../libgimpbase/gimpbaseenums.c:1469 msgctxt "precision" msgid "16-bit linear floating point" msgstr "16-bitowa (liniowa, zmiennoprzecinkowa)" -#: ../libgimpbase/gimpbaseenums.c:1438 +#: ../libgimpbase/gimpbaseenums.c:1470 msgctxt "precision" msgid "16-bit gamma floating point" msgstr "16-bitowa (gamma, zmiennoprzecinkowa)" -#: ../libgimpbase/gimpbaseenums.c:1439 +#: ../libgimpbase/gimpbaseenums.c:1471 msgctxt "precision" msgid "32-bit linear floating point" msgstr "32-bitowa (liniowa, zmiennoprzecinkowa)" -#: ../libgimpbase/gimpbaseenums.c:1440 +#: ../libgimpbase/gimpbaseenums.c:1472 msgctxt "precision" msgid "32-bit gamma floating point" msgstr "32-bitowa (gamma, zmiennoprzecinkowa)" -#: ../libgimpbase/gimpbaseenums.c:1441 +#: ../libgimpbase/gimpbaseenums.c:1473 msgctxt "precision" msgid "64-bit linear floating point" msgstr "64-bitowa (liniowa, zmiennoprzecinkowa)" -#: ../libgimpbase/gimpbaseenums.c:1442 +#: ../libgimpbase/gimpbaseenums.c:1474 msgctxt "precision" msgid "64-bit gamma floating point" msgstr "64-bitowa (gamma, zmiennoprzecinkowa)" -#: ../libgimpbase/gimpbaseenums.c:1511 +#: ../libgimpbase/gimpbaseenums.c:1543 msgctxt "repeat-mode" msgid "None (extend)" msgstr "Brak (poszerzenie)" -#: ../libgimpbase/gimpbaseenums.c:1512 +#: ../libgimpbase/gimpbaseenums.c:1544 msgctxt "repeat-mode" msgid "Sawtooth wave" msgstr "Fala piłokształtna" -#: ../libgimpbase/gimpbaseenums.c:1513 +#: ../libgimpbase/gimpbaseenums.c:1545 msgctxt "repeat-mode" msgid "Triangular wave" msgstr "Fala trójkątna" -#: ../libgimpbase/gimpbaseenums.c:1514 +#: ../libgimpbase/gimpbaseenums.c:1546 msgctxt "repeat-mode" msgid "Truncate" msgstr "Skrócenie" -#: ../libgimpbase/gimpbaseenums.c:1576 +#: ../libgimpbase/gimpbaseenums.c:1608 msgctxt "run-mode" msgid "Run interactively" msgstr "Uruchom interaktywnie" -#: ../libgimpbase/gimpbaseenums.c:1577 +#: ../libgimpbase/gimpbaseenums.c:1609 msgctxt "run-mode" msgid "Run non-interactively" msgstr "Uruchom wsadowo" -#: ../libgimpbase/gimpbaseenums.c:1578 +#: ../libgimpbase/gimpbaseenums.c:1610 msgctxt "run-mode" msgid "Run with last used values" msgstr "Uruchom z ostatnio użytymi wartościami" -#: ../libgimpbase/gimpbaseenums.c:1616 +#: ../libgimpbase/gimpbaseenums.c:1648 msgctxt "select-criterion" msgid "Composite" msgstr "Zbiorowe" -#: ../libgimpbase/gimpbaseenums.c:1617 +#: ../libgimpbase/gimpbaseenums.c:1649 msgctxt "select-criterion" msgid "Red" msgstr "Czerwone" -#: ../libgimpbase/gimpbaseenums.c:1618 +#: ../libgimpbase/gimpbaseenums.c:1650 msgctxt "select-criterion" msgid "Green" msgstr "Zielone" -#: ../libgimpbase/gimpbaseenums.c:1619 +#: ../libgimpbase/gimpbaseenums.c:1651 msgctxt "select-criterion" msgid "Blue" msgstr "Niebieskie" -#: ../libgimpbase/gimpbaseenums.c:1620 +#: ../libgimpbase/gimpbaseenums.c:1652 msgctxt "select-criterion" msgid "Hue (HSV)" msgstr "Barwa (HSV)" -#: ../libgimpbase/gimpbaseenums.c:1621 +#: ../libgimpbase/gimpbaseenums.c:1653 msgctxt "select-criterion" msgid "Saturation (HSV)" msgstr "Nasycenie (HSV)" -#: ../libgimpbase/gimpbaseenums.c:1622 +#: ../libgimpbase/gimpbaseenums.c:1654 msgctxt "select-criterion" msgid "Value (HSV)" msgstr "Wartość (HSV)" -#: ../libgimpbase/gimpbaseenums.c:1623 +#: ../libgimpbase/gimpbaseenums.c:1655 msgctxt "select-criterion" msgid "Alpha" msgstr "Alfa" -#: ../libgimpbase/gimpbaseenums.c:1624 +#: ../libgimpbase/gimpbaseenums.c:1656 msgctxt "select-criterion" msgid "Lightness (LCH)" msgstr "Jasność (LCH)" -#: ../libgimpbase/gimpbaseenums.c:1625 +#: ../libgimpbase/gimpbaseenums.c:1657 msgctxt "select-criterion" msgid "Chroma (LCH)" msgstr "Nasycenie (LCH)" -#: ../libgimpbase/gimpbaseenums.c:1626 +#: ../libgimpbase/gimpbaseenums.c:1658 msgctxt "select-criterion" msgid "Hue (LCH)" msgstr "Barwa (LCH)" -#: ../libgimpbase/gimpbaseenums.c:1655 +#: ../libgimpbase/gimpbaseenums.c:1687 msgctxt "size-type" msgid "Pixels" msgstr "Piksele" -#: ../libgimpbase/gimpbaseenums.c:1656 +#: ../libgimpbase/gimpbaseenums.c:1688 msgctxt "size-type" msgid "Points" msgstr "Punkty" -#: ../libgimpbase/gimpbaseenums.c:1717 +#: ../libgimpbase/gimpbaseenums.c:1749 msgctxt "stroke-method" msgid "Stroke line" msgstr "Rysowanie linii" -#: ../libgimpbase/gimpbaseenums.c:1718 +#: ../libgimpbase/gimpbaseenums.c:1750 msgctxt "stroke-method" msgid "Stroke with a paint tool" msgstr "Rysowanie za pomocą narzędzia rysowania" -#: ../libgimpbase/gimpbaseenums.c:1747 +#: ../libgimpbase/gimpbaseenums.c:1779 msgctxt "text-direction" msgid "From left to right" msgstr "Od lewej do prawej" -#: ../libgimpbase/gimpbaseenums.c:1748 +#: ../libgimpbase/gimpbaseenums.c:1780 msgctxt "text-direction" msgid "From right to left" msgstr "Od prawej do lewej" -#: ../libgimpbase/gimpbaseenums.c:1779 +#: ../libgimpbase/gimpbaseenums.c:1811 msgctxt "text-hint-style" msgid "None" msgstr "Brak" -#: ../libgimpbase/gimpbaseenums.c:1780 +#: ../libgimpbase/gimpbaseenums.c:1812 msgctxt "text-hint-style" msgid "Slight" msgstr "Lekki" -#: ../libgimpbase/gimpbaseenums.c:1781 +#: ../libgimpbase/gimpbaseenums.c:1813 msgctxt "text-hint-style" msgid "Medium" msgstr "Średni" -#: ../libgimpbase/gimpbaseenums.c:1782 +#: ../libgimpbase/gimpbaseenums.c:1814 msgctxt "text-hint-style" msgid "Full" msgstr "Pełny" -#: ../libgimpbase/gimpbaseenums.c:1813 +#: ../libgimpbase/gimpbaseenums.c:1845 msgctxt "text-justification" msgid "Left justified" msgstr "Wyrównane do lewej" -#: ../libgimpbase/gimpbaseenums.c:1814 +#: ../libgimpbase/gimpbaseenums.c:1846 msgctxt "text-justification" msgid "Right justified" msgstr "Wyrównane do prawej" -#: ../libgimpbase/gimpbaseenums.c:1815 +#: ../libgimpbase/gimpbaseenums.c:1847 msgctxt "text-justification" msgid "Centered" msgstr "Wyśrodkowane" -#: ../libgimpbase/gimpbaseenums.c:1816 +#: ../libgimpbase/gimpbaseenums.c:1848 msgctxt "text-justification" msgid "Filled" msgstr "Wypełnione" -#: ../libgimpbase/gimpbaseenums.c:1846 +#: ../libgimpbase/gimpbaseenums.c:1878 msgctxt "transfer-mode" msgid "Shadows" msgstr "Cienie" -#: ../libgimpbase/gimpbaseenums.c:1847 +#: ../libgimpbase/gimpbaseenums.c:1879 msgctxt "transfer-mode" msgid "Midtones" msgstr "Półtony" -#: ../libgimpbase/gimpbaseenums.c:1848 +#: ../libgimpbase/gimpbaseenums.c:1880 msgctxt "transfer-mode" msgid "Highlights" msgstr "Światła" -#: ../libgimpbase/gimpbaseenums.c:1877 +#: ../libgimpbase/gimpbaseenums.c:1909 msgctxt "transform-direction" msgid "Normal (Forward)" msgstr "Zwykły (przedni)" -#: ../libgimpbase/gimpbaseenums.c:1878 +#: ../libgimpbase/gimpbaseenums.c:1910 msgctxt "transform-direction" msgid "Corrective (Backward)" msgstr "Korekcyjny (tylny)" -#: ../libgimpbase/gimpbaseenums.c:1909 +#: ../libgimpbase/gimpbaseenums.c:1941 msgctxt "transform-resize" msgid "Adjust" msgstr "Dostosowanie" -#: ../libgimpbase/gimpbaseenums.c:1910 +#: ../libgimpbase/gimpbaseenums.c:1942 msgctxt "transform-resize" msgid "Clip" msgstr "Przycięcie" -#: ../libgimpbase/gimpbaseenums.c:1911 +#: ../libgimpbase/gimpbaseenums.c:1943 msgctxt "transform-resize" msgid "Crop to result" msgstr "Kadrowanie do wyniku" -#: ../libgimpbase/gimpbaseenums.c:1912 +#: ../libgimpbase/gimpbaseenums.c:1944 msgctxt "transform-resize" msgid "Crop with aspect" msgstr "Kadrowanie z proporcjami" @@ -1409,52 +1424,57 @@ msgstr "Kadrowanie z proporcjami" msgid "Can load metadata only from local files" msgstr "Można wczytywać metadane tylko z plików lokalnych" -#: ../libgimpbase/gimpmetadata.c:905 +#: ../libgimpbase/gimpmetadata.c:859 +#, c-format +msgid "Conversion of the filename to system codepage failed." +msgstr "Konwersja nazwy pliku na stronę kodową systemu się nie powiodła." + +#: ../libgimpbase/gimpmetadata.c:916 #, c-format msgid "Can save metadata only to local files" msgstr "Można zapisywać metadane tylko do plików lokalnych" -#: ../libgimpbase/gimpmetadata.c:981 +#: ../libgimpbase/gimpmetadata.c:992 #, c-format msgid "Parsing Exif data failed." msgstr "Przetworzenie danych Exif się nie powiodło." -#: ../libgimpbase/gimpmetadata.c:1032 +#: ../libgimpbase/gimpmetadata.c:1043 #, c-format msgid "Parsing IPTC data failed." msgstr "Przetworzenie danych IPTC się nie powiodło." -#: ../libgimpbase/gimpmetadata.c:1081 +#: ../libgimpbase/gimpmetadata.c:1092 #, c-format msgid "Parsing XMP data failed." msgstr "Przetworzenie danych XMP się nie powiodło." -#: ../libgimpbase/gimputils.c:192 ../libgimpbase/gimputils.c:197 +#: ../libgimpbase/gimputils.c:223 ../libgimpbase/gimputils.c:228 msgid "(invalid UTF-8 string)" msgstr "(nieprawidłowy tekst UTF-8)" -#: ../libgimpbase/gimputils.c:367 +#: ../libgimpbase/gimputils.c:398 msgid "File path is NULL" msgstr "Ścieżka do pliku wynosi NULL" -#: ../libgimpbase/gimputils.c:376 ../libgimpbase/gimputils.c:387 +#: ../libgimpbase/gimputils.c:407 ../libgimpbase/gimputils.c:418 msgid "Error converting UTF-8 filename to wide char" msgstr "Błąd podczas konwertowania nazwy pliku UTF-8 do szerokich znaków" -#: ../libgimpbase/gimputils.c:395 +#: ../libgimpbase/gimputils.c:426 msgid "ILCreateFromPath() failed" msgstr "„ILCreateFromPath()” się nie powiodło" -#: ../libgimpbase/gimputils.c:432 +#: ../libgimpbase/gimputils.c:463 #, c-format msgid "Cannot convert '%s' into a valid NSURL." msgstr "Nie można konwertować „%s” na prawidłowe NSURL." -#: ../libgimpbase/gimputils.c:460 +#: ../libgimpbase/gimputils.c:491 msgid "Connecting to org.freedesktop.FileManager1 failed: " msgstr "Połączenie z „org.freedesktop.FileManager1” się nie powiodło: " -#: ../libgimpbase/gimputils.c:484 +#: ../libgimpbase/gimputils.c:515 msgid "Calling ShowItems failed: " msgstr "Wywołanie „ShowItems” się nie powiodło: " @@ -1915,27 +1935,23 @@ msgstr "Producent: " msgid "Copyright: " msgstr "Prawa autorskie: " -#: ../libgimpwidgets/gimpcolorscales.c:204 +#: ../libgimpwidgets/gimpcolorscales.c:205 msgid "Scales" msgstr "Skale" -#: ../libgimpwidgets/gimpcolorscales.c:383 -msgid "RGB" -msgstr "RGB" - -#: ../libgimpwidgets/gimpcolorscales.c:416 +#: ../libgimpwidgets/gimpcolorscales.c:437 msgid "0..100" msgstr "0..100" -#: ../libgimpwidgets/gimpcolorscales.c:418 +#: ../libgimpwidgets/gimpcolorscales.c:439 msgid "0..255" msgstr "0..255" -#: ../libgimpwidgets/gimpcolorscales.c:444 +#: ../libgimpwidgets/gimpcolorscales.c:460 msgid "LCH" msgstr "LCH" -#: ../libgimpwidgets/gimpcolorscales.c:453 +#: ../libgimpwidgets/gimpcolorscales.c:462 msgid "HSV" msgstr "HSV" @@ -2154,7 +2170,7 @@ msgstr "Rozmiar szachownicy" msgid "Check Style" msgstr "Wygląd szachownicy" -#: ../libgimpwidgets/gimppropwidgets.c:2143 +#: ../libgimpwidgets/gimppropwidgets.c:2177 #, c-format msgid "This text input field is limited to %d character." msgid_plural "This text input field is limited to %d characters." diff --git a/po-libgimp/ru.po b/po-libgimp/ru.po index 33638fe733..4f3e27dfc1 100644 --- a/po-libgimp/ru.po +++ b/po-libgimp/ru.po @@ -1,18 +1,17 @@ -# translation of libgimp.pot to Russian +# Translation of GIMP to Russian # Copyright (C) 1999-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # # Valek Filippov , 1999-2002. # Anatoly A. Yakushin , 2003, 2004. # Roxana Kolosova , 2003-2006. -# Александр Прокудин , 2011. -# Alexandre Prokoudine , 2005, 2006, 2009, 2015, 2016, 2017, 2018. +# Alexandre Prokoudine , 2005-2018, 2018. # msgid "" msgstr "" -"Project-Id-Version: libgimp 2.9\n" +"Project-Id-Version: libgimp 2.10rc2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-12 17:04+0300\n" -"PO-Revision-Date: 2018-03-24 01:38+0300\n" +"POT-Creation-Date: 2018-04-15 03:10+0300\n" +"PO-Revision-Date: 2018-04-15 17:34+0300\n" "Last-Translator: Alexandre Prokoudine \n" "Language-Team: русский <>\n" "Language: ru\n" @@ -24,22 +23,22 @@ msgstr "" "X-Generator: Gtranslator 2.91.7\n" #. procedure executed successfully -#: ../libgimp/gimp.c:1206 +#: ../libgimp/gimp.c:1264 msgid "success" msgstr "успешно" #. procedure execution failed -#: ../libgimp/gimp.c:1210 +#: ../libgimp/gimp.c:1268 msgid "execution error" msgstr "ошибка выполнения" #. procedure called incorrectly -#: ../libgimp/gimp.c:1214 +#: ../libgimp/gimp.c:1272 msgid "calling error" msgstr "ошибка вызова" #. procedure execution cancelled -#: ../libgimp/gimp.c:1218 +#: ../libgimp/gimp.c:1276 msgid "cancelled" msgstr "отменено" @@ -187,8 +186,8 @@ msgstr "Подтвердить сохранение" #: ../libgimp/gimpexport.c:447 ../libgimp/gimpexport.c:529 #: ../libgimp/gimpexport.c:1021 ../libgimpwidgets/gimpcolorbutton.c:572 -#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:152 -#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:162 +#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:166 +#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:176 #: ../libgimpwidgets/gimpfileentry.c:435 ../libgimpwidgets/gimpquerybox.c:274 #: ../libgimpwidgets/gimpquerybox.c:334 ../libgimpwidgets/gimpquerybox.c:398 #: ../libgimpwidgets/gimpquerybox.c:472 ../libgimpwidgets/gimpunitmenu.c:492 @@ -259,51 +258,51 @@ msgstr "Выбор шрифта" msgid "Gradient Selection" msgstr "Выбор градиента" -#: ../libgimp/gimpimagemetadata.c:477 +#: ../libgimp/gimpimagemetadata.c:487 msgid "GIMP 2.9/2.10" msgstr "GIMP 2.9/2.10" -#: ../libgimp/gimpimagemetadata.c:661 +#: ../libgimp/gimpimagemetadata.c:671 msgid "Background" msgstr "Фон" -#: ../libgimp/gimpimagemetadata.c:850 +#: ../libgimp/gimpimagemetadata.c:860 #, c-format msgid "Rotate %s?" msgstr "Повернуть %s?" -#: ../libgimp/gimpimagemetadata.c:856 +#: ../libgimp/gimpimagemetadata.c:866 msgid "_Keep Original" msgstr "" -#: ../libgimp/gimpimagemetadata.c:857 ../libgimpwidgets/gimpicons.c:274 +#: ../libgimp/gimpimagemetadata.c:867 ../libgimpwidgets/gimpicons.c:271 msgid "_Rotate" msgstr "_Повернуть" -#: ../libgimp/gimpimagemetadata.c:898 +#: ../libgimp/gimpimagemetadata.c:908 msgid "Original" msgstr "" -#: ../libgimp/gimpimagemetadata.c:914 +#: ../libgimp/gimpimagemetadata.c:924 msgid "Rotated" msgstr "" -#: ../libgimp/gimpimagemetadata.c:932 +#: ../libgimp/gimpimagemetadata.c:942 msgid "This image contains Exif orientation metadata." msgstr "Это изображение содержит метаданные Exif об ориентации." -#: ../libgimp/gimpimagemetadata.c:950 +#: ../libgimp/gimpimagemetadata.c:960 msgid "Would you like to rotate the image?" msgstr "Повернуть изображение?" -#: ../libgimp/gimpimagemetadata.c:962 +#: ../libgimp/gimpimagemetadata.c:972 msgid "_Don't ask me again" msgstr "_Больше не спрашивать" #. This string appears in an empty menu as in #. * "nothing selected and nothing to select" #. -#: ../libgimp/gimpmenu.c:462 ../libgimpwidgets/gimpintstore.c:252 +#: ../libgimp/gimpmenu.c:462 ../libgimpwidgets/gimpintstore.c:253 msgid "(Empty)" msgstr "(Пусто)" @@ -494,10 +493,9 @@ msgid "Circle" msgstr "Окружность" #: ../libgimpbase/gimpbaseenums.c:99 -#, fuzzy msgctxt "brush-generated-shape" msgid "Square" -msgstr "Квадратная" +msgstr "Квадрат" #: ../libgimpbase/gimpbaseenums.c:100 msgctxt "brush-generated-shape" @@ -758,7 +756,7 @@ msgstr "Яркость" #: ../libgimpbase/gimpbaseenums.c:516 msgctxt "desaturate-mode" msgid "Average (HSI Intensity)" -msgstr "" +msgstr "Среднее (интенсивность по HSI)" #: ../libgimpbase/gimpbaseenums.c:517 msgctxt "desaturate-mode" @@ -806,626 +804,703 @@ msgid "Pattern" msgstr "Текстура" #: ../libgimpbase/gimpbaseenums.c:644 +msgctxt "gradient-blend-color-space" +msgid "Perceptual RGB" +msgstr "Нелинейное, RGB" + +#: ../libgimpbase/gimpbaseenums.c:645 +msgctxt "gradient-blend-color-space" +msgid "Linear RGB" +msgstr "Линейное, RGB" + +#: ../libgimpbase/gimpbaseenums.c:646 +msgctxt "gradient-blend-color-space" +msgid "CIE Lab" +msgstr "CIE LAB" + +#: ../libgimpbase/gimpbaseenums.c:676 msgctxt "gradient-segment-color" msgid "RGB" msgstr "RGB" -#: ../libgimpbase/gimpbaseenums.c:645 +#: ../libgimpbase/gimpbaseenums.c:677 +msgctxt "gradient-segment-color" +msgid "HSV (counter-clockwise hue)" +msgstr "HSV (тон против часовой стрелки)" + +#. Translators: this is an abbreviated version of "HSV (counter-clockwise hue)". +#. Keep it short. +#: ../libgimpbase/gimpbaseenums.c:680 msgctxt "gradient-segment-color" msgid "HSV (ccw)" msgstr "HSV (против часовой стрелки)" -#: ../libgimpbase/gimpbaseenums.c:646 +#: ../libgimpbase/gimpbaseenums.c:681 +msgctxt "gradient-segment-color" +msgid "HSV (clockwise hue)" +msgstr "HSV (тон по часовой стрелке)" + +#. Translators: this is an abbreviated version of "HSV (clockwise hue)". +#. Keep it short. +#: ../libgimpbase/gimpbaseenums.c:684 msgctxt "gradient-segment-color" msgid "HSV (cw)" msgstr "HSV (по часовой стрелке)" -#: ../libgimpbase/gimpbaseenums.c:678 -#, fuzzy +#: ../libgimpbase/gimpbaseenums.c:716 msgctxt "gradient-segment-type" msgid "Linear" -msgstr "Линейная" +msgstr "Линейное" -#: ../libgimpbase/gimpbaseenums.c:679 +#: ../libgimpbase/gimpbaseenums.c:717 msgctxt "gradient-segment-type" msgid "Curved" msgstr "" -#: ../libgimpbase/gimpbaseenums.c:680 +#: ../libgimpbase/gimpbaseenums.c:718 msgctxt "gradient-segment-type" msgid "Sinusoidal" -msgstr "" +msgstr "По синусоиде" -#: ../libgimpbase/gimpbaseenums.c:681 +#: ../libgimpbase/gimpbaseenums.c:719 +#, fuzzy +msgctxt "gradient-segment-type" +msgid "Spherical (increasing)" +msgstr "Спираль (CW)" + +#. Translators: this is an abbreviated version of "Spherical (increasing)". +#. Keep it short. +#: ../libgimpbase/gimpbaseenums.c:722 #, fuzzy msgctxt "gradient-segment-type" msgid "Spherical (inc)" msgstr "Спираль (CW)" -#: ../libgimpbase/gimpbaseenums.c:682 +#: ../libgimpbase/gimpbaseenums.c:723 +#, fuzzy +msgctxt "gradient-segment-type" +msgid "Spherical (decreasing)" +msgstr "Спираль (CW)" + +#. Translators: this is an abbreviated version of "Spherical (decreasing)". +#. Keep it short. +#: ../libgimpbase/gimpbaseenums.c:726 #, fuzzy msgctxt "gradient-segment-type" msgid "Spherical (dec)" msgstr "Спираль (CW)" -#: ../libgimpbase/gimpbaseenums.c:720 +#: ../libgimpbase/gimpbaseenums.c:764 msgctxt "gradient-type" msgid "Linear" msgstr "Линейная" -#: ../libgimpbase/gimpbaseenums.c:721 +#: ../libgimpbase/gimpbaseenums.c:765 msgctxt "gradient-type" msgid "Bi-linear" msgstr "Билинейная" -#: ../libgimpbase/gimpbaseenums.c:722 +#: ../libgimpbase/gimpbaseenums.c:766 msgctxt "gradient-type" msgid "Radial" msgstr "Радиальная" -#: ../libgimpbase/gimpbaseenums.c:723 +#: ../libgimpbase/gimpbaseenums.c:767 msgctxt "gradient-type" msgid "Square" msgstr "Квадратная" -#: ../libgimpbase/gimpbaseenums.c:724 +#: ../libgimpbase/gimpbaseenums.c:768 +msgctxt "gradient-type" +msgid "Conical (symmetric)" +msgstr "Коническая (симметричная)" + +#. Translators: this is an abbreviated version of "Conical (symmetric)". +#. Keep it short. +#: ../libgimpbase/gimpbaseenums.c:771 msgctxt "gradient-type" msgid "Conical (sym)" msgstr "Коническая (симм.)" -#: ../libgimpbase/gimpbaseenums.c:725 +#: ../libgimpbase/gimpbaseenums.c:772 +msgctxt "gradient-type" +msgid "Conical (asymmetric)" +msgstr "Коническая (асимметричная)" + +#. Translators: this is an abbreviated version of "Conical (asymmetric)". +#. Keep it short. +#: ../libgimpbase/gimpbaseenums.c:775 msgctxt "gradient-type" msgid "Conical (asym)" msgstr "Коническая (асимм.)" -#: ../libgimpbase/gimpbaseenums.c:726 +#: ../libgimpbase/gimpbaseenums.c:776 msgctxt "gradient-type" msgid "Shaped (angular)" msgstr "Очертания (угловая)" -#: ../libgimpbase/gimpbaseenums.c:727 +#: ../libgimpbase/gimpbaseenums.c:777 msgctxt "gradient-type" msgid "Shaped (spherical)" msgstr "Очертания (сфера)" -#: ../libgimpbase/gimpbaseenums.c:728 +#: ../libgimpbase/gimpbaseenums.c:778 msgctxt "gradient-type" msgid "Shaped (dimpled)" msgstr "Очертания (рябь)" -#: ../libgimpbase/gimpbaseenums.c:729 +#: ../libgimpbase/gimpbaseenums.c:779 +msgctxt "gradient-type" +msgid "Spiral (clockwise)" +msgstr "Спираль (по часовой стрелке)" + +#. Translators: this is an abbreviated version of "Spiral (clockwise)". +#. Keep it short. +#: ../libgimpbase/gimpbaseenums.c:782 msgctxt "gradient-type" msgid "Spiral (cw)" -msgstr "Спираль (CW)" +msgstr "Спираль (по ЧС)" -#: ../libgimpbase/gimpbaseenums.c:730 +#: ../libgimpbase/gimpbaseenums.c:783 +msgctxt "gradient-type" +msgid "Spiral (counter-clockwise)" +msgstr "Спираль (против часовой стрелки)" + +#. Translators: this is an abbreviated version of "Spiral (counter-clockwise)". +#. Keep it short. +#: ../libgimpbase/gimpbaseenums.c:786 msgctxt "gradient-type" msgid "Spiral (ccw)" -msgstr "Спираль (CCW)" +msgstr "Спираль (пр. ЧС)" -#: ../libgimpbase/gimpbaseenums.c:762 +#: ../libgimpbase/gimpbaseenums.c:818 msgctxt "grid-style" msgid "Intersections (dots)" msgstr "Пересечения (точки)" -#: ../libgimpbase/gimpbaseenums.c:763 +#: ../libgimpbase/gimpbaseenums.c:819 msgctxt "grid-style" msgid "Intersections (crosshairs)" msgstr "Пересечения (перекрестья)" -#: ../libgimpbase/gimpbaseenums.c:764 +#: ../libgimpbase/gimpbaseenums.c:820 msgctxt "grid-style" msgid "Dashed" msgstr "Пунктир" -#: ../libgimpbase/gimpbaseenums.c:765 +#: ../libgimpbase/gimpbaseenums.c:821 msgctxt "grid-style" msgid "Double dashed" msgstr "Двойной пунктир" -#: ../libgimpbase/gimpbaseenums.c:766 +#: ../libgimpbase/gimpbaseenums.c:822 msgctxt "grid-style" msgid "Solid" msgstr "Цельная линия" -#: ../libgimpbase/gimpbaseenums.c:836 +#: ../libgimpbase/gimpbaseenums.c:892 msgctxt "icon-type" msgid "Icon name" msgstr "Название значка" -#: ../libgimpbase/gimpbaseenums.c:837 +#: ../libgimpbase/gimpbaseenums.c:893 msgctxt "icon-type" msgid "Inline pixbuf" msgstr "Внутристрочное изображение" -#: ../libgimpbase/gimpbaseenums.c:838 +#: ../libgimpbase/gimpbaseenums.c:894 msgctxt "icon-type" msgid "Image file" msgstr "Файл изображения" -#: ../libgimpbase/gimpbaseenums.c:868 +#: ../libgimpbase/gimpbaseenums.c:924 msgctxt "image-base-type" msgid "RGB color" msgstr "Цвета RGB" -#: ../libgimpbase/gimpbaseenums.c:869 +#: ../libgimpbase/gimpbaseenums.c:925 msgctxt "image-base-type" msgid "Grayscale" msgstr "Градации серого" -#: ../libgimpbase/gimpbaseenums.c:870 +#: ../libgimpbase/gimpbaseenums.c:926 msgctxt "image-base-type" msgid "Indexed color" msgstr "Индексированный цвет" -#: ../libgimpbase/gimpbaseenums.c:903 +#: ../libgimpbase/gimpbaseenums.c:959 msgctxt "image-type" msgid "RGB" msgstr "RGB" -#: ../libgimpbase/gimpbaseenums.c:904 +#: ../libgimpbase/gimpbaseenums.c:960 msgctxt "image-type" msgid "RGB-alpha" msgstr "RGB + альфа" -#: ../libgimpbase/gimpbaseenums.c:905 +#: ../libgimpbase/gimpbaseenums.c:961 msgctxt "image-type" msgid "Grayscale" msgstr "Градации серого" -#: ../libgimpbase/gimpbaseenums.c:906 +#: ../libgimpbase/gimpbaseenums.c:962 msgctxt "image-type" msgid "Grayscale-alpha" msgstr "Градации серого + альфа" -#: ../libgimpbase/gimpbaseenums.c:907 +#: ../libgimpbase/gimpbaseenums.c:963 msgctxt "image-type" msgid "Indexed" msgstr "Индексированный" -#: ../libgimpbase/gimpbaseenums.c:908 +#: ../libgimpbase/gimpbaseenums.c:964 msgctxt "image-type" msgid "Indexed-alpha" msgstr "Индексированный + альфа" -#: ../libgimpbase/gimpbaseenums.c:938 +#: ../libgimpbase/gimpbaseenums.c:994 msgctxt "ink-blob-type" msgid "Circle" msgstr "Окружность" -#: ../libgimpbase/gimpbaseenums.c:939 +#: ../libgimpbase/gimpbaseenums.c:995 #, fuzzy msgctxt "ink-blob-type" msgid "Square" msgstr "Квадратная" -#: ../libgimpbase/gimpbaseenums.c:940 +#: ../libgimpbase/gimpbaseenums.c:996 msgctxt "ink-blob-type" msgid "Diamond" msgstr "Ромб" -#: ../libgimpbase/gimpbaseenums.c:972 +#: ../libgimpbase/gimpbaseenums.c:1028 msgctxt "interpolation-type" msgid "None" msgstr "Нет" -#: ../libgimpbase/gimpbaseenums.c:973 +#: ../libgimpbase/gimpbaseenums.c:1029 msgctxt "interpolation-type" msgid "Linear" msgstr "Линейная" -#: ../libgimpbase/gimpbaseenums.c:974 +#: ../libgimpbase/gimpbaseenums.c:1030 msgctxt "interpolation-type" msgid "Cubic" msgstr "Кубическая" -#: ../libgimpbase/gimpbaseenums.c:975 +#: ../libgimpbase/gimpbaseenums.c:1031 msgctxt "interpolation-type" msgid "NoHalo" -msgstr "" +msgstr "Без гало" -#: ../libgimpbase/gimpbaseenums.c:976 +#: ../libgimpbase/gimpbaseenums.c:1032 msgctxt "interpolation-type" msgid "LoHalo" -msgstr "" +msgstr "Мало гало" -#: ../libgimpbase/gimpbaseenums.c:1006 +#: ../libgimpbase/gimpbaseenums.c:1062 msgctxt "join-style" msgid "Miter" msgstr "" -#: ../libgimpbase/gimpbaseenums.c:1007 +#: ../libgimpbase/gimpbaseenums.c:1063 msgctxt "join-style" msgid "Round" msgstr "" -#: ../libgimpbase/gimpbaseenums.c:1008 +#: ../libgimpbase/gimpbaseenums.c:1064 msgctxt "join-style" msgid "Bevel" msgstr "" -#: ../libgimpbase/gimpbaseenums.c:1069 +#: ../libgimpbase/gimpbaseenums.c:1125 msgctxt "merge-type" msgid "Expanded as necessary" msgstr "Расширен при необходимости" -#: ../libgimpbase/gimpbaseenums.c:1070 +#: ../libgimpbase/gimpbaseenums.c:1126 msgctxt "merge-type" msgid "Clipped to image" msgstr "Обрезан до размера изображения" -#: ../libgimpbase/gimpbaseenums.c:1071 +#: ../libgimpbase/gimpbaseenums.c:1127 msgctxt "merge-type" msgid "Clipped to bottom layer" msgstr "Обрезан до размера нижнего слоя" -#: ../libgimpbase/gimpbaseenums.c:1072 +#: ../libgimpbase/gimpbaseenums.c:1128 #, fuzzy msgctxt "merge-type" msgid "Flatten" msgstr "Текстура" -#: ../libgimpbase/gimpbaseenums.c:1164 +#: ../libgimpbase/gimpbaseenums.c:1220 msgctxt "orientation-type" msgid "Horizontal" msgstr "По горизонтали" -#: ../libgimpbase/gimpbaseenums.c:1165 +#: ../libgimpbase/gimpbaseenums.c:1221 msgctxt "orientation-type" msgid "Vertical" msgstr "По вертикали" -#: ../libgimpbase/gimpbaseenums.c:1166 +#: ../libgimpbase/gimpbaseenums.c:1222 msgctxt "orientation-type" msgid "Unknown" msgstr "" -#: ../libgimpbase/gimpbaseenums.c:1195 +#: ../libgimpbase/gimpbaseenums.c:1251 msgctxt "paint-application-mode" msgid "Constant" msgstr "Константа" -#: ../libgimpbase/gimpbaseenums.c:1196 +#: ../libgimpbase/gimpbaseenums.c:1252 msgctxt "paint-application-mode" msgid "Incremental" msgstr "Постепенная" -#: ../libgimpbase/gimpbaseenums.c:1329 +#: ../libgimpbase/gimpbaseenums.c:1385 msgctxt "pdb-proc-type" msgid "Internal GIMP procedure" msgstr "Внутренняя процедура GIMP" -#: ../libgimpbase/gimpbaseenums.c:1330 +#: ../libgimpbase/gimpbaseenums.c:1386 msgctxt "pdb-proc-type" msgid "GIMP Plug-In" msgstr "Модуль GIMP" -#: ../libgimpbase/gimpbaseenums.c:1331 +#: ../libgimpbase/gimpbaseenums.c:1387 msgctxt "pdb-proc-type" msgid "GIMP Extension" msgstr "Расширение GIMP" -#: ../libgimpbase/gimpbaseenums.c:1332 +#: ../libgimpbase/gimpbaseenums.c:1388 msgctxt "pdb-proc-type" msgid "Temporary Procedure" msgstr "Временная процедура" -#: ../libgimpbase/gimpbaseenums.c:1407 +#: ../libgimpbase/gimpbaseenums.c:1463 msgctxt "precision" msgid "8-bit linear integer" msgstr "" -#: ../libgimpbase/gimpbaseenums.c:1408 +#: ../libgimpbase/gimpbaseenums.c:1464 msgctxt "precision" msgid "8-bit gamma integer" msgstr "" -#: ../libgimpbase/gimpbaseenums.c:1409 +#: ../libgimpbase/gimpbaseenums.c:1465 msgctxt "precision" msgid "16-bit linear integer" msgstr "" -#: ../libgimpbase/gimpbaseenums.c:1410 +#: ../libgimpbase/gimpbaseenums.c:1466 msgctxt "precision" msgid "16-bit gamma integer" msgstr "" -#: ../libgimpbase/gimpbaseenums.c:1411 +#: ../libgimpbase/gimpbaseenums.c:1467 msgctxt "precision" msgid "32-bit linear integer" msgstr "" -#: ../libgimpbase/gimpbaseenums.c:1412 +#: ../libgimpbase/gimpbaseenums.c:1468 msgctxt "precision" msgid "32-bit gamma integer" msgstr "" -#: ../libgimpbase/gimpbaseenums.c:1413 +#: ../libgimpbase/gimpbaseenums.c:1469 msgctxt "precision" msgid "16-bit linear floating point" msgstr "" -#: ../libgimpbase/gimpbaseenums.c:1414 +#: ../libgimpbase/gimpbaseenums.c:1470 msgctxt "precision" msgid "16-bit gamma floating point" msgstr "" -#: ../libgimpbase/gimpbaseenums.c:1415 +#: ../libgimpbase/gimpbaseenums.c:1471 msgctxt "precision" msgid "32-bit linear floating point" msgstr "" -#: ../libgimpbase/gimpbaseenums.c:1416 +#: ../libgimpbase/gimpbaseenums.c:1472 msgctxt "precision" msgid "32-bit gamma floating point" msgstr "" -#: ../libgimpbase/gimpbaseenums.c:1417 +#: ../libgimpbase/gimpbaseenums.c:1473 msgctxt "precision" msgid "64-bit linear floating point" msgstr "" -#: ../libgimpbase/gimpbaseenums.c:1418 +#: ../libgimpbase/gimpbaseenums.c:1474 msgctxt "precision" msgid "64-bit gamma floating point" msgstr "" -#: ../libgimpbase/gimpbaseenums.c:1487 +#: ../libgimpbase/gimpbaseenums.c:1543 msgctxt "repeat-mode" msgid "None (extend)" msgstr "Нет, расширить" -#: ../libgimpbase/gimpbaseenums.c:1488 +#: ../libgimpbase/gimpbaseenums.c:1544 msgctxt "repeat-mode" msgid "Sawtooth wave" msgstr "Зубцевидная волна" -#: ../libgimpbase/gimpbaseenums.c:1489 +#: ../libgimpbase/gimpbaseenums.c:1545 msgctxt "repeat-mode" msgid "Triangular wave" msgstr "Треугольная волна" -#: ../libgimpbase/gimpbaseenums.c:1490 +#: ../libgimpbase/gimpbaseenums.c:1546 msgctxt "repeat-mode" msgid "Truncate" msgstr "Обрезать" -#: ../libgimpbase/gimpbaseenums.c:1552 +#: ../libgimpbase/gimpbaseenums.c:1608 msgctxt "run-mode" msgid "Run interactively" msgstr "Запустить интерактивно" -#: ../libgimpbase/gimpbaseenums.c:1553 +#: ../libgimpbase/gimpbaseenums.c:1609 msgctxt "run-mode" msgid "Run non-interactively" msgstr "Запустить неинтерактивно" -#: ../libgimpbase/gimpbaseenums.c:1554 +#: ../libgimpbase/gimpbaseenums.c:1610 msgctxt "run-mode" msgid "Run with last used values" msgstr "Запустить с последними введёнными значениями" -#: ../libgimpbase/gimpbaseenums.c:1592 +#: ../libgimpbase/gimpbaseenums.c:1648 msgctxt "select-criterion" msgid "Composite" msgstr "Композитный цвет" -#: ../libgimpbase/gimpbaseenums.c:1593 +#: ../libgimpbase/gimpbaseenums.c:1649 msgctxt "select-criterion" msgid "Red" msgstr "Красный" -#: ../libgimpbase/gimpbaseenums.c:1594 +#: ../libgimpbase/gimpbaseenums.c:1650 msgctxt "select-criterion" msgid "Green" msgstr "Зелёный" -#: ../libgimpbase/gimpbaseenums.c:1595 +#: ../libgimpbase/gimpbaseenums.c:1651 msgctxt "select-criterion" msgid "Blue" msgstr "Синий" -#: ../libgimpbase/gimpbaseenums.c:1596 +#: ../libgimpbase/gimpbaseenums.c:1652 msgctxt "select-criterion" msgid "Hue (HSV)" msgstr "Тон (HSV)" -#: ../libgimpbase/gimpbaseenums.c:1597 +#: ../libgimpbase/gimpbaseenums.c:1653 msgctxt "select-criterion" msgid "Saturation (HSV)" msgstr "Насыщенность (HSV)" -#: ../libgimpbase/gimpbaseenums.c:1598 +#: ../libgimpbase/gimpbaseenums.c:1654 msgctxt "select-criterion" msgid "Value (HSV)" msgstr "Значение (HSV)" -#: ../libgimpbase/gimpbaseenums.c:1599 +#: ../libgimpbase/gimpbaseenums.c:1655 msgctxt "select-criterion" msgid "Alpha" msgstr "Альфа" -#: ../libgimpbase/gimpbaseenums.c:1600 +#: ../libgimpbase/gimpbaseenums.c:1656 msgctxt "select-criterion" msgid "Lightness (LCH)" msgstr "Освещенность (LCH)" -#: ../libgimpbase/gimpbaseenums.c:1601 +#: ../libgimpbase/gimpbaseenums.c:1657 msgctxt "select-criterion" msgid "Chroma (LCH)" msgstr "Цветность (LCH)" -#: ../libgimpbase/gimpbaseenums.c:1602 +#: ../libgimpbase/gimpbaseenums.c:1658 msgctxt "select-criterion" msgid "Hue (LCH)" msgstr "Тон (LCH)" -#: ../libgimpbase/gimpbaseenums.c:1631 +#: ../libgimpbase/gimpbaseenums.c:1687 msgctxt "size-type" msgid "Pixels" msgstr "Точек растра" -#: ../libgimpbase/gimpbaseenums.c:1632 +#: ../libgimpbase/gimpbaseenums.c:1688 msgctxt "size-type" msgid "Points" msgstr "Пунктов" -#: ../libgimpbase/gimpbaseenums.c:1693 +#: ../libgimpbase/gimpbaseenums.c:1749 msgctxt "stroke-method" msgid "Stroke line" msgstr "" -#: ../libgimpbase/gimpbaseenums.c:1694 +#: ../libgimpbase/gimpbaseenums.c:1750 msgctxt "stroke-method" msgid "Stroke with a paint tool" msgstr "" -#: ../libgimpbase/gimpbaseenums.c:1723 +#: ../libgimpbase/gimpbaseenums.c:1779 msgctxt "text-direction" msgid "From left to right" msgstr "Слева направо" -#: ../libgimpbase/gimpbaseenums.c:1724 +#: ../libgimpbase/gimpbaseenums.c:1780 msgctxt "text-direction" msgid "From right to left" msgstr "Справа налево" -#: ../libgimpbase/gimpbaseenums.c:1755 +#: ../libgimpbase/gimpbaseenums.c:1811 msgctxt "text-hint-style" msgid "None" msgstr "Без" -#: ../libgimpbase/gimpbaseenums.c:1756 +#: ../libgimpbase/gimpbaseenums.c:1812 msgctxt "text-hint-style" msgid "Slight" msgstr "Слабое" -#: ../libgimpbase/gimpbaseenums.c:1757 +#: ../libgimpbase/gimpbaseenums.c:1813 msgctxt "text-hint-style" msgid "Medium" msgstr "Среднее" -#: ../libgimpbase/gimpbaseenums.c:1758 +#: ../libgimpbase/gimpbaseenums.c:1814 msgctxt "text-hint-style" msgid "Full" msgstr "Полное" -#: ../libgimpbase/gimpbaseenums.c:1789 +#: ../libgimpbase/gimpbaseenums.c:1845 msgctxt "text-justification" msgid "Left justified" msgstr "Выключка влево" -#: ../libgimpbase/gimpbaseenums.c:1790 +#: ../libgimpbase/gimpbaseenums.c:1846 msgctxt "text-justification" msgid "Right justified" msgstr "Выключка вправо" -#: ../libgimpbase/gimpbaseenums.c:1791 +#: ../libgimpbase/gimpbaseenums.c:1847 msgctxt "text-justification" msgid "Centered" msgstr "Выключка по центру" -#: ../libgimpbase/gimpbaseenums.c:1792 +#: ../libgimpbase/gimpbaseenums.c:1848 msgctxt "text-justification" msgid "Filled" msgstr "Полная выключка" -#: ../libgimpbase/gimpbaseenums.c:1822 +#: ../libgimpbase/gimpbaseenums.c:1878 msgctxt "transfer-mode" msgid "Shadows" msgstr "Тени" -#: ../libgimpbase/gimpbaseenums.c:1823 +#: ../libgimpbase/gimpbaseenums.c:1879 msgctxt "transfer-mode" msgid "Midtones" msgstr "Полутона" -#: ../libgimpbase/gimpbaseenums.c:1824 +#: ../libgimpbase/gimpbaseenums.c:1880 msgctxt "transfer-mode" msgid "Highlights" msgstr "Светлые части" -#: ../libgimpbase/gimpbaseenums.c:1853 +#: ../libgimpbase/gimpbaseenums.c:1909 msgctxt "transform-direction" msgid "Normal (Forward)" msgstr "Обычное (вперед)" -#: ../libgimpbase/gimpbaseenums.c:1854 +#: ../libgimpbase/gimpbaseenums.c:1910 msgctxt "transform-direction" msgid "Corrective (Backward)" msgstr "Корректирующее (назад)" -#: ../libgimpbase/gimpbaseenums.c:1885 +#: ../libgimpbase/gimpbaseenums.c:1941 msgctxt "transform-resize" msgid "Adjust" msgstr "С полями" -#: ../libgimpbase/gimpbaseenums.c:1886 +#: ../libgimpbase/gimpbaseenums.c:1942 msgctxt "transform-resize" msgid "Clip" msgstr "Без полей" -#: ../libgimpbase/gimpbaseenums.c:1887 +#: ../libgimpbase/gimpbaseenums.c:1943 msgctxt "transform-resize" msgid "Crop to result" msgstr "В прямоугольник" -#: ../libgimpbase/gimpbaseenums.c:1888 +#: ../libgimpbase/gimpbaseenums.c:1944 msgctxt "transform-resize" msgid "Crop with aspect" msgstr "Пропорциональная" -#: ../libgimpbase/gimpmetadata.c:840 +#: ../libgimpbase/gimpmetadata.c:845 #, c-format msgid "Can load metadata only from local files" +msgstr "Загружать метаданные можно только из локальных файлов" + +#: ../libgimpbase/gimpmetadata.c:859 +#, c-format +msgid "Conversion of the filename to system codepage failed." msgstr "" -#: ../libgimpbase/gimpmetadata.c:900 +#: ../libgimpbase/gimpmetadata.c:916 #, c-format msgid "Can save metadata only to local files" -msgstr "" +msgstr "Метаданные можно сохранять только в локальные файлы" -#: ../libgimpbase/gimpmetadata.c:976 +#: ../libgimpbase/gimpmetadata.c:992 #, c-format msgid "Parsing Exif data failed." msgstr "Не удалось разобрать данные Exif." -#: ../libgimpbase/gimpmetadata.c:1027 -#, fuzzy, c-format +#: ../libgimpbase/gimpmetadata.c:1043 +#, c-format msgid "Parsing IPTC data failed." -msgstr "Не удалось разобрать данные XMP." +msgstr "Не удалось разобрать данные IPTC." -#: ../libgimpbase/gimpmetadata.c:1076 +#: ../libgimpbase/gimpmetadata.c:1092 #, c-format msgid "Parsing XMP data failed." msgstr "Не удалось разобрать данные XMP." -#: ../libgimpbase/gimputils.c:192 ../libgimpbase/gimputils.c:197 +#: ../libgimpbase/gimputils.c:223 ../libgimpbase/gimputils.c:228 msgid "(invalid UTF-8 string)" msgstr "(некорректная строка в UTF-8)" -#: ../libgimpbase/gimputils.c:367 +#: ../libgimpbase/gimputils.c:398 msgid "File path is NULL" msgstr "" -#: ../libgimpbase/gimputils.c:376 ../libgimpbase/gimputils.c:387 +#: ../libgimpbase/gimputils.c:407 ../libgimpbase/gimputils.c:418 msgid "Error converting UTF-8 filename to wide char" msgstr "" -#: ../libgimpbase/gimputils.c:395 +#: ../libgimpbase/gimputils.c:426 msgid "ILCreateFromPath() failed" msgstr "" -#: ../libgimpbase/gimputils.c:432 +#: ../libgimpbase/gimputils.c:463 #, c-format msgid "Cannot convert '%s' into a valid NSURL." msgstr "" -#: ../libgimpbase/gimputils.c:460 +#: ../libgimpbase/gimputils.c:491 msgid "Connecting to org.freedesktop.FileManager1 failed: " msgstr "" -#: ../libgimpbase/gimputils.c:484 +#: ../libgimpbase/gimputils.c:515 msgid "Calling ShowItems failed: " msgstr "" @@ -1505,7 +1580,7 @@ msgstr "Абсолютная колориметрическая" #. * #: ../libgimpconfig/gimpcolorconfig.c:52 msgid "How images are displayed on screen." -msgstr "" +msgstr "Как изображения показываются на экране." #: ../libgimpconfig/gimpcolorconfig.c:55 msgid "The color profile of your (primary) monitor." @@ -1631,7 +1706,7 @@ msgstr "Использовать компенсацию чёрной точки #: ../libgimpconfig/gimpcolorconfig.c:265 msgid "Optimize display color transformations" -msgstr "" +msgstr "Оптимизировать трансформации цвета для отображения" #: ../libgimpconfig/gimpcolorconfig.c:272 msgid "Soft-proofing rendering intent" @@ -1643,7 +1718,7 @@ msgstr "Использовать компенсацию чёрной точки #: ../libgimpconfig/gimpcolorconfig.c:287 msgid "Optimize soft-proofing color transformations" -msgstr "" +msgstr "Оптимизировать трансформации цвета для программной цветопробы" #: ../libgimpconfig/gimpcolorconfig.c:294 msgid "Mark out of gamut colors" @@ -1698,8 +1773,8 @@ msgstr "неверное значение '%ld' для маркёра %s" msgid "while parsing token '%s': %s" msgstr "при синтаксическом разборе маркёра '%s': %s" -#: ../libgimpconfig/gimpconfig-iface.c:658 -#: ../libgimpconfig/gimpconfig-iface.c:671 ../libgimpconfig/gimpscanner.c:742 +#: ../libgimpconfig/gimpconfig-iface.c:662 +#: ../libgimpconfig/gimpconfig-iface.c:675 ../libgimpconfig/gimpscanner.c:742 #: ../libgimpconfig/gimpscanner.c:824 #: ../libgimpwidgets/gimpcolorprofilestore.c:710 msgid "fatal parse error" @@ -1827,28 +1902,28 @@ msgstr "_Сбросить" msgid "_OK" msgstr "_OK" -#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:94 +#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:101 msgid "All files (*.*)" msgstr "Все файлы (*.*)" -#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:99 +#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:106 msgid "ICC color profile (*.icc, *.icm)" msgstr "Цветовой ICC-профиль (*.icc, *.icm)" -#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:153 +#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:167 msgid "_Save" msgstr "_Сохранить" -#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:163 +#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:177 msgid "_Open" msgstr "_Открыть" -#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:325 +#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:339 #: ../libgimpwidgets/gimppatheditor.c:270 msgid "Folder" msgstr "Папка" -#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:330 +#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:344 msgid "Not a regular file." msgstr "" @@ -1869,10 +1944,26 @@ msgstr "Производитель: " msgid "Copyright: " msgstr "Авторские права: " -#: ../libgimpwidgets/gimpcolorscales.c:122 +#: ../libgimpwidgets/gimpcolorscales.c:205 msgid "Scales" msgstr "Шкала" +#: ../libgimpwidgets/gimpcolorscales.c:437 +msgid "0..100" +msgstr "0..100" + +#: ../libgimpwidgets/gimpcolorscales.c:439 +msgid "0..255" +msgstr "0..255" + +#: ../libgimpwidgets/gimpcolorscales.c:460 +msgid "LCH" +msgstr "LCH" + +#: ../libgimpwidgets/gimpcolorscales.c:462 +msgid "HSV" +msgstr "HSV" + #: ../libgimpwidgets/gimpcolorselection.c:222 msgid "Current:" msgstr "Текущий:" @@ -1911,11 +2002,11 @@ msgstr "Откройте диалог для просмотра файлов" #: ../libgimpwidgets/gimpfileentry.c:236 msgid "Indicates whether or not the folder exists" -msgstr "" +msgstr "Показывает, существует ли эта папка" #: ../libgimpwidgets/gimpfileentry.c:237 msgid "Indicates whether or not the file exists" -msgstr "" +msgstr "Показывает, существует ли этот файл" #: ../libgimpwidgets/gimpfileentry.c:397 #, c-format @@ -1978,23 +2069,23 @@ msgstr "_Интерлиньяж" msgid "Re_size" msgstr "_Изменить" -#: ../libgimpwidgets/gimpicons.c:140 ../libgimpwidgets/gimpicons.c:275 +#: ../libgimpwidgets/gimpicons.c:140 ../libgimpwidgets/gimpicons.c:272 msgid "_Scale" msgstr "Из_менить" -#: ../libgimpwidgets/gimpicons.c:250 +#: ../libgimpwidgets/gimpicons.c:247 msgid "Cr_op" msgstr "_Обрезать" -#: ../libgimpwidgets/gimpicons.c:258 +#: ../libgimpwidgets/gimpicons.c:255 msgid "_Select" msgstr "В_ыбрать" -#: ../libgimpwidgets/gimpicons.c:270 +#: ../libgimpwidgets/gimpicons.c:267 msgid "_Transform" msgstr "_Преобразовать" -#: ../libgimpwidgets/gimpicons.c:276 +#: ../libgimpwidgets/gimpicons.c:273 msgid "_Shear" msgstr "Н_аклонить" @@ -2067,7 +2158,7 @@ msgstr "Удалить выбранную папку из списка" msgid "Writable" msgstr "Запись" -#: ../libgimpwidgets/gimppickbutton.c:110 +#: ../libgimpwidgets/gimppickbutton.c:112 msgid "" "Click the eyedropper, then click a color anywhere on your screen to select " "that color." @@ -2087,7 +2178,7 @@ msgstr "Размер клеток" msgid "Check Style" msgstr "Стиль клеток" -#: ../libgimpwidgets/gimppropwidgets.c:2143 +#: ../libgimpwidgets/gimppropwidgets.c:2177 #, c-format msgid "This text input field is limited to %d character." msgid_plural "This text input field is limited to %d characters." @@ -2229,14 +2320,13 @@ msgstr "Альфа" #: ../libgimpwidgets/gimpwidgetsenums.c:136 msgctxt "color-selector-channel" msgid "_L" -msgstr "" +msgstr "_L" #: ../libgimpwidgets/gimpwidgetsenums.c:136 msgid "LCH Lightness" msgstr "Освещенность в LCH" #: ../libgimpwidgets/gimpwidgetsenums.c:137 -#, fuzzy msgctxt "color-selector-channel" msgid "_C" msgstr "_C" @@ -2249,22 +2339,49 @@ msgstr "Цветность в LCH" msgid "LCH Hue" msgstr "Тон в LCH" -#: ../libgimpwidgets/gimpwidgetsenums.c:167 +#: ../libgimpwidgets/gimpwidgetsenums.c:168 +msgctxt "color-selector-model" +msgid "RGB" +msgstr "RGB" + +#: ../libgimpwidgets/gimpwidgetsenums.c:168 +msgid "RGB color model" +msgstr "Цветовая модель RGB" + +#: ../libgimpwidgets/gimpwidgetsenums.c:169 +msgctxt "color-selector-model" +msgid "LCH" +msgstr "LCH" + +#: ../libgimpwidgets/gimpwidgetsenums.c:169 +msgid "CIELCh color model" +msgstr "Цветовая модель CIE LCH" + +#: ../libgimpwidgets/gimpwidgetsenums.c:170 +msgctxt "color-selector-model" +msgid "HSV" +msgstr "HSV" + +#: ../libgimpwidgets/gimpwidgetsenums.c:170 +msgid "HSV color model" +msgstr "Цветовая модель HSV" + +#: ../libgimpwidgets/gimpwidgetsenums.c:199 msgctxt "page-selector-target" msgid "Layers" msgstr "Слои" -#: ../libgimpwidgets/gimpwidgetsenums.c:168 +#: ../libgimpwidgets/gimpwidgetsenums.c:200 msgctxt "page-selector-target" msgid "Images" msgstr "Изображения" -#: ../libgimpwidgets/gimpwidgetsenums.c:229 +#: ../libgimpwidgets/gimpwidgetsenums.c:261 msgctxt "zoom-type" msgid "Zoom in" msgstr "Приблизить" -#: ../libgimpwidgets/gimpwidgetsenums.c:230 +#: ../libgimpwidgets/gimpwidgetsenums.c:262 msgctxt "zoom-type" msgid "Zoom out" msgstr "Отдалить" @@ -2770,12 +2887,12 @@ msgstr "" "Фильтр, моделирующий невосприятие цвета (алгоритм Бреттеля-Виенота-Моллона)" #: ../modules/display-filter-color-blind.c:253 -msgid "Deficiency" -msgstr "Разновидность:" +msgid "Type" +msgstr "Тип" #: ../modules/display-filter-color-blind.c:254 -msgid "Color deficiency type" -msgstr "Тип сниженного цветовосприятия:" +msgid "Color vision deficiency type" +msgstr "Тип сниженного цветовосприятия" #: ../modules/display-filter-color-blind.c:259 msgid "Color Deficient Vision" @@ -2802,6 +2919,9 @@ msgstr "_Степень контраста:" msgid "Contrast" msgstr "Контраст" +#~ msgid "Deficiency" +#~ msgstr "Разновидность:" + #~ msgctxt "desaturate-mode" #~ msgid "Average" #~ msgstr "Среднее" diff --git a/po-libgimp/sv.po b/po-libgimp/sv.po index 9a929991f4..b659a544dd 100644 --- a/po-libgimp/sv.po +++ b/po-libgimp/sv.po @@ -1,45 +1,45 @@ # Swedish messages for libgimp. -# Copyright © 1999-2017 Free Software Foundation, Inc. +# Copyright © 1999-2018 Free Software Foundation, Inc. # Tomas Ögren , 1999. # Christian Rose , 2000, 2001, 2002, 2003. # Jan Morén 2003. # Daniel Nylander , 2007, 2008, 2009, 2011, 2012. -# Sebastian Rasmussen , 2016. -# Anders Jonsson , 2017. +# Sebastian Rasmussen , 2016, 2017. +# Anders Jonsson , 2017, 2018. # msgid "" msgstr "" "Project-Id-Version: libgimp\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=Internationalisation\n" -"POT-Creation-Date: 2017-02-28 18:42+0000\n" -"PO-Revision-Date: 2017-03-01 19:09+0100\n" -"Last-Translator: Anders Jonsson \n" +"POT-Creation-Date: 2018-04-14 20:11+0000\n" +"PO-Revision-Date: 2018-04-14 22:14+0200\n" +"Last-Translator: Sebastian Rasmussen \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.11\n" +"X-Generator: Poedit 2.0.6\n" #. procedure executed successfully -#: ../libgimp/gimp.c:1204 +#: ../libgimp/gimp.c:1264 msgid "success" msgstr "lyckades" #. procedure execution failed -#: ../libgimp/gimp.c:1208 +#: ../libgimp/gimp.c:1268 msgid "execution error" msgstr "exekveringsfel" #. procedure called incorrectly -#: ../libgimp/gimp.c:1212 +#: ../libgimp/gimp.c:1272 msgid "calling error" msgstr "anropsfel" #. procedure execution cancelled -#: ../libgimp/gimp.c:1216 +#: ../libgimp/gimp.c:1276 msgid "cancelled" msgstr "avbruten" @@ -52,79 +52,79 @@ msgstr "Penselval" msgid "_Browse..." msgstr "_Bläddra..." -#: ../libgimp/gimpexport.c:249 ../libgimp/gimpexport.c:285 +#: ../libgimp/gimpexport.c:251 ../libgimp/gimpexport.c:287 #, c-format msgid "%s plug-in can't handle layers" msgstr "Insticksmodulen %s kan inte hantera lager" -#: ../libgimp/gimpexport.c:250 ../libgimp/gimpexport.c:259 -#: ../libgimp/gimpexport.c:268 ../libgimp/gimpexport.c:286 +#: ../libgimp/gimpexport.c:252 ../libgimp/gimpexport.c:261 +#: ../libgimp/gimpexport.c:270 ../libgimp/gimpexport.c:288 msgid "Merge Visible Layers" msgstr "Sammanfoga synliga lager" -#: ../libgimp/gimpexport.c:258 +#: ../libgimp/gimpexport.c:260 #, c-format msgid "%s plug-in can't handle layer offsets, size or opacity" msgstr "" "Insticksmodulen %s kan inte hantera lageravstånd, lagerstorlek eller " "lageropacitet" -#: ../libgimp/gimpexport.c:267 ../libgimp/gimpexport.c:276 +#: ../libgimp/gimpexport.c:269 ../libgimp/gimpexport.c:278 #, c-format msgid "%s plug-in can only handle layers as animation frames" msgstr "" "Insticksmodulen %s kan endast hantera lager som bildrutor i en animation" -#: ../libgimp/gimpexport.c:268 ../libgimp/gimpexport.c:277 +#: ../libgimp/gimpexport.c:270 ../libgimp/gimpexport.c:279 msgid "Save as Animation" msgstr "Spara som animation" -#: ../libgimp/gimpexport.c:277 ../libgimp/gimpexport.c:286 -#: ../libgimp/gimpexport.c:295 +#: ../libgimp/gimpexport.c:279 ../libgimp/gimpexport.c:288 +#: ../libgimp/gimpexport.c:297 msgid "Flatten Image" msgstr "Platta till bild" -#: ../libgimp/gimpexport.c:294 +#: ../libgimp/gimpexport.c:296 #, c-format msgid "%s plug-in can't handle transparency" msgstr "Insticksmodulen %s kan inte hantera transparens" -#: ../libgimp/gimpexport.c:303 +#: ../libgimp/gimpexport.c:305 #, c-format msgid "%s plug-in can't handle layer masks" msgstr "Insticksmodulen %s kan inte hantera lagermasker" -#: ../libgimp/gimpexport.c:304 +#: ../libgimp/gimpexport.c:306 msgid "Apply Layer Masks" msgstr "Applicera lagermask" -#: ../libgimp/gimpexport.c:312 +#: ../libgimp/gimpexport.c:314 #, c-format msgid "%s plug-in can only handle RGB images" msgstr "Insticksmodulen %s kan endast hantera RGB-bilder" -#: ../libgimp/gimpexport.c:313 ../libgimp/gimpexport.c:351 -#: ../libgimp/gimpexport.c:360 +#: ../libgimp/gimpexport.c:315 ../libgimp/gimpexport.c:353 +#: ../libgimp/gimpexport.c:362 msgid "Convert to RGB" msgstr "Konvertera till RGB" -#: ../libgimp/gimpexport.c:321 +#: ../libgimp/gimpexport.c:323 #, c-format msgid "%s plug-in can only handle grayscale images" msgstr "Insticksmodulen %s kan endast hantera gråskalebilder" -#: ../libgimp/gimpexport.c:322 ../libgimp/gimpexport.c:351 -#: ../libgimp/gimpexport.c:372 +#: ../libgimp/gimpexport.c:324 ../libgimp/gimpexport.c:353 +#: ../libgimp/gimpexport.c:374 msgid "Convert to Grayscale" msgstr "Konvertera till gråskala" -#: ../libgimp/gimpexport.c:330 +#: ../libgimp/gimpexport.c:332 #, c-format msgid "%s plug-in can only handle indexed images" msgstr "Insticksmodulen %s kan endast hantera indexerade bilder" -#: ../libgimp/gimpexport.c:331 ../libgimp/gimpexport.c:360 -#: ../libgimp/gimpexport.c:370 +#: ../libgimp/gimpexport.c:333 ../libgimp/gimpexport.c:362 +#: ../libgimp/gimpexport.c:372 msgid "" "Convert to Indexed using default settings\n" "(Do it manually to tune the result)" @@ -132,14 +132,14 @@ msgstr "" "Konvertera till Indexerat med standardinställningar\n" "(Gör det manuellt om du vill finjustera)" -#: ../libgimp/gimpexport.c:340 +#: ../libgimp/gimpexport.c:342 #, c-format msgid "%s plug-in can only handle bitmap (two color) indexed images" msgstr "" "Insticksmodulen %s kan endast hantera bitmappindexerade (tvåfärgsindexerade) " "bilder" -#: ../libgimp/gimpexport.c:341 +#: ../libgimp/gimpexport.c:343 msgid "" "Convert to Indexed using bitmap default settings\n" "(Do it manually to tune the result)" @@ -147,64 +147,64 @@ msgstr "" "Konvertera till Indexerat med bitmapp-standardinställningar\n" "(Gör det manuellt om du vill finjustera)" -#: ../libgimp/gimpexport.c:350 +#: ../libgimp/gimpexport.c:352 #, c-format msgid "%s plug-in can only handle RGB or grayscale images" msgstr "Insticksmodulen %s kan endast hantera RGB-bilder eller gråskalebilder" -#: ../libgimp/gimpexport.c:359 +#: ../libgimp/gimpexport.c:361 #, c-format msgid "%s plug-in can only handle RGB or indexed images" msgstr "" "Insticksmodulen %s kan endast hantera RGB-bilder eller indexerade bilder" -#: ../libgimp/gimpexport.c:369 +#: ../libgimp/gimpexport.c:371 #, c-format msgid "%s plug-in can only handle grayscale or indexed images" msgstr "" "Insticksmodulen %s kan endast hantera gråskalebilder eller indexerade bilder" -#: ../libgimp/gimpexport.c:380 +#: ../libgimp/gimpexport.c:382 #, c-format msgid "%s plug-in needs an alpha channel" msgstr "Insticksmodulen %s behöver en alfakanal" -#: ../libgimp/gimpexport.c:381 +#: ../libgimp/gimpexport.c:383 msgid "Add Alpha Channel" msgstr "Lägg till alfakanal" -#: ../libgimp/gimpexport.c:440 +#: ../libgimp/gimpexport.c:442 msgid "Confirm Save" msgstr "Bekräfta sparande" -#: ../libgimp/gimpexport.c:445 ../libgimp/gimpexport.c:527 -#: ../libgimp/gimpexport.c:1019 ../libgimpwidgets/gimpcolorbutton.c:540 -#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:152 -#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:162 -#: ../libgimpwidgets/gimpfileentry.c:442 ../libgimpwidgets/gimpquerybox.c:274 +#: ../libgimp/gimpexport.c:447 ../libgimp/gimpexport.c:529 +#: ../libgimp/gimpexport.c:1021 ../libgimpwidgets/gimpcolorbutton.c:572 +#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:166 +#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:176 +#: ../libgimpwidgets/gimpfileentry.c:435 ../libgimpwidgets/gimpquerybox.c:274 #: ../libgimpwidgets/gimpquerybox.c:334 ../libgimpwidgets/gimpquerybox.c:398 -#: ../libgimpwidgets/gimpquerybox.c:472 ../libgimpwidgets/gimpunitmenu.c:496 +#: ../libgimpwidgets/gimpquerybox.c:472 ../libgimpwidgets/gimpunitmenu.c:492 msgid "_Cancel" msgstr "_Avbryt" -#: ../libgimp/gimpexport.c:446 +#: ../libgimp/gimpexport.c:448 msgid "C_onfirm" msgstr "_Bekräfta" -#: ../libgimp/gimpexport.c:522 +#: ../libgimp/gimpexport.c:524 msgid "Export File" msgstr "Exportera fil" -#: ../libgimp/gimpexport.c:526 +#: ../libgimp/gimpexport.c:528 msgid "_Ignore" msgstr "_Ignorera" -#: ../libgimp/gimpexport.c:528 ../libgimp/gimpexport.c:1020 +#: ../libgimp/gimpexport.c:530 ../libgimp/gimpexport.c:1022 msgid "_Export" msgstr "_Exportera" #. the headline -#: ../libgimp/gimpexport.c:558 +#: ../libgimp/gimpexport.c:560 #, c-format msgid "" "Your image should be exported before it can be saved as %s for the following " @@ -213,11 +213,11 @@ msgstr "" "Din bild bör exporteras innan den kan sparas som %s av följande anledningar:" #. the footline -#: ../libgimp/gimpexport.c:632 +#: ../libgimp/gimpexport.c:634 msgid "The export conversion won't modify your original image." msgstr "Konverteringen vid export modifierar inte originalbilden." -#: ../libgimp/gimpexport.c:739 +#: ../libgimp/gimpexport.c:741 #, c-format msgid "" "You are about to save a layer mask as %s.\n" @@ -226,7 +226,7 @@ msgstr "" "Du kommer att spara en lagermask som %s.\n" "Detta kommer inte att spara de synliga lagren." -#: ../libgimp/gimpexport.c:745 +#: ../libgimp/gimpexport.c:747 #, c-format msgid "" "You are about to save a channel (saved selection) as %s.\n" @@ -235,7 +235,7 @@ msgstr "" "Du kommer att spara en kanal (sparad markering) som %s.\n" "Detta kommer inte att spara de synliga lagren." -#: ../libgimp/gimpexport.c:1013 +#: ../libgimp/gimpexport.c:1015 msgid "Export Image as " msgstr "Exportera bild som " @@ -247,47 +247,51 @@ msgstr "Typsnittsval" msgid "Gradient Selection" msgstr "Gradientval" -#: ../libgimp/gimpimagemetadata.c:610 +#: ../libgimp/gimpimagemetadata.c:487 +msgid "GIMP 2.9/2.10" +msgstr "GIMP 2.9/2.10" + +#: ../libgimp/gimpimagemetadata.c:671 msgid "Background" msgstr "Bakgrund" -#: ../libgimp/gimpimagemetadata.c:799 +#: ../libgimp/gimpimagemetadata.c:860 #, c-format msgid "Rotate %s?" msgstr "Rotera %s?" -#: ../libgimp/gimpimagemetadata.c:805 +#: ../libgimp/gimpimagemetadata.c:866 msgid "_Keep Original" msgstr "_Behåll original" -#: ../libgimp/gimpimagemetadata.c:806 ../libgimpwidgets/gimpicons.c:270 +#: ../libgimp/gimpimagemetadata.c:867 ../libgimpwidgets/gimpicons.c:271 msgid "_Rotate" msgstr "_Rotera" -#: ../libgimp/gimpimagemetadata.c:847 +#: ../libgimp/gimpimagemetadata.c:908 msgid "Original" msgstr "Original" -#: ../libgimp/gimpimagemetadata.c:863 +#: ../libgimp/gimpimagemetadata.c:924 msgid "Rotated" msgstr "Roterad" -#: ../libgimp/gimpimagemetadata.c:881 +#: ../libgimp/gimpimagemetadata.c:942 msgid "This image contains Exif orientation metadata." msgstr "Denna bild innehåller Exif-orienteringsmetadata." -#: ../libgimp/gimpimagemetadata.c:899 +#: ../libgimp/gimpimagemetadata.c:960 msgid "Would you like to rotate the image?" msgstr "Vill du rotera bilden?" -#: ../libgimp/gimpimagemetadata.c:911 +#: ../libgimp/gimpimagemetadata.c:972 msgid "_Don't ask me again" msgstr "_Fråga mig inte igen" #. This string appears in an empty menu as in #. * "nothing selected and nothing to select" #. -#: ../libgimp/gimpmenu.c:462 ../libgimpwidgets/gimpintstore.c:251 +#: ../libgimp/gimpmenu.c:462 ../libgimpwidgets/gimpintstore.c:253 msgid "(Empty)" msgstr "(Tom)" @@ -725,648 +729,789 @@ msgctxt "convolve-type" msgid "Sharpen" msgstr "Gör skarpare" -#: ../libgimpbase/gimpbaseenums.c:513 -msgctxt "desaturate-mode" -msgid "Lightness" -msgstr "Ljushet" - #: ../libgimpbase/gimpbaseenums.c:514 msgctxt "desaturate-mode" +msgid "Lightness (HSL)" +msgstr "Ljushet (HSL)" + +#: ../libgimpbase/gimpbaseenums.c:515 +msgctxt "desaturate-mode" msgid "Luma" msgstr "Luma" -#: ../libgimpbase/gimpbaseenums.c:515 -msgctxt "desaturate-mode" -msgid "Average" -msgstr "Medel" - #: ../libgimpbase/gimpbaseenums.c:516 msgctxt "desaturate-mode" +msgid "Average (HSI Intensity)" +msgstr "Medel (HSI-intensitet)" + +#: ../libgimpbase/gimpbaseenums.c:517 +msgctxt "desaturate-mode" msgid "Luminance" msgstr "Luminans" -#: ../libgimpbase/gimpbaseenums.c:545 +#: ../libgimpbase/gimpbaseenums.c:518 +msgctxt "desaturate-mode" +msgid "Value (HSV)" +msgstr "Intensitet (NMI)" + +#: ../libgimpbase/gimpbaseenums.c:547 msgctxt "dodge-burn-type" msgid "Dodge" -msgstr "Blek" +msgstr "Skugga" -#: ../libgimpbase/gimpbaseenums.c:546 +#: ../libgimpbase/gimpbaseenums.c:548 msgctxt "dodge-burn-type" msgid "Burn" -msgstr "Bränn" +msgstr "Efterbelys" -#: ../libgimpbase/gimpbaseenums.c:578 +#: ../libgimpbase/gimpbaseenums.c:580 msgctxt "fill-type" msgid "Foreground color" msgstr "Förgrundsfärg" -#: ../libgimpbase/gimpbaseenums.c:579 +#: ../libgimpbase/gimpbaseenums.c:581 msgctxt "fill-type" msgid "Background color" msgstr "Bakgrundsfärg" -#: ../libgimpbase/gimpbaseenums.c:580 +#: ../libgimpbase/gimpbaseenums.c:582 msgctxt "fill-type" msgid "White" msgstr "Vit" -#: ../libgimpbase/gimpbaseenums.c:581 +#: ../libgimpbase/gimpbaseenums.c:583 msgctxt "fill-type" msgid "Transparency" msgstr "Transparent" -#: ../libgimpbase/gimpbaseenums.c:582 +#: ../libgimpbase/gimpbaseenums.c:584 msgctxt "fill-type" msgid "Pattern" msgstr "Mönster" +#: ../libgimpbase/gimpbaseenums.c:644 +msgctxt "gradient-blend-color-space" +msgid "Perceptual RGB" +msgstr "Perceptuell RGB" + +#: ../libgimpbase/gimpbaseenums.c:645 +msgctxt "gradient-blend-color-space" +msgid "Linear RGB" +msgstr "Linjär RGB" + +#: ../libgimpbase/gimpbaseenums.c:646 +msgctxt "gradient-blend-color-space" +msgid "CIE Lab" +msgstr "CIE Lab" + +#: ../libgimpbase/gimpbaseenums.c:676 +msgctxt "gradient-segment-color" +msgid "RGB" +msgstr "RGB" + +#: ../libgimpbase/gimpbaseenums.c:677 +msgctxt "gradient-segment-color" +msgid "HSV (counter-clockwise hue)" +msgstr "NMI (motursnyans)" + +#. Translators: this is an abbreviated version of "HSV (counter-clockwise hue)". +#. Keep it short. +#: ../libgimpbase/gimpbaseenums.c:680 +msgctxt "gradient-segment-color" +msgid "HSV (ccw)" +msgstr "NMI (moturs)" + +#: ../libgimpbase/gimpbaseenums.c:681 +msgctxt "gradient-segment-color" +msgid "HSV (clockwise hue)" +msgstr "NMI (medursnyans)" + +#. Translators: this is an abbreviated version of "HSV (clockwise hue)". +#. Keep it short. +#: ../libgimpbase/gimpbaseenums.c:684 +msgctxt "gradient-segment-color" +msgid "HSV (cw)" +msgstr "NMI (medurs)" + +#: ../libgimpbase/gimpbaseenums.c:716 +msgctxt "gradient-segment-type" +msgid "Linear" +msgstr "Linjär" + +#: ../libgimpbase/gimpbaseenums.c:717 +msgctxt "gradient-segment-type" +msgid "Curved" +msgstr "Kurvad" + #: ../libgimpbase/gimpbaseenums.c:718 +msgctxt "gradient-segment-type" +msgid "Sinusoidal" +msgstr "Sinusformad" + +#: ../libgimpbase/gimpbaseenums.c:719 +msgctxt "gradient-segment-type" +msgid "Spherical (increasing)" +msgstr "Sfärisk (ökande)" + +#. Translators: this is an abbreviated version of "Spherical (increasing)". +#. Keep it short. +#: ../libgimpbase/gimpbaseenums.c:722 +msgctxt "gradient-segment-type" +msgid "Spherical (inc)" +msgstr "Sfärisk (ökande)" + +#: ../libgimpbase/gimpbaseenums.c:723 +msgctxt "gradient-segment-type" +msgid "Spherical (decreasing)" +msgstr "Sfärisk (minskande)" + +#. Translators: this is an abbreviated version of "Spherical (decreasing)". +#. Keep it short. +#: ../libgimpbase/gimpbaseenums.c:726 +msgctxt "gradient-segment-type" +msgid "Spherical (dec)" +msgstr "Sfärisk (minskande)" + +#: ../libgimpbase/gimpbaseenums.c:764 msgctxt "gradient-type" msgid "Linear" msgstr "Linjär" -#: ../libgimpbase/gimpbaseenums.c:719 +#: ../libgimpbase/gimpbaseenums.c:765 msgctxt "gradient-type" msgid "Bi-linear" msgstr "Bilinjär" -#: ../libgimpbase/gimpbaseenums.c:720 +#: ../libgimpbase/gimpbaseenums.c:766 msgctxt "gradient-type" msgid "Radial" msgstr "Radiell" -#: ../libgimpbase/gimpbaseenums.c:721 +#: ../libgimpbase/gimpbaseenums.c:767 msgctxt "gradient-type" msgid "Square" msgstr "Fyrkantig" -#: ../libgimpbase/gimpbaseenums.c:722 +#: ../libgimpbase/gimpbaseenums.c:768 +msgctxt "gradient-type" +msgid "Conical (symmetric)" +msgstr "Konisk (symmetrisk)" + +#. Translators: this is an abbreviated version of "Conical (symmetric)". +#. Keep it short. +#: ../libgimpbase/gimpbaseenums.c:771 msgctxt "gradient-type" msgid "Conical (sym)" msgstr "Konisk (symmetrisk)" -#: ../libgimpbase/gimpbaseenums.c:723 +#: ../libgimpbase/gimpbaseenums.c:772 +msgctxt "gradient-type" +msgid "Conical (asymmetric)" +msgstr "Konisk (asymmetrisk)" + +#. Translators: this is an abbreviated version of "Conical (asymmetric)". +#. Keep it short. +#: ../libgimpbase/gimpbaseenums.c:775 msgctxt "gradient-type" msgid "Conical (asym)" msgstr "Konisk (asymmetrisk)" -#: ../libgimpbase/gimpbaseenums.c:724 +#: ../libgimpbase/gimpbaseenums.c:776 msgctxt "gradient-type" msgid "Shaped (angular)" msgstr "Formfyllning (vinkel)" -#: ../libgimpbase/gimpbaseenums.c:725 +#: ../libgimpbase/gimpbaseenums.c:777 msgctxt "gradient-type" msgid "Shaped (spherical)" msgstr "Formfyllning (sfärisk)" -#: ../libgimpbase/gimpbaseenums.c:726 +#: ../libgimpbase/gimpbaseenums.c:778 msgctxt "gradient-type" msgid "Shaped (dimpled)" msgstr "Formfyllning (gropig)" -#: ../libgimpbase/gimpbaseenums.c:727 +#: ../libgimpbase/gimpbaseenums.c:779 +msgctxt "gradient-type" +msgid "Spiral (clockwise)" +msgstr "Spiral (medurs)" + +#. Translators: this is an abbreviated version of "Spiral (clockwise)". +#. Keep it short. +#: ../libgimpbase/gimpbaseenums.c:782 msgctxt "gradient-type" msgid "Spiral (cw)" msgstr "Spiral (medurs)" -#: ../libgimpbase/gimpbaseenums.c:728 +#: ../libgimpbase/gimpbaseenums.c:783 +msgctxt "gradient-type" +msgid "Spiral (counter-clockwise)" +msgstr "Spiral (moturs)" + +#. Translators: this is an abbreviated version of "Spiral (counter-clockwise)". +#. Keep it short. +#: ../libgimpbase/gimpbaseenums.c:786 msgctxt "gradient-type" msgid "Spiral (ccw)" msgstr "Spiral (moturs)" -#: ../libgimpbase/gimpbaseenums.c:760 +#: ../libgimpbase/gimpbaseenums.c:818 msgctxt "grid-style" msgid "Intersections (dots)" msgstr "Snitt (punkter)" -#: ../libgimpbase/gimpbaseenums.c:761 +#: ../libgimpbase/gimpbaseenums.c:819 msgctxt "grid-style" msgid "Intersections (crosshairs)" msgstr "Snitt (hårkors)" -#: ../libgimpbase/gimpbaseenums.c:762 +#: ../libgimpbase/gimpbaseenums.c:820 msgctxt "grid-style" msgid "Dashed" msgstr "Streckad" -#: ../libgimpbase/gimpbaseenums.c:763 +#: ../libgimpbase/gimpbaseenums.c:821 msgctxt "grid-style" msgid "Double dashed" msgstr "Dubbelstreckad" -#: ../libgimpbase/gimpbaseenums.c:764 +#: ../libgimpbase/gimpbaseenums.c:822 msgctxt "grid-style" msgid "Solid" msgstr "Enfärgad" -#: ../libgimpbase/gimpbaseenums.c:834 +#: ../libgimpbase/gimpbaseenums.c:892 msgctxt "icon-type" msgid "Icon name" msgstr "Ikonnamn" -#: ../libgimpbase/gimpbaseenums.c:835 +#: ../libgimpbase/gimpbaseenums.c:893 msgctxt "icon-type" msgid "Inline pixbuf" msgstr "Inline pixbuf" -#: ../libgimpbase/gimpbaseenums.c:836 +#: ../libgimpbase/gimpbaseenums.c:894 msgctxt "icon-type" msgid "Image file" msgstr "Bildfil" -#: ../libgimpbase/gimpbaseenums.c:866 +#: ../libgimpbase/gimpbaseenums.c:924 msgctxt "image-base-type" msgid "RGB color" msgstr "RGB-färg" -#: ../libgimpbase/gimpbaseenums.c:867 +#: ../libgimpbase/gimpbaseenums.c:925 msgctxt "image-base-type" msgid "Grayscale" msgstr "Gråskala" -#: ../libgimpbase/gimpbaseenums.c:868 +#: ../libgimpbase/gimpbaseenums.c:926 msgctxt "image-base-type" msgid "Indexed color" msgstr "Indexerad färg" -#: ../libgimpbase/gimpbaseenums.c:901 +#: ../libgimpbase/gimpbaseenums.c:959 msgctxt "image-type" msgid "RGB" msgstr "RGB" -#: ../libgimpbase/gimpbaseenums.c:902 +#: ../libgimpbase/gimpbaseenums.c:960 msgctxt "image-type" msgid "RGB-alpha" msgstr "RGB-alfa" -#: ../libgimpbase/gimpbaseenums.c:903 +#: ../libgimpbase/gimpbaseenums.c:961 msgctxt "image-type" msgid "Grayscale" msgstr "Gråskala" -#: ../libgimpbase/gimpbaseenums.c:904 +#: ../libgimpbase/gimpbaseenums.c:962 msgctxt "image-type" msgid "Grayscale-alpha" msgstr "Gråskala-alfa" -#: ../libgimpbase/gimpbaseenums.c:905 +#: ../libgimpbase/gimpbaseenums.c:963 msgctxt "image-type" msgid "Indexed" msgstr "Indexerad" -#: ../libgimpbase/gimpbaseenums.c:906 +#: ../libgimpbase/gimpbaseenums.c:964 msgctxt "image-type" msgid "Indexed-alpha" msgstr "Indexerad-alfa" -#: ../libgimpbase/gimpbaseenums.c:936 +#: ../libgimpbase/gimpbaseenums.c:994 msgctxt "ink-blob-type" msgid "Circle" msgstr "Cirkel" -#: ../libgimpbase/gimpbaseenums.c:937 +#: ../libgimpbase/gimpbaseenums.c:995 msgctxt "ink-blob-type" msgid "Square" msgstr "Fyrkantig" -#: ../libgimpbase/gimpbaseenums.c:938 +#: ../libgimpbase/gimpbaseenums.c:996 msgctxt "ink-blob-type" msgid "Diamond" msgstr "Diamant" -#: ../libgimpbase/gimpbaseenums.c:970 +#: ../libgimpbase/gimpbaseenums.c:1028 msgctxt "interpolation-type" msgid "None" msgstr "Ingen" -#: ../libgimpbase/gimpbaseenums.c:971 +#: ../libgimpbase/gimpbaseenums.c:1029 msgctxt "interpolation-type" msgid "Linear" msgstr "Linjär" -#: ../libgimpbase/gimpbaseenums.c:972 +#: ../libgimpbase/gimpbaseenums.c:1030 msgctxt "interpolation-type" msgid "Cubic" msgstr "Kubisk" -#: ../libgimpbase/gimpbaseenums.c:973 +#: ../libgimpbase/gimpbaseenums.c:1031 msgctxt "interpolation-type" msgid "NoHalo" msgstr "NoHalo" -#: ../libgimpbase/gimpbaseenums.c:974 +#: ../libgimpbase/gimpbaseenums.c:1032 msgctxt "interpolation-type" msgid "LoHalo" msgstr "LoHalo" -#: ../libgimpbase/gimpbaseenums.c:1004 +#: ../libgimpbase/gimpbaseenums.c:1062 msgctxt "join-style" msgid "Miter" msgstr "Spetsig" -#: ../libgimpbase/gimpbaseenums.c:1005 +#: ../libgimpbase/gimpbaseenums.c:1063 msgctxt "join-style" msgid "Round" msgstr "Avrundad" -#: ../libgimpbase/gimpbaseenums.c:1006 +#: ../libgimpbase/gimpbaseenums.c:1064 msgctxt "join-style" msgid "Bevel" msgstr "Avfasad" -#: ../libgimpbase/gimpbaseenums.c:1067 +#: ../libgimpbase/gimpbaseenums.c:1125 msgctxt "merge-type" msgid "Expanded as necessary" msgstr "Expanderad efter behov" -#: ../libgimpbase/gimpbaseenums.c:1068 +#: ../libgimpbase/gimpbaseenums.c:1126 msgctxt "merge-type" msgid "Clipped to image" msgstr "Klippt till bild" -#: ../libgimpbase/gimpbaseenums.c:1069 +#: ../libgimpbase/gimpbaseenums.c:1127 msgctxt "merge-type" msgid "Clipped to bottom layer" msgstr "Klippt till bottenlager" -#: ../libgimpbase/gimpbaseenums.c:1070 +#: ../libgimpbase/gimpbaseenums.c:1128 msgctxt "merge-type" msgid "Flatten" msgstr "Platta ut" -#: ../libgimpbase/gimpbaseenums.c:1162 +#: ../libgimpbase/gimpbaseenums.c:1220 msgctxt "orientation-type" msgid "Horizontal" msgstr "Horisontell" -#: ../libgimpbase/gimpbaseenums.c:1163 +#: ../libgimpbase/gimpbaseenums.c:1221 msgctxt "orientation-type" msgid "Vertical" msgstr "Vertikal" -#: ../libgimpbase/gimpbaseenums.c:1164 +#: ../libgimpbase/gimpbaseenums.c:1222 msgctxt "orientation-type" msgid "Unknown" msgstr "Okänd" -#: ../libgimpbase/gimpbaseenums.c:1193 +#: ../libgimpbase/gimpbaseenums.c:1251 msgctxt "paint-application-mode" msgid "Constant" msgstr "Konstant" -#: ../libgimpbase/gimpbaseenums.c:1194 +#: ../libgimpbase/gimpbaseenums.c:1252 msgctxt "paint-application-mode" msgid "Incremental" msgstr "Inkrementell" -#: ../libgimpbase/gimpbaseenums.c:1327 +#: ../libgimpbase/gimpbaseenums.c:1385 msgctxt "pdb-proc-type" msgid "Internal GIMP procedure" msgstr "Intern GIMP-procedur" -#: ../libgimpbase/gimpbaseenums.c:1328 +#: ../libgimpbase/gimpbaseenums.c:1386 msgctxt "pdb-proc-type" msgid "GIMP Plug-In" msgstr "GIMP-insticksmodul" -#: ../libgimpbase/gimpbaseenums.c:1329 +#: ../libgimpbase/gimpbaseenums.c:1387 msgctxt "pdb-proc-type" msgid "GIMP Extension" msgstr "GIMP-tillägg" -#: ../libgimpbase/gimpbaseenums.c:1330 +#: ../libgimpbase/gimpbaseenums.c:1388 msgctxt "pdb-proc-type" msgid "Temporary Procedure" msgstr "Temporär procedur" -#: ../libgimpbase/gimpbaseenums.c:1405 +#: ../libgimpbase/gimpbaseenums.c:1463 msgctxt "precision" msgid "8-bit linear integer" msgstr "8-bit linjär heltal" -#: ../libgimpbase/gimpbaseenums.c:1406 +#: ../libgimpbase/gimpbaseenums.c:1464 msgctxt "precision" msgid "8-bit gamma integer" msgstr "8-bit gamma heltal" -#: ../libgimpbase/gimpbaseenums.c:1407 +#: ../libgimpbase/gimpbaseenums.c:1465 msgctxt "precision" msgid "16-bit linear integer" msgstr "16-bit linjär heltal" -#: ../libgimpbase/gimpbaseenums.c:1408 +#: ../libgimpbase/gimpbaseenums.c:1466 msgctxt "precision" msgid "16-bit gamma integer" msgstr "16-bit gamma heltal" -#: ../libgimpbase/gimpbaseenums.c:1409 +#: ../libgimpbase/gimpbaseenums.c:1467 msgctxt "precision" msgid "32-bit linear integer" msgstr "32-bit linjär heltal" -#: ../libgimpbase/gimpbaseenums.c:1410 +#: ../libgimpbase/gimpbaseenums.c:1468 msgctxt "precision" msgid "32-bit gamma integer" msgstr "32-bit gamma heltal" -#: ../libgimpbase/gimpbaseenums.c:1411 +#: ../libgimpbase/gimpbaseenums.c:1469 msgctxt "precision" msgid "16-bit linear floating point" msgstr "16-bit linjär flyttal" -#: ../libgimpbase/gimpbaseenums.c:1412 +#: ../libgimpbase/gimpbaseenums.c:1470 msgctxt "precision" msgid "16-bit gamma floating point" msgstr "16-bit gamma flyttal" -#: ../libgimpbase/gimpbaseenums.c:1413 +#: ../libgimpbase/gimpbaseenums.c:1471 msgctxt "precision" msgid "32-bit linear floating point" msgstr "32-bit linjär flyttal" -#: ../libgimpbase/gimpbaseenums.c:1414 +#: ../libgimpbase/gimpbaseenums.c:1472 msgctxt "precision" msgid "32-bit gamma floating point" msgstr "32-bit gamma flyttal" -#: ../libgimpbase/gimpbaseenums.c:1415 +#: ../libgimpbase/gimpbaseenums.c:1473 msgctxt "precision" msgid "64-bit linear floating point" msgstr "64-bit linjär flyttal" -#: ../libgimpbase/gimpbaseenums.c:1416 +#: ../libgimpbase/gimpbaseenums.c:1474 msgctxt "precision" msgid "64-bit gamma floating point" msgstr "64-bit gamma flyttal" -#: ../libgimpbase/gimpbaseenums.c:1485 +#: ../libgimpbase/gimpbaseenums.c:1543 msgctxt "repeat-mode" msgid "None (extend)" msgstr "Ingen (utöka)" -#: ../libgimpbase/gimpbaseenums.c:1486 +#: ../libgimpbase/gimpbaseenums.c:1544 msgctxt "repeat-mode" msgid "Sawtooth wave" msgstr "Sågtandsvåg" -#: ../libgimpbase/gimpbaseenums.c:1487 +#: ../libgimpbase/gimpbaseenums.c:1545 msgctxt "repeat-mode" msgid "Triangular wave" msgstr "Triangulär våg" -#: ../libgimpbase/gimpbaseenums.c:1488 +#: ../libgimpbase/gimpbaseenums.c:1546 msgctxt "repeat-mode" msgid "Truncate" msgstr "Trunkera" -#: ../libgimpbase/gimpbaseenums.c:1550 +#: ../libgimpbase/gimpbaseenums.c:1608 msgctxt "run-mode" msgid "Run interactively" msgstr "Kör interaktivt" -#: ../libgimpbase/gimpbaseenums.c:1551 +#: ../libgimpbase/gimpbaseenums.c:1609 msgctxt "run-mode" msgid "Run non-interactively" msgstr "Kör icke-interaktivt" -#: ../libgimpbase/gimpbaseenums.c:1552 +#: ../libgimpbase/gimpbaseenums.c:1610 msgctxt "run-mode" msgid "Run with last used values" msgstr "Kör med senast använda värden" -#: ../libgimpbase/gimpbaseenums.c:1587 +#: ../libgimpbase/gimpbaseenums.c:1648 msgctxt "select-criterion" msgid "Composite" msgstr "Sammansatt" -#: ../libgimpbase/gimpbaseenums.c:1588 +#: ../libgimpbase/gimpbaseenums.c:1649 msgctxt "select-criterion" msgid "Red" msgstr "Röd" -#: ../libgimpbase/gimpbaseenums.c:1589 +#: ../libgimpbase/gimpbaseenums.c:1650 msgctxt "select-criterion" msgid "Green" msgstr "Grön" -#: ../libgimpbase/gimpbaseenums.c:1590 +#: ../libgimpbase/gimpbaseenums.c:1651 msgctxt "select-criterion" msgid "Blue" msgstr "Blå" -#: ../libgimpbase/gimpbaseenums.c:1591 +#: ../libgimpbase/gimpbaseenums.c:1652 msgctxt "select-criterion" -msgid "Hue" -msgstr "Nyans" +msgid "Hue (HSV)" +msgstr "Nyans (NMI)" -#: ../libgimpbase/gimpbaseenums.c:1592 +#: ../libgimpbase/gimpbaseenums.c:1653 msgctxt "select-criterion" -msgid "Saturation" -msgstr "Mättnad" +msgid "Saturation (HSV)" +msgstr "Mättnad (NMI)" -#: ../libgimpbase/gimpbaseenums.c:1593 +#: ../libgimpbase/gimpbaseenums.c:1654 msgctxt "select-criterion" -msgid "Value" -msgstr "Intensitet" +msgid "Value (HSV)" +msgstr "Intensitet (NMI)" -#: ../libgimpbase/gimpbaseenums.c:1594 +#: ../libgimpbase/gimpbaseenums.c:1655 msgctxt "select-criterion" msgid "Alpha" msgstr "Alfa" -#: ../libgimpbase/gimpbaseenums.c:1623 +#: ../libgimpbase/gimpbaseenums.c:1656 +msgctxt "select-criterion" +msgid "Lightness (LCH)" +msgstr "Ljusstyrka (LCH)" + +#: ../libgimpbase/gimpbaseenums.c:1657 +msgctxt "select-criterion" +msgid "Chroma (LCH)" +msgstr "Krominans (LCH)" + +#: ../libgimpbase/gimpbaseenums.c:1658 +msgctxt "select-criterion" +msgid "Hue (LCH)" +msgstr "Nyans (LCH)" + +#: ../libgimpbase/gimpbaseenums.c:1687 msgctxt "size-type" msgid "Pixels" msgstr "Bildpunkter" -#: ../libgimpbase/gimpbaseenums.c:1624 +#: ../libgimpbase/gimpbaseenums.c:1688 msgctxt "size-type" msgid "Points" msgstr "Punkter" -#: ../libgimpbase/gimpbaseenums.c:1685 +#: ../libgimpbase/gimpbaseenums.c:1749 msgctxt "stroke-method" msgid "Stroke line" msgstr "Stryk linje" -#: ../libgimpbase/gimpbaseenums.c:1686 +#: ../libgimpbase/gimpbaseenums.c:1750 msgctxt "stroke-method" msgid "Stroke with a paint tool" msgstr "Stryk med ett måleriverktyg" -#: ../libgimpbase/gimpbaseenums.c:1715 +#: ../libgimpbase/gimpbaseenums.c:1779 msgctxt "text-direction" msgid "From left to right" msgstr "Från vänster till höger" -#: ../libgimpbase/gimpbaseenums.c:1716 +#: ../libgimpbase/gimpbaseenums.c:1780 msgctxt "text-direction" msgid "From right to left" msgstr "Från höger till vänster" -#: ../libgimpbase/gimpbaseenums.c:1747 +#: ../libgimpbase/gimpbaseenums.c:1811 msgctxt "text-hint-style" msgid "None" msgstr "Ingen" -#: ../libgimpbase/gimpbaseenums.c:1748 +#: ../libgimpbase/gimpbaseenums.c:1812 msgctxt "text-hint-style" msgid "Slight" msgstr "Lite" -#: ../libgimpbase/gimpbaseenums.c:1749 +#: ../libgimpbase/gimpbaseenums.c:1813 msgctxt "text-hint-style" msgid "Medium" msgstr "Mellan" -#: ../libgimpbase/gimpbaseenums.c:1750 +#: ../libgimpbase/gimpbaseenums.c:1814 msgctxt "text-hint-style" msgid "Full" msgstr "Full" -#: ../libgimpbase/gimpbaseenums.c:1781 +#: ../libgimpbase/gimpbaseenums.c:1845 msgctxt "text-justification" msgid "Left justified" msgstr "Vänsterjusterad" -#: ../libgimpbase/gimpbaseenums.c:1782 +#: ../libgimpbase/gimpbaseenums.c:1846 msgctxt "text-justification" msgid "Right justified" msgstr "Högerjusterad" -#: ../libgimpbase/gimpbaseenums.c:1783 +#: ../libgimpbase/gimpbaseenums.c:1847 msgctxt "text-justification" msgid "Centered" msgstr "Centrerad" -#: ../libgimpbase/gimpbaseenums.c:1784 +#: ../libgimpbase/gimpbaseenums.c:1848 msgctxt "text-justification" msgid "Filled" msgstr "Fylld" -#: ../libgimpbase/gimpbaseenums.c:1814 +#: ../libgimpbase/gimpbaseenums.c:1878 msgctxt "transfer-mode" msgid "Shadows" msgstr "Skuggor" -#: ../libgimpbase/gimpbaseenums.c:1815 +#: ../libgimpbase/gimpbaseenums.c:1879 msgctxt "transfer-mode" msgid "Midtones" msgstr "Mellantoner" -#: ../libgimpbase/gimpbaseenums.c:1816 +#: ../libgimpbase/gimpbaseenums.c:1880 msgctxt "transfer-mode" msgid "Highlights" msgstr "Högdagrar" -#: ../libgimpbase/gimpbaseenums.c:1845 +#: ../libgimpbase/gimpbaseenums.c:1909 msgctxt "transform-direction" msgid "Normal (Forward)" msgstr "Normal (Framåt)" -#: ../libgimpbase/gimpbaseenums.c:1846 +#: ../libgimpbase/gimpbaseenums.c:1910 msgctxt "transform-direction" msgid "Corrective (Backward)" msgstr "Korrektiv (Bakåt)" -#: ../libgimpbase/gimpbaseenums.c:1877 +#: ../libgimpbase/gimpbaseenums.c:1941 msgctxt "transform-resize" msgid "Adjust" msgstr "Justera" -#: ../libgimpbase/gimpbaseenums.c:1878 +#: ../libgimpbase/gimpbaseenums.c:1942 msgctxt "transform-resize" msgid "Clip" msgstr "Klipp" -#: ../libgimpbase/gimpbaseenums.c:1879 +#: ../libgimpbase/gimpbaseenums.c:1943 msgctxt "transform-resize" msgid "Crop to result" msgstr "Beskär till resultat" -#: ../libgimpbase/gimpbaseenums.c:1880 +#: ../libgimpbase/gimpbaseenums.c:1944 msgctxt "transform-resize" msgid "Crop with aspect" msgstr "Beskär med förhållande" -#: ../libgimpbase/gimpmetadata.c:575 +#: ../libgimpbase/gimpmetadata.c:845 #, c-format msgid "Can load metadata only from local files" msgstr "Kan endast läsa in metadata från lokala filer" -#: ../libgimpbase/gimpmetadata.c:635 +#: ../libgimpbase/gimpmetadata.c:859 +#, c-format +msgid "Conversion of the filename to system codepage failed." +msgstr "Konvertering av filnamnet till en systemteckentabell misslyckades." + +#: ../libgimpbase/gimpmetadata.c:916 #, c-format msgid "Can save metadata only to local files" msgstr "Kan endast spara metadata till lokala filer" -#: ../libgimpbase/gimpmetadata.c:711 +#: ../libgimpbase/gimpmetadata.c:992 #, c-format msgid "Parsing Exif data failed." msgstr "Misslyckades med tolkning av Exif-data." -#: ../libgimpbase/gimpmetadata.c:762 +#: ../libgimpbase/gimpmetadata.c:1043 +#, c-format +msgid "Parsing IPTC data failed." +msgstr "Tolkning av IPTC-data misslyckades." + +#: ../libgimpbase/gimpmetadata.c:1092 #, c-format msgid "Parsing XMP data failed." msgstr "Misslyckades med tolkning av XMP-data." -#: ../libgimpbase/gimputils.c:192 ../libgimpbase/gimputils.c:197 +#: ../libgimpbase/gimputils.c:223 ../libgimpbase/gimputils.c:228 msgid "(invalid UTF-8 string)" msgstr "(ogiltig UTF-8-sträng)" -#: ../libgimpbase/gimputils.c:367 +#: ../libgimpbase/gimputils.c:398 msgid "File path is NULL" msgstr "Filsökväg är NULL" -#: ../libgimpbase/gimputils.c:376 ../libgimpbase/gimputils.c:387 +#: ../libgimpbase/gimputils.c:407 ../libgimpbase/gimputils.c:418 msgid "Error converting UTF-8 filename to wide char" msgstr "Fel vid konvertering av UTF-8-filnamn till breda tecken" -#: ../libgimpbase/gimputils.c:395 +#: ../libgimpbase/gimputils.c:426 msgid "ILCreateFromPath() failed" msgstr "ILCreateFromPath() misslyckades" -#: ../libgimpbase/gimputils.c:432 +#: ../libgimpbase/gimputils.c:463 #, c-format msgid "Cannot convert '%s' into a valid NSURL." msgstr "Kan inte konvertera ”%s” till en giltig NSURL." -#: ../libgimpbase/gimputils.c:460 +#: ../libgimpbase/gimputils.c:491 msgid "Connecting to org.freedesktop.FileManager1 failed: " msgstr "Misslyckades med att ansluta till org.freedesktop.FileManager1: " -#: ../libgimpbase/gimputils.c:484 +#: ../libgimpbase/gimputils.c:515 msgid "Calling ShowItems failed: " msgstr "Misslyckades med att anropa ShowItems: " -#: ../libgimpcolor/gimpcolorprofile.c:269 +#: ../libgimpcolor/gimpcolorprofile.c:263 #, c-format msgid "'%s' does not appear to be an ICC color profile" msgstr "”%s” verkar inte vara en ICC-färgprofil" -#: ../libgimpcolor/gimpcolorprofile.c:315 +#: ../libgimpcolor/gimpcolorprofile.c:309 msgid "Data does not appear to be an ICC color profile" msgstr "Data verkar inte vara en ICC-färgprofil" -#: ../libgimpcolor/gimpcolorprofile.c:372 +#: ../libgimpcolor/gimpcolorprofile.c:366 msgid "Could not save color profile to memory" msgstr "Kunde inte spara färgprofil till minne" -#: ../libgimpcolor/gimpcolorprofile.c:590 +#: ../libgimpcolor/gimpcolorprofile.c:583 msgid "(unnamed profile)" msgstr "(namnlös profil)" -#: ../libgimpcolor/gimpcolorprofile.c:632 +#: ../libgimpcolor/gimpcolorprofile.c:625 #, c-format msgid "Model: %s" msgstr "Modell: %s" -#: ../libgimpcolor/gimpcolorprofile.c:641 +#: ../libgimpcolor/gimpcolorprofile.c:634 #, c-format msgid "Manufacturer: %s" msgstr "Tillverkare: %s" -#: ../libgimpcolor/gimpcolorprofile.c:650 +#: ../libgimpcolor/gimpcolorprofile.c:643 #, c-format msgid "Copyright: %s" msgstr "Copyright: %s" @@ -1428,7 +1573,7 @@ msgid "" "fallback." msgstr "" "När aktiverad kommer GIMP att försöka använda färgprofilen för skärmen från " -"fönstersystemet. Den konfigurerade skärmprofilen kommer då endast att " +"fönstersystemet. Den konfigurerade skärmprofilen kommer då endast att " "användas för att falla tillbaka på." #: ../libgimpconfig/gimpcolorconfig.c:63 @@ -1582,20 +1727,20 @@ msgstr "Märk upp färger som är utanför färgomfång" msgid "Out of gamut warning color" msgstr "Varningsfärg för färger utanför färgomfång" -#: ../libgimpconfig/gimpcolorconfig.c:659 -#: ../libgimpconfig/gimpcolorconfig.c:843 +#: ../libgimpconfig/gimpcolorconfig.c:660 +#: ../libgimpconfig/gimpcolorconfig.c:844 #, c-format msgid "Color profile '%s' is not for RGB color space." msgstr "Färgprofil ”%s” passar inte med RGB-färgrymd." -#: ../libgimpconfig/gimpcolorconfig.c:701 -#: ../libgimpconfig/gimpcolorconfig.c:893 +#: ../libgimpconfig/gimpcolorconfig.c:702 +#: ../libgimpconfig/gimpcolorconfig.c:894 #, c-format msgid "Color profile '%s' is not for GRAY color space." msgstr "Färgprofil ”%s” passar inte med GRÅ-färgrymd." -#: ../libgimpconfig/gimpcolorconfig.c:743 -#: ../libgimpconfig/gimpcolorconfig.c:943 +#: ../libgimpconfig/gimpcolorconfig.c:744 +#: ../libgimpconfig/gimpcolorconfig.c:944 #, c-format msgid "Color profile '%s' is not for CMYK color space." msgstr "Färgprofil ”%s” passar inte med CMYK-färgrymd." @@ -1626,10 +1771,10 @@ msgstr "ogiltigt värde ”%ld” för element %s" msgid "while parsing token '%s': %s" msgstr "vid tolkning av elementet ”%s”: %s" -#: ../libgimpconfig/gimpconfig-iface.c:658 -#: ../libgimpconfig/gimpconfig-iface.c:671 ../libgimpconfig/gimpscanner.c:745 -#: ../libgimpconfig/gimpscanner.c:827 -#: ../libgimpwidgets/gimpcolorprofilestore.c:712 +#: ../libgimpconfig/gimpconfig-iface.c:662 +#: ../libgimpconfig/gimpconfig-iface.c:675 ../libgimpconfig/gimpscanner.c:742 +#: ../libgimpconfig/gimpscanner.c:824 +#: ../libgimpwidgets/gimpcolorprofilestore.c:710 msgid "fatal parse error" msgstr "ödesdigert tolkningsfel" @@ -1664,12 +1809,12 @@ msgid "invalid UTF-8 string" msgstr "ogiltig UTF-8-sträng" #. please don't translate 'yes' and 'no' -#: ../libgimpconfig/gimpscanner.c:606 +#: ../libgimpconfig/gimpscanner.c:617 #, c-format msgid "expected 'yes' or 'no' for boolean token, got '%s'" msgstr "förväntade ett ”yes” eller ”no” för booleskt element, fick ”%s”" -#: ../libgimpconfig/gimpscanner.c:854 +#: ../libgimpconfig/gimpscanner.c:851 #, c-format msgid "Error while parsing '%s' in line %d: %s" msgstr "Fel vid tolkning av ”%s” på rad %d: %s" @@ -1725,88 +1870,104 @@ msgstr "Kunde inte skapa miniatyrbild för %s: %s" msgid "_Search:" msgstr "_Sök:" -#: ../libgimpwidgets/gimpcolorbutton.c:137 +#: ../libgimpwidgets/gimpcolorbutton.c:152 msgid "_Foreground Color" msgstr "_Förgrundsfärg" -#: ../libgimpwidgets/gimpcolorbutton.c:141 +#: ../libgimpwidgets/gimpcolorbutton.c:156 msgid "_Background Color" msgstr "_Bakgrundsfärg" -#: ../libgimpwidgets/gimpcolorbutton.c:145 +#: ../libgimpwidgets/gimpcolorbutton.c:160 msgid "Blac_k" msgstr "_Svart" -#: ../libgimpwidgets/gimpcolorbutton.c:149 +#: ../libgimpwidgets/gimpcolorbutton.c:164 msgid "_White" msgstr "_Vit" -#: ../libgimpwidgets/gimpcolorbutton.c:539 ../libgimpwidgets/gimpicons.c:67 +#: ../libgimpwidgets/gimpcolorbutton.c:571 ../libgimpwidgets/gimpicons.c:68 msgid "_Reset" msgstr "_Återställ" -#: ../libgimpwidgets/gimpcolorbutton.c:541 -#: ../libgimpwidgets/gimpfileentry.c:443 ../libgimpwidgets/gimpquerybox.c:274 +#: ../libgimpwidgets/gimpcolorbutton.c:573 +#: ../libgimpwidgets/gimpfileentry.c:436 ../libgimpwidgets/gimpquerybox.c:274 #: ../libgimpwidgets/gimpquerybox.c:334 ../libgimpwidgets/gimpquerybox.c:398 -#: ../libgimpwidgets/gimpquerybox.c:472 ../libgimpwidgets/gimpunitmenu.c:497 +#: ../libgimpwidgets/gimpquerybox.c:472 ../libgimpwidgets/gimpunitmenu.c:493 msgid "_OK" msgstr "_OK" -#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:94 +#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:101 msgid "All files (*.*)" msgstr "Alla filer (*.*)" -#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:99 +#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:106 msgid "ICC color profile (*.icc, *.icm)" msgstr "ICC-färgprofil (*.icc, *.icm)" -#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:153 +#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:167 msgid "_Save" msgstr "_Spara" -#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:163 +#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:177 msgid "_Open" msgstr "_Öppna" -#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:325 -#: ../libgimpwidgets/gimppatheditor.c:266 +#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:339 +#: ../libgimpwidgets/gimppatheditor.c:270 msgid "Folder" msgstr "Mapp" -#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:330 +#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:344 msgid "Not a regular file." msgstr "Inte en vanlig fil." -#: ../libgimpwidgets/gimpcolorprofilestore.c:145 +#: ../libgimpwidgets/gimpcolorprofilestore.c:147 msgid "Select color profile from disk..." msgstr "Välj färgprofil från disk..." -#: ../libgimpwidgets/gimpcolorprofilestore.c:317 +#: ../libgimpwidgets/gimpcolorprofilestore.c:315 msgctxt "profile" msgid "None" msgstr "Ingen" -#: ../libgimpwidgets/gimpcolorprofileview.c:174 +#: ../libgimpwidgets/gimpcolorprofileview.c:170 msgid "Manufacturer: " msgstr "Tillverkare: " -#: ../libgimpwidgets/gimpcolorprofileview.c:186 +#: ../libgimpwidgets/gimpcolorprofileview.c:182 msgid "Copyright: " msgstr "Copyright: " -#: ../libgimpwidgets/gimpcolorscales.c:111 +#: ../libgimpwidgets/gimpcolorscales.c:205 msgid "Scales" msgstr "Skalor" -#: ../libgimpwidgets/gimpcolorselection.c:221 +#: ../libgimpwidgets/gimpcolorscales.c:437 +msgid "0..100" +msgstr "0..100" + +#: ../libgimpwidgets/gimpcolorscales.c:439 +msgid "0..255" +msgstr "0..255" + +#: ../libgimpwidgets/gimpcolorscales.c:460 +msgid "LCH" +msgstr "LCH" + +#: ../libgimpwidgets/gimpcolorscales.c:462 +msgid "HSV" +msgstr "NMI" + +#: ../libgimpwidgets/gimpcolorselection.c:222 msgid "Current:" msgstr "Nuvarande:" -#: ../libgimpwidgets/gimpcolorselection.c:230 +#: ../libgimpwidgets/gimpcolorselection.c:231 msgid "Old:" msgstr "Gammal:" -#: ../libgimpwidgets/gimpcolorselection.c:315 +#: ../libgimpwidgets/gimpcolorselection.c:316 msgid "" "Hexadecimal color notation as used in HTML and CSS. This entry also accepts " "CSS color names." @@ -1814,11 +1975,11 @@ msgstr "" "Hexadecimal färgnotation som används i HTML och CSS. Den här posten " "accepterar även CSS-färgnamn." -#: ../libgimpwidgets/gimpcolorselection.c:321 +#: ../libgimpwidgets/gimpcolorselection.c:322 msgid "HTML _notation:" msgstr "HTML-_notation:" -#: ../libgimpwidgets/gimpdialog.c:176 +#: ../libgimpwidgets/gimpdialog.c:182 msgid "_Help" msgstr "_Hjälp" @@ -1826,32 +1987,32 @@ msgstr "_Hjälp" msgid "Show file location in the file manager" msgstr "Visa filplats i filhanterare" -#: ../libgimpwidgets/gimpfileentry.c:230 +#: ../libgimpwidgets/gimpfileentry.c:223 msgid "Open a file selector to browse your folders" msgstr "Öppna en filväljare för att bläddra i dina mappar" -#: ../libgimpwidgets/gimpfileentry.c:231 +#: ../libgimpwidgets/gimpfileentry.c:224 msgid "Open a file selector to browse your files" msgstr "Öppna en filväljare för att bläddra i dina filer" -#: ../libgimpwidgets/gimpfileentry.c:243 +#: ../libgimpwidgets/gimpfileentry.c:236 msgid "Indicates whether or not the folder exists" msgstr "Indikerar huruvida mappen existerar eller ej" -#: ../libgimpwidgets/gimpfileentry.c:244 +#: ../libgimpwidgets/gimpfileentry.c:237 msgid "Indicates whether or not the file exists" msgstr "Indikerar huruvida filen existerar eller ej" -#: ../libgimpwidgets/gimpfileentry.c:404 +#: ../libgimpwidgets/gimpfileentry.c:397 #, c-format msgid "Can't show file in file manager: %s" msgstr "Kan inte visa filen i filhanterare: %s" -#: ../libgimpwidgets/gimpfileentry.c:431 +#: ../libgimpwidgets/gimpfileentry.c:424 msgid "Select Folder" msgstr "Välj mapp" -#: ../libgimpwidgets/gimpfileentry.c:433 +#: ../libgimpwidgets/gimpfileentry.c:426 msgid "Select File" msgstr "Välj fil" @@ -1859,139 +2020,139 @@ msgstr "Välj fil" msgid "Press F1 for more help" msgstr "Tryck på F1 för mer hjälp" -#: ../libgimpwidgets/gimpicons.c:61 +#: ../libgimpwidgets/gimpicons.c:62 msgid "Anchor" msgstr "Ankare" -#: ../libgimpwidgets/gimpicons.c:62 +#: ../libgimpwidgets/gimpicons.c:63 msgid "C_enter" msgstr "C_entrera" -#: ../libgimpwidgets/gimpicons.c:63 +#: ../libgimpwidgets/gimpicons.c:64 msgid "_Duplicate" msgstr "_Duplicera" -#: ../libgimpwidgets/gimpicons.c:64 +#: ../libgimpwidgets/gimpicons.c:65 msgid "Linked" msgstr "Länkad" -#: ../libgimpwidgets/gimpicons.c:65 +#: ../libgimpwidgets/gimpicons.c:66 msgid "Paste as New" msgstr "Klistra in som ny" -#: ../libgimpwidgets/gimpicons.c:66 +#: ../libgimpwidgets/gimpicons.c:67 msgid "Paste Into" msgstr "Klistra in i" -#: ../libgimpwidgets/gimpicons.c:68 +#: ../libgimpwidgets/gimpicons.c:69 msgid "Visible" msgstr "Synlig" -#: ../libgimpwidgets/gimpicons.c:104 ../libgimpwidgets/gimpicons.c:108 +#: ../libgimpwidgets/gimpicons.c:105 ../libgimpwidgets/gimpicons.c:109 msgid "_Stroke" msgstr "_Stryk" -#: ../libgimpwidgets/gimpicons.c:120 +#: ../libgimpwidgets/gimpicons.c:121 msgid "L_etter Spacing" msgstr "_Teckenmellanrum" -#: ../libgimpwidgets/gimpicons.c:121 +#: ../libgimpwidgets/gimpicons.c:122 msgid "L_ine Spacing" msgstr "_Radmellanrum" -#: ../libgimpwidgets/gimpicons.c:138 +#: ../libgimpwidgets/gimpicons.c:139 msgid "Re_size" msgstr "_Ändra storlek" -#: ../libgimpwidgets/gimpicons.c:139 ../libgimpwidgets/gimpicons.c:271 +#: ../libgimpwidgets/gimpicons.c:140 ../libgimpwidgets/gimpicons.c:272 msgid "_Scale" msgstr "_Skala" -#: ../libgimpwidgets/gimpicons.c:246 +#: ../libgimpwidgets/gimpicons.c:247 msgid "Cr_op" msgstr "B_eskär" -#: ../libgimpwidgets/gimpicons.c:254 +#: ../libgimpwidgets/gimpicons.c:255 msgid "_Select" msgstr "_Markera" -#: ../libgimpwidgets/gimpicons.c:266 +#: ../libgimpwidgets/gimpicons.c:267 msgid "_Transform" msgstr "_Transformera" -#: ../libgimpwidgets/gimpicons.c:272 +#: ../libgimpwidgets/gimpicons.c:273 msgid "_Shear" -msgstr "_Luta" +msgstr "_Skeva" -#: ../libgimpwidgets/gimpmemsizeentry.c:223 +#: ../libgimpwidgets/gimpmemsizeentry.c:219 msgid "Kilobytes" msgstr "kilobyte" -#: ../libgimpwidgets/gimpmemsizeentry.c:224 +#: ../libgimpwidgets/gimpmemsizeentry.c:220 msgid "Megabytes" msgstr "megabyte" -#: ../libgimpwidgets/gimpmemsizeentry.c:225 +#: ../libgimpwidgets/gimpmemsizeentry.c:221 msgid "Gigabytes" msgstr "gigabyte" #. Count label -#: ../libgimpwidgets/gimppageselector.c:270 -#: ../libgimpwidgets/gimppageselector.c:1067 +#: ../libgimpwidgets/gimppageselector.c:274 +#: ../libgimpwidgets/gimppageselector.c:1070 msgid "Nothing selected" msgstr "Ingenting markerat" -#: ../libgimpwidgets/gimppageselector.c:288 +#: ../libgimpwidgets/gimppageselector.c:292 msgid "Select _All" msgstr "Markera _allt" -#: ../libgimpwidgets/gimppageselector.c:308 +#: ../libgimpwidgets/gimppageselector.c:312 msgid "Select _range:" msgstr "Välj _intervall:" -#: ../libgimpwidgets/gimppageselector.c:320 +#: ../libgimpwidgets/gimppageselector.c:324 msgid "Open _pages as" msgstr "Öppna _sidor som" -#: ../libgimpwidgets/gimppageselector.c:449 -#: ../libgimpwidgets/gimppageselector.c:647 +#: ../libgimpwidgets/gimppageselector.c:452 +#: ../libgimpwidgets/gimppageselector.c:650 #, c-format msgid "Page %d" msgstr "Sida %d" -#: ../libgimpwidgets/gimppageselector.c:1072 +#: ../libgimpwidgets/gimppageselector.c:1075 msgid "One page selected" msgstr "En sida markerad" -#: ../libgimpwidgets/gimppageselector.c:1079 -#: ../libgimpwidgets/gimppageselector.c:1083 +#: ../libgimpwidgets/gimppageselector.c:1082 +#: ../libgimpwidgets/gimppageselector.c:1086 #, c-format msgid "%d page selected" msgid_plural "All %d pages selected" msgstr[0] "%d sida markerad" msgstr[1] "Alla %d sidor markerade" -#: ../libgimpwidgets/gimppatheditor.c:180 +#: ../libgimpwidgets/gimppatheditor.c:181 msgid "Add a new folder" msgstr "Lägg till en ny mapp" -#: ../libgimpwidgets/gimppatheditor.c:197 +#: ../libgimpwidgets/gimppatheditor.c:199 msgid "Move the selected folder up" msgstr "Flytta den valda mappen uppåt" -#: ../libgimpwidgets/gimppatheditor.c:214 +#: ../libgimpwidgets/gimppatheditor.c:217 msgid "Move the selected folder down" msgstr "Flytta den valda mappen nedåt" -#: ../libgimpwidgets/gimppatheditor.c:231 +#: ../libgimpwidgets/gimppatheditor.c:235 msgid "Remove the selected folder from the list" msgstr "Ta bort den valda mappen från listan" -#: ../libgimpwidgets/gimppatheditor.c:257 +#: ../libgimpwidgets/gimppatheditor.c:261 msgid "Writable" msgstr "Skrivbar" -#: ../libgimpwidgets/gimppickbutton.c:110 +#: ../libgimpwidgets/gimppickbutton.c:112 msgid "" "Click the eyedropper, then click a color anywhere on your screen to select " "that color." @@ -2000,7 +2161,7 @@ msgstr "" "att välja den färgen." #. toggle button to (de)activate the instant preview -#: ../libgimpwidgets/gimppreview.c:291 +#: ../libgimpwidgets/gimppreview.c:293 msgid "_Preview" msgstr "_Förhandsgranska" @@ -2008,30 +2169,30 @@ msgstr "_Förhandsgranska" msgid "Check Size" msgstr "Rutstorlek" -#: ../libgimpwidgets/gimppreviewarea.c:133 +#: ../libgimpwidgets/gimppreviewarea.c:134 msgid "Check Style" msgstr "Rutstil" -#: ../libgimpwidgets/gimppropwidgets.c:2111 +#: ../libgimpwidgets/gimppropwidgets.c:2177 #, c-format msgid "This text input field is limited to %d character." msgid_plural "This text input field is limited to %d characters." msgstr[0] "Det här textinmatningsfältet är begränsat till %d tecken." msgstr[1] "Det här textinmatningsfältet är begränsat till %d tecken." -#: ../libgimpwidgets/gimpunitmenu.c:265 +#: ../libgimpwidgets/gimpunitmenu.c:261 msgid "More..." msgstr "Mer..." -#: ../libgimpwidgets/gimpunitmenu.c:491 +#: ../libgimpwidgets/gimpunitmenu.c:487 msgid "Unit Selection" msgstr "Enhetsval" -#: ../libgimpwidgets/gimpunitmenu.c:540 +#: ../libgimpwidgets/gimpunitmenu.c:536 msgid "Unit" msgstr "Enhet" -#: ../libgimpwidgets/gimpunitmenu.c:544 +#: ../libgimpwidgets/gimpunitmenu.c:540 msgid "Factor" msgstr "Faktor" @@ -2040,8 +2201,8 @@ msgid "" "Use this value for random number generator seed - this allows you to repeat " "a given \"random\" operation" msgstr "" -"Använd detta värde för generering av slumptalsfrö - det låter dig upprepa en " -"given ”slumpfunktion”" +"Använd detta värde för generering av slumptalsfrö - detta låter dig upprepa " +"en given ”slumpfunktion”" #: ../libgimpwidgets/gimpwidgets.c:525 msgid "_New Seed" @@ -2055,17 +2216,17 @@ msgstr "Skapa slumptalsfrö till slumptalsgeneratorn med ett genererat slumptal" msgid "_Randomize" msgstr "_Slumpa" -#: ../libgimpwidgets/gimpwidgets-private.c:47 +#: ../libgimpwidgets/gimpwidgets-private.c:50 msgctxt "input-mode" msgid "Disabled" msgstr "Inaktiverad" -#: ../libgimpwidgets/gimpwidgets-private.c:48 +#: ../libgimpwidgets/gimpwidgets-private.c:51 msgctxt "input-mode" msgid "Screen" msgstr "Skärm" -#: ../libgimpwidgets/gimpwidgets-private.c:49 +#: ../libgimpwidgets/gimpwidgets-private.c:52 msgctxt "input-mode" msgid "Window" msgstr "Fönster" @@ -2085,85 +2246,135 @@ msgctxt "aspect-type" msgid "Landscape" msgstr "Landskap" -#: ../libgimpwidgets/gimpwidgetsenums.c:126 +#: ../libgimpwidgets/gimpwidgetsenums.c:129 +#: ../libgimpwidgets/gimpwidgetsenums.c:138 msgctxt "color-selector-channel" msgid "_H" msgstr "_N" -#: ../libgimpwidgets/gimpwidgetsenums.c:126 -msgid "Hue" -msgstr "Nyans" +#: ../libgimpwidgets/gimpwidgetsenums.c:129 +msgid "HSV Hue" +msgstr "NMI-nyans" -#: ../libgimpwidgets/gimpwidgetsenums.c:127 +#: ../libgimpwidgets/gimpwidgetsenums.c:130 msgctxt "color-selector-channel" msgid "_S" msgstr "_M" -#: ../libgimpwidgets/gimpwidgetsenums.c:127 -msgid "Saturation" -msgstr "Mättnad" +#: ../libgimpwidgets/gimpwidgetsenums.c:130 +msgid "HSV Saturation" +msgstr "NMI-mättnad" -#: ../libgimpwidgets/gimpwidgetsenums.c:128 +#: ../libgimpwidgets/gimpwidgetsenums.c:131 msgctxt "color-selector-channel" msgid "_V" msgstr "_I" -#: ../libgimpwidgets/gimpwidgetsenums.c:128 -msgid "Value" -msgstr "Intensitet" +#: ../libgimpwidgets/gimpwidgetsenums.c:131 +msgid "HSV Value" +msgstr "NMI-intensitet" -#: ../libgimpwidgets/gimpwidgetsenums.c:129 +#: ../libgimpwidgets/gimpwidgetsenums.c:132 msgctxt "color-selector-channel" msgid "_R" msgstr "_R" -#: ../libgimpwidgets/gimpwidgetsenums.c:129 +#: ../libgimpwidgets/gimpwidgetsenums.c:132 msgid "Red" msgstr "Röd" -#: ../libgimpwidgets/gimpwidgetsenums.c:130 +#: ../libgimpwidgets/gimpwidgetsenums.c:133 msgctxt "color-selector-channel" msgid "_G" msgstr "_G" -#: ../libgimpwidgets/gimpwidgetsenums.c:130 +#: ../libgimpwidgets/gimpwidgetsenums.c:133 msgid "Green" msgstr "Grön" -#: ../libgimpwidgets/gimpwidgetsenums.c:131 +#: ../libgimpwidgets/gimpwidgetsenums.c:134 msgctxt "color-selector-channel" msgid "_B" msgstr "_B" -#: ../libgimpwidgets/gimpwidgetsenums.c:131 +#: ../libgimpwidgets/gimpwidgetsenums.c:134 msgid "Blue" msgstr "Blå" -#: ../libgimpwidgets/gimpwidgetsenums.c:132 +#: ../libgimpwidgets/gimpwidgetsenums.c:135 msgctxt "color-selector-channel" msgid "_A" msgstr "_A" -#: ../libgimpwidgets/gimpwidgetsenums.c:132 +#: ../libgimpwidgets/gimpwidgetsenums.c:135 msgid "Alpha" msgstr "Alfa" -#: ../libgimpwidgets/gimpwidgetsenums.c:161 +#: ../libgimpwidgets/gimpwidgetsenums.c:136 +msgctxt "color-selector-channel" +msgid "_L" +msgstr "_L" + +#: ../libgimpwidgets/gimpwidgetsenums.c:136 +msgid "LCH Lightness" +msgstr "LCH-ljushet" + +#: ../libgimpwidgets/gimpwidgetsenums.c:137 +msgctxt "color-selector-channel" +msgid "_C" +msgstr "_C" + +#: ../libgimpwidgets/gimpwidgetsenums.c:137 +msgid "LCH Chroma" +msgstr "LCH-krominans" + +#: ../libgimpwidgets/gimpwidgetsenums.c:138 +msgid "LCH Hue" +msgstr "LCH-nyans" + +#: ../libgimpwidgets/gimpwidgetsenums.c:168 +msgctxt "color-selector-model" +msgid "RGB" +msgstr "RGB" + +#: ../libgimpwidgets/gimpwidgetsenums.c:168 +msgid "RGB color model" +msgstr "RGB-färgmodell" + +#: ../libgimpwidgets/gimpwidgetsenums.c:169 +msgctxt "color-selector-model" +msgid "LCH" +msgstr "LCH" + +#: ../libgimpwidgets/gimpwidgetsenums.c:169 +msgid "CIELCh color model" +msgstr "CIELCh-färgmodell" + +#: ../libgimpwidgets/gimpwidgetsenums.c:170 +msgctxt "color-selector-model" +msgid "HSV" +msgstr "NMI" + +#: ../libgimpwidgets/gimpwidgetsenums.c:170 +msgid "HSV color model" +msgstr "NMI-färgmodell" + +#: ../libgimpwidgets/gimpwidgetsenums.c:199 msgctxt "page-selector-target" msgid "Layers" msgstr "Lager" -#: ../libgimpwidgets/gimpwidgetsenums.c:162 +#: ../libgimpwidgets/gimpwidgetsenums.c:200 msgctxt "page-selector-target" msgid "Images" msgstr "Bilder" -#: ../libgimpwidgets/gimpwidgetsenums.c:223 +#: ../libgimpwidgets/gimpwidgetsenums.c:261 msgctxt "zoom-type" msgid "Zoom in" msgstr "Zooma in" -#: ../libgimpwidgets/gimpwidgetsenums.c:224 +#: ../libgimpwidgets/gimpwidgetsenums.c:262 msgctxt "zoom-type" msgid "Zoom out" msgstr "Zooma ut" @@ -2235,7 +2446,7 @@ msgstr "Tryck" #: ../modules/color-selector-wheel.c:72 msgid "HSV color wheel" -msgstr "HSV-färghjul" +msgstr "NMI-färghjul" #: ../modules/color-selector-wheel.c:104 msgid "Wheel" @@ -2579,6 +2790,78 @@ msgstr "GIMP" msgid "GIMP MIDI Input Controller" msgstr "MIDI-inmatningskontroller för GIMP" +#: ../modules/display-filter-clip-warning.c:120 +msgid "Clip warning color display filter" +msgstr "Klippvarningsfärgvisningsfilter" + +#: ../modules/display-filter-clip-warning.c:157 +msgid "Show shadows" +msgstr "Visa skuggor" + +#: ../modules/display-filter-clip-warning.c:158 +msgid "Show warning for pixels with a negative component" +msgstr "Visa varning för bildpunkter med en negativ komponent" + +#: ../modules/display-filter-clip-warning.c:164 +msgid "Shadows color" +msgstr "Skuggfärg" + +#: ../modules/display-filter-clip-warning.c:165 +msgid "Shadows warning color" +msgstr "Varningsfärg för skuggor" + +#: ../modules/display-filter-clip-warning.c:177 +msgid "Show highlights" +msgstr "Visa högdagrar" + +#: ../modules/display-filter-clip-warning.c:178 +msgid "Show warning for pixels with a component greater than one" +msgstr "Visa varning för bildpunkter med en komponent som är större än ett" + +#: ../modules/display-filter-clip-warning.c:184 +msgid "Highlights color" +msgstr "Högdagerfärg" + +#: ../modules/display-filter-clip-warning.c:185 +msgid "Highlights warning color" +msgstr "Varningsfärg för högdagrar" + +#: ../modules/display-filter-clip-warning.c:197 +msgid "Show bogus" +msgstr "Visa felaktiga" + +#: ../modules/display-filter-clip-warning.c:198 +msgid "Show warning for pixels with an infinite or NaN component" +msgstr "Visa varning för bildpunkter med en komponent som är oändlig eller NaN" + +#: ../modules/display-filter-clip-warning.c:204 +msgid "Bogus color" +msgstr "Felaktig färg" + +#: ../modules/display-filter-clip-warning.c:205 +msgid "Bogus warning color" +msgstr "Varningsfärg för felaktigheter" + +#: ../modules/display-filter-clip-warning.c:217 +msgid "Include alpha component" +msgstr "Inkludera alfakomponent" + +#: ../modules/display-filter-clip-warning.c:218 +msgid "Include alpha component in the warning" +msgstr "Inkludera alfakomponent i varningen" + +#: ../modules/display-filter-clip-warning.c:224 +msgid "Include transparent pixels" +msgstr "Inkludera transparenta bildpunkter" + +#: ../modules/display-filter-clip-warning.c:225 +msgid "Include fully transparent pixels in the warning" +msgstr "Inkludera helt transparenta bildpunkter i varningen" + +#: ../modules/display-filter-clip-warning.c:229 +msgid "Clip Warning" +msgstr "Klippvarning" + #: ../modules/display-filter-color-blind.c:68 msgid "Protanopia (insensitivity to red)" msgstr "Protanopi (okänslighet för rött)" @@ -2591,119 +2874,117 @@ msgstr "Deuteranopi (okänslighet för grönt)" msgid "Tritanopia (insensitivity to blue)" msgstr "Tritanopi (okänslighet för blått)" -#: ../modules/display-filter-color-blind.c:195 +#: ../modules/display-filter-color-blind.c:194 msgid "Color deficit simulation filter (Brettel-Vienot-Mollon algorithm)" msgstr "" "Simulationsfilter för färgbristfällighet (Brettel-Vienot-Mollon-algoritm)" -#: ../modules/display-filter-color-blind.c:254 -msgid "Deficiency" -msgstr "Bristfällighet" +#: ../modules/display-filter-color-blind.c:253 +msgid "Type" +msgstr "Typ" -#: ../modules/display-filter-color-blind.c:260 +#: ../modules/display-filter-color-blind.c:254 +msgid "Color vision deficiency type" +msgstr "Typ av färgseendebristfällighet" + +#: ../modules/display-filter-color-blind.c:259 msgid "Color Deficient Vision" msgstr "Färgsynskada" -#: ../modules/display-filter-color-blind.c:421 -msgid "Color _deficiency type:" -msgstr "Typ av färg_bristfällighet:" - -#: ../modules/display-filter-gamma.c:87 +#: ../modules/display-filter-gamma.c:86 msgid "Gamma color display filter" msgstr "Gammafärgvisningsfilter" -#: ../modules/display-filter-gamma.c:124 ../modules/display-filter-gamma.c:129 +#: ../modules/display-filter-gamma.c:123 ../modules/display-filter-gamma.c:128 msgid "Gamma" msgstr "Gamma" -#: ../modules/display-filter-gamma.c:226 -msgid "_Gamma:" -msgstr "_Gamma:" - -#: ../modules/display-filter-high-contrast.c:87 +#: ../modules/display-filter-high-contrast.c:86 msgid "High Contrast color display filter" msgstr "Färgvisningsfilter, högkontrast" -#: ../modules/display-filter-high-contrast.c:124 -#: ../modules/display-filter-high-contrast.c:129 +#: ../modules/display-filter-high-contrast.c:123 +msgid "Contrast cycles" +msgstr "Kontrastcykler" + +#: ../modules/display-filter-high-contrast.c:128 msgid "Contrast" msgstr "Kontrast" -#: ../modules/display-filter-high-contrast.c:226 -msgid "Contrast c_ycles:" -msgstr "Kontrastc_ykler:" +#~ msgid "RGB" +#~ msgstr "RGB" -#: ../modules/display-filter-lcms.c:92 -msgid "Color management display filter using ICC color profiles" -msgstr "Visningsfilter för färghantering med ICC-färgprofiler" +#~ msgctxt "desaturate-mode" +#~ msgid "Average" +#~ msgstr "Medel" -#: ../modules/display-filter-lcms.c:124 -msgid "Color Management" -msgstr "Färghantering" +#~ msgctxt "select-criterion" +#~ msgid "Hue" +#~ msgstr "Nyans" -#: ../modules/display-filter-lcms.c:173 -msgid "" -"This filter takes its configuration from the Color Management section in the " -"Preferences dialog." -msgstr "" -"Det här filtret tar sin konfiguration från sektionen Färghantering i " -"inställningsdialogrutan." +#~ msgid "Hue" +#~ msgstr "Nyans" -#: ../modules/display-filter-lcms.c:187 -msgid "Mode of operation:" -msgstr "Operationsläge:" +#~ msgid "Deficiency" +#~ msgstr "Bristfällighet" -#: ../modules/display-filter-lcms.c:194 -msgid "Image profile:" -msgstr "Bildprofil:" +#~ msgid "_Gamma:" +#~ msgstr "_Gamma:" -#: ../modules/display-filter-lcms.c:202 -msgid "Monitor profile:" -msgstr "Skärmprofil:" +#~ msgid "Color management display filter using ICC color profiles" +#~ msgstr "Visningsfilter för färghantering med ICC-färgprofiler" -#: ../modules/display-filter-lcms.c:210 -msgid "Print simulation profile:" -msgstr "Profil för utskriftssimulering:" +#~ msgid "Color Management" +#~ msgstr "Färghantering" -#: ../modules/display-filter-lcms.c:364 -msgid "None" -msgstr "Ingen" +#~ msgid "" +#~ "This filter takes its configuration from the Color Management section in " +#~ "the Preferences dialog." +#~ msgstr "" +#~ "Det här filtret tar sin konfiguration från sektionen Färghantering i " +#~ "inställningsdialogrutan." -#: ../modules/display-filter-proof.c:91 -msgid "Color proof filter using ICC color profile" -msgstr "Färgprovfilter med ICC-färgprofil" +#~ msgid "Mode of operation:" +#~ msgstr "Operationsläge:" -#: ../modules/display-filter-proof.c:129 -msgid "Intent" -msgstr "Återgivning" +#~ msgid "Image profile:" +#~ msgstr "Bildprofil:" -#: ../modules/display-filter-proof.c:137 -msgid "Black point compensation" -msgstr "Svartpunktskompensering" +#~ msgid "Monitor profile:" +#~ msgstr "Skärmprofil:" -#: ../modules/display-filter-proof.c:144 -msgid "Profile" -msgstr "Profil" +#~ msgid "Print simulation profile:" +#~ msgstr "Profil för utskriftssimulering:" -#: ../modules/display-filter-proof.c:149 -msgid "Color Proof" -msgstr "Färgprov" +#~ msgid "None" +#~ msgstr "Ingen" -#: ../modules/display-filter-proof.c:292 -msgid "Choose an ICC Color Profile" -msgstr "Välj en ICC-färgprofil" +#~ msgid "Color proof filter using ICC color profile" +#~ msgstr "Färgprovfilter med ICC-färgprofil" -#: ../modules/display-filter-proof.c:316 -msgid "_Profile:" -msgstr "_Profil:" +#~ msgid "Intent" +#~ msgstr "Återgivning" -#: ../modules/display-filter-proof.c:322 -msgid "_Intent:" -msgstr "_Återgivning:" +#~ msgid "Black point compensation" +#~ msgstr "Svartpunktskompensering" -#: ../modules/display-filter-proof.c:327 -msgid "_Black Point Compensation" -msgstr "_Svartpunktskompensering" +#~ msgid "Profile" +#~ msgstr "Profil" + +#~ msgid "Color Proof" +#~ msgstr "Färgprov" + +#~ msgid "Choose an ICC Color Profile" +#~ msgstr "Välj en ICC-färgprofil" + +#~ msgid "_Profile:" +#~ msgstr "_Profil:" + +#~ msgid "_Intent:" +#~ msgstr "_Återgivning:" + +#~ msgid "_Black Point Compensation" +#~ msgstr "_Svartpunktskompensering" #~ msgid "_Edit" #~ msgstr "_Redigera" diff --git a/po-plug-ins/fr.po b/po-plug-ins/fr.po index 4c0fe68a1b..faa2340cc7 100644 --- a/po-plug-ins/fr.po +++ b/po-plug-ins/fr.po @@ -13,16 +13,16 @@ # Stéphane Raimbault , 2007. # Jean-Luc Coulon , 2007. # Claude Paroz , 2008-2011, 2016, 2018. -# Julien Hardelin , 2004-2009, 2011, 2016, 2017, 2018. +# Julien Hardelin , 2004-2009, 2011, 2016-2018. # msgid "" msgstr "" "Project-Id-Version: gimp-plugins HEAD fr\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=Internationalisation\n" -"POT-Creation-Date: 2018-01-10 02:53+0000\n" -"PO-Revision-Date: 2018-01-11 11:19+0100\n" -"Last-Translator: Julien Hardelin \n" +"POT-Creation-Date: 2018-04-01 12:57+0000\n" +"PO-Revision-Date: 2018-04-01 16:21+0100\n" +"Last-Translator: julien \n" "Language-Team: GNOME French Team \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -59,6 +59,7 @@ msgstr "Aligner les calques visibles" #: ../plug-ins/common/destripe.c:444 ../plug-ins/common/edge-dog.c:306 #: ../plug-ins/common/edge-neon.c:700 ../plug-ins/common/emboss.c:453 #: ../plug-ins/common/file-cel.c:936 ../plug-ins/common/file-gif-save.c:1089 +#: ../plug-ins/common/file-jp2-load.c:949 #: ../plug-ins/common/file-pdf-load.c:707 #: ../plug-ins/common/file-pdf-load.c:1272 #: ../plug-ins/common/file-pdf-save.c:1009 ../plug-ins/common/file-ps.c:3392 @@ -108,8 +109,8 @@ msgstr "Aligner les calques visibles" #: ../plug-ins/map-object/map-object-ui.c:1333 #: ../plug-ins/metadata/metadata-editor.c:547 #: ../plug-ins/metadata/metadata-editor.c:765 -#: ../plug-ins/metadata/metadata-editor.c:5644 -#: ../plug-ins/metadata/metadata-editor.c:5679 +#: ../plug-ins/metadata/metadata-editor.c:5648 +#: ../plug-ins/metadata/metadata-editor.c:5683 #: ../plug-ins/pagecurl/pagecurl.c:439 ../plug-ins/screenshot/screenshot.c:486 #: ../plug-ins/selection-to-path/selection-to-path.c:309 msgid "_Cancel" @@ -286,7 +287,7 @@ msgstr "Optimisation de l’animation" #: ../plug-ins/common/animation-play.c:210 msgid "Preview a GIMP layer-based animation" -msgstr "Aperçu d’une animation basée sur les calques GIMP" +msgstr "Aperçu d’une animation fondée sur les calques GIMP" #: ../plug-ins/common/animation-play.c:215 msgid "_Playback..." @@ -451,10 +452,10 @@ msgstr "_Vertical" #: ../plug-ins/common/blinds.c:277 ../plug-ins/common/compose.c:1022 #: ../plug-ins/common/decompose.c:607 ../plug-ins/common/file-cel.c:441 #: ../plug-ins/common/file-cel.c:446 ../plug-ins/common/file-dicom.c:611 -#: ../plug-ins/common/file-gegl.c:414 ../plug-ins/common/file-gif-load.c:980 -#: ../plug-ins/common/file-jp2-load.c:395 ../plug-ins/common/file-pcx.c:445 +#: ../plug-ins/common/file-gegl.c:428 ../plug-ins/common/file-gif-load.c:980 +#: ../plug-ins/common/file-jp2-load.c:1275 ../plug-ins/common/file-pcx.c:445 #: ../plug-ins/common/file-pcx.c:453 ../plug-ins/common/file-pix.c:400 -#: ../plug-ins/common/file-png.c:1066 ../plug-ins/common/file-pnm.c:685 +#: ../plug-ins/common/file-png.c:1079 ../plug-ins/common/file-pnm.c:685 #: ../plug-ins/common/file-raw-data.c:1392 #: ../plug-ins/common/file-sunras.c:1049 ../plug-ins/common/file-tga.c:1097 #: ../plug-ins/common/file-xbm.c:904 ../plug-ins/common/film.c:745 @@ -463,7 +464,7 @@ msgstr "_Vertical" #: ../plug-ins/file-faxg3/faxg3.c:525 ../plug-ins/file-fits/fits.c:529 #: ../plug-ins/file-jpeg/jpeg-load.c:240 #: ../plug-ins/file-psd/psd-image-res-load.c:1033 -#: ../plug-ins/file-psd/psd-load.c:1816 ../plug-ins/file-sgi/sgi.c:411 +#: ../plug-ins/file-psd/psd-load.c:1821 ../plug-ins/file-sgi/sgi.c:411 #: ../plug-ins/file-tiff/file-tiff-load.c:924 #: ../plug-ins/file-webp/file-webp-load.c:149 #: ../plug-ins/gfig/gfig-dialog.c:1321 ../plug-ins/gimpressionist/general.c:139 @@ -631,7 +632,7 @@ msgstr "Fonction Delta échelonnée" #: ../plug-ins/common/cml-explorer.c:140 msgid "sin^p-based function" -msgstr "Fonction basée sur sin^p" +msgstr "Fonction fondée sur sin^p" #: ../plug-ins/common/cml-explorer.c:141 msgid "sin^p, stepped" @@ -834,6 +835,7 @@ msgstr "Germe aléatoire" #: ../plug-ins/common/cml-explorer.c:1269 #: ../plug-ins/common/cml-explorer.c:2120 ../plug-ins/common/curve-bend.c:1488 #: ../plug-ins/common/curve-bend.c:2066 ../plug-ins/common/file-cel.c:937 +#: ../plug-ins/common/file-jp2-load.c:950 #: ../plug-ins/common/file-raw-data.c:1834 ../plug-ins/common/qbist.c:721 #: ../plug-ins/common/qbist.c:885 ../plug-ins/common/sphere-designer.c:2210 #: ../plug-ins/common/sphere-designer.c:2610 ../plug-ins/file-fits/fits.c:1151 @@ -1050,14 +1052,14 @@ msgstr "Enregistrez les paramètres de la fractale CML" #: ../plug-ins/common/cml-explorer.c:2038 ../plug-ins/common/curve-bend.c:839 #: ../plug-ins/common/file-dicom.c:1371 ../plug-ins/common/file-mng.c:648 #: ../plug-ins/common/file-mng.c:985 ../plug-ins/common/file-pcx.c:854 -#: ../plug-ins/common/file-pdf-save.c:468 ../plug-ins/common/file-png.c:1562 +#: ../plug-ins/common/file-pdf-save.c:468 ../plug-ins/common/file-png.c:1582 #: ../plug-ins/common/file-raw-data.c:1192 #: ../plug-ins/common/file-raw-data.c:1220 ../plug-ins/common/file-sunras.c:610 #: ../plug-ins/common/file-tga.c:1208 ../plug-ins/common/file-xmc.c:1490 #: ../plug-ins/common/sphere-designer.c:2121 #: ../plug-ins/file-bmp/bmp-save.c:318 ../plug-ins/file-fits/fits.c:481 -#: ../plug-ins/file-fli/fli-gimp.c:750 ../plug-ins/file-ico/ico-save.c:1082 -#: ../plug-ins/file-jpeg/jpeg-save.c:328 ../plug-ins/file-psd/psd-save.c:1581 +#: ../plug-ins/file-fli/fli-gimp.c:750 ../plug-ins/file-ico/ico-save.c:1087 +#: ../plug-ins/file-jpeg/jpeg-save.c:328 ../plug-ins/file-psd/psd-save.c:1608 #: ../plug-ins/file-tiff/file-tiff-save.c:644 ../plug-ins/flame/flame.c:442 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1548 #: ../plug-ins/gfig/gfig.c:794 ../plug-ins/ifs-compose/ifs-compose.c:2390 @@ -1078,10 +1080,8 @@ msgstr "Chargez les paramètres de la fractale CML" #: ../plug-ins/common/cml-explorer.c:2211 ../plug-ins/common/curve-bend.c:891 #: ../plug-ins/common/file-cel.c:300 ../plug-ins/common/file-cel.c:351 #: ../plug-ins/common/file-cel.c:582 ../plug-ins/common/file-dicom.c:342 -#: ../plug-ins/common/file-gif-load.c:361 -#: ../plug-ins/common/file-jp2-load.c:234 -#: ../plug-ins/common/file-jp2-load.c:243 ../plug-ins/common/file-mng.c:1158 -#: ../plug-ins/common/file-pcx.c:375 ../plug-ins/common/file-png.c:914 +#: ../plug-ins/common/file-gif-load.c:361 ../plug-ins/common/file-mng.c:1158 +#: ../plug-ins/common/file-pcx.c:375 ../plug-ins/common/file-png.c:927 #: ../plug-ins/common/file-ps.c:1071 ../plug-ins/common/file-ps.c:3342 #: ../plug-ins/common/file-psp.c:1772 ../plug-ins/common/file-psp.c:1826 #: ../plug-ins/common/file-raw-data.c:477 @@ -1390,6 +1390,7 @@ msgid "CMY" msgstr "Trichromie" #: ../plug-ins/common/compose.c:231 ../plug-ins/common/decompose.c:198 +#: ../plug-ins/common/file-jp2-load.c:985 msgid "CMYK" msgstr "CMJN" @@ -1948,7 +1949,7 @@ msgstr "" #: ../plug-ins/common/depth-merge.c:183 msgid "Combine two images using depth maps (z-buffers)" -msgstr "Combiner deux images en utilisant les cartes de profondeur (z-buffers)" +msgstr "Combine deux images en utilisant les cartes de profondeur (z-buffers)" #: ../plug-ins/common/depth-merge.c:192 msgid "_Depth Merge..." @@ -2209,11 +2210,11 @@ msgstr "EOF ou erreur lors de la lecture de l’en-tête d’image" #. * Open the file for reading... #. #: ../plug-ins/common/file-cel.c:342 ../plug-ins/common/file-dicom.c:334 -#: ../plug-ins/common/file-gbr.c:364 ../plug-ins/common/file-gegl.c:298 +#: ../plug-ins/common/file-gbr.c:364 ../plug-ins/common/file-gegl.c:312 #: ../plug-ins/common/file-gif-load.c:353 ../plug-ins/common/file-gih.c:679 -#: ../plug-ins/common/file-jp2-load.c:227 ../plug-ins/common/file-pat.c:336 +#: ../plug-ins/common/file-jp2-load.c:1064 ../plug-ins/common/file-pat.c:336 #: ../plug-ins/common/file-pcx.c:367 ../plug-ins/common/file-pdf-load.c:1043 -#: ../plug-ins/common/file-pix.c:357 ../plug-ins/common/file-png.c:906 +#: ../plug-ins/common/file-pix.c:357 ../plug-ins/common/file-png.c:919 #: ../plug-ins/common/file-pnm.c:566 ../plug-ins/common/file-ps.c:1063 #: ../plug-ins/common/file-raw-data.c:1294 ../plug-ins/common/file-sunras.c:429 #: ../plug-ins/common/file-tga.c:438 ../plug-ins/common/file-wmf.c:984 @@ -2303,13 +2304,13 @@ msgstr "« %s » : EOF ou erreur lors de la lecture des données de palette" #: ../plug-ins/common/file-gif-save.c:865 ../plug-ins/common/file-gih.c:1305 #: ../plug-ins/common/file-html-table.c:236 ../plug-ins/common/file-pat.c:535 #: ../plug-ins/common/file-pcx.c:743 ../plug-ins/common/file-pix.c:537 -#: ../plug-ins/common/file-png.c:1555 ../plug-ins/common/file-pnm.c:1246 +#: ../plug-ins/common/file-png.c:1575 ../plug-ins/common/file-pnm.c:1246 #: ../plug-ins/common/file-ps.c:1236 ../plug-ins/common/file-sunras.c:602 #: ../plug-ins/common/file-tga.c:1202 ../plug-ins/common/file-xbm.c:1033 -#: ../plug-ins/common/file-xpm.c:660 ../plug-ins/common/file-xwd.c:652 +#: ../plug-ins/common/file-xpm.c:663 ../plug-ins/common/file-xwd.c:652 #: ../plug-ins/file-bmp/bmp-save.c:310 ../plug-ins/file-fits/fits.c:473 -#: ../plug-ins/file-fli/fli-gimp.c:718 ../plug-ins/file-ico/ico-save.c:1076 -#: ../plug-ins/file-jpeg/jpeg-save.c:285 ../plug-ins/file-psd/psd-save.c:1552 +#: ../plug-ins/file-fli/fli-gimp.c:718 ../plug-ins/file-ico/ico-save.c:1081 +#: ../plug-ins/file-jpeg/jpeg-save.c:285 ../plug-ins/file-psd/psd-save.c:1579 #: ../plug-ins/file-sgi/sgi.c:579 ../plug-ins/file-tiff/file-tiff-save.c:317 #, c-format msgid "Exporting '%s'" @@ -2471,11 +2472,15 @@ msgstr "Description :" msgid "Spacing:" msgstr "Espacement :" -#: ../plug-ins/common/file-gegl.c:73 ../plug-ins/file-exr/file-exr.c:86 +#: ../plug-ins/common/file-gegl.c:73 +msgid "Radiance RGBE" +msgstr "Radiance RVBE" + +#: ../plug-ins/common/file-gegl.c:87 ../plug-ins/file-exr/file-exr.c:86 msgid "OpenEXR image" msgstr "Image OpenEXR" -#: ../plug-ins/common/file-gegl.c:322 +#: ../plug-ins/common/file-gegl.c:336 #, c-format msgid "Could not open '%s'" msgstr "Impossible d’ouvrir « %s »" @@ -2808,86 +2813,98 @@ msgstr "_Espacement des cellules :" msgid "The amount of cell spacing." msgstr "Importance de l’espacement entre les cellules." -#: ../plug-ins/common/file-jp2-load.c:98 +#: ../plug-ins/common/file-jp2-load.c:154 msgid "JPEG 2000 image" msgstr "Image JPEG 2000" -#: ../plug-ins/common/file-jp2-load.c:252 -#, c-format -msgid "Couldn't decode '%s'." -msgstr "Impossible de décoder « %s »." +#: ../plug-ins/common/file-jp2-load.c:185 +msgid "JPEG 2000 codestream" +msgstr "Codestream JPEG 2000" -#: ../plug-ins/common/file-jp2-load.c:275 -#, c-format -msgid "The image '%s' is in grayscale but does not contain any gray component." -msgstr "" -"L’image « %s » est en niveaux de gris mais ne contient aucune composante de " -"gris." +#. Can be RGB, YUV and YCC. +#. Can be RGB, YUV and YCC with alpha or CMYK. +#: ../plug-ins/common/file-jp2-load.c:974 +#: ../plug-ins/common/file-jp2-load.c:982 +msgid "sRGB" +msgstr "sRVB" -#: ../plug-ins/common/file-jp2-load.c:302 -#, c-format -msgid "The image '%s' is in RGB, but is missing some of the components." -msgstr "L’image « %s » est en RVB mais certaines composantes sont absentes." +#: ../plug-ins/common/file-jp2-load.c:975 +#: ../plug-ins/common/file-jp2-load.c:983 +msgid "YCbCr" +msgstr "Y’CbCr" -#: ../plug-ins/common/file-jp2-load.c:328 -#, c-format -msgid "" -"The image '%s' is in the CIEXYZ color space, but there is no code in place " -"to convert it to RGB." -msgstr "" -"L’image « %s » est dans l’espace colorimétrique CIEXYZ mais aucun code n’est " -"présent pour la convertir en RVB." +#: ../plug-ins/common/file-jp2-load.c:976 +#: ../plug-ins/common/file-jp2-load.c:984 +msgid "xvYCC" +msgstr "xvYCC" -#: ../plug-ins/common/file-jp2-load.c:335 +#: ../plug-ins/common/file-jp2-load.c:991 #, c-format -msgid "" -"The image '%s' is in the CIELAB color space, but there is no code in place " -"to convert it to RGB." -msgstr "" -"L’image « %s » est dans l’espace colorimétrique CIELAB mais aucun code n’est " -"présent pour la convertir en RVB." +msgid "Unsupported JPEG 2000%s '%s' with %d components." +msgstr "JPEG 2000%s « %s » avec %d composants n’est pas accepté." -#: ../plug-ins/common/file-jp2-load.c:342 -#, c-format -msgid "" -"The image '%s' is in the YCbCr color space, but there is no code in place to " -"convert it to RGB." -msgstr "" -"L’image « %s » est dans l’espace colorimétrique YCbCr mais aucun code n’est " -"présent pour la convertir en RVB." +#: ../plug-ins/common/file-jp2-load.c:1000 +msgid "Color space:" +msgstr "Espace de couleurs :" -#: ../plug-ins/common/file-jp2-load.c:350 +#: ../plug-ins/common/file-jp2-load.c:1071 ../plug-ins/common/file-wmf.c:965 #, c-format -msgid "The image '%s' is in an unknown color space." -msgstr "L’image « %s » est dans un espace colorimétrique inconnu." +msgid "Could not open '%s' for reading" +msgstr "Impossible d’ouvrir « %s » en lecture" -#: ../plug-ins/common/file-jp2-load.c:364 +#: ../plug-ins/common/file-jp2-load.c:1082 #, c-format -msgid "" -"Image component %d of image '%s' does not have the same size as the image. " -"This is currently not supported." -msgstr "" -"Le composant d’image %d de l’image « %s » n’a pas la même taille que " -"l’image, ce qui n’est actuellement pas pris en charge." +msgid "Couldn't set parameters on decoder for '%s'." +msgstr "Impossible de fixer les paramètres sur le décodeur pour « %s »." -#: ../plug-ins/common/file-jp2-load.c:375 +#: ../plug-ins/common/file-jp2-load.c:1090 #, c-format -msgid "Image component %d of image '%s' does not have both a hstep and vstep." -msgstr "" -"Le composant %d de l’image « %s » n’a pas à la fois un « hstep » et un " -"« vstep »." +msgid "Couldn't read JP2 header from '%s'." +msgstr "Impossible de lire l’en-tête JP2 depuis « %s »." -#: ../plug-ins/common/file-jp2-load.c:384 +#: ../plug-ins/common/file-jp2-load.c:1098 #, c-format -msgid "" -"Image component %d of image '%s' is signed. This is currently not supported." -msgstr "" -"Le composant %d de l’image « %s » est signé, ce qui n’est actuellement pas " -"pris en charge par GIMP." +msgid "Couldn't decode JP2 image in '%s'." +msgstr "Impossible de décoder l’image JP2 dans « %s »." + +#: ../plug-ins/common/file-jp2-load.c:1106 +#, c-format +msgid "Couldn't decompress JP2 image in '%s'." +msgstr "Impossible de décompresser l’image JP2 dans « %s »." + +#: ../plug-ins/common/file-jp2-load.c:1135 +#, c-format +msgid "Couldn't decode CIELAB JP2 image in '%s'." +msgstr "Impossible de décoder l’image JP2 CIELAB dans « %s »." + +#: ../plug-ins/common/file-jp2-load.c:1192 +#, c-format +msgid "Unknown color space in JP2 codestream '%s'." +msgstr "Espace de couleur inconnu dans le codestream JP2 « %s »." + +#: ../plug-ins/common/file-jp2-load.c:1203 +#, c-format +msgid "Couldn't convert YCbCr JP2 image '%s' to RGB." +msgstr "Impossible de convertir l’image JP2 Y'CbCr « %s » en RVB." + +#: ../plug-ins/common/file-jp2-load.c:1213 +#, c-format +msgid "Couldn't convert CMYK JP2 image in '%s' to RGB." +msgstr "Impossible de convertir l’image JP2 CMJN dans « %s » en RVB." + +#: ../plug-ins/common/file-jp2-load.c:1223 +#, c-format +msgid "Couldn't convert xvYCC JP2 image in '%s' to RGB." +msgstr "Impossible de convertir l’image JP2 xvYCC dans « %s » en RVB." + +#: ../plug-ins/common/file-jp2-load.c:1250 +#, c-format +msgid "Unsupported color space in JP2 image '%s'." +msgstr "Espace de couleurs non pris en charge dans l’image JP2 « %s »." #. Inform the user that we couldn't losslessly save the #. * transparency & just use the full palette -#: ../plug-ins/common/file-mng.c:533 ../plug-ins/common/file-png.c:2265 +#: ../plug-ins/common/file-mng.c:533 ../plug-ins/common/file-png.c:2285 msgid "Couldn't losslessly save transparency, saving opacity instead." msgstr "" "Impossible d’enregistrer la transparence sans perte, enregistrement de " @@ -2922,7 +2939,7 @@ msgid "Save creation time" msgstr "Enregistrer la date de création" #. Dialog init -#: ../plug-ins/common/file-mng.c:1413 ../plug-ins/common/file-png.c:2323 +#: ../plug-ins/common/file-mng.c:1413 ../plug-ins/common/file-png.c:2343 msgid "PNG" msgstr "PNG" @@ -3109,11 +3126,10 @@ msgstr "PDF (Portable Document Format)" #. #: ../plug-ins/common/file-pdf-load.c:504 #, c-format -msgid "PDF document '%1$s' has a single page. Page %2$d is out of range." +msgid "PDF document '%1$s' has %3$d page. Page %2$d is out of range." msgid_plural "PDF document '%1$s' has %3$d pages. Page %2$d is out of range." msgstr[0] "" -"Le document PDF « %1$s » n’a qu’une seule page. La page %2$d est hors " -"intervalle." +"Le document PDF « %1$s » a %3$d page. La page %2$d est hors intervalle." msgstr[1] "" "Le document PDF « %1$s » a %3$d pages. La page %2$d est hors intervalle." @@ -3152,7 +3168,7 @@ msgstr "Importation depuis un PDF" #: ../plug-ins/common/file-pdf-load.c:1273 ../plug-ins/common/file-ps.c:3393 #: ../plug-ins/file-tiff/file-tiff-load.c:148 -#: ../plug-ins/metadata/metadata-editor.c:5645 +#: ../plug-ins/metadata/metadata-editor.c:5649 msgid "_Import" msgstr "_Importer" @@ -3282,34 +3298,41 @@ msgstr "Image Alias Pix" msgid "PNG image" msgstr "Image PNG" -#: ../plug-ins/common/file-png.c:762 +#: ../plug-ins/common/file-png.c:768 #, c-format msgid "Error loading PNG file: %s" msgstr "Erreur lors du chargement du fichier PNG : %s" -#: ../plug-ins/common/file-png.c:879 +#: ../plug-ins/common/file-png.c:885 #, c-format msgid "Error creating PNG read struct while exporting '%s'." msgstr "" "Erreur de création d’une structure PNG « read » lors de l’exportation de " "« %s »." -#: ../plug-ins/common/file-png.c:889 +#: ../plug-ins/common/file-png.c:894 +#, c-format +msgid "Error while reading '%s'. Could not create PNG header info structure." +msgstr "" +"Erreur lors de la lecture de « %s ». Impossible de créer la structure " +"d’information du fichier d’en-tête PNG." + +#: ../plug-ins/common/file-png.c:902 #, c-format msgid "Error while reading '%s'. File corrupted?" msgstr "Erreur en lecture de « %s ». Fichier endommagé ?" -#: ../plug-ins/common/file-png.c:1044 +#: ../plug-ins/common/file-png.c:1057 #, c-format msgid "Unknown color model in PNG file '%s'." msgstr "Modèle de couleur inconnu dans le fichier PNG « %s »." -#: ../plug-ins/common/file-png.c:1057 ../plug-ins/file-exr/file-exr.c:251 +#: ../plug-ins/common/file-png.c:1070 ../plug-ins/file-exr/file-exr.c:251 #, c-format msgid "Could not create new image for '%s': %s" msgstr "Impossible de créer une nouvelle image pour « %s » : %s" -#: ../plug-ins/common/file-png.c:1113 +#: ../plug-ins/common/file-png.c:1126 msgid "" "The PNG file specifies an offset that caused the layer to be positioned " "outside the image." @@ -3317,19 +3340,19 @@ msgstr "" "Le fichier PNG spécifie un décalage qui entraîne un calque positionné en " "dehors de l’image." -#: ../plug-ins/common/file-png.c:1390 +#: ../plug-ins/common/file-png.c:1403 msgid "Apply PNG Offset" msgstr "Appliquer le décalage PNG" -#: ../plug-ins/common/file-png.c:1394 +#: ../plug-ins/common/file-png.c:1407 msgid "Ignore PNG offset" msgstr "Ignorer le décalage PNG" -#: ../plug-ins/common/file-png.c:1395 +#: ../plug-ins/common/file-png.c:1408 msgid "Apply PNG offset to layer" msgstr "Appliquer le décalage PNG au calque" -#: ../plug-ins/common/file-png.c:1420 +#: ../plug-ins/common/file-png.c:1433 #, c-format msgid "" "The PNG image you are importing specifies an offset of %d, %d. Do you want " @@ -3338,26 +3361,33 @@ msgstr "" "L’image PNG importée indique un décalage de %d, %d. Voulez-vous appliquer ce " "décalage au calque ?" -#: ../plug-ins/common/file-png.c:1528 +#: ../plug-ins/common/file-png.c:1541 #, c-format msgid "Error creating PNG write struct while exporting '%s'." msgstr "" "Erreur de création d’une structure PNG « write » lors de l’exportation de " "« %s »." -#: ../plug-ins/common/file-png.c:1538 +#: ../plug-ins/common/file-png.c:1550 +#, c-format +msgid "Error while exporting '%s'. Could not create PNG header info structure." +msgstr "" +"Erreur lors de l’exportation de « %s ». Impossible de créer la structure " +"d’information du fichier d’en-tête PNG." + +#: ../plug-ins/common/file-png.c:1558 #, c-format msgid "Error while exporting '%s'. Could not export image." msgstr "Erreur lors de l’exportation de « %s ». Impossible d’exporter l’image." -#: ../plug-ins/common/file-png.c:2340 ../plug-ins/common/file-raw-data.c:2129 +#: ../plug-ins/common/file-png.c:2360 ../plug-ins/common/file-raw-data.c:2129 #: ../plug-ins/file-tiff/file-tiff-save.c:958 #, c-format msgid "Error loading UI file '%s': %s" msgstr "" "Erreur lors du chargement du fichier d’interface utilisateur « %s » : %s" -#: ../plug-ins/common/file-png.c:2341 ../plug-ins/common/file-raw-data.c:2130 +#: ../plug-ins/common/file-png.c:2361 ../plug-ins/common/file-raw-data.c:2130 #: ../plug-ins/file-tiff/file-tiff-save.c:959 msgid "Unknown error" msgstr "Erreur inconnue" @@ -3518,7 +3548,7 @@ msgstr "N/B" msgid "Gray" msgstr "Gris" -#: ../plug-ins/common/file-ps.c:3534 ../plug-ins/common/file-xpm.c:480 +#: ../plug-ins/common/file-ps.c:3534 ../plug-ins/common/file-xpm.c:483 #: ../plug-ins/gimpressionist/color.c:65 #: ../plug-ins/gimpressionist/general.c:169 #: ../plug-ins/imagemap/imap_menu.c:227 @@ -3895,19 +3925,19 @@ msgstr "Alpha indexé" #: ../plug-ins/common/file-raw-data.c:1950 msgid "Gray unsigned 16 bit Big Endian" -msgstr "16 bits gros-boutiste non signé gris" +msgstr "16 bits gros-boutiste (Big Endian) non signé gris" #: ../plug-ins/common/file-raw-data.c:1951 msgid "Gray unsigned 16 bit Little Endian" -msgstr "16 bits petit-boutiste non signé gris" +msgstr "16 bits petit-boutiste (Little Endian) non signé gris" #: ../plug-ins/common/file-raw-data.c:1952 msgid "Gray 16 bit Big Endian" -msgstr "16 bits gros-boutiste gris" +msgstr "16 bits gros-boutiste (Big Endian) gris" #: ../plug-ins/common/file-raw-data.c:1953 msgid "Gray 16 bit Little Endian" -msgstr "16 bits petit-boutiste gris" +msgstr "16 bits petit-boutiste (Little Endian) gris" #: ../plug-ins/common/file-raw-data.c:1958 msgid "Image _Type:" @@ -4180,11 +4210,6 @@ msgstr "" msgid "Render Windows Metafile" msgstr "Rendre Windows Metafile" -#: ../plug-ins/common/file-wmf.c:965 -#, c-format -msgid "Could not open '%s' for reading" -msgstr "Impossible d’ouvrir « %s » en lecture" - #: ../plug-ins/common/file-wmf.c:998 msgid "Rendered WMF" msgstr "Rendu WMF" @@ -4535,7 +4560,7 @@ msgid "" msgstr "" "Votre curseur a été exporté avec succès, mais il contient une ou plusieurs " "images dont la largeur ou la hauteur dépasse 8 chiffres.\n" -"Nous l'avons réduit à %dpx. Vérifiez le curseur exporté." +"Nous l’avons réduit à %dpx. Vérifiez le curseur exporté." #. translators: the %i is *always* 8 here #: ../plug-ins/common/file-xmc.c:2222 @@ -4551,25 +4576,25 @@ msgstr "" msgid "X PixMap image" msgstr "Image pixmap X" -#: ../plug-ins/common/file-xpm.c:365 ../plug-ins/common/file-xpm.c:797 +#: ../plug-ins/common/file-xpm.c:365 ../plug-ins/common/file-xpm.c:800 #, c-format msgid "Error opening file '%s'" msgstr "Erreur lors de l’ouverture du fichier « %s »" -#: ../plug-ins/common/file-xpm.c:371 ../plug-ins/common/file-xpm.c:803 +#: ../plug-ins/common/file-xpm.c:371 ../plug-ins/common/file-xpm.c:806 msgid "XPM file invalid" msgstr "Fichier XPM non valide" -#: ../plug-ins/common/file-xpm.c:650 +#: ../plug-ins/common/file-xpm.c:653 #, c-format msgid "Unsupported drawable type" msgstr "Type d’objet graphique non pris en charge." -#: ../plug-ins/common/file-xpm.c:829 +#: ../plug-ins/common/file-xpm.c:832 msgid "XPM" msgstr "XPM" -#: ../plug-ins/common/file-xpm.c:839 +#: ../plug-ins/common/file-xpm.c:842 msgid "_Alpha threshold:" msgstr "Seuil _alpha :" @@ -4634,7 +4659,7 @@ msgstr "Le fichier XWD %s est endommagé." #: ../plug-ins/common/film.c:217 msgid "Combine several images on a film strip" -msgstr "Combiner plusieurs images sur un film" +msgstr "Combine plusieurs images sur un film" #: ../plug-ins/common/film.c:222 msgid "_Filmstrip..." @@ -5124,7 +5149,7 @@ msgstr "Noir_cir" #: ../plug-ins/common/jigsaw.c:356 msgid "Add a jigsaw-puzzle pattern to the image" -msgstr "Ajouter une trame de puzzle à l’image" +msgstr "Ajoute une trame de puzzle à l’image" #: ../plug-ins/common/jigsaw.c:361 msgid "_Jigsaw..." @@ -7291,31 +7316,31 @@ msgstr "Largeur de masque de calque non valide ou non prise en charge : %d" msgid "Unsupported or invalid layer mask size: %dx%d" msgstr "Taille de masque de calque non valide ou non prise en charge : %dx%d" -#: ../plug-ins/file-psd/psd-load.c:1326 ../plug-ins/file-psd/psd-load.c:1791 +#: ../plug-ins/file-psd/psd-load.c:1326 ../plug-ins/file-psd/psd-load.c:1796 #, c-format msgid "Unsupported compression mode: %d" msgstr "Mode de compression non pris en charge : %d" -#: ../plug-ins/file-psd/psd-load.c:1887 +#: ../plug-ins/file-psd/psd-load.c:1892 msgid "Extra" msgstr "Supplémentaire" -#: ../plug-ins/file-psd/psd-load.c:2066 +#: ../plug-ins/file-psd/psd-load.c:2071 #, c-format msgid "Unsupported or invalid channel size" msgstr "Taille de canal non valide ou non prise en charge" -#: ../plug-ins/file-psd/psd-load.c:2135 +#: ../plug-ins/file-psd/psd-load.c:2140 #, c-format msgid "Failed to decompress data" msgstr "Échec de décompression des données" -#: ../plug-ins/file-psd/psd-save.c:462 +#: ../plug-ins/file-psd/psd-save.c:463 msgid "Error: Can't convert GIMP base imagetype to PSD mode" msgstr "" "Erreur : impossible de convertir le type d’image de base GIMP en mode PSD" -#: ../plug-ins/file-psd/psd-save.c:1545 +#: ../plug-ins/file-psd/psd-save.c:1572 #, c-format msgid "" "Unable to export '%s'. The PSD file format does not support images that are " @@ -7324,7 +7349,7 @@ msgstr "" "Impossible d’exporter « %s ». Le format PSD ne prend pas en charge les " "images de plus de 30 000 pixels de haut ou de large." -#: ../plug-ins/file-psd/psd-save.c:1566 +#: ../plug-ins/file-psd/psd-save.c:1593 #, c-format msgid "" "Unable to export '%s'. The PSD file format does not support images with " @@ -8935,7 +8960,7 @@ msgstr "Une valeur de secours pour les sélections adaptatives" #: ../plug-ins/gimpressionist/gimp.c:89 msgid "Performs various artistic operations" -msgstr "Exécuter diverses opérations artistiques" +msgstr "Exécute diverses opérations artistiques" #: ../plug-ins/gimpressionist/gimp.c:94 msgid "_GIMPressionist..." @@ -9924,7 +9949,7 @@ msgstr "Référence de latitude" #: ../plug-ins/ui/plug-in-metadata-editor.ui.h:87 msgid "Altitude Reference" -msgstr "Référence d'altitude" +msgstr "Référence d’altitude" #: ../plug-ins/ui/plug-in-metadata-editor.ui.h:88 msgid "GPS" @@ -10970,7 +10995,7 @@ msgstr "A_perçu" #: ../plug-ins/imagemap/imap_main.c:121 msgid "Create a clickable imagemap" -msgstr "Créer une image cliquable pour le Web" +msgstr "Crée une image cliquable pour le Web" #: ../plug-ins/imagemap/imap_main.c:126 msgid "_Image Map..." @@ -11943,19 +11968,19 @@ msgstr "Date d’agenda :" msgid "Set Date" msgstr "Définir la date" -#: ../plug-ins/metadata/metadata-editor.c:1616 +#: ../plug-ins/metadata/metadata-editor.c:1620 msgid "Unrated" msgstr "Non noté" -#: ../plug-ins/metadata/metadata-editor.c:5641 +#: ../plug-ins/metadata/metadata-editor.c:5645 msgid "Import Metadata File" msgstr "Importer un fichier de métadonnées" -#: ../plug-ins/metadata/metadata-editor.c:5676 +#: ../plug-ins/metadata/metadata-editor.c:5680 msgid "Export Metadata File" msgstr "Exporter un fichier de métadonnées" -#: ../plug-ins/metadata/metadata-editor.c:5680 +#: ../plug-ins/metadata/metadata-editor.c:5684 msgid "_Export" msgstr "_Exporter" @@ -12181,7 +12206,7 @@ msgstr "(%llu d’octets(s) en plus)" #: ../plug-ins/pagecurl/pagecurl.c:203 msgid "Curl up one of the image corners" -msgstr "Fait un coin de page dans un coin de l’image" +msgstr "Crée un coin de page dans un coin de l’image" #: ../plug-ins/pagecurl/pagecurl.c:208 msgid "_Pagecurl..." diff --git a/po-plug-ins/it.po b/po-plug-ins/it.po index 4d278fb056..25e5453500 100644 --- a/po-plug-ins/it.po +++ b/po-plug-ins/it.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: gimp 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-09 11:54+0100\n" -"PO-Revision-Date: 2018-01-09 10:49+0100\n" +"POT-Creation-Date: 2018-04-15 17:51+0200\n" +"PO-Revision-Date: 2018-04-15 17:51+0200\n" "Last-Translator: Marco Ciampa \n" "Language-Team: tp@lists.linux.it\n" "Language: it\n" @@ -46,6 +46,7 @@ msgstr "Allinea livelli visibili" #: ../plug-ins/common/destripe.c:444 ../plug-ins/common/edge-dog.c:306 #: ../plug-ins/common/edge-neon.c:700 ../plug-ins/common/emboss.c:453 #: ../plug-ins/common/file-cel.c:936 ../plug-ins/common/file-gif-save.c:1089 +#: ../plug-ins/common/file-jp2-load.c:949 #: ../plug-ins/common/file-pdf-load.c:707 #: ../plug-ins/common/file-pdf-load.c:1272 #: ../plug-ins/common/file-pdf-save.c:1009 ../plug-ins/common/file-ps.c:3392 @@ -94,9 +95,9 @@ msgstr "Allinea livelli visibili" #: ../plug-ins/lighting/lighting-ui.c:1306 #: ../plug-ins/map-object/map-object-ui.c:1333 #: ../plug-ins/metadata/metadata-editor.c:547 -#: ../plug-ins/metadata/metadata-editor.c:764 -#: ../plug-ins/metadata/metadata-editor.c:5618 -#: ../plug-ins/metadata/metadata-editor.c:5653 +#: ../plug-ins/metadata/metadata-editor.c:765 +#: ../plug-ins/metadata/metadata-editor.c:5648 +#: ../plug-ins/metadata/metadata-editor.c:5683 #: ../plug-ins/pagecurl/pagecurl.c:439 ../plug-ins/screenshot/screenshot.c:486 #: ../plug-ins/selection-to-path/selection-to-path.c:309 msgid "_Cancel" @@ -438,10 +439,10 @@ msgstr "_Verticale" #: ../plug-ins/common/blinds.c:277 ../plug-ins/common/compose.c:1022 #: ../plug-ins/common/decompose.c:607 ../plug-ins/common/file-cel.c:441 #: ../plug-ins/common/file-cel.c:446 ../plug-ins/common/file-dicom.c:611 -#: ../plug-ins/common/file-gegl.c:414 ../plug-ins/common/file-gif-load.c:980 -#: ../plug-ins/common/file-jp2-load.c:395 ../plug-ins/common/file-pcx.c:445 +#: ../plug-ins/common/file-gegl.c:428 ../plug-ins/common/file-gif-load.c:980 +#: ../plug-ins/common/file-jp2-load.c:1275 ../plug-ins/common/file-pcx.c:445 #: ../plug-ins/common/file-pcx.c:453 ../plug-ins/common/file-pix.c:400 -#: ../plug-ins/common/file-png.c:1066 ../plug-ins/common/file-pnm.c:685 +#: ../plug-ins/common/file-png.c:1079 ../plug-ins/common/file-pnm.c:685 #: ../plug-ins/common/file-raw-data.c:1392 #: ../plug-ins/common/file-sunras.c:1049 ../plug-ins/common/file-tga.c:1097 #: ../plug-ins/common/file-xbm.c:904 ../plug-ins/common/film.c:745 @@ -450,7 +451,7 @@ msgstr "_Verticale" #: ../plug-ins/file-faxg3/faxg3.c:525 ../plug-ins/file-fits/fits.c:529 #: ../plug-ins/file-jpeg/jpeg-load.c:240 #: ../plug-ins/file-psd/psd-image-res-load.c:1033 -#: ../plug-ins/file-psd/psd-load.c:1816 ../plug-ins/file-sgi/sgi.c:411 +#: ../plug-ins/file-psd/psd-load.c:1821 ../plug-ins/file-sgi/sgi.c:411 #: ../plug-ins/file-tiff/file-tiff-load.c:924 #: ../plug-ins/file-webp/file-webp-load.c:149 #: ../plug-ins/gfig/gfig-dialog.c:1321 ../plug-ins/gimpressionist/general.c:139 @@ -819,6 +820,7 @@ msgstr "Seme Casuale" #: ../plug-ins/common/cml-explorer.c:1269 #: ../plug-ins/common/cml-explorer.c:2120 ../plug-ins/common/curve-bend.c:1488 #: ../plug-ins/common/curve-bend.c:2066 ../plug-ins/common/file-cel.c:937 +#: ../plug-ins/common/file-jp2-load.c:950 #: ../plug-ins/common/file-raw-data.c:1834 ../plug-ins/common/qbist.c:721 #: ../plug-ins/common/qbist.c:885 ../plug-ins/common/sphere-designer.c:2210 #: ../plug-ins/common/sphere-designer.c:2610 ../plug-ins/file-fits/fits.c:1151 @@ -1035,14 +1037,14 @@ msgstr "Salva parametri Esploratore CML" #: ../plug-ins/common/cml-explorer.c:2038 ../plug-ins/common/curve-bend.c:839 #: ../plug-ins/common/file-dicom.c:1371 ../plug-ins/common/file-mng.c:648 #: ../plug-ins/common/file-mng.c:985 ../plug-ins/common/file-pcx.c:854 -#: ../plug-ins/common/file-pdf-save.c:468 ../plug-ins/common/file-png.c:1562 +#: ../plug-ins/common/file-pdf-save.c:468 ../plug-ins/common/file-png.c:1582 #: ../plug-ins/common/file-raw-data.c:1192 #: ../plug-ins/common/file-raw-data.c:1220 ../plug-ins/common/file-sunras.c:610 #: ../plug-ins/common/file-tga.c:1208 ../plug-ins/common/file-xmc.c:1490 #: ../plug-ins/common/sphere-designer.c:2121 #: ../plug-ins/file-bmp/bmp-save.c:318 ../plug-ins/file-fits/fits.c:481 -#: ../plug-ins/file-fli/fli-gimp.c:750 ../plug-ins/file-ico/ico-save.c:1082 -#: ../plug-ins/file-jpeg/jpeg-save.c:328 ../plug-ins/file-psd/psd-save.c:1581 +#: ../plug-ins/file-fli/fli-gimp.c:750 ../plug-ins/file-ico/ico-save.c:1087 +#: ../plug-ins/file-jpeg/jpeg-save.c:328 ../plug-ins/file-psd/psd-save.c:1608 #: ../plug-ins/file-tiff/file-tiff-save.c:644 ../plug-ins/flame/flame.c:442 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1548 #: ../plug-ins/gfig/gfig.c:794 ../plug-ins/ifs-compose/ifs-compose.c:2390 @@ -1063,10 +1065,8 @@ msgstr "Carica parametri Esploratore CML" #: ../plug-ins/common/cml-explorer.c:2211 ../plug-ins/common/curve-bend.c:891 #: ../plug-ins/common/file-cel.c:300 ../plug-ins/common/file-cel.c:351 #: ../plug-ins/common/file-cel.c:582 ../plug-ins/common/file-dicom.c:342 -#: ../plug-ins/common/file-gif-load.c:361 -#: ../plug-ins/common/file-jp2-load.c:234 -#: ../plug-ins/common/file-jp2-load.c:243 ../plug-ins/common/file-mng.c:1158 -#: ../plug-ins/common/file-pcx.c:375 ../plug-ins/common/file-png.c:914 +#: ../plug-ins/common/file-gif-load.c:361 ../plug-ins/common/file-mng.c:1158 +#: ../plug-ins/common/file-pcx.c:375 ../plug-ins/common/file-png.c:927 #: ../plug-ins/common/file-ps.c:1071 ../plug-ins/common/file-ps.c:3342 #: ../plug-ins/common/file-psp.c:1772 ../plug-ins/common/file-psp.c:1826 #: ../plug-ins/common/file-raw-data.c:477 @@ -1375,6 +1375,7 @@ msgid "CMY" msgstr "CMY" #: ../plug-ins/common/compose.c:231 ../plug-ins/common/decompose.c:198 +#: ../plug-ins/common/file-jp2-load.c:985 msgid "CMYK" msgstr "CMYK" @@ -2192,11 +2193,11 @@ msgstr "" #. * Open the file for reading... #. #: ../plug-ins/common/file-cel.c:342 ../plug-ins/common/file-dicom.c:334 -#: ../plug-ins/common/file-gbr.c:364 ../plug-ins/common/file-gegl.c:298 +#: ../plug-ins/common/file-gbr.c:364 ../plug-ins/common/file-gegl.c:312 #: ../plug-ins/common/file-gif-load.c:353 ../plug-ins/common/file-gih.c:679 -#: ../plug-ins/common/file-jp2-load.c:227 ../plug-ins/common/file-pat.c:336 +#: ../plug-ins/common/file-jp2-load.c:1064 ../plug-ins/common/file-pat.c:336 #: ../plug-ins/common/file-pcx.c:367 ../plug-ins/common/file-pdf-load.c:1043 -#: ../plug-ins/common/file-pix.c:357 ../plug-ins/common/file-png.c:906 +#: ../plug-ins/common/file-pix.c:357 ../plug-ins/common/file-png.c:919 #: ../plug-ins/common/file-pnm.c:566 ../plug-ins/common/file-ps.c:1063 #: ../plug-ins/common/file-raw-data.c:1294 ../plug-ins/common/file-sunras.c:429 #: ../plug-ins/common/file-tga.c:438 ../plug-ins/common/file-wmf.c:984 @@ -2289,13 +2290,13 @@ msgstr "" #: ../plug-ins/common/file-gif-save.c:865 ../plug-ins/common/file-gih.c:1305 #: ../plug-ins/common/file-html-table.c:236 ../plug-ins/common/file-pat.c:535 #: ../plug-ins/common/file-pcx.c:743 ../plug-ins/common/file-pix.c:537 -#: ../plug-ins/common/file-png.c:1555 ../plug-ins/common/file-pnm.c:1246 +#: ../plug-ins/common/file-png.c:1575 ../plug-ins/common/file-pnm.c:1246 #: ../plug-ins/common/file-ps.c:1236 ../plug-ins/common/file-sunras.c:602 #: ../plug-ins/common/file-tga.c:1202 ../plug-ins/common/file-xbm.c:1033 -#: ../plug-ins/common/file-xpm.c:660 ../plug-ins/common/file-xwd.c:652 +#: ../plug-ins/common/file-xpm.c:663 ../plug-ins/common/file-xwd.c:652 #: ../plug-ins/file-bmp/bmp-save.c:310 ../plug-ins/file-fits/fits.c:473 -#: ../plug-ins/file-fli/fli-gimp.c:718 ../plug-ins/file-ico/ico-save.c:1076 -#: ../plug-ins/file-jpeg/jpeg-save.c:285 ../plug-ins/file-psd/psd-save.c:1552 +#: ../plug-ins/file-fli/fli-gimp.c:718 ../plug-ins/file-ico/ico-save.c:1081 +#: ../plug-ins/file-jpeg/jpeg-save.c:285 ../plug-ins/file-psd/psd-save.c:1579 #: ../plug-ins/file-sgi/sgi.c:579 ../plug-ins/file-tiff/file-tiff-save.c:317 #, c-format msgid "Exporting '%s'" @@ -2456,11 +2457,15 @@ msgstr "Descrizione:" msgid "Spacing:" msgstr "Spaziatura:" -#: ../plug-ins/common/file-gegl.c:73 ../plug-ins/file-exr/file-exr.c:86 +#: ../plug-ins/common/file-gegl.c:73 +msgid "Radiance RGBE" +msgstr "Radianza RGBE" + +#: ../plug-ins/common/file-gegl.c:87 ../plug-ins/file-exr/file-exr.c:86 msgid "OpenEXR image" msgstr "Immagine OpenEXR" -#: ../plug-ins/common/file-gegl.c:322 +#: ../plug-ins/common/file-gegl.c:336 #, c-format msgid "Could not open '%s'" msgstr "Impossibile aprire \"%s\"" @@ -2787,85 +2792,98 @@ msgstr "_Spaziatura-celle:" msgid "The amount of cell spacing." msgstr "Dimensione della spaziatura celle." -#: ../plug-ins/common/file-jp2-load.c:98 +#: ../plug-ins/common/file-jp2-load.c:154 msgid "JPEG 2000 image" msgstr "Immagine JPEG 2000" -#: ../plug-ins/common/file-jp2-load.c:252 -#, c-format -msgid "Couldn't decode '%s'." -msgstr "Impossibile decodificare \"%s\"" +#: ../plug-ins/common/file-jp2-load.c:185 +msgid "JPEG 2000 codestream" +msgstr "Codestream JPEG 2000" -#: ../plug-ins/common/file-jp2-load.c:275 -#, c-format -msgid "The image '%s' is in grayscale but does not contain any gray component." -msgstr "" -"L'immagine \"%s\" è in scala di grigi ma non contiene nessuna componente " -"grigia." +#. Can be RGB, YUV and YCC. +#. Can be RGB, YUV and YCC with alpha or CMYK. +#: ../plug-ins/common/file-jp2-load.c:974 +#: ../plug-ins/common/file-jp2-load.c:982 +msgid "sRGB" +msgstr "sRGB" -#: ../plug-ins/common/file-jp2-load.c:302 -#, c-format -msgid "The image '%s' is in RGB, but is missing some of the components." -msgstr "L'immagine \"%s\" è in RGB ma manca qualche componente." +#: ../plug-ins/common/file-jp2-load.c:975 +#: ../plug-ins/common/file-jp2-load.c:983 +msgid "YCbCr" +msgstr "YCbCr" -#: ../plug-ins/common/file-jp2-load.c:328 -#, c-format -msgid "" -"The image '%s' is in the CIEXYZ color space, but there is no code in place " -"to convert it to RGB." -msgstr "" -"L'immagine \"%s\" è espressa nello spazio colore CIEXYZ ma non è presente il " -"codice per convertirla in RGB." +#: ../plug-ins/common/file-jp2-load.c:976 +#: ../plug-ins/common/file-jp2-load.c:984 +msgid "xvYCC" +msgstr "xvYCC" -#: ../plug-ins/common/file-jp2-load.c:335 +#: ../plug-ins/common/file-jp2-load.c:991 #, c-format -msgid "" -"The image '%s' is in the CIELAB color space, but there is no code in place " -"to convert it to RGB." -msgstr "" -"L'immagine \"%s\" è espressa nello spazio colore CIELAB ma non è presente il " -"codice per convertirla in RGB." +msgid "Unsupported JPEG 2000%s '%s' with %d components." +msgstr "Versione JPEG 2000%s \"%s\" con %d componenti non supportata." -#: ../plug-ins/common/file-jp2-load.c:342 -#, c-format -msgid "" -"The image '%s' is in the YCbCr color space, but there is no code in place to " -"convert it to RGB." -msgstr "" -"L'immagine \"%s\" è espressa nello spazio colore YCbCr ma non è presente il " -"codice per convertirla in RGB." +#: ../plug-ins/common/file-jp2-load.c:1000 +msgid "Color space:" +msgstr "Spazio colori:" -#: ../plug-ins/common/file-jp2-load.c:350 +#: ../plug-ins/common/file-jp2-load.c:1071 ../plug-ins/common/file-wmf.c:965 #, c-format -msgid "The image '%s' is in an unknown color space." -msgstr "L'immagine \"%s\" possiede uno spazio colore sconosciuto." +msgid "Could not open '%s' for reading" +msgstr "Impossibile aprire \"%s\" in lettura" -#: ../plug-ins/common/file-jp2-load.c:364 +#: ../plug-ins/common/file-jp2-load.c:1082 #, c-format -msgid "" -"Image component %d of image '%s' does not have the same size as the image. " -"This is currently not supported." -msgstr "" -"La componente %d dell'immagine \"%s\" non possiede la stessa dimensione " -"dell'immagine; questa condizione non è attualmente supportata." +msgid "Couldn't set parameters on decoder for '%s'." +msgstr "Impossibile impostare i parametri sul decodificatore per \"%s\"." -#: ../plug-ins/common/file-jp2-load.c:375 +#: ../plug-ins/common/file-jp2-load.c:1090 #, c-format -msgid "Image component %d of image '%s' does not have both a hstep and vstep." -msgstr "" -"La componente %d dell'immagine \"%s\" non possiede entrambi hstep e vstep." +msgid "Couldn't read JP2 header from '%s'." +msgstr "Impossibile leggere l'intestazione JP2 da \"%s\"." -#: ../plug-ins/common/file-jp2-load.c:384 +#: ../plug-ins/common/file-jp2-load.c:1098 #, c-format -msgid "" -"Image component %d of image '%s' is signed. This is currently not supported." -msgstr "" -"La componente %d dell'immagine \"%s\" è firmata. Tale caratteristica non è " -"attualmente supportata." +msgid "Couldn't decode JP2 image in '%s'." +msgstr "Impossibile decodificare l'immagine JP2 in \"%s\"." + +#: ../plug-ins/common/file-jp2-load.c:1106 +#, c-format +msgid "Couldn't decompress JP2 image in '%s'." +msgstr "Impossibile decomprimere l'immagine JP2 in \"%s\"." + +#: ../plug-ins/common/file-jp2-load.c:1135 +#, c-format +msgid "Couldn't decode CIELAB JP2 image in '%s'." +msgstr "Impossibile decodificare l'immagine JP2 CIELAB in \"%s\"." + +#: ../plug-ins/common/file-jp2-load.c:1192 +#, c-format +msgid "Unknown color space in JP2 codestream '%s'." +msgstr "Modello di colore sconosciuto nel codestream JP2 \"%s\"." + +#: ../plug-ins/common/file-jp2-load.c:1203 +#, c-format +msgid "Couldn't convert YCbCr JP2 image '%s' to RGB." +msgstr "Impossibile convertire l'immagine JP2 YCbCr \"%s\" a RGB." + +#: ../plug-ins/common/file-jp2-load.c:1213 +#, c-format +msgid "Couldn't convert CMYK JP2 image in '%s' to RGB." +msgstr "Impossibile convertire l'immagine JP2 CMYK in \"%s\" a RGB." + +#: ../plug-ins/common/file-jp2-load.c:1223 +#, c-format +msgid "Couldn't convert xvYCC JP2 image in '%s' to RGB." +msgstr "Impossibile convertire l'immagine JP2 xvYCC in \"%s\" a RGB." + +#: ../plug-ins/common/file-jp2-load.c:1250 +#, c-format +msgid "Unsupported color space in JP2 image '%s'." +msgstr "Spazio colore non supportato nell'immagine JP2: \"%s\"." #. Inform the user that we couldn't losslessly save the #. * transparency & just use the full palette -#: ../plug-ins/common/file-mng.c:533 ../plug-ins/common/file-png.c:2265 +#: ../plug-ins/common/file-mng.c:533 ../plug-ins/common/file-png.c:2285 msgid "Couldn't losslessly save transparency, saving opacity instead." msgstr "" "Impossibile salvare senza degrado la trasparenza; salvataggio dell'opacità." @@ -2899,7 +2917,7 @@ msgid "Save creation time" msgstr "Salva la data di creazione" #. Dialog init -#: ../plug-ins/common/file-mng.c:1413 ../plug-ins/common/file-png.c:2323 +#: ../plug-ins/common/file-mng.c:1413 ../plug-ins/common/file-png.c:2343 msgid "PNG" msgstr "PNG" @@ -3084,11 +3102,12 @@ msgstr "Portable Document Format (PDF)" #. #: ../plug-ins/common/file-pdf-load.c:504 #, c-format -msgid "PDF document '%1$s' has a single page. Page %2$d is out of range." +msgid "PDF document '%1$s' has %3$d page. Page %2$d is out of range." msgid_plural "PDF document '%1$s' has %3$d pages. Page %2$d is out of range." msgstr[0] "" -"Il documento PDF \"%1$s\" ha una sola pagina. La pagina %2$d è fuori campo." -msgstr[1] "Il documento PDF \"%s\" ha %d pagine. La pagina %d è fuori campo." +"Il documento PDF \"%1$s\" ha %3$d pagina. La pagina %2$d è fuori campo." +msgstr[1] "" +"Il documento PDF \"%1$s\" ha %3$d pagine. La pagina %2$d è fuori campo." #: ../plug-ins/common/file-pdf-load.c:679 #: ../plug-ins/common/file-pdf-load.c:749 @@ -3124,7 +3143,7 @@ msgstr "Importa da PDF" #: ../plug-ins/common/file-pdf-load.c:1273 ../plug-ins/common/file-ps.c:3393 #: ../plug-ins/file-tiff/file-tiff-load.c:148 -#: ../plug-ins/metadata/metadata-editor.c:5619 +#: ../plug-ins/metadata/metadata-editor.c:5649 msgid "_Import" msgstr "_Importa" @@ -3252,34 +3271,39 @@ msgstr "Immagine Alias Pix" msgid "PNG image" msgstr "Immagine PNG" -#: ../plug-ins/common/file-png.c:762 +#: ../plug-ins/common/file-png.c:768 #, c-format msgid "Error loading PNG file: %s" msgstr "Errore durante il caricamento del file PNG: %s" -#: ../plug-ins/common/file-png.c:879 +#: ../plug-ins/common/file-png.c:885 #, c-format -msgid "Error creating PNG read struct while exporting '%s'." -msgstr "" -"Errore nella creazione delle strutture di lettura del PNG durante " -"l'esportazione di \"%s\"." +msgid "Error creating PNG read struct while loading '%s'." +msgstr "Errore nella creazione delle strutture di lettura del PNG durante il caricamento di \"%s\"." -#: ../plug-ins/common/file-png.c:889 +#: ../plug-ins/common/file-png.c:894 +#, c-format +msgid "Error while reading '%s'. Could not create PNG header info structure." +msgstr "" +"Errore durante la lettura di \"%s\". Impossibile creare la struttura " +"dell'intestazione PNG." + +#: ../plug-ins/common/file-png.c:902 #, c-format msgid "Error while reading '%s'. File corrupted?" msgstr "Errore durante la lettura di \"%s\". File danneggiato?" -#: ../plug-ins/common/file-png.c:1044 +#: ../plug-ins/common/file-png.c:1057 #, c-format msgid "Unknown color model in PNG file '%s'." msgstr "Modello di colore sconosciuto nel file PNG \"%s\"." -#: ../plug-ins/common/file-png.c:1057 ../plug-ins/file-exr/file-exr.c:251 +#: ../plug-ins/common/file-png.c:1070 ../plug-ins/file-exr/file-exr.c:251 #, c-format msgid "Could not create new image for '%s': %s" msgstr "Impossibile creare una nuova immagine per \"%s\": %s" -#: ../plug-ins/common/file-png.c:1113 +#: ../plug-ins/common/file-png.c:1126 msgid "" "The PNG file specifies an offset that caused the layer to be positioned " "outside the image." @@ -3287,19 +3311,19 @@ msgstr "" "Il file PNG specifica uno spostamento che ha causato il posizionamento del " "livello fuori dell'immagine." -#: ../plug-ins/common/file-png.c:1390 +#: ../plug-ins/common/file-png.c:1403 msgid "Apply PNG Offset" msgstr "Applica spostamento PNG" -#: ../plug-ins/common/file-png.c:1394 +#: ../plug-ins/common/file-png.c:1407 msgid "Ignore PNG offset" msgstr "Ignora spostamento PNG" -#: ../plug-ins/common/file-png.c:1395 +#: ../plug-ins/common/file-png.c:1408 msgid "Apply PNG offset to layer" msgstr "Applica lo spostamento PNG al livello" -#: ../plug-ins/common/file-png.c:1420 +#: ../plug-ins/common/file-png.c:1433 #, c-format msgid "" "The PNG image you are importing specifies an offset of %d, %d. Do you want " @@ -3308,26 +3332,33 @@ msgstr "" "L'immagine PNG che si sta importando specifica uno spostamento di %d, %d. " "Applicare questo spostamento al livello?" -#: ../plug-ins/common/file-png.c:1528 +#: ../plug-ins/common/file-png.c:1541 #, c-format msgid "Error creating PNG write struct while exporting '%s'." msgstr "" "Errore nella creazione delle strutture di scrittura del PNG durante " "l'esportazione di \"%s\"." -#: ../plug-ins/common/file-png.c:1538 +#: ../plug-ins/common/file-png.c:1550 +#, c-format +msgid "Error while exporting '%s'. Could not create PNG header info structure." +msgstr "" +"Errore durante l'esportazione di \"%s\". Impossibile creare la struttura " +"dell'intestazione PNG." + +#: ../plug-ins/common/file-png.c:1558 #, c-format msgid "Error while exporting '%s'. Could not export image." msgstr "" "Errore durante l'esportazione di \"%s\". Impossibile esportare l'immagine." -#: ../plug-ins/common/file-png.c:2340 ../plug-ins/common/file-raw-data.c:2129 +#: ../plug-ins/common/file-png.c:2360 ../plug-ins/common/file-raw-data.c:2129 #: ../plug-ins/file-tiff/file-tiff-save.c:958 #, c-format msgid "Error loading UI file '%s': %s" msgstr "Errore di caricamento file IU \"%s\": %s" -#: ../plug-ins/common/file-png.c:2341 ../plug-ins/common/file-raw-data.c:2130 +#: ../plug-ins/common/file-png.c:2361 ../plug-ins/common/file-raw-data.c:2130 #: ../plug-ins/file-tiff/file-tiff-save.c:959 msgid "Unknown error" msgstr "Errore sconosciuto" @@ -3487,7 +3518,7 @@ msgstr "Bianco/Nero" msgid "Gray" msgstr "Grigio" -#: ../plug-ins/common/file-ps.c:3534 ../plug-ins/common/file-xpm.c:480 +#: ../plug-ins/common/file-ps.c:3534 ../plug-ins/common/file-xpm.c:483 #: ../plug-ins/gimpressionist/color.c:65 #: ../plug-ins/gimpressionist/general.c:169 #: ../plug-ins/imagemap/imap_menu.c:227 @@ -4147,11 +4178,6 @@ msgstr "" msgid "Render Windows Metafile" msgstr "Renderizza metafile Windows" -#: ../plug-ins/common/file-wmf.c:965 -#, c-format -msgid "Could not open '%s' for reading" -msgstr "Impossibile aprire \"%s\" in lettura" - #: ../plug-ins/common/file-wmf.c:998 msgid "Rendered WMF" msgstr "WMF renderizzato" @@ -4527,25 +4553,25 @@ msgstr "" msgid "X PixMap image" msgstr "Immagine PixMap X" -#: ../plug-ins/common/file-xpm.c:365 ../plug-ins/common/file-xpm.c:797 +#: ../plug-ins/common/file-xpm.c:365 ../plug-ins/common/file-xpm.c:800 #, c-format msgid "Error opening file '%s'" msgstr "Errore di apertura file '%s'" -#: ../plug-ins/common/file-xpm.c:371 ../plug-ins/common/file-xpm.c:803 +#: ../plug-ins/common/file-xpm.c:371 ../plug-ins/common/file-xpm.c:806 msgid "XPM file invalid" msgstr "File XPM non valido" -#: ../plug-ins/common/file-xpm.c:650 +#: ../plug-ins/common/file-xpm.c:653 #, c-format msgid "Unsupported drawable type" msgstr "Tipo di disegnabile non supportato" -#: ../plug-ins/common/file-xpm.c:829 +#: ../plug-ins/common/file-xpm.c:832 msgid "XPM" msgstr "XPM" -#: ../plug-ins/common/file-xpm.c:839 +#: ../plug-ins/common/file-xpm.c:842 msgid "_Alpha threshold:" msgstr "Soglia _alfa:" @@ -7263,31 +7289,31 @@ msgstr "Larghezza maschera di livello non supportata o non valida: %d" msgid "Unsupported or invalid layer mask size: %dx%d" msgstr "Dimensioni maschera di livello non supportate o non valide: %dx%d" -#: ../plug-ins/file-psd/psd-load.c:1326 ../plug-ins/file-psd/psd-load.c:1791 +#: ../plug-ins/file-psd/psd-load.c:1326 ../plug-ins/file-psd/psd-load.c:1796 #, c-format msgid "Unsupported compression mode: %d" msgstr "Modalità di compressione non supportata: %d" -#: ../plug-ins/file-psd/psd-load.c:1887 +#: ../plug-ins/file-psd/psd-load.c:1892 msgid "Extra" msgstr "Extra" -#: ../plug-ins/file-psd/psd-load.c:2066 +#: ../plug-ins/file-psd/psd-load.c:2071 #, c-format msgid "Unsupported or invalid channel size" msgstr "Dimensione canale non supportata o non valida." -#: ../plug-ins/file-psd/psd-load.c:2135 +#: ../plug-ins/file-psd/psd-load.c:2140 #, c-format msgid "Failed to decompress data" msgstr "Fallita la decompressione dati" -#: ../plug-ins/file-psd/psd-save.c:462 +#: ../plug-ins/file-psd/psd-save.c:463 msgid "Error: Can't convert GIMP base imagetype to PSD mode" msgstr "" "Errore: impossibile convertire l'immagine di tipo base GIMP in modalità PSD" -#: ../plug-ins/file-psd/psd-save.c:1545 +#: ../plug-ins/file-psd/psd-save.c:1572 #, c-format msgid "" "Unable to export '%s'. The PSD file format does not support images that are " @@ -7296,7 +7322,7 @@ msgstr "" "Impossibile esportare \"%s\". Il formato del file PSD non supporta immagini " "più larghe o alte di 30.000 pixel." -#: ../plug-ins/file-psd/psd-save.c:1566 +#: ../plug-ins/file-psd/psd-save.c:1593 #, c-format msgid "" "Unable to export '%s'. The PSD file format does not support images with " @@ -11893,27 +11919,27 @@ msgstr "Importa metadati" msgid "Export metadata" msgstr "Esporta metadati" -#: ../plug-ins/metadata/metadata-editor.c:761 +#: ../plug-ins/metadata/metadata-editor.c:762 msgid "Calendar Date:" msgstr "Data del calendario:" -#: ../plug-ins/metadata/metadata-editor.c:765 +#: ../plug-ins/metadata/metadata-editor.c:766 msgid "Set Date" msgstr "Imposta data" -#: ../plug-ins/metadata/metadata-editor.c:1615 +#: ../plug-ins/metadata/metadata-editor.c:1620 msgid "Unrated" msgstr "Non classificato" -#: ../plug-ins/metadata/metadata-editor.c:5615 +#: ../plug-ins/metadata/metadata-editor.c:5645 msgid "Import Metadata File" msgstr "Importa file metadati" -#: ../plug-ins/metadata/metadata-editor.c:5650 +#: ../plug-ins/metadata/metadata-editor.c:5680 msgid "Export Metadata File" msgstr "Esporta file metadati" -#: ../plug-ins/metadata/metadata-editor.c:5654 +#: ../plug-ins/metadata/metadata-editor.c:5684 msgid "_Export" msgstr "_Esporta" diff --git a/po-plug-ins/pl.po b/po-plug-ins/pl.po index 7c697a1d69..c8cbbd514f 100644 --- a/po-plug-ins/pl.po +++ b/po-plug-ins/pl.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: gimp-plug-ins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-26 23:54+0200\n" -"PO-Revision-Date: 2018-03-26 23:55+0200\n" +"POT-Creation-Date: 2018-04-08 22:14+0200\n" +"PO-Revision-Date: 2018-04-08 22:15+0200\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -3274,9 +3274,9 @@ msgstr "Błąd podczas wczytywania pliku PNG: %s" #: ../plug-ins/common/file-png.c:885 #, c-format -msgid "Error creating PNG read struct while exporting '%s'." +msgid "Error creating PNG read struct while loading '%s'." msgstr "" -"Błąd podczas tworzenia struktur odczytu PNG podczas eksportowania „%s”." +"Błąd podczas tworzenia struktur odczytu PNG podczas wczytywania pliku „%s”." #: ../plug-ins/common/file-png.c:894 #, c-format diff --git a/po-plug-ins/sv.po b/po-plug-ins/sv.po index e29e3865e7..fcaf6182e1 100644 --- a/po-plug-ins/sv.po +++ b/po-plug-ins/sv.po @@ -13,9 +13,9 @@ msgstr "" "Project-Id-Version: gimp plugins\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=Internationalisation\n" -"POT-Creation-Date: 2018-03-22 12:36+0000\n" -"PO-Revision-Date: 2018-03-26 19:52+0200\n" -"Last-Translator: Sebastian Rasmussen \n" +"POT-Creation-Date: 2018-04-04 00:23+0000\n" +"PO-Revision-Date: 2018-04-14 20:43+0200\n" +"Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" @@ -448,7 +448,7 @@ msgstr "_Vertikal" #: ../plug-ins/common/file-gegl.c:428 ../plug-ins/common/file-gif-load.c:980 #: ../plug-ins/common/file-jp2-load.c:1275 ../plug-ins/common/file-pcx.c:445 #: ../plug-ins/common/file-pcx.c:453 ../plug-ins/common/file-pix.c:400 -#: ../plug-ins/common/file-png.c:1072 ../plug-ins/common/file-pnm.c:685 +#: ../plug-ins/common/file-png.c:1079 ../plug-ins/common/file-pnm.c:685 #: ../plug-ins/common/file-raw-data.c:1392 #: ../plug-ins/common/file-sunras.c:1049 ../plug-ins/common/file-tga.c:1097 #: ../plug-ins/common/file-xbm.c:904 ../plug-ins/common/film.c:745 @@ -1045,7 +1045,7 @@ msgstr "Spara parametrar för CML-utforskare" #: ../plug-ins/common/cml-explorer.c:2038 ../plug-ins/common/curve-bend.c:839 #: ../plug-ins/common/file-dicom.c:1371 ../plug-ins/common/file-mng.c:648 #: ../plug-ins/common/file-mng.c:985 ../plug-ins/common/file-pcx.c:854 -#: ../plug-ins/common/file-pdf-save.c:468 ../plug-ins/common/file-png.c:1568 +#: ../plug-ins/common/file-pdf-save.c:468 ../plug-ins/common/file-png.c:1582 #: ../plug-ins/common/file-raw-data.c:1192 #: ../plug-ins/common/file-raw-data.c:1220 ../plug-ins/common/file-sunras.c:610 #: ../plug-ins/common/file-tga.c:1208 ../plug-ins/common/file-xmc.c:1490 @@ -1074,7 +1074,7 @@ msgstr "Läs in parametrar för CML-utforskare" #: ../plug-ins/common/file-cel.c:300 ../plug-ins/common/file-cel.c:351 #: ../plug-ins/common/file-cel.c:582 ../plug-ins/common/file-dicom.c:342 #: ../plug-ins/common/file-gif-load.c:361 ../plug-ins/common/file-mng.c:1158 -#: ../plug-ins/common/file-pcx.c:375 ../plug-ins/common/file-png.c:920 +#: ../plug-ins/common/file-pcx.c:375 ../plug-ins/common/file-png.c:927 #: ../plug-ins/common/file-ps.c:1071 ../plug-ins/common/file-ps.c:3342 #: ../plug-ins/common/file-psp.c:1772 ../plug-ins/common/file-psp.c:1826 #: ../plug-ins/common/file-raw-data.c:477 @@ -2199,7 +2199,7 @@ msgstr "EOF eller fel vid inläsning av bildhuvud" #: ../plug-ins/common/file-gif-load.c:353 ../plug-ins/common/file-gih.c:679 #: ../plug-ins/common/file-jp2-load.c:1064 ../plug-ins/common/file-pat.c:336 #: ../plug-ins/common/file-pcx.c:367 ../plug-ins/common/file-pdf-load.c:1043 -#: ../plug-ins/common/file-pix.c:357 ../plug-ins/common/file-png.c:912 +#: ../plug-ins/common/file-pix.c:357 ../plug-ins/common/file-png.c:919 #: ../plug-ins/common/file-pnm.c:566 ../plug-ins/common/file-ps.c:1063 #: ../plug-ins/common/file-raw-data.c:1294 ../plug-ins/common/file-sunras.c:429 #: ../plug-ins/common/file-tga.c:438 ../plug-ins/common/file-wmf.c:984 @@ -2232,8 +2232,8 @@ msgid "" "illegal image dimensions: width: %d, horizontal offset: %d, height: %d, " "vertical offset: %d" msgstr "" -"ogiltiga bilddimensioner: bredd: %d, horisontell kompensation: %d, höjd: %d, " -"vertikal kompensation: %d" +"ogiltiga bilddimensioner: bredd: %d, horisontell förskjutning: %d, höjd: %d, " +"vertikal förskjutning: %d" #: ../plug-ins/common/file-cel.c:432 #, c-format @@ -2289,10 +2289,10 @@ msgstr "”%s”: EOF eller fel vid inläsning av palettdata" #: ../plug-ins/common/file-gif-save.c:865 ../plug-ins/common/file-gih.c:1305 #: ../plug-ins/common/file-html-table.c:236 ../plug-ins/common/file-pat.c:535 #: ../plug-ins/common/file-pcx.c:743 ../plug-ins/common/file-pix.c:537 -#: ../plug-ins/common/file-png.c:1561 ../plug-ins/common/file-pnm.c:1246 +#: ../plug-ins/common/file-png.c:1575 ../plug-ins/common/file-pnm.c:1246 #: ../plug-ins/common/file-ps.c:1236 ../plug-ins/common/file-sunras.c:602 #: ../plug-ins/common/file-tga.c:1202 ../plug-ins/common/file-xbm.c:1033 -#: ../plug-ins/common/file-xpm.c:660 ../plug-ins/common/file-xwd.c:652 +#: ../plug-ins/common/file-xpm.c:663 ../plug-ins/common/file-xwd.c:652 #: ../plug-ins/file-bmp/bmp-save.c:310 ../plug-ins/file-fits/fits.c:473 #: ../plug-ins/file-fli/fli-gimp.c:718 ../plug-ins/file-ico/ico-save.c:1081 #: ../plug-ins/file-jpeg/jpeg-save.c:285 ../plug-ins/file-psd/psd-save.c:1579 @@ -2600,7 +2600,7 @@ msgstr "GIMP-pensel (animerad)" #: ../plug-ins/common/file-gih.c:584 msgid "GIMP brush file appears to be corrupted." -msgstr "GIMP-penselfilen verkar vara trasig." +msgstr "GIMP-penselfilen verkar vara skadad." #: ../plug-ins/common/file-gih.c:915 msgid "Brush Pipe" @@ -2878,7 +2878,7 @@ msgstr "JP2-bilden ”%s” har en okänd färgrymd." #. Inform the user that we couldn't losslessly save the #. * transparency & just use the full palette -#: ../plug-ins/common/file-mng.c:533 ../plug-ins/common/file-png.c:2271 +#: ../plug-ins/common/file-mng.c:533 ../plug-ins/common/file-png.c:2285 msgid "Couldn't losslessly save transparency, saving opacity instead." msgstr "" "Kunde inte spara transparens utan informationsförlust; sparar opacitet " @@ -2913,7 +2913,7 @@ msgid "Save creation time" msgstr "Spara skapad tid" #. Dialog init -#: ../plug-ins/common/file-mng.c:1413 ../plug-ins/common/file-png.c:2329 +#: ../plug-ins/common/file-mng.c:1413 ../plug-ins/common/file-png.c:2343 msgid "PNG" msgstr "PNG" @@ -3274,25 +3274,31 @@ msgstr "Fel vid inläsning av PNG-fil: %s" #: ../plug-ins/common/file-png.c:885 #, c-format -msgid "Error creating PNG read struct while exporting '%s'." -msgstr "Fel vid skapande av PNG läs-struct då ”%s” exporterades." +msgid "Error creating PNG read struct while loading '%s'." +msgstr "Fel vid skapande av läs-struct för PNG då ”%s” lästes in." -#: ../plug-ins/common/file-png.c:895 +#: ../plug-ins/common/file-png.c:894 +#, c-format +msgid "Error while reading '%s'. Could not create PNG header info structure." +msgstr "" +"Fel vid läsning av ”%s”. Kunde inte skapa informationsstruktur för PNG-huvud." + +#: ../plug-ins/common/file-png.c:902 #, c-format msgid "Error while reading '%s'. File corrupted?" -msgstr "Fel vid inläsning av ”%s”. Trasig fil?" +msgstr "Fel vid inläsning av ”%s”. Skadad fil?" -#: ../plug-ins/common/file-png.c:1050 +#: ../plug-ins/common/file-png.c:1057 #, c-format msgid "Unknown color model in PNG file '%s'." msgstr "Okänd färgmodell i PNG-filen ”%s”." -#: ../plug-ins/common/file-png.c:1063 ../plug-ins/file-exr/file-exr.c:251 +#: ../plug-ins/common/file-png.c:1070 ../plug-ins/file-exr/file-exr.c:251 #, c-format msgid "Could not create new image for '%s': %s" msgstr "Kunde inte skapa ny bild för ”%s”: %s" -#: ../plug-ins/common/file-png.c:1119 +#: ../plug-ins/common/file-png.c:1126 msgid "" "The PNG file specifies an offset that caused the layer to be positioned " "outside the image." @@ -3300,44 +3306,50 @@ msgstr "" "PNG-filen angav en position som orsakade att lagret blev placerat utanför " "bilden." -#: ../plug-ins/common/file-png.c:1396 +#: ../plug-ins/common/file-png.c:1403 msgid "Apply PNG Offset" -msgstr "Tillämpa PNG-kompensation" +msgstr "Tillämpa PNG-position" -#: ../plug-ins/common/file-png.c:1400 +#: ../plug-ins/common/file-png.c:1407 msgid "Ignore PNG offset" -msgstr "Ignorera PNG-kompensation" +msgstr "Ignorera PNG-position" -#: ../plug-ins/common/file-png.c:1401 +#: ../plug-ins/common/file-png.c:1408 msgid "Apply PNG offset to layer" -msgstr "Tillämpa PNG-kompensation på lager" +msgstr "Tillämpa PNG-position på lager" -#: ../plug-ins/common/file-png.c:1426 +#: ../plug-ins/common/file-png.c:1433 #, c-format msgid "" "The PNG image you are importing specifies an offset of %d, %d. Do you want " "to apply this offset to the layer?" msgstr "" -"PNG-bilden du importerar anger en kompensation på %d, %d. Vill du tillämpa " -"denna kompensation på lagret?" +"PNG-bilden du importerar anger en position på %d, %d. Vill du tillämpa denna " +"position på lagret?" -#: ../plug-ins/common/file-png.c:1534 +#: ../plug-ins/common/file-png.c:1541 #, c-format msgid "Error creating PNG write struct while exporting '%s'." msgstr "Fel vid skapande av PNG skriv-struct då ”%s” exporterades." -#: ../plug-ins/common/file-png.c:1544 +#: ../plug-ins/common/file-png.c:1550 +#, c-format +msgid "Error while exporting '%s'. Could not create PNG header info structure." +msgstr "" +"Fel vid export av ”%s”. Kunde inte skapa informationsstruktur för PNG-huvud." + +#: ../plug-ins/common/file-png.c:1558 #, c-format msgid "Error while exporting '%s'. Could not export image." -msgstr "Fel vid exporterande av ”%s”. Kunde inte exportera bild." +msgstr "Fel vid export av ”%s”. Kunde inte exportera bild." -#: ../plug-ins/common/file-png.c:2346 ../plug-ins/common/file-raw-data.c:2129 +#: ../plug-ins/common/file-png.c:2360 ../plug-ins/common/file-raw-data.c:2129 #: ../plug-ins/file-tiff/file-tiff-save.c:958 #, c-format msgid "Error loading UI file '%s': %s" msgstr "Fel vid inläsning av användargränssnittsfilen ”%s”: %s" -#: ../plug-ins/common/file-png.c:2347 ../plug-ins/common/file-raw-data.c:2130 +#: ../plug-ins/common/file-png.c:2361 ../plug-ins/common/file-raw-data.c:2130 #: ../plug-ins/file-tiff/file-tiff-save.c:959 msgid "Unknown error" msgstr "Okänt fel" @@ -3499,7 +3511,7 @@ msgstr "S/V" msgid "Gray" msgstr "Grått" -#: ../plug-ins/common/file-ps.c:3534 ../plug-ins/common/file-xpm.c:480 +#: ../plug-ins/common/file-ps.c:3534 ../plug-ins/common/file-xpm.c:483 #: ../plug-ins/gimpressionist/color.c:65 #: ../plug-ins/gimpressionist/general.c:169 #: ../plug-ins/imagemap/imap_menu.c:227 @@ -4518,25 +4530,25 @@ msgstr "" msgid "X PixMap image" msgstr "X pixmap-bild" -#: ../plug-ins/common/file-xpm.c:365 ../plug-ins/common/file-xpm.c:797 +#: ../plug-ins/common/file-xpm.c:365 ../plug-ins/common/file-xpm.c:800 #, c-format msgid "Error opening file '%s'" msgstr "Fel vid öppnande av filen ”%s”" -#: ../plug-ins/common/file-xpm.c:371 ../plug-ins/common/file-xpm.c:803 +#: ../plug-ins/common/file-xpm.c:371 ../plug-ins/common/file-xpm.c:806 msgid "XPM file invalid" msgstr "XPM-fil är ogiltig" -#: ../plug-ins/common/file-xpm.c:650 +#: ../plug-ins/common/file-xpm.c:653 #, c-format msgid "Unsupported drawable type" msgstr "Denna typ av rityta stöds inte" -#: ../plug-ins/common/file-xpm.c:829 +#: ../plug-ins/common/file-xpm.c:832 msgid "XPM" msgstr "XPM" -#: ../plug-ins/common/file-xpm.c:839 +#: ../plug-ins/common/file-xpm.c:842 msgid "_Alpha threshold:" msgstr "_Alfatröskelvärde:" @@ -4597,7 +4609,7 @@ msgstr "Fel vid exportering av ”%s”: " #: ../plug-ins/common/file-xwd.c:1753 ../plug-ins/common/file-xwd.c:2151 #, c-format msgid "XWD-file %s is corrupt." -msgstr "XWD-fil %s är korrupt." +msgstr "XWD-filen %s är skadad." #: ../plug-ins/common/film.c:217 msgid "Combine several images on a film strip" @@ -5813,11 +5825,11 @@ msgstr "Glittra" #: ../plug-ins/common/sparkle.c:374 msgid "Luminosity _threshold:" -msgstr "_Tröskelvärde för luminans:" +msgstr "_Tröskelvärde för luminiscens:" #: ../plug-ins/common/sparkle.c:377 msgid "Adjust the luminosity threshold" -msgstr "Justera tröskelvärdet för luminans" +msgstr "Justera tröskelvärdet för luminiscens" #: ../plug-ins/common/sparkle.c:387 msgid "F_lare intensity:" @@ -5885,11 +5897,11 @@ msgstr "Justera hur mycket mättnaden skall ändras slumpmässigt" #: ../plug-ins/common/sparkle.c:499 msgid "_Preserve luminosity" -msgstr "_Bevara luminans" +msgstr "_Bevara luminiscens" #: ../plug-ins/common/sparkle.c:506 msgid "Should the luminosity be preserved?" -msgstr "Ska luminansen bevaras?" +msgstr "Ska luminiscensen bevaras?" #: ../plug-ins/common/sparkle.c:515 msgid "In_verse" @@ -6398,7 +6410,7 @@ msgstr "_Toning" #: ../plug-ins/common/van-gogh-lic.c:694 msgid "Convolve" -msgstr "Konvolvera" +msgstr "Falta" #: ../plug-ins/common/van-gogh-lic.c:699 msgid "_With white noise" @@ -8250,7 +8262,7 @@ msgstr "”%s” är inte en FractalExplorer-fil" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1880 #, c-format msgid "'%s' is corrupt. Line %d Option section incorrect" -msgstr "”%s” är trasig. Alternativsektion på rad %d är felaktig" +msgstr "”%s” är skadad. Alternativsektion på rad %d är felaktig" #: ../plug-ins/fractal-explorer/fractal-explorer.c:236 msgid "Render fractal art" @@ -8285,7 +8297,7 @@ msgid "" "File '%s' is corrupt.\n" "Line %d Option section incorrect" msgstr "" -"Filen ”%s” är trasig.\n" +"Filen ”%s” är skadad.\n" "Rad %d alternativsektion är felaktig" #: ../plug-ins/fractal-explorer/fractal-explorer.c:1000 @@ -10388,7 +10400,7 @@ msgstr "Asymmetri:" #. Shear #: ../plug-ins/ifs-compose/ifs-compose.c:582 msgid "Shear:" -msgstr "Lutning:" +msgstr "Skevning:" #. Simple color control section #: ../plug-ins/ifs-compose/ifs-compose.c:627 @@ -12763,7 +12775,7 @@ msgstr "Överför data från bildläsare/kamera" #~ msgstr "efter" #~ msgid "Seconds delay" -#~ msgstr "sekunders fördröjning" +#~ msgstr "Sekunders fördröjning" #~ msgid "Include decorations" #~ msgstr "Ta med fönsterkanten" @@ -13009,16 +13021,6 @@ msgstr "Överför data från bildläsare/kamera" #~ msgid "Color profile '%s' is not for RGB color space." #~ msgstr "Färgprofilen \"%s\" är inte för RGB-färgrymd." -#, fuzzy -#~| msgid "Error reading file" -#~ msgid "Error parsing 'icc-profile': " -#~ msgstr "Fel vid inläsning" - -#, fuzzy -#~| msgid "Color profile '%s' is not for RGB color space." -#~ msgid "Color profile '%s' is not for RGB color space" -#~ msgstr "Färgprofilen \"%s\" är inte för RGB-färgrymd." - #~ msgid "Converting from '%s' to '%s'" #~ msgstr "Konverterar från \"%s\" till \"%s\"" @@ -13718,22 +13720,6 @@ msgstr "Överför data från bildläsare/kamera" #~ msgid "Cro_p" #~ msgstr "Be_skär" -#~ msgid "Apply a generic 5x5 convolution matrix" -#~ msgstr "Tillämpar en allmän 5x5 konvolveringsmatris" - -#~ msgid "_Convolution Matrix..." -#~ msgstr "_Konvolveringsmatris..." - -#~ msgid "Convolution does not work on layers smaller than 3x3 pixels." -#~ msgstr "" -#~ "Konvolvering fungerar inte på lager som är mindre än 3x3 bildpunkter." - -#~ msgid "Applying convolution" -#~ msgstr "Tillämpar konvolvering" - -#~ msgid "Convolution Matrix" -#~ msgstr "Konvolveringsmatris" - #~ msgid "Matrix" #~ msgstr "Matris" diff --git a/po-script-fu/fr.po b/po-script-fu/fr.po index 9e0ade5b36..f26f420bf2 100644 --- a/po-script-fu/fr.po +++ b/po-script-fu/fr.po @@ -1,5 +1,5 @@ # French translation of gimp-script-fu. -# Copyright (C) 2000-2011 Free Software Foundation, Inc. +# Copyright (C) 2000-2018 Free Software Foundation, Inc. # This file is distributed under the same license as the gimp package. # # David Monniaux , 2000. @@ -9,18 +9,20 @@ # Jonathan Ernst , 2007. # Stéphane Raimbault , 2007. # Laurent Monin , 2007. -# Julien Hardelin , 2007-2011. +# Julien Hardelin , 2007-2011, 2016, 2018. +# msgid "" msgstr "" "Project-Id-Version: gimp-script-fu HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-03 22:00+1200\n" -"PO-Revision-Date: 2011-12-09 14:53+0100\n" -"Last-Translator: Julien Hardelin \n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" +"product=gimp&keywords=I18N+L10N&component=Internationalisation\n" +"POT-Creation-Date: 2018-04-01 23:10+0000\n" +"PO-Revision-Date: 2018-04-02 07:44+0100\n" +"Last-Translator: julien \n" "Language-Team: GNOME French Team \n" "Language: fr\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" @@ -38,201 +40,236 @@ msgstr "Serveur pour les opérations Script-Fu distantes" #: ../plug-ins/script-fu/script-fu.c:151 msgid "_Start Server..." -msgstr "_Démarrer le serveur..." +msgstr "_Démarrer le serveur…" -#: ../plug-ins/script-fu/script-fu.c:307 +#: ../plug-ins/script-fu/script-fu.c:306 msgid "_GIMP Online" msgstr "_GIMP en-ligne" -#: ../plug-ins/script-fu/script-fu.c:308 +#: ../plug-ins/script-fu/script-fu.c:307 msgid "_User Manual" -msgstr "_Manuel de l'utilisateur" +msgstr "_Manuel de l’utilisateur" -#: ../plug-ins/script-fu/script-fu.c:311 +#: ../plug-ins/script-fu/script-fu.c:310 msgid "_Script-Fu" msgstr "_Script-Fu" -#: ../plug-ins/script-fu/script-fu.c:313 +#: ../plug-ins/script-fu/script-fu.c:312 msgid "_Test" msgstr "_Test" -#: ../plug-ins/script-fu/script-fu.c:316 +#: ../plug-ins/script-fu/script-fu.c:315 msgid "_Buttons" msgstr "_Boutons" -#: ../plug-ins/script-fu/script-fu.c:318 +#: ../plug-ins/script-fu/script-fu.c:317 msgid "_Logos" msgstr "_Logos" -#: ../plug-ins/script-fu/script-fu.c:320 +#: ../plug-ins/script-fu/script-fu.c:319 msgid "_Patterns" msgstr "_Motifs" -#: ../plug-ins/script-fu/script-fu.c:323 +#: ../plug-ins/script-fu/script-fu.c:322 msgid "_Web Page Themes" msgstr "_Thèmes de page Web" -#: ../plug-ins/script-fu/script-fu.c:325 +#: ../plug-ins/script-fu/script-fu.c:324 msgid "_Alien Glow" msgstr "Lueur _extérieure" -#: ../plug-ins/script-fu/script-fu.c:327 +#: ../plug-ins/script-fu/script-fu.c:326 msgid "_Beveled Pattern" msgstr "Motif _biseauté" -#: ../plug-ins/script-fu/script-fu.c:329 +#: ../plug-ins/script-fu/script-fu.c:328 msgid "_Classic.Gimp.Org" msgstr "_Classic.Gimp.Org" -#: ../plug-ins/script-fu/script-fu.c:332 +#: ../plug-ins/script-fu/script-fu.c:331 msgid "Alpha to _Logo" msgstr "Alpha vers _logo" -#: ../plug-ins/script-fu/script-fu.c:335 +#: ../plug-ins/script-fu/script-fu.c:334 msgid "Re-read all available Script-Fu scripts" msgstr "Relire tous les scripts Script-Fu disponibles" -#: ../plug-ins/script-fu/script-fu.c:340 +#: ../plug-ins/script-fu/script-fu.c:339 msgid "_Refresh Scripts" msgstr "_Actualiser les scripts" -#: ../plug-ins/script-fu/script-fu.c:363 +#: ../plug-ins/script-fu/script-fu.c:362 msgid "" "You can not use \"Refresh Scripts\" while a Script-Fu dialog box is open. " "Please close all Script-Fu windows and try again." msgstr "" "Vous ne pouvez pas utiliser « Actualiser les scripts » tant que la boîte de " -"dialogue d'un Script-Fu est ouverte. Fermez toutes les fenêtres de script-fu " +"dialogue d’un Script-Fu est ouverte. Fermez toutes les fenêtres de script-fu " "et essayez à nouveau." -#: ../plug-ins/script-fu/script-fu-console.c:130 -#: ../plug-ins/script-fu/script-fu-console.c:197 +#: ../plug-ins/script-fu/script-fu-console.c:127 +#: ../plug-ins/script-fu/script-fu-console.c:194 msgid "Script-Fu Console" msgstr "Console Script-Fu" -#: ../plug-ins/script-fu/script-fu-console.c:193 +#: ../plug-ins/script-fu/script-fu-console.c:132 +#: ../plug-ins/script-fu/script-fu-console.c:293 +msgid "_Save" +msgstr "_Enregistrer" + +#: ../plug-ins/script-fu/script-fu-console.c:133 +msgid "C_lear" +msgstr "Effa_cer" + +#: ../plug-ins/script-fu/script-fu-console.c:134 +#: ../plug-ins/script-fu/script-fu-console.c:371 +msgid "_Close" +msgstr "_Fermer" + +#: ../plug-ins/script-fu/script-fu-console.c:190 msgid "Welcome to TinyScheme" msgstr "Bienvenue sur TinyScheme" -#: ../plug-ins/script-fu/script-fu-console.c:199 +#: ../plug-ins/script-fu/script-fu-console.c:196 msgid "Interactive Scheme Development" msgstr "Développement Scheme interactif" -#: ../plug-ins/script-fu/script-fu-console.c:235 +#: ../plug-ins/script-fu/script-fu-console.c:232 msgid "_Browse..." -msgstr "_Parcourir..." +msgstr "_Parcourir…" -#: ../plug-ins/script-fu/script-fu-console.c:293 +#: ../plug-ins/script-fu/script-fu-console.c:288 msgid "Save Script-Fu Console Output" msgstr "Enregistrer les sorties de la console Script-Fu" -#: ../plug-ins/script-fu/script-fu-console.c:340 +#: ../plug-ins/script-fu/script-fu-console.c:292 +#: ../plug-ins/script-fu/script-fu-interface.c:236 +#: ../plug-ins/script-fu/script-fu-server.c:834 +msgid "_Cancel" +msgstr "_Annuler" + +#: ../plug-ins/script-fu/script-fu-console.c:337 #, c-format msgid "Could not open '%s' for writing: %s" -msgstr "Impossible d'ouvrir « %s » pour écrire : %s" +msgstr "Impossible d’ouvrir « %s » pour écrire : %s" -#: ../plug-ins/script-fu/script-fu-console.c:369 +#: ../plug-ins/script-fu/script-fu-console.c:366 msgid "Script-Fu Procedure Browser" msgstr "Navigateur de procédures Script-Fu" +#: ../plug-ins/script-fu/script-fu-console.c:370 +msgid "_Apply" +msgstr "A_ppliquer" + #: ../plug-ins/script-fu/script-fu-eval.c:60 msgid "Script-Fu evaluation mode only allows non-interactive invocation" msgstr "" -"Le mode d'évaluation de Script-Fu autorise uniquement un appel non-interactif" +"Le mode d’évaluation de Script-Fu autorise uniquement un appel non-interactif" -#: ../plug-ins/script-fu/script-fu-interface.c:198 +#: ../plug-ins/script-fu/script-fu-interface.c:200 msgid "Script-Fu cannot process two scripts at the same time." msgstr "Script-Fu ne peut pas exécuter deux scripts à la fois." -#: ../plug-ins/script-fu/script-fu-interface.c:200 +#: ../plug-ins/script-fu/script-fu-interface.c:202 #, c-format msgid "You are already running the \"%s\" script." msgstr "Vous utilisez déjà le script « %s »" -#: ../plug-ins/script-fu/script-fu-interface.c:226 +#: ../plug-ins/script-fu/script-fu-interface.c:228 #, c-format msgid "Script-Fu: %s" msgstr "Script-Fu : %s" +#: ../plug-ins/script-fu/script-fu-interface.c:235 +msgid "_Reset" +msgstr "_Réinitialiser" + +#: ../plug-ins/script-fu/script-fu-interface.c:237 +msgid "_OK" +msgstr "_Valider" + #. we add a colon after the label; #. * some languages want an extra space here #. -#: ../plug-ins/script-fu/script-fu-interface.c:290 +#: ../plug-ins/script-fu/script-fu-interface.c:291 #, c-format msgid "%s:" msgstr "%s :" -#: ../plug-ins/script-fu/script-fu-interface.c:337 +#: ../plug-ins/script-fu/script-fu-interface.c:341 msgid "Script-Fu Color Selection" msgstr "Sélection de la couleur Script-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:446 +#: ../plug-ins/script-fu/script-fu-interface.c:457 msgid "Script-Fu File Selection" msgstr "Sélection du fichier Script-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:449 +#: ../plug-ins/script-fu/script-fu-interface.c:460 msgid "Script-Fu Folder Selection" msgstr "Sélection du répertoire du Script-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:462 +#: ../plug-ins/script-fu/script-fu-interface.c:473 msgid "Script-Fu Font Selection" msgstr "Sélection de la police Script-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:470 +#: ../plug-ins/script-fu/script-fu-interface.c:481 msgid "Script-Fu Palette Selection" msgstr "Sélection de la palette Script-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:479 +#: ../plug-ins/script-fu/script-fu-interface.c:490 msgid "Script-Fu Pattern Selection" msgstr "Sélection du motif Script-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:488 +#: ../plug-ins/script-fu/script-fu-interface.c:499 msgid "Script-Fu Gradient Selection" msgstr "Sélection du dégradé Script-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:497 +#: ../plug-ins/script-fu/script-fu-interface.c:508 msgid "Script-Fu Brush Selection" msgstr "Sélection de la brosse Script-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:840 +#: ../plug-ins/script-fu/script-fu-interface.c:877 #, c-format msgid "Error while executing %s:" -msgstr "Erreur lors de l'exécution de %s :" +msgstr "Erreur lors de l’exécution de %s :" -#: ../plug-ins/script-fu/script-fu-scripts.c:146 +#: ../plug-ins/script-fu/script-fu-scripts.c:149 msgid "Too few arguments to 'script-fu-register' call" -msgstr "Trop peu de paramètres pour l'appel à « script-fu-register »" +msgstr "Trop peu de paramètres pour l’appel à « script-fu-register »" -#: ../plug-ins/script-fu/script-fu-scripts.c:605 +#: ../plug-ins/script-fu/script-fu-scripts.c:648 #, c-format msgid "Error while loading %s:" msgstr "Erreur lors du chargement de %s :" -#: ../plug-ins/script-fu/script-fu-server.c:827 +#: ../plug-ins/script-fu/script-fu-server.c:830 msgid "Script-Fu Server Options" msgstr "Options du serveur Script-Fu" -#: ../plug-ins/script-fu/script-fu-server.c:832 +#: ../plug-ins/script-fu/script-fu-server.c:835 msgid "_Start Server" msgstr "_Démarrer le serveur" -#: ../plug-ins/script-fu/script-fu-server.c:865 +#: ../plug-ins/script-fu/script-fu-server.c:868 msgid "Listen on IP:" -msgstr "" +msgstr "Écouter sur l’IP :" -#: ../plug-ins/script-fu/script-fu-server.c:872 +#: ../plug-ins/script-fu/script-fu-server.c:875 msgid "Server port:" msgstr "Port du serveur :" -#: ../plug-ins/script-fu/script-fu-server.c:878 +#: ../plug-ins/script-fu/script-fu-server.c:881 msgid "Server logfile:" msgstr "Fichier journal du serveur :" -#: ../plug-ins/script-fu/script-fu-server.c:890 +#: ../plug-ins/script-fu/script-fu-server.c:894 msgid "" "Listening on an IP address other than 127.0.0.1 (especially 0.0.0.0) can " "allow attackers to remotely execute arbitrary code on this machine." msgstr "" +"Écouter sur une adresse IP autre que 127.0.0.1 (particulièrement 0.0.0.0) " +"peut permettre à un attaquant d’exécuter un code malveillant sur cette " +"machine." #: ../plug-ins/script-fu/scripts/add-bevel.scm:76 msgid "Bumpmap" @@ -240,7 +277,7 @@ msgstr "Bosselage" #: ../plug-ins/script-fu/scripts/add-bevel.scm:185 msgid "Add B_evel..." -msgstr "Ajouter un bis_eau..." +msgstr "Ajouter un bis_eau…" #: ../plug-ins/script-fu/scripts/add-bevel.scm:186 msgid "Add a beveled border to an image" @@ -269,11 +306,11 @@ msgstr "Calque de bordure" #: ../plug-ins/script-fu/scripts/addborder.scm:160 msgid "Add _Border..." -msgstr "Ajouter une _bordure..." +msgstr "Ajouter une b_ordure…" #: ../plug-ins/script-fu/scripts/addborder.scm:161 msgid "Add a border around an image" -msgstr "Ajoute une bordure autour de l'image" +msgstr "Ajoute une bordure autour de l’image" #: ../plug-ins/script-fu/scripts/addborder.scm:168 msgid "Border X size" @@ -298,11 +335,11 @@ msgstr "Cadre" #: ../plug-ins/script-fu/scripts/blend-anim.scm:222 msgid "Blend Animation needs at least three source layers" -msgstr "L'animation mélanger a besoin d'au moins trois calques sources" +msgstr "L’animation mélanger a besoin d’au moins trois calques sources" #: ../plug-ins/script-fu/scripts/blend-anim.scm:228 msgid "_Blend..." -msgstr "_Mélanger..." +msgstr "_Mélanger…" #: ../plug-ins/script-fu/scripts/blend-anim.scm:229 msgid "" @@ -330,12 +367,12 @@ msgid "" "The Burn-In script needs two layers in total. A foreground layer with " "transparency and a background layer." msgstr "" -"L'effet « en flammes » nécessite deux calques au total. Un calque de premier " +"L’effet « en flammes » nécessite deux calques au total. Un calque de premier " "plan avec transparence et un calque de fond." #: ../plug-ins/script-fu/scripts/burn-in-anim.scm:219 msgid "B_urn-In..." -msgstr "En _flammes..." +msgstr "En _flammes…" #: ../plug-ins/script-fu/scripts/burn-in-anim.scm:220 msgid "" @@ -355,7 +392,7 @@ msgstr "Fondu" #: ../plug-ins/script-fu/scripts/burn-in-anim.scm:229 msgid "Fadeout width" -msgstr "Largeur de l'estompement" +msgstr "Largeur de l’estompement" #: ../plug-ins/script-fu/scripts/burn-in-anim.scm:230 msgid "Corona width" @@ -399,12 +436,14 @@ msgstr "Insertion" #: ../plug-ins/script-fu/scripts/carve-it.scm:182 msgid "Stencil C_arve..." -msgstr "Patron de gr_avure..." +msgstr "Patron de gr_avure…" #: ../plug-ins/script-fu/scripts/carve-it.scm:183 msgid "" "Use the specified drawable as a stencil to carve from the specified image." msgstr "" +"Utiliser l’élément graphique spécifié comme patron pour graver d’après " +"l’image spécifiée." #: ../plug-ins/script-fu/scripts/carve-it.scm:190 msgid "Image to carve" @@ -445,7 +484,7 @@ msgstr "Éclairage" #: ../plug-ins/script-fu/scripts/chrome-it.scm:214 msgid "Stencil C_hrome..." -msgstr "Patron de c_hromage..." +msgstr "Patron de c_hromage…" #: ../plug-ins/script-fu/scripts/chrome-it.scm:215 msgid "" @@ -469,11 +508,11 @@ msgstr "Facteur de chrome" #: ../plug-ins/script-fu/scripts/chrome-it.scm:225 msgid "Environment map" -msgstr "Carte d'environnement" +msgstr "Carte d’environnement" #: ../plug-ins/script-fu/scripts/chrome-it.scm:228 msgid "Highlight balance" -msgstr "Balance d'éclairage" +msgstr "Balance d’éclairage" #: ../plug-ins/script-fu/scripts/chrome-it.scm:229 msgid "Chrome balance" @@ -483,41 +522,41 @@ msgstr "Balance du chrome" msgid "Chrome white areas" msgstr "Zones blanches du chrome" -#: ../plug-ins/script-fu/scripts/circuit.scm:81 +#: ../plug-ins/script-fu/scripts/circuit.scm:74 msgid "Effect layer" -msgstr "Calque d'effet" +msgstr "Calque d’effet" -#: ../plug-ins/script-fu/scripts/circuit.scm:134 +#: ../plug-ins/script-fu/scripts/circuit.scm:127 msgid "_Circuit..." -msgstr "_Circuit..." +msgstr "_Circuit…" -#: ../plug-ins/script-fu/scripts/circuit.scm:135 +#: ../plug-ins/script-fu/scripts/circuit.scm:128 msgid "" "Fill the selected region (or alpha) with traces like those on a circuit board" msgstr "" "Remplit la région sélectionnée (ou alpha) avec des traces telles que sur un " "circuit imprimé" -#: ../plug-ins/script-fu/scripts/circuit.scm:142 +#: ../plug-ins/script-fu/scripts/circuit.scm:135 msgid "Oilify mask size" msgstr "Taille de masque " -#: ../plug-ins/script-fu/scripts/circuit.scm:143 +#: ../plug-ins/script-fu/scripts/circuit.scm:136 msgid "Circuit seed" msgstr "Germe du circuit" -#: ../plug-ins/script-fu/scripts/circuit.scm:144 +#: ../plug-ins/script-fu/scripts/circuit.scm:137 msgid "No background (only for separate layer)" msgstr "Aucun arrière-plan (seulement pour le nouveau calque)" -#: ../plug-ins/script-fu/scripts/circuit.scm:145 +#: ../plug-ins/script-fu/scripts/circuit.scm:138 #: ../plug-ins/script-fu/scripts/lava.scm:129 #: ../plug-ins/script-fu/scripts/predator.scm:132 #: ../plug-ins/script-fu/scripts/xach-effect.scm:138 msgid "Keep selection" msgstr "Conserver la sélection" -#: ../plug-ins/script-fu/scripts/circuit.scm:146 +#: ../plug-ins/script-fu/scripts/circuit.scm:139 #: ../plug-ins/script-fu/scripts/lava.scm:130 #: ../plug-ins/script-fu/scripts/predator.scm:133 msgid "Separate layer" @@ -525,7 +564,7 @@ msgstr "Nouveau calque" #: ../plug-ins/script-fu/scripts/clothify.scm:51 msgid "_Clothify..." -msgstr "_Tisser..." +msgstr "_Tisser…" #: ../plug-ins/script-fu/scripts/clothify.scm:52 msgid "Add a cloth-like texture to the selected region (or alpha)" @@ -558,11 +597,11 @@ msgstr "Taches" #: ../plug-ins/script-fu/scripts/coffee.scm:81 msgid "_Coffee Stain..." -msgstr "_Tache de café..." +msgstr "_Tache de café…" #: ../plug-ins/script-fu/scripts/coffee.scm:82 msgid "Add realistic looking coffee stains to the image" -msgstr "Ajoute une tache de café réaliste à l'image" +msgstr "Ajoute une tache de café réaliste à l’image" #: ../plug-ins/script-fu/scripts/coffee.scm:89 msgid "Stains" @@ -572,49 +611,49 @@ msgstr "Taches" msgid "Darken only" msgstr "Assombrir seulement" -#: ../plug-ins/script-fu/scripts/difference-clouds.scm:67 +#: ../plug-ins/script-fu/scripts/difference-clouds.scm:70 msgid "Difference Clouds..." -msgstr "Nuages par différence..." +msgstr "Nuages par différence…" -#: ../plug-ins/script-fu/scripts/difference-clouds.scm:68 +#: ../plug-ins/script-fu/scripts/difference-clouds.scm:71 msgid "Solid noise applied with Difference layer mode" msgstr "Bruit plein appliqué avec le mode de calque différence" -#: ../plug-ins/script-fu/scripts/distress-selection.scm:102 +#: ../plug-ins/script-fu/scripts/distress-selection.scm:105 msgid "_Distort..." -msgstr "_Déformation..." +msgstr "_Déformation…" -#: ../plug-ins/script-fu/scripts/distress-selection.scm:103 +#: ../plug-ins/script-fu/scripts/distress-selection.scm:106 msgid "Distress the selection" msgstr "Déforme la sélection" -#: ../plug-ins/script-fu/scripts/distress-selection.scm:110 +#: ../plug-ins/script-fu/scripts/distress-selection.scm:113 msgid "Threshold (bigger 1<-->254 smaller)" msgstr "Seuil (plus grand 1<-->254 plus petit)" -#: ../plug-ins/script-fu/scripts/distress-selection.scm:111 +#: ../plug-ins/script-fu/scripts/distress-selection.scm:114 msgid "Spread" msgstr "Dispersion" -#: ../plug-ins/script-fu/scripts/distress-selection.scm:112 +#: ../plug-ins/script-fu/scripts/distress-selection.scm:115 msgid "Granularity (1 is low)" msgstr "Granularité (1 est faible)" -#: ../plug-ins/script-fu/scripts/distress-selection.scm:113 +#: ../plug-ins/script-fu/scripts/distress-selection.scm:116 msgid "Smooth" msgstr "Adoucir" -#: ../plug-ins/script-fu/scripts/distress-selection.scm:114 +#: ../plug-ins/script-fu/scripts/distress-selection.scm:117 msgid "Smooth horizontally" msgstr "Adoucir horizontalement" -#: ../plug-ins/script-fu/scripts/distress-selection.scm:115 +#: ../plug-ins/script-fu/scripts/distress-selection.scm:118 msgid "Smooth vertically" msgstr "Adoucir verticalement" #: ../plug-ins/script-fu/scripts/drop-shadow.scm:170 -msgid "_Drop Shadow..." -msgstr "Ombre _portée..." +msgid "_Drop Shadow (legacy)..." +msgstr "Ombre _portée (ancien)…" #: ../plug-ins/script-fu/scripts/drop-shadow.scm:171 msgid "Add a drop shadow to the selected region (or alpha)" @@ -653,7 +692,7 @@ msgstr "Permettre le redimensionnement" #: ../plug-ins/script-fu/scripts/erase-rows.scm:39 msgid "_Erase Every Other Row..." -msgstr "Change une colonne ou rangée _sur deux..." +msgstr "Change une colonne ou rangée _sur deux…" #: ../plug-ins/script-fu/scripts/erase-rows.scm:40 msgid "Erase every other row or column" @@ -693,11 +732,11 @@ msgstr "Effacer" #: ../plug-ins/script-fu/scripts/erase-rows.scm:49 msgid "Fill with BG" -msgstr "Remplir avec l'AP" +msgstr "Remplir avec l’AP" #: ../plug-ins/script-fu/scripts/font-map.scm:152 msgid "Render _Font Map..." -msgstr "Rendre un aperçu de _polices..." +msgstr "Rendre un aperçu de _polices…" #: ../plug-ins/script-fu/scripts/font-map.scm:153 msgid "" @@ -744,11 +783,11 @@ msgstr "Activer les couleurs" #: ../plug-ins/script-fu/scripts/fuzzyborder.scm:146 msgid "_Fuzzy Border..." -msgstr "Bordure _inégale..." +msgstr "Bor_dure inégale…" #: ../plug-ins/script-fu/scripts/fuzzyborder.scm:147 msgid "Add a jagged, fuzzy border to an image" -msgstr "Ajoute une bordure diffuse et inégale à l'image" +msgstr "Ajoute une bordure diffuse et inégale à l’image" #: ../plug-ins/script-fu/scripts/fuzzyborder.scm:155 #: ../plug-ins/script-fu/scripts/old-photo.scm:98 @@ -769,11 +808,11 @@ msgstr "Ajouter une ombre" #: ../plug-ins/script-fu/scripts/fuzzyborder.scm:159 msgid "Shadow weight (%)" -msgstr "Épaisseur de l'ombre (%)" +msgstr "Épaisseur de l’ombre (%)" #: ../plug-ins/script-fu/scripts/fuzzyborder.scm:161 msgid "Flatten image" -msgstr "Aplatir l'image" +msgstr "Aplatir l’image" #: ../plug-ins/script-fu/scripts/gimp-online.scm:59 msgid "Using _Paths" @@ -843,7 +882,7 @@ msgstr "_Registre des greffons" #: ../plug-ins/script-fu/scripts/gradient-example.scm:63 msgid "Custom _Gradient..." -msgstr "Dégradé _personnalisé..." +msgstr "Dégradé _personnalisé…" #: ../plug-ins/script-fu/scripts/gradient-example.scm:64 msgid "Create an image filled with an example of the current gradient" @@ -871,7 +910,7 @@ msgstr "Dégradé inverse" #: ../plug-ins/script-fu/scripts/grid-system.scm:84 msgid "_Grid..." -msgstr "_Grille..." +msgstr "_Grille…" #: ../plug-ins/script-fu/scripts/grid-system.scm:85 msgid "" @@ -894,18 +933,17 @@ msgid "New Guides from _Selection" msgstr "Nouveaux guides depuis la _sélection" #: ../plug-ins/script-fu/scripts/guides-from-selection.scm:33 -#, fuzzy msgid "Create four guides around the bounding box of the current selection" -msgstr "Arrondit les coins de la sélection courante" +msgstr "Crée 4 guides autour de la boîte englobante de la sélection courante" #: ../plug-ins/script-fu/scripts/guides-new-percent.scm:27 msgid "New Guide (by _Percent)..." -msgstr "Nouveau guide (en _pourcentage)..." +msgstr "Nouveau guide (en _pourcentage)…" #: ../plug-ins/script-fu/scripts/guides-new-percent.scm:28 msgid "Add a guide at the position specified as a percentage of the image size" msgstr "" -"Ajoute un guide à la position indiquée en pourcentage de la taille de l'image" +"Ajoute un guide à la position indiquée en pourcentage de la taille de l’image" #: ../plug-ins/script-fu/scripts/guides-new-percent.scm:35 #: ../plug-ins/script-fu/scripts/guides-new.scm:35 @@ -928,12 +966,12 @@ msgstr "Position (en %)" #: ../plug-ins/script-fu/scripts/guides-new.scm:27 msgid "New _Guide..." -msgstr "Nouveau _guide..." +msgstr "Nouveau _guide…" #: ../plug-ins/script-fu/scripts/guides-new.scm:28 msgid "Add a guide at the orientation and position specified (in pixels)" msgstr "" -"Ajoute un guide dans l'orientation et à la position indiquées (en pixels)" +"Ajoute un guide dans l’orientation et à la position indiquées (en pixels)" #: ../plug-ins/script-fu/scripts/guides-new.scm:36 msgid "Position" @@ -949,7 +987,7 @@ msgstr "Supprime tous les guides horizontaux et verticaux" #: ../plug-ins/script-fu/scripts/lava.scm:117 msgid "_Lava..." -msgstr "_Lave..." +msgstr "_Lave…" #: ../plug-ins/script-fu/scripts/lava.scm:118 msgid "Fill the current selection with lava" @@ -976,11 +1014,11 @@ msgstr "Dégradé" msgid "Use current gradient" msgstr "Utilise le dégradé courant" -#: ../plug-ins/script-fu/scripts/line-nova.scm:106 +#: ../plug-ins/script-fu/scripts/line-nova.scm:108 msgid "Line _Nova..." -msgstr "Ligne No_va..." +msgstr "Ligne No_va…" -#: ../plug-ins/script-fu/scripts/line-nova.scm:107 +#: ../plug-ins/script-fu/scripts/line-nova.scm:109 msgid "" "Fill a layer with rays emanating outward from its center using the " "foreground color" @@ -988,25 +1026,25 @@ msgstr "" "Remplit un calque avec des rayons émanant de son centre en utilisant la " "couleur de premier plan" -#: ../plug-ins/script-fu/scripts/line-nova.scm:114 +#: ../plug-ins/script-fu/scripts/line-nova.scm:116 msgid "Number of lines" msgstr "Nombres de lignes" -#: ../plug-ins/script-fu/scripts/line-nova.scm:115 +#: ../plug-ins/script-fu/scripts/line-nova.scm:117 msgid "Sharpness (degrees)" msgstr "Étroitesse (degrés)" -#: ../plug-ins/script-fu/scripts/line-nova.scm:116 +#: ../plug-ins/script-fu/scripts/line-nova.scm:118 msgid "Offset radius" msgstr "Rayon du décalage" -#: ../plug-ins/script-fu/scripts/line-nova.scm:117 +#: ../plug-ins/script-fu/scripts/line-nova.scm:119 msgid "Randomness" msgstr "Aléa" #: ../plug-ins/script-fu/scripts/mkbrush.scm:63 msgid "_Rectangular..." -msgstr "_Rectangulaire..." +msgstr "_Rectangulaire…" #: ../plug-ins/script-fu/scripts/mkbrush.scm:64 msgid "Create a rectangular brush" @@ -1030,7 +1068,7 @@ msgstr "Espacement" #: ../plug-ins/script-fu/scripts/mkbrush.scm:131 msgid "Re_ctangular, Feathered..." -msgstr "Re_ctangulaire, adoucie..." +msgstr "Re_ctangulaire, adoucie…" #: ../plug-ins/script-fu/scripts/mkbrush.scm:132 msgid "Create a rectangular brush with feathered edges" @@ -1043,7 +1081,7 @@ msgstr "Adoucissement" #: ../plug-ins/script-fu/scripts/mkbrush.scm:187 msgid "_Elliptical..." -msgstr "_Elliptique..." +msgstr "_Elliptique…" #: ../plug-ins/script-fu/scripts/mkbrush.scm:188 msgid "Create an elliptical brush" @@ -1051,7 +1089,7 @@ msgstr "Crée une brosse elliptique" #: ../plug-ins/script-fu/scripts/mkbrush.scm:256 msgid "Elli_ptical, Feathered..." -msgstr "_Elliptique, adoucie..." +msgstr "_Elliptique, adoucie…" #: ../plug-ins/script-fu/scripts/mkbrush.scm:257 msgid "Create an elliptical brush with feathered edges" @@ -1059,11 +1097,11 @@ msgstr "Crée une brosse elliptique avec des bords adoucis" #: ../plug-ins/script-fu/scripts/old-photo.scm:89 msgid "_Old Photo..." -msgstr "_Vieille photo..." +msgstr "_Vieille photo…" #: ../plug-ins/script-fu/scripts/old-photo.scm:90 msgid "Make an image look like an old photo" -msgstr "Faire qu'une image ressemble à une vieille photo" +msgstr "Faire qu’une image ressemble à une vieille photo" #: ../plug-ins/script-fu/scripts/old-photo.scm:97 msgid "Defocus" @@ -1080,11 +1118,11 @@ msgstr "Sépia" msgid "Mottle" msgstr "Marbrer" -#: ../plug-ins/script-fu/scripts/palette-export.scm:235 +#: ../plug-ins/script-fu/scripts/palette-export.scm:226 msgid "Folder for the output file" msgstr "Dossier pour le fichier de sortie" -#: ../plug-ins/script-fu/scripts/palette-export.scm:236 +#: ../plug-ins/script-fu/scripts/palette-export.scm:227 msgid "" "The name of the file to create (if a file with this name already exist, it " "will be replaced)" @@ -1092,13 +1130,13 @@ msgstr "" "Le nom du fichier à créer (si un fichier de ce nom existe déjà, il sera " "remplacé)" -#: ../plug-ins/script-fu/scripts/palette-export.scm:244 +#: ../plug-ins/script-fu/scripts/palette-export.scm:235 msgid "The filename you entered is not a suitable name for a file." msgstr "" -"Le nom de fichier que vous avez saisi n'est pas un nom qui convient à un " +"Le nom de fichier que vous avez saisi n’est pas un nom qui convient à un " "fichier." -#: ../plug-ins/script-fu/scripts/palette-export.scm:246 +#: ../plug-ins/script-fu/scripts/palette-export.scm:237 msgid "" "All characters in the name are either white-spaces or characters which can " "not appear in filenames." @@ -1106,34 +1144,34 @@ msgstr "" "Tous les caractères du nom sont soit des espaces blancs, soit des caractères " "interdits dans les noms de fichiers." -#: ../plug-ins/script-fu/scripts/palette-export.scm:274 +#: ../plug-ins/script-fu/scripts/palette-export.scm:265 msgid "" "Export the active palette as a CSS stylesheet with the color entry name as " "their class name, and the color itself as the color attribute" msgstr "" "Exporte la palette active en tant que feuille de style CSS avec pour nom de " -"classe le nom d'entrée de couleur, et, pour attribut de couleur, la couleur " +"classe le nom d’entrée de couleur, et, pour attribut de couleur, la couleur " "elle-même" -#: ../plug-ins/script-fu/scripts/palette-export.scm:300 +#: ../plug-ins/script-fu/scripts/palette-export.scm:291 msgid "Export the active palette as a PHP dictionary (name => color)" msgstr "" "Exporte la palette active en tant que dictionnaire PHP (nom => couleur)" -#: ../plug-ins/script-fu/scripts/palette-export.scm:332 +#: ../plug-ins/script-fu/scripts/palette-export.scm:323 msgid "Export the active palette as a Python dictionary (name: color)" msgstr "" "Exporte la palette active en tant que dictionnaire Python (nom : couleur)" -#: ../plug-ins/script-fu/scripts/palette-export.scm:361 +#: ../plug-ins/script-fu/scripts/palette-export.scm:352 msgid "" "Write all the colors in a palette to a text file, one hexadecimal value per " "line (no names)" msgstr "" -"Inscrit toutes les couleurs d'une palette dans un fichier texte, une valeur " +"Inscrit toutes les couleurs d’une palette dans un fichier texte, une valeur " "hexadécimale par ligne (sans nom)" -#: ../plug-ins/script-fu/scripts/palette-export.scm:408 +#: ../plug-ins/script-fu/scripts/palette-export.scm:399 msgid "Export the active palette as a java.util.Hashtable" msgstr "" "Exporte la palette active en tant que java.util.Hashtable " @@ -1141,11 +1179,11 @@ msgstr "" #: ../plug-ins/script-fu/scripts/paste-as-brush.scm:56 #: ../plug-ins/script-fu/scripts/paste-as-pattern.scm:44 msgid "There is no image data in the clipboard to paste." -msgstr "Aucune image n'est présente dans le presse-papier pour collage." +msgstr "Aucune image n’est présente dans le presse-papier pour collage." #: ../plug-ins/script-fu/scripts/paste-as-brush.scm:62 msgid "New _Brush..." -msgstr "Nouvelle _brosse..." +msgstr "Nouvelle _brosse…" #: ../plug-ins/script-fu/scripts/paste-as-brush.scm:63 msgid "Paste the clipboard contents into a new brush" @@ -1165,7 +1203,7 @@ msgstr "Nom de fichier" #: ../plug-ins/script-fu/scripts/paste-as-pattern.scm:50 msgid "New _Pattern..." -msgstr "Nouveau _motif..." +msgstr "Nouveau _motif…" #: ../plug-ins/script-fu/scripts/paste-as-pattern.scm:51 msgid "Paste the clipboard contents into a new pattern" @@ -1178,7 +1216,7 @@ msgstr "Nom du motif" #: ../plug-ins/script-fu/scripts/perspective-shadow.scm:198 msgid "_Perspective..." -msgstr "Ombre en _perspective..." +msgstr "Ombre en _perspective…" #: ../plug-ins/script-fu/scripts/perspective-shadow.scm:199 msgid "Add a perspective shadow to the selected region (or alpha)" @@ -1190,11 +1228,11 @@ msgstr "Angle" #: ../plug-ins/script-fu/scripts/perspective-shadow.scm:207 msgid "Relative distance of horizon" -msgstr "Distance relative de l'horizon" +msgstr "Distance relative de l’horizon" #: ../plug-ins/script-fu/scripts/perspective-shadow.scm:208 msgid "Relative length of shadow" -msgstr "Longueur relative de l'ombre" +msgstr "Longueur relative de l’ombre" #: ../plug-ins/script-fu/scripts/perspective-shadow.scm:212 msgid "Interpolation" @@ -1202,7 +1240,7 @@ msgstr "Interpolation" #: ../plug-ins/script-fu/scripts/predator.scm:121 msgid "_Predator..." -msgstr "_Prédateur..." +msgstr "_Prédateur…" #: ../plug-ins/script-fu/scripts/predator.scm:122 msgid "Add a 'Predator' effect to the selected region (or alpha)" @@ -1210,7 +1248,7 @@ msgstr "Ajoute un effet « prédateur » à la région sélectionnée (ou alph #: ../plug-ins/script-fu/scripts/predator.scm:129 msgid "Edge amount" -msgstr "Nombre d'arêtes" +msgstr "Nombre d’arêtes" #: ../plug-ins/script-fu/scripts/predator.scm:130 msgid "Pixelize" @@ -1222,57 +1260,57 @@ msgstr "Nombre de pixels" #: ../plug-ins/script-fu/scripts/reverse-layers.scm:42 msgid "Reverse Layer Order" -msgstr "Inverser l'ordre des calques" +msgstr "Inverser l’ordre des calques" #: ../plug-ins/script-fu/scripts/reverse-layers.scm:43 msgid "Reverse the order of layers in the image" -msgstr "Inverse l'ordre des calques dans l'image" +msgstr "Inverse l’ordre des calques dans l’image" -#: ../plug-ins/script-fu/scripts/ripply-anim.scm:119 +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:67 msgid "_Rippling..." -msgstr "_Ondulation..." +msgstr "_Ondulation…" -#: ../plug-ins/script-fu/scripts/ripply-anim.scm:120 +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:68 msgid "" -"Create a multi-layer image by adding a ripple effect to the current image" +"Create a multi-layer image by adding a ripple effect to the current layer" msgstr "" -"Crée une image multicalque en ajoutant un effet d'ondulation à l'image " -"courante" +"Crée une image multi-calque en ajoutant un effet d’ondulation au calque " +"courant" -#: ../plug-ins/script-fu/scripts/ripply-anim.scm:127 +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:75 msgid "Rippling strength" -msgstr "Vigueur de l'ondulation" +msgstr "Vigueur de l’ondulation" -#: ../plug-ins/script-fu/scripts/ripply-anim.scm:128 +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:76 #: ../plug-ins/script-fu/scripts/waves-anim.scm:105 msgid "Number of frames" -msgstr "Nombre d'images" +msgstr "Nombre d’images" -#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129 +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:77 msgid "Edge behavior" msgstr "Comportement du bord" -#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129 +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:77 msgid "Wrap" msgstr "Enrouler" -#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129 +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:77 msgid "Smear" msgstr "Étaler" -#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129 +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:77 msgid "Black" msgstr "Noir" #: ../plug-ins/script-fu/scripts/round-corners.scm:129 msgid "_Round Corners..." -msgstr "Coins a_rrondis..." +msgstr "Coins a_rrondis…" #: ../plug-ins/script-fu/scripts/round-corners.scm:130 msgid "" "Round the corners of an image and optionally add a drop-shadow and background" msgstr "" -"Arrondit les coins d'une image et optionnellement ajouter une ombre portée " +"Arrondit les coins d’une image et optionnellement ajouter une ombre portée " "et un fond" #: ../plug-ins/script-fu/scripts/round-corners.scm:137 @@ -1285,11 +1323,11 @@ msgstr "Ajouter une ombre portée" #: ../plug-ins/script-fu/scripts/round-corners.scm:139 msgid "Shadow X offset" -msgstr "Décalage de l'ombre en X" +msgstr "Décalage de l’ombre en X" #: ../plug-ins/script-fu/scripts/round-corners.scm:140 msgid "Shadow Y offset" -msgstr "Décalage de l'ombre en Y" +msgstr "Décalage de l’ombre en Y" #: ../plug-ins/script-fu/scripts/round-corners.scm:142 msgid "Add background" @@ -1297,12 +1335,12 @@ msgstr "Ajouter un arrière-plan" #: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm:53 msgid "Se_t Colormap..." -msgstr "Définir la pale_tte..." +msgstr "Définir la pale_tte…" #: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm:54 msgid "Change the colormap of an image to the colors in a specified palette." msgstr "" -"Attribue à la palette de couleurs d'une image les couleurs de la palette " +"Attribue à la palette de couleurs d’une image les couleurs de la palette " "indiquée." #: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm:61 @@ -1311,7 +1349,7 @@ msgstr "Palette" #: ../plug-ins/script-fu/scripts/selection-round.scm:139 msgid "Rounded R_ectangle..." -msgstr "Rectangle arr_ondi..." +msgstr "Rectangle arr_ondi…" #: ../plug-ins/script-fu/scripts/selection-round.scm:140 msgid "Round the corners of the current selection" @@ -1327,7 +1365,7 @@ msgstr "Concave" #: ../plug-ins/script-fu/scripts/select-to-brush.scm:133 msgid "To _Brush..." -msgstr "Vers une _brosse..." +msgstr "Vers une _brosse…" #: ../plug-ins/script-fu/scripts/select-to-brush.scm:134 msgid "Convert a selection to a brush" @@ -1343,7 +1381,7 @@ msgstr "Convertit une sélection en image" #: ../plug-ins/script-fu/scripts/select-to-pattern.scm:93 msgid "To _Pattern..." -msgstr "Vers un _motif..." +msgstr "Vers un _motif…" #: ../plug-ins/script-fu/scripts/select-to-pattern.scm:94 msgid "Convert a selection to a pattern" @@ -1351,12 +1389,12 @@ msgstr "Convertit une sélection en motif" #: ../plug-ins/script-fu/scripts/slide.scm:236 msgid "_Slide..." -msgstr "_Pellicule photo..." +msgstr "_Pellicule photo…" #: ../plug-ins/script-fu/scripts/slide.scm:237 msgid "Add a slide-film like frame, sprocket holes, and labels to an image" msgstr "" -"Ajoute un cadre de pellicule photo, des trous d'entraînement et un " +"Ajoute un cadre de pellicule photo, des trous d’entraînement et un " "étiquetage à une image" #: ../plug-ins/script-fu/scripts/slide.scm:244 @@ -1377,12 +1415,12 @@ msgstr "Couleur de la police" #: ../plug-ins/script-fu/scripts/spinning-globe.scm:94 msgid "_Spinning Globe..." -msgstr "Globe _tournant..." +msgstr "Globe _tournant…" #: ../plug-ins/script-fu/scripts/spinning-globe.scm:95 msgid "Create an animation by mapping the current image onto a spinning sphere" msgstr "" -"Crée une animation en plaquant l'image courante sur une sphère tournante" +"Crée une animation en plaquant l’image courante sur une sphère tournante" #: ../plug-ins/script-fu/scripts/spinning-globe.scm:102 msgid "Frames" @@ -1402,17 +1440,18 @@ msgstr "Index à n couleurs (0 = reste en RVB)" #: ../plug-ins/script-fu/scripts/spyrogimp.scm:240 msgid "Rendering Spyro" -msgstr "Rendu spirographe en cours" +msgstr "Rendu spirogimp en cours" #: ../plug-ins/script-fu/scripts/spyrogimp.scm:314 msgid "_Spyrogimp..." -msgstr "_Spirographe..." +msgstr "_Spirogimp…" #: ../plug-ins/script-fu/scripts/spyrogimp.scm:315 msgid "" "Add Spirographs, Epitrochoids, and Lissajous Curves to the current layer" msgstr "" -"Ajoute des courbes spirographes, épitrochoïdes et lissajous au calque actuel" +"Ajoute des courbes spirographes, épitrochoïdes et de Lissajous au calque " +"actuel" #: ../plug-ins/script-fu/scripts/spyrogimp.scm:323 msgid "Type" @@ -1524,17 +1563,16 @@ msgid "Gradient: Loop Triangle" msgstr "Dégradé : rebouclage en triangle" #: ../plug-ins/script-fu/scripts/test-sphere.scm:267 -#, fuzzy msgid "_Sphere..." -msgstr "C_hrome..." +msgstr "_Sphère…" #: ../plug-ins/script-fu/scripts/tileblur.scm:68 msgid "_Tileable Blur..." -msgstr "Flou _mosaïque..." +msgstr "Flou _mosaïque…" #: ../plug-ins/script-fu/scripts/tileblur.scm:69 msgid "Blur the edges of an image so the result tiles seamlessly" -msgstr "Brouille les bords d'une image pour obtenir un carreau raccordable" +msgstr "Brouille les bords d’une image pour obtenir un carreau raccordable" #: ../plug-ins/script-fu/scripts/tileblur.scm:76 msgid "Radius" @@ -1570,7 +1608,7 @@ msgstr "Opacité du masque" #: ../plug-ins/script-fu/scripts/waves-anim.scm:95 msgid "_Waves..." -msgstr "_Vagues..." +msgstr "_Vagues…" #: ../plug-ins/script-fu/scripts/waves-anim.scm:96 msgid "" @@ -1578,7 +1616,7 @@ msgid "" "current image" msgstr "" "Crée une image multi-calque avec un effet de pierre jetée au travers de " -"l'image courante" +"l’image courante" #: ../plug-ins/script-fu/scripts/waves-anim.scm:103 msgid "Amplitude" @@ -1586,7 +1624,7 @@ msgstr "Amplitude" #: ../plug-ins/script-fu/scripts/waves-anim.scm:104 msgid "Wavelength" -msgstr "Longueur d'onde" +msgstr "Longueur d’onde" #: ../plug-ins/script-fu/scripts/waves-anim.scm:106 msgid "Invert direction" @@ -1594,7 +1632,7 @@ msgstr "Inverse la direction" #: ../plug-ins/script-fu/scripts/weave.scm:389 msgid "_Weave..." -msgstr "T_resser..." +msgstr "T_resser…" #: ../plug-ins/script-fu/scripts/weave.scm:390 msgid "" @@ -1614,11 +1652,11 @@ msgstr "Espacement bandes" #: ../plug-ins/script-fu/scripts/weave.scm:399 msgid "Shadow darkness" -msgstr "Obscurité de l'ombre" +msgstr "Obscurité de l’ombre" #: ../plug-ins/script-fu/scripts/weave.scm:400 msgid "Shadow depth" -msgstr "Profondeur de l'ombre" +msgstr "Profondeur de l’ombre" #: ../plug-ins/script-fu/scripts/weave.scm:401 msgid "Thread length" @@ -1638,7 +1676,7 @@ msgstr "Ombre" #: ../plug-ins/script-fu/scripts/xach-effect.scm:121 msgid "_Xach-Effect..." -msgstr "Effet _Xach..." +msgstr "Effet _Xach…" #: ../plug-ins/script-fu/scripts/xach-effect.scm:122 msgid "Add a subtle translucent 3D effect to the selected region (or alpha)" @@ -1655,796 +1693,28 @@ msgstr "Décalage Y éclairage" #: ../plug-ins/script-fu/scripts/xach-effect.scm:131 msgid "Highlight color" -msgstr "Couleur d'éclairage" +msgstr "Couleur d’éclairage" #: ../plug-ins/script-fu/scripts/xach-effect.scm:132 msgid "Highlight opacity" -msgstr "Opacité d'éclairage" +msgstr "Opacité d’éclairage" #: ../plug-ins/script-fu/scripts/xach-effect.scm:133 msgid "Drop shadow color" -msgstr "Couleur de l'ombre portée" +msgstr "Couleur de l’ombre portée" #: ../plug-ins/script-fu/scripts/xach-effect.scm:134 msgid "Drop shadow opacity" -msgstr "Opacité de l'ombre portée" +msgstr "Opacité de l’ombre portée" #: ../plug-ins/script-fu/scripts/xach-effect.scm:135 msgid "Drop shadow blur radius" -msgstr "Rayon de flou pour l'ombre portée" +msgstr "Rayon de flou pour l’ombre portée" #: ../plug-ins/script-fu/scripts/xach-effect.scm:136 msgid "Drop shadow X offset" -msgstr "Décalage X d'ombre portée" +msgstr "Décalage X d’ombre portée" #: ../plug-ins/script-fu/scripts/xach-effect.scm:137 msgid "Drop shadow Y offset" -msgstr "Décalage Y d'ombre portée" - -#~ msgid "3D _Outline..." -#~ msgstr "_Contour 3D..." - -#~ msgid "Bumpmap (alpha layer) blur radius" -#~ msgstr "Rayon de flou du bosselage (calque alpha)" - -#~ msgid "Create a logo with outlined text and a drop shadow" -#~ msgstr "Crée un logo avec du texte au contour marqué et une ombre portée" - -#~ msgid "Default bumpmap settings" -#~ msgstr "Réglages par défaut du bosselage" - -#~ msgid "Font size (pixels)" -#~ msgstr "Taille de la police (pixels)" - -#~ msgid "Outline blur radius" -#~ msgstr "Rayon de flou du contour" - -#~ msgid "" -#~ "Outline the selected region (or alpha) with a pattern and add a drop " -#~ "shadow" -#~ msgstr "" -#~ "Marque le contour d'une région sélectionnée (ou alpha) avec un motif et " -#~ "ajoute une ombre portée" - -#~ msgid "Pattern" -#~ msgstr "Motif" - -#~ msgid "Shadow blur radius" -#~ msgstr "Rayon de flou de l'ombre" - -#~ msgid "3_D Truchet..." -#~ msgstr "3_D Truchet..." - -#~ msgid "Background color" -#~ msgstr "Couleur d'arrière-plan" - -#~ msgid "Block size" -#~ msgstr "Taille de bloc" - -#~ msgid "Create an image filled with a 3D Truchet pattern" -#~ msgstr "Crée une image remplie avec un motif 3D truchet" - -#~ msgid "End blend" -#~ msgstr "Fin du mélange" - -#~ msgid "Number of X tiles" -#~ msgstr "Nombre de carreaux en X" - -#~ msgid "Number of Y tiles" -#~ msgstr "Nombre de carreaux en Y" - -#~ msgid "Start blend" -#~ msgstr "Départ du mélange" - -#~ msgid "Supersample" -#~ msgstr "Sur-échantillonnage" - -#~ msgid "Alien Glow" -#~ msgstr "Lueur extérieure" - -#~ msgid "Arrow" -#~ msgstr "Flèche" - -#~ msgid "Create an arrow graphic with an eerie glow for web pages" -#~ msgstr "" -#~ "Crée une flèche graphique avec une lueur spectrale pour les pages Web" - -#~ msgid "Down" -#~ msgstr "Bas" - -#~ msgid "Left" -#~ msgstr "Gauche" - -#~ msgid "Orientation" -#~ msgstr "Orientation" - -#~ msgid "Right" -#~ msgstr "Droite" - -#~ msgid "Up" -#~ msgstr "Haut" - -#~ msgid "_Arrow..." -#~ msgstr "_Flèche..." - -#~ msgid "Bar" -#~ msgstr "Barre" - -#~ msgid "Bar height" -#~ msgstr "Hauteur de la barre" - -#~ msgid "Bar length" -#~ msgstr "Longueur de la barre" - -#~ msgid "Create an Hrule graphic with an eerie glow for web pages" -#~ msgstr "" -#~ "Crée une ligne horizontale (hrule) graphique avec une lueur spectrale " -#~ "pour les pages Web" - -#~ msgid "_Hrule..." -#~ msgstr "_Règle horizontale..." - -#~ msgid "Bullet" -#~ msgstr "Puce" - -#~ msgid "Create a bullet graphic with an eerie glow for web pages" -#~ msgstr "Crée une puce graphique avec une lueur spectrale pour les pages Web" - -#~ msgid "_Bullet..." -#~ msgstr "_Puce..." - -#~ msgid "B_utton..." -#~ msgstr "Bo_uton..." - -#~ msgid "Button" -#~ msgstr "Bouton" - -#~ msgid "Create a button graphic with an eerie glow for web pages" -#~ msgstr "" -#~ "Crée un bouton graphique avec une lueur spectrale pour les pages Web" - -#~ msgid "Glow" -#~ msgstr "Lueur" - -#~ msgid "Glow radius" -#~ msgstr "Rayon de la lueur" - -#~ msgid "Padding" -#~ msgstr "Marge" - -#~ msgid "Text color" -#~ msgstr "Couleur du texte" - -#~ msgid "Add an eerie glow around the selected region (or alpha)" -#~ msgstr "" -#~ "Ajoute une lueur spectrale autour de la région sélectionnée (ou alpha)" - -#~ msgid "Alien _Glow..." -#~ msgstr "Lueur _extérieure..." - -#~ msgid "Create a logo with an alien glow around the text" -#~ msgstr "Crée un logo avec une lueur extérieure autour du texte" - -#~ msgid "Glow size (pixels * 4)" -#~ msgstr "Taille de la lueur (pixels * 4)" - -#~ msgid "Add psychedelic outlines to the selected region (or alpha)" -#~ msgstr "" -#~ "Ajoute un contour psychédélique autour de la région sélectionnée (ou " -#~ "alpha)" - -#~ msgid "Alien _Neon..." -#~ msgstr "_Néon extérieur..." - -#~ msgid "Create a logo with psychedelic outlines around the text" -#~ msgstr "Crée un logo avec des contours psychédéliques autour du texte" - -#~ msgid "Fade away" -#~ msgstr "Affaiblissement" - -#~ msgid "Number of bands" -#~ msgstr "Nombre de bandes" - -#~ msgid "Width of bands" -#~ msgstr "Largeur des bandes" - -#~ msgid "Width of gaps" -#~ msgstr "Largeur des brèches" - -#~ msgid "" -#~ "Add a gradient effect, a drop shadow, and a background to the selected " -#~ "region (or alpha)" -#~ msgstr "" -#~ "Ajoute un effet graduel, une ombre portée et un fond à la région " -#~ "sélectionnée (ou alpha)" - -#~ msgid "" -#~ "Create a plain text logo with a gradient effect, a drop shadow, and a " -#~ "background" -#~ msgstr "" -#~ "Crée un logo textuel avec un effet graduel, une ombre portée et un fond" - -#~ msgid "_Basic I..." -#~ msgstr "_Basique I..." - -#~ msgid "Add a shadow and a highlight to the selected region (or alpha)" -#~ msgstr "" -#~ "Ajoute un éclairage et une ombre à la région sélectionnée (ou alpha)" - -#~ msgid "B_asic II..." -#~ msgstr "B_asique II..." - -#~ msgid "Create a simple logo with a shadow and a highlight" -#~ msgstr "Crée un logo simple avec un éclairage et une ombre" - -#~ msgid "Bevel width" -#~ msgstr "Largeur du biseau" - -#~ msgid "Create a simple, beveled button graphic for webpages" -#~ msgstr "Crée un simple bouton graphique biseauté pour les pages Web" - -#~ msgid "Lower-right color" -#~ msgstr "Couleur bas-droite" - -#~ msgid "Pressed" -#~ msgstr "Activé" - -#~ msgid "Simple _Beveled Button..." -#~ msgstr "Simple bouton _biseauté..." - -#~ msgid "Upper-left color" -#~ msgstr "Couleur haut-gauche" - -#~ msgid "Create a beveled pattern arrow for webpages" -#~ msgstr "Crée une flèche biseautée pour les pages Web" - -#~ msgid "Create a beveled pattern bullet for webpages" -#~ msgstr "Crée d'une puce biseautée pour les pages Web" - -#~ msgid "Diameter" -#~ msgstr "Diamètre" - -#~ msgid "Create a beveled pattern button for webpages" -#~ msgstr "Crée un bouton biseauté pour les pages Web" - -#~ msgid "Create a beveled pattern heading for webpages" -#~ msgstr "Crée un titre biseauté pour les pages Web" - -#~ msgid "H_eading..." -#~ msgstr "_Titre..." - -#~ msgid "Create a beveled pattern hrule for webpages" -#~ msgstr "Crée une ligne horizontale (hrule) biseautée pour les pages Web" - -#~ msgid "Rule" -#~ msgstr "Règle" - -#~ msgid "" -#~ "Add blended backgrounds, highlights, and shadows to the selected region " -#~ "(or alpha)" -#~ msgstr "" -#~ "Ajoute des fonds mélangés, éclairages et ombres à la région sélectionnée " -#~ "(ou alpha)" - -#~ msgid "Blen_ded..." -#~ msgstr "Mélan_gé..." - -#~ msgid "Blend mode" -#~ msgstr "Mode de mélange" - -#~ msgid "Create a logo with blended backgrounds, highlights, and shadows" -#~ msgstr "Crée un logo avec des fonds mélangés, éclairages et ombres" - -#~ msgid "Custom Gradient" -#~ msgstr "Dégradé personnalisé" - -#~ msgid "FG-BG-HSV" -#~ msgstr "PP-AP-HSV" - -#~ msgid "FG-BG-RGB" -#~ msgstr "PP-AP-RGB" - -#~ msgid "FG-Transparent" -#~ msgstr "PP Transparent" - -#~ msgid "Offset (pixels)" -#~ msgstr "Décalage (pixels)" - -#~ msgid "Add 'cow spots' to the selected region (or alpha)" -#~ msgstr "Ajoute des « taches bovines » à la région sélectionnée (ou alpha)" - -#~ msgid "Background Color" -#~ msgstr "Couleur d'arrière-plan" - -#~ msgid "Bo_vination..." -#~ msgstr "Bo_vination..." - -#~ msgid "Create a logo with text in the style of 'cow spots'" -#~ msgstr "Crée un logo avec un texte dans le style « tache bovine »" - -#~ msgid "Spots density X" -#~ msgstr "Densité de taches en X" - -#~ msgid "Spots density Y" -#~ msgstr "Densité de taches en Y" - -#~ msgid "Color 1" -#~ msgstr "Couleur 1" - -#~ msgid "Color 2" -#~ msgstr "Couleur 2" - -#~ msgid "Color 3" -#~ msgstr "Couleur 3" - -#~ msgid "Create an image filled with a camouflage pattern" -#~ msgstr "Crée une image remplie avec un motif camouflage" - -#~ msgid "Granularity" -#~ msgstr "Granularité" - -#~ msgid "Image size" -#~ msgstr "Taille de l'image" - -#~ msgid "_Camouflage..." -#~ msgstr "_Camouflage..." - -#~ msgid "Background Image" -#~ msgstr "Image d'arrière-plan" - -#~ msgid "Carve raised text" -#~ msgstr "Grave le texte agrandi" - -#~ msgid "Carved..." -#~ msgstr "Gravé..." - -#~ msgid "" -#~ "Create a logo with text raised above or carved in to the specified " -#~ "background image" -#~ msgstr "" -#~ "Crée un logo avec un texte qui ressort, ou en creux, dans le fond " -#~ "spécifié de l'image" - -#~ msgid "Padding around text" -#~ msgstr "Remplissage autour du texte" - -#~ msgid "Chalk color" -#~ msgstr "Couleur de craie" - -#~ msgid "Create a chalk drawing effect for the selected region (or alpha)" -#~ msgstr "" -#~ "Crée un effet de dessin à la craie sur la région sélectionnée (ou alpha)" - -#~ msgid "Create a logo resembling chalk scribbled on a blackboard" -#~ msgstr "" -#~ "Crée un logo ressemblant à de la craie griffonnée sur un tableau noir" - -#~ msgid "_Chalk..." -#~ msgstr "C_raie..." - -#~ msgid "Add a chipped woodcarving effect to the selected region (or alpha)" -#~ msgstr "" -#~ "Ajoute un effet de gravure sur bois à la région sélectionnée (ou alpha)" - -#~ msgid "Blur amount" -#~ msgstr "Importance du flou" - -#~ msgid "Chip Awa_y..." -#~ msgstr "Gravure au _burin..." - -#~ msgid "Chip amount" -#~ msgstr "Nombre d'éclats" - -#~ msgid "Create a logo resembling a chipped wood carving" -#~ msgstr "Crée un logo ressemblant à du bois gravé au burin" - -#~ msgid "Drop shadow" -#~ msgstr "Ombre portée" - -#~ msgid "Fill BG with pattern" -#~ msgstr "Remplir l'AP avec un motif" - -#~ msgid "Invert" -#~ msgstr "Inverser" - -#~ msgid "Keep background" -#~ msgstr "Garder l'arrière-plan" - -#~ msgid "Add a simple chrome effect to the selected region (or alpha)" -#~ msgstr "" -#~ "Ajoute un simple effet de chrome à la région sélectionnée (ou alpha)" - -#~ msgid "Create a simplistic, but cool, chromed logo" -#~ msgstr "Crée un logo chromé, simpliste mais sympathique" - -#~ msgid "Offsets (pixels * 2)" -#~ msgstr "Décalages (pixels x 2)" - -#~ msgid "" -#~ "Add a comic-book effect to the selected region (or alpha) by outlining " -#~ "and filling with a gradient" -#~ msgstr "" -#~ "Ajoute un effet BD à la région sélectionnée (ou alpha) en l'entourant et " -#~ "la remplissant avec un dégradé" - -#~ msgid "Comic Boo_k..." -#~ msgstr "B_D..." - -#~ msgid "" -#~ "Create a comic-book style logo by outlining and filling with a gradient" -#~ msgstr "" -#~ "Crée un logo dans le style BD en entourant et remplissant avec un dégradé" - -#~ msgid "Outline color" -#~ msgstr "Couleur du contour" - -#~ msgid "Outline size" -#~ msgstr "Taille du contour" - -#~ msgid "" -#~ "Add a metallic effect to the selected region (or alpha) with reflections " -#~ "and perspective shadows" -#~ msgstr "" -#~ "Ajoute un effet métallique à la région sélectionnée (ou alpha) avec des " -#~ "réflexions et des ombres de perspective" - -#~ msgid "Cool _Metal..." -#~ msgstr "_Métallique froid..." - -#~ msgid "Create a metallic logo with reflections and perspective shadows" -#~ msgstr "" -#~ "Crée un logo métallique avec des réflexions et des ombres de perspective" - -#~ msgid "Effect size (pixels)" -#~ msgstr "Taille de l'effet (pixels)" - -#~ msgid "Background image" -#~ msgstr "Image d'arrière-plan" - -#~ msgid "" -#~ "Create a logo with a crystal/gel effect displacing the image underneath" -#~ msgstr "" -#~ "Crée un logo avec un effet cristal/gel et déplace l'image en dessous" - -#~ msgid "Crystal..." -#~ msgstr "Cristal..." - -#~ msgid "Create an image filled with a Land Pattern" -#~ msgstr "Crée une image remplie avec un motif de terrain" - -#~ msgid "Detail level" -#~ msgstr "Niveau de détail" - -#~ msgid "Image height" -#~ msgstr "Hauteur de l'image" - -#~ msgid "Image width" -#~ msgstr "Largeur de l'image" - -#~ msgid "Random seed" -#~ msgstr "Germe aléatoire" - -#~ msgid "Scale X" -#~ msgstr "Échelle en X" - -#~ msgid "Scale Y" -#~ msgstr "Échelle en Y" - -#~ msgid "_Flatland..." -#~ msgstr "_Terrain plat..." - -#~ msgid "" -#~ "Add a frost effect to the selected region (or alpha) with an added drop " -#~ "shadow" -#~ msgstr "" -#~ "Ajoute un effet givré à la région sélectionnée (ou alpha) avec une ombre " -#~ "portée" - -#~ msgid "Create frozen logo with an added drop shadow" -#~ msgstr "Crée un logo givré avec une ombre portée" - -#~ msgid "_Frosty..." -#~ msgstr "_Givré..." - -#~ msgid "" -#~ "Add gradients, patterns, shadows, and bump maps to the selected region " -#~ "(or alpha)" -#~ msgstr "" -#~ "Ajoute des dégradés, motifs, ombres et reliefs à la région sélectionnée " -#~ "(ou alpha)" - -#~ msgid "Blend gradient (outline)" -#~ msgstr "Dégradé (contours)" - -#~ msgid "Blend gradient (text)" -#~ msgstr "Dégradé (texte)" - -#~ msgid "Create a logo with gradients, patterns, shadows, and bump maps" -#~ msgstr "Crée un logo avec dégradés, motifs, ombres et reliefs" - -#~ msgid "Glo_ssy..." -#~ msgstr "G_lacé..." - -#~ msgid "Outline gradient reverse" -#~ msgstr "Dégradé du contour inversé" - -#~ msgid "Pattern (outline)" -#~ msgstr "Motif (contour)" - -#~ msgid "Pattern (overlay)" -#~ msgstr "Motif (recouvrement)" - -#~ msgid "Pattern (text)" -#~ msgstr "Motif (texte)" - -#~ msgid "Text gradient reverse" -#~ msgstr "Dégradé de texte inversé" - -#~ msgid "Use pattern for outline instead of gradient" -#~ msgstr "Utiliser un motif pour le contour au lieu du dégradé" - -#~ msgid "Use pattern for text instead of gradient" -#~ msgstr "Utiliser un motif pour le texte au lieu du dégradé" - -#~ msgid "Use pattern overlay" -#~ msgstr "Utiliser un motif de recouvrement" - -#~ msgid "Add a glowing hot metal effect to the selected region (or alpha)" -#~ msgstr "" -#~ "Ajoute un effet de métal chaud rougeoyant à la région sélectionnée (ou " -#~ "alpha) " - -#~ msgid "Create a logo that looks like glowing hot metal" -#~ msgstr "Crée d'un logo ressemblant à du métal chaud rougeoyant" - -#~ msgid "Glo_wing Hot..." -#~ msgstr "Chaud rougeoyant..." - -#~ msgid "Add a shiny look and bevel effect to the selected region (or alpha)" -#~ msgstr "" -#~ "Ajoute un aspect brillant et un biseau à la région sélectionnée (ou " -#~ "alpha) " - -#~ msgid "Bevel height (sharpness)" -#~ msgstr "Hauteur du biseau (finesse)" - -#~ msgid "Border size (pixels)" -#~ msgstr "Taille de la bordure (pixels)" - -#~ msgid "Create a logo with a shiny look and beveled edges" -#~ msgstr "Crée un logo avec un aspect brillant et des bords biseautés" - -#~ msgid "Gradient Beve_l..." -#~ msgstr "B_iseau graduel..." - -#~ msgid "Create a logo in a two-color, scribbled text style" -#~ msgstr "Crée un logo bicolore dans le style d'un texte griffonné" - -#~ msgid "Frame color" -#~ msgstr "Couleur de l'encadrement" - -#~ msgid "Frame size" -#~ msgstr "Taille de l'encadrement" - -#~ msgid "Imigre-_26..." -#~ msgstr "Imigre-_26..." - -#~ msgid "Create an image filled with a topographic map pattern" -#~ msgstr "Crée une image remplie avec un motif de carte topographique" - -#~ msgid "Land height" -#~ msgstr "Hauteur du terrain" - -#~ msgid "Sea depth" -#~ msgstr "Profondeur de la mer" - -#~ msgid "_Land..." -#~ msgstr "T_erre..." - -#~ msgid "Convert the selected region (or alpha) into a neon-sign like object" -#~ msgstr "" -#~ "Convertit la région sélectionnée (ou alpha) en un objet constitué de " -#~ "tubes néon" - -#~ msgid "Create a logo in the style of a neon sign" -#~ msgstr "Crée un logo dans le style de tubes néon" - -#~ msgid "Create shadow" -#~ msgstr "Créer une ombre" - -#~ msgid "N_eon..." -#~ msgstr "N_éon..." - -#~ msgid "Cell size (pixels)" -#~ msgstr "Taille des cellules (pixels)" - -#~ msgid "Create a logo in the style of newspaper printing" -#~ msgstr "Crée un logo dans le style papier journal" - -#~ msgid "Density (%)" -#~ msgstr "Densité (%)" - -#~ msgid "Newsprint Te_xt..." -#~ msgstr "Te_xte de papier journal..." - -#~ msgid "Create images, each containing an oval button graphic" -#~ msgstr "Crée des images contenant chacune un bouton graphique ovale" - -#~ msgid "Lower color" -#~ msgstr "Couleur du bas" - -#~ msgid "Lower color (active)" -#~ msgstr "Couleur du bas (active)" - -#~ msgid "Not pressed" -#~ msgstr "Inactif" - -#~ msgid "Not pressed (active)" -#~ msgstr "Normal" - -#~ msgid "Padding X" -#~ msgstr "Marge X" - -#~ msgid "Padding Y" -#~ msgstr "Marge Y" - -#~ msgid "Round ratio" -#~ msgstr "Proportions de l'arrondi" - -#~ msgid "Text color (active)" -#~ msgstr "Couleur du texte (actif)" - -#~ msgid "Upper color" -#~ msgstr "Couleur du haut" - -#~ msgid "Upper color (active)" -#~ msgstr "Couleur du haut (actif)" - -#~ msgid "_Round Button..." -#~ msgstr "Bouton a_rrondi..." - -#~ msgid "Behavior" -#~ msgstr "Comportement" - -#~ msgid "Create an image filled with an Earth-like map pattern" -#~ msgstr "Crée une image remplie avec un motif de style terrain" - -#~ msgid "Detail in Middle" -#~ msgstr "Détail au milieu" - -#~ msgid "Render _Map..." -#~ msgstr "Rendre un _terrain..." - -#~ msgid "Tile" -#~ msgstr "Carreau" - -#~ msgid "Create a State Of The Art chromed logo" -#~ msgstr "Crée un logo chromé dans l'état de l'art" - -#~ msgid "SOTA Chrome..." -#~ msgstr "SOTA chrome..." - -#~ msgid "Create a logo with a speedy text effect" -#~ msgstr "Crée un logo avec un effet de texte accéléré" - -#~ msgid "Speed Text..." -#~ msgstr "Texte accéléré..." - -#~ msgid "Create a logo using a rock-like texture, a nova glow, and shadow" -#~ msgstr "" -#~ "Crée un logo en utilisant une texture de roche, une lueur nova et une " -#~ "ombre" - -#~ msgid "Sta_rscape..." -#~ msgstr "Paysage étoilé..." - -#~ msgid "Create an image filled with a swirled tile effect" -#~ msgstr "Crée une image remplie avec un effet tourbillonnant " - -#~ msgid "Swirl-_Tile..." -#~ msgstr "Carreau tourbillonnant..." - -#~ msgid "Whirl amount" -#~ msgstr "Quantité de tourbillons" - -#~ msgid "Create an image filled with a swirly pattern" -#~ msgstr "Crée une image remplie avec un motif tourbillonnant " - -#~ msgid "Number of times to whirl" -#~ msgstr "Combien de fois tourbillonner" - -#~ msgid "Quarter size" -#~ msgstr "Taille du quartier" - -#~ msgid "Whirl angle" -#~ msgstr "Angle de tourbillon" - -#~ msgid "_Swirly..." -#~ msgstr "T_ourbillonné..." - -#~ msgid "Add a Trace of Particles effect to the selected region (or alpha)" -#~ msgstr "" -#~ "Ajoute un effet de trace de particules à la région sélectionnée (ou alpha)" - -#~ msgid "Base color" -#~ msgstr "Couleur de base" - -#~ msgid "Create a logo using a Trace Of Particles effect" -#~ msgstr "Crée un logo en utilisant l'effet de trace de particules" - -#~ msgid "Edge only" -#~ msgstr "Bords seulement" - -#~ msgid "Edge width" -#~ msgstr "Largeur des bords" - -#~ msgid "Hit rate" -#~ msgstr "Taux de traces" - -#~ msgid "_Particle Trace..." -#~ msgstr "Traces de _particules..." - -#~ msgid "Antialias" -#~ msgstr "Anti-crénelage" - -#~ msgid "" -#~ "Create a logo by rendering the specified text along the perimeter of a " -#~ "circle" -#~ msgstr "" -#~ "Crée un logo en rendant le texte spécifié le long du périmètre d'un cercle" - -#~ msgid "Fill angle" -#~ msgstr "Angle de remplissage" - -#~ msgid "Text C_ircle..." -#~ msgstr "Texte circ_ulaire..." - -#~ msgid "" -#~ "Create a textured logo with highlights, shadows, and a mosaic background" -#~ msgstr "Crée un logo texturé avec éclairages, ombres et un fond mosaïque" - -#~ msgid "Ending blend" -#~ msgstr "Mélange final" - -#~ msgid "" -#~ "Fill the selected region (or alpha) with a texture and add highlights, " -#~ "shadows, and a mosaic background" -#~ msgstr "" -#~ "Remplit la région sélectionnée (ou alpha) avec une texture et ajouter des " -#~ "éclairages, ombres et un fond mosaïque" - -#~ msgid "Hexagons" -#~ msgstr "Hexagones" - -#~ msgid "Mosaic tile type" -#~ msgstr "Type de mosaïque" - -#~ msgid "Octagons" -#~ msgstr "Octogones" - -#~ msgid "Squares" -#~ msgstr "Carrés" - -#~ msgid "Starting blend" -#~ msgstr "Début mélange" - -#~ msgid "Text pattern" -#~ msgstr "Motif du texte" - -#~ msgid "_Textured..." -#~ msgstr "_Texturé..." - -#~ msgid "Create a decorative web title header" -#~ msgstr "Crée un en-tête de titre Web décoratif" - -#~ msgid "Web Title Header..." -#~ msgstr "Titre Web..." - -#~ msgid "Create an image filled with a Truchet pattern" -#~ msgstr "Crée une image remplie avec un motif truchet" - -#~ msgid "Foreground color" -#~ msgstr "Couleur de premier plan" - -#~ msgid "T_ruchet..." -#~ msgstr "T_ruchet..." +msgstr "Décalage Y d’ombre portée" diff --git a/po-script-fu/sv.po b/po-script-fu/sv.po index 0800eb0e09..74e4aa0979 100644 --- a/po-script-fu/sv.po +++ b/po-script-fu/sv.po @@ -12,15 +12,15 @@ msgstr "" "Project-Id-Version: gimp-script-fu\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=Internationalisation\n" -"POT-Creation-Date: 2017-12-28 15:40+0000\n" -"PO-Revision-Date: 2017-12-28 21:18+0100\n" -"Last-Translator: Sebastian Rasmussen \n" +"POT-Creation-Date: 2018-03-22 12:37+0000\n" +"PO-Revision-Date: 2018-04-14 02:08+0200\n" +"Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.5\n" +"X-Generator: Poedit 2.0.6\n" #: ../plug-ins/script-fu/script-fu.c:111 msgid "Interactive console for Script-Fu development" @@ -1533,7 +1533,7 @@ msgstr "Färgmetod" #: ../plug-ins/script-fu/scripts/spyrogimp.scm:347 msgid "Solid Color" -msgstr "Solid färg" +msgstr "Enfärgad" #: ../plug-ins/script-fu/scripts/spyrogimp.scm:348 msgid "Gradient: Loop Sawtooth" diff --git a/po-tips/it.po b/po-tips/it.po index 2c13eb2109..83b1b407dd 100644 --- a/po-tips/it.po +++ b/po-tips/it.po @@ -1,14 +1,14 @@ # translation of gimp20-tips.po to italian # Copyright (C) 2003, 2004 Free Software Foundation, Inc. # MIke Vargas , 2004. -# Marco Ciampa , 2004-2011. +# Marco Ciampa , 2004-2018. # msgid "" msgstr "" "Project-Id-Version: it\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-07 23:11+0100\n" -"PO-Revision-Date: 2011-12-07 23:15+0100\n" +"POT-Creation-Date: 2018-03-27 12:12+0200\n" +"PO-Revision-Date: 2018-03-27 12:17+0200\n" "Last-Translator: Marco Ciampa \n" "Language-Team: gimp.linux.it \n" "Language: it\n" @@ -19,47 +19,128 @@ msgstr "" #: ../data/tips/gimp-tips.xml.in.h:1 msgid "" -"Ctrl-click with the Bucket Fill tool to have it use the background " -"color instead of the foreground color. Similarly, Ctrl-clicking " -"with the eyedropper tool sets the background color instead of the foreground " -"color." +"You can get context-sensitive help for most of GIMP's features by pressing " +"the F1 key at any time. This also works inside the menus." msgstr "" -"Premendo Ctrl-clic con lo strumento di Riempimento Colore, sarà " -"utilizzato il colore di sfondo invece di quello in primo piano. Similmente, " -"Ctrl-clic con lo strumento di prelievo colore imposterà il colore " -"di sfondo invece che di primo piano." +"È possibile ottenere un aiuto sensibile al contesto per la maggior parte " +"delle funzioni di GIMP premendo F1 in qualsiasi istante. Funziona anche " +"all'interno dei menu." #: ../data/tips/gimp-tips.xml.in.h:2 msgid "" -"Ctrl-clicking on the layer mask's preview in the Layers dialog " -"toggles the effect of the layer mask. Alt-clicking on the layer " -"mask's preview in the Layers dialog toggles viewing the mask directly." +"GIMP uses layers to let you organize your image. Think of them as a stack of " +"slides or filters, such that looking through them you see a composite of " +"their contents." msgstr "" -"Ctrl-clic sull'anteprima della maschera di livello nella finestra " -"di dialogo Livelli abilita/disabilita l'effetto della maschera di livello. " -"Alt-clic sull'anteprima nella finestra di dialogo dei Livelli " -"abilita/disabilita la visualizzazione diretta della maschera." +"GIMP usa i livelli per organizzare l'immagine. Pensateli come una pila di " +"diapositive o filtri, in modo che guardando attraverso di loro è possibile " +"vedere una composizione del loro contenuto." #: ../data/tips/gimp-tips.xml.in.h:3 msgid "" -"Ctrl-drag with the Rotate tool will constrain the rotation to 15 " -"degree angles." +"You can perform many layer operations by right-clicking on the text label of " +"a layer in the Layers dialog." msgstr "" -"Premendo Ctrl e trascinando con lo strumento Rotazione, " -"quest'ultima sarà forzata ad angoli di 15 gradi." +"Puoi eseguire un gran numero di operazioni facendo clic con il tasto destro " +"sul nome del livello nella finestra di dialogo Livelli." #: ../data/tips/gimp-tips.xml.in.h:4 msgid "" -"Shift-click on the eye icon in the Layers dialog to hide all layers " -"but that one. Shift-click again to show all layers." -msgstr "" -"Premendo il tasto Maiusc e facendo clic con il mouse sull'icona a " -"forma d'occhio nella finestra di dialogo Livelli nasconderà tutti i livelli " -"eccetto quello cui è associato l'occhio. Premendo di nuovo Maiusc-" -"clic, riappariranno." +"Saving an image uses XCF, GIMP's native file format (file extension ." +"xcf). This preserves the layers and many aspects of your work-in-" +"progress, allowing to work on it again later. Once a project is completed, " +"you can export it as JPEG, PNG, GIF, etc." +msgstr "Il salvataggio di un'immagine usa il formato nativo di GIMP, l'XCF (con estensione .xcf). Esso manterrà i livelli e ogni altro aspetto del lavoro, consentendone la successiva continuazione. Una volta che il progetto sarà finito, sarà sempre possibile esportarlo come JPEG, PNG, GIF, ecc." #: ../data/tips/gimp-tips.xml.in.h:5 msgid "" +"Most plug-ins work on the current layer of the current image. In some cases, " +"you will have to merge all layers (Image→Flatten Image) if you want the plug-" +"in to work on the whole image." +msgstr "" +"La maggior parte dei plug-in lavora sul livello attivo dell'immagine " +"corrente. In alcuni casi è necessario unire tutti i livelli (Immagine->" +"Appiattisci immagine) se vuoi che i plug-in agiscano sull'intera immagine." + +#: ../data/tips/gimp-tips.xml.in.h:6 +msgid "" +"If a layer's name in the Layers dialog is displayed in bold, this " +"layer doesn't have an alpha-channel. You can add an alpha-channel using " +"Layer→Transparency→Add Alpha Channel." +msgstr "" +"Se il nome di un livello nella finestra di dialogo dei livelli viene " +"mostrato in grassetto significa che quel livello non possiede un " +"canale alfa. È comunque possibile aggiungerlo usando Livello->Trasparenza-" +">Aggiungi canale alfa." + +#: ../data/tips/gimp-tips.xml.in.h:7 +msgid "" +"Not all effects can be applied to all kinds of images. This is indicated by " +"a grayed-out menu-entry. You may need to change the image mode to RGB " +"(Image→Mode→RGB), add an alpha-channel (Layer→Transparency→Add Alpha " +"Channel) or flatten it (Image→Flatten Image)." +msgstr "" +"Non tutti gli effetti possono essere applicati ad ogni tipo di immagine. In " +"caso di impossibilità la corrispondente voce del menu sarà resa in grigetto. " +"Per risolvere il problema, basta cambiare la modalità immagine in RGB " +"(Immagine->Modalità->RGB), aggiungere un canale alfa (Livelli->" +"Trasparenze->Aggiungi canale alfa) o appiattire l'immagine (Immagine->" +"Appiattisci immagine)." + +#: ../data/tips/gimp-tips.xml.in.h:8 +msgid "" +"You can adjust or move a selection by using Alt-drag. If this makes " +"the window move, your window manager uses the Alt key already. Most " +"window managers can be configured to ignore the Alt key or to use " +"the Super key (or \"Windows logo\") instead." +msgstr "" +"Puoi regolare o spostare una selezione premendo Alt e trascinando. " +"Se si dovesse muovere la finestra, vuol dire che il programma di gestione " +"finestre (window manager) corrente usa già il tasto Alt. Molti " +"gestori di finestre possono essere configurati per ignorare il tasto " +"Alt o per usare in alternativa il tasto con il logo, in genere una " +"mela o il simbolo di una finestra." + +#: ../data/tips/gimp-tips.xml.in.h:9 +msgid "" +"You can drag and drop many things in GIMP. For example, dragging a color " +"from the toolbox or from a color palette and dropping it into an image will " +"fill the current selection with that color." +msgstr "" +"È possibile trascinare molte cose con GIMP. Per esempio, trascinando un " +"colore dalla finestra degli strumenti o da una tavolozza e rilasciandolo " +"nell'immagine si riempirà la selezione corrente con quel colore." + +#: ../data/tips/gimp-tips.xml.in.h:10 +msgid "" +"You can use the middle mouse button to pan around the image (or optionally " +"hold Spacebar while you move the mouse)." +msgstr "" +"È possibile usare il tasto centrale del mouse per muoversi nell'immagine " +"(oppure mantenendo premuta la barra spaziatrice mentre si muove il " +"mouse)." + +#: ../data/tips/gimp-tips.xml.in.h:11 +msgid "" +"Click and drag on a ruler to place a guide on an image. All dragged " +"selections will snap to the guides. You can remove guides by dragging them " +"off the image with the Move tool." +msgstr "" +"Fare clic su un righello e trascinare verso l'immagine per posizionare una " +"guida. Tutte le selezioni trascinate si attaccheranno alle guide. Per " +"rimuovere le guide trascinarle fuori dall'immagine con lo strumento sposta." + +#: ../data/tips/gimp-tips.xml.in.h:12 +msgid "" +"You can drag a layer from the Layers dialog and drop it onto the toolbox. " +"This will create a new image containing only that layer." +msgstr "" +"Trascinando e rilasciando un livello dalla finestra di dialogo Livelli alla " +"finestra degli strumenti, verrà creata una nuova immagine contenente solo " +"quel livello." + +#: ../data/tips/gimp-tips.xml.in.h:13 +msgid "" "A floating selection must be anchored to a new layer or to the last active " "layer before doing other operations on the image. Click on the "New " "Layer" or the "Anchor Layer" button in the Layers dialog, or " @@ -71,7 +152,84 @@ msgstr "" "livello" nella finestra di dialogo Livelli, oppure usare le voci del " "menu per eseguire le stesse azioni." -#: ../data/tips/gimp-tips.xml.in.h:6 +#: ../data/tips/gimp-tips.xml.in.h:14 +msgid "" +"GIMP supports gzip compression on the fly. Just add .gz (or ." +"bz2, if you have bzip2 installed) to the filename and your image will " +"be saved compressed. Of course loading compressed images works too." +msgstr "" +"GIMP supporta la compressione gzip al volo. Basta aggiungere .gz (o " +".bz2, se si è installato bzip2) al nome del file e la tua immagine " +"sarà salvata compressa. Ovviamente funzionerà anche il caricamento di " +"immagini compresse." + +#: ../data/tips/gimp-tips.xml.in.h:15 +msgid "" +"Pressing and holding the Shift key before making a selection allows " +"you to add to the current selection instead of replacing it. Using Ctrl before making a selection subtracts from the current one." +msgstr "" +"Tenendo premuto il tasto Maiusc prima di effettuare una selezione " +"ti consentirà di aggiungere la selezione corrente invece di rimpiazzarla. " +"Usando il tasto Ctrl la selezione verrà sottratta a quella presente." + +#: ../data/tips/gimp-tips.xml.in.h:16 +msgid "" +"You can draw simple squares or circles using Edit→Stroke Selection. It " +"strokes the edge of your current selection. More complex shapes can be drawn " +"using the Path tool or with Filters→Render→Gfig." +msgstr "" +"Usando Modifica->Disegna selezione potrai disegnare semplici quadrati o " +"cerchi tracciando la selezione corrente con il pennello attivo. Forme più " +"complesse possono essere disegnate con lo strumento tracciati o con Filtri-" +">Render->Gfig." + +#: ../data/tips/gimp-tips.xml.in.h:17 +msgid "" +"If you stroke a path (Edit→Stroke Path), the paint tools can be used with " +"their current settings. You can use the Paintbrush in gradient mode or even " +"the Eraser or the Smudge tool." +msgstr "" +"Per delineare un tracciato (Modifica->Disegna tracciato), si possono " +"usare anche gli strumenti di disegno con le loro impostazioni correnti. Si " +"può usare il Pennello nella modalità gradiente oppure la Gomma o lo " +"strumento Sfumino." + +#: ../data/tips/gimp-tips.xml.in.h:18 +msgid "" +"You can create and edit complex selections using the Path tool. The Paths " +"dialog allows you to work on multiple paths and to convert them to " +"selections." +msgstr "" +"Puoi creare e modificare selezioni complesse usando lo strumento Tracciati. " +"La finestra di dialogo Tracciati ti permette di lavorare con molteplici " +"tracciati e di convertirli in selezioni." + +#: ../data/tips/gimp-tips.xml.in.h:19 +msgid "" +"You can use the paint tools to change the selection. Click on the "" +"Quick Mask" button at the bottom left of an image window. Change your " +"selection by painting in the image and click on the button again to convert " +"it back to a normal selection." +msgstr "" +"Gli strumenti di disegno possono servire per cambiare le selezioni: fare " +"clic sul pulsante "Maschera veloce" in basso a sinistra della " +"finestra dell'immagine, cambiare la selezione disegnando nell'immagine e " +"fare clic nuovamente sul pulsante per convertirla ad una selezione normale." + +#: ../data/tips/gimp-tips.xml.in.h:20 +msgid "" +"You can save a selection to a channel (Select→Save to Channel) and then " +"modify this channel with any paint tools. Using the buttons in the Channels " +"dialog, you can toggle the visibility of this new channel or convert it to a " +"selection." +msgstr "" +"Puoi salvare una selezione in un canale (Seleziona->Salva in Canale) e " +"poi modificare il canale con gli strumenti di disegno. Con i pulsanti " +"presenti nella finestra di dialogo Canali, puoi rendere visibile o " +"invisibile il nuovo canale o convertirlo in una selezione." + +#: ../data/tips/gimp-tips.xml.in.h:21 msgid "" "After you enabled "Dynamic Keyboard Shortcuts" in the Preferences " "dialog, you can reassign shortcut keys. Do so by bringing up the menu, " @@ -89,49 +247,66 @@ msgstr "" "i "Tasti scorciatoia dinamici" per prevenire la riassegnazione " "accidentale delle scorciatoie da tastiera." -#: ../data/tips/gimp-tips.xml.in.h:7 +#: ../data/tips/gimp-tips.xml.in.h:22 msgid "" -"Click and drag on a ruler to place a guide on an image. All dragged " -"selections will snap to the guides. You can remove guides by dragging them " -"off the image with the Move tool." +"If your screen is too cluttered, you can press Tab in an image " +"window to toggle the visibility of the toolbox and other dialogs." msgstr "" -"Fare clic su un righello e trascinare verso l'immagine per posizionare una " -"guida. Tutte le selezioni trascinate si attaccheranno alle guide. Per " -"rimuovere le guide trascinarle fuori dall'immagine con lo strumento sposta." +"Se lo schermo è troppo affollato, premi il tasto Tab più volte " +"nella finestra dell'immagine per nascondere o mostrare la barra degli " +"strumenti o le altre finestre di dialogo." -#: ../data/tips/gimp-tips.xml.in.h:8 +#: ../data/tips/gimp-tips.xml.in.h:23 msgid "" -"GIMP supports gzip compression on the fly. Just add .gz (or ." -"bz2, if you have bzip2 installed) to the filename and your image will " -"be saved compressed. Of course loading compressed images works too." +"Shift-click on the eye icon in the Layers dialog to hide all layers " +"but that one. Shift-click again to show all layers." msgstr "" -"GIMP supporta la compressione gzip al volo. Basta aggiungere .gz (o " -".bz2, se si è installato bzip2) al nome del file e la tua immagine " -"sarà salvata compressa. Ovviamente funzionerà anche il caricamento di " -"immagini compresse." +"Premendo il tasto Maiusc e facendo clic con il mouse sull'icona a " +"forma d'occhio nella finestra di dialogo Livelli nasconderà tutti i livelli " +"eccetto quello cui è associato l'occhio. Premendo di nuovo Maiusc-" +"clic, riappariranno." -#: ../data/tips/gimp-tips.xml.in.h:9 +#: ../data/tips/gimp-tips.xml.in.h:24 msgid "" -"GIMP uses layers to let you organize your image. Think of them as a stack of " -"slides or filters, such that looking through them you see a composite of " -"their contents." +"Ctrl-clicking on the layer mask's preview in the Layers dialog " +"toggles the effect of the layer mask. Alt-clicking on the layer " +"mask's preview in the Layers dialog toggles viewing the mask directly." msgstr "" -"GIMP usa i livelli per organizzare l'immagine. Pensateli come una pila di " -"diapositive o filtri, in modo che guardando attraverso di loro è possibile " -"vedere una composizione del loro contenuto." +"Ctrl-clic sull'anteprima della maschera di livello nella finestra " +"di dialogo Livelli abilita/disabilita l'effetto della maschera di livello. " +"Alt-clic sull'anteprima nella finestra di dialogo dei Livelli " +"abilita/disabilita la visualizzazione diretta della maschera." -#: ../data/tips/gimp-tips.xml.in.h:10 +#: ../data/tips/gimp-tips.xml.in.h:25 msgid "" -"If a layer's name in the Layers dialog is displayed in bold, this " -"layer doesn't have an alpha-channel. You can add an alpha-channel using " -"Layer→Transparency→Add Alpha Channel." +"You can use Ctrl-Tab to cycle through all layers in an " +"image (if your window manager doesn't trap those keys...)." msgstr "" -"Se il nome di un livello nella finestra di dialogo dei livelli viene " -"mostrato in grassetto significa che quel livello non possiede un " -"canale alfa. È comunque possibile aggiungerlo usando Livello->Trasparenza-" -">Aggiungi canale alfa." +"Puoi usare Ctrl-Tab per spostarti tra tutti i livelli di " +"un'immagine (a meno che questi tasti non vengano usati dal window " +"manager ...)." -#: ../data/tips/gimp-tips.xml.in.h:11 +#: ../data/tips/gimp-tips.xml.in.h:26 +msgid "" +"Ctrl-click with the Bucket Fill tool to have it use the background " +"color instead of the foreground color. Similarly, Ctrl-clicking " +"with the eyedropper tool sets the background color instead of the foreground " +"color." +msgstr "" +"Premendo Ctrl-clic con lo strumento di Riempimento Colore, sarà " +"utilizzato il colore di sfondo invece di quello in primo piano. Similmente, " +"Ctrl-clic con lo strumento di prelievo colore imposterà il colore " +"di sfondo invece che di primo piano." + +#: ../data/tips/gimp-tips.xml.in.h:27 +msgid "" +"Ctrl-drag with the Rotate tool will constrain the rotation to 15 " +"degree angles." +msgstr "" +"Premendo Ctrl e trascinando con lo strumento Rotazione, " +"quest'ultima sarà forzata ad angoli di 15 gradi." + +#: ../data/tips/gimp-tips.xml.in.h:28 msgid "" "If some of your scanned photos do not look colorful enough, you can easily " "improve their tonal range with the "Auto" button in the Levels " @@ -143,203 +318,3 @@ msgstr "" "nello strumento Livelli (Colori->Livelli). Se sono presenti delle " "dominanti di colore puoi correggerle con lo strumento Curve (Colori->" "Curve)." - -#: ../data/tips/gimp-tips.xml.in.h:12 -msgid "" -"If you stroke a path (Edit→Stroke Path), the paint tools can be used with " -"their current settings. You can use the Paintbrush in gradient mode or even " -"the Eraser or the Smudge tool." -msgstr "" -"Per delineare un tracciato (Modifica->Disegna tracciato), si possono " -"usare anche gli strumenti di disegno con le loro impostazioni correnti. Si " -"può usare il Pennello nella modalità gradiente oppure la Gomma o lo " -"strumento Sfumino." - -#: ../data/tips/gimp-tips.xml.in.h:13 -msgid "" -"If your screen is too cluttered, you can press Tab in an image " -"window to toggle the visibility of the toolbox and other dialogs." -msgstr "" -"Se lo schermo è troppo affollato, premi il tasto Tab più volte " -"nella finestra dell'immagine per nascondere o mostrare la barra degli " -"strumenti o le altre finestre di dialogo." - -#: ../data/tips/gimp-tips.xml.in.h:14 -msgid "" -"Most plug-ins work on the current layer of the current image. In some cases, " -"you will have to merge all layers (Image→Flatten Image) if you want the plug-" -"in to work on the whole image." -msgstr "" -"La maggior parte dei plug-in lavora sul livello attivo dell'immagine " -"corrente. In alcuni casi è necessario unire tutti i livelli (Immagine->" -"Appiattisci immagine) se vuoi che i plug-in agiscano sull'intera immagine." - -#: ../data/tips/gimp-tips.xml.in.h:15 -msgid "" -"Not all effects can be applied to all kinds of images. This is indicated by " -"a grayed-out menu-entry. You may need to change the image mode to RGB " -"(Image→Mode→RGB), add an alpha-channel (Layer→Transparency→Add Alpha " -"Channel) or flatten it (Image→Flatten Image)." -msgstr "" -"Non tutti gli effetti possono essere applicati ad ogni tipo di immagine. In " -"caso di impossibilità la corrispondente voce del menu sarà resa in grigetto. " -"Per risolvere il problema, basta cambiare la modalità immagine in RGB " -"(Immagine->Modalità->RGB), aggiungere un canale alfa (Livelli->" -"Trasparenze->Aggiungi canale alfa) o appiattire l'immagine (Immagine->" -"Appiattisci immagine)." - -#: ../data/tips/gimp-tips.xml.in.h:16 -msgid "" -"Pressing and holding the Shift key before making a selection allows " -"you to add to the current selection instead of replacing it. Using Ctrl before making a selection subtracts from the current one." -msgstr "" -"Tenendo premuto il tasto Maiusc prima di effettuare una selezione " -"ti consentirà di aggiungere la selezione corrente invece di rimpiazzarla. " -"Usando il tasto Ctrl la selezione verrà sottratta a quella presente." - -#: ../data/tips/gimp-tips.xml.in.h:17 -msgid "" -"When you save an image to work on it again later, try using XCF, GIMP's " -"native file format (use the file extension .xcf). This preserves " -"the layers and many aspects of your work-in-progress. Once a project is " -"completed, you can export it as JPEG, PNG, GIF, etc." -msgstr "Quando si salva un'immagine con l'intenzione di continuare a lavorarci sopra in seguito, provare ad usare il formato nativo di GIMP, XCF (usando l'estensione .xcf). Esso manterrà i livelli e ogni altro aspetto del lavoro. Una volta che il progetto sarà finito, sarà sempre possibile esportarlo come JPEG, PNG, GIF, ..." - -#: ../data/tips/gimp-tips.xml.in.h:18 -msgid "" -"You can adjust or move a selection by using Alt-drag. If this makes " -"the window move, your window manager uses the Alt key already. Most " -"window managers can be configured to ignore the Alt key or to use " -"the Super key (or \"Windows logo\") instead." -msgstr "" -"Puoi regolare o spostare una selezione premendo Alt e trascinando. " -"Se si dovesse muovere la finestra, vuol dire che il programma di gestione " -"finestre (window manager) corrente usa già il tasto Alt. Molti " -"gestori di finestre possono essere configurati per ignorare il tasto " -"Alt o per usare in alternativa il tasto con il logo, in genere una " -"mela o il simbolo di una finestra." - -#: ../data/tips/gimp-tips.xml.in.h:19 -msgid "" -"You can create and edit complex selections using the Path tool. The Paths " -"dialog allows you to work on multiple paths and to convert them to " -"selections." -msgstr "" -"Puoi creare e modificare selezioni complesse usando lo strumento Tracciati. " -"La finestra di dialogo Tracciati ti permette di lavorare con molteplici " -"tracciati e di convertirli in selezioni." - -#: ../data/tips/gimp-tips.xml.in.h:20 -msgid "" -"You can drag a layer from the Layers dialog and drop it onto the toolbox. " -"This will create a new image containing only that layer." -msgstr "" -"Trascinando e rilasciando un livello dalla finestra di dialogo Livelli alla " -"finestra degli strumenti, verrà creata una nuova immagine contenente solo " -"quel livello." - -#: ../data/tips/gimp-tips.xml.in.h:21 -msgid "" -"You can drag and drop many things in GIMP. For example, dragging a color " -"from the toolbox or from a color palette and dropping it into an image will " -"fill the current selection with that color." -msgstr "" -"È possibile trascinare molte cose con GIMP. Per esempio, trascinando un " -"colore dalla finestra degli strumenti o da una tavolozza e rilasciandolo " -"nell'immagine si riempirà la selezione corrente con quel colore." - -#: ../data/tips/gimp-tips.xml.in.h:22 -msgid "" -"You can draw simple squares or circles using Edit→Stroke Selection. It " -"strokes the edge of your current selection. More complex shapes can be drawn " -"using the Path tool or with Filters→Render→Gfig." -msgstr "" -"Usando Modifica->Disegna selezione potrai disegnare semplici quadrati o " -"cerchi tracciando la selezione corrente con il pennello attivo. Forme più " -"complesse possono essere disegnate con lo strumento tracciati o con Filtri-" -">Render->Gfig." - -#: ../data/tips/gimp-tips.xml.in.h:23 -msgid "" -"You can get context-sensitive help for most of GIMP's features by pressing " -"the F1 key at any time. This also works inside the menus." -msgstr "" -"È possibile ottenere un aiuto sensibile al contesto per la maggior parte " -"delle funzioni di GIMP premendo F1 in qualsiasi istante. Funziona anche " -"all'interno dei menu." - -#: ../data/tips/gimp-tips.xml.in.h:24 -msgid "" -"You can perform many layer operations by right-clicking on the text label of " -"a layer in the Layers dialog." -msgstr "" -"Puoi eseguire un gran numero di operazioni facendo clic con il tasto destro " -"sul nome del livello nella finestra di dialogo Livelli." - -#: ../data/tips/gimp-tips.xml.in.h:25 -msgid "" -"You can save a selection to a channel (Select→Save to Channel) and then " -"modify this channel with any paint tools. Using the buttons in the Channels " -"dialog, you can toggle the visibility of this new channel or convert it to a " -"selection." -msgstr "" -"Puoi salvare una selezione in un canale (Seleziona->Salva in Canale) e " -"poi modificare il canale con gli strumenti di disegno. Con i pulsanti " -"presenti nella finestra di dialogo Canali, puoi rendere visibile o " -"invisibile il nuovo canale o convertirlo in una selezione." - -#: ../data/tips/gimp-tips.xml.in.h:26 -msgid "" -"You can use Ctrl-Tab to cycle through all layers in an " -"image (if your window manager doesn't trap those keys...)." -msgstr "" -"Puoi usare Ctrl-Tab per spostarti tra tutti i livelli di " -"un'immagine (a meno che questi tasti non vengano usati dal window " -"manager ...)." - -#: ../data/tips/gimp-tips.xml.in.h:27 -msgid "" -"You can use the middle mouse button to pan around the image (or optionally " -"hold Spacebar while you move the mouse)." -msgstr "" -"È possibile usare il tasto centrale del mouse per muoversi nell'immagine " -"(oppure mantenendo premuta la barra spaziatrice mentre si muove il " -"mouse)." - -#: ../data/tips/gimp-tips.xml.in.h:28 -msgid "" -"You can use the paint tools to change the selection. Click on the "" -"Quick Mask" button at the bottom left of an image window. Change your " -"selection by painting in the image and click on the button again to convert " -"it back to a normal selection." -msgstr "" -"Gli strumenti di disegno possono servire per cambiare le selezioni: fare " -"clic sul pulsante "Maschera veloce" in basso a sinistra della " -"finestra dell'immagine, cambiare la selezione disegnando nell'immagine e " -"fare clic nuovamente sul pulsante per convertirla ad una selezione normale." - -#~ msgid "Welcome to the GNU Image Manipulation Program!" -#~ msgstr "" -#~ "Benvenuti in GIMP il programma di elaborazione immagini del progetto " -#~ "GNU!" - -#~ msgid "" -#~ "GIMP allows you to undo most changes to the image, so feel free to " -#~ "experiment." -#~ msgstr "" -#~ "Con GIMP si può annullare la maggior parte dei cambiamenti effettuati " -#~ "alle immagini perciò sentitevi liberi di fare esperimenti!" - -#~ msgid "" -#~ "To create a circle-shaped selection, hold Shift while doing an " -#~ "ellipse select. To place a circle precisely, drag horizontal and vertical " -#~ "guides tangent to the circle you want to select, place your cursor at the " -#~ "intersection of the guides, and the resulting selection will just touch " -#~ "the guides." -#~ msgstr "" -#~ "Per creare un cerchio perfetto, premi il tasto Maiusc mentre " -#~ "stai facendo una selezione ellittica. Per posizionare un cerchio in " -#~ "maniera precisa, trascina le guide verticali e orizzontali in posizione " -#~ "tangente al cerchio che vuoi selezionare, posiziona il cursore " -#~ "nell'intersezione delle guide: la selezione risultante toccherà le guide." diff --git a/po/POTFILES.in b/po/POTFILES.in index 959aca8a0f..e1d300e0dd 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -131,12 +131,12 @@ app/core/gimpcurve-save.c app/core/gimpdata.c app/core/gimpdatafactory.c app/core/gimpdrawable.c -app/core/gimpdrawable-blend.c app/core/gimpdrawable-bucket-fill.c app/core/gimpdrawable-equalize.c app/core/gimpdrawable-floating-selection.c app/core/gimpdrawable-foreground-extract.c app/core/gimpdrawable-fill.c +app/core/gimpdrawable-gradient.c app/core/gimpdrawable-levels.c app/core/gimpdrawable-offset.c app/core/gimpdrawable-stroke.c @@ -260,6 +260,7 @@ app/display/gimpdisplayshell-utils.c app/display/gimpnavigationeditor.c app/display/gimpstatusbar.c app/display/gimptoolcompass.c +app/display/gimptoolgyroscope.c app/display/gimptoolhandlegrid.c app/display/gimptoolline.c app/display/gimptoolpath.c @@ -335,6 +336,7 @@ app/pdb/channel-cmds.c app/pdb/color-cmds.c app/pdb/drawable-cmds.c app/pdb/drawable-color-cmds.c +app/pdb/drawable-edit-cmds.c app/pdb/drawable-transform-cmds.c app/pdb/edit-cmds.c app/pdb/floating-sel-cmds.c @@ -384,6 +386,7 @@ app/propgui/gimppropgui-convolution-matrix.c app/propgui/gimppropgui-diffraction-patterns.c app/propgui/gimppropgui-generic.c app/propgui/gimppropgui-hue-saturation.c +app/propgui/gimppropgui-panorama-projection.c app/propgui/gimppropgui-recursive-transform.c app/propgui/gimppropgui-shadows-highlights.c app/propgui/gimppropgui-spiral.c @@ -403,9 +406,6 @@ app/tools/gimp-tools.c app/tools/gimpairbrushtool.c app/tools/gimpalignoptions.c app/tools/gimpaligntool.c -app/tools/gimpblendoptions.c -app/tools/gimpblendtool.c -app/tools/gimpblendtool-editor.c app/tools/gimpbrightnesscontrasttool.c app/tools/gimpbucketfilloptions.c app/tools/gimpbucketfilltool.c @@ -437,6 +437,9 @@ app/tools/gimpfreeselecttool.c app/tools/gimpfuzzyselecttool.c app/tools/gimpgegltool.c app/tools/gimpgenerictransformtool.c +app/tools/gimpgradientoptions.c +app/tools/gimpgradienttool.c +app/tools/gimpgradienttool-editor.c app/tools/gimpguidetool.c app/tools/gimphandletransformoptions.c app/tools/gimphandletransformtool.c diff --git a/po/ar.po b/po/ar.po index b13ae82b75..f7db146e80 100644 --- a/po/ar.po +++ b/po/ar.po @@ -2,13 +2,13 @@ # translation of gimp.HEAD.ar2.po to # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Khaled Hosny , 2006, 2008, 2009, 2010, 2011, 2012, 2014, 2015, 2016. +# Khaled Hosny , 2006, 2008, 2009, 2010, 2011, 2012, 2014, 2015, 2016, 2018. msgid "" msgstr "" "Project-Id-Version: gimp.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-25 00:11+0200\n" -"PO-Revision-Date: 2016-12-25 00:46+0200\n" +"POT-Creation-Date: 2018-03-27 13:21+0200\n" +"PO-Revision-Date: 2018-03-27 15:44+0200\n" "Last-Translator: Khaled Hosny \n" "Language-Team: Arabic \n" "Language: ar\n" @@ -17,18 +17,19 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: Virtaal 0.7.1\n" +"X-Generator: Virtaal 1.0.0-beta1\n" -#: ../desktop/gimp.appdata.xml.in.h:1 ../desktop/gimp.desktop.in.in.h:1 -#: ../app/about.h:26 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:1 +#: ../desktop/gimp.desktop.in.in.h:1 ../app/about.h:26 msgid "GNU Image Manipulation Program" msgstr "برنامج جنو لمعالجة الصور" -#: ../desktop/gimp.appdata.xml.in.h:2 ../desktop/gimp.desktop.in.in.h:3 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:2 +#: ../desktop/gimp.desktop.in.in.h:3 msgid "Create images and edit photographs" msgstr "أنشئ صورا وحرّر لقطات" -#: ../desktop/gimp.appdata.xml.in.h:3 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:3 msgid "" "GIMP is an acronym for GNU Image Manipulation Program. It is a freely " "distributed program for such tasks as photo retouching, image composition " @@ -37,7 +38,7 @@ msgstr "" "جمب هو اختصار برنامج جنو لمعالجة الصور. هو برنامج حر لأمور مثل تعديل الصور " "و تركيبها و تحسينها." -#: ../desktop/gimp.appdata.xml.in.h:4 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:4 msgid "" "It has many capabilities. It can be used as a simple paint program, an " "expert quality photo retouching program, an online batch processing system, " @@ -46,7 +47,7 @@ msgstr "" "له الكثير من الإمكانيات. يمكن استخدامه كبرنامج رسم بسيط، أو كبرنامج احترافي " "لتعديل الصور، أو كنظام لمعالجة الصور في دفعات، أو كمحول بين أنساق الصور، إلخ." -#: ../desktop/gimp.appdata.xml.in.h:5 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:5 msgid "" "GIMP is expandable and extensible. It is designed to be augmented with plug-" "ins and extensions to do just about anything. The advanced scripting " @@ -58,9 +59,127 @@ msgstr "" "المتقدمة تتيح كتابة برامج تفسيرية لعمل كل شيء من أبسط المهام إلى أعقد عمليات " "معالجة الصور. يتوفر جمب على لينكس و ويندوز و ماك." -#: ../desktop/gimp.appdata.xml.in.h:6 -msgid "Screenshot showing channel mixing and layer editor" -msgstr "لقطة شاشة تظهر خلط القنوات و محرر الطبقات" +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:6 +msgid "Painting in GIMP" +msgstr "الرسم في جمب" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:7 +msgid "Photo editing in GIMP" +msgstr "تعديل الصور في جمب" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:8 +msgid "" +"GIMP 2.10.0-RC1 is the first release candidate before GIMP 2.10.0 stable " +"release, with a focus on debugging and stability. Other than the many bug " +"fixes, most notable improvements are:" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:9 +msgid "New dashboard dockable to monitor GIMP resource usage" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:10 +msgid "" +"New debug dialog to produce back traces and other debug data, encouraging to " +"report bugs" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:11 +msgid "Unsaved images can now be recovered after a crash" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:12 +#, fuzzy +msgid "Layer masks on layer groups" +msgstr "لا يمكن الرسم على مجموعات الطبقات." + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:13 +msgid "JPEG 2000 support improved for high bit depth and various color spaces" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:14 +msgid "Screenshot and color picking improved on various platforms" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:15 +msgid "Metadata defaults preferences now available" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:16 +msgid "Various GUI polishing" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:17 +msgid "" +"For more information, see https://www.gimp.org/news/2018/03/23/gimp-2-10-rc1-" +"released/" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:18 +msgid "" +"GIMP 2.9.8 introduces on-canvas gradient editing and various enhancements " +"while focusing on bugfixing and stability." +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:19 +#, fuzzy +msgid "On-canvas gradient editing" +msgstr "افتح محرر التدرجات" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:20 +msgid "Notification when an image is over/underexposed" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:21 +#, fuzzy +msgid "Better and faster color management" +msgstr "إدارة الألوان" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:22 +msgid "Support for color picker and screenshots in Wayland on KDE Plasma" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:23 +msgid "Paste in place feature" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:24 +msgid "Many usability improvements" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:25 +msgid "Manual can be displayed in the user's preferred language" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:26 +msgid "Improvements for the Wavelet Decompose filter" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:27 +msgid "Improved compatibility with Photoshop .psd files" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:28 +msgid "New support for password-protected PDF" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:29 +msgid "New support for HGT format (Digital Elevation Model data)" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:30 +msgid "" +"For more information, see https://www.gimp.org/news/2017/12/12/gimp-2-9-8-" +"released/" +msgstr "" + +#: ../desktop/gimp-data-extras.metainfo.xml.in.h:1 +msgid "Extra files for GIMP" +msgstr "" + +#: ../desktop/gimp-data-extras.metainfo.xml.in.h:2 +msgid "Patterns, gradients, and other extra files for GIMP" +msgstr "" #: ../desktop/gimp.desktop.in.in.h:2 msgid "Image Editor" @@ -115,109 +234,119 @@ msgstr "" "من المفترض أنك تلقيت نسخة من رخصة جنو العمومية مع هذا البرنامج، وإلا فراجع " "http://www.gnu.org/licenses/" -#: ../app/main.c:160 +#: ../app/gimp-version.c:66 ../app/gimp-version.c:164 +#, c-format +msgid "using %s version %s (compiled against version %s)" +msgstr "يستخدم %s الإصدارة %s (مصرّفة مقابل الإصدارة %s)" + +#: ../app/gimp-version.c:192 +#, c-format +msgid "%s version %s" +msgstr "‏%s إصدارة %s" + +#: ../app/main.c:155 msgid "Show version information and exit" msgstr "اعرض معلومات النسخة ثم اخرج" -#: ../app/main.c:165 +#: ../app/main.c:160 msgid "Show license information and exit" msgstr "اعرض معلومات الترخيص ثم اخرج" -#: ../app/main.c:170 +#: ../app/main.c:165 msgid "Be more verbose" msgstr "كن أكثر تفصيلا" -#: ../app/main.c:175 +#: ../app/main.c:170 msgid "Start a new GIMP instance" msgstr "ابدأ سيرورة جمب جديدة" -#: ../app/main.c:180 +#: ../app/main.c:175 msgid "Open images as new" msgstr "افتح الصور كجديدة" -#: ../app/main.c:185 +#: ../app/main.c:180 msgid "Run without a user interface" msgstr "اعمل بدون واجهة مستخدم" -#: ../app/main.c:190 +#: ../app/main.c:185 msgid "Do not load brushes, gradients, patterns, ..." msgstr "لا تحمل الفرش، والتدرجات، والأنماط،‌ ..." -#: ../app/main.c:195 +#: ../app/main.c:190 msgid "Do not load any fonts" msgstr "لا تحمل أي خطوط" -#: ../app/main.c:200 +#: ../app/main.c:195 msgid "Do not show a splash screen" msgstr "لا تظهر شاشة بداية" -#: ../app/main.c:205 -msgid "Do not use shared memory between GIMP and plugins" +#: ../app/main.c:200 +msgid "Do not use shared memory between GIMP and plug-ins" msgstr "لا تستخدم ذاكرة مشتركة بين جمب والامتدادات" -#: ../app/main.c:210 +#: ../app/main.c:205 msgid "Do not use special CPU acceleration functions" msgstr "لا تستخدم تسارع وظائف المعالج الخاصة" -#: ../app/main.c:215 +#: ../app/main.c:210 msgid "Use an alternate sessionrc file" msgstr "استخدم ملف إعدادات جلسة (sessionrc) بديل" -#: ../app/main.c:220 +#: ../app/main.c:215 msgid "Use an alternate user gimprc file" msgstr "استخدم ملف إعدادات جمب (gimprc) للمستخدم بديل" -#: ../app/main.c:225 +#: ../app/main.c:220 msgid "Use an alternate system gimprc file" msgstr "استخدم ملف إعدادات جمب (gimprc) للنظام بديل" -#: ../app/main.c:230 +#: ../app/main.c:225 msgid "Batch command to run (can be used multiple times)" msgstr "أمر دفعة ليستخدم (يمكن استخدامه مرات متعددة)" -#: ../app/main.c:235 +#: ../app/main.c:230 msgid "The procedure to process batch commands with" msgstr "الإجراء لتنفيذ أوامر الدفعة معه" -#: ../app/main.c:240 +#: ../app/main.c:235 msgid "Send messages to console instead of using a dialog" msgstr "أرسِل الرسائل إلى الطرفية بدلا من استخدام نوافذ حوارية" #. don't translate the mode names (off|on|warn) -#: ../app/main.c:246 +#: ../app/main.c:241 msgid "PDB compatibility mode (off|on|warn)" msgstr "طور التوافقية مع PDB ‏(off|on|warn)" #. don't translate the mode names (never|query|always) -#: ../app/main.c:252 +#: ../app/main.c:247 msgid "Debug in case of a crash (never|query|always)" msgstr "تتبع الأخطاء في حالة التحطم (never|query|always)" -#: ../app/main.c:257 +#: ../app/main.c:252 msgid "Enable non-fatal debugging signal handlers" msgstr "فعّل مناول تنقيح الإشارات غير الفادحة" -#: ../app/main.c:262 +#: ../app/main.c:257 msgid "Make all warnings fatal" msgstr "اجعل جميع التحذيرات فادحة" -#: ../app/main.c:267 +#: ../app/main.c:262 msgid "Output a gimprc file with default settings" msgstr "أخرج ملف gimprc بالإعدادات المبدئية" -#: ../app/main.c:283 +#: ../app/main.c:278 msgid "Output a sorted list of deprecated procedures in the PDB" msgstr "" -#: ../app/main.c:288 +#: ../app/main.c:283 msgid "Show a preferences page with experimental features" msgstr "" -#: ../app/main.c:491 +#: ../app/main.c:459 msgid "[FILE|URI...]" msgstr "[FILE|URI...]" -#: ../app/main.c:509 +#: ../app/main.c:477 msgid "" "GIMP could not initialize the graphical user interface.\n" "Make sure a proper setup for your display environment exists." @@ -225,24 +354,24 @@ msgstr "" "لم يستطع جمب بدء واجهة المستخدم الرسومية.\n" "تأكد من أن بيئة العرض معدّة بدقة." -#: ../app/main.c:528 +#: ../app/main.c:496 msgid "Another GIMP instance is already running." msgstr "تعمل بالفعل سيرورة أخرى من جمب." -#: ../app/main.c:616 +#: ../app/main.c:586 msgid "GIMP output. Type any character to close this window." msgstr "خرْج جمب. اكتب أي حرف لإغلاق هذه النافذة." -#: ../app/main.c:617 +#: ../app/main.c:587 #, c-format msgid "(Type any character to close this window)\n" msgstr "(اكتب أي حرف لإغلاق هذه النافذة)\n" -#: ../app/main.c:634 +#: ../app/main.c:604 msgid "GIMP output. You can minimize this window, but don't close it." msgstr "خرْج جمب. تستطيع تصغير هذه النافذة، لكن لا تغلقها." -#: ../app/sanity.c:661 +#: ../app/sanity.c:562 #, c-format msgid "" "The configured filename encoding cannot be converted to UTF-8: %s\n" @@ -253,7 +382,7 @@ msgstr "" "\n" "من فضلك راجع قيمة متغير البيئة G_FILENAME_ENCODING." -#: ../app/sanity.c:680 +#: ../app/sanity.c:581 #, c-format msgid "" "The name of the directory holding the GIMP user configuration cannot be " @@ -268,230 +397,223 @@ msgstr "" "غالبا يحفظ نظام الكلفات لديك الملفات بترميز غير UTF-8 ولم تُخبر GLib عن هذا. " "من فضلك اضبط متغير البيئة G_FILENAME_ENCODING." -#. show versions of libraries used by GIMP -#: ../app/version.c:63 ../app/version.c:130 -#, c-format -msgid "using %s version %s (compiled against version %s)" -msgstr "يستخدم %s الإصدارة %s (مصرّفة مقابل الإصدارة %s)" - -#: ../app/version.c:138 -#, c-format -msgid "%s version %s" -msgstr "‏%s إصدارة %s" - -#: ../app/actions/actions.c:110 ../app/dialogs/dialogs.c:413 +#: ../app/actions/actions.c:111 ../app/dialogs/dialogs.c:420 #: ../app/widgets/gimpbrusheditor.c:89 msgid "Brush Editor" msgstr "محرر الفُرَش" #. initialize the list of gimp brushes -#: ../app/actions/actions.c:113 ../app/core/gimp-data-factories.c:353 -#: ../app/dialogs/dialogs.c:328 ../app/dialogs/preferences-dialog.c:2746 +#: ../app/actions/actions.c:114 ../app/core/gimp-data-factories.c:317 +#: ../app/dialogs/dialogs.c:335 ../app/dialogs/preferences-dialog.c:3072 msgid "Brushes" msgstr "الفُرَش" -#: ../app/actions/actions.c:116 ../app/dialogs/dialogs.c:349 +#: ../app/actions/actions.c:117 ../app/dialogs/dialogs.c:356 msgid "Buffers" msgstr "البراحات" -#: ../app/actions/actions.c:119 ../app/dialogs/dialogs.c:367 +#: ../app/actions/actions.c:120 ../app/dialogs/dialogs.c:374 #: ../app/widgets/gimppickablepopup.c:249 msgid "Channels" msgstr "القنوات" -#: ../app/actions/actions.c:122 ../app/dialogs/convert-indexed-dialog.c:179 -#: ../app/dialogs/dialogs.c:375 +#: ../app/actions/actions.c:123 ../app/dialogs/convert-indexed-dialog.c:174 +#: ../app/dialogs/dialogs.c:382 msgid "Colormap" msgstr "مخطط الألوان" -#: ../app/actions/actions.c:125 +#: ../app/actions/actions.c:126 msgid "Context" msgstr "السياق" -#: ../app/actions/actions.c:128 ../app/dialogs/dialogs.c:319 +#: ../app/actions/actions.c:129 ../app/dialogs/dialogs.c:322 msgid "Pointer Information" msgstr "معلومات المؤشر" -#: ../app/actions/actions.c:131 +#: ../app/actions/actions.c:132 ../app/dialogs/dialogs.c:326 +msgid "Dashboard" +msgstr "لوحة الأدوات" + +#: ../app/actions/actions.c:135 msgid "Debug" msgstr "التنقيح" -#: ../app/actions/actions.c:134 +#: ../app/actions/actions.c:138 msgid "Dialogs" msgstr "الحوارات" -#: ../app/actions/actions.c:137 +#: ../app/actions/actions.c:141 msgid "Dock" msgstr "رصيف" -#: ../app/actions/actions.c:140 +#: ../app/actions/actions.c:144 msgid "Dockable" msgstr "قابل للترصيف" #. Document History -#: ../app/actions/actions.c:143 ../app/dialogs/dialogs.c:355 -#: ../app/dialogs/preferences-dialog.c:1090 +#: ../app/actions/actions.c:147 ../app/dialogs/dialogs.c:362 +#: ../app/dialogs/preferences-dialog.c:1197 msgid "Document History" msgstr "تاريخ المستند" -#: ../app/actions/actions.c:146 +#: ../app/actions/actions.c:150 msgid "Drawable" -msgstr "قابل للرسم" +msgstr "عنصر رسم" -#: ../app/actions/actions.c:149 ../app/dialogs/dialogs.c:331 +#: ../app/actions/actions.c:153 ../app/dialogs/dialogs.c:338 msgid "Paint Dynamics" msgstr "حركيات الرسم" -#: ../app/actions/actions.c:152 ../app/dialogs/dialogs.c:417 +#: ../app/actions/actions.c:156 ../app/dialogs/dialogs.c:424 #: ../app/widgets/gimpdynamicseditor.c:97 msgid "Paint Dynamics Editor" msgstr "محرر حركيات الرسم" -#: ../app/actions/actions.c:155 +#: ../app/actions/actions.c:159 msgid "Edit" msgstr "حرّر" -#: ../app/actions/actions.c:158 ../app/dialogs/dialogs.c:315 +#: ../app/actions/actions.c:162 ../app/dialogs/dialogs.c:318 msgid "Error Console" msgstr "مِعراض الأخطاء" -#: ../app/actions/actions.c:161 +#: ../app/actions/actions.c:165 msgid "File" msgstr "ملف" -#: ../app/actions/actions.c:164 +#: ../app/actions/actions.c:168 msgid "Filters" msgstr "مرشّحات" -#: ../app/actions/actions.c:167 ../app/dialogs/dialogs.c:346 -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/actions/actions.c:171 ../app/dialogs/dialogs.c:353 +#: ../app/dialogs/preferences-dialog.c:3092 msgid "Fonts" msgstr "الخطوط" -#: ../app/actions/actions.c:170 ../app/dialogs/dialogs.c:421 +#: ../app/actions/actions.c:174 ../app/dialogs/dialogs.c:428 #: ../app/widgets/gimpgradienteditor.c:271 msgid "Gradient Editor" msgstr "محرر التدرجات" #. initialize the list of gimp gradients -#: ../app/actions/actions.c:173 ../app/core/gimp-data-factories.c:378 -#: ../app/dialogs/dialogs.c:340 ../app/dialogs/preferences-dialog.c:2762 +#: ../app/actions/actions.c:177 ../app/core/gimp-data-factories.c:342 +#: ../app/dialogs/dialogs.c:347 ../app/dialogs/preferences-dialog.c:3088 msgid "Gradients" msgstr "التدرجات" -#: ../app/actions/actions.c:176 ../app/core/gimp-data-factories.c:389 -#: ../app/dialogs/dialogs.c:352 ../app/dialogs/preferences-dialog.c:2770 +#: ../app/actions/actions.c:180 ../app/core/gimp-data-factories.c:353 +#: ../app/dialogs/dialogs.c:359 ../app/dialogs/preferences-dialog.c:3096 msgid "Tool Presets" msgstr "محفوظات الخيارات" -#: ../app/actions/actions.c:179 ../app/dialogs/dialogs.c:429 +#: ../app/actions/actions.c:183 ../app/dialogs/dialogs.c:436 #: ../app/widgets/gimptoolpreseteditor.c:94 msgid "Tool Preset Editor" msgstr "محرر محفوظات الخيارات" -#: ../app/actions/actions.c:182 +#: ../app/actions/actions.c:186 msgid "Help" msgstr "مساعدة" -#: ../app/actions/actions.c:185 +#: ../app/actions/actions.c:189 msgid "Image" msgstr "الصورة" -#: ../app/actions/actions.c:188 ../app/dialogs/dialogs.c:325 +#: ../app/actions/actions.c:192 ../app/dialogs/dialogs.c:332 #: ../app/widgets/gimppickablepopup.c:179 msgid "Images" msgstr "الصور" -#: ../app/actions/actions.c:191 ../app/dialogs/dialogs.c:363 +#: ../app/actions/actions.c:195 ../app/dialogs/dialogs.c:370 #: ../app/dialogs/resize-dialog.c:144 ../app/widgets/gimppickablepopup.c:230 msgid "Layers" msgstr "الطبقات" #. initialize the list of mypaint brushes -#: ../app/actions/actions.c:194 ../app/core/gimp-data-factories.c:363 -#: ../app/dialogs/dialogs.c:334 ../app/dialogs/preferences-dialog.c:2774 +#: ../app/actions/actions.c:198 ../app/core/gimp-data-factories.c:327 +#: ../app/dialogs/dialogs.c:341 ../app/dialogs/preferences-dialog.c:3100 msgid "MyPaint Brushes" msgstr "فرش ماي پينت" -#: ../app/actions/actions.c:197 ../app/dialogs/dialogs.c:425 +#: ../app/actions/actions.c:201 ../app/dialogs/dialogs.c:432 #: ../app/widgets/gimppaletteeditor.c:149 msgid "Palette Editor" msgstr "محرر لوحة الألوان" #. initialize the list of gimp palettes -#: ../app/actions/actions.c:200 ../app/core/gimp-data-factories.c:373 -#: ../app/dialogs/dialogs.c:343 ../app/dialogs/preferences-dialog.c:2758 +#: ../app/actions/actions.c:204 ../app/core/gimp-data-factories.c:337 +#: ../app/dialogs/dialogs.c:350 ../app/dialogs/preferences-dialog.c:3084 msgid "Palettes" msgstr "ألواح الألوان" #. initialize the list of gimp patterns -#: ../app/actions/actions.c:203 ../app/core/gimp-data-factories.c:368 -#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2754 +#: ../app/actions/actions.c:207 ../app/core/gimp-data-factories.c:332 +#: ../app/dialogs/dialogs.c:344 ../app/dialogs/preferences-dialog.c:3080 msgid "Patterns" msgstr "الأنماط" -#: ../app/actions/actions.c:206 ../app/dialogs/preferences-dialog.c:2778 -msgid "Plug-Ins" +#: ../app/actions/actions.c:210 ../app/dialogs/preferences-dialog.c:3104 +msgid "Plug-ins" msgstr "الامتدادات" #. Quick Mask Color -#: ../app/actions/actions.c:209 ../app/core/gimpchannel.c:405 -#: ../app/dialogs/preferences-dialog.c:1424 +#: ../app/actions/actions.c:213 ../app/core/gimpchannel.c:383 +#: ../app/dialogs/preferences-dialog.c:1680 msgid "Quick Mask" msgstr "قناع سريع" -#: ../app/actions/actions.c:212 ../app/dialogs/dialogs.c:395 +#: ../app/actions/actions.c:216 ../app/dialogs/dialogs.c:402 msgid "Sample Points" msgstr "عينات نقاط" -#: ../app/actions/actions.c:215 +#: ../app/actions/actions.c:219 msgid "Select" msgstr "اختر" #. initialize the template list -#: ../app/actions/actions.c:218 ../app/core/gimp.c:874 -#: ../app/dialogs/dialogs.c:358 +#: ../app/actions/actions.c:222 ../app/core/gimp.c:795 +#: ../app/dialogs/dialogs.c:365 msgid "Templates" msgstr "القوالب" -#: ../app/actions/actions.c:221 +#: ../app/actions/actions.c:225 msgid "Text Tool" msgstr "أداة النصوص" -#: ../app/actions/actions.c:224 +#: ../app/actions/actions.c:228 msgid "Text Editor" msgstr "محرر النصوص" -#: ../app/actions/actions.c:227 ../app/dialogs/dialogs.c:307 -#: ../app/gui/gui.c:473 +#: ../app/actions/actions.c:231 ../app/dialogs/dialogs.c:310 +#: ../app/gui/gui.c:550 msgid "Tool Options" msgstr "خيارات الأدوات" -#: ../app/actions/actions.c:230 ../app/widgets/gimptoolpalette.c:296 +#: ../app/actions/actions.c:234 ../app/widgets/gimptoolpalette.c:329 msgid "Tools" msgstr "الأدوات" -#: ../app/actions/actions.c:233 ../app/dialogs/dialogs.c:371 -#: ../app/tools/gimpvectortool.c:169 +#: ../app/actions/actions.c:237 ../app/dialogs/dialogs.c:378 +#: ../app/tools/gimpvectortool.c:163 msgid "Paths" msgstr "المسارات" -#: ../app/actions/actions.c:236 +#: ../app/actions/actions.c:240 msgid "View" msgstr "عرض" -#: ../app/actions/actions.c:239 +#: ../app/actions/actions.c:243 msgid "Windows" msgstr "نوافذ" #. value description and new value shown in the status bar -#: ../app/actions/actions.c:590 +#: ../app/actions/actions.c:593 #, c-format msgid "%s: %.2f" msgstr "%s: %.2f" #. value description and new value shown in the status bar -#: ../app/actions/actions.c:616 +#: ../app/actions/actions.c:619 #, c-format msgid "%s: %d" msgstr "%s: %d" @@ -598,60 +720,89 @@ msgstr "قائمة البراحات" #: ../app/actions/buffers-actions.c:46 msgctxt "buffers-action" -msgid "_Paste Buffer" -msgstr "أل_صق البراح" - -#: ../app/actions/buffers-actions.c:47 -msgctxt "buffers-action" -msgid "Paste the selected buffer" -msgstr "ألصق البراح المختار" - -#: ../app/actions/buffers-actions.c:52 -msgctxt "buffers-action" -msgid "Paste Buffer _Into" -msgstr "ألصق البراح إ_لى" - -#: ../app/actions/buffers-actions.c:53 -msgctxt "buffers-action" -msgid "Paste the selected buffer into the selection" -msgstr "ألصق البراح المختار إلى التحديد" - -#: ../app/actions/buffers-actions.c:58 -msgctxt "buffers-action" -msgid "Paste Buffer as New _Layer" -msgstr "ألصق البراح كطبقة ج_ديدة" - -#: ../app/actions/buffers-actions.c:59 -msgctxt "buffers-action" -msgid "Paste the selected buffer as a new layer" -msgstr "ألصق البراح المختار كطبقة جديدة" - -#: ../app/actions/buffers-actions.c:64 -msgctxt "buffers-action" msgid "Paste Buffer as _New Image" msgstr "ألصق البراح كصورة ج_ديدة" -#: ../app/actions/buffers-actions.c:65 +#: ../app/actions/buffers-actions.c:47 msgctxt "buffers-action" msgid "Paste the selected buffer as a new image" msgstr "ألصق البراح المختار كصورة جديدة" -#: ../app/actions/buffers-actions.c:70 +#: ../app/actions/buffers-actions.c:52 msgctxt "buffers-action" msgid "_Delete Buffer" msgstr "اح_ذف البراح" -#: ../app/actions/buffers-actions.c:71 +#: ../app/actions/buffers-actions.c:53 msgctxt "buffers-action" msgid "Delete the selected buffer" msgstr "احذف البراح المختار" +#: ../app/actions/buffers-actions.c:61 +msgctxt "buffers-action" +msgid "_Paste Buffer" +msgstr "أل_صق البراح" + +#: ../app/actions/buffers-actions.c:62 +msgctxt "buffers-action" +msgid "Paste the selected buffer" +msgstr "ألصق البراح المختار" + +#: ../app/actions/buffers-actions.c:67 +msgctxt "buffers-action" +msgid "Paste Buffer In Pl_ace" +msgstr "ألصق البراح في _مكانه" + +#: ../app/actions/buffers-actions.c:68 +msgctxt "buffers-action" +msgid "Paste the selected buffer at its original position" +msgstr "ألصق البراح المختار في موضعه الأصلي" + +#: ../app/actions/buffers-actions.c:73 +msgctxt "buffers-action" +msgid "Paste Buffer _Into The Selection" +msgstr "ألصق البراح إ_لى التحديد" + +#: ../app/actions/buffers-actions.c:74 +msgctxt "buffers-action" +msgid "Paste the selected buffer into the selection" +msgstr "ألصق البراح المختار إلى التحديد" + +#: ../app/actions/buffers-actions.c:79 +msgctxt "buffers-action" +msgid "Paste Buffer Into The Selection In Place" +msgstr "ألصق البراح المختار إلى التحديد في مكانه" + +#: ../app/actions/buffers-actions.c:81 +msgctxt "buffers-action" +msgid "Paste the selected buffer into the selection at its original position" +msgstr "ألصق البراح المختار إلى التحديد في موضعه الأصلي" + +#: ../app/actions/buffers-actions.c:86 +msgctxt "buffers-action" +msgid "Paste Buffer as New _Layer" +msgstr "ألصق البراح كطبقة ج_ديدة" + +#: ../app/actions/buffers-actions.c:87 +msgctxt "buffers-action" +msgid "Paste the selected buffer as a new layer" +msgstr "ألصق البراح المختار كطبقة جديدة" + +#: ../app/actions/buffers-actions.c:92 +msgctxt "buffers-action" +msgid "Paste Buffer as New Layer in Place" +msgstr "ألصق البراح كطبقة جديدة في مكانه" + +#: ../app/actions/buffers-actions.c:94 +msgctxt "buffers-action" +msgid "Paste the selected buffer as a new layer at its original position" +msgstr "ألصق البراح المختار كطبقة جديدة في موضعه الأصلي" + #: ../app/actions/channels-actions.c:45 msgctxt "channels-action" msgid "Channels Menu" msgstr "قائمة القنوات" -#. abused #: ../app/actions/channels-actions.c:49 msgctxt "channels-action" msgid "Color Tag" @@ -749,26 +900,25 @@ msgstr "أخفض القناة إلى أسفل رصة القنوات" #: ../app/actions/channels-actions.c:113 msgctxt "channels-action" -msgid "_Visible" -msgstr "_مرئي" +msgid "Toggle Channel _Visibility" +msgstr "بدّل حالة _ظهور القناة" #: ../app/actions/channels-actions.c:119 msgctxt "channels-action" -msgid "_Linked" -msgstr "مربو_ط" +msgid "Toggle Channel _Linked State" +msgstr "بدّل حالة رب_ط القناة" -#. GIMP_STOCK_LOCK +#. GIMP_ICON_LOCK #: ../app/actions/channels-actions.c:125 msgctxt "channels-action" -msgid "L_ock pixels" -msgstr "أوصِد الب_كسلات" +msgid "L_ock Pixels of Channel" +msgstr "أو_صِد ب_كسلات القناة" #: ../app/actions/channels-actions.c:131 msgctxt "channels-action" -msgid "L_ock position" -msgstr "أو_صِد الموضع" +msgid "L_ock Position of Channel" +msgstr "أو_صِد مو_ضع القناة" -#. abused #: ../app/actions/channels-actions.c:140 msgctxt "channels-action" msgid "None" @@ -776,8 +926,8 @@ msgstr "بدون" #: ../app/actions/channels-actions.c:141 msgctxt "channels-action" -msgid "Clear color tag" -msgstr "امسح وسم اللون" +msgid "Channel Color Tag: Clear" +msgstr "وسم لون القناة: بلا لون" #: ../app/actions/channels-actions.c:146 msgctxt "channels-action" @@ -786,8 +936,8 @@ msgstr "أزرق" #: ../app/actions/channels-actions.c:147 msgctxt "channels-action" -msgid "Set color tag to blue" -msgstr "ضع وسم لون أزرق" +msgid "Channel Color Tag: Set to Blue" +msgstr "وسم لون القناة: اجعله أزرق" #: ../app/actions/channels-actions.c:152 msgctxt "channels-action" @@ -796,8 +946,8 @@ msgstr "أخضر" #: ../app/actions/channels-actions.c:153 msgctxt "channels-action" -msgid "Set color tag to green" -msgstr "ضع وسم لون أخضر" +msgid "Channel Color Tag: Set to Green" +msgstr "وسم لون القناة: اجعله أخضر" #: ../app/actions/channels-actions.c:158 msgctxt "channels-action" @@ -806,8 +956,8 @@ msgstr "أصفر" #: ../app/actions/channels-actions.c:159 msgctxt "channels-action" -msgid "Set color tag to yellow" -msgstr "ضع وسم لون أصفر" +msgid "Channel Color Tag: Set to Yellow" +msgstr "وسم لون القناة: اجعله أصفر" #: ../app/actions/channels-actions.c:164 msgctxt "channels-action" @@ -816,8 +966,8 @@ msgstr "برتقالي" #: ../app/actions/channels-actions.c:165 msgctxt "channels-action" -msgid "Set color tag to orange" -msgstr "ضع وسم لون برتقالي" +msgid "Channel Color Tag: Set to Orange" +msgstr "وسم لون القناة: اجعله برتقالي" #: ../app/actions/channels-actions.c:170 msgctxt "channels-action" @@ -826,8 +976,8 @@ msgstr "بني" #: ../app/actions/channels-actions.c:171 msgctxt "channels-action" -msgid "Set color tag to brown" -msgstr "ضع وسم لون بني" +msgid "Channel Color Tag: Set to Brown" +msgstr "وسم لون القناة: اجعله بني" #: ../app/actions/channels-actions.c:176 msgctxt "channels-action" @@ -836,8 +986,8 @@ msgstr "أحمر" #: ../app/actions/channels-actions.c:177 msgctxt "channels-action" -msgid "Set color tag to red" -msgstr "ضع وسم لون أحمر" +msgid "Channel Color Tag: Set to Red" +msgstr "وسم لون القناة: اجعله أحمر" #: ../app/actions/channels-actions.c:182 msgctxt "channels-action" @@ -846,8 +996,8 @@ msgstr "بنفسجي" #: ../app/actions/channels-actions.c:183 msgctxt "channels-action" -msgid "Set color tag to violet" -msgstr "ضع وسم لون بنفسجي" +msgid "Channel Color Tag: Set to Violet" +msgstr "وسم لون القناة: اجعله بنفسجي" #: ../app/actions/channels-actions.c:188 msgctxt "channels-action" @@ -856,8 +1006,8 @@ msgstr "رمادي" #: ../app/actions/channels-actions.c:189 msgctxt "channels-action" -msgid "Set color tag to gray" -msgstr "ضع وسم لون رمادي" +msgid "Channel Color Tag: Set to Gray" +msgstr "وسم لون القناة: اجعله أزرق رمادي" #: ../app/actions/channels-actions.c:197 msgctxt "channels-action" @@ -899,8 +1049,48 @@ msgctxt "channels-action" msgid "Intersect this channel with the current selection" msgstr "قاطع هذه القناة مع التحديد الحالي" +#: ../app/actions/channels-actions.c:224 +msgctxt "channels-action" +msgid "Select _Top Channel" +msgstr "ا_ختر قناة السطح" + +#: ../app/actions/channels-actions.c:225 +msgctxt "channels-action" +msgid "Select the topmost channel" +msgstr "اختر القناة الأعلى" + +#: ../app/actions/channels-actions.c:230 +msgctxt "channels-action" +msgid "Select _Bottom Channel" +msgstr "اختر قناة ال_قاع" + +#: ../app/actions/channels-actions.c:231 +msgctxt "channels-action" +msgid "Select the bottommost channel" +msgstr "اختر القناة الأدنى" + +#: ../app/actions/channels-actions.c:236 +msgctxt "channels-action" +msgid "Select _Previous Channel" +msgstr "اختر القناة ال_سابقة" + +#: ../app/actions/channels-actions.c:237 +msgctxt "channels-action" +msgid "Select the channel above the current channel" +msgstr "اختر القناة فوق هذه القناة" + +#: ../app/actions/channels-actions.c:242 +msgctxt "channels-action" +msgid "Select _Next Channel" +msgstr "اختر القناة ال_تالية" + +#: ../app/actions/channels-actions.c:243 +msgctxt "channels-action" +msgid "Select the channel below the current channel" +msgstr "اختر القناة تحت هذه القناة" + #: ../app/actions/channels-commands.c:111 -#: ../app/actions/channels-commands.c:515 +#: ../app/actions/channels-commands.c:517 msgid "Channel Attributes" msgstr "صفات القناة" @@ -918,7 +1108,6 @@ msgid "_Fill opacity:" msgstr "_عتامة اللون:" #: ../app/actions/channels-commands.c:156 -#: ../app/actions/channels-commands.c:209 #: ../app/widgets/gimpchanneltreeview.c:327 msgid "New Channel" msgstr "قناة جديدة" @@ -931,10 +1120,10 @@ msgstr "أنشئ قناة جديدة" msgid "New Channel Color" msgstr "لون القناة الجديدة" -#: ../app/actions/channels-commands.c:294 ../app/core/gimpimage-new.c:275 -#: ../app/display/gimpdisplayshell-dnd.c:672 +#: ../app/actions/channels-commands.c:274 ../app/core/gimpimage-new.c:278 +#: ../app/display/gimpdisplayshell-dnd.c:670 #: ../app/widgets/gimpchanneltreeview.c:258 -#: ../app/widgets/gimplayertreeview.c:784 +#: ../app/widgets/gimplayertreeview.c:805 #, c-format msgid "%s Channel Copy" msgstr "نسخة القناة %s" @@ -1096,7 +1285,7 @@ msgstr "ال_صلابة" #: ../app/actions/context-actions.c:76 msgctxt "context-action" msgid "_Aspect Ratio" -msgstr "ن_سبة الارتفاع" +msgstr "ن_سبة الأبعاد" #: ../app/actions/context-actions.c:78 msgctxt "context-action" @@ -1123,22 +1312,1102 @@ msgctxt "context-action" msgid "Exchange foreground and background colors" msgstr "بدّل بين ألوان المقدمة والخلفية" -#: ../app/actions/context-commands.c:431 +#: ../app/actions/context-actions.c:97 +msgctxt "context-action" +msgid "Foreground: Set Color From Palette" +msgstr "لون المقدمة: خذه من لوحة الألوان" + +#: ../app/actions/context-actions.c:101 +msgctxt "context-action" +msgid "Foreground: Use First Palette Color" +msgstr "لون المقدمة: استخدم أول لون في لوحة الألوان" + +#: ../app/actions/context-actions.c:105 +msgctxt "context-action" +msgid "Foreground: Use Last Palette Color" +msgstr "لون المقدمة: استخدم آخر لون في لوحة الألوان" + +#: ../app/actions/context-actions.c:109 +msgctxt "context-action" +msgid "Foreground: Use Previous Palette Color" +msgstr "لون المقدمة: استخدم لون لوحة الألوان السابق" + +#: ../app/actions/context-actions.c:113 +msgctxt "context-action" +msgid "Foreground: Use Next Palette Color" +msgstr "لون المقدمة: استخدم لون لوحة الألوان التالي" + +#: ../app/actions/context-actions.c:117 +msgctxt "context-action" +msgid "Foreground: Skip Back Palette Color" +msgstr "لون المقدمة: عد للخلف في لوحة الألوان" + +#: ../app/actions/context-actions.c:121 +msgctxt "context-action" +msgid "Foreground: Skip Forward Palette Color" +msgstr "لون المقدمة: تقدّم للأمام في لوحة الألوان" + +#: ../app/actions/context-actions.c:129 +msgctxt "context-action" +msgid "Background: Set Color From Palette" +msgstr "لون الخلفية: خذه من لوح الألوان" + +#: ../app/actions/context-actions.c:133 +msgctxt "context-action" +msgid "Background: Use First Palette Color" +msgstr "لون الخلفية: استخدم أول لون في لوحة الألوان" + +#: ../app/actions/context-actions.c:137 +msgctxt "context-action" +msgid "Background: Use Last Palette Color" +msgstr "لون الخلفية: استخدم آخر لون في لوحة الألوان" + +#: ../app/actions/context-actions.c:141 +msgctxt "context-action" +msgid "Background: Use Previous Palette Color" +msgstr "لون الخلفية: استخدم لون لوحة الألوان السابق" + +#: ../app/actions/context-actions.c:145 +msgctxt "context-action" +msgid "Background: Use Next Palette Color" +msgstr "لون الخلفية: استخدم لون لوحة الألوان التالي" + +#: ../app/actions/context-actions.c:149 +msgctxt "context-action" +msgid "Background: Skip Back Palette Color" +msgstr "لون الخلفية: عد للخلف في لوحة الألوان" + +#: ../app/actions/context-actions.c:153 +msgctxt "context-action" +msgid "Background: Skip Forward Palette Color" +msgstr "لون الخلفية: تقدّم للأمام في لوحة الألوان" + +#: ../app/actions/context-actions.c:161 +msgctxt "context-action" +msgid "Foreground: Set Color From Colormap" +msgstr "لون المقدمة: خذه من مخطط الألوان" + +#: ../app/actions/context-actions.c:165 +msgctxt "context-action" +msgid "Foreground: Use First Color From Colormap" +msgstr "لون المقدمة: استخدم أول لون في مخطط الألوان" + +#: ../app/actions/context-actions.c:169 +msgctxt "context-action" +msgid "Foreground: Use Last Color From Colormap" +msgstr "لون المقدمة: استخدم آخر لون في مخطط الألوان" + +#: ../app/actions/context-actions.c:173 +msgctxt "context-action" +msgid "Foreground: Use Previous Color From Colormap" +msgstr "لون المقدمة: استخدم لون مخطط الألوان السابق" + +#: ../app/actions/context-actions.c:177 +msgctxt "context-action" +msgid "Foreground: Use Next Color From Colormap" +msgstr "لون المقدمة: استخدم لون مخطط الألوان التالي" + +#: ../app/actions/context-actions.c:181 +msgctxt "context-action" +msgid "Foreground: Skip Back Color From Colormap" +msgstr "لون المقدمة: عد للخلف في مخطط الألوان" + +#: ../app/actions/context-actions.c:185 +msgctxt "context-action" +msgid "Foreground: Skip Forward Color From Colormap" +msgstr "لون المقدمة: تقدّم للأمام في مخطط الألوان" + +#: ../app/actions/context-actions.c:193 +msgctxt "context-action" +msgid "Background: Set Color From Colormap" +msgstr "لون الخلفية: خذه من مخطط الألوان" + +#: ../app/actions/context-actions.c:197 +msgctxt "context-action" +msgid "Background: Use First Color From Colormap" +msgstr "لون الخلفية: استخدم أول لون في مخطط الألوان" + +#: ../app/actions/context-actions.c:201 +msgctxt "context-action" +msgid "Background: Use Last Color From Colormap" +msgstr "لون الخلفية: استخدم آخر لون في مخطط الألوان" + +#: ../app/actions/context-actions.c:205 +msgctxt "context-action" +msgid "Background: Use Previous Color From Colormap" +msgstr "لون الخلفية: استخدم لون مخطط الألوان السابق" + +#: ../app/actions/context-actions.c:209 +msgctxt "context-action" +msgid "Background: Use Next Color From Colormap" +msgstr "لون الخلفية: استخدم لون مخطط الألوان التالي" + +#: ../app/actions/context-actions.c:213 +msgctxt "context-action" +msgid "Background: Skip Back Color From Colormap" +msgstr "لون الخلفية: عد للخلف في مخطط الألوان" + +#: ../app/actions/context-actions.c:217 +msgctxt "context-action" +msgid "Background: Skip Forward Color From Colormap" +msgstr "لون الخلفية: تقدّم للأمام في مخطط الألوان" + +#: ../app/actions/context-actions.c:225 +msgctxt "context-action" +msgid "Foreground: Set Color From Swatch" +msgstr "لون المقدمة: خذه من العينة" + +#: ../app/actions/context-actions.c:229 +msgctxt "context-action" +msgid "Foreground: Use First Color From Swatch" +msgstr "لون المقدمة: استخدم أول لون في العينة" + +#: ../app/actions/context-actions.c:233 +msgctxt "context-action" +msgid "Foreground: Use Last Color From Swatch" +msgstr "لون المقدمة: استخدم آخر لون في العينة" + +#: ../app/actions/context-actions.c:237 +msgctxt "context-action" +msgid "Foreground: Use Previous Color From Swatch" +msgstr "لون المقدمة: استخدم لون العينة السابق" + +#: ../app/actions/context-actions.c:241 +msgctxt "context-action" +msgid "Foreground: Use Next Color From Swatch" +msgstr "لون المقدمة: استخدم لون العينة التالي" + +#: ../app/actions/context-actions.c:245 +msgctxt "context-action" +msgid "Foreground: Skip Back Color From Swatch" +msgstr "لون المقدمة: عد للخلف في ألوان العينة" + +#: ../app/actions/context-actions.c:249 +msgctxt "context-action" +msgid "Foreground: Skip Forward Color From Swatch" +msgstr "لون المقدمة: تقدّم للأمام في ألوان العينة" + +#: ../app/actions/context-actions.c:257 +msgctxt "context-action" +msgid "Background: Set Color From Swatch" +msgstr "لون الخلفية: خذه من العينة" + +#: ../app/actions/context-actions.c:261 +msgctxt "context-action" +msgid "Background: Use First Color From Swatch" +msgstr "لون الخلفية: استخدم أول لون في العينة" + +#: ../app/actions/context-actions.c:265 +msgctxt "context-action" +msgid "Background: Use Last Color From Swatch" +msgstr "لون الخلفية: استخدم آخر لون في العينة" + +#: ../app/actions/context-actions.c:269 +msgctxt "context-action" +msgid "Background: Use Previous Color From Swatch" +msgstr "لون الخلفية: استخدم لون العينة السابق" + +#: ../app/actions/context-actions.c:273 +msgctxt "context-action" +msgid "Background: Use Next Color From Swatch" +msgstr "لون الخلفية: استخدم لون العينة التالي" + +#: ../app/actions/context-actions.c:277 +msgctxt "context-action" +msgid "Background: Skip Color Back From Swatch" +msgstr "لون الخلفية: عد للخلف في ألوان العينة" + +#: ../app/actions/context-actions.c:281 +msgctxt "context-action" +msgid "Background: Skip Color Forward From Swatch" +msgstr "لون الخلفية: تقدّم للأمام في ألوان العينة" + +#: ../app/actions/context-actions.c:289 +msgctxt "context-action" +msgid "Foreground Red: Set" +msgstr "لون المقدمة الأحمر: حدده" + +#: ../app/actions/context-actions.c:293 +msgctxt "context-action" +msgid "Foreground Red: Set to Minimum" +msgstr "لون المقدمة الأحمر: استخدم الحد الأدنى" + +#: ../app/actions/context-actions.c:297 +msgctxt "context-action" +msgid "Foreground Red: Set to Maximum" +msgstr "لون المقدمة الأحمر: استخدم الحد الأقصى" + +#: ../app/actions/context-actions.c:301 +msgctxt "context-action" +msgid "Foreground Red: Decrease by 1%" +msgstr "لون المقدمة الأحمر: قلل بنسبة ١٪" + +#: ../app/actions/context-actions.c:305 +msgctxt "context-action" +msgid "Foreground Red: Increase by 1%" +msgstr "لون المقدمة الأحمر: زوّد بنسبة ١٪" + +#: ../app/actions/context-actions.c:309 +msgctxt "context-action" +msgid "Foreground Red: Decrease by 10%" +msgstr "لون المقدمة الأحمر: قلل بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:313 +msgctxt "context-action" +msgid "Foreground Red: Increase by 10%" +msgstr "لون المقدمة الأحمر: زوّد بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:321 +msgctxt "context-action" +msgid "Foreground Green: Set" +msgstr "لون المقدمة الأخضر: حدده" + +#: ../app/actions/context-actions.c:325 +msgctxt "context-action" +msgid "Foreground Green: Set to Minimum" +msgstr "لون المقدمة الأخضر: استخدم الحد الأدنى" + +#: ../app/actions/context-actions.c:329 +msgctxt "context-action" +msgid "Foreground Green: Set to Maximum" +msgstr "لون المقدمة الأخضر: استخدم الحد الأقصى" + +#: ../app/actions/context-actions.c:333 +msgctxt "context-action" +msgid "Foreground Green: Decrease by 1%" +msgstr "لون المقدمة الأخضر: قلل بنسبة ١٪" + +#: ../app/actions/context-actions.c:337 +msgctxt "context-action" +msgid "Foreground Green: Increase by 1%" +msgstr "لون المقدمة الأخضر: زوّد بنسبة ١٪" + +#: ../app/actions/context-actions.c:341 +msgctxt "context-action" +msgid "Foreground Green: Decrease by 10%" +msgstr "لون المقدمة الأخضر: قلل بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:345 +msgctxt "context-action" +msgid "Foreground Green: Increase by 10%" +msgstr "لون المقدمة الأخضر: زوّد بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:353 +msgctxt "context-action" +msgid "Foreground Blue: Set" +msgstr "لون المقدمة الأزرق: حدده" + +#: ../app/actions/context-actions.c:357 +msgctxt "context-action" +msgid "Foreground Blue: Set to Minimum" +msgstr "لون المقدمة الأزرق: استخدم الحد الأدنى" + +#: ../app/actions/context-actions.c:361 +msgctxt "context-action" +msgid "Foreground Blue: Set to Maximum" +msgstr "لون المقدمة الأزرق: استخدم الحد الأقصى" + +#: ../app/actions/context-actions.c:365 +msgctxt "context-action" +msgid "Foreground Blue: Decrease by 1%" +msgstr "لون المقدمة الأزرق: قلل بنسبة ١٪" + +#: ../app/actions/context-actions.c:369 +msgctxt "context-action" +msgid "Foreground Blue: Increase by 1%" +msgstr "لون المقدمة الأزرق: زوّد بنسبة ١٪" + +#: ../app/actions/context-actions.c:373 +msgctxt "context-action" +msgid "Foreground Blue: Decrease by 10%" +msgstr "لون المقدمة الأزرق: قلل بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:377 +msgctxt "context-action" +msgid "Foreground Blue: Increase by 10%" +msgstr "لون المقدمة الأزرق: زوّد بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:385 +msgctxt "context-action" +msgid "Background Red: Set" +msgstr "لون الخلفية الأحمر: حدده" + +#: ../app/actions/context-actions.c:389 +msgctxt "context-action" +msgid "Background Red: Set to Minimum" +msgstr "لون الخلفية الأحمر: استخدم الحد الأدنى" + +#: ../app/actions/context-actions.c:393 +msgctxt "context-action" +msgid "Background Red: Set to Maximum" +msgstr "لون الخلفية الأحمر: استخدم الحد الأقصى" + +#: ../app/actions/context-actions.c:397 +msgctxt "context-action" +msgid "Background Red: Decrease by 1%" +msgstr "لون الخلفية الأحمر: قلل بنسبة ١٪" + +#: ../app/actions/context-actions.c:401 +msgctxt "context-action" +msgid "Background Red: Increase by 1%" +msgstr "لون الخلفية الأحمر: زوّد بنسبة ١٪" + +#: ../app/actions/context-actions.c:405 +msgctxt "context-action" +msgid "Background Red: Decrease by 10%" +msgstr "لون الخلفية الأحمر: قلل بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:409 +msgctxt "context-action" +msgid "Background Red: Increase by 10%" +msgstr "لون الخلفية الأحمر: زوّد بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:417 +msgctxt "context-action" +msgid "Background Green: Set" +msgstr "لون الخلفية الأخضر: حدده" + +#: ../app/actions/context-actions.c:421 +msgctxt "context-action" +msgid "Background Green: Set to Minimum" +msgstr "لون الخلفية الأخضر: استخدم الحد الأدنى" + +#: ../app/actions/context-actions.c:425 +msgctxt "context-action" +msgid "Background Green: Set to Maximum" +msgstr "لون الخلفية الأخضر: استخدم الحد الأقصى" + +#: ../app/actions/context-actions.c:429 +msgctxt "context-action" +msgid "Background Green: Decrease by 1%" +msgstr "لون الخلفية الأخضر: قلل بنسبة ١٪" + +#: ../app/actions/context-actions.c:433 +msgctxt "context-action" +msgid "Background Green: Increase by 1%" +msgstr "لون الخلفية الأخضر: زوّد بنسبة ١٪" + +#: ../app/actions/context-actions.c:437 +msgctxt "context-action" +msgid "Background Green: Decrease by 10%" +msgstr "لون الخلفية الأخضر: قلل بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:441 +msgctxt "context-action" +msgid "Background Green: Increase by 10%" +msgstr "لون الخلفية الأخضر: زوّد بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:449 +msgctxt "context-action" +msgid "Background Blue: Set" +msgstr "لون الخلفية الأزرق: حدده" + +#: ../app/actions/context-actions.c:453 +msgctxt "context-action" +msgid "Background Blue: Set to Minimum" +msgstr "لون الخلفية الأزرق: استخدم الحد الأدنى" + +#: ../app/actions/context-actions.c:457 +msgctxt "context-action" +msgid "Background Blue: Set to Maximum" +msgstr "لون الخلفية الأزرق: استخدم الحد الأقصى" + +#: ../app/actions/context-actions.c:461 +msgctxt "context-action" +msgid "Background Blue: Decrease by 1%" +msgstr "لون الخلفية الأزرق: قلل بنسبة ١٪" + +#: ../app/actions/context-actions.c:465 +msgctxt "context-action" +msgid "Background Blue: Increase by 1%" +msgstr "لون الخلفية الأزرق: زوّد بنسبة ١٪" + +#: ../app/actions/context-actions.c:469 +msgctxt "context-action" +msgid "Background Blue: Decrease by 10%" +msgstr "لون الخلفية الأزرق: قلل بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:473 +msgctxt "context-action" +msgid "Background Blue: Increase by 10%" +msgstr "لون الخلفية الأزرق: زوّد بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:481 +msgctxt "context-action" +msgid "Foreground Hue: Set" +msgstr "درجة المقدمة: حدده" + +#: ../app/actions/context-actions.c:485 +msgctxt "context-action" +msgid "Foreground Hue: Set to Minimum" +msgstr "درجة المقدمة: استخدم الحد الأدنى" + +#: ../app/actions/context-actions.c:489 +msgctxt "context-action" +msgid "Foreground Hue: Set to Maximum" +msgstr "درجة المقدمة: استخدم الحد الأقصى" + +#: ../app/actions/context-actions.c:493 +msgctxt "context-action" +msgid "Foreground Hue: Decrease by 1%" +msgstr "درجة المقدمة: قلل بنسبة ١٪" + +#: ../app/actions/context-actions.c:497 +msgctxt "context-action" +msgid "Foreground Hue: Increase by 1%" +msgstr "درجة المقدمة: زوّد بنسبة ١٪" + +#: ../app/actions/context-actions.c:501 +msgctxt "context-action" +msgid "Foreground Hue: Decrease by 10%" +msgstr "درجة المقدمة: قلل بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:505 +msgctxt "context-action" +msgid "Foreground Hue: Increase by 10%" +msgstr "درجة المقدمة: زوّد بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:513 +msgctxt "context-action" +msgid "Foreground Saturation: Set" +msgstr "تشبع المقدمة: حدده" + +#: ../app/actions/context-actions.c:517 +msgctxt "context-action" +msgid "Foreground Saturation: Set to Minimum" +msgstr "تشبع المقدمة: استخدم الحد الأدنى" + +#: ../app/actions/context-actions.c:521 +msgctxt "context-action" +msgid "Foreground Saturation: Set to Maximum" +msgstr "تشبع المقدمة: استخدم الحد الأقصى" + +#: ../app/actions/context-actions.c:525 +msgctxt "context-action" +msgid "Foreground Saturation: Decrease by 1%" +msgstr "تشبع المقدمة: قلل بنسبة ١٪" + +#: ../app/actions/context-actions.c:529 +msgctxt "context-action" +msgid "Foreground Saturation: Increase by 1%" +msgstr "تشبع المقدمة: زوّد بنسبة ١٪" + +#: ../app/actions/context-actions.c:533 +msgctxt "context-action" +msgid "Foreground Saturation: Decrease by 10%" +msgstr "تشبع المقدمة: قلل بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:537 +msgctxt "context-action" +msgid "Foreground Saturation: Increase by 10%" +msgstr "تشبع المقدمة: زوّد بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:545 +msgctxt "context-action" +msgid "Foreground Value: Set" +msgstr "قيمة المقدمة: حددها" + +#: ../app/actions/context-actions.c:549 +msgctxt "context-action" +msgid "Foreground Value: Set to Minimum" +msgstr "قيمة المقدمة: استخدم الحد الأدنى" + +#: ../app/actions/context-actions.c:553 +msgctxt "context-action" +msgid "Foreground Value: Set to Maximum" +msgstr "قيمة المقدمة: استخدم الحد الأقصى" + +#: ../app/actions/context-actions.c:557 +msgctxt "context-action" +msgid "Foreground Value: Decrease by 1%" +msgstr "قيمة المقدمة: قلل بنسبة ١٪" + +#: ../app/actions/context-actions.c:561 +msgctxt "context-action" +msgid "Foreground Value: Increase by 1%" +msgstr "قيمة المقدمة: زوّد بنسبة ١٪" + +#: ../app/actions/context-actions.c:565 +msgctxt "context-action" +msgid "Foreground Value: Decrease by 10%" +msgstr "قيمة المقدمة: قلل بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:569 +msgctxt "context-action" +msgid "Foreground Value: Increase by 10%" +msgstr "قيمة المقدمة: زوّد بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:577 +msgctxt "context-action" +msgid "Background Hue: Set" +msgstr "درجة الخلفية: حدده" + +#: ../app/actions/context-actions.c:581 +msgctxt "context-action" +msgid "Background Hue: Set to Minimum" +msgstr "درجة الخلفية: استخدم الحد الأدنى" + +#: ../app/actions/context-actions.c:585 +msgctxt "context-action" +msgid "Background Hue: Set to Maximum" +msgstr "درجة الخلفية: استخدم الحد الأقصى" + +#: ../app/actions/context-actions.c:589 +msgctxt "context-action" +msgid "Background Hue: Decrease by 1%" +msgstr "درجة الخلفية: قلل بنسبة ١٪" + +#: ../app/actions/context-actions.c:593 +msgctxt "context-action" +msgid "Background Hue: Increase by 1%" +msgstr "درجة الخلفية: زوّد بنسبة ١٪" + +#: ../app/actions/context-actions.c:597 +msgctxt "context-action" +msgid "Background Hue: Decrease by 10%" +msgstr "درجة الخلفية: قلل بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:601 +msgctxt "context-action" +msgid "Background Hue: Increase by 10%" +msgstr "درجة الخلفية: زوّد بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:609 +msgctxt "context-action" +msgid "Background Saturation: Set" +msgstr "تشبع الخلفية: حدده" + +#: ../app/actions/context-actions.c:613 +msgctxt "context-action" +msgid "Background Saturation: Set to Minimum" +msgstr "تشبع الخلفية: استخدم الحد الأدنى" + +#: ../app/actions/context-actions.c:617 +msgctxt "context-action" +msgid "Background Saturation: Set to Maximum" +msgstr "تشبع الخلفية: استخدم الحد الأقصى" + +#: ../app/actions/context-actions.c:621 +msgctxt "context-action" +msgid "Background Saturation: Decrease by 1%" +msgstr "تشبع الخلفية: قلل بنسبة ١٪" + +#: ../app/actions/context-actions.c:625 +msgctxt "context-action" +msgid "Background Saturation: Increase by 1%" +msgstr "تشبع الخلفية: زوّد بنسبة ١٪" + +#: ../app/actions/context-actions.c:629 +msgctxt "context-action" +msgid "Background Saturation: Decrease by 10%" +msgstr "تشبع الخلفية: قلل بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:633 +msgctxt "context-action" +msgid "Background Saturation: Increase by 10%" +msgstr "تشبع الخلفية: زوّد بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:641 +msgctxt "context-action" +msgid "Background Value: Set" +msgstr "قيمة الخلفية: حددها" + +#: ../app/actions/context-actions.c:645 +msgctxt "context-action" +msgid "Background Value: Set to Minimum" +msgstr "قيمة الخلفية: استخدم الحد الأدنى" + +#: ../app/actions/context-actions.c:649 +msgctxt "context-action" +msgid "Background Value: Set to Maximum" +msgstr "قيمة الخلفية: استخدم الحد الأقصى" + +#: ../app/actions/context-actions.c:653 +msgctxt "context-action" +msgid "Background Value: Decrease by 1%" +msgstr "قيمة الخلفية: قلل بنسبة ١٪" + +#: ../app/actions/context-actions.c:657 +msgctxt "context-action" +msgid "Background Value: Increase by 1%" +msgstr "قيمة الخلفية: زوّد بنسبة ١٪" + +#: ../app/actions/context-actions.c:661 +msgctxt "context-action" +msgid "Background Value: Decrease by 10%" +msgstr "قيمة الخلفية: قلل بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:665 +msgctxt "context-action" +msgid "Background Value: Increase by 10%" +msgstr "قيمة الخلفية: زوّد بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:673 +msgctxt "context-action" +msgid "Tool Opacity: Set Transparency" +msgstr "عتامة الأداة: حدد بالشفافية" + +#: ../app/actions/context-actions.c:677 +msgctxt "context-action" +msgid "Tool Opacity: Make Completely Transparent" +msgstr "عتامة الأداة: اجعلها شفافة تمامًا" + +#: ../app/actions/context-actions.c:681 +msgctxt "context-action" +msgid "Tool Opacity: Make Completely Opaque" +msgstr "عتامة الأداة: اجعلها معتمة تمامًا" + +#: ../app/actions/context-actions.c:685 +msgctxt "context-action" +msgid "Tool Opacity: Make 1% More Transparent" +msgstr "عتامة الأداة: اجعلها شفافة أكثر بنسبة ١٪" + +#: ../app/actions/context-actions.c:689 +msgctxt "context-action" +msgid "Tool Opacity: Make 1% More Opaque" +msgstr "عتامة الأداة: اجعلها معتمة أكثر بنسبة ١٪" + +#: ../app/actions/context-actions.c:693 +msgctxt "context-action" +msgid "Tool Opacity: Make 10% More Transparent" +msgstr "عتامة الأداة: اجعلها شفافة أكثر بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:697 +msgctxt "context-action" +msgid "Tool Opacity: Make 10% More Opaque" +msgstr "عتامة الأداة: اجعلها معتمة أكثر بنسبة ١٠٪" + +#: ../app/actions/context-actions.c:705 +msgctxt "context-action" +msgid "Tool Paint Mode: Select First" +msgstr "نمط رسم الأداة: اختر الأول" + +#: ../app/actions/context-actions.c:709 +msgctxt "context-action" +msgid "Tool Paint Mode: Select Last" +msgstr "نمط رسم الأداة: اختر الأخير" + +#: ../app/actions/context-actions.c:713 +msgctxt "context-action" +msgid "Tool Paint Mode: Select Previous" +msgstr "نمط رسم الأداة: اختر السابق" + +#: ../app/actions/context-actions.c:717 +msgctxt "context-action" +msgid "Tool Paint Mode: Select Next" +msgstr "نمط رسم الأداة: اختر التالي" + +#: ../app/actions/context-actions.c:725 +msgctxt "context-action" +msgid "Tool Selection: Choose by Index" +msgstr "تحديد الأداة: اختر بالرقم" + +#: ../app/actions/context-actions.c:729 +msgctxt "context-action" +msgid "Tool Selection: Switch to First" +msgstr "تحديد الأداة: انتقل إلى الأول" + +#: ../app/actions/context-actions.c:733 +msgctxt "context-action" +msgid "Tool Selection: Switch to Last" +msgstr "تحديد الأداة: انتقل إلى الأخير" + +#: ../app/actions/context-actions.c:737 +msgctxt "context-action" +msgid "Tool Selection: Switch to Previous" +msgstr "تحديد الأداة: انتقل إلى السابق" + +#: ../app/actions/context-actions.c:741 +msgctxt "context-action" +msgid "Tool Selection: Switch to Next" +msgstr "تحديد الأداة: انتقل إلى التالي" + +#: ../app/actions/context-actions.c:749 +msgctxt "context-action" +msgid "Brush Selection: Select by Index" +msgstr "تحديد الفرشاة: اختر بالرقم" + +#: ../app/actions/context-actions.c:753 +msgctxt "context-action" +msgid "Brush Selection: Switch to First" +msgstr "تحديد الفرشاة: انتقل إلى الأول" + +#: ../app/actions/context-actions.c:757 +msgctxt "context-action" +msgid "Brush Selection: Switch to Last" +msgstr "تحديد الفرشاة: انتقل إلى الأخير" + +#: ../app/actions/context-actions.c:761 +msgctxt "context-action" +msgid "Brush Selection: Switch to Previous" +msgstr "تحديد الفرشاة: انتقل إلى السابق" + +#: ../app/actions/context-actions.c:765 +msgctxt "context-action" +msgid "Brush Selection: Switch to Next" +msgstr "تحديد الفرشاة: انتقل إلى التالي" + +#: ../app/actions/context-actions.c:773 +msgctxt "context-action" +msgid "Pattern Selection: Select by Index" +msgstr "تحديد النمط: اختر بالرقم" + +#: ../app/actions/context-actions.c:777 +msgctxt "context-action" +msgid "Pattern Selection: Switch to First" +msgstr "تحديد النمط: انتقل إلى الأول" + +#: ../app/actions/context-actions.c:781 +msgctxt "context-action" +msgid "Pattern Selection: Switch to Last" +msgstr "تحديد النمط: انتقل إلى الأخير" + +#: ../app/actions/context-actions.c:785 +msgctxt "context-action" +msgid "Pattern Selection: Switch to Previous" +msgstr "تحديد النمط: انتقل إلى السابق" + +#: ../app/actions/context-actions.c:789 +msgctxt "context-action" +msgid "Pattern Selection: Switch to Next" +msgstr "تحديد النمط: انتقل إلى التالي" + +#: ../app/actions/context-actions.c:797 +msgctxt "context-action" +msgid "Palette Selection: Select by Index" +msgstr "تحديد لوحة الألوان: اختر بالرقم" + +#: ../app/actions/context-actions.c:801 +msgctxt "context-action" +msgid "Palette Selection: Switch to First" +msgstr "تحديد لوحة الألوان: انتقل إلى الأول" + +#: ../app/actions/context-actions.c:805 +msgctxt "context-action" +msgid "Palette Selection: Switch to Last" +msgstr "تحديد لوحة الألوان: انتقل إلى الأخير" + +#: ../app/actions/context-actions.c:809 +msgctxt "context-action" +msgid "Palette Selection: Switch to Previous" +msgstr "تحديد لوحة الألوان: انتقل إلى السابق" + +#: ../app/actions/context-actions.c:813 +msgctxt "context-action" +msgid "Palette Selection: Switch to Next" +msgstr "تحديد لوحة الألوان: انتقل إلى التالي" + +#: ../app/actions/context-actions.c:821 +msgctxt "context-action" +msgid "Gradient Selection: Select by Index" +msgstr "تحديد التدرج: اختر بالرقم" + +#: ../app/actions/context-actions.c:825 +msgctxt "context-action" +msgid "Gradient Selection: Switch to First" +msgstr "تحديد التدرج: انتقل إلى الأول" + +#: ../app/actions/context-actions.c:829 +msgctxt "context-action" +msgid "Gradient Selection: Switch to Last" +msgstr "تحديد التدرج: انتقل إلى الأخير" + +#: ../app/actions/context-actions.c:833 +msgctxt "context-action" +msgid "Gradient Selection: Switch to Previous" +msgstr "تحديد التدرج: انتقل إلى السابق" + +#: ../app/actions/context-actions.c:837 +msgctxt "context-action" +msgid "Gradient Selection: Switch to Next" +msgstr "تحديد التدرج: انتقل إلى التالي" + +#: ../app/actions/context-actions.c:845 +msgctxt "context-action" +msgid "Font Selection: Select by Index" +msgstr "تحديد الخط: اختر بالرقم" + +#: ../app/actions/context-actions.c:849 +msgctxt "context-action" +msgid "Font Selection: Switch to First" +msgstr "تحديد الخط: انتقل إلى الأول" + +#: ../app/actions/context-actions.c:853 +msgctxt "context-action" +msgid "Font Selection: Switch to Last" +msgstr "تحديد الخط: انتقل إلى الأخير" + +#: ../app/actions/context-actions.c:857 +msgctxt "context-action" +msgid "Font Selection: Switch to Previous" +msgstr "تحديد الخط: انتقل إلى السابق" + +#: ../app/actions/context-actions.c:861 +msgctxt "context-action" +msgid "Font Selection: Switch to Next" +msgstr "تحديد الخط: انتقل إلى التالي" + +#: ../app/actions/context-actions.c:869 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Set" +msgstr "مباعدة الفرشاة (المحرر): حددها" + +#: ../app/actions/context-actions.c:873 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Set to Minimum" +msgstr "مباعدة الفرشاة (المحرر): استخدم الحد الأدنى" + +#: ../app/actions/context-actions.c:877 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Set to Maximum" +msgstr "مباعدة الفرشاة (المحرر): استخدم الحد الأقصى" + +#: ../app/actions/context-actions.c:881 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Decrease by 1" +msgstr "مباعدة الفرشاة (المحرر): قلل بقيمة ١" + +#: ../app/actions/context-actions.c:885 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Increase by 1" +msgstr "مباعدة الفرشاة (المحرر): زوّد بقيمة ١" + +#: ../app/actions/context-actions.c:889 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Decrease by 10" +msgstr "مباعدة الفرشاة (المحرر): قلل بقيمة ١٠" + +#: ../app/actions/context-actions.c:893 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Increase by 10" +msgstr "مباعدة الفرشاة (المحرر): زوّد بقيمة ١٠" + +#: ../app/actions/context-actions.c:901 +msgctxt "context-action" +msgid "Brush Shape (Editor): Use Circular" +msgstr "شكل الفرشاة (المحرر): دائري" + +#: ../app/actions/context-actions.c:905 +msgctxt "context-action" +msgid "Brush Shape (Editor): Use Square" +msgstr "شكل الفرشاة (المحرر): مربع" + +#: ../app/actions/context-actions.c:909 +msgctxt "context-action" +msgid "Brush Shape (Editor): Use Diamond" +msgstr "شكل الفرشاة (المحرر): معيّن" + +#: ../app/actions/context-actions.c:917 +msgctxt "context-action" +msgid "Brush Radius (Editor): Set" +msgstr "قطر الفرشاة (المحرر): حدده" + +#: ../app/actions/context-actions.c:921 +msgctxt "context-action" +msgid "Brush Radius (Editor): Set to Minimum" +msgstr "قطر الفرشاة (المحرر): استخدم الحد الأدنى" + +#: ../app/actions/context-actions.c:925 +msgctxt "context-action" +msgid "Brush Radius (Editor): Set to Maximum" +msgstr "قطر الفرشاة (المحرر): استخدم الحد الأقصى" + +#: ../app/actions/context-actions.c:929 +msgctxt "context-action" +msgid "Brush Radius (Editor): Decrease by 0.1" +msgstr "قطر الفرشاة (المحرر): قلل بقيمة ٠٫١" + +#: ../app/actions/context-actions.c:933 +msgctxt "context-action" +msgid "Brush Radius (Editor): Increase by 0.1" +msgstr "قطر الفرشاة (المحرر): زوّد بقيمة ٠٫١" + +#: ../app/actions/context-actions.c:937 +msgctxt "context-action" +msgid "Brush Radius (Editor): Decrease by 1" +msgstr "قطر الفرشاة (المحرر): قلل بقيمة ١" + +#: ../app/actions/context-actions.c:941 +msgctxt "context-action" +msgid "Brush Radius (Editor): Increase by 1" +msgstr "قطر الفرشاة (المحرر): زوّد بقيمة ١" + +#: ../app/actions/context-actions.c:945 +msgctxt "context-action" +msgid "Brush Radius (Editor): Decrease by 10" +msgstr "قطر الفرشاة (المحرر): قلل بقيمة ١٠" + +#: ../app/actions/context-actions.c:949 +msgctxt "context-action" +msgid "Brush Radius (Editor): Increase by 10" +msgstr "قطر الفرشاة (المحرر): زوّد بقيمة ١٠" + +#: ../app/actions/context-actions.c:953 +msgctxt "context-action" +msgid "Brush Radius (Editor): Decrease Relative" +msgstr "قطر الفرشاة (المحرر): قلل نسبيًا" + +#: ../app/actions/context-actions.c:957 +msgctxt "context-action" +msgid "Brush Radius (Editor): Increase Relative" +msgstr "قطر الفرشاة (المحرر): زوّد نسبيًا" + +#: ../app/actions/context-actions.c:965 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Set" +msgstr "أسنان الفرشاة (المحرر): حددها" + +#: ../app/actions/context-actions.c:969 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Set to Minimum" +msgstr "أسنان الفرشاة (المحرر): استخدم الحد الأدنى" + +#: ../app/actions/context-actions.c:973 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Set to Maximum" +msgstr "أسنان الفرشاة (المحرر): استخدم الحد الأقصى" + +#: ../app/actions/context-actions.c:977 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Decrease by 1" +msgstr "أسنان الفرشاة (المحرر): قلل بقيمة ١" + +#: ../app/actions/context-actions.c:981 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Increase by 1" +msgstr "أسنان الفرشاة (المحرر): زوّد بقيمة ١" + +#: ../app/actions/context-actions.c:985 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Decrease by 4" +msgstr "أسنان الفرشاة (المحرر): قلل بقيمة ٤" + +#: ../app/actions/context-actions.c:989 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Increase by 4" +msgstr "أسنان الفرشاة (المحرر): زوّد بقيمة ٤" + +#: ../app/actions/context-actions.c:997 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Set" +msgstr "صلابة الفرشاة (المحرر): حددها" + +#: ../app/actions/context-actions.c:1001 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Set to Minimum" +msgstr "صلابة الفرشاة (المحرر): استخدم الحد الأدنى" + +#: ../app/actions/context-actions.c:1005 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Set to Maximum" +msgstr "صلابة الفرشاة (المحرر): استخدم الحد الأقصى" + +#: ../app/actions/context-actions.c:1009 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Decrease by 0.01" +msgstr "صلابة الفرشاة (المحرر): قلل بقيمة ٠٫٠١" + +#: ../app/actions/context-actions.c:1013 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Increase by 0.01" +msgstr "صلابة الفرشاة (المحرر): زوّد بقيمة ٠٫٠١" + +#: ../app/actions/context-actions.c:1017 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Decrease by 0.1" +msgstr "صلابة الفرشاة (المحرر): قلل بقيمة ٠٫١" + +#: ../app/actions/context-actions.c:1021 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Increase by 0.1" +msgstr "صلابة الفرشاة (المحرر): زوّد بقيمة ٠٫١" + +#: ../app/actions/context-actions.c:1029 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Set" +msgstr "نسبة أبعاد الفرشاة (المحرر): حددها" + +#: ../app/actions/context-actions.c:1033 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Set to Minimum" +msgstr "نسبة أبعاد الفرشاة (المحرر): استخدم الحد الأدنى" + +#: ../app/actions/context-actions.c:1037 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Set to Maximum" +msgstr "نسبة أبعاد الفرشاة (المحرر): استخدم الحد الأقصى" + +#: ../app/actions/context-actions.c:1041 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Decrease by 0.1" +msgstr "نسبة أبعاد الفرشاة (المحرر): قلل بقيمة ٠٫١" + +#: ../app/actions/context-actions.c:1045 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Increase by 0.1" +msgstr "نسبة أبعاد الفرشاة (المحرر): زوّد بقيمة ٠٫١" + +#: ../app/actions/context-actions.c:1049 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Decrease by 1" +msgstr "نسبة أبعاد الفرشاة (المحرر): قلل بقيمة ١" + +#: ../app/actions/context-actions.c:1053 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Increase by 1" +msgstr "نسبة أبعاد الفرشاة (المحرر): زوّد بقيمة ١" + +#: ../app/actions/context-actions.c:1061 +msgctxt "context-action" +msgid "Brush Angle (Editor): Set" +msgstr "زاوية الفرشاة (المحرر): حددها" + +#: ../app/actions/context-actions.c:1065 +msgctxt "context-action" +msgid "Brush Angle (Editor): Make Horizontal" +msgstr "زاوية الفرشاة (المحرر): اجعلها أفقية" + +#: ../app/actions/context-actions.c:1069 +msgctxt "context-action" +msgid "Brush Angle (Editor): Make Vertical" +msgstr "زاوية الفرشاة (المحرر): اجعلها رأسية" + +#: ../app/actions/context-actions.c:1073 +msgctxt "context-action" +msgid "Brush Angle (Editor): Rotate Right by 1°" +msgstr "زاوية الفرشاة (المحرر): لفها يمينا ١°" + +#: ../app/actions/context-actions.c:1077 +msgctxt "context-action" +msgid "Brush Angle (Editor): Rotate Left by 1°" +msgstr "زاوية الفرشاة (المحرر): لفها يسارا ١°" + +#: ../app/actions/context-actions.c:1081 +msgctxt "context-action" +msgid "Brush Angle (Editor): Rotate Right by 15°" +msgstr "زاوية الفرشاة (المحرر): لفها يمينا ١٥°" + +#: ../app/actions/context-actions.c:1085 +msgctxt "context-action" +msgid "Brush Angle (Editor): Rotate Left by 15°" +msgstr "زاوية الفرشاة (المحرر): لفها يسارا ١٥°" + +#: ../app/actions/context-commands.c:411 #, c-format msgid "Paint Mode: %s" -msgstr "نمط ال_تلوين: %s" +msgstr "نمط الرسم: %s" -#: ../app/actions/context-commands.c:557 +#: ../app/actions/context-commands.c:537 #, c-format msgid "Brush Shape: %s" -msgstr "شكل الفُرَشاة: %s" +msgstr "شكل الفرشاة: %s" -#: ../app/actions/context-commands.c:617 +#: ../app/actions/context-commands.c:597 #, c-format msgid "Brush Radius: %2.2f" msgstr "نصف قطر الفرشاة: %2.2f" -#: ../app/actions/context-commands.c:725 +#: ../app/actions/context-commands.c:705 #, c-format msgid "Brush Angle: %2.2f" msgstr "زاوية الفرشاة: %2.2f" @@ -1158,13 +2427,98 @@ msgctxt "cursor-info-action" msgid "Use the composite color of all visible layers" msgstr "استخدم اللون الممزوج لكل الطبقات المرئية" +#: ../app/actions/dashboard-actions.c:40 +msgctxt "dashboard-action" +msgid "Dashboard Menu" +msgstr "قائمة لوحة الأدوات" + +#: ../app/actions/dashboard-actions.c:44 +msgctxt "dashboard-action" +msgid "Update Interval" +msgstr "فترة التحديث" + +#: ../app/actions/dashboard-actions.c:46 +msgctxt "dashboard-action" +msgid "History Duration" +msgstr "مدة التأريخ" + +#: ../app/actions/dashboard-actions.c:49 +msgctxt "dashboard-action" +msgid "Reset" +msgstr "صفّر" + +#: ../app/actions/dashboard-actions.c:50 +msgctxt "dashboard-action" +msgid "Reset cumulative data" +msgstr "صفّر البيانات التراكمية" + +#: ../app/actions/dashboard-actions.c:58 +msgctxt "dashboard-action" +msgid "Low Swap Space Warning" +msgstr "تحذير انخفاض مساحة منطقة التبديل" + +#: ../app/actions/dashboard-actions.c:59 +msgctxt "dashboard-action" +msgid "Raise the dashboard when the swap size approaches its limit" +msgstr "ارفع لوحة الأدوات عندما تصبح منطقة التبديل شبه ممتلئة " + +#: ../app/actions/dashboard-actions.c:69 +msgctxt "dashboard-update-interval" +msgid "0.25 Seconds" +msgstr "٠٫٢٥ ثانية" + +#: ../app/actions/dashboard-actions.c:74 +msgctxt "dashboard-update-interval" +msgid "0.5 Seconds" +msgstr "٠٫٥ ثانية" + +#: ../app/actions/dashboard-actions.c:79 +msgctxt "dashboard-update-interval" +msgid "1 Second" +msgstr "ثانية واحدة" + +#: ../app/actions/dashboard-actions.c:84 +msgctxt "dashboard-update-interval" +msgid "2 Seconds" +msgstr "ثانيتين" + +#: ../app/actions/dashboard-actions.c:89 +msgctxt "dashboard-update-interval" +msgid "4 Seconds" +msgstr "٤ ثوان" + +#: ../app/actions/dashboard-actions.c:97 +msgctxt "dashboard-history-duration" +msgid "15 Seconds" +msgstr "١٥ ثانية" + +#: ../app/actions/dashboard-actions.c:102 +msgctxt "dashboard-history-duration" +msgid "30 Seconds" +msgstr "٣٠ ثانية" + +#: ../app/actions/dashboard-actions.c:107 +msgctxt "dashboard-history-duration" +msgid "60 Seconds" +msgstr "٦٠ ثانية" + +#: ../app/actions/dashboard-actions.c:112 +msgctxt "dashboard-history-duration" +msgid "120 Seconds" +msgstr "١٢٠ ثانية" + +#: ../app/actions/dashboard-actions.c:117 +msgctxt "dashboard-history-duration" +msgid "240 Seconds" +msgstr "٢٤٠ ثانية" + #: ../app/actions/data-commands.c:90 ../app/actions/documents-commands.c:383 #: ../app/actions/file-commands.c:205 ../app/dialogs/file-open-dialog.c:212 #: ../app/dialogs/file-open-dialog.c:253 #: ../app/dialogs/file-open-location-dialog.c:218 #: ../app/dialogs/file-open-location-dialog.c:228 -#: ../app/display/gimpdisplayshell-dnd.c:616 -#: ../app/widgets/gimplayertreeview.c:744 ../app/widgets/gimptoolbox.c:809 +#: ../app/display/gimpdisplayshell-dnd.c:614 +#: ../app/widgets/gimplayertreeview.c:765 ../app/widgets/gimptoolbox.c:805 #: ../app/widgets/gimptoolbox-dnd.c:170 #, c-format msgid "" @@ -1177,15 +2531,15 @@ msgstr "" "%s" #: ../app/actions/data-commands.c:114 ../app/actions/tool-options-commands.c:74 -#: ../app/core/gimpbrushgenerated-load.c:120 ../app/core/gimpimage.c:1998 -#: ../app/core/gimppalette.c:451 ../app/core/gimppalette-import.c:211 +#: ../app/core/gimpbrushgenerated-load.c:120 ../app/core/gimpimage.c:1964 +#: ../app/core/gimppalette.c:461 ../app/core/gimppalette-import.c:211 #: ../app/core/gimppalette-load.c:186 -#: ../app/dialogs/palette-import-dialog.c:783 ../app/widgets/gimpdnd-xds.c:89 +#: ../app/dialogs/palette-import-dialog.c:778 ../app/widgets/gimpdnd-xds.c:89 msgid "Untitled" msgstr "غير معنون" #: ../app/actions/data-commands.c:212 ../app/actions/documents-commands.c:189 -#: ../app/actions/file-commands.c:544 +#: ../app/actions/file-commands.c:519 #, c-format msgid "Can't show file in file manager: %s" msgstr "تعذّر عرض الملف في مدير الملفات: %s" @@ -1505,96 +2859,106 @@ msgctxt "dialogs-action" msgid "Open the error console" msgstr "افتح مِعراض الأخطاء" -#: ../app/actions/dialogs-actions.c:244 +#: ../app/actions/dialogs-actions.c:239 +msgctxt "dialogs-action" +msgid "_Dashboard" +msgstr "لوحة الأ_دوات" + +#: ../app/actions/dialogs-actions.c:240 +msgctxt "dialogs-action" +msgid "Open the dashboard" +msgstr "افتح لوحة الأدوات" + +#: ../app/actions/dialogs-actions.c:250 msgctxt "dialogs-action" msgid "_Preferences" msgstr "التف_ضيلات" -#: ../app/actions/dialogs-actions.c:245 +#: ../app/actions/dialogs-actions.c:251 msgctxt "dialogs-action" msgid "Open the preferences dialog" msgstr "افتح حوار التفضيلات" -#: ../app/actions/dialogs-actions.c:250 +#: ../app/actions/dialogs-actions.c:256 msgctxt "dialogs-action" msgid "_Input Devices" msgstr "أجهزة الإ_دخال" -#: ../app/actions/dialogs-actions.c:251 +#: ../app/actions/dialogs-actions.c:257 msgctxt "dialogs-action" msgid "Open the input devices editor" msgstr "افتح محرر أجهزة الإدخال" -#: ../app/actions/dialogs-actions.c:256 +#: ../app/actions/dialogs-actions.c:262 msgctxt "dialogs-action" msgid "_Keyboard Shortcuts" msgstr "ا_ختصارات لوحة المفاتيح" -#: ../app/actions/dialogs-actions.c:257 +#: ../app/actions/dialogs-actions.c:263 msgctxt "dialogs-action" msgid "Open the keyboard shortcuts editor" msgstr "افتح محرر اختصارات لوحة المفاتيح" -#: ../app/actions/dialogs-actions.c:262 +#: ../app/actions/dialogs-actions.c:268 msgctxt "dialogs-action" msgid "_Modules" msgstr "ال_وحدات" -#: ../app/actions/dialogs-actions.c:263 +#: ../app/actions/dialogs-actions.c:269 msgctxt "dialogs-action" msgid "Open the module manager dialog" msgstr "افتح حوار إدارة الوحدات" -#: ../app/actions/dialogs-actions.c:268 +#: ../app/actions/dialogs-actions.c:274 msgctxt "dialogs-action" msgid "_Tip of the Day" msgstr "_فائدة اليوم" -#: ../app/actions/dialogs-actions.c:269 +#: ../app/actions/dialogs-actions.c:275 msgctxt "dialogs-action" msgid "Show some helpful tips on using GIMP" msgstr "اعرض بعض التلميحات المفيدة حول استخدام جمب" -#: ../app/actions/dialogs-actions.c:275 ../app/actions/dialogs-actions.c:282 +#: ../app/actions/dialogs-actions.c:281 ../app/actions/dialogs-actions.c:288 msgctxt "dialogs-action" msgid "About GIMP" msgstr "عن جمب" -#: ../app/actions/dialogs-actions.c:277 +#: ../app/actions/dialogs-actions.c:283 msgctxt "dialogs-action" msgid "About" msgstr "عن" -#: ../app/actions/dialogs-actions.c:279 +#: ../app/actions/dialogs-actions.c:285 msgctxt "dialogs-action" msgid "_About" msgstr "_عن" -#: ../app/actions/dialogs-actions.c:287 +#: ../app/actions/dialogs-actions.c:293 msgctxt "dialogs-action" msgid "_Search and Run a Command" msgstr "اب_حث و نفّذ أمرًا" -#: ../app/actions/dialogs-actions.c:288 +#: ../app/actions/dialogs-actions.c:294 msgctxt "dialogs-action" msgid "Search commands by keyword, and run them" msgstr "ابحث عن الأوامر بالكلمات المفتاحية و نفّذهم" -#: ../app/actions/dialogs-actions.c:351 -#: ../app/dialogs/preferences-dialog.c:1758 -#: ../app/dialogs/preferences-dialog.c:1759 ../app/widgets/gimptoolbox.c:533 +#: ../app/actions/dialogs-actions.c:357 +#: ../app/dialogs/preferences-dialog.c:2018 +#: ../app/dialogs/preferences-dialog.c:2019 ../app/widgets/gimptoolbox.c:529 msgid "Toolbox" msgstr "صندوق الأدوات" -#: ../app/actions/dialogs-actions.c:352 +#: ../app/actions/dialogs-actions.c:358 msgid "Raise the toolbox" msgstr "ارفع صندوق الأدوات" -#: ../app/actions/dialogs-actions.c:356 +#: ../app/actions/dialogs-actions.c:362 msgid "New Toolbox" msgstr "صندوق أدوات جديد" -#: ../app/actions/dialogs-actions.c:357 +#: ../app/actions/dialogs-actions.c:363 msgid "Create a new toolbox" msgstr "أنشئ صندوق أدوات جديد" @@ -1728,7 +3092,7 @@ msgctxt "tab-style" msgid "St_atus & Text" msgstr "حا_لة ونص" -#: ../app/actions/dockable-actions.c:117 ../app/widgets/widgets-enums.c:255 +#: ../app/actions/dockable-actions.c:117 ../app/widgets/widgets-enums.c:261 msgctxt "tab-style" msgid "Automatic" msgstr "تلقائي" @@ -1867,6 +3231,67 @@ msgstr "احذف المدخلات التي تنتمي لملفات غير موج msgid "Clear Document History" msgstr "امسح تأريخ المستند" +#: ../app/actions/documents-commands.c:230 ../app/actions/edit-commands.c:160 +#: ../app/actions/error-console-commands.c:96 +#: ../app/actions/file-commands.c:416 +#: ../app/actions/gradient-editor-commands.c:478 +#: ../app/actions/gradient-editor-commands.c:580 +#: ../app/actions/gradients-commands.c:78 ../app/actions/plug-in-commands.c:180 +#: ../app/actions/templates-commands.c:244 +#: ../app/actions/text-editor-commands.c:64 +#: ../app/actions/text-tool-commands.c:118 +#: ../app/actions/tool-options-commands.c:195 +#: ../app/actions/window-commands.c:75 +#: ../app/dialogs/color-profile-dialog.c:136 +#: ../app/dialogs/color-profile-dialog.c:154 +#: ../app/dialogs/color-profile-dialog.c:172 +#: ../app/dialogs/color-profile-dialog.c:190 +#: ../app/dialogs/color-profile-dialog.c:208 +#: ../app/dialogs/convert-indexed-dialog.c:138 +#: ../app/dialogs/convert-precision-dialog.c:165 +#: ../app/dialogs/data-delete-dialog.c:86 ../app/dialogs/fade-dialog.c:120 +#: ../app/dialogs/file-open-location-dialog.c:80 +#: ../app/dialogs/file-save-dialog.c:714 ../app/dialogs/fill-dialog.c:115 +#: ../app/dialogs/grid-dialog.c:102 +#: ../app/dialogs/image-merge-layers-dialog.c:100 +#: ../app/dialogs/image-new-dialog.c:106 ../app/dialogs/image-new-dialog.c:325 +#: ../app/dialogs/image-scale-dialog.c:210 +#: ../app/dialogs/item-options-dialog.c:145 +#: ../app/dialogs/layer-add-mask-dialog.c:110 +#: ../app/dialogs/offset-dialog.c:136 +#: ../app/dialogs/palette-import-dialog.c:162 +#: ../app/dialogs/preferences-dialog.c:287 +#: ../app/dialogs/preferences-dialog.c:633 +#: ../app/dialogs/preferences-dialog.c:1096 +#: ../app/dialogs/print-size-dialog.c:124 ../app/dialogs/quit-dialog.c:171 +#: ../app/dialogs/resize-dialog.c:186 +#: ../app/dialogs/resolution-calibrate-dialog.c:76 +#: ../app/dialogs/scale-dialog.c:137 ../app/dialogs/stroke-dialog.c:128 +#: ../app/dialogs/template-options-dialog.c:118 +#: ../app/dialogs/vectors-export-dialog.c:83 +#: ../app/dialogs/vectors-import-dialog.c:88 +#: ../app/display/gimpdisplayshell-close.c:179 +#: ../app/display/gimpdisplayshell-filter-dialog.c:87 +#: ../app/display/gimpdisplayshell-rotate-dialog.c:122 +#: ../app/display/gimpdisplayshell-scale-dialog.c:122 +#: ../app/tools/gimpfiltertool.c:321 +#: ../app/tools/gimpforegroundselecttool.c:307 ../app/tools/gimptexttool.c:1591 +#: ../app/tools/gimptransformtool.c:1201 ../app/widgets/gimpactionview.c:669 +#: ../app/widgets/gimpcolordialog.c:110 +#: ../app/widgets/gimpcontrollereditor.c:660 +#: ../app/widgets/gimpcontrollerlist.c:564 +#: ../app/widgets/gimpdeviceeditor.c:508 ../app/widgets/gimpdnd-xds.c:228 +#: ../app/widgets/gimpfiledialog.c:324 ../app/widgets/gimphelp.c:447 +#: ../app/widgets/gimphelp.c:796 ../app/widgets/gimpiconpicker.c:488 +#: ../app/widgets/gimpprogressdialog.c:91 ../app/widgets/gimpsettingsbox.c:734 +msgid "_Cancel" +msgstr "أل_غ" + +#: ../app/actions/documents-commands.c:231 ../app/actions/edit-commands.c:161 +#: ../app/dialogs/preferences-dialog.c:634 +msgid "Cl_ear" +msgstr "ام_سح" + #: ../app/actions/documents-commands.c:246 msgid "Clear the Recent Documents list?" msgstr "أأمسح قائمة أحدث المستندات؟" @@ -1891,172 +3316,109 @@ msgstr "تحسين تلقائي للتباين" #: ../app/actions/drawable-actions.c:51 msgctxt "drawable-action" -msgid "In_vert" -msgstr "اعك_س" - -#: ../app/actions/drawable-actions.c:52 -msgctxt "drawable-action" -msgid "Invert the colors" -msgstr "اعكس الألوان" - -#: ../app/actions/drawable-actions.c:57 -msgctxt "drawable-action" -msgid "_Value Invert" -msgstr "ا_عكس القيمة" - -#: ../app/actions/drawable-actions.c:58 -msgctxt "drawable-action" -msgid "Invert the brightness of each pixel" -msgstr "اعكس سطوع كل بكسل" - -#: ../app/actions/drawable-actions.c:63 -msgctxt "drawable-action" msgid "_White Balance" msgstr "توازن أ_بيض" -#: ../app/actions/drawable-actions.c:64 +#: ../app/actions/drawable-actions.c:52 msgctxt "drawable-action" msgid "Automatic white balance correction" msgstr "تصحيح تلقائي للتوازن الأبيض" -#: ../app/actions/drawable-actions.c:69 -msgctxt "drawable-action" -msgid "_Dilate" -msgstr "_خفِّف" - -#: ../app/actions/drawable-actions.c:70 -msgctxt "drawable-action" -msgid "Grow lighter areas of the image" -msgstr "زوّد المناطق الفاتحة في الصورة" - -#: ../app/actions/drawable-actions.c:75 -msgctxt "drawable-action" -msgid "E_rode" -msgstr "_تآكل" - -#: ../app/actions/drawable-actions.c:76 -msgctxt "drawable-action" -msgid "Grow darker areas of the image" -msgstr "زوّد المناطق الغامقة في الصورة" - -#: ../app/actions/drawable-actions.c:81 +#: ../app/actions/drawable-actions.c:57 msgctxt "drawable-action" msgid "_Offset..." msgstr "الإ_زاحة..." -#: ../app/actions/drawable-actions.c:83 +#: ../app/actions/drawable-actions.c:59 msgctxt "drawable-action" msgid "Shift the pixels, optionally wrapping them at the borders" msgstr "حرك البكسلات، كاسرا إياهم اختياريا عند الحواف" -#: ../app/actions/drawable-actions.c:91 +#: ../app/actions/drawable-actions.c:67 msgctxt "drawable-action" -msgid "_Visible" -msgstr "مر_ئي" +msgid "Toggle Drawable _Visibility" +msgstr "بدّل حالة ظهور عن_صر الرسم" -#: ../app/actions/drawable-actions.c:92 +#: ../app/actions/drawable-actions.c:73 msgctxt "drawable-action" -msgid "Toggle visibility" -msgstr "بدّل حالة الظهور" +msgid "Toggle Drawable _Linked State" +msgstr "بدّل حالة رب_ط عنصر الرسم" -#: ../app/actions/drawable-actions.c:98 +#. GIMP_ICON_LOCK +#: ../app/actions/drawable-actions.c:79 msgctxt "drawable-action" -msgid "_Linked" -msgstr "_مربوط" +msgid "L_ock Pixels of Drawable" +msgstr "أو_صِد بكسلات عنصر الرسم" -#: ../app/actions/drawable-actions.c:99 -msgctxt "drawable-action" -msgid "Toggle the linked state" -msgstr "بدّل حالة الربط" - -#. GIMP_STOCK_LOCK -#: ../app/actions/drawable-actions.c:105 -msgctxt "drawable-action" -msgid "L_ock pixels" -msgstr "أوصِد الب_كسلات" - -#: ../app/actions/drawable-actions.c:107 +#: ../app/actions/drawable-actions.c:81 msgctxt "drawable-action" msgid "Keep the pixels on this drawable from being modified" -msgstr "احفظ البكسلات في هذه القابل للرسم من أن تُعدّل" +msgstr "احفظ البكسلات في عنصر الرسم هذا من أن تُعدّل" -#: ../app/actions/drawable-actions.c:113 +#: ../app/actions/drawable-actions.c:87 msgctxt "drawable-action" -msgid "L_ock position of channel" -msgstr "أو_صِد موضع القناة" +msgid "L_ock Position of Drawable" +msgstr "أو_صِد موضع عنصر الرسم" -#: ../app/actions/drawable-actions.c:115 +#: ../app/actions/drawable-actions.c:89 msgctxt "drawable-action" msgid "Keep the position on this drawable from being modified" -msgstr "احفظ الموضع في هذه القابل للرسم من أن يُعدّل" +msgstr "احفظ موضع عنصر الرسم هذا من أن يُعدّل" -#: ../app/actions/drawable-actions.c:124 +#: ../app/actions/drawable-actions.c:98 msgctxt "drawable-action" msgid "Flip _Horizontally" msgstr "اقلب أ_فقيا" -#: ../app/actions/drawable-actions.c:125 +#: ../app/actions/drawable-actions.c:99 msgctxt "drawable-action" -msgid "Flip horizontally" -msgstr "اقلب أفقيا" +msgid "Flip drawable horizontally" +msgstr "اقلب عنصر الرسم أفقيا" -#: ../app/actions/drawable-actions.c:130 +#: ../app/actions/drawable-actions.c:104 msgctxt "drawable-action" msgid "Flip _Vertically" msgstr "اقلب _رأسيا" -#: ../app/actions/drawable-actions.c:131 +#: ../app/actions/drawable-actions.c:105 msgctxt "drawable-action" -msgid "Flip vertically" -msgstr "اقلب رأسيا" +msgid "Flip drawable vertically" +msgstr "اقلب عنصر الرسم رأسيا" -#: ../app/actions/drawable-actions.c:139 +#: ../app/actions/drawable-actions.c:113 msgctxt "drawable-action" msgid "Rotate 90° _clockwise" msgstr "لف 90° باتجاه _عقارب الساعة" -#: ../app/actions/drawable-actions.c:140 +#: ../app/actions/drawable-actions.c:114 msgctxt "drawable-action" -msgid "Rotate 90 degrees to the right" -msgstr "لف 90 درجة إلى اليمين" +msgid "Rotate drawable 90 degrees to the right" +msgstr "دوّر عنصر الرسم ٩٠ درجة يمينا" -#: ../app/actions/drawable-actions.c:145 +#: ../app/actions/drawable-actions.c:119 msgctxt "drawable-action" msgid "Rotate _180°" msgstr "لف _180°" -#: ../app/actions/drawable-actions.c:146 +#: ../app/actions/drawable-actions.c:120 msgctxt "drawable-action" -msgid "Turn upside-down" -msgstr "اقلب رأسا غلى عقب" +msgid "Turn drawable upside-down" +msgstr "أقلب عنصر الرسم رأساً على عقب" -#: ../app/actions/drawable-actions.c:151 +#: ../app/actions/drawable-actions.c:125 msgctxt "drawable-action" msgid "Rotate 90° counter-clock_wise" msgstr "لف 90° ع_كس اتجاه عقارب الساعة" -#: ../app/actions/drawable-actions.c:152 +#: ../app/actions/drawable-actions.c:126 msgctxt "drawable-action" -msgid "Rotate 90 degrees to the left" -msgstr "لف 90 درجة إلى اليسار" +msgid "Rotate drawable 90 degrees to the left" +msgstr "دوّر عنصر الرسم ٩٠ درجة يسارا" -#: ../app/actions/drawable-commands.c:85 ../app/actions/drawable-commands.c:101 -#: ../app/pdb/color-cmds.c:388 -msgid "Invert" -msgstr "اعكس" - -#: ../app/actions/drawable-commands.c:122 +#: ../app/actions/drawable-commands.c:89 msgid "White Balance operates only on RGB color layers." msgstr "توازن الأبيض يعمل فقط على طبقات ألوان ح‌خ‌ز." -#: ../app/actions/drawable-commands.c:157 -msgid "Dilate" -msgstr "خفِّف" - -#: ../app/actions/drawable-commands.c:189 -msgid "Erode" -msgstr "تآكل" - #: ../app/actions/dynamics-actions.c:43 msgctxt "dynamics-action" msgid "Paint Dynamics Menu" @@ -2220,7 +3582,7 @@ msgstr "أ_بهِت..." #: ../app/actions/edit-actions.c:107 msgctxt "edit-action" msgid "Modify paint mode and opacity of the last pixel manipulation" -msgstr "عدّل نمط رسم وعتامة التعامل مع آخر بكسل" +msgstr "عدّل نمط رسم و عتامة التعامل مع آخر بكسل" #: ../app/actions/edit-actions.c:112 msgctxt "edit-action" @@ -2242,7 +3604,7 @@ msgctxt "edit-action" msgid "Copy the selected pixels to the clipboard" msgstr "انسخ البكسلات المحددة إلى الحافظة" -#. GIMP_STOCK_COPY_VISIBLE, +#. GIMP_ICON_COPY_VISIBLE, #: ../app/actions/edit-actions.c:124 msgctxt "edit-action" msgid "Copy _Visible" @@ -2255,226 +3617,260 @@ msgstr "انسخ ما هو مرئي في المنطقة المحددة" #: ../app/actions/edit-actions.c:130 msgctxt "edit-action" -msgid "_Paste" -msgstr "أل_صق" - -#: ../app/actions/edit-actions.c:131 -msgctxt "edit-action" -msgid "Paste the content of the clipboard" -msgstr "ألصق محتويات الحافظة" - -#: ../app/actions/edit-actions.c:136 -msgctxt "edit-action" -msgid "Paste _Into" -msgstr "ألصق إل_ى" - -#: ../app/actions/edit-actions.c:138 -msgctxt "edit-action" -msgid "Paste the content of the clipboard into the current selection" -msgstr "القص محتويات الحافظة إلى التحديد الحالي" - -#: ../app/actions/edit-actions.c:143 -msgctxt "edit-action" -msgid "New _Layer" -msgstr "_طبقة جديدة" - -#: ../app/actions/edit-actions.c:144 -msgctxt "edit-action" -msgid "Create a new layer from the content of the clipboard" -msgstr "أنشئ طبقة جديدة من محتويات الحافظة" - -#: ../app/actions/edit-actions.c:149 -msgctxt "edit-action" msgid "From _Clipboard" msgstr "من ال_حافظة" -#: ../app/actions/edit-actions.c:150 ../app/actions/edit-actions.c:156 +#: ../app/actions/edit-actions.c:131 ../app/actions/edit-actions.c:137 msgctxt "edit-action" msgid "Create a new image from the content of the clipboard" msgstr "أنشئ صورة جديدة من محتويات الحافظة" -#: ../app/actions/edit-actions.c:155 +#: ../app/actions/edit-actions.c:136 msgctxt "edit-action" msgid "_New Image" msgstr "صورة _جديدة" -#: ../app/actions/edit-actions.c:161 +#: ../app/actions/edit-actions.c:142 msgctxt "edit-action" msgid "Cu_t Named..." msgstr "قص مُ_سمى..." -#: ../app/actions/edit-actions.c:162 +#: ../app/actions/edit-actions.c:143 msgctxt "edit-action" msgid "Move the selected pixels to a named buffer" msgstr "انقل البكسلات المحددة إلى براح مُسمّى" -#: ../app/actions/edit-actions.c:167 +#: ../app/actions/edit-actions.c:148 msgctxt "edit-action" msgid "_Copy Named..." msgstr "ا_نسخ مسمى..." -#: ../app/actions/edit-actions.c:168 +#: ../app/actions/edit-actions.c:149 msgctxt "edit-action" msgid "Copy the selected pixels to a named buffer" msgstr "انسخ البكسلات المحددة إلى براح مُسمّى" -#. GIMP_STOCK_COPY_VISIBLE, -#: ../app/actions/edit-actions.c:173 +#. GIMP_ICON_COPY_VISIBLE, +#: ../app/actions/edit-actions.c:154 msgctxt "edit-action" msgid "Copy _Visible Named..." msgstr "انسخ _مرئي مُسمى..." -#: ../app/actions/edit-actions.c:175 +#: ../app/actions/edit-actions.c:156 msgctxt "edit-action" msgid "Copy what is visible in the selected region to a named buffer" msgstr "انسخ المرئي في المنطقة المحددة إلى براح مُسمّى" -#: ../app/actions/edit-actions.c:180 +#: ../app/actions/edit-actions.c:161 msgctxt "edit-action" msgid "_Paste Named..." msgstr "أل_صق مسمى..." -#: ../app/actions/edit-actions.c:181 +#: ../app/actions/edit-actions.c:162 msgctxt "edit-action" msgid "Paste the content of a named buffer" msgstr "ألصق محتوى براح مسمى" -#: ../app/actions/edit-actions.c:186 +#: ../app/actions/edit-actions.c:167 msgctxt "edit-action" msgid "Cl_ear" msgstr "ام_سح" -#: ../app/actions/edit-actions.c:187 +#: ../app/actions/edit-actions.c:168 msgctxt "edit-action" msgid "Clear the selected pixels" msgstr "امسح البكسلات المحددة" -#: ../app/actions/edit-actions.c:195 +#: ../app/actions/edit-actions.c:176 +msgctxt "edit-action" +msgid "_Paste" +msgstr "أل_صق" + +#: ../app/actions/edit-actions.c:177 +msgctxt "edit-action" +msgid "Paste the content of the clipboard" +msgstr "ألصق محتويات الحافظة" + +#: ../app/actions/edit-actions.c:182 +msgctxt "edit-action" +msgid "Paste In Place" +msgstr "ألصق في مكانه" + +#: ../app/actions/edit-actions.c:184 +msgctxt "edit-action" +msgid "Paste the content of the clipboard at its original position" +msgstr "ألصق محتويات الحافظة في موضعها الأصلي" + +#: ../app/actions/edit-actions.c:189 +msgctxt "edit-action" +msgid "Paste _Into Selection" +msgstr "ألصق في الت_حديد" + +#: ../app/actions/edit-actions.c:191 +msgctxt "edit-action" +msgid "Paste the content of the clipboard into the current selection" +msgstr "القص محتويات الحافظة إلى التحديد الحالي" + +#: ../app/actions/edit-actions.c:196 +msgctxt "edit-action" +msgid "Paste Into Selection In Place" +msgstr "ألصق في التحديد في مكانه" + +#: ../app/actions/edit-actions.c:198 +msgctxt "edit-action" +msgid "" +"Paste the content of the clipboard into the current selection at its " +"original position" +msgstr "القص محتويات الحافظة إلى التحديد الحالي في موضعها الأصلي" + +#: ../app/actions/edit-actions.c:204 +msgctxt "edit-action" +msgid "New _Layer" +msgstr "_طبقة جديدة" + +#: ../app/actions/edit-actions.c:205 +msgctxt "edit-action" +msgid "Create a new layer from the content of the clipboard" +msgstr "أنشئ طبقة جديدة من محتويات الحافظة" + +#: ../app/actions/edit-actions.c:210 +msgctxt "edit-action" +msgid "New Layer In _Place" +msgstr "طبقة جديدة في م_كانها" + +#: ../app/actions/edit-actions.c:212 +msgctxt "edit-action" +msgid "" +"Create a new layer from the content of the clipboard and place it at its " +"original position" +msgstr "أنشئ طبقة جديدة من محتويات الحافظة و ضعها في موضعها الأصلي" + +#: ../app/actions/edit-actions.c:221 msgctxt "edit-action" msgid "Fill with _FG Color" msgstr "املأ بلون ال_مقدمة" -#: ../app/actions/edit-actions.c:196 +#: ../app/actions/edit-actions.c:222 msgctxt "edit-action" msgid "Fill the selection using the foreground color" msgstr "املأ التحديد باستخدام لون المقدمة" -#: ../app/actions/edit-actions.c:201 +#: ../app/actions/edit-actions.c:227 msgctxt "edit-action" msgid "Fill with B_G Color" msgstr "املأ بلون ال_خلفية" -#: ../app/actions/edit-actions.c:202 +#: ../app/actions/edit-actions.c:228 msgctxt "edit-action" msgid "Fill the selection using the background color" msgstr "املأ التحديد بلون الخلفية" -#: ../app/actions/edit-actions.c:207 +#: ../app/actions/edit-actions.c:233 msgctxt "edit-action" msgid "Fill _with Pattern" msgstr "املأ بنمط" -#: ../app/actions/edit-actions.c:208 +#: ../app/actions/edit-actions.c:234 msgctxt "edit-action" msgid "Fill the selection using the active pattern" msgstr "املأ التحديد باستخدام النمط النشط" -#: ../app/actions/edit-actions.c:315 ../app/actions/edit-actions.c:317 +#: ../app/actions/edit-actions.c:344 ../app/actions/edit-actions.c:346 #, c-format msgid "_Undo %s" msgstr "_تراجع عن %s" -#: ../app/actions/edit-actions.c:321 ../app/actions/edit-actions.c:323 +#: ../app/actions/edit-actions.c:350 ../app/actions/edit-actions.c:352 #, c-format msgid "_Redo %s" msgstr "أ_عد %s" -#: ../app/actions/edit-actions.c:337 +#: ../app/actions/edit-actions.c:366 #, c-format msgid "_Fade %s..." msgstr "أ_بهِت %s..." -#: ../app/actions/edit-actions.c:349 +#: ../app/actions/edit-actions.c:378 msgid "_Undo" msgstr "_تراجع" -#: ../app/actions/edit-actions.c:350 +#: ../app/actions/edit-actions.c:379 msgid "_Redo" msgstr "أ_عد" -#: ../app/actions/edit-actions.c:351 +#: ../app/actions/edit-actions.c:380 msgid "_Fade..." msgstr "أ_بهِت..." -#: ../app/actions/edit-commands.c:154 +#: ../app/actions/edit-commands.c:152 msgid "Clear Undo History" msgstr "امسح تأريخ التراجع" -#: ../app/actions/edit-commands.c:180 +#: ../app/actions/edit-commands.c:179 msgid "Really clear image's undo history?" msgstr "هل حقا تريد مسح تأريخ التراجع في الصورة؟" -#: ../app/actions/edit-commands.c:193 +#: ../app/actions/edit-commands.c:192 #, c-format msgid "Clearing the undo history of this image will gain %s of memory." msgstr "مسح تأريخ التراجع في هذه الصورة سيُخلي %s من الذاكرة." -#: ../app/actions/edit-commands.c:249 +#: ../app/actions/edit-commands.c:248 msgid "Cut layer to the clipboard." msgstr "قص الطبقة إلى الحافظة." -#: ../app/actions/edit-commands.c:250 +#: ../app/actions/edit-commands.c:249 msgid "Cut pixels to the clipboard." msgstr "قص البكسلات إلى الحافظة." -#: ../app/actions/edit-commands.c:285 +#: ../app/actions/edit-commands.c:284 msgid "Copied layer to the clipboard." msgstr "انسخ الطبقة إلى الحافظة." -#: ../app/actions/edit-commands.c:286 ../app/actions/edit-commands.c:315 +#: ../app/actions/edit-commands.c:285 ../app/actions/edit-commands.c:314 msgid "Copied pixels to the clipboard." msgstr "انسخ البكسلات إلى الحافظة." -#: ../app/actions/edit-commands.c:404 ../app/actions/edit-commands.c:610 +#: ../app/actions/edit-commands.c:393 ../app/actions/edit-commands.c:599 #: ../app/tools/gimpseamlessclonetool.c:295 msgid "There is no image data in the clipboard to paste." msgstr "لا يوجد بيانات صور في الحافظة للصق" -#: ../app/actions/edit-commands.c:419 +#: ../app/actions/edit-commands.c:408 msgid "Cut Named" msgstr "قص مُسمى" -#: ../app/actions/edit-commands.c:422 ../app/actions/edit-commands.c:442 -#: ../app/actions/edit-commands.c:462 +#: ../app/actions/edit-commands.c:411 ../app/actions/edit-commands.c:431 +#: ../app/actions/edit-commands.c:451 msgid "Enter a name for this buffer" msgstr "أدخل اسما لهذا البراح" -#: ../app/actions/edit-commands.c:439 +#: ../app/actions/edit-commands.c:428 msgid "Copy Named" msgstr "انسخ مُسمى" -#: ../app/actions/edit-commands.c:459 +#: ../app/actions/edit-commands.c:448 msgid "Copy Visible Named " msgstr "انسخ المسمى الظاهر" -#: ../app/actions/edit-commands.c:580 ../app/display/gimpdisplayshell-dnd.c:481 +#: ../app/actions/edit-commands.c:571 ../app/display/gimpdisplayshell-dnd.c:479 msgid "Pasted as new layer because the target is a layer group." msgstr "ألصقت كطبقة جديدة لأن الوجهة مجموعة طبقات." -#: ../app/actions/edit-commands.c:589 ../app/display/gimpdisplayshell-dnd.c:490 +#: ../app/actions/edit-commands.c:578 ../app/display/gimpdisplayshell-dnd.c:488 msgid "Pasted as new layer because the target's pixels are locked." msgstr "ألصقت كطبقة جديدة لأن بكسلات الوجهة موصدة." -#: ../app/actions/edit-commands.c:627 +#: ../app/actions/edit-commands.c:616 msgid "There is no active layer or channel to cut from." msgstr "لا يوجد طبقة أو قناة نشطة للقص منها." -#: ../app/actions/edit-commands.c:632 ../app/actions/edit-commands.c:664 -#: ../app/actions/edit-commands.c:688 +#: ../app/actions/edit-commands.c:621 ../app/actions/edit-commands.c:653 +#: ../app/actions/edit-commands.c:677 msgid "(Unnamed Buffer)" msgstr "(براح غير مسمى)" -#: ../app/actions/edit-commands.c:659 +#: ../app/actions/edit-commands.c:648 msgid "There is no active layer or channel to copy from." msgstr "لا يوجد طبقة نشطة أو قناة للنسخ منها." @@ -2503,26 +3899,61 @@ msgctxt "error-console-action" msgid "Select all error messages" msgstr "حدّد كل رسائل الأخطاء" -#: ../app/actions/error-console-actions.c:59 +#: ../app/actions/error-console-actions.c:56 +msgctxt "error-console-action" +msgid "_Highlight" +msgstr "أ_برِز" + +#: ../app/actions/error-console-actions.c:63 msgctxt "error-console-action" msgid "_Save Error Log to File..." msgstr "ا_حفظ سجل الأخطاء في ملف..." -#: ../app/actions/error-console-actions.c:60 +#: ../app/actions/error-console-actions.c:64 msgctxt "error-console-action" msgid "Write all error messages to a file" msgstr "اكتب كل رسائل الخطأ إلى ملف" -#: ../app/actions/error-console-actions.c:65 +#: ../app/actions/error-console-actions.c:69 msgctxt "error-console-action" msgid "Save S_election to File..." msgstr "احفظ ال_محدد في ملف..." -#: ../app/actions/error-console-actions.c:66 +#: ../app/actions/error-console-actions.c:70 msgctxt "error-console-action" msgid "Write the selected error messages to a file" msgstr "اكتب رسائل الخطأ المحددة في ملف" +#: ../app/actions/error-console-actions.c:78 +msgctxt "error-console-action" +msgid "_Errors" +msgstr "الأ_عطال" + +#: ../app/actions/error-console-actions.c:79 +msgctxt "error-console-action" +msgid "Highlight error console on errors" +msgstr "أبرز معراض الأعطال في حالة حدوث أعطال" + +#: ../app/actions/error-console-actions.c:85 +msgctxt "error-console-action" +msgid "_Warnings" +msgstr "التح_ذيرات" + +#: ../app/actions/error-console-actions.c:86 +msgctxt "error-console-action" +msgid "Highlight error console on warnings" +msgstr "أبرز معراض الأعطال في حالة صدور تحذيرات" + +#: ../app/actions/error-console-actions.c:92 +msgctxt "error-console-action" +msgid "_Messages" +msgstr "الر_سائل" + +#: ../app/actions/error-console-actions.c:93 +msgctxt "error-console-action" +msgid "Highlight error console on messages" +msgstr "أبرز معراض الأعطال في حالة صدور رسائل" + #: ../app/actions/error-console-commands.c:84 msgid "Cannot save. Nothing is selected." msgstr "لا يمكن الحفظ. لا شيء محدد." @@ -2531,7 +3962,16 @@ msgstr "لا يمكن الحفظ. لا شيء محدد." msgid "Save Error Log to File" msgstr "احفظ سجل الأخطاء في ملف" -#: ../app/actions/error-console-commands.c:152 +#: ../app/actions/error-console-commands.c:97 +#: ../app/actions/gradients-commands.c:79 ../app/dialogs/file-save-dialog.c:715 +#: ../app/dialogs/input-devices-dialog.c:63 +#: ../app/dialogs/vectors-export-dialog.c:84 +#: ../app/display/gimpdisplayshell-close.c:177 +#: ../app/widgets/gimpsavedialog.c:143 ../app/widgets/gimpsettingsbox.c:736 +msgid "_Save" +msgstr "ا_حفظ" + +#: ../app/actions/error-console-commands.c:188 #, c-format msgid "" "Error writing file '%s':\n" @@ -2734,7 +4174,7 @@ msgstr "صدّر إلى %s" msgid "Over_write %s" msgstr "ا_طمس %s" -#: ../app/actions/file-commands.c:118 ../app/actions/file-commands.c:567 +#: ../app/actions/file-commands.c:118 ../app/actions/file-commands.c:542 #: ../app/widgets/gimpopendialog.c:66 msgid "Open Image" msgstr "افتح صورة" @@ -2743,47 +4183,45 @@ msgstr "افتح صورة" msgid "Open Image as Layers" msgstr "افتح صورة كطبقات" -#: ../app/actions/file-commands.c:279 ../app/widgets/gimpsavedialog.c:260 -#, c-format -msgid "" -"The image uses features from %s and cannot be saved for older GIMP versions." -msgstr "تستخدم الصورة مميزات من %s و لا يمكن حفظها لإصدارات جمب الأقدم." - -#: ../app/actions/file-commands.c:302 +#: ../app/actions/file-commands.c:277 msgid "No changes need to be saved" msgstr "لا توجد تغييرات لتُحفظ" -#: ../app/actions/file-commands.c:309 ../app/actions/file-commands.c:777 -#: ../app/widgets/gimpsavedialog.c:138 +#: ../app/actions/file-commands.c:284 ../app/actions/file-commands.c:751 +#: ../app/widgets/gimpsavedialog.c:140 msgid "Save Image" msgstr "احفظ الصورة" -#: ../app/actions/file-commands.c:315 +#: ../app/actions/file-commands.c:290 msgid "Save a Copy of the Image" msgstr "احفظ نسخة من الصورة" -#: ../app/actions/file-commands.c:392 +#: ../app/actions/file-commands.c:367 msgid "Create New Template" msgstr "أنشئ قالب جديد" -#: ../app/actions/file-commands.c:396 +#: ../app/actions/file-commands.c:371 msgid "Enter a name for this template" msgstr "أدخل اسما لهذا القالب" -#: ../app/actions/file-commands.c:424 +#: ../app/actions/file-commands.c:399 msgid "Revert failed. No file name associated with this image." msgstr "فشل الاسترجاع. لا يوجد اسم ملف مقترن بهذه الصورة." -#: ../app/actions/file-commands.c:436 +#: ../app/actions/file-commands.c:411 msgid "Revert Image" msgstr "استرجع الصورة" -#: ../app/actions/file-commands.c:460 +#: ../app/actions/file-commands.c:417 +msgid "_Revert" +msgstr "ا_عكس" + +#: ../app/actions/file-commands.c:435 #, c-format msgid "Revert '%s' to '%s'?" msgstr "أأسترجع '%s' إلى '%s'؟" -#: ../app/actions/file-commands.c:465 +#: ../app/actions/file-commands.c:440 msgid "" "By reverting the image to the state saved on disk, you will lose all " "changes, including all undo information." @@ -2791,11 +4229,11 @@ msgstr "" "باسترجاع الصورة إلى آخر حالة محفوظة على القرص، سوف تخسر كل التغييرات بما في " "ذلك معلومات التراجع." -#: ../app/actions/file-commands.c:800 +#: ../app/actions/file-commands.c:773 msgid "(Unnamed Template)" msgstr "(قالب غير مسمى)" -#: ../app/actions/file-commands.c:847 +#: ../app/actions/file-commands.c:820 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -2806,582 +4244,728 @@ msgstr "" "\n" "%s" -#: ../app/actions/filters-actions.c:55 +#: ../app/actions/filters-actions.c:58 msgctxt "filters-action" msgid "Filte_rs" msgstr "مر_شّحات" -#: ../app/actions/filters-actions.c:57 +#: ../app/actions/filters-actions.c:60 msgctxt "filters-action" msgid "Recently Used" msgstr "المستخدمة مؤخرا" -#: ../app/actions/filters-actions.c:59 +#: ../app/actions/filters-actions.c:62 msgctxt "filters-action" msgid "_Blur" msgstr "_تمويه" -#: ../app/actions/filters-actions.c:61 +#: ../app/actions/filters-actions.c:64 msgctxt "filters-action" msgid "_Noise" msgstr "_ضجيج" -#: ../app/actions/filters-actions.c:63 +#: ../app/actions/filters-actions.c:66 msgctxt "filters-action" msgid "Edge-De_tect" msgstr "اكتشاف الحا_فة" -#: ../app/actions/filters-actions.c:65 +#: ../app/actions/filters-actions.c:68 msgctxt "filters-action" msgid "En_hance" msgstr "ت_حسين" -#: ../app/actions/filters-actions.c:67 +#: ../app/actions/filters-actions.c:70 msgctxt "filters-action" msgid "C_ombine" msgstr "_ضم" -#: ../app/actions/filters-actions.c:69 +#: ../app/actions/filters-actions.c:72 msgctxt "filters-action" msgid "_Generic" msgstr "_عام" -#: ../app/actions/filters-actions.c:71 +#: ../app/actions/filters-actions.c:74 msgctxt "filters-action" msgid "_Light and Shadow" msgstr "_ضوء وظل" -#: ../app/actions/filters-actions.c:73 +#: ../app/actions/filters-actions.c:76 msgctxt "filters-action" msgid "_Distorts" msgstr "تحري_ف" -#: ../app/actions/filters-actions.c:75 +#: ../app/actions/filters-actions.c:78 msgctxt "filters-action" msgid "_Artistic" msgstr "ف_ني" -#: ../app/actions/filters-actions.c:77 +#: ../app/actions/filters-actions.c:80 msgctxt "filters-action" msgid "_Decor" msgstr "_زخرفة" -#: ../app/actions/filters-actions.c:79 +#: ../app/actions/filters-actions.c:82 msgctxt "filters-action" msgid "_Map" msgstr "_خريطة" -#: ../app/actions/filters-actions.c:81 +#: ../app/actions/filters-actions.c:84 msgctxt "filters-action" msgid "_Render" msgstr "ت_صيير" -#: ../app/actions/filters-actions.c:83 +#: ../app/actions/filters-actions.c:86 msgctxt "filters-action" msgid "_Clouds" msgstr "سُ_حُب" -#: ../app/actions/filters-actions.c:85 +#: ../app/actions/filters-actions.c:88 msgctxt "filters-action" msgid "_Fractals" msgstr "_كسيريات" -#: ../app/actions/filters-actions.c:87 +#: ../app/actions/filters-actions.c:90 msgctxt "filters-action" msgid "_Nature" msgstr "طبي_عة" -#: ../app/actions/filters-actions.c:89 +#: ../app/actions/filters-actions.c:92 msgctxt "filters-action" msgid "N_oise" msgstr "_ضجيج" -#: ../app/actions/filters-actions.c:91 +#: ../app/actions/filters-actions.c:94 msgctxt "filters-action" msgid "_Pattern" msgstr "ال_نمط" -#: ../app/actions/filters-actions.c:93 +#: ../app/actions/filters-actions.c:96 msgctxt "filters-action" msgid "_Web" msgstr "_وب" -#: ../app/actions/filters-actions.c:95 +#: ../app/actions/filters-actions.c:98 msgctxt "filters-action" msgid "An_imation" msgstr "حرك_ة" -#: ../app/actions/filters-actions.c:101 +#: ../app/actions/filters-actions.c:104 +msgctxt "filters-action" +msgid "_Antialias" +msgstr "ن_عّم" + +#: ../app/actions/filters-actions.c:109 +msgctxt "filters-action" +msgid "_Color Enhance" +msgstr "حسّن الأ_لوان" + +#: ../app/actions/filters-actions.c:114 +msgctxt "filters-action" +msgid "_Linear Invert" +msgstr "اعكس _خطّيا" + +#: ../app/actions/filters-actions.c:119 +msgctxt "filters-action" +msgid "In_vert" +msgstr "اعك_س" + +#: ../app/actions/filters-actions.c:124 +msgctxt "filters-action" +msgid "_Value Invert" +msgstr "ا_عكس القيمة" + +#: ../app/actions/filters-actions.c:129 +msgctxt "filters-action" +msgid "_Stretch Contrast HSV" +msgstr "_مط تباين HSV" + +#: ../app/actions/filters-actions.c:137 +msgctxt "filters-action" +msgid "_Dilate" +msgstr "_خفِّف" + +#: ../app/actions/filters-actions.c:138 +msgctxt "drawable-action" +msgid "Grow lighter areas of the image" +msgstr "زوّد المناطق الفاتحة في الصورة" + +#: ../app/actions/filters-actions.c:153 +msgctxt "filters-action" +msgid "_Erode" +msgstr "_تآكل" + +#: ../app/actions/filters-actions.c:154 +msgctxt "drawable-action" +msgid "Grow darker areas of the image" +msgstr "زوّد المناطق الغامقة في الصورة" + +#: ../app/actions/filters-actions.c:172 msgctxt "filters-action" msgid "_Alien Map..." msgstr "خريطة _غريبة..." -#: ../app/actions/filters-actions.c:106 -msgctxt "filters-action" -msgid "_Antialias..." -msgstr "_نعّم..." - -#: ../app/actions/filters-actions.c:111 +#: ../app/actions/filters-actions.c:177 msgctxt "filters-action" msgid "_Apply Canvas..." msgstr "_طبّق رقعة الرسم..." -#: ../app/actions/filters-actions.c:116 +#: ../app/actions/filters-actions.c:182 msgctxt "filters-action" msgid "Apply _Lens..." msgstr "طبّق ال_عدسة..." -#: ../app/actions/filters-actions.c:121 +#: ../app/actions/filters-actions.c:187 +msgctxt "filters-action" +msgid "B_rightness-Contrast..." +msgstr "ال_سطوع و التباين..." + +#: ../app/actions/filters-actions.c:192 msgctxt "filters-action" msgid "_Bump Map..." msgstr "خريطة بارز_ة..." -#: ../app/actions/filters-actions.c:126 +#: ../app/actions/filters-actions.c:197 msgctxt "filters-action" msgid "_Color to Gray..." msgstr "لون إلى ر_مادي..." -#: ../app/actions/filters-actions.c:131 +#: ../app/actions/filters-actions.c:202 msgctxt "filters-action" msgid "Ca_rtoon..." msgstr "رسوم متحرك_ة..." -#: ../app/actions/filters-actions.c:136 +#: ../app/actions/filters-actions.c:207 msgctxt "filters-action" msgid "_Channel Mixer..." msgstr "مازج القنوا_ت..." -#: ../app/actions/filters-actions.c:141 +#: ../app/actions/filters-actions.c:212 msgctxt "filters-action" msgid "_Checkerboard..." msgstr "لوحة _شطرنج..." -#: ../app/actions/filters-actions.c:146 +#: ../app/actions/filters-actions.c:217 msgctxt "filters-action" -msgid "_Color Enhance..." -msgstr "تحسين الأ_لوان..." +msgid "Color _Balance..." +msgstr "توازن الأ_لوان..." -#: ../app/actions/filters-actions.c:151 +#: ../app/actions/filters-actions.c:222 msgctxt "filters-action" msgid "_Color Exchange..." msgstr "تبادل الألوا_ن..." -#: ../app/actions/filters-actions.c:156 +#: ../app/actions/filters-actions.c:227 +msgctxt "filters-action" +msgid "Colori_ze..." +msgstr "_لوّن..." + +#: ../app/actions/filters-actions.c:232 msgctxt "filters-action" msgid "Dithe_r..." msgstr "أرجِ_ف..." -#: ../app/actions/filters-actions.c:161 +#: ../app/actions/filters-actions.c:237 msgctxt "filters-action" msgid "_Rotate Colors..." msgstr "تدوير الأل_وان..." -#: ../app/actions/filters-actions.c:166 +#: ../app/actions/filters-actions.c:242 msgctxt "filters-action" msgid "Color T_emperature..." msgstr "_حرارة اللون..." -#: ../app/actions/filters-actions.c:171 +#: ../app/actions/filters-actions.c:247 msgctxt "filters-action" msgid "Color to _Alpha..." msgstr "لون إلى أل_فا..." -#: ../app/actions/filters-actions.c:176 +#: ../app/actions/filters-actions.c:252 +msgctxt "filters-action" +msgid "_Extract Component..." +msgstr "استخرج _مكون..." + +#: ../app/actions/filters-actions.c:257 msgctxt "filters-action" msgid "_Convolution Matrix..." msgstr "مصفوفة ال_تحويل..." -#: ../app/actions/filters-actions.c:181 +#: ../app/actions/filters-actions.c:262 msgctxt "filters-action" msgid "_Cubism..." msgstr "ت_كعيب..." -#: ../app/actions/filters-actions.c:186 +#: ../app/actions/filters-actions.c:267 +msgctxt "filters-action" +msgid "_Curves..." +msgstr "المن_حنيات..." + +#: ../app/actions/filters-actions.c:272 msgctxt "filters-action" msgid "_Deinterlace..." msgstr "ف_ك الدمج..." -#: ../app/actions/filters-actions.c:191 +#: ../app/actions/filters-actions.c:277 msgctxt "filters-action" msgid "_Desaturate..." msgstr "أ_زِل التشبع..." -#: ../app/actions/filters-actions.c:196 +#: ../app/actions/filters-actions.c:282 msgctxt "filters-action" msgid "Difference of Gaussians..." msgstr "فرق الغوسيات..." -#: ../app/actions/filters-actions.c:201 +#: ../app/actions/filters-actions.c:287 msgctxt "filters-action" msgid "Diffraction Patterns..." msgstr "أنماط مقلمة..." -#: ../app/actions/filters-actions.c:206 +#: ../app/actions/filters-actions.c:292 msgctxt "filters-action" msgid "Displace..." msgstr "أزِح..." -#: ../app/actions/filters-actions.c:211 +#: ../app/actions/filters-actions.c:297 msgctxt "filters-action" msgid "Distance Map..." msgstr "خريطة المسافات..." -#: ../app/actions/filters-actions.c:216 +#: ../app/actions/filters-actions.c:302 msgctxt "filters-action" msgid "_Drop Shadow..." msgstr "ظل _ساقط..." -#: ../app/actions/filters-actions.c:221 +#: ../app/actions/filters-actions.c:307 msgctxt "filters-action" msgid "_Edge..." msgstr "_حافة..." -#: ../app/actions/filters-actions.c:226 +#: ../app/actions/filters-actions.c:312 msgctxt "filters-action" msgid "_Laplace" msgstr "_لابلاس" -#: ../app/actions/filters-actions.c:231 +#: ../app/actions/filters-actions.c:317 +msgctxt "filters-action" +msgid "_Neon..." +msgstr "_نيون..." + +#: ../app/actions/filters-actions.c:322 msgctxt "filters-action" msgid "_Sobel..." msgstr "_سوبل..." -#: ../app/actions/filters-actions.c:236 +#: ../app/actions/filters-actions.c:327 msgctxt "filters-action" msgid "_Emboss..." msgstr "_نقش بارز..." -#: ../app/actions/filters-actions.c:241 +#: ../app/actions/filters-actions.c:332 msgctxt "filters-action" msgid "En_grave..." msgstr "نقش _غائر..." -#: ../app/actions/filters-actions.c:246 +#: ../app/actions/filters-actions.c:337 msgctxt "filters-action" msgid "E_xposure..." msgstr "التعر_ض..." -#: ../app/actions/filters-actions.c:251 +#: ../app/actions/filters-actions.c:342 +msgctxt "filters-action" +msgid "_Fattal et al. 2002..." +msgstr "فتّال و آخرون ٢٠٠٢..." + +#: ../app/actions/filters-actions.c:347 msgctxt "filters-action" msgid "_Fractal Trace..." msgstr "تتبع _كسيري..." -#: ../app/actions/filters-actions.c:256 +#: ../app/actions/filters-actions.c:352 msgctxt "filters-action" msgid "_Gaussian Blur..." msgstr "_غشاوة غوسية..." -#: ../app/actions/filters-actions.c:261 +#: ../app/actions/filters-actions.c:357 msgctxt "filters-action" msgid "_Selective Gaussian Blur..." msgstr "غشاوة _غوسية انتقائية..." -#: ../app/actions/filters-actions.c:266 +#: ../app/actions/filters-actions.c:362 msgctxt "filters-action" msgid "_GEGL graph..." msgstr "رسم بياني _جي.إي.جي.إل..." -#: ../app/actions/filters-actions.c:271 +#: ../app/actions/filters-actions.c:367 msgctxt "filters-action" msgid "_Grid..." msgstr "_شبكة..." -#: ../app/actions/filters-actions.c:276 +#: ../app/actions/filters-actions.c:372 #, fuzzy msgctxt "filters-action" msgid "_High Pass..." msgstr "بلاط _سلس..." -#: ../app/actions/filters-actions.c:281 +#: ../app/actions/filters-actions.c:377 +#, fuzzy +msgctxt "filters-action" +msgid "Hue-_Chroma..." +msgstr "التدرج و التشبع..." + +#: ../app/actions/filters-actions.c:382 +msgctxt "filters-action" +msgid "Hue-_Saturation..." +msgstr "الدرجة و التشبع..." + +#: ../app/actions/filters-actions.c:387 msgctxt "filters-action" msgid "_Illusion..." msgstr "و_هم..." -#: ../app/actions/filters-actions.c:286 +#: ../app/actions/filters-actions.c:392 +msgctxt "filters-action" +msgid "_Image Gradient..." +msgstr "تدرج ال_صورة..." + +#: ../app/actions/filters-actions.c:397 msgctxt "filters-action" msgid "_Kaleidoscope..." msgstr "م_شكال..." -#: ../app/actions/filters-actions.c:291 +#: ../app/actions/filters-actions.c:402 msgctxt "filters-action" msgid "Lens Distortion..." msgstr "تشوه العدسات..." -#: ../app/actions/filters-actions.c:296 +#: ../app/actions/filters-actions.c:407 msgctxt "filters-action" msgid "Lens Flare..." msgstr "س_طوع العدسات..." -#: ../app/actions/filters-actions.c:301 +#: ../app/actions/filters-actions.c:412 +msgctxt "filters-action" +msgid "_Levels..." +msgstr "الم_ستويات..." + +#: ../app/actions/filters-actions.c:417 +msgctxt "filters-action" +msgid "_Mantiuk 2006..." +msgstr "_مانتيوك ٢٠٠٦" + +#: ../app/actions/filters-actions.c:422 msgctxt "filters-action" msgid "_Maze..." msgstr "متا_هة..." -#: ../app/actions/filters-actions.c:306 +#: ../app/actions/filters-actions.c:427 +msgctxt "filters-action" +msgid "_Median Blur..." +msgstr "_غشاوة متوسطية..." + +#: ../app/actions/filters-actions.c:432 msgctxt "filters-action" msgid "_Mono Mixer..." msgstr "مازج أ_حادي..." -#: ../app/actions/filters-actions.c:311 +#: ../app/actions/filters-actions.c:437 msgctxt "filters-action" msgid "_Mosaic..." msgstr "_فسيفساء..." -#: ../app/actions/filters-actions.c:316 +#: ../app/actions/filters-actions.c:442 msgctxt "filters-action" msgid "_Circular Motion Blur..." msgstr "غشاوة حركية _دائرية..." -#: ../app/actions/filters-actions.c:321 +#: ../app/actions/filters-actions.c:447 msgctxt "filters-action" msgid "_Linear Motion Blur..." msgstr "غشاوة حركية _خطية..." -#: ../app/actions/filters-actions.c:326 +#: ../app/actions/filters-actions.c:452 msgctxt "filters-action" msgid "_Zoom Motion Blur..." msgstr "غشاوة حركية _تكبيرية..." -#: ../app/actions/filters-actions.c:331 +#: ../app/actions/filters-actions.c:457 msgctxt "filters-action" msgid "_Cell Noise..." msgstr "ضجيج _خلوي..." -#: ../app/actions/filters-actions.c:336 +#: ../app/actions/filters-actions.c:462 msgctxt "filters-action" msgid "CIE lch Noise..." msgstr "ضجيج CIE lch..." -#: ../app/actions/filters-actions.c:341 +#: ../app/actions/filters-actions.c:467 msgctxt "filters-action" msgid "HSV Noise..." msgstr "ضجيج HSV..." -#: ../app/actions/filters-actions.c:346 +#: ../app/actions/filters-actions.c:472 msgctxt "filters-action" msgid "_Hurl..." msgstr "ر_مي..." -#: ../app/actions/filters-actions.c:351 +#: ../app/actions/filters-actions.c:477 msgctxt "filters-action" msgid "_Perlin Noise..." msgstr "_ضجيج پر_لن..." -#: ../app/actions/filters-actions.c:356 +#: ../app/actions/filters-actions.c:482 msgctxt "filters-action" msgid "_Pick..." msgstr "انتقا_ء..." -#: ../app/actions/filters-actions.c:361 +#: ../app/actions/filters-actions.c:487 msgctxt "filters-action" msgid "_RGB Noise..." msgstr "ضجيج _RGB..." -#: ../app/actions/filters-actions.c:366 +#: ../app/actions/filters-actions.c:492 msgctxt "filters-action" msgid "Noise R_eduction..." msgstr "خ_فض الضجيج..." -#: ../app/actions/filters-actions.c:371 +#: ../app/actions/filters-actions.c:497 msgctxt "filters-action" msgid "_Simplex Noise..." msgstr "ضجيج بسي_طي..." -#: ../app/actions/filters-actions.c:376 +#: ../app/actions/filters-actions.c:502 msgctxt "filters-action" msgid "_Slur..." msgstr "_تلطيخ..." -#: ../app/actions/filters-actions.c:381 +#: ../app/actions/filters-actions.c:507 msgctxt "filters-action" msgid "_Solid Noise..." msgstr "_ضجيج صلب..." -#: ../app/actions/filters-actions.c:386 +#: ../app/actions/filters-actions.c:512 msgctxt "filters-action" msgid "Sp_read..." msgstr "انت_شار..." -#: ../app/actions/filters-actions.c:391 +#: ../app/actions/filters-actions.c:517 msgctxt "filters-action" msgid "Oili_fy..." msgstr "تزي_يت..." -#: ../app/actions/filters-actions.c:396 +#: ../app/actions/filters-actions.c:522 msgctxt "filters-action" msgid "_Panorama Projection..." msgstr "إسقاط با_نورامي..." -#: ../app/actions/filters-actions.c:401 +#: ../app/actions/filters-actions.c:527 msgctxt "filters-action" msgid "_Photocopy..." msgstr "نسخ _ضوئي..." -#: ../app/actions/filters-actions.c:406 +#: ../app/actions/filters-actions.c:532 msgctxt "filters-action" msgid "_Pixelize..." msgstr "_بكسلة..." -#: ../app/actions/filters-actions.c:411 +#: ../app/actions/filters-actions.c:537 msgctxt "filters-action" msgid "_Plasma..." msgstr "بلا_زما..." -#: ../app/actions/filters-actions.c:416 +#: ../app/actions/filters-actions.c:542 msgctxt "filters-action" msgid "P_olar Coordinates..." msgstr "إحدا_ثيات قطبية..." -#: ../app/actions/filters-actions.c:421 +#: ../app/actions/filters-actions.c:547 msgctxt "filters-action" msgid "_Posterize..." msgstr "قلل الأ_لوان..." -#: ../app/actions/filters-actions.c:426 +#: ../app/actions/filters-actions.c:552 msgctxt "filters-action" msgid "_Red Eye Removal..." msgstr "إزالة تأثير العين ال_حمراء..." -#: ../app/actions/filters-actions.c:431 +#: ../app/actions/filters-actions.c:557 +msgctxt "filters-action" +msgid "_Reinhard 2005..." +msgstr "رينهارد ٢٠٠٥..." + +#: ../app/actions/filters-actions.c:562 +msgctxt "filters-action" +msgid "RGB _Clip..." +msgstr "قص _RGB..." + +#: ../app/actions/filters-actions.c:567 msgctxt "filters-action" msgid "_Ripple..." msgstr "تمو_ج..." -#: ../app/actions/filters-actions.c:436 +#: ../app/actions/filters-actions.c:572 msgctxt "filters-action" msgid "Sat_uration..." msgstr "ال_تشبّع..." -#: ../app/actions/filters-actions.c:441 +#: ../app/actions/filters-actions.c:577 msgctxt "filters-action" msgid "_Semi-Flatten..." msgstr "_شبه تسطيح..." -#: ../app/actions/filters-actions.c:446 +#: ../app/actions/filters-actions.c:582 msgctxt "filters-action" msgid "_Sepia..." msgstr "_سِپيا..." -#: ../app/actions/filters-actions.c:451 +#: ../app/actions/filters-actions.c:587 +msgctxt "filters-action" +msgid "S_hadows-Highlights..." +msgstr "إبراز ال_ظلال..." + +#: ../app/actions/filters-actions.c:592 msgctxt "filters-action" msgid "_Shift..." msgstr "_نقل..." -#: ../app/actions/filters-actions.c:456 +#: ../app/actions/filters-actions.c:597 msgctxt "filters-action" msgid "_Sinus..." msgstr "ال_جيب..." -#: ../app/actions/filters-actions.c:461 +#: ../app/actions/filters-actions.c:602 +msgctxt "filters-action" +msgid "_Simple Linear Iterative Clustering..." +msgstr "" + +#: ../app/actions/filters-actions.c:607 +msgctxt "filters-action" +msgid "_Symmetric Nearest Neighbor..." +msgstr "" + +#: ../app/actions/filters-actions.c:612 msgctxt "filters-action" msgid "_Softglow..." msgstr "توهج _ناعم..." -#: ../app/actions/filters-actions.c:466 +#: ../app/actions/filters-actions.c:617 +msgctxt "filters-action" +msgid "S_piral..." +msgstr "_حلزون..." + +#: ../app/actions/filters-actions.c:622 msgctxt "filters-action" msgid "_Stretch Contrast..." msgstr "تباين الم_ط..." -#: ../app/actions/filters-actions.c:471 +#: ../app/actions/filters-actions.c:627 msgctxt "filters-action" -msgid "_Stretch Contrast HSV..." -msgstr "تباين م_ط HSV..." +msgid "_Stress..." +msgstr "_ضغط..." -#: ../app/actions/filters-actions.c:476 +#: ../app/actions/filters-actions.c:632 msgctxt "filters-action" msgid "Super_nova..." msgstr "سوبر_نوفا..." -#: ../app/actions/filters-actions.c:481 +#: ../app/actions/filters-actions.c:637 +msgctxt "filters-action" +msgid "_Threshold..." +msgstr "ال_عتبة..." + +#: ../app/actions/filters-actions.c:642 msgctxt "filters-action" msgid "_Threshold Alpha..." msgstr "_عتبة الشفافية..." -#: ../app/actions/filters-actions.c:486 +#: ../app/actions/filters-actions.c:647 msgctxt "filters-action" msgid "_Glass Tile..." msgstr "بلا_ط زجاجي..." -#: ../app/actions/filters-actions.c:491 +#: ../app/actions/filters-actions.c:652 msgctxt "filters-action" msgid "_Paper Tile..." msgstr "بلاط ورق_ي..." -#: ../app/actions/filters-actions.c:496 +#: ../app/actions/filters-actions.c:657 msgctxt "filters-action" msgid "_Tile Seamless..." msgstr "بلاط _سلس..." -#: ../app/actions/filters-actions.c:501 +#: ../app/actions/filters-actions.c:662 msgctxt "filters-action" msgid "_Unsharp Mask..." msgstr "_قناع التنعيم..." -#: ../app/actions/filters-actions.c:506 +#: ../app/actions/filters-actions.c:667 msgctxt "filters-action" msgid "_Value Propagate..." msgstr "انتشار ال_قيمة..." -#: ../app/actions/filters-actions.c:511 +#: ../app/actions/filters-actions.c:672 msgctxt "filters-action" msgid "Vi_deo Degradation..." msgstr "ان_حلال الڤديو..." -#: ../app/actions/filters-actions.c:516 +#: ../app/actions/filters-actions.c:677 msgctxt "filters-action" msgid "_Vignette..." msgstr "ڤِنْي_ت..." -#: ../app/actions/filters-actions.c:521 +#: ../app/actions/filters-actions.c:682 +msgctxt "filters-action" +msgid "_Waterpixels..." +msgstr "ب_كسلات ماء..." + +#: ../app/actions/filters-actions.c:687 msgctxt "filters-action" msgid "_Waves..." msgstr "أ_مواج..." -#: ../app/actions/filters-actions.c:526 +#: ../app/actions/filters-actions.c:692 msgctxt "filters-action" msgid "W_hirl and Pinch..." msgstr "دوامة و قر_صة..." -#: ../app/actions/filters-actions.c:531 +#: ../app/actions/filters-actions.c:697 msgctxt "filters-action" msgid "W_ind..." msgstr "_رياح..." -#: ../app/actions/filters-actions.c:539 +#: ../app/actions/filters-actions.c:705 msgctxt "filters-action" msgid "Re_peat Last" msgstr "كر_ر الأخير" -#: ../app/actions/filters-actions.c:541 +#: ../app/actions/filters-actions.c:707 msgctxt "filters-action" msgid "Rerun the last used filter using the same settings" msgstr "أعِد تشغيل آخر مُرشِّح مستخدم بنفس الإعدادات" -#: ../app/actions/filters-actions.c:546 +#: ../app/actions/filters-actions.c:712 msgctxt "filters-action" msgid "R_e-Show Last" msgstr "أ_عد إظهار الأخير" -#: ../app/actions/filters-actions.c:547 +#: ../app/actions/filters-actions.c:713 msgctxt "filters-action" msgid "Show the last used filter dialog again" msgstr "اعرض حوار آخر مُرشِّح مستخدم مجددا" -#: ../app/actions/filters-actions.c:820 +#: ../app/actions/filters-actions.c:1037 #, c-format msgid "Re_peat \"%s\"" msgstr "_كرر \"%s\"" -#: ../app/actions/filters-actions.c:821 +#: ../app/actions/filters-actions.c:1038 #, c-format msgid "R_e-Show \"%s\"" msgstr "أ_عد إظهار \"%s\"" -#: ../app/actions/filters-actions.c:859 +#: ../app/actions/filters-actions.c:1076 msgid "Repeat Last" msgstr "كرر الأخير" -#: ../app/actions/filters-actions.c:861 +#: ../app/actions/filters-actions.c:1078 msgid "Re-Show Last" msgstr "أعِد إظهار الأخير" @@ -3400,7 +4984,7 @@ msgctxt "fonts-action" msgid "Rescan the installed fonts" msgstr "أعِد مسخ الخطوط المُثبّتة" -#: ../app/actions/gimpgeglprocedure.c:300 +#: ../app/actions/gimpgeglprocedure.c:320 #, c-format msgid "There are no last settings for '%s', showing the filter dialog instead." msgstr "لا إعدادات أخيرة تخص '%s'، سيُعرض حوار الترشيح بدلا عنها." @@ -3565,12 +5149,12 @@ msgstr "_ح‌خ‌ز (RGB)" #: ../app/actions/gradient-editor-actions.c:356 msgctxt "gradient-editor-coloring" msgid "HSV (_counter-clockwise hue)" -msgstr "‏HSV (تدرج _عكس اتجاه الساعة)" +msgstr "‏HSV (درجة _عكس اتجاه الساعة)" #: ../app/actions/gradient-editor-actions.c:361 msgctxt "gradient-editor-coloring" msgid "HSV (clockwise _hue)" -msgstr "‏HSV (تدرج في ا_تجاه الساعة)" +msgstr "‏HSV (درجة في ا_تجاه الساعة)" #: ../app/actions/gradient-editor-actions.c:366 msgctxt "gradient-editor-coloring" @@ -3604,75 +5188,75 @@ msgstr "قرب الكل" msgid "Zoom all" msgstr "قرّب الكل" -#: ../app/actions/gradient-editor-actions.c:777 +#: ../app/actions/gradient-editor-actions.c:779 msgid "_Blending Function for Segment" msgstr "وظيفة _مزج القطعة" -#: ../app/actions/gradient-editor-actions.c:779 +#: ../app/actions/gradient-editor-actions.c:781 msgid "Coloring _Type for Segment" msgstr "نوع _تلوين القطعة" -#: ../app/actions/gradient-editor-actions.c:782 +#: ../app/actions/gradient-editor-actions.c:784 msgid "_Flip Segment" msgstr "ا_قلب القطعة" -#: ../app/actions/gradient-editor-actions.c:784 +#: ../app/actions/gradient-editor-actions.c:786 msgid "_Replicate Segment..." msgstr "_كرر القطعة..." -#: ../app/actions/gradient-editor-actions.c:786 +#: ../app/actions/gradient-editor-actions.c:788 msgid "Split Segment at _Midpoint" msgstr "_شق القطعة في المنتصف" -#: ../app/actions/gradient-editor-actions.c:788 +#: ../app/actions/gradient-editor-actions.c:790 msgid "Split Segment _Uniformly..." msgstr "شق القطعة تما_ثليا" -#: ../app/actions/gradient-editor-actions.c:790 +#: ../app/actions/gradient-editor-actions.c:792 msgid "_Delete Segment" msgstr "ا_حذف القطعة" -#: ../app/actions/gradient-editor-actions.c:792 +#: ../app/actions/gradient-editor-actions.c:794 msgid "Re-_center Segment's Midpoint" msgstr "أعِد _تمركز منتصف القطعة" -#: ../app/actions/gradient-editor-actions.c:794 +#: ../app/actions/gradient-editor-actions.c:796 msgid "Re-distribute _Handles in Segment" msgstr "أعِد ترتيب _المناولات في القطعة" -#: ../app/actions/gradient-editor-actions.c:799 +#: ../app/actions/gradient-editor-actions.c:801 msgid "_Blending Function for Selection" msgstr "وظيفة _مزج التحديد" -#: ../app/actions/gradient-editor-actions.c:801 +#: ../app/actions/gradient-editor-actions.c:803 msgid "Coloring _Type for Selection" msgstr "نوع _تلوين التحديد" -#: ../app/actions/gradient-editor-actions.c:804 +#: ../app/actions/gradient-editor-actions.c:806 msgid "_Flip Selection" msgstr "ا_قلب التحديد" -#: ../app/actions/gradient-editor-actions.c:806 +#: ../app/actions/gradient-editor-actions.c:808 msgid "_Replicate Selection..." msgstr "_كرر التحديد..." -#: ../app/actions/gradient-editor-actions.c:808 +#: ../app/actions/gradient-editor-actions.c:810 msgid "Split Segments at _Midpoints" msgstr "شق القطع في منت_صفاتها" -#: ../app/actions/gradient-editor-actions.c:810 +#: ../app/actions/gradient-editor-actions.c:812 msgid "Split Segments _Uniformly..." msgstr "شق القطع _تماثليا..." -#: ../app/actions/gradient-editor-actions.c:812 +#: ../app/actions/gradient-editor-actions.c:814 msgid "_Delete Selection" msgstr "ا_حذف التحديد" -#: ../app/actions/gradient-editor-actions.c:814 +#: ../app/actions/gradient-editor-actions.c:816 msgid "Re-_center Midpoints in Selection" msgstr "أعِد _تمركز منتصفات التحديد" -#: ../app/actions/gradient-editor-actions.c:816 +#: ../app/actions/gradient-editor-actions.c:818 msgid "Re-distribute _Handles in Selection" msgstr "أعِد توزيع ال_متناولات في التحديد" @@ -3684,35 +5268,35 @@ msgstr "لون نقطة النهاية اليسرى" msgid "Gradient Segment's Left Endpoint Color" msgstr "لون نقطة النهاية اليسرى لقطعة التدرج" -#: ../app/actions/gradient-editor-commands.c:239 +#: ../app/actions/gradient-editor-commands.c:237 msgid "Right Endpoint Color" msgstr "لون نقطة النهاية اليمنى" -#: ../app/actions/gradient-editor-commands.c:241 +#: ../app/actions/gradient-editor-commands.c:239 msgid "Gradient Segment's Right Endpoint Color" msgstr "لون نقطة النهاية اليمنى لقطعة التدرج" -#: ../app/actions/gradient-editor-commands.c:464 +#: ../app/actions/gradient-editor-commands.c:460 msgid "Replicate Segment" msgstr "كرر القطعة" -#: ../app/actions/gradient-editor-commands.c:465 +#: ../app/actions/gradient-editor-commands.c:461 msgid "Replicate Gradient Segment" msgstr "كرر قطعة التدرج" -#: ../app/actions/gradient-editor-commands.c:469 +#: ../app/actions/gradient-editor-commands.c:465 msgid "Replicate Selection" msgstr "كرر التحديد" -#: ../app/actions/gradient-editor-commands.c:470 +#: ../app/actions/gradient-editor-commands.c:466 msgid "Replicate Gradient Selection" msgstr "كرر تحديد التدرج" -#: ../app/actions/gradient-editor-commands.c:483 -msgid "Replicate" -msgstr "كرر" +#: ../app/actions/gradient-editor-commands.c:479 +msgid "_Replicate" +msgstr "_كرر" -#: ../app/actions/gradient-editor-commands.c:504 +#: ../app/actions/gradient-editor-commands.c:500 msgid "" "Select the number of times\n" "to replicate the selected segment." @@ -3720,7 +5304,7 @@ msgstr "" "حدد عدد مرات\n" "تكرار القطعة المحددة." -#: ../app/actions/gradient-editor-commands.c:507 +#: ../app/actions/gradient-editor-commands.c:503 msgid "" "Select the number of times\n" "to replicate the selection." @@ -3728,27 +5312,27 @@ msgstr "" "حدد عدد مرات\n" "تكرار التحديد." -#: ../app/actions/gradient-editor-commands.c:566 +#: ../app/actions/gradient-editor-commands.c:562 msgid "Split Segment Uniformly" msgstr "شق القطعة تماثليا" -#: ../app/actions/gradient-editor-commands.c:567 +#: ../app/actions/gradient-editor-commands.c:563 msgid "Split Gradient Segment Uniformly" msgstr "شق قطعة التدرج تماثليا" -#: ../app/actions/gradient-editor-commands.c:571 +#: ../app/actions/gradient-editor-commands.c:567 msgid "Split Segments Uniformly" msgstr "شق القطع تماثليا" -#: ../app/actions/gradient-editor-commands.c:572 +#: ../app/actions/gradient-editor-commands.c:568 msgid "Split Gradient Segments Uniformly" msgstr "شق قطع التدرج تماثليا" -#: ../app/actions/gradient-editor-commands.c:585 -msgid "Split" -msgstr "شق" +#: ../app/actions/gradient-editor-commands.c:581 +msgid "_Split" +msgstr "ا_قسم" -#: ../app/actions/gradient-editor-commands.c:607 +#: ../app/actions/gradient-editor-commands.c:603 msgid "" "Select the number of uniform parts\n" "in which to split the selected segment." @@ -3756,7 +5340,7 @@ msgstr "" "اختر عدد الأجزاء المتمثلة\n" "التي تريد شق القطعة المحددة إليها." -#: ../app/actions/gradient-editor-commands.c:610 +#: ../app/actions/gradient-editor-commands.c:606 msgid "" "Select the number of uniform parts\n" "in which to split the segments in the selection." @@ -3909,214 +5493,225 @@ msgctxt "image-action" msgid "_Guides" msgstr "الأ_دلة" -#: ../app/actions/image-actions.c:66 +#: ../app/actions/image-actions.c:65 +msgctxt "image-action" +msgid "Meta_data" +msgstr "بيانات _فوقية" + +#: ../app/actions/image-actions.c:67 msgctxt "image-action" msgid "_Colors" msgstr "أ_لوان" -#: ../app/actions/image-actions.c:67 +#: ../app/actions/image-actions.c:68 msgctxt "image-action" msgid "I_nfo" msgstr "م_علومات" -#: ../app/actions/image-actions.c:68 +#: ../app/actions/image-actions.c:69 msgctxt "image-action" msgid "_Auto" msgstr "_تلقائي" -#: ../app/actions/image-actions.c:69 +#: ../app/actions/image-actions.c:70 msgctxt "image-action" msgid "_Map" msgstr "_خريطة" -#: ../app/actions/image-actions.c:70 +#: ../app/actions/image-actions.c:71 +#, fuzzy +msgctxt "image-action" +msgid "_Tone Mapping" +msgstr "الاتباع" + +#: ../app/actions/image-actions.c:72 msgctxt "image-action" msgid "C_omponents" msgstr "ال_مكوّنات" -#: ../app/actions/image-actions.c:71 +#: ../app/actions/image-actions.c:73 msgctxt "image-action" msgid "D_esaturate" msgstr "أزل الت_شبع" -#: ../app/actions/image-actions.c:74 +#: ../app/actions/image-actions.c:76 msgctxt "image-action" msgid "_New..." msgstr "_جديدة..." -#: ../app/actions/image-actions.c:75 +#: ../app/actions/image-actions.c:77 msgctxt "image-action" msgid "Create a new image" msgstr "أنشئ صورة جديدة" -#: ../app/actions/image-actions.c:80 +#: ../app/actions/image-actions.c:82 msgctxt "image-action" msgid "_Duplicate" msgstr "_كرر" -#: ../app/actions/image-actions.c:81 +#: ../app/actions/image-actions.c:83 msgctxt "image-action" msgid "Create a duplicate of this image" msgstr "أنشئ نسخة مكررة من هذه الصورة" -#: ../app/actions/image-actions.c:86 +#: ../app/actions/image-actions.c:88 msgctxt "image-action" msgid "_Assign Color Profile..." msgstr "حدد لا_حة ألوان..." -#: ../app/actions/image-actions.c:87 +#: ../app/actions/image-actions.c:89 msgctxt "image-action" msgid "Set a color profile on the image" msgstr "حدد لاحة ألوان للصورة" -#: ../app/actions/image-actions.c:92 +#: ../app/actions/image-actions.c:94 msgctxt "image-action" msgid "_Convert to Color Profile..." msgstr "حوّل إلى لاحة ألوان..." -#: ../app/actions/image-actions.c:93 +#: ../app/actions/image-actions.c:95 msgctxt "image-action" msgid "Apply a color profile to the image" msgstr "طبّق لاحة ألوان على الصورة" -#: ../app/actions/image-actions.c:98 +#: ../app/actions/image-actions.c:100 msgctxt "image-action" msgid "_Discard Color Profile" msgstr "أز_ل لاحة الألوان" -#: ../app/actions/image-actions.c:99 +#: ../app/actions/image-actions.c:101 msgctxt "image-action" msgid "Remove the image's color profile" msgstr "أزل لاحة ألوان الصورة" -#: ../app/actions/image-actions.c:104 +#: ../app/actions/image-actions.c:106 msgctxt "image-action" msgid "_Save Color Profile to File..." msgstr "ا_حفظ لاحة الألوان في ملف..." -#: ../app/actions/image-actions.c:105 +#: ../app/actions/image-actions.c:107 msgctxt "image-action" msgid "Save the image's color profile to an ICC file" msgstr "احفظ لاحة ألوان الصورة إلى ملف ICC" -#: ../app/actions/image-actions.c:110 +#: ../app/actions/image-actions.c:112 msgctxt "image-action" msgid "Can_vas Size..." msgstr "حجم رقعة الرسم..." -#: ../app/actions/image-actions.c:111 +#: ../app/actions/image-actions.c:113 msgctxt "image-action" msgid "Adjust the image dimensions" msgstr "اضبط أبعاد الصورة" -#: ../app/actions/image-actions.c:116 +#: ../app/actions/image-actions.c:118 msgctxt "image-action" msgid "Fit Canvas to L_ayers" msgstr "لا_ئم رقعة الرسم مع الطبقات" -#: ../app/actions/image-actions.c:117 +#: ../app/actions/image-actions.c:119 msgctxt "image-action" msgid "Resize the image to enclose all layers" msgstr "غيّر حجم الصورة ليحتوي كل الطبقات" -#: ../app/actions/image-actions.c:122 +#: ../app/actions/image-actions.c:124 msgctxt "image-action" msgid "F_it Canvas to Selection" msgstr "لا_ئم رقعة الرسم مع التحديد" -#: ../app/actions/image-actions.c:123 +#: ../app/actions/image-actions.c:125 msgctxt "image-action" msgid "Resize the image to the extents of the selection" msgstr "غيّر حجم الصورة إلى أبعاد التحديد" -#: ../app/actions/image-actions.c:128 +#: ../app/actions/image-actions.c:130 msgctxt "image-action" msgid "_Print Size..." msgstr "حجم ال_طباعة..." -#: ../app/actions/image-actions.c:129 +#: ../app/actions/image-actions.c:131 msgctxt "image-action" msgid "Adjust the print resolution" msgstr "اضبط ميْز الطباعة" -#: ../app/actions/image-actions.c:134 +#: ../app/actions/image-actions.c:136 msgctxt "image-action" msgid "_Scale Image..." msgstr "حجّم ال_صورة..." -#: ../app/actions/image-actions.c:135 +#: ../app/actions/image-actions.c:137 msgctxt "image-action" msgid "Change the size of the image content" msgstr "غيّر حجم محتوى الصورة" -#: ../app/actions/image-actions.c:140 +#: ../app/actions/image-actions.c:142 msgctxt "image-action" msgid "_Crop to Selection" msgstr "_قصّر إلى التحديد" -#: ../app/actions/image-actions.c:141 +#: ../app/actions/image-actions.c:143 msgctxt "image-action" msgid "Crop the image to the extents of the selection" msgstr "قصّر الصورة إلى حدود التحديد" -#: ../app/actions/image-actions.c:146 +#: ../app/actions/image-actions.c:148 msgctxt "image-action" msgid "Crop to C_ontent" msgstr "قصّر إلى الم_حتوى" -#: ../app/actions/image-actions.c:147 +#: ../app/actions/image-actions.c:149 msgctxt "image-action" msgid "" "Crop the image to the extents of its content (remove empty borders from the " "image)" msgstr "قصّر الصورة إلى حدود محتواها (أزل الحدود الخالية من الصورة)" -#: ../app/actions/image-actions.c:152 +#: ../app/actions/image-actions.c:154 msgctxt "image-action" msgid "Merge Visible _Layers..." msgstr "ادمج ال_طبقات المرئية..." -#: ../app/actions/image-actions.c:153 +#: ../app/actions/image-actions.c:155 msgctxt "image-action" msgid "Merge all visible layers into one layer" msgstr "ادمج كل الطبقات المرئية في طبقة واحدة" -#: ../app/actions/image-actions.c:158 +#: ../app/actions/image-actions.c:160 msgctxt "image-action" msgid "_Flatten Image" msgstr "_سطّح الصورة" -#: ../app/actions/image-actions.c:159 +#: ../app/actions/image-actions.c:161 msgctxt "image-action" msgid "Merge all layers into one and remove transparency" msgstr "ادمج كل الطبقات في واحدة واحذف الشفافية" -#: ../app/actions/image-actions.c:164 +#: ../app/actions/image-actions.c:166 msgctxt "image-action" msgid "Configure G_rid..." msgstr "اضبط ال_شبكة..." -#: ../app/actions/image-actions.c:165 +#: ../app/actions/image-actions.c:167 msgctxt "image-action" msgid "Configure the grid for this image" msgstr "اضبط شبكة هذه الصورة" -#: ../app/actions/image-actions.c:170 +#: ../app/actions/image-actions.c:172 msgctxt "image-action" msgid "Image Pr_operties" msgstr "_خصائص الصورة" -#: ../app/actions/image-actions.c:171 +#: ../app/actions/image-actions.c:173 msgctxt "image-action" msgid "Display information about this image" msgstr "اعرض معلومات عن هذه الصورة" -#: ../app/actions/image-actions.c:179 +#: ../app/actions/image-actions.c:181 msgctxt "image-action" msgid "_Enable Color Management" msgstr "_فعّل إدارة الألوان" -#: ../app/actions/image-actions.c:180 +#: ../app/actions/image-actions.c:182 msgctxt "image-action" msgid "" "Whether the image is color managed. Disabling color management is equivalent " @@ -4124,172 +5719,172 @@ msgid "" "enabled." msgstr "" -#: ../app/actions/image-actions.c:191 ../app/actions/image-actions.c:442 +#: ../app/actions/image-actions.c:193 ../app/actions/image-actions.c:444 msgctxt "image-convert-action" msgid "_RGB" msgstr "_ح‌خ‌ز (RGB)" -#: ../app/actions/image-actions.c:192 +#: ../app/actions/image-actions.c:194 msgctxt "image-convert-action" msgid "Convert the image to the RGB colorspace" msgstr "حوّل الصورة إلى ألوان ح‌خ‌ز" -#: ../app/actions/image-actions.c:196 ../app/actions/image-actions.c:444 +#: ../app/actions/image-actions.c:198 ../app/actions/image-actions.c:446 msgctxt "image-convert-action" msgid "_Grayscale" msgstr "_تدرج رمادي" -#: ../app/actions/image-actions.c:197 +#: ../app/actions/image-actions.c:199 msgctxt "image-convert-action" msgid "Convert the image to grayscale" msgstr "حوّل الصورة إلى تدرج رمادي" -#: ../app/actions/image-actions.c:201 +#: ../app/actions/image-actions.c:203 msgctxt "image-convert-action" msgid "_Indexed..." msgstr "_مفهرسة..." -#: ../app/actions/image-actions.c:202 +#: ../app/actions/image-actions.c:204 msgctxt "image-convert-action" msgid "Convert the image to indexed colors" msgstr "حوّل الصورة إلى ألوان مفهرسة" -#: ../app/actions/image-actions.c:209 +#: ../app/actions/image-actions.c:211 msgctxt "image-convert-action" msgid "8 bit integer" msgstr "عدد صحيح من 8 بتات" -#: ../app/actions/image-actions.c:211 +#: ../app/actions/image-actions.c:213 msgctxt "image-convert-action" msgid "Convert the image to 8 bit integer" msgstr "حوّل الصورة إلى دقة عدد صحيح من 8 بتات" -#: ../app/actions/image-actions.c:215 +#: ../app/actions/image-actions.c:217 msgctxt "image-convert-action" msgid "16 bit integer" msgstr "عدد صحيح من 16 بتة" -#: ../app/actions/image-actions.c:217 +#: ../app/actions/image-actions.c:219 msgctxt "image-convert-action" msgid "Convert the image to 16 bit integer" msgstr "حوّل الصورة إلى دقة عدد صحيح من 16 بتة" -#: ../app/actions/image-actions.c:221 +#: ../app/actions/image-actions.c:223 msgctxt "image-convert-action" msgid "32 bit integer" msgstr "عدد صحيح من 32 بتة" -#: ../app/actions/image-actions.c:223 +#: ../app/actions/image-actions.c:225 msgctxt "image-convert-action" msgid "Convert the image to 32 bit integer" msgstr "حوّل الصورة إلى دقة عدد صحيح من 32 بتة" -#: ../app/actions/image-actions.c:227 +#: ../app/actions/image-actions.c:229 msgctxt "image-convert-action" msgid "16 bit floating point" msgstr "عدد عشري من 16 بتة" -#: ../app/actions/image-actions.c:229 +#: ../app/actions/image-actions.c:231 msgctxt "image-convert-action" msgid "Convert the image to 16 bit floating point" msgstr "حوّل الصورة إلى دقة عدد عشري من 16 بتة" -#: ../app/actions/image-actions.c:233 +#: ../app/actions/image-actions.c:235 msgctxt "image-convert-action" msgid "32 bit floating point" msgstr "عدد عشري من 32 بتة" -#: ../app/actions/image-actions.c:235 +#: ../app/actions/image-actions.c:237 msgctxt "image-convert-action" msgid "Convert the image to 32 bit floating point" msgstr "حوّل الصورة إلى دقة عدد عشري من 32 بتة" -#: ../app/actions/image-actions.c:239 +#: ../app/actions/image-actions.c:241 msgctxt "image-convert-action" msgid "64 bit floating point" msgstr "عدد عشري من 64 بتة" -#: ../app/actions/image-actions.c:241 +#: ../app/actions/image-actions.c:243 msgctxt "image-convert-action" msgid "Convert the image to 64 bit floating point" msgstr "حوّل الصورة إلى دقة عدد عشري من 64 بتة" -#: ../app/actions/image-actions.c:248 +#: ../app/actions/image-actions.c:250 msgctxt "image-convert-action" msgid "Perceptual gamma (sRGB)" msgstr "جاما إدراكية (sRGB)" -#: ../app/actions/image-actions.c:250 +#: ../app/actions/image-actions.c:252 msgctxt "image-convert-action" -msgid "Convert the image to preceptual (sRGB) gamma" +msgid "Convert the image to perceptual (sRGB) gamma" msgstr "حوّل الصورة إلى جاما إدراكية (sRGB)" -#: ../app/actions/image-actions.c:254 +#: ../app/actions/image-actions.c:256 msgctxt "image-convert-action" msgid "Linear light" msgstr "ضوء خطي" -#: ../app/actions/image-actions.c:256 +#: ../app/actions/image-actions.c:258 msgctxt "image-convert-action" msgid "Convert the image to linear light" msgstr "حوّل الصورة إلى ضوء خطي" -#: ../app/actions/image-actions.c:263 +#: ../app/actions/image-actions.c:265 msgctxt "image-action" msgid "Flip _Horizontally" msgstr "اقلب أ_فقيا" -#: ../app/actions/image-actions.c:264 +#: ../app/actions/image-actions.c:266 msgctxt "image-action" msgid "Flip image horizontally" msgstr "اقلب الصورة أفقيا" -#: ../app/actions/image-actions.c:269 +#: ../app/actions/image-actions.c:271 msgctxt "image-action" msgid "Flip _Vertically" msgstr "اقلب _رأسيا" -#: ../app/actions/image-actions.c:270 +#: ../app/actions/image-actions.c:272 msgctxt "image-action" msgid "Flip image vertically" msgstr "اقلب الصورة رأسيا" -#: ../app/actions/image-actions.c:278 +#: ../app/actions/image-actions.c:280 msgctxt "image-action" msgid "Rotate 90° _clockwise" msgstr "لف 90° باتجاه _عقارب الساعة" -#: ../app/actions/image-actions.c:279 +#: ../app/actions/image-actions.c:281 msgctxt "image-action" msgid "Rotate the image 90 degrees to the right" msgstr "دوّر الصورة 90 درجة يمينا" -#: ../app/actions/image-actions.c:284 +#: ../app/actions/image-actions.c:286 msgctxt "image-action" msgid "Rotate _180°" msgstr "لف _180°" -#: ../app/actions/image-actions.c:285 +#: ../app/actions/image-actions.c:287 msgctxt "image-action" msgid "Turn the image upside-down" msgstr "اقلب الصورة رأسا على عقب" -#: ../app/actions/image-actions.c:290 +#: ../app/actions/image-actions.c:292 msgctxt "image-action" msgid "Rotate 90° counter-clock_wise" msgstr "لف 90° ع_كس اتجاه عقارب الساعة" -#: ../app/actions/image-actions.c:291 +#: ../app/actions/image-actions.c:293 msgctxt "image-action" msgid "Rotate the image 90 degrees to the left" msgstr "دوّر الصورة 90 درجة يسارا" -#: ../app/actions/image-actions.c:435 +#: ../app/actions/image-actions.c:437 msgctxt "image-convert-action" msgid "_RGB..." msgstr "_ح‌خ‌ز (RGB)..." -#: ../app/actions/image-actions.c:437 +#: ../app/actions/image-actions.c:439 msgctxt "image-convert-action" msgid "_Grayscale..." msgstr "_تدرج رمادي..." @@ -4303,89 +5898,89 @@ msgstr "فشل حفظ لاحة الألوان: %s" msgid "Save Color Profile" msgstr "احفظ لاحة الألوان" -#: ../app/actions/image-commands.c:642 +#: ../app/actions/image-commands.c:646 msgid "Set Image Canvas Size" msgstr "حدد حجم رقعة الرسم" -#: ../app/actions/image-commands.c:672 ../app/actions/image-commands.c:696 -#: ../app/actions/image-commands.c:1354 +#: ../app/actions/image-commands.c:676 ../app/actions/image-commands.c:700 +#: ../app/actions/image-commands.c:1358 msgid "Resizing" msgstr "يغيّر الحجم" -#: ../app/actions/image-commands.c:729 +#: ../app/actions/image-commands.c:733 msgid "Set Image Print Resolution" msgstr "اضبط ميْز طباعة الصورة" -#: ../app/actions/image-commands.c:795 ../app/pdb/drawable-transform-cmds.c:166 +#: ../app/actions/image-commands.c:799 ../app/pdb/drawable-transform-cmds.c:166 #: ../app/pdb/drawable-transform-cmds.c:256 #: ../app/pdb/item-transform-cmds.c:170 msgid "Flipping" msgstr "يقلب" -#: ../app/actions/image-commands.c:819 ../app/pdb/drawable-transform-cmds.c:617 +#: ../app/actions/image-commands.c:823 ../app/pdb/drawable-transform-cmds.c:617 #: ../app/pdb/drawable-transform-cmds.c:711 #: ../app/pdb/image-transform-cmds.c:250 ../app/pdb/item-transform-cmds.c:443 -#: ../app/pdb/transform-tools-cmds.c:255 ../app/tools/gimprotatetool.c:126 +#: ../app/pdb/transform-tools-cmds.c:255 ../app/tools/gimprotatetool.c:129 msgid "Rotating" msgstr "يدوّر" -#: ../app/actions/image-commands.c:846 ../app/actions/layers-commands.c:792 +#: ../app/actions/image-commands.c:850 ../app/actions/layers-commands.c:779 msgid "Cannot crop because the current selection is empty." msgstr "تعذّر التقصير لأن التحديد الحالي فارغ" -#: ../app/actions/image-commands.c:884 +#: ../app/actions/image-commands.c:888 msgid "Cannot crop because the image has no content." msgstr "تعذّر التقصير لأن الصورة خالية." -#: ../app/actions/image-commands.c:890 +#: ../app/actions/image-commands.c:894 msgid "Cannot crop because the image is already cropped to its content." msgstr "تعذّر التقصير لأن الصورة مقصّرة إلى محتواها بالفعل." -#: ../app/actions/image-commands.c:1025 +#: ../app/actions/image-commands.c:1029 #, c-format msgid "Converting to RGB (%s)" msgstr "حوّل إلى ح‌خ‌ز (%s)" -#: ../app/actions/image-commands.c:1063 +#: ../app/actions/image-commands.c:1067 #, c-format msgid "Converting to grayscale (%s)" msgstr "حوّل إلى تدرج رمادي (%s)" -#: ../app/actions/image-commands.c:1125 +#: ../app/actions/image-commands.c:1129 msgid "Converting to indexed colors" msgstr "يحول إلى ألوان مفهرسة" -#: ../app/actions/image-commands.c:1213 +#: ../app/actions/image-commands.c:1217 #, c-format msgid "Converting image to %s" msgstr "يحوّل الصورة إلى %s" -#: ../app/actions/image-commands.c:1244 +#: ../app/actions/image-commands.c:1248 msgid "Assign color profile" msgstr "حدد لاحة ألوان" -#: ../app/actions/image-commands.c:1290 +#: ../app/actions/image-commands.c:1294 #, c-format msgid "Converting to '%s'" msgstr "حوّل إلى '%s'" -#: ../app/actions/image-commands.c:1396 +#: ../app/actions/image-commands.c:1400 msgid "Change Print Size" msgstr "غيّر حجم الطباعة" -#: ../app/actions/image-commands.c:1440 +#: ../app/actions/image-commands.c:1444 msgid "Scale Image" msgstr "حجّم الصورة" #. Scaling -#: ../app/actions/image-commands.c:1449 ../app/actions/layers-commands.c:1466 -#: ../app/dialogs/preferences-dialog.c:1346 +#: ../app/actions/image-commands.c:1453 ../app/actions/layers-commands.c:1569 +#: ../app/dialogs/preferences-dialog.c:1602 #: ../app/pdb/drawable-transform-cmds.c:800 #: ../app/pdb/drawable-transform-cmds.c:891 #: ../app/pdb/image-transform-cmds.c:122 ../app/pdb/image-transform-cmds.c:158 -#: ../app/pdb/item-transform-cmds.c:534 ../app/pdb/layer-cmds.c:400 -#: ../app/pdb/layer-cmds.c:447 ../app/pdb/transform-tools-cmds.c:346 -#: ../app/tools/gimpscaletool.c:119 +#: ../app/pdb/item-transform-cmds.c:534 ../app/pdb/layer-cmds.c:401 +#: ../app/pdb/layer-cmds.c:448 ../app/pdb/transform-tools-cmds.c:346 +#: ../app/tools/gimpscaletool.c:121 msgid "Scaling" msgstr "التحجيم" @@ -4432,688 +6027,878 @@ msgstr "لا يوجد طبقة أو قناة نشطة لملئها." msgid "There is no active layer or channel to stroke to." msgstr "لا توجد طبقة أو قناة نشطة لرسم الحواف بها." -#: ../app/actions/layers-actions.c:50 +#: ../app/actions/layers-actions.c:52 msgctxt "layers-action" msgid "Layers Menu" msgstr "قائمة الطبقات" -#. abused -#: ../app/actions/layers-actions.c:54 +#: ../app/actions/layers-actions.c:56 +#, fuzzy +msgctxt "layers-action" +msgid "Blend Space" +msgstr "امزج: " + +#: ../app/actions/layers-actions.c:60 +#, fuzzy +msgctxt "layers-action" +msgid "Composite Space" +msgstr "مُركّب" + +#: ../app/actions/layers-actions.c:64 +#, fuzzy +msgctxt "layers-action" +msgid "Composite Mode" +msgstr "مُركّب" + +#: ../app/actions/layers-actions.c:68 msgctxt "layers-action" msgid "Color Tag" msgstr "وسم اللون" -#: ../app/actions/layers-actions.c:58 +#: ../app/actions/layers-actions.c:72 msgctxt "layers-action" msgid "_Layer" msgstr "_طبقة" -#: ../app/actions/layers-actions.c:60 +#: ../app/actions/layers-actions.c:74 msgctxt "layers-action" msgid "Stac_k" msgstr "الر_صّة" -#: ../app/actions/layers-actions.c:62 +#: ../app/actions/layers-actions.c:76 msgctxt "layers-action" msgid "_Mask" msgstr "ال_قناع" -#: ../app/actions/layers-actions.c:64 +#: ../app/actions/layers-actions.c:78 msgctxt "layers-action" msgid "Tr_ansparency" msgstr "ال_شفافية" -#: ../app/actions/layers-actions.c:66 +#: ../app/actions/layers-actions.c:80 msgctxt "layers-action" msgid "_Transform" msgstr "_حوّل" -#: ../app/actions/layers-actions.c:68 +#: ../app/actions/layers-actions.c:82 msgctxt "layers-action" msgid "_Properties" msgstr "ال_خصائص" -#: ../app/actions/layers-actions.c:70 +#: ../app/actions/layers-actions.c:84 msgctxt "layers-action" msgid "_Opacity" -msgstr "الإ_عتام" +msgstr "ال_عتامة" -#: ../app/actions/layers-actions.c:72 +#: ../app/actions/layers-actions.c:86 msgctxt "layers-action" msgid "Layer _Mode" msgstr "طور الطب_قة" -#: ../app/actions/layers-actions.c:75 +#: ../app/actions/layers-actions.c:89 msgctxt "layers-action" -msgid "Te_xt Tool" -msgstr "أداة الن_صوص" +msgid "Default Edit Action" +msgstr "إجراء التحرير المبدئي" -#: ../app/actions/layers-actions.c:76 +#: ../app/actions/layers-actions.c:90 +#, fuzzy msgctxt "layers-action" -msgid "Activate the text tool on this text layer" +msgid "Activate the default edit action for this type of layer" msgstr "نشّط أداة النصوص على هذه الطبقة" -#: ../app/actions/layers-actions.c:81 +#: ../app/actions/layers-actions.c:95 +msgctxt "layers-action" +msgid "Edit Te_xt on canvas" +msgstr "حرر ال_نص على رقعة الرسم" + +#: ../app/actions/layers-actions.c:96 +msgctxt "layers-action" +msgid "Edit this text layer content on canvas" +msgstr "حرر محتوى الطبقة النصية على رقعة الرسم" + +#: ../app/actions/layers-actions.c:101 msgctxt "layers-action" msgid "_Edit Layer Attributes..." msgstr "_حرّر صفات الطبقة..." -#: ../app/actions/layers-actions.c:82 +#: ../app/actions/layers-actions.c:102 msgctxt "layers-action" msgid "Edit the layer's name" msgstr "حرّر اسم الطبقة" -#: ../app/actions/layers-actions.c:87 ../app/actions/layers-actions.c:728 +#: ../app/actions/layers-actions.c:107 ../app/actions/layers-actions.c:914 msgctxt "layers-action" msgid "_New Layer..." msgstr "طبقة ج_ديدة..." -#: ../app/actions/layers-actions.c:88 +#: ../app/actions/layers-actions.c:108 msgctxt "layers-action" msgid "Create a new layer and add it to the image" msgstr "أنشئ طبقة جديدة وأضفها إلى الصورة" -#: ../app/actions/layers-actions.c:93 ../app/actions/layers-actions.c:729 +#: ../app/actions/layers-actions.c:113 ../app/actions/layers-actions.c:915 msgctxt "layers-action" msgid "_New Layer" msgstr "طبقة ج_ديدة" -#: ../app/actions/layers-actions.c:94 +#: ../app/actions/layers-actions.c:114 msgctxt "layers-action" msgid "Create a new layer with last used values" msgstr "أنشئ طبقة جديدة بآخر القيم المستخدمة" -#: ../app/actions/layers-actions.c:99 +#: ../app/actions/layers-actions.c:119 msgctxt "layers-action" msgid "New from _Visible" msgstr "جديدة من ال_مرئي" -#: ../app/actions/layers-actions.c:101 +#: ../app/actions/layers-actions.c:121 msgctxt "layers-action" msgid "Create a new layer from what is visible in this image" msgstr "أنشئ طبقة جديدة من المرئي في هذه الصورة" -#: ../app/actions/layers-actions.c:106 +#: ../app/actions/layers-actions.c:126 msgctxt "layers-action" msgid "New Layer _Group" msgstr "مجمو_عة طبقات جديدة" -#: ../app/actions/layers-actions.c:107 +#: ../app/actions/layers-actions.c:127 msgctxt "layers-action" msgid "Create a new layer group and add it to the image" msgstr "أنشئ مجموعة طبقات جديدة وأضفها إلى الصورة" -#: ../app/actions/layers-actions.c:112 +#: ../app/actions/layers-actions.c:132 msgctxt "layers-action" msgid "D_uplicate Layer" msgstr "_كرر الطبقة" -#: ../app/actions/layers-actions.c:114 +#: ../app/actions/layers-actions.c:134 msgctxt "layers-action" msgid "Create a duplicate of the layer and add it to the image" msgstr "أنشئ نسخة مكررة من الطبقة وأضفها إلى الصورة" -#: ../app/actions/layers-actions.c:119 +#: ../app/actions/layers-actions.c:139 msgctxt "layers-action" msgid "_Delete Layer" msgstr "ا_حذف الطبقة" -#: ../app/actions/layers-actions.c:120 +#: ../app/actions/layers-actions.c:140 msgctxt "layers-action" msgid "Delete this layer" msgstr "احذف هذه الطبقة" -#: ../app/actions/layers-actions.c:125 +#: ../app/actions/layers-actions.c:145 msgctxt "layers-action" msgid "_Raise Layer" msgstr "ار_فع الطبقة" -#: ../app/actions/layers-actions.c:126 +#: ../app/actions/layers-actions.c:146 msgctxt "layers-action" msgid "Raise this layer one step in the layer stack" msgstr "ارفع الطبقة درجة واحدة في رصة الطبقات" -#: ../app/actions/layers-actions.c:131 +#: ../app/actions/layers-actions.c:151 msgctxt "layers-action" msgid "Layer to _Top" msgstr "الطبقة إلى ال_سطح" -#: ../app/actions/layers-actions.c:132 +#: ../app/actions/layers-actions.c:152 msgctxt "layers-action" msgid "Move this layer to the top of the layer stack" msgstr "انقل الطبقة إلى أعلى رصة الطبقات" -#: ../app/actions/layers-actions.c:137 +#: ../app/actions/layers-actions.c:157 msgctxt "layers-action" msgid "_Lower Layer" msgstr "أ_خفض الطبقة" -#: ../app/actions/layers-actions.c:138 +#: ../app/actions/layers-actions.c:158 msgctxt "layers-action" msgid "Lower this layer one step in the layer stack" msgstr "أخفض الطبقة درجة واحدة في رصة الطبقات" -#: ../app/actions/layers-actions.c:143 +#: ../app/actions/layers-actions.c:163 msgctxt "layers-action" msgid "Layer to _Bottom" msgstr "الطبقة إلى ال_قاع" -#: ../app/actions/layers-actions.c:144 +#: ../app/actions/layers-actions.c:164 msgctxt "layers-action" msgid "Move this layer to the bottom of the layer stack" msgstr "انقل الطبقة إلى أسفل رصة الطبقات" -#: ../app/actions/layers-actions.c:149 +#: ../app/actions/layers-actions.c:169 msgctxt "layers-action" msgid "_Anchor Layer" msgstr "_ثبّت الطبقة" -#: ../app/actions/layers-actions.c:150 +#: ../app/actions/layers-actions.c:170 msgctxt "layers-action" msgid "Anchor the floating layer" msgstr "ثبّت الطبقة الحرة" -#: ../app/actions/layers-actions.c:155 +#: ../app/actions/layers-actions.c:175 msgctxt "layers-action" msgid "Merge Do_wn" msgstr "ا_دمج لأسفل" -#: ../app/actions/layers-actions.c:156 +#: ../app/actions/layers-actions.c:176 msgctxt "layers-action" msgid "Merge this layer with the first visible layer below it" msgstr "ادمج هذه الطبقة بأول طبقة مرئية أسفلها" -#: ../app/actions/layers-actions.c:161 +#: ../app/actions/layers-actions.c:181 msgctxt "layers-action" msgid "Merge Layer Group" msgstr "ادمج مجموعة الطبقات" -#: ../app/actions/layers-actions.c:162 +#: ../app/actions/layers-actions.c:182 msgctxt "layers-action" msgid "Merge the layer group's layers into one normal layer" msgstr "ادمج طبقات مجموعة الطبقات في طبقة عادية واحدة" -#: ../app/actions/layers-actions.c:167 +#: ../app/actions/layers-actions.c:187 msgctxt "layers-action" msgid "Merge _Visible Layers..." msgstr "ادمج الطبقات المر_ئية..." -#: ../app/actions/layers-actions.c:168 +#: ../app/actions/layers-actions.c:188 msgctxt "layers-action" msgid "Merge all visible layers into one layer" msgstr "ادمج كل الطبقات المرئية في طبقة واحدة" -#: ../app/actions/layers-actions.c:173 +#: ../app/actions/layers-actions.c:193 msgctxt "layers-action" msgid "_Flatten Image" msgstr "_سطّح الصورة" -#: ../app/actions/layers-actions.c:174 +#: ../app/actions/layers-actions.c:194 msgctxt "layers-action" msgid "Merge all layers into one and remove transparency" msgstr "ادمج كل الطبقات في واحدة واحذف الشفافية" -#: ../app/actions/layers-actions.c:179 +#: ../app/actions/layers-actions.c:199 msgctxt "layers-action" msgid "_Discard Text Information" msgstr "_تجاهل معلومات النص" -#: ../app/actions/layers-actions.c:180 +#: ../app/actions/layers-actions.c:200 msgctxt "layers-action" msgid "Turn this text layer into a normal layer" msgstr "حوّل هذه الطبقة النصية إلى طبقة عادية" -#: ../app/actions/layers-actions.c:185 +#: ../app/actions/layers-actions.c:205 msgctxt "layers-action" msgid "Text to _Path" msgstr "النص إلى _مسار" -#: ../app/actions/layers-actions.c:186 +#: ../app/actions/layers-actions.c:206 msgctxt "layers-action" msgid "Create a path from this text layer" msgstr "أنشئ مسارا من هذه الطبقة النصية" -#: ../app/actions/layers-actions.c:191 +#: ../app/actions/layers-actions.c:211 msgctxt "layers-action" msgid "Text alon_g Path" msgstr "النص ب_محاذاة المسار" -#: ../app/actions/layers-actions.c:192 +#: ../app/actions/layers-actions.c:212 msgctxt "layers-action" msgid "Warp this layer's text along the current path" msgstr "لف نص هذه الطبقة بمحاذاة المسار الحالي" -#: ../app/actions/layers-actions.c:197 +#: ../app/actions/layers-actions.c:217 msgctxt "layers-action" msgid "Layer B_oundary Size..." msgstr "حجم _حد الطبقة..." -#: ../app/actions/layers-actions.c:198 +#: ../app/actions/layers-actions.c:218 msgctxt "layers-action" msgid "Adjust the layer dimensions" msgstr "اضبط أبعاد الطبقة" -#: ../app/actions/layers-actions.c:203 +#: ../app/actions/layers-actions.c:223 msgctxt "layers-action" msgid "Layer to _Image Size" msgstr "الطبقة إلى حجم ال_صورة" -#: ../app/actions/layers-actions.c:204 +#: ../app/actions/layers-actions.c:224 msgctxt "layers-action" msgid "Resize the layer to the size of the image" msgstr "أعد تحجيم الطبقة إلى حجم الصورة" -#: ../app/actions/layers-actions.c:209 +#: ../app/actions/layers-actions.c:229 msgctxt "layers-action" msgid "_Scale Layer..." msgstr "_حجّم الطبقة..." -#: ../app/actions/layers-actions.c:210 +#: ../app/actions/layers-actions.c:230 msgctxt "layers-action" msgid "Change the size of the layer content" msgstr "غيّر حجم محتوى الطبقة" -#: ../app/actions/layers-actions.c:215 +#: ../app/actions/layers-actions.c:235 msgctxt "layers-action" msgid "_Crop to Selection" msgstr "_قصّر إلى التحديد" -#: ../app/actions/layers-actions.c:216 +#: ../app/actions/layers-actions.c:236 msgctxt "layers-action" msgid "Crop the layer to the extents of the selection" msgstr "قصّر الطبقة إلى حدود التحديد" -#: ../app/actions/layers-actions.c:221 +#: ../app/actions/layers-actions.c:241 msgctxt "layers-action" msgid "Crop to C_ontent" msgstr "قصّر إلى المحتوى" -#: ../app/actions/layers-actions.c:222 +#: ../app/actions/layers-actions.c:242 msgctxt "layers-action" msgid "" "Crop the layer to the extents of its content (remove empty borders from the " "layer)" msgstr "قصّر الصورة إلى الطبقة إلى حدود محتواها (أزل الحدود الخالية من الطبقة)" -#: ../app/actions/layers-actions.c:227 ../app/actions/layers-actions.c:237 +#: ../app/actions/layers-actions.c:247 ../app/actions/layers-actions.c:257 msgctxt "layers-action" msgid "Add La_yer Mask..." msgstr "أضِف ق_ناع طبقة..." -#: ../app/actions/layers-actions.c:229 ../app/actions/layers-actions.c:239 +#: ../app/actions/layers-actions.c:249 ../app/actions/layers-actions.c:259 msgctxt "layers-action" msgid "Add a mask that allows non-destructive editing of transparency" msgstr "أضِف قناعا يسمح بتعديل غير مدمّر للشفافية" -#: ../app/actions/layers-actions.c:244 +#: ../app/actions/layers-actions.c:264 msgctxt "layers-action" msgid "Add La_yer Mask" msgstr "أضِف قناع _طبقة" -#: ../app/actions/layers-actions.c:246 +#: ../app/actions/layers-actions.c:266 msgctxt "layers-action" msgid "Add a mask with last used values" msgstr "أضف قناعًا بآخر القيم المستخدمة" -#: ../app/actions/layers-actions.c:251 +#: ../app/actions/layers-actions.c:271 msgctxt "layers-action" msgid "Add Alpha C_hannel" msgstr "أضِف قناة أل_فا" -#: ../app/actions/layers-actions.c:252 +#: ../app/actions/layers-actions.c:272 msgctxt "layers-action" msgid "Add transparency information to the layer" msgstr "أضف معلومات الشفافية إلى الطبقة" -#: ../app/actions/layers-actions.c:257 +#: ../app/actions/layers-actions.c:277 msgctxt "layers-action" msgid "_Remove Alpha Channel" msgstr "ا_حذف قناة الشفافية" -#: ../app/actions/layers-actions.c:258 +#: ../app/actions/layers-actions.c:278 msgctxt "layers-action" msgid "Remove transparency information from the layer" msgstr "احذف معلومات الشفافية من الطبقة" -#: ../app/actions/layers-actions.c:266 +#: ../app/actions/layers-actions.c:286 msgctxt "layers-action" msgid "_Edit Layer Mask" msgstr "_حرّر قناع الطبقة" -#: ../app/actions/layers-actions.c:267 +#: ../app/actions/layers-actions.c:287 msgctxt "layers-action" msgid "Work on the layer mask" msgstr "اعمل على قناع الطبقة" -#: ../app/actions/layers-actions.c:273 +#: ../app/actions/layers-actions.c:293 msgctxt "layers-action" msgid "S_how Layer Mask" msgstr "أ_ظهر قناع الطبقة" -#: ../app/actions/layers-actions.c:279 +#: ../app/actions/layers-actions.c:299 msgctxt "layers-action" msgid "_Disable Layer Mask" msgstr "_عطّل قناع الطبقة" -#: ../app/actions/layers-actions.c:280 +#: ../app/actions/layers-actions.c:300 msgctxt "layers-action" msgid "Dismiss the effect of the layer mask" msgstr "ألغِ تأثير قناع الطبقة" -#: ../app/actions/layers-actions.c:286 +#: ../app/actions/layers-actions.c:306 msgctxt "layers-action" -msgid "_Visible" -msgstr "مر_ئي" +msgid "Toggle Layer _Visibility" +msgstr "بدّل حالة _ظهور الطبقة" -#: ../app/actions/layers-actions.c:292 +#: ../app/actions/layers-actions.c:312 msgctxt "layers-action" -msgid "_Linked" -msgstr "_مربوط" +msgid "Toggle Layer _Linked State" +msgstr "بدّل حالة رب_ط الطبقة" -#. GIMP_STOCK_LOCK -#: ../app/actions/layers-actions.c:298 +#. GIMP_ICON_LOCK +#: ../app/actions/layers-actions.c:318 msgctxt "layers-action" -msgid "L_ock pixels" -msgstr "أوصِد الب_كسلات" +msgid "L_ock Pixels of Layer" +msgstr "أو_صِد بكسلات الطبقة" -#: ../app/actions/layers-actions.c:304 +#: ../app/actions/layers-actions.c:324 msgctxt "layers-action" -msgid "L_ock position" -msgstr "أو_صِد الموضع" +msgid "L_ock Position of Layer" +msgstr "أو_صِد مو_ضع الطبقة" -#: ../app/actions/layers-actions.c:310 +#: ../app/actions/layers-actions.c:330 msgctxt "layers-action" msgid "Lock Alph_a Channel" msgstr "أوصد طبقة أ_لفا" -#: ../app/actions/layers-actions.c:312 +#: ../app/actions/layers-actions.c:332 msgctxt "layers-action" msgid "Keep transparency information on this layer from being modified" msgstr "امنع معلومات الشفافية في هذه الطبقة من أن تعدل" -#. abused -#: ../app/actions/layers-actions.c:321 +#: ../app/actions/layers-actions.c:341 ../app/actions/layers-actions.c:362 +#: ../app/actions/layers-actions.c:383 +msgctxt "layers-action" +msgid "Auto" +msgstr "تلقائي" + +#: ../app/actions/layers-actions.c:342 +msgctxt "layers-action" +msgid "Layer Blend Space: Auto" +msgstr "" + +#: ../app/actions/layers-actions.c:347 ../app/actions/layers-actions.c:368 +msgctxt "layers-action" +msgid "RGB (linear)" +msgstr "" + +#: ../app/actions/layers-actions.c:348 +msgctxt "layers-action" +msgid "Layer Blend Space: RGB (linear)" +msgstr "" + +#: ../app/actions/layers-actions.c:353 ../app/actions/layers-actions.c:374 +#, fuzzy +msgctxt "layers-action" +msgid "RGB (perceptual)" +msgstr "النسبة المئوية:" + +#: ../app/actions/layers-actions.c:354 +msgctxt "layers-action" +msgid "Layer Blend Space: RGB (perceptual)" +msgstr "" + +#: ../app/actions/layers-actions.c:363 +msgctxt "layers-action" +msgid "Layer Composite Space: Auto" +msgstr "" + +#: ../app/actions/layers-actions.c:369 +msgctxt "layers-action" +msgid "Layer Composite Space: RGB (linear)" +msgstr "" + +#: ../app/actions/layers-actions.c:375 +msgctxt "layers-action" +msgid "Layer Composite Space: RGB (perceptual)" +msgstr "" + +#: ../app/actions/layers-actions.c:384 +msgctxt "layers-action" +msgid "Layer Composite Mode: Auto" +msgstr "" + +#: ../app/actions/layers-actions.c:389 +msgctxt "layers-action" +msgid "Union" +msgstr "" + +#: ../app/actions/layers-actions.c:390 +msgctxt "layers-action" +msgid "Layer Composite Mode: Union" +msgstr "" + +#: ../app/actions/layers-actions.c:395 +#, fuzzy +msgctxt "layers-action" +msgid "Clip to Backdrop" +msgstr "انقر للإظهار" + +#: ../app/actions/layers-actions.c:396 +msgctxt "layers-action" +msgid "Layer Composite Mode: Clip to Backdrop" +msgstr "" + +#: ../app/actions/layers-actions.c:401 +#, fuzzy +msgctxt "layers-action" +msgid "Clip to Layer" +msgstr "اقلب الطبقة النصية" + +#: ../app/actions/layers-actions.c:402 +msgctxt "layers-action" +msgid "Layer Composite Mode: Clip to Layer" +msgstr "" + +#: ../app/actions/layers-actions.c:407 +#, fuzzy +msgctxt "layers-action" +msgid "Intersection" +msgstr "قاطع" + +#: ../app/actions/layers-actions.c:408 +msgctxt "layers-action" +msgid "Layer Composite Mode: Intersection" +msgstr "" + +#: ../app/actions/layers-actions.c:416 msgctxt "layers-action" msgid "None" msgstr "بدون" -#: ../app/actions/layers-actions.c:322 +#: ../app/actions/layers-actions.c:417 msgctxt "layers-action" -msgid "Clear color tag" -msgstr "امسح وسم اللون" +msgid "Layer Color Tag: Clear" +msgstr "" -#: ../app/actions/layers-actions.c:327 +#: ../app/actions/layers-actions.c:422 msgctxt "layers-action" msgid "Blue" msgstr "أزرق" -#: ../app/actions/layers-actions.c:328 +#: ../app/actions/layers-actions.c:423 +#, fuzzy msgctxt "layers-action" -msgid "Set color tag to blue" +msgid "Layer Color Tag: Set to Blue" msgstr "ضع وسم لون أزرق" -#: ../app/actions/layers-actions.c:333 +#: ../app/actions/layers-actions.c:428 msgctxt "layers-action" msgid "Green" msgstr "أخضر" -#: ../app/actions/layers-actions.c:334 +#: ../app/actions/layers-actions.c:429 +#, fuzzy msgctxt "layers-action" -msgid "Set color tag to green" +msgid "Layer Color Tag: Set to Green" msgstr "ضع وسم لون أخضر" -#: ../app/actions/layers-actions.c:339 +#: ../app/actions/layers-actions.c:434 msgctxt "layers-action" msgid "Yellow" msgstr "أصفر" -#: ../app/actions/layers-actions.c:340 +#: ../app/actions/layers-actions.c:435 +#, fuzzy msgctxt "layers-action" -msgid "Set color tag to yellow" +msgid "Layer Color Tag: Set to Yellow" msgstr "ضع وسم لون أصفر" -#: ../app/actions/layers-actions.c:345 +#: ../app/actions/layers-actions.c:440 msgctxt "layers-action" msgid "Orange" msgstr "برتقالي" -#: ../app/actions/layers-actions.c:346 +#: ../app/actions/layers-actions.c:441 +#, fuzzy msgctxt "layers-action" -msgid "Set color tag to orange" +msgid "Layer Color Tag: Set to Orange" msgstr "ضع وسم لون برتقالي" -#: ../app/actions/layers-actions.c:351 +#: ../app/actions/layers-actions.c:446 msgctxt "layers-action" msgid "Brown" msgstr "بني" -#: ../app/actions/layers-actions.c:352 +#: ../app/actions/layers-actions.c:447 +#, fuzzy msgctxt "layers-action" -msgid "Set color tag to brown" +msgid "Layer Color Tag: Set to Brown" msgstr "ضع وسم لون بني" -#: ../app/actions/layers-actions.c:357 +#: ../app/actions/layers-actions.c:452 msgctxt "layers-action" msgid "Red" msgstr "أحمر" -#: ../app/actions/layers-actions.c:358 +#: ../app/actions/layers-actions.c:453 +#, fuzzy msgctxt "layers-action" -msgid "Set color tag to red" +msgid "Layer Color Tag: Set to Red" msgstr "ضع وسم لون أحمر" -#: ../app/actions/layers-actions.c:363 +#: ../app/actions/layers-actions.c:458 msgctxt "layers-action" msgid "Violet" msgstr "بنفسجي" -#: ../app/actions/layers-actions.c:364 +#: ../app/actions/layers-actions.c:459 +#, fuzzy msgctxt "layers-action" -msgid "Set color tag to violet" +msgid "Layer Color Tag: Set to Violet" msgstr "ضع وسم لون بنفسجي" -#: ../app/actions/layers-actions.c:369 +#: ../app/actions/layers-actions.c:464 msgctxt "layers-action" msgid "Gray" msgstr "رمادي" -#: ../app/actions/layers-actions.c:370 +#: ../app/actions/layers-actions.c:465 +#, fuzzy msgctxt "layers-action" -msgid "Set color tag to gray" +msgid "Layer Color Tag: Set to Gray" msgstr "ضع وسم لون رمادي" -#: ../app/actions/layers-actions.c:378 +#: ../app/actions/layers-actions.c:473 msgctxt "layers-action" msgid "Apply Layer _Mask" msgstr "طبّق _قناع الطبقة" -#: ../app/actions/layers-actions.c:379 +#: ../app/actions/layers-actions.c:474 msgctxt "layers-action" msgid "Apply the effect of the layer mask and remove it" msgstr "طبّق تأثير قناع الطبقة ثم احذفه" -#: ../app/actions/layers-actions.c:384 +#: ../app/actions/layers-actions.c:479 msgctxt "layers-action" msgid "Delete Layer Mas_k" msgstr "احذف قناع ال_طبقة" -#: ../app/actions/layers-actions.c:385 +#: ../app/actions/layers-actions.c:480 msgctxt "layers-action" msgid "Remove the layer mask and its effect" msgstr "احذف قناع الطبقة وتأثيراته" -#: ../app/actions/layers-actions.c:393 +#: ../app/actions/layers-actions.c:488 msgctxt "layers-action" msgid "_Mask to Selection" msgstr "_قناع من التحديد" -#: ../app/actions/layers-actions.c:394 +#: ../app/actions/layers-actions.c:489 msgctxt "layers-action" msgid "Replace the selection with the layer mask" msgstr "استبدل بالتحديد قناع الطبقة" -#: ../app/actions/layers-actions.c:399 +#: ../app/actions/layers-actions.c:494 msgctxt "layers-action" msgid "_Add to Selection" msgstr "أ_ضف إلى التحديد" -#: ../app/actions/layers-actions.c:400 +#: ../app/actions/layers-actions.c:495 msgctxt "layers-action" msgid "Add the layer mask to the current selection" msgstr "أضِف قناع الطبقة إلى التحديد الحالي" -#: ../app/actions/layers-actions.c:405 ../app/actions/layers-actions.c:434 +#: ../app/actions/layers-actions.c:500 ../app/actions/layers-actions.c:529 msgctxt "layers-action" msgid "_Subtract from Selection" msgstr "ا_طرح من التحديد" -#: ../app/actions/layers-actions.c:406 +#: ../app/actions/layers-actions.c:501 msgctxt "layers-action" msgid "Subtract the layer mask from the current selection" msgstr "اطرح قناع الطبقة من التحديد الحالي" -#: ../app/actions/layers-actions.c:411 ../app/actions/layers-actions.c:441 +#: ../app/actions/layers-actions.c:506 ../app/actions/layers-actions.c:536 msgctxt "layers-action" msgid "_Intersect with Selection" msgstr "_قاطع مع التحديد" -#: ../app/actions/layers-actions.c:412 +#: ../app/actions/layers-actions.c:507 msgctxt "layers-action" msgid "Intersect the layer mask with the current selection" msgstr "قاطِع قناع الطبقة مع التحديد الحالي" -#: ../app/actions/layers-actions.c:420 +#: ../app/actions/layers-actions.c:515 msgctxt "layers-action" msgid "Al_pha to Selection" msgstr "أل_فا من التحديد" -#: ../app/actions/layers-actions.c:422 +#: ../app/actions/layers-actions.c:517 msgctxt "layers-action" msgid "Replace the selection with the layer's alpha channel" msgstr "استبدل بالتحديد قناة شفافية الطبقة" -#: ../app/actions/layers-actions.c:427 +#: ../app/actions/layers-actions.c:522 msgctxt "layers-action" msgid "A_dd to Selection" msgstr "أ_ضف إلى التحديد" -#: ../app/actions/layers-actions.c:429 +#: ../app/actions/layers-actions.c:524 msgctxt "layers-action" msgid "Add the layer's alpha channel to the current selection" msgstr "أضِف قناة شفافية الطبقة إلى التحديد الحالي" -#: ../app/actions/layers-actions.c:436 +#: ../app/actions/layers-actions.c:531 msgctxt "layers-action" msgid "Subtract the layer's alpha channel from the current selection" msgstr "اطرح قناة شفافية الطبقة من التحديد الحالي" -#: ../app/actions/layers-actions.c:443 +#: ../app/actions/layers-actions.c:538 msgctxt "layers-action" msgid "Intersect the layer's alpha channel with the current selection" msgstr "قاطع قناة شفافية الطبقة مع التحديد الحالي" -#: ../app/actions/layers-actions.c:451 +#: ../app/actions/layers-actions.c:546 msgctxt "layers-action" msgid "Select _Top Layer" msgstr "ا_ختر طبقة السطح" -#: ../app/actions/layers-actions.c:452 +#: ../app/actions/layers-actions.c:547 msgctxt "layers-action" msgid "Select the topmost layer" msgstr "اختر الطبقة الأعلى" -#: ../app/actions/layers-actions.c:457 +#: ../app/actions/layers-actions.c:552 msgctxt "layers-action" msgid "Select _Bottom Layer" msgstr "اختر طبقة ال_قاع" -#: ../app/actions/layers-actions.c:458 +#: ../app/actions/layers-actions.c:553 msgctxt "layers-action" msgid "Select the bottommost layer" msgstr "اختر الطبقة الأدنى" -#: ../app/actions/layers-actions.c:463 +#: ../app/actions/layers-actions.c:558 msgctxt "layers-action" msgid "Select _Previous Layer" msgstr "اختر الطبقة ال_سابقة" -#: ../app/actions/layers-actions.c:464 +#: ../app/actions/layers-actions.c:559 msgctxt "layers-action" msgid "Select the layer above the current layer" msgstr "اختر الطبقة فوق هذه الطبقة" -#: ../app/actions/layers-actions.c:469 +#: ../app/actions/layers-actions.c:564 msgctxt "layers-action" msgid "Select _Next Layer" msgstr "اختر الطبقة ال_تالية" -#: ../app/actions/layers-actions.c:470 +#: ../app/actions/layers-actions.c:565 msgctxt "layers-action" msgid "Select the layer below the current layer" msgstr "اختر الطبقة تحت هذه الطبقة" +#: ../app/actions/layers-actions.c:573 +#, fuzzy +msgctxt "layers-action" +msgid "Layer Opacity: Set" +msgstr "إعتام الأساس" + +#: ../app/actions/layers-actions.c:577 +msgctxt "layers-action" +msgid "Layer Opacity: Make Completely Transparent" +msgstr "" + +#: ../app/actions/layers-actions.c:581 +msgctxt "layers-action" +msgid "Layer Opacity: Make Completely Opaque" +msgstr "" + +#: ../app/actions/layers-actions.c:585 +msgctxt "layers-action" +msgid "Layer Opacity: Make More Transparent" +msgstr "" + +#: ../app/actions/layers-actions.c:589 +msgctxt "layers-action" +msgid "Layer Opacity: Make More Opaque" +msgstr "" + +#: ../app/actions/layers-actions.c:593 +msgctxt "layers-action" +msgid "Layer Opacity: Make 10% More Transparent" +msgstr "" + +#: ../app/actions/layers-actions.c:597 +msgctxt "layers-action" +msgid "Layer Opacity: Make 10% More Opaque" +msgstr "" + +#: ../app/actions/layers-actions.c:605 +#, fuzzy +msgctxt "layers-action" +msgid "Layer Mode: Select First" +msgstr "قناع الطبقة إلى التحديد" + +#: ../app/actions/layers-actions.c:609 +#, fuzzy +msgctxt "layers-action" +msgid "Layer Mode: Select Last" +msgstr "اختيار طبقة" + +#: ../app/actions/layers-actions.c:613 +#, fuzzy +msgctxt "layers-action" +msgid "Layer Mode: Select Previous" +msgstr "قناع الطبقة إلى التحديد" + +#: ../app/actions/layers-actions.c:617 +#, fuzzy +msgctxt "layers-action" +msgid "Layer Mode: Select Next" +msgstr "اختيار طبقة" + #. Will be followed with e.g. "Shift-Click #. on thumbnail" #. -#: ../app/actions/layers-actions.c:551 +#: ../app/actions/layers-actions.c:646 msgid "Shortcut: " msgstr "الاختصار:" #. Will be prepended with a modifier key #. string, e.g. "Shift" #. -#: ../app/actions/layers-actions.c:556 +#: ../app/actions/layers-actions.c:651 msgid "-Click on thumbnail in Layers dockable" msgstr "-نقر على المصغرة في رصيف الطبقات" -#: ../app/actions/layers-actions.c:723 ../app/actions/layers-actions.c:724 +#: ../app/actions/layers-actions.c:909 ../app/actions/layers-actions.c:910 msgctxt "layers-action" msgid "To _New Layer" msgstr "إلى طبقة ج_ديدة" -#: ../app/actions/layers-commands.c:255 ../app/actions/layers-commands.c:1324 +#: ../app/actions/layers-commands.c:259 ../app/actions/layers-commands.c:1418 msgid "Layer Attributes" msgstr "صفات الطبقة" -#: ../app/actions/layers-commands.c:258 +#: ../app/actions/layers-commands.c:262 msgid "Edit Layer Attributes" msgstr "حرّر صفات الطبقة" -#: ../app/actions/layers-commands.c:321 ../app/actions/layers-commands.c:393 +#: ../app/actions/layers-commands.c:328 #: ../app/widgets/gimpdrawabletreeview.c:331 -#: ../app/widgets/gimplayertreeview.c:845 +#: ../app/widgets/gimplayertreeview.c:882 msgid "New Layer" msgstr "طبقة جديدة" -#: ../app/actions/layers-commands.c:324 +#: ../app/actions/layers-commands.c:331 msgid "Create a New Layer" msgstr "أنشئ طبقة جديدة" -#: ../app/actions/layers-commands.c:433 ../app/core/gimptoolinfo.c:82 +#: ../app/actions/layers-commands.c:420 ../app/core/gimptoolinfo.c:82 msgid "Visible" msgstr "المرئي" -#: ../app/actions/layers-commands.c:698 +#: ../app/actions/layers-commands.c:685 msgid "Set Layer Boundary Size" msgstr "حدد حجم حد الطبقة" -#: ../app/actions/layers-commands.c:760 +#: ../app/actions/layers-commands.c:747 msgid "Scale Layer" msgstr "حجّم الطبقة" -#: ../app/actions/layers-commands.c:802 +#: ../app/actions/layers-commands.c:789 msgid "Crop Layer to Selection" msgstr "قصّر الطبقة إلى التحديد" -#: ../app/actions/layers-commands.c:832 +#: ../app/actions/layers-commands.c:819 msgid "Crop Layer to Content" msgstr "قصّر الطبقة إلى المحتوى" -#: ../app/actions/layers-commands.c:845 +#: ../app/actions/layers-commands.c:832 msgid "Cannot crop because the active layer has no content." msgstr "تعذّر التقصير لأن الطبقة النشطة خالية." -#: ../app/actions/layers-commands.c:852 +#: ../app/actions/layers-commands.c:839 msgid "Cannot crop because the active layer is already cropped to its content." msgstr "تعذّر التقصير لأن الطبقة النشطة مقصّرة إلى محتواها بالفعل." @@ -5254,11 +7039,11 @@ msgstr "ب_عّد" msgid "Zoom _All" msgstr "قرّب ال_كل" -#: ../app/actions/palette-editor-commands.c:69 +#: ../app/actions/palette-editor-commands.c:70 msgid "Edit Palette Color" msgstr "حرّر لون لوحة الألوان" -#: ../app/actions/palette-editor-commands.c:71 +#: ../app/actions/palette-editor-commands.c:72 msgid "Edit Color Palette Entry" msgstr "حرّر مدخلة لوحة الألوان" @@ -5468,6 +7253,20 @@ msgstr "صفّر كل الملحقات إلى إعداداتها المبدئي msgid "Reset all Filters" msgstr "صفّر كل المرشحات" +#: ../app/actions/plug-in-commands.c:181 +#: ../app/actions/tool-options-commands.c:196 ../app/dialogs/fill-dialog.c:114 +#: ../app/dialogs/grid-dialog.c:101 ../app/dialogs/image-new-dialog.c:105 +#: ../app/dialogs/preferences-dialog.c:288 +#: ../app/dialogs/preferences-dialog.c:1095 +#: ../app/dialogs/print-size-dialog.c:123 ../app/dialogs/scale-dialog.c:136 +#: ../app/dialogs/stroke-dialog.c:127 +#: ../app/display/gimpdisplayshell-rotate-dialog.c:121 +#: ../app/tools/gimpfiltertool.c:320 ../app/tools/gimptransformtool.c:1200 +#: ../app/widgets/gimpcolordialog.c:109 +#, fuzzy +msgid "_Reset" +msgstr "_صفّر المنحنى" + #: ../app/actions/plug-in-commands.c:195 msgid "Do you really want to reset all filters to default values?" msgstr "هل تريد حقا تصفير جميع المرشحات إلى القيم المبدئية؟" @@ -5480,7 +7279,7 @@ msgstr "قائمة القناع السريع" #: ../app/actions/quick-mask-actions.c:47 msgctxt "quick-mask-action" msgid "_Configure Color and Opacity..." -msgstr "ا_ضبط اللون والإعتام..." +msgstr "ا_ضبط اللون والعتامة..." #: ../app/actions/quick-mask-actions.c:55 msgctxt "quick-mask-action" @@ -5516,7 +7315,7 @@ msgstr "حرّر لون القناع السريع" #: ../app/actions/quick-mask-commands.c:128 msgid "_Mask opacity:" -msgstr "إ_عتام القناع:" +msgstr "_عتامة القناع:" #: ../app/actions/sample-points-actions.c:40 msgctxt "sample-points-action" @@ -5822,6 +7621,12 @@ msgstr "حرّر القالب" msgid "Delete Template" msgstr "احذف القالب" +#: ../app/actions/templates-commands.c:245 +#: ../app/dialogs/data-delete-dialog.c:87 ../app/widgets/gimpdeviceeditor.c:509 +#, fuzzy +msgid "_Delete" +msgstr "ا_حذف" + #: ../app/actions/templates-commands.c:266 #, c-format msgid "" @@ -5873,12 +7678,22 @@ msgstr "من اليمين إلى اليسار" msgid "Open Text File (UTF-8)" msgstr "افتح ملفا نصيا (UTF-8)" +#: ../app/actions/text-editor-commands.c:65 +#: ../app/actions/text-tool-commands.c:119 +#: ../app/dialogs/file-open-location-dialog.c:81 +#: ../app/dialogs/vectors-import-dialog.c:89 +#: ../app/widgets/gimpiconpicker.c:489 ../app/widgets/gimpopendialog.c:69 +#: ../app/widgets/gimpsettingsbox.c:736 +#, fuzzy +msgid "_Open" +msgstr "افتح" + #: ../app/actions/text-editor-commands.c:139 #: ../app/actions/text-tool-commands.c:209 ../app/config/gimpconfig-file.c:71 #: ../app/core/gimppalette-import.c:510 ../app/plug-in/gimpenvirontable.c:289 #: ../app/plug-in/gimpinterpreterdb.c:233 -#: ../app/tools/gimpfiltertool-settings.c:168 -#: ../app/widgets/gimptextbuffer.c:1647 +#: ../app/tools/gimpfiltertool-settings.c:170 +#: ../app/widgets/gimptextbuffer.c:1674 #, c-format msgid "Could not open '%s' for reading: %s" msgstr "لا يمكن فتح '%s' للقراءة: %s" @@ -6012,7 +7827,7 @@ msgstr "صفّر كل خيارات الأدوات" msgid "Reset All Tool Options" msgstr "صفّر كل خيارات الأدوات" -#: ../app/actions/tool-options-commands.c:211 +#: ../app/actions/tool-options-commands.c:212 msgid "Do you really want to reset all tool options to default values?" msgstr "هل تريد حقا تصفير جميع خيارات الأدوات إلى القيم المبدئية؟" @@ -6192,364 +8007,861 @@ msgctxt "tools-action" msgid "Rotate by an arbitrary angle" msgstr "دوّر بزاوية محددة" +#: ../app/actions/tools-actions.c:151 +#, fuzzy +msgctxt "tools-action" +msgid "Airbrush Rate: Set" +msgstr "فرشاة هواء" + +#: ../app/actions/tools-actions.c:155 +msgctxt "tools-action" +msgid "Airbrush Rate: Set to Minimum" +msgstr "" + +#: ../app/actions/tools-actions.c:159 +msgctxt "tools-action" +msgid "Airbrush Rate: Set to Maximum" +msgstr "" + +#: ../app/actions/tools-actions.c:163 +msgctxt "tools-action" +msgid "Airbrush Rate: Decrease by 1" +msgstr "" + +#: ../app/actions/tools-actions.c:167 +msgctxt "tools-action" +msgid "Airbrush Rate: Increase by 1" +msgstr "" + +#: ../app/actions/tools-actions.c:171 +msgctxt "tools-action" +msgid "Airbrush Rate: Decrease by 10" +msgstr "" + +#: ../app/actions/tools-actions.c:175 +msgctxt "tools-action" +msgid "Airbrush Rate: Increase by 10" +msgstr "" + +#: ../app/actions/tools-actions.c:183 +#, fuzzy +msgctxt "tools-action" +msgid "Airbrush Flow: Set" +msgstr "فرشاة هواء" + +#: ../app/actions/tools-actions.c:187 +msgctxt "tools-action" +msgid "Airbrush Flow: Set to Minimum" +msgstr "" + +#: ../app/actions/tools-actions.c:191 +msgctxt "tools-action" +msgid "Airbrush Flow: Set to Maximum" +msgstr "" + +#: ../app/actions/tools-actions.c:195 +msgctxt "tools-action" +msgid "Airbrush Flow: Decrease by 1" +msgstr "" + +#: ../app/actions/tools-actions.c:199 +msgctxt "tools-action" +msgid "Airbrush Flow: Increase by 1" +msgstr "" + +#: ../app/actions/tools-actions.c:203 +msgctxt "tools-action" +msgid "Airbrush Flow: Decrease by 10" +msgstr "" + +#: ../app/actions/tools-actions.c:207 +msgctxt "tools-action" +msgid "Airbrush Flow: Increase by 10" +msgstr "" + +#: ../app/actions/tools-actions.c:264 +msgctxt "tools-action" +msgid "Tool's Opacity: Set" +msgstr "" + +#: ../app/actions/tools-actions.c:268 +#, fuzzy +msgctxt "tools-action" +msgid "Tool's Opacity: Set to Default Value" +msgstr "_صفّر خيارات الأدوات إلى القيم المبدئية" + +#: ../app/actions/tools-actions.c:272 +msgctxt "tools-action" +msgid "Tool's Opacity: Minimize" +msgstr "" + +#: ../app/actions/tools-actions.c:276 +msgctxt "tools-action" +msgid "Tool's Opacity: Maximize" +msgstr "" + +#: ../app/actions/tools-actions.c:280 +msgctxt "tools-action" +msgid "Tool's Opacity: Decrease by 1" +msgstr "" + +#: ../app/actions/tools-actions.c:284 +msgctxt "tools-action" +msgid "Tool's Opacity: Increase by 1" +msgstr "" + +#: ../app/actions/tools-actions.c:288 +msgctxt "tools-action" +msgid "Tool's Opacity: Decrease by 10" +msgstr "" + +#: ../app/actions/tools-actions.c:292 +msgctxt "tools-action" +msgid "Tool's Opacity: Increase by 10" +msgstr "" + +#: ../app/actions/tools-actions.c:296 +msgctxt "tools-action" +msgid "Tool's Opacity: Decrease Relative" +msgstr "" + +#: ../app/actions/tools-actions.c:300 +msgctxt "tools-action" +msgid "Tool's Opacity: Increase Relative" +msgstr "" + +#: ../app/actions/tools-actions.c:308 +msgctxt "tools-action" +msgid "Tool's Size: Set" +msgstr "" + +#: ../app/actions/tools-actions.c:312 +#, fuzzy +msgctxt "tools-action" +msgid "Tool's Size: Set to Default Value" +msgstr "استعد القيم المبدئية" + +#: ../app/actions/tools-actions.c:316 +msgctxt "tools-action" +msgid "Tool's Size: Minimize" +msgstr "" + +#: ../app/actions/tools-actions.c:320 +msgctxt "tools-action" +msgid "Tool's Size: Maximize" +msgstr "" + +#: ../app/actions/tools-actions.c:324 +msgctxt "tools-action" +msgid "Tool's Size: Decrease by 1" +msgstr "" + +#: ../app/actions/tools-actions.c:328 +msgctxt "tools-action" +msgid "Tool's Size: Increase by 1" +msgstr "" + +#: ../app/actions/tools-actions.c:332 +msgctxt "tools-action" +msgid "Tool's Size: Decrease by 10" +msgstr "" + +#: ../app/actions/tools-actions.c:336 +msgctxt "tools-action" +msgid "Tool's Size: Increase by 10" +msgstr "" + +#: ../app/actions/tools-actions.c:340 +msgctxt "tools-action" +msgid "Tool's Size: Decrease Relative" +msgstr "" + +#: ../app/actions/tools-actions.c:344 +msgctxt "tools-action" +msgid "Tool's Size: Increase Relative" +msgstr "" + +#: ../app/actions/tools-actions.c:352 +#, fuzzy +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Set" +msgstr "نسبة أبعاد الفرشاة" + +#: ../app/actions/tools-actions.c:356 +#, fuzzy +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Set To Default Value" +msgstr "_صفّر خيارات الأدوات إلى القيم المبدئية" + +#: ../app/actions/tools-actions.c:360 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Minimize" +msgstr "" + +#: ../app/actions/tools-actions.c:364 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Maximize" +msgstr "" + +#: ../app/actions/tools-actions.c:368 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Decrease by 0.1" +msgstr "" + +#: ../app/actions/tools-actions.c:372 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Increase by 0.1" +msgstr "" + +#: ../app/actions/tools-actions.c:376 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Decrease by 1" +msgstr "" + +#: ../app/actions/tools-actions.c:380 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Increase by 1" +msgstr "" + +#: ../app/actions/tools-actions.c:384 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Decrease Relative" +msgstr "" + +#: ../app/actions/tools-actions.c:388 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Increase Relative" +msgstr "" + +#: ../app/actions/tools-actions.c:396 +msgctxt "tools-action" +msgid "Tool's Angle: Set" +msgstr "" + +#: ../app/actions/tools-actions.c:400 +msgctxt "tools-action" +msgid "Tool's Angle: Set Angle To Default Value" +msgstr "" + +#: ../app/actions/tools-actions.c:404 +msgctxt "tools-action" +msgid "Tool's Angle: Minimize" +msgstr "" + +#: ../app/actions/tools-actions.c:408 +msgctxt "tools-action" +msgid "Tool's Angle: Maximize" +msgstr "" + +#: ../app/actions/tools-actions.c:412 +msgctxt "tools-action" +msgid "Tool's Angle: Decrease by 1°" +msgstr "" + +#: ../app/actions/tools-actions.c:416 +msgctxt "tools-action" +msgid "Tool's Angle: Increase by 1°" +msgstr "" + +#: ../app/actions/tools-actions.c:420 +msgctxt "tools-action" +msgid "Tool's Angle: Decrease by 15°" +msgstr "" + +#: ../app/actions/tools-actions.c:424 +msgctxt "tools-action" +msgid "Tool's Angle: Increase by 15°" +msgstr "" + +#: ../app/actions/tools-actions.c:428 +msgctxt "tools-action" +msgid "Tool's Angle: Decrease Relative" +msgstr "" + +#: ../app/actions/tools-actions.c:432 +msgctxt "tools-action" +msgid "Tool's Angle: Increase Relative" +msgstr "" + +#: ../app/actions/tools-actions.c:440 +msgctxt "tools-action" +msgid "Tool's Spacing: Set" +msgstr "" + +#: ../app/actions/tools-actions.c:444 +#, fuzzy +msgctxt "tools-action" +msgid "Tool's Spacing: Set To Default Value" +msgstr "_صفّر خيارات الأدوات إلى القيم المبدئية" + +#: ../app/actions/tools-actions.c:448 +msgctxt "tools-action" +msgid "Tool's Spacing: Minimize" +msgstr "" + +#: ../app/actions/tools-actions.c:452 +msgctxt "tools-action" +msgid "Tool's Spacing: Maximize" +msgstr "" + +#: ../app/actions/tools-actions.c:456 +msgctxt "tools-action" +msgid "Tool's Spacing: Decrease by 1" +msgstr "" + +#: ../app/actions/tools-actions.c:460 +msgctxt "tools-action" +msgid "Tool's Spacing: Increase by 1" +msgstr "" + +#: ../app/actions/tools-actions.c:464 +msgctxt "tools-action" +msgid "Tool's Spacing: Decrease by 10" +msgstr "" + +#: ../app/actions/tools-actions.c:468 +msgctxt "tools-action" +msgid "Tool's Spacing: Increase by 10" +msgstr "" + +#: ../app/actions/tools-actions.c:472 +msgctxt "tools-action" +msgid "Tool's Spacing: Decrease Relative" +msgstr "" + +#: ../app/actions/tools-actions.c:476 +msgctxt "tools-action" +msgid "Tool's Spacing: Increase Relative" +msgstr "" + +#: ../app/actions/tools-actions.c:484 +#, fuzzy +msgctxt "tools-action" +msgid "Tool's Hardness: Set" +msgstr "محفوظات الخيارات" + +#: ../app/actions/tools-actions.c:488 +#, fuzzy +msgctxt "tools-action" +msgid "Tool's Hardness: Set to Default Value" +msgstr "استعد القيم المبدئية" + +#: ../app/actions/tools-actions.c:492 +msgctxt "tools-action" +msgid "Tool's Hardness: Minimize" +msgstr "" + +#: ../app/actions/tools-actions.c:496 +msgctxt "tools-action" +msgid "Tool's Hardness: Maximize" +msgstr "" + +#: ../app/actions/tools-actions.c:500 +msgctxt "tools-action" +msgid "Tool's Hardness: Decrease by 1" +msgstr "" + +#: ../app/actions/tools-actions.c:504 +msgctxt "tools-action" +msgid "Tool's Hardness: Increase by 1" +msgstr "" + +#: ../app/actions/tools-actions.c:508 +msgctxt "tools-action" +msgid "Tool's Hardness: Decrease by 10" +msgstr "" + +#: ../app/actions/tools-actions.c:512 +msgctxt "tools-action" +msgid "Tool's Hardness: Increase by 10" +msgstr "" + +#: ../app/actions/tools-actions.c:516 +msgctxt "tools-action" +msgid "Tool's Hardness: Decrease Relative" +msgstr "" + +#: ../app/actions/tools-actions.c:520 +msgctxt "tools-action" +msgid "Tool's Hardness: Increase Relative" +msgstr "" + +#: ../app/actions/tools-actions.c:528 +#, fuzzy +msgctxt "tools-action" +msgid "Tool's Force: Set" +msgstr "محفوظات الخيارات" + +#: ../app/actions/tools-actions.c:532 +#, fuzzy +msgctxt "tools-action" +msgid "Tool's Force: Set to Default Value" +msgstr "استعد القيم المبدئية" + +#: ../app/actions/tools-actions.c:536 +msgctxt "tools-action" +msgid "Tool's Force: Minimize" +msgstr "" + +#: ../app/actions/tools-actions.c:540 +msgctxt "tools-action" +msgid "Tool's Force: Maximize" +msgstr "" + +#: ../app/actions/tools-actions.c:544 +msgctxt "tools-action" +msgid "Tool's Force: Decrease by 1" +msgstr "" + +#: ../app/actions/tools-actions.c:548 +msgctxt "tools-action" +msgid "Tool's Force: Increase by 1" +msgstr "" + +#: ../app/actions/tools-actions.c:552 +msgctxt "tools-action" +msgid "Tool's Force: Decrease by 10" +msgstr "" + +#: ../app/actions/tools-actions.c:556 +msgctxt "tools-action" +msgid "Tool's Force: Increase by 10" +msgstr "" + +#: ../app/actions/tools-actions.c:560 +msgctxt "tools-action" +msgid "Tool's Force: Decrease Relative" +msgstr "" + +#: ../app/actions/tools-actions.c:564 +msgctxt "tools-action" +msgid "Tool's Force: Increase Relative" +msgstr "" + #: ../app/actions/vectors-actions.c:46 msgctxt "vectors-action" msgid "Paths Menu" msgstr "قائمة المسارات" -#. abused #: ../app/actions/vectors-actions.c:50 msgctxt "vectors-action" msgid "Color Tag" msgstr "وسم اللون" #: ../app/actions/vectors-actions.c:54 +#, fuzzy msgctxt "vectors-action" -msgid "Path _Tool" -msgstr "أداة ال_مسار" +msgid "Edit Pa_th" +msgstr "حرّر فرشاة ماي پينت" -#: ../app/actions/vectors-actions.c:59 +#: ../app/actions/vectors-actions.c:55 +#, fuzzy +msgctxt "vectors-action" +msgid "Edit the active path" +msgstr "صدّر المسار النشط" + +#: ../app/actions/vectors-actions.c:60 msgctxt "vectors-action" msgid "_Edit Path Attributes..." msgstr "_حرّر صفات المسار..." -#: ../app/actions/vectors-actions.c:60 +#: ../app/actions/vectors-actions.c:61 msgctxt "vectors-action" msgid "Edit path attributes" msgstr "حرّر صفات المسار" -#: ../app/actions/vectors-actions.c:65 +#: ../app/actions/vectors-actions.c:66 msgctxt "vectors-action" msgid "_New Path..." msgstr "مسار ج_ديد..." -#: ../app/actions/vectors-actions.c:66 +#: ../app/actions/vectors-actions.c:67 msgctxt "vectors-action" msgid "Create a new path..." msgstr "أنشئ قالبا جديدا" -#: ../app/actions/vectors-actions.c:71 +#: ../app/actions/vectors-actions.c:72 msgctxt "vectors-action" msgid "_New Path with last values" msgstr "_مسار جديد بالقيم الأخيرة" -#: ../app/actions/vectors-actions.c:72 +#: ../app/actions/vectors-actions.c:73 msgctxt "vectors-action" msgid "Create a new path with last used values" msgstr "أنشئ طبقة جديدة بآخر القيم المستخدمة" -#: ../app/actions/vectors-actions.c:77 +#: ../app/actions/vectors-actions.c:78 msgctxt "vectors-action" msgid "D_uplicate Path" msgstr "_كرّر المسار" -#: ../app/actions/vectors-actions.c:78 +#: ../app/actions/vectors-actions.c:79 msgctxt "vectors-action" msgid "Duplicate this path" msgstr "كرّر هذا المسار" -#: ../app/actions/vectors-actions.c:83 +#: ../app/actions/vectors-actions.c:84 msgctxt "vectors-action" msgid "_Delete Path" msgstr "اح_ذف المسار" -#: ../app/actions/vectors-actions.c:84 +#: ../app/actions/vectors-actions.c:85 msgctxt "vectors-action" msgid "Delete this path" msgstr "احذف هذا المسار" -#: ../app/actions/vectors-actions.c:89 +#: ../app/actions/vectors-actions.c:90 msgctxt "vectors-action" msgid "Merge _Visible Paths" msgstr "ادمج المسارات المر_ئية" -#: ../app/actions/vectors-actions.c:94 +#: ../app/actions/vectors-actions.c:95 msgctxt "vectors-action" msgid "_Raise Path" msgstr "ار_فع المسار" -#: ../app/actions/vectors-actions.c:95 +#: ../app/actions/vectors-actions.c:96 msgctxt "vectors-action" msgid "Raise this path" msgstr "ارفع هذا المسار" -#: ../app/actions/vectors-actions.c:100 +#: ../app/actions/vectors-actions.c:101 msgctxt "vectors-action" msgid "Raise Path to _Top" msgstr "ارفع المسار إلى ال_سطح" -#: ../app/actions/vectors-actions.c:101 +#: ../app/actions/vectors-actions.c:102 msgctxt "vectors-action" msgid "Raise this path to the top" msgstr "ارفع هذا المسار إلى السطح" -#: ../app/actions/vectors-actions.c:106 +#: ../app/actions/vectors-actions.c:107 msgctxt "vectors-action" msgid "_Lower Path" msgstr "ا_خفض المسار" -#: ../app/actions/vectors-actions.c:107 +#: ../app/actions/vectors-actions.c:108 msgctxt "vectors-action" msgid "Lower this path" msgstr "اخفض هذا المسار" -#: ../app/actions/vectors-actions.c:112 +#: ../app/actions/vectors-actions.c:113 msgctxt "vectors-action" msgid "Lower Path to _Bottom" msgstr "اخفض المسار إلى ال_قاع" -#: ../app/actions/vectors-actions.c:113 +#: ../app/actions/vectors-actions.c:114 msgctxt "vectors-action" msgid "Lower this path to the bottom" msgstr "اخفض هذا المسار إلى القاع" -#: ../app/actions/vectors-actions.c:118 +#: ../app/actions/vectors-actions.c:119 msgctxt "vectors-action" msgid "Fill Path..." msgstr "املأ المسار..." -#: ../app/actions/vectors-actions.c:119 +#: ../app/actions/vectors-actions.c:120 msgctxt "vectors-action" msgid "Fill the path" msgstr "املأ المسار" -#: ../app/actions/vectors-actions.c:124 +#: ../app/actions/vectors-actions.c:125 msgctxt "vectors-action" msgid "Fill Path" msgstr "املأ المسار" -#: ../app/actions/vectors-actions.c:125 +#: ../app/actions/vectors-actions.c:126 msgctxt "vectors-action" msgid "Fill the path with last values" msgstr "املأ المسار مستخدما القيم الأخيرة" -#: ../app/actions/vectors-actions.c:130 +#: ../app/actions/vectors-actions.c:131 msgctxt "vectors-action" msgid "Stro_ke Path..." msgstr "ارسم المسا_ر..." -#: ../app/actions/vectors-actions.c:131 +#: ../app/actions/vectors-actions.c:132 msgctxt "vectors-action" msgid "Paint along the path" msgstr "ارسم مارا بالمسار" -#: ../app/actions/vectors-actions.c:136 +#: ../app/actions/vectors-actions.c:137 msgctxt "vectors-action" msgid "Stro_ke Path" msgstr "ارسم المسا_ر" -#: ../app/actions/vectors-actions.c:137 +#: ../app/actions/vectors-actions.c:138 msgctxt "vectors-action" msgid "Paint along the path with last values" msgstr "ارسم مارا بالمسار مستخدما القيم الأخيرة" -#: ../app/actions/vectors-actions.c:142 +#: ../app/actions/vectors-actions.c:143 msgctxt "vectors-action" msgid "Co_py Path" msgstr "ان_سخ المسار" -#: ../app/actions/vectors-actions.c:147 +#: ../app/actions/vectors-actions.c:148 msgctxt "vectors-action" msgid "Paste Pat_h" msgstr "أل_صق المسار" -#: ../app/actions/vectors-actions.c:152 +#: ../app/actions/vectors-actions.c:153 msgctxt "vectors-action" msgid "E_xport Path..." msgstr "_صدّر المسار..." -#: ../app/actions/vectors-actions.c:157 +#: ../app/actions/vectors-actions.c:158 msgctxt "vectors-action" msgid "I_mport Path..." msgstr "ا_ستورد مسارا..." -#: ../app/actions/vectors-actions.c:165 +#: ../app/actions/vectors-actions.c:166 +#, fuzzy msgctxt "vectors-action" -msgid "_Visible" -msgstr "مر_ئي" +msgid "Toggle Path _Visibility" +msgstr "بدّل حالة الظهور" -#: ../app/actions/vectors-actions.c:171 +#: ../app/actions/vectors-actions.c:172 +#, fuzzy msgctxt "vectors-action" -msgid "_Linked" -msgstr "_مربوط" +msgid "Toggle Path _Linked State" +msgstr "بدّل حالة الربط" -#. GIMP_STOCK_LOCK -#: ../app/actions/vectors-actions.c:177 +#. GIMP_ICON_LOCK +#: ../app/actions/vectors-actions.c:178 +#, fuzzy msgctxt "vectors-action" -msgid "L_ock strokes" +msgid "L_ock Strokes of Path" msgstr "أو_صِد الحدود" -#: ../app/actions/vectors-actions.c:183 +#: ../app/actions/vectors-actions.c:184 +#, fuzzy msgctxt "vectors-action" -msgid "L_ock position" -msgstr "أو_صِد الموضع" +msgid "L_ock Position of Path" +msgstr "أو_صِد موضع القناة" -#. abused -#: ../app/actions/vectors-actions.c:192 +#: ../app/actions/vectors-actions.c:193 msgctxt "vectors-action" msgid "None" msgstr "بدون" -#: ../app/actions/vectors-actions.c:193 +#: ../app/actions/vectors-actions.c:194 +#, fuzzy msgctxt "vectors-action" -msgid "Clear color tag" -msgstr "امسح وسم اللون" +msgid "Path Color Tag: Clear" +msgstr "وسم اللون" -#: ../app/actions/vectors-actions.c:198 +#: ../app/actions/vectors-actions.c:199 msgctxt "vectors-action" msgid "Blue" msgstr "أزرق" -#: ../app/actions/vectors-actions.c:199 +#: ../app/actions/vectors-actions.c:200 +#, fuzzy msgctxt "vectors-action" -msgid "Set color tag to blue" +msgid "Path Color Tag: Set to Blue" msgstr "ضع وسم لون أزرق" -#: ../app/actions/vectors-actions.c:204 +#: ../app/actions/vectors-actions.c:205 msgctxt "vectors-action" msgid "Green" msgstr "أخضر" -#: ../app/actions/vectors-actions.c:205 +#: ../app/actions/vectors-actions.c:206 +#, fuzzy msgctxt "vectors-action" -msgid "Set color tag to green" +msgid "Path Color Tag: Set to Green" msgstr "ضع وسم لون أخضر" -#: ../app/actions/vectors-actions.c:210 +#: ../app/actions/vectors-actions.c:211 msgctxt "vectors-action" msgid "Yellow" msgstr "أصفر" -#: ../app/actions/vectors-actions.c:211 +#: ../app/actions/vectors-actions.c:212 +#, fuzzy msgctxt "vectors-action" -msgid "Set color tag to yellow" +msgid "Path Color Tag: Set to Yellow" msgstr "ضع وسم لون أصفر" -#: ../app/actions/vectors-actions.c:216 +#: ../app/actions/vectors-actions.c:217 msgctxt "vectors-action" msgid "Orange" msgstr "برتقالي" -#: ../app/actions/vectors-actions.c:217 +#: ../app/actions/vectors-actions.c:218 +#, fuzzy msgctxt "vectors-action" -msgid "Set color tag to orange" +msgid "Path Color Tag: Set to Orange" msgstr "ضع وسم لون برتقالي" -#: ../app/actions/vectors-actions.c:222 +#: ../app/actions/vectors-actions.c:223 msgctxt "vectors-action" msgid "Brown" msgstr "بني" -#: ../app/actions/vectors-actions.c:223 +#: ../app/actions/vectors-actions.c:224 +#, fuzzy msgctxt "vectors-action" -msgid "Set color tag to brown" +msgid "Path Color Tag: Set to Brown" msgstr "ضع وسم لون بني" -#: ../app/actions/vectors-actions.c:228 +#: ../app/actions/vectors-actions.c:229 msgctxt "vectors-action" msgid "Red" msgstr "أحمر" -#: ../app/actions/vectors-actions.c:229 +#: ../app/actions/vectors-actions.c:230 +#, fuzzy msgctxt "vectors-action" -msgid "Set color tag to red" +msgid "Path Color Tag: Set to Red" msgstr "ضع وسم لون أحمر" -#: ../app/actions/vectors-actions.c:234 +#: ../app/actions/vectors-actions.c:235 msgctxt "vectors-action" msgid "Violet" msgstr "بنفسجي" -#: ../app/actions/vectors-actions.c:235 +#: ../app/actions/vectors-actions.c:236 +#, fuzzy msgctxt "vectors-action" -msgid "Set color tag to violet" +msgid "Path Color Tag: Set to Violet" msgstr "ضع وسم لون بنفسجي" -#: ../app/actions/vectors-actions.c:240 +#: ../app/actions/vectors-actions.c:241 msgctxt "vectors-action" msgid "Gray" msgstr "رمادي" -#: ../app/actions/vectors-actions.c:241 +#: ../app/actions/vectors-actions.c:242 +#, fuzzy msgctxt "vectors-action" -msgid "Set color tag to gray" +msgid "Path Color Tag: Set to Gray" msgstr "ضع وسم لون رمادي" -#: ../app/actions/vectors-actions.c:249 +#: ../app/actions/vectors-actions.c:250 msgctxt "vectors-action" msgid "Path to Sele_ction" msgstr "المسار إلى الت_حديد" -#: ../app/actions/vectors-actions.c:250 +#: ../app/actions/vectors-actions.c:251 msgctxt "vectors-action" msgid "Path to selection" msgstr "المسار إلى التحديد" -#: ../app/actions/vectors-actions.c:255 +#: ../app/actions/vectors-actions.c:256 msgctxt "vectors-action" msgid "Fr_om Path" msgstr "_من المسار" -#: ../app/actions/vectors-actions.c:256 +#: ../app/actions/vectors-actions.c:257 msgctxt "vectors-action" msgid "Replace selection with path" msgstr "استبدل التحديد بهذه القناة" -#: ../app/actions/vectors-actions.c:261 +#: ../app/actions/vectors-actions.c:262 msgctxt "vectors-action" msgid "_Add to Selection" msgstr "أ_ضف إلى التحديد" -#: ../app/actions/vectors-actions.c:262 +#: ../app/actions/vectors-actions.c:263 msgctxt "vectors-action" msgid "Add path to selection" msgstr "أضف المسار إلى التحديد" -#: ../app/actions/vectors-actions.c:267 +#: ../app/actions/vectors-actions.c:268 msgctxt "vectors-action" msgid "_Subtract from Selection" msgstr "ا_طرح من التحديد" -#: ../app/actions/vectors-actions.c:268 +#: ../app/actions/vectors-actions.c:269 msgctxt "vectors-action" msgid "Subtract path from selection" msgstr "اطرح المسار من التحديد" -#: ../app/actions/vectors-actions.c:273 +#: ../app/actions/vectors-actions.c:274 msgctxt "vectors-action" msgid "_Intersect with Selection" msgstr "_قاطع مع التحديد" -#: ../app/actions/vectors-actions.c:274 +#: ../app/actions/vectors-actions.c:275 msgctxt "vectors-action" msgid "Intersect path with selection" msgstr "قاطع المسار مع التحديد" -#: ../app/actions/vectors-actions.c:282 +#: ../app/actions/vectors-actions.c:283 msgctxt "vectors-action" msgid "Selecti_on to Path" msgstr "التحديد إلى الم_سار" -#: ../app/actions/vectors-actions.c:283 ../app/actions/vectors-actions.c:289 +#: ../app/actions/vectors-actions.c:284 ../app/actions/vectors-actions.c:290 msgctxt "vectors-action" msgid "Selection to path" msgstr "التحديد إلى المسار" -#: ../app/actions/vectors-actions.c:288 +#: ../app/actions/vectors-actions.c:289 msgctxt "vectors-action" msgid "To _Path" msgstr "إلى ال_مسار" -#: ../app/actions/vectors-actions.c:294 +#: ../app/actions/vectors-actions.c:295 msgctxt "vectors-action" msgid "Selection to Path (_Advanced)" msgstr "التحديد إلى المسار (_متقدم)" -#: ../app/actions/vectors-actions.c:295 +#: ../app/actions/vectors-actions.c:296 msgctxt "vectors-action" msgid "Advanced options" msgstr "الخيارات المتقدمة" +#: ../app/actions/vectors-actions.c:304 +#, fuzzy +msgctxt "vectors-action" +msgid "Select _Top Path" +msgstr "ا_ختر طبقة السطح" + +#: ../app/actions/vectors-actions.c:305 +#, fuzzy +msgctxt "vectors-action" +msgid "Select the topmost path" +msgstr "اختر الطبقة الأعلى" + +#: ../app/actions/vectors-actions.c:310 +#, fuzzy +msgctxt "vectors-action" +msgid "Select _Bottom Path" +msgstr "اختر طبقة ال_قاع" + +#: ../app/actions/vectors-actions.c:311 +#, fuzzy +msgctxt "vectors-action" +msgid "Select the bottommost path" +msgstr "اختر الطبقة الأدنى" + +#: ../app/actions/vectors-actions.c:316 +#, fuzzy +msgctxt "vectors-action" +msgid "Select _Previous Path" +msgstr "اختر الطبقة ال_سابقة" + +#: ../app/actions/vectors-actions.c:317 +#, fuzzy +msgctxt "vectors-action" +msgid "Select the path above the current path" +msgstr "اختر الطبقة فوق هذه الطبقة" + +#: ../app/actions/vectors-actions.c:322 +#, fuzzy +msgctxt "vectors-action" +msgid "Select _Next Path" +msgstr "اختر الطبقة ال_تالية" + +#: ../app/actions/vectors-actions.c:323 +#, fuzzy +msgctxt "vectors-action" +msgid "Select the vector below the current path" +msgstr "اختر الطبقة تحت هذه الطبقة" + #: ../app/actions/vectors-commands.c:162 ../app/actions/vectors-commands.c:719 msgid "Path Attributes" msgstr "صفات المسار" @@ -6566,12 +8878,13 @@ msgstr "مسار جديد" msgid "Create a New Path" msgstr "أنشئ مسارًا جديدا" -#: ../app/actions/vectors-commands.c:425 +#: ../app/actions/vectors-commands.c:425 ../app/tools/gimpvectoroptions.c:202 +#: ../app/tools/gimpvectortool.c:740 msgid "Fill Path" msgstr "املأ المسار" -#: ../app/actions/vectors-commands.c:455 ../app/tools/gimpvectoroptions.c:202 -#: ../app/tools/gimpvectortool.c:1990 +#: ../app/actions/vectors-commands.c:455 ../app/tools/gimpvectoroptions.c:210 +#: ../app/tools/gimpvectortool.c:812 msgid "Stroke Path" msgstr "ارسم المسار" @@ -6678,9 +8991,10 @@ msgid "Restore the previous zoom level" msgstr "استعد مستوى التقريب السابق" #: ../app/actions/view-actions.c:125 +#, fuzzy msgctxt "view-action" -msgid "Othe_r..." -msgstr "أ_خرى..." +msgid "Othe_r rotation angle..." +msgstr "استخدم زاوية تدوير مخصصة" #: ../app/actions/view-actions.c:126 msgctxt "view-action" @@ -6952,6 +9266,22 @@ msgctxt "view-action" msgid "Toggle fullscreen view" msgstr "تحول إلى منظور ملء الشاشة" +#: ../app/actions/view-actions.c:315 +#, fuzzy +msgctxt "view-action" +msgid "Set zoom factor" +msgstr "استخدم عامل تقريب مخصص" + +#: ../app/actions/view-actions.c:320 +msgctxt "view-action" +msgid "Zoom out as far as possible" +msgstr "" + +#: ../app/actions/view-actions.c:325 +msgctxt "view-action" +msgid "Zoom in as far as possible" +msgstr "" + #: ../app/actions/view-actions.c:330 msgctxt "view-zoom-action" msgid "Zoom _Out" @@ -6982,6 +9312,18 @@ msgctxt "view-zoom-action" msgid "Zoom In" msgstr "قرّب" +#: ../app/actions/view-actions.c:354 +#, fuzzy +msgctxt "view-action" +msgid "Zoom out a lot" +msgstr "بعّد" + +#: ../app/actions/view-actions.c:359 +#, fuzzy +msgctxt "view-action" +msgid "Zoom in a lot" +msgstr "قرّب" + #: ../app/actions/view-actions.c:367 ../app/actions/view-actions.c:373 msgctxt "view-zoom-action" msgid "1_6:1 (1600%)" @@ -7073,8 +9415,9 @@ msgid "Zoom 1:16" msgstr "قرّب 1‏:16" #: ../app/actions/view-actions.c:451 +#, fuzzy msgctxt "view-zoom-action" -msgid "Othe_r..." +msgid "Othe_r zoom factor..." msgstr "أ_خرى..." #: ../app/actions/view-actions.c:452 @@ -7087,228 +9430,327 @@ msgctxt "view-action" msgid "Flip Horizontally" msgstr "اقلب أفقيا" -#: ../app/actions/view-actions.c:466 +#: ../app/actions/view-actions.c:461 +#, fuzzy +msgctxt "view-action" +msgid "Flip the view horizontally" +msgstr "اقلب الصورة أفقيا" + +#: ../app/actions/view-actions.c:467 msgctxt "view-action" msgid "Flip Vertically" msgstr "اقلب رأسيا" -#: ../app/actions/view-actions.c:480 +#: ../app/actions/view-actions.c:468 +#, fuzzy +msgctxt "view-action" +msgid "Flip the view vertically" +msgstr "اقلب الصورة رأسيا" + +#: ../app/actions/view-actions.c:482 msgctxt "view-action" msgid "_Reset Flip & Rotate" msgstr "أعد _ضبط القلب و التدوير" -#: ../app/actions/view-actions.c:482 +#: ../app/actions/view-actions.c:484 msgctxt "view-action" msgid "Reset flipping to unflipped and the angle of rotation to 0°" msgstr "أرجع المقلوب إلى غير مقلوب و صفّر زاوية التدوير" -#: ../app/actions/view-actions.c:490 +#: ../app/actions/view-actions.c:492 msgctxt "view-action" msgid "Rotate 15° _clockwise" msgstr "لف 15° باتجاه _عقارب الساعة" -#: ../app/actions/view-actions.c:491 +#: ../app/actions/view-actions.c:493 +#, fuzzy msgctxt "view-action" -msgid "Rotate 15 degrees to the right" -msgstr "لف 15 درجة إلى اليمين" +msgid "Rotate the view 15 degrees to the right" +msgstr "دوّر الصورة 90 درجة يمينا" -#: ../app/actions/view-actions.c:496 +#: ../app/actions/view-actions.c:498 msgctxt "view-action" msgid "Rotate 90° _clockwise" msgstr "لف 90° باتجاه _عقارب الساعة" -#: ../app/actions/view-actions.c:497 +#: ../app/actions/view-actions.c:499 +#, fuzzy msgctxt "view-action" -msgid "Rotate 90 degrees to the right" -msgstr "لف 90 درجة إلى اليمين" +msgid "Rotate the view 90 degrees to the right" +msgstr "دوّر الصورة 90 درجة يمينا" -#: ../app/actions/view-actions.c:502 +#: ../app/actions/view-actions.c:504 msgctxt "view-action" msgid "Rotate _180°" msgstr "لف _180°" -#: ../app/actions/view-actions.c:503 +#: ../app/actions/view-actions.c:505 +#, fuzzy msgctxt "view-action" -msgid "Turn upside-down" -msgstr "اقلب رأسا على عقب" +msgid "Turn the view upside-down" +msgstr "اقلب الصورة رأسا على عقب" -#: ../app/actions/view-actions.c:508 +#: ../app/actions/view-actions.c:510 msgctxt "view-action" msgid "Rotate 90° counter-clock_wise" msgstr "لف 90° ع_كس اتجاه عقارب الساعة" -#: ../app/actions/view-actions.c:509 +#: ../app/actions/view-actions.c:511 +#, fuzzy msgctxt "view-action" -msgid "Rotate 90 degrees to the left" -msgstr "لف 90 درجة إلى اليسار" +msgid "Rotate the view 90 degrees to the left" +msgstr "دوّر الصورة 90 درجة يسارا" -#: ../app/actions/view-actions.c:514 +#: ../app/actions/view-actions.c:516 msgctxt "view-action" msgid "Rotate 15° counter-clock_wise" msgstr "لف 15° ع_كس اتجاه عقارب الساعة" -#: ../app/actions/view-actions.c:515 +#: ../app/actions/view-actions.c:517 +#, fuzzy msgctxt "view-action" -msgid "Rotate 15 degrees to the left" -msgstr "لف 15 درجة إلى اليسار" +msgid "Rotate the view 15 degrees to the left" +msgstr "دوّر الصورة 90 درجة يسارا" -#: ../app/actions/view-actions.c:523 ../app/actions/view-actions.c:550 +#: ../app/actions/view-actions.c:525 ../app/actions/view-actions.c:552 #, fuzzy msgctxt "view-action" msgid "_Perceptual" msgstr "النسبة المئوية:" -#: ../app/actions/view-actions.c:524 +#: ../app/actions/view-actions.c:526 #, fuzzy msgctxt "view-action" msgid "Display rendering intent is perceptual" msgstr "توزيع الألوان على ال_شاشة:" -#: ../app/actions/view-actions.c:529 ../app/actions/view-actions.c:556 +#: ../app/actions/view-actions.c:531 ../app/actions/view-actions.c:558 #, fuzzy msgctxt "view-action" msgid "_Relative Colorimetric" msgstr "ا_حذف اللون" -#: ../app/actions/view-actions.c:530 +#: ../app/actions/view-actions.c:532 #, fuzzy msgctxt "view-action" msgid "Display rendering intent is relative colorimetric" msgstr "توزيع الألوان على ال_شاشة:" -#: ../app/actions/view-actions.c:535 ../app/actions/view-actions.c:562 +#: ../app/actions/view-actions.c:537 ../app/actions/view-actions.c:564 #, fuzzy msgctxt "view-action" msgid "_Saturation" msgstr "ال_تشبع" -#: ../app/actions/view-actions.c:536 +#: ../app/actions/view-actions.c:538 #, fuzzy msgctxt "view-action" msgid "Display rendering intent is saturation" msgstr "توزيع الألوان على ال_شاشة:" -#: ../app/actions/view-actions.c:541 ../app/actions/view-actions.c:568 +#: ../app/actions/view-actions.c:543 ../app/actions/view-actions.c:570 msgctxt "view-action" msgid "_Absolute Colorimetric" msgstr "" -#: ../app/actions/view-actions.c:542 +#: ../app/actions/view-actions.c:544 #, fuzzy msgctxt "view-action" msgid "Display rendering intent is absolute colorimetric" msgstr "توزيع الألوان على ال_شاشة:" -#: ../app/actions/view-actions.c:551 +#: ../app/actions/view-actions.c:553 #, fuzzy msgctxt "view-action" msgid "Soft-proofing rendering intent is perceptual" msgstr "توزيع الألوان في م_حاكاة الطباعة:" -#: ../app/actions/view-actions.c:557 +#: ../app/actions/view-actions.c:559 #, fuzzy msgctxt "view-action" msgid "Soft-proofing rendering intent is relative colorimetric" msgstr "توزيع الألوان في م_حاكاة الطباعة:" -#: ../app/actions/view-actions.c:563 +#: ../app/actions/view-actions.c:565 #, fuzzy msgctxt "view-action" msgid "Soft-proofing rendering intent is saturation" msgstr "توزيع الألوان في م_حاكاة الطباعة:" -#: ../app/actions/view-actions.c:569 +#: ../app/actions/view-actions.c:571 #, fuzzy msgctxt "view-action" msgid "Soft-proofing rendering intent is absolute colorimetric" msgstr "توزيع الألوان في م_حاكاة الطباعة:" -#: ../app/actions/view-actions.c:577 +#: ../app/actions/view-actions.c:579 msgctxt "view-padding-color" msgid "From _Theme" msgstr "من ال_سّمة" -#: ../app/actions/view-actions.c:578 +#: ../app/actions/view-actions.c:580 msgctxt "view-padding-color" msgid "Use the current theme's background color" msgstr "استخدم لون خلفية السّمة الحالية" -#: ../app/actions/view-actions.c:583 +#: ../app/actions/view-actions.c:585 msgctxt "view-padding-color" msgid "_Light Check Color" msgstr "لو ن _فحص فاتح" -#: ../app/actions/view-actions.c:584 +#: ../app/actions/view-actions.c:586 msgctxt "view-padding-color" msgid "Use the light check color" msgstr "استخدم لون فحص فاتح" -#: ../app/actions/view-actions.c:589 +#: ../app/actions/view-actions.c:591 msgctxt "view-padding-color" msgid "_Dark Check Color" msgstr "لو ن فحص _غامق" -#: ../app/actions/view-actions.c:590 +#: ../app/actions/view-actions.c:592 msgctxt "view-padding-color" msgid "Use the dark check color" msgstr "استخدم لون فحص غامق" -#: ../app/actions/view-actions.c:595 +#: ../app/actions/view-actions.c:597 #, fuzzy msgctxt "view-padding-color" msgid "_Custom Color..." msgstr "اختر _لونا مخصصا..." -#: ../app/actions/view-actions.c:596 +#: ../app/actions/view-actions.c:598 msgctxt "view-padding-color" msgid "Use an arbitrary color" msgstr "استخدم لونا محددا" -#: ../app/actions/view-actions.c:601 +#: ../app/actions/view-actions.c:603 msgctxt "view-padding-color" msgid "As in _Preferences" msgstr "كما في ال_تفضيلات" -#: ../app/actions/view-actions.c:603 +#: ../app/actions/view-actions.c:605 msgctxt "view-padding-color" msgid "Reset padding color to what's configured in preferences" msgstr "استعد لون التوسيد إلى المضبوط في التفضيلات" -#: ../app/actions/view-actions.c:901 +#: ../app/actions/view-actions.c:613 +msgctxt "view-action" +msgid "Set horizontal scroll offset" +msgstr "" + +#: ../app/actions/view-actions.c:618 +#, fuzzy +msgctxt "view-action" +msgid "Scroll to left border" +msgstr "لف يسارا" + +#: ../app/actions/view-actions.c:623 +#, fuzzy +msgctxt "view-action" +msgid "Scroll to right border" +msgstr "لف يمينا" + +#: ../app/actions/view-actions.c:628 +#, fuzzy +msgctxt "view-action" +msgid "Scroll left" +msgstr "لف يسارا" + +#: ../app/actions/view-actions.c:633 +#, fuzzy +msgctxt "view-action" +msgid "Scroll right" +msgstr "لف يمينا" + +#: ../app/actions/view-actions.c:638 +#, fuzzy +msgctxt "view-action" +msgid "Scroll page left" +msgstr "لف يسارا" + +#: ../app/actions/view-actions.c:643 +#, fuzzy +msgctxt "view-action" +msgid "Scroll page right" +msgstr "لف يمينا" + +#: ../app/actions/view-actions.c:651 +msgctxt "view-action" +msgid "Set vertical scroll offset" +msgstr "" + +#: ../app/actions/view-actions.c:656 +#, fuzzy +msgctxt "view-action" +msgid "Scroll to top border" +msgstr "ضع وسم لون برتقالي" + +#: ../app/actions/view-actions.c:661 +#, fuzzy +msgctxt "view-action" +msgid "Scroll to bottom border" +msgstr "قص إلى طبقة القاع" + +#: ../app/actions/view-actions.c:666 +#, fuzzy +msgctxt "view-action" +msgid "Scroll up" +msgstr "لف للأعلى" + +#: ../app/actions/view-actions.c:671 +#, fuzzy +msgctxt "view-action" +msgid "Scroll down" +msgstr "لف للأسفل" + +#: ../app/actions/view-actions.c:676 +#, fuzzy +msgctxt "view-action" +msgid "Scroll page up" +msgstr "لف للأعلى" + +#: ../app/actions/view-actions.c:681 +#, fuzzy +msgctxt "view-action" +msgid "Scroll page down" +msgstr "لف للأسفل" + +#: ../app/actions/view-actions.c:903 #, c-format msgid "Re_vert Zoom (%d%%)" msgstr "استعد التقريب (%Id%%)" -#: ../app/actions/view-actions.c:909 +#: ../app/actions/view-actions.c:911 msgid "Re_vert Zoom" msgstr "ا_ستعِد التقريب" -#: ../app/actions/view-actions.c:1096 +#: ../app/actions/view-actions.c:1098 #, c-format msgid "Othe_r (%s)..." msgstr "أ_خرى (%s)..." -#: ../app/actions/view-actions.c:1105 +#: ../app/actions/view-actions.c:1107 #, c-format msgid "_Zoom (%s)" msgstr "_تقريب (%s)" #. please preserve the trailing space -#: ../app/actions/view-actions.c:1126 +#: ../app/actions/view-actions.c:1128 msgid "(H+V) " msgstr "(أ+ر) " #. please preserve the trailing space -#: ../app/actions/view-actions.c:1131 +#: ../app/actions/view-actions.c:1133 msgid "(H) " msgstr "(أ) " #. please preserve the trailing space -#: ../app/actions/view-actions.c:1136 +#: ../app/actions/view-actions.c:1138 msgid "(V) " msgstr "(ر) " -#: ../app/actions/view-actions.c:1143 +#: ../app/actions/view-actions.c:1145 #, c-format msgid "_Flip %s& Rotate (%d°)" msgstr "اقلب %sو دوّر (%d°)" @@ -7331,6 +9773,23 @@ msgstr "الشاشة %s" msgid "Move this window to screen %s" msgstr "انقل هذه النافذة إلى الشاشة %s" +#: ../app/actions/window-commands.c:76 ../app/dialogs/file-save-dialog.c:638 +#: ../app/dialogs/grid-dialog.c:103 ../app/dialogs/image-new-dialog.c:107 +#: ../app/dialogs/image-new-dialog.c:326 +#: ../app/dialogs/item-options-dialog.c:146 +#: ../app/dialogs/preferences-dialog.c:1097 +#: ../app/dialogs/print-size-dialog.c:125 +#: ../app/dialogs/resolution-calibrate-dialog.c:77 +#: ../app/dialogs/template-options-dialog.c:119 +#: ../app/display/gimpdisplayshell-filter-dialog.c:88 +#: ../app/display/gimpdisplayshell-rotate-dialog.c:123 +#: ../app/display/gimpdisplayshell-scale-dialog.c:123 ../app/gui/gui.c:193 +#: ../app/tools/gimpfiltertool.c:322 ../app/widgets/gimpcolordialog.c:111 +#: ../app/widgets/gimpcontrollereditor.c:661 +#: ../app/widgets/gimperrordialog.c:76 ../app/widgets/gimpfiledialog.c:188 +msgid "_OK" +msgstr "" + #: ../app/actions/windows-actions.c:98 msgctxt "windows-action" msgid "_Windows" @@ -7441,131 +9900,166 @@ msgstr "" "الرصيف الحديث المختار يحتوي صندوق أدوات. رجاء أغلق صندوق الأدوات المفتوح " "حاليًا ثم أعد المحاولة." -#: ../app/config/config-enums.c:24 -msgctxt "cursor-mode" -msgid "Tool icon" -msgstr "أيقونة الأداة" - #: ../app/config/config-enums.c:25 -msgctxt "cursor-mode" -msgid "Tool icon with crosshair" -msgstr "أيقونة الأداة مع خطين متقاطعين" - -#: ../app/config/config-enums.c:26 -msgctxt "cursor-mode" -msgid "Crosshair only" -msgstr "خطين متقاطعين فقط" - -#: ../app/config/config-enums.c:56 msgctxt "canvas-padding-mode" msgid "From theme" msgstr "من السمة" -#: ../app/config/config-enums.c:57 +#: ../app/config/config-enums.c:26 msgctxt "canvas-padding-mode" msgid "Light check color" msgstr "لون الاختيار الفاتح" -#: ../app/config/config-enums.c:58 +#: ../app/config/config-enums.c:27 msgctxt "canvas-padding-mode" msgid "Dark check color" msgstr "لون الاختيار الغامق" -#: ../app/config/config-enums.c:59 +#: ../app/config/config-enums.c:28 msgctxt "canvas-padding-mode" msgid "Custom color" msgstr "لون مخصص" -#: ../app/config/config-enums.c:88 -msgctxt "space-bar-action" -msgid "No action" -msgstr "لا إجراء" - -#: ../app/config/config-enums.c:89 -msgctxt "space-bar-action" -msgid "Pan view" -msgstr "منظور عام" - -#: ../app/config/config-enums.c:90 -msgctxt "space-bar-action" -msgid "Switch to Move tool" -msgstr "انتقل إلى أداة النقل" - -#: ../app/config/config-enums.c:118 -msgctxt "zoom-quality" -msgid "Low" -msgstr "منخفض" - -#: ../app/config/config-enums.c:119 -msgctxt "zoom-quality" -msgid "High" -msgstr "مرتفع" - -#: ../app/config/config-enums.c:147 -msgctxt "help-browser-type" -msgid "GIMP help browser" -msgstr "متصفح مساعدة جمب" - -#: ../app/config/config-enums.c:148 -msgctxt "help-browser-type" -msgid "Web browser" -msgstr "متصفح الوب" - -#: ../app/config/config-enums.c:177 -msgctxt "window-hint" -msgid "Normal window" -msgstr "نافذة عادية" - -#: ../app/config/config-enums.c:178 -msgctxt "window-hint" -msgid "Utility window" -msgstr "نافذة أدوات" - -#: ../app/config/config-enums.c:179 -msgctxt "window-hint" -msgid "Keep above" -msgstr "أبقها في الأعلى" - -#: ../app/config/config-enums.c:207 +#: ../app/config/config-enums.c:56 msgctxt "cursor-format" msgid "Black & white" msgstr "أبيض وأسود" -#: ../app/config/config-enums.c:208 +#: ../app/config/config-enums.c:57 msgctxt "cursor-format" msgid "Fancy" msgstr "خيالي" -#: ../app/config/config-enums.c:236 +#: ../app/config/config-enums.c:86 +msgctxt "cursor-mode" +msgid "Tool icon" +msgstr "أيقونة الأداة" + +#: ../app/config/config-enums.c:87 +msgctxt "cursor-mode" +msgid "Tool icon with crosshair" +msgstr "أيقونة الأداة مع خطين متقاطعين" + +#: ../app/config/config-enums.c:88 +msgctxt "cursor-mode" +msgid "Crosshair only" +msgstr "خطين متقاطعين فقط" + +#: ../app/config/config-enums.c:116 msgctxt "handedness" msgid "Left-handed" msgstr "أ_يسر اليد" -#: ../app/config/config-enums.c:237 +#: ../app/config/config-enums.c:117 msgctxt "handedness" msgid "Right-handed" msgstr "أي_من اليد" -#: ../app/config/config-enums.c:267 +#: ../app/config/config-enums.c:145 +msgctxt "help-browser-type" +msgid "GIMP help browser" +msgstr "متصفح مساعدة جمب" + +#: ../app/config/config-enums.c:146 +msgctxt "help-browser-type" +msgid "Web browser" +msgstr "متصفح الوب" + +#: ../app/config/config-enums.c:178 +msgctxt "icon-size" +msgid "Guess ideal size" +msgstr "" + +#: ../app/config/config-enums.c:179 +#, fuzzy +msgctxt "icon-size" +msgid "Theme-set size" +msgstr "السمات" + +#: ../app/config/config-enums.c:180 +#, fuzzy +msgctxt "icon-size" +msgid "Small size" +msgstr "حجم الصورة" + +#: ../app/config/config-enums.c:181 +#, fuzzy +msgctxt "icon-size" +msgid "Medium size" +msgstr "شرُط متوسطة" + +#: ../app/config/config-enums.c:182 +#, fuzzy +msgctxt "icon-size" +msgid "Large size" +msgstr "حجم الصورة" + +#: ../app/config/config-enums.c:183 +#, fuzzy +msgctxt "icon-size" +msgid "Huge size" +msgstr "حجم الصورة" + +#: ../app/config/config-enums.c:213 msgctxt "position" msgid "Top" msgstr "فوق" -#: ../app/config/config-enums.c:268 +#: ../app/config/config-enums.c:214 msgctxt "position" msgid "Bottom" msgstr "تحت" -#: ../app/config/config-enums.c:269 +#: ../app/config/config-enums.c:215 msgctxt "position" msgid "Left" msgstr "يسار" -#: ../app/config/config-enums.c:270 +#: ../app/config/config-enums.c:216 msgctxt "position" msgid "Right" msgstr "يمين" +#: ../app/config/config-enums.c:245 +msgctxt "space-bar-action" +msgid "No action" +msgstr "لا إجراء" + +#: ../app/config/config-enums.c:246 +msgctxt "space-bar-action" +msgid "Pan view" +msgstr "منظور عام" + +#: ../app/config/config-enums.c:247 +msgctxt "space-bar-action" +msgid "Switch to Move tool" +msgstr "انتقل إلى أداة النقل" + +#: ../app/config/config-enums.c:276 +msgctxt "window-hint" +msgid "Normal window" +msgstr "نافذة عادية" + +#: ../app/config/config-enums.c:277 +msgctxt "window-hint" +msgid "Utility window" +msgstr "نافذة أدوات" + +#: ../app/config/config-enums.c:278 +msgctxt "window-hint" +msgid "Keep above" +msgstr "أبقها في الأعلى" + +#: ../app/config/config-enums.c:306 +msgctxt "zoom-quality" +msgid "Low" +msgstr "منخفض" + +#: ../app/config/config-enums.c:307 +msgctxt "zoom-quality" +msgid "High" +msgstr "مرتفع" + #: ../app/config/gimpconfig-file.c:82 #, c-format msgid "Could not open '%s' for writing: %s" @@ -7577,15 +10071,15 @@ msgid "Error parsing '%%s': line longer than %s characters." msgstr "تعذّر تحليل '%%s': السطر أطول من %s من الحروف." #: ../app/config/gimpconfig-file.c:152 ../app/config/gimpconfig-file.c:196 -#: ../app/core/gimp-tags.c:144 ../app/gui/themes.c:324 -#: ../app/tools/gimpfiltertool-settings.c:229 +#: ../app/core/gimp-tags.c:144 ../app/gui/themes.c:361 +#: ../app/tools/gimpfiltertool-settings.c:227 #, c-format msgid "Error writing '%s': %s" msgstr "خطأ في كتابة '%s'‏: %s" #: ../app/config/gimpconfig-file.c:182 ../app/plug-in/gimpenvirontable.c:369 #: ../app/plug-in/gimpinterpreterdb.c:267 -#: ../app/tools/gimpfiltertool-settings.c:180 +#: ../app/tools/gimpfiltertool-settings.c:182 #, c-format msgid "Error reading '%s': %s" msgstr "خطأ في قراءة '%s'‏: %s" @@ -7599,19 +10093,19 @@ msgstr "" "حدث خطأ أثناء تحليل ملف '%s'. ستستخدم القيم المبدئية. حفظة نسخة احتياطية من " "إعداداتك في '%s'." -#: ../app/config/gimpdialogconfig.c:294 ../app/core/gimplayer.c:324 +#: ../app/config/gimpdialogconfig.c:307 ../app/core/gimplayer.c:440 msgid "Layer" msgstr "طبقة" -#: ../app/config/gimpdialogconfig.c:370 ../app/core/gimpchannel.c:288 -#: ../app/operations/gimpcurvesconfig.c:104 -#: ../app/operations/gimplevelsconfig.c:105 +#: ../app/config/gimpdialogconfig.c:407 ../app/core/gimpchannel.c:269 +#: ../app/operations/gimpcurvesconfig.c:111 +#: ../app/operations/gimplevelsconfig.c:114 #: ../app/operations/gimpoperationthreshold.c:89 #: ../app/widgets/gimpchanneltreeview.c:332 msgid "Channel" msgstr "القناة" -#: ../app/config/gimpdialogconfig.c:385 ../app/vectors/gimpvectors.c:223 +#: ../app/config/gimpdialogconfig.c:422 ../app/vectors/gimpvectors.c:223 #: ../app/widgets/gimpvectorstreeview.c:250 msgid "Path" msgstr "المسار" @@ -7648,14 +10142,19 @@ msgid "How to handle embedded color profiles when opening a file." msgstr "كيف يتعامل مع لاحات الألوان المدمجة عند فتح ملف" #: ../app/config/gimprc-blurbs.h:46 +#, fuzzy +msgid "Sets the default folder path for all color profile file dialogs." +msgstr "تحدد حجم المصغّرة المعروضة في حوار الفتح." + +#: ../app/config/gimprc-blurbs.h:49 msgid "Sets the type of mouse pointers to use." msgstr "يضبط نوع مؤشرات الفأرة المستخدمة في جمب." -#: ../app/config/gimprc-blurbs.h:49 +#: ../app/config/gimprc-blurbs.h:52 msgid "Sets the handedness for cursor positioning." msgstr "حدد اليد المستخدمة، لأجل تموضع المؤشر." -#: ../app/config/gimprc-blurbs.h:52 +#: ../app/config/gimprc-blurbs.h:55 msgid "" "Context-dependent mouse pointers are helpful. They are enabled by default. " "However, they require overhead that you may want to do without." @@ -7663,17 +10162,17 @@ msgstr "" "مؤشرات الفأرة المرتبطة بالسياق مفيدة. يتم تفعيلها مبدئيا. لكنها تضيف عبئا " "قد تكون في غنى عنه." -#: ../app/config/gimprc-blurbs.h:68 +#: ../app/config/gimprc-blurbs.h:71 msgid "" "When enabled, this will ensure that each pixel of an image gets mapped to a " "pixel on the screen." msgstr "عند تفعيله سيضمن هذا أن كل بكسل في الصورة يتم ربطه ببكسل على الشاشة." -#: ../app/config/gimprc-blurbs.h:93 +#: ../app/config/gimprc-blurbs.h:96 msgid "This is the distance in pixels where Guide and Grid snapping activates." msgstr "هذه المسافة بالبكسل التي يُفعل عندها اتباع الأدلة والشبكة." -#: ../app/config/gimprc-blurbs.h:109 +#: ../app/config/gimprc-blurbs.h:112 msgid "" "Tools such as fuzzy-select and bucket fill find regions based on a seed-fill " "algorithm. The seed fill starts at the initially selected pixel and " @@ -7682,111 +10181,157 @@ msgid "" "the default threshold." msgstr "" -#: ../app/config/gimprc-blurbs.h:122 +#: ../app/config/gimprc-blurbs.h:125 msgid "" "The window type hint that is set on dock windows and the toolbox window. " "This may affect the way your window manager decorates and handles these " "windows." msgstr "" -#: ../app/config/gimprc-blurbs.h:142 +#: ../app/config/gimprc-blurbs.h:145 msgid "When enabled, the selected brush will be used for all tools." msgstr "عند تفعيله ستستخدم الفرشاة المختارة مع كل الأدوات." -#: ../app/config/gimprc-blurbs.h:145 +#: ../app/config/gimprc-blurbs.h:148 msgid "When enabled, the selected dynamics will be used for all tools." msgstr "عند تفعيله ستستخدم الحركيات المختارة مع كل الأدوات." -#: ../app/config/gimprc-blurbs.h:151 +#: ../app/config/gimprc-blurbs.h:154 msgid "When enabled, the selected gradient will be used for all tools." msgstr "عند تفعيله سيستخدم التدرج المختار مع كل الأدوات." -#: ../app/config/gimprc-blurbs.h:154 +#: ../app/config/gimprc-blurbs.h:157 msgid "When enabled, the selected pattern will be used for all tools." msgstr "عند تفعيله سيتم استخدام النمط المختار لكل الأدوات." -#: ../app/config/gimprc-blurbs.h:168 +#: ../app/config/gimprc-blurbs.h:171 msgid "Sets the browser used by the help system." msgstr "يحدد المتصفح المستخدم لنظام المساعدة." #: ../app/config/gimprc-blurbs.h:179 +#, fuzzy +msgid "How many recent settings to keep around in filter tools." +msgstr "ما عدد الملفات المفتوحة حديثة التي ستوضع في قائمة ملف." + +#: ../app/config/gimprc-blurbs.h:182 +msgid "Show advanced color options in filter tools." +msgstr "" + +#: ../app/config/gimprc-blurbs.h:185 msgid "Sets the text to appear in image window status bars." msgstr "يحدد النص الذي يظهر في أشرطة حالة نافذة الصورة." -#: ../app/config/gimprc-blurbs.h:182 +#: ../app/config/gimprc-blurbs.h:188 msgid "Sets the text to appear in image window titles." msgstr "يحدد النص الذي يظهر في عناوين نافذة الصورة." -#: ../app/config/gimprc-blurbs.h:185 +#: ../app/config/gimprc-blurbs.h:191 +msgid "" +"Promote imported images to floating point precision. Does not apply to " +"indexed images." +msgstr "" + +#: ../app/config/gimprc-blurbs.h:195 +msgid "" +"When promoting imported images to floating point precision, also add minimal " +"noise in order to distribute color values a bit." +msgstr "" + +#: ../app/config/gimprc-blurbs.h:199 +msgid "Add an alpha channel to all layers of imported images." +msgstr "" + +#: ../app/config/gimprc-blurbs.h:202 +msgid "Which plug-in to use for importing raw digital camera files." +msgstr "" + +#: ../app/config/gimprc-blurbs.h:205 +msgid "Export Exif metadata by default." +msgstr "" + +#: ../app/config/gimprc-blurbs.h:208 +msgid "Export XMP metadata by default." +msgstr "" + +#: ../app/config/gimprc-blurbs.h:211 +msgid "Export IPTC metadata by default." +msgstr "" + +#: ../app/config/gimprc-blurbs.h:214 +msgid "Try generating debug data for bug reporting when appropriate." +msgstr "" + +#: ../app/config/gimprc-blurbs.h:217 msgid "" "When enabled, this will ensure that the full image is visible after a file " "is opened, otherwise it will be displayed with a scale of 1:1." msgstr "" -#: ../app/config/gimprc-blurbs.h:189 +#: ../app/config/gimprc-blurbs.h:221 msgid "" "Sets the level of interpolation used for scaling and other transformations." msgstr "يحدد مستوى الاستيفاء المستخدم في التحجيم والتحويلات الأخرى." -#: ../app/config/gimprc-blurbs.h:196 +#: ../app/config/gimprc-blurbs.h:228 msgid "Specifies the language to use for the user interface." msgstr "يحدد لغة واجهة المستخدم." -#: ../app/config/gimprc-blurbs.h:199 +#: ../app/config/gimprc-blurbs.h:231 msgid "How many recently opened image filenames to keep on the File menu." msgstr "ما عدد الملفات المفتوحة حديثة التي ستوضع في قائمة ملف." -#: ../app/config/gimprc-blurbs.h:202 +#: ../app/config/gimprc-blurbs.h:234 msgid "" "Speed of marching ants in the selection outline. This value is in " "milliseconds (less time indicates faster marching)." msgstr "" -#: ../app/config/gimprc-blurbs.h:206 +#: ../app/config/gimprc-blurbs.h:238 msgid "" "GIMP will warn the user if an attempt is made to create an image that would " "take more memory than the size specified here." msgstr "" "سيُحذّر جمب المُستخدم عند محاولة إنشاء صورة تأخذ ذاكرة أكبر من الحجم المحدد هنا." -#: ../app/config/gimprc-blurbs.h:216 +#: ../app/config/gimprc-blurbs.h:248 msgid "" "Sets the monitor's horizontal resolution, in dots per inch. If set to 0, " "forces the X server to be queried for both horizontal and vertical " "resolution information." msgstr "" -#: ../app/config/gimprc-blurbs.h:221 +#: ../app/config/gimprc-blurbs.h:253 msgid "" "Sets the monitor's vertical resolution, in dots per inch. If set to 0, " "forces the X server to be queried for both horizontal and vertical " "resolution information." msgstr "" -#: ../app/config/gimprc-blurbs.h:226 +#: ../app/config/gimprc-blurbs.h:258 msgid "" "If enabled, the move tool sets the edited layer or path as active. This " "used to be the default behaviour in older versions." msgstr "" -#: ../app/config/gimprc-blurbs.h:235 +#: ../app/config/gimprc-blurbs.h:267 msgid "" "Sets the size of the navigation preview available in the lower right corner " "of the image window." msgstr "" -#: ../app/config/gimprc-blurbs.h:239 -msgid "Sets how many processors GIMP should try to use simultaneously." +#: ../app/config/gimprc-blurbs.h:271 +#, fuzzy +msgid "Sets how many threads GIMP should use for operations that support it." msgstr "تحدد عدد المعالجات التي سيُحاول جمب استخدامها معا." -#: ../app/config/gimprc-blurbs.h:261 +#: ../app/config/gimprc-blurbs.h:293 msgid "" "Sets whether GIMP should create previews of layers and channels. Previews in " "the layers and channels dialog are nice to have but they can slow things " "down when working with large images." msgstr "" -#: ../app/config/gimprc-blurbs.h:266 +#: ../app/config/gimprc-blurbs.h:298 msgid "" "Sets the preview size used for layers and channel previews in newly created " "dialogs." @@ -7794,11 +10339,11 @@ msgstr "" "يحدد حجم المعاينة المستخدم لمعاينات الطبقات والقنوات في الحوارات المُنشأة " "حديثا." -#: ../app/config/gimprc-blurbs.h:270 +#: ../app/config/gimprc-blurbs.h:302 msgid "Sets the default quick mask color." msgstr "حدد اللون المبدئي للقناع السريع." -#: ../app/config/gimprc-blurbs.h:273 +#: ../app/config/gimprc-blurbs.h:305 #, fuzzy msgid "" "When enabled, the image window will automatically resize itself whenever the " @@ -7806,7 +10351,7 @@ msgid "" "mode." msgstr "عند تفعيله، ستعيد نافذة الصورة تحجيم نفسها عندما يتغير حجم الصورة." -#: ../app/config/gimprc-blurbs.h:278 +#: ../app/config/gimprc-blurbs.h:310 #, fuzzy msgid "" "When enabled, the image window will automatically resize itself when zooming " @@ -7814,62 +10359,62 @@ msgid "" msgstr "" "عند تفعيله، ستعيد نافذة الصورة تحجيم نفسها عند تكبير الصور للداخل أو الخارج." -#: ../app/config/gimprc-blurbs.h:283 +#: ../app/config/gimprc-blurbs.h:315 msgid "Let GIMP try to restore your last saved session on each startup." msgstr "دع جمب يحاول استعادة آخر جلسة محفوظة عند كل بداية." -#: ../app/config/gimprc-blurbs.h:286 +#: ../app/config/gimprc-blurbs.h:318 msgid "" "When enabled, GIMP will try to restore windows on the monitor they were open " "before. When disabled, windows will appear on the currently used monitor." msgstr "" -#: ../app/config/gimprc-blurbs.h:291 +#: ../app/config/gimprc-blurbs.h:323 msgid "" "Remember the current tool, pattern, color, and brush across GIMP sessions." msgstr "تذكّر الأداة والنمط واللون والفرشاة الحالية عبر جلسات جمب." -#: ../app/config/gimprc-blurbs.h:295 +#: ../app/config/gimprc-blurbs.h:327 msgid "" "When enabled, the same tool and tool options will be used for all input " "devices. No tool switching will occur when the input device changes." msgstr "" -#: ../app/config/gimprc-blurbs.h:300 +#: ../app/config/gimprc-blurbs.h:332 msgid "" "Keep a permanent record of all opened and saved files in the Recent " "Documents list." msgstr "" "احفظ سجلا دائما بكل الملفات المفتوحة والمحفوظة في قائمة المستندات الحديثة." -#: ../app/config/gimprc-blurbs.h:304 +#: ../app/config/gimprc-blurbs.h:336 msgid "Save the positions and sizes of the main dialogs when GIMP exits." msgstr "احفظ مواضع وأحجام الحوارات الرئيسية عند غلق جمب." -#: ../app/config/gimprc-blurbs.h:307 +#: ../app/config/gimprc-blurbs.h:339 msgid "Save the tool options when GIMP exits." msgstr "احفظ خيارات الأدوات عند إغلاق جمب." -#: ../app/config/gimprc-blurbs.h:313 +#: ../app/config/gimprc-blurbs.h:345 msgid "" "When enabled, all paint tools will show a preview of the current brush's " "outline." msgstr "" -#: ../app/config/gimprc-blurbs.h:317 +#: ../app/config/gimprc-blurbs.h:349 msgid "" "When enabled, dialogs will show a help button that gives access to the " "related help page. Without this button, the help page can still be reached " "by pressing F1." msgstr "" -#: ../app/config/gimprc-blurbs.h:322 +#: ../app/config/gimprc-blurbs.h:354 msgid "" "When enabled, the mouse pointer will be shown over the image while using a " "paint tool." msgstr "" -#: ../app/config/gimprc-blurbs.h:326 +#: ../app/config/gimprc-blurbs.h:358 msgid "" "When enabled, the menubar is visible by default. This can also be toggled " "with the \"View->Show Menubar\" command." @@ -7877,7 +10422,7 @@ msgstr "" "عند تفعيله، سيصبح شريط القوائم مرئيا مبدئيا.يمكن التحكم في هذا أيضا عن طريق " "\"منظور←أظهر شريط القوائم\"." -#: ../app/config/gimprc-blurbs.h:330 +#: ../app/config/gimprc-blurbs.h:362 msgid "" "When enabled, the rulers are visible by default. This can also be toggled " "with the \"View->Show Rulers\" command." @@ -7885,7 +10430,7 @@ msgstr "" "عند تفعيله، ستصبح المساطر مرئية مبدئيا.يمكن التحكم في هذا أيضا عن طريق " "\"منظور←أظهر المساطر\"." -#: ../app/config/gimprc-blurbs.h:334 +#: ../app/config/gimprc-blurbs.h:366 msgid "" "When enabled, the scrollbars are visible by default. This can also be " "toggled with the \"View->Show Scrollbars\" command." @@ -7893,7 +10438,7 @@ msgstr "" "عند تفعيله، ستصبح أشرطة التمرير مرئية مبدئيا.يمكن التحكم في هذا أيضا عن طريق " "\"منظور←أظهر شريط التمرير\"." -#: ../app/config/gimprc-blurbs.h:338 +#: ../app/config/gimprc-blurbs.h:370 msgid "" "When enabled, the statusbar is visible by default. This can also be toggled " "with the \"View->Show Statusbar\" command." @@ -7901,7 +10446,7 @@ msgstr "" "عند تفعيله، سيصبح شريط الحالة مرئيا مبدئيا.يمكن التحكم في هذا أيضا عن طريق " "\"منظور←أظهر شريط الحالة\"." -#: ../app/config/gimprc-blurbs.h:342 +#: ../app/config/gimprc-blurbs.h:374 msgid "" "When enabled, the selection is visible by default. This can also be toggled " "with the \"View->Show Selection\" command." @@ -7909,7 +10454,7 @@ msgstr "" "عند تفعيله، سيصبح التحديد مرئيا مبدئيا.يمكن التحكم في هذا أيضا عن طريق " "\"منظور←أظهر التحديد\"." -#: ../app/config/gimprc-blurbs.h:346 +#: ../app/config/gimprc-blurbs.h:378 msgid "" "When enabled, the layer boundary is visible by default. This can also be " "toggled with the \"View->Show Layer Boundary\" command." @@ -7917,7 +10462,7 @@ msgstr "" "عند تفعيله، ستصبح حدود الطبقة مرئية مبدئيا.يمكن التحكم في هذا أيضا عن طريق " "\"منظور←أظهر حدود الطبقة\"." -#: ../app/config/gimprc-blurbs.h:350 +#: ../app/config/gimprc-blurbs.h:382 msgid "" "When enabled, the guides are visible by default. This can also be toggled " "with the \"View->Show Guides\" command." @@ -7925,7 +10470,7 @@ msgstr "" "عند تفعيله، ستصبح الأدلة مرئية مبدئيا.يمكن التحكم في هذا أيضا عن طريق " "\"منظور←أظهر الأدلة\"." -#: ../app/config/gimprc-blurbs.h:354 +#: ../app/config/gimprc-blurbs.h:386 msgid "" "When enabled, the grid is visible by default. This can also be toggled with " "the \"View->Show Grid\" command." @@ -7933,7 +10478,7 @@ msgstr "" "عند تفعيله، ستصبح الشبكة مرئية مبدئيا.يمكن التحكم في هذا أيضا عن طريق " "\"منظور←أظهر الشبكة\"." -#: ../app/config/gimprc-blurbs.h:358 +#: ../app/config/gimprc-blurbs.h:390 msgid "" "When enabled, the sample points are visible by default. This can also be " "toggled with the \"View->Show Sample Points\" command." @@ -7941,43 +10486,43 @@ msgstr "" "عند تفعيله، ستصبح عينات النقاط مرئية مبدئيا.يمكن التحكم في هذا أيضا عن طريق " "\"منظور←أظهر عينات النقاط\"." -#: ../app/config/gimprc-blurbs.h:362 +#: ../app/config/gimprc-blurbs.h:394 msgid "Show a tooltip when the pointer hovers over an item." msgstr "أظهر تلميحا عندما يمر المؤشر فوق عنصر ما." -#: ../app/config/gimprc-blurbs.h:365 +#: ../app/config/gimprc-blurbs.h:397 msgid "Use GIMP in a single-window mode." msgstr "استخدم جمب في نمط النافذة المفردة." -#: ../app/config/gimprc-blurbs.h:368 +#: ../app/config/gimprc-blurbs.h:400 msgid "Hide docks and other windows, leaving only image windows." msgstr "أخفِ الأرصفة والنوافذ الأخرى تاركا نوافذ الصور فقط." -#: ../app/config/gimprc-blurbs.h:371 +#: ../app/config/gimprc-blurbs.h:403 msgid "Enable the N-Point Deformation tool." msgstr "" -#: ../app/config/gimprc-blurbs.h:374 +#: ../app/config/gimprc-blurbs.h:406 msgid "Enable the Handle Transform tool." msgstr "" -#: ../app/config/gimprc-blurbs.h:377 +#: ../app/config/gimprc-blurbs.h:409 msgid "Enable symmetry on painting." msgstr "" -#: ../app/config/gimprc-blurbs.h:380 +#: ../app/config/gimprc-blurbs.h:412 msgid "Enable the MyPaint Brush tool." msgstr "فعّل أداة فرش ماي پينت." -#: ../app/config/gimprc-blurbs.h:383 +#: ../app/config/gimprc-blurbs.h:415 msgid "Enable the Seamless Clone tool." msgstr "فعّل أداة الاستنساخ السلس." -#: ../app/config/gimprc-blurbs.h:386 +#: ../app/config/gimprc-blurbs.h:418 msgid "What to do when the space bar is pressed in the image window." msgstr "ماذا يفعل عند ضغط مسطرة المسافات في نافذة الصورة." -#: ../app/config/gimprc-blurbs.h:389 +#: ../app/config/gimprc-blurbs.h:421 msgid "" "Sets the swap file location. GIMP uses a tile based memory allocation " "scheme. The swap file is used to quickly and easily swap tiles out to disk " @@ -7987,25 +10532,25 @@ msgid "" "may be desirable to put your swap file in \"/tmp\"." msgstr "" -#: ../app/config/gimprc-blurbs.h:398 +#: ../app/config/gimprc-blurbs.h:430 msgid "When enabled, menus can be torn off." msgstr "عند تفعيله سيُمكن تعطيل القوائم." -#: ../app/config/gimprc-blurbs.h:401 +#: ../app/config/gimprc-blurbs.h:433 msgid "" "When enabled, you can change keyboard shortcuts for menu items by hitting a " "key combination while the menu item is highlighted." msgstr "" -#: ../app/config/gimprc-blurbs.h:405 +#: ../app/config/gimprc-blurbs.h:437 msgid "Save changed keyboard shortcuts when GIMP exits." msgstr "احفظ اختصارات لوحة المفاتيح المغيّرة عند خروج جمب" -#: ../app/config/gimprc-blurbs.h:408 +#: ../app/config/gimprc-blurbs.h:440 msgid "Restore saved keyboard shortcuts on each GIMP startup." msgstr "استعد اختصارات لوحة المفاتيح المحفوظة عند كل تشغيل لجِمب." -#: ../app/config/gimprc-blurbs.h:411 +#: ../app/config/gimprc-blurbs.h:443 msgid "" "Sets the folder for temporary storage. Files will appear here during the " "course of running GIMP. Most files will disappear when GIMP exits, but some " @@ -8013,199 +10558,214 @@ msgid "" "shared by other users." msgstr "" -#: ../app/config/gimprc-blurbs.h:429 +#: ../app/config/gimprc-blurbs.h:464 msgid "" "Sets the default rendering intent for the 'Convert to Color Profile' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:432 +#: ../app/config/gimprc-blurbs.h:467 msgid "" "Sets the default 'Black Point Compensation' state for the 'Convert to Color " "Profile' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:436 +#: ../app/config/gimprc-blurbs.h:471 msgid "" "Sets the default layer dithering method for the 'Convert Precision' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:439 +#: ../app/config/gimprc-blurbs.h:474 msgid "" "Sets the default text layer dithering method for the 'Convert Precision' " "dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:442 +#: ../app/config/gimprc-blurbs.h:477 msgid "" "Sets the default channel dithering method for the 'Convert Precision' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:445 +#: ../app/config/gimprc-blurbs.h:480 msgid "Sets the default palette type for the 'Convert to Indexed' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:448 +#: ../app/config/gimprc-blurbs.h:483 msgid "" "Sets the default maximum number of colors for the 'Convert to Indexed' " "dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:451 +#: ../app/config/gimprc-blurbs.h:486 msgid "" "Sets the default 'Remove duplicate colors' state for the 'Convert to " "Indexed' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:454 +#: ../app/config/gimprc-blurbs.h:489 msgid "Sets the default dithering type for the 'Convert to Indexed' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:457 +#: ../app/config/gimprc-blurbs.h:492 msgid "" "Sets the default 'Dither alpha' state for the 'Convert to Indexed' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:460 +#: ../app/config/gimprc-blurbs.h:495 msgid "" "Sets the default 'Dither text layers' state for the 'Convert to Indexed' " "dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:463 +#: ../app/config/gimprc-blurbs.h:498 msgid "Sets the default fill type for the 'Canvas Size' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:466 +#: ../app/config/gimprc-blurbs.h:501 msgid "Sets the default set of layers to resize for the 'Canvas Size' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:469 +#: ../app/config/gimprc-blurbs.h:504 msgid "" "Sets the default 'Resize text layers' state for the 'Canvas Size' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:472 +#: ../app/config/gimprc-blurbs.h:507 msgid "Sets the default layer name for the 'New Layer' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:475 +#: ../app/config/gimprc-blurbs.h:510 msgid "Sets the default mode for the 'New Layer' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:478 +#: ../app/config/gimprc-blurbs.h:513 +#, fuzzy +msgid "Sets the default blend space for the 'New Layer' dialog." +msgstr "تحدد حجم المصغّرة المعروضة في حوار الفتح." + +#: ../app/config/gimprc-blurbs.h:516 +#, fuzzy +msgid "Sets the default composite space for the 'New Layer' dialog." +msgstr "تحدد حجم المصغّرة المعروضة في حوار الفتح." + +#: ../app/config/gimprc-blurbs.h:519 +#, fuzzy +msgid "Sets the default composite mode for the 'New Layer' dialog." +msgstr "تحدد حجم المصغّرة المعروضة في حوار الفتح." + +#: ../app/config/gimprc-blurbs.h:522 msgid "Sets the default opacity for the 'New Layer' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:481 +#: ../app/config/gimprc-blurbs.h:525 msgid "Sets the default fill type for the 'New Layer' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:484 +#: ../app/config/gimprc-blurbs.h:528 msgid "Sets the default fill type for the 'Layer Boundary Size' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:487 +#: ../app/config/gimprc-blurbs.h:531 msgid "Sets the default mask for the 'Add Layer Mask' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:490 +#: ../app/config/gimprc-blurbs.h:534 msgid "Sets the default 'invert mask' state for the 'Add Layer Mask' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:493 +#: ../app/config/gimprc-blurbs.h:537 msgid "Sets the default merge type for the 'Merge Visible Layers' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:496 +#: ../app/config/gimprc-blurbs.h:540 msgid "" "Sets the default 'Active group only' for the 'Merge Visible Layers' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:499 +#: ../app/config/gimprc-blurbs.h:543 msgid "" "Sets the default 'Discard invisible' for the 'Merge Visible Layers' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:502 +#: ../app/config/gimprc-blurbs.h:546 msgid "Sets the default channel name for the 'New Channel' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:505 +#: ../app/config/gimprc-blurbs.h:549 msgid "Sets the default color and opacity for the 'New Channel' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:508 +#: ../app/config/gimprc-blurbs.h:552 #, fuzzy msgid "Sets the default path name for the 'New Path' dialog." msgstr "تحدد حجم المصغّرة المعروضة في حوار الفتح." -#: ../app/config/gimprc-blurbs.h:511 +#: ../app/config/gimprc-blurbs.h:555 msgid "Sets the default folder path for the 'Export Path' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:514 +#: ../app/config/gimprc-blurbs.h:558 msgid "" "Sets the default 'Export the active path' state for the 'Export Path' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:517 +#: ../app/config/gimprc-blurbs.h:561 msgid "Sets the default folder path for the 'Import Path' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:520 +#: ../app/config/gimprc-blurbs.h:564 msgid "" "Sets the default 'Merge imported paths' state for the 'Import Path' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:523 +#: ../app/config/gimprc-blurbs.h:567 msgid "" "Sets the default 'Scale imported paths to fit size' state for the 'Import " "Path' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:526 +#: ../app/config/gimprc-blurbs.h:570 msgid "Sets the default feather radius for the 'Feather Selection' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:529 +#: ../app/config/gimprc-blurbs.h:573 msgid "Sets the default grow radius for the 'Grow Selection' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:532 +#: ../app/config/gimprc-blurbs.h:576 msgid "Sets the default shrink radius for the 'Shrink Selection' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:535 +#: ../app/config/gimprc-blurbs.h:579 msgid "" "Sets the default 'Selected areas continue outside the image' setting for the " "'Shrink Selection' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:539 +#: ../app/config/gimprc-blurbs.h:583 msgid "Sets the default border radius for the 'Border Selection' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:542 +#: ../app/config/gimprc-blurbs.h:586 msgid "" "Sets the default 'Selected areas continue outside the image' setting for the " "'Border Selection' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:546 +#: ../app/config/gimprc-blurbs.h:590 msgid "Sets the default border style for the 'Border Selection' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:555 +#: ../app/config/gimprc-blurbs.h:599 msgid "Sets the size of the thumbnail shown in the Open dialog." msgstr "تحدد حجم المصغّرة المعروضة في حوار الفتح." -#: ../app/config/gimprc-blurbs.h:558 +#: ../app/config/gimprc-blurbs.h:602 msgid "" "The thumbnail in the Open dialog will be automatically updated if the file " "being previewed is smaller than the size set here." msgstr "" -#: ../app/config/gimprc-blurbs.h:562 +#: ../app/config/gimprc-blurbs.h:606 msgid "" "When the amount of pixel data exceeds this limit, GIMP will start to swap " "tiles to disk. This is a lot slower but it makes it possible to work on " @@ -8213,60 +10773,60 @@ msgid "" "you may want to set this to a higher value." msgstr "" -#: ../app/config/gimprc-blurbs.h:568 +#: ../app/config/gimprc-blurbs.h:612 msgid "Show the current foreground and background colors in the toolbox." msgstr "أظهر ألوان المُقدمة والخلفية الحالية في شريط الأدوات." -#: ../app/config/gimprc-blurbs.h:571 +#: ../app/config/gimprc-blurbs.h:615 msgid "Show the currently selected brush, pattern and gradient in the toolbox." msgstr "أظهر الفرشاة والنمط والتدرّج المختارة حاليا في صندوق الأدوات." -#: ../app/config/gimprc-blurbs.h:574 +#: ../app/config/gimprc-blurbs.h:618 msgid "Show the currently active image in the toolbox." msgstr "أظهر الصورة النشطة حاليا في شريط الأدوات." -#: ../app/config/gimprc-blurbs.h:580 +#: ../app/config/gimprc-blurbs.h:624 msgid "Sets the manner in which transparency is displayed in images." msgstr "" -#: ../app/config/gimprc-blurbs.h:583 +#: ../app/config/gimprc-blurbs.h:627 msgid "Sets the size of the checkerboard used to display transparency." msgstr "" -#: ../app/config/gimprc-blurbs.h:586 +#: ../app/config/gimprc-blurbs.h:630 msgid "" "When enabled, GIMP will not save an image if it has not been changed since " "it was opened." msgstr "" -#: ../app/config/gimprc-blurbs.h:590 +#: ../app/config/gimprc-blurbs.h:634 msgid "" "Sets the minimal number of operations that can be undone. More undo levels " "are kept available until the undo-size limit is reached." msgstr "" -#: ../app/config/gimprc-blurbs.h:594 +#: ../app/config/gimprc-blurbs.h:638 msgid "" "Sets an upper limit to the memory that is used per image to keep operations " "on the undo stack. Regardless of this setting, at least as many undo-levels " "as configured can be undone." msgstr "" -#: ../app/config/gimprc-blurbs.h:599 +#: ../app/config/gimprc-blurbs.h:643 msgid "Sets the size of the previews in the Undo History." msgstr "" -#: ../app/config/gimprc-blurbs.h:602 +#: ../app/config/gimprc-blurbs.h:646 msgid "When enabled, pressing F1 will open the help browser." msgstr "عند تفعيله سيُفتح متصفّح المساعدة عند ضغط F1." -#: ../app/config/gimprc-blurbs.h:605 +#: ../app/config/gimprc-blurbs.h:649 msgid "When enabled, uses OpenCL for some operations." msgstr "عند تفعيله سيُستخدم OpenCL لبعض العمليات." -#: ../app/config/gimprc-deserialize.c:136 ../app/core/gimp-modules.c:135 -#: ../app/core/gimp-units.c:278 ../app/gui/session.c:292 -#: ../app/plug-in/plug-in-rc.c:242 +#: ../app/config/gimprc-deserialize.c:136 ../app/core/gimp-modules.c:131 +#: ../app/core/gimp-units.c:278 ../app/gui/session.c:293 +#: ../app/plug-in/plug-in-rc.c:245 msgid "fatal parse error" msgstr "خطأ تحليل فادح" @@ -8340,866 +10900,823 @@ msgctxt "histogram-channel" msgid "RGB" msgstr "ح‌خ‌ز (RGB)" -#: ../app/core/core-enums.c:328 -msgctxt "layer-mode-effects" -msgid "Normal" -msgstr "عادي" - -#: ../app/core/core-enums.c:329 -msgctxt "layer-mode-effects" -msgid "Dissolve" -msgstr "إذابة" - -#: ../app/core/core-enums.c:330 -msgctxt "layer-mode-effects" -msgid "Behind" -msgstr "خلف" - -#: ../app/core/core-enums.c:331 -msgctxt "layer-mode-effects" -msgid "Multiply" -msgstr "تكرار" - -#: ../app/core/core-enums.c:332 -msgctxt "layer-mode-effects" -msgid "Screen" -msgstr "شاشة" - -#: ../app/core/core-enums.c:333 -msgctxt "layer-mode-effects" -msgid "Old broken Overlay" -msgstr "الكسو القديم المعطوب" - -#: ../app/core/core-enums.c:334 -msgctxt "layer-mode-effects" -msgid "Difference" -msgstr "فرق" - -#: ../app/core/core-enums.c:335 -msgctxt "layer-mode-effects" -msgid "Addition" -msgstr "إضافة" - -#: ../app/core/core-enums.c:336 -msgctxt "layer-mode-effects" -msgid "Subtract" -msgstr "طرح" - -#: ../app/core/core-enums.c:337 -msgctxt "layer-mode-effects" -msgid "Darken only" -msgstr "تغميق فقط" - -#: ../app/core/core-enums.c:338 -msgctxt "layer-mode-effects" -msgid "Lighten only" -msgstr "تفتيح فقط" - -#: ../app/core/core-enums.c:339 -msgctxt "layer-mode-effects" -msgid "Hue (HSV)" -msgstr "التدرج (HSV)" - -#: ../app/core/core-enums.c:340 -msgctxt "layer-mode-effects" -msgid "Saturation (HSV)" -msgstr "التشبّع (HSV)" - -#: ../app/core/core-enums.c:341 -msgctxt "layer-mode-effects" -msgid "Color (HSV)" -msgstr "اللون (HSV)" - -#: ../app/core/core-enums.c:342 -msgctxt "layer-mode-effects" -msgid "Value (HSV)" -msgstr "القيمة (HSV)" - -#: ../app/core/core-enums.c:343 -msgctxt "layer-mode-effects" -msgid "Divide" -msgstr "قسمة" - -#: ../app/core/core-enums.c:344 -msgctxt "layer-mode-effects" -msgid "Dodge" -msgstr "دودج" - -#: ../app/core/core-enums.c:345 -msgctxt "layer-mode-effects" -msgid "Burn" -msgstr "حرق" - -#: ../app/core/core-enums.c:346 -msgctxt "layer-mode-effects" -msgid "Hard light" -msgstr "ضوء قاسي" - -#: ../app/core/core-enums.c:347 -msgctxt "layer-mode-effects" -msgid "Soft light" -msgstr "لون لين" - -#: ../app/core/core-enums.c:348 -msgctxt "layer-mode-effects" -msgid "Grain extract" -msgstr "استخراج الحبوب" - -#: ../app/core/core-enums.c:349 -msgctxt "layer-mode-effects" -msgid "Grain merge" -msgstr "دمج الحبوب" - -#: ../app/core/core-enums.c:350 -msgctxt "layer-mode-effects" -msgid "Color erase" -msgstr "محو اللون" - -#: ../app/core/core-enums.c:351 -msgctxt "layer-mode-effects" -msgid "Overlay" -msgstr "كسو" - -#: ../app/core/core-enums.c:352 -msgctxt "layer-mode-effects" -msgid "Hue (LCH)" -msgstr "التدرج (LCH)" - -#: ../app/core/core-enums.c:353 -msgctxt "layer-mode-effects" -msgid "Chroma (LCH)" -msgstr "الصفاء (LCH)" - -#: ../app/core/core-enums.c:354 -msgctxt "layer-mode-effects" -msgid "Color (LCH)" -msgstr "اللون (LCH)" - -#: ../app/core/core-enums.c:355 -msgctxt "layer-mode-effects" -msgid "Lightness (LCH)" -msgstr "الإضاءة (LCH)" - -#: ../app/core/core-enums.c:356 -msgctxt "layer-mode-effects" -msgid "Erase" -msgstr "محو" - -#: ../app/core/core-enums.c:357 -msgctxt "layer-mode-effects" -msgid "Replace" -msgstr "استبدال" - -#: ../app/core/core-enums.c:358 -msgctxt "layer-mode-effects" -msgid "Anti erase" -msgstr "مضاد للمحو" - -#: ../app/core/core-enums.c:386 +#: ../app/core/core-enums.c:299 msgctxt "matting-engine" msgid "Matting Global" msgstr "استخراج عام" -#: ../app/core/core-enums.c:387 +#: ../app/core/core-enums.c:300 msgctxt "matting-engine" msgid "Matting Levin" msgstr "استخراج ليڤن" -#: ../app/core/core-enums.c:503 +#: ../app/core/core-enums.c:422 msgctxt "align-reference-type" msgid "First item" msgstr "العنصر الأول" -#: ../app/core/core-enums.c:504 +#: ../app/core/core-enums.c:423 msgctxt "align-reference-type" msgid "Image" msgstr "الصورة" -#: ../app/core/core-enums.c:505 +#: ../app/core/core-enums.c:424 msgctxt "align-reference-type" msgid "Selection" msgstr "التحديد" -#: ../app/core/core-enums.c:506 +#: ../app/core/core-enums.c:425 msgctxt "align-reference-type" msgid "Active layer" msgstr "الطبقة النشطة" -#: ../app/core/core-enums.c:507 +#: ../app/core/core-enums.c:426 msgctxt "align-reference-type" msgid "Active channel" msgstr "القناة النشطة" -#: ../app/core/core-enums.c:508 +#: ../app/core/core-enums.c:427 msgctxt "align-reference-type" msgid "Active path" msgstr "المسار النشط" -#: ../app/core/core-enums.c:536 +#: ../app/core/core-enums.c:455 msgctxt "fill-style" msgid "Solid color" msgstr "لون سادة" -#: ../app/core/core-enums.c:537 +#: ../app/core/core-enums.c:456 msgctxt "fill-style" msgid "Pattern" msgstr "نمط" -#: ../app/core/core-enums.c:574 +#: ../app/core/core-enums.c:493 msgctxt "dash-preset" msgid "Custom" msgstr "مخصصة" -#: ../app/core/core-enums.c:575 +#: ../app/core/core-enums.c:494 msgctxt "dash-preset" msgid "Line" msgstr "سطر" -#: ../app/core/core-enums.c:576 +#: ../app/core/core-enums.c:495 msgctxt "dash-preset" msgid "Long dashes" msgstr "شرُط طويلة" -#: ../app/core/core-enums.c:577 +#: ../app/core/core-enums.c:496 msgctxt "dash-preset" msgid "Medium dashes" msgstr "شرُط متوسطة" -#: ../app/core/core-enums.c:578 +#: ../app/core/core-enums.c:497 msgctxt "dash-preset" msgid "Short dashes" msgstr "شرُط قصيرة" -#: ../app/core/core-enums.c:579 +#: ../app/core/core-enums.c:498 msgctxt "dash-preset" msgid "Sparse dots" msgstr "نقاط متناثرة" -#: ../app/core/core-enums.c:580 +#: ../app/core/core-enums.c:499 msgctxt "dash-preset" msgid "Normal dots" msgstr "نقاط عادية" -#: ../app/core/core-enums.c:581 +#: ../app/core/core-enums.c:500 msgctxt "dash-preset" msgid "Dense dots" msgstr "نقاط كثيفة" -#: ../app/core/core-enums.c:582 +#: ../app/core/core-enums.c:501 msgctxt "dash-preset" msgid "Stipples" msgstr "خط منقّط" -#: ../app/core/core-enums.c:583 +#: ../app/core/core-enums.c:502 msgctxt "dash-preset" msgid "Dash, dot" msgstr "شرطة، نقطة" -#: ../app/core/core-enums.c:584 +#: ../app/core/core-enums.c:503 msgctxt "dash-preset" msgid "Dash, dot, dot" msgstr "شرطة، نقطة، نقطة" -#: ../app/core/core-enums.c:615 +#: ../app/core/core-enums.c:534 msgctxt "item-set" msgid "None" msgstr "لا شيء" -#: ../app/core/core-enums.c:616 +#: ../app/core/core-enums.c:535 msgctxt "item-set" msgid "All layers" msgstr "كل الطبقات" -#: ../app/core/core-enums.c:617 +#: ../app/core/core-enums.c:536 msgctxt "item-set" msgid "Image-sized layers" msgstr "الطبقات بحجم الصورة" -#: ../app/core/core-enums.c:618 +#: ../app/core/core-enums.c:537 msgctxt "item-set" msgid "All visible layers" msgstr "كل الطبقات الظاهرة" -#: ../app/core/core-enums.c:619 +#: ../app/core/core-enums.c:538 msgctxt "item-set" msgid "All linked layers" msgstr "كل الطبقات المربوطة" -#: ../app/core/core-enums.c:654 +#: ../app/core/core-enums.c:573 msgctxt "view-size" msgid "Tiny" msgstr "ضئيل" -#: ../app/core/core-enums.c:655 +#: ../app/core/core-enums.c:574 msgctxt "view-size" msgid "Very small" msgstr "صغير جدا" -#: ../app/core/core-enums.c:656 +#: ../app/core/core-enums.c:575 msgctxt "view-size" msgid "Small" msgstr "صغير" -#: ../app/core/core-enums.c:657 +#: ../app/core/core-enums.c:576 msgctxt "view-size" msgid "Medium" msgstr "متوسط" -#: ../app/core/core-enums.c:658 +#: ../app/core/core-enums.c:577 msgctxt "view-size" msgid "Large" msgstr "كبير" -#: ../app/core/core-enums.c:659 +#: ../app/core/core-enums.c:578 msgctxt "view-size" msgid "Very large" msgstr "كبير جدا" -#: ../app/core/core-enums.c:660 +#: ../app/core/core-enums.c:579 msgctxt "view-size" msgid "Huge" msgstr "ضخم" -#: ../app/core/core-enums.c:661 +#: ../app/core/core-enums.c:580 msgctxt "view-size" msgid "Enormous" msgstr "هائل" -#: ../app/core/core-enums.c:662 +#: ../app/core/core-enums.c:581 msgctxt "view-size" msgid "Gigantic" msgstr "عملاق" -#: ../app/core/core-enums.c:690 +#: ../app/core/core-enums.c:609 msgctxt "view-type" msgid "View as list" msgstr "اعرض كقائمة" -#: ../app/core/core-enums.c:691 +#: ../app/core/core-enums.c:610 msgctxt "view-type" msgid "View as grid" msgstr "اعرض كشبكة" -#: ../app/core/core-enums.c:720 +#: ../app/core/core-enums.c:639 msgctxt "thumbnail-size" msgid "No thumbnails" msgstr "لا مصغّرات" -#: ../app/core/core-enums.c:721 +#: ../app/core/core-enums.c:640 msgctxt "thumbnail-size" msgid "Normal (128x128)" msgstr "طبيعي (128×128)" -#: ../app/core/core-enums.c:722 +#: ../app/core/core-enums.c:641 msgctxt "thumbnail-size" msgid "Large (256x256)" msgstr "عريض (256×256)" -#: ../app/core/core-enums.c:906 +#: ../app/core/core-enums.c:671 +msgctxt "debug-policy" +msgid "Debug warnings, critical errors and crashes" +msgstr "" + +#: ../app/core/core-enums.c:672 +msgctxt "debug-policy" +msgid "Debug critical errors and crashes" +msgstr "" + +#: ../app/core/core-enums.c:673 +msgctxt "debug-policy" +msgid "Debug crashes only" +msgstr "" + +#: ../app/core/core-enums.c:674 +msgctxt "debug-policy" +msgid "Never debug GIMP" +msgstr "" + +#: ../app/core/core-enums.c:862 msgctxt "undo-type" msgid "<>" msgstr "<<غير صحيح>>" -#: ../app/core/core-enums.c:907 +#: ../app/core/core-enums.c:863 msgctxt "undo-type" msgid "Scale image" msgstr "حجّم الصورة" -#: ../app/core/core-enums.c:908 +#: ../app/core/core-enums.c:864 msgctxt "undo-type" msgid "Resize image" msgstr "غيّر حجم الصورة" -#: ../app/core/core-enums.c:909 +#: ../app/core/core-enums.c:865 msgctxt "undo-type" msgid "Flip image" msgstr "اقلب الصورة" -#: ../app/core/core-enums.c:910 +#: ../app/core/core-enums.c:866 msgctxt "undo-type" msgid "Rotate image" msgstr "دوّر الصورة" -#: ../app/core/core-enums.c:911 +#: ../app/core/core-enums.c:867 msgctxt "undo-type" msgid "Crop image" msgstr "قصّر الصورة" -#: ../app/core/core-enums.c:912 +#: ../app/core/core-enums.c:868 msgctxt "undo-type" msgid "Convert image" msgstr "حوّل الصورة" -#: ../app/core/core-enums.c:913 +#: ../app/core/core-enums.c:869 msgctxt "undo-type" msgid "Remove item" msgstr "أزل العنصر" -#: ../app/core/core-enums.c:914 +#: ../app/core/core-enums.c:870 msgctxt "undo-type" msgid "Merge layers" msgstr "ادمج الطبقات" -#: ../app/core/core-enums.c:915 +#: ../app/core/core-enums.c:871 msgctxt "undo-type" msgid "Merge paths" msgstr "ادمج المسارات" -#: ../app/core/core-enums.c:916 +#: ../app/core/core-enums.c:872 msgctxt "undo-type" msgid "Quick Mask" msgstr "قناع سريع" -#: ../app/core/core-enums.c:917 ../app/core/core-enums.c:948 +#: ../app/core/core-enums.c:873 ../app/core/core-enums.c:904 #: ../app/core/gimpimage-grid.c:64 msgctxt "undo-type" msgid "Grid" msgstr "شبكة" -#: ../app/core/core-enums.c:918 ../app/core/core-enums.c:952 +#: ../app/core/core-enums.c:874 ../app/core/core-enums.c:908 msgctxt "undo-type" msgid "Guide" msgstr "دليل" -#: ../app/core/core-enums.c:919 ../app/core/core-enums.c:953 +#: ../app/core/core-enums.c:875 ../app/core/core-enums.c:909 msgctxt "undo-type" msgid "Sample Point" msgstr "عينة نقطة" -#: ../app/core/core-enums.c:920 ../app/core/core-enums.c:954 +#: ../app/core/core-enums.c:876 ../app/core/core-enums.c:910 msgctxt "undo-type" msgid "Layer/Channel" msgstr "طبقة/قناة" -#: ../app/core/core-enums.c:921 ../app/core/core-enums.c:955 +#: ../app/core/core-enums.c:877 ../app/core/core-enums.c:911 msgctxt "undo-type" msgid "Layer/Channel modification" msgstr "تعديل الطبقة/القناة" -#: ../app/core/core-enums.c:922 ../app/core/core-enums.c:956 +#: ../app/core/core-enums.c:878 ../app/core/core-enums.c:912 msgctxt "undo-type" msgid "Selection mask" msgstr "قناع التحديد" -#: ../app/core/core-enums.c:923 ../app/core/core-enums.c:960 +#: ../app/core/core-enums.c:879 ../app/core/core-enums.c:916 msgctxt "undo-type" msgid "Item visibility" msgstr "ظهور العنصر" -#: ../app/core/core-enums.c:924 ../app/core/core-enums.c:961 +#: ../app/core/core-enums.c:880 ../app/core/core-enums.c:917 msgctxt "undo-type" msgid "Link/Unlink item" msgstr "اربط/افصل العنصر" -#: ../app/core/core-enums.c:925 +#: ../app/core/core-enums.c:881 msgctxt "undo-type" msgid "Item properties" msgstr "خصائص العنصر" -#: ../app/core/core-enums.c:926 ../app/core/core-enums.c:959 +#: ../app/core/core-enums.c:882 ../app/core/core-enums.c:915 msgctxt "undo-type" msgid "Move item" msgstr "انقل العنصر" -#: ../app/core/core-enums.c:927 +#: ../app/core/core-enums.c:883 msgctxt "undo-type" msgid "Scale item" msgstr "حجّم العنصر" -#: ../app/core/core-enums.c:928 +#: ../app/core/core-enums.c:884 msgctxt "undo-type" msgid "Resize item" msgstr "غيّر حجم العنصر" -#: ../app/core/core-enums.c:929 +#: ../app/core/core-enums.c:885 msgctxt "undo-type" msgid "Add layer" msgstr "أضِف طبقة" -#: ../app/core/core-enums.c:930 ../app/core/core-enums.c:976 +#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:936 msgctxt "undo-type" msgid "Add layer mask" msgstr "أضِف قناع طبقة" -#: ../app/core/core-enums.c:931 ../app/core/core-enums.c:978 +#: ../app/core/core-enums.c:887 ../app/core/core-enums.c:938 msgctxt "undo-type" msgid "Apply layer mask" msgstr "طبّق قناع الطبقة" -#: ../app/core/core-enums.c:932 ../app/core/core-enums.c:986 +#: ../app/core/core-enums.c:888 ../app/core/core-enums.c:946 msgctxt "undo-type" msgid "Floating selection to layer" msgstr "التحديد الحر إلى طبقة" -#: ../app/core/core-enums.c:933 +#: ../app/core/core-enums.c:889 msgctxt "undo-type" msgid "Float selection" msgstr "تحديد حر" -#: ../app/core/core-enums.c:934 +#: ../app/core/core-enums.c:890 msgctxt "undo-type" msgid "Anchor floating selection" msgstr "اربط التحديد الحر" -#: ../app/core/core-enums.c:935 ../app/core/gimp-edit.c:438 +#: ../app/core/core-enums.c:891 ../app/core/gimp-edit.c:501 msgctxt "undo-type" msgid "Paste" msgstr "ألصق" -#: ../app/core/core-enums.c:936 ../app/core/gimp-edit.c:690 +#: ../app/core/core-enums.c:892 ../app/core/gimp-edit.c:829 msgctxt "undo-type" msgid "Cut" msgstr "قص" -#: ../app/core/core-enums.c:937 +#: ../app/core/core-enums.c:893 msgctxt "undo-type" msgid "Text" msgstr "نص" -#: ../app/core/core-enums.c:938 ../app/core/core-enums.c:987 -#: ../app/core/gimpdrawable-transform.c:672 +#: ../app/core/core-enums.c:894 ../app/core/core-enums.c:947 +#: ../app/core/gimpdrawable-transform.c:692 msgctxt "undo-type" msgid "Transform" msgstr "حوّل" -#: ../app/core/core-enums.c:939 ../app/core/core-enums.c:988 +#: ../app/core/core-enums.c:895 ../app/core/core-enums.c:948 msgctxt "undo-type" msgid "Paint" msgstr "لوّن" -#: ../app/core/core-enums.c:940 ../app/core/core-enums.c:991 +#: ../app/core/core-enums.c:896 ../app/core/core-enums.c:951 msgctxt "undo-type" msgid "Attach parasite" msgstr "أرفق طفيلي" -#: ../app/core/core-enums.c:941 ../app/core/core-enums.c:992 +#: ../app/core/core-enums.c:897 ../app/core/core-enums.c:952 msgctxt "undo-type" msgid "Remove parasite" msgstr "أزِل الطفيلي" -#: ../app/core/core-enums.c:942 +#: ../app/core/core-enums.c:898 msgctxt "undo-type" msgid "Import paths" msgstr "استورد مسارات" -#: ../app/core/core-enums.c:943 +#: ../app/core/core-enums.c:899 msgctxt "undo-type" msgid "Plug-In" msgstr "ملحقة" -#: ../app/core/core-enums.c:944 +#: ../app/core/core-enums.c:900 msgctxt "undo-type" msgid "Image type" msgstr "نوع الصورة" -#: ../app/core/core-enums.c:945 +#: ../app/core/core-enums.c:901 msgctxt "undo-type" msgid "Image precision" msgstr "دقّة الصورة" -#: ../app/core/core-enums.c:946 +#: ../app/core/core-enums.c:902 msgctxt "undo-type" msgid "Image size" msgstr "حجم الصورة" -#: ../app/core/core-enums.c:947 +#: ../app/core/core-enums.c:903 msgctxt "undo-type" msgid "Image resolution change" msgstr "تغيير ميز الصورة" -#: ../app/core/core-enums.c:949 +#: ../app/core/core-enums.c:905 msgctxt "undo-type" msgid "Change metadata" msgstr "غيّر البيانات الفوقية" -#: ../app/core/core-enums.c:950 +#: ../app/core/core-enums.c:906 msgctxt "undo-type" msgid "Change indexed palette" msgstr "غيّر لوح اللون المفهرس" -#: ../app/core/core-enums.c:951 +#: ../app/core/core-enums.c:907 #, fuzzy msgctxt "undo-type" msgid "Change color managed state" msgstr "غيّر لون النص المحدد" -#: ../app/core/core-enums.c:957 +#: ../app/core/core-enums.c:913 msgctxt "undo-type" msgid "Reorder item" msgstr "غيّر ترتيب العنصر" -#: ../app/core/core-enums.c:958 +#: ../app/core/core-enums.c:914 msgctxt "undo-type" msgid "Rename item" msgstr "غيّر تسمية العنصر" -#: ../app/core/core-enums.c:962 +#: ../app/core/core-enums.c:918 #, fuzzy msgctxt "undo-type" msgid "Item color tag" msgstr "احذف اللون" -#: ../app/core/core-enums.c:963 +#: ../app/core/core-enums.c:919 msgctxt "undo-type" msgid "Lock/Unlock content" msgstr "أوصد/افتح المحتوى" -#: ../app/core/core-enums.c:964 +#: ../app/core/core-enums.c:920 msgctxt "undo-type" msgid "Lock/Unlock position" msgstr "أوصد/افتح الموضع" -#: ../app/core/core-enums.c:965 +#: ../app/core/core-enums.c:921 msgctxt "undo-type" msgid "New layer" msgstr "طبقة جديدة" -#: ../app/core/core-enums.c:966 +#: ../app/core/core-enums.c:922 msgctxt "undo-type" msgid "Delete layer" msgstr "احذف الطبقة" -#: ../app/core/core-enums.c:967 +#: ../app/core/core-enums.c:923 msgctxt "undo-type" msgid "Set layer mode" msgstr "حدد طور الطبقة" -#: ../app/core/core-enums.c:968 +#: ../app/core/core-enums.c:924 msgctxt "undo-type" msgid "Set layer opacity" -msgstr "حدد إعتام الطبقة" +msgstr "حدد عتامة الطبقة" -#: ../app/core/core-enums.c:969 +#: ../app/core/core-enums.c:925 msgctxt "undo-type" msgid "Lock/Unlock alpha channel" msgstr "أوصد/افتح قناة الشفافية" -#: ../app/core/core-enums.c:970 +#: ../app/core/core-enums.c:926 msgctxt "undo-type" msgid "Suspend group layer resize" msgstr "علّق تغيير حجم مجموعة الطبقات" -#: ../app/core/core-enums.c:971 +#: ../app/core/core-enums.c:927 msgctxt "undo-type" msgid "Resume group layer resize" msgstr "استكمل تغيير حجم مجموعة الطبقات" -#: ../app/core/core-enums.c:972 +#: ../app/core/core-enums.c:928 +#, fuzzy +msgctxt "undo-type" +msgid "Suspend group layer mask" +msgstr "علّق تغيير حجم مجموعة الطبقات" + +#: ../app/core/core-enums.c:929 +#, fuzzy +msgctxt "undo-type" +msgid "Resume group layer mask" +msgstr "استكمل تغيير حجم مجموعة الطبقات" + +#: ../app/core/core-enums.c:930 +#, fuzzy +msgctxt "undo-type" +msgid "Start moving group layer" +msgstr "حوّل مجموعة الطبقات" + +#: ../app/core/core-enums.c:931 +#, fuzzy +msgctxt "undo-type" +msgid "End moving group layer" +msgstr "حوّل مجموعة الطبقات" + +#: ../app/core/core-enums.c:932 msgctxt "undo-type" msgid "Convert group layer" msgstr "حوّل مجموعة الطبقات" -#: ../app/core/core-enums.c:973 +#: ../app/core/core-enums.c:933 msgctxt "undo-type" msgid "Text layer" msgstr "طبقة نصية" -#: ../app/core/core-enums.c:974 +#: ../app/core/core-enums.c:934 msgctxt "undo-type" msgid "Text layer modification" msgstr "تعديل الطبقة النصية" -#: ../app/core/core-enums.c:975 +#: ../app/core/core-enums.c:935 msgctxt "undo-type" msgid "Convert text layer" msgstr "حوّل طبقة النص" -#: ../app/core/core-enums.c:977 +#: ../app/core/core-enums.c:937 msgctxt "undo-type" msgid "Delete layer mask" msgstr "احذف قناع الطبقة" -#: ../app/core/core-enums.c:979 +#: ../app/core/core-enums.c:939 msgctxt "undo-type" msgid "Show layer mask" msgstr "اعرض قناع الطبقة" -#: ../app/core/core-enums.c:980 +#: ../app/core/core-enums.c:940 msgctxt "undo-type" msgid "New channel" msgstr "قناة جديدة" -#: ../app/core/core-enums.c:981 +#: ../app/core/core-enums.c:941 msgctxt "undo-type" msgid "Delete channel" msgstr "احذف القناة" -#: ../app/core/core-enums.c:982 +#: ../app/core/core-enums.c:942 msgctxt "undo-type" msgid "Channel color" msgstr "لون القناة" -#: ../app/core/core-enums.c:983 +#: ../app/core/core-enums.c:943 msgctxt "undo-type" msgid "New path" msgstr "مسار جديد" -#: ../app/core/core-enums.c:984 +#: ../app/core/core-enums.c:944 msgctxt "undo-type" msgid "Delete path" msgstr "احذف المسار" -#: ../app/core/core-enums.c:985 +#: ../app/core/core-enums.c:945 msgctxt "undo-type" msgid "Path modification" msgstr "تعديل المسار" -#: ../app/core/core-enums.c:989 +#: ../app/core/core-enums.c:949 msgctxt "undo-type" msgid "Ink" msgstr "حبر" -#: ../app/core/core-enums.c:990 +#: ../app/core/core-enums.c:950 msgctxt "undo-type" msgid "Select foreground" msgstr "اختر المقدمة" -#: ../app/core/core-enums.c:993 +#: ../app/core/core-enums.c:953 msgctxt "undo-type" msgid "Not undoable" msgstr "غير قابل للتراجع" -#: ../app/core/core-enums.c:1106 +#: ../app/core/core-enums.c:1033 +#, fuzzy +msgctxt "gradient-color" +msgid "Fixed" +msgstr "ثابت" + +#: ../app/core/core-enums.c:1034 +#, fuzzy +msgctxt "gradient-color" +msgid "Foreground color" +msgstr "لون المقدمة" + +#. Translators: this is an abbreviated version of "Foreground color". +#. Keep it short. +#: ../app/core/core-enums.c:1037 +msgctxt "gradient-color" +msgid "FG" +msgstr "" + +#: ../app/core/core-enums.c:1038 +#, fuzzy +msgctxt "gradient-color" +msgid "Foreground color (transparent)" +msgstr "لون الم_قدمة (شفاف)" + +#. Translators: this is an abbreviated version of "Foreground color (transparent)". +#. Keep it short. +#: ../app/core/core-enums.c:1041 +msgctxt "gradient-color" +msgid "FG (t)" +msgstr "" + +#: ../app/core/core-enums.c:1042 +#, fuzzy +msgctxt "gradient-color" +msgid "Background color" +msgstr "لون الخلفية" + +#. Translators: this is an abbreviated version of "Background color". +#. Keep it short. +#: ../app/core/core-enums.c:1045 +msgctxt "gradient-color" +msgid "BG" +msgstr "" + +#: ../app/core/core-enums.c:1046 +#, fuzzy +msgctxt "gradient-color" +msgid "Background color (transparent)" +msgstr "لون الخل_فية (شفاف)" + +#. Translators: this is an abbreviated version of "Background color (transparent)". +#. Keep it short. +#: ../app/core/core-enums.c:1049 +msgctxt "gradient-color" +msgid "BG (t)" +msgstr "" + +#: ../app/core/core-enums.c:1080 msgctxt "message-severity" msgid "Message" msgstr "رسالة" -#: ../app/core/core-enums.c:1107 +#: ../app/core/core-enums.c:1081 msgctxt "message-severity" msgid "Warning" msgstr "تحذير" -#: ../app/core/core-enums.c:1108 +#: ../app/core/core-enums.c:1082 msgctxt "message-severity" msgid "Error" msgstr "خطأ" -#: ../app/core/core-enums.c:1137 +#: ../app/core/core-enums.c:1083 +msgctxt "message-severity" +msgid "WARNING" +msgstr "" + +#: ../app/core/core-enums.c:1084 +msgctxt "message-severity" +msgid "CRITICAL" +msgstr "" + +#: ../app/core/core-enums.c:1113 msgctxt "color-profile-policy" msgid "Ask what to do" msgstr "سؤال ماذا تصنع" -#: ../app/core/core-enums.c:1138 +#: ../app/core/core-enums.c:1114 msgctxt "color-profile-policy" msgid "Keep embedded profile" msgstr "اترك اللاحة المدمجة" -#: ../app/core/core-enums.c:1139 +#: ../app/core/core-enums.c:1115 #, fuzzy msgctxt "color-profile-policy" msgid "Convert to preferred RGB color profile" msgstr "حوّل الصورة إلى لاحة ألوان" -#: ../app/core/core-enums.c:1176 +#: ../app/core/core-enums.c:1152 msgctxt "dynamics-output-type" msgid "Opacity" -msgstr "الإعتام" +msgstr "العتامة" -#: ../app/core/core-enums.c:1177 +#: ../app/core/core-enums.c:1153 msgctxt "dynamics-output-type" msgid "Size" msgstr "الحجم" -#: ../app/core/core-enums.c:1178 +#: ../app/core/core-enums.c:1154 msgctxt "dynamics-output-type" msgid "Angle" msgstr "الزاوية" -#: ../app/core/core-enums.c:1179 +#: ../app/core/core-enums.c:1155 msgctxt "dynamics-output-type" msgid "Color" msgstr "اللون" -#: ../app/core/core-enums.c:1180 +#: ../app/core/core-enums.c:1156 msgctxt "dynamics-output-type" msgid "Hardness" msgstr "الصلابة" -#: ../app/core/core-enums.c:1181 +#: ../app/core/core-enums.c:1157 msgctxt "dynamics-output-type" msgid "Force" msgstr "القوة" -#: ../app/core/core-enums.c:1182 +#: ../app/core/core-enums.c:1158 msgctxt "dynamics-output-type" msgid "Aspect ratio" -msgstr "نسبة الارتفاع" +msgstr "نسبة الأبعاد" -#: ../app/core/core-enums.c:1183 +#: ../app/core/core-enums.c:1159 msgctxt "dynamics-output-type" msgid "Spacing" msgstr "التباعد" -#: ../app/core/core-enums.c:1184 +#: ../app/core/core-enums.c:1160 msgctxt "dynamics-output-type" msgid "Rate" msgstr "المعدل" -#: ../app/core/core-enums.c:1185 +#: ../app/core/core-enums.c:1161 msgctxt "dynamics-output-type" msgid "Flow" msgstr "التدفق" -#: ../app/core/core-enums.c:1186 +#: ../app/core/core-enums.c:1162 msgctxt "dynamics-output-type" msgid "Jitter" msgstr "النفّاض" -#: ../app/core/core-enums.c:1214 +#: ../app/core/core-enums.c:1190 #, fuzzy msgctxt "filter-region" msgid "Use the selection as input" msgstr "استخدم التحديد كمُدخلات" -#: ../app/core/core-enums.c:1215 +#: ../app/core/core-enums.c:1191 #, fuzzy msgctxt "filter-region" msgid "Use the entire layer as input" msgstr "استخدم كل الطبقة كمُدخلات" -#: ../app/core/core-enums.c:1244 +#: ../app/core/core-enums.c:1220 #, fuzzy msgctxt "channel-border-style" msgid "Hard" msgstr "الصلابة" -#: ../app/core/core-enums.c:1245 +#: ../app/core/core-enums.c:1221 #, fuzzy msgctxt "channel-border-style" msgid "Smooth" msgstr "ناعم" -#: ../app/core/core-enums.c:1246 +#: ../app/core/core-enums.c:1222 #, fuzzy msgctxt "channel-border-style" msgid "Feathered" msgstr "نعّم الحواف" #. initialize babl fishes -#: ../app/core/gimp.c:587 ../app/core/gimp.c:619 +#: ../app/core/gimp.c:508 ../app/core/gimp.c:540 msgid "Initialization" msgstr "يجهّز" #. register all internal procedures -#: ../app/core/gimp.c:599 +#: ../app/core/gimp.c:520 msgid "Internal Procedures" msgstr "عملية داخلية" #. initialize the global parasite table -#: ../app/core/gimp.c:860 +#: ../app/core/gimp.c:781 msgid "Looking for data files" msgstr "يبحث عن ملفات البيانات" -#: ../app/core/gimp.c:860 +#: ../app/core/gimp.c:781 msgid "Parasites" msgstr "الطفيليات" -#: ../app/core/gimp.c:869 +#: ../app/core/gimp.c:790 msgid "Fonts (this may take a while)" msgstr "الخطوط (قد تستغرق بعض الوقت)" #. initialize the module list -#: ../app/core/gimp.c:878 ../app/dialogs/preferences-dialog.c:2786 +#: ../app/core/gimp.c:799 ../app/dialogs/preferences-dialog.c:3112 msgid "Modules" msgstr "الوحدات" @@ -9213,69 +11730,88 @@ msgstr "لم يُحدد أي مفسر سطر أوامر، سيُستخدم ال msgid "The batch interpreter '%s' is not available. Batch mode disabled." msgstr "مفسر سطر الأوامر '%s' غير متاح. وضع سطر الأوامر سيُعطّل." -#: ../app/core/gimp-contexts.c:153 ../app/core/gimptooloptions.c:352 -#: ../app/gui/session.c:427 ../app/menus/menus.c:467 -#: ../app/widgets/gimpdevices.c:207 +#: ../app/core/gimp-contexts.c:153 ../app/core/gimp-internal-data.c:304 +#: ../app/core/gimptooloptions.c:348 ../app/gui/session.c:428 +#: ../app/menus/menus.c:476 ../app/widgets/gimpdevices.c:207 #, c-format msgid "Deleting \"%s\" failed: %s" msgstr "فشل حذف \"%s\"‏ : %s" #. initialize the list of gimp dynamics -#: ../app/core/gimp-data-factories.c:358 ../app/core/gimpcontext.c:711 -#: ../app/dialogs/preferences-dialog.c:2750 -#: ../app/tools/gimppaintoptions-gui.c:219 +#: ../app/core/gimp-data-factories.c:322 ../app/core/gimpcontext.c:711 +#: ../app/dialogs/preferences-dialog.c:3076 +#: ../app/tools/gimppaintoptions-gui.c:225 msgid "Dynamics" msgstr "الحركيات" #. initialize the color history -#: ../app/core/gimp-data-factories.c:383 ../app/core/gimp-palettes.c:60 +#: ../app/core/gimp-data-factories.c:347 ../app/core/gimp-palettes.c:60 msgid "Color History" msgstr "امسح التأريخ" #. update tag cache -#: ../app/core/gimp-data-factories.c:395 +#: ../app/core/gimp-data-factories.c:359 msgid "Updating tag cache" msgstr "يُحدّث خبيئة الوسوم" -#: ../app/core/gimp-edit.c:89 +#: ../app/core/gimp-edit.c:97 #, fuzzy msgctxt "undo-type" msgid "Cut Layer" msgstr "طبقة نصية" -#: ../app/core/gimp-edit.c:421 ../app/core/gimpimage-new.c:326 +#: ../app/core/gimp-edit.c:313 ../app/core/gimpimage-new.c:325 msgid "Pasted Layer" msgstr "طبقة ملصقة" -#: ../app/core/gimp-edit.c:591 +#: ../app/core/gimp-edit.c:724 msgctxt "undo-type" msgid "Clear" msgstr "امسح" -#: ../app/core/gimp-edit.c:703 +#: ../app/core/gimp-edit.c:846 msgid "Global Buffer" msgstr "براح عام" -#: ../app/core/gimp-gradients.c:63 +#: ../app/core/gimp-gradients.c:64 +#, fuzzy +msgid "Custom" +msgstr "مخصصة" + +#: ../app/core/gimp-gradients.c:74 msgid "FG to BG (RGB)" msgstr "المقدمة للخلفية (ح‌خ‌ز)" -#: ../app/core/gimp-gradients.c:71 +#: ../app/core/gimp-gradients.c:82 msgid "FG to BG (Hardedge)" msgstr "المقدمة للخلفية (Hardedge)" -#: ../app/core/gimp-gradients.c:88 +#: ../app/core/gimp-gradients.c:99 msgid "FG to BG (HSV counter-clockwise)" msgstr "المقدمة للخلفية (إتش.إس.ڤي عكس عقارب الساعة)" -#: ../app/core/gimp-gradients.c:96 +#: ../app/core/gimp-gradients.c:107 +#, fuzzy msgid "FG to BG (HSV clockwise hue)" -msgstr "المقدمة للخلفية (تدرج HSV مع عقارب الساعة)" +msgstr "المقدمة للخلفية (درجة HSV مع عقارب الساعة)" -#: ../app/core/gimp-gradients.c:104 +#: ../app/core/gimp-gradients.c:115 msgid "FG to Transparent" msgstr "الخلفية إلى شفاف" +#: ../app/core/gimp-spawn.c:186 +#, fuzzy, c-format +msgid "Failed to fork (%s)" +msgstr "" +"فشل تحميل البيانات:\n" +"\n" +"%s" + +#: ../app/core/gimp-spawn.c:223 +#, c-format +msgid "Failed to execute child process “%s” (%s)" +msgstr "" + #. This is a special string to specify the language identifier to #. * look for in the gimp-tags-default.xml file. Please translate the #. * C in it according to the name of the po file used for @@ -9286,14 +11822,14 @@ msgstr "الخلفية إلى شفاف" msgid "tags-locale:C" msgstr "tags-locale:ar" -#: ../app/core/gimp-user-install.c:213 +#: ../app/core/gimp-user-install.c:216 #, c-format msgid "" "It seems you have used GIMP %s before. GIMP will now migrate your user " "settings to '%s'." msgstr "يبدو أنك استخدمت جمب %s من قبل. سيقوم جمب بنقل إعداداتك الآن إلى '%s'." -#: ../app/core/gimp-user-install.c:218 +#: ../app/core/gimp-user-install.c:221 #, c-format msgid "" "It appears that you are using GIMP for the first time. GIMP will now create " @@ -9302,63 +11838,68 @@ msgstr "" "يبدو أنك تستخدم جمب للمرة الأولى. سينشئ جمب الآن مجلدا باسم '%s' وينسخ بعض " "الملفات إليه." -#: ../app/core/gimp-user-install.c:417 +#: ../app/core/gimp-user-install.c:420 #, c-format msgid "Copying file '%s' from '%s'..." msgstr "ينسخ الملف '%s' من '%s'..." -#: ../app/core/gimp-user-install.c:432 ../app/core/gimp-user-install.c:458 +#: ../app/core/gimp-user-install.c:435 ../app/core/gimp-user-install.c:461 #, c-format msgid "Creating folder '%s'..." msgstr "ينشئ المجلد '%s'..." -#: ../app/core/gimp-user-install.c:443 ../app/core/gimp-user-install.c:469 +#: ../app/core/gimp-user-install.c:446 ../app/core/gimp-user-install.c:472 #, c-format msgid "Cannot create folder '%s': %s" msgstr "تعذّر إنشاء المجلد '%s'‏: %s" -#: ../app/core/gimp-utils.c:553 ../app/core/gimpfilloptions.c:329 +#: ../app/core/gimp-utils.c:569 ../app/core/gimpfilloptions.c:330 msgid "No patterns available for this operation." msgstr "لا تتوفر أنماط لهذه العملية." -#: ../app/core/gimpbrush-load.c:173 +#: ../app/core/gimpbrush-load.c:174 #, c-format msgid "Fatal parse error in brush file: Width = 0." msgstr "خطأ تحليل فادح في ملف الفرشاة:‏ العرض = 0." -#: ../app/core/gimpbrush-load.c:180 +#: ../app/core/gimpbrush-load.c:181 #, c-format msgid "Fatal parse error in brush file: Height = 0." msgstr "خطأ تحليل فادح في ملف الفرشاة:‏ الارتفاع = 0." -#: ../app/core/gimpbrush-load.c:187 +#: ../app/core/gimpbrush-load.c:188 #, c-format msgid "Fatal parse error in brush file: Bytes = 0." msgstr "خطأ تحليل فادح في ملف الفرشاة:‏ البايتات = 0." -#: ../app/core/gimpbrush-load.c:212 +#: ../app/core/gimpbrush-load.c:213 #, c-format msgid "Fatal parse error in brush file: Unknown depth %d." msgstr "خطأ تحليل فادح في ملف الفرشاة:‏ عمق مجهول %Id." -#: ../app/core/gimpbrush-load.c:224 +#: ../app/core/gimpbrush-load.c:225 #, c-format msgid "Fatal parse error in brush file: Unknown version %d." msgstr "خطأ تحليل فادح في ملف الفرشاة:‏ إصدارة مجهولة %Id." -#: ../app/core/gimpbrush-load.c:245 ../app/core/gimpbrushgenerated-load.c:125 +#: ../app/core/gimpbrush-load.c:233 +#, c-format +msgid "Unsupported brush format" +msgstr "" + +#: ../app/core/gimpbrush-load.c:253 ../app/core/gimpbrushgenerated-load.c:125 #: ../app/core/gimpbrushpipe-load.c:75 #, c-format msgid "Invalid UTF-8 string in brush file '%s'." msgstr "سلسلة UTF-8 غير صحيحة في ملف الفرشاة '%s'." -#: ../app/core/gimpbrush-load.c:252 ../app/core/gimppattern-load.c:116 +#: ../app/core/gimpbrush-load.c:260 ../app/core/gimppattern-load.c:130 #: ../app/dialogs/template-options-dialog.c:110 -#: ../app/tools/gimpvectortool.c:328 +#: ../app/display/gimptoolpath.c:554 msgid "Unnamed" msgstr "غير مسمى" -#: ../app/core/gimpbrush-load.c:323 +#: ../app/core/gimpbrush-load.c:331 #, c-format msgid "" "Fatal parse error in brush file:\n" @@ -9372,7 +11913,7 @@ msgstr "" "فرش جمب يجب أن تكون GRAY أو RGBA.\n" "قد يكون هذا ملف فرشاة جمب عتيق، جرب تحميله كصورة ثم حفظه مرة أخرى." -#: ../app/core/gimpbrush-load.c:370 +#: ../app/core/gimpbrush-load.c:378 #, c-format msgid "" "Fatal parse error in brush file:\n" @@ -9383,33 +11924,58 @@ msgstr "" "عمق فرشاة غير مدعوم %Id\n" "فرش جمب يجب أن تكون GRAY أو RGBA." -#: ../app/core/gimpbrush-load.c:446 +#: ../app/core/gimpbrush-load.c:454 #, c-format msgid "Unable to decode abr format version %d." msgstr "تعذّر فك إصدارة نسق abr ‏%Id." -#: ../app/core/gimpbrush-load.c:644 +#: ../app/core/gimpbrush-load.c:572 ../app/core/gimpbrush-load.c:791 +#, fuzzy, c-format +msgid "Fatal parse error in brush file: Brush size value corrupt." +msgstr "خطأ تحليل فادح في ملف الفرشاة '%s':‏ الملف تالف." + +#: ../app/core/gimpbrush-load.c:659 ../app/core/gimpbrush-load.c:849 +#, fuzzy, c-format +msgid "Fatal parse error in brush file: Brush dimensions out of range." +msgstr "خطأ تحليل فادح في ملف الفرشاة:‏ الفرش العريضة غير مدعومة." + +#: ../app/core/gimpbrush-load.c:671 #, c-format msgid "Fatal parse error in brush file: Wide brushes are not supported." msgstr "خطأ تحليل فادح في ملف الفرشاة:‏ الفرش العريضة غير مدعومة." -#: ../app/core/gimpbrush-load.c:785 +#: ../app/core/gimpbrush-load.c:820 msgid "Fatal parse error in brush file: File appears truncated: " msgstr "خطأ تحليل فادح في ملف الفرشاة:‏ يبدو الملف مقصوصا:" -#: ../app/core/gimpbrush-load.c:931 +#: ../app/core/gimpbrush-load.c:857 +#, fuzzy, c-format +msgid "Fatal parse error in brush file: Unknown compression method." +msgstr "خطأ تحليل فادح في ملف الفرشاة:‏ إصدارة مجهولة %Id." + +#: ../app/core/gimpbrush-load.c:993 #, c-format msgid "" "Fatal parse error in brush file: Unable to decode abr format version %d." msgstr "خطأ تحليل فادح في ملف الفرشاة:‏ تعذّر فك إصدارة نسق abr‏ %Id." -#: ../app/core/gimpbrush.c:150 ../app/paint/gimppaintoptions.c:219 +#: ../app/core/gimpbrush-load.c:1114 ../app/core/gimpbrush-load.c:1132 +#, fuzzy, c-format +msgid "Fatal parse error in brush file: RLE compressed brush data corrupt." +msgstr "خطأ تحليل فادح في ملف الفرشاة '%s':‏ الملف تالف." + +#: ../app/core/gimpbrush.c:150 ../app/paint/gimppaintoptions.c:213 msgid "Brush Spacing" msgstr "مباعدة الفرشاة" -#: ../app/core/gimpbrushclipboard.c:168 ../app/core/gimppatternclipboard.c:168 -#: ../app/widgets/gimpclipboard.c:485 -msgid "Clipboard" +#: ../app/core/gimpbrushclipboard.c:190 +#, fuzzy +msgid "Clipboard Mask" +msgstr "الحافظة" + +#: ../app/core/gimpbrushclipboard.c:192 ../app/core/gimppatternclipboard.c:169 +#, fuzzy +msgid "Clipboard Image" msgstr "الحافظة" #: ../app/core/gimpbrushgenerated-load.c:75 @@ -9432,27 +11998,27 @@ msgstr "شكل فرشاة جمب مجهول." msgid "In line %d of brush file: " msgstr "في سطر %d من ملف الفرشاة:" -#: ../app/core/gimpbrushgenerated.c:130 +#: ../app/core/gimpbrushgenerated.c:135 msgid "Brush Shape" msgstr "شكل الفرشاة" -#: ../app/core/gimpbrushgenerated.c:138 +#: ../app/core/gimpbrushgenerated.c:143 msgid "Brush Radius" msgstr "نصف قطر الفرشاة" -#: ../app/core/gimpbrushgenerated.c:145 +#: ../app/core/gimpbrushgenerated.c:150 msgid "Brush Spikes" msgstr "أسنان الفرشاة" -#: ../app/core/gimpbrushgenerated.c:152 ../app/paint/gimppaintoptions.c:226 +#: ../app/core/gimpbrushgenerated.c:157 ../app/paint/gimppaintoptions.c:220 msgid "Brush Hardness" msgstr "صلابة الفرشاة" -#: ../app/core/gimpbrushgenerated.c:160 ../app/paint/gimppaintoptions.c:205 +#: ../app/core/gimpbrushgenerated.c:165 ../app/paint/gimppaintoptions.c:199 msgid "Brush Aspect Ratio" -msgstr "نسبة ارتفاع الفرشاة" +msgstr "نسبة أبعاد الفرشاة" -#: ../app/core/gimpbrushgenerated.c:167 ../app/paint/gimppaintoptions.c:212 +#: ../app/core/gimpbrushgenerated.c:172 ../app/paint/gimppaintoptions.c:206 msgid "Brush Angle" msgstr "زاوية الفرشاة" @@ -9476,7 +12042,7 @@ msgctxt "undo-type" msgid "Rounded Rectangle Select" msgstr "تحديد مستطيل مدور الزوايا" -#: ../app/core/gimpchannel-select.c:440 ../app/core/gimplayer.c:332 +#: ../app/core/gimpchannel-select.c:440 ../app/core/gimplayer.c:448 msgctxt "undo-type" msgid "Alpha to Selection" msgstr "الشفافية إلى التحديد" @@ -9502,150 +12068,150 @@ msgctxt "undo-type" msgid "Select by Indexed Color" msgstr "حدد باللون المفهرس" -#: ../app/core/gimpchannel.c:289 +#: ../app/core/gimpchannel.c:270 msgctxt "undo-type" msgid "Rename Channel" msgstr "غيّر اسم القناة" -#: ../app/core/gimpchannel.c:290 +#: ../app/core/gimpchannel.c:271 msgctxt "undo-type" msgid "Move Channel" msgstr "انقل القناة" -#: ../app/core/gimpchannel.c:291 +#: ../app/core/gimpchannel.c:272 msgctxt "undo-type" msgid "Scale Channel" msgstr "حجّم القناة" -#: ../app/core/gimpchannel.c:292 +#: ../app/core/gimpchannel.c:273 msgctxt "undo-type" msgid "Resize Channel" msgstr "غيّر حجم القناة" -#: ../app/core/gimpchannel.c:293 +#: ../app/core/gimpchannel.c:274 msgctxt "undo-type" msgid "Flip Channel" msgstr "اقلب القناة" -#: ../app/core/gimpchannel.c:294 +#: ../app/core/gimpchannel.c:275 msgctxt "undo-type" msgid "Rotate Channel" msgstr "دوّر القناة" -#: ../app/core/gimpchannel.c:295 ../app/core/gimpdrawable-transform.c:993 +#: ../app/core/gimpchannel.c:276 ../app/core/gimpdrawable-transform.c:1013 msgctxt "undo-type" msgid "Transform Channel" msgstr "حوّل القناة" -#: ../app/core/gimpchannel.c:296 ../app/core/gimpchannel.c:331 +#: ../app/core/gimpchannel.c:277 ../app/core/gimpchannel.c:309 msgctxt "undo-type" msgid "Fill Channel" msgstr "املأ القناة" -#: ../app/core/gimpchannel.c:297 +#: ../app/core/gimpchannel.c:278 msgctxt "undo-type" msgid "Stroke Channel" msgstr "ارسم القناة" -#: ../app/core/gimpchannel.c:298 ../app/core/gimpselection.c:655 +#: ../app/core/gimpchannel.c:279 ../app/core/gimpselection.c:654 msgctxt "undo-type" msgid "Channel to Selection" msgstr "القناة إلى التحديد" -#: ../app/core/gimpchannel.c:299 +#: ../app/core/gimpchannel.c:280 msgctxt "undo-type" msgid "Reorder Channel" msgstr "غيّر ترتيب القناة" -#: ../app/core/gimpchannel.c:300 +#: ../app/core/gimpchannel.c:281 msgctxt "undo-type" msgid "Raise Channel" msgstr "ارفع القناة" -#: ../app/core/gimpchannel.c:301 +#: ../app/core/gimpchannel.c:282 msgctxt "undo-type" msgid "Raise Channel to Top" msgstr "ارفع القناة إلى القمة" -#: ../app/core/gimpchannel.c:302 +#: ../app/core/gimpchannel.c:283 msgctxt "undo-type" msgid "Lower Channel" msgstr "أخفض قناة" -#: ../app/core/gimpchannel.c:303 +#: ../app/core/gimpchannel.c:284 msgctxt "undo-type" msgid "Lower Channel to Bottom" msgstr "أخفض القناة إلى القاع" -#: ../app/core/gimpchannel.c:304 +#: ../app/core/gimpchannel.c:285 msgid "Channel cannot be raised higher." msgstr "لا يمكن رفع القناة أعلى." -#: ../app/core/gimpchannel.c:305 +#: ../app/core/gimpchannel.c:286 msgid "Channel cannot be lowered more." msgstr "لا يمكن خفض القناة أكثر." -#: ../app/core/gimpchannel.c:328 +#: ../app/core/gimpchannel.c:306 msgctxt "undo-type" msgid "Feather Channel" msgstr "نعّم القناة" -#: ../app/core/gimpchannel.c:329 +#: ../app/core/gimpchannel.c:307 msgctxt "undo-type" msgid "Sharpen Channel" msgstr "حُد القناة" -#: ../app/core/gimpchannel.c:330 +#: ../app/core/gimpchannel.c:308 msgctxt "undo-type" msgid "Clear Channel" msgstr "امسح القناة" -#: ../app/core/gimpchannel.c:332 +#: ../app/core/gimpchannel.c:310 msgctxt "undo-type" msgid "Invert Channel" msgstr "اعكس القناة" -#: ../app/core/gimpchannel.c:333 +#: ../app/core/gimpchannel.c:311 msgctxt "undo-type" msgid "Border Channel" msgstr "حدّد القناة" -#: ../app/core/gimpchannel.c:334 +#: ../app/core/gimpchannel.c:312 msgctxt "undo-type" msgid "Grow Channel" msgstr "أنْمِ القناة" -#: ../app/core/gimpchannel.c:335 +#: ../app/core/gimpchannel.c:313 msgctxt "undo-type" msgid "Shrink Channel" msgstr "قلّص القناة" -#: ../app/core/gimpchannel.c:336 +#: ../app/core/gimpchannel.c:314 #, fuzzy msgctxt "undo-type" msgid "Flood Channel" msgstr "اقلب القناة" -#: ../app/core/gimpchannel.c:841 +#: ../app/core/gimpchannel.c:818 #, fuzzy msgid "Cannot fill empty channel." msgstr "لا يمكن رسم قناة فارغة." -#: ../app/core/gimpchannel.c:877 +#: ../app/core/gimpchannel.c:854 msgid "Cannot stroke empty channel." msgstr "لا يمكن رسم قناة فارغة." -#: ../app/core/gimpchannel.c:1788 +#: ../app/core/gimpchannel.c:1677 msgctxt "undo-type" msgid "Set Channel Color" msgstr "حدد لون القناة" -#: ../app/core/gimpchannel.c:1842 +#: ../app/core/gimpchannel.c:1728 msgctxt "undo-type" msgid "Set Channel Opacity" -msgstr "حدد إعتام القناة" +msgstr "حدد عتامة القناة" -#: ../app/core/gimpchannel.c:1939 ../app/core/gimpselection.c:168 +#: ../app/core/gimpchannel.c:1817 ../app/core/gimpselection.c:168 msgid "Selection Mask" msgstr "قناع التحديد" @@ -9669,9 +12235,10 @@ msgid "Background color" msgstr "لون الخلفية" #: ../app/core/gimpcontext.c:687 ../app/core/gimpcontext.c:688 -#: ../app/widgets/gimpbrushselect.c:177 ../app/widgets/gimplayertreeview.c:286 +#: ../app/dialogs/fade-dialog.c:158 ../app/widgets/gimpbrushselect.c:175 +#: ../app/widgets/gimplayertreeview.c:295 msgid "Opacity" -msgstr "الإعتام" +msgstr "العتامة" #: ../app/core/gimpcontext.c:696 ../app/core/gimpcontext.c:697 msgid "Paint Mode" @@ -9679,7 +12246,7 @@ msgstr "نمط التلوين" #: ../app/core/gimpcontext.c:704 ../app/core/gimpcontext.c:705 #: ../app/tools/gimpmybrushoptions-gui.c:54 -#: ../app/tools/gimppaintoptions-gui.c:159 +#: ../app/tools/gimppaintoptions-gui.c:162 msgid "Brush" msgstr "فرشاة" @@ -9699,7 +12266,7 @@ msgid "Pattern" msgstr "نمط" #: ../app/core/gimpcontext.c:732 ../app/core/gimpcontext.c:733 -#: ../app/tools/gimpblendoptions.c:225 ../app/tools/gimppaintoptions-gui.c:368 +#: ../app/tools/gimpblendoptions.c:283 ../app/tools/gimppaintoptions-gui.c:374 msgid "Gradient" msgstr "تدرج" @@ -9714,22 +12281,22 @@ msgid "Tool Preset" msgstr "محفوظات الخيارات" #: ../app/core/gimpcontext.c:753 ../app/core/gimpcontext.c:754 -#: ../app/tools/gimptextoptions.c:548 +#: ../app/tools/gimptextoptions.c:530 msgid "Font" msgstr "الخط" -#: ../app/core/gimpdata.c:550 ../app/core/gimpdata.c:558 +#: ../app/core/gimpdata.c:582 ../app/core/gimpdata.c:590 #, c-format msgid "Error saving '%s': " msgstr "خطأ في حفظ '%s'‏:" -#: ../app/core/gimpdata.c:564 +#: ../app/core/gimpdata.c:596 #, c-format msgid "Error saving '%s'" msgstr "خطأ في حفظ '%s'‏" -#: ../app/core/gimpdatafactory.c:451 ../app/core/gimpdatafactory.c:476 -#: ../app/core/gimpdatafactory.c:643 ../app/core/gimpdatafactory.c:665 +#: ../app/core/gimpdatafactory.c:433 ../app/core/gimpdatafactory.c:458 +#: ../app/core/gimpdatafactory.c:625 ../app/core/gimpdatafactory.c:647 #, c-format msgid "" "Failed to save data:\n" @@ -9740,17 +12307,17 @@ msgstr "" "\n" "%s" -#: ../app/core/gimpdatafactory.c:557 ../app/core/gimpdatafactory.c:560 -#: ../app/core/gimpitem.c:517 ../app/core/gimpitem.c:520 +#: ../app/core/gimpdatafactory.c:539 ../app/core/gimpdatafactory.c:542 +#: ../app/core/gimpitem.c:540 ../app/core/gimpitem.c:543 msgid "copy" msgstr "انسخ" -#: ../app/core/gimpdatafactory.c:569 ../app/core/gimpitem.c:528 +#: ../app/core/gimpdatafactory.c:551 ../app/core/gimpitem.c:551 #, c-format msgid "%s copy" msgstr "نسخة %s" -#: ../app/core/gimpdatafactory.c:760 +#: ../app/core/gimpdatafactory.c:742 #, c-format msgid "" "You have a writable data folder configured (%s), but this folder does not " @@ -9760,7 +12327,7 @@ msgstr "" "لديك مجلد بيانات مُعدّ قابل للكتابة (%s) لكن هذا المجلد لا وجود له. من فضلك " "أنشئ المجلد أو أصلح التضبيطات في قسم المجلدات من حوار التفضيلات." -#: ../app/core/gimpdatafactory.c:779 +#: ../app/core/gimpdatafactory.c:761 #, c-format msgid "" "You have a writable data folder configured, but this folder is not part of " @@ -9770,27 +12337,27 @@ msgstr "" "لديك مجلد بيانات مُعدّ لكن هذا المجلد ليس جزءا من مسار بحث البيانات. غالبا سبق " "وحررت ملف gimprc يدويا. من فضلك أصلحه في قسم المجلدات من حوار التفضيلات." -#: ../app/core/gimpdatafactory.c:789 +#: ../app/core/gimpdatafactory.c:771 #, c-format msgid "You don't have any writable data folder configured." msgstr "لا تمتلك أي مجلد بيانات مُعدّ قابل للكتابة." -#: ../app/core/gimpdatafactory.c:920 +#: ../app/core/gimpdatafactory.c:904 #, c-format msgid "Error loading '%s': " msgstr "خطأ في تحميل '%s'‏:" -#: ../app/core/gimpdatafactory.c:926 +#: ../app/core/gimpdatafactory.c:910 #, c-format msgid "Error loading '%s'" msgstr "خطأ في تحميل '%s'‏" -#: ../app/core/gimpdatafactory.c:935 ../app/xcf/xcf.c:426 +#: ../app/core/gimpdatafactory.c:920 ../app/xcf/xcf.c:439 #, c-format msgid "Could not open '%s' for reading: " msgstr "تعذّر فتح '%s' للقراءة:" -#: ../app/core/gimpdatafactory.c:994 +#: ../app/core/gimpdatafactory.c:979 #, c-format msgid "" "Failed to load data:\n" @@ -9801,17 +12368,17 @@ msgstr "" "\n" "%s" -#: ../app/core/gimpdrawable.c:522 +#: ../app/core/gimpdrawable.c:469 msgctxt "undo-type" msgid "Scale" msgstr "حجّم" -#: ../app/core/gimpdrawable-blend.c:150 ../app/tools/gimpblendtool.c:1197 +#: ../app/core/gimpdrawable-blend.c:125 ../app/tools/gimpblendtool.c:1015 msgctxt "undo-type" msgid "Blend" msgstr "امزج" -#: ../app/core/gimpdrawable-blend.c:240 +#: ../app/core/gimpdrawable-blend.c:213 msgid "Calculating distance map" msgstr "يحسب خريطة المسافات" @@ -9825,7 +12392,7 @@ msgctxt "undo-type" msgid "Equalize" msgstr "ساوِ" -#: ../app/core/gimpdrawable-floating-selection.c:171 +#: ../app/core/gimpdrawable-floating-selection.c:191 #, fuzzy msgid "Floating Selection" msgstr "حرر التحديد" @@ -9834,47 +12401,47 @@ msgstr "حرر التحديد" msgid "Computing alpha of unknown pixels" msgstr "يحسب شفافية البكسلات غير المعروفة" -#: ../app/core/gimpdrawable-fill.c:205 ../app/vectors/gimpvectors.c:646 +#: ../app/core/gimpdrawable-fill.c:202 ../app/vectors/gimpvectors.c:668 msgid "Not enough points to fill" msgstr "لا توجد نقاط كافية للملء" -#: ../app/core/gimpdrawable-fill.c:259 +#: ../app/core/gimpdrawable-fill.c:256 msgctxt "undo-type" msgid "Render Stroke" msgstr "ارسم الخط" #: ../app/core/gimpdrawable-levels.c:72 #: ../app/tools/gimpforegroundselectoptions.c:116 -#: ../app/tools/gimplevelstool.c:137 +#: ../app/tools/gimplevelstool.c:132 msgid "Levels" msgstr "المستويات" #: ../app/core/gimpdrawable-offset.c:249 msgctxt "undo-type" msgid "Offset Drawable" -msgstr "إزاحة القابل للرسم" +msgstr "إزاحة عنصر الرسم" #: ../app/core/gimpdrawable-stroke.c:111 -#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:668 +#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:690 msgid "Not enough points to stroke" msgstr "لا توجد نقاط كافية لرسم الخط" -#: ../app/core/gimpdrawable-transform.c:761 +#: ../app/core/gimpdrawable-transform.c:781 msgctxt "undo-type" msgid "Flip" msgstr "اقلب" -#: ../app/core/gimpdrawable-transform.c:846 +#: ../app/core/gimpdrawable-transform.c:866 msgctxt "undo-type" msgid "Rotate" msgstr "دوّر" -#: ../app/core/gimpdrawable-transform.c:991 ../app/core/gimplayer.c:331 +#: ../app/core/gimpdrawable-transform.c:1011 ../app/core/gimplayer.c:447 msgctxt "undo-type" msgid "Transform Layer" msgstr "حوّل الطبقة" -#: ../app/core/gimpdrawable-transform.c:1004 +#: ../app/core/gimpdrawable-transform.c:1024 msgid "Transformation" msgstr "التحويل" @@ -9887,9 +12454,9 @@ msgstr "نوع الخرج" msgid "Style" msgstr "_طراز اللسان" -#: ../app/core/gimpfilloptions.c:111 ../app/pdb/gimppdbcontext.c:99 +#: ../app/core/gimpfilloptions.c:111 ../app/pdb/gimppdbcontext.c:100 #: ../app/tools/gimpbucketfilloptions.c:132 -#: ../app/tools/gimpselectionoptions.c:80 ../app/tools/gimptextoptions.c:150 +#: ../app/tools/gimpselectionoptions.c:80 ../app/tools/gimptextoptions.c:134 msgid "Antialiasing" msgstr "التنعيم" @@ -9908,17 +12475,17 @@ msgctxt "undo-type" msgid "Fill with White" msgstr "املأ بالأبيض" -#: ../app/core/gimpfilloptions.c:319 +#: ../app/core/gimpfilloptions.c:320 msgctxt "undo-type" msgid "Fill with Transparency" msgstr "املأ بالشفافية" -#: ../app/core/gimpfilloptions.c:335 ../app/core/gimpfilloptions.c:403 +#: ../app/core/gimpfilloptions.c:336 ../app/core/gimpfilloptions.c:404 msgctxt "undo-type" msgid "Fill with Pattern" msgstr "املأ بنمط" -#: ../app/core/gimpfilloptions.c:400 +#: ../app/core/gimpfilloptions.c:401 #, fuzzy msgctxt "undo-type" msgid "Fill with Solid Color" @@ -9939,22 +12506,24 @@ msgstr "سلسلة UTF-8 غير سليمة في ملف التدرج '%s'." msgid "File is corrupt." msgstr "الملف معطوب." -#: ../app/core/gimpgradient-load.c:195 ../app/core/gimpgradient-load.c:203 +#: ../app/core/gimpgradient-load.c:189 ../app/core/gimpgradient-load.c:199 +#: ../app/core/gimpgradient-load.c:211 ../app/core/gimpgradient-load.c:221 +#: ../app/core/gimpgradient-load.c:229 ../app/core/gimpgradient-load.c:237 #, c-format msgid "Corrupt segment %d." msgstr "قطعة معطوبة %d." -#: ../app/core/gimpgradient-load.c:214 ../app/core/gimpgradient-load.c:224 +#: ../app/core/gimpgradient-load.c:248 ../app/core/gimpgradient-load.c:258 #, c-format msgid "Segments do not span the range 0-1." msgstr "القطع لا تملأ المدى 0-1." -#: ../app/core/gimpgradient-load.c:239 +#: ../app/core/gimpgradient-load.c:273 #, c-format msgid "In line %d of gradient file: " msgstr "في سطر %d من ملف التدرجات:" -#: ../app/core/gimpgradient-load.c:315 +#: ../app/core/gimpgradient-load.c:349 #, c-format msgid "No linear gradients found." msgstr "لا تدرجات خطية." @@ -10029,123 +12598,123 @@ msgstr "الإزاحة الرأسية لخط الشبكة الأول؛ يمن أ msgid "Offset unit" msgstr "الإزاحة" -#: ../app/core/gimpgrouplayer.c:227 +#: ../app/core/gimpgrouplayer.c:277 msgid "Layer Group" msgstr "مجموعة طبقات" -#: ../app/core/gimpgrouplayer.c:228 +#: ../app/core/gimpgrouplayer.c:278 msgctxt "undo-type" msgid "Rename Layer Group" msgstr "غيّر اسم مجموعة الطبقات" -#: ../app/core/gimpgrouplayer.c:229 +#: ../app/core/gimpgrouplayer.c:279 msgctxt "undo-type" msgid "Move Layer Group" msgstr "انقل مجموعة الطبقات" -#: ../app/core/gimpgrouplayer.c:230 +#: ../app/core/gimpgrouplayer.c:280 msgctxt "undo-type" msgid "Scale Layer Group" msgstr "حجّم مجموعة الطبقات" -#: ../app/core/gimpgrouplayer.c:231 +#: ../app/core/gimpgrouplayer.c:281 msgctxt "undo-type" msgid "Resize Layer Group" msgstr "غيّر حجم مجموعة الطبقات" -#: ../app/core/gimpgrouplayer.c:232 +#: ../app/core/gimpgrouplayer.c:282 msgctxt "undo-type" msgid "Flip Layer Group" msgstr "اقلب مجموعة الطبقات" -#: ../app/core/gimpgrouplayer.c:233 +#: ../app/core/gimpgrouplayer.c:283 msgctxt "undo-type" msgid "Rotate Layer Group" msgstr "دوّر مجموعة الطبقات" -#: ../app/core/gimpgrouplayer.c:234 +#: ../app/core/gimpgrouplayer.c:284 msgctxt "undo-type" msgid "Transform Layer Group" msgstr "حوّل مجموعة الطبقات" -#: ../app/core/gimpimage.c:642 ../app/widgets/gimpsymmetryeditor.c:178 +#: ../app/core/gimpimage.c:645 ../app/widgets/gimpsymmetryeditor.c:179 msgid "Symmetry" msgstr "" -#: ../app/core/gimpimage.c:2250 +#: ../app/core/gimpimage.c:2216 msgid " (exported)" msgstr " (صُدّرت)" -#: ../app/core/gimpimage.c:2254 +#: ../app/core/gimpimage.c:2220 msgid " (overwritten)" msgstr " (طُمست)" -#: ../app/core/gimpimage.c:2263 +#: ../app/core/gimpimage.c:2229 msgid " (imported)" msgstr " (استوردت)" -#: ../app/core/gimpimage.c:2497 +#: ../app/core/gimpimage.c:2557 msgctxt "undo-type" msgid "Change Image Resolution" msgstr "غيّر ميْز الصورة" -#: ../app/core/gimpimage.c:2549 +#: ../app/core/gimpimage.c:2609 msgctxt "undo-type" msgid "Change Image Unit" msgstr "غيّر وحدة الصورة" -#: ../app/core/gimpimage.c:3429 +#: ../app/core/gimpimage.c:3493 #, c-format msgid "" "'gimp-comment' parasite validation failed: comment contains invalid UTF-8" msgstr "" -#: ../app/core/gimpimage.c:3481 +#: ../app/core/gimpimage.c:3545 msgctxt "undo-type" msgid "Attach Parasite to Image" msgstr "أرفِق طفيليا بالصورة" -#: ../app/core/gimpimage.c:3522 +#: ../app/core/gimpimage.c:3586 msgctxt "undo-type" msgid "Remove Parasite from Image" msgstr "احذف الطفيلي من الصورة" -#: ../app/core/gimpimage.c:4231 +#: ../app/core/gimpimage.c:4297 msgctxt "undo-type" msgid "Add Layer" msgstr "أضِف طبقة" -#: ../app/core/gimpimage.c:4281 ../app/core/gimpimage.c:4301 +#: ../app/core/gimpimage.c:4339 ../app/core/gimpimage.c:4370 msgctxt "undo-type" msgid "Remove Layer" msgstr "احذف الطبقة" -#: ../app/core/gimpimage.c:4295 +#: ../app/core/gimpimage.c:4364 msgctxt "undo-type" msgid "Remove Floating Selection" msgstr "أزل التحديد الحر" -#: ../app/core/gimpimage.c:4460 +#: ../app/core/gimpimage.c:4531 msgctxt "undo-type" msgid "Add Channel" msgstr "أضِف قناة" -#: ../app/core/gimpimage.c:4498 ../app/core/gimpimage.c:4511 +#: ../app/core/gimpimage.c:4559 ../app/core/gimpimage.c:4583 msgctxt "undo-type" msgid "Remove Channel" msgstr "احذف القناة" -#: ../app/core/gimpimage.c:4565 +#: ../app/core/gimpimage.c:4639 msgctxt "undo-type" msgid "Add Path" msgstr "أضِف مسارا" -#: ../app/core/gimpimage.c:4596 +#: ../app/core/gimpimage.c:4669 ../app/core/gimpimage.c:4676 msgctxt "undo-type" msgid "Remove Path" msgstr "احذف المسار" -#: ../app/core/gimpimage-arrange.c:170 +#: ../app/core/gimpimage-arrange.c:173 msgctxt "undo-type" msgid "Arrange Objects" msgstr "رتّب العناصر" @@ -10189,109 +12758,118 @@ msgstr "تحويل لاحة الألوان" msgid "Colormap of Image #%d (%s)" msgstr "مخطط ألوان الصورة #%d ‏(%s)" -#: ../app/core/gimpimage-colormap.c:196 +#: ../app/core/gimpimage-colormap.c:193 msgctxt "undo-type" msgid "Set Colormap" msgstr "حدد مخطط الألوان" -#: ../app/core/gimpimage-colormap.c:244 +#: ../app/core/gimpimage-colormap.c:241 msgctxt "undo-type" msgid "Unset Colormap" msgstr "ألغِ مخطط الألوان" -#: ../app/core/gimpimage-colormap.c:297 +#: ../app/core/gimpimage-colormap.c:294 msgctxt "undo-type" msgid "Change Colormap entry" msgstr "غيّر مدخلة مخطط الألوان" -#: ../app/core/gimpimage-colormap.c:325 +#: ../app/core/gimpimage-colormap.c:322 msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "أضِف لونا إلى مخطط الألوان" -#: ../app/core/gimpimage-convert-indexed.c:789 +#: ../app/core/gimpimage-convert-indexed.c:786 msgid "Cannot convert image: palette is empty." msgstr "لا يمكن تحويل الصورة: لوح الألوان فارغ" -#: ../app/core/gimpimage-convert-indexed.c:803 +#: ../app/core/gimpimage-convert-indexed.c:798 msgctxt "undo-type" msgid "Convert Image to Indexed" msgstr "حوّل الصورة إلى مفهرسة" -#: ../app/core/gimpimage-convert-indexed.c:884 +#: ../app/core/gimpimage-convert-indexed.c:890 msgid "Converting to indexed colors (stage 2)" msgstr "حوّل إلى مفهرسة (المرحلة 2)" -#: ../app/core/gimpimage-convert-indexed.c:932 +#: ../app/core/gimpimage-convert-indexed.c:939 msgid "Converting to indexed colors (stage 3)" msgstr "حوّل إلى مفهرسة (المرحلة 3)" -#: ../app/core/gimpimage-convert-precision.c:82 +#: ../app/core/gimpimage-convert-precision.c:75 msgctxt "undo-type" msgid "Convert Image to 8 bit linear integer" msgstr "حوّل الصورة إلى دقة عدد صحيح خطي من 8 بتات" -#: ../app/core/gimpimage-convert-precision.c:85 +#: ../app/core/gimpimage-convert-precision.c:78 msgctxt "undo-type" msgid "Convert Image to 8 bit gamma integer" msgstr "حوّل الصورة إلى دقة عدد صحيح جاما من 8 بتات" -#: ../app/core/gimpimage-convert-precision.c:88 +#: ../app/core/gimpimage-convert-precision.c:81 msgctxt "undo-type" msgid "Convert Image to 16 bit linear integer" msgstr "حوّل الصورة إلى دقة عدد صحيح خطي من 16 بتة" -#: ../app/core/gimpimage-convert-precision.c:91 +#: ../app/core/gimpimage-convert-precision.c:84 msgctxt "undo-type" msgid "Convert Image to 16 bit gamma integer" msgstr "حوّل الصورة إلى دقة عدد صحيح جاما من 16 بتة" -#: ../app/core/gimpimage-convert-precision.c:94 +#: ../app/core/gimpimage-convert-precision.c:87 msgctxt "undo-type" msgid "Convert Image to 32 bit linear integer" msgstr "حوّل الصورة إلى دقة عدد صحيح خطي من 32 بتة" -#: ../app/core/gimpimage-convert-precision.c:97 +#: ../app/core/gimpimage-convert-precision.c:90 msgctxt "undo-type" msgid "Convert Image to 32 bit gamma integer" msgstr "حوّل الصورة إلى دقة عدد صحيح جاما من 32 بتة" -#: ../app/core/gimpimage-convert-precision.c:100 +#: ../app/core/gimpimage-convert-precision.c:93 msgctxt "undo-type" msgid "Convert Image to 16 bit linear floating point" msgstr "حوّل الصورة إلى دقة عدد عشري خطي من 16 بتة" -#: ../app/core/gimpimage-convert-precision.c:103 +#: ../app/core/gimpimage-convert-precision.c:96 msgctxt "undo-type" msgid "Convert Image to 16 bit gamma floating point" msgstr "حوّل الصورة إلى دقة عدد عشري جاما من 16 بتة" -#: ../app/core/gimpimage-convert-precision.c:106 +#: ../app/core/gimpimage-convert-precision.c:99 msgctxt "undo-type" msgid "Convert Image to 32 bit linear floating point" msgstr "حوّل الصورة إلى دقة عدد عشري خطي من 32 بتة" -#: ../app/core/gimpimage-convert-precision.c:109 +#: ../app/core/gimpimage-convert-precision.c:102 msgctxt "undo-type" msgid "Convert Image to 32 bit gamma floating point" msgstr "حوّل الصورة إلى دقة عدد عشري جاما من 32 بتة" -#: ../app/core/gimpimage-convert-precision.c:112 +#: ../app/core/gimpimage-convert-precision.c:105 msgctxt "undo-type" msgid "Convert Image to 64 bit linear floating point" msgstr "حوّل الصورة إلى دقة عدد عشري خطي من 64 بتة" -#: ../app/core/gimpimage-convert-precision.c:115 +#: ../app/core/gimpimage-convert-precision.c:108 msgctxt "undo-type" msgid "Convert Image to 64 bit gamma floating point" msgstr "حوّل الصورة إلى دقة عدد عشري جاما من 64 بتة" -#: ../app/core/gimpimage-convert-type.c:83 +#. dithering +#: ../app/core/gimpimage-convert-precision.c:264 +#: ../app/core/gimpimage-convert-precision.c:288 +#: ../app/dialogs/convert-indexed-dialog.c:236 +#: ../app/dialogs/convert-precision-dialog.c:221 +#: ../app/tools/gimpblendoptions.c:135 +msgid "Dithering" +msgstr "الإرجاف" + +#: ../app/core/gimpimage-convert-type.c:81 msgctxt "undo-type" msgid "Convert Image to RGB" msgstr "حوّل الصورة إلى ح‌خ‌ز" -#: ../app/core/gimpimage-convert-type.c:87 +#: ../app/core/gimpimage-convert-type.c:85 msgctxt "undo-type" msgid "Convert Image to Grayscale" msgstr "حوّل الصورة إلى تدرج رمادي" @@ -10301,7 +12879,7 @@ msgctxt "undo-type" msgid "Crop Image" msgstr "قصّر الصورة" -#: ../app/core/gimpimage-crop.c:75 ../app/core/gimpimage-resize.c:90 +#: ../app/core/gimpimage-crop.c:75 ../app/core/gimpimage-resize.c:91 msgctxt "undo-type" msgid "Resize Image" msgstr "غيّر حجم الصورة" @@ -10326,68 +12904,78 @@ msgctxt "undo-type" msgid "Move Guide" msgstr "انقل الدليل" -#: ../app/core/gimpimage-item-list.c:113 +#: ../app/core/gimpimage-item-list.c:117 msgctxt "undo-type" msgid "Translate Items" msgstr "ترجم العناصر" -#: ../app/core/gimpimage-item-list.c:141 +#: ../app/core/gimpimage-item-list.c:157 msgctxt "undo-type" msgid "Flip Items" msgstr "اقلب العناصر" -#: ../app/core/gimpimage-item-list.c:170 ../app/core/gimpitem-linked.c:164 +#: ../app/core/gimpimage-item-list.c:196 ../app/core/gimpitem-linked.c:164 msgctxt "undo-type" msgid "Rotate Items" msgstr "دوّر العناصر" -#: ../app/core/gimpimage-item-list.c:201 +#: ../app/core/gimpimage-item-list.c:246 msgctxt "undo-type" msgid "Transform Items" msgstr "حوّل عناصر" -#: ../app/core/gimpimage-merge.c:134 +#: ../app/core/gimpimage-merge.c:135 msgctxt "undo-type" msgid "Merge Visible Layers" msgstr "ادمج الطبقات المرئية" -#: ../app/core/gimpimage-merge.c:197 +#: ../app/core/gimpimage-merge.c:198 msgctxt "undo-type" msgid "Flatten Image" msgstr "سطّح صورة" -#: ../app/core/gimpimage-merge.c:219 +#: ../app/core/gimpimage-merge.c:220 msgid "Cannot flatten an image without any visible layer." msgstr "لا يمكن تسطيح صورة بلا أي طبقات مرئية." -#: ../app/core/gimpimage-merge.c:262 +#: ../app/core/gimpimage-merge.c:245 +#, fuzzy +msgid "Cannot merge down a floating selection." +msgstr "أنشئ تحديدا طافيا" + +#: ../app/core/gimpimage-merge.c:252 +#, fuzzy +msgid "Cannot merge down an invisible layer." +msgstr "لا يمكن تغيير اسم قناع الطبقة." + +#: ../app/core/gimpimage-merge.c:277 msgid "Cannot merge down to a layer group." msgstr "تعذّر دمج مجموعة طبقات لأسفل." -#: ../app/core/gimpimage-merge.c:269 +#: ../app/core/gimpimage-merge.c:284 msgid "The layer to merge down to is locked." msgstr "الطبقة التي ستُدمج لأسفل موصدة" -#: ../app/core/gimpimage-merge.c:281 +#: ../app/core/gimpimage-merge.c:296 msgid "There is no visible layer to merge down to." msgstr "لا طبقة مرئية ليُدمج لأسفل بها." -#: ../app/core/gimpimage-merge.c:291 +#: ../app/core/gimpimage-merge.c:306 msgctxt "undo-type" msgid "Merge Down" msgstr "ادمج لأسفل" -#: ../app/core/gimpimage-merge.c:319 +#: ../app/core/gimpimage-merge.c:334 msgctxt "undo-type" msgid "Merge Layer Group" msgstr "ادمج مجموعة الطبقات" -#: ../app/core/gimpimage-merge.c:372 +#: ../app/core/gimpimage-merge.c:387 msgctxt "undo-type" msgid "Merge Visible Paths" msgstr "ادمج المسارات المرئية" -#: ../app/core/gimpimage-merge.c:408 +#: ../app/core/gimpimage-merge.c:423 msgid "Not enough visible paths for a merge. There must be at least two." msgstr "لا يوجد مسارات مرئية كافية للدمج. لا بد من وجود اثنين على الأقل." @@ -10401,67 +12989,67 @@ msgctxt "undo-type" msgid "Disable Quick Mask" msgstr "عطّل القناع السريع" -#: ../app/core/gimpimage-sample-points.c:54 +#: ../app/core/gimpimage-sample-points.c:52 msgctxt "undo-type" msgid "Add Sample Point" msgstr "أضِف نقطة عينة" -#: ../app/core/gimpimage-sample-points.c:98 +#: ../app/core/gimpimage-sample-points.c:96 msgctxt "undo-type" msgid "Remove Sample Point" msgstr "احذف النقطة العينة" -#: ../app/core/gimpimage-sample-points.c:125 +#: ../app/core/gimpimage-sample-points.c:123 msgctxt "undo-type" msgid "Move Sample Point" msgstr "انقل النقطة العينة" -#: ../app/core/gimpimage-scale.c:86 +#: ../app/core/gimpimage-scale.c:79 msgctxt "undo-type" msgid "Scale Image" msgstr "حجّم الصورة" -#: ../app/core/gimpimage-undo-push.c:964 +#: ../app/core/gimpimage-undo-push.c:1028 #, c-format msgid "Can't undo %s" msgstr "تعذّر التراجع عن %s" -#: ../app/core/gimpimagefile.c:776 ../app/dialogs/preferences-dialog.c:1582 -#: ../app/dialogs/preferences-dialog.c:1687 +#: ../app/core/gimpimagefile.c:750 ../app/dialogs/preferences-dialog.c:1838 +#: ../app/dialogs/preferences-dialog.c:1944 msgid "Folder" msgstr "مجلد" -#: ../app/core/gimpimagefile.c:781 +#: ../app/core/gimpimagefile.c:755 msgid "Special File" msgstr "ملف خاص" -#: ../app/core/gimpimagefile.c:797 +#: ../app/core/gimpimagefile.c:771 msgid "Remote File" msgstr "ملف بعيد" -#: ../app/core/gimpimagefile.c:816 +#: ../app/core/gimpimagefile.c:790 msgid "Click to create preview" msgstr "انقر لإنشاء معاينة" -#: ../app/core/gimpimagefile.c:822 +#: ../app/core/gimpimagefile.c:796 msgid "Loading preview..." msgstr "يحمّل المعاينة..." -#: ../app/core/gimpimagefile.c:828 +#: ../app/core/gimpimagefile.c:802 msgid "Preview is out of date" msgstr "المعاينة غير محدثة" -#: ../app/core/gimpimagefile.c:834 +#: ../app/core/gimpimagefile.c:808 msgid "Cannot create preview" msgstr "تعذّر إنشاء معاينة" -#: ../app/core/gimpimagefile.c:844 +#: ../app/core/gimpimagefile.c:818 msgid "(Preview may be out of date)" msgstr "(المعاينة قد تكون غير محدثة)" #. pixel size -#: ../app/core/gimpimagefile.c:853 ../app/widgets/gimpimagepropview.c:430 -#: ../app/widgets/gimpsizebox.c:432 ../app/widgets/gimptemplateeditor.c:686 +#: ../app/core/gimpimagefile.c:827 ../app/widgets/gimpimagepropview.c:429 +#: ../app/widgets/gimpsizebox.c:432 ../app/widgets/gimptemplateeditor.c:684 #, c-format msgid "%d × %d pixel" msgid_plural "%d × %d pixels" @@ -10472,7 +13060,7 @@ msgstr[3] "%Id × %Id بسكل" msgstr[4] "%Id × %Id بسكل" msgstr[5] "%Id × %Id بسكل" -#: ../app/core/gimpimagefile.c:876 ../app/display/gimpdisplayshell-title.c:325 +#: ../app/core/gimpimagefile.c:850 ../app/display/gimpdisplayshell-title.c:325 #, c-format msgid "%d layer" msgid_plural "%d layers" @@ -10483,22 +13071,22 @@ msgstr[3] "%Id طبقات" msgstr[4] "%Id طبقة" msgstr[5] "%Id طبقة" -#: ../app/core/gimpimagefile.c:924 +#: ../app/core/gimpimagefile.c:898 #, c-format msgid "Could not open thumbnail '%s': %s" msgstr "تعذر فتح المصغرة '%s'‏: %s" -#: ../app/core/gimpitem.c:1931 +#: ../app/core/gimpitem.c:2075 msgctxt "undo-type" msgid "Attach Parasite" msgstr "أرفق طفيليا" -#: ../app/core/gimpitem.c:1941 +#: ../app/core/gimpitem.c:2085 msgctxt "undo-type" msgid "Attach Parasite to Item" msgstr "أرفق طفيليا بالعنصر" -#: ../app/core/gimpitem.c:1992 ../app/core/gimpitem.c:1999 +#: ../app/core/gimpitem.c:2136 ../app/core/gimpitem.c:2143 msgctxt "undo-type" msgid "Remove Parasite from Item" msgstr "أزل الطفيلي من العنصر" @@ -10516,7 +13104,7 @@ msgctxt "undo-type" msgid "Anchor Floating Selection" msgstr "ثبّت التحديد الحر" -#: ../app/core/gimplayer-floating-selection.c:175 ../app/core/gimplayer.c:846 +#: ../app/core/gimplayer-floating-selection.c:175 ../app/core/gimplayer.c:1037 msgid "" "Cannot create a new layer from the floating selection because it belongs to " "a layer mask or channel." @@ -10528,76 +13116,76 @@ msgctxt "undo-type" msgid "Floating Selection to Layer" msgstr "التحديد الحر إلى طبقة" -#: ../app/core/gimplayer.c:325 +#: ../app/core/gimplayer.c:441 msgctxt "undo-type" msgid "Rename Layer" msgstr "غيّر اسم الطبقة" -#: ../app/core/gimplayer.c:326 +#: ../app/core/gimplayer.c:442 msgctxt "undo-type" msgid "Move Layer" msgstr "انقل الطبقة" -#: ../app/core/gimplayer.c:327 +#: ../app/core/gimplayer.c:443 msgctxt "undo-type" msgid "Scale Layer" msgstr "حجّم الطبقة" -#: ../app/core/gimplayer.c:328 +#: ../app/core/gimplayer.c:444 msgctxt "undo-type" msgid "Resize Layer" msgstr "غيّر حجم الطبقة" -#: ../app/core/gimplayer.c:329 +#: ../app/core/gimplayer.c:445 msgctxt "undo-type" msgid "Flip Layer" msgstr "اقلب الطبقة" -#: ../app/core/gimplayer.c:330 +#: ../app/core/gimplayer.c:446 msgctxt "undo-type" msgid "Rotate Layer" msgstr "دوّر الطبقة" -#: ../app/core/gimplayer.c:333 +#: ../app/core/gimplayer.c:449 msgctxt "undo-type" msgid "Reorder Layer" msgstr "غيّر ترتيب الطبقة" -#: ../app/core/gimplayer.c:334 +#: ../app/core/gimplayer.c:450 msgctxt "undo-type" msgid "Raise Layer" msgstr "ارفع الطبقة" -#: ../app/core/gimplayer.c:335 +#: ../app/core/gimplayer.c:451 msgctxt "undo-type" msgid "Raise Layer to Top" msgstr "ارفع الطبقة إلى السطح" -#: ../app/core/gimplayer.c:336 +#: ../app/core/gimplayer.c:452 msgctxt "undo-type" msgid "Lower Layer" msgstr "اخفض الطبقة" -#: ../app/core/gimplayer.c:337 +#: ../app/core/gimplayer.c:453 msgctxt "undo-type" msgid "Lower Layer to Bottom" msgstr "اخفض الطبقة إلى القاع" -#: ../app/core/gimplayer.c:338 +#: ../app/core/gimplayer.c:454 msgid "Layer cannot be raised higher." msgstr "لا يمكن رفع الطبقة أعلى." -#: ../app/core/gimplayer.c:339 +#: ../app/core/gimplayer.c:455 msgid "Layer cannot be lowered more." msgstr "لا يمكن خفض الطبقة أكثر." -#: ../app/core/gimplayer.c:567 ../app/core/gimplayer.c:1449 +#: ../app/core/gimplayer.c:744 ../app/core/gimplayer.c:1905 #: ../app/core/gimplayermask.c:257 #, c-format msgid "%s mask" msgstr "قناع %s" -#: ../app/core/gimplayer.c:606 +#: ../app/core/gimplayer.c:783 #, c-format msgid "" "Floating Selection\n" @@ -10606,60 +13194,60 @@ msgstr "" "تحديد حر\n" "(%s)" -#: ../app/core/gimplayer.c:1352 +#: ../app/core/gimplayer.c:1811 msgid "Unable to add a layer mask since the layer already has one." msgstr "تعذّ إضافة قناع طبقة لأنه الطبقة بها واحد مسبقا." -#: ../app/core/gimplayer.c:1363 +#: ../app/core/gimplayer.c:1822 msgid "Cannot add layer mask of different dimensions than specified layer." msgstr "لا يمكن إضافة قناع طبقة ذو أبعاد مختلفة عن الطبقة المحددة." -#: ../app/core/gimplayer.c:1369 +#: ../app/core/gimplayer.c:1828 msgctxt "undo-type" msgid "Add Layer Mask" msgstr "أضِف قناع طبقة" -#: ../app/core/gimplayer.c:1500 +#: ../app/core/gimplayer.c:1956 msgctxt "undo-type" msgid "Transfer Alpha to Mask" msgstr "حوّل الشفافية إلى قناع" -#: ../app/core/gimplayer.c:1651 +#: ../app/core/gimplayer.c:2112 msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "طبّق قناع الطبقة" -#: ../app/core/gimplayer.c:1652 +#: ../app/core/gimplayer.c:2113 msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "احذف قناع الطبقة" -#: ../app/core/gimplayer.c:1757 +#: ../app/core/gimplayer.c:2215 msgctxt "undo-type" msgid "Enable Layer Mask" msgstr "فعّل قناع الطبقة" -#: ../app/core/gimplayer.c:1758 +#: ../app/core/gimplayer.c:2216 msgctxt "undo-type" msgid "Disable Layer Mask" msgstr "عطّل قناع الطبقة" -#: ../app/core/gimplayer.c:1837 +#: ../app/core/gimplayer.c:2292 msgctxt "undo-type" msgid "Show Layer Mask" msgstr "أظهر قناع الطبقة" -#: ../app/core/gimplayer.c:1913 +#: ../app/core/gimplayer.c:2365 msgctxt "undo-type" msgid "Add Alpha Channel" msgstr "أضِف قناة شفافية" -#: ../app/core/gimplayer.c:1945 +#: ../app/core/gimplayer.c:2400 msgctxt "undo-type" msgid "Remove Alpha Channel" msgstr "أزِل قناة الشفافية" -#: ../app/core/gimplayer.c:1966 +#: ../app/core/gimplayer.c:2421 msgctxt "undo-type" msgid "Layer to Image Size" msgstr "الطبقة إلى حجم الصورة" @@ -10784,20 +13372,25 @@ msgstr "" "عمق نمط غير مدعوم %Id\n" "أنماط جمب يجب أن تكون GRAY أو RGB." -#: ../app/core/gimppattern-load.c:103 ../app/core/gimppattern-load.c:141 +#: ../app/core/gimppattern-load.c:98 +#, c-format +msgid "Invalid header data in '%s': width=%lu, height=%lu, bytes=%lu" +msgstr "" + +#: ../app/core/gimppattern-load.c:117 ../app/core/gimppattern-load.c:155 msgid "File appears truncated." msgstr "يبدو أن الملف مقصوص." -#: ../app/core/gimppattern-load.c:109 +#: ../app/core/gimppattern-load.c:123 #, c-format msgid "Invalid UTF-8 string in pattern file '%s'." msgstr "سلسلة UTF-8 غير سليمة في ملف النمط '%s'." -#: ../app/core/gimppattern-load.c:152 +#: ../app/core/gimppattern-load.c:166 msgid "Fatal parse error in pattern file: " msgstr "خطأ فادح في تحليل ملف لوح الألوان:" -#: ../app/core/gimppdbprogress.c:282 ../app/widgets/gimppdbdialog.c:332 +#: ../app/core/gimppdbprogress.c:268 ../app/widgets/gimppdbdialog.c:310 #, c-format msgid "Unable to run %s callback. The corresponding plug-in may have crashed." msgstr "" @@ -10873,23 +13466,28 @@ msgstr "لا تحديد لرسمه." msgid "There is no selection to stroke." msgstr "لا تحديد لرسمه." -#: ../app/core/gimpselection.c:751 +#: ../app/core/gimpselection.c:749 msgid "Unable to cut or copy because the selected region is empty." msgstr "تعذّر القص أو النسخ لأن المنطقة المحددة فارغة." -#: ../app/core/gimpselection.c:869 +#: ../app/core/gimpselection.c:867 msgid "Cannot float selection because the selected region is empty." msgstr "تعذّر تحرير التحديد لأن المنطقة المحددة فارغة." -#: ../app/core/gimpselection.c:876 +#: ../app/core/gimpselection.c:874 msgctxt "undo-type" msgid "Float Selection" msgstr "حرر التحديد" -#: ../app/core/gimpselection.c:894 +#: ../app/core/gimpselection.c:892 msgid "Floated Layer" msgstr "طبقة حرة" +#: ../app/core/gimpsettings.c:151 +#, c-format +msgid "Last used: %s" +msgstr "" + #: ../app/core/gimpstrokeoptions.c:156 msgid "Method" msgstr "" @@ -10900,7 +13498,7 @@ msgid "Line width" msgstr "عرض السطر:" #: ../app/core/gimpstrokeoptions.c:171 ../app/core/gimptemplate.c:151 -#: ../app/tools/gimptextoptions.c:137 +#: ../app/tools/gimptextoptions.c:121 #, fuzzy msgid "Unit" msgstr "الوحدات" @@ -10938,7 +13536,7 @@ msgstr "_حاكي حركيات الفرشاة" #. no undo (or redo) steps available #: ../app/core/gimpsymmetry.c:132 ../app/widgets/gimpimagepropview.c:399 -#: ../app/widgets/gimpsymmetryeditor.c:168 +#: ../app/widgets/gimpsymmetryeditor.c:169 msgid "None" msgstr "بدون" @@ -11026,54 +13624,54 @@ msgstr "الإزاحة الرأسية للتوزيع" msgid "Horizontal axis position" msgstr "الإزاحة الأفقية للتوزيع" -#: ../app/core/gimpsymmetry-tiling.c:101 +#: ../app/core/gimpsymmetry-tiling.c:102 #, fuzzy msgid "Tiling" msgstr "التحجيم" -#: ../app/core/gimpsymmetry-tiling.c:107 +#: ../app/core/gimpsymmetry-tiling.c:108 #, fuzzy msgid "Interval X" msgstr "الف_ترة:" -#: ../app/core/gimpsymmetry-tiling.c:108 +#: ../app/core/gimpsymmetry-tiling.c:109 msgid "Interval on the X axis (pixels)" msgstr "" -#: ../app/core/gimpsymmetry-tiling.c:119 +#: ../app/core/gimpsymmetry-tiling.c:120 #, fuzzy msgid "Interval Y" msgstr "الف_ترة:" -#: ../app/core/gimpsymmetry-tiling.c:120 +#: ../app/core/gimpsymmetry-tiling.c:121 msgid "Interval on the Y axis (pixels)" msgstr "" -#: ../app/core/gimpsymmetry-tiling.c:131 +#: ../app/core/gimpsymmetry-tiling.c:132 #, fuzzy msgid "Shift" msgstr "نقل" -#: ../app/core/gimpsymmetry-tiling.c:132 +#: ../app/core/gimpsymmetry-tiling.c:133 msgid "X-shift between lines (pixels)" msgstr "" -#: ../app/core/gimpsymmetry-tiling.c:139 +#: ../app/core/gimpsymmetry-tiling.c:144 #, fuzzy msgid "Max strokes X" msgstr "أو_صِد الحدود" -#: ../app/core/gimpsymmetry-tiling.c:140 +#: ../app/core/gimpsymmetry-tiling.c:145 #, fuzzy msgid "Maximum number of strokes on the X axis" msgstr "أ_كبر عدد من الألوان:" -#: ../app/core/gimpsymmetry-tiling.c:147 +#: ../app/core/gimpsymmetry-tiling.c:152 #, fuzzy msgid "Max strokes Y" msgstr "أو_صِد الحدود" -#: ../app/core/gimpsymmetry-tiling.c:148 +#: ../app/core/gimpsymmetry-tiling.c:153 #, fuzzy msgid "Maximum number of strokes on the Y axis" msgstr "أ_كبر عدد من الألوان:" @@ -11083,13 +13681,11 @@ msgstr "أ_كبر عدد من الألوان:" msgid "Error writing '%s': %s\n" msgstr "خطأ في كتابة '%s'‏: %s\n" -#: ../app/core/gimptemplate.c:135 ../app/widgets/gimpgrideditor.c:195 -#: ../app/widgets/gimpgrideditor.c:227 +#: ../app/core/gimptemplate.c:135 msgid "Width" msgstr "العرض" -#: ../app/core/gimptemplate.c:143 ../app/widgets/gimpgrideditor.c:197 -#: ../app/widgets/gimpgrideditor.c:229 +#: ../app/core/gimptemplate.c:143 msgid "Height" msgstr "الارتفاع" @@ -11127,9 +13723,9 @@ msgid "Precision" msgstr "الدقة:" #. gamma -#: ../app/core/gimptemplate.c:205 ../app/dialogs/convert-precision-dialog.c:201 -#: ../app/operations/gimplevelsconfig.c:112 -#: ../app/operations/gimplevelsconfig.c:113 ../app/tools/gimplevelstool.c:488 +#: ../app/core/gimptemplate.c:205 ../app/dialogs/convert-precision-dialog.c:195 +#: ../app/operations/gimplevelsconfig.c:139 +#: ../app/operations/gimplevelsconfig.c:140 ../app/tools/gimplevelstool.c:500 msgid "Gamma" msgstr "جاما" @@ -11259,17 +13855,17 @@ msgctxt "plural" msgid "percent" msgstr "بالمئة" -#: ../app/dialogs/about-dialog.c:117 +#: ../app/dialogs/about-dialog.c:115 msgid "About GIMP" msgstr "عن جمب" -#: ../app/dialogs/about-dialog.c:126 +#: ../app/dialogs/about-dialog.c:124 msgid "Visit the GIMP website" msgstr "زُر موقع جمب" #. Translators: insert your names here, #. separated by newline -#: ../app/dialogs/about-dialog.c:132 +#: ../app/dialogs/about-dialog.c:130 msgid "translator-credits" msgstr "" "فريق عربايز للترجمة http://www.arabeyes.org:\n" @@ -11279,11 +13875,11 @@ msgstr "" "أسامة خالد \n" "خالد حسني " -#: ../app/dialogs/about-dialog.c:531 +#: ../app/dialogs/about-dialog.c:529 msgid "GIMP is brought to you by" msgstr "قدّمه لك" -#: ../app/dialogs/about-dialog.c:611 +#: ../app/dialogs/about-dialog.c:605 #, c-format msgid "" "This is an unstable development release\n" @@ -11301,13 +13897,13 @@ msgid "Channel _name:" msgstr "ا_سم القناة:" #: ../app/dialogs/channel-options-dialog.c:128 -#: ../app/dialogs/layer-options-dialog.c:146 +#: ../app/dialogs/layer-options-dialog.c:168 #, fuzzy msgid "Lock _pixels" msgstr "أوصِد البكسلات" #: ../app/dialogs/channel-options-dialog.c:129 -#: ../app/dialogs/layer-options-dialog.c:147 +#: ../app/dialogs/layer-options-dialog.c:169 #, fuzzy msgid "Lock position and _size" msgstr "أوصد الموضع و الحجم" @@ -11340,6 +13936,15 @@ msgstr "حوّل إلى لاحة ألوان ICC" msgid "Convert the image to a color profile" msgstr "حوّل الصورة إلى لاحة ألوان" +#: ../app/dialogs/color-profile-dialog.c:155 +#: ../app/dialogs/color-profile-dialog.c:173 +#: ../app/dialogs/color-profile-dialog.c:191 +#: ../app/dialogs/color-profile-import-dialog.c:105 +#: ../app/dialogs/convert-indexed-dialog.c:139 +#: ../app/dialogs/convert-precision-dialog.c:166 +msgid "C_onvert" +msgstr "_حوّل" + #: ../app/dialogs/color-profile-dialog.c:158 #: ../app/dialogs/color-profile-dialog.c:176 #: ../app/dialogs/color-profile-dialog.c:194 @@ -11377,6 +13982,7 @@ msgid "Select Soft-Proof Profile" msgstr "اختر لاحة ألوان الشاشة" #: ../app/dialogs/color-profile-dialog.c:209 +#: ../app/tools/gimpforegroundselecttool.c:308 #, fuzzy msgid "_Select" msgstr "ت_حديد" @@ -11409,9 +14015,9 @@ msgstr "تعويض النق_طة السوداء" msgid "Select Destination Profile" msgstr "اختر اللاحة الهدف" -#: ../app/dialogs/color-profile-dialog.c:481 -#: ../app/widgets/gimpwidgets-constructors.c:242 -#: ../app/widgets/gimpwidgets-constructors.c:253 +#: ../app/dialogs/color-profile-dialog.c:485 +#: ../app/widgets/gimpwidgets-constructors.c:86 +#: ../app/widgets/gimpwidgets-constructors.c:97 #, fuzzy msgctxt "profile" msgid "None" @@ -11438,13 +14044,10 @@ msgid "Import the image from a color profile" msgstr "استورد الصورة من لاحة ألوان" #: ../app/dialogs/color-profile-import-dialog.c:104 -msgid "Keep" +#, fuzzy +msgid "_Keep" msgstr "أبقِ" -#: ../app/dialogs/color-profile-import-dialog.c:105 -msgid "Convert" -msgstr "حوّل" - #: ../app/dialogs/color-profile-import-dialog.c:122 #, c-format msgid "The image '%s' has an embedded color profile" @@ -11462,78 +14065,66 @@ msgstr "تحويل لون مفهرس" msgid "Convert Image to Indexed Colors" msgstr "حوّل الصورة إلى ألوان مفهرسة" -#: ../app/dialogs/convert-indexed-dialog.c:143 -#: ../app/dialogs/convert-precision-dialog.c:173 -msgid "C_onvert" -msgstr "_حوّل" - -#: ../app/dialogs/convert-indexed-dialog.c:195 +#: ../app/dialogs/convert-indexed-dialog.c:190 msgid "_Maximum number of colors:" msgstr "أ_كبر عدد من الألوان:" -#: ../app/dialogs/convert-indexed-dialog.c:224 +#: ../app/dialogs/convert-indexed-dialog.c:219 #, fuzzy msgid "_Remove unused and duplicate colors from colormap" msgstr "أ_زل الألوان غير المستخدمة من مخطط الألوان" -#. dithering -#: ../app/dialogs/convert-indexed-dialog.c:241 -#: ../app/dialogs/convert-precision-dialog.c:227 -#: ../app/tools/gimpblendoptions.c:119 -msgid "Dithering" -msgstr "الإرجاف" - -#: ../app/dialogs/convert-indexed-dialog.c:253 +#: ../app/dialogs/convert-indexed-dialog.c:248 msgid "Color _dithering:" msgstr "إر_جاف الألوان:" -#: ../app/dialogs/convert-indexed-dialog.c:268 +#: ../app/dialogs/convert-indexed-dialog.c:263 msgid "Enable dithering of _transparency" msgstr "فعّل إرجاف ال_شفافية" -#: ../app/dialogs/convert-indexed-dialog.c:280 -#: ../app/dialogs/preferences-dialog.c:1889 +#: ../app/dialogs/convert-indexed-dialog.c:275 +#: ../app/dialogs/preferences-dialog.c:2163 msgid "Enable dithering of text layers" msgstr "فعّل إرجاف الطبقات النصية" -#: ../app/dialogs/convert-indexed-dialog.c:291 -#: ../app/dialogs/convert-precision-dialog.c:282 +#: ../app/dialogs/convert-indexed-dialog.c:286 +#: ../app/dialogs/convert-precision-dialog.c:276 msgid "Dithering text layers will make them uneditable" msgstr "إرجاف طبقات النص سيجعلها غير قابلة للتحرير" -#: ../app/dialogs/convert-indexed-dialog.c:415 +#: ../app/dialogs/convert-indexed-dialog.c:410 #: ../app/pdb/image-convert-cmds.c:159 msgid "Cannot convert to a palette with more than 256 colors." msgstr "تعذّر تحويل لوح ألوان ذو أكثر من 256 لون." -#: ../app/dialogs/convert-precision-dialog.c:155 +#: ../app/dialogs/convert-precision-dialog.c:154 #, c-format msgid "Convert Image to %s" msgstr "حوّل الصورة إلى %s" -#: ../app/dialogs/convert-precision-dialog.c:158 +#: ../app/dialogs/convert-precision-dialog.c:157 msgid "Precision Conversion" msgstr "تحويل دقيق" -#: ../app/dialogs/convert-precision-dialog.c:210 +#: ../app/dialogs/convert-precision-dialog.c:204 #: ../app/widgets/gimptemplateeditor.c:425 msgid "Perceptual gamma (sRGB)" msgstr "جاما إدراكية (sRGB)" -#: ../app/dialogs/convert-precision-dialog.c:211 +#: ../app/dialogs/convert-precision-dialog.c:205 #: ../app/widgets/gimptemplateeditor.c:424 msgid "Linear light" msgstr "ضوء خطي" -#: ../app/dialogs/convert-precision-dialog.c:243 +#: ../app/dialogs/convert-precision-dialog.c:237 msgid "_Layers:" msgstr "ال_طبقات:" -#: ../app/dialogs/convert-precision-dialog.c:265 +#: ../app/dialogs/convert-precision-dialog.c:259 msgid "_Text Layers:" msgstr "ال_طبقات النصية:" -#: ../app/dialogs/convert-precision-dialog.c:292 +#: ../app/dialogs/convert-precision-dialog.c:286 msgid "_Channels and Masks:" msgstr "ال_قنوات و الأقنعة" @@ -11552,72 +14143,77 @@ msgid "" "Are you sure you want to remove '%s' from the list and delete it on disk?" msgstr "أمتأكد أنك تريد إزالة '%s' من القائمة وحذفه من القرص؟" -#: ../app/dialogs/dialogs-constructors.c:214 ../app/gui/gui.c:177 -#: ../app/gui/gui-message.c:157 +#: ../app/dialogs/dialogs-constructors.c:216 ../app/gui/gui.c:190 +#: ../app/gui/gui-message.c:268 msgid "GIMP Message" msgstr "رسالة جمب" -#: ../app/dialogs/dialogs.c:311 +#: ../app/dialogs/dialogs-constructors.c:225 +#, fuzzy +msgid "GIMP Debug" +msgstr "التنقيح" + +#: ../app/dialogs/dialogs.c:314 msgid "Devices" msgstr "الأجهزة" -#: ../app/dialogs/dialogs.c:311 +#: ../app/dialogs/dialogs.c:314 msgid "Device Status" msgstr "حالة الأجهزة" -#: ../app/dialogs/dialogs.c:315 +#: ../app/dialogs/dialogs.c:318 msgid "Errors" msgstr "الأخطاء" -#: ../app/dialogs/dialogs.c:319 +#: ../app/dialogs/dialogs.c:322 msgid "Pointer" msgstr "المؤشر" -#: ../app/dialogs/dialogs.c:355 +#: ../app/dialogs/dialogs.c:362 msgid "History" msgstr "التأريخ" -#: ../app/dialogs/dialogs.c:358 +#: ../app/dialogs/dialogs.c:365 msgid "Image Templates" msgstr "قوالب الصور" -#: ../app/dialogs/dialogs.c:379 +#: ../app/dialogs/dialogs.c:386 msgid "Histogram" msgstr "رسم بياني" -#: ../app/dialogs/dialogs.c:383 +#: ../app/dialogs/dialogs.c:390 msgid "Selection" msgstr "التحديد" -#: ../app/dialogs/dialogs.c:383 +#: ../app/dialogs/dialogs.c:390 msgid "Selection Editor" msgstr "محرر التحديد" -#: ../app/dialogs/dialogs.c:387 +#: ../app/dialogs/dialogs.c:394 msgid "Symmetry Painting" msgstr "" -#: ../app/dialogs/dialogs.c:391 +#: ../app/dialogs/dialogs.c:398 msgid "Undo" msgstr "تراجع" -#: ../app/dialogs/dialogs.c:391 +#: ../app/dialogs/dialogs.c:398 msgid "Undo History" msgstr "تأريخ التراجع" -#: ../app/dialogs/dialogs.c:401 +#: ../app/dialogs/dialogs.c:408 msgid "Navigation" msgstr "إبحار" -#: ../app/dialogs/dialogs.c:401 +#: ../app/dialogs/dialogs.c:408 msgid "Display Navigation" msgstr "اعرض الإبحار" -#: ../app/dialogs/dialogs.c:407 +#: ../app/dialogs/dialogs.c:414 msgid "FG/BG" msgstr "المقدمة/الخلفية" -#: ../app/dialogs/dialogs.c:407 +#: ../app/dialogs/dialogs.c:414 msgid "FG/BG Color" msgstr "لون المقدمة/الخلفية" @@ -11630,14 +14226,12 @@ msgstr "أبهت %s" msgid "_Fade" msgstr "أب_هت" -#: ../app/dialogs/fade-dialog.c:157 ../app/dialogs/layer-options-dialog.c:161 -#: ../app/widgets/gimpdeviceinfoeditor.c:346 -msgid "_Mode:" -msgstr "ال_طور:" - -#: ../app/dialogs/fade-dialog.c:163 ../app/dialogs/layer-options-dialog.c:170 -msgid "_Opacity:" -msgstr "الإ_عتام:" +#: ../app/dialogs/fade-dialog.c:151 +#: ../app/operations/gimpoperationdesaturate.c:90 +#: ../app/tools/gimppaintoptions-gui.c:119 ../app/widgets/gimpdeviceinfo.c:132 +#: ../app/widgets/gimplayertreeview.c:279 +msgid "Mode" +msgstr "الوضع" #: ../app/dialogs/file-open-dialog.c:244 msgid "Open layers" @@ -11651,7 +14245,7 @@ msgstr "افتح مكانا" msgid "Enter location (URI):" msgstr "أدخل المكان:" -#: ../app/dialogs/file-save-dialog.c:452 +#: ../app/dialogs/file-save-dialog.c:458 msgid "" "Saving remote files needs to determine the file format from the file " "extension. Please enter a file extension that matches the selected file " @@ -11660,11 +14254,11 @@ msgstr "" "حفظ الملفات عن بعد يحتاج إلى تحديد نسق الملف من امتداده. من فضلك أدخل امتداد " "ملف يطابق نسق الملف المختار أو لا تدخل أي امتداد." -#: ../app/dialogs/file-save-dialog.c:612 +#: ../app/dialogs/file-save-dialog.c:618 msgid "The given filename cannot be used for exporting" msgstr "لا يمكن استخدام اسم الملف المعطى للتصدير" -#: ../app/dialogs/file-save-dialog.c:613 +#: ../app/dialogs/file-save-dialog.c:619 msgid "" "You can use this dialog to export to various file formats. If you want to " "save the image to the GIMP XCF format, use File→Save instead." @@ -11672,15 +14266,15 @@ msgstr "" "يمكنك استخدام هذا الحوار للتصدير إلى أنساق الملفات المختلفة. إذا أردت حفظ " "الصورة بنسق جمب XCF فاختر ملف←احفظ بدلا من هذا." -#: ../app/dialogs/file-save-dialog.c:616 +#: ../app/dialogs/file-save-dialog.c:622 msgid "Take me to the Save dialog" msgstr "خذني إلى حوار الحفظ" -#: ../app/dialogs/file-save-dialog.c:620 +#: ../app/dialogs/file-save-dialog.c:626 msgid "The given filename cannot be used for saving" msgstr "لا يمكن استخدام اسم الملف المعطى للحفظ" -#: ../app/dialogs/file-save-dialog.c:621 +#: ../app/dialogs/file-save-dialog.c:627 msgid "" "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." @@ -11688,15 +14282,15 @@ msgstr "" "يمكنك استخدام هذا الحوار للحفظ بنسق جمب XCF. استخدم ملف←صدّر للتصدير إلى " "أنساق الملفات الأخرى." -#: ../app/dialogs/file-save-dialog.c:623 +#: ../app/dialogs/file-save-dialog.c:629 msgid "Take me to the Export dialog" msgstr "خذني إلى حوار التصدير" -#: ../app/dialogs/file-save-dialog.c:626 ../app/dialogs/file-save-dialog.c:703 +#: ../app/dialogs/file-save-dialog.c:632 ../app/dialogs/file-save-dialog.c:709 msgid "Extension Mismatch" msgstr "الامتداد غير متطابق" -#: ../app/dialogs/file-save-dialog.c:687 +#: ../app/dialogs/file-save-dialog.c:693 msgid "" "The given filename does not have any known file extension. Please enter a " "known file extension or select a file format from the file format list." @@ -11704,19 +14298,19 @@ msgstr "" "الاسم المدخل لا يحتوي أي امتداد معروف. رجاءً أدخل امتداد ملف معروف أو اختر " "نسق ملف من قائمة أنساق الملفات." -#: ../app/dialogs/file-save-dialog.c:719 +#: ../app/dialogs/file-save-dialog.c:725 msgid "The given file extension does not match the chosen file type." msgstr "الامتداد المعطى لا يطابق نوع الملف المحدد." -#: ../app/dialogs/file-save-dialog.c:723 +#: ../app/dialogs/file-save-dialog.c:729 msgid "Do you want to save the image using this name anyway?" msgstr "هل تريد حفظ الصورة باستخدام هذا الاسم على كل حال؟" -#: ../app/dialogs/file-save-dialog.c:788 +#: ../app/dialogs/file-save-dialog.c:794 msgid "Saving canceled" msgstr "أُلغي الحفظ" -#: ../app/dialogs/file-save-dialog.c:794 ../app/widgets/gimpdnd-xds.c:190 +#: ../app/dialogs/file-save-dialog.c:800 ../app/widgets/gimpdnd-xds.c:190 #, c-format msgid "" "Saving '%s' failed:\n" @@ -11778,7 +14372,7 @@ msgid "Create a New Image" msgstr "أنشئ صورة جديدة" #: ../app/dialogs/image-new-dialog.c:138 -#: ../app/dialogs/preferences-dialog.c:1408 +#: ../app/dialogs/preferences-dialog.c:1664 msgid "_Template:" msgstr "_قالب:" @@ -11806,6 +14400,18 @@ msgstr "" msgid "Image Properties" msgstr "خصائص الصورة" +#: ../app/dialogs/image-properties-dialog.c:68 +#: ../app/dialogs/input-devices-dialog.c:62 +#: ../app/dialogs/keyboard-shortcuts-dialog.c:55 +#: ../app/dialogs/module-dialog.c:134 ../app/tools/gimpblendtool-editor.c:1851 +#: ../app/tools/gimpcolorpickertool.c:349 ../app/tools/gimpmeasuretool.c:651 +#: ../app/widgets/gimpcontrollerlist.c:640 +#: ../app/widgets/gimpcriticaldialog.c:97 ../app/widgets/gimppdbdialog.c:175 +#: ../app/widgets/gimpsettingsbox.c:663 ../app/widgets/gimptexteditor.c:162 +#, fuzzy +msgid "_Close" +msgstr "ا_ستنسخ" + #: ../app/dialogs/image-properties-dialog.c:84 msgid "Properties" msgstr "الخصائص" @@ -11823,6 +14429,11 @@ msgstr "تحجيم الصورة" msgid "Confirm Scaling" msgstr "أكّد التحجيم" +#: ../app/dialogs/image-scale-dialog.c:211 ../app/dialogs/scale-dialog.c:138 +#: ../app/tools/gimpscaletool.c:92 ../app/tools/gimpscaletool.c:110 +msgid "_Scale" +msgstr "_حجّم" + #: ../app/dialogs/image-scale-dialog.c:243 #, c-format msgid "" @@ -11891,6 +14502,11 @@ msgstr "أضِف قناع طبقة" msgid "Add a Mask to the Layer" msgstr "أضِف قناعا إلى الصورة" +#: ../app/dialogs/layer-add-mask-dialog.c:111 +#, fuzzy +msgid "_Add" +msgstr "أضف ل_سانا" + #: ../app/dialogs/layer-add-mask-dialog.c:137 msgid "Initialize Layer Mask to:" msgstr "جهز قناع الطبقة إلى:" @@ -11903,50 +14519,72 @@ msgstr "اق_لب القناع" msgid "Please select a channel first" msgstr "رجاء اختر قناة أولا" -#: ../app/dialogs/layer-options-dialog.c:144 +#: ../app/dialogs/layer-options-dialog.c:166 msgid "Layer _name:" msgstr "ا_سم الطبقة:" +#: ../app/dialogs/layer-options-dialog.c:188 +#: ../app/widgets/gimpdeviceinfoeditor.c:349 +msgid "_Mode:" +msgstr "ال_طور:" + +#: ../app/dialogs/layer-options-dialog.c:203 +#, fuzzy +msgid "Blend space:" +msgstr "مساحة الألوان:" + +#: ../app/dialogs/layer-options-dialog.c:213 +#, fuzzy +msgid "Composite space:" +msgstr "مُركّب" + +#: ../app/dialogs/layer-options-dialog.c:225 +#, fuzzy +msgid "Composite mode:" +msgstr "مُركّب" + +#: ../app/dialogs/layer-options-dialog.c:239 +msgid "_Opacity:" +msgstr "ال_عتامة:" + #. The size labels -#: ../app/dialogs/layer-options-dialog.c:183 -#: ../app/tools/gimpmeasuretool.c:1139 +#: ../app/dialogs/layer-options-dialog.c:252 ../app/tools/gimpmeasuretool.c:726 msgid "Width:" msgstr "العرض:" -#: ../app/dialogs/layer-options-dialog.c:189 -#: ../app/tools/gimpmeasuretool.c:1167 +#: ../app/dialogs/layer-options-dialog.c:258 ../app/tools/gimpmeasuretool.c:754 msgid "Height:" msgstr "الارتفاع:" #. The offset labels -#: ../app/dialogs/layer-options-dialog.c:247 +#: ../app/dialogs/layer-options-dialog.c:316 #: ../app/tools/gimpalignoptions.c:380 #, fuzzy msgid "Offset X:" msgstr "الإزاحة:" -#: ../app/dialogs/layer-options-dialog.c:253 +#: ../app/dialogs/layer-options-dialog.c:322 #: ../app/tools/gimpalignoptions.c:393 #, fuzzy msgid "Offset Y:" msgstr "الإزاحة:" -#: ../app/dialogs/layer-options-dialog.c:327 ../app/dialogs/resize-dialog.c:369 -#: ../app/widgets/gimptemplateeditor.c:450 +#: ../app/dialogs/layer-options-dialog.c:396 ../app/dialogs/resize-dialog.c:369 +#: ../app/widgets/gimptemplateeditor.c:452 msgid "_Fill with:" msgstr "ا_ملأ بـ:" -#: ../app/dialogs/layer-options-dialog.c:342 -#: ../app/widgets/gimpcolordisplayeditor.c:277 +#: ../app/dialogs/layer-options-dialog.c:411 +#: ../app/widgets/gimpcolordisplayeditor.c:285 msgid "Active Filters" msgstr "المرشحات النشطة" -#: ../app/dialogs/layer-options-dialog.c:369 +#: ../app/dialogs/layer-options-dialog.c:438 #, fuzzy msgid "Lock _alpha" msgstr "أوصِد قناة الشفافية" -#: ../app/dialogs/layer-options-dialog.c:381 +#: ../app/dialogs/layer-options-dialog.c:450 msgid "Set name from _text" msgstr "اضبط الاسم من الن_ص" @@ -12000,6 +14638,11 @@ msgstr "القاتل GEGLs من الفضاء الخارجي" msgid "Module Manager" msgstr "مدير الملحقات" +#: ../app/dialogs/module-dialog.c:133 +#, fuzzy +msgid "_Refresh" +msgstr "ح_دّث الفُرَش" + #: ../app/dialogs/module-dialog.c:153 msgid "You will have to restart GIMP for the changes to take effect." msgstr "ستحتاج لإعادة تشغيل جمب لتطبيق التغييرات." @@ -12008,31 +14651,31 @@ msgstr "ستحتاج لإعادة تشغيل جمب لتطبيق التغيير msgid "Module" msgstr "الوحدات" -#: ../app/dialogs/module-dialog.c:471 +#: ../app/dialogs/module-dialog.c:472 msgid "Only in memory" msgstr "فقط في الذاكرة" -#: ../app/dialogs/module-dialog.c:476 +#: ../app/dialogs/module-dialog.c:477 msgid "No longer available" msgstr "لم يعد موجودا" -#: ../app/dialogs/module-dialog.c:501 +#: ../app/dialogs/module-dialog.c:502 msgid "Author:" msgstr "المؤلف:" -#: ../app/dialogs/module-dialog.c:502 +#: ../app/dialogs/module-dialog.c:503 msgid "Version:" msgstr "الإصدارة:" -#: ../app/dialogs/module-dialog.c:503 +#: ../app/dialogs/module-dialog.c:504 msgid "Date:" msgstr "التأريخ:" -#: ../app/dialogs/module-dialog.c:504 +#: ../app/dialogs/module-dialog.c:505 msgid "Copyright:" msgstr "حقوق النشر:" -#: ../app/dialogs/module-dialog.c:505 +#: ../app/dialogs/module-dialog.c:506 msgid "Location:" msgstr "المكان:" @@ -12051,8 +14694,8 @@ msgstr "أزِح القناة" #. The offset frame #: ../app/dialogs/offset-dialog.c:129 ../app/dialogs/offset-dialog.c:163 #: ../app/dialogs/resize-dialog.c:230 ../app/tools/gimpalignoptions.c:100 -#: ../app/tools/gimpalignoptions.c:107 ../app/tools/gimpblendoptions.c:79 -#: ../app/widgets/gimpgrideditor.c:206 +#: ../app/tools/gimpalignoptions.c:107 ../app/tools/gimpblendoptions.c:88 +#: ../app/widgets/gimpgrideditor.c:209 msgid "Offset" msgstr "الإزاحة" @@ -12090,98 +14733,98 @@ msgstr "املأ بلون ال_خلفية" msgid "Make _transparent" msgstr "اجعلها _شفافة" -#: ../app/dialogs/palette-import-dialog.c:158 +#: ../app/dialogs/palette-import-dialog.c:157 msgid "Import a New Palette" msgstr "استورد لوح ألوان جديد" -#: ../app/dialogs/palette-import-dialog.c:168 +#: ../app/dialogs/palette-import-dialog.c:163 msgid "_Import" msgstr "ا_ستورد" #. The "Source" frame -#: ../app/dialogs/palette-import-dialog.c:207 +#: ../app/dialogs/palette-import-dialog.c:201 msgid "Select Source" msgstr "اختر المصدر" -#: ../app/dialogs/palette-import-dialog.c:218 -#: ../app/dialogs/preferences-dialog.c:1370 +#: ../app/dialogs/palette-import-dialog.c:212 +#: ../app/dialogs/preferences-dialog.c:1626 msgid "_Gradient" msgstr "_تدرج" -#: ../app/dialogs/palette-import-dialog.c:229 +#: ../app/dialogs/palette-import-dialog.c:223 msgid "I_mage" msgstr "_صورة" -#: ../app/dialogs/palette-import-dialog.c:243 +#: ../app/dialogs/palette-import-dialog.c:237 msgid "Sample _Merged" msgstr "عينات مدموجة" -#: ../app/dialogs/palette-import-dialog.c:255 +#: ../app/dialogs/palette-import-dialog.c:249 msgid "_Selected Pixels only" msgstr "ال_بكسلات المحددة فقط" -#: ../app/dialogs/palette-import-dialog.c:267 +#: ../app/dialogs/palette-import-dialog.c:261 msgid "Palette _file" msgstr "ملف _لوح الألوان" #. Palette file name entry -#: ../app/dialogs/palette-import-dialog.c:296 +#: ../app/dialogs/palette-import-dialog.c:290 msgid "Select Palette File" msgstr "اختر ملف لوح ألوان" #. The "Import" frame -#: ../app/dialogs/palette-import-dialog.c:307 +#: ../app/dialogs/palette-import-dialog.c:301 msgid "Import Options" msgstr "خيارات الاستيراد" -#: ../app/dialogs/palette-import-dialog.c:321 +#: ../app/dialogs/palette-import-dialog.c:315 msgid "New import" msgstr "استيراد جديد" -#: ../app/dialogs/palette-import-dialog.c:323 +#: ../app/dialogs/palette-import-dialog.c:317 msgid "Palette _name:" msgstr "ا_سم لوح الألوان:" -#: ../app/dialogs/palette-import-dialog.c:329 +#: ../app/dialogs/palette-import-dialog.c:323 msgid "N_umber of colors:" msgstr "_عدد الألوان:" -#: ../app/dialogs/palette-import-dialog.c:342 +#: ../app/dialogs/palette-import-dialog.c:337 msgid "C_olumns:" msgstr "الأع_مدة:" -#: ../app/dialogs/palette-import-dialog.c:354 +#: ../app/dialogs/palette-import-dialog.c:349 msgid "I_nterval:" msgstr "الف_ترة:" #. The "Preview" frame -#: ../app/dialogs/palette-import-dialog.c:365 -#: ../app/tools/gimpforegroundselecttool.c:1229 +#: ../app/dialogs/palette-import-dialog.c:360 +#: ../app/tools/gimpforegroundselecttool.c:1214 msgid "Preview" msgstr "عاين" -#: ../app/dialogs/palette-import-dialog.c:386 +#: ../app/dialogs/palette-import-dialog.c:381 msgid "The selected source contains no colors." msgstr "المصدر المختار لا يحتوي على ألوان." -#: ../app/dialogs/palette-import-dialog.c:471 +#: ../app/dialogs/palette-import-dialog.c:466 #, fuzzy msgid "There is no palette to import." msgstr "لا يوجد مسار لنقله." -#: ../app/dialogs/preferences-dialog.c:269 +#: ../app/dialogs/preferences-dialog.c:280 msgid "Reset All Preferences" msgstr "صفّر كل التفضيلات" -#: ../app/dialogs/preferences-dialog.c:287 +#: ../app/dialogs/preferences-dialog.c:298 msgid "Do you really want to reset all preferences to default values?" msgstr "هل تريد حقا إعادة ضبط كل التفضيلات إلى قيمها المبدئية؟" -#: ../app/dialogs/preferences-dialog.c:366 +#: ../app/dialogs/preferences-dialog.c:377 msgid "You will have to restart GIMP for the following changes to take effect:" msgstr "عليك إعادة تشغيل جمب لتطبيق التغييرات التالية:" -#: ../app/dialogs/preferences-dialog.c:588 +#: ../app/dialogs/preferences-dialog.c:615 msgid "" "Your keyboard shortcuts will be reset to default values the next time you " "start GIMP." @@ -12189,22 +14832,22 @@ msgstr "" "ستعاد اختصارات لوحة المفاتيح إلى قيمها المبدئية في المرة القادمة التي تشغل " "جمب فيها." -#: ../app/dialogs/preferences-dialog.c:599 +#: ../app/dialogs/preferences-dialog.c:626 msgid "Remove all Keyboard Shortcuts" msgstr "احذف كل اختصارات لوحة المفاتيح" -#: ../app/dialogs/preferences-dialog.c:621 +#: ../app/dialogs/preferences-dialog.c:648 msgid "Do you really want to remove all keyboard shortcuts from all menus?" msgstr "هل تريد حقا حذف جميع اختصارات لوحة المفاتيح من جميع القوائم؟" -#: ../app/dialogs/preferences-dialog.c:662 +#: ../app/dialogs/preferences-dialog.c:689 msgid "" "Your window setup will be reset to default values the next time you start " "GIMP." msgstr "" "سيُعاد إعداد نافذتك إلى قيمته المبدئية في المرة القادمة التي تشغل جمب فيها." -#: ../app/dialogs/preferences-dialog.c:697 +#: ../app/dialogs/preferences-dialog.c:724 msgid "" "Your input device settings will be reset to default values the next time you " "start GIMP." @@ -12212,1298 +14855,1431 @@ msgstr "" "ستعاد إعدادات أجهزة الإدخال إلى قيمها المبدئية في المرة القادمة التي تشغل " "جمب فيها." -#: ../app/dialogs/preferences-dialog.c:739 +#: ../app/dialogs/preferences-dialog.c:766 msgid "" "Your tool options will be reset to default values the next time you start " "GIMP." msgstr "" "ستعاد خيارات الأدوات إلى قيمها المبدئية في المرة القادمة التي تشغل جمب فيها." -#: ../app/dialogs/preferences-dialog.c:835 +#: ../app/dialogs/preferences-dialog.c:818 +#: ../app/dialogs/preferences-dialog.c:2436 +msgid "There's a local installation of the user manual." +msgstr "يوجد نسخة محلية من دليل المستخدم." + +#: ../app/dialogs/preferences-dialog.c:823 +#: ../app/dialogs/preferences-dialog.c:2442 +msgid "The user manual is not installed locally." +msgstr "دليل المستخدم ليس مثبتا محليا." + +#: ../app/dialogs/preferences-dialog.c:930 msgid "Show _menubar" msgstr "أظهر _شريط القوائم" -#: ../app/dialogs/preferences-dialog.c:839 +#: ../app/dialogs/preferences-dialog.c:934 msgid "Show _rulers" msgstr "أظهر المسا_طر" -#: ../app/dialogs/preferences-dialog.c:842 +#: ../app/dialogs/preferences-dialog.c:937 msgid "Show scroll_bars" msgstr "أظهر أشرطة ال_تمرير" -#: ../app/dialogs/preferences-dialog.c:845 +#: ../app/dialogs/preferences-dialog.c:940 msgid "Show s_tatusbar" msgstr "أظهر شريط ال_حالة" -#: ../app/dialogs/preferences-dialog.c:853 +#: ../app/dialogs/preferences-dialog.c:948 msgid "Show s_election" msgstr "أظهر التح_ديد" -#: ../app/dialogs/preferences-dialog.c:856 +#: ../app/dialogs/preferences-dialog.c:951 msgid "Show _layer boundary" msgstr "أظهر حدود الطب_قة" -#: ../app/dialogs/preferences-dialog.c:859 +#: ../app/dialogs/preferences-dialog.c:954 msgid "Show _guides" msgstr "أظهر الأد_لة" -#: ../app/dialogs/preferences-dialog.c:862 +#: ../app/dialogs/preferences-dialog.c:957 msgid "Show gri_d" msgstr "أظهر الشبك_ة" -#: ../app/dialogs/preferences-dialog.c:868 +#: ../app/dialogs/preferences-dialog.c:963 msgid "Canvas _padding mode:" msgstr "طور توسيد رق_عة الرسم:" -#: ../app/dialogs/preferences-dialog.c:873 +#: ../app/dialogs/preferences-dialog.c:968 msgid "Custom p_adding color:" msgstr "لون توسيد م_خصص:" -#: ../app/dialogs/preferences-dialog.c:874 +#: ../app/dialogs/preferences-dialog.c:969 msgid "Select Custom Canvas Padding Color" msgstr "اضبط لون مخصص لتوسيد رقعة الرسم" -#: ../app/dialogs/preferences-dialog.c:904 +#: ../app/dialogs/preferences-dialog.c:999 msgid "Snap to Guides" msgstr "اتبع الأدلة" -#: ../app/dialogs/preferences-dialog.c:907 +#: ../app/dialogs/preferences-dialog.c:1002 msgid "Snap to Grid" msgstr "اتبع الشبكة" -#: ../app/dialogs/preferences-dialog.c:915 +#: ../app/dialogs/preferences-dialog.c:1010 msgid "Snap to Canvas Edges" msgstr "اتبع حدود الرقعة" -#: ../app/dialogs/preferences-dialog.c:918 +#: ../app/dialogs/preferences-dialog.c:1013 msgid "Snap to Active Path" msgstr "اتبع المسار النشط" -#: ../app/dialogs/preferences-dialog.c:993 +#: ../app/dialogs/preferences-dialog.c:1090 msgid "Preferences" msgstr "التفضيلات" -#: ../app/dialogs/preferences-dialog.c:1029 -#: ../app/dialogs/preferences-dialog.c:1030 +#: ../app/dialogs/preferences-dialog.c:1126 +#: ../app/dialogs/preferences-dialog.c:1127 msgid "System Resources" msgstr "موارد النظام" -#: ../app/dialogs/preferences-dialog.c:1037 +#: ../app/dialogs/preferences-dialog.c:1134 msgid "Resource Consumption" msgstr "استهلاك الموارد" -#: ../app/dialogs/preferences-dialog.c:1047 +#: ../app/dialogs/preferences-dialog.c:1144 msgid "Minimal number of _undo levels:" msgstr "أقل عدد من مستويات ال_تراجع:" -#: ../app/dialogs/preferences-dialog.c:1050 +#: ../app/dialogs/preferences-dialog.c:1147 msgid "Maximum undo _memory:" msgstr "أعلى _ذاكرة تراجع:" -#: ../app/dialogs/preferences-dialog.c:1053 +#: ../app/dialogs/preferences-dialog.c:1150 msgid "Tile cache _size:" msgstr "_حجم مخبئية اللوح:" -#: ../app/dialogs/preferences-dialog.c:1056 +#: ../app/dialogs/preferences-dialog.c:1153 msgid "Maximum _new image size:" msgstr "أقصى حجم للصور ال_جديدة:" -#: ../app/dialogs/preferences-dialog.c:1061 -msgid "Number of _processors to use:" +#: ../app/dialogs/preferences-dialog.c:1158 +#, fuzzy +msgid "Number of _threads to use:" msgstr "عدد الم_عالجات المستخدمة:" +#: ../app/dialogs/preferences-dialog.c:1163 +msgid "" +"Threading support is not yet stable.\n" +"Setting this to greater than one might\n" +"result in image errors or crashes." +msgstr "" + #. Hardware Acceleration -#: ../app/dialogs/preferences-dialog.c:1066 +#: ../app/dialogs/preferences-dialog.c:1173 msgid "Hardware Acceleration" msgstr "تسريع العتاد" -#: ../app/dialogs/preferences-dialog.c:1070 +#: ../app/dialogs/preferences-dialog.c:1177 msgid "Use OpenCL" msgstr "استعمل OpenCL" #. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1074 +#: ../app/dialogs/preferences-dialog.c:1181 msgid "Image Thumbnails" msgstr "مصغّرات الصور" -#: ../app/dialogs/preferences-dialog.c:1079 +#: ../app/dialogs/preferences-dialog.c:1186 msgid "Size of _thumbnails:" msgstr "حجم الم_صغّرات:" -#: ../app/dialogs/preferences-dialog.c:1083 +#: ../app/dialogs/preferences-dialog.c:1190 msgid "Maximum _filesize for thumbnailing:" msgstr "أقصى حجم لملف المض_غرات:" -#: ../app/dialogs/preferences-dialog.c:1093 +#: ../app/dialogs/preferences-dialog.c:1200 msgid "Keep record of used files in the Recent Documents list" msgstr "احفظ سجلا بالملفات المستخدمة في قائمة أحدث المستندات" -#: ../app/dialogs/preferences-dialog.c:1102 -#: ../app/dialogs/preferences-dialog.c:1103 +#. TODO: icon needed. +#: ../app/dialogs/preferences-dialog.c:1215 +#: ../app/dialogs/preferences-dialog.c:1216 +#, fuzzy +msgid "Debugging" +msgstr "التنقيح" + +#: ../app/dialogs/preferences-dialog.c:1223 +msgid "" +"We hope you will never need these settings, but as all software, GIMP has " +"bugs, and crashes can occur. If it happens, you can help us by reporting " +"bugs." +msgstr "" + +#: ../app/dialogs/preferences-dialog.c:1232 +msgid "Bug Reporting" +msgstr "" + +#: ../app/dialogs/preferences-dialog.c:1239 +msgid "Debug Policy" +msgstr "" + +#: ../app/dialogs/preferences-dialog.c:1251 +msgid "This feature requires \"gdb\" or \"lldb\" installed on your system." +msgstr "" + +#: ../app/dialogs/preferences-dialog.c:1255 +msgid "" +"This feature is more efficient with \"gdb\" or \"lldb\" installed on your " +"system." +msgstr "" + +#: ../app/dialogs/preferences-dialog.c:1268 +#: ../app/dialogs/preferences-dialog.c:1269 msgid "Color Management" msgstr "إدارة الألوان" -#: ../app/dialogs/preferences-dialog.c:1112 +#: ../app/dialogs/preferences-dialog.c:1278 #, fuzzy msgid "Reset Color Management" msgstr "إدارة الألوان" -#: ../app/dialogs/preferences-dialog.c:1135 +#: ../app/dialogs/preferences-dialog.c:1301 msgid "Image display _mode:" msgstr "" #. Color Managed Display -#: ../app/dialogs/preferences-dialog.c:1139 +#: ../app/dialogs/preferences-dialog.c:1305 #, fuzzy msgid "Color Managed Display" msgstr "إدارة الألوان" -#: ../app/dialogs/preferences-dialog.c:1148 +#: ../app/dialogs/preferences-dialog.c:1314 msgid "Select Monitor Color Profile" msgstr "اختر لاحة ألوان الشاشة" -#: ../app/dialogs/preferences-dialog.c:1149 +#: ../app/dialogs/preferences-dialog.c:1315 msgid "_Monitor profile:" msgstr "لاحة ال_شاشة:" -#: ../app/dialogs/preferences-dialog.c:1154 +#: ../app/dialogs/preferences-dialog.c:1321 msgid "_Try to use the system monitor profile" msgstr "_جرب استخدام لاحة شاشة النظام" -#: ../app/dialogs/preferences-dialog.c:1163 +#: ../app/dialogs/preferences-dialog.c:1330 #, fuzzy msgid "_Rendering intent:" msgstr "_هدف التصيير:" -#: ../app/dialogs/preferences-dialog.c:1168 +#: ../app/dialogs/preferences-dialog.c:1335 #, fuzzy msgid "Use _black point compensation" msgstr "تعويض النق_طة السوداء" -#: ../app/dialogs/preferences-dialog.c:1176 -#: ../app/dialogs/preferences-dialog.c:1211 ../app/paint/gimpinkoptions.c:93 +#: ../app/dialogs/preferences-dialog.c:1343 +#: ../app/dialogs/preferences-dialog.c:1379 ../app/paint/gimpinkoptions.c:93 msgid "Speed" msgstr "السرعة" -#: ../app/dialogs/preferences-dialog.c:1177 -#: ../app/dialogs/preferences-dialog.c:1212 +#: ../app/dialogs/preferences-dialog.c:1344 +#: ../app/dialogs/preferences-dialog.c:1380 #, fuzzy msgid "Precision / Color Fidelity" msgstr "تحويل دقيق" -#: ../app/dialogs/preferences-dialog.c:1178 +#: ../app/dialogs/preferences-dialog.c:1345 #, fuzzy msgid "_Optimize image display for:" msgstr "افتح حوار الصورة" #. Print Simulation (Soft-proofing) -#: ../app/dialogs/preferences-dialog.c:1182 +#: ../app/dialogs/preferences-dialog.c:1349 msgid "Soft-Proofing" msgstr "" -#: ../app/dialogs/preferences-dialog.c:1192 +#: ../app/dialogs/preferences-dialog.c:1359 #, fuzzy msgid "Select Soft-Proofing Color Profile" msgstr "اختر لاحة ألوان الطابعة" -#: ../app/dialogs/preferences-dialog.c:1193 +#: ../app/dialogs/preferences-dialog.c:1360 #, fuzzy msgid "_Soft-proofing profile:" msgstr "توزيع الألوان في م_حاكاة الطباعة:" -#: ../app/dialogs/preferences-dialog.c:1198 +#: ../app/dialogs/preferences-dialog.c:1366 #, fuzzy msgid "Re_ndering intent:" msgstr "_هدف التصيير:" -#: ../app/dialogs/preferences-dialog.c:1203 +#: ../app/dialogs/preferences-dialog.c:1371 #, fuzzy msgid "Use black _point compensation" msgstr "تعويض النق_طة السوداء" -#: ../app/dialogs/preferences-dialog.c:1213 +#: ../app/dialogs/preferences-dialog.c:1381 msgid "O_ptimize soft-proofing for:" msgstr "" -#: ../app/dialogs/preferences-dialog.c:1222 +#: ../app/dialogs/preferences-dialog.c:1390 msgid "Mark out of gamut colors" msgstr "" -#: ../app/dialogs/preferences-dialog.c:1227 +#: ../app/dialogs/preferences-dialog.c:1395 msgid "Select Warning Color" msgstr "اختر لون التحذير" #. Preferred profiles -#: ../app/dialogs/preferences-dialog.c:1238 +#: ../app/dialogs/preferences-dialog.c:1406 #, fuzzy msgid "Preferred Profiles" msgstr "لا_حة ح‌خ‌ز (RGB) المفضلة:" -#: ../app/dialogs/preferences-dialog.c:1247 +#: ../app/dialogs/preferences-dialog.c:1415 #, fuzzy msgid "Select Preferred RGB Color Profile" msgstr "اختر لاحة ألوان ح‌خ‌ز" -#: ../app/dialogs/preferences-dialog.c:1248 +#: ../app/dialogs/preferences-dialog.c:1416 #, fuzzy msgid "_RGB profile:" msgstr "لاحة _زق‌ص‌س:" -#: ../app/dialogs/preferences-dialog.c:1254 +#: ../app/dialogs/preferences-dialog.c:1423 #, fuzzy msgid "Select Preferred Grayscale Color Profile" msgstr "اختر لاحة الألوان الرمادية" -#: ../app/dialogs/preferences-dialog.c:1255 +#: ../app/dialogs/preferences-dialog.c:1424 #, fuzzy msgid "_Grayscale profile:" msgstr "لا_حة التدرج الرمادي المفضلة:" -#: ../app/dialogs/preferences-dialog.c:1261 +#: ../app/dialogs/preferences-dialog.c:1431 msgid "Select CMYK Color Profile" msgstr "اختر لاحة ألوان زق‌ص‌س" -#: ../app/dialogs/preferences-dialog.c:1262 +#: ../app/dialogs/preferences-dialog.c:1432 msgid "_CMYK profile:" msgstr "لاحة _زق‌ص‌س:" #. Policies -#: ../app/dialogs/preferences-dialog.c:1266 +#: ../app/dialogs/preferences-dialog.c:1437 msgid "Policies" msgstr "" -#: ../app/dialogs/preferences-dialog.c:1271 +#: ../app/dialogs/preferences-dialog.c:1442 msgid "File Open behaviour:" msgstr "سلوك فتح الملفات:" -#: ../app/dialogs/preferences-dialog.c:1287 +#. Filter Dialogs +#: ../app/dialogs/preferences-dialog.c:1446 +#, fuzzy +msgid "Filter Dialogs" +msgstr "_حوار فتح ملف" + +#: ../app/dialogs/preferences-dialog.c:1450 +#, fuzzy +msgid "Show advanced color options" +msgstr "الخيارات المتقدمة" + +#: ../app/dialogs/preferences-dialog.c:1464 +#: ../app/dialogs/preferences-dialog.c:1465 +msgid "Image Import & Export" +msgstr "" + +#. Import Policies +#: ../app/dialogs/preferences-dialog.c:1471 +#, fuzzy +msgid "Import Policies" +msgstr "المجلد المؤقت:" + +#: ../app/dialogs/preferences-dialog.c:1475 +#, fuzzy +msgid "Promote imported images to _floating point precision" +msgstr "حوّل الصورة إلى دقة عدد عشري من 16 بتة" + +#: ../app/dialogs/preferences-dialog.c:1481 +#, fuzzy +msgid "Dither images when promoting to floating point" +msgstr "حوّل الصورة إلى دقة عدد عشري من 16 بتة" + +#: ../app/dialogs/preferences-dialog.c:1486 +#, fuzzy +msgid "Add an alpha channel to imported images" +msgstr "أضِف قناة شفافية الطبقة إلى التحديد الحالي" + +#: ../app/dialogs/preferences-dialog.c:1491 +#: ../app/dialogs/preferences-dialog.c:2090 +#, fuzzy +msgid "Color profile policy:" +msgstr "تحويل لاحة الألوان" + +#. Export Policies +#: ../app/dialogs/preferences-dialog.c:1495 +#, fuzzy +msgid "Export Policies" +msgstr "المجلد المؤقت:" + +#: ../app/dialogs/preferences-dialog.c:1499 +msgid "Export Exif metadata by default when available" +msgstr "" + +#: ../app/dialogs/preferences-dialog.c:1502 +msgid "Export XMP metadata by default when available" +msgstr "" + +#: ../app/dialogs/preferences-dialog.c:1505 +msgid "Export IPTC metadata by default when available" +msgstr "" + +#: ../app/dialogs/preferences-dialog.c:1508 +msgid "Metadata can contain sensitive information." +msgstr "" + +#. Raw Image Importer +#: ../app/dialogs/preferences-dialog.c:1513 +#, fuzzy +msgid "Raw Image Importer" +msgstr "قوالب الصور" + +#: ../app/dialogs/preferences-dialog.c:1546 msgid "Experimental Playground" msgstr "ساحة التجارب" -#: ../app/dialogs/preferences-dialog.c:1288 +#: ../app/dialogs/preferences-dialog.c:1547 msgid "Playground" msgstr "ساحة التجارب" -#: ../app/dialogs/preferences-dialog.c:1293 +#: ../app/dialogs/preferences-dialog.c:1552 msgid "Insane Options" msgstr "خيارات مجنونة" -#: ../app/dialogs/preferences-dialog.c:1297 +#: ../app/dialogs/preferences-dialog.c:1556 msgid "_N-Point Deformation tool" msgstr "" -#: ../app/dialogs/preferences-dialog.c:1300 -msgid "_Handle Transform tool" -msgstr "" - -#: ../app/dialogs/preferences-dialog.c:1303 +#: ../app/dialogs/preferences-dialog.c:1559 msgid "_Seamless Clone tool" msgstr "أداة الاستنساخ ال_سلس" -#: ../app/dialogs/preferences-dialog.c:1313 -#: ../app/dialogs/preferences-dialog.c:1314 +#: ../app/dialogs/preferences-dialog.c:1569 +#: ../app/dialogs/preferences-dialog.c:1570 msgctxt "preferences" msgid "Tool Options" msgstr "خيارات الأدوات" #. General #. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1322 -#: ../app/dialogs/preferences-dialog.c:2099 -#: ../app/dialogs/preferences-dialog.c:2382 -#: ../app/dialogs/preferences-dialog.c:2613 +#: ../app/dialogs/preferences-dialog.c:1578 +#: ../app/dialogs/preferences-dialog.c:2380 +#: ../app/dialogs/preferences-dialog.c:2708 +#: ../app/dialogs/preferences-dialog.c:2939 #: ../app/widgets/gimpcontrollereditor.c:186 msgid "General" msgstr "عام" -#: ../app/dialogs/preferences-dialog.c:1325 +#: ../app/dialogs/preferences-dialog.c:1581 msgid "_Save tool options on exit" msgstr "ا_حفظ خيارات الأدوات عند الخروج" -#: ../app/dialogs/preferences-dialog.c:1329 +#: ../app/dialogs/preferences-dialog.c:1585 msgid "Save Tool Options _Now" msgstr "احفظ خيارات الأدوات ال_آن" -#: ../app/dialogs/preferences-dialog.c:1336 +#: ../app/dialogs/preferences-dialog.c:1592 msgid "_Reset Saved Tool Options to Default Values" msgstr "_صفّر خيارات الأدوات إلى القيم المبدئية" -#: ../app/dialogs/preferences-dialog.c:1350 +#: ../app/dialogs/preferences-dialog.c:1606 msgid "Default _interpolation:" msgstr "الاستيفاء ال_مبدئي:" #. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1357 +#: ../app/dialogs/preferences-dialog.c:1613 msgid "Paint Options Shared Between Tools" msgstr "خيارات التلوين مشتركة بين الأدوات" -#: ../app/dialogs/preferences-dialog.c:1361 +#: ../app/dialogs/preferences-dialog.c:1617 msgid "_Brush" msgstr "ال_فرشاة" -#: ../app/dialogs/preferences-dialog.c:1364 +#: ../app/dialogs/preferences-dialog.c:1620 msgid "_Dynamics" msgstr "ال_حركيات" -#: ../app/dialogs/preferences-dialog.c:1367 +#: ../app/dialogs/preferences-dialog.c:1623 msgid "_Pattern" msgstr "ال_نمط" #. Move Tool -#: ../app/dialogs/preferences-dialog.c:1374 +#: ../app/dialogs/preferences-dialog.c:1630 msgid "Move Tool" msgstr "أداة النقل" -#: ../app/dialogs/preferences-dialog.c:1378 +#: ../app/dialogs/preferences-dialog.c:1634 msgid "Set layer or path as active" msgstr "اجعل الطبقة أو المسار نشطا" -#: ../app/dialogs/preferences-dialog.c:1391 +#: ../app/dialogs/preferences-dialog.c:1647 msgid "Default New Image" msgstr "الصورة الجديدة المبدئية" -#: ../app/dialogs/preferences-dialog.c:1392 +#: ../app/dialogs/preferences-dialog.c:1648 msgid "Default Image" msgstr "الصورة المبدئية" -#: ../app/dialogs/preferences-dialog.c:1428 +#: ../app/dialogs/preferences-dialog.c:1684 msgid "Quick Mask color:" msgstr "لون القناع السريع:" -#: ../app/dialogs/preferences-dialog.c:1429 +#: ../app/dialogs/preferences-dialog.c:1685 msgid "Set the default Quick Mask color" msgstr "حدد اللون المبدئي للقناع السريع" -#: ../app/dialogs/preferences-dialog.c:1439 +#: ../app/dialogs/preferences-dialog.c:1695 msgid "Default Image Grid" msgstr "شبكة الصورة المبدئية" -#: ../app/dialogs/preferences-dialog.c:1440 +#: ../app/dialogs/preferences-dialog.c:1696 msgid "Default Grid" msgstr "الشبكة المبدئية" -#: ../app/dialogs/preferences-dialog.c:1459 +#: ../app/dialogs/preferences-dialog.c:1715 msgid "User Interface" msgstr "واجهة المستخدم" -#: ../app/dialogs/preferences-dialog.c:1460 +#: ../app/dialogs/preferences-dialog.c:1716 msgid "Interface" msgstr "الواجهة" -#: ../app/dialogs/preferences-dialog.c:1469 ../app/tools/gimptextoptions.c:167 +#: ../app/dialogs/preferences-dialog.c:1725 ../app/tools/gimptextoptions.c:151 msgid "Language" msgstr "اللغة" #. Previews -#: ../app/dialogs/preferences-dialog.c:1475 +#: ../app/dialogs/preferences-dialog.c:1731 msgid "Previews" msgstr "معاينات" -#: ../app/dialogs/preferences-dialog.c:1478 +#: ../app/dialogs/preferences-dialog.c:1734 msgid "_Enable layer & channel previews" msgstr "فعّل _معاينات الطبقات والقنوات" -#: ../app/dialogs/preferences-dialog.c:1484 +#: ../app/dialogs/preferences-dialog.c:1740 msgid "_Default layer & channel preview size:" msgstr "حجم معاينة الطبقات والقنوات الا_فتراضي:" -#: ../app/dialogs/preferences-dialog.c:1487 +#: ../app/dialogs/preferences-dialog.c:1743 #, fuzzy msgid "_Undo preview size:" msgstr "حجم معاينة الإب_حار:" -#: ../app/dialogs/preferences-dialog.c:1490 +#: ../app/dialogs/preferences-dialog.c:1746 msgid "Na_vigation preview size:" msgstr "حجم معاينة الإب_حار:" #. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1494 +#: ../app/dialogs/preferences-dialog.c:1750 msgid "Keyboard Shortcuts" msgstr "اختصارات لوحة المفاتيح" -#: ../app/dialogs/preferences-dialog.c:1498 +#: ../app/dialogs/preferences-dialog.c:1754 msgid "_Use dynamic keyboard shortcuts" msgstr "استخدم اختصارات لوحة مفاتيح _دينامية" -#: ../app/dialogs/preferences-dialog.c:1502 +#: ../app/dialogs/preferences-dialog.c:1758 msgid "Configure _Keyboard Shortcuts..." msgstr "اضبط اختصارات لوحة الم_فاتيح..." -#: ../app/dialogs/preferences-dialog.c:1509 +#: ../app/dialogs/preferences-dialog.c:1765 msgid "_Save keyboard shortcuts on exit" msgstr "احفظ اختصارات لوحة المفاتيح عند الخروج" -#: ../app/dialogs/preferences-dialog.c:1513 +#: ../app/dialogs/preferences-dialog.c:1769 msgid "Save Keyboard Shortcuts _Now" msgstr "احفظ اختصارات لوحة المفاتيح الآ_ن" -#: ../app/dialogs/preferences-dialog.c:1520 +#: ../app/dialogs/preferences-dialog.c:1776 msgid "_Reset Keyboard Shortcuts to Default Values" msgstr "_صفّر اختصارات لوحة المفاتيح إلى القيم المبدئية." -#: ../app/dialogs/preferences-dialog.c:1529 +#: ../app/dialogs/preferences-dialog.c:1785 msgid "Remove _All Keyboard Shortcuts" msgstr "أزل _كل اختصارات لوحة المفاتيح" -#: ../app/dialogs/preferences-dialog.c:1541 -#: ../app/dialogs/preferences-dialog.c:1542 -#: ../app/dialogs/preferences-dialog.c:1577 +#: ../app/dialogs/preferences-dialog.c:1797 +#: ../app/dialogs/preferences-dialog.c:1798 +#: ../app/dialogs/preferences-dialog.c:1833 msgid "Theme" msgstr "السمة" -#: ../app/dialogs/preferences-dialog.c:1547 +#: ../app/dialogs/preferences-dialog.c:1803 msgid "Select Theme" msgstr "اختر سمة" -#: ../app/dialogs/preferences-dialog.c:1629 +#: ../app/dialogs/preferences-dialog.c:1885 msgid "Reload C_urrent Theme" msgstr "أعد تحميل السمة ال_حالية" -#: ../app/dialogs/preferences-dialog.c:1641 -#: ../app/dialogs/preferences-dialog.c:1642 -#: ../app/dialogs/preferences-dialog.c:1682 +#: ../app/dialogs/preferences-dialog.c:1897 +#: ../app/dialogs/preferences-dialog.c:1898 +#: ../app/dialogs/preferences-dialog.c:1939 msgid "Icon Theme" msgstr "سمة الأيقونات" -#: ../app/dialogs/preferences-dialog.c:1647 +#: ../app/dialogs/preferences-dialog.c:1903 msgid "Select an Icon Theme" msgstr "اختر سمة الأيقونات" #. Appearance -#: ../app/dialogs/preferences-dialog.c:1767 -#: ../app/dialogs/preferences-dialog.c:2453 ../app/widgets/gimpgrideditor.c:134 +#: ../app/dialogs/preferences-dialog.c:2027 +#: ../app/dialogs/preferences-dialog.c:2779 ../app/widgets/gimpgrideditor.c:134 msgid "Appearance" msgstr "المظهر" -#: ../app/dialogs/preferences-dialog.c:1771 +#: ../app/dialogs/preferences-dialog.c:2031 +msgid "Show GIMP _logo (drag-and-drop target)" +msgstr "" + +#: ../app/dialogs/preferences-dialog.c:2035 msgid "Show _foreground & background color" msgstr "أظهر لون المقدمة والخلفية" -#: ../app/dialogs/preferences-dialog.c:1775 +#: ../app/dialogs/preferences-dialog.c:2039 msgid "Show active _brush, pattern & gradient" msgstr "أظهر الفرشاة وال_نمط والتدرّج النشط" -#: ../app/dialogs/preferences-dialog.c:1779 +#: ../app/dialogs/preferences-dialog.c:2043 msgid "Show active _image" msgstr "أظهر ال_صورة النشطة" #. Tool Editor -#: ../app/dialogs/preferences-dialog.c:1787 +#: ../app/dialogs/preferences-dialog.c:2051 msgid "Tools Configuration" msgstr "ضبط الأداة" -#: ../app/dialogs/preferences-dialog.c:1803 -#: ../app/dialogs/preferences-dialog.c:1804 +#: ../app/dialogs/preferences-dialog.c:2067 +#: ../app/dialogs/preferences-dialog.c:2068 #, fuzzy msgid "Dialog Defaults" msgstr "قائمة الحوارات" -#: ../app/dialogs/preferences-dialog.c:1813 +#: ../app/dialogs/preferences-dialog.c:2077 #, fuzzy msgid "Reset Dialog Defaults" msgstr "استعد القيم المبدئية" #. Color profile import dialog -#: ../app/dialogs/preferences-dialog.c:1821 +#: ../app/dialogs/preferences-dialog.c:2085 #, fuzzy msgid "Color Profile Import Dialog" msgstr "تحويل لاحة الألوان" -#: ../app/dialogs/preferences-dialog.c:1826 +#. All color profile chooser dialogs +#: ../app/dialogs/preferences-dialog.c:2094 #, fuzzy -msgid "Color profile policy:" +msgid "Color Profile File Dialogs" msgstr "تحويل لاحة الألوان" +#: ../app/dialogs/preferences-dialog.c:2099 +#, fuzzy +msgid "Profile folder:" +msgstr "تفاصيل اللا_حة" + +#: ../app/dialogs/preferences-dialog.c:2100 +#, fuzzy +msgid "Select Default Folder for Color Profiles" +msgstr "اختر مجلدا للملفات المؤقتة" + #. Convert to Color Profile Dialog -#: ../app/dialogs/preferences-dialog.c:1830 +#: ../app/dialogs/preferences-dialog.c:2104 #, fuzzy msgid "Convert to Color Profile Dialog" msgstr "حوّل إلى لاحة ألوان ICC" -#: ../app/dialogs/preferences-dialog.c:1835 +#: ../app/dialogs/preferences-dialog.c:2109 #, fuzzy msgid "Rendering intent:" msgstr "_هدف التصيير:" -#: ../app/dialogs/preferences-dialog.c:1839 +#: ../app/dialogs/preferences-dialog.c:2113 #, fuzzy msgid "Black point compensation" msgstr "تعويض النق_طة السوداء" #. Convert Precision Dialog -#: ../app/dialogs/preferences-dialog.c:1843 +#: ../app/dialogs/preferences-dialog.c:2117 #, fuzzy msgid "Precision Conversion Dialog" msgstr "تحويل دقيق" -#: ../app/dialogs/preferences-dialog.c:1850 +#: ../app/dialogs/preferences-dialog.c:2124 #, fuzzy msgid "Dither layers:" msgstr "أفلت الطبقات" -#: ../app/dialogs/preferences-dialog.c:1855 +#: ../app/dialogs/preferences-dialog.c:2129 #, fuzzy msgid "Dither text layers:" msgstr "غيّر حجم الطبقات ال_نصية" -#: ../app/dialogs/preferences-dialog.c:1860 +#: ../app/dialogs/preferences-dialog.c:2134 #, fuzzy msgid "Dither channels/masks:" msgstr "احذف القناة" #. Convert Indexed Dialog -#: ../app/dialogs/preferences-dialog.c:1864 +#: ../app/dialogs/preferences-dialog.c:2138 #, fuzzy msgid "Indexed Conversion Dialog" msgstr "تحويل لون مفهرس" -#: ../app/dialogs/preferences-dialog.c:1869 +#: ../app/dialogs/preferences-dialog.c:2143 #, fuzzy msgid "Colormap:" msgstr "مخطط الألوان" -#: ../app/dialogs/preferences-dialog.c:1872 +#: ../app/dialogs/preferences-dialog.c:2146 #, fuzzy msgid "Maximum number of colors:" msgstr "أ_كبر عدد من الألوان:" -#: ../app/dialogs/preferences-dialog.c:1876 +#: ../app/dialogs/preferences-dialog.c:2150 #, fuzzy msgid "Remove unused and duplicate colors from colormap" msgstr "أ_زل الألوان غير المستخدمة من مخطط الألوان" -#: ../app/dialogs/preferences-dialog.c:1882 +#: ../app/dialogs/preferences-dialog.c:2156 #, fuzzy msgid "Color dithering:" msgstr "إر_جاف الألوان:" -#: ../app/dialogs/preferences-dialog.c:1886 +#: ../app/dialogs/preferences-dialog.c:2160 #, fuzzy msgid "Enable dithering of transparency" msgstr "فعّل إرجاف ال_شفافية" #. Canvas Size Dialog -#: ../app/dialogs/preferences-dialog.c:1893 +#: ../app/dialogs/preferences-dialog.c:2167 #, fuzzy msgid "Canvas Size Dialog" msgstr "حجم رقعة الرسم" -#: ../app/dialogs/preferences-dialog.c:1898 -#: ../app/dialogs/preferences-dialog.c:1927 +#: ../app/dialogs/preferences-dialog.c:2172 +#: ../app/dialogs/preferences-dialog.c:2201 #, fuzzy msgid "Fill with:" msgstr "ا_ملأ بـ:" -#: ../app/dialogs/preferences-dialog.c:1901 +#: ../app/dialogs/preferences-dialog.c:2175 #, fuzzy msgid "Resize layers:" msgstr "غيّر حجم ال_طبقات:" -#: ../app/dialogs/preferences-dialog.c:1905 +#: ../app/dialogs/preferences-dialog.c:2179 #, fuzzy msgid "Resize text layers" msgstr "غيّر حجم الطبقات ال_نصية" #. New Layer Dialog -#: ../app/dialogs/preferences-dialog.c:1909 +#: ../app/dialogs/preferences-dialog.c:2183 #, fuzzy msgid "New Layer Dialog" msgstr "طبقة جديدة" -#: ../app/dialogs/preferences-dialog.c:1914 +#: ../app/dialogs/preferences-dialog.c:2188 #, fuzzy msgid "Layer name:" msgstr "ا_سم الطبقة:" -#: ../app/dialogs/preferences-dialog.c:1918 +#: ../app/dialogs/preferences-dialog.c:2192 #, fuzzy msgid "Fill type:" msgstr "نوع الملف:" #. Layer Boundary Size Dialog -#: ../app/dialogs/preferences-dialog.c:1922 +#: ../app/dialogs/preferences-dialog.c:2196 #, fuzzy msgid "Layer Boundary Size Dialog" msgstr "حدد حجم حد الطبقة" #. Add Layer Mask Dialog -#: ../app/dialogs/preferences-dialog.c:1931 +#: ../app/dialogs/preferences-dialog.c:2205 #, fuzzy msgid "Add Layer Mask Dialog" msgstr "أضِف قناع طبقة" -#: ../app/dialogs/preferences-dialog.c:1936 +#: ../app/dialogs/preferences-dialog.c:2210 #, fuzzy msgid "Layer mask type:" msgstr "نوع ملء الطبقة" -#: ../app/dialogs/preferences-dialog.c:1940 +#: ../app/dialogs/preferences-dialog.c:2214 #, fuzzy msgid "Invert mask" msgstr "اق_لب القناع" #. Merge Layers Dialog -#: ../app/dialogs/preferences-dialog.c:1944 +#: ../app/dialogs/preferences-dialog.c:2218 #, fuzzy msgid "Merge Layers Dialog" msgstr "ادمج الطبقات" -#: ../app/dialogs/preferences-dialog.c:1951 +#: ../app/dialogs/preferences-dialog.c:2225 #, fuzzy msgid "Merged layer size:" msgstr "ادمج الطبقات" -#: ../app/dialogs/preferences-dialog.c:1955 +#: ../app/dialogs/preferences-dialog.c:2229 #, fuzzy msgid "Merge within active group only" msgstr "ادمج داخل المجمو_عة النشطة فقط" -#: ../app/dialogs/preferences-dialog.c:1958 +#: ../app/dialogs/preferences-dialog.c:2232 #, fuzzy msgid "Discard invisible layers" msgstr "_تجاهل الطبقات غير المرئية" #. New Channel Dialog -#: ../app/dialogs/preferences-dialog.c:1962 +#: ../app/dialogs/preferences-dialog.c:2236 #, fuzzy msgid "New Channel Dialog" msgstr "لون القناة الجديدة" -#: ../app/dialogs/preferences-dialog.c:1967 +#: ../app/dialogs/preferences-dialog.c:2241 #, fuzzy msgid "Channel name:" msgstr "ا_سم القناة:" -#: ../app/dialogs/preferences-dialog.c:1971 +#: ../app/dialogs/preferences-dialog.c:2245 #, fuzzy msgid "Color and opacity:" msgstr "مساحة الألوان:" -#: ../app/dialogs/preferences-dialog.c:1972 +#: ../app/dialogs/preferences-dialog.c:2246 #, fuzzy msgid "Default New Channel Color and Opacity" msgstr "حرر اسم القناة ولونها وعتامتها" #. New Path Dialog -#: ../app/dialogs/preferences-dialog.c:1977 +#: ../app/dialogs/preferences-dialog.c:2251 #, fuzzy msgid "New Path Dialog" msgstr "خيارات المسار الجديد" -#: ../app/dialogs/preferences-dialog.c:1982 +#: ../app/dialogs/preferences-dialog.c:2256 msgid "Path name:" msgstr "اسم المسار:" #. Export Path Dialog -#: ../app/dialogs/preferences-dialog.c:1986 +#: ../app/dialogs/preferences-dialog.c:2260 #, fuzzy msgid "Export Paths Dialog" msgstr "صدّر المسار إلى إس.ڤي.جي" -#: ../app/dialogs/preferences-dialog.c:1991 +#: ../app/dialogs/preferences-dialog.c:2265 #, fuzzy msgid "Export folder:" msgstr "المجلد المؤقت:" -#: ../app/dialogs/preferences-dialog.c:1992 +#: ../app/dialogs/preferences-dialog.c:2266 #, fuzzy msgid "Select Default Folder for Exporting Paths" msgstr "اختر مجلدا للملفات المؤقتة" -#: ../app/dialogs/preferences-dialog.c:1996 +#: ../app/dialogs/preferences-dialog.c:2270 #, fuzzy msgid "Export the active path only" msgstr "صدّر المسار النشط" #. Import Path Dialog -#: ../app/dialogs/preferences-dialog.c:2000 +#: ../app/dialogs/preferences-dialog.c:2274 #, fuzzy msgid "Import Paths Dialog" msgstr "استورد المسارات" -#: ../app/dialogs/preferences-dialog.c:2005 +#: ../app/dialogs/preferences-dialog.c:2279 #, fuzzy msgid "Import folder:" msgstr "المجلد المؤقت:" -#: ../app/dialogs/preferences-dialog.c:2006 +#: ../app/dialogs/preferences-dialog.c:2280 #, fuzzy msgid "Select Default Folder for Importing Paths" msgstr "اختر مجلدا للملفات المؤقتة" -#: ../app/dialogs/preferences-dialog.c:2010 +#: ../app/dialogs/preferences-dialog.c:2284 #, fuzzy msgid "Merge imported paths" msgstr "ا_دمج المسارات المستوردة" -#: ../app/dialogs/preferences-dialog.c:2013 +#: ../app/dialogs/preferences-dialog.c:2287 #, fuzzy msgid "Scale imported paths" msgstr "ا_دمج المسارات المستوردة" #. Feather Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2017 +#: ../app/dialogs/preferences-dialog.c:2291 #, fuzzy msgid "Feather Selection Dialog" msgstr "نعّم التحديد" -#: ../app/dialogs/preferences-dialog.c:2022 +#: ../app/dialogs/preferences-dialog.c:2296 #, fuzzy msgid "Feather radius:" msgstr "نعّم الحواف" #. Grow Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2026 +#: ../app/dialogs/preferences-dialog.c:2300 #, fuzzy msgid "Grow Selection Dialog" msgstr "أنمِ التحديد" -#: ../app/dialogs/preferences-dialog.c:2031 +#: ../app/dialogs/preferences-dialog.c:2305 #, fuzzy msgid "Grow radius:" msgstr "أنْمِ المنطقة" #. Shrink Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2035 +#: ../app/dialogs/preferences-dialog.c:2309 #, fuzzy msgid "Shrink Selection Dialog" msgstr "قلّص التحديد" -#: ../app/dialogs/preferences-dialog.c:2040 +#: ../app/dialogs/preferences-dialog.c:2314 #, fuzzy msgid "Shrink radius:" msgstr "_قلّص المنطقة" -#: ../app/dialogs/preferences-dialog.c:2044 -#: ../app/dialogs/preferences-dialog.c:2061 +#: ../app/dialogs/preferences-dialog.c:2318 +#: ../app/dialogs/preferences-dialog.c:2335 #, fuzzy msgid "Selected areas continue outside the image" msgstr "المنطقة المختارة _تمتد خارج الصورة" #. Border Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2048 +#: ../app/dialogs/preferences-dialog.c:2322 #, fuzzy msgid "Border Selection Dialog" msgstr "حدد التحديد" -#: ../app/dialogs/preferences-dialog.c:2053 +#: ../app/dialogs/preferences-dialog.c:2327 #, fuzzy msgid "Border radius:" msgstr "نصف قطر الفرشاة" -#: ../app/dialogs/preferences-dialog.c:2057 +#: ../app/dialogs/preferences-dialog.c:2331 #, fuzzy msgid "Border style:" msgstr "أسلوب الو_صل:" #. Fill Options Dialog -#: ../app/dialogs/preferences-dialog.c:2065 +#: ../app/dialogs/preferences-dialog.c:2339 msgid "Fill Selection Outline & Fill Path Dialogs" msgstr "" #. Stroke Options Dialog -#: ../app/dialogs/preferences-dialog.c:2074 +#: ../app/dialogs/preferences-dialog.c:2348 #, fuzzy msgid "Stroke Selection & Stroke Path Dialogs" msgstr "التحديد إلى الم_سار" -#: ../app/dialogs/preferences-dialog.c:2090 -#: ../app/dialogs/preferences-dialog.c:2091 +#: ../app/dialogs/preferences-dialog.c:2371 +#: ../app/dialogs/preferences-dialog.c:2372 msgid "Help System" msgstr "نظام المساعدة" -#: ../app/dialogs/preferences-dialog.c:2102 +#: ../app/dialogs/preferences-dialog.c:2383 msgid "Show _tooltips" msgstr "اعرض تلمي_حات الأدوات" -#: ../app/dialogs/preferences-dialog.c:2105 +#: ../app/dialogs/preferences-dialog.c:2386 msgid "Show help _buttons" msgstr "أظهر أزرار ال_مساعدة" -#: ../app/dialogs/preferences-dialog.c:2110 +#: ../app/dialogs/preferences-dialog.c:2391 msgid "Use the online version" msgstr "استخدم نسخة الإنترنت" -#: ../app/dialogs/preferences-dialog.c:2111 +#: ../app/dialogs/preferences-dialog.c:2392 msgid "Use a locally installed copy" msgstr "استخدم النسخة المثبتة محليا" -#: ../app/dialogs/preferences-dialog.c:2112 +#: ../app/dialogs/preferences-dialog.c:2393 msgid "User manual:" msgstr "دليل المستخدم:" -#: ../app/dialogs/preferences-dialog.c:2119 -msgid "There's a local installation of the user manual." -msgstr "يوجد نسخة محلية من دليل المستخدم." - -#: ../app/dialogs/preferences-dialog.c:2125 -msgid "The user manual is not installed locally." -msgstr "دليل المستخدم ليس مثبتا محليا." +#: ../app/dialogs/preferences-dialog.c:2404 +#, fuzzy +msgid "User interface language" +msgstr "واجهة المستخدم" #. If there is no webkit available, assume we are on a platform #. * that doesn't use the help browser, so don't bother showing #. * the combo. #. -#: ../app/dialogs/preferences-dialog.c:2138 +#: ../app/dialogs/preferences-dialog.c:2463 msgid "Help Browser" msgstr "متصفح المساعدة" -#: ../app/dialogs/preferences-dialog.c:2145 +#: ../app/dialogs/preferences-dialog.c:2470 msgid "H_elp browser to use:" msgstr "متصفح المساعدة الم_ستخدم:" -#: ../app/dialogs/preferences-dialog.c:2151 +#: ../app/dialogs/preferences-dialog.c:2476 msgid "" "The GIMP help browser doesn't seem to be installed. Using the web browser " "instead." msgstr "" #. Action Search -#: ../app/dialogs/preferences-dialog.c:2168 +#: ../app/dialogs/preferences-dialog.c:2493 msgid "Action Search" msgstr "ابحث في الإجراءات" -#: ../app/dialogs/preferences-dialog.c:2172 +#: ../app/dialogs/preferences-dialog.c:2497 msgid "Show _unavailable actions" msgstr "أظهر الإجراءات غير ال_متاحة" -#: ../app/dialogs/preferences-dialog.c:2175 +#: ../app/dialogs/preferences-dialog.c:2500 msgid "Maximum History Size:" msgstr "أقصى حجم للتأريخ:" -#: ../app/dialogs/preferences-dialog.c:2179 +#: ../app/dialogs/preferences-dialog.c:2504 msgid "Clear Action History" msgstr "امسح تأريخ الإجراءات" -#: ../app/dialogs/preferences-dialog.c:2194 -#: ../app/dialogs/preferences-dialog.c:2195 +#: ../app/dialogs/preferences-dialog.c:2519 +#: ../app/dialogs/preferences-dialog.c:2520 msgid "Display" msgstr "العرض" #. Transparency -#: ../app/dialogs/preferences-dialog.c:2203 +#: ../app/dialogs/preferences-dialog.c:2528 msgid "Transparency" msgstr "الشفافية" -#: ../app/dialogs/preferences-dialog.c:2207 +#: ../app/dialogs/preferences-dialog.c:2532 msgid "_Check style:" msgstr "أسلوب المرب_عات:" -#: ../app/dialogs/preferences-dialog.c:2210 +#: ../app/dialogs/preferences-dialog.c:2535 msgid "Check _size:" msgstr "_حجم المربعات:" -#: ../app/dialogs/preferences-dialog.c:2213 +#: ../app/dialogs/preferences-dialog.c:2538 msgid "Monitor Resolution" msgstr "ميْز الشاشة" #. Pixels -#: ../app/dialogs/preferences-dialog.c:2217 ../app/display/gimpcursorview.c:210 -#: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:231 +#: ../app/dialogs/preferences-dialog.c:2542 ../app/display/gimpcursorview.c:215 +#: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:234 msgid "Pixels" msgstr "بكسلات" -#: ../app/dialogs/preferences-dialog.c:2235 +#: ../app/dialogs/preferences-dialog.c:2560 ../app/widgets/gimpgrideditor.c:195 +#: ../app/widgets/gimpgrideditor.c:230 msgid "Horizontal" msgstr "أفقي" -#: ../app/dialogs/preferences-dialog.c:2237 +#: ../app/dialogs/preferences-dialog.c:2562 ../app/widgets/gimpgrideditor.c:197 +#: ../app/widgets/gimpgrideditor.c:232 msgid "Vertical" msgstr "رأسي" -#: ../app/dialogs/preferences-dialog.c:2239 -#: ../app/widgets/gimpimagepropview.c:459 +#: ../app/dialogs/preferences-dialog.c:2564 +#: ../app/widgets/gimpimagepropview.c:457 msgid "ppi" msgstr "نقطة في البوصة" -#: ../app/dialogs/preferences-dialog.c:2257 +#: ../app/dialogs/preferences-dialog.c:2583 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "ا_كتشف آليا (حاليا %Id × %Id بكسل في البوصة)" -#: ../app/dialogs/preferences-dialog.c:2275 +#: ../app/dialogs/preferences-dialog.c:2601 msgid "_Enter manually" msgstr "أ_دخل يدويا" -#: ../app/dialogs/preferences-dialog.c:2290 +#: ../app/dialogs/preferences-dialog.c:2616 msgid "C_alibrate..." msgstr "عايِر..." -#: ../app/dialogs/preferences-dialog.c:2318 -#: ../app/dialogs/preferences-dialog.c:2319 +#: ../app/dialogs/preferences-dialog.c:2644 +#: ../app/dialogs/preferences-dialog.c:2645 msgid "Window Management" msgstr "إدارة النوافذ" -#: ../app/dialogs/preferences-dialog.c:2324 +#: ../app/dialogs/preferences-dialog.c:2650 msgid "Window Manager Hints" msgstr "تلميحات مدير النوافذ" -#: ../app/dialogs/preferences-dialog.c:2330 +#: ../app/dialogs/preferences-dialog.c:2656 msgid "Hint for _docks and toolbox:" msgstr "تلميحة الأرصفة و _صندوق الأدوات:" -#: ../app/dialogs/preferences-dialog.c:2333 +#: ../app/dialogs/preferences-dialog.c:2659 msgid "Focus" msgstr "البؤرة" -#: ../app/dialogs/preferences-dialog.c:2337 +#: ../app/dialogs/preferences-dialog.c:2663 msgid "Activate the _focused image" msgstr "نشّط الصورة التي في ال_بؤرة" #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2341 +#: ../app/dialogs/preferences-dialog.c:2667 msgid "Window Positions" msgstr "مواضع النوافذ" -#: ../app/dialogs/preferences-dialog.c:2344 +#: ../app/dialogs/preferences-dialog.c:2670 msgid "_Save window positions on exit" msgstr "ا_حفظ مواضع النوافذ عند الخروج" -#: ../app/dialogs/preferences-dialog.c:2347 +#: ../app/dialogs/preferences-dialog.c:2673 msgid "Open windows on the same _monitor they were open before" msgstr "افتح ال_نوافذ في نفس الشاشة التي فتحوا فيها من قبل" -#: ../app/dialogs/preferences-dialog.c:2351 +#: ../app/dialogs/preferences-dialog.c:2677 msgid "Save Window Positions _Now" msgstr "احفظ مواضع النوافذ الآ_ن" -#: ../app/dialogs/preferences-dialog.c:2358 +#: ../app/dialogs/preferences-dialog.c:2684 msgid "_Reset Saved Window Positions to Default Values" msgstr "صفّر مواضع النوافذ المحفوظة إلى القيم المبدئية" -#: ../app/dialogs/preferences-dialog.c:2373 -#: ../app/dialogs/preferences-dialog.c:2374 +#: ../app/dialogs/preferences-dialog.c:2699 +#: ../app/dialogs/preferences-dialog.c:2700 msgid "Image Windows" msgstr "نوافذ الصور" -#: ../app/dialogs/preferences-dialog.c:2385 +#: ../app/dialogs/preferences-dialog.c:2711 msgid "Use \"_Dot for dot\" by default" msgstr "استخدم \"نقطة لنقطة\" مبدئيا" -#: ../app/dialogs/preferences-dialog.c:2391 +#: ../app/dialogs/preferences-dialog.c:2717 msgid "Marching _ants speed:" msgstr "سرعة ال_نمل الزاحف:" #. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2395 +#: ../app/dialogs/preferences-dialog.c:2721 msgid "Zoom & Resize Behavior" msgstr "سلوك التقريب والتحجيم" -#: ../app/dialogs/preferences-dialog.c:2399 +#: ../app/dialogs/preferences-dialog.c:2725 msgid "Resize window on _zoom" msgstr "غيّر حجم النافذة عند الت_قريب" -#: ../app/dialogs/preferences-dialog.c:2402 +#: ../app/dialogs/preferences-dialog.c:2728 msgid "Resize window on image _size change" msgstr "غيّر حجم النافذة عند تغيير _حجم الصورة" -#: ../app/dialogs/preferences-dialog.c:2408 +#: ../app/dialogs/preferences-dialog.c:2734 msgid "Show entire image" msgstr "أظهر كل الصورة" -#: ../app/dialogs/preferences-dialog.c:2410 +#: ../app/dialogs/preferences-dialog.c:2736 msgid "Initial zoom _ratio:" msgstr "نسبة التقريب الابتدائية:" #. Space Bar -#: ../app/dialogs/preferences-dialog.c:2414 +#: ../app/dialogs/preferences-dialog.c:2740 msgid "Space Bar" msgstr "مسطرة المسافات" -#: ../app/dialogs/preferences-dialog.c:2420 +#: ../app/dialogs/preferences-dialog.c:2746 msgid "_While space bar is pressed:" msgstr "_بينما مسطرة المسافات مضغوطة:" #. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2424 +#: ../app/dialogs/preferences-dialog.c:2750 msgid "Mouse Pointers" msgstr "مؤشرات الفأرة" -#: ../app/dialogs/preferences-dialog.c:2428 +#: ../app/dialogs/preferences-dialog.c:2754 msgid "Show _brush outline" msgstr "أظهر _حدود الفرشاة الخارجية" -#: ../app/dialogs/preferences-dialog.c:2431 +#: ../app/dialogs/preferences-dialog.c:2757 msgid "Show pointer for paint _tools" msgstr "اعرض المؤشر لأ_داة الرسم" -#: ../app/dialogs/preferences-dialog.c:2437 +#: ../app/dialogs/preferences-dialog.c:2763 msgid "Pointer _mode:" msgstr "_طور المؤشر:" -#: ../app/dialogs/preferences-dialog.c:2440 +#: ../app/dialogs/preferences-dialog.c:2766 msgid "Pointer _handedness:" msgstr "اليد المستخدمة للمؤ_شر:" -#: ../app/dialogs/preferences-dialog.c:2452 +#: ../app/dialogs/preferences-dialog.c:2778 msgid "Image Window Appearance" msgstr "مظهر نافذة الصورة" -#: ../app/dialogs/preferences-dialog.c:2460 +#: ../app/dialogs/preferences-dialog.c:2786 msgid "Default Appearance in Normal Mode" msgstr "المظهر المبدئي في الطور العادي" -#: ../app/dialogs/preferences-dialog.c:2465 +#: ../app/dialogs/preferences-dialog.c:2791 msgid "Default Appearance in Fullscreen Mode" msgstr "المظهر المبدئي في طور ملء الشاشة" -#: ../app/dialogs/preferences-dialog.c:2474 +#: ../app/dialogs/preferences-dialog.c:2800 msgid "Image Title & Statusbar Format" msgstr "عنوان الصورة وصيغة شريط الحالة" -#: ../app/dialogs/preferences-dialog.c:2475 +#: ../app/dialogs/preferences-dialog.c:2801 msgid "Title & Status" msgstr "العنوان والحالة" -#: ../app/dialogs/preferences-dialog.c:2493 +#: ../app/dialogs/preferences-dialog.c:2819 msgid "Current format" msgstr "النسق الحالي" -#: ../app/dialogs/preferences-dialog.c:2494 +#: ../app/dialogs/preferences-dialog.c:2820 msgid "Default format" msgstr "النسق المبدئي" -#: ../app/dialogs/preferences-dialog.c:2495 +#: ../app/dialogs/preferences-dialog.c:2821 msgid "Show zoom percentage" msgstr "أظهر نسبة التقريب المئوية" -#: ../app/dialogs/preferences-dialog.c:2496 +#: ../app/dialogs/preferences-dialog.c:2822 msgid "Show zoom ratio" msgstr "أظهر نسبة التقريب" -#: ../app/dialogs/preferences-dialog.c:2497 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Show image size" msgstr "أظهر حجم الصورة" -#: ../app/dialogs/preferences-dialog.c:2498 +#: ../app/dialogs/preferences-dialog.c:2824 msgid "Show drawable size" -msgstr "أظهر حجم القابل للرسم" +msgstr "أظهر حجم عنصر الرسم" -#: ../app/dialogs/preferences-dialog.c:2511 +#: ../app/dialogs/preferences-dialog.c:2837 msgid "Image Title Format" msgstr "نسق عنوان الصورة" -#: ../app/dialogs/preferences-dialog.c:2513 +#: ../app/dialogs/preferences-dialog.c:2839 msgid "Image Statusbar Format" msgstr "نسق شريط حالة الصورة" -#: ../app/dialogs/preferences-dialog.c:2597 +#: ../app/dialogs/preferences-dialog.c:2923 msgid "Image Window Snapping Behavior" msgstr "سلوك اتباع نافذة الصورة" -#: ../app/dialogs/preferences-dialog.c:2598 +#: ../app/dialogs/preferences-dialog.c:2924 msgid "Snapping" msgstr "الاتباع" -#: ../app/dialogs/preferences-dialog.c:2605 +#: ../app/dialogs/preferences-dialog.c:2931 msgid "Default Behavior in Normal Mode" msgstr "السلوك المبدئي في الطور العادي" -#: ../app/dialogs/preferences-dialog.c:2609 +#: ../app/dialogs/preferences-dialog.c:2935 msgid "Default Behavior in Fullscreen Mode" msgstr "السلوك المبدئي في طور ملء الشاشة" -#: ../app/dialogs/preferences-dialog.c:2618 +#: ../app/dialogs/preferences-dialog.c:2944 msgid "_Snapping distance:" msgstr "_مسافة الاتباع:" -#: ../app/dialogs/preferences-dialog.c:2627 -#: ../app/dialogs/preferences-dialog.c:2628 +#: ../app/dialogs/preferences-dialog.c:2953 +#: ../app/dialogs/preferences-dialog.c:2954 msgid "Input Devices" msgstr "أجهزة الإدخال" #. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2634 +#: ../app/dialogs/preferences-dialog.c:2960 msgid "Extended Input Devices" msgstr "أجهزة إدخال ممتدة" -#: ../app/dialogs/preferences-dialog.c:2638 +#: ../app/dialogs/preferences-dialog.c:2964 #, fuzzy msgid "S_hare tool and tool options between input devices" msgstr "احفظ خيارات الأدوات عند إغلاق جمب." -#: ../app/dialogs/preferences-dialog.c:2642 +#: ../app/dialogs/preferences-dialog.c:2968 msgid "Configure E_xtended Input Devices..." msgstr "اضبط أجهزة الإدخال ال_ممتدة..." -#: ../app/dialogs/preferences-dialog.c:2649 +#: ../app/dialogs/preferences-dialog.c:2975 msgid "_Save input device settings on exit" msgstr "ا_حفظ إعدادات جهاز الإدخال عند الخروج" -#: ../app/dialogs/preferences-dialog.c:2653 +#: ../app/dialogs/preferences-dialog.c:2979 msgid "Save Input Device Settings _Now" msgstr "احفظ إعدادات جهاز الإدخال ال_آن" -#: ../app/dialogs/preferences-dialog.c:2660 +#: ../app/dialogs/preferences-dialog.c:2986 msgid "_Reset Saved Input Device Settings to Default Values" msgstr "صفّر إعدادات جهاز الدخل المحفوظة إلى القيم المبدئية" -#: ../app/dialogs/preferences-dialog.c:2675 +#: ../app/dialogs/preferences-dialog.c:3001 msgid "Additional Input Controllers" msgstr "متحكمات إدخال إضافية" -#: ../app/dialogs/preferences-dialog.c:2676 +#: ../app/dialogs/preferences-dialog.c:3002 msgid "Input Controllers" msgstr "متحكمات الإدخال" -#: ../app/dialogs/preferences-dialog.c:2691 -#: ../app/dialogs/preferences-dialog.c:2692 +#: ../app/dialogs/preferences-dialog.c:3017 +#: ../app/dialogs/preferences-dialog.c:3018 msgid "Folders" msgstr "المجلدات" -#: ../app/dialogs/preferences-dialog.c:2708 +#: ../app/dialogs/preferences-dialog.c:3034 msgid "Temporary folder:" msgstr "المجلد المؤقت:" -#: ../app/dialogs/preferences-dialog.c:2709 +#: ../app/dialogs/preferences-dialog.c:3035 msgid "Select Folder for Temporary Files" msgstr "اختر مجلدا للملفات المؤقتة" -#: ../app/dialogs/preferences-dialog.c:2713 +#: ../app/dialogs/preferences-dialog.c:3039 msgid "Swap folder:" msgstr "مجلد التبديل:" -#: ../app/dialogs/preferences-dialog.c:2714 +#: ../app/dialogs/preferences-dialog.c:3040 msgid "Select Swap Folder" msgstr "اختر مجلد التبديل:" -#: ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/preferences-dialog.c:3072 msgid "Brush Folders" msgstr "مجلدات الفرش" -#: ../app/dialogs/preferences-dialog.c:2748 +#: ../app/dialogs/preferences-dialog.c:3074 msgid "Select Brush Folders" msgstr "اختر مجلدات الفرش" -#: ../app/dialogs/preferences-dialog.c:2750 +#: ../app/dialogs/preferences-dialog.c:3076 msgid "Dynamics Folders" msgstr "مجلدات الحركيات" -#: ../app/dialogs/preferences-dialog.c:2752 +#: ../app/dialogs/preferences-dialog.c:3078 msgid "Select Dynamics Folders" msgstr "اختر مجلدات الحركيات" -#: ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/preferences-dialog.c:3080 msgid "Pattern Folders" msgstr "مجلدات الأنماط" -#: ../app/dialogs/preferences-dialog.c:2756 +#: ../app/dialogs/preferences-dialog.c:3082 msgid "Select Pattern Folders" msgstr "اختر مجلدات الأنماط" -#: ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/preferences-dialog.c:3084 msgid "Palette Folders" msgstr "مجلدات ألواح الألوان" -#: ../app/dialogs/preferences-dialog.c:2760 +#: ../app/dialogs/preferences-dialog.c:3086 msgid "Select Palette Folders" msgstr "اختر مجلدات ألواح الألوان" -#: ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/preferences-dialog.c:3088 msgid "Gradient Folders" msgstr "مجلدات التدرجات" -#: ../app/dialogs/preferences-dialog.c:2764 +#: ../app/dialogs/preferences-dialog.c:3090 msgid "Select Gradient Folders" msgstr "اختر مجلدات التدرجات" -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:3092 msgid "Font Folders" msgstr "مجلدات الخطوط" -#: ../app/dialogs/preferences-dialog.c:2768 +#: ../app/dialogs/preferences-dialog.c:3094 msgid "Select Font Folders" msgstr "اختر مجلدات الخطوط" -#: ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/preferences-dialog.c:3096 msgid "Tool Preset Folders" msgstr "مجلد محفوظات الخيارات" -#: ../app/dialogs/preferences-dialog.c:2772 +#: ../app/dialogs/preferences-dialog.c:3098 msgid "Select Tool Preset Folders" msgstr "اختر مجلد محفوظات الخيارات" -#: ../app/dialogs/preferences-dialog.c:2774 +#: ../app/dialogs/preferences-dialog.c:3100 msgid "MyPaint Brush Folders" msgstr "مجلدات فرش ماي پينت" -#: ../app/dialogs/preferences-dialog.c:2776 +#: ../app/dialogs/preferences-dialog.c:3102 msgid "Select MyPaint Brush Folders" msgstr "اختر مجلدات فرش ماي پينت" -#: ../app/dialogs/preferences-dialog.c:2778 -msgid "Plug-In Folders" +#: ../app/dialogs/preferences-dialog.c:3104 +#, fuzzy +msgid "Plug-in Folders" msgstr "مجلدات الملحقات" -#: ../app/dialogs/preferences-dialog.c:2780 -msgid "Select Plug-In Folders" +#: ../app/dialogs/preferences-dialog.c:3106 +#, fuzzy +msgid "Select plug-in Folders" msgstr "اختر مجلدات الملحقات" -#: ../app/dialogs/preferences-dialog.c:2782 +#: ../app/dialogs/preferences-dialog.c:3108 msgid "Scripts" msgstr "مخطوطات" -#: ../app/dialogs/preferences-dialog.c:2782 +#: ../app/dialogs/preferences-dialog.c:3108 msgid "Script-Fu Folders" msgstr "مجلدات المخطوطات" -#: ../app/dialogs/preferences-dialog.c:2784 +#: ../app/dialogs/preferences-dialog.c:3110 msgid "Select Script-Fu Folders" msgstr "اختر مجلدات المخطوطات" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:3112 msgid "Module Folders" msgstr "مجلدات الوحدات" -#: ../app/dialogs/preferences-dialog.c:2788 +#: ../app/dialogs/preferences-dialog.c:3114 msgid "Select Module Folders" msgstr "اختر مجلدات الوحدات" -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:3116 msgid "Interpreters" msgstr "المفسّرات" -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:3116 msgid "Interpreter Folders" msgstr "مجلدات المفسّرات" -#: ../app/dialogs/preferences-dialog.c:2792 +#: ../app/dialogs/preferences-dialog.c:3118 msgid "Select Interpreter Folders" msgstr "اختر مجلدات المفسّرات" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:3120 msgid "Environment" msgstr "البيئة" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:3120 msgid "Environment Folders" msgstr "مجلدات البيئة" -#: ../app/dialogs/preferences-dialog.c:2796 +#: ../app/dialogs/preferences-dialog.c:3122 msgid "Select Environment Folders" msgstr "اختر مجلدات البيئة" -#: ../app/dialogs/preferences-dialog.c:2798 +#: ../app/dialogs/preferences-dialog.c:3124 msgid "Themes" msgstr "السمات" -#: ../app/dialogs/preferences-dialog.c:2798 +#: ../app/dialogs/preferences-dialog.c:3124 msgid "Theme Folders" msgstr "مجلدات السمات" -#: ../app/dialogs/preferences-dialog.c:2800 +#: ../app/dialogs/preferences-dialog.c:3126 msgid "Select Theme Folders" msgstr "اختر مجلدات السمات" -#: ../app/dialogs/preferences-dialog.c:2802 +#: ../app/dialogs/preferences-dialog.c:3128 msgid "Icon Themes" msgstr "سمات الأيقونات" -#: ../app/dialogs/preferences-dialog.c:2802 +#: ../app/dialogs/preferences-dialog.c:3128 msgid "Icon Theme Folders" msgstr "مجلدات سمات الأيقونات" -#: ../app/dialogs/preferences-dialog.c:2804 +#: ../app/dialogs/preferences-dialog.c:3130 msgid "Select Icon Theme Folders" msgstr "اختر مجلدات سمات الأيقونات" @@ -13538,26 +16314,26 @@ msgstr "ميْز _ص:" msgid "pixels/%a" msgstr "بكسل/%a" -#: ../app/dialogs/quit-dialog.c:163 +#: ../app/dialogs/quit-dialog.c:164 msgid "Quit GIMP" msgstr "اخرج من جمب" -#: ../app/dialogs/quit-dialog.c:163 +#: ../app/dialogs/quit-dialog.c:164 msgid "Close All Images" msgstr "أغلق كل الصور" -#: ../app/dialogs/quit-dialog.c:255 +#: ../app/dialogs/quit-dialog.c:256 msgid "If you quit GIMP now, these changes will be lost." msgstr "إذا خرجت من جمب الآن ستفقد هذه التغييرات." -#: ../app/dialogs/quit-dialog.c:258 +#: ../app/dialogs/quit-dialog.c:259 msgid "If you close these images now, changes will be lost." msgstr "إذا أغلقت هذه الصورة الآن ستضيع التعديلات." #. TRANSLATORS: unless your language #. msgstr[0] applies to 1 only (as #. in English), replace "one" with %d. -#: ../app/dialogs/quit-dialog.c:344 +#: ../app/dialogs/quit-dialog.c:346 #, c-format msgid "There is one image with unsaved changes:" msgid_plural "There are %d images with unsaved changes:" @@ -13568,41 +16344,50 @@ msgstr[3] "توجد %Id صور بتغييرات غير محفوظة:" msgstr[4] "توجد %Id صورة بتغييرات غير محفوظة:" msgstr[5] "توجد %Id صورة بتغييرات غير محفوظة:" -#: ../app/dialogs/quit-dialog.c:355 +#: ../app/dialogs/quit-dialog.c:357 #, c-format msgid "Press %s to quit." msgstr "اضغط %s للخروج." -#: ../app/dialogs/quit-dialog.c:358 +#: ../app/dialogs/quit-dialog.c:360 #, c-format msgid "Press %s to close all images." msgstr "اضغط %s لغلق كل الصور." -#: ../app/dialogs/quit-dialog.c:374 +#: ../app/dialogs/quit-dialog.c:364 ../app/dialogs/user-install-dialog.c:89 +#, fuzzy +msgid "_Quit" +msgstr "ا_خرج" + +#: ../app/dialogs/quit-dialog.c:364 +msgid "Cl_ose" +msgstr "" + +#: ../app/dialogs/quit-dialog.c:388 #, c-format msgid "Press %s to discard all changes and quit." msgstr "اضغط %s لتجاهل كل التغييرات و الخروج." -#: ../app/dialogs/quit-dialog.c:377 +#: ../app/dialogs/quit-dialog.c:391 #, c-format msgid "Press %s to discard all changes and close all images." msgstr "اضغط %s لتجاهل كل التغييرات و غلق كل الصور." -#: ../app/dialogs/quit-dialog.c:385 ../app/display/gimpdisplayshell-close.c:183 +#: ../app/dialogs/quit-dialog.c:399 ../app/display/gimpdisplayshell-close.c:180 msgid "_Discard Changes" msgstr "_تجاهل التغييرات" -#: ../app/dialogs/quit-dialog.c:472 +#: ../app/dialogs/quit-dialog.c:486 #, c-format msgid "Exported to %s" msgstr "صدّر إلى %s" -#: ../app/dialogs/quit-dialog.c:575 +#: ../app/dialogs/quit-dialog.c:589 #, fuzzy msgid "Save this image" msgstr "احفظ هذه الصورة" -#: ../app/dialogs/quit-dialog.c:577 +#: ../app/dialogs/quit-dialog.c:591 #, fuzzy msgid "Save as" msgstr "احفظ" @@ -13620,6 +16405,16 @@ msgstr "حجم الطبقة" msgid "Fill With" msgstr "ا_ملأ بـ:" +#: ../app/dialogs/resize-dialog.c:185 +#, fuzzy +msgid "Re_set" +msgstr "الم_حفوظات:" + +#: ../app/dialogs/resize-dialog.c:187 +#, fuzzy +msgid "_Resize" +msgstr "يغيّر الحجم" + #: ../app/dialogs/resize-dialog.c:331 msgid "Resize _layers:" msgstr "غيّر حجم ال_طبقات:" @@ -13654,7 +16449,7 @@ msgstr "رأ_سي:" msgid "Image Size" msgstr "حجم الصورة" -#: ../app/dialogs/scale-dialog.c:181 ../app/paint/gimppaintoptions.c:402 +#: ../app/dialogs/scale-dialog.c:181 ../app/paint/gimppaintoptions.c:403 msgid "Quality" msgstr "الجودة" @@ -13662,18 +16457,15 @@ msgstr "الجودة" msgid "I_nterpolation:" msgstr "الا_ستيفاء:" -#: ../app/dialogs/scale-dialog.c:212 -msgid "" -"Indexed color layers are always scaled without interpolation. The chosen " -"interpolation type will affect channels and layer masks only." -msgstr "" -"يتم دائما تحجيم الطبقات مفهرسة الألوان دون استيفاء. نوع الاستيفاء المختار " -"سيؤثر على القنوات و أقنعة الطبقة فقط." - #: ../app/dialogs/stroke-dialog.c:122 msgid "Choose Stroke Style" msgstr "اختر طراز الحافة" +#: ../app/dialogs/stroke-dialog.c:129 +#, fuzzy +msgid "_Stroke" +msgstr "أضِف ضربة" + #: ../app/dialogs/stroke-dialog.c:238 msgid "Paint tool:" msgstr "أداة التلوين:" @@ -13712,7 +16504,7 @@ msgid "_Next Tip" msgstr "الفائدة ال_تالية" #. a link to the related section in the user manual -#: ../app/dialogs/tips-dialog.c:204 +#: ../app/dialogs/tips-dialog.c:205 msgid "Learn more" msgstr "تعرف على المزيد" @@ -13745,11 +16537,11 @@ msgstr "سجل التثبيت" msgid "Export Path to SVG" msgstr "صدّر المسار إلى إس.ڤي.جي" -#: ../app/dialogs/vectors-export-dialog.c:123 +#: ../app/dialogs/vectors-export-dialog.c:121 msgid "Export the active path" msgstr "صدّر المسار النشط" -#: ../app/dialogs/vectors-export-dialog.c:124 +#: ../app/dialogs/vectors-export-dialog.c:122 msgid "Export all paths from this image" msgstr "صدّر كل المسارات في هذه الصورة" @@ -13757,19 +16549,19 @@ msgstr "صدّر كل المسارات في هذه الصورة" msgid "Import Paths from SVG" msgstr "استورد المسارات من إس.ڤي.جي" -#: ../app/dialogs/vectors-import-dialog.c:127 +#: ../app/dialogs/vectors-import-dialog.c:124 msgid "All files (*.*)" msgstr "كل الملفات (*.*)" -#: ../app/dialogs/vectors-import-dialog.c:132 +#: ../app/dialogs/vectors-import-dialog.c:129 msgid "Scalable SVG image (*.svg)" msgstr "صورة إس.ڤي.جي قابلة للتحجيم (*.svg)" -#: ../app/dialogs/vectors-import-dialog.c:143 +#: ../app/dialogs/vectors-import-dialog.c:140 msgid "_Merge imported paths" msgstr "ا_دمج المسارات المستوردة" -#: ../app/dialogs/vectors-import-dialog.c:153 +#: ../app/dialogs/vectors-import-dialog.c:150 msgid "_Scale imported paths to fit image" msgstr "حجّم المسارات المس_توردة لتلائم الصورة" @@ -13788,116 +16580,168 @@ msgstr "أوصِد سماكة المسارات" msgid "Lock path _position" msgstr "أوصِد موضع المسار" -#: ../app/display/display-enums.c:60 +#: ../app/display/display-enums.c:124 msgctxt "guides-type" msgid "No guides" msgstr "لا أدلة" -#: ../app/display/display-enums.c:61 +#: ../app/display/display-enums.c:125 msgctxt "guides-type" msgid "Center lines" msgstr "خطوط وسطية" -#: ../app/display/display-enums.c:62 +#: ../app/display/display-enums.c:126 msgctxt "guides-type" msgid "Rule of thirds" msgstr "مسطرة من أثلاث" -#: ../app/display/display-enums.c:63 +#: ../app/display/display-enums.c:127 msgctxt "guides-type" msgid "Rule of fifths" msgstr "مسطرة من أخماس" -#: ../app/display/display-enums.c:64 +#: ../app/display/display-enums.c:128 msgctxt "guides-type" msgid "Golden sections" msgstr "أقسام ذهبية" -#: ../app/display/display-enums.c:65 +#: ../app/display/display-enums.c:129 msgctxt "guides-type" msgid "Diagonal lines" msgstr "خطوط قُطرية" -#: ../app/display/display-enums.c:66 +#: ../app/display/display-enums.c:130 msgctxt "guides-type" msgid "Number of lines" msgstr "عدد الخطوط" -#: ../app/display/display-enums.c:67 +#: ../app/display/display-enums.c:131 msgctxt "guides-type" msgid "Line spacing" msgstr "تباعد الخطوط" -#: ../app/display/gimpcursorview.c:220 ../app/display/gimpcursorview.c:226 -#: ../app/display/gimpcursorview.c:245 ../app/display/gimpcursorview.c:251 -#: ../app/display/gimpcursorview.c:270 ../app/display/gimpcursorview.c:276 -#: ../app/display/gimpcursorview.c:292 ../app/display/gimpcursorview.c:299 -#: ../app/display/gimpcursorview.c:693 ../app/display/gimpcursorview.c:695 -#: ../app/display/gimpcursorview.c:697 ../app/display/gimpcursorview.c:699 -#: ../app/display/gimpcursorview.c:812 ../app/display/gimpcursorview.c:813 -#: ../app/display/gimpcursorview.c:814 ../app/display/gimpcursorview.c:815 -#: ../app/widgets/gimpcolorframe.c:781 +#: ../app/display/display-enums.c:313 +msgctxt "rectangle-fixed-rule" +msgid "Aspect ratio" +msgstr "نسبة الأبعاد" + +#: ../app/display/display-enums.c:314 +#, fuzzy +msgctxt "rectangle-fixed-rule" +msgid "Width" +msgstr "العرض" + +#: ../app/display/display-enums.c:315 +#, fuzzy +msgctxt "rectangle-fixed-rule" +msgid "Height" +msgstr "الارتفاع" + +#: ../app/display/display-enums.c:316 +#, fuzzy +msgctxt "rectangle-fixed-rule" +msgid "Size" +msgstr "الحجم" + +#: ../app/display/display-enums.c:409 +msgctxt "transform-handle-mode" +msgid "Add / Transform" +msgstr "أضف \\ حوّل" + +#: ../app/display/display-enums.c:410 +msgctxt "transform-handle-mode" +msgid "Move" +msgstr "انقل" + +#: ../app/display/display-enums.c:411 +msgctxt "transform-handle-mode" +msgid "Remove" +msgstr "أزل" + +#: ../app/display/display-enums.c:440 +msgctxt "vector-mode" +msgid "Design" +msgstr "تصميم" + +#: ../app/display/display-enums.c:441 +msgctxt "vector-mode" +msgid "Edit" +msgstr "حرّر" + +#: ../app/display/display-enums.c:442 +msgctxt "vector-mode" +msgid "Move" +msgstr "انقل" + +#: ../app/display/gimpcursorview.c:225 ../app/display/gimpcursorview.c:231 +#: ../app/display/gimpcursorview.c:250 ../app/display/gimpcursorview.c:256 +#: ../app/display/gimpcursorview.c:275 ../app/display/gimpcursorview.c:281 +#: ../app/display/gimpcursorview.c:297 ../app/display/gimpcursorview.c:304 +#: ../app/display/gimpcursorview.c:706 ../app/display/gimpcursorview.c:708 +#: ../app/display/gimpcursorview.c:710 ../app/display/gimpcursorview.c:712 +#: ../app/display/gimpcursorview.c:791 ../app/display/gimpcursorview.c:792 +#: ../app/display/gimpcursorview.c:793 ../app/display/gimpcursorview.c:794 msgid "n/a" msgstr "غير متوفر" -#: ../app/display/gimpcursorview.c:223 ../app/display/gimpcursorview.c:248 -#: ../app/display/gimpcursorview.c:273 +#: ../app/display/gimpcursorview.c:228 ../app/display/gimpcursorview.c:253 +#: ../app/display/gimpcursorview.c:278 #: ../app/widgets/gimpdeviceinfoeditor.c:139 msgid "X" msgstr "س" -#: ../app/display/gimpcursorview.c:229 ../app/display/gimpcursorview.c:254 -#: ../app/display/gimpcursorview.c:279 +#: ../app/display/gimpcursorview.c:234 ../app/display/gimpcursorview.c:259 +#: ../app/display/gimpcursorview.c:284 #: ../app/widgets/gimpdeviceinfoeditor.c:140 msgid "Y" msgstr "ص" #. Units -#: ../app/display/gimpcursorview.c:235 +#: ../app/display/gimpcursorview.c:240 msgid "Units" msgstr "الوحدات" #. Selection Bounding Box -#: ../app/display/gimpcursorview.c:260 +#: ../app/display/gimpcursorview.c:265 msgid "Selection Bounding Box" msgstr "صندوق حدود التحديد" #. Width -#: ../app/display/gimpcursorview.c:296 +#: ../app/display/gimpcursorview.c:301 msgid "W" msgstr "ع" #. Height -#: ../app/display/gimpcursorview.c:303 +#: ../app/display/gimpcursorview.c:308 msgid "H" msgstr "ر" -#: ../app/display/gimpcursorview.c:332 +#: ../app/display/gimpcursorview.c:337 msgid "_Sample Merged" msgstr "عينة _مدمجة" -#: ../app/display/gimpdisplayshell.c:541 +#: ../app/display/gimpdisplayshell.c:552 msgid "Access the image menu" msgstr "اذهب إلى قائمة الصورة" -#: ../app/display/gimpdisplayshell.c:656 +#: ../app/display/gimpdisplayshell.c:667 msgid "Zoom image when window size changes" msgstr "قرّب الصورة عندما يتغير حجم النافذة" -#: ../app/display/gimpdisplayshell.c:685 +#: ../app/display/gimpdisplayshell.c:696 msgid "Toggle Quick Mask" msgstr "بدّل القناع السريع" -#: ../app/display/gimpdisplayshell.c:708 +#: ../app/display/gimpdisplayshell.c:719 msgid "Navigate the image display" msgstr "تصفّح عرض الصورة" -#: ../app/display/gimpdisplayshell.c:778 ../app/display/gimpdisplayshell.c:1477 +#: ../app/display/gimpdisplayshell.c:789 ../app/display/gimpdisplayshell.c:1445 #: ../app/widgets/gimptoolbox.c:251 msgid "Drop image files here to open them" msgstr "ألق ملفات الصور هنا لفتحها" -#: ../app/display/gimpdisplayshell-callbacks.c:540 +#: ../app/display/gimpdisplayshell-callbacks.c:551 #, c-format msgid "" "Unstable Development Version\n" @@ -13915,22 +16759,27 @@ msgstr "" "في مستودع التطوير قبل الإبلاغ عنها." #: ../app/display/gimpdisplayshell-close.c:168 -#: ../app/display/gimpdisplayshell-close.c:268 +#: ../app/display/gimpdisplayshell-close.c:266 #, c-format msgid "Close %s" msgstr "أغلق %s" -#: ../app/display/gimpdisplayshell-close.c:216 +#: ../app/display/gimpdisplayshell-close.c:178 +#, fuzzy +msgid "Save _As" +msgstr "احفظ با_سم..." + +#: ../app/display/gimpdisplayshell-close.c:214 #, c-format msgid "Press %s to discard all changes and close the image." msgstr "اضغط %s لتجاهل كل التغييرات و غلق الصورة." -#: ../app/display/gimpdisplayshell-close.c:276 +#: ../app/display/gimpdisplayshell-close.c:274 #, c-format msgid "Save the changes to image '%s' before closing?" msgstr "أأحفظ التغييرات على الصورة '%s' قبل الإغلاق؟" -#: ../app/display/gimpdisplayshell-close.c:309 +#: ../app/display/gimpdisplayshell-close.c:307 #, c-format msgid "If you don't save the image, changes from the last hour will be lost." msgid_plural "" @@ -13942,7 +16791,7 @@ msgstr[3] "إذا لم تحفظ الصورة، فإن التغييرات في آ msgstr[4] "إذا لم تحفظ الصورة، فإن التغييرات في آخر %Id ساعة ستفقد" msgstr[5] "إذا لم تحفظ الصورة، فإن التغييرات في آخر %Id ساعة ستفقد" -#: ../app/display/gimpdisplayshell-close.c:320 +#: ../app/display/gimpdisplayshell-close.c:318 #, c-format msgid "" "If you don't save the image, changes from the last hour and %d minute will " @@ -13957,7 +16806,7 @@ msgstr[3] "إذا لم تحفظ الصورة، فإن التغييرات في آ msgstr[4] "إذا لم تحفظ الصورة، فإن التغييرات في آخر ساعة و %Id دقيقة ستفقد" msgstr[5] "إذا لم تحفظ الصورة، فإن التغييرات في آخر ساعة و %Id دقيقة ستفقد" -#: ../app/display/gimpdisplayshell-close.c:332 +#: ../app/display/gimpdisplayshell-close.c:330 #, c-format msgid "If you don't save the image, changes from the last minute will be lost." msgid_plural "" @@ -13969,57 +16818,57 @@ msgstr[3] "إذا لم تحفظ الصورة، فإن التغييرات في آ msgstr[4] "إذا لم تحفظ الصورة، فإن التغييرات في آخر %Id دقيقة ستفقد" msgstr[5] "إذا لم تحفظ الصورة، فإن التغييرات في آخر %Id دقيقة ستفقد" -#: ../app/display/gimpdisplayshell-close.c:350 +#: ../app/display/gimpdisplayshell-close.c:348 #, c-format msgid "The image has been exported to '%s'." msgstr "صُدّرت الصورة إلى '%s'." -#: ../app/display/gimpdisplayshell-dnd.c:248 -#: ../app/display/gimpdisplayshell-dnd.c:675 -#: ../app/display/gimpdisplayshell-dnd.c:734 +#: ../app/display/gimpdisplayshell-dnd.c:246 +#: ../app/display/gimpdisplayshell-dnd.c:673 +#: ../app/display/gimpdisplayshell-dnd.c:733 msgid "Drop New Layer" msgstr "أفلت طبقة جديدة" -#: ../app/display/gimpdisplayshell-dnd.c:291 +#: ../app/display/gimpdisplayshell-dnd.c:289 msgid "Drop New Path" msgstr "أفلت مسارا جديدا" -#: ../app/display/gimpdisplayshell-dnd.c:362 ../app/tools/gimpblendtool.c:251 -#: ../app/tools/gimpbucketfilltool.c:137 ../app/tools/gimpfiltertool.c:301 -#: ../app/tools/gimpselectiontool.c:427 +#: ../app/display/gimpdisplayshell-dnd.c:360 ../app/tools/gimpblendtool.c:243 +#: ../app/tools/gimpbucketfilltool.c:137 ../app/tools/gimpcagetool.c:220 +#: ../app/tools/gimpfiltertool.c:268 ../app/tools/gimpselectiontool.c:427 msgid "Cannot modify the pixels of layer groups." msgstr "تعذّر تعديل بكسلات مجموعات الطبقات." -#: ../app/display/gimpdisplayshell-dnd.c:370 ../app/tools/gimpblendtool.c:258 -#: ../app/tools/gimpbucketfilltool.c:144 ../app/tools/gimpcroptool.c:325 -#: ../app/tools/gimpfiltertool.c:308 ../app/tools/gimppainttool.c:278 -#: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:1842 -#: ../app/tools/gimpwarptool.c:579 +#: ../app/display/gimpdisplayshell-dnd.c:368 ../app/tools/gimpblendtool.c:250 +#: ../app/tools/gimpbucketfilltool.c:144 ../app/tools/gimpcagetool.c:227 +#: ../app/tools/gimpcroptool.c:462 ../app/tools/gimpfiltertool.c:275 +#: ../app/tools/gimppainttool.c:279 ../app/tools/gimpselectiontool.c:432 +#: ../app/tools/gimptransformtool.c:1435 ../app/tools/gimpwarptool.c:629 msgid "The active layer's pixels are locked." msgstr "بكسلات الطبقة النشطة موصدة" -#: ../app/display/gimpdisplayshell-dnd.c:413 +#: ../app/display/gimpdisplayshell-dnd.c:411 #: ../app/widgets/gimpdrawabletreeview.c:247 #: ../app/widgets/gimpdrawabletreeview.c:358 msgctxt "undo-type" msgid "Drop pattern to layer" msgstr "أفلت النمط على الطبقة" -#: ../app/display/gimpdisplayshell-dnd.c:435 +#: ../app/display/gimpdisplayshell-dnd.c:433 #: ../app/widgets/gimpdrawabletreeview.c:277 #: ../app/widgets/gimpdrawabletreeview.c:378 msgctxt "undo-type" msgid "Drop color to layer" msgstr "أفلت اللون على الطبقة" -#: ../app/display/gimpdisplayshell-dnd.c:571 -#: ../app/widgets/gimplayertreeview.c:735 +#: ../app/display/gimpdisplayshell-dnd.c:569 +#: ../app/widgets/gimplayertreeview.c:756 msgid "Drop layers" msgstr "أفلت الطبقات" -#: ../app/display/gimpdisplayshell-dnd.c:708 -#: ../app/display/gimpdisplayshell-dnd.c:726 -#: ../app/widgets/gimplayertreeview.c:810 ../app/widgets/gimptoolbox-dnd.c:272 +#: ../app/display/gimpdisplayshell-dnd.c:706 +#: ../app/display/gimpdisplayshell-dnd.c:724 +#: ../app/widgets/gimplayertreeview.c:831 ../app/widgets/gimptoolbox-dnd.c:272 msgid "Dropped Buffer" msgstr "البراح المُفلت" @@ -14031,17 +16880,17 @@ msgstr "مرشحات عرض الألوان" msgid "Configure Color Display Filters" msgstr "اضبط مرشحات عرض الألوان" -#: ../app/display/gimpdisplayshell-handlers.c:869 +#: ../app/display/gimpdisplayshell-handlers.c:871 #, c-format msgid "Image saved to '%s'" msgstr "حفظت الصورة في '%s'" -#: ../app/display/gimpdisplayshell-handlers.c:881 +#: ../app/display/gimpdisplayshell-handlers.c:884 #, c-format msgid "Image exported to '%s'" msgstr "صُدّرت الصورة إلى '%s'" -#: ../app/display/gimpdisplayshell-layer-select.c:125 +#: ../app/display/gimpdisplayshell-layer-select.c:128 msgid "Layer Select" msgstr "اختيار طبقة" @@ -14054,7 +16903,7 @@ msgid "Select Rotation Angle" msgstr "اختر زاوية التدوير" #: ../app/display/gimpdisplayshell-rotate-dialog.c:154 -#: ../app/tools/gimpmeasuretool.c:1111 +#: ../app/tools/gimpmeasuretool.c:698 msgid "Angle:" msgstr "الزاوية:" @@ -14090,7 +16939,7 @@ msgstr "(نظيف)" #: ../app/display/gimpdisplayshell-title.c:350 #: ../app/widgets/gimpactiongroup.c:971 #: ../app/widgets/gimpbuffersourcebox.c:171 -#: ../app/widgets/gimpbuffersourcebox.c:309 +#: ../app/widgets/gimpbuffersourcebox.c:295 msgid "(none)" msgstr "(بدون)" @@ -14099,34 +16948,367 @@ msgstr "(بدون)" msgid "not color managed" msgstr "إدارة الألوان" -#: ../app/display/gimpstatusbar.c:431 +#: ../app/display/gimpdisplayshell-utils.c:149 +#: ../app/tools/gimpmeasuretool.c:528 ../app/tools/gimpmeasuretool.c:681 +#: ../app/tools/gimpmeasuretool.c:737 ../app/tools/gimpmeasuretool.c:765 +msgid "pixels" +msgstr "بكسل" + +#: ../app/display/gimpstatusbar.c:456 #, c-format msgid "Cancel %s" msgstr "ألغِ %s" -#: ../app/file/file-open.c:119 ../app/file/file-save.c:114 +#: ../app/display/gimptoolcompass.c:811 +msgid "Click to place vertical and horizontal guides" +msgstr "انقر لوضع دليلا أفقيا ورأسيا" + +#: ../app/display/gimptoolcompass.c:819 +msgid "Click to place a horizontal guide" +msgstr "انقر لوضع دليلا أفقي" + +#: ../app/display/gimptoolcompass.c:832 +msgid "Click to place a vertical guide" +msgstr "انقر لوضع دليلا رأسي" + +#: ../app/display/gimptoolcompass.c:844 +msgid "Click-Drag to add a new point" +msgstr "انقر واسحب لإضافة نقطة جديدة" + +#: ../app/display/gimptoolcompass.c:854 ../app/tools/gimpiscissorstool.c:911 +msgid "Click-Drag to move this point" +msgstr "انقر واسحب لنقل هذه النقطة" + +#: ../app/display/gimptoolcompass.c:873 +msgid "Click-Drag to move all points" +msgstr "انقر واسحب لنقل جميع النقاط" + +#: ../app/display/gimptoolhandlegrid.c:837 +#: ../app/display/gimptooltransformgrid.c:1773 +#, fuzzy +msgid "Click-Drag to move" +msgstr "انقر واسحب لنقل هذه النقطة" + +#: ../app/display/gimptoolhandlegrid.c:840 +#, fuzzy +msgid "Click-Drag to rotate and scale" +msgstr "انقر واسحب لإنشاء تحديد جديد" + +#: ../app/display/gimptoolhandlegrid.c:843 +#, fuzzy +msgid "Click-Drag to shear and scale" +msgstr "انقر واسحب لإنشاء تحديد جديد" + +#: ../app/display/gimptoolhandlegrid.c:846 +#: ../app/display/gimptooltransformgrid.c:1761 +#, fuzzy +msgid "Click-Drag to change perspective" +msgstr "انقر واسحب لتغيير شكل المنحنى" + +#: ../app/display/gimptoolhandlegrid.c:857 +#, fuzzy +msgid "Click to add a handle" +msgstr "انقر لتُصلِح" + +#: ../app/display/gimptoolhandlegrid.c:863 +#, fuzzy +msgid "Click-Drag to move this handle" +msgstr "انقر واسحب لنقل المناول" + +#: ../app/display/gimptoolhandlegrid.c:868 +#, fuzzy +msgid "Click-Drag to remove this handle" +msgstr "انقر واسحب لنقل المناول" + +#: ../app/display/gimptoolline.c:335 ../app/display/gimptoolline.c:498 +#, fuzzy +msgid "Line: " +msgstr "سطر" + +#: ../app/display/gimptoolline.c:1484 +#, fuzzy +msgid "Click-Drag to move the endpoint" +msgstr "انقر واسحب لنقل هذه النقطة" + +#: ../app/display/gimptoolline.c:1490 ../app/tools/gimppainttool.c:657 +#, c-format +msgid "%s for constrained angles" +msgstr "%s للزوايا المقيدة" + +#: ../app/display/gimptoolline.c:1497 +#, fuzzy +msgid "Release to remove the slider" +msgstr "انقر لتمويه السطر" + +#: ../app/display/gimptoolline.c:1501 +#, fuzzy, c-format +msgid "%s for constrained values" +msgstr "%s للزوايا المقيدة" + +#: ../app/display/gimptoolline.c:1511 +#, fuzzy +msgid "Click-Drag to move the slider; drag away to remove the slider" +msgstr "انقر و اسحب لنقل قناع التحديد" + +#: ../app/display/gimptoolline.c:1516 +#, fuzzy +msgid "Click-Drag to move or remove the slider" +msgstr "انقر واسحب لنقل قمة النقطة" + +#: ../app/display/gimptoolline.c:1521 +#, fuzzy +msgid "Click-Drag to move the slider" +msgstr "انقر واسحب لنقل البكسلات المحددة" + +#: ../app/display/gimptoolline.c:1532 +#, fuzzy +msgid "Click-Drag away to remove the slider" +msgstr "انقر واسحب لنقل البكسلات المحددة" + +#: ../app/display/gimptoolline.c:1536 +#, fuzzy +msgid "Click-Drag to remove the slider" +msgstr "انقر واسحب لنقل البكسلات المحددة" + +#: ../app/display/gimptoolline.c:1547 +#, fuzzy +msgid "Click or Click-Drag to add a new slider" +msgstr "انقر أو انقر واسحب لإضافة نقطة" + +#: ../app/display/gimptoolline.c:1553 +#, fuzzy +msgid "Click-Drag to move the line" +msgstr "انقر واسحب لنقل هذه النقطة" + +#: ../app/display/gimptoolline.c:1565 +#, c-format +msgid "%s to move the whole line" +msgstr "‏%s لنقل كل السطر" + +#: ../app/display/gimptoolpath.c:256 ../app/tools/gimpvectoroptions.c:71 +msgid "Edit Mode" +msgstr "حرّر النمط" + +#: ../app/display/gimptoolpath.c:265 ../app/tools/gimpvectoroptions.c:79 +msgid "Polygonal" +msgstr "مضلع" + +#: ../app/display/gimptoolpath.c:266 ../app/tools/gimpvectoroptions.c:80 +msgid "Restrict editing to polygons" +msgstr "اقصر التحرير على المُضلّعات" + +#: ../app/display/gimptoolpath.c:492 +msgid "The active path is locked." +msgstr "المسار النشط موصد." + +#: ../app/display/gimptoolpath.c:576 +msgid "Add Stroke" +msgstr "أضِف ضربة" + +#: ../app/display/gimptoolpath.c:600 +msgid "Add Anchor" +msgstr "أضِف مربط" + +#: ../app/display/gimptoolpath.c:624 +msgid "Insert Anchor" +msgstr "أدرج مربط" + +#: ../app/display/gimptoolpath.c:653 +msgid "Drag Handle" +msgstr "اسحب المناول" + +#: ../app/display/gimptoolpath.c:684 +msgid "Drag Anchor" +msgstr "اسحب المربط" + +#: ../app/display/gimptoolpath.c:702 +msgid "Drag Anchors" +msgstr "اسحب المرابط" + +#: ../app/display/gimptoolpath.c:724 +msgid "Drag Curve" +msgstr "اسحب المنحنى" + +#: ../app/display/gimptoolpath.c:753 +msgid "Connect Strokes" +msgstr "وصّل السماكات" + +#: ../app/display/gimptoolpath.c:785 +msgid "Drag Path" +msgstr "اسحب المسار" + +#: ../app/display/gimptoolpath.c:796 +msgid "Convert Edge" +msgstr "حوّل الحافة" + +#: ../app/display/gimptoolpath.c:827 +msgid "Delete Anchor" +msgstr "احذف المربط" + +#: ../app/display/gimptoolpath.c:850 +msgid "Delete Segment" +msgstr "احذف القطعة" + +#: ../app/display/gimptoolpath.c:1293 +msgid "Move Anchors" +msgstr "انقل المربط" + +#: ../app/display/gimptoolpath.c:1440 +msgid "Click to pick path to edit" +msgstr "انقر لأخذ المسار للتعديل" + +#: ../app/display/gimptoolpath.c:1444 +msgid "Click to create a new path" +msgstr "انقر لإنشاء مسار جديد" + +#: ../app/display/gimptoolpath.c:1448 +msgid "Click to create a new component of the path" +msgstr "انقر لإضافة مكون جديد للمسار" + +#: ../app/display/gimptoolpath.c:1452 +msgid "Click or Click-Drag to create a new anchor" +msgstr "انقر أو انقر واسحب لإنشاء مربط جديد" + +#: ../app/display/gimptoolpath.c:1462 ../app/display/gimptoolpath.c:1469 +msgid "Click-Drag to move the anchor around" +msgstr "انقر واسحب لنقل المربط" + +#: ../app/display/gimptoolpath.c:1473 ../app/display/gimptoolpath.c:1496 +msgid "Click-Drag to move the anchors around" +msgstr "انقر واسحب لنقل المرابط" + +#: ../app/display/gimptoolpath.c:1479 +msgid "Click-Drag to move the handle around" +msgstr "انقر واسحب لنقل المناول" + +#: ../app/display/gimptoolpath.c:1486 +msgid "Click-Drag to move the handles around symmetrically" +msgstr "انقر واسحب لنقل المناول بشكل متساو" + +#: ../app/display/gimptoolpath.c:1501 +msgid "Click-Drag to change the shape of the curve" +msgstr "انقر واسحب لتغيير شكل المنحنى" + +#: ../app/display/gimptoolpath.c:1504 +#, c-format +msgid "%s: symmetrical" +msgstr "‏%s: متماثل" + +#: ../app/display/gimptoolpath.c:1509 +msgid "Click-Drag to move the component around" +msgstr "انقر واسحب لنقل المكون" + +#: ../app/display/gimptoolpath.c:1517 +msgid "Click-Drag to move the path around" +msgstr "انقر واسحب لنقل المسار" + +#: ../app/display/gimptoolpath.c:1521 +msgid "Click-Drag to insert an anchor on the path" +msgstr "انقر واسحب لإدراج مربط في المسار" + +#: ../app/display/gimptoolpath.c:1529 +msgid "Click to delete this anchor" +msgstr "انقر لحذف هذا المربط" + +#: ../app/display/gimptoolpath.c:1533 +msgid "Click to connect this anchor with the selected endpoint" +msgstr "انقر لربط هذا المربط بنقطة النهاية المحدد" + +#: ../app/display/gimptoolpath.c:1538 +msgid "Click to open up the path" +msgstr "انقر لفتح المسار" + +#: ../app/display/gimptoolpath.c:1542 +msgid "Click to make this node angular" +msgstr "انقر لجعل هذه العقدة مدببة" + +#: ../app/display/gimptoolpath.c:1546 +msgid "Clicking here does nothing, try clicking on path elements." +msgstr "" + +#: ../app/display/gimptoolpath.c:1754 +msgid "Delete Anchors" +msgstr "احذف المرابط" + +#: ../app/display/gimptoolpolygon.c:866 +#, fuzzy +msgid "Click to close shape" +msgstr "انقر للإظهار" + +#: ../app/display/gimptoolpolygon.c:870 +msgid "Click-Drag to move segment vertex" +msgstr "انقر واسحب لنقل قمة النقطة" + +#: ../app/display/gimptoolpolygon.c:875 +#, fuzzy +msgid "Return commits, Escape cancels, Backspace re-opens shape" +msgstr "" +"إدخال (Enter) يودع، و تجاهل (Escape) يُلغي، و تراجع (Backspace) يحذف آخر قطعة" + +#: ../app/display/gimptoolpolygon.c:879 +msgid "Return commits, Escape cancels, Backspace removes last segment" +msgstr "" +"إدخال (Enter) يودع، و تجاهل (Escape) يُلغي، و تراجع (Backspace) يحذف آخر قطعة" + +#: ../app/display/gimptoolpolygon.c:883 +msgid "Click-Drag adds a free segment, Click adds a polygonal segment" +msgstr "النقر والسحب يضيف قطعة جديدة، النقر يضيف قطعة مضلعة" + +#: ../app/display/gimptoolrectangle.c:555 +#: ../app/display/gimptoolrectangle.c:875 +#: ../app/tools/gimprectangleselecttool.c:728 +msgid "Rectangle: " +msgstr "مستطيل: " + +#: ../app/display/gimptoolrectangle.c:2151 +#, fuzzy +msgid "Position: " +msgstr "الموضع:" + +#: ../app/display/gimptooltransformgrid.c:1766 +#: ../app/display/gimptooltransformgrid.c:1771 +#, fuzzy +msgid "Click-Drag to scale" +msgstr "انقر لتستنسخ" + +#: ../app/display/gimptooltransformgrid.c:1775 +#, fuzzy +msgid "Click-Drag to move the pivot point" +msgstr "انقر واسحب لنقل هذه النقطة" + +#: ../app/display/gimptooltransformgrid.c:1780 +#, fuzzy +msgid "Click-Drag to shear" +msgstr "انقر لتُصلِح" + +#: ../app/display/gimptooltransformgrid.c:1782 +#, fuzzy +msgid "Click-Drag to rotate" +msgstr "انقر للمحو" + +#: ../app/file/file-open.c:116 ../app/file/file-save.c:114 msgid "Not a regular file" msgstr "ليس ملفا عاديا" -#: ../app/file/file-open.c:128 ../app/file/file-save.c:123 +#: ../app/file/file-open.c:125 ../app/file/file-save.c:123 msgid "Permission denied" msgstr "رُفِض الإذن" -#: ../app/file/file-open.c:260 +#: ../app/file/file-open.c:257 #, c-format msgid "%s plug-in returned SUCCESS but did not return an image" msgstr "أرجعة الملحقة %s رسالة نجاح (SUCCESS) لكن لم تُرجع صورة" -#: ../app/file/file-open.c:271 +#: ../app/file/file-open.c:268 #, c-format msgid "%s plug-In could not open image" msgstr "لم تستطع الملحقة %s فتح الصورة" -#: ../app/file/file-open.c:667 +#: ../app/file/file-open.c:658 msgid "Image doesn't contain any layers" msgstr "لا تحتوي الصورة أي طبقات" -#: ../app/file/file-open.c:726 +#: ../app/file/file-open.c:717 #, c-format msgid "Opening '%s' failed: %s" msgstr "فشل فتح '%s'‏: %s" @@ -14264,6 +17446,633 @@ msgstr "" "شوّه القفص\n" "لتشويه الصورة" +#: ../app/operations/operations-enums.c:25 +#, fuzzy +msgctxt "layer-color-space" +msgid "Auto" +msgstr "تلقائي" + +#: ../app/operations/operations-enums.c:26 +msgctxt "layer-color-space" +msgid "RGB (linear)" +msgstr "" + +#: ../app/operations/operations-enums.c:27 +#, fuzzy +msgctxt "layer-color-space" +msgid "RGB (perceptual)" +msgstr "النسبة المئوية:" + +#: ../app/operations/operations-enums.c:28 +msgctxt "layer-color-space" +msgid "LAB" +msgstr "" + +#: ../app/operations/operations-enums.c:59 +#, fuzzy +msgctxt "layer-composite-mode" +msgid "Auto" +msgstr "تلقائي" + +#: ../app/operations/operations-enums.c:60 +msgctxt "layer-composite-mode" +msgid "Union" +msgstr "" + +#: ../app/operations/operations-enums.c:61 +#, fuzzy +msgctxt "layer-composite-mode" +msgid "Clip to backdrop" +msgstr "انقر للإظهار" + +#: ../app/operations/operations-enums.c:62 +#, fuzzy +msgctxt "layer-composite-mode" +msgid "Clip to layer" +msgstr "قص إلى طبقة القاع" + +#: ../app/operations/operations-enums.c:63 +#, fuzzy +msgctxt "layer-composite-mode" +msgid "Intersection" +msgstr "قاطع" + +#: ../app/operations/operations-enums.c:153 +msgctxt "layer-mode" +msgid "Normal (legacy)" +msgstr "" + +#. Translators: this is an abbreviated version of "Normal (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:156 +#, fuzzy +msgctxt "layer-mode" +msgid "Normal (l)" +msgstr "عادي" + +#: ../app/operations/operations-enums.c:157 +#, fuzzy +msgctxt "layer-mode" +msgid "Dissolve" +msgstr "إذابة" + +#: ../app/operations/operations-enums.c:158 +msgctxt "layer-mode" +msgid "Behind (legacy)" +msgstr "" + +#. Translators: this is an abbreviated version of "Behind (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:161 +#, fuzzy +msgctxt "layer-mode" +msgid "Behind (l)" +msgstr "خلف" + +#: ../app/operations/operations-enums.c:162 +#, fuzzy +msgctxt "layer-mode" +msgid "Multiply (legacy)" +msgstr "تكرار" + +#. Translators: this is an abbreviated version of "Multiply (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:165 +#, fuzzy +msgctxt "layer-mode" +msgid "Multiply (l)" +msgstr "تكرار" + +#: ../app/operations/operations-enums.c:166 +msgctxt "layer-mode" +msgid "Screen (legacy)" +msgstr "" + +#. Translators: this is an abbreviated version of "Screen (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:169 +#, fuzzy +msgctxt "layer-mode" +msgid "Screen (l)" +msgstr "شاشة" + +#: ../app/operations/operations-enums.c:170 +#, fuzzy +msgctxt "layer-mode" +msgid "Old broken Overlay" +msgstr "الكسو القديم المعطوب" + +#. Translators: this is an abbreviated version of "Old broken Overlay". +#. Keep it short. +#: ../app/operations/operations-enums.c:173 +#, fuzzy +msgctxt "layer-mode" +msgid "Old Overlay" +msgstr "كسو" + +#: ../app/operations/operations-enums.c:174 +#, fuzzy +msgctxt "layer-mode" +msgid "Difference (legacy)" +msgstr "فرق" + +#. Translators: this is an abbreviated version of "Difference (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:177 +#, fuzzy +msgctxt "layer-mode" +msgid "Difference (l)" +msgstr "فرق" + +#: ../app/operations/operations-enums.c:178 +#, fuzzy +msgctxt "layer-mode" +msgid "Addition (legacy)" +msgstr "إضافة" + +#. Translators: this is an abbreviated version of "Addition (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:181 +#, fuzzy +msgctxt "layer-mode" +msgid "Addition (l)" +msgstr "إضافة" + +#: ../app/operations/operations-enums.c:182 +#, fuzzy +msgctxt "layer-mode" +msgid "Subtract (legacy)" +msgstr "طرح" + +#. Translators: this is an abbreviated version of "Subtract (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:185 +#, fuzzy +msgctxt "layer-mode" +msgid "Subtract (l)" +msgstr "طرح" + +#: ../app/operations/operations-enums.c:186 +#, fuzzy +msgctxt "layer-mode" +msgid "Darken only (legacy)" +msgstr "تغميق فقط" + +#. Translators: this is an abbreviated version of "Darken only (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:189 +#, fuzzy +msgctxt "layer-mode" +msgid "Darken only (l)" +msgstr "تغميق فقط" + +#: ../app/operations/operations-enums.c:190 +#, fuzzy +msgctxt "layer-mode" +msgid "Lighten only (legacy)" +msgstr "تفتيح فقط" + +#. Translators: this is an abbreviated version of "Lighten only (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:193 +#, fuzzy +msgctxt "layer-mode" +msgid "Lighten only (l)" +msgstr "تفتيح فقط" + +#: ../app/operations/operations-enums.c:194 +#, fuzzy +msgctxt "layer-mode" +msgid "Hue (HSV) (legacy)" +msgstr "الدرجة (HSV)" + +#. Translators: this is an abbreviated version of "Hue (HSV) (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:197 +#, fuzzy +msgctxt "layer-mode" +msgid "Hue (HSV) (l)" +msgstr "الدرجة (HSV)" + +#: ../app/operations/operations-enums.c:198 +#, fuzzy +msgctxt "layer-mode" +msgid "Saturation (HSV) (legacy)" +msgstr "التشبّع (HSV)" + +#. Translators: this is an abbreviated version of "Saturation (HSV) (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:201 +#, fuzzy +msgctxt "layer-mode" +msgid "Saturation (HSV) (l)" +msgstr "التشبّع (HSV)" + +#: ../app/operations/operations-enums.c:202 +#, fuzzy +msgctxt "layer-mode" +msgid "Color (HSL) (legacy)" +msgstr "اللون (HSV)" + +#. Translators: this is an abbreviated version of "Color (HSL) (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:205 +#, fuzzy +msgctxt "layer-mode" +msgid "Color (HSL) (l)" +msgstr "اللون (HSV)" + +#: ../app/operations/operations-enums.c:206 +#, fuzzy +msgctxt "layer-mode" +msgid "Value (HSV) (legacy)" +msgstr "القيمة (HSV)" + +#. Translators: this is an abbreviated version of "Value (HSV) (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:209 +#, fuzzy +msgctxt "layer-mode" +msgid "Value (HSV) (l)" +msgstr "القيمة (HSV)" + +#: ../app/operations/operations-enums.c:210 +msgctxt "layer-mode" +msgid "Divide (legacy)" +msgstr "" + +#. Translators: this is an abbreviated version of "Divide (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:213 +#, fuzzy +msgctxt "layer-mode" +msgid "Divide (l)" +msgstr "قسمة" + +#: ../app/operations/operations-enums.c:214 +msgctxt "layer-mode" +msgid "Dodge (legacy)" +msgstr "" + +#. Translators: this is an abbreviated version of "Dodge (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:217 +#, fuzzy +msgctxt "layer-mode" +msgid "Dodge (l)" +msgstr "دودج" + +#: ../app/operations/operations-enums.c:218 +msgctxt "layer-mode" +msgid "Burn (legacy)" +msgstr "" + +#. Translators: this is an abbreviated version of "Burn (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:221 +#, fuzzy +msgctxt "layer-mode" +msgid "Burn (l)" +msgstr "حرق" + +#: ../app/operations/operations-enums.c:222 +#, fuzzy +msgctxt "layer-mode" +msgid "Hard light (legacy)" +msgstr "ضوء قاسي" + +#. Translators: this is an abbreviated version of "Hard light (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:225 +#, fuzzy +msgctxt "layer-mode" +msgid "Hard light (l)" +msgstr "ضوء قاسي" + +#: ../app/operations/operations-enums.c:226 +#, fuzzy +msgctxt "layer-mode" +msgid "Soft light (legacy)" +msgstr "لون لين" + +#. Translators: this is an abbreviated version of "Soft light (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:229 +#, fuzzy +msgctxt "layer-mode" +msgid "Soft light (l)" +msgstr "لون لين" + +#: ../app/operations/operations-enums.c:230 +#, fuzzy +msgctxt "layer-mode" +msgid "Grain extract (legacy)" +msgstr "استخراج الحبوب" + +#. Translators: this is an abbreviated version of "Grain extract (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:233 +#, fuzzy +msgctxt "layer-mode" +msgid "Grain extract (l)" +msgstr "استخراج الحبوب" + +#: ../app/operations/operations-enums.c:234 +#, fuzzy +msgctxt "layer-mode" +msgid "Grain merge (legacy)" +msgstr "دمج الحبوب" + +#. Translators: this is an abbreviated version of "Grain merge (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:237 +#, fuzzy +msgctxt "layer-mode" +msgid "Grain merge (l)" +msgstr "دمج الحبوب" + +#: ../app/operations/operations-enums.c:238 +#, fuzzy +msgctxt "layer-mode" +msgid "Color erase (legacy)" +msgstr "محو اللون" + +#. Translators: this is an abbreviated version of "Color erase (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:241 +#, fuzzy +msgctxt "layer-mode" +msgid "Color erase (l)" +msgstr "محو اللون" + +#: ../app/operations/operations-enums.c:242 +#, fuzzy +msgctxt "layer-mode" +msgid "Overlay" +msgstr "كسو" + +#: ../app/operations/operations-enums.c:243 +msgctxt "layer-mode" +msgid "Hue (LCH)" +msgstr "الدرجة (LCH)" + +#: ../app/operations/operations-enums.c:244 +#, fuzzy +msgctxt "layer-mode" +msgid "Chroma (LCH)" +msgstr "الصفاء (LCH)" + +#: ../app/operations/operations-enums.c:245 +#, fuzzy +msgctxt "layer-mode" +msgid "Color (LCH)" +msgstr "اللون (LCH)" + +#: ../app/operations/operations-enums.c:246 +#, fuzzy +msgctxt "layer-mode" +msgid "Lightness (LCH)" +msgstr "الإضاءة (LCH)" + +#: ../app/operations/operations-enums.c:247 +#, fuzzy +msgctxt "layer-mode" +msgid "Normal" +msgstr "عادي" + +#: ../app/operations/operations-enums.c:248 +#, fuzzy +msgctxt "layer-mode" +msgid "Behind" +msgstr "خلف" + +#: ../app/operations/operations-enums.c:249 +#, fuzzy +msgctxt "layer-mode" +msgid "Multiply" +msgstr "تكرار" + +#: ../app/operations/operations-enums.c:250 +#, fuzzy +msgctxt "layer-mode" +msgid "Screen" +msgstr "شاشة" + +#: ../app/operations/operations-enums.c:251 +#, fuzzy +msgctxt "layer-mode" +msgid "Difference" +msgstr "فرق" + +#: ../app/operations/operations-enums.c:252 +#, fuzzy +msgctxt "layer-mode" +msgid "Addition" +msgstr "إضافة" + +#: ../app/operations/operations-enums.c:253 +#, fuzzy +msgctxt "layer-mode" +msgid "Subtract" +msgstr "طرح" + +#: ../app/operations/operations-enums.c:254 +#, fuzzy +msgctxt "layer-mode" +msgid "Darken only" +msgstr "تغميق فقط" + +#: ../app/operations/operations-enums.c:255 +#, fuzzy +msgctxt "layer-mode" +msgid "Lighten only" +msgstr "تفتيح فقط" + +#: ../app/operations/operations-enums.c:256 +msgctxt "layer-mode" +msgid "Hue (HSV)" +msgstr "الدرجة (HSV)" + +#: ../app/operations/operations-enums.c:257 +#, fuzzy +msgctxt "layer-mode" +msgid "Saturation (HSV)" +msgstr "التشبّع (HSV)" + +#: ../app/operations/operations-enums.c:258 +#, fuzzy +msgctxt "layer-mode" +msgid "Color (HSL)" +msgstr "اللون (HSV)" + +#: ../app/operations/operations-enums.c:259 +#, fuzzy +msgctxt "layer-mode" +msgid "Value (HSV)" +msgstr "القيمة (HSV)" + +#: ../app/operations/operations-enums.c:260 +#, fuzzy +msgctxt "layer-mode" +msgid "Divide" +msgstr "قسمة" + +#: ../app/operations/operations-enums.c:261 +#, fuzzy +msgctxt "layer-mode" +msgid "Dodge" +msgstr "دودج" + +#: ../app/operations/operations-enums.c:262 +#, fuzzy +msgctxt "layer-mode" +msgid "Burn" +msgstr "حرق" + +#: ../app/operations/operations-enums.c:263 +#, fuzzy +msgctxt "layer-mode" +msgid "Hard light" +msgstr "ضوء قاسي" + +#: ../app/operations/operations-enums.c:264 +#, fuzzy +msgctxt "layer-mode" +msgid "Soft light" +msgstr "لون لين" + +#: ../app/operations/operations-enums.c:265 +#, fuzzy +msgctxt "layer-mode" +msgid "Grain extract" +msgstr "استخراج الحبوب" + +#: ../app/operations/operations-enums.c:266 +#, fuzzy +msgctxt "layer-mode" +msgid "Grain merge" +msgstr "دمج الحبوب" + +#: ../app/operations/operations-enums.c:267 +#, fuzzy +msgctxt "layer-mode" +msgid "Vivid light" +msgstr "ضوء قاسي" + +#: ../app/operations/operations-enums.c:268 +#, fuzzy +msgctxt "layer-mode" +msgid "Pin light" +msgstr "ضوء خطي" + +#: ../app/operations/operations-enums.c:269 +#, fuzzy +msgctxt "layer-mode" +msgid "Linear light" +msgstr "ضوء خطي" + +#: ../app/operations/operations-enums.c:270 +#, fuzzy +msgctxt "layer-mode" +msgid "Hard mix" +msgstr "ضوء قاسي" + +#: ../app/operations/operations-enums.c:271 +#, fuzzy +msgctxt "layer-mode" +msgid "Exclusion" +msgstr "وهم" + +#: ../app/operations/operations-enums.c:272 +#, fuzzy +msgctxt "layer-mode" +msgid "Linear burn" +msgstr "خ_طي" + +#: ../app/operations/operations-enums.c:273 +msgctxt "layer-mode" +msgid "Luma/Luminance darken only" +msgstr "" + +#. Translators: this is an abbreviated version of "Luma/Luminance darken only". +#. Keep it short. +#: ../app/operations/operations-enums.c:276 +#, fuzzy +msgctxt "layer-mode" +msgid "Luma darken only" +msgstr "تغميق فقط" + +#: ../app/operations/operations-enums.c:277 +#, fuzzy +msgctxt "layer-mode" +msgid "Luma/Luminance lighten only" +msgstr "تفتيح فقط" + +#. Translators: this is an abbreviated version of "Luma/Luminance lighten only". +#. Keep it short. +#: ../app/operations/operations-enums.c:280 +#, fuzzy +msgctxt "layer-mode" +msgid "Luma lighten only" +msgstr "تفتيح فقط" + +#: ../app/operations/operations-enums.c:281 +msgctxt "layer-mode" +msgid "Luminance" +msgstr "" + +#: ../app/operations/operations-enums.c:282 +#, fuzzy +msgctxt "layer-mode" +msgid "Color erase" +msgstr "محو اللون" + +#: ../app/operations/operations-enums.c:283 +#, fuzzy +msgctxt "layer-mode" +msgid "Erase" +msgstr "محو" + +#: ../app/operations/operations-enums.c:284 +#, fuzzy +msgctxt "layer-mode" +msgid "Merge" +msgstr "ادم_ج" + +#: ../app/operations/operations-enums.c:285 +#, fuzzy +msgctxt "layer-mode" +msgid "Split" +msgstr "شق" + +#: ../app/operations/operations-enums.c:286 +msgctxt "layer-mode" +msgid "Pass through" +msgstr "" + +#: ../app/operations/operations-enums.c:287 +#, fuzzy +msgctxt "layer-mode" +msgid "Replace" +msgstr "استبدال" + +#: ../app/operations/operations-enums.c:288 +#, fuzzy +msgctxt "layer-mode" +msgid "Anti erase" +msgstr "مضاد للمحو" + +#: ../app/operations/operations-enums.c:316 +#, fuzzy +msgctxt "layer-mode-group" +msgid "Default" +msgstr "الشبكة المبدئية" + +#: ../app/operations/operations-enums.c:317 +msgctxt "layer-mode-group" +msgid "Legacy" +msgstr "" + #: ../app/operations/gimpbrightnesscontrastconfig.c:82 #: ../app/operations/gimpbrightnesscontrastconfig.c:83 msgid "Brightness" @@ -14305,86 +18114,122 @@ msgstr "أصفر-أزرق" msgid "Preserve Luminosity" msgstr "حافظ على الإضاءة" -#: ../app/operations/gimpcolorizeconfig.c:85 -#: ../app/operations/gimpcolorizeconfig.c:86 -#: ../app/operations/gimphuesaturationconfig.c:101 -#: ../app/operations/gimphuesaturationconfig.c:102 -msgid "Hue" -msgstr "التدرج" - -#: ../app/operations/gimpcolorizeconfig.c:91 -#: ../app/operations/gimpcolorizeconfig.c:92 -#: ../app/operations/gimphuesaturationconfig.c:107 -#: ../app/operations/gimphuesaturationconfig.c:108 -msgid "Saturation" -msgstr "التشبّع" - -#: ../app/operations/gimpcolorizeconfig.c:97 -#: ../app/operations/gimpcolorizeconfig.c:98 -#: ../app/operations/gimphuesaturationconfig.c:113 -#: ../app/operations/gimphuesaturationconfig.c:114 -msgid "Lightness" -msgstr "الإضاءة" - #: ../app/operations/gimpcurvesconfig.c:105 -#: ../app/operations/gimplevelsconfig.c:106 +#: ../app/operations/gimplevelsconfig.c:108 +#: ../app/widgets/gimphistogrameditor.c:110 +#, fuzzy +msgid "Linear" +msgstr "خ_طي" + +#: ../app/operations/gimpcurvesconfig.c:106 +#: ../app/operations/gimplevelsconfig.c:109 +msgid "Work on linear RGB" +msgstr "" + +#: ../app/operations/gimpcurvesconfig.c:112 +#: ../app/operations/gimplevelsconfig.c:115 msgid "The affected channel" msgstr "القناة المتأثرة" -#: ../app/operations/gimpcurvesconfig.c:111 -#: ../app/operations/gimpcurvesconfig.c:112 +#: ../app/operations/gimpcurvesconfig.c:118 +#: ../app/operations/gimpcurvesconfig.c:119 msgid "Curve" msgstr "المنحنى" -#: ../app/operations/gimpcurvesconfig.c:526 +#: ../app/operations/gimpcurvesconfig.c:548 msgid "not a GIMP Curves file" msgstr "ليس ملف منحنيات جمب" -#: ../app/operations/gimpcurvesconfig.c:557 +#: ../app/operations/gimpcurvesconfig.c:579 msgid "Parse error, didn't find 2 integers" msgstr "" -#: ../app/operations/gimpcurvesconfig.c:673 +#: ../app/operations/gimpcurvesconfig.c:699 msgid "Writing curves file failed: " msgstr "فشلت كتابة ملف المنحنيات:" +#: ../app/operations/gimphuesaturationconfig.c:101 +#: ../app/operations/gimphuesaturationconfig.c:102 +#: ../app/operations/gimpoperationcolorize.c:92 +#: ../app/operations/gimpoperationcolorize.c:93 +msgid "Hue" +msgstr "الدرجة" + +#: ../app/operations/gimphuesaturationconfig.c:107 +#: ../app/operations/gimphuesaturationconfig.c:108 +#: ../app/operations/gimpoperationcolorize.c:98 +#: ../app/operations/gimpoperationcolorize.c:99 +msgid "Saturation" +msgstr "التشبّع" + +#: ../app/operations/gimphuesaturationconfig.c:113 +#: ../app/operations/gimphuesaturationconfig.c:114 +#: ../app/operations/gimpoperationcolorize.c:104 +#: ../app/operations/gimpoperationcolorize.c:105 +msgid "Lightness" +msgstr "الإضاءة" + #: ../app/operations/gimphuesaturationconfig.c:119 #: ../app/operations/gimphuesaturationconfig.c:120 msgid "Overlap" msgstr "تداخل" -#: ../app/operations/gimplevelsconfig.c:118 -#: ../app/operations/gimplevelsconfig.c:119 +#: ../app/operations/gimplevelsconfig.c:121 +#: ../app/operations/gimplevelsconfig.c:122 msgid "Low Input" msgstr "الإدخال الأدنى" -#: ../app/operations/gimplevelsconfig.c:124 -#: ../app/operations/gimplevelsconfig.c:125 +#: ../app/operations/gimplevelsconfig.c:127 +#: ../app/operations/gimplevelsconfig.c:128 msgid "High Input" msgstr "الإدخال الأقصى" -#: ../app/operations/gimplevelsconfig.c:130 -#: ../app/operations/gimplevelsconfig.c:131 +#: ../app/operations/gimplevelsconfig.c:133 +#, fuzzy +msgid "Clamp Input" +msgstr "الإدخال الأدنى" + +#: ../app/operations/gimplevelsconfig.c:134 +msgid "Clamp input values before applying output mapping." +msgstr "" + +#: ../app/operations/gimplevelsconfig.c:145 +#: ../app/operations/gimplevelsconfig.c:146 msgid "Low Output" msgstr "الإخراج الأدنى" -#: ../app/operations/gimplevelsconfig.c:136 -#: ../app/operations/gimplevelsconfig.c:137 +#: ../app/operations/gimplevelsconfig.c:151 +#: ../app/operations/gimplevelsconfig.c:152 msgid "High Output" msgstr "الإخراج الأقصى" -#: ../app/operations/gimplevelsconfig.c:778 +#: ../app/operations/gimplevelsconfig.c:157 +#, fuzzy +msgid "Clamp Output" +msgstr "الإخراج الأدنى" + +#: ../app/operations/gimplevelsconfig.c:158 +msgid "Clamp final output values." +msgstr "" + +#: ../app/operations/gimplevelsconfig.c:842 msgid "not a GIMP Levels file" msgstr "ليس ملف مستويات جمب" -#: ../app/operations/gimplevelsconfig.c:846 +#: ../app/operations/gimplevelsconfig.c:917 msgid "parse error" msgstr "خطأ تحليل" -#: ../app/operations/gimplevelsconfig.c:881 +#: ../app/operations/gimplevelsconfig.c:952 msgid "Writing levels file failed: " msgstr "فشلت كتابة ملف المستويات:" +#: ../app/operations/gimpoperationbrightnesscontrast.c:65 +#: ../app/tools/gimpbrightnesscontrasttool.c:98 +#, fuzzy +msgid "Adjust brightness and contrast" +msgstr "اضبط السطوع والتباين" + #: ../app/operations/gimpoperationcagecoefcalc.c:69 msgid "Compute a set of coefficient buffer for the GIMP cage tool" msgstr "" @@ -14395,30 +18240,55 @@ msgid "" "tool" msgstr "" -#: ../app/operations/gimpoperationcagetransform.c:127 +#: ../app/operations/gimpoperationcagetransform.c:131 msgid "Fill with plain color" msgstr "املأ بلون سادة" -#: ../app/operations/gimpoperationcagetransform.c:128 +#: ../app/operations/gimpoperationcagetransform.c:132 msgid "Fill the original position of the cage with a plain color" msgstr "املأ الموضع الأصلي للقفص بلون سادة" +#: ../app/operations/gimpoperationcolorbalance.c:65 +#, fuzzy +msgid "Adjust color distribution" +msgstr "أداة توازن الألوان: اضبط توزيع الألوان" + +#: ../app/operations/gimpoperationcolorize.c:85 +#, fuzzy +msgid "Colorize the image" +msgstr "لوّن الصورة" + +#: ../app/operations/gimpoperationcolorize.c:114 +#: ../app/operations/gimpoperationcolorize.c:115 +#, fuzzy +msgid "Color" +msgstr "اللون" + +#: ../app/operations/gimpoperationcurves.c:67 ../app/tools/gimpcurvestool.c:143 +#, fuzzy +msgid "Adjust color curves" +msgstr "اضبط منحنيات الألوان" + #: ../app/operations/gimpoperationdesaturate.c:85 #, fuzzy msgid "Turn colors into shades of gray" msgstr "أداة إزالة التشبع: حول الألوان إلى ظلال رمادية" -#: ../app/operations/gimpoperationdesaturate.c:90 -#: ../app/tools/gimppaintoptions-gui.c:117 ../app/widgets/gimpdeviceinfo.c:132 -#: ../app/widgets/gimplayertreeview.c:269 -msgid "Mode" -msgstr "الوضع" - #: ../app/operations/gimpoperationdesaturate.c:91 #, fuzzy msgid "Choose shade of gray based on" msgstr "اختر الظلال الرمادية بناء على:" +#: ../app/operations/gimpoperationhuesaturation.c:65 +#, fuzzy +msgid "Adjust hue, saturation, and lightness" +msgstr "أداة الدرجة والتشبع: اضبط التدرج والتشبع والإضاءة" + +#: ../app/operations/gimpoperationlevels.c:64 ../app/tools/gimplevelstool.c:133 +#, fuzzy +msgid "Adjust color levels" +msgstr "اضبط مستويات الألوان" + #: ../app/operations/gimpoperationposterize.c:82 #, fuzzy msgid "Reduce to a limited set of colors" @@ -14433,6 +18303,12 @@ msgstr "مستويات _تقليل الألوان" msgid "Replace partial transparency with a color" msgstr "بدّل الشفافية الجزئية بلون" +#: ../app/operations/gimpoperationthreshold.c:84 +#: ../app/tools/gimpthresholdtool.c:88 +#, fuzzy +msgid "Reduce image to two colors using a threshold" +msgstr "أداة العتبة: اخفض الصورة إلى لونين باستخدام عتبة" + #: ../app/operations/gimpoperationthreshold.c:97 msgid "Low threshold" msgstr "العتبة الدنيا" @@ -14452,18 +18328,55 @@ msgstr "" #. * but xgettext extracts it anyway mistakenly into GIMP po files. #. * Leave an empty string as translation. It does not matter. #. -#: ../app/gui/gui.c:221 +#: ../app/gui/gui.c:236 msgid "default:LTR" msgstr "default:RTL" +#: ../app/gui/gui.c:326 +#, fuzzy +msgid "Image Recovery" +msgstr "دقّة الصورة" + +#: ../app/gui/gui.c:328 +#, fuzzy +msgid "_Discard" +msgstr "_تجاهل التغييرات" + +#: ../app/gui/gui.c:329 +msgid "_Recover" +msgstr "" + +#: ../app/gui/gui.c:340 +msgid "Eeek! It looks like GIMP recovered from a crash!" +msgstr "" + +#. TRANSLATORS: even if English singular form does +#. * not use %d, you can use %d for translation in +#. * any singular/plural form of your language if +#. * suited. It will just work and be replaced by the +#. * number of images as expected. +#. +#: ../app/gui/gui.c:349 +#, c-format +msgid "" +"An image was salvaged from the crash. Do you want to try and recover it?" +msgid_plural "" +"%d images were salvaged from the crash. Do you want to try and recover them?" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + #. load the recent documents after gimp_real_restore() because we #. * need the mime-types implemented by plug-ins #. -#: ../app/gui/gui.c:517 +#: ../app/gui/gui.c:594 msgid "Documents" msgstr "المستندات" -#: ../app/gui/splash.c:115 +#: ../app/gui/splash.c:128 msgid "GIMP Startup" msgstr "بدء جمب" @@ -14484,11 +18397,11 @@ msgstr "حركة فقط" msgid "Flow" msgstr "التدفق" -#: ../app/paint/gimpbrushcore.c:411 +#: ../app/paint/gimpbrushcore.c:393 msgid "No brushes available for use with this tool." msgstr "لا فرش متاحة للاستخدام مع هذه الأداة." -#: ../app/paint/gimpbrushcore.c:418 +#: ../app/paint/gimpbrushcore.c:400 msgid "No paint dynamics available for use with this tool." msgstr "لا حركيات متوفرة للاستخدام مع هذه الأداة." @@ -14539,20 +18452,20 @@ msgstr "ممحاة" msgid "Anti erase" msgstr "مضاد للمحو" -#: ../app/paint/gimpheal.c:106 ../app/tools/gimphealtool.c:53 +#: ../app/paint/gimpheal.c:115 ../app/tools/gimphealtool.c:53 msgid "Heal" msgstr "إصلاح" -#: ../app/paint/gimpheal.c:145 +#: ../app/paint/gimpheal.c:155 msgid "Healing does not operate on indexed layers." msgstr "الإصلاح لا يعمل على الطبقات المؤرشفة." -#: ../app/paint/gimpink.c:104 ../app/tools/gimpinktool.c:61 +#: ../app/paint/gimpink.c:107 ../app/tools/gimpinktool.c:61 msgid "Ink" msgstr "حبر" #: ../app/paint/gimpinkoptions.c:74 ../app/paint/gimpinkoptions.c:87 -#: ../app/paint/gimppaintoptions.c:190 ../app/tools/gimpwarpoptions.c:91 +#: ../app/paint/gimppaintoptions.c:191 ../app/tools/gimpwarpoptions.c:91 msgid "Size" msgstr "الحجم" @@ -14561,7 +18474,7 @@ msgid "Ink Blob Size" msgstr "حجم نقطة الحبر" #: ../app/paint/gimpinkoptions.c:80 ../app/paint/gimpinkoptions.c:119 -#: ../app/paint/gimppaintoptions.c:211 ../app/widgets/gimpbrusheditor.c:200 +#: ../app/paint/gimppaintoptions.c:205 ../app/widgets/gimpbrusheditor.c:200 msgid "Angle" msgstr "الزاوية" @@ -14571,18 +18484,18 @@ msgid "Tilt" msgstr "الانحناء" #. Blob shape widgets -#: ../app/paint/gimpinkoptions.c:106 ../app/tools/gimpblendoptions.c:85 -#: ../app/tools/gimpblendoptions.c:236 ../app/tools/gimpinkoptions-gui.c:103 +#: ../app/paint/gimpinkoptions.c:106 ../app/tools/gimpblendoptions.c:94 +#: ../app/tools/gimpblendoptions.c:294 ../app/tools/gimpinkoptions-gui.c:103 msgid "Shape" msgstr "الشكل" #: ../app/paint/gimpinkoptions.c:113 ../app/widgets/gimpbrusheditor.c:189 msgid "Aspect ratio" -msgstr "نسبة الارتفاع" +msgstr "نسبة الأبعاد" #: ../app/paint/gimpinkoptions.c:114 msgid "Ink Blob Aspect Ratio" -msgstr "نسبة ارتفاع نقطة الحبر" +msgstr "نسبة أبعاد نقطة الحبر" #: ../app/paint/gimpinkoptions.c:120 msgid "Ink Blob Angle" @@ -14596,186 +18509,194 @@ msgstr "Mybrush" msgid "No MyPaint brushes available for use with this tool." msgstr "لا فرش ماي پينت متاحة للاستخدام مع هذه الأداة." -#: ../app/paint/gimpmybrushoptions.c:85 ../app/tools/gimpcoloroptions.c:83 -#: ../app/tools/gimprectangleselectoptions.c:92 +#: ../app/paint/gimpmybrushoptions.c:86 ../app/tools/gimpcoloroptions.c:85 +#: ../app/tools/gimprectangleselectoptions.c:100 #: ../app/tools/gimpselectionoptions.c:94 ../app/widgets/gimpbrusheditor.c:156 msgid "Radius" msgstr "نصف القطر" -#: ../app/paint/gimpmybrushoptions.c:92 +#: ../app/paint/gimpmybrushoptions.c:93 msgid "Base Opacity" msgstr "إعتام الأساس" -#: ../app/paint/gimpmybrushoptions.c:99 ../app/paint/gimppaintoptions.c:225 +#: ../app/paint/gimpmybrushoptions.c:100 ../app/paint/gimppaintoptions.c:219 #: ../app/tools/gimpwarpoptions.c:98 ../app/widgets/gimpbrusheditor.c:178 msgid "Hardness" msgstr "الصلابة" -#: ../app/paint/gimpmybrushoptions.c:106 +#: ../app/paint/gimpmybrushoptions.c:107 msgid "Erase with this brush" msgstr "امسح بهذه الفرشاة" +#: ../app/paint/gimpmybrushoptions.c:114 +msgid "No erasing effect" +msgstr "" + +#: ../app/paint/gimpmybrushoptions.c:115 ../app/paint/gimpsmudgeoptions.c:85 +msgid "Never decrease alpha of existing pixels" +msgstr "" + #: ../app/paint/gimppaintbrush.c:68 ../app/tools/gimppaintbrushtool.c:51 msgid "Paintbrush" msgstr "فرشاة تلوين" -#: ../app/paint/gimppaintcore.c:144 +#: ../app/paint/gimppaintcore.c:147 msgid "Paint" msgstr "لوّن" -#: ../app/paint/gimppaintoptions.c:191 +#: ../app/paint/gimppaintoptions.c:192 msgid "Brush Size" msgstr "حجم الفرشاة" -#: ../app/paint/gimppaintoptions.c:197 -#, fuzzy -msgid "Brush Zoom" -msgstr "قوة الفرشاة" - #: ../app/paint/gimppaintoptions.c:198 -msgid "Link brush size with canvas zoom" -msgstr "اربط حجم الفرشاة بحجم رقعة الرسم" - -#: ../app/paint/gimppaintoptions.c:204 msgid "Aspect Ratio" -msgstr "نسبة الارتفاع" +msgstr "نسبة الأبعاد" -#: ../app/paint/gimppaintoptions.c:218 ../app/widgets/gimpbrusheditor.c:211 +#: ../app/paint/gimppaintoptions.c:212 ../app/tools/gimpwarpoptions.c:112 +#: ../app/widgets/gimpbrusheditor.c:211 #: ../app/widgets/gimpbrushfactoryview.c:81 ../app/widgets/gimpgrideditor.c:174 msgid "Spacing" msgstr "المباعدة" -#: ../app/paint/gimppaintoptions.c:232 +#: ../app/paint/gimppaintoptions.c:226 msgid "Force" msgstr "القوة" -#: ../app/paint/gimppaintoptions.c:233 +#: ../app/paint/gimppaintoptions.c:227 msgid "Brush Force" msgstr "قوة الفرشاة" -#: ../app/paint/gimppaintoptions.c:239 +#: ../app/paint/gimppaintoptions.c:233 #, fuzzy msgid "Link Size" msgstr "حجم الطباعة" -#: ../app/paint/gimppaintoptions.c:240 +#: ../app/paint/gimppaintoptions.c:234 msgid "Link brush size to brush native" msgstr "اربط حجم الفرشاة بحجمها الطبيعي" -#: ../app/paint/gimppaintoptions.c:246 -#, fuzzy +#: ../app/paint/gimppaintoptions.c:240 msgid "Link Aspect Ratio" -msgstr "نسبة الارتفاع" +msgstr "ربط نسبة الأبعاد" + +#: ../app/paint/gimppaintoptions.c:241 +msgid "Link brush aspect ratio to brush native" +msgstr "اربط نسبة أبعاد الفرشاة بنسبتها الطبيعية" #: ../app/paint/gimppaintoptions.c:247 -msgid "Link brush aspect ratio to brush native" -msgstr "اربط نسبة ارتفاع الفرشاة بنسبتها الطبيعية" - -#: ../app/paint/gimppaintoptions.c:253 #, fuzzy msgid "Link Angle" msgstr "زاوية نقطة الحبر" -#: ../app/paint/gimppaintoptions.c:254 +#: ../app/paint/gimppaintoptions.c:248 msgid "Link brush angle to brush native" msgstr "اربط زاوية الفرشاة بزاويتها الطبيعية" -#: ../app/paint/gimppaintoptions.c:260 +#: ../app/paint/gimppaintoptions.c:254 #, fuzzy msgid "Link Spacing" msgstr "تباعد الخطوط" -#: ../app/paint/gimppaintoptions.c:261 +#: ../app/paint/gimppaintoptions.c:255 msgid "Link brush spacing to brush native" msgstr "اربط تباعد الفرشاة بتباعدها الطبيعي" -#: ../app/paint/gimppaintoptions.c:267 +#: ../app/paint/gimppaintoptions.c:261 #, fuzzy msgid "Link Hardness" msgstr "الصلابة" -#: ../app/paint/gimppaintoptions.c:268 +#: ../app/paint/gimppaintoptions.c:262 msgid "Link brush hardness to brush native" msgstr "اربط صلابة الفرشاة بصلابتها الطبيعية" -#: ../app/paint/gimppaintoptions.c:274 +#: ../app/paint/gimppaintoptions.c:268 +#, fuzzy +msgid "Lock brush to view" +msgstr "أوصد حجم الفرشاة لمستوى التقريب" + +#: ../app/paint/gimppaintoptions.c:269 +msgid "Keep brush appearance fixed relative to the view" +msgstr "" + +#: ../app/paint/gimppaintoptions.c:275 msgid "Incremental" msgstr "تزايدي" -#: ../app/paint/gimppaintoptions.c:275 +#: ../app/paint/gimppaintoptions.c:276 msgid "Every stamp has its own opacity" msgstr "لكل ختم عتامته الخاصة" -#: ../app/paint/gimppaintoptions.c:282 +#: ../app/paint/gimppaintoptions.c:283 msgid "Hard edge" msgstr "حافة قاسية" -#: ../app/paint/gimppaintoptions.c:283 +#: ../app/paint/gimppaintoptions.c:284 msgid "Ignore fuzziness of the current brush" msgstr "تجاهل ضبابية الفرشاة الحالية" -#: ../app/paint/gimppaintoptions.c:289 +#: ../app/paint/gimppaintoptions.c:290 msgid "Apply Jitter" msgstr "طبّق النفّاض" -#: ../app/paint/gimppaintoptions.c:290 +#: ../app/paint/gimppaintoptions.c:291 msgid "Scatter brush as you paint" msgstr "بعثر الفرشاة أثناء التلوين" -#: ../app/paint/gimppaintoptions.c:295 +#: ../app/paint/gimppaintoptions.c:296 msgid "Amount" msgstr "المقدار" -#: ../app/paint/gimppaintoptions.c:296 +#: ../app/paint/gimppaintoptions.c:297 msgid "Distance of scattering" msgstr "مسافة البعثرة" -#: ../app/paint/gimppaintoptions.c:302 +#: ../app/paint/gimppaintoptions.c:303 msgid "Dynamics Options" msgstr "خيارات الحركيات" -#: ../app/paint/gimppaintoptions.c:309 +#: ../app/paint/gimppaintoptions.c:310 msgid "Fade length" msgstr "طول الإبهات" -#: ../app/paint/gimppaintoptions.c:310 +#: ../app/paint/gimppaintoptions.c:311 msgid "Distance over which strokes fade out" msgstr "المسافة التي ستُبهت الضربات عبرها" -#: ../app/paint/gimppaintoptions.c:320 ../app/widgets/gimpviewablebox.c:381 +#: ../app/paint/gimppaintoptions.c:321 ../app/widgets/gimpviewablebox.c:381 msgid "Reverse" msgstr "اعكس" -#: ../app/paint/gimppaintoptions.c:321 +#: ../app/paint/gimppaintoptions.c:322 msgid "Reverse direction of fading" msgstr "اعكس اتجاه الإبهات" -#: ../app/paint/gimppaintoptions.c:326 ../app/tools/gimpblendoptions.c:92 -#: ../app/tools/gimpblendoptions.c:245 ../app/tools/gimppaintoptions-gui.c:351 +#: ../app/paint/gimppaintoptions.c:327 ../app/tools/gimpblendoptions.c:108 +#: ../app/tools/gimpblendoptions.c:315 ../app/tools/gimppaintoptions-gui.c:356 msgid "Repeat" msgstr "كرّر" -#: ../app/paint/gimppaintoptions.c:327 +#: ../app/paint/gimppaintoptions.c:328 msgid "How fade is repeated as you paint" msgstr "كيفية تكرار الإبهات أثناء التلوين" -#: ../app/paint/gimppaintoptions.c:396 +#: ../app/paint/gimppaintoptions.c:397 msgid "Smooth stroke" msgstr "سماكة ناعمة" -#: ../app/paint/gimppaintoptions.c:397 +#: ../app/paint/gimppaintoptions.c:398 msgid "Paint smoother strokes" msgstr "اجعل ضربات الفرشاة أنعم" -#: ../app/paint/gimppaintoptions.c:403 +#: ../app/paint/gimppaintoptions.c:404 msgid "Depth of smoothing" msgstr "عمق التنعيم" -#: ../app/paint/gimppaintoptions.c:408 +#: ../app/paint/gimppaintoptions.c:409 msgid "Weight" msgstr "الوزن" -#: ../app/paint/gimppaintoptions.c:409 +#: ../app/paint/gimppaintoptions.c:410 msgid "Gravity of the pen" msgstr "اتجاه جاذبية القلم" @@ -14784,20 +18705,39 @@ msgid "Pencil" msgstr "قلم" #: ../app/paint/gimpperspectiveclone.c:91 -#: ../app/tools/gimpperspectiveclonetool.c:133 +#: ../app/tools/gimpperspectiveclonetool.c:142 msgid "Perspective Clone" msgstr "استنساخ منظوري" -#: ../app/paint/gimpsmudge.c:85 ../app/tools/gimpsmudgetool.c:54 +#: ../app/paint/gimpsmudge.c:85 ../app/tools/gimpsmudgetool.c:55 msgid "Smudge" msgstr "تلطيخ" -#: ../app/paint/gimpsmudgeoptions.c:66 +#: ../app/paint/gimpsmudgeoptions.c:70 msgctxt "smudge-tool" msgid "Rate" msgstr "المعدل" -#: ../app/paint/gimpsourcecore.c:238 +#: ../app/paint/gimpsmudgeoptions.c:71 +msgid "The strength of smudging" +msgstr "" + +#: ../app/paint/gimpsmudgeoptions.c:77 +#, fuzzy +msgctxt "smudge-tool" +msgid "Flow" +msgstr "التدفق" + +#: ../app/paint/gimpsmudgeoptions.c:78 +msgid "The amount of brush color to blend" +msgstr "" + +#: ../app/paint/gimpsmudgeoptions.c:84 +msgctxt "smudge-tool" +msgid "No erasing effect" +msgstr "" + +#: ../app/paint/gimpsourcecore.c:239 msgid "Set a source image first." msgstr "حدد الصورة المصدر أولا." @@ -14806,7 +18746,7 @@ msgstr "حدد الصورة المصدر أولا." msgid "Alignment" msgstr "المحاذاة" -#: ../app/paint/gimpsourceoptions.c:71 ../app/pdb/gimppdbcontext.c:127 +#: ../app/paint/gimpsourceoptions.c:71 ../app/pdb/gimppdbcontext.c:128 #: ../app/tools/gimpbucketfilloptions.c:117 ../app/tools/gimpcoloroptions.c:69 #: ../app/tools/gimphealtool.c:99 ../app/tools/gimpregionselectoptions.c:97 msgid "Sample merged" @@ -14846,67 +18786,72 @@ msgstr "ثابت" msgid "Combine Masks" msgstr "ضم الأقنعة" -#: ../app/pdb/color-cmds.c:86 ../app/pdb/drawable-color-cmds.c:86 +#: ../app/pdb/color-cmds.c:85 ../app/pdb/drawable-color-cmds.c:85 msgctxt "undo-type" msgid "Brightness-Contrast" msgstr "السطوع-التباين" -#: ../app/pdb/color-cmds.c:147 ../app/pdb/drawable-color-cmds.c:590 +#: ../app/pdb/color-cmds.c:148 ../app/pdb/drawable-color-cmds.c:610 msgctxt "undo-type" msgid "Levels" msgstr "المستويات" -#: ../app/pdb/color-cmds.c:246 ../app/pdb/drawable-color-cmds.c:660 +#: ../app/pdb/color-cmds.c:247 ../app/pdb/drawable-color-cmds.c:680 msgctxt "undo-type" msgid "Posterize" msgstr "قلل الألوان" -#: ../app/pdb/color-cmds.c:285 ../app/pdb/color-cmds.c:326 +#: ../app/pdb/color-cmds.c:286 ../app/pdb/color-cmds.c:327 #: ../app/pdb/drawable-color-cmds.c:325 msgctxt "undo-type" msgid "Desaturate" msgstr "أزل التشبع" -#: ../app/pdb/color-cmds.c:435 ../app/pdb/color-cmds.c:483 +#: ../app/pdb/color-cmds.c:389 +msgid "Invert" +msgstr "اعكس" + +#: ../app/pdb/color-cmds.c:436 ../app/pdb/color-cmds.c:484 #: ../app/pdb/drawable-color-cmds.c:235 ../app/pdb/drawable-color-cmds.c:283 msgctxt "undo-type" msgid "Curves" msgstr "منحنيات" -#: ../app/pdb/color-cmds.c:537 ../app/pdb/drawable-color-cmds.c:140 +#: ../app/pdb/color-cmds.c:538 ../app/pdb/drawable-color-cmds.c:139 msgctxt "undo-type" msgid "Color Balance" msgstr "توازن الألوان" -#: ../app/pdb/color-cmds.c:583 ../app/pdb/drawable-color-cmds.c:186 +#: ../app/pdb/color-cmds.c:586 ../app/pdb/drawable-color-cmds.c:187 msgctxt "undo-type" msgid "Colorize" msgstr "لوّن" -#: ../app/pdb/color-cmds.c:726 ../app/tools/gimphuesaturationtool.c:96 +#: ../app/pdb/color-cmds.c:738 msgid "Hue-Saturation" -msgstr "التدرج و التشبع" +msgstr "الدرجة و التشبع" -#: ../app/pdb/color-cmds.c:770 ../app/pdb/drawable-color-cmds.c:706 +#: ../app/pdb/color-cmds.c:782 ../app/pdb/drawable-color-cmds.c:726 msgctxt "undo-type" msgid "Threshold" msgstr "العتبة" #: ../app/pdb/drawable-cmds.c:524 -msgid "Plug-In" +#, fuzzy +msgid "Plug-in" msgstr "ملحقة" -#: ../app/pdb/drawable-cmds.c:963 ../app/tools/gimpforegroundselecttool.c:998 +#: ../app/pdb/drawable-cmds.c:963 ../app/tools/gimpforegroundselecttool.c:987 msgctxt "command" msgid "Foreground Select" msgstr "تحديد المقدمة" -#: ../app/pdb/drawable-color-cmds.c:497 +#: ../app/pdb/drawable-color-cmds.c:507 msgctxt "undo-type" msgid "Hue-Saturation" -msgstr "التدرج و التشبع" +msgstr "الدرجة و التشبع" -#: ../app/pdb/drawable-color-cmds.c:530 +#: ../app/pdb/drawable-color-cmds.c:542 msgctxt "undo-type" msgid "Invert" msgstr "اعكس" @@ -14914,16 +18859,16 @@ msgstr "اعكس" #: ../app/pdb/drawable-transform-cmds.c:355 #: ../app/pdb/drawable-transform-cmds.c:455 #: ../app/pdb/item-transform-cmds.c:270 ../app/pdb/transform-tools-cmds.c:171 -#: ../app/tools/gimpperspectivetool.c:83 -#: ../app/tools/gimptransformoptions.c:524 -#: ../app/tools/gimptransformoptions.c:533 +#: ../app/tools/gimpperspectivetool.c:85 +#: ../app/tools/gimptransformoptions.c:552 +#: ../app/tools/gimptransformoptions.c:561 msgid "Perspective" msgstr "منظوري" #: ../app/pdb/drawable-transform-cmds.c:977 #: ../app/pdb/drawable-transform-cmds.c:1064 #: ../app/pdb/item-transform-cmds.c:621 ../app/pdb/transform-tools-cmds.c:432 -#: ../app/tools/gimpsheartool.c:116 +#: ../app/tools/gimpsheartool.c:119 msgid "Shearing" msgstr "تمزيق" @@ -14939,7 +18884,7 @@ msgstr "تحويل ثنائي الأبعاد" msgid "2D Transforming" msgstr "تحويل ثنائي الأبعاد" -#: ../app/pdb/edit-cmds.c:801 +#: ../app/pdb/edit-cmds.c:797 msgid "Blending" msgstr "مزج" @@ -14977,127 +18922,152 @@ msgstr "اسم فرشاة فارغ غير صحيح " msgid "Brush '%s' not found" msgstr "الفرشاة '%s' غير موجودة" -#: ../app/pdb/gimppdb-utils.c:90 +#: ../app/pdb/gimppdb-utils.c:91 #, c-format msgid "Brush '%s' is not editable" msgstr "الفرشاة '%s' غير قابلة للتعديل" -#: ../app/pdb/gimppdb-utils.c:116 +#: ../app/pdb/gimppdb-utils.c:98 +#, fuzzy, c-format +msgid "Brush '%s' is not renamable" +msgstr "الفرشاة '%s' غير قابلة للتعديل" + +#: ../app/pdb/gimppdb-utils.c:124 #, c-format msgid "Brush '%s' is not a generated brush" msgstr "الفرشاة '%sط ليست فرشاة مُولَّدة" -#: ../app/pdb/gimppdb-utils.c:137 +#: ../app/pdb/gimppdb-utils.c:145 msgid "Invalid empty paint dynamics name" msgstr "اسم حركية تلوين فارغ غير صحيح" -#: ../app/pdb/gimppdb-utils.c:146 +#: ../app/pdb/gimppdb-utils.c:154 #, c-format msgid "Paint dynamics '%s' not found" msgstr "حركية التلوين '%s' غير موجودة" -#: ../app/pdb/gimppdb-utils.c:151 +#: ../app/pdb/gimppdb-utils.c:160 #, c-format msgid "Paint dynamics '%s' is not editable" msgstr "حركية التلوين '%s' غير قابلة للتعديل" -#: ../app/pdb/gimppdb-utils.c:172 +#: ../app/pdb/gimppdb-utils.c:167 +#, fuzzy, c-format +msgid "Paint dynamics '%s' is not renamable" +msgstr "حركية التلوين '%s' غير قابلة للتعديل" + +#: ../app/pdb/gimppdb-utils.c:188 #, fuzzy msgid "Invalid empty MyPaint brush name" msgstr "اسم فرشاة فارغ غير صحيح " -#: ../app/pdb/gimppdb-utils.c:181 +#: ../app/pdb/gimppdb-utils.c:197 #, fuzzy, c-format msgid "MyPaint brush '%s' not found" msgstr "الفرشاة '%s' غير موجودة" -#: ../app/pdb/gimppdb-utils.c:186 +#: ../app/pdb/gimppdb-utils.c:203 #, fuzzy, c-format msgid "MyPaint brush '%s' is not editable" msgstr "الفرشاة '%s' غير قابلة للتعديل" -#: ../app/pdb/gimppdb-utils.c:206 +#: ../app/pdb/gimppdb-utils.c:210 +#, fuzzy, c-format +msgid "MyPaint brush '%s' is not renamable" +msgstr "الفرشاة '%s' غير قابلة للتعديل" + +#: ../app/pdb/gimppdb-utils.c:230 msgid "Invalid empty pattern name" msgstr "اسم نمط فارغ غير صحيح" -#: ../app/pdb/gimppdb-utils.c:215 +#: ../app/pdb/gimppdb-utils.c:239 #, c-format msgid "Pattern '%s' not found" msgstr "النمط '%s' غير موجود" -#: ../app/pdb/gimppdb-utils.c:235 +#: ../app/pdb/gimppdb-utils.c:259 msgid "Invalid empty gradient name" msgstr "اسم تدرج فارغ غير صحيح" -#: ../app/pdb/gimppdb-utils.c:244 +#: ../app/pdb/gimppdb-utils.c:268 #, c-format msgid "Gradient '%s' not found" msgstr "التدرج '%s' غير موجود" -#: ../app/pdb/gimppdb-utils.c:249 +#: ../app/pdb/gimppdb-utils.c:274 #, c-format msgid "Gradient '%s' is not editable" msgstr "التدرج '%s' غير قابل للتعديل" -#: ../app/pdb/gimppdb-utils.c:270 +#: ../app/pdb/gimppdb-utils.c:281 +#, fuzzy, c-format +msgid "Gradient '%s' is not renamable" +msgstr "التدرج '%s' غير قابل للتعديل" + +#: ../app/pdb/gimppdb-utils.c:302 msgid "Invalid empty palette name" msgstr "اسم لوح ألوان فارغ غير صحيح" -#: ../app/pdb/gimppdb-utils.c:279 +#: ../app/pdb/gimppdb-utils.c:311 #, c-format msgid "Palette '%s' not found" msgstr "لوح الألوان '%s' غير موجود" -#: ../app/pdb/gimppdb-utils.c:284 +#: ../app/pdb/gimppdb-utils.c:317 #, c-format msgid "Palette '%s' is not editable" msgstr "لوح الألوان '%s' غير قابل للتعديل" -#: ../app/pdb/gimppdb-utils.c:304 +#: ../app/pdb/gimppdb-utils.c:324 +#, fuzzy, c-format +msgid "Palette '%s' is not renamable" +msgstr "لوح الألوان '%s' غير قابل للتعديل" + +#: ../app/pdb/gimppdb-utils.c:344 msgid "Invalid empty font name" msgstr "اسم خط فارغ غير صحيح" -#: ../app/pdb/gimppdb-utils.c:314 +#: ../app/pdb/gimppdb-utils.c:354 #, c-format msgid "Font '%s' not found" msgstr "الخط '%s' غير موجود" -#: ../app/pdb/gimppdb-utils.c:333 +#: ../app/pdb/gimppdb-utils.c:373 msgid "Invalid empty buffer name" msgstr "اسم براح فارغ غير صخيح" -#: ../app/pdb/gimppdb-utils.c:343 +#: ../app/pdb/gimppdb-utils.c:383 #, c-format msgid "Named buffer '%s' not found" msgstr "البراح المسمى '%s' غير موجود" -#: ../app/pdb/gimppdb-utils.c:362 +#: ../app/pdb/gimppdb-utils.c:402 msgid "Invalid empty paint method name" msgstr "اسم طريقة تلوين فارغ غير صحيح" -#: ../app/pdb/gimppdb-utils.c:372 +#: ../app/pdb/gimppdb-utils.c:412 #, c-format msgid "Paint method '%s' does not exist" msgstr "طريقة التلوين '%s' غير موجودة" -#: ../app/pdb/gimppdb-utils.c:391 +#: ../app/pdb/gimppdb-utils.c:431 #, c-format msgid "Item '%s' (%d) cannot be used because it has not been added to an image" msgstr "تعذّر استخدام العنصر '%s' ‏(%Id) لأنه لم يضف إلى صورة" -#: ../app/pdb/gimppdb-utils.c:401 +#: ../app/pdb/gimppdb-utils.c:441 #, c-format msgid "Item '%s' (%d) cannot be used because it is attached to another image" msgstr "تعذّر استخدام العنصر '%s' ‏(%Id) لأنه مرتبط بصورة أخرى" -#: ../app/pdb/gimppdb-utils.c:427 +#: ../app/pdb/gimppdb-utils.c:467 #, c-format msgid "" "Item '%s' (%d) cannot be used because it is not a direct child of an item " "tree" msgstr "تعذّر استخدام العنصر '%s' ‏(%Id) لأنه ليس ابنا مباشرا لشجرة عنصر" -#: ../app/pdb/gimppdb-utils.c:455 +#: ../app/pdb/gimppdb-utils.c:495 #, c-format msgid "" "Items '%s' (%d) and '%s' (%d) cannot be used because they are not part of " @@ -15106,80 +19076,80 @@ msgstr "" "تعذّر استخدام العنصرين '%s' ‏(%Id) و '%s' ‏(%Id) لأنهما لا ينتميان إلى نفس شجرة " "العنصر" -#: ../app/pdb/gimppdb-utils.c:480 +#: ../app/pdb/gimppdb-utils.c:520 #, c-format msgid "Item '%s' (%d) must not be an ancestor of '%s' (%d)" msgstr "يجب أن يكون العنصر '%s'‏ (%d) سلفا للعنصر '%s'‏ (%d)" -#: ../app/pdb/gimppdb-utils.c:504 +#: ../app/pdb/gimppdb-utils.c:544 #, c-format msgid "Item '%s' (%d) has already been added to an image" msgstr "العنصر '%s' ‏(%Id) أُضيف بالفعل إلى صورة" -#: ../app/pdb/gimppdb-utils.c:512 +#: ../app/pdb/gimppdb-utils.c:552 #, c-format msgid "Trying to add item '%s' (%d) to wrong image" msgstr "محاولة لإضافة العنصر '%s' ‏(%d) إلى الصورة الخطأ" -#: ../app/pdb/gimppdb-utils.c:532 +#: ../app/pdb/gimppdb-utils.c:572 #, c-format msgid "Item '%s' (%d) cannot be modified because its contents are locked" msgstr "تعذّر تعديل العنصر '%s' ‏(%Id) لأن محتوياته موصدة" -#: ../app/pdb/gimppdb-utils.c:542 +#: ../app/pdb/gimppdb-utils.c:582 #, c-format msgid "" "Item '%s' (%d) cannot be modified because its position and size are locked" msgstr "تعذّر تعديل العنصر '%s' ‏(%Id) لأن موضعه و حجمه موصدين" -#: ../app/pdb/gimppdb-utils.c:562 +#: ../app/pdb/gimppdb-utils.c:602 #, c-format msgid "Item '%s' (%d) cannot be used because it is not a group item" msgstr "تعذّر تعديل العنصر '%s' ‏(%Id) لأنه ليس عنصر مجموعة" -#: ../app/pdb/gimppdb-utils.c:582 +#: ../app/pdb/gimppdb-utils.c:622 #, c-format msgid "Item '%s' (%d) cannot be modified because it is a group item" msgstr "تعذّر تعديل العنصر '%s' ‏(%Id) لأنه عنصر مجموعة" -#: ../app/pdb/gimppdb-utils.c:603 +#: ../app/pdb/gimppdb-utils.c:643 #, c-format msgid "Layer '%s' (%d) cannot be used because it is not a text layer" msgstr "تعذّر استخدام الطبقة '%s' ‏(%Id) لأنها ليست طبقة نصية" -#: ../app/pdb/gimppdb-utils.c:644 +#: ../app/pdb/gimppdb-utils.c:684 #, c-format msgid "Image '%s' (%d) is of type '%s', but an image of type '%s' is expected" msgstr "الصورة '%s' ‏(%Id) نوعها '%s'، لكن تُوقعت صورة نوعها '%s'" -#: ../app/pdb/gimppdb-utils.c:667 +#: ../app/pdb/gimppdb-utils.c:707 #, c-format msgid "Image '%s' (%d) must not be of type '%s'" msgstr "الصورة '%s' ‏(%Id) يجب ألا يكون نوعها '%s'" -#: ../app/pdb/gimppdb-utils.c:687 +#: ../app/pdb/gimppdb-utils.c:727 #, c-format msgid "" "Image '%s' (%d) has precision '%s', but an image of precision '%s' is " "expected" msgstr "الصورة '%s' ‏(%Id) دقتها '%s'، لكن تُوقعت صورة بدقة '%s'" -#: ../app/pdb/gimppdb-utils.c:710 +#: ../app/pdb/gimppdb-utils.c:750 #, c-format msgid "Image '%s' (%d) must not be of precision '%s'" msgstr "الصورة '%s' ‏(%Id) يجب أن تكون بدقة '%s'" -#: ../app/pdb/gimppdb-utils.c:734 ../app/pdb/image-guides-cmds.c:179 +#: ../app/pdb/gimppdb-utils.c:774 ../app/pdb/image-guides-cmds.c:179 #, c-format msgid "Image '%s' (%d) does not contain guide with ID %d" msgstr "" -#: ../app/pdb/gimppdb-utils.c:757 ../app/pdb/image-sample-points-cmds.c:144 +#: ../app/pdb/gimppdb-utils.c:797 ../app/pdb/image-sample-points-cmds.c:144 #, fuzzy, c-format msgid "Image '%s' (%d) does not contain sample point with ID %d" msgstr "الصورة '%s' ‏(%Id) يجب ألا يكون نوعها '%s'" -#: ../app/pdb/gimppdb-utils.c:785 +#: ../app/pdb/gimppdb-utils.c:825 #, c-format msgid "Vectors object %d does not contain stroke with ID %d" msgstr "" @@ -15191,129 +19161,135 @@ msgid "" "%s, got %s." msgstr "" -#: ../app/pdb/gimppdbcontext.c:100 ../app/tools/gimpselectionoptions.c:81 +#: ../app/pdb/gimppdbcontext.c:101 ../app/tools/gimpselectionoptions.c:81 msgid "Smooth edges" msgstr "حواف ناعمة" -#: ../app/pdb/gimppdbcontext.c:106 +#: ../app/pdb/gimppdbcontext.c:107 #, fuzzy msgid "Feather" msgstr "_نعّم..." -#: ../app/pdb/gimppdbcontext.c:113 +#: ../app/pdb/gimppdbcontext.c:114 #, fuzzy msgid "Feather radius X" msgstr "نعّم الحواف" -#: ../app/pdb/gimppdbcontext.c:120 +#: ../app/pdb/gimppdbcontext.c:121 #, fuzzy msgid "Feather radius Y" msgstr "نعّم الحواف" -#: ../app/pdb/gimppdbcontext.c:134 +#: ../app/pdb/gimppdbcontext.c:135 #, fuzzy msgid "Sample criterion" msgstr "معيار التحديد" -#: ../app/pdb/gimppdbcontext.c:142 +#: ../app/pdb/gimppdbcontext.c:143 #, fuzzy msgid "Sample threshold" msgstr "طبّق العتبة" -#: ../app/pdb/gimppdbcontext.c:149 +#: ../app/pdb/gimppdbcontext.c:150 #, fuzzy msgid "Sample transparent" msgstr "اجعلها _شفافة" -#: ../app/pdb/gimppdbcontext.c:156 ../app/tools/gimpbucketfilloptions.c:124 +#: ../app/pdb/gimppdbcontext.c:157 ../app/tools/gimpbucketfilloptions.c:124 #: ../app/tools/gimpregionselectoptions.c:104 #, fuzzy msgid "Diagonal neighbors" msgstr "خطوط قُطرية" -#: ../app/pdb/gimppdbcontext.c:163 ../app/tools/gimptransformoptions.c:124 -#: ../app/tools/gimptransformoptions.c:441 +#: ../app/pdb/gimppdbcontext.c:164 ../app/tools/gimptransformoptions.c:124 +#: ../app/tools/gimptransformoptions.c:440 ../app/tools/gimpwarpoptions.c:119 +#: ../app/tools/gimpwarpoptions.c:322 msgid "Interpolation" msgstr "الاستيفاء" -#: ../app/pdb/gimppdbcontext.c:171 +#: ../app/pdb/gimppdbcontext.c:172 #, fuzzy msgid "Transform direction" msgstr "التحويل" -#: ../app/pdb/gimppdbcontext.c:179 +#: ../app/pdb/gimppdbcontext.c:180 #, fuzzy msgid "Transform resize" msgstr "حوّل عناصر" -#: ../app/pdb/gimpprocedure.c:461 ../app/plug-in/gimppluginprocframe.c:213 +#: ../app/pdb/gimppdbcontext.c:195 +#, fuzzy +msgid "Distance metric" +msgstr "المسافة:" + +#: ../app/pdb/gimpprocedure.c:467 ../app/plug-in/gimppluginprocframe.c:191 #, c-format msgid "Procedure '%s' returned no return values" msgstr "" -#: ../app/pdb/gimpprocedure.c:731 +#: ../app/pdb/gimpprocedure.c:743 #, c-format msgid "" "Procedure '%s' returned a wrong value type for return value '%s' (#%d). " "Expected %s, got %s." msgstr "" -#: ../app/pdb/gimpprocedure.c:743 +#: ../app/pdb/gimpprocedure.c:755 #, c-format msgid "" "Procedure '%s' has been called with a wrong value type for argument '%s' (#" "%d). Expected %s, got %s." msgstr "" -#: ../app/pdb/gimpprocedure.c:776 +#: ../app/pdb/gimpprocedure.c:788 #, c-format msgid "" "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" "in is trying to work on a layer that doesn't exist any longer." msgstr "" -#: ../app/pdb/gimpprocedure.c:789 +#: ../app/pdb/gimpprocedure.c:801 #, c-format msgid "" "Procedure '%s' has been called with an invalid ID for argument '%s'. Most " "likely a plug-in is trying to work on a layer that doesn't exist any longer." msgstr "" -#: ../app/pdb/gimpprocedure.c:806 +#: ../app/pdb/gimpprocedure.c:818 #, c-format msgid "" "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" "in is trying to work on an image that doesn't exist any longer." msgstr "" -#: ../app/pdb/gimpprocedure.c:819 +#: ../app/pdb/gimpprocedure.c:831 #, c-format msgid "" "Procedure '%s' has been called with an invalid ID for argument '%s'. Most " "likely a plug-in is trying to work on an image that doesn't exist any longer." msgstr "" -#: ../app/pdb/gimpprocedure.c:840 +#: ../app/pdb/gimpprocedure.c:852 #, c-format msgid "" "Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value " "is out of range." msgstr "" -#: ../app/pdb/gimpprocedure.c:854 +#: ../app/pdb/gimpprocedure.c:866 #, c-format msgid "" "Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type " "%s). This value is out of range." msgstr "" -#: ../app/pdb/image-cmds.c:2310 +#: ../app/pdb/image-cmds.c:2339 msgid "" "Image resolution is out of bounds, using the default resolution instead." msgstr "ميْز الصورة جاوز الحد، سأستخدم الميْز المبدئي بدلا منه." #: ../app/pdb/image-select-cmds.c:302 ../app/pdb/selection-tools-cmds.c:223 -#: ../app/tools/gimpfreeselecttool.c:196 +#: ../app/tools/gimpfreeselecttool.c:128 msgid "Free Select" msgstr "تحديد حر" @@ -15410,206 +19386,206 @@ msgctxt "undo-type" msgid "Diffraction Patterns" msgstr "أنماط مقلمة" -#: ../app/pdb/plug-in-compat-cmds.c:1451 +#: ../app/pdb/plug-in-compat-cmds.c:1455 msgctxt "undo-type" msgid "Edge" msgstr "حافة" -#: ../app/pdb/plug-in-compat-cmds.c:1495 +#: ../app/pdb/plug-in-compat-cmds.c:1499 msgctxt "undo-type" msgid "Engrave" msgstr "نقش" -#: ../app/pdb/plug-in-compat-cmds.c:1568 +#: ../app/pdb/plug-in-compat-cmds.c:1572 msgctxt "undo-type" msgid "Color Exchange" msgstr "تبادل الألوان" -#: ../app/pdb/plug-in-compat-cmds.c:1616 +#: ../app/pdb/plug-in-compat-cmds.c:1620 msgctxt "undo-type" msgid "Lens Flare" msgstr "سطوع العدسات" -#: ../app/pdb/plug-in-compat-cmds.c:1800 +#: ../app/pdb/plug-in-compat-cmds.c:1804 msgctxt "undo-type" msgid "Glass Tile" msgstr "بلاط زجاجي" -#: ../app/pdb/plug-in-compat-cmds.c:1853 +#: ../app/pdb/plug-in-compat-cmds.c:1857 msgctxt "undo-type" msgid "Noise HSV" msgstr "ضجيج HSV" -#: ../app/pdb/plug-in-compat-cmds.c:2132 ../app/pdb/plug-in-compat-cmds.c:2187 +#: ../app/pdb/plug-in-compat-cmds.c:2136 ../app/pdb/plug-in-compat-cmds.c:2191 msgid "Set color profile" msgstr "حدد لاحة ألوان" -#: ../app/pdb/plug-in-compat-cmds.c:2242 +#: ../app/pdb/plug-in-compat-cmds.c:2246 msgctxt "undo-type" msgid "Illusion" msgstr "وهم" -#: ../app/pdb/plug-in-compat-cmds.c:2279 +#: ../app/pdb/plug-in-compat-cmds.c:2283 msgctxt "undo-type" msgid "Laplace" msgstr "لابلاس" -#: ../app/pdb/plug-in-compat-cmds.c:2355 +#: ../app/pdb/plug-in-compat-cmds.c:2359 msgctxt "undo-type" msgid "Lens Distortion" msgstr "تشوه العدسات" -#: ../app/pdb/plug-in-compat-cmds.c:2395 +#: ../app/pdb/plug-in-compat-cmds.c:2399 msgctxt "undo-type" msgid "Tile Seamless" msgstr "بلاط سلس" -#: ../app/pdb/plug-in-compat-cmds.c:2462 +#: ../app/pdb/plug-in-compat-cmds.c:2466 msgctxt "undo-type" msgid "Maze" msgstr "متاهة" -#: ../app/pdb/plug-in-compat-cmds.c:2545 ../app/pdb/plug-in-compat-cmds.c:2629 +#: ../app/pdb/plug-in-compat-cmds.c:2549 ../app/pdb/plug-in-compat-cmds.c:2633 msgctxt "undo-type" msgid "Motion Blur" msgstr "غشاوة حركية" -#: ../app/pdb/plug-in-compat-cmds.c:2730 +#: ../app/pdb/plug-in-compat-cmds.c:2734 msgctxt "undo-type" msgid "Mosaic" msgstr "فسيفساء" -#: ../app/pdb/plug-in-compat-cmds.c:2792 +#: ../app/pdb/plug-in-compat-cmds.c:2796 msgctxt "undo-type" msgid "Supernova" msgstr "سوبرنوفا" -#: ../app/pdb/plug-in-compat-cmds.c:2882 +#: ../app/pdb/plug-in-compat-cmds.c:2886 msgctxt "undo-type" msgid "Paper Tile" msgstr "بلاط ورقي" -#: ../app/pdb/plug-in-compat-cmds.c:2923 ../app/pdb/plug-in-compat-cmds.c:2966 +#: ../app/pdb/plug-in-compat-cmds.c:2927 ../app/pdb/plug-in-compat-cmds.c:2970 msgctxt "undo-type" msgid "Pixelize" msgstr "بكسلة" -#: ../app/pdb/plug-in-compat-cmds.c:3017 +#: ../app/pdb/plug-in-compat-cmds.c:3021 msgctxt "undo-type" msgid "Plasma" msgstr "بلازما" -#: ../app/pdb/plug-in-compat-cmds.c:3071 +#: ../app/pdb/plug-in-compat-cmds.c:3075 msgctxt "undo-type" msgid "Polar Coordinates" msgstr "إحداثيات قطبية" -#: ../app/pdb/plug-in-compat-cmds.c:3111 +#: ../app/pdb/plug-in-compat-cmds.c:3115 msgctxt "undo-type" msgid "Red Eye Removal" msgstr "إزالة تأثير العين الحمراء" -#: ../app/pdb/plug-in-compat-cmds.c:3164 +#: ../app/pdb/plug-in-compat-cmds.c:3168 msgctxt "undo-type" msgid "Random Hurl" msgstr "رمي عشوائي" -#: ../app/pdb/plug-in-compat-cmds.c:3217 +#: ../app/pdb/plug-in-compat-cmds.c:3221 msgctxt "undo-type" msgid "Random Pick" msgstr "انتقاء عشوائي" -#: ../app/pdb/plug-in-compat-cmds.c:3270 +#: ../app/pdb/plug-in-compat-cmds.c:3274 msgctxt "undo-type" msgid "Random Slur" msgstr "تلطيخ عشوائي" -#: ../app/pdb/plug-in-compat-cmds.c:3345 +#: ../app/pdb/plug-in-compat-cmds.c:3349 msgctxt "undo-type" msgid "RGB Noise" msgstr "ضجيج RGB" -#: ../app/pdb/plug-in-compat-cmds.c:3468 +#: ../app/pdb/plug-in-compat-cmds.c:3472 msgctxt "undo-type" msgid "Noisify" msgstr "ضجيج" -#: ../app/pdb/plug-in-compat-cmds.c:3512 +#: ../app/pdb/plug-in-compat-cmds.c:3516 msgctxt "undo-type" msgid "Selective Gaussian Blur" msgstr "غشاوة غوسية انتقائية" -#: ../app/pdb/plug-in-compat-cmds.c:3556 +#: ../app/pdb/plug-in-compat-cmds.c:3560 msgctxt "undo-type" msgid "Semi-Flatten" msgstr "شبه تسطيح" -#: ../app/pdb/plug-in-compat-cmds.c:3599 +#: ../app/pdb/plug-in-compat-cmds.c:3603 msgctxt "undo-type" msgid "Shift" msgstr "نقل" -#: ../app/pdb/plug-in-compat-cmds.c:3702 +#: ../app/pdb/plug-in-compat-cmds.c:3706 msgctxt "undo-type" msgid "Sinus" msgstr "جيب" -#: ../app/pdb/plug-in-compat-cmds.c:3750 +#: ../app/pdb/plug-in-compat-cmds.c:3754 msgctxt "undo-type" msgid "Sobel" msgstr "سوبل" -#: ../app/pdb/plug-in-compat-cmds.c:3811 +#: ../app/pdb/plug-in-compat-cmds.c:3815 msgctxt "undo-type" msgid "Solid Noise" msgstr "ضجيج صلب" -#: ../app/pdb/plug-in-compat-cmds.c:3855 +#: ../app/pdb/plug-in-compat-cmds.c:3859 msgctxt "undo-type" msgid "Spread" msgstr "انتشار" -#: ../app/pdb/plug-in-compat-cmds.c:3896 +#: ../app/pdb/plug-in-compat-cmds.c:3900 msgctxt "undo-type" msgid "Threshold Alpha" msgstr "عتبة الشفافية" -#: ../app/pdb/plug-in-compat-cmds.c:3942 +#: ../app/pdb/plug-in-compat-cmds.c:3946 msgctxt "undo-type" msgid "Video" msgstr "ڤديو" -#: ../app/pdb/plug-in-compat-cmds.c:3979 +#: ../app/pdb/plug-in-compat-cmds.c:3983 msgctxt "undo-type" msgid "Value Invert" msgstr "عكس القيمة" -#: ../app/pdb/plug-in-compat-cmds.c:4083 +#: ../app/pdb/plug-in-compat-cmds.c:4087 msgctxt "undo-type" msgid "Value Propagate" msgstr "انتشار القيمة" -#: ../app/pdb/plug-in-compat-cmds.c:4130 +#: ../app/pdb/plug-in-compat-cmds.c:4134 msgctxt "undo-type" msgid "Dilate" msgstr "خفِّف" -#: ../app/pdb/plug-in-compat-cmds.c:4177 +#: ../app/pdb/plug-in-compat-cmds.c:4181 msgctxt "undo-type" msgid "Erode" msgstr "تآكل" -#: ../app/pdb/plug-in-compat-cmds.c:4240 +#: ../app/pdb/plug-in-compat-cmds.c:4244 msgctxt "undo-type" msgid "Waves" msgstr "أمواج" -#: ../app/pdb/plug-in-compat-cmds.c:4288 +#: ../app/pdb/plug-in-compat-cmds.c:4292 msgctxt "undo-type" msgid "Whirl and Pinch" msgstr "دوامة و قرصة" -#: ../app/pdb/plug-in-compat-cmds.c:4340 +#: ../app/pdb/plug-in-compat-cmds.c:4344 msgctxt "undo-type" msgid "Wind" msgstr "رياح" @@ -15684,7 +19660,7 @@ msgstr "مفسّر سئ مشار إليه في ملف المفسر %s: ‏%s" msgid "Bad binary format string in interpreter file %s" msgstr "سلسلة نسق ثنائي سيئة في ملف المفسر %s" -#: ../app/plug-in/gimpplugin.c:648 +#: ../app/plug-in/gimpplugin.c:622 #, c-format msgid "" "Plug-in crashed: \"%s\"\n" @@ -15717,50 +19693,53 @@ msgstr "" "خطأ في تنفيذ الإجراء '%s'‏:\n" "%s" -#: ../app/plug-in/gimpplugin-progress.c:339 +#: ../app/plug-in/gimpplugin-progress.c:334 msgid "Cancelled" msgstr "أُلغِيَ" -#: ../app/plug-in/gimppluginmanager.c:258 -msgid "Plug-In Interpreters" +#: ../app/plug-in/gimppluginmanager.c:230 +#, fuzzy +msgid "Plug-in Interpreters" msgstr "مفسّرات الملحقة" -#: ../app/plug-in/gimppluginmanager.c:264 -msgid "Plug-In Environment" +#: ../app/plug-in/gimppluginmanager.c:236 +#, fuzzy +msgid "Plug-in Environment" msgstr "بيئة الملحقة" #: ../app/plug-in/gimppluginmanager-call.c:184 #: ../app/plug-in/gimppluginmanager-call.c:235 -#: ../app/plug-in/gimppluginmanager-call.c:333 +#: ../app/plug-in/gimppluginmanager-call.c:331 #, c-format msgid "Failed to run plug-in \"%s\"" msgstr "فشل تشغيل الملحقة \"%s\"" -#: ../app/plug-in/gimppluginmanager-file-procedure.c:203 +#: ../app/plug-in/gimppluginmanager-file-procedure.c:208 msgid "Unknown file type" msgstr "نوع ملف غير معروف" -#: ../app/plug-in/gimppluginmanager-restore.c:237 -msgid "Searching Plug-Ins" +#: ../app/plug-in/gimppluginmanager-restore.c:230 +#, fuzzy +msgid "Searching plug-ins" msgstr "يبحث في الامتدادات" -#: ../app/plug-in/gimppluginmanager-restore.c:334 +#: ../app/plug-in/gimppluginmanager-restore.c:395 msgid "Resource configuration" msgstr "ضبط الموارد" -#: ../app/plug-in/gimppluginmanager-restore.c:370 +#: ../app/plug-in/gimppluginmanager-restore.c:431 msgid "Querying new Plug-ins" msgstr "يستعلم عن الملحقات الجديدة" -#: ../app/plug-in/gimppluginmanager-restore.c:421 +#: ../app/plug-in/gimppluginmanager-restore.c:482 msgid "Initializing Plug-ins" msgstr "يجهز الملحقات" -#: ../app/plug-in/gimppluginmanager-restore.c:494 +#: ../app/plug-in/gimppluginmanager-restore.c:555 msgid "Starting Extensions" msgstr "يبدأ الامتدادات" -#: ../app/plug-in/gimppluginprocedure.c:1152 +#: ../app/plug-in/gimppluginprocedure.c:1172 #, c-format msgid "" "Calling error for '%s':\n" @@ -15769,7 +19748,7 @@ msgstr "" "خطأ في استدعاء '%s'‏:\n" "%s" -#: ../app/plug-in/gimppluginprocedure.c:1164 +#: ../app/plug-in/gimppluginprocedure.c:1184 #, c-format msgid "" "Execution error for '%s':\n" @@ -15778,26 +19757,343 @@ msgstr "" "خطأ في تنفيذ '%s'‏:\n" "%s" -#: ../app/plug-in/plug-in-rc.c:228 +#: ../app/plug-in/plug-in-rc.c:231 #, c-format msgid "Skipping '%s': wrong GIMP protocol version." msgstr "يتجاوز '%s': إصدار بروتوكول جمب خاطئ." -#: ../app/plug-in/plug-in-rc.c:235 +#: ../app/plug-in/plug-in-rc.c:238 #, c-format msgid "Skipping '%s': wrong pluginrc file format version." msgstr "يتجاوز '%s': إصدار ملف pluginrc خاطئ." -#: ../app/plug-in/plug-in-rc.c:507 +#: ../app/plug-in/plug-in-rc.c:510 #, c-format msgid "invalid value '%s' for icon type" msgstr "قيمة غير صحيحة '%s' لنوع أيقونة" -#: ../app/plug-in/plug-in-rc.c:522 +#: ../app/plug-in/plug-in-rc.c:525 #, c-format msgid "invalid value '%ld' for icon type" msgstr "'%ld' قيمة غير صحيحة لأيقونة" +#: ../app/propgui/gimppropgui-channel-mixer.c:63 +msgid "Red channel" +msgstr "القناة الحمراء" + +#: ../app/propgui/gimppropgui-channel-mixer.c:87 +msgid "Green channel" +msgstr "القناة الخضراء" + +#: ../app/propgui/gimppropgui-channel-mixer.c:111 +msgid "Blue channel" +msgstr "القناة الزرقاء" + +#: ../app/propgui/gimppropgui-color-balance.c:98 +msgid "Select Range to Adjust" +msgstr "اختر مدى لضبطه" + +#: ../app/propgui/gimppropgui-color-balance.c:103 +#: ../app/tools/gimplevelstool.c:247 +msgid "Adjust Color Levels" +msgstr "اضبط مستويات الألوان" + +#: ../app/propgui/gimppropgui-color-balance.c:119 +#: ../app/propgui/gimppropgui-hue-saturation.c:138 +msgid "Cyan" +msgstr "سيان" + +#: ../app/propgui/gimppropgui-color-balance.c:119 +#: ../app/propgui/gimppropgui-hue-saturation.c:135 +msgid "Red" +msgstr "أحمر" + +#: ../app/propgui/gimppropgui-color-balance.c:123 +#: ../app/propgui/gimppropgui-hue-saturation.c:140 +msgid "Magenta" +msgstr "ماجنتا" + +#: ../app/propgui/gimppropgui-color-balance.c:123 +#: ../app/propgui/gimppropgui-hue-saturation.c:137 +msgid "Green" +msgstr "أخضر" + +#: ../app/propgui/gimppropgui-color-balance.c:127 +#: ../app/propgui/gimppropgui-hue-saturation.c:136 +msgid "Yellow" +msgstr "أصفر" + +#: ../app/propgui/gimppropgui-color-balance.c:127 +#: ../app/propgui/gimppropgui-hue-saturation.c:139 +msgid "Blue" +msgstr "أزرق" + +#: ../app/propgui/gimppropgui-color-balance.c:134 +msgid "R_eset Range" +msgstr "_صفّر المدى" + +#: ../app/propgui/gimppropgui-color-balance.c:144 +msgid "Preserve _luminosity" +msgstr "حافظ على الإ_ضاءة" + +#: ../app/propgui/gimppropgui-color-rotate.c:126 +msgid "Clockwise" +msgstr "مع عقارب الساعة" + +#: ../app/propgui/gimppropgui-color-rotate.c:130 +#, fuzzy +msgid "Invert Range" +msgstr "اعكس القناة" + +#: ../app/propgui/gimppropgui-color-rotate.c:134 +#, fuzzy +msgid "Select All" +msgstr "اختر الكل" + +#: ../app/propgui/gimppropgui-color-rotate.c:214 +msgid "Source Range" +msgstr "المدى المصدر" + +#: ../app/propgui/gimppropgui-color-rotate.c:225 +msgid "Destination Range" +msgstr "المدى الهدف" + +#: ../app/propgui/gimppropgui-color-rotate.c:236 +msgid "Gray Handling" +msgstr "التعامل مع الرمادي" + +#: ../app/propgui/gimppropgui-color-to-alpha.c:109 +#, fuzzy +msgid "Pick farthest full-transparency color" +msgstr "بدّل الشفافية الجزئية بلون" + +#: ../app/propgui/gimppropgui-color-to-alpha.c:131 +msgid "Pick nearest full-opacity color" +msgstr "" + +#: ../app/propgui/gimppropgui-convolution-matrix.c:202 +#, fuzzy +msgid "Rotate matrix 90° counter-clockwise" +msgstr "لف 90° ع_كس اتجاه عقارب الساعة" + +#: ../app/propgui/gimppropgui-convolution-matrix.c:208 +#, fuzzy +msgid "Rotate matrix 90° clockwise" +msgstr "لف 90° باتجاه _عقارب الساعة" + +#: ../app/propgui/gimppropgui-convolution-matrix.c:214 +#, fuzzy +msgid "Flip matrix horizontally" +msgstr "اقلب الصورة أفقيا" + +#: ../app/propgui/gimppropgui-convolution-matrix.c:220 +#, fuzzy +msgid "Flip matrix vertically" +msgstr "اقلب الصورة رأسيا" + +#: ../app/propgui/gimppropgui-diffraction-patterns.c:68 +msgid "Frequencies" +msgstr "" + +#: ../app/propgui/gimppropgui-diffraction-patterns.c:79 +#, fuzzy +msgid "Contours" +msgstr "متّصل" + +#: ../app/propgui/gimppropgui-diffraction-patterns.c:90 +#, fuzzy +msgid "Sharp Edges" +msgstr "تحديد" + +#: ../app/propgui/gimppropgui-diffraction-patterns.c:101 +#, fuzzy +msgid "Other Options" +msgstr "خيارات الإبهات" + +#: ../app/propgui/gimppropgui-generic.c:185 +msgid "Pick coordinates from the image" +msgstr "خذ الإحداثيات من الصورة" + +#: ../app/propgui/gimppropgui-hue-saturation.c:134 +msgid "M_aster" +msgstr "الر_ئيسي" + +#: ../app/propgui/gimppropgui-hue-saturation.c:134 +msgid "Adjust all colors" +msgstr "اضبط كل الألوان" + +#: ../app/propgui/gimppropgui-hue-saturation.c:135 +msgid "_R" +msgstr "_ح" + +#: ../app/propgui/gimppropgui-hue-saturation.c:136 +msgid "_Y" +msgstr "_ص" + +#: ../app/propgui/gimppropgui-hue-saturation.c:137 +msgid "_G" +msgstr "_خ" + +#: ../app/propgui/gimppropgui-hue-saturation.c:138 +msgid "_C" +msgstr "_س" + +#: ../app/propgui/gimppropgui-hue-saturation.c:139 +msgid "_B" +msgstr "_ز" + +#: ../app/propgui/gimppropgui-hue-saturation.c:140 +msgid "_M" +msgstr "_م" + +#: ../app/propgui/gimppropgui-hue-saturation.c:150 +msgid "Select Primary Color to Adjust" +msgstr "حدد اللون الأساسي لضبطه" + +#: ../app/propgui/gimppropgui-hue-saturation.c:236 +msgid "_Overlap" +msgstr "_تداخل" + +#: ../app/propgui/gimppropgui-hue-saturation.c:241 +msgid "Adjust Selected Color" +msgstr "اضبط اللون المختار" + +#: ../app/propgui/gimppropgui-hue-saturation.c:251 +msgid "_Hue" +msgstr "ال_درجة" + +#: ../app/propgui/gimppropgui-hue-saturation.c:258 +msgid "_Lightness" +msgstr "الإ_ضاءة" + +#: ../app/propgui/gimppropgui-hue-saturation.c:265 +msgid "_Saturation" +msgstr "ال_تشبع" + +#: ../app/propgui/gimppropgui-hue-saturation.c:274 +msgid "R_eset Color" +msgstr "_صفّر الألوان" + +#: ../app/propgui/gimppropgui-recursive-transform.c:125 +#, fuzzy +msgid "Recursive Transform: " +msgstr "التحويل:" + +#: ../app/propgui/gimppropgui-shadows-highlights.c:62 +msgid "Shadows" +msgstr "" + +#: ../app/propgui/gimppropgui-shadows-highlights.c:80 +#, fuzzy +msgid "Highlights" +msgstr "أبرِز" + +#: ../app/propgui/gimppropgui-shadows-highlights.c:98 +#, fuzzy +msgid "Common" +msgstr "التعليق" + +#: ../app/propgui/gimppropgui-spiral.c:220 +msgid "Spiral: " +msgstr "" + +#: ../app/propgui/gimppropgui-supernova.c:125 +#, fuzzy +msgid "Supernova: " +msgstr "سوبرنوفا" + +#: ../app/propgui/gimppropgui-utils.c:70 +msgid "1,700 K – Match flame" +msgstr "" + +#: ../app/propgui/gimppropgui-utils.c:71 +msgid "1,850 K – Candle flame, sunset/sunrise" +msgstr "" + +#: ../app/propgui/gimppropgui-utils.c:72 +msgid "2,700 K - Soft (or warm) LED lamps" +msgstr "" + +#: ../app/propgui/gimppropgui-utils.c:73 +msgid "3,000 K – Soft (or warm) white compact fluorescent lamps" +msgstr "" + +#: ../app/propgui/gimppropgui-utils.c:74 +msgid "3,200 K – Studio lamps, photofloods, etc." +msgstr "" + +#: ../app/propgui/gimppropgui-utils.c:75 +msgid "3,300 K – Incandescent lamps" +msgstr "" + +#: ../app/propgui/gimppropgui-utils.c:76 +msgid "3,350 K – Studio \"CP\" light" +msgstr "" + +#: ../app/propgui/gimppropgui-utils.c:77 +msgid "4,000 K - Cold (daylight) LED lamps" +msgstr "" + +#: ../app/propgui/gimppropgui-utils.c:78 +msgid "4,100 K – Moonlight" +msgstr "" + +#: ../app/propgui/gimppropgui-utils.c:79 +msgid "5,000 K – D50" +msgstr "" + +#: ../app/propgui/gimppropgui-utils.c:80 +msgid "5,000 K – Cool white/daylight compact fluorescent lamps" +msgstr "" + +#: ../app/propgui/gimppropgui-utils.c:81 +msgid "5,000 K – Horizon daylight" +msgstr "" + +#: ../app/propgui/gimppropgui-utils.c:82 +msgid "5,500 K – D55" +msgstr "" + +#: ../app/propgui/gimppropgui-utils.c:83 +msgid "5,500 K – Vertical daylight, electronic flash" +msgstr "" + +#: ../app/propgui/gimppropgui-utils.c:84 +msgid "6,200 K – Xenon short-arc lamp" +msgstr "" + +#: ../app/propgui/gimppropgui-utils.c:85 +msgid "6,500 K – D65" +msgstr "" + +#: ../app/propgui/gimppropgui-utils.c:86 +msgid "6,500 K – Daylight, overcast" +msgstr "" + +#: ../app/propgui/gimppropgui-utils.c:87 +msgid "7,500 K – D75" +msgstr "" + +#: ../app/propgui/gimppropgui-utils.c:88 +msgid "9,300 K" +msgstr "" + +#: ../app/propgui/gimppropgui-utils.c:103 +msgid "Choose from a list of common color temperatures" +msgstr "" + +#: ../app/propgui/gimppropgui-utils.c:154 +msgid "New Seed" +msgstr "بذرة جديدة" + +#: ../app/propgui/gimppropgui.c:375 +msgid "Pick color from the image" +msgstr "خذ اللون من الصورة" + +#: ../app/propgui/gimppropgui.c:517 +msgid "This operation has no editable properties" +msgstr "ليس لهذه العملية أي خصائص قابلة للتحرير" + #. This is a so-called pangram; it's supposed to #. contain all characters found in the alphabet. #: ../app/text/gimpfont.c:50 @@ -15808,55 +20104,55 @@ msgstr "" "أبجد هوز حطي كلمن\n" "سعفص قرشت ثخذ ضظغ." -#: ../app/text/gimptext-compat.c:106 ../app/tools/gimptexttool.c:1409 +#: ../app/text/gimptext-compat.c:106 ../app/tools/gimptexttool.c:1472 msgid "Add Text Layer" msgstr "أضِف طبقة نصية" -#: ../app/text/gimptextlayer.c:148 +#: ../app/text/gimptextlayer.c:150 msgid "Text Layer" msgstr "طبقة نصية" -#: ../app/text/gimptextlayer.c:149 +#: ../app/text/gimptextlayer.c:151 msgid "Rename Text Layer" msgstr "غيّر اسم الطبقة النصية" -#: ../app/text/gimptextlayer.c:150 +#: ../app/text/gimptextlayer.c:152 msgid "Move Text Layer" msgstr "انقل الطبقة النصية" -#: ../app/text/gimptextlayer.c:151 +#: ../app/text/gimptextlayer.c:153 msgid "Scale Text Layer" msgstr "حجّم الطبقة النصية" -#: ../app/text/gimptextlayer.c:152 +#: ../app/text/gimptextlayer.c:154 msgid "Resize Text Layer" msgstr "غيّر حجم الطبقة النصية" -#: ../app/text/gimptextlayer.c:153 +#: ../app/text/gimptextlayer.c:155 msgid "Flip Text Layer" msgstr "اقلب الطبقة النصية" -#: ../app/text/gimptextlayer.c:154 +#: ../app/text/gimptextlayer.c:156 msgid "Rotate Text Layer" msgstr "دوّر الطبقة النصية" -#: ../app/text/gimptextlayer.c:155 +#: ../app/text/gimptextlayer.c:157 msgid "Transform Text Layer" msgstr "حوّل الطبقة النصية" -#: ../app/text/gimptextlayer.c:567 +#: ../app/text/gimptextlayer.c:565 msgid "Discard Text Information" msgstr "تجاهل معلومات النص" -#: ../app/text/gimptextlayer.c:635 +#: ../app/text/gimptextlayer.c:633 msgid "Due to lack of any fonts, text functionality is not available." msgstr "نظرا لعدم توفر أي خط؛ وظيفية النص لن تكون متاحة." -#: ../app/text/gimptextlayer.c:698 +#: ../app/text/gimptextlayer.c:696 msgid "Empty Text Layer" msgstr "أفرغ الطبقة النصية" -#: ../app/text/gimptextlayer.c:751 +#: ../app/text/gimptextlayer.c:749 msgid "" "Your text cannot be rendered. It is likely too big. Please make it shorter " "or use a smaller font." @@ -15893,7 +20189,7 @@ msgctxt "text-box-mode" msgid "Fixed" msgstr "ثابت" -#: ../app/tools/gimp-tools.c:381 +#: ../app/tools/gimp-tools.c:382 msgid "" "This tool has\n" "no options." @@ -15925,7 +20221,7 @@ msgstr "الإزاحة الأفقية للتوزيع" msgid "Vertical offset for distribution" msgstr "الإزاحة الرأسية للتوزيع" -#: ../app/tools/gimpalignoptions.c:282 ../app/tools/gimpaligntool.c:124 +#: ../app/tools/gimpalignoptions.c:282 ../app/tools/gimpaligntool.c:123 msgid "Align" msgstr "محاذاة" @@ -15989,132 +20285,251 @@ msgstr "وزّع قيعان الأهداف" msgid "Distribute targets evenly in the vertical" msgstr "وزّع الأهداف بالتساوي رأسيًا" -#: ../app/tools/gimpaligntool.c:125 +#: ../app/tools/gimpaligntool.c:124 msgid "Alignment Tool: Align or arrange layers and other objects" msgstr "أداة المحاذاة: حاذ أو رتب الطبقات والكائنات الأخرى" -#: ../app/tools/gimpaligntool.c:126 +#: ../app/tools/gimpaligntool.c:125 msgid "_Align" msgstr "حا_ذ" -#: ../app/tools/gimpaligntool.c:551 +#: ../app/tools/gimpaligntool.c:541 msgid "Click on a layer, path or guide, or Click-Drag to pick several layers" msgstr "انقر على طبقة أو مسار أو دليل، أو انقر واسحب لالتقاط عدة طبقات" -#: ../app/tools/gimpaligntool.c:559 +#: ../app/tools/gimpaligntool.c:549 msgid "Click to pick this layer as first item" msgstr "انقر لأخذ هذه الطبقة كأول عنصر" -#: ../app/tools/gimpaligntool.c:566 +#: ../app/tools/gimpaligntool.c:556 msgid "Click to add this layer to the list" msgstr "انقر لإضافة هذه الطبقة إلى القائمة" -#: ../app/tools/gimpaligntool.c:570 +#: ../app/tools/gimpaligntool.c:560 msgid "Click to pick this guide as first item" msgstr "انقر لأخذ هذا الدليل كأول عنصر" -#: ../app/tools/gimpaligntool.c:577 +#: ../app/tools/gimpaligntool.c:567 msgid "Click to add this guide to the list" msgstr "انقر لإضافة هذا الدليل إلى القائمة" -#: ../app/tools/gimpaligntool.c:581 +#: ../app/tools/gimpaligntool.c:571 msgid "Click to pick this path as first item" msgstr "انقر لأخذ هذا المسار كأول عنصر" -#: ../app/tools/gimpaligntool.c:588 +#: ../app/tools/gimpaligntool.c:578 msgid "Click to add this path to the list" msgstr "انقر لإضافة هذا المسار إلى القائمة" -#: ../app/tools/gimpblendoptions.c:100 +#: ../app/tools/gimpblendoptions.c:101 ../app/tools/gimpblendoptions.c:303 +msgid "Metric" +msgstr "" + +#: ../app/tools/gimpblendoptions.c:102 +msgid "Metric to use for the distance calculation" +msgstr "" + +#: ../app/tools/gimpblendoptions.c:116 #, fuzzy msgid "Adaptive Supersampling" msgstr "نمذجة عالية تكيفي_ة" -#: ../app/tools/gimpblendoptions.c:106 +#: ../app/tools/gimpblendoptions.c:122 msgid "Max depth" msgstr "العمق الأقصى" -#: ../app/tools/gimpblendoptions.c:112 ../app/tools/gimpbucketfilloptions.c:142 +#: ../app/tools/gimpblendoptions.c:128 ../app/tools/gimpbucketfilloptions.c:142 #: ../app/tools/gimpregionselectoptions.c:112 -#: ../app/tools/gimpthresholdtool.c:93 +#: ../app/tools/gimpthresholdtool.c:87 msgid "Threshold" msgstr "العتبة" -#: ../app/tools/gimpblendoptions.c:230 ../app/tools/gimppaintoptions-gui.c:373 +#: ../app/tools/gimpblendoptions.c:142 +#, fuzzy +msgid "Instant mode" +msgstr "تحديث آني" + +#: ../app/tools/gimpblendoptions.c:143 +msgid "Commit gradient instantly" +msgstr "" + +#: ../app/tools/gimpblendoptions.c:149 +#, fuzzy +msgid "Modify active gradient" +msgstr "حرّر التدرجات النشطة" + +#: ../app/tools/gimpblendoptions.c:150 +#, fuzzy +msgid "Modify the active gradient in-place" +msgstr "حرّر التدرجات النشطة" + +#: ../app/tools/gimpblendoptions.c:288 ../app/tools/gimppaintoptions-gui.c:379 #, fuzzy msgid "Edit this gradient" msgstr "حرّر التدرج" -#: ../app/tools/gimpblendtool.c:170 +#. the instant toggle +#: ../app/tools/gimpblendoptions.c:356 +#, fuzzy, c-format +msgid "Instant mode (%s)" +msgstr "تحديث آني" + +#: ../app/tools/gimpblendoptions.c:376 +msgid "" +"The active gradient is non-writable and cannot be edited directly. Uncheck " +"this option to edit a copy of it." +msgstr "" + +#: ../app/tools/gimpblendtool.c:156 msgid "Blend" msgstr "امزج" -#: ../app/tools/gimpblendtool.c:171 +#: ../app/tools/gimpblendtool.c:157 msgid "Blend Tool: Fill selected area with a color gradient" msgstr "أداة المزج: املأ المناطق المحددة بتدرج لوني" -#: ../app/tools/gimpblendtool.c:172 +#: ../app/tools/gimpblendtool.c:158 msgid "Blen_d" msgstr "ا_مزج" -#: ../app/tools/gimpblendtool.c:265 ../app/tools/gimpbucketfilltool.c:151 -#: ../app/tools/gimpfiltertool.c:315 -#: ../app/tools/gimpforegroundselecttool.c:290 ../app/tools/gimppainttool.c:285 -#: ../app/tools/gimptransformtool.c:1850 ../app/tools/gimpwarptool.c:586 +#: ../app/tools/gimpblendtool.c:213 +#, fuzzy +msgid "Click-Drag to draw a gradient" +msgstr "انقر واسحب لإضافة نقطة جديدة" + +#: ../app/tools/gimpblendtool.c:257 ../app/tools/gimpbucketfilltool.c:151 +#: ../app/tools/gimpcagetool.c:234 ../app/tools/gimpfiltertool.c:282 +#: ../app/tools/gimpforegroundselecttool.c:288 ../app/tools/gimppainttool.c:286 +#: ../app/tools/gimptransformtool.c:1443 ../app/tools/gimpwarptool.c:640 msgid "The active layer is not visible." msgstr "الطبقة النشطة غير مرئية." -#: ../app/tools/gimpblendtool.c:272 +#: ../app/tools/gimpblendtool.c:264 msgid "No gradient available for use with this tool." msgstr "لا تدرّجات متوفرة للاستخدام مع هذه الأداة." -#: ../app/tools/gimpblendtool.c:971 ../app/tools/gimppainttool.c:656 -#, c-format -msgid "%s for constrained angles" -msgstr "%s للزوايا المقيدة" - -#: ../app/tools/gimpblendtool.c:972 -#, c-format -msgid "%s to move the whole line" -msgstr "‏%s لنقل كل السطر" - -#: ../app/tools/gimpblendtool.c:976 +#: ../app/tools/gimpblendtool.c:614 msgid "Blend: " msgstr "امزج: " -#: ../app/tools/gimpbrightnesscontrasttool.c:101 +#. the position labels +#: ../app/tools/gimpblendtool-editor.c:1280 +#, fuzzy +msgid "X:" +msgstr "_س:" + +#: ../app/tools/gimpblendtool-editor.c:1286 +#, fuzzy +msgid "Y:" +msgstr "_ص:" + +#. the color label +#: ../app/tools/gimpblendtool-editor.c:1339 ../app/tools/gimptextoptions.c:583 +msgid "Color:" +msgstr "اللون:" + +#: ../app/tools/gimpblendtool-editor.c:1347 +#, fuzzy +msgid "Change Endpoint Color" +msgstr "لون نقطة النهاية اليسرى" + +#. the position label +#: ../app/tools/gimpblendtool-editor.c:1385 +#: ../app/tools/gimpblendtool-editor.c:1505 +#: ../app/tools/gimprectangleoptions.c:1031 +msgid "Position:" +msgstr "الموضع:" + +#. the color labels +#: ../app/tools/gimpblendtool-editor.c:1410 +#, fuzzy +msgid "Left color:" +msgstr "نوع اللون الأيسر" + +#: ../app/tools/gimpblendtool-editor.c:1416 +#, fuzzy +msgid "Right color:" +msgstr "نوع اللون الأيمن" + +#: ../app/tools/gimpblendtool-editor.c:1443 +#: ../app/tools/gimpblendtool-editor.c:1452 +#, fuzzy +msgid "Change Stop Color" +msgstr "غيّر لون المقدّمة" + +#: ../app/tools/gimpblendtool-editor.c:1474 +#, fuzzy +msgid "Delete stop" +msgstr "احذف المسار" + +#. the type label +#: ../app/tools/gimpblendtool-editor.c:1530 +#, fuzzy +msgid "Blending:" +msgstr "مزج" + +#. the color label +#: ../app/tools/gimpblendtool-editor.c:1552 +#, fuzzy +msgid "Coloring:" +msgstr "اللون:" + +#: ../app/tools/gimpblendtool-editor.c:1586 +msgid "New stop at midpoint" +msgstr "" + +#: ../app/tools/gimpblendtool-editor.c:1594 +#, fuzzy +msgid "Center midpoint" +msgstr "خطوط وسطية" + +#: ../app/tools/gimpblendtool-editor.c:1657 +#, fuzzy +msgid "Start Endpoint" +msgstr "نقطة الن_هاية اليسرى" + +#: ../app/tools/gimpblendtool-editor.c:1665 +#, fuzzy +msgid "End Endpoint" +msgstr "نقطة الن_هاية اليسرى" + +#: ../app/tools/gimpblendtool-editor.c:1718 +#, c-format +msgid "Stop %d" +msgstr "" + +#: ../app/tools/gimpblendtool-editor.c:1786 +#, fuzzy, c-format +msgid "Midpoint %d" +msgstr "نقطة" + +#: ../app/tools/gimpblendtool-editor.c:2364 +#: ../app/tools/gimpblendtool-editor.c:2373 +#, fuzzy +msgid "Blend Step" +msgstr "امزج: " + +#: ../app/tools/gimpbrightnesscontrasttool.c:97 msgid "Brightness-Contrast" msgstr "السطوع-التباين" -#: ../app/tools/gimpbrightnesscontrasttool.c:102 -msgid "Brightness/Contrast Tool: Adjust brightness and contrast" -msgstr "أداة السطوع/التباين: اضبط السطوع والتباين" - -#: ../app/tools/gimpbrightnesscontrasttool.c:103 +#: ../app/tools/gimpbrightnesscontrasttool.c:99 msgid "B_rightness-Contrast..." msgstr "ال_سطوع والتباين..." -#: ../app/tools/gimpbrightnesscontrasttool.c:121 -msgid "Import Brightness-Contrast settings" -msgstr "استورد إعدادات السطوع التباين" - -#: ../app/tools/gimpbrightnesscontrasttool.c:122 -msgid "Export Brightness-Contrast settings" -msgstr "صدّر إعدادات السطوع التباين" - -#: ../app/tools/gimpbrightnesscontrasttool.c:173 +#: ../app/tools/gimpbrightnesscontrasttool.c:161 msgid "Adjust Brightness and Contrast" msgstr "اضبط السطوع والتباين" -#: ../app/tools/gimpbrightnesscontrasttool.c:258 +#: ../app/tools/gimpbrightnesscontrasttool.c:277 msgid "_Brightness" msgstr "ال_سطوع" -#: ../app/tools/gimpbrightnesscontrasttool.c:266 +#: ../app/tools/gimpbrightnesscontrasttool.c:285 msgid "_Contrast" msgstr "ال_تباين" -#: ../app/tools/gimpbrightnesscontrasttool.c:273 +#: ../app/tools/gimpbrightnesscontrasttool.c:292 msgid "Edit these Settings as Levels" msgstr "حرّر هذه الإعدادات كمستويات" @@ -16225,27 +20640,27 @@ msgstr "" "املأ الموضع الأصلي\n" "للقفص بلون" -#: ../app/tools/gimpcagetool.c:160 ../app/tools/gimpcagetool.c:1198 +#: ../app/tools/gimpcagetool.c:158 ../app/tools/gimpcagetool.c:1223 msgid "Cage Transform" msgstr "تحويل القفص" -#: ../app/tools/gimpcagetool.c:161 +#: ../app/tools/gimpcagetool.c:159 msgid "Cage Transform: Deform a selection with a cage" msgstr "تحويل القفص: شوّه التحديد باستخدام قفص" -#: ../app/tools/gimpcagetool.c:162 +#: ../app/tools/gimpcagetool.c:160 msgid "_Cage Transform" msgstr "تحويل ال_قفص" -#: ../app/tools/gimpcagetool.c:317 ../app/tools/gimpwarptool.c:319 +#: ../app/tools/gimpcagetool.c:732 ../app/tools/gimpwarptool.c:329 msgid "Press ENTER to commit the transform" msgstr "اضغط ENTER لتنفيذ التحويل" -#: ../app/tools/gimpcagetool.c:1101 +#: ../app/tools/gimpcagetool.c:1133 msgid "Computing Cage Coefficients" msgstr "يحسِب مُعامِلات القفص" -#: ../app/tools/gimpcagetool.c:1249 +#: ../app/tools/gimpcagetool.c:1266 msgid "Cage transform" msgstr "تحويل القفص" @@ -16271,204 +20686,84 @@ msgstr "‏%s لتحدد مصدر استنساخ جديد" msgid "Click to set a new clone source" msgstr "انقر لتحدد مصدر استنساخ جديد" -#: ../app/tools/gimpcolorbalancetool.c:81 -msgid "Color Balance" -msgstr "توازن الألوان" +#: ../app/tools/gimpcoloroptions.c:70 +#, fuzzy +msgid "Use merged color value from all composited visible layers" +msgstr "استخدم اللون المجمّع من كل الطبقات المرئية الممزوجة" -#: ../app/tools/gimpcolorbalancetool.c:82 -msgid "Color Balance Tool: Adjust color distribution" -msgstr "أداة توازن الألوان: اضبط توزيع الألوان" - -#: ../app/tools/gimpcolorbalancetool.c:83 -msgid "Color _Balance..." -msgstr "توازن الأ_لوان..." - -#: ../app/tools/gimpcolorbalancetool.c:98 -msgid "Import Color Balance Settings" -msgstr "استورد إعدادات توازن الألوان" - -#: ../app/tools/gimpcolorbalancetool.c:99 -msgid "Export Color Balance Settings" -msgstr "صدّر إعدادات توازن الألوان" - -#: ../app/tools/gimpcolorbalancetool.c:125 -msgid "Color Balance operates only on RGB color layers." -msgstr "توازن الألوان يعمل فقط على طبقات ألوان خ‌ح‌ز." - -#: ../app/tools/gimpcolorbalancetool.c:140 -msgid "Adjust Color Balance" -msgstr "اضبط توازن الألوان" - -#: ../app/tools/gimpcolorbalancetool.c:195 -msgid "Select Range to Adjust" -msgstr "اختر مدى لضبطه" - -#: ../app/tools/gimpcolorbalancetool.c:200 ../app/tools/gimplevelstool.c:267 -msgid "Adjust Color Levels" -msgstr "اضبط مستويات الألوان" - -#: ../app/tools/gimpcolorbalancetool.c:216 -#: ../app/tools/gimphuesaturationtool.c:209 -msgid "Cyan" -msgstr "سيان" - -#: ../app/tools/gimpcolorbalancetool.c:216 -#: ../app/tools/gimphuesaturationtool.c:206 -msgid "Red" -msgstr "أحمر" - -#: ../app/tools/gimpcolorbalancetool.c:220 -#: ../app/tools/gimphuesaturationtool.c:211 -msgid "Magenta" -msgstr "ماجنتا" - -#: ../app/tools/gimpcolorbalancetool.c:220 -#: ../app/tools/gimphuesaturationtool.c:208 -msgid "Green" -msgstr "أخضر" - -#: ../app/tools/gimpcolorbalancetool.c:224 -#: ../app/tools/gimphuesaturationtool.c:207 -msgid "Yellow" -msgstr "أصفر" - -#: ../app/tools/gimpcolorbalancetool.c:224 -#: ../app/tools/gimphuesaturationtool.c:210 -msgid "Blue" -msgstr "أزرق" - -#: ../app/tools/gimpcolorbalancetool.c:231 -msgid "R_eset Range" -msgstr "_صفّر المدى" - -#: ../app/tools/gimpcolorbalancetool.c:241 -msgid "Preserve _luminosity" -msgstr "حافظ على الإ_ضاءة" - -#: ../app/tools/gimpcolorizetool.c:82 -msgid "Colorize" -msgstr "لوّن" - -#: ../app/tools/gimpcolorizetool.c:83 -msgid "Colorize Tool: Colorize the image" -msgstr "أداة التلوين: لوّن الصورة" - -#: ../app/tools/gimpcolorizetool.c:84 -msgid "Colori_ze..." -msgstr "_لوّن..." - -#: ../app/tools/gimpcolorizetool.c:99 -msgid "Import Colorize Settings" -msgstr "استورد إعدادات التلوين" - -#: ../app/tools/gimpcolorizetool.c:100 -msgid "Export Colorize Settings" -msgstr "صدّر إعدادات التلوين" - -#: ../app/tools/gimpcolorizetool.c:126 -msgid "Colorize does not operate on grayscale layers." -msgstr "التلوين لا يعمل على طبقات التدرج الرمادي." - -#: ../app/tools/gimpcolorizetool.c:141 -msgid "Colorize the Image" -msgstr "لوّن الصورة" - -#: ../app/tools/gimpcolorizetool.c:164 -msgid "Select Color" -msgstr "اختر لونا" - -#: ../app/tools/gimpcolorizetool.c:174 ../app/tools/gimphuesaturationtool.c:312 -msgid "_Hue" -msgstr "ال_تدرج" - -#: ../app/tools/gimpcolorizetool.c:181 ../app/tools/gimphuesaturationtool.c:326 -msgid "_Saturation" -msgstr "ال_تشبع" - -#: ../app/tools/gimpcolorizetool.c:188 ../app/tools/gimphuesaturationtool.c:319 -msgid "_Lightness" -msgstr "الإ_ضاءة" - -#: ../app/tools/gimpcolorizetool.c:199 -msgid "Colorize Color" -msgstr "لون التلوين" - -#: ../app/tools/gimpcolorizetool.c:211 -msgid "Pick color from image" -msgstr "استخدم لونا من الصورة" - -#: ../app/tools/gimpcoloroptions.c:76 ../app/tools/gimpcolorpickeroptions.c:69 +#: ../app/tools/gimpcoloroptions.c:77 ../app/tools/gimpcolorpickeroptions.c:71 msgid "Sample average" msgstr "معدل عينة" -#: ../app/tools/gimpcoloroptions.c:84 +#: ../app/tools/gimpcoloroptions.c:78 ../app/tools/gimpcolorpickeroptions.c:72 +#, fuzzy +msgid "Use averaged color value from nearby pixels" +msgstr "استخدم اللون المجمّع من كل الطبقات المرئية الممزوجة" + +#: ../app/tools/gimpcoloroptions.c:86 msgid "Color Picker Average Radius" msgstr "متوسط نصف قطر لاقط اللون" -#: ../app/tools/gimpcolorpickeroptions.c:70 -msgid "Use accumulated color value from all composited visible layers" -msgstr "استخدم اللون المجمّع من كل الطبقات المرئية الممزوجة" - -#: ../app/tools/gimpcolorpickeroptions.c:77 +#: ../app/tools/gimpcolorpickeroptions.c:79 #, fuzzy msgid "Pick Mode" msgstr "نمط الالتقاط (%s)" -#: ../app/tools/gimpcolorpickeroptions.c:78 +#: ../app/tools/gimpcolorpickeroptions.c:80 msgid "Choose what color picker will do" msgstr "اختر ما الذي سيفعله لاقط الألوان" -#: ../app/tools/gimpcolorpickeroptions.c:85 +#: ../app/tools/gimpcolorpickeroptions.c:87 #: ../app/tools/gimpmeasureoptions.c:68 msgid "Use info window" msgstr "استخدام نافذة المعلومات" -#: ../app/tools/gimpcolorpickeroptions.c:86 +#: ../app/tools/gimpcolorpickeroptions.c:88 msgid "" "Open a floating dialog to view picked color values in various color models" msgstr "افتح حوار عائم لعرض قيم الألوان المنتقاة في أنظمة الألوان المختلفة" #. the pick FG/BG frame -#: ../app/tools/gimpcolorpickeroptions.c:167 +#: ../app/tools/gimpcolorpickeroptions.c:195 #, c-format msgid "Pick Mode (%s)" msgstr "نمط الالتقاط (%s)" #. the use_info_window toggle button -#: ../app/tools/gimpcolorpickeroptions.c:176 +#: ../app/tools/gimpcolorpickeroptions.c:204 #, c-format msgid "Use info window (%s)" msgstr "نافذة معلومات الاستخدام (%s)" -#: ../app/tools/gimpcolorpickertool.c:102 +#: ../app/tools/gimpcolorpickertool.c:108 msgid "Color Picker" msgstr "لاقط الألوان" -#: ../app/tools/gimpcolorpickertool.c:103 +#: ../app/tools/gimpcolorpickertool.c:109 msgid "Color Picker Tool: Set colors from image pixels" msgstr "أداة لاقط الألوان: اضبط الألوان من بكسلات الصورة" -#: ../app/tools/gimpcolorpickertool.c:104 +#: ../app/tools/gimpcolorpickertool.c:110 msgid "C_olor Picker" msgstr "لاقط الأ_لون" -#: ../app/tools/gimpcolorpickertool.c:252 +#: ../app/tools/gimpcolorpickertool.c:253 msgid "Click in any image to view its color" msgstr "انقر أي صورة لعرض لونها" -#: ../app/tools/gimpcolorpickertool.c:259 ../app/tools/gimppainttool.c:497 +#: ../app/tools/gimpcolorpickertool.c:260 ../app/tools/gimppainttool.c:500 msgid "Click in any image to pick the foreground color" msgstr "انقر أي صورة لأخذ لون المقدمة" -#: ../app/tools/gimpcolorpickertool.c:267 ../app/tools/gimppainttool.c:503 +#: ../app/tools/gimpcolorpickertool.c:268 ../app/tools/gimppainttool.c:506 msgid "Click in any image to pick the background color" msgstr "انقر أي صورة لأخذ لون الخلفية" -#: ../app/tools/gimpcolorpickertool.c:275 +#: ../app/tools/gimpcolorpickertool.c:276 msgid "Click in any image to add the color to the palette" msgstr "انقر على أي صورة لإضافة اللون إلى اللوح" -#: ../app/tools/gimpcolorpickertool.c:342 +#: ../app/tools/gimpcolorpickertool.c:343 msgid "Color Picker Information" msgstr "معلومات لاقط اللون" @@ -16518,7 +20813,6 @@ msgstr "نوع التجديل (%s)" #: ../app/tools/gimpcropoptions.c:78 #: ../app/tools/gimprectangleselectoptions.c:78 -#: ../app/tools/gimptextoptions.c:130 msgid "Highlight" msgstr "أبرِز" @@ -16527,115 +20821,133 @@ msgstr "أبرِز" msgid "Dim everything outside selection" msgstr "أخفت أي شيء خارج التحديد" -#: ../app/tools/gimpcropoptions.c:85 +#: ../app/tools/gimpcropoptions.c:86 +#: ../app/tools/gimprectangleselectoptions.c:86 +#, fuzzy +msgid "Highlight opacity" +msgstr "أبرِز" + +#: ../app/tools/gimpcropoptions.c:87 +#: ../app/tools/gimprectangleselectoptions.c:87 +#, fuzzy +msgid "How much to dim everything outside selection" +msgstr "أخفت أي شيء خارج التحديد" + +#: ../app/tools/gimpcropoptions.c:93 msgid "Current layer only" msgstr "الطبقة الحالية فقط" -#: ../app/tools/gimpcropoptions.c:86 +#: ../app/tools/gimpcropoptions.c:94 msgid "Crop only currently selected layer" msgstr "قصّر الطبقة المحددة الآن فقط" -#: ../app/tools/gimpcropoptions.c:92 +#: ../app/tools/gimpcropoptions.c:100 msgid "Allow growing" msgstr "اسمح بالنمو" -#: ../app/tools/gimpcropoptions.c:93 +#: ../app/tools/gimpcropoptions.c:101 msgid "Allow resizing canvas by dragging cropping frame beyond image boundary" msgstr "اسمح بتغيير حجم رقعة الرسم بسحب إطار التقصير خارج حدود الصورة" -#: ../app/tools/gimpcropoptions.c:100 ../app/tools/gimpcropoptions.c:192 +#: ../app/tools/gimpcropoptions.c:108 ../app/tools/gimpcropoptions.c:200 #, fuzzy msgid "Fill with" msgstr "ا_ملأ بـ:" -#: ../app/tools/gimpcropoptions.c:101 +#: ../app/tools/gimpcropoptions.c:109 msgid "How to fill new areas created by 'Allow growing'" msgstr "" -#: ../app/tools/gimpcroptool.c:117 +#: ../app/tools/gimpcroptool.c:118 msgid "Crop" msgstr "قصّر" -#: ../app/tools/gimpcroptool.c:118 +#: ../app/tools/gimpcroptool.c:119 msgid "Crop Tool: Remove edge areas from image or layer" msgstr "أداة التقصير: احذف مناطق الحافة من صورة أو طبقة" -#: ../app/tools/gimpcroptool.c:119 +#: ../app/tools/gimpcroptool.c:120 msgid "_Crop" msgstr "_قصّر" -#: ../app/tools/gimpcroptool.c:252 +#: ../app/tools/gimpcroptool.c:158 +#, fuzzy +msgid "Click-Drag to draw a crop rectangle" +msgstr "انقر واسحب لإنشاء تحديد جديد" + +#: ../app/tools/gimpcroptool.c:278 msgid "Click or press Enter to crop" msgstr "انقر أو اضغط إدخال لتقصيرها" -#: ../app/tools/gimpcroptool.c:318 +#: ../app/tools/gimpcroptool.c:385 +#, fuzzy +msgid "Crop to: " +msgstr "قصّر إلى الم_حتوى" + +#: ../app/tools/gimpcroptool.c:455 msgid "There is no active layer to crop." msgstr "لا يوجد طبقة نشطة للقص منها." -#: ../app/tools/gimpcurvestool.c:147 +#: ../app/tools/gimpcurvestool.c:142 msgid "Curves" msgstr "منحنيات" -#: ../app/tools/gimpcurvestool.c:148 -msgid "Curves Tool: Adjust color curves" -msgstr "أداة المنحنيات: اضبط منحنيات الألوان" - -#: ../app/tools/gimpcurvestool.c:149 +#: ../app/tools/gimpcurvestool.c:144 msgid "_Curves..." msgstr "المن_حنيات..." -#: ../app/tools/gimpcurvestool.c:176 -msgid "Import Curves" -msgstr "استورد المنحنيات" - -#: ../app/tools/gimpcurvestool.c:177 -msgid "Export Curves" -msgstr "صدّر المنحنيات" - -#: ../app/tools/gimpcurvestool.c:345 +#: ../app/tools/gimpcurvestool.c:325 msgid "Click to add a control point" msgstr "انقر لإضافة نقطة تحكم" -#: ../app/tools/gimpcurvestool.c:350 +#: ../app/tools/gimpcurvestool.c:330 msgid "Click to add control points to all channels" msgstr "انقر لإضافة نقاط تحكم إلى كل القنوات" -#: ../app/tools/gimpcurvestool.c:355 +#: ../app/tools/gimpcurvestool.c:335 msgid "Click to locate on curve" msgstr "انقر لتحديد موضع المنحنى" -#: ../app/tools/gimpcurvestool.c:357 +#: ../app/tools/gimpcurvestool.c:337 #, c-format msgid "%s: add control point" msgstr "%s: أضف نقطة تحكم" -#: ../app/tools/gimpcurvestool.c:358 +#: ../app/tools/gimpcurvestool.c:338 #, c-format msgid "%s: add control points to all channels" msgstr "%s: أضف نقاط تحكم إلى كل القنوات" -#: ../app/tools/gimpcurvestool.c:411 +#: ../app/tools/gimpcurvestool.c:355 msgid "Adjust Color Curves" msgstr "اضبط منحنيات الألوان" -#: ../app/tools/gimpcurvestool.c:456 ../app/tools/gimplevelstool.c:363 -#: ../app/tools/gimpthresholdtool.c:222 +#: ../app/tools/gimpcurvestool.c:400 ../app/tools/gimplevelstool.c:345 +#: ../app/tools/gimpthresholdtool.c:194 msgid "Cha_nnel:" msgstr "الق_ناة:" -#: ../app/tools/gimpcurvestool.c:483 ../app/tools/gimplevelstool.c:388 +#: ../app/tools/gimpcurvestool.c:432 ../app/tools/gimplevelstool.c:375 msgid "R_eset Channel" msgstr "_صفّر القناة" -#: ../app/tools/gimpcurvestool.c:580 ../app/widgets/gimpdeviceinfoeditor.c:461 +#: ../app/tools/gimpcurvestool.c:452 +msgid "Adjust curves in linear light" +msgstr "" + +#: ../app/tools/gimpcurvestool.c:453 +msgid "Adjust curves perceptually" +msgstr "" + +#: ../app/tools/gimpcurvestool.c:543 ../app/widgets/gimpdeviceinfoeditor.c:464 msgid "Curve _type:" msgstr "نوع الم_نحنى:" -#: ../app/tools/gimpcurvestool.c:647 ../app/tools/gimplevelstool.c:664 +#: ../app/tools/gimpcurvestool.c:661 ../app/tools/gimplevelstool.c:744 msgid "Could not read header: " msgstr "تعذّر قراءة الترويسة:" -#: ../app/tools/gimpcurvestool.c:688 +#: ../app/tools/gimpcurvestool.c:735 msgid "Use _old curves file format" msgstr "استخدم نسق ملفات المنحنيات ال_قديم" @@ -16683,25 +20995,25 @@ msgstr "%s للتمويه" msgid "Type (%s)" msgstr "النوع (%s)" -#: ../app/tools/gimpeditselectiontool.c:439 -#: ../app/tools/gimpeditselectiontool.c:607 +#: ../app/tools/gimpeditselectiontool.c:449 +#: ../app/tools/gimpeditselectiontool.c:623 msgid "Move: " msgstr "انقل: " -#: ../app/tools/gimpeditselectiontool.c:860 -#: ../app/tools/gimpeditselectiontool.c:1119 +#: ../app/tools/gimpeditselectiontool.c:879 +#: ../app/tools/gimpeditselectiontool.c:1138 msgid "Move Floating Selection" msgstr "انقل التحديد الحر" -#: ../app/tools/gimpellipseselecttool.c:66 +#: ../app/tools/gimpellipseselecttool.c:64 msgid "Ellipse Select" msgstr "تحديد بيضاوي" -#: ../app/tools/gimpellipseselecttool.c:67 +#: ../app/tools/gimpellipseselecttool.c:65 msgid "Ellipse Select Tool: Select an elliptical region" msgstr "أداة التحديد البيضاوي: حدد منطقة بيضاوية" -#: ../app/tools/gimpellipseselecttool.c:68 +#: ../app/tools/gimpellipseselecttool.c:66 msgid "_Ellipse Select" msgstr "_تحديد بيضاوي" @@ -16732,65 +21044,74 @@ msgstr "‏%s لالتقاط لون الخلفية" msgid "Anti erase (%s)" msgstr "مضاد المسح (%s)" -#: ../app/tools/gimpfilteroptions.c:74 +#: ../app/tools/gimpfilteroptions.c:71 msgid "_Preview" msgstr "م_عاينة" -#: ../app/tools/gimpfilteroptions.c:81 +#: ../app/tools/gimpfilteroptions.c:78 #, fuzzy -msgid "_Split view" +msgid "Split _view" msgstr "شق" -#: ../app/tools/gimpfilteroptions.c:112 +#: ../app/tools/gimpfilteroptions.c:109 #, fuzzy msgid "Color _managed" msgstr "إدارة الألوان" #. The Color Options expander -#: ../app/tools/gimpfiltertool.c:427 +#: ../app/tools/gimpfiltertool.c:371 #, fuzzy msgid "Advanced Color Options" msgstr "الخيارات المتقدمة" -#: ../app/tools/gimpfiltertool.c:442 -msgid "Apply filter in color managed space (slow)" +#: ../app/tools/gimpfiltertool.c:390 +msgid "Convert pixels to built-in sRGB to apply filter (slow)" msgstr "" -#: ../app/tools/gimpfiltertool.c:443 -#, fuzzy -msgid "Apply filter to the layer's raw pixels" -msgstr "طبّق تأثير قناع الطبقة ثم احذفه" +#: ../app/tools/gimpfiltertool.c:391 +msgid "Assume pixels are built-in sRGB (ignore actual image color space)" +msgstr "" -#: ../app/tools/gimpfiltertool.c:658 +#: ../app/tools/gimpfiltertool.c:626 #, fuzzy msgid "Click to switch the original and filtered sides" msgstr "انقر لأخذ هذا الدليل كأول عنصر" -#: ../app/tools/gimpfiltertool.c:662 +#: ../app/tools/gimpfiltertool.c:630 #, fuzzy msgid "Click to switch between vertical and horizontal" msgstr "انقر لوضع دليلا أفقيا ورأسيا" -#: ../app/tools/gimpfiltertool.c:666 +#: ../app/tools/gimpfiltertool.c:634 #, fuzzy msgid "Click to move the split guide" msgstr "انقر لتمويه السطر" -#: ../app/tools/gimpfiltertool.c:668 +#: ../app/tools/gimpfiltertool.c:636 #, c-format msgid "%s: switch original and filtered" msgstr "" -#: ../app/tools/gimpfiltertool.c:669 +#: ../app/tools/gimpfiltertool.c:637 #, c-format msgid "%s: switch horizontal and vertical" msgstr "" -#: ../app/tools/gimpfiltertool-settings.c:81 +#: ../app/tools/gimpfiltertool.c:1298 ../app/tools/gimpfiltertool-settings.c:71 +#, c-format +msgid "Import '%s' Settings" +msgstr "استورد إعدادات '%s'" + +#: ../app/tools/gimpfiltertool.c:1300 ../app/tools/gimpfiltertool-settings.c:73 +#, c-format +msgid "Export '%s' Settings" +msgstr "صدّر إعدادات '%s'" + +#: ../app/tools/gimpfiltertool-settings.c:100 msgid "Pre_sets:" msgstr "الم_حفوظات:" -#: ../app/tools/gimpfiltertool-settings.c:242 +#: ../app/tools/gimpfiltertool-settings.c:240 #, c-format msgid "Settings saved to '%s'" msgstr "حُفِظت الإعدادات في '%s'" @@ -16804,35 +21125,40 @@ msgstr "نوع الملف" msgid "Direction of flipping" msgstr "اتجاه القلب" -#: ../app/tools/gimpflipoptions.c:135 ../app/tools/gimptransformoptions.c:426 +#: ../app/tools/gimpflipoptions.c:139 ../app/tools/gimptransformoptions.c:425 msgid "Transform:" msgstr "التحويل:" #. tool toggle -#: ../app/tools/gimpflipoptions.c:144 ../app/tools/gimpmagnifyoptions.c:191 +#: ../app/tools/gimpflipoptions.c:148 ../app/tools/gimpmagnifyoptions.c:191 #, c-format msgid "Direction (%s)" msgstr "الاتجاه (%s)" -#: ../app/tools/gimpfliptool.c:85 +#: ../app/tools/gimpflipoptions.c:170 ../app/tools/gimptransformoptions.c:132 +#: ../app/tools/gimptransformoptions.c:447 +msgid "Clipping" +msgstr "القص" + +#: ../app/tools/gimpfliptool.c:106 msgid "Flip" msgstr "اقلب" -#: ../app/tools/gimpfliptool.c:86 +#: ../app/tools/gimpfliptool.c:107 msgid "" "Flip Tool: Reverse the layer, selection or path horizontally or vertically" msgstr "أداة القلب: اقلب الطبقة، أو التحديد أو المسار أفقيا أو رأسيا" -#: ../app/tools/gimpfliptool.c:88 +#: ../app/tools/gimpfliptool.c:109 ../app/tools/gimpfliptool.c:133 msgid "_Flip" msgstr "ا_قلب" -#: ../app/tools/gimpfliptool.c:188 +#: ../app/tools/gimpfliptool.c:298 msgctxt "undo-type" msgid "Flip horizontally" msgstr "اقلب أفقيا" -#: ../app/tools/gimpfliptool.c:191 +#: ../app/tools/gimpfliptool.c:301 msgctxt "undo-type" msgid "Flip vertically" msgstr "اقلب رأسيا" @@ -16840,7 +21166,7 @@ msgstr "اقلب رأسيا" #. probably this is not actually reached today, but #. * could be if someone defined FLIP_DIAGONAL, say... #. -#: ../app/tools/gimpfliptool.c:197 +#: ../app/tools/gimpfliptool.c:307 msgctxt "undo-desc" msgid "Flip" msgstr "اقلب" @@ -16905,19 +21231,19 @@ msgstr "عدد المرّات المطبقة" msgid "Reset stroke width native size" msgstr "صفّر حجم السماكة لقيمته الطبيعية" -#: ../app/tools/gimpforegroundselecttool.c:187 +#: ../app/tools/gimpforegroundselecttool.c:189 msgid "Foreground Select" msgstr "تحديد المقدمة" -#: ../app/tools/gimpforegroundselecttool.c:188 +#: ../app/tools/gimpforegroundselecttool.c:190 msgid "Foreground Select Tool: Select a region containing foreground objects" msgstr "أداة تحديد المقدمة: حدد منطقة تحتوي كائن مقدمة" -#: ../app/tools/gimpforegroundselecttool.c:189 +#: ../app/tools/gimpforegroundselecttool.c:191 msgid "F_oreground Select" msgstr "تحديد ال_مقدمة" -#: ../app/tools/gimpforegroundselecttool.c:303 +#: ../app/tools/gimpforegroundselecttool.c:301 msgid "Dialog for foreground select" msgstr "حوار تحديد المقدمة" @@ -16929,61 +21255,44 @@ msgstr "قناع الم_عاينة" msgid "Select foreground pixels" msgstr "اختر بكسلات المقدمة" -#: ../app/tools/gimpforegroundselecttool.c:598 +#: ../app/tools/gimpforegroundselecttool.c:606 msgid "Roughly outline the object to extract" msgstr "حدد بشكل عام الكائن الذي سيُستخرج" -#: ../app/tools/gimpforegroundselecttool.c:619 +#: ../app/tools/gimpforegroundselecttool.c:627 msgid "Selecting foreground," msgstr "يختار المقدمة،" -#: ../app/tools/gimpforegroundselecttool.c:621 +#: ../app/tools/gimpforegroundselecttool.c:629 msgid "Selecting background," msgstr "يختار الخلفية،" -#: ../app/tools/gimpforegroundselecttool.c:623 +#: ../app/tools/gimpforegroundselecttool.c:631 msgid "Selecting unknown," msgstr "يختار غير المعروف،" -#: ../app/tools/gimpforegroundselecttool.c:626 +#: ../app/tools/gimpforegroundselecttool.c:634 msgid "press Enter to preview." msgstr "انقر إدخال للمعاينة" -#: ../app/tools/gimpforegroundselecttool.c:628 +#: ../app/tools/gimpforegroundselecttool.c:636 msgid "press Escape to exit preview or Enter to apply." msgstr "انقر Escape للخروج من المعاينة أو إدخال للتطبيق." -#: ../app/tools/gimpforegroundselecttool.c:1225 +#: ../app/tools/gimpforegroundselecttool.c:1210 msgid "Paint mask" msgstr "قناع الرسم" -#: ../app/tools/gimpfreeselecttool.c:197 +#: ../app/tools/gimpfreeselecttool.c:129 msgid "" "Free Select Tool: Select a hand-drawn region with free and polygonal segments" msgstr "أداة التحديد الحر: حدد منطقة مرسومة يدويا بقطع حرة ومضلعة" -#: ../app/tools/gimpfreeselecttool.c:199 +#: ../app/tools/gimpfreeselecttool.c:131 msgid "_Free Select" msgstr "تحديد _حر" -#: ../app/tools/gimpfreeselecttool.c:816 -msgid "Click to complete selection" -msgstr "انقر لإكمال التحديد" - -#: ../app/tools/gimpfreeselecttool.c:820 -msgid "Click-Drag to move segment vertex" -msgstr "انقر واسحب لنقل قمة النقطة" - -#: ../app/tools/gimpfreeselecttool.c:825 -msgid "Return commits, Escape cancels, Backspace removes last segment" -msgstr "" -"إدخال (Enter) يودع، و تجاهل (Escape) يُلغي، و تراجع (Backspace) يحذف آخر قطعة" - -#: ../app/tools/gimpfreeselecttool.c:829 -msgid "Click-Drag adds a free segment, Click adds a polygonal segment" -msgstr "النقر والسحب يضيف قطعة جديدة، النقر يضيف قطعة مضلعة" - -#: ../app/tools/gimpfreeselecttool.c:1408 +#: ../app/tools/gimpfreeselecttool.c:494 msgctxt "command" msgid "Free Select" msgstr "تحديد حر" @@ -17005,23 +21314,33 @@ msgctxt "command" msgid "Fuzzy Select" msgstr "تحديد ضباضي" -#: ../app/tools/gimpgegltool.c:72 ../app/tools/gimpgegltool.c:466 -#: ../app/tools/gimpgegltool.c:467 ../app/tools/gimpoperationtool.c:132 +#: ../app/tools/gimpgegltool.c:78 ../app/tools/gimpgegltool.c:539 +#: ../app/tools/gimpgegltool.c:540 ../app/tools/gimpoperationtool.c:134 msgid "GEGL Operation" msgstr "عمليات جي.إي.جي.إل" -#: ../app/tools/gimpgegltool.c:73 +#: ../app/tools/gimpgegltool.c:79 msgid "GEGL Tool: Use an arbitrary GEGL operation" msgstr "أداة جي.إي.جي.إل: استخدم عملية جي.إي.جي.إل معينة" -#: ../app/tools/gimpgegltool.c:74 ../app/tools/gimpoperationtool.c:134 +#: ../app/tools/gimpgegltool.c:80 ../app/tools/gimpoperationtool.c:136 msgid "_GEGL Operation..." msgstr "عمليات _جي.إي.جي.إل..." -#: ../app/tools/gimpgegltool.c:421 +#. The options vbox +#: ../app/tools/gimpgegltool.c:484 msgid "Select an operation from the list above" msgstr "احذف كل العمليات من القائمة أعلاه" +#: ../app/tools/gimpgenerictransformtool.c:83 +msgid "Transform Matrix" +msgstr "مصفوفة التحويل" + +#: ../app/tools/gimpgenerictransformtool.c:114 +#, fuzzy +msgid "Invalid transform" +msgstr "التحويل الموحد" + #: ../app/tools/gimpguidetool.c:274 msgid "Remove Guide" msgstr "احذف الدليل" @@ -17056,30 +21375,25 @@ msgstr "" msgid "Remove transform handles" msgstr "" -#: ../app/tools/gimphandletransformtool.c:164 +#: ../app/tools/gimphandletransformtool.c:115 msgid "Handle Transform" msgstr "" -#: ../app/tools/gimphandletransformtool.c:165 +#: ../app/tools/gimphandletransformtool.c:116 #, fuzzy msgid "Handle Transform Tool: Deform the layer, selection or path with handles" msgstr "أداة التحويل الموحد: حوّل الطبقة أو التحديد أو المسار" -#: ../app/tools/gimphandletransformtool.c:167 +#: ../app/tools/gimphandletransformtool.c:118 #, fuzzy msgid "_Handle Transform" msgstr "تحويل ال_قفص" -#: ../app/tools/gimphandletransformtool.c:199 +#: ../app/tools/gimphandletransformtool.c:146 msgid "Handle transformation" msgstr "" -#: ../app/tools/gimphandletransformtool.c:425 -#: ../app/tools/gimpperspectivetool.c:131 -msgid "Transformation Matrix" -msgstr "مصفوفة التحويل" - -#: ../app/tools/gimphandletransformtool.c:678 +#: ../app/tools/gimphandletransformtool.c:310 msgctxt "undo-type" msgid "Handle transform" msgstr "" @@ -17110,78 +21424,6 @@ msgstr "انقر لتحدد مصدر إصلاح جديد" msgid "Histogram Scale" msgstr "مقياس الرسم البياني" -#: ../app/tools/gimphuesaturationtool.c:97 -msgid "Hue-Saturation Tool: Adjust hue, saturation, and lightness" -msgstr "أداة التدرج والتشبع: اضبط التدرج والتشبع والإضاءة" - -#: ../app/tools/gimphuesaturationtool.c:98 -msgid "Hue-_Saturation..." -msgstr "التدرج و التشبع..." - -#: ../app/tools/gimphuesaturationtool.c:116 -msgid "Import Hue-Saturation Settings" -msgstr "استورد إعدادات التدرج و التشبع" - -#: ../app/tools/gimphuesaturationtool.c:117 -msgid "Export Hue-Saturation Settings" -msgstr "صدّر إعدادات التدرج و التشبع" - -#: ../app/tools/gimphuesaturationtool.c:153 -msgid "Hue-Saturation operates only on RGB color layers." -msgstr "التدرج و التشبع يعمل فقط على طبقات ح‌خ‌ز." - -#: ../app/tools/gimphuesaturationtool.c:168 -msgid "Adjust Hue / Lightness / Saturation" -msgstr "اضبط التدرج / الإضاءة / التشبع" - -#: ../app/tools/gimphuesaturationtool.c:205 -msgid "M_aster" -msgstr "الر_ئيسي" - -#: ../app/tools/gimphuesaturationtool.c:205 -msgid "Adjust all colors" -msgstr "اضبط كل الألوان" - -#: ../app/tools/gimphuesaturationtool.c:206 -msgid "_R" -msgstr "_ح" - -#: ../app/tools/gimphuesaturationtool.c:207 -msgid "_Y" -msgstr "_ص" - -#: ../app/tools/gimphuesaturationtool.c:208 -msgid "_G" -msgstr "_خ" - -#: ../app/tools/gimphuesaturationtool.c:209 -msgid "_C" -msgstr "_س" - -#: ../app/tools/gimphuesaturationtool.c:210 -msgid "_B" -msgstr "_ز" - -#: ../app/tools/gimphuesaturationtool.c:211 -msgid "_M" -msgstr "_م" - -#: ../app/tools/gimphuesaturationtool.c:216 -msgid "Select Primary Color to Adjust" -msgstr "حدد اللون الأساسي لضبطه" - -#: ../app/tools/gimphuesaturationtool.c:297 -msgid "_Overlap" -msgstr "_تداخل" - -#: ../app/tools/gimphuesaturationtool.c:302 -msgid "Adjust Selected Color" -msgstr "اضبط اللون المختار" - -#: ../app/tools/gimphuesaturationtool.c:335 -msgid "R_eset Color" -msgstr "_صفّر الألوان" - #. adjust sliders #: ../app/tools/gimpinkoptions-gui.c:55 msgid "Adjustment" @@ -17224,10 +21466,6 @@ msgstr "_مقص ذكي" msgid "Click to remove this point" msgstr "انقر لحذف هذه النقطة" -#: ../app/tools/gimpiscissorstool.c:911 ../app/tools/gimpmeasuretool.c:608 -msgid "Click-Drag to move this point" -msgstr "انقر واسحب لنقل هذه النقطة" - #: ../app/tools/gimpiscissorstool.c:913 ../app/tools/gimpiscissorstool.c:982 #, c-format msgid "%s: disable auto-snap" @@ -17258,79 +21496,84 @@ msgstr "اضغط إدخال (Enter) لتحويلها إلى تحديد" msgid "Click or Click-Drag to add a point" msgstr "انقر أو انقر واسحب لإضافة نقطة" -#: ../app/tools/gimpiscissorstool.c:1118 ../app/tools/gimpiscissorstool.c:1130 +#: ../app/tools/gimpiscissorstool.c:1117 ../app/tools/gimpiscissorstool.c:1129 msgid "Modify Scissors Curve" msgstr "" -#: ../app/tools/gimplevelstool.c:138 -msgid "Levels Tool: Adjust color levels" -msgstr "أداة المستويات: اضبط مستويات الألوان" - -#: ../app/tools/gimplevelstool.c:139 +#: ../app/tools/gimplevelstool.c:134 msgid "_Levels..." msgstr "الم_ستويات..." -#: ../app/tools/gimplevelstool.c:158 -msgid "Import Levels" -msgstr "استورد المستويات" - -#: ../app/tools/gimplevelstool.c:159 -msgid "Export Levels" -msgstr "صدّر المستويات" - -#: ../app/tools/gimplevelstool.c:291 +#: ../app/tools/gimplevelstool.c:271 msgid "Pick black point for all channels" msgstr "اختر النقطة السوداء لكل القنوات" -#: ../app/tools/gimplevelstool.c:293 +#: ../app/tools/gimplevelstool.c:273 msgid "Pick black point for the selected channel" msgstr "اختر النقطة السوداء لكل القنوات المحددة" -#: ../app/tools/gimplevelstool.c:300 +#: ../app/tools/gimplevelstool.c:280 msgid "Pick gray point for all channels" msgstr "اختر النقطة الرمادية لكل القنوات" -#: ../app/tools/gimplevelstool.c:302 +#: ../app/tools/gimplevelstool.c:282 msgid "Pick gray point for the selected channel" msgstr "اختر النقطة الرمادية لكل القنوات المحددة" -#: ../app/tools/gimplevelstool.c:309 +#: ../app/tools/gimplevelstool.c:289 msgid "Pick white point for all channels" msgstr "اختر النقطة البيضاء لكل القنوات" -#: ../app/tools/gimplevelstool.c:311 +#: ../app/tools/gimplevelstool.c:291 msgid "Pick white point for the selected channel" msgstr "اختر النقطة البيضاء لكل القنوات المحددة" +#: ../app/tools/gimplevelstool.c:395 +msgid "Adjust levels in linear light" +msgstr "" + +#: ../app/tools/gimplevelstool.c:396 +#, fuzzy +msgid "Adjust levels perceptually" +msgstr "اضبط مستويات كل القنوات تلقائيا" + #. Input levels frame -#: ../app/tools/gimplevelstool.c:407 +#: ../app/tools/gimplevelstool.c:405 msgid "Input Levels" msgstr "مستويات الدخل" +#: ../app/tools/gimplevelstool.c:492 +msgid "Clamp _input" +msgstr "" + #. Output levels frame -#: ../app/tools/gimplevelstool.c:523 +#: ../app/tools/gimplevelstool.c:535 msgid "Output Levels" msgstr "مستويات الخرج" +#: ../app/tools/gimplevelstool.c:583 +msgid "Clamp outpu_t" +msgstr "" + #. all channels frame -#: ../app/tools/gimplevelstool.c:581 +#: ../app/tools/gimplevelstool.c:598 msgid "All Channels" msgstr "كل القنوات" -#: ../app/tools/gimplevelstool.c:593 +#: ../app/tools/gimplevelstool.c:610 #, fuzzy msgid "_Auto Input Levels" msgstr "مستويات الدخل" -#: ../app/tools/gimplevelstool.c:596 +#: ../app/tools/gimplevelstool.c:613 msgid "Adjust levels for all channels automatically" msgstr "اضبط مستويات كل القنوات تلقائيا" -#: ../app/tools/gimplevelstool.c:623 +#: ../app/tools/gimplevelstool.c:640 msgid "Edit these Settings as Curves" msgstr "حرر هذه الإعدادات كمنحنيات" -#: ../app/tools/gimplevelstool.c:774 +#: ../app/tools/gimplevelstool.c:860 msgid "Use _old levels file format" msgstr "استخدم نسق ملفات المستويات ال_قديم" @@ -17368,57 +21611,32 @@ msgstr "_قرّب" msgid "Open a floating dialog to view details about measurements" msgstr "افتح نافذة عائمة لعرض تفاصيل القياسات" -#: ../app/tools/gimpmeasuretool.c:127 +#: ../app/tools/gimpmeasuretool.c:121 msgid "Measure" msgstr "قِس" -#: ../app/tools/gimpmeasuretool.c:128 +#: ../app/tools/gimpmeasuretool.c:122 msgid "Measure Tool: Measure distances and angles" msgstr "أداة القياس: لقياس المسافات والزوايا" -#: ../app/tools/gimpmeasuretool.c:129 +#: ../app/tools/gimpmeasuretool.c:123 msgid "_Measure" msgstr "_قِس" -#: ../app/tools/gimpmeasuretool.c:251 +#: ../app/tools/gimpmeasuretool.c:156 +#, fuzzy +msgid "Click-Drag to create a line" +msgstr "اسحب لإنشاء خط" + +#: ../app/tools/gimpmeasuretool.c:334 msgid "Add Guides" msgstr "أضِف أدلة" -#: ../app/tools/gimpmeasuretool.c:317 -msgid "Drag to create a line" -msgstr "اسحب لإنشاء خط" - -#: ../app/tools/gimpmeasuretool.c:563 -msgid "Click to place vertical and horizontal guides" -msgstr "انقر لوضع دليلا أفقيا ورأسيا" - -#: ../app/tools/gimpmeasuretool.c:571 -msgid "Click to place a horizontal guide" -msgstr "انقر لوضع دليلا أفقي" - -#: ../app/tools/gimpmeasuretool.c:585 -msgid "Click to place a vertical guide" -msgstr "انقر لوضع دليلا رأسي" - -#: ../app/tools/gimpmeasuretool.c:598 -msgid "Click-Drag to add a new point" -msgstr "انقر واسحب لإضافة نقطة جديدة" - -#: ../app/tools/gimpmeasuretool.c:627 -msgid "Click-Drag to move all points" -msgstr "انقر واسحب لنقل جميع النقاط" - -#: ../app/tools/gimpmeasuretool.c:943 ../app/tools/gimpmeasuretool.c:1094 -#: ../app/tools/gimpmeasuretool.c:1150 ../app/tools/gimpmeasuretool.c:1178 -#: ../app/tools/gimppainttool.c:665 -msgid "pixels" -msgstr "بكسل" - -#: ../app/tools/gimpmeasuretool.c:1058 +#: ../app/tools/gimpmeasuretool.c:645 msgid "Measure Distances and Angles" msgstr "قِس المسافات والزوايا" -#: ../app/tools/gimpmeasuretool.c:1083 +#: ../app/tools/gimpmeasuretool.c:670 msgid "Distance:" msgstr "المسافة:" @@ -17451,40 +21669,40 @@ msgstr "انقل:" msgid "Tool Toggle (%s)" msgstr "بدّل الأداة (%s)" -#: ../app/tools/gimpmovetool.c:113 +#: ../app/tools/gimpmovetool.c:112 msgctxt "tool" msgid "Move" msgstr "انقل" -#: ../app/tools/gimpmovetool.c:114 +#: ../app/tools/gimpmovetool.c:113 msgid "Move Tool: Move layers, selections, and other objects" msgstr "أداة النقل: انقل الطبقات والتحديدات والكائنات الأخرى" -#: ../app/tools/gimpmovetool.c:115 +#: ../app/tools/gimpmovetool.c:114 msgid "_Move" msgstr "ا_نقل" -#: ../app/tools/gimpmovetool.c:255 +#: ../app/tools/gimpmovetool.c:256 msgid "There is no path to move." msgstr "لا يوجد مسار لنقله." -#: ../app/tools/gimpmovetool.c:256 ../app/tools/gimptransformtool.c:1871 +#: ../app/tools/gimpmovetool.c:257 ../app/tools/gimptransformtool.c:1470 msgid "The active path's position is locked." msgstr "موضع المسار النشط موصد." -#: ../app/tools/gimpmovetool.c:287 +#: ../app/tools/gimpmovetool.c:288 msgid "The selection is empty." msgstr "التحديد خالِ." -#: ../app/tools/gimpmovetool.c:295 +#: ../app/tools/gimpmovetool.c:296 msgid "There is no layer to move." msgstr "لا يوجد طبقة لنقلها." -#: ../app/tools/gimpmovetool.c:299 ../app/tools/gimpmovetool.c:325 +#: ../app/tools/gimpmovetool.c:300 ../app/tools/gimpmovetool.c:326 msgid "The active layer's position is locked." msgstr "موضع الطبقة النشطة موصد." -#: ../app/tools/gimpmovetool.c:312 +#: ../app/tools/gimpmovetool.c:313 msgid "The active channel's position is locked." msgstr "موضع المسار النشط موصد." @@ -17531,8 +21749,8 @@ msgid "Show lattice" msgstr "اعرض المشبك" #: ../app/tools/gimpnpointdeformationoptions.c:230 -#: ../app/tools/gimpscaletool.c:90 ../app/tools/gimptransformoptions.c:518 -#: ../app/tools/gimptransformoptions.c:529 +#: ../app/tools/gimpscaletool.c:90 ../app/tools/gimptransformoptions.c:546 +#: ../app/tools/gimptransformoptions.c:557 msgid "Scale" msgstr "حجّم" @@ -17541,8 +21759,8 @@ msgid "Rigid (Rubber)" msgstr "جامد (مطاط)" #: ../app/tools/gimpnpointdeformationtool.c:158 -#: ../app/tools/gimpnpointdeformationtool.c:1014 -#: ../app/tools/gimpnpointdeformationtool.c:1018 +#: ../app/tools/gimpnpointdeformationtool.c:1000 +#: ../app/tools/gimpnpointdeformationtool.c:1004 msgid "N-Point Deformation" msgstr "" @@ -17554,28 +21772,18 @@ msgstr "" msgid "_N-Point Deformation" msgstr "" -#: ../app/tools/gimpoperationtool.c:133 +#: ../app/tools/gimpoperationtool.c:135 msgid "Operation Tool: Use an arbitrary GEGL operation" msgstr "أداة العمليات: استخدم أي عملية GEGL" -#: ../app/tools/gimpoperationtool.c:343 -#, c-format -msgid "Import '%s' Settings" -msgstr "استورد إعدادات '%s'" - -#: ../app/tools/gimpoperationtool.c:344 -#, c-format -msgid "Export '%s' Settings" -msgstr "صدّر إعدادات '%s'" - #. don't translate "Aux" -#: ../app/tools/gimpoperationtool.c:695 +#: ../app/tools/gimpoperationtool.c:547 #, c-format msgid "Aux Input" msgstr "" #. don't translate "Aux" -#: ../app/tools/gimpoperationtool.c:701 +#: ../app/tools/gimpoperationtool.c:553 #, c-format msgid "Aux%d Input" msgstr "" @@ -17588,77 +21796,73 @@ msgstr "أداة فرشاة التلوين: ارسم ضربات ناعمة بف msgid "_Paintbrush" msgstr "_فرشاة تلوين" -#: ../app/tools/gimppaintoptions-gui.c:162 +#: ../app/tools/gimppaintoptions-gui.c:165 #, fuzzy msgid "Edit this brush" msgstr "حرّر هذه الفرشاة" -#: ../app/tools/gimppaintoptions-gui.c:170 +#: ../app/tools/gimppaintoptions-gui.c:173 msgid "Reset size to brush's native size" msgstr "صفّر حجم الفرشاة لقيمته الطبيعية" -#: ../app/tools/gimppaintoptions-gui.c:178 +#: ../app/tools/gimppaintoptions-gui.c:181 #, fuzzy msgid "Reset aspect ratio to brush's native aspect ratio" -msgstr "صفّر نسبة ارتفاع الفرشاة لقيمتها الطبيعية" +msgstr "صفّر نسبة أبعاد الفرشاة لقيمتها الطبيعية" -#: ../app/tools/gimppaintoptions-gui.c:186 +#: ../app/tools/gimppaintoptions-gui.c:189 #, fuzzy msgid "Reset angle to brush's native angle" msgstr "صفّر مباعدة الفرشاة لقيمتها الطبيعية" -#: ../app/tools/gimppaintoptions-gui.c:194 +#: ../app/tools/gimppaintoptions-gui.c:197 msgid "Reset spacing to brush's native spacing" msgstr "صفّر مباعدة الفرشاة لقيمتها الطبيعية" -#: ../app/tools/gimppaintoptions-gui.c:202 +#: ../app/tools/gimppaintoptions-gui.c:205 #, fuzzy msgid "Reset hardness to brush's native hardness" msgstr "صفّر حجم الفرشاة لقيمته الطبيعية" -#: ../app/tools/gimppaintoptions-gui.c:210 +#: ../app/tools/gimppaintoptions-gui.c:213 msgid "Reset force to default" msgstr "استعد القيم المبدئية للقوة" -#: ../app/tools/gimppaintoptions-gui.c:223 +#: ../app/tools/gimppaintoptions-gui.c:229 #, fuzzy msgid "Edit this dynamics" msgstr "حرر الحركيات" -#: ../app/tools/gimppaintoptions-gui.c:256 -msgid "Lock brush size to zoom" -msgstr "أوصد حجم الفرشاة لمستوى التقريب" - -#: ../app/tools/gimppaintoptions-gui.c:320 +#: ../app/tools/gimppaintoptions-gui.c:325 msgid "Fade Options" msgstr "خيارات الإبهات" -#: ../app/tools/gimppaintoptions-gui.c:363 +#: ../app/tools/gimppaintoptions-gui.c:369 msgid "Color Options" msgstr "خيارات الألوان" -#: ../app/tools/gimppaintoptions-gui.c:615 +#: ../app/tools/gimppaintoptions-gui.c:622 msgid "Link to brush default" msgstr "اربط الفرشاة بالمبدئيات" -#: ../app/tools/gimppainttool.c:156 +#: ../app/tools/gimppainttool.c:157 msgid "Click to paint" msgstr "انقر لترسم" -#: ../app/tools/gimppainttool.c:157 +#: ../app/tools/gimppainttool.c:158 msgid "Click to draw the line" msgstr "انقر لرسم السطر" -#: ../app/tools/gimppainttool.c:158 +#: ../app/tools/gimppainttool.c:159 #, c-format msgid "%s to pick a color" msgstr "‏%s لتلتقط لونا" -#: ../app/tools/gimppainttool.c:271 +#: ../app/tools/gimppainttool.c:272 msgid "Cannot paint on layer groups." msgstr "لا يمكن الرسم على مجموعات الطبقات." -#: ../app/tools/gimppainttool.c:711 +#: ../app/tools/gimppainttool.c:688 #, c-format msgid "%s for a straight line" msgstr "‏%s لترسم سطرا مستقيما" @@ -17671,155 +21875,152 @@ msgstr "أداة القلم: رسم حاد الحواف باستخدام فرش msgid "Pe_ncil" msgstr "_قلم" -#: ../app/tools/gimpperspectiveclonetool.c:134 +#: ../app/tools/gimpperspectiveclonetool.c:143 msgid "" "Perspective Clone Tool: Clone from an image source after applying a " "perspective transformation" msgstr "أداة الاستنساخ المنظوري: انسخ من مصدر صورة بعد تطبيق تحويل منظوري" -#: ../app/tools/gimpperspectiveclonetool.c:136 +#: ../app/tools/gimpperspectiveclonetool.c:145 msgid "_Perspective Clone" msgstr "ا_ستنساخ منظوري" -#: ../app/tools/gimpperspectiveclonetool.c:675 +#: ../app/tools/gimpperspectiveclonetool.c:556 msgid "Ctrl-Click to set a clone source" msgstr "انقر مع ضغط Ctrl لتحدد مصدر الاستنساخ" -#: ../app/tools/gimpperspectivetool.c:84 +#: ../app/tools/gimpperspectivetool.c:86 msgid "Perspective Tool: Change perspective of the layer, selection or path" msgstr "أداة المنظور: غير منظور الطبقة أو التحديد أو المسارا" -#: ../app/tools/gimpperspectivetool.c:86 +#: ../app/tools/gimpperspectivetool.c:88 msgid "_Perspective" msgstr "_منظوري" -#: ../app/tools/gimpperspectivetool.c:114 +#: ../app/tools/gimpperspectivetool.c:117 msgid "Perspective transformation" msgstr "تحويل منظوري" -#: ../app/tools/gimpperspectivetool.c:256 +#: ../app/tools/gimpperspectivetool.c:182 msgctxt "undo-type" msgid "Perspective" msgstr "منظوري" -#: ../app/tools/gimprectangleoptions.c:105 +#: ../app/tools/gimprectangleoptions.c:109 msgid "Automatically shrink to the nearest rectangular shape in a layer" msgstr "اكمش تلقائيًا لأقرب شكل مستطيل في الطبقة" -#: ../app/tools/gimprectangleoptions.c:113 +#: ../app/tools/gimprectangleoptions.c:117 msgid "Shrink merged" msgstr "قلّص المدموج" -#: ../app/tools/gimprectangleoptions.c:114 +#: ../app/tools/gimprectangleoptions.c:118 msgid "Use all visible layers when shrinking the selection" msgstr "استخدم كل الطبقات المرئية عن تقليص التحديد" -#: ../app/tools/gimprectangleoptions.c:123 +#: ../app/tools/gimprectangleoptions.c:127 #: ../app/tools/gimptransformoptions.c:155 msgid "Composition guides such as rule of thirds" msgstr "" -#: ../app/tools/gimprectangleoptions.c:132 +#: ../app/tools/gimprectangleoptions.c:136 msgid "X coordinate of top left corner" msgstr "الإحداثي السيني للزاوية العليا اليسرى" -#: ../app/tools/gimprectangleoptions.c:142 +#: ../app/tools/gimprectangleoptions.c:146 msgid "Y coordinate of top left corner" msgstr "الإحداثي الصادي للزاوية العليا اليسرى" -#: ../app/tools/gimprectangleoptions.c:152 +#: ../app/tools/gimprectangleoptions.c:156 msgid "Width of selection" msgstr "عرض التحديد" -#: ../app/tools/gimprectangleoptions.c:161 +#: ../app/tools/gimprectangleoptions.c:165 msgid "Height of selection" msgstr "ارتفاع التحديد" -#: ../app/tools/gimprectangleoptions.c:170 +#: ../app/tools/gimprectangleoptions.c:174 msgid "Unit of top left corner coordinate" msgstr "وحدة إحداثي الزاوية العليا اليسرى" -#: ../app/tools/gimprectangleoptions.c:179 +#: ../app/tools/gimprectangleoptions.c:183 msgid "Unit of selection size" msgstr "وحدة حجم التحديد" -#: ../app/tools/gimprectangleoptions.c:188 +#: ../app/tools/gimprectangleoptions.c:192 msgid "Enable lock of aspect ratio, width, height or size" -msgstr "فعّل وصْد نسبة الارتفاع أو العرض أو الارتفاع أو الحجم" +msgstr "فعّل وصْد نسبة الأبعاد أو العرض أو الارتفاع أو الحجم" -#: ../app/tools/gimprectangleoptions.c:197 +#: ../app/tools/gimprectangleoptions.c:201 msgid "Choose what has to be locked" msgstr "حدد ما الذي سيُوصد" -#: ../app/tools/gimprectangleoptions.c:206 +#: ../app/tools/gimprectangleoptions.c:210 msgid "Custom fixed width" msgstr "عرض ثابت محدد" -#: ../app/tools/gimprectangleoptions.c:215 +#: ../app/tools/gimprectangleoptions.c:219 msgid "Custom fixed height" msgstr "ارتفاع ثابت محدد" -#: ../app/tools/gimprectangleoptions.c:309 +#: ../app/tools/gimprectangleoptions.c:313 msgid "Unit of fixed width, height or size" msgstr "وحدة العرض أو الارتفاع أو الحجم الثابتين" -#: ../app/tools/gimprectangleoptions.c:317 +#: ../app/tools/gimprectangleoptions.c:321 msgid "Expand from center" msgstr "مدد من المركز" -#: ../app/tools/gimprectangleoptions.c:318 +#: ../app/tools/gimprectangleoptions.c:322 msgid "Expand selection from center outwards" msgstr "مدد التحديد من المركز باتجاه الأطراف" #. Current, as in what is currently in use. -#: ../app/tools/gimprectangleoptions.c:762 +#: ../app/tools/gimprectangleoptions.c:774 msgid "Current" msgstr "الحالي" -#: ../app/tools/gimprectangleoptions.c:871 +#: ../app/tools/gimprectangleoptions.c:890 msgid "Fixed" msgstr "ثابت" -#: ../app/tools/gimprectangleoptions.c:1012 -msgid "Position:" -msgstr "الموضع:" - -#: ../app/tools/gimprectangleoptions.c:1022 ../app/tools/gimptextoptions.c:563 +#: ../app/tools/gimprectangleoptions.c:1040 ../app/tools/gimptextoptions.c:545 msgid "Size:" msgstr "الحجم:" #. Auto Shrink -#: ../app/tools/gimprectangleoptions.c:1041 +#: ../app/tools/gimprectangleoptions.c:1067 msgid "Auto Shrink" msgstr "تقليص تلقائي" -#: ../app/tools/gimprectangleselectoptions.c:85 +#: ../app/tools/gimprectangleselectoptions.c:93 msgid "Rounded corners" msgstr "أركان دائرية" -#: ../app/tools/gimprectangleselectoptions.c:86 +#: ../app/tools/gimprectangleselectoptions.c:94 msgid "Round corners of selection" msgstr "دوّر أركان التحديد" -#: ../app/tools/gimprectangleselectoptions.c:93 +#: ../app/tools/gimprectangleselectoptions.c:101 msgid "Radius of rounding in pixels" msgstr "نصف قطر التدوير بالبكسل" -#: ../app/tools/gimprectangleselecttool.c:166 +#: ../app/tools/gimprectangleselecttool.c:151 msgid "Rectangle Select" msgstr "تحديد مستطيل" -#: ../app/tools/gimprectangleselecttool.c:167 +#: ../app/tools/gimprectangleselecttool.c:152 msgid "Rectangle Select Tool: Select a rectangular region" msgstr "أداة التحديد المستطيل: حدد منطقة مستطيلة" -#: ../app/tools/gimprectangleselecttool.c:168 +#: ../app/tools/gimprectangleselecttool.c:153 msgid "_Rectangle Select" msgstr "تحديد _مستطيل" -#: ../app/tools/gimprectangletool.c:1140 ../app/tools/gimprectangletool.c:2009 -msgid "Rectangle: " -msgstr "مستطيل: " +#: ../app/tools/gimprectangleselecttool.c:728 +#, fuzzy +msgid "Ellipse: " +msgstr "تحديد بيضاوي" #: ../app/tools/gimpregionselectoptions.c:89 msgid "Select transparent areas" @@ -17851,22 +22052,27 @@ msgstr "قناع الرسم" msgid "Draw the selected region's mask" msgstr "ارسم قناه المنطقة المحددة" -#: ../app/tools/gimpregionselecttool.c:162 +#: ../app/tools/gimpregionselecttool.c:154 msgid "Move the mouse to change threshold" msgstr "حرّك الفأرة لضبط العتبة" -#: ../app/tools/gimprotatetool.c:94 ../app/tools/gimptransformoptions.c:520 +#: ../app/tools/gimprotatetool.c:95 ../app/tools/gimptransformoptions.c:548 msgid "Rotate" msgstr "دوّر" -#: ../app/tools/gimprotatetool.c:95 +#: ../app/tools/gimprotatetool.c:96 msgid "Rotate Tool: Rotate the layer, selection or path" msgstr "أداة التدوير: دوّر الطبقة أو التحديد أو المسار" -#: ../app/tools/gimprotatetool.c:96 +#: ../app/tools/gimprotatetool.c:97 msgid "_Rotate" msgstr "_دوّر" +#: ../app/tools/gimprotatetool.c:118 +#, fuzzy +msgid "R_otate" +msgstr "دوّر" + #: ../app/tools/gimprotatetool.c:193 msgid "_Angle:" msgstr "ال_زاوية:" @@ -17879,7 +22085,7 @@ msgstr "وسط _س:" msgid "Center _Y:" msgstr "وسط _ص:" -#: ../app/tools/gimprotatetool.c:378 +#: ../app/tools/gimprotatetool.c:348 #, c-format msgctxt "undo-type" msgid "Rotate by %-3.3g° around (%g, %g)" @@ -17907,11 +22113,7 @@ msgstr "أضِف عينة نقطة: " msgid "Scale Tool: Scale the layer, selection or path" msgstr "أداة التحجيم: حجّم الطبقة المحددة أو المسار" -#: ../app/tools/gimpscaletool.c:92 -msgid "_Scale" -msgstr "_حجّم" - -#: ../app/tools/gimpscaletool.c:338 +#: ../app/tools/gimpscaletool.c:257 #, c-format msgctxt "undo-type" msgid "Scale to %d x %d" @@ -17927,7 +22129,7 @@ msgid "" msgstr "" #: ../app/tools/gimpseamlessclonetool.c:190 -#: ../app/tools/gimpseamlessclonetool.c:763 +#: ../app/tools/gimpseamlessclonetool.c:751 msgid "Seamless Clone" msgstr "استنساخ سلس" @@ -17939,7 +22141,7 @@ msgstr "استنساخ سلس: ألصق صورة بسلاسة في صورة أخ msgid "_Seamless Clone" msgstr "استنساخ _سلس" -#: ../app/tools/gimpseamlessclonetool.c:801 +#: ../app/tools/gimpseamlessclonetool.c:789 msgid "Cloning the foreground object" msgstr "استنساخ عنصر الواجهة" @@ -17955,7 +22157,7 @@ msgstr "" msgid "Radius of feathering" msgstr "" -#: ../app/tools/gimpselectionoptions.c:222 ../app/widgets/gimpbrushselect.c:190 +#: ../app/tools/gimpselectionoptions.c:222 ../app/widgets/gimpbrushselect.c:188 msgid "Mode:" msgstr "النمط:" @@ -17995,188 +22197,199 @@ msgstr "انقر واسحب لنقل نسخة من البكسلات المحدد msgid "Click to anchor the floating selection" msgstr "انقر لربط التحديد الحر" -#: ../app/tools/gimpsheartool.c:87 ../app/tools/gimptransformoptions.c:522 -#: ../app/tools/gimptransformoptions.c:531 +#: ../app/tools/gimpsheartool.c:88 ../app/tools/gimptransformoptions.c:550 +#: ../app/tools/gimptransformoptions.c:559 msgid "Shear" msgstr "قص" -#: ../app/tools/gimpsheartool.c:88 +#: ../app/tools/gimpsheartool.c:89 msgid "Shear Tool: Shear the layer, selection or path" msgstr "أداة القص: قص الطبقة أو التحديد أو المسار" -#: ../app/tools/gimpsheartool.c:89 +#: ../app/tools/gimpsheartool.c:90 msgid "S_hear" msgstr "_مزّق" -#: ../app/tools/gimpsheartool.c:135 +#: ../app/tools/gimpsheartool.c:108 +#, fuzzy +msgid "_Shear" +msgstr "قص" + +#: ../app/tools/gimpsheartool.c:136 msgid "Shear magnitude _X" msgstr "مقدار التمزيق _س" -#: ../app/tools/gimpsheartool.c:146 +#: ../app/tools/gimpsheartool.c:147 msgid "Shear magnitude _Y" msgstr "مقدار التمزيق _ص" -#: ../app/tools/gimpsheartool.c:258 +#: ../app/tools/gimpsheartool.c:251 #, c-format msgctxt "undo-type" msgid "Shear horizontally by %-3.3g" msgstr "مزّق أفقيا بمقدار %-3.3g" -#: ../app/tools/gimpsheartool.c:262 +#: ../app/tools/gimpsheartool.c:255 #, c-format msgctxt "undo-type" msgid "Shear vertically by %-3.3g" msgstr "مزّق رأسيا بمقدار %-3.3g" #. e.g. user entered numbers but no notification callback -#: ../app/tools/gimpsheartool.c:267 +#: ../app/tools/gimpsheartool.c:260 #, c-format msgctxt "undo-type" msgid "Shear horizontally by %-3.3g, vertically by %-3.3g" msgstr "مزّق أفقيا بمقدار %-3.3g، ورأسيا بمقدار %-3.3g" -#: ../app/tools/gimpsmudgetool.c:55 +#: ../app/tools/gimpsmudgetool.c:56 msgid "Smudge Tool: Smudge selectively using a brush" msgstr "أداة الضباب: تضبيب الجزء المحدد باستخدام فرشاة" -#: ../app/tools/gimpsmudgetool.c:56 +#: ../app/tools/gimpsmudgetool.c:57 msgid "_Smudge" msgstr "_تضبيب" -#: ../app/tools/gimpsmudgetool.c:75 +#: ../app/tools/gimpsmudgetool.c:79 msgid "Click to smudge" msgstr "انقر للتضبيب" -#: ../app/tools/gimpsmudgetool.c:76 +#: ../app/tools/gimpsmudgetool.c:80 msgid "Click to smudge the line" msgstr "انقر لتضبيب السطر" -#: ../app/tools/gimptextoptions.c:138 +#: ../app/tools/gimptextoptions.c:122 msgid "Font size unit" msgstr "وحدة حجم الخط" -#: ../app/tools/gimptextoptions.c:143 ../app/tools/gimptextoptions.c:144 +#: ../app/tools/gimptextoptions.c:127 ../app/tools/gimptextoptions.c:128 msgid "Font size" msgstr "حجم الخط" -#: ../app/tools/gimptextoptions.c:157 +#: ../app/tools/gimptextoptions.c:141 #, fuzzy msgid "Hinting" msgstr "التلميح:" -#: ../app/tools/gimptextoptions.c:158 +#: ../app/tools/gimptextoptions.c:142 msgid "" "Hinting alters the font outline to produce a crisp bitmap at small sizes" msgstr "التلميح يعدل حدود الخط الخارجية لينتج صورة نقطية نضرة بحجم صغير" -#: ../app/tools/gimptextoptions.c:168 +#: ../app/tools/gimptextoptions.c:152 msgid "The text language may have an effect on the way the text is rendered." msgstr "قد تؤثر لغة النص على كيفية عرضه." -#: ../app/tools/gimptextoptions.c:182 +#: ../app/tools/gimptextoptions.c:166 #, fuzzy msgid "Justify" msgstr "المساواة:" -#: ../app/tools/gimptextoptions.c:183 +#: ../app/tools/gimptextoptions.c:167 msgid "Text alignment" msgstr "محاذاة النص" -#: ../app/tools/gimptextoptions.c:190 +#: ../app/tools/gimptextoptions.c:174 #, fuzzy msgid "Indentation" msgstr "المرّات" -#: ../app/tools/gimptextoptions.c:191 +#: ../app/tools/gimptextoptions.c:175 msgid "Indentation of the first line" msgstr "مسافة بادئة في أول سطر" -#: ../app/tools/gimptextoptions.c:198 +#: ../app/tools/gimptextoptions.c:182 #, fuzzy msgid "Line spacing" msgstr "تباعد الخطوط" -#: ../app/tools/gimptextoptions.c:199 +#: ../app/tools/gimptextoptions.c:183 msgid "Adjust line spacing" msgstr "اضبط تباعد السطر" -#: ../app/tools/gimptextoptions.c:206 +#: ../app/tools/gimptextoptions.c:190 #, fuzzy msgid "Letter spacing" msgstr "تباعد الخطوط" -#: ../app/tools/gimptextoptions.c:207 +#: ../app/tools/gimptextoptions.c:191 msgid "Adjust letter spacing" msgstr "اضبط تباعد الحروف" -#: ../app/tools/gimptextoptions.c:214 +#: ../app/tools/gimptextoptions.c:198 #, fuzzy msgid "Box" msgstr "الصندوق:" -#: ../app/tools/gimptextoptions.c:215 +#: ../app/tools/gimptextoptions.c:199 msgid "" "Whether text flows into rectangular shape or moves into a new line when you " "press Enter" msgstr "" -#: ../app/tools/gimptextoptions.c:223 +#: ../app/tools/gimptextoptions.c:207 msgid "Use editor" msgstr "استخدم المحرر" -#: ../app/tools/gimptextoptions.c:224 +#: ../app/tools/gimptextoptions.c:208 msgid "Use an external editor window for text entry" msgstr "استخدم نافذة محرر خارجية لإدخال النصوص" -#: ../app/tools/gimptextoptions.c:592 +#: ../app/tools/gimptextoptions.c:574 msgid "Hinting:" msgstr "التلميح:" -#: ../app/tools/gimptextoptions.c:596 +#: ../app/tools/gimptextoptions.c:578 msgid "Text Color" msgstr "لون النص" -#: ../app/tools/gimptextoptions.c:601 -msgid "Color:" -msgstr "اللون:" - -#: ../app/tools/gimptextoptions.c:607 +#: ../app/tools/gimptextoptions.c:589 msgid "Justify:" msgstr "المساواة:" -#: ../app/tools/gimptextoptions.c:630 +#: ../app/tools/gimptextoptions.c:615 msgid "Box:" msgstr "الصندوق:" -#: ../app/tools/gimptextoptions.c:647 +#: ../app/tools/gimptextoptions.c:632 msgid "Language:" msgstr "اللغة:" -#: ../app/tools/gimptexttool.c:192 +#: ../app/tools/gimptexttool.c:203 msgid "Text" msgstr "نص" -#: ../app/tools/gimptexttool.c:193 +#: ../app/tools/gimptexttool.c:204 msgid "Text Tool: Create or edit text layers" msgstr "أداة النصوص: أنشئ أو عدّل الطبقات النصية" -#: ../app/tools/gimptexttool.c:194 +#: ../app/tools/gimptexttool.c:205 msgid "Te_xt" msgstr "_نص" -#: ../app/tools/gimptexttool.c:1018 +#: ../app/tools/gimptexttool.c:953 +#, fuzzy +msgid "Text box: " +msgstr "أداة النصوص" + +#: ../app/tools/gimptexttool.c:1084 msgid "Reshape Text Layer" msgstr "غيّر شكل الطبقة النصية" -#: ../app/tools/gimptexttool.c:1520 ../app/tools/gimptexttool.c:1523 +#: ../app/tools/gimptexttool.c:1583 ../app/tools/gimptexttool.c:1586 msgid "Confirm Text Editing" msgstr "أكّد تحرير النص" -#: ../app/tools/gimptexttool.c:1527 +#: ../app/tools/gimptexttool.c:1590 msgid "Create _New Layer" msgstr "أنشئ _طبقة جديدة" -#: ../app/tools/gimptexttool.c:1551 +#: ../app/tools/gimptexttool.c:1592 +#, fuzzy +msgid "_Edit" +msgstr "ت_حرير" + +#: ../app/tools/gimptexttool.c:1614 msgid "" "The layer you selected is a text layer but it has been modified using other " "tools. Editing the layer with the text tool will discard these " @@ -18189,39 +22402,27 @@ msgstr "" "\n" "يمكنك تحرير الطبقة أو إنشاء طبقة نصية أخرى من خصائص نصها." -#: ../app/tools/gimptexttool-editor.c:1290 +#: ../app/tools/gimptexttool-editor.c:1292 msgid "GIMP Text Editor" msgstr "محرر نصوص جمب" -#: ../app/tools/gimpthresholdtool.c:94 -msgid "Threshold Tool: Reduce image to two colors using a threshold" -msgstr "أداة العتبة: اخفض الصورة إلى لونين باستخدام عتبة" - -#: ../app/tools/gimpthresholdtool.c:95 +#: ../app/tools/gimpthresholdtool.c:89 msgid "_Threshold..." msgstr "ال_عتبة..." -#: ../app/tools/gimpthresholdtool.c:114 -msgid "Import Threshold Settings" -msgstr "استورد إعدادات العتبة" - -#: ../app/tools/gimpthresholdtool.c:115 -msgid "Export Threshold Settings" -msgstr "صدّر إعدادات العتبة" - -#: ../app/tools/gimpthresholdtool.c:184 +#: ../app/tools/gimpthresholdtool.c:156 msgid "Apply Threshold" msgstr "طبّق العتبة" -#: ../app/tools/gimpthresholdtool.c:280 +#: ../app/tools/gimpthresholdtool.c:257 msgid "_Auto" msgstr "_تلقائي" -#: ../app/tools/gimpthresholdtool.c:282 +#: ../app/tools/gimpthresholdtool.c:259 msgid "Automatically adjust to optimal binarization threshold" msgstr "" -#: ../app/tools/gimptool.c:1035 +#: ../app/tools/gimptool.c:1193 msgid "Can't work on an empty image, add a layer first" msgstr "لا يمكن العمل على صورة خالية، أضف طبقة أولا" @@ -18229,15 +22430,10 @@ msgstr "لا يمكن العمل على صورة خالية، أضف طبقة أ msgid "Direction of transformation" msgstr "اتجاه التحويل" -#: ../app/tools/gimptransformoptions.c:125 +#: ../app/tools/gimptransformoptions.c:125 ../app/tools/gimpwarpoptions.c:120 msgid "Interpolation method" msgstr "طريقة الاستيفاء" -#: ../app/tools/gimptransformoptions.c:132 -#: ../app/tools/gimptransformoptions.c:448 -msgid "Clipping" -msgstr "القص" - #: ../app/tools/gimptransformoptions.c:133 msgid "How to clip" msgstr "طريقة القص" @@ -18256,10 +22452,10 @@ msgstr "إعتام الصورة" #: ../app/tools/gimptransformoptions.c:148 msgid "Opacity of the preview image" -msgstr "عتامة الصورة المحوّلة" +msgstr "إعتام الصورة المحوّلة" #: ../app/tools/gimptransformoptions.c:154 -#: ../app/tools/gimptransformoptions.c:469 +#: ../app/tools/gimptransformoptions.c:468 msgid "Guides" msgstr "الأدلة" @@ -18267,170 +22463,177 @@ msgstr "الأدلة" msgid "Size of a grid cell for variable number of composition guides" msgstr "" -#: ../app/tools/gimptransformoptions.c:490 +#: ../app/tools/gimptransformoptions.c:491 #, c-format msgid "15 degrees (%s)" msgstr "15 درجة (%s)" -#: ../app/tools/gimptransformoptions.c:491 +#: ../app/tools/gimptransformoptions.c:498 msgid "Limit rotation steps to 15 degrees" msgstr "اقصر خطوات التدوير على 15 درجة" -#: ../app/tools/gimptransformoptions.c:496 +#: ../app/tools/gimptransformoptions.c:508 #, c-format msgid "Keep aspect (%s)" msgstr "أبقِ النسبة (%s)" -#: ../app/tools/gimptransformoptions.c:497 -msgid "Keep the original aspect ratio" -msgstr "أبق على نسبة الارتفاع الأصلية" - #: ../app/tools/gimptransformoptions.c:515 +msgid "Keep the original aspect ratio" +msgstr "أبق على نسبة الأبعاد الأصلية" + +#: ../app/tools/gimptransformoptions.c:520 +#, fuzzy, c-format +msgid "Around center (%s)" +msgstr "أركان دائرية" + +#: ../app/tools/gimptransformoptions.c:527 +msgid "Scale around the center point" +msgstr "" + +#: ../app/tools/gimptransformoptions.c:543 #, c-format msgid "Constrain (%s)" msgstr "القيد (%s)" -#: ../app/tools/gimptransformoptions.c:516 +#: ../app/tools/gimptransformoptions.c:544 msgid "Move" msgstr "انقل" -#: ../app/tools/gimptransformoptions.c:517 +#: ../app/tools/gimptransformoptions.c:545 #, c-format msgid "Constrain movement to 45 degree angles from center (%s)" msgstr "قيد الحركة بزوايا 45 درجة من المركز (%s)" -#: ../app/tools/gimptransformoptions.c:519 +#: ../app/tools/gimptransformoptions.c:547 #, c-format msgid "Maintain aspect ratio when scaling (%s)" -msgstr "حافظ على نسبة الارتفاع أثناء التحجيم (%s)" +msgstr "حافظ على نسبة الأبعاد أثناء التحجيم (%s)" -#: ../app/tools/gimptransformoptions.c:521 +#: ../app/tools/gimptransformoptions.c:549 #, c-format msgid "Constrain rotation to 15 degree increments (%s)" msgstr "قيد التدوير بزيادات 15 درجة (%s)" -#: ../app/tools/gimptransformoptions.c:523 +#: ../app/tools/gimptransformoptions.c:551 #, c-format msgid "Shear along edge direction only (%s)" msgstr "" -#: ../app/tools/gimptransformoptions.c:525 +#: ../app/tools/gimptransformoptions.c:553 #, c-format msgid "Constrain perspective handles to move along edges and diagonal (%s)" msgstr "" -#: ../app/tools/gimptransformoptions.c:528 +#: ../app/tools/gimptransformoptions.c:556 #, c-format msgid "From pivot (%s)" msgstr "" -#: ../app/tools/gimptransformoptions.c:530 +#: ../app/tools/gimptransformoptions.c:558 #, c-format msgid "Scale from pivot point (%s)" msgstr "" -#: ../app/tools/gimptransformoptions.c:532 +#: ../app/tools/gimptransformoptions.c:560 #, c-format msgid "Shear opposite edge by same amount (%s)" msgstr "" -#: ../app/tools/gimptransformoptions.c:534 +#: ../app/tools/gimptransformoptions.c:562 #, c-format msgid "Maintain position of pivot while changing perspective (%s)" msgstr "" -#: ../app/tools/gimptransformoptions.c:537 +#: ../app/tools/gimptransformoptions.c:565 msgid "Pivot" msgstr "" -#: ../app/tools/gimptransformoptions.c:538 +#: ../app/tools/gimptransformoptions.c:566 #, c-format msgid "Snap (%s)" msgstr "" -#: ../app/tools/gimptransformoptions.c:539 +#: ../app/tools/gimptransformoptions.c:567 #, c-format msgid "Snap pivot to corners and center (%s)" msgstr "" -#: ../app/tools/gimptransformoptions.c:540 +#: ../app/tools/gimptransformoptions.c:568 msgid "Lock" msgstr "أوصِد" -#: ../app/tools/gimptransformoptions.c:541 +#: ../app/tools/gimptransformoptions.c:569 msgid "Lock pivot position to canvas" msgstr "" -#: ../app/tools/gimptransformtool.c:241 +#: ../app/tools/gimptransformtool.c:195 +#, fuzzy +msgid "_Transform" +msgstr "_حوّل" + +#: ../app/tools/gimptransformtool.c:219 msgid "Transforming" msgstr "التحويل" -#: ../app/tools/gimptransformtool.c:292 +#: ../app/tools/gimptransformtool.c:259 #, c-format msgid "The selection does not intersect with the layer." msgstr "" -#: ../app/tools/gimptransformtool.c:796 ../app/tools/gimptransformtool.c:809 +#: ../app/tools/gimptransformtool.c:514 ../app/tools/gimptransformtool.c:526 msgid "Transform Step" msgstr "خطوة التحويل" -#: ../app/tools/gimptransformtool.c:1839 +#: ../app/tools/gimptransformtool.c:982 +msgid "The current transform is invalid" +msgstr "" + +#: ../app/tools/gimptransformtool.c:1430 msgid "There is no layer to transform." msgstr "لا يوجد طبقة لتحويلها." -#: ../app/tools/gimptransformtool.c:1844 +#: ../app/tools/gimptransformtool.c:1437 msgid "The active layer's position and size are locked." msgstr "موضع الطبقة النشطة و حجمها موصدان." -#: ../app/tools/gimptransformtool.c:1856 +#: ../app/tools/gimptransformtool.c:1450 msgid "There is no selection to transform." msgstr "لا تحديد لتحويله." -#: ../app/tools/gimptransformtool.c:1866 +#: ../app/tools/gimptransformtool.c:1463 msgid "There is no path to transform." msgstr "لا يوجد مسار لتحويله." -#: ../app/tools/gimptransformtool.c:1869 +#: ../app/tools/gimptransformtool.c:1468 msgid "The active path's strokes are locked." msgstr "بكسلات المسار النشط موصدة." -#: ../app/tools/gimpunifiedtransformtool.c:104 +#: ../app/tools/gimptransformtool.c:1472 +#, fuzzy +msgid "The active path has no strokes." +msgstr "المسار النشط موصد." + +#: ../app/tools/gimpunifiedtransformtool.c:87 msgid "Unified Transform" msgstr "التحويل الموحد" -#: ../app/tools/gimpunifiedtransformtool.c:105 +#: ../app/tools/gimpunifiedtransformtool.c:88 msgid "Unified Transform Tool: Transform the layer, selection or path" msgstr "أداة التحويل الموحد: حوّل الطبقة أو التحديد أو المسار" -#: ../app/tools/gimpunifiedtransformtool.c:107 +#: ../app/tools/gimpunifiedtransformtool.c:90 msgid "_Unified Transform" msgstr "التحويل المو_حد" -#: ../app/tools/gimpunifiedtransformtool.c:134 +#: ../app/tools/gimpunifiedtransformtool.c:115 msgid "Unified transform" msgstr "التحويل الموحد" -#: ../app/tools/gimpunifiedtransformtool.c:768 -msgid "Transform Matrix" -msgstr "مصفوفة التحويل" - -#: ../app/tools/gimpunifiedtransformtool.c:1330 +#: ../app/tools/gimpunifiedtransformtool.c:190 msgctxt "undo-type" msgid "Unified Transform" msgstr "التحويل الموحد" -#: ../app/tools/gimpvectoroptions.c:71 -msgid "Edit Mode" -msgstr "حرّر النمط" - -#: ../app/tools/gimpvectoroptions.c:79 -msgid "Polygonal" -msgstr "مضلع" - -#: ../app/tools/gimpvectoroptions.c:80 -msgid "Restrict editing to polygons" -msgstr "اقصر التحرير على المُضلّعات" - #: ../app/tools/gimpvectoroptions.c:181 #, c-format msgid "" @@ -18449,163 +22652,27 @@ msgstr "" msgid "Selection from Path" msgstr "التحديد من المسار" -#: ../app/tools/gimpvectortool.c:170 +#: ../app/tools/gimpvectortool.c:164 msgid "Paths Tool: Create and edit paths" msgstr "أداة المسارات: أنشئ وحرّر المسارات" -#: ../app/tools/gimpvectortool.c:171 +#: ../app/tools/gimpvectortool.c:165 msgid "Pat_hs" msgstr "ال_مسارات" -#: ../app/tools/gimpvectortool.c:261 -msgid "The active path is locked." -msgstr "المسار النشط موصد." +#: ../app/tools/gimpvectortool.c:733 +#, fuzzy +msgid "There is no active layer or channel to fill" +msgstr "لا يوجد طبقة أو قناة نشطة لملئها." -#: ../app/tools/gimpvectortool.c:351 -msgid "Add Stroke" -msgstr "أضِف ضربة" - -#: ../app/tools/gimpvectortool.c:376 -msgid "Add Anchor" -msgstr "أضِف مربط" - -#: ../app/tools/gimpvectortool.c:402 -msgid "Insert Anchor" -msgstr "أدرج مربط" - -#: ../app/tools/gimpvectortool.c:433 -msgid "Drag Handle" -msgstr "اسحب المناول" - -#: ../app/tools/gimpvectortool.c:464 -msgid "Drag Anchor" -msgstr "اسحب المربط" - -#: ../app/tools/gimpvectortool.c:482 -msgid "Drag Anchors" -msgstr "اسحب المرابط" - -#: ../app/tools/gimpvectortool.c:505 -msgid "Drag Curve" -msgstr "اسحب المنحنى" - -#: ../app/tools/gimpvectortool.c:534 -msgid "Connect Strokes" -msgstr "وصّل السماكات" - -#: ../app/tools/gimpvectortool.c:566 -msgid "Drag Path" -msgstr "اسحب المسار" - -#: ../app/tools/gimpvectortool.c:577 -msgid "Convert Edge" -msgstr "حوّل الحافة" - -#: ../app/tools/gimpvectortool.c:608 -msgid "Delete Anchor" -msgstr "احذف المربط" - -#: ../app/tools/gimpvectortool.c:631 -msgid "Delete Segment" -msgstr "احذف القطعة" - -#: ../app/tools/gimpvectortool.c:853 -msgid "Move Anchors" -msgstr "انقل المربط" - -#: ../app/tools/gimpvectortool.c:1218 -msgid "Click to pick path to edit" -msgstr "انقر لأخذ المسار للتعديل" - -#: ../app/tools/gimpvectortool.c:1222 -msgid "Click to create a new path" -msgstr "انقر لإنشاء مسار جديد" - -#: ../app/tools/gimpvectortool.c:1226 -msgid "Click to create a new component of the path" -msgstr "انقر لإضافة مكون جديد للمسار" - -#: ../app/tools/gimpvectortool.c:1230 -msgid "Click or Click-Drag to create a new anchor" -msgstr "انقر أو انقر واسحب لإنشاء مربط جديد" - -#: ../app/tools/gimpvectortool.c:1240 ../app/tools/gimpvectortool.c:1247 -msgid "Click-Drag to move the anchor around" -msgstr "انقر واسحب لنقل المربط" - -#: ../app/tools/gimpvectortool.c:1251 ../app/tools/gimpvectortool.c:1274 -msgid "Click-Drag to move the anchors around" -msgstr "انقر واسحب لنقل المرابط" - -#: ../app/tools/gimpvectortool.c:1257 -msgid "Click-Drag to move the handle around" -msgstr "انقر واسحب لنقل المناول" - -#: ../app/tools/gimpvectortool.c:1264 -msgid "Click-Drag to move the handles around symmetrically" -msgstr "انقر واسحب لنقل المناول بشكل متساو" - -#: ../app/tools/gimpvectortool.c:1279 -msgid "Click-Drag to change the shape of the curve" -msgstr "انقر واسحب لتغيير شكل المنحنى" - -#: ../app/tools/gimpvectortool.c:1282 -#, c-format -msgid "%s: symmetrical" -msgstr "‏%s: متماثل" - -#: ../app/tools/gimpvectortool.c:1287 -msgid "Click-Drag to move the component around" -msgstr "انقر واسحب لنقل المكون" - -#: ../app/tools/gimpvectortool.c:1295 -msgid "Click-Drag to move the path around" -msgstr "انقر واسحب لنقل المسار" - -#: ../app/tools/gimpvectortool.c:1299 -msgid "Click-Drag to insert an anchor on the path" -msgstr "انقر واسحب لإدراج مربط في المسار" - -#: ../app/tools/gimpvectortool.c:1307 -msgid "Click to delete this anchor" -msgstr "انقر لحذف هذا المربط" - -#: ../app/tools/gimpvectortool.c:1311 -msgid "Click to connect this anchor with the selected endpoint" -msgstr "انقر لربط هذا المربط بنقطة النهاية المحدد" - -#: ../app/tools/gimpvectortool.c:1316 -msgid "Click to open up the path" -msgstr "انقر لفتح المسار" - -#: ../app/tools/gimpvectortool.c:1320 -msgid "Click to make this node angular" -msgstr "انقر لجعل هذه العقدة مدببة" - -#: ../app/tools/gimpvectortool.c:1324 -msgid "Clicking here does nothing, try clicking on path elements." -msgstr "" - -#: ../app/tools/gimpvectortool.c:1821 -msgid "Delete Anchors" -msgstr "احذف المرابط" - -#: ../app/tools/gimpvectortool.c:1983 +#: ../app/tools/gimpvectortool.c:805 msgid "There is no active layer or channel to stroke to" msgstr "لا توجد طبقة أو قناة نشطة لرسم الحواف بها" -#: ../app/tools/gimpwarpoptions.c:76 ../app/tools/gimpwarpoptions.c:77 +#: ../app/tools/gimpwarpoptions.c:83 ../app/tools/gimpwarpoptions.c:84 msgid "Behavior" msgstr "السلوك" -#: ../app/tools/gimpwarpoptions.c:84 -msgid "Strength" -msgstr "القوة" - -#: ../app/tools/gimpwarpoptions.c:85 -msgid "Effect Strength" -msgstr "قوة التأثير" - #: ../app/tools/gimpwarpoptions.c:92 msgid "Effect Size" msgstr "حجم التأثير" @@ -18615,191 +22682,208 @@ msgid "Effect Hardness" msgstr "صلابة التأثير" #: ../app/tools/gimpwarpoptions.c:105 +msgid "Strength" +msgstr "القوة" + +#: ../app/tools/gimpwarpoptions.c:106 +msgid "Effect Strength" +msgstr "قوة التأثير" + +#: ../app/tools/gimpwarpoptions.c:113 +#, fuzzy +msgid "Stroke Spacing" +msgstr "ارسم حواف التحديد" + +#: ../app/tools/gimpwarpoptions.c:127 ../app/tools/gimpwarpoptions.c:329 +msgid "Abyss policy" +msgstr "" + +#: ../app/tools/gimpwarpoptions.c:128 +msgid "Out-of-bounds sampling behavior" +msgstr "" + +#: ../app/tools/gimpwarpoptions.c:135 +msgid "High quality preview" +msgstr "" + +#: ../app/tools/gimpwarpoptions.c:136 +#, fuzzy +msgid "Use an accurate but slower preview" +msgstr "استخدم ملف إعدادات جمب (gimprc) للمستخدم بديل" + +#: ../app/tools/gimpwarpoptions.c:142 +msgid "During motion" +msgstr "" + +#: ../app/tools/gimpwarpoptions.c:143 +msgid "Apply effect during motion" +msgstr "" + +#: ../app/tools/gimpwarpoptions.c:149 +#, fuzzy +msgid "Periodically" +msgstr "رأسي" + +#: ../app/tools/gimpwarpoptions.c:150 +msgid "Apply effect periodically" +msgstr "" + +#: ../app/tools/gimpwarpoptions.c:156 +#, fuzzy +msgid "Rate" +msgstr "المعدل" + +#: ../app/tools/gimpwarpoptions.c:157 +msgid "Periodic stroke rate" +msgstr "" + +#: ../app/tools/gimpwarpoptions.c:163 msgid "Frames" msgstr "الأُطر" -#: ../app/tools/gimpwarpoptions.c:106 +#: ../app/tools/gimpwarpoptions.c:164 msgid "Number of animation frames" msgstr "عدد أُطر التحريك" +#. the stroke frame +#: ../app/tools/gimpwarpoptions.c:339 +#, fuzzy +msgid "Stroke" +msgstr "أضِف ضربة" + #. the animation frame -#: ../app/tools/gimpwarpoptions.c:215 +#: ../app/tools/gimpwarpoptions.c:361 msgid "Animate" msgstr "حرّك" -#: ../app/tools/gimpwarpoptions.c:229 +#: ../app/tools/gimpwarpoptions.c:375 msgid "Create Animation" msgstr "أنشئ صورة متحركة" -#: ../app/tools/gimpwarptool.c:142 +#: ../app/tools/gimpwarptool.c:155 msgid "Warp Transform" msgstr "" -#: ../app/tools/gimpwarptool.c:143 +#: ../app/tools/gimpwarptool.c:156 msgid "Warp Transform: Deform with different tools" msgstr "" -#: ../app/tools/gimpwarptool.c:144 +#: ../app/tools/gimpwarptool.c:157 msgid "_Warp Transform" msgstr "" -#: ../app/tools/gimpwarptool.c:464 ../app/tools/gimpwarptool.c:476 +#: ../app/tools/gimpwarptool.c:484 ../app/tools/gimpwarptool.c:496 msgid "Warp Tool Stroke" msgstr "" -#: ../app/tools/gimpwarptool.c:572 +#: ../app/tools/gimpwarptool.c:618 #, fuzzy msgid "Cannot warp layer groups." msgstr "لا يمكن الرسم على مجموعات الطبقات." -#: ../app/tools/gimpwarptool.c:752 +#: ../app/tools/gimpwarptool.c:652 +#, fuzzy +msgid "No stroke events selected." +msgstr "لم يحدد أي مرشح" + +#: ../app/tools/gimpwarptool.c:863 msgid "Warp transform" msgstr "" -#: ../app/tools/gimpwarptool.c:889 +#: ../app/tools/gimpwarptool.c:1076 msgid "Please add some warp strokes first." msgstr "" -#: ../app/tools/gimpwarptool.c:902 ../app/tools/gimpwarptool.c:938 +#: ../app/tools/gimpwarptool.c:1090 ../app/tools/gimpwarptool.c:1127 #, c-format msgid "Rendering Frame %d" msgstr "يصيّر الإطار %d" -#: ../app/tools/gimpwarptool.c:917 ../app/tools/gimpwarptool.c:946 +#: ../app/tools/gimpwarptool.c:1105 ../app/tools/gimpwarptool.c:1135 #, c-format msgid "Frame %d" msgstr "إطار %d" -#: ../app/tools/gimpwarptool.c:955 +#: ../app/tools/gimpwarptool.c:1144 msgid "Frame" msgstr "إطار" -#: ../app/tools/tools-enums.c:89 -msgctxt "transform-handle-mode" -msgid "Add / Transform" -msgstr "أضف \\ حوّل" - -#: ../app/tools/tools-enums.c:90 -msgctxt "transform-handle-mode" -msgid "Move" -msgstr "انقل" - -#: ../app/tools/tools-enums.c:91 -msgctxt "transform-handle-mode" -msgid "Remove" -msgstr "أزل" - -#: ../app/tools/tools-enums.c:181 -msgctxt "rectangle-tool-fixed-rule" -msgid "Aspect ratio" -msgstr "نسبة الارتفاع" - -#: ../app/tools/tools-enums.c:182 -msgctxt "rectangle-tool-fixed-rule" -msgid "Width" -msgstr "العرض" - -#: ../app/tools/tools-enums.c:183 -msgctxt "rectangle-tool-fixed-rule" -msgid "Height" -msgstr "الارتفاع" - -#: ../app/tools/tools-enums.c:184 -msgctxt "rectangle-tool-fixed-rule" -msgid "Size" -msgstr "الحجم" - -#: ../app/tools/tools-enums.c:213 +#: ../app/tools/tools-enums.c:25 msgctxt "rect-select-mode" msgid "Free select" msgstr "تحديد حر" -#: ../app/tools/tools-enums.c:214 +#: ../app/tools/tools-enums.c:26 msgctxt "rect-select-mode" msgid "Fixed size" msgstr "حجم ثابت" -#: ../app/tools/tools-enums.c:215 +#: ../app/tools/tools-enums.c:27 msgctxt "rect-select-mode" msgid "Fixed aspect ratio" -msgstr "نسبة ارتفاع ثابتة" +msgstr "نسبة أبعاد ثابتة" -#: ../app/tools/tools-enums.c:244 +#: ../app/tools/tools-enums.c:56 msgctxt "transform-type" msgid "Layer" msgstr "طبقة" -#: ../app/tools/tools-enums.c:245 +#: ../app/tools/tools-enums.c:57 msgctxt "transform-type" msgid "Selection" msgstr "التحديد" -#: ../app/tools/tools-enums.c:246 +#: ../app/tools/tools-enums.c:58 msgctxt "transform-type" msgid "Path" msgstr "المسار" -#: ../app/tools/tools-enums.c:275 -msgctxt "vector-mode" -msgid "Design" -msgstr "تصميم" - -#: ../app/tools/tools-enums.c:276 -msgctxt "vector-mode" -msgid "Edit" -msgstr "حرّر" - -#: ../app/tools/tools-enums.c:277 -msgctxt "vector-mode" -msgid "Move" -msgstr "انقل" - -#: ../app/tools/tools-enums.c:339 +#: ../app/tools/tools-enums.c:151 msgctxt "matting-draw-mode" msgid "Draw foreground" msgstr "ارسم المقدمة" -#: ../app/tools/tools-enums.c:340 +#: ../app/tools/tools-enums.c:152 msgctxt "matting-draw-mode" msgid "Draw background" msgstr "ارسم الخلفية" -#: ../app/tools/tools-enums.c:341 +#: ../app/tools/tools-enums.c:153 msgctxt "matting-draw-mode" msgid "Draw unknown" msgstr "ارسم غير المعروف" -#: ../app/tools/tools-enums.c:374 +#: ../app/tools/tools-enums.c:186 msgctxt "warp-behavior" msgid "Move pixels" msgstr "انقل البكسلات" -#: ../app/tools/tools-enums.c:375 +#: ../app/tools/tools-enums.c:187 msgctxt "warp-behavior" msgid "Grow area" msgstr "أنْمِ المنطقة" -#: ../app/tools/tools-enums.c:376 +#: ../app/tools/tools-enums.c:188 msgctxt "warp-behavior" msgid "Shrink area" msgstr "_قلّص المنطقة" -#: ../app/tools/tools-enums.c:377 +#: ../app/tools/tools-enums.c:189 msgctxt "warp-behavior" msgid "Swirl clockwise" msgstr "دوامة في ا_تجاه عقارب الساعة" -#: ../app/tools/tools-enums.c:378 +#: ../app/tools/tools-enums.c:190 msgctxt "warp-behavior" msgid "Swirl counter-clockwise" msgstr "دوامة _عكس اتجاه عقارب الساعة" -#: ../app/tools/tools-enums.c:379 +#: ../app/tools/tools-enums.c:191 msgctxt "warp-behavior" msgid "Erase warping" msgstr "" -#: ../app/tools/tools-enums.c:380 +#: ../app/tools/tools-enums.c:192 msgctxt "warp-behavior" msgid "Smooth warping" msgstr "" @@ -18900,7 +22984,7 @@ msgstr "اقلب المسار" msgid "Rotate Path" msgstr "دوّر المسار" -#: ../app/vectors/gimpvectors.c:615 +#: ../app/vectors/gimpvectors.c:616 msgid "Transform Path" msgstr "حوّل المسار" @@ -18940,55 +23024,56 @@ msgstr "اب_حث:" msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" msgstr "ح‌خ‌ز‌ش (%I0.3f، %I0.3f، %I0.3f، %I0.3f)" -#: ../app/widgets/gimpactionview.c:337 +#: ../app/widgets/gimpactionview.c:332 #: ../app/widgets/gimpcontrollereditor.c:342 msgid "Action" msgstr "إجراء" -#: ../app/widgets/gimpactionview.c:366 +#: ../app/widgets/gimpactionview.c:361 msgid "Shortcut" msgstr "اختصار" -#: ../app/widgets/gimpactionview.c:392 +#: ../app/widgets/gimpactionview.c:387 msgid "Name" msgstr "الاسم" -#: ../app/widgets/gimpactionview.c:632 ../app/widgets/gimpactionview.c:872 +#: ../app/widgets/gimpactionview.c:627 ../app/widgets/gimpactionview.c:868 msgid "Changing shortcut failed." msgstr "فشل تغيير الاختصار." -#: ../app/widgets/gimpactionview.c:669 +#: ../app/widgets/gimpactionview.c:664 msgid "Conflicting Shortcuts" msgstr "اختصارات متعارضة" -#: ../app/widgets/gimpactionview.c:675 -msgid "_Reassign shortcut" +#: ../app/widgets/gimpactionview.c:670 +#, fuzzy +msgid "_Reassign Shortcut" msgstr "أعد _تعيين الاختصار" -#: ../app/widgets/gimpactionview.c:690 +#: ../app/widgets/gimpactionview.c:686 #, c-format msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group." msgstr "الاختصار \"%s\" محجوز بالفعل ل \"%s\" من المجموعة \"%s\"." -#: ../app/widgets/gimpactionview.c:694 +#: ../app/widgets/gimpactionview.c:690 #, c-format msgid "Reassigning the shortcut will cause it to be removed from \"%s\"." msgstr "إعادة تعيين هذا الاختصار سيؤدي إلى مسحه من \"%s\"." -#: ../app/widgets/gimpactionview.c:789 +#: ../app/widgets/gimpactionview.c:785 msgid "Invalid shortcut." msgstr "اختصار غير صالح." -#: ../app/widgets/gimpactionview.c:796 ../app/widgets/gimpactionview.c:900 +#: ../app/widgets/gimpactionview.c:792 ../app/widgets/gimpactionview.c:896 msgid "F1 cannot be remapped." msgstr "لا يمكن تغيير F1" -#: ../app/widgets/gimpactionview.c:804 +#: ../app/widgets/gimpactionview.c:800 #, c-format msgid "Alt+%d is used to switch to display %d and cannot be remapped." msgstr "" -#: ../app/widgets/gimpactionview.c:908 +#: ../app/widgets/gimpactionview.c:904 msgid "Removing shortcut failed." msgstr "فشل حذف الاختصار." @@ -19005,42 +23090,46 @@ msgstr "السنون" msgid "Percentage of width of brush" msgstr "النسبة من عرض الفرشاة" -#: ../app/widgets/gimpbufferview.c:175 ../app/widgets/gimpbufferview.c:267 -#: ../app/widgets/gimpeditor.c:745 +#: ../app/widgets/gimpbufferview.c:189 ../app/widgets/gimpbufferview.c:290 +#: ../app/widgets/gimpeditor.c:759 msgid "(None)" msgstr "(لا شيء)" -#: ../app/widgets/gimpcolordialog.c:153 +#: ../app/widgets/gimpclipboard.c:485 +msgid "Clipboard" +msgstr "الحافظة" + +#: ../app/widgets/gimpcolordialog.c:156 msgid "Add the current color to the color history" msgstr "أضِف اللون الحالي إلى تأريخ الألوان" -#: ../app/widgets/gimpcolordisplayeditor.c:157 +#: ../app/widgets/gimpcolordisplayeditor.c:165 msgid "Available Filters" msgstr "المرشحات المتوفرة" -#: ../app/widgets/gimpcolordisplayeditor.c:221 +#: ../app/widgets/gimpcolordisplayeditor.c:229 msgid "Move the selected filter up" msgstr "انقل المرشح المختار نحو الأعلى" -#: ../app/widgets/gimpcolordisplayeditor.c:230 +#: ../app/widgets/gimpcolordisplayeditor.c:238 msgid "Move the selected filter down" msgstr "انقل المرشح المختار نحو الأسفل" -#: ../app/widgets/gimpcolordisplayeditor.c:328 +#: ../app/widgets/gimpcolordisplayeditor.c:336 msgid "Reset the selected filter to default values" msgstr "أعد المرشح المحدد إلى القيم المبدئية" -#: ../app/widgets/gimpcolordisplayeditor.c:530 +#: ../app/widgets/gimpcolordisplayeditor.c:527 #, c-format msgid "Add '%s' to the list of active filters" msgstr "أضف '%s' إلى قائمة المرشحات النشطة" -#: ../app/widgets/gimpcolordisplayeditor.c:567 +#: ../app/widgets/gimpcolordisplayeditor.c:564 #, c-format msgid "Remove '%s' from the list of active filters" msgstr "احذف '%s' من قائمة المرشحات النشطة" -#: ../app/widgets/gimpcolordisplayeditor.c:598 +#: ../app/widgets/gimpcolordisplayeditor.c:605 msgid "No filter selected" msgstr "لم يحدد أي مرشح" @@ -19052,59 +23141,161 @@ msgstr "" "ترقيم الألوان الست عشرية كما يستخدم في إتش.تي.إم.إل و سي.إس.إس. تقبل هذه " "الخانة أسماء ألون سي.إس.إس. أيضا." -#: ../app/widgets/gimpcolorframe.c:627 ../app/widgets/gimpcolorframe.c:696 -msgid "Value:" -msgstr "القيمة:" +#. TRANSLATORS: X for the X coordinate. +#: ../app/widgets/gimpcolorframe.c:193 +#, fuzzy +msgctxt "Coordinates" +msgid "X:" +msgstr "_س:" -#: ../app/widgets/gimpcolorframe.c:630 ../app/widgets/gimpcolorframe.c:639 -#: ../app/widgets/gimpcolorframe.c:669 ../app/widgets/gimpcolorframe.c:699 -#: ../app/widgets/gimpcolorframe.c:724 -msgid "Alpha:" -msgstr "الشفافية:" +#. TRANSLATORS: Y for the Y coordinate. +#: ../app/widgets/gimpcolorframe.c:207 +#, fuzzy +msgctxt "Coordinates" +msgid "Y:" +msgstr "_ص:" -#: ../app/widgets/gimpcolorframe.c:634 ../app/widgets/gimpcolorframe.c:664 -msgid "Red:" +#. TRANSLATORS: n/a for Not Available. +#: ../app/widgets/gimpcolorframe.c:637 ../app/widgets/gimpcolorframe.c:639 +#, fuzzy +msgctxt "Coordinates" +msgid "n/a" +msgstr "غير متوفر" + +#. TRANSLATORS: V for Value (grayscale) +#: ../app/widgets/gimpcolorframe.c:712 +msgctxt "Grayscale" +msgid "V:" +msgstr "" + +#. TRANSLATORS: A for Alpha (color transparency) +#: ../app/widgets/gimpcolorframe.c:716 ../app/widgets/gimpcolorframe.c:729 +#: ../app/widgets/gimpcolorframe.c:765 ../app/widgets/gimpcolorframe.c:807 +#: ../app/widgets/gimpcolorframe.c:835 ../app/widgets/gimpcolorframe.c:867 +#: ../app/widgets/gimpcolorframe.c:901 +msgctxt "Alpha channel" +msgid "A:" +msgstr "" + +#. TRANSLATORS: R for Red (RGB) +#: ../app/widgets/gimpcolorframe.c:721 ../app/widgets/gimpcolorframe.c:757 +#, fuzzy +msgctxt "RGB" +msgid "R:" msgstr "أحمر:" -#: ../app/widgets/gimpcolorframe.c:635 ../app/widgets/gimpcolorframe.c:665 -msgid "Green:" -msgstr "أخضر:" +#. TRANSLATORS: G for Green (RGB) +#: ../app/widgets/gimpcolorframe.c:723 ../app/widgets/gimpcolorframe.c:759 +msgctxt "RGB" +msgid "G:" +msgstr "" -#: ../app/widgets/gimpcolorframe.c:636 ../app/widgets/gimpcolorframe.c:666 -msgid "Blue:" -msgstr "أزرق:" +#. TRANSLATORS: B for Blue (RGB) +#: ../app/widgets/gimpcolorframe.c:725 ../app/widgets/gimpcolorframe.c:761 +#, fuzzy +msgctxt "RGB" +msgid "B:" +msgstr "الصندوق:" -#: ../app/widgets/gimpcolorframe.c:643 +#. TRANSLATORS: Index of the color in the palette. +#: ../app/widgets/gimpcolorframe.c:734 +#, fuzzy +msgctxt "Indexed color" msgid "Index:" msgstr "فهرس:" -#: ../app/widgets/gimpcolorframe.c:681 +#. TRANSLATORS: Hex for Hexadecimal (representation of a color) +#: ../app/widgets/gimpcolorframe.c:768 +#, fuzzy +msgctxt "Color representation" msgid "Hex:" msgstr "ست عشري:" -#: ../app/widgets/gimpcolorframe.c:694 -msgid "Hue:" -msgstr "التدرج:" +#. TRANSLATORS: H for Hue (HSV color space) +#: ../app/widgets/gimpcolorframe.c:799 +#, fuzzy +msgctxt "HSV color space" +msgid "H:" +msgstr "ر" -#: ../app/widgets/gimpcolorframe.c:695 -msgid "Sat.:" -msgstr "التشبع:" +#. TRANSLATORS: S for Saturation (HSV color space) +#: ../app/widgets/gimpcolorframe.c:801 +msgctxt "HSV color space" +msgid "S:" +msgstr "" -#: ../app/widgets/gimpcolorframe.c:718 -msgid "Cyan:" -msgstr "سيان:" +#. TRANSLATORS: V for Value (HSV color space) +#: ../app/widgets/gimpcolorframe.c:803 +msgctxt "HSV color space" +msgid "V:" +msgstr "" -#: ../app/widgets/gimpcolorframe.c:719 -msgid "Magenta:" -msgstr "ماجنتا:" +#. TRANSLATORS: L for Lightness (LCH color space) +#: ../app/widgets/gimpcolorframe.c:827 +msgctxt "LCH color space" +msgid "L*:" +msgstr "" -#: ../app/widgets/gimpcolorframe.c:720 -msgid "Yellow:" -msgstr "أصفر:" +#. TRANSLATORS: C for Chroma (LCH color space) +#: ../app/widgets/gimpcolorframe.c:829 +msgctxt "LCH color space" +msgid "C*:" +msgstr "" -#: ../app/widgets/gimpcolorframe.c:721 -msgid "Black:" -msgstr "أسود:" +#. TRANSLATORS: H for Hue angle (LCH color space) +#: ../app/widgets/gimpcolorframe.c:831 +msgctxt "LCH color space" +msgid "h°:" +msgstr "" + +#. TRANSLATORS: L* for Lightness (Lab color space) +#: ../app/widgets/gimpcolorframe.c:859 +msgctxt "Lab color space" +msgid "L*:" +msgstr "" + +#. TRANSLATORS: a* color channel in Lab color space +#: ../app/widgets/gimpcolorframe.c:861 +msgctxt "Lab color space" +msgid "a*:" +msgstr "" + +#. TRANSLATORS: b* color channel in Lab color space +#: ../app/widgets/gimpcolorframe.c:863 +msgctxt "Lab color space" +msgid "b*:" +msgstr "" + +#. TRANSLATORS: C for Cyan (CMYK) +#: ../app/widgets/gimpcolorframe.c:891 +msgctxt "CMYK" +msgid "C:" +msgstr "" + +#. TRANSLATORS: M for Magenta (CMYK) +#: ../app/widgets/gimpcolorframe.c:893 +msgctxt "CMYK" +msgid "M:" +msgstr "" + +#. TRANSLATORS: Y for Yellow (CMYK) +#: ../app/widgets/gimpcolorframe.c:895 +#, fuzzy +msgctxt "CMYK" +msgid "Y:" +msgstr "_ص:" + +#. TRANSLATORS: K for Key/black (CMYK) +#: ../app/widgets/gimpcolorframe.c:897 +msgctxt "CMYK" +msgid "K:" +msgstr "" + +#: ../app/widgets/gimpcolorframe.c:959 +#, fuzzy +msgctxt "Color value" +msgid "n/a" +msgstr "غير متوفر" #: ../app/widgets/gimpcolormapeditor.c:203 msgid "Color index:" @@ -19114,15 +23305,15 @@ msgstr "فهرس الألوان:" msgid "HTML notation:" msgstr "ترقيم HTML:" -#: ../app/widgets/gimpcolormapeditor.c:485 +#: ../app/widgets/gimpcolormapeditor.c:481 msgid "Only indexed images have a colormap." msgstr "الصور الفهرسة فقط لها مخططات ألوان." -#: ../app/widgets/gimpcontainerpopup.c:351 +#: ../app/widgets/gimpcontainerpopup.c:333 msgid "Smaller Previews" msgstr "معاينات أصغر" -#: ../app/widgets/gimpcontainerpopup.c:356 +#: ../app/widgets/gimpcontainerpopup.c:338 msgid "Larger Previews" msgstr "معاينات أكبر" @@ -19154,22 +23345,32 @@ msgstr "ا_لتقط الإجراء" msgid "Select the next event arriving from the controller" msgstr "" -#: ../app/widgets/gimpcontrollereditor.c:526 +#: ../app/widgets/gimpcontrollereditor.c:374 +#, fuzzy +msgid "_Edit event" +msgstr "_حرّر التدرج..." + +#: ../app/widgets/gimpcontrollereditor.c:382 +#, fuzzy +msgid "_Clear event" +msgstr "ا_لتقط الإجراء" + +#: ../app/widgets/gimpcontrollereditor.c:521 #, c-format msgid "Remove the action assigned to '%s'" msgstr "احذف الإجراء المسند إلى '%s'" -#: ../app/widgets/gimpcontrollereditor.c:531 +#: ../app/widgets/gimpcontrollereditor.c:526 #, c-format msgid "Assign an action to '%s'" msgstr "أسنِد الإجراء إلى '%s'" -#: ../app/widgets/gimpcontrollereditor.c:652 +#: ../app/widgets/gimpcontrollereditor.c:647 #, c-format msgid "Select Action for Event '%s'" msgstr "اختر إجراء الحدث '%s'" -#: ../app/widgets/gimpcontrollereditor.c:657 +#: ../app/widgets/gimpcontrollereditor.c:652 msgid "Select Controller Event Action" msgstr "اختر إجراء حدث الضابط" @@ -19260,55 +23461,57 @@ msgstr "انقل الضابط المحدد نحو الأعلى" msgid "Move the selected controller down" msgstr "انقل الضابط المحدد نحو الأسفل" -#: ../app/widgets/gimpcontrollerlist.c:429 +#: ../app/widgets/gimpcontrollerlist.c:425 #, c-format msgid "Add '%s' to the list of active controllers" msgstr "أضف '%s' إلى قائمة الضابطات النشطة" -#: ../app/widgets/gimpcontrollerlist.c:480 +#: ../app/widgets/gimpcontrollerlist.c:476 #, c-format msgid "Remove '%s' from the list of active controllers" msgstr "احذف '%s' من قائمة الضابطات النشطة" -#: ../app/widgets/gimpcontrollerlist.c:514 +#: ../app/widgets/gimpcontrollerlist.c:510 msgid "" "There can only be one active keyboard controller.\n" "\n" "You already have a keyboard controller in your list of active controllers." msgstr "" -#: ../app/widgets/gimpcontrollerlist.c:525 +#: ../app/widgets/gimpcontrollerlist.c:521 msgid "" "There can only be one active wheel controller.\n" "\n" "You already have a wheel controller in your list of active controllers." msgstr "" -#: ../app/widgets/gimpcontrollerlist.c:536 +#: ../app/widgets/gimpcontrollerlist.c:532 msgid "" "There can only be one active mouse controller.\n" "\n" "You already have a mouse controller in your list of active controllers." msgstr "" -#: ../app/widgets/gimpcontrollerlist.c:562 +#: ../app/widgets/gimpcontrollerlist.c:558 msgid "Remove Controller?" msgstr "أأحذف الضابط؟" -#: ../app/widgets/gimpcontrollerlist.c:567 -msgid "Disable Controller" +#: ../app/widgets/gimpcontrollerlist.c:563 +#, fuzzy +msgid "_Disable Controller" msgstr "عطّل الضابط" -#: ../app/widgets/gimpcontrollerlist.c:569 -msgid "Remove Controller" +#: ../app/widgets/gimpcontrollerlist.c:565 +#, fuzzy +msgid "_Remove Controller" msgstr "احذف الضابط" -#: ../app/widgets/gimpcontrollerlist.c:581 +#: ../app/widgets/gimpcontrollerlist.c:577 #, c-format msgid "Remove Controller '%s'?" msgstr "أأحذف الضابط '%s'؟" -#: ../app/widgets/gimpcontrollerlist.c:585 +#: ../app/widgets/gimpcontrollerlist.c:581 msgid "" "Removing this controller from the list of active controllers will " "permanently delete all event mappings you have configured.\n" @@ -19317,7 +23520,7 @@ msgid "" "removing it." msgstr "" -#: ../app/widgets/gimpcontrollerlist.c:637 +#: ../app/widgets/gimpcontrollerlist.c:633 msgid "Configure Input Controller" msgstr "اضبط ضابط الإدخال" @@ -19436,6 +23639,301 @@ msgstr "بكرة الفأرة" msgid "Mouse Wheel Events" msgstr "أحداث بكرة الفأرة" +#: ../app/widgets/gimpcriticaldialog.c:54 +#, fuzzy +msgid "Copy Bug Information" +msgstr "ا_نسخ مكان الفرشاة" + +#: ../app/widgets/gimpcriticaldialog.c:55 +msgid "Open Bug Tracker" +msgstr "" + +#: ../app/widgets/gimpcriticaldialog.c:132 +#: ../app/widgets/gimpcriticaldialog.c:443 +msgid "" +"To help us improve GIMP, you can report the bug with these simple steps:" +msgstr "" + +#: ../app/widgets/gimpcriticaldialog.c:134 +#: ../app/widgets/gimpcriticaldialog.c:445 +#, fuzzy +msgid "Copy the bug information to the clipboard by clicking: " +msgstr "انسخ مكان ملف الفرشاة إلى الحافظة" + +#: ../app/widgets/gimpcriticaldialog.c:136 +#: ../app/widgets/gimpcriticaldialog.c:447 +msgid "Open our bug tracker in the browser by clicking: " +msgstr "" + +#: ../app/widgets/gimpcriticaldialog.c:138 +#: ../app/widgets/gimpcriticaldialog.c:449 +msgid "Create a login if you don't have one yet." +msgstr "" + +#: ../app/widgets/gimpcriticaldialog.c:139 +#: ../app/widgets/gimpcriticaldialog.c:450 +#, fuzzy +msgid "Paste the clipboard text in a new bug report." +msgstr "ألصق محتوى براح مسمى" + +#: ../app/widgets/gimpcriticaldialog.c:140 +#: ../app/widgets/gimpcriticaldialog.c:451 +msgid "" +"Add relevant information in English in the bug report explaining what you " +"were doing when this error occurred." +msgstr "" + +#: ../app/widgets/gimpcriticaldialog.c:142 +msgid "" +"This error may have left GIMP in an inconsistent state. It is advised to " +"save your work and restart GIMP." +msgstr "" + +#: ../app/widgets/gimpcriticaldialog.c:153 +msgid "" +"You can also close the dialog directly but reporting bugs is the best way to " +"make your software awesome." +msgstr "" + +#: ../app/widgets/gimpcriticaldialog.c:226 +msgid "The operating system is out of memory or resources." +msgstr "" + +#: ../app/widgets/gimpcriticaldialog.c:229 +msgid "The specified file was not found." +msgstr "" + +#: ../app/widgets/gimpcriticaldialog.c:232 +#, fuzzy +msgid "The specified path was not found." +msgstr "المسار النشط موصد." + +#: ../app/widgets/gimpcriticaldialog.c:235 +msgid "" +"The .exe file is invalid (non-Microsoft Win32 .exe or error in .exe image)." +msgstr "" + +#: ../app/widgets/gimpcriticaldialog.c:238 +msgid "The operating system denied access to the specified file." +msgstr "" + +#: ../app/widgets/gimpcriticaldialog.c:241 +msgid "The file name association is incomplete or invalid." +msgstr "" + +#: ../app/widgets/gimpcriticaldialog.c:244 +msgid "DDE transaction busy" +msgstr "" + +#: ../app/widgets/gimpcriticaldialog.c:247 +#, fuzzy +msgid "The DDE transaction failed." +msgstr "فشل تثبيت المستخدم!" + +#: ../app/widgets/gimpcriticaldialog.c:250 +msgid "The DDE transaction timed out." +msgstr "" + +#: ../app/widgets/gimpcriticaldialog.c:253 +msgid "The specified DLL was not found." +msgstr "" + +#: ../app/widgets/gimpcriticaldialog.c:256 +msgid "There is no application associated with the given file name extension." +msgstr "" + +#: ../app/widgets/gimpcriticaldialog.c:259 +msgid "There was not enough memory to complete the operation." +msgstr "" + +#: ../app/widgets/gimpcriticaldialog.c:262 +msgid "A sharing violation occurred." +msgstr "" + +#: ../app/widgets/gimpcriticaldialog.c:265 +msgid "Unknown Microsoft Windows error." +msgstr "" + +#: ../app/widgets/gimpcriticaldialog.c:268 +#, fuzzy, c-format +msgid "Failed to open '%s': %s" +msgstr "فشل استيراد المسارات من '%s'‏: %s" + +#: ../app/widgets/gimpcriticaldialog.c:409 +#, c-format +msgid "GIMP crashed with a fatal error: %s" +msgstr "" + +#. First error. Let's just display it. +#: ../app/widgets/gimpcriticaldialog.c:416 +#, c-format +msgid "GIMP encountered an error: %s" +msgstr "" + +#. Let's not display all errors. They will be in the bug report +#. * part anyway. +#. +#: ../app/widgets/gimpcriticaldialog.c:424 +#, c-format +msgid "GIMP encountered several critical errors!" +msgstr "" + +#: ../app/widgets/gimpcriticaldialog.c:476 +msgid "_Restart GIMP" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:332 ../app/widgets/gimpdashboard.c:384 +msgctxt "dashboard-variable" +msgid "Occupied" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:333 +#, fuzzy +msgid "Tile cache occupied size" +msgstr "_حجم مخبئية اللوح:" + +#: ../app/widgets/gimpdashboard.c:342 +msgctxt "dashboard-variable" +msgid "Maximum" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:343 +msgid "Maximal tile cache occupied size" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:352 ../app/widgets/gimpdashboard.c:404 +msgctxt "dashboard-variable" +msgid "Limit" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:353 +#, fuzzy +msgid "Tile cache size limit" +msgstr "_حجم مخبئية اللوح:" + +#: ../app/widgets/gimpdashboard.c:361 +#, fuzzy +msgctxt "dashboard-variable" +msgid "Compression" +msgstr "دقّة الصورة" + +#: ../app/widgets/gimpdashboard.c:362 +msgid "Tile cache compression ratio" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:371 +msgctxt "dashboard-variable" +msgid "Hit/Miss" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:372 +#, fuzzy +msgid "Tile cache hit/miss ratio" +msgstr "_حجم مخبئية اللوح:" + +#: ../app/widgets/gimpdashboard.c:385 +#, fuzzy +msgid "Swap file occupied size" +msgstr "_حجم مخبئية اللوح:" + +#: ../app/widgets/gimpdashboard.c:394 +#, fuzzy +msgctxt "dashboard-variable" +msgid "Size" +msgstr "الحجم" + +#: ../app/widgets/gimpdashboard.c:395 +#, fuzzy +msgid "Swap file size" +msgstr "أظهر حجم الصورة" + +#: ../app/widgets/gimpdashboard.c:405 +msgid "Swap file size limit" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:412 +msgctxt "dashboard-variable" +msgid "Busy" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:413 +msgid "Whether there is work queued for the swap file" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:426 +#, fuzzy +msgctxt "dashboard-variable" +msgid "Usage" +msgstr "رسالة" + +#: ../app/widgets/gimpdashboard.c:427 +msgid "Total CPU usage" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:435 ../app/widgets/gimpdashboard.c:445 +#, fuzzy +msgctxt "dashboard-variable" +msgid "Active" +msgstr "المسار النشط" + +#: ../app/widgets/gimpdashboard.c:436 +#, fuzzy +msgid "Whether the CPU is active" +msgstr "اجعل الطبقة أو المسار نشطا" + +#: ../app/widgets/gimpdashboard.c:446 +msgid "Total amount of time the CPU has been active" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:460 +msgctxt "dashboard-group" +msgid "Cache" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:461 +msgid "In-memory tile cache" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:496 +msgctxt "dashboard-group" +msgid "Swap" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:497 +msgid "On-disk tile swap" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:525 +msgctxt "dashboard-group" +msgid "CPU" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:526 +msgid "CPU usage" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:698 +#, fuzzy +msgid "Select fields" +msgstr "اختر الكل" + +#. Tranlators: "N/A" is an abbreviation for "not available" +#: ../app/widgets/gimpdashboard.c:2162 +msgctxt "dashboard-value" +msgid "N/A" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:2171 +msgctxt "dashboard-value" +msgid "Yes" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:2172 +#, fuzzy +msgctxt "dashboard-value" +msgid "No" +msgstr "بدون" + #: ../app/widgets/gimpdataeditor.c:413 #, c-format msgid "%s (read only)" @@ -19479,42 +23977,45 @@ msgstr "ميل س" msgid "Y tilt" msgstr "ميل ص" -#. Wheel as in mouse or input device wheel -#: ../app/widgets/gimpdeviceinfoeditor.c:145 +#. Wheel as in mouse or input device wheel. +#. * Some pens use the same axis for their rotation feature. +#. * See bug 791455. +#. +#: ../app/widgets/gimpdeviceinfoeditor.c:148 #: ../app/widgets/gimpdynamicseditor.c:165 -#: ../app/widgets/gimpdynamicsoutputeditor.c:74 -msgid "Wheel" -msgstr "البكرة" +#, fuzzy +msgid "Wheel/Rotation" +msgstr "يدوّر" #. the axes #. The axes of an input device -#: ../app/widgets/gimpdeviceinfoeditor.c:196 +#: ../app/widgets/gimpdeviceinfoeditor.c:199 msgid "Axes" msgstr "المحاور" #. the keys -#: ../app/widgets/gimpdeviceinfoeditor.c:270 +#: ../app/widgets/gimpdeviceinfoeditor.c:273 msgid "Keys" msgstr "المفاتيح" -#: ../app/widgets/gimpdeviceinfoeditor.c:366 -#: ../app/widgets/gimpdeviceinfoeditor.c:585 +#: ../app/widgets/gimpdeviceinfoeditor.c:369 +#: ../app/widgets/gimpdeviceinfoeditor.c:584 #, c-format msgid "none" msgstr "لا شيء" #. e.g. "Pressure Curve" for mapping input device axes -#: ../app/widgets/gimpdeviceinfoeditor.c:415 +#: ../app/widgets/gimpdeviceinfoeditor.c:418 #, c-format msgid "%s Curve" msgstr "منحنى %s" -#: ../app/widgets/gimpdeviceinfoeditor.c:474 +#: ../app/widgets/gimpdeviceinfoeditor.c:477 #: ../app/widgets/gimpdynamicsoutputeditor.c:209 msgid "_Reset Curve" msgstr "_صفّر المنحنى" -#: ../app/widgets/gimpdeviceinfoeditor.c:487 +#: ../app/widgets/gimpdeviceinfoeditor.c:490 #, c-format msgid "The axis '%s' has no curve" msgstr "ليس للمحور '%s' منحنيات" @@ -19541,16 +24042,16 @@ msgstr "اسم الملف المعطى لا يحمل أي امتداد." msgid "File Exists" msgstr "الملف موجود" -#: ../app/widgets/gimpdnd-xds.c:228 +#: ../app/widgets/gimpdnd-xds.c:229 msgid "_Replace" msgstr "ا_ستبدل" -#: ../app/widgets/gimpdnd-xds.c:238 +#: ../app/widgets/gimpdnd-xds.c:239 #, c-format msgid "A file named '%s' already exists." msgstr "يوجد فعلا ملف بالاسم %s." -#: ../app/widgets/gimpdnd-xds.c:242 +#: ../app/widgets/gimpdnd-xds.c:243 msgid "Do you want to replace it with the image you are saving?" msgstr "هل تريد استبداله بالصورة التي تحفظها؟" @@ -19576,7 +24077,7 @@ msgctxt "dock" msgid " | " msgstr " | " -#: ../app/widgets/gimpdockbook.c:294 +#: ../app/widgets/gimpdockbook.c:303 msgid "Configure this tab" msgstr "اضبط هذا اللسان" @@ -19617,16 +24118,20 @@ msgstr "الإبهات" msgid "Mapping matrix" msgstr "مصفوفة المقابلة" -#: ../app/widgets/gimpdynamicseditor.c:319 +#: ../app/widgets/gimpdynamicseditor.c:315 #: ../app/widgets/gimptoolpreseteditor.c:149 msgid "Icon:" msgstr "الأيقونة:" -#: ../app/widgets/gimperrordialog.c:151 +#: ../app/widgets/gimpdynamicsoutputeditor.c:74 +msgid "Wheel / Rotation" +msgstr "" + +#: ../app/widgets/gimperrordialog.c:169 msgid "Too many error messages!" msgstr "رسائل خطأ كثيرة جدا!" -#: ../app/widgets/gimperrordialog.c:152 +#: ../app/widgets/gimperrordialog.c:170 msgid "Messages are redirected to stderr." msgstr "تمرر الرسائل إلى الخطأ القياسي." @@ -19634,7 +24139,7 @@ msgstr "تمرر الرسائل إلى الخطأ القياسي." #. * like "GIMP Message" or #. * "PNG Message" #. -#: ../app/widgets/gimperrordialog.c:175 +#: ../app/widgets/gimperrordialog.c:196 #, c-format msgid "%s Message" msgstr "رسالة %s" @@ -19647,7 +24152,7 @@ msgstr "صدّر الصورة" msgid "_Export" msgstr "_صدِّر" -#: ../app/widgets/gimpexportdialog.c:74 ../app/widgets/gimpsavedialog.c:143 +#: ../app/widgets/gimpexportdialog.c:74 ../app/widgets/gimpsavedialog.c:145 msgid "By Extension" msgstr "بالامتداد" @@ -19655,15 +24160,20 @@ msgstr "بالامتداد" msgid "All export images" msgstr "كل صور التصدير" -#: ../app/widgets/gimpfiledialog.c:752 +#: ../app/widgets/gimpfiledialog.c:350 +#, fuzzy +msgid "_Help" +msgstr "م_ساعدة" + +#: ../app/widgets/gimpfiledialog.c:756 msgid "All files" msgstr "كل الملفات" -#: ../app/widgets/gimpfiledialog.c:757 +#: ../app/widgets/gimpfiledialog.c:761 msgid "All images" msgstr "كل الصور" -#: ../app/widgets/gimpfiledialog.c:953 +#: ../app/widgets/gimpfiledialog.c:959 #, c-format msgid "Select File _Type (%s)" msgstr "اختر _نوع الملف (%s)" @@ -19786,15 +24296,15 @@ msgstr "غيّر لون خلفية الشبكة" msgid "_Background color:" msgstr "لون ال_خلفية:" -#: ../app/widgets/gimphelp.c:310 +#: ../app/widgets/gimphelp.c:371 msgid "Help browser is missing" msgstr "متصفح المساعدة مفقود" -#: ../app/widgets/gimphelp.c:311 +#: ../app/widgets/gimphelp.c:372 msgid "The GIMP help browser is not available." msgstr "متصفح مساعدة جمب غير متاح." -#: ../app/widgets/gimphelp.c:312 +#: ../app/widgets/gimphelp.c:373 msgid "" "The GIMP help browser plug-in appears to be missing from your installation. " "You may instead use the web browser for reading the help pages." @@ -19802,38 +24312,54 @@ msgstr "" "ملحقة متصفح مساعدة جمب تبدو مفقودة من تثبيتك. يمكنك استخدام متصفح الوب لعرض " "صفحات المساعدة." -#: ../app/widgets/gimphelp.c:358 +#: ../app/widgets/gimphelp.c:419 msgid "Help browser doesn't start" msgstr "متصفح المساعدة لا يبدأ" -#: ../app/widgets/gimphelp.c:359 +#: ../app/widgets/gimphelp.c:420 msgid "Could not start the GIMP help browser plug-in." msgstr "تعذّر بدء ملحقة مساعدة حمب." -#: ../app/widgets/gimphelp.c:361 +#: ../app/widgets/gimphelp.c:422 #, fuzzy msgid "You may instead use the web browser for reading the help pages." msgstr "" "ملحقة متصفح مساعدة جمب تبدو مفقودة من تثبيتك. يمكنك استخدام متصفح الوب لعرض " "صفحات المساعدة." -#: ../app/widgets/gimphelp.c:387 +#: ../app/widgets/gimphelp.c:448 msgid "Use _Web Browser" msgstr "استخدم _متصفح الوب" -#: ../app/widgets/gimphelp.c:637 +#: ../app/widgets/gimphelp.c:793 msgid "GIMP user manual is missing" msgstr "دليل مستخدمي جمب مفقود" -#: ../app/widgets/gimphelp.c:644 -msgid "_Read Online" -msgstr "ا_قرأ من الإنترنت" - -#: ../app/widgets/gimphelp.c:668 -msgid "The GIMP user manual is not installed on your computer." +#: ../app/widgets/gimphelp.c:809 +#, fuzzy +msgid "The GIMP user manual is not installed in your language." msgstr "كتيب مستخدمي جمب ليس مثبتا على حاسوبك." -#: ../app/widgets/gimphelp.c:671 +#: ../app/widgets/gimphelp.c:820 +#, fuzzy +msgid "Read Selected _Language" +msgstr "لغة النظام" + +#: ../app/widgets/gimphelp.c:824 +#, fuzzy +msgid "Available manuals..." +msgstr "المرشحات المتوفرة" + +#: ../app/widgets/gimphelp.c:836 +#, fuzzy +msgid "" +"You may either select a manual in another language or read the online " +"version." +msgstr "" +"يمكنك إما تثبيت حزمة المساعدة الإضافية أو تعديل التفضيلات لتستخدم نسخة " +"الإنترنت." + +#: ../app/widgets/gimphelp.c:842 msgid "" "You may either install the additional help package or change your " "preferences to use the online version." @@ -19841,33 +24367,47 @@ msgstr "" "يمكنك إما تثبيت حزمة المساعدة الإضافية أو تعديل التفضيلات لتستخدم نسخة " "الإنترنت." -#: ../app/widgets/gimphistogrameditor.c:98 +#: ../app/widgets/gimphelp.c:847 +#, fuzzy +msgid "Read _Online" +msgstr "ا_قرأ من الإنترنت" + +#: ../app/widgets/gimphistogrameditor.c:128 msgid "Mean:" msgstr "المتوسط:" -#: ../app/widgets/gimphistogrameditor.c:99 +#: ../app/widgets/gimphistogrameditor.c:129 msgid "Std dev:" msgstr "الجهاز القياسي:" -#: ../app/widgets/gimphistogrameditor.c:100 +#: ../app/widgets/gimphistogrameditor.c:130 msgid "Median:" msgstr "الأوسط:" -#: ../app/widgets/gimphistogrameditor.c:101 +#: ../app/widgets/gimphistogrameditor.c:131 msgid "Pixels:" msgstr "بكسلات:" -#: ../app/widgets/gimphistogrameditor.c:102 +#: ../app/widgets/gimphistogrameditor.c:132 msgid "Count:" msgstr "عد:" -#: ../app/widgets/gimphistogrameditor.c:103 +#: ../app/widgets/gimphistogrameditor.c:133 msgid "Percentile:" msgstr "النسبة المئوية:" -#: ../app/widgets/gimphistogrameditor.c:121 -msgid "Channel:" -msgstr "القناة:" +#: ../app/widgets/gimphistogrameditor.c:160 +#, fuzzy +msgid "Histogram channel" +msgstr "مقياس الرسم البياني" + +#: ../app/widgets/gimphistogrameditor.c:171 +msgid "Show values in linear space" +msgstr "" + +#: ../app/widgets/gimphistogrameditor.c:172 +msgid "Show values in perceptual space" +msgstr "" #: ../app/widgets/gimpiconpicker.c:245 msgid "From File..." @@ -19885,10 +24425,24 @@ msgstr "انسخ الأيقونة إلى الحافظة" msgid "Paste Icon from Clipboard" msgstr "ألصق أيقونة من الحافظة" -#: ../app/widgets/gimpiconpicker.c:512 +#: ../app/widgets/gimpiconpicker.c:484 msgid "Load Icon Image" msgstr "حمّل صورة أيقونة" +#: ../app/widgets/gimpiconsizescale.c:126 +#, fuzzy +msgid "Guess icon size from resolution" +msgstr "الميْز الأفقي للشاشة" + +#: ../app/widgets/gimpiconsizescale.c:127 +msgid "Use icon size from the theme" +msgstr "" + +#: ../app/widgets/gimpiconsizescale.c:128 +#, fuzzy +msgid "Custom icon size" +msgstr "لون مخصص" + #. Button #: ../app/widgets/gimpimagecommenteditor.c:107 msgid "Use default comment" @@ -19962,18 +24516,18 @@ msgstr "عدد القنوات:" msgid "Number of paths:" msgstr "عدد المسارات:" -#: ../app/widgets/gimpimagepropview.c:454 +#: ../app/widgets/gimpimagepropview.c:452 #: ../app/widgets/gimptemplateeditor.c:349 #, c-format msgid "pixels/%s" msgstr "بكسل/%s" -#: ../app/widgets/gimpimagepropview.c:456 +#: ../app/widgets/gimpimagepropview.c:454 #, c-format msgid "%g × %g %s" msgstr "‏%g × ‏%g ‏%s" -#: ../app/widgets/gimpimagepropview.c:477 +#: ../app/widgets/gimpimagepropview.c:475 msgid "colors" msgstr "الألوان" @@ -19981,15 +24535,20 @@ msgstr "الألوان" msgid "Lock:" msgstr "أوصِد:" -#: ../app/widgets/gimplanguagestore-parser.c:252 +#: ../app/widgets/gimplanguagestore-parser.c:253 msgid "System Language" msgstr "لغة النظام" -#: ../app/widgets/gimplayertreeview.c:310 +#: ../app/widgets/gimplayermodebox.c:158 +#, fuzzy +msgid "Switch to another group of modes" +msgstr "انتقل إلى الصورة السابقة" + +#: ../app/widgets/gimplayertreeview.c:319 msgid "Lock alpha channel" msgstr "أوصِد قناة الشفافية" -#: ../app/widgets/gimpmessagebox.c:442 +#: ../app/widgets/gimpmessagebox.c:395 #, c-format msgid "Message repeated once." msgid_plural "Message repeated %d times." @@ -20022,170 +24581,42 @@ msgid "You can drop dockable dialogs here" msgstr "يمكنك إفلات العناصر القابلة للرصف هنا" #: ../app/widgets/gimppickablepopup.c:206 -#: ../app/widgets/gimppickablepopup.c:432 +#: ../app/widgets/gimppickablepopup.c:423 msgid "Select an image in the left pane" msgstr "اختر صورة من اللوحة اليسرى" +#: ../app/widgets/gimppluginview.c:149 +msgid "Plug-In" +msgstr "ملحقة" + #: ../app/widgets/gimpprogressdialog.c:223 msgid "Progress" msgstr "التقدم" -#: ../app/widgets/gimppropgui-constructors.c:171 -msgid "Pick coordinates from the image" -msgstr "خذ الإحداثيات من الصورة" - -#: ../app/widgets/gimppropgui-constructors.c:330 -msgid "Clockwise" -msgstr "مع عقارب الساعة" - -#: ../app/widgets/gimppropgui-constructors.c:334 -#, fuzzy -msgid "Invert Range" -msgstr "اعكس القناة" - -#: ../app/widgets/gimppropgui-constructors.c:338 -#, fuzzy -msgid "Select All" -msgstr "اختر الكل" - -#: ../app/widgets/gimppropgui-constructors.c:417 -msgid "Source Range" -msgstr "المدى المصدر" - -#: ../app/widgets/gimppropgui-constructors.c:428 -msgid "Destination Range" -msgstr "المدى الهدف" - -#: ../app/widgets/gimppropgui-constructors.c:439 -msgid "Gray Handling" -msgstr "التعامل مع الرمادي" - -#: ../app/widgets/gimppropgui-constructors.c:576 -msgid "Red channel" -msgstr "القناة الحمراء" - -#: ../app/widgets/gimppropgui-constructors.c:600 -msgid "Green channel" -msgstr "القناة الخضراء" - -#: ../app/widgets/gimppropgui-constructors.c:624 -msgid "Blue channel" -msgstr "القناة الزرقاء" - -#: ../app/widgets/gimppropgui-constructors.c:682 -msgid "Frequencies" -msgstr "" - -#: ../app/widgets/gimppropgui-constructors.c:691 -#, fuzzy -msgid "Contours" -msgstr "متّصل" - -#: ../app/widgets/gimppropgui-constructors.c:700 -#, fuzzy -msgid "Sharp Edges" -msgstr "تحديد" - -#: ../app/widgets/gimppropgui-constructors.c:709 -#, fuzzy -msgid "Other Options" -msgstr "خيارات الإبهات" - -#: ../app/widgets/gimppropgui.c:119 -msgid "New Seed" -msgstr "بذرة جديدة" - -#: ../app/widgets/gimppropgui.c:346 -msgid "Pick color from the image" -msgstr "خذ اللون من الصورة" - -#: ../app/widgets/gimppropgui.c:457 -msgid "This operation has no editable properties" -msgstr "ليس لهذه العملية أي خصائص قابلة للتحرير" - -#: ../app/widgets/gimppropgui.c:527 -msgid "1,700 K – Match flame" -msgstr "" - -#: ../app/widgets/gimppropgui.c:528 -msgid "1,850 K – Candle flame, sunset/sunrise" -msgstr "" - -#: ../app/widgets/gimppropgui.c:529 -msgid "3,000 K – Soft (or warm) white compact fluorescent lamps" -msgstr "" - -#: ../app/widgets/gimppropgui.c:530 -msgid "3,300 K – Incandescent lamps" -msgstr "" - -#: ../app/widgets/gimppropgui.c:531 -msgid "3,200 K – Studio lamps, photofloods, etc." -msgstr "" - -#: ../app/widgets/gimppropgui.c:532 -msgid "3,350 K – Studio \"CP\" light" -msgstr "" - -#: ../app/widgets/gimppropgui.c:533 -msgid "4,100 K – Moonlight" -msgstr "" - -#: ../app/widgets/gimppropgui.c:534 -msgid "5,000 K – D50" -msgstr "" - -#: ../app/widgets/gimppropgui.c:535 -msgid "5,000 K – Cool white/daylight compact fluorescent lamps" -msgstr "" - -#: ../app/widgets/gimppropgui.c:536 -msgid "5,000 K – Horizon daylight" -msgstr "" - -#: ../app/widgets/gimppropgui.c:537 -msgid "5,500 K – D55" -msgstr "" - -#: ../app/widgets/gimppropgui.c:538 -msgid "5,500 K – Vertical daylight, electronic flash" -msgstr "" - -#: ../app/widgets/gimppropgui.c:539 -msgid "6,200 K – Xenon short-arc lamp" -msgstr "" - -#: ../app/widgets/gimppropgui.c:540 -msgid "6,500 K – D65" -msgstr "" - -#: ../app/widgets/gimppropgui.c:541 -msgid "6,500 K – Daylight, overcast" -msgstr "" - -#: ../app/widgets/gimppropgui.c:542 -msgid "7,500 K – D75" -msgstr "" - -#: ../app/widgets/gimppropgui.c:543 -msgid "9,300 K" -msgstr "" - -#: ../app/widgets/gimpsavedialog.c:149 +#: ../app/widgets/gimpsavedialog.c:151 msgid "All XCF images" msgstr "كل صور XCF" -#: ../app/widgets/gimpsavedialog.c:270 -#, c-format -msgid "Disables compression to make the XCF file readable by %s and later." +#: ../app/widgets/gimpsavedialog.c:259 +#, fuzzy, c-format +msgid "" +"The image uses features from %s, disabling compression won't make the XCF " +"file readable by older GIMP versions." +msgstr "تستخدم الصورة مميزات من %s و لا يمكن حفظها لإصدارات جمب الأقدم." + +#: ../app/widgets/gimpsavedialog.c:266 +#, fuzzy, c-format +msgid "" +"Keep compression disabled to make the XCF file readable by %s and later." msgstr "عطّل الضغط لإبقاء ملف XCF مقروء في %s أو أحدث." -#: ../app/widgets/gimpsavedialog.c:278 +#: ../app/widgets/gimpsavedialog.c:276 msgid "Metadata won't be visible in GIMP older than version 2.10." msgstr "" -#: ../app/widgets/gimpsavedialog.c:342 -msgid "Save this XCF file with maximum compatibility" +#: ../app/widgets/gimpsavedialog.c:329 +#, fuzzy +msgid "Save this XCF file with better but slower compression" msgstr "احفظ ملف XCF هذا بأعلى توافقية" #: ../app/widgets/gimpselectiondata.c:250 @@ -20200,52 +24631,68 @@ msgstr "" msgid "Invalid UTF-8" msgstr "‏UTF-8 غير صالح" -#: ../app/widgets/gimpsettingsbox.c:269 -msgid "Pick a setting from the list" +#: ../app/widgets/gimpsettingsbox.c:304 +#, fuzzy +msgid "Pick a preset from the list" msgstr "انتقِ إعدادا من القائمة" -#: ../app/widgets/gimpsettingsbox.c:291 -msgid "Add settings to favorites" -msgstr "أضِف الإعدادات إلى المفضلة" +#: ../app/widgets/gimpsettingsbox.c:328 +#, fuzzy +msgid "Save the current settings as named preset" +msgstr "احفظ خيارات الأدوات في هذه المحفوظة" -#: ../app/widgets/gimpsettingsbox.c:319 -msgid "_Import Settings from File..." +#: ../app/widgets/gimpsettingsbox.c:346 +#, fuzzy +msgid "Manage presets" +msgstr "أدِر الإعدادات المحفوظة" + +#: ../app/widgets/gimpsettingsbox.c:360 +#, fuzzy +msgid "_Import Current Settings from File..." msgstr "ا_ستورد الإعدادات من ملف..." -#: ../app/widgets/gimpsettingsbox.c:325 -msgid "_Export Settings to File..." +#: ../app/widgets/gimpsettingsbox.c:366 +#, fuzzy +msgid "_Export Current Settings to File..." msgstr "_صدّر الإعدادات إلى ملف..." -#: ../app/widgets/gimpsettingsbox.c:332 -msgid "_Manage Settings..." -msgstr "أدِر الإ_عدادت..." +#: ../app/widgets/gimpsettingsbox.c:373 +#, fuzzy +msgid "_Manage Saved Presets..." +msgstr "أدِر الإعدادات المحفوظة" -#: ../app/widgets/gimpsettingsbox.c:646 -msgid "Add Settings to Favorites" -msgstr "أضِف الإعدادات للمفضلة" +#: ../app/widgets/gimpsettingsbox.c:613 +#, fuzzy +msgid "Save Settings as Named Preset" +msgstr "الإعدادات المحفوظة" -#: ../app/widgets/gimpsettingsbox.c:649 -msgid "Enter a name for the settings" +#: ../app/widgets/gimpsettingsbox.c:616 +#, fuzzy +msgid "Enter a name for the preset" msgstr "أدخل اسما للإعدادات" -#: ../app/widgets/gimpsettingsbox.c:650 +#: ../app/widgets/gimpsettingsbox.c:617 msgid "Saved Settings" msgstr "الإعدادات المحفوظة" -#: ../app/widgets/gimpsettingsbox.c:691 -msgid "Manage Saved Settings" +#: ../app/widgets/gimpsettingsbox.c:658 +#, fuzzy +msgid "Manage Saved Presets" msgstr "أدِر الإعدادات المحفوظة" -#: ../app/widgets/gimpsettingseditor.c:194 -msgid "Import settings from a file" +#: ../app/widgets/gimpsettingseditor.c:195 +#, fuzzy +msgid "Import presets from a file" msgstr "استورد الإعدادات من ملف" -#: ../app/widgets/gimpsettingseditor.c:203 -msgid "Export the selected settings to a file" +#: ../app/widgets/gimpsettingseditor.c:204 +#, fuzzy +msgid "Export the selected presets to a file" msgstr "صدّر الإعدادات المختارة إلى ملف" -#: ../app/widgets/gimpsettingseditor.c:212 -msgid "Delete the selected settings" +#: ../app/widgets/gimpsettingseditor.c:213 +#, fuzzy +msgid "Delete the selected preset" msgstr "احذف الإعدادات المختارة" #: ../app/widgets/gimpsizebox.c:458 @@ -20298,7 +24745,7 @@ msgstr "أدخِل الوسوم" #. * IMPORTANT: use only one of Unicode terminal punctuation chars. #. * http://unicode.org/review/pr-23.html #. -#: ../app/widgets/gimptagentry.c:1751 +#: ../app/widgets/gimptagentry.c:1750 msgid "," msgstr "،" @@ -20334,29 +24781,29 @@ msgstr "لوّن الصورة" msgid "Choose A Color Profile" msgstr "لاحة الألوان الحالية" -#: ../app/widgets/gimptemplateeditor.c:443 +#: ../app/widgets/gimptemplateeditor.c:445 #, fuzzy msgid "Co_lor profile:" msgstr "لاحة الألوان" -#: ../app/widgets/gimptemplateeditor.c:460 +#: ../app/widgets/gimptemplateeditor.c:462 msgid "Comme_nt:" msgstr "ال_تعليق:" -#: ../app/widgets/gimptemplateeditor.c:579 +#: ../app/widgets/gimptemplateeditor.c:577 msgid "_Name:" msgstr "الا_سم:" -#: ../app/widgets/gimptemplateeditor.c:585 +#: ../app/widgets/gimptemplateeditor.c:583 msgid "_Icon:" msgstr "أي_قونة:" -#: ../app/widgets/gimptemplateeditor.c:804 +#: ../app/widgets/gimptemplateeditor.c:802 #, c-format msgid "%d × %d ppi, %s" msgstr "‏%Id × %Id نقطة في البوصة، %s" -#: ../app/widgets/gimptemplateeditor.c:806 +#: ../app/widgets/gimptemplateeditor.c:804 #, c-format msgid "%d ppi, %s" msgstr "‏%Id نقطة في البوصة، %s" @@ -20371,27 +24818,27 @@ msgstr "الخاصّة \"%s\" غير صالحة على العنصر <%s> في ه msgid "Outermost element in text must be not <%s>" msgstr "العنصر العلوي في نص يجب أن يكون و ليس <%s>" -#: ../app/widgets/gimptextbuffer.c:1684 +#: ../app/widgets/gimptextbuffer.c:1711 #, c-format msgid "Input file '%s' appears truncated: %s" msgstr "يبدو الملف '%s' مقصوصا: %s" -#: ../app/widgets/gimptextbuffer.c:1702 +#: ../app/widgets/gimptextbuffer.c:1729 #, c-format msgid "Invalid UTF-8 data in file '%s'." msgstr "بيانات UTF-8 غير صحيحة في الملف '%s'." -#: ../app/widgets/gimptextbuffer.c:1751 -#, c-format -msgid "Writing palette file '%s' failed: %s" +#: ../app/widgets/gimptextbuffer.c:1778 +#, fuzzy, c-format +msgid "Writing text file '%s' failed: %s" msgstr "فشلت كتابة ملف لوح الألوان ‏'%s': ‏%s" -#: ../app/widgets/gimptexteditor.c:223 +#: ../app/widgets/gimptexteditor.c:220 msgid "_Use selected font" msgstr "استخدم ال_خط المختار" #: ../app/widgets/gimptextstyleeditor.c:207 -#: ../app/widgets/gimptextstyleeditor.c:1317 +#: ../app/widgets/gimptextstyleeditor.c:1298 msgid "Change font of selected text" msgstr "غيّر خط النص المحدد" @@ -20432,12 +24879,12 @@ msgstr "تسطير" msgid "Strikethrough" msgstr "شطب" -#: ../app/widgets/gimptextstyleeditor.c:1309 +#: ../app/widgets/gimptextstyleeditor.c:1290 #, c-format msgid "Font \"%s\" unavailable on this system" msgstr "الخط \"%s\" غير متوفر على هذا النظام" -#: ../app/widgets/gimpthumbbox.c:328 +#: ../app/widgets/gimpthumbbox.c:324 #, c-format msgid "" "Click to update preview\n" @@ -20446,20 +24893,20 @@ msgstr "" "انقر لتحديث المعاينة\n" "‏%s-نقر لتجبر على تحديث المعاينة حتى لو كانت حديثة" -#: ../app/widgets/gimpthumbbox.c:345 +#: ../app/widgets/gimpthumbbox.c:341 msgid "Pr_eview" msgstr "معاي_نة" -#: ../app/widgets/gimpthumbbox.c:402 ../app/widgets/gimpthumbbox.c:465 +#: ../app/widgets/gimpthumbbox.c:398 ../app/widgets/gimpthumbbox.c:461 msgid "No selection" msgstr "لا تحديد" -#: ../app/widgets/gimpthumbbox.c:609 ../app/widgets/gimpthumbbox.c:630 +#: ../app/widgets/gimpthumbbox.c:605 ../app/widgets/gimpthumbbox.c:626 #, c-format msgid "Thumbnail %d of %d" msgstr "مصغرة %Id ل %Id" -#: ../app/widgets/gimpthumbbox.c:738 ../app/widgets/gimpthumbbox.c:748 +#: ../app/widgets/gimpthumbbox.c:734 ../app/widgets/gimpthumbbox.c:744 msgid "Creating preview..." msgstr "ينشئ معاينة..." @@ -20540,19 +24987,19 @@ msgstr "اخفض هذه الأداة إلى القاع" msgid "Reset tool order and visibility" msgstr "أعِد ضبط ترتيب و رؤية الأداة" -#: ../app/widgets/gimptooloptionseditor.c:202 +#: ../app/widgets/gimptooloptionseditor.c:203 msgid "Save Tool Preset..." msgstr "احفظ محفوظة الخيارات..." -#: ../app/widgets/gimptooloptionseditor.c:210 +#: ../app/widgets/gimptooloptionseditor.c:212 msgid "Restore Tool Preset..." msgstr "استعد محفوظة الخيارات..." -#: ../app/widgets/gimptooloptionseditor.c:218 +#: ../app/widgets/gimptooloptionseditor.c:221 msgid "Delete Tool Preset..." msgstr "احذف محفوظة الخيارات..." -#: ../app/widgets/gimptoolpreseteditor.c:299 +#: ../app/widgets/gimptoolpreseteditor.c:295 #, c-format msgid "%s Preset" msgstr "محفوظات %s" @@ -20631,22 +25078,22 @@ msgstr "‏%s (جرّب %s، %s)" msgid "%s (try %s, %s, %s)" msgstr "‏%s (جرّب %s، %s، %s)" -#: ../app/widgets/gimpwidgets-utils.c:1490 +#: ../app/widgets/gimpwidgets-utils.c:1658 #, c-format msgid "Built-in grayscale (%s)" msgstr "تدرج رمادي مدمج (%s)" -#: ../app/widgets/gimpwidgets-utils.c:1497 +#: ../app/widgets/gimpwidgets-utils.c:1665 #, c-format msgid "Built-in RGB (%s)" msgstr "ح‌خ‌ز (RGB) مدمج (%s)" -#: ../app/widgets/gimpwidgets-utils.c:1514 +#: ../app/widgets/gimpwidgets-utils.c:1682 #, c-format msgid "Preferred grayscale (%s)" msgstr "التدرج الرمادي المفضّل (%s)" -#: ../app/widgets/gimpwidgets-utils.c:1521 +#: ../app/widgets/gimpwidgets-utils.c:1689 #, c-format msgid "Preferred RGB (%s)" msgstr "ح‌خ‌ز (RGB) مفضّل (%s)" @@ -20671,179 +25118,195 @@ msgctxt "circle-background" msgid "HSV" msgstr "HSV" -#: ../app/widgets/widgets-enums.c:114 +#: ../app/widgets/widgets-enums.c:117 msgctxt "color-frame-mode" msgid "Pixel" msgstr "بكسل" -#: ../app/widgets/widgets-enums.c:115 +#: ../app/widgets/widgets-enums.c:118 +#, fuzzy msgctxt "color-frame-mode" -msgid "RGB" -msgstr "ح‌خ‌ز (RGB)" +msgid "RGB (%)" +msgstr "ح‌خ‌ز (%Id، %Id، %Id)" -#: ../app/widgets/widgets-enums.c:116 +#: ../app/widgets/widgets-enums.c:119 +msgctxt "color-frame-mode" +msgid "RGB (0..255)" +msgstr "" + +#: ../app/widgets/widgets-enums.c:120 msgctxt "color-frame-mode" msgid "HSV" msgstr "HSV" -#: ../app/widgets/widgets-enums.c:117 +#: ../app/widgets/widgets-enums.c:121 +msgctxt "color-frame-mode" +msgid "CIE LCH" +msgstr "" + +#: ../app/widgets/widgets-enums.c:122 +msgctxt "color-frame-mode" +msgid "CIE LAB" +msgstr "" + +#: ../app/widgets/widgets-enums.c:123 msgctxt "color-frame-mode" msgid "CMYK" msgstr "زق‌ص‌س (CMYK)" -#: ../app/widgets/widgets-enums.c:147 +#: ../app/widgets/widgets-enums.c:153 msgctxt "color-pick-mode" msgid "Pick only" msgstr "التقط فقط" -#: ../app/widgets/widgets-enums.c:148 +#: ../app/widgets/widgets-enums.c:154 msgctxt "color-pick-mode" msgid "Set foreground color" msgstr "اضبط لون المقدمة" -#: ../app/widgets/widgets-enums.c:149 +#: ../app/widgets/widgets-enums.c:155 msgctxt "color-pick-mode" msgid "Set background color" msgstr "اضبط لون الخلفية" -#: ../app/widgets/widgets-enums.c:150 +#: ../app/widgets/widgets-enums.c:156 msgctxt "color-pick-mode" msgid "Add to palette" msgstr "أضِف إلى لوح الألوان" -#: ../app/widgets/widgets-enums.c:209 +#: ../app/widgets/widgets-enums.c:215 msgctxt "histogram-scale" msgid "Linear histogram" msgstr "رسم بياني خطي" -#: ../app/widgets/widgets-enums.c:210 +#: ../app/widgets/widgets-enums.c:216 msgctxt "histogram-scale" msgid "Logarithmic histogram" msgstr "رسم بياني لوغارتمي" -#: ../app/widgets/widgets-enums.c:246 +#: ../app/widgets/widgets-enums.c:252 msgctxt "tab-style" msgid "Icon" msgstr "أيقونة" -#: ../app/widgets/widgets-enums.c:247 +#: ../app/widgets/widgets-enums.c:253 msgctxt "tab-style" msgid "Current status" msgstr "الحالة الحالية" -#: ../app/widgets/widgets-enums.c:248 +#: ../app/widgets/widgets-enums.c:254 msgctxt "tab-style" msgid "Text" msgstr "نص" -#: ../app/widgets/widgets-enums.c:249 +#: ../app/widgets/widgets-enums.c:255 msgctxt "tab-style" msgid "Description" msgstr "وصف" -#: ../app/widgets/widgets-enums.c:250 +#: ../app/widgets/widgets-enums.c:256 msgctxt "tab-style" msgid "Icon & text" msgstr "أيقونة ونص" -#: ../app/widgets/widgets-enums.c:251 +#: ../app/widgets/widgets-enums.c:257 msgctxt "tab-style" msgid "Icon & desc" msgstr "أيقونة ووصف" -#: ../app/widgets/widgets-enums.c:252 +#: ../app/widgets/widgets-enums.c:258 msgctxt "tab-style" msgid "Status & text" msgstr "حالة ونص" -#: ../app/widgets/widgets-enums.c:253 +#: ../app/widgets/widgets-enums.c:259 msgctxt "tab-style" msgid "Status & desc" msgstr "حالة ووصف" -#: ../app/widgets/widgets-enums.c:254 +#: ../app/widgets/widgets-enums.c:260 msgctxt "tab-style" msgid "Undefined" msgstr "غير معرف" -#: ../app/xcf/xcf.c:110 ../app/xcf/xcf.c:181 +#: ../app/xcf/xcf.c:114 ../app/xcf/xcf.c:185 msgid "GIMP XCF image" msgstr "صورة جمب XCF" -#: ../app/xcf/xcf.c:268 ../app/xcf/xcf.c:351 +#: ../app/xcf/xcf.c:272 ../app/xcf/xcf.c:360 msgid "Memory Stream" msgstr "" -#: ../app/xcf/xcf.c:278 +#: ../app/xcf/xcf.c:283 #, c-format msgid "Opening '%s'" msgstr "يفتح '%s'" -#: ../app/xcf/xcf.c:316 +#: ../app/xcf/xcf.c:325 #, c-format msgid "XCF error: unsupported XCF file version %d encountered" msgstr "خطأ في XCF: إصدارة ملف XCF غير مدعومة %d" -#: ../app/xcf/xcf.c:370 +#: ../app/xcf/xcf.c:383 #, c-format msgid "Saving '%s'" msgstr "يحفظ '%s'" -#: ../app/xcf/xcf.c:377 +#: ../app/xcf/xcf.c:390 #, c-format msgid "Closing '%s'" msgstr "يغلق '%s'" -#: ../app/xcf/xcf.c:384 +#: ../app/xcf/xcf.c:397 #, c-format msgid "Error writing '%s': " msgstr "خطأ في كتابة '%s'‏:" -#: ../app/xcf/xcf.c:478 +#: ../app/xcf/xcf.c:491 #, c-format msgid "Error creating '%s': " msgstr "خطأ في قراءة '%s'‏:" -#: ../app/xcf/xcf-load.c:302 +#: ../app/xcf/xcf-load.c:305 #, c-format msgid "" "Corrupt 'exif-data' parasite discovered.\n" "Exif data could not be migrated: %s" msgstr "" -#: ../app/xcf/xcf-load.c:339 +#: ../app/xcf/xcf-load.c:342 msgid "" "Corrupt 'gimp-metadata' parasite discovered.\n" "XMP data could not be migrated." msgstr "" -#: ../app/xcf/xcf-load.c:359 +#: ../app/xcf/xcf-load.c:362 #, c-format msgid "" "Corrupt 'gimp-metadata' parasite discovered.\n" "XMP data could not be migrated: %s" msgstr "" -#: ../app/xcf/xcf-load.c:546 +#: ../app/xcf/xcf-load.c:549 msgid "" "This XCF file is corrupt! I have loaded as much of it as I can, but it is " "incomplete." msgstr "ملف إكس.سي.إف هذا فاسد! حاولت تحميله قدر استطاعتي، لكنه غير مكتمل." -#: ../app/xcf/xcf-load.c:557 +#: ../app/xcf/xcf-load.c:560 msgid "" "This XCF file is corrupt! I could not even salvage any partial image data " "from it." msgstr "ملف XCF هذا تالف! تعذّر حتى إنقاذ أي بيانات صورة جزئية منه." -#: ../app/xcf/xcf-load.c:649 +#: ../app/xcf/xcf-load.c:652 msgid "" "XCF warning: version 0 of XCF file format\n" "did not save indexed colormaps correctly.\n" "Substituting grayscale map." msgstr "" -#: ../app/xcf/xcf-read.c:105 +#: ../app/xcf/xcf-read.c:189 msgid "Invalid UTF-8 string in XCF file" msgstr "سلسلة UTF-8 غير صحيحة في ملف XCF" @@ -20851,10 +25314,19 @@ msgstr "سلسلة UTF-8 غير صحيحة في ملف XCF" msgid "Could not seek in XCF file: " msgstr "تعذّر الانتقال في ملف XCF:" -#: ../app/xcf/xcf-write.c:99 +#: ../app/xcf/xcf-write.c:45 msgid "Error writing XCF: " msgstr "خطأ في كتابة XCF:" +#: ../app/xcf/xcf-write.c:273 +#, c-format +msgid "Error writing XCF: unsupported BPC when writing pixel: %d" +msgstr "" + +#: ../app-tools/gimp-debug-tool.c:78 +msgid "GIMP Crash Debug" +msgstr "" + #: ../data/tags/gimp-tags-default.xml.in.h:1 msgid "round" msgstr "دائري" @@ -20864,6 +25336,320 @@ msgstr "دائري" msgid "fuzzy" msgstr "ضبابي" +#~ msgid "Screenshot showing channel mixing and layer editor" +#~ msgstr "لقطة شاشة تظهر خلط القنوات و محرر الطبقات" + +#~ msgctxt "channels-action" +#~ msgid "_Visible" +#~ msgstr "_مرئي" + +#~ msgctxt "channels-action" +#~ msgid "_Linked" +#~ msgstr "مربو_ط" + +#~ msgctxt "channels-action" +#~ msgid "L_ock pixels" +#~ msgstr "أوصِد الب_كسلات" + +#~ msgctxt "channels-action" +#~ msgid "L_ock position" +#~ msgstr "أو_صِد الموضع" + +#~ msgctxt "channels-action" +#~ msgid "Clear color tag" +#~ msgstr "امسح وسم اللون" + +#~ msgctxt "channels-action" +#~ msgid "Set color tag to red" +#~ msgstr "ضع وسم لون أحمر" + +#~ msgctxt "channels-action" +#~ msgid "Set color tag to gray" +#~ msgstr "ضع وسم لون رمادي" + +#~ msgctxt "drawable-action" +#~ msgid "Invert the colors" +#~ msgstr "اعكس الألوان" + +#~ msgctxt "drawable-action" +#~ msgid "Invert the brightness of each pixel" +#~ msgstr "اعكس سطوع كل بكسل" + +#~ msgctxt "drawable-action" +#~ msgid "E_rode" +#~ msgstr "_تآكل" + +#~ msgctxt "drawable-action" +#~ msgid "_Visible" +#~ msgstr "مر_ئي" + +#~ msgctxt "drawable-action" +#~ msgid "_Linked" +#~ msgstr "_مربوط" + +#~ msgctxt "drawable-action" +#~ msgid "Flip horizontally" +#~ msgstr "اقلب أفقيا" + +#~ msgctxt "drawable-action" +#~ msgid "Flip vertically" +#~ msgstr "اقلب رأسيا" + +#~ msgid "Dilate" +#~ msgstr "خفِّف" + +#~ msgctxt "filters-action" +#~ msgid "_Antialias..." +#~ msgstr "_نعّم..." + +#~ msgctxt "filters-action" +#~ msgid "_Stretch Contrast HSV..." +#~ msgstr "تباين م_ط HSV..." + +#~ msgctxt "layers-action" +#~ msgid "Te_xt Tool" +#~ msgstr "أداة الن_صوص" + +#~ msgctxt "layers-action" +#~ msgid "_Visible" +#~ msgstr "مر_ئي" + +#~ msgctxt "layers-action" +#~ msgid "_Linked" +#~ msgstr "_مربوط" + +#~ msgctxt "layers-action" +#~ msgid "L_ock position" +#~ msgstr "أو_صِد الموضع" + +#~ msgctxt "layers-action" +#~ msgid "Clear color tag" +#~ msgstr "امسح وسم اللون" + +#~ msgctxt "vectors-action" +#~ msgid "Path _Tool" +#~ msgstr "أداة ال_مسار" + +#~ msgctxt "vectors-action" +#~ msgid "_Visible" +#~ msgstr "مر_ئي" + +#~ msgctxt "vectors-action" +#~ msgid "_Linked" +#~ msgstr "_مربوط" + +#~ msgctxt "vectors-action" +#~ msgid "L_ock position" +#~ msgstr "أو_صِد الموضع" + +#~ msgctxt "vectors-action" +#~ msgid "Clear color tag" +#~ msgstr "امسح وسم اللون" + +#~ msgctxt "view-action" +#~ msgid "Othe_r..." +#~ msgstr "أ_خرى..." + +#~ msgctxt "view-action" +#~ msgid "Rotate 15 degrees to the right" +#~ msgstr "لف 15 درجة إلى اليمين" + +#~ msgctxt "view-action" +#~ msgid "Rotate 90 degrees to the right" +#~ msgstr "لف 90 درجة إلى اليمين" + +#~ msgctxt "view-action" +#~ msgid "Turn upside-down" +#~ msgstr "اقلب رأسا على عقب" + +#~ msgctxt "view-action" +#~ msgid "Rotate 90 degrees to the left" +#~ msgstr "لف 90 درجة إلى اليسار" + +#~ msgctxt "view-action" +#~ msgid "Rotate 15 degrees to the left" +#~ msgstr "لف 15 درجة إلى اليسار" + +#~ msgctxt "layer-mode-effects" +#~ msgid "Anti erase" +#~ msgstr "مضاد للمحو" + +#~ msgid "Convert" +#~ msgstr "حوّل" + +#~ msgid "" +#~ "Indexed color layers are always scaled without interpolation. The chosen " +#~ "interpolation type will affect channels and layer masks only." +#~ msgstr "" +#~ "يتم دائما تحجيم الطبقات مفهرسة الألوان دون استيفاء. نوع الاستيفاء المختار " +#~ "سيؤثر على القنوات و أقنعة الطبقة فقط." + +#, fuzzy +#~ msgid "Brush Zoom" +#~ msgstr "قوة الفرشاة" + +#~ msgid "Link brush size with canvas zoom" +#~ msgstr "اربط حجم الفرشاة بحجم رقعة الرسم" + +#~ msgid "Brightness/Contrast Tool: Adjust brightness and contrast" +#~ msgstr "أداة السطوع/التباين: اضبط السطوع والتباين" + +#~ msgid "Import Brightness-Contrast settings" +#~ msgstr "استورد إعدادات السطوع التباين" + +#~ msgid "Export Brightness-Contrast settings" +#~ msgstr "صدّر إعدادات السطوع التباين" + +#~ msgid "Color Balance" +#~ msgstr "توازن الألوان" + +#~ msgid "Import Color Balance Settings" +#~ msgstr "استورد إعدادات توازن الألوان" + +#~ msgid "Export Color Balance Settings" +#~ msgstr "صدّر إعدادات توازن الألوان" + +#~ msgid "Color Balance operates only on RGB color layers." +#~ msgstr "توازن الألوان يعمل فقط على طبقات ألوان خ‌ح‌ز." + +#~ msgid "Adjust Color Balance" +#~ msgstr "اضبط توازن الألوان" + +#~ msgid "Colorize" +#~ msgstr "لوّن" + +#~ msgid "Colorize Tool: Colorize the image" +#~ msgstr "أداة التلوين: لوّن الصورة" + +#~ msgid "Import Colorize Settings" +#~ msgstr "استورد إعدادات التلوين" + +#~ msgid "Export Colorize Settings" +#~ msgstr "صدّر إعدادات التلوين" + +#~ msgid "Colorize does not operate on grayscale layers." +#~ msgstr "التلوين لا يعمل على طبقات التدرج الرمادي." + +#~ msgid "Select Color" +#~ msgstr "اختر لونا" + +#~ msgid "Colorize Color" +#~ msgstr "لون التلوين" + +#~ msgid "Pick color from image" +#~ msgstr "استخدم لونا من الصورة" + +#~ msgid "Curves Tool: Adjust color curves" +#~ msgstr "أداة المنحنيات: اضبط منحنيات الألوان" + +#~ msgid "Import Curves" +#~ msgstr "استورد المنحنيات" + +#~ msgid "Export Curves" +#~ msgstr "صدّر المنحنيات" + +#, fuzzy +#~ msgid "Apply filter to the layer's raw pixels" +#~ msgstr "طبّق تأثير قناع الطبقة ثم احذفه" + +#~ msgid "Click to complete selection" +#~ msgstr "انقر لإكمال التحديد" + +#~ msgid "Transformation Matrix" +#~ msgstr "مصفوفة التحويل" + +#~ msgid "Import Hue-Saturation Settings" +#~ msgstr "استورد إعدادات التدرج و التشبع" + +#~ msgid "Export Hue-Saturation Settings" +#~ msgstr "صدّر إعدادات التدرج و التشبع" + +#~ msgid "Hue-Saturation operates only on RGB color layers." +#~ msgstr "التدرج و التشبع يعمل فقط على طبقات ح‌خ‌ز." + +#~ msgid "Adjust Hue / Lightness / Saturation" +#~ msgstr "اضبط التدرج / الإضاءة / التشبع" + +#~ msgid "Levels Tool: Adjust color levels" +#~ msgstr "أداة المستويات: اضبط مستويات الألوان" + +#~ msgid "Import Levels" +#~ msgstr "استورد المستويات" + +#~ msgid "Export Levels" +#~ msgstr "صدّر المستويات" + +#~ msgid "Import Threshold Settings" +#~ msgstr "استورد إعدادات العتبة" + +#~ msgid "Export Threshold Settings" +#~ msgstr "صدّر إعدادات العتبة" + +#~ msgctxt "rectangle-tool-fixed-rule" +#~ msgid "Aspect ratio" +#~ msgstr "نسبة الارتفاع" + +#~ msgctxt "rectangle-tool-fixed-rule" +#~ msgid "Width" +#~ msgstr "العرض" + +#~ msgctxt "rectangle-tool-fixed-rule" +#~ msgid "Height" +#~ msgstr "الارتفاع" + +#~ msgctxt "rectangle-tool-fixed-rule" +#~ msgid "Size" +#~ msgstr "الحجم" + +#~ msgid "Value:" +#~ msgstr "القيمة:" + +#~ msgid "Alpha:" +#~ msgstr "الشفافية:" + +#~ msgid "Green:" +#~ msgstr "أخضر:" + +#~ msgid "Blue:" +#~ msgstr "أزرق:" + +#~ msgid "Hue:" +#~ msgstr "التدرج:" + +#~ msgid "Sat.:" +#~ msgstr "التشبع:" + +#~ msgid "Cyan:" +#~ msgstr "سيان:" + +#~ msgid "Magenta:" +#~ msgstr "ماجنتا:" + +#~ msgid "Yellow:" +#~ msgstr "أصفر:" + +#~ msgid "Black:" +#~ msgstr "أسود:" + +#~ msgid "Wheel" +#~ msgstr "البكرة" + +#~ msgid "Channel:" +#~ msgstr "القناة:" + +#~ msgid "Add settings to favorites" +#~ msgstr "أضِف الإعدادات إلى المفضلة" + +#~ msgid "_Manage Settings..." +#~ msgstr "أدِر الإ_عدادت..." + +#~ msgid "Add Settings to Favorites" +#~ msgstr "أضِف الإعدادات للمفضلة" + +#~ msgctxt "color-frame-mode" +#~ msgid "RGB" +#~ msgstr "ح‌خ‌ز (RGB)" + #~ msgid "New Channel Options" #~ msgstr "خيارات القناة الجديدة" @@ -20902,9 +25688,6 @@ msgstr "ضبابي" #~ msgid "Clipped to image" #~ msgstr "قص إلى الصورة" -#~ msgid "Clipped to bottom layer" -#~ msgstr "قص إلى طبقة القاع" - #~ msgid "_Print simulation profile:" #~ msgstr "لاحة محاكاة ال_طبع:" @@ -20941,9 +25724,6 @@ msgstr "ضبابي" #~ msgid "Posterize (Reduce Number of Colors)" #~ msgstr "اخفض عدد الألوان" -#~ msgid "Revert" -#~ msgstr "اعكس" - #~ msgctxt "plug-in-action" #~ msgid "_Map" #~ msgstr "_خريطة" @@ -21184,10 +25964,6 @@ msgstr "ضبابي" #~ msgid "32-bit gamma floating point" #~ msgstr "عدد عشري من 32 بتة" -#~ msgctxt "select-criterion" -#~ msgid "Composite" -#~ msgstr "مُركّب" - #~ msgctxt "select-criterion" #~ msgid "Red" #~ msgstr "أحمر" @@ -21244,9 +26020,6 @@ msgstr "ضبابي" #~ msgid "Could not delete '%s': %s" #~ msgstr "تعذّر حذف '%s'‏: %s" -#~ msgid "Foreground Extraction" -#~ msgstr "استخراج المقدمة" - #~ msgid "Fatal parse error in gradient file '%s': Read error in line %d." #~ msgstr "خطأ فادح في تحليل ملف التدرج '%s': خطأ قراءة في السطر %Id." @@ -21708,9 +26481,6 @@ msgstr "ضبابي" #~ msgid "Error saving tool options presets: %s" #~ msgstr "خطأ أثناء حفظ محفوظات خيارات الأدوات: %s" -#~ msgid "Instant update" -#~ msgstr "تحديث آني" - #~ msgid "Brush Scale" #~ msgstr "مقياس الفرشاة" @@ -21819,10 +26589,6 @@ msgstr "ضبابي" #~ msgid "tool|_Zoom" #~ msgstr "_قرب" -#, fuzzy -#~ msgid "Cannot merge down a layer group." -#~ msgstr "لا يمكن تغيير اسم قناع الطبقة." - #~ msgid "New brush" #~ msgstr "فرشاة جديدة" @@ -21898,9 +26664,6 @@ msgstr "ضبابي" #~ msgid "Add" #~ msgstr "أضِف" -#~ msgid "Intersect" -#~ msgstr "قاطع" - #~ msgid "Remove floating selection" #~ msgstr "احذف التحديد الحر" diff --git a/po/ca.po b/po/ca.po index e3ea7674f4..d3989666de 100644 --- a/po/ca.po +++ b/po/ca.po @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: ca\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=Internationalisation\n" -"POT-Creation-Date: 2018-02-22 13:22+0000\n" -"PO-Revision-Date: 2018-02-23 18:37+0100\n" +"POT-Creation-Date: 2018-03-25 15:48+0000\n" +"PO-Revision-Date: 2018-03-29 11:25+0200\n" "Last-Translator: Jordi Mas \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -84,58 +84,102 @@ msgstr "Editeu fotografies amb el GIMP" #: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:8 msgid "" +"GIMP 2.10.0-RC1 is the first release candidate before GIMP 2.10.0 stable " +"release, with a focus on debugging and stability. Other than the many bug " +"fixes, most notable improvements are:" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:9 +msgid "New dashboard dockable to monitor GIMP resource usage" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:10 +msgid "" +"New debug dialog to produce back traces and other debug data, encouraging to " +"report bugs" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:11 +msgid "Unsaved images can now be recovered after a crash" +msgstr "Les imatges sense desar es poden recuperar en cas de fallada" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:12 +msgid "Layer masks on layer groups" +msgstr "Màscares de capa en grups de capes" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:13 +msgid "JPEG 2000 support improved for high bit depth and various color spaces" +msgstr "La compatibilitat amb JPEG 2000 ha millorat per alta profunditat de bits i diversos espais de colors" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:14 +msgid "Screenshot and color picking improved on various platforms" +msgstr "Captura de pantalla i la tria de colors ha millorat en diferents plataformes" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:15 +msgid "Metadata defaults preferences now available" +msgstr "Preferències per defecte de les metadades ara ja estan disponibles" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:16 +msgid "Various GUI polishing" +msgstr "Diverses millores de la interfície d'usuari" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:17 +msgid "" +"For more information, see https://www.gimp.org/news/2018/03/23/gimp-2-10-rc1-" +"released/" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:18 +msgid "" "GIMP 2.9.8 introduces on-canvas gradient editing and various enhancements " "while focusing on bugfixing and stability." msgstr "" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:9 -#, fuzzy -#| msgctxt "dialogs-action" -#| msgid "Open the gradient editor" +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:19 msgid "On-canvas gradient editing" -msgstr "Mostra l'editor dels degradats" +msgstr "Edició de degradats al llenç" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:10 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:20 msgid "Notification when an image is over/underexposed" -msgstr "" +msgstr "Notificació quan la imatge està sobreexposada o subexposada" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:11 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:21 msgid "Better and faster color management" msgstr "Millor gestió del color i més ràpida" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:12 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:22 msgid "Support for color picker and screenshots in Wayland on KDE Plasma" -msgstr "" +msgstr "Compatibilitat per la tria de colors i captures de pantalla a Wayland amb KDE Plasma" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:13 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:23 msgid "Paste in place feature" msgstr "Funcionalitat enganxa al lloc" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:14 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:24 msgid "Many usability improvements" msgstr "Moltes millores d'usabilitat" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:15 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:25 msgid "Manual can be displayed in the user's preferred language" msgstr "El manual es pot mostrar en la llengua preferida de l'usuari" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:16 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:26 msgid "Improvements for the Wavelet Decompose filter" msgstr "" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:17 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:27 msgid "Improved compatibility with Photoshop .psd files" msgstr "Millora de compatibilitat amb els fitxers .psd de Photoshop" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:18 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:28 msgid "New support for password-protected PDF" msgstr "Compatibilitat amb els PDF protegits amb contrasenya" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:19 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:29 msgid "New support for HGT format (Digital Elevation Model data)" msgstr "" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:20 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:30 msgid "" "For more information, see https://www.gimp.org/news/2017/12/12/gimp-2-9-8-" "released/" @@ -567,7 +611,7 @@ msgid "Text Editor" msgstr "Editor de text" #: ../app/actions/actions.c:231 ../app/dialogs/dialogs.c:310 -#: ../app/gui/gui.c:499 +#: ../app/gui/gui.c:550 msgid "Tool Options" msgstr "Opcions de l'eina" @@ -1077,7 +1121,7 @@ msgid "Select the channel below the current channel" msgstr "Selecciona el canal de sota el canal actual" #: ../app/actions/channels-commands.c:111 -#: ../app/actions/channels-commands.c:537 +#: ../app/actions/channels-commands.c:517 msgid "Channel Attributes" msgstr "Atributs del canal" @@ -1095,7 +1139,6 @@ msgid "_Fill opacity:" msgstr "_Opacitat del farciment:" #: ../app/actions/channels-commands.c:156 -#: ../app/actions/channels-commands.c:209 #: ../app/widgets/gimpchanneltreeview.c:327 msgid "New Channel" msgstr "Canal nou" @@ -1108,10 +1151,10 @@ msgstr "Crea un canal nou" msgid "New Channel Color" msgstr "Color del canal nou" -#: ../app/actions/channels-commands.c:294 ../app/core/gimpimage-new.c:278 +#: ../app/actions/channels-commands.c:274 ../app/core/gimpimage-new.c:278 #: ../app/display/gimpdisplayshell-dnd.c:670 #: ../app/widgets/gimpchanneltreeview.c:258 -#: ../app/widgets/gimplayertreeview.c:784 +#: ../app/widgets/gimplayertreeview.c:805 #, c-format msgid "%s Channel Copy" msgstr "Còpia del canal %s" @@ -2507,7 +2550,7 @@ msgstr "240 segons" #: ../app/dialogs/file-open-location-dialog.c:218 #: ../app/dialogs/file-open-location-dialog.c:228 #: ../app/display/gimpdisplayshell-dnd.c:614 -#: ../app/widgets/gimplayertreeview.c:744 ../app/widgets/gimptoolbox.c:805 +#: ../app/widgets/gimplayertreeview.c:765 ../app/widgets/gimptoolbox.c:805 #: ../app/widgets/gimptoolbox-dnd.c:170 #, c-format msgid "" @@ -3274,7 +3317,7 @@ msgstr "Buida l'historial de documents" #: ../app/display/gimpdisplayshell-rotate-dialog.c:122 #: ../app/display/gimpdisplayshell-scale-dialog.c:122 #: ../app/tools/gimpfiltertool.c:321 -#: ../app/tools/gimpforegroundselecttool.c:307 ../app/tools/gimptexttool.c:1581 +#: ../app/tools/gimpforegroundselecttool.c:307 ../app/tools/gimptexttool.c:1591 #: ../app/tools/gimptransformtool.c:1201 ../app/widgets/gimpactionview.c:669 #: ../app/widgets/gimpcolordialog.c:110 #: ../app/widgets/gimpcontrollereditor.c:660 @@ -3869,7 +3912,7 @@ msgstr "Copia i anomena" msgid "Copy Visible Named " msgstr "Copia el que es veu i anomena" -#: ../app/actions/edit-commands.c:569 ../app/display/gimpdisplayshell-dnd.c:479 +#: ../app/actions/edit-commands.c:571 ../app/display/gimpdisplayshell-dnd.c:479 msgid "Pasted as new layer because the target is a layer group." msgstr "Enganxat com a capa nova perquè el destí és un grup de capes." @@ -5953,7 +5996,7 @@ msgstr "S'està capgirant" msgid "Rotating" msgstr "S'està girant" -#: ../app/actions/image-commands.c:850 ../app/actions/layers-commands.c:802 +#: ../app/actions/image-commands.c:850 ../app/actions/layers-commands.c:779 msgid "Cannot crop because the current selection is empty." msgstr "No s'ha pogut escapçar perquè l'àrea seleccionada està buida." @@ -6003,7 +6046,7 @@ msgid "Scale Image" msgstr "Ajusta la mida de la imatge" #. Scaling -#: ../app/actions/image-commands.c:1453 ../app/actions/layers-commands.c:1592 +#: ../app/actions/image-commands.c:1453 ../app/actions/layers-commands.c:1569 #: ../app/dialogs/preferences-dialog.c:1602 #: ../app/pdb/drawable-transform-cmds.c:800 #: ../app/pdb/drawable-transform-cmds.c:891 @@ -6540,43 +6583,53 @@ msgstr "Mode composició de capa: automàtic" #: ../app/actions/layers-actions.c:389 msgctxt "layers-action" -msgid "Source Over" -msgstr "Origen per sobre" +msgid "Union" +msgstr "Unió" #: ../app/actions/layers-actions.c:390 msgctxt "layers-action" -msgid "Layer Composite Mode: Source Over" -msgstr "Mode composició de capa: font superior" +msgid "Layer Composite Mode: Union" +msgstr "Mode composició de capa: unió" #: ../app/actions/layers-actions.c:395 +#, fuzzy +#| msgid "Click to sharpen" msgctxt "layers-action" -msgid "Source Atop" -msgstr "Origen a dalt" +msgid "Clip to Backdrop" +msgstr "Feu clic per a ressaltar" #: ../app/actions/layers-actions.c:396 +#, fuzzy +#| msgctxt "layers-action" +#| msgid "Layer Composite Mode: Auto" msgctxt "layers-action" -msgid "Layer Composite Mode: Source Atop" -msgstr "Mode composició de la capa: font a la part superior" +msgid "Layer Composite Mode: Clip to Backdrop" +msgstr "Mode composició de capa: automàtic" #: ../app/actions/layers-actions.c:401 +#, fuzzy +#| msgid "Flip Text Layer" msgctxt "layers-action" -msgid "Source In" -msgstr "Origen dins" +msgid "Clip to Layer" +msgstr "Capgira la capa de text" #: ../app/actions/layers-actions.c:402 +#, fuzzy +#| msgctxt "layers-action" +#| msgid "Layer Composite Mode: Auto" msgctxt "layers-action" -msgid "Layer Composite Mode: Source In" -msgstr "Mode composició de capa: origen dins" +msgid "Layer Composite Mode: Clip to Layer" +msgstr "Mode composició de capa: automàtic" #: ../app/actions/layers-actions.c:407 msgctxt "layers-action" -msgid "Destination Atop" -msgstr "Destinació a dalt" +msgid "Intersection" +msgstr "Intersecció" #: ../app/actions/layers-actions.c:408 msgctxt "layers-action" -msgid "Layer Composite Mode: Destination Atop" -msgstr "Mode composició de la capa: destinació a la part superior" +msgid "Layer Composite Mode: Intersection" +msgstr "Mode composició de capa: intersecció" #: ../app/actions/layers-actions.c:416 msgctxt "layers-action" @@ -6876,7 +6929,7 @@ msgctxt "layers-action" msgid "To _New Layer" msgstr "A la capa _nova" -#: ../app/actions/layers-commands.c:259 ../app/actions/layers-commands.c:1441 +#: ../app/actions/layers-commands.c:259 ../app/actions/layers-commands.c:1418 msgid "Layer Attributes" msgstr "Atributs de la capa" @@ -6884,9 +6937,9 @@ msgstr "Atributs de la capa" msgid "Edit Layer Attributes" msgstr "Edita els atributs de la capa" -#: ../app/actions/layers-commands.c:328 ../app/actions/layers-commands.c:403 +#: ../app/actions/layers-commands.c:328 #: ../app/widgets/gimpdrawabletreeview.c:331 -#: ../app/widgets/gimplayertreeview.c:846 +#: ../app/widgets/gimplayertreeview.c:882 msgid "New Layer" msgstr "Capa nova" @@ -6894,31 +6947,31 @@ msgstr "Capa nova" msgid "Create a New Layer" msgstr "Crea una capa nova" -#: ../app/actions/layers-commands.c:443 ../app/core/gimptoolinfo.c:82 +#: ../app/actions/layers-commands.c:420 ../app/core/gimptoolinfo.c:82 msgid "Visible" msgstr "Visible" -#: ../app/actions/layers-commands.c:708 +#: ../app/actions/layers-commands.c:685 msgid "Set Layer Boundary Size" msgstr "Defineix mida del marc de la capa" -#: ../app/actions/layers-commands.c:770 +#: ../app/actions/layers-commands.c:747 msgid "Scale Layer" msgstr "Ajusta la mida de la capa" -#: ../app/actions/layers-commands.c:812 +#: ../app/actions/layers-commands.c:789 msgid "Crop Layer to Selection" msgstr "Escapça la capa a la selecció" -#: ../app/actions/layers-commands.c:842 +#: ../app/actions/layers-commands.c:819 msgid "Crop Layer to Content" msgstr "Escapça la capa al contingut" -#: ../app/actions/layers-commands.c:855 +#: ../app/actions/layers-commands.c:832 msgid "Cannot crop because the active layer has no content." msgstr "No s'ha pogut escapçar perquè la capa seleccionada està buida." -#: ../app/actions/layers-commands.c:862 +#: ../app/actions/layers-commands.c:839 msgid "Cannot crop because the active layer is already cropped to its content." msgstr "" "No s'ha pogut escapçar perquè la capa seleccionada ja s'ha escapçat al seu " @@ -7724,7 +7777,7 @@ msgstr "_Obre" #: ../app/core/gimppalette-import.c:510 ../app/plug-in/gimpenvirontable.c:289 #: ../app/plug-in/gimpinterpreterdb.c:233 #: ../app/tools/gimpfiltertool-settings.c:170 -#: ../app/widgets/gimptextbuffer.c:1647 +#: ../app/widgets/gimptextbuffer.c:1674 #, c-format msgid "Could not open '%s' for reading: %s" msgstr "No s'ha pogut obrir «%s» per a lectura: %s" @@ -10057,7 +10110,7 @@ msgstr "" "S'ha produït un error en analitzar el fitxer «%s». S'utilitzaran els valors " "per defecte. S'ha creat una còpia de seguretat de la configuració a «%s»." -#: ../app/config/gimpdialogconfig.c:307 ../app/core/gimplayer.c:438 +#: ../app/config/gimpdialogconfig.c:307 ../app/core/gimplayer.c:440 msgid "Layer" msgstr "Capa" @@ -10243,15 +10296,15 @@ msgstr "" #: ../app/config/gimprc-blurbs.h:205 msgid "Export Exif metadata by default." -msgstr "" +msgstr "Exporta les metadades Exif per defecte." #: ../app/config/gimprc-blurbs.h:208 msgid "Export XMP metadata by default." -msgstr "" +msgstr "Exporta les metadades XMP per defecte." #: ../app/config/gimprc-blurbs.h:211 msgid "Export IPTC metadata by default." -msgstr "" +msgstr "Exporta les metadades IPTC per defecte." #: ../app/config/gimprc-blurbs.h:214 msgid "Try generating debug data for bug reporting when appropriate." @@ -11245,547 +11298,557 @@ msgctxt "debug-policy" msgid "Never debug GIMP" msgstr "" -#: ../app/core/core-enums.c:860 +#: ../app/core/core-enums.c:862 msgctxt "undo-type" msgid "<>" msgstr "<>" -#: ../app/core/core-enums.c:861 +#: ../app/core/core-enums.c:863 msgctxt "undo-type" msgid "Scale image" msgstr "Ajusta la mida de la imatge" -#: ../app/core/core-enums.c:862 +#: ../app/core/core-enums.c:864 msgctxt "undo-type" msgid "Resize image" msgstr "Canvia la mida de la imatge" -#: ../app/core/core-enums.c:863 +#: ../app/core/core-enums.c:865 msgctxt "undo-type" msgid "Flip image" msgstr "Capgira la imatge" -#: ../app/core/core-enums.c:864 +#: ../app/core/core-enums.c:866 msgctxt "undo-type" msgid "Rotate image" msgstr "Gira la imatge" -#: ../app/core/core-enums.c:865 +#: ../app/core/core-enums.c:867 msgctxt "undo-type" msgid "Crop image" msgstr "Escapça la imatge" -#: ../app/core/core-enums.c:866 +#: ../app/core/core-enums.c:868 msgctxt "undo-type" msgid "Convert image" msgstr "Converteix la imatge" -#: ../app/core/core-enums.c:867 +#: ../app/core/core-enums.c:869 msgctxt "undo-type" msgid "Remove item" msgstr "Suprimeix l'element" -#: ../app/core/core-enums.c:868 +#: ../app/core/core-enums.c:870 msgctxt "undo-type" msgid "Merge layers" msgstr "Fusiona les capes" -#: ../app/core/core-enums.c:869 +#: ../app/core/core-enums.c:871 msgctxt "undo-type" msgid "Merge paths" msgstr "Fusiona els camins" -#: ../app/core/core-enums.c:870 +#: ../app/core/core-enums.c:872 msgctxt "undo-type" msgid "Quick Mask" msgstr "Màscara ràpida" -#: ../app/core/core-enums.c:871 ../app/core/core-enums.c:902 +#: ../app/core/core-enums.c:873 ../app/core/core-enums.c:904 #: ../app/core/gimpimage-grid.c:64 msgctxt "undo-type" msgid "Grid" msgstr "Quadrícula" -#: ../app/core/core-enums.c:872 ../app/core/core-enums.c:906 +#: ../app/core/core-enums.c:874 ../app/core/core-enums.c:908 msgctxt "undo-type" msgid "Guide" msgstr "Guia" -#: ../app/core/core-enums.c:873 ../app/core/core-enums.c:907 +#: ../app/core/core-enums.c:875 ../app/core/core-enums.c:909 msgctxt "undo-type" msgid "Sample Point" msgstr "Punt de mostra" -#: ../app/core/core-enums.c:874 ../app/core/core-enums.c:908 +#: ../app/core/core-enums.c:876 ../app/core/core-enums.c:910 msgctxt "undo-type" msgid "Layer/Channel" msgstr "Capa/canal" -#: ../app/core/core-enums.c:875 ../app/core/core-enums.c:909 +#: ../app/core/core-enums.c:877 ../app/core/core-enums.c:911 msgctxt "undo-type" msgid "Layer/Channel modification" msgstr "Modificació de la capa o canal" -#: ../app/core/core-enums.c:876 ../app/core/core-enums.c:910 +#: ../app/core/core-enums.c:878 ../app/core/core-enums.c:912 msgctxt "undo-type" msgid "Selection mask" msgstr "Màscara de selecció" -#: ../app/core/core-enums.c:877 ../app/core/core-enums.c:914 +#: ../app/core/core-enums.c:879 ../app/core/core-enums.c:916 msgctxt "undo-type" msgid "Item visibility" msgstr "Visibilitat de l'element" -#: ../app/core/core-enums.c:878 ../app/core/core-enums.c:915 +#: ../app/core/core-enums.c:880 ../app/core/core-enums.c:917 msgctxt "undo-type" msgid "Link/Unlink item" msgstr "Enllaça o desenllaça l'element" -#: ../app/core/core-enums.c:879 +#: ../app/core/core-enums.c:881 msgctxt "undo-type" msgid "Item properties" msgstr "Propietats de l'element" -#: ../app/core/core-enums.c:880 ../app/core/core-enums.c:913 +#: ../app/core/core-enums.c:882 ../app/core/core-enums.c:915 msgctxt "undo-type" msgid "Move item" msgstr "Mou l'element" -#: ../app/core/core-enums.c:881 +#: ../app/core/core-enums.c:883 msgctxt "undo-type" msgid "Scale item" msgstr "Ajusta la mida de l'element" -#: ../app/core/core-enums.c:882 +#: ../app/core/core-enums.c:884 msgctxt "undo-type" msgid "Resize item" msgstr "Canvia la mida de l'element" -#: ../app/core/core-enums.c:883 +#: ../app/core/core-enums.c:885 msgctxt "undo-type" msgid "Add layer" msgstr "Afegeix una capa" -#: ../app/core/core-enums.c:884 ../app/core/core-enums.c:932 +#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:936 msgctxt "undo-type" msgid "Add layer mask" msgstr "Afegeix una màscara de capa" -#: ../app/core/core-enums.c:885 ../app/core/core-enums.c:934 +#: ../app/core/core-enums.c:887 ../app/core/core-enums.c:938 msgctxt "undo-type" msgid "Apply layer mask" msgstr "Aplica una màscara de capa" -#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:942 +#: ../app/core/core-enums.c:888 ../app/core/core-enums.c:946 msgctxt "undo-type" msgid "Floating selection to layer" msgstr "Converteix la selecció flotant en una capa" -#: ../app/core/core-enums.c:887 +#: ../app/core/core-enums.c:889 msgctxt "undo-type" msgid "Float selection" msgstr "Selecció flotant" -#: ../app/core/core-enums.c:888 +#: ../app/core/core-enums.c:890 msgctxt "undo-type" msgid "Anchor floating selection" msgstr "Ancora la selecció flotant" -#: ../app/core/core-enums.c:889 ../app/core/gimp-edit.c:479 +#: ../app/core/core-enums.c:891 ../app/core/gimp-edit.c:501 msgctxt "undo-type" msgid "Paste" msgstr "Enganxa" -#: ../app/core/core-enums.c:890 ../app/core/gimp-edit.c:813 +#: ../app/core/core-enums.c:892 ../app/core/gimp-edit.c:829 msgctxt "undo-type" msgid "Cut" msgstr "Retalla" -#: ../app/core/core-enums.c:891 +#: ../app/core/core-enums.c:893 msgctxt "undo-type" msgid "Text" msgstr "Text" -#: ../app/core/core-enums.c:892 ../app/core/core-enums.c:943 +#: ../app/core/core-enums.c:894 ../app/core/core-enums.c:947 #: ../app/core/gimpdrawable-transform.c:692 msgctxt "undo-type" msgid "Transform" msgstr "Transforma" -#: ../app/core/core-enums.c:893 ../app/core/core-enums.c:944 +#: ../app/core/core-enums.c:895 ../app/core/core-enums.c:948 msgctxt "undo-type" msgid "Paint" msgstr "Pinta" -#: ../app/core/core-enums.c:894 ../app/core/core-enums.c:947 +#: ../app/core/core-enums.c:896 ../app/core/core-enums.c:951 msgctxt "undo-type" msgid "Attach parasite" msgstr "Adjunta un paràsit" -#: ../app/core/core-enums.c:895 ../app/core/core-enums.c:948 +#: ../app/core/core-enums.c:897 ../app/core/core-enums.c:952 msgctxt "undo-type" msgid "Remove parasite" msgstr "Suprimeix el paràsit" -#: ../app/core/core-enums.c:896 +#: ../app/core/core-enums.c:898 msgctxt "undo-type" msgid "Import paths" msgstr "Importa camins" -#: ../app/core/core-enums.c:897 +#: ../app/core/core-enums.c:899 msgctxt "undo-type" msgid "Plug-In" msgstr "Connector" -#: ../app/core/core-enums.c:898 +#: ../app/core/core-enums.c:900 msgctxt "undo-type" msgid "Image type" msgstr "Tipus d'imatge" -#: ../app/core/core-enums.c:899 +#: ../app/core/core-enums.c:901 msgctxt "undo-type" msgid "Image precision" msgstr "Precisió de la imatge" -#: ../app/core/core-enums.c:900 +#: ../app/core/core-enums.c:902 msgctxt "undo-type" msgid "Image size" msgstr "Mida de la imatge" -#: ../app/core/core-enums.c:901 +#: ../app/core/core-enums.c:903 msgctxt "undo-type" msgid "Image resolution change" msgstr "Canvi de resolució de la imatge" -#: ../app/core/core-enums.c:903 +#: ../app/core/core-enums.c:905 msgctxt "undo-type" msgid "Change metadata" msgstr "Canvia les metadades" -#: ../app/core/core-enums.c:904 +#: ../app/core/core-enums.c:906 msgctxt "undo-type" msgid "Change indexed palette" msgstr "Canvia la paleta indexada" -#: ../app/core/core-enums.c:905 +#: ../app/core/core-enums.c:907 msgctxt "undo-type" msgid "Change color managed state" msgstr "Canvia l'estat gestió de color" -#: ../app/core/core-enums.c:911 +#: ../app/core/core-enums.c:913 msgctxt "undo-type" msgid "Reorder item" msgstr "Reordena l'element" -#: ../app/core/core-enums.c:912 +#: ../app/core/core-enums.c:914 msgctxt "undo-type" msgid "Rename item" msgstr "Reanomena l'element" -#: ../app/core/core-enums.c:916 +#: ../app/core/core-enums.c:918 msgctxt "undo-type" msgid "Item color tag" msgstr "Element etiqueta color" -#: ../app/core/core-enums.c:917 +#: ../app/core/core-enums.c:919 msgctxt "undo-type" msgid "Lock/Unlock content" msgstr "Bloqueja/desbloqueja el contingut" -#: ../app/core/core-enums.c:918 +#: ../app/core/core-enums.c:920 msgctxt "undo-type" msgid "Lock/Unlock position" msgstr "Bloqueja/desbloqueja la posició" -#: ../app/core/core-enums.c:919 +#: ../app/core/core-enums.c:921 msgctxt "undo-type" msgid "New layer" msgstr "Capa nova" -#: ../app/core/core-enums.c:920 +#: ../app/core/core-enums.c:922 msgctxt "undo-type" msgid "Delete layer" msgstr "Suprimeix la capa" -#: ../app/core/core-enums.c:921 +#: ../app/core/core-enums.c:923 msgctxt "undo-type" msgid "Set layer mode" msgstr "Defineix el mode de la capa" -#: ../app/core/core-enums.c:922 +#: ../app/core/core-enums.c:924 msgctxt "undo-type" msgid "Set layer opacity" msgstr "Defineix l'opacitat de la capa" -#: ../app/core/core-enums.c:923 +#: ../app/core/core-enums.c:925 msgctxt "undo-type" msgid "Lock/Unlock alpha channel" msgstr "Bloqueja/desbloqueja el canal alfa" -#: ../app/core/core-enums.c:924 +#: ../app/core/core-enums.c:926 msgctxt "undo-type" msgid "Suspend group layer resize" msgstr "Atura l'acció de redimensionar el grup de capes" -#: ../app/core/core-enums.c:925 +#: ../app/core/core-enums.c:927 msgctxt "undo-type" msgid "Resume group layer resize" msgstr "Reprèn l'acció de redimensionar el grup de capes" -#: ../app/core/core-enums.c:926 +#: ../app/core/core-enums.c:928 msgctxt "undo-type" msgid "Suspend group layer mask" msgstr "Atura la mascara de capa del grup" -#: ../app/core/core-enums.c:927 +#: ../app/core/core-enums.c:929 msgctxt "undo-type" msgid "Resume group layer mask" msgstr "Reprèn la mascara de capa del grup" -#: ../app/core/core-enums.c:928 +#: ../app/core/core-enums.c:930 +msgctxt "undo-type" +msgid "Start moving group layer" +msgstr "Comença el moviment de la capa del grup" + +#: ../app/core/core-enums.c:931 +msgctxt "undo-type" +msgid "End moving group layer" +msgstr "Finalitza el moviment de la capa del grup" + +#: ../app/core/core-enums.c:932 msgctxt "undo-type" msgid "Convert group layer" msgstr "Converteix la capa del grup" -#: ../app/core/core-enums.c:929 +#: ../app/core/core-enums.c:933 msgctxt "undo-type" msgid "Text layer" msgstr "Capa de text" -#: ../app/core/core-enums.c:930 +#: ../app/core/core-enums.c:934 msgctxt "undo-type" msgid "Text layer modification" msgstr "Modificació de la capa de text" -#: ../app/core/core-enums.c:931 +#: ../app/core/core-enums.c:935 msgctxt "undo-type" msgid "Convert text layer" msgstr "Converteix la capa de text" -#: ../app/core/core-enums.c:933 +#: ../app/core/core-enums.c:937 msgctxt "undo-type" msgid "Delete layer mask" msgstr "Suprimeix la màscara de capa" -#: ../app/core/core-enums.c:935 +#: ../app/core/core-enums.c:939 msgctxt "undo-type" msgid "Show layer mask" msgstr "Mostra la màscara de capa" -#: ../app/core/core-enums.c:936 +#: ../app/core/core-enums.c:940 msgctxt "undo-type" msgid "New channel" msgstr "Canal nou" -#: ../app/core/core-enums.c:937 +#: ../app/core/core-enums.c:941 msgctxt "undo-type" msgid "Delete channel" msgstr "Suprimeix el canal" -#: ../app/core/core-enums.c:938 +#: ../app/core/core-enums.c:942 msgctxt "undo-type" msgid "Channel color" msgstr "Color del canal" -#: ../app/core/core-enums.c:939 +#: ../app/core/core-enums.c:943 msgctxt "undo-type" msgid "New path" msgstr "Camí nou" -#: ../app/core/core-enums.c:940 +#: ../app/core/core-enums.c:944 msgctxt "undo-type" msgid "Delete path" msgstr "Suprimeix el camí" -#: ../app/core/core-enums.c:941 +#: ../app/core/core-enums.c:945 msgctxt "undo-type" msgid "Path modification" msgstr "Modificació del camí" -#: ../app/core/core-enums.c:945 +#: ../app/core/core-enums.c:949 msgctxt "undo-type" msgid "Ink" msgstr "Tinta" -#: ../app/core/core-enums.c:946 +#: ../app/core/core-enums.c:950 msgctxt "undo-type" msgid "Select foreground" msgstr "Selecciona el color de primer pla" -#: ../app/core/core-enums.c:949 +#: ../app/core/core-enums.c:953 msgctxt "undo-type" msgid "Not undoable" msgstr "No es pot desfer" -#: ../app/core/core-enums.c:1029 +#: ../app/core/core-enums.c:1033 msgctxt "gradient-color" msgid "Fixed" msgstr "Fixat" -#: ../app/core/core-enums.c:1030 +#: ../app/core/core-enums.c:1034 msgctxt "gradient-color" msgid "Foreground color" msgstr "Color de primer pla" #. Translators: this is an abbreviated version of "Foreground color". #. Keep it short. -#: ../app/core/core-enums.c:1033 +#: ../app/core/core-enums.c:1037 msgctxt "gradient-color" msgid "FG" msgstr "Primer pla" -#: ../app/core/core-enums.c:1034 +#: ../app/core/core-enums.c:1038 msgctxt "gradient-color" msgid "Foreground color (transparent)" msgstr "Color de primer pla (transparent)" #. Translators: this is an abbreviated version of "Foreground color (transparent)". #. Keep it short. -#: ../app/core/core-enums.c:1037 +#: ../app/core/core-enums.c:1041 msgctxt "gradient-color" msgid "FG (t)" msgstr "Primer pla (t)" -#: ../app/core/core-enums.c:1038 +#: ../app/core/core-enums.c:1042 msgctxt "gradient-color" msgid "Background color" msgstr "Color de fons" #. Translators: this is an abbreviated version of "Background color". #. Keep it short. -#: ../app/core/core-enums.c:1041 +#: ../app/core/core-enums.c:1045 msgctxt "gradient-color" msgid "BG" msgstr "Fons" -#: ../app/core/core-enums.c:1042 +#: ../app/core/core-enums.c:1046 msgctxt "gradient-color" msgid "Background color (transparent)" msgstr "Color de fons (transparent)" #. Translators: this is an abbreviated version of "Background color (transparent)". #. Keep it short. -#: ../app/core/core-enums.c:1045 +#: ../app/core/core-enums.c:1049 msgctxt "gradient-color" msgid "BG (t)" msgstr "Primer pla (t)" -#: ../app/core/core-enums.c:1076 +#: ../app/core/core-enums.c:1080 msgctxt "message-severity" msgid "Message" msgstr "Missatge" -#: ../app/core/core-enums.c:1077 +#: ../app/core/core-enums.c:1081 msgctxt "message-severity" msgid "Warning" msgstr "Avís" -#: ../app/core/core-enums.c:1078 +#: ../app/core/core-enums.c:1082 msgctxt "message-severity" msgid "Error" msgstr "Error" -#: ../app/core/core-enums.c:1079 +#: ../app/core/core-enums.c:1083 msgctxt "message-severity" msgid "WARNING" -msgstr "" +msgstr "ADVERTIMENT" -#: ../app/core/core-enums.c:1080 +#: ../app/core/core-enums.c:1084 msgctxt "message-severity" msgid "CRITICAL" -msgstr "" +msgstr "CRÍTIC" -#: ../app/core/core-enums.c:1109 +#: ../app/core/core-enums.c:1113 msgctxt "color-profile-policy" msgid "Ask what to do" msgstr "Pregunta què s'ha de fer" -#: ../app/core/core-enums.c:1110 +#: ../app/core/core-enums.c:1114 msgctxt "color-profile-policy" msgid "Keep embedded profile" msgstr "Conserva el perfil" -#: ../app/core/core-enums.c:1111 +#: ../app/core/core-enums.c:1115 msgctxt "color-profile-policy" msgid "Convert to preferred RGB color profile" msgstr "Converteix al perfil de color RGB preferit" -#: ../app/core/core-enums.c:1148 +#: ../app/core/core-enums.c:1152 msgctxt "dynamics-output-type" msgid "Opacity" msgstr "Opacitat" -#: ../app/core/core-enums.c:1149 +#: ../app/core/core-enums.c:1153 msgctxt "dynamics-output-type" msgid "Size" msgstr "Mida" -#: ../app/core/core-enums.c:1150 +#: ../app/core/core-enums.c:1154 msgctxt "dynamics-output-type" msgid "Angle" msgstr "Angle" -#: ../app/core/core-enums.c:1151 +#: ../app/core/core-enums.c:1155 msgctxt "dynamics-output-type" msgid "Color" msgstr "Color" -#: ../app/core/core-enums.c:1152 +#: ../app/core/core-enums.c:1156 msgctxt "dynamics-output-type" msgid "Hardness" msgstr "Duresa" -#: ../app/core/core-enums.c:1153 +#: ../app/core/core-enums.c:1157 msgctxt "dynamics-output-type" msgid "Force" msgstr "Força" -#: ../app/core/core-enums.c:1154 +#: ../app/core/core-enums.c:1158 msgctxt "dynamics-output-type" msgid "Aspect ratio" msgstr "Relació d'aspecte" -#: ../app/core/core-enums.c:1155 +#: ../app/core/core-enums.c:1159 msgctxt "dynamics-output-type" msgid "Spacing" msgstr "Espaiat" -#: ../app/core/core-enums.c:1156 +#: ../app/core/core-enums.c:1160 msgctxt "dynamics-output-type" msgid "Rate" msgstr "Velocitat" -#: ../app/core/core-enums.c:1157 +#: ../app/core/core-enums.c:1161 msgctxt "dynamics-output-type" msgid "Flow" msgstr "Flux" -#: ../app/core/core-enums.c:1158 +#: ../app/core/core-enums.c:1162 msgctxt "dynamics-output-type" msgid "Jitter" msgstr "Dispersa" -#: ../app/core/core-enums.c:1186 +#: ../app/core/core-enums.c:1190 msgctxt "filter-region" msgid "Use the selection as input" msgstr "Utilitza la selecció com a entrada" -#: ../app/core/core-enums.c:1187 +#: ../app/core/core-enums.c:1191 msgctxt "filter-region" msgid "Use the entire layer as input" msgstr "Utilitza la capa sencera com a entrada" -#: ../app/core/core-enums.c:1216 +#: ../app/core/core-enums.c:1220 msgctxt "channel-border-style" msgid "Hard" msgstr "Dur" -#: ../app/core/core-enums.c:1217 +#: ../app/core/core-enums.c:1221 msgctxt "channel-border-style" msgid "Smooth" msgstr "Suau" -#: ../app/core/core-enums.c:1218 +#: ../app/core/core-enums.c:1222 msgctxt "channel-border-style" msgid "Feathered" msgstr "Difuminat" @@ -11861,16 +11924,16 @@ msgctxt "undo-type" msgid "Cut Layer" msgstr "Retalla la capa" -#: ../app/core/gimp-edit.c:291 ../app/core/gimpimage-new.c:325 +#: ../app/core/gimp-edit.c:313 ../app/core/gimpimage-new.c:325 msgid "Pasted Layer" msgstr "Capa enganxada" -#: ../app/core/gimp-edit.c:708 +#: ../app/core/gimp-edit.c:724 msgctxt "undo-type" msgid "Clear" msgstr "Buida" -#: ../app/core/gimp-edit.c:830 +#: ../app/core/gimp-edit.c:846 msgid "Global Buffer" msgstr "Memòria global" @@ -11899,6 +11962,16 @@ msgstr "Entre els dos colors (HSV sentit horari)" msgid "FG to Transparent" msgstr "Fes transparent el color de primer pla" +#: ../app/core/gimp-spawn.c:186 +#, c-format +msgid "Failed to fork (%s)" +msgstr "No s'han pogut fer un «fork» (%s)" + +#: ../app/core/gimp-spawn.c:223 +#, c-format +msgid "Failed to execute child process “%s” (%s)" +msgstr "No s'ha pogut executar el procés fill «%s» (%s)" + #. This is a special string to specify the language identifier to #. * look for in the gimp-tags-default.xml file. Please translate the #. * C in it according to the name of the po file used for @@ -12022,6 +12095,7 @@ msgid "Unable to decode abr format version %d." msgstr "No es pot descodificar el format abr versió %d." #: ../app/core/gimpbrush-load.c:572 ../app/core/gimpbrush-load.c:791 +#, c-format msgid "Fatal parse error in brush file: Brush size value corrupt." msgstr "" "Error greu d'anàlisi en el fitxer de pinzell: el valor de la mida del " @@ -12061,10 +12135,11 @@ msgstr "" "format abr versió %d." #: ../app/core/gimpbrush-load.c:1114 ../app/core/gimpbrush-load.c:1132 +#, c-format msgid "Fatal parse error in brush file: RLE compressed brush data corrupt." msgstr "" -"Error greu d'anàlisi en el fitxer de pinzell: les dades del pinzell comprimides amb " -"RLE estan malmeses." +"Error greu d'anàlisi en el fitxer de pinzell: les dades del pinzell " +"comprimides amb RLE estan malmeses." #: ../app/core/gimpbrush.c:150 ../app/paint/gimppaintoptions.c:213 msgid "Brush Spacing" @@ -12143,7 +12218,7 @@ msgctxt "undo-type" msgid "Rounded Rectangle Select" msgstr "Selecció rectangular arrodonida" -#: ../app/core/gimpchannel-select.c:440 ../app/core/gimplayer.c:446 +#: ../app/core/gimpchannel-select.c:440 ../app/core/gimplayer.c:448 msgctxt "undo-type" msgid "Alpha to Selection" msgstr "Alfa a la selecció" @@ -12332,7 +12407,7 @@ msgstr "Color de fons" #: ../app/core/gimpcontext.c:687 ../app/core/gimpcontext.c:688 #: ../app/dialogs/fade-dialog.c:158 ../app/widgets/gimpbrushselect.c:175 -#: ../app/widgets/gimplayertreeview.c:286 +#: ../app/widgets/gimplayertreeview.c:295 msgid "Opacity" msgstr "Opacitat" @@ -12360,7 +12435,7 @@ msgid "Pattern" msgstr "Patró" #: ../app/core/gimpcontext.c:732 ../app/core/gimpcontext.c:733 -#: ../app/tools/gimpblendoptions.c:266 ../app/tools/gimppaintoptions-gui.c:374 +#: ../app/tools/gimpblendoptions.c:283 ../app/tools/gimppaintoptions-gui.c:374 msgid "Gradient" msgstr "Degradat" @@ -12469,12 +12544,12 @@ msgctxt "undo-type" msgid "Scale" msgstr "Ajusta la mida" -#: ../app/core/gimpdrawable-blend.c:123 ../app/tools/gimpblendtool.c:965 +#: ../app/core/gimpdrawable-blend.c:125 ../app/tools/gimpblendtool.c:1015 msgctxt "undo-type" msgid "Blend" msgstr "Barreja" -#: ../app/core/gimpdrawable-blend.c:216 +#: ../app/core/gimpdrawable-blend.c:213 msgid "Calculating distance map" msgstr "Calculant el mapa de distàncies" @@ -12531,7 +12606,7 @@ msgctxt "undo-type" msgid "Rotate" msgstr "Gira" -#: ../app/core/gimpdrawable-transform.c:1011 ../app/core/gimplayer.c:445 +#: ../app/core/gimpdrawable-transform.c:1011 ../app/core/gimplayer.c:447 msgctxt "undo-type" msgid "Transform Layer" msgstr "Transforma la capa" @@ -12548,7 +12623,7 @@ msgstr "Nivells de sortida" msgid "Style" msgstr "Estil" -#: ../app/core/gimpfilloptions.c:111 ../app/pdb/gimppdbcontext.c:99 +#: ../app/core/gimpfilloptions.c:111 ../app/pdb/gimppdbcontext.c:100 #: ../app/tools/gimpbucketfilloptions.c:132 #: ../app/tools/gimpselectionoptions.c:80 ../app/tools/gimptextoptions.c:134 msgid "Antialiasing" @@ -12688,41 +12763,41 @@ msgstr "" msgid "Offset unit" msgstr "Unitat de desplaçament" -#: ../app/core/gimpgrouplayer.c:275 +#: ../app/core/gimpgrouplayer.c:277 msgid "Layer Group" msgstr "Grup de capes" -#: ../app/core/gimpgrouplayer.c:276 +#: ../app/core/gimpgrouplayer.c:278 msgctxt "undo-type" msgid "Rename Layer Group" msgstr "Canvia el nom del grup de capes" -#: ../app/core/gimpgrouplayer.c:277 +#: ../app/core/gimpgrouplayer.c:279 msgctxt "undo-type" msgid "Move Layer Group" msgstr "Mou el grup de capes" -#: ../app/core/gimpgrouplayer.c:278 +#: ../app/core/gimpgrouplayer.c:280 msgctxt "undo-type" msgid "Scale Layer Group" msgstr "Ajusta la mida del grup de capes" -#: ../app/core/gimpgrouplayer.c:279 +#: ../app/core/gimpgrouplayer.c:281 msgctxt "undo-type" msgid "Resize Layer Group" msgstr "Canvia la mida del grup de capes" -#: ../app/core/gimpgrouplayer.c:280 +#: ../app/core/gimpgrouplayer.c:282 msgctxt "undo-type" msgid "Flip Layer Group" msgstr "Capgira el grup de capes" -#: ../app/core/gimpgrouplayer.c:281 +#: ../app/core/gimpgrouplayer.c:283 msgctxt "undo-type" msgid "Rotate Layer Group" msgstr "Gira el grup de capes" -#: ../app/core/gimpgrouplayer.c:282 +#: ../app/core/gimpgrouplayer.c:284 msgctxt "undo-type" msgid "Transform Layer Group" msgstr "Transforma el grup de capes" @@ -12875,98 +12950,98 @@ msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "Afegeix el color al mapa de color" -#: ../app/core/gimpimage-convert-indexed.c:789 +#: ../app/core/gimpimage-convert-indexed.c:786 msgid "Cannot convert image: palette is empty." msgstr "No s'ha pogut convertir la imatge perquè la paleta està buida." -#: ../app/core/gimpimage-convert-indexed.c:803 +#: ../app/core/gimpimage-convert-indexed.c:798 msgctxt "undo-type" msgid "Convert Image to Indexed" msgstr "Converteix la imatge a indexat" -#: ../app/core/gimpimage-convert-indexed.c:884 +#: ../app/core/gimpimage-convert-indexed.c:890 msgid "Converting to indexed colors (stage 2)" msgstr "S'està convertint a colors indexats (2ª etapa)" -#: ../app/core/gimpimage-convert-indexed.c:932 +#: ../app/core/gimpimage-convert-indexed.c:939 msgid "Converting to indexed colors (stage 3)" msgstr "S'està convertint a colors indexats (3ª etapa)" -#: ../app/core/gimpimage-convert-precision.c:83 +#: ../app/core/gimpimage-convert-precision.c:75 msgctxt "undo-type" msgid "Convert Image to 8 bit linear integer" msgstr "Converteix la imatge a enter lineal de 8 bits" -#: ../app/core/gimpimage-convert-precision.c:86 +#: ../app/core/gimpimage-convert-precision.c:78 msgctxt "undo-type" msgid "Convert Image to 8 bit gamma integer" msgstr "Converteix la imatge a enter de gamma de 8 bits" -#: ../app/core/gimpimage-convert-precision.c:89 +#: ../app/core/gimpimage-convert-precision.c:81 msgctxt "undo-type" msgid "Convert Image to 16 bit linear integer" msgstr "Converteix la imatge a enter lineal de 16 bits" -#: ../app/core/gimpimage-convert-precision.c:92 +#: ../app/core/gimpimage-convert-precision.c:84 msgctxt "undo-type" msgid "Convert Image to 16 bit gamma integer" msgstr "Converteix la imatge a enter de gamma de 16 bits" -#: ../app/core/gimpimage-convert-precision.c:95 +#: ../app/core/gimpimage-convert-precision.c:87 msgctxt "undo-type" msgid "Convert Image to 32 bit linear integer" msgstr "Converteix la imatge a enter lineal de 32 bits" -#: ../app/core/gimpimage-convert-precision.c:98 +#: ../app/core/gimpimage-convert-precision.c:90 msgctxt "undo-type" msgid "Convert Image to 32 bit gamma integer" msgstr "Converteix la imatge a enter de gamma de 32 bits" -#: ../app/core/gimpimage-convert-precision.c:101 +#: ../app/core/gimpimage-convert-precision.c:93 msgctxt "undo-type" msgid "Convert Image to 16 bit linear floating point" msgstr "Converteix la imatge a lineal de 16 bits de punt flotant" -#: ../app/core/gimpimage-convert-precision.c:104 +#: ../app/core/gimpimage-convert-precision.c:96 msgctxt "undo-type" msgid "Convert Image to 16 bit gamma floating point" msgstr "Converteix la imatge a gamma de 16 bits de punt flotant" -#: ../app/core/gimpimage-convert-precision.c:107 +#: ../app/core/gimpimage-convert-precision.c:99 msgctxt "undo-type" msgid "Convert Image to 32 bit linear floating point" msgstr "Converteix la imatge a lineal de 32 bits de punt flotant" -#: ../app/core/gimpimage-convert-precision.c:110 +#: ../app/core/gimpimage-convert-precision.c:102 msgctxt "undo-type" msgid "Convert Image to 32 bit gamma floating point" msgstr "Converteix la imatge a gamma de 32 bits de punt flotant" -#: ../app/core/gimpimage-convert-precision.c:113 +#: ../app/core/gimpimage-convert-precision.c:105 msgctxt "undo-type" msgid "Convert Image to 64 bit linear floating point" msgstr "Converteix la imatge a lineal de 64 bits de punt flotant" -#: ../app/core/gimpimage-convert-precision.c:116 +#: ../app/core/gimpimage-convert-precision.c:108 msgctxt "undo-type" msgid "Convert Image to 64 bit gamma floating point" msgstr "Converteix la imatge a gamma de 64 bits de punt flotant" #. dithering -#: ../app/core/gimpimage-convert-precision.c:284 -#: ../app/core/gimpimage-convert-precision.c:298 +#: ../app/core/gimpimage-convert-precision.c:264 +#: ../app/core/gimpimage-convert-precision.c:288 #: ../app/dialogs/convert-indexed-dialog.c:236 #: ../app/dialogs/convert-precision-dialog.c:221 -#: ../app/tools/gimpblendoptions.c:124 +#: ../app/tools/gimpblendoptions.c:135 msgid "Dithering" msgstr "Tramatge" -#: ../app/core/gimpimage-convert-type.c:83 +#: ../app/core/gimpimage-convert-type.c:81 msgctxt "undo-type" msgid "Convert Image to RGB" msgstr "Converteix la imatge a RGB" -#: ../app/core/gimpimage-convert-type.c:87 +#: ../app/core/gimpimage-convert-type.c:85 msgctxt "undo-type" msgid "Convert Image to Grayscale" msgstr "Converteix la imatge a escala de grisos" @@ -12976,7 +13051,7 @@ msgctxt "undo-type" msgid "Crop Image" msgstr "Escapça la imatge" -#: ../app/core/gimpimage-crop.c:75 ../app/core/gimpimage-resize.c:90 +#: ../app/core/gimpimage-crop.c:75 ../app/core/gimpimage-resize.c:91 msgctxt "undo-type" msgid "Resize Image" msgstr "Canvia la mida de la imatge" @@ -13001,22 +13076,22 @@ msgctxt "undo-type" msgid "Move Guide" msgstr "Mou la guia" -#: ../app/core/gimpimage-item-list.c:116 +#: ../app/core/gimpimage-item-list.c:117 msgctxt "undo-type" msgid "Translate Items" msgstr "Tradueix els elements" -#: ../app/core/gimpimage-item-list.c:156 +#: ../app/core/gimpimage-item-list.c:157 msgctxt "undo-type" msgid "Flip Items" msgstr "Capgira els elements" -#: ../app/core/gimpimage-item-list.c:195 ../app/core/gimpitem-linked.c:164 +#: ../app/core/gimpimage-item-list.c:196 ../app/core/gimpitem-linked.c:164 msgctxt "undo-type" msgid "Rotate Items" msgstr "Gira els elements" -#: ../app/core/gimpimage-item-list.c:236 +#: ../app/core/gimpimage-item-list.c:246 msgctxt "undo-type" msgid "Transform Items" msgstr "Transforma els elements" @@ -13100,12 +13175,12 @@ msgctxt "undo-type" msgid "Move Sample Point" msgstr "Mou el punt de mostratge" -#: ../app/core/gimpimage-scale.c:86 +#: ../app/core/gimpimage-scale.c:79 msgctxt "undo-type" msgid "Scale Image" msgstr "Ajusta la mida de la imatge" -#: ../app/core/gimpimage-undo-push.c:996 +#: ../app/core/gimpimage-undo-push.c:1028 #, c-format msgid "Can't undo %s" msgstr "No es pot desfer %s" @@ -13164,17 +13239,17 @@ msgstr[1] "%d capes" msgid "Could not open thumbnail '%s': %s" msgstr "No s'ha pogut obrir la miniatura «%s»: %s" -#: ../app/core/gimpitem.c:2022 +#: ../app/core/gimpitem.c:2075 msgctxt "undo-type" msgid "Attach Parasite" msgstr "Adjunta el paràsit" -#: ../app/core/gimpitem.c:2032 +#: ../app/core/gimpitem.c:2085 msgctxt "undo-type" msgid "Attach Parasite to Item" msgstr "Adjunta el paràsit a l'element" -#: ../app/core/gimpitem.c:2083 ../app/core/gimpitem.c:2090 +#: ../app/core/gimpitem.c:2136 ../app/core/gimpitem.c:2143 msgctxt "undo-type" msgid "Remove Parasite from Item" msgstr "Suprimeix el paràsit de l'element" @@ -13192,7 +13267,7 @@ msgctxt "undo-type" msgid "Anchor Floating Selection" msgstr "Ancora la selecció flotant" -#: ../app/core/gimplayer-floating-selection.c:175 ../app/core/gimplayer.c:1035 +#: ../app/core/gimplayer-floating-selection.c:175 ../app/core/gimplayer.c:1037 msgid "" "Cannot create a new layer from the floating selection because it belongs to " "a layer mask or channel." @@ -13205,76 +13280,76 @@ msgctxt "undo-type" msgid "Floating Selection to Layer" msgstr "Converteix la selecció flotant en una capa" -#: ../app/core/gimplayer.c:439 +#: ../app/core/gimplayer.c:441 msgctxt "undo-type" msgid "Rename Layer" msgstr "Canvia el nom de la capa" -#: ../app/core/gimplayer.c:440 +#: ../app/core/gimplayer.c:442 msgctxt "undo-type" msgid "Move Layer" msgstr "Mou la capa" -#: ../app/core/gimplayer.c:441 +#: ../app/core/gimplayer.c:443 msgctxt "undo-type" msgid "Scale Layer" msgstr "Ajusta la mida de la capa" -#: ../app/core/gimplayer.c:442 +#: ../app/core/gimplayer.c:444 msgctxt "undo-type" msgid "Resize Layer" msgstr "Canvia la mida de la capa" -#: ../app/core/gimplayer.c:443 +#: ../app/core/gimplayer.c:445 msgctxt "undo-type" msgid "Flip Layer" msgstr "Capgira la capa" -#: ../app/core/gimplayer.c:444 +#: ../app/core/gimplayer.c:446 msgctxt "undo-type" msgid "Rotate Layer" msgstr "Gira la capa" -#: ../app/core/gimplayer.c:447 +#: ../app/core/gimplayer.c:449 msgctxt "undo-type" msgid "Reorder Layer" msgstr "Reordena la capa" -#: ../app/core/gimplayer.c:448 +#: ../app/core/gimplayer.c:450 msgctxt "undo-type" msgid "Raise Layer" msgstr "Apuja la capa" -#: ../app/core/gimplayer.c:449 +#: ../app/core/gimplayer.c:451 msgctxt "undo-type" msgid "Raise Layer to Top" msgstr "Mou la capa al capdamunt" -#: ../app/core/gimplayer.c:450 +#: ../app/core/gimplayer.c:452 msgctxt "undo-type" msgid "Lower Layer" msgstr "Abaixa la capa" -#: ../app/core/gimplayer.c:451 +#: ../app/core/gimplayer.c:453 msgctxt "undo-type" msgid "Lower Layer to Bottom" msgstr "Mou la capa al capdavall" -#: ../app/core/gimplayer.c:452 +#: ../app/core/gimplayer.c:454 msgid "Layer cannot be raised higher." msgstr "La capa no es pot apujar més." -#: ../app/core/gimplayer.c:453 +#: ../app/core/gimplayer.c:455 msgid "Layer cannot be lowered more." msgstr "La capa no es pot abaixar més." -#: ../app/core/gimplayer.c:742 ../app/core/gimplayer.c:1812 +#: ../app/core/gimplayer.c:744 ../app/core/gimplayer.c:1905 #: ../app/core/gimplayermask.c:257 #, c-format msgid "%s mask" msgstr "Màscara de %s" -#: ../app/core/gimplayer.c:781 +#: ../app/core/gimplayer.c:783 #, c-format msgid "" "Floating Selection\n" @@ -13283,62 +13358,62 @@ msgstr "" "Selecció flotant\n" "(%s)" -#: ../app/core/gimplayer.c:1718 +#: ../app/core/gimplayer.c:1811 msgid "Unable to add a layer mask since the layer already has one." msgstr "No es pot afegir una màscara de capa perquè la capa ja en té una." -#: ../app/core/gimplayer.c:1729 +#: ../app/core/gimplayer.c:1822 msgid "Cannot add layer mask of different dimensions than specified layer." msgstr "" "No es pot afegir una màscara de capa de mida diferent de la capa " "especificada." -#: ../app/core/gimplayer.c:1735 +#: ../app/core/gimplayer.c:1828 msgctxt "undo-type" msgid "Add Layer Mask" msgstr "Afegeix una màscara de capa" -#: ../app/core/gimplayer.c:1863 +#: ../app/core/gimplayer.c:1956 msgctxt "undo-type" msgid "Transfer Alpha to Mask" msgstr "Transfereix l'alfa a la màscara" -#: ../app/core/gimplayer.c:2019 +#: ../app/core/gimplayer.c:2112 msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "Aplica la màscara de capa" -#: ../app/core/gimplayer.c:2020 +#: ../app/core/gimplayer.c:2113 msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "Suprimeix la màscara de capa" -#: ../app/core/gimplayer.c:2122 +#: ../app/core/gimplayer.c:2215 msgctxt "undo-type" msgid "Enable Layer Mask" msgstr "Habilita la màscara de capa" -#: ../app/core/gimplayer.c:2123 +#: ../app/core/gimplayer.c:2216 msgctxt "undo-type" msgid "Disable Layer Mask" msgstr "Inhabilita la màscara de capa" -#: ../app/core/gimplayer.c:2199 +#: ../app/core/gimplayer.c:2292 msgctxt "undo-type" msgid "Show Layer Mask" msgstr "Mostra la màscara de capa" -#: ../app/core/gimplayer.c:2272 +#: ../app/core/gimplayer.c:2365 msgctxt "undo-type" msgid "Add Alpha Channel" msgstr "Afegeix el canal alfa" -#: ../app/core/gimplayer.c:2307 +#: ../app/core/gimplayer.c:2400 msgctxt "undo-type" msgid "Remove Alpha Channel" msgstr "Suprimeix el canal alfa" -#: ../app/core/gimplayer.c:2328 +#: ../app/core/gimplayer.c:2421 msgctxt "undo-type" msgid "Layer to Image Size" msgstr "Mida de la imatge igual a la de la capa" @@ -14292,7 +14367,7 @@ msgstr "_Esvaeix" #: ../app/dialogs/fade-dialog.c:151 #: ../app/operations/gimpoperationdesaturate.c:90 #: ../app/tools/gimppaintoptions-gui.c:119 ../app/widgets/gimpdeviceinfo.c:132 -#: ../app/widgets/gimplayertreeview.c:270 +#: ../app/widgets/gimplayertreeview.c:279 msgid "Mode" msgstr "Mode" @@ -14750,7 +14825,7 @@ msgstr "Desplaça el canal" #. The offset frame #: ../app/dialogs/offset-dialog.c:129 ../app/dialogs/offset-dialog.c:163 #: ../app/dialogs/resize-dialog.c:230 ../app/tools/gimpalignoptions.c:100 -#: ../app/tools/gimpalignoptions.c:107 ../app/tools/gimpblendoptions.c:84 +#: ../app/tools/gimpalignoptions.c:107 ../app/tools/gimpblendoptions.c:88 #: ../app/widgets/gimpgrideditor.c:209 msgid "Offset" msgstr "Desplaçament" @@ -15083,8 +15158,8 @@ msgid "Bug Reporting" msgstr "Informe d'error" #: ../app/dialogs/preferences-dialog.c:1239 -msgid "Try generating debug data for bug reporting when appropriate" -msgstr "" +msgid "Debug Policy" +msgstr "Política de depuració" #: ../app/dialogs/preferences-dialog.c:1251 msgid "This feature requires \"gdb\" or \"lldb\" installed on your system." @@ -16832,13 +16907,13 @@ msgid "Drop color to layer" msgstr "Deixa anar un color a la capa" #: ../app/display/gimpdisplayshell-dnd.c:569 -#: ../app/widgets/gimplayertreeview.c:735 +#: ../app/widgets/gimplayertreeview.c:756 msgid "Drop layers" msgstr "Elimina les capes" #: ../app/display/gimpdisplayshell-dnd.c:706 #: ../app/display/gimpdisplayshell-dnd.c:724 -#: ../app/widgets/gimplayertreeview.c:810 ../app/widgets/gimptoolbox-dnd.c:272 +#: ../app/widgets/gimplayertreeview.c:831 ../app/widgets/gimptoolbox-dnd.c:272 msgid "Dropped Buffer" msgstr "Objecte eliminat del porta-retalls del GIMP" @@ -17424,23 +17499,29 @@ msgstr "Automàtic" #: ../app/operations/operations-enums.c:60 msgctxt "layer-composite-mode" -msgid "Source over" -msgstr "Origen per sobre" +msgid "Union" +msgstr "Unió" #: ../app/operations/operations-enums.c:61 +#, fuzzy +#| msgid "Click to sharpen" msgctxt "layer-composite-mode" -msgid "Source atop" -msgstr "Origen a dalt" +msgid "Clip to backdrop" +msgstr "Feu clic per a ressaltar" #: ../app/operations/operations-enums.c:62 +#, fuzzy +#| msgid "Flip Text Layer" msgctxt "layer-composite-mode" -msgid "Destination atop" -msgstr "Destinació a dalt" +msgid "Clip to layer" +msgstr "Capgira la capa de text" #: ../app/operations/operations-enums.c:63 +#, fuzzy +#| msgid "Iterations" msgctxt "layer-composite-mode" -msgid "Source in" -msgstr "Origen dins" +msgid "Intersection" +msgstr "Iteracions" #: ../app/operations/operations-enums.c:153 msgctxt "layer-mode" @@ -18192,10 +18273,41 @@ msgstr "" msgid "default:LTR" msgstr "default:LTR" +#: ../app/gui/gui.c:326 +msgid "Image Recovery" +msgstr "Recuperació de la imatge" + +#: ../app/gui/gui.c:328 +msgid "_Discard" +msgstr "_Descarta" + +#: ../app/gui/gui.c:329 +msgid "_Recover" +msgstr "R_ecupera" + +#: ../app/gui/gui.c:340 +msgid "Eeek! It looks like GIMP recovered from a crash!" +msgstr "Ep! Sembla que el GIMP s'ha recuperat d'una fallida" + +#. TRANSLATORS: even if English singular form does +#. * not use %d, you can use %d for translation in +#. * any singular/plural form of your language if +#. * suited. It will just work and be replaced by the +#. * number of images as expected. +#. +#: ../app/gui/gui.c:349 +#, c-format +msgid "" +"An image was salvaged from the crash. Do you want to try and recover it?" +msgid_plural "" +"%d images were salvaged from the crash. Do you want to try and recover them?" +msgstr[0] "S'ha desat una imatge abans de la fallida. Voleu intentar recuperar-la?" +msgstr[1] "S'han desats %d imatges abans de la fallida. Voleu intentar recuperar-les?" + #. load the recent documents after gimp_real_restore() because we #. * need the mime-types implemented by plug-ins #. -#: ../app/gui/gui.c:543 +#: ../app/gui/gui.c:594 msgid "Documents" msgstr "Documents" @@ -18306,8 +18418,8 @@ msgid "Tilt" msgstr "Inclinació" #. Blob shape widgets -#: ../app/paint/gimpinkoptions.c:106 ../app/tools/gimpblendoptions.c:90 -#: ../app/tools/gimpblendoptions.c:277 ../app/tools/gimpinkoptions-gui.c:103 +#: ../app/paint/gimpinkoptions.c:106 ../app/tools/gimpblendoptions.c:94 +#: ../app/tools/gimpblendoptions.c:294 ../app/tools/gimpinkoptions-gui.c:103 msgid "Shape" msgstr "Forma" @@ -18489,8 +18601,8 @@ msgstr "Torna a l'estat anterior" msgid "Reverse direction of fading" msgstr "Inverteix la direcció de l'esvaïment" -#: ../app/paint/gimppaintoptions.c:327 ../app/tools/gimpblendoptions.c:97 -#: ../app/tools/gimpblendoptions.c:286 ../app/tools/gimppaintoptions-gui.c:356 +#: ../app/paint/gimppaintoptions.c:327 ../app/tools/gimpblendoptions.c:108 +#: ../app/tools/gimpblendoptions.c:315 ../app/tools/gimppaintoptions-gui.c:356 msgid "Repeat" msgstr "Repeteix" @@ -18563,7 +18675,7 @@ msgstr "Indiqueu primer la imatge origen." msgid "Alignment" msgstr "Alineació" -#: ../app/paint/gimpsourceoptions.c:71 ../app/pdb/gimppdbcontext.c:127 +#: ../app/paint/gimpsourceoptions.c:71 ../app/pdb/gimppdbcontext.c:128 #: ../app/tools/gimpbucketfilloptions.c:117 ../app/tools/gimpcoloroptions.c:69 #: ../app/tools/gimphealtool.c:99 ../app/tools/gimpregionselectoptions.c:97 msgid "Sample merged" @@ -18993,55 +19105,59 @@ msgstr "" "La funció «%s» s'ha cridat amb un paràmetre (núm. %d) amb el tipus " "incorrecte. S'esperava un %s, però ha arribat un %s." -#: ../app/pdb/gimppdbcontext.c:100 ../app/tools/gimpselectionoptions.c:81 +#: ../app/pdb/gimppdbcontext.c:101 ../app/tools/gimpselectionoptions.c:81 msgid "Smooth edges" msgstr "Suavitza les vores" -#: ../app/pdb/gimppdbcontext.c:106 +#: ../app/pdb/gimppdbcontext.c:107 msgid "Feather" msgstr "Difumina la vora" # Quim: opció en el diàleg selecció, per fer que les puntes de la selecció rectangular siguin arrodonides -#: ../app/pdb/gimppdbcontext.c:113 +#: ../app/pdb/gimppdbcontext.c:114 msgid "Feather radius X" msgstr "Difumina vora radi X" # Quim: opció en el diàleg selecció, per fer que les puntes de la selecció rectangular siguin arrodonides -#: ../app/pdb/gimppdbcontext.c:120 +#: ../app/pdb/gimppdbcontext.c:121 msgid "Feather radius Y" msgstr "Difumina vora radi Y" -#: ../app/pdb/gimppdbcontext.c:134 +#: ../app/pdb/gimppdbcontext.c:135 msgid "Sample criterion" msgstr "Criteris de mostra" -#: ../app/pdb/gimppdbcontext.c:142 +#: ../app/pdb/gimppdbcontext.c:143 msgid "Sample threshold" msgstr "Llindar de la mostra" -#: ../app/pdb/gimppdbcontext.c:149 +#: ../app/pdb/gimppdbcontext.c:150 msgid "Sample transparent" msgstr "Mostra transparent" -#: ../app/pdb/gimppdbcontext.c:156 ../app/tools/gimpbucketfilloptions.c:124 +#: ../app/pdb/gimppdbcontext.c:157 ../app/tools/gimpbucketfilloptions.c:124 #: ../app/tools/gimpregionselectoptions.c:104 msgid "Diagonal neighbors" msgstr "Línies diagonals veïnes" -#: ../app/pdb/gimppdbcontext.c:163 ../app/tools/gimptransformoptions.c:124 +#: ../app/pdb/gimppdbcontext.c:164 ../app/tools/gimptransformoptions.c:124 #: ../app/tools/gimptransformoptions.c:440 ../app/tools/gimpwarpoptions.c:119 #: ../app/tools/gimpwarpoptions.c:322 msgid "Interpolation" msgstr "Interpolació" -#: ../app/pdb/gimppdbcontext.c:171 +#: ../app/pdb/gimppdbcontext.c:172 msgid "Transform direction" msgstr "Direcció de transformació" -#: ../app/pdb/gimppdbcontext.c:179 +#: ../app/pdb/gimppdbcontext.c:180 msgid "Transform resize" msgstr "Redimensiona la transformació" +#: ../app/pdb/gimppdbcontext.c:195 +msgid "Distance metric" +msgstr "Distància mètrica" + #: ../app/pdb/gimpprocedure.c:467 ../app/plug-in/gimppluginprocframe.c:191 #, c-format msgid "Procedure '%s' returned no return values" @@ -19502,7 +19618,7 @@ msgstr "S'ha referit un intèrpret incorrecte al fitxer d'intèrpret %s: %s" msgid "Bad binary format string in interpreter file %s" msgstr "Cadena de format binari incorrecta al fitxer d'intèrpret %s" -#: ../app/plug-in/gimpplugin.c:629 +#: ../app/plug-in/gimpplugin.c:622 #, c-format msgid "" "Plug-in crashed: \"%s\"\n" @@ -19740,7 +19856,7 @@ msgstr "Realça la vora" msgid "Other Options" msgstr "Altres opcions" -#: ../app/propgui/gimppropgui-generic.c:177 +#: ../app/propgui/gimppropgui-generic.c:185 msgid "Pick coordinates from the image" msgstr "Tria les coordenades des de la imatge" @@ -19804,6 +19920,10 @@ msgstr "_Saturació" msgid "R_eset Color" msgstr "_Inicialitza el color" +#: ../app/propgui/gimppropgui-recursive-transform.c:125 +msgid "Recursive Transform: " +msgstr "Transformació recursiva: " + #: ../app/propgui/gimppropgui-shadows-highlights.c:62 msgid "Shadows" msgstr "Ombres" @@ -19911,11 +20031,11 @@ msgstr "Trieu entre una llista de temperatures de colors comuns" msgid "New Seed" msgstr "Llavor nova" -#: ../app/propgui/gimppropgui.c:374 +#: ../app/propgui/gimppropgui.c:375 msgid "Pick color from the image" msgstr "Tria el color des de la imatge" -#: ../app/propgui/gimppropgui.c:514 +#: ../app/propgui/gimppropgui.c:517 msgid "This operation has no editable properties" msgstr "Aquesta operació no té propietats editables" @@ -19932,7 +20052,7 @@ msgstr "" "Jove xef, porti whisky amb\n" "quinze glaçons d'hidrogen, coi!." -#: ../app/text/gimptext-compat.c:106 ../app/tools/gimptexttool.c:1462 +#: ../app/text/gimptext-compat.c:106 ../app/tools/gimptexttool.c:1472 msgid "Add Text Layer" msgstr "Afegeix capa de text" @@ -20157,47 +20277,55 @@ msgstr "Feu clic en aquest camí com a primer element" msgid "Click to add this path to the list" msgstr "Feu clic en aquest camí per a afegir-lo a la llista" -#: ../app/tools/gimpblendoptions.c:105 +#: ../app/tools/gimpblendoptions.c:101 ../app/tools/gimpblendoptions.c:303 +msgid "Metric" +msgstr "Mètrica" + +#: ../app/tools/gimpblendoptions.c:102 +msgid "Metric to use for the distance calculation" +msgstr "" + +#: ../app/tools/gimpblendoptions.c:116 msgid "Adaptive Supersampling" msgstr "Supermostratge adaptable" -#: ../app/tools/gimpblendoptions.c:111 +#: ../app/tools/gimpblendoptions.c:122 msgid "Max depth" msgstr "Profunditat màxima" -#: ../app/tools/gimpblendoptions.c:117 ../app/tools/gimpbucketfilloptions.c:142 +#: ../app/tools/gimpblendoptions.c:128 ../app/tools/gimpbucketfilloptions.c:142 #: ../app/tools/gimpregionselectoptions.c:112 #: ../app/tools/gimpthresholdtool.c:87 msgid "Threshold" msgstr "Llindar blanc i negre" -#: ../app/tools/gimpblendoptions.c:131 +#: ../app/tools/gimpblendoptions.c:142 msgid "Instant mode" msgstr "Mode instant" -#: ../app/tools/gimpblendoptions.c:132 +#: ../app/tools/gimpblendoptions.c:143 msgid "Commit gradient instantly" msgstr "Lliura el degradat a l'instant" -#: ../app/tools/gimpblendoptions.c:138 +#: ../app/tools/gimpblendoptions.c:149 msgid "Modify active gradient" msgstr "Modifica el degradat actiu" -#: ../app/tools/gimpblendoptions.c:139 +#: ../app/tools/gimpblendoptions.c:150 msgid "Modify the active gradient in-place" msgstr "Modifica el degradat actiu en el lloc" -#: ../app/tools/gimpblendoptions.c:271 ../app/tools/gimppaintoptions-gui.c:379 +#: ../app/tools/gimpblendoptions.c:288 ../app/tools/gimppaintoptions-gui.c:379 msgid "Edit this gradient" msgstr "Edita el degradat actual" #. the instant toggle -#: ../app/tools/gimpblendoptions.c:326 +#: ../app/tools/gimpblendoptions.c:356 #, c-format msgid "Instant mode (%s)" msgstr "Mode instant (%s)" -#: ../app/tools/gimpblendoptions.c:346 +#: ../app/tools/gimpblendoptions.c:376 msgid "" "The active gradient is non-writable and cannot be edited directly. Uncheck " "this option to edit a copy of it." @@ -20232,7 +20360,7 @@ msgstr "La capa activa no és visible." msgid "No gradient available for use with this tool." msgstr "No es pot utilitzar cap degradat amb aquesta eina." -#: ../app/tools/gimpblendtool.c:571 +#: ../app/tools/gimpblendtool.c:614 msgid "Blend: " msgstr "Barreja: " @@ -20918,12 +21046,12 @@ msgstr "%s: commuta entre original i filtrat" msgid "%s: switch horizontal and vertical" msgstr "%s: commuta entre horitzontal i vertical" -#: ../app/tools/gimpfiltertool.c:1295 ../app/tools/gimpfiltertool-settings.c:71 +#: ../app/tools/gimpfiltertool.c:1298 ../app/tools/gimpfiltertool-settings.c:71 #, c-format msgid "Import '%s' Settings" msgstr "Importa la configuració de «%s»" -#: ../app/tools/gimpfiltertool.c:1297 ../app/tools/gimpfiltertool-settings.c:73 +#: ../app/tools/gimpfiltertool.c:1300 ../app/tools/gimpfiltertool-settings.c:73 #, c-format msgid "Export '%s' Settings" msgstr "Exporta la configuració de «%s»" @@ -21147,7 +21275,7 @@ msgid "Fuzzy Select" msgstr "Selecció de regió contigua" #: ../app/tools/gimpgegltool.c:78 ../app/tools/gimpgegltool.c:539 -#: ../app/tools/gimpgegltool.c:540 ../app/tools/gimpoperationtool.c:131 +#: ../app/tools/gimpgegltool.c:540 ../app/tools/gimpoperationtool.c:134 msgid "GEGL Operation" msgstr "Operació GEGL" @@ -21155,7 +21283,7 @@ msgstr "Operació GEGL" msgid "GEGL Tool: Use an arbitrary GEGL operation" msgstr "Eina GEGL: Utilitza una operació GEGL arbitrària" -#: ../app/tools/gimpgegltool.c:80 ../app/tools/gimpoperationtool.c:133 +#: ../app/tools/gimpgegltool.c:80 ../app/tools/gimpoperationtool.c:136 msgid "_GEGL Operation..." msgstr "Operació _GEGL..." @@ -21607,18 +21735,18 @@ msgstr "" msgid "_N-Point Deformation" msgstr "Deformació de _N-Punts" -#: ../app/tools/gimpoperationtool.c:132 +#: ../app/tools/gimpoperationtool.c:135 msgid "Operation Tool: Use an arbitrary GEGL operation" msgstr "Eina Operació: utilitza una operació GEGL arbitrària" #. don't translate "Aux" -#: ../app/tools/gimpoperationtool.c:536 +#: ../app/tools/gimpoperationtool.c:547 #, c-format msgid "Aux Input" msgstr "Entrada aux" #. don't translate "Aux" -#: ../app/tools/gimpoperationtool.c:542 +#: ../app/tools/gimpoperationtool.c:553 #, c-format msgid "Aux%d Input" msgstr "Entrada aux %d" @@ -22189,39 +22317,39 @@ msgstr "Capsa:" msgid "Language:" msgstr "Idioma:" -#: ../app/tools/gimptexttool.c:197 +#: ../app/tools/gimptexttool.c:203 msgid "Text" msgstr "Text" -#: ../app/tools/gimptexttool.c:198 +#: ../app/tools/gimptexttool.c:204 msgid "Text Tool: Create or edit text layers" msgstr "Eina Text: crea o edita una capa de text" -#: ../app/tools/gimptexttool.c:199 +#: ../app/tools/gimptexttool.c:205 msgid "Te_xt" msgstr "Te_xt" -#: ../app/tools/gimptexttool.c:944 +#: ../app/tools/gimptexttool.c:953 msgid "Text box: " msgstr "Quadre de text: " -#: ../app/tools/gimptexttool.c:1075 +#: ../app/tools/gimptexttool.c:1084 msgid "Reshape Text Layer" msgstr "Canvia la forma de la capa de text" -#: ../app/tools/gimptexttool.c:1573 ../app/tools/gimptexttool.c:1576 +#: ../app/tools/gimptexttool.c:1583 ../app/tools/gimptexttool.c:1586 msgid "Confirm Text Editing" msgstr "Confirma l'edició del text" -#: ../app/tools/gimptexttool.c:1580 +#: ../app/tools/gimptexttool.c:1590 msgid "Create _New Layer" msgstr "Crea una capa _nova" -#: ../app/tools/gimptexttool.c:1582 +#: ../app/tools/gimptexttool.c:1592 msgid "_Edit" msgstr "_Edita" -#: ../app/tools/gimptexttool.c:1604 +#: ../app/tools/gimptexttool.c:1614 msgid "" "The layer you selected is a text layer but it has been modified using other " "tools. Editing the layer with the text tool will discard these " @@ -22916,7 +23044,7 @@ msgid "Percentage of width of brush" msgstr "Percentatge de l'amplada del pinzell" #: ../app/widgets/gimpbufferview.c:189 ../app/widgets/gimpbufferview.c:290 -#: ../app/widgets/gimpeditor.c:758 +#: ../app/widgets/gimpeditor.c:759 msgid "(None)" msgstr "(Cap)" @@ -23498,7 +23626,8 @@ msgstr "" #: ../app/widgets/gimpcriticaldialog.c:139 #: ../app/widgets/gimpcriticaldialog.c:450 msgid "Paste the clipboard text in a new bug report." -msgstr "Enganxa el contingut del text del porta-retalls a un informe d'error nou." +msgstr "" +"Enganxa el contingut del text del porta-retalls a un informe d'error nou." #: ../app/widgets/gimpcriticaldialog.c:140 #: ../app/widgets/gimpcriticaldialog.c:451 @@ -23525,13 +23654,11 @@ msgstr "" #: ../app/widgets/gimpcriticaldialog.c:229 msgid "The specified file was not found." -msgstr "" +msgstr "No s'ha trobat el fitxer especificat." #: ../app/widgets/gimpcriticaldialog.c:232 -#, fuzzy -#| msgid "The active path has no strokes." msgid "The specified path was not found." -msgstr "El camí actiu no té traços." +msgstr "No s'ha trobat el camí especificat." #: ../app/widgets/gimpcriticaldialog.c:235 msgid "" @@ -23540,25 +23667,23 @@ msgstr "" #: ../app/widgets/gimpcriticaldialog.c:238 msgid "The operating system denied access to the specified file." -msgstr "" +msgstr "El sistema operatiu ha denegat accés al fitxer especificat." #: ../app/widgets/gimpcriticaldialog.c:241 msgid "The file name association is incomplete or invalid." -msgstr "" +msgstr "El nom de fitxer de l'associació és incomplet o no vàlid." #: ../app/widgets/gimpcriticaldialog.c:244 msgid "DDE transaction busy" -msgstr "" +msgstr "La transacció DDE està ocupada" #: ../app/widgets/gimpcriticaldialog.c:247 -#, fuzzy -#| msgid "User installation failed!" msgid "The DDE transaction failed." -msgstr "Ha fallat la instal·lació personalitzada" +msgstr "Ha fallat la transacció DDE." #: ../app/widgets/gimpcriticaldialog.c:250 msgid "The DDE transaction timed out." -msgstr "" +msgstr "La transacció DDE ha esgotat el temps d'espera." #: ../app/widgets/gimpcriticaldialog.c:253 msgid "The specified DLL was not found." @@ -23567,6 +23692,7 @@ msgstr "No s'ha trobat la biblioteca DLL indicada." #: ../app/widgets/gimpcriticaldialog.c:256 msgid "There is no application associated with the given file name extension." msgstr "" +"No hi ha cap aplicació associada a l'extensió que es vol donar al fitxer." #: ../app/widgets/gimpcriticaldialog.c:259 msgid "There was not enough memory to complete the operation." @@ -23578,13 +23704,12 @@ msgstr "S'ha produït una violació en la compartició." #: ../app/widgets/gimpcriticaldialog.c:265 msgid "Unknown Microsoft Windows error." -msgstr "Error del Microsoft Windows desconegut" +msgstr "Error del Microsoft Windows desconegut." #: ../app/widgets/gimpcriticaldialog.c:268 -#, fuzzy, c-format -#| msgid "Failed to import paths from '%s': %s" +#, c-format msgid "Failed to open '%s': %s" -msgstr "No s'han pogut importar els camins de «%s»: %s" +msgstr "No s'ha pogut obrir «%s»: %s" #: ../app/widgets/gimpcriticaldialog.c:409 #, c-format @@ -23725,7 +23850,7 @@ msgstr "" #: ../app/widgets/gimpdashboard.c:496 msgctxt "dashboard-group" msgid "Swap" -msgstr "" +msgstr "Espai d'intercanvi" #: ../app/widgets/gimpdashboard.c:497 msgid "On-disk tile swap" @@ -23811,10 +23936,8 @@ msgstr "Inclinació Y" #. #: ../app/widgets/gimpdeviceinfoeditor.c:148 #: ../app/widgets/gimpdynamicseditor.c:165 -#, fuzzy -#| msgid "Rotating" msgid "Wheel/Rotation" -msgstr "S'està girant" +msgstr "Roda/Rotació" #. the axes #. The axes of an input device @@ -24365,7 +24488,7 @@ msgstr "Idioma" msgid "Switch to another group of modes" msgstr "Commuta a un altre grup de modes" -#: ../app/widgets/gimplayertreeview.c:310 +#: ../app/widgets/gimplayertreeview.c:319 msgid "Lock alpha channel" msgstr "Bloqueja el canal alfa" @@ -24625,19 +24748,20 @@ msgstr "En aquest context, l'atribut \"%s\" no és vàlid en l'element <%s>" msgid "Outermost element in text must be not <%s>" msgstr "El primer element del text ha de ser en comptes de <%s>" -#: ../app/widgets/gimptextbuffer.c:1684 +#: ../app/widgets/gimptextbuffer.c:1711 #, c-format msgid "Input file '%s' appears truncated: %s" msgstr "El fitxer d'entrada «%s» sembla truncat: %s" -#: ../app/widgets/gimptextbuffer.c:1702 +#: ../app/widgets/gimptextbuffer.c:1729 #, c-format msgid "Invalid UTF-8 data in file '%s'." msgstr "Hi ha dades UTF-8 no vàlides al fitxer «%s»." -#: ../app/widgets/gimptextbuffer.c:1751 -#, c-format -msgid "Writing palette file '%s' failed: %s" +#: ../app/widgets/gimptextbuffer.c:1778 +#, fuzzy, c-format +#| msgid "Writing palette file '%s' failed: %s" +msgid "Writing text file '%s' failed: %s" msgstr "Ha fallat l'escriptura del fitxer de paleta «%s»: %s" #: ../app/widgets/gimptexteditor.c:220 @@ -25149,7 +25273,7 @@ msgstr "" "S'ha produït un error en escriure el XCF: no s'admet el BPC quan escriviu " "píxel: %d" -#: ../tools/gimp-debug-tool.c:78 +#: ../app-tools/gimp-debug-tool.c:78 msgid "GIMP Crash Debug" msgstr "" @@ -25162,6 +25286,54 @@ msgstr "arrodonit" msgid "fuzzy" msgstr "difús" +#~ msgctxt "layers-action" +#~ msgid "Source Over" +#~ msgstr "Origen per sobre" + +#~ msgctxt "layers-action" +#~ msgid "Layer Composite Mode: Source Over" +#~ msgstr "Mode composició de capa: font superior" + +#~ msgctxt "layers-action" +#~ msgid "Source Atop" +#~ msgstr "Origen a dalt" + +#~ msgctxt "layers-action" +#~ msgid "Layer Composite Mode: Source Atop" +#~ msgstr "Mode composició de la capa: font a la part superior" + +#~ msgctxt "layers-action" +#~ msgid "Source In" +#~ msgstr "Origen dins" + +#~ msgctxt "layers-action" +#~ msgid "Layer Composite Mode: Source In" +#~ msgstr "Mode composició de capa: origen dins" + +#~ msgctxt "layers-action" +#~ msgid "Destination Atop" +#~ msgstr "Destinació a dalt" + +#~ msgctxt "layers-action" +#~ msgid "Layer Composite Mode: Destination Atop" +#~ msgstr "Mode composició de la capa: destinació a la part superior" + +#~ msgctxt "layer-composite-mode" +#~ msgid "Source over" +#~ msgstr "Origen per sobre" + +#~ msgctxt "layer-composite-mode" +#~ msgid "Source atop" +#~ msgstr "Origen a dalt" + +#~ msgctxt "layer-composite-mode" +#~ msgid "Destination atop" +#~ msgstr "Destinació a dalt" + +#~ msgctxt "layer-composite-mode" +#~ msgid "Source in" +#~ msgstr "Origen dins" + #~ msgid "Transformation Matrix" #~ msgstr "Matriu de transformació" diff --git a/po/eu.po b/po/eu.po index 340deb27e3..2825aaa23a 100644 --- a/po/eu.po +++ b/po/eu.po @@ -92,7 +92,7 @@ msgstr "Irudi-editorea" #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! #: ../desktop/gimp.desktop.in.in.h:5 msgid "GIMP;graphic;design;illustration;painting;" -msgstr "GIMP;irudia;diseinua;ilustrazioa;margotzea" +msgstr "GIMP;irudia;diseinua;ilustrazioa;margotzea;" #: ../app/about.h:23 msgid "GIMP" diff --git a/po/fr.po b/po/fr.po index b2258d6a1b..80a9104ff3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -16,16 +16,16 @@ # Robert-André Mauchin , 2008. # Claude Paroz , 2009-2011, 2018. # Alexandre Franke, , 2012. -# Julien Hardelin , 2004, 2009-2012, 2013, 2014, 2016, 2017, 2018. +# Julien Hardelin , 2004, 2009-2018. # msgid "" msgstr "" "Project-Id-Version: The GIMP HEAD\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=Internationalisation\n" -"POT-Creation-Date: 2018-01-14 20:04+0000\n" -"PO-Revision-Date: 2018-01-15 15:21+0100\n" -"Last-Translator: Julien Hardelin \n" +"POT-Creation-Date: 2018-04-02 23:48+0000\n" +"PO-Revision-Date: 2018-04-03 11:46+0200\n" +"Last-Translator: julien \n" "Language-Team: GNOME French Team \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -86,6 +86,132 @@ msgstr "Peinture dans GIMP" msgid "Photo editing in GIMP" msgstr "Retouche photo dans GIMP" +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:8 +msgid "" +"GIMP 2.10.0-RC1 is the first release candidate before GIMP 2.10.0 stable " +"release, with a focus on debugging and stability. Other than the many bug " +"fixes, most notable improvements are:" +msgstr "" +"GIMP 2.10.0-RC1 est la première version candidate avant la version 2.10.0 " +"stable, visant particulièrement la résolution de bogues et la stabilité. En " +"dehors des nombreux bogue réglés, les améliorations les plus importantes " +"sont :" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:9 +msgid "New dashboard dockable to monitor GIMP resource usage" +msgstr "" +"Un nouveau tableau de bord ancrable pour surveiller l’utilisation des " +"ressources par GIMP" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:10 +msgid "" +"New debug dialog to produce back traces and other debug data, encouraging to " +"report bugs" +msgstr "" +"Une nouvelle boîte de dialogue de débogage pour présenter des traces et " +"autres données de débogage, encourageant les signalements de bogues" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:11 +msgid "Unsaved images can now be recovered after a crash" +msgstr "" +"Les images non enregistrées peuvent maintenant être récupérées après un " +"plantage" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:12 +msgid "Layer masks on layer groups" +msgstr "Des masques de calque sur les groupes de calques" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:13 +msgid "JPEG 2000 support improved for high bit depth and various color spaces" +msgstr "" +"Gestion du JPEG 2000 amélioré pour une grande profondeur de bits et divers " +"espaces de couleurs" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:14 +msgid "Screenshot and color picking improved on various platforms" +msgstr "" +"Capture d’écran et prélèvement de couleur amélioré sur diverses plateformes" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:15 +msgid "Metadata defaults preferences now available" +msgstr "" +"Des préférences par défaut concernant les métadonnées sont maintenant " +"disponibles" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:16 +msgid "Various GUI polishing" +msgstr "Diverses améliorations de l’interface utilisateur" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:17 +msgid "" +"For more information, see https://www.gimp.org/news/2018/03/23/gimp-2-10-rc1-" +"released/" +msgstr "" +"Pour plus d’informations, reportez-vous à https://www.gimp.org/" +"news/2018/03/23/gimp-2-10-rc1-released/" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:18 +msgid "" +"GIMP 2.9.8 introduces on-canvas gradient editing and various enhancements " +"while focusing on bugfixing and stability." +msgstr "" +"GIMP 2.9.8 introduit la possibilité de modifier un dégradé directement sur " +"le canevas et diverses améliorations orientées vers la résolution de bogues " +"et la stabilité." + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:19 +msgid "On-canvas gradient editing" +msgstr "Modification de dégradé directement sur le canevas" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:20 +msgid "Notification when an image is over/underexposed" +msgstr "Notification émise quand une image est sur- ou sous-exposée" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:21 +msgid "Better and faster color management" +msgstr "Gestion des couleurs meilleure et plus rapide" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:22 +msgid "Support for color picker and screenshots in Wayland on KDE Plasma" +msgstr "" +"Gestion de la pipette à couleurs et des captures d’écran pour KDE/Wayland" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:23 +msgid "Paste in place feature" +msgstr "Fonctionnalité coller en place" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:24 +msgid "Many usability improvements" +msgstr "Nombreuses améliorations d’usage" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:25 +msgid "Manual can be displayed in the user's preferred language" +msgstr "Le manuel peut être affiché dans la langue préférée de l’utilisateur" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:26 +msgid "Improvements for the Wavelet Decompose filter" +msgstr "Améliorations du filtre Décomposition en ondelettes" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:27 +msgid "Improved compatibility with Photoshop .psd files" +msgstr "Amélioration de la compatibilité avec les fichiers .psd Photoshop" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:28 +msgid "New support for password-protected PDF" +msgstr "Nouvelle gestion des PDF protégés par mot de passe" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:29 +msgid "New support for HGT format (Digital Elevation Model data)" +msgstr "Nouvelle gestion du format HGT (données Digital Elevation Model)" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:30 +msgid "" +"For more information, see https://www.gimp.org/news/2017/12/12/gimp-2-9-8-" +"released/" +msgstr "" +"Pour plus d’informations, reportez-vous à https://www.gimp.org/" +"news/2017/12/12/gimp-2-9-8-released/" + #: ../desktop/gimp-data-extras.metainfo.xml.in.h:1 msgid "Extra files for GIMP" msgstr "Fichiers en supplément pour GIMP" @@ -150,111 +276,125 @@ msgstr "" "Vous devriez avoir reçu une copie de la Licence Publique Générale GNU avec " "GIMP. Sinon, consultez http://www.gnu.org/licenses/" -#: ../app/main.c:160 +#: ../app/gimp-version.c:66 ../app/gimp-version.c:164 +#, c-format +msgid "using %s version %s (compiled against version %s)" +msgstr "utilisation de %s version %s (compilé avec la version %s)" + +#: ../app/gimp-version.c:192 +#, c-format +msgid "%s version %s" +msgstr "%s version %s" + +#: ../app/main.c:157 msgid "Show version information and exit" msgstr "Afficher l’information de version et quitter" -#: ../app/main.c:165 +#: ../app/main.c:162 msgid "Show license information and exit" msgstr "Afficher l’information de licence et quitter" -#: ../app/main.c:170 +#: ../app/main.c:167 msgid "Be more verbose" msgstr "Être plus bavard" -#: ../app/main.c:175 +#: ../app/main.c:172 msgid "Start a new GIMP instance" msgstr "Démarrer une nouvelle instance de GIMP" -#: ../app/main.c:180 +#: ../app/main.c:177 msgid "Open images as new" msgstr "Ouvrir en tant que nouvelles images" -#: ../app/main.c:185 +#: ../app/main.c:182 msgid "Run without a user interface" msgstr "Lancer sans interface utilisateur" -#: ../app/main.c:190 +#: ../app/main.c:187 msgid "Do not load brushes, gradients, patterns, ..." msgstr "Ne pas charger les brosses, dégradés, palettes, motifs…" -#: ../app/main.c:195 +#: ../app/main.c:192 msgid "Do not load any fonts" msgstr "Ne charger aucune police" -#: ../app/main.c:200 +#: ../app/main.c:197 msgid "Do not show a splash screen" msgstr "Ne pas afficher d’écran de démarrage" -#: ../app/main.c:205 +#: ../app/main.c:202 msgid "Do not use shared memory between GIMP and plug-ins" msgstr "Ne pas utiliser la mémoire partagée entre GIMP et ses greffons" -#: ../app/main.c:210 +#: ../app/main.c:207 msgid "Do not use special CPU acceleration functions" msgstr "Ne pas utiliser les accélérations propres aux CPU" -#: ../app/main.c:215 +#: ../app/main.c:212 msgid "Use an alternate sessionrc file" msgstr "Utiliser un autre fichier sessionrc" -#: ../app/main.c:220 +#: ../app/main.c:217 msgid "Use an alternate user gimprc file" msgstr "Utiliser un autre fichier utilisateur gimprc" -#: ../app/main.c:225 +#: ../app/main.c:222 msgid "Use an alternate system gimprc file" msgstr "Utiliser un autre fichier système gimprc" -#: ../app/main.c:230 +#: ../app/main.c:227 msgid "Batch command to run (can be used multiple times)" msgstr "Commande batch à lancer (peut être utilisé plusieurs fois)" -#: ../app/main.c:235 +#: ../app/main.c:232 msgid "The procedure to process batch commands with" msgstr "La procédure pour exécuter les commandes batch" -#: ../app/main.c:240 +#: ../app/main.c:237 msgid "Send messages to console instead of using a dialog" msgstr "" "Envoyer les messages dans la console au lieu d’utiliser une boîte de dialogue" #. don't translate the mode names (off|on|warn) -#: ../app/main.c:246 +#: ../app/main.c:243 msgid "PDB compatibility mode (off|on|warn)" msgstr "Mode compatibilité PDB (off|on|warn)" #. don't translate the mode names (never|query|always) -#: ../app/main.c:252 +#: ../app/main.c:249 msgid "Debug in case of a crash (never|query|always)" msgstr "Débogage en cas d’arrêt brutal (never|query|always)" -#: ../app/main.c:257 +#: ../app/main.c:254 msgid "Enable non-fatal debugging signal handlers" msgstr "Activer le débogage pour les signaux non fatals" -#: ../app/main.c:262 +#: ../app/main.c:259 msgid "Make all warnings fatal" msgstr "Rendre tous les signaux fatals" -#: ../app/main.c:267 +#: ../app/main.c:264 msgid "Output a gimprc file with default settings" msgstr "Créer un fichier gimprc avec les paramètres par défaut" -#: ../app/main.c:283 +#: ../app/main.c:280 msgid "Output a sorted list of deprecated procedures in the PDB" msgstr "Créer une liste triée des procédures invalidées de la BDP" -#: ../app/main.c:288 +#: ../app/main.c:285 msgid "Show a preferences page with experimental features" msgstr "" "Afficher une page de préférences avec des caractéristique expérimentales" -#: ../app/main.c:491 +#: ../app/main.c:290 +msgid "Show an image submenu with debug actions" +msgstr "Afficher un sous-menu d’image avec des actions de débogage" + +#: ../app/main.c:466 msgid "[FILE|URI...]" msgstr "[FICHIER|URI…]" -#: ../app/main.c:509 +#: ../app/main.c:484 msgid "" "GIMP could not initialize the graphical user interface.\n" "Make sure a proper setup for your display environment exists." @@ -263,21 +403,21 @@ msgstr "" "Assurez-vous qu’une configuration adaptée à l’environnement d’affichage " "existe." -#: ../app/main.c:528 +#: ../app/main.c:503 msgid "Another GIMP instance is already running." msgstr "Une autre instance de GIMP est déjà lancée." -#: ../app/main.c:616 +#: ../app/main.c:594 msgid "GIMP output. Type any character to close this window." msgstr "" "Sortie GIMP. Saisissez n’importe quel caractère pour fermer cette fenêtre." -#: ../app/main.c:617 +#: ../app/main.c:595 #, c-format msgid "(Type any character to close this window)\n" msgstr "(saisissez n’importe quel caractère pour fermer cette fenêtre)\n" -#: ../app/main.c:634 +#: ../app/main.c:612 msgid "GIMP output. You can minimize this window, but don't close it." msgstr "Sortie GIMP. Vous pouvez réduire cette fenêtre mais ne la fermez pas." @@ -310,39 +450,28 @@ msgstr "" "différent d’UTF-8 et vous ne l’avez pas déclaré auprès de GLib. Définissez " "la valeur de la variable d’environnement G_FILENAME_ENCODING." -#. show versions of libraries used by GIMP -#: ../app/version.c:63 ../app/version.c:130 -#, c-format -msgid "using %s version %s (compiled against version %s)" -msgstr "utilisation de %s version %s (compilé avec la version %s)" - -#: ../app/version.c:138 -#, c-format -msgid "%s version %s" -msgstr "%s version %s" - -#: ../app/actions/actions.c:111 ../app/dialogs/dialogs.c:418 +#: ../app/actions/actions.c:111 ../app/dialogs/dialogs.c:420 #: ../app/widgets/gimpbrusheditor.c:89 msgid "Brush Editor" msgstr "Éditeur de brosses" #. initialize the list of gimp brushes #: ../app/actions/actions.c:114 ../app/core/gimp-data-factories.c:317 -#: ../app/dialogs/dialogs.c:333 ../app/dialogs/preferences-dialog.c:3012 +#: ../app/dialogs/dialogs.c:335 ../app/dialogs/preferences-dialog.c:3092 msgid "Brushes" msgstr "Brosses" -#: ../app/actions/actions.c:117 ../app/dialogs/dialogs.c:354 +#: ../app/actions/actions.c:117 ../app/dialogs/dialogs.c:356 msgid "Buffers" msgstr "Presse-papiers" -#: ../app/actions/actions.c:120 ../app/dialogs/dialogs.c:372 +#: ../app/actions/actions.c:120 ../app/dialogs/dialogs.c:374 #: ../app/widgets/gimppickablepopup.c:249 msgid "Channels" msgstr "Canaux" #: ../app/actions/actions.c:123 ../app/dialogs/convert-indexed-dialog.c:174 -#: ../app/dialogs/dialogs.c:380 +#: ../app/dialogs/dialogs.c:382 msgid "Colormap" msgstr "Palette" @@ -350,11 +479,11 @@ msgstr "Palette" msgid "Context" msgstr "Contexte" -#: ../app/actions/actions.c:129 ../app/dialogs/dialogs.c:320 +#: ../app/actions/actions.c:129 ../app/dialogs/dialogs.c:322 msgid "Pointer Information" msgstr "Information de pointeur" -#: ../app/actions/actions.c:132 ../app/dialogs/dialogs.c:324 +#: ../app/actions/actions.c:132 ../app/dialogs/dialogs.c:326 msgid "Dashboard" msgstr "Tableau de bord" @@ -375,8 +504,8 @@ msgid "Dockable" msgstr "Ancrable" #. Document History -#: ../app/actions/actions.c:147 ../app/dialogs/dialogs.c:360 -#: ../app/dialogs/preferences-dialog.c:1196 +#: ../app/actions/actions.c:147 ../app/dialogs/dialogs.c:362 +#: ../app/dialogs/preferences-dialog.c:1201 msgid "Document History" msgstr "Historique des documents" @@ -384,11 +513,11 @@ msgstr "Historique des documents" msgid "Drawable" msgstr "Objet graphique" -#: ../app/actions/actions.c:153 ../app/dialogs/dialogs.c:336 +#: ../app/actions/actions.c:153 ../app/dialogs/dialogs.c:338 msgid "Paint Dynamics" msgstr "Dynamique de la brosse" -#: ../app/actions/actions.c:156 ../app/dialogs/dialogs.c:422 +#: ../app/actions/actions.c:156 ../app/dialogs/dialogs.c:424 #: ../app/widgets/gimpdynamicseditor.c:97 msgid "Paint Dynamics Editor" msgstr "Éditeur de dynamique de brosse" @@ -397,7 +526,7 @@ msgstr "Éditeur de dynamique de brosse" msgid "Edit" msgstr "Édition" -#: ../app/actions/actions.c:162 ../app/dialogs/dialogs.c:316 +#: ../app/actions/actions.c:162 ../app/dialogs/dialogs.c:318 msgid "Error Console" msgstr "Console d’erreurs" @@ -409,28 +538,28 @@ msgstr "Fichier" msgid "Filters" msgstr "Filtres" -#: ../app/actions/actions.c:171 ../app/dialogs/dialogs.c:351 -#: ../app/dialogs/preferences-dialog.c:3032 +#: ../app/actions/actions.c:171 ../app/dialogs/dialogs.c:353 +#: ../app/dialogs/preferences-dialog.c:3112 msgid "Fonts" msgstr "Polices" -#: ../app/actions/actions.c:174 ../app/dialogs/dialogs.c:426 +#: ../app/actions/actions.c:174 ../app/dialogs/dialogs.c:428 #: ../app/widgets/gimpgradienteditor.c:271 msgid "Gradient Editor" msgstr "Éditeur de dégradés" #. initialize the list of gimp gradients #: ../app/actions/actions.c:177 ../app/core/gimp-data-factories.c:342 -#: ../app/dialogs/dialogs.c:345 ../app/dialogs/preferences-dialog.c:3028 +#: ../app/dialogs/dialogs.c:347 ../app/dialogs/preferences-dialog.c:3108 msgid "Gradients" msgstr "Dégradés" #: ../app/actions/actions.c:180 ../app/core/gimp-data-factories.c:353 -#: ../app/dialogs/dialogs.c:357 ../app/dialogs/preferences-dialog.c:3036 +#: ../app/dialogs/dialogs.c:359 ../app/dialogs/preferences-dialog.c:3116 msgid "Tool Presets" msgstr "Préréglages d’outils" -#: ../app/actions/actions.c:183 ../app/dialogs/dialogs.c:434 +#: ../app/actions/actions.c:183 ../app/dialogs/dialogs.c:436 #: ../app/widgets/gimptoolpreseteditor.c:94 msgid "Tool Preset Editor" msgstr "Éditeur de préréglages d’outils" @@ -443,50 +572,50 @@ msgstr "Aide" msgid "Image" msgstr "Image" -#: ../app/actions/actions.c:192 ../app/dialogs/dialogs.c:330 +#: ../app/actions/actions.c:192 ../app/dialogs/dialogs.c:332 #: ../app/widgets/gimppickablepopup.c:179 msgid "Images" msgstr "Images" -#: ../app/actions/actions.c:195 ../app/dialogs/dialogs.c:368 +#: ../app/actions/actions.c:195 ../app/dialogs/dialogs.c:370 #: ../app/dialogs/resize-dialog.c:144 ../app/widgets/gimppickablepopup.c:230 msgid "Layers" msgstr "Calques" #. initialize the list of mypaint brushes #: ../app/actions/actions.c:198 ../app/core/gimp-data-factories.c:327 -#: ../app/dialogs/dialogs.c:339 ../app/dialogs/preferences-dialog.c:3040 +#: ../app/dialogs/dialogs.c:341 ../app/dialogs/preferences-dialog.c:3120 msgid "MyPaint Brushes" msgstr "Brosses MyPaint" -#: ../app/actions/actions.c:201 ../app/dialogs/dialogs.c:430 +#: ../app/actions/actions.c:201 ../app/dialogs/dialogs.c:432 #: ../app/widgets/gimppaletteeditor.c:149 msgid "Palette Editor" msgstr "Éditeur de palette" #. initialize the list of gimp palettes #: ../app/actions/actions.c:204 ../app/core/gimp-data-factories.c:337 -#: ../app/dialogs/dialogs.c:348 ../app/dialogs/preferences-dialog.c:3024 +#: ../app/dialogs/dialogs.c:350 ../app/dialogs/preferences-dialog.c:3104 msgid "Palettes" msgstr "Palettes" #. initialize the list of gimp patterns #: ../app/actions/actions.c:207 ../app/core/gimp-data-factories.c:332 -#: ../app/dialogs/dialogs.c:342 ../app/dialogs/preferences-dialog.c:3020 +#: ../app/dialogs/dialogs.c:344 ../app/dialogs/preferences-dialog.c:3100 msgid "Patterns" msgstr "Motifs" -#: ../app/actions/actions.c:210 ../app/dialogs/preferences-dialog.c:3044 +#: ../app/actions/actions.c:210 ../app/dialogs/preferences-dialog.c:3124 msgid "Plug-ins" msgstr "Greffons" #. Quick Mask Color -#: ../app/actions/actions.c:213 ../app/core/gimpchannel.c:408 -#: ../app/dialogs/preferences-dialog.c:1620 +#: ../app/actions/actions.c:213 ../app/core/gimpchannel.c:383 +#: ../app/dialogs/preferences-dialog.c:1684 msgid "Quick Mask" msgstr "Masque rapide" -#: ../app/actions/actions.c:216 ../app/dialogs/dialogs.c:400 +#: ../app/actions/actions.c:216 ../app/dialogs/dialogs.c:402 msgid "Sample Points" msgstr "Points d’échantillonnage" @@ -495,8 +624,8 @@ msgid "Select" msgstr "Sélection" #. initialize the template list -#: ../app/actions/actions.c:222 ../app/core/gimp.c:795 -#: ../app/dialogs/dialogs.c:363 +#: ../app/actions/actions.c:222 ../app/core/gimp.c:797 +#: ../app/dialogs/dialogs.c:365 msgid "Templates" msgstr "Modèles" @@ -508,8 +637,8 @@ msgstr "Outil Texte" msgid "Text Editor" msgstr "Éditeur de texte" -#: ../app/actions/actions.c:231 ../app/dialogs/dialogs.c:308 -#: ../app/gui/gui.c:499 +#: ../app/actions/actions.c:231 ../app/dialogs/dialogs.c:310 +#: ../app/gui/gui.c:550 msgid "Tool Options" msgstr "Options de l’outil" @@ -517,7 +646,7 @@ msgstr "Options de l’outil" msgid "Tools" msgstr "Outils" -#: ../app/actions/actions.c:237 ../app/dialogs/dialogs.c:376 +#: ../app/actions/actions.c:237 ../app/dialogs/dialogs.c:378 #: ../app/tools/gimpvectortool.c:163 msgid "Paths" msgstr "Chemins" @@ -898,12 +1027,12 @@ msgstr "Marque de couleur du canal : mettre en orange" #: ../app/actions/channels-actions.c:170 msgctxt "channels-action" msgid "Brown" -msgstr "Marrron" +msgstr "Marron" #: ../app/actions/channels-actions.c:171 msgctxt "channels-action" msgid "Channel Color Tag: Set to Brown" -msgstr "Marque de couleurdu canal : mettre en marron" +msgstr "Marque de couleur du canal : mettre en marron" #: ../app/actions/channels-actions.c:176 msgctxt "channels-action" @@ -1016,7 +1145,7 @@ msgid "Select the channel below the current channel" msgstr "Sélectionne le canal juste en-dessous du canal actuel" #: ../app/actions/channels-commands.c:111 -#: ../app/actions/channels-commands.c:537 +#: ../app/actions/channels-commands.c:517 msgid "Channel Attributes" msgstr "Attributs du canal" @@ -1034,7 +1163,6 @@ msgid "_Fill opacity:" msgstr "Opacité du _remplissage :" #: ../app/actions/channels-commands.c:156 -#: ../app/actions/channels-commands.c:209 #: ../app/widgets/gimpchanneltreeview.c:327 msgid "New Channel" msgstr "Nouveau canal" @@ -1047,10 +1175,10 @@ msgstr "Créer un nouveau canal" msgid "New Channel Color" msgstr "Nouveau canal de couleur" -#: ../app/actions/channels-commands.c:294 ../app/core/gimpimage-new.c:278 +#: ../app/actions/channels-commands.c:274 ../app/core/gimpimage-new.c:278 #: ../app/display/gimpdisplayshell-dnd.c:670 #: ../app/widgets/gimpchanneltreeview.c:258 -#: ../app/widgets/gimplayertreeview.c:784 +#: ../app/widgets/gimplayertreeview.c:805 #, c-format msgid "%s Channel Copy" msgstr "Copie du canal %s" @@ -2364,82 +2492,87 @@ msgstr "Menu du tableau de bord" #: ../app/actions/dashboard-actions.c:44 msgctxt "dashboard-action" +msgid "Groups" +msgstr "Groupes" + +#: ../app/actions/dashboard-actions.c:46 +msgctxt "dashboard-action" msgid "Update Interval" msgstr "Intervalle de mise à jour" -#: ../app/actions/dashboard-actions.c:46 +#: ../app/actions/dashboard-actions.c:48 msgctxt "dashboard-action" msgid "History Duration" msgstr "Durée de l’historique" -#: ../app/actions/dashboard-actions.c:49 +#: ../app/actions/dashboard-actions.c:51 msgctxt "dashboard-action" msgid "Reset" msgstr "Réinitialiser" -#: ../app/actions/dashboard-actions.c:50 +#: ../app/actions/dashboard-actions.c:52 msgctxt "dashboard-action" msgid "Reset cumulative data" msgstr "Réinitialise les données cumulées" -#: ../app/actions/dashboard-actions.c:58 +#: ../app/actions/dashboard-actions.c:60 msgctxt "dashboard-action" msgid "Low Swap Space Warning" msgstr "Avertissement d’espace d’échange bas" -#: ../app/actions/dashboard-actions.c:59 +#: ../app/actions/dashboard-actions.c:61 msgctxt "dashboard-action" msgid "Raise the dashboard when the swap size approaches its limit" msgstr "" "Fait apparaître le tableau de bord quand la taille de l’espace d’échange " "approche de sa limite" -#: ../app/actions/dashboard-actions.c:69 +#: ../app/actions/dashboard-actions.c:71 msgctxt "dashboard-update-interval" msgid "0.25 Seconds" msgstr "0,25 seconde" -#: ../app/actions/dashboard-actions.c:74 +#: ../app/actions/dashboard-actions.c:76 msgctxt "dashboard-update-interval" msgid "0.5 Seconds" msgstr "0,5 seconde" -#: ../app/actions/dashboard-actions.c:79 +#: ../app/actions/dashboard-actions.c:81 msgctxt "dashboard-update-interval" msgid "1 Second" msgstr "1 seconde" -#: ../app/actions/dashboard-actions.c:84 +#: ../app/actions/dashboard-actions.c:86 msgctxt "dashboard-update-interval" msgid "2 Seconds" msgstr "2 secondes" -#: ../app/actions/dashboard-actions.c:89 +#: ../app/actions/dashboard-actions.c:91 msgctxt "dashboard-update-interval" msgid "4 Seconds" msgstr "4 secondes" -#: ../app/actions/dashboard-actions.c:97 +#: ../app/actions/dashboard-actions.c:99 msgctxt "dashboard-history-duration" msgid "15 Seconds" msgstr "15 secondes" -#: ../app/actions/dashboard-actions.c:102 +#: ../app/actions/dashboard-actions.c:104 msgctxt "dashboard-history-duration" msgid "30 Seconds" msgstr "30 secondes" -#: ../app/actions/dashboard-actions.c:107 +#: ../app/actions/dashboard-actions.c:109 msgctxt "dashboard-history-duration" msgid "60 Seconds" msgstr "60 secondes" -#: ../app/actions/dashboard-actions.c:112 +#: ../app/actions/dashboard-actions.c:114 msgctxt "dashboard-history-duration" msgid "120 Seconds" msgstr "120 secondes" -#: ../app/actions/dashboard-actions.c:117 +#: ../app/actions/dashboard-actions.c:119 msgctxt "dashboard-history-duration" msgid "240 Seconds" msgstr "240 secondes" @@ -2447,10 +2580,10 @@ msgstr "240 secondes" #: ../app/actions/data-commands.c:90 ../app/actions/documents-commands.c:383 #: ../app/actions/file-commands.c:205 ../app/dialogs/file-open-dialog.c:212 #: ../app/dialogs/file-open-dialog.c:253 -#: ../app/dialogs/file-open-location-dialog.c:218 -#: ../app/dialogs/file-open-location-dialog.c:228 +#: ../app/dialogs/file-open-location-dialog.c:223 +#: ../app/dialogs/file-open-location-dialog.c:239 #: ../app/display/gimpdisplayshell-dnd.c:614 -#: ../app/widgets/gimplayertreeview.c:744 ../app/widgets/gimptoolbox.c:805 +#: ../app/widgets/gimplayertreeview.c:765 ../app/widgets/gimptoolbox.c:805 #: ../app/widgets/gimptoolbox-dnd.c:170 #, c-format msgid "" @@ -2463,7 +2596,7 @@ msgstr "" "%s" #: ../app/actions/data-commands.c:114 ../app/actions/tool-options-commands.c:74 -#: ../app/core/gimpbrushgenerated-load.c:120 ../app/core/gimpimage.c:1966 +#: ../app/core/gimpbrushgenerated-load.c:120 ../app/core/gimpimage.c:1964 #: ../app/core/gimppalette.c:461 ../app/core/gimppalette-import.c:211 #: ../app/core/gimppalette-load.c:186 #: ../app/dialogs/palette-import-dialog.c:778 ../app/widgets/gimpdnd-xds.c:89 @@ -2877,8 +3010,8 @@ msgid "Search commands by keyword, and run them" msgstr "Recherche les commandes par mots-clés et les exécute" #: ../app/actions/dialogs-actions.c:357 -#: ../app/dialogs/preferences-dialog.c:1958 -#: ../app/dialogs/preferences-dialog.c:1959 ../app/widgets/gimptoolbox.c:529 +#: ../app/dialogs/preferences-dialog.c:2022 +#: ../app/dialogs/preferences-dialog.c:2023 ../app/widgets/gimptoolbox.c:529 msgid "Toolbox" msgstr "Boîte à outils" @@ -3194,9 +3327,9 @@ msgstr "Vider l’historique des documents" #: ../app/dialogs/layer-add-mask-dialog.c:110 #: ../app/dialogs/offset-dialog.c:136 #: ../app/dialogs/palette-import-dialog.c:162 -#: ../app/dialogs/preferences-dialog.c:286 -#: ../app/dialogs/preferences-dialog.c:632 -#: ../app/dialogs/preferences-dialog.c:1095 +#: ../app/dialogs/preferences-dialog.c:287 +#: ../app/dialogs/preferences-dialog.c:637 +#: ../app/dialogs/preferences-dialog.c:1100 #: ../app/dialogs/print-size-dialog.c:124 ../app/dialogs/quit-dialog.c:171 #: ../app/dialogs/resize-dialog.c:186 #: ../app/dialogs/resolution-calibrate-dialog.c:76 @@ -3209,8 +3342,8 @@ msgstr "Vider l’historique des documents" #: ../app/display/gimpdisplayshell-rotate-dialog.c:122 #: ../app/display/gimpdisplayshell-scale-dialog.c:122 #: ../app/tools/gimpfiltertool.c:321 -#: ../app/tools/gimpforegroundselecttool.c:307 ../app/tools/gimptexttool.c:1581 -#: ../app/tools/gimptransformtool.c:1173 ../app/widgets/gimpactionview.c:669 +#: ../app/tools/gimpforegroundselecttool.c:307 ../app/tools/gimptexttool.c:1591 +#: ../app/tools/gimptransformtool.c:1201 ../app/widgets/gimpactionview.c:669 #: ../app/widgets/gimpcolordialog.c:110 #: ../app/widgets/gimpcontrollereditor.c:660 #: ../app/widgets/gimpcontrollerlist.c:564 @@ -3222,7 +3355,7 @@ msgid "_Cancel" msgstr "_Annuler" #: ../app/actions/documents-commands.c:231 ../app/actions/edit-commands.c:161 -#: ../app/dialogs/preferences-dialog.c:633 +#: ../app/dialogs/preferences-dialog.c:638 msgid "Cl_ear" msgstr "_Effacer" @@ -3800,7 +3933,7 @@ msgstr "Copier (nommé)" msgid "Copy Visible Named " msgstr "Copier visible (nommé)" -#: ../app/actions/edit-commands.c:569 ../app/display/gimpdisplayshell-dnd.c:479 +#: ../app/actions/edit-commands.c:571 ../app/display/gimpdisplayshell-dnd.c:479 msgid "Pasted as new layer because the target is a layer group." msgstr "Collé comme nouveau calque car la cible est un groupe de calques." @@ -4900,21 +5033,21 @@ msgctxt "filters-action" msgid "Show the last used filter dialog again" msgstr "Afficher à nouveau la boîte de dialogue du dernier greffon utilisé" -#: ../app/actions/filters-actions.c:1036 +#: ../app/actions/filters-actions.c:1037 #, c-format msgid "Re_peat \"%s\"" msgstr "Ré_péter « %s »" -#: ../app/actions/filters-actions.c:1037 +#: ../app/actions/filters-actions.c:1038 #, c-format msgid "R_e-Show \"%s\"" msgstr "R_éafficher « %s »" -#: ../app/actions/filters-actions.c:1075 +#: ../app/actions/filters-actions.c:1076 msgid "Repeat Last" msgstr "Répéter le dernier" -#: ../app/actions/filters-actions.c:1077 +#: ../app/actions/filters-actions.c:1078 msgid "Re-Show Last" msgstr "Réafficher le dernier" @@ -4933,7 +5066,7 @@ msgctxt "fonts-action" msgid "Rescan the installed fonts" msgstr "Recharger les polices installées" -#: ../app/actions/gimpgeglprocedure.c:320 +#: ../app/actions/gimpgeglprocedure.c:323 #, c-format msgid "There are no last settings for '%s', showing the filter dialog instead." msgstr "" @@ -5493,7 +5626,7 @@ msgstr "_Nouvelle image…" #: ../app/actions/image-actions.c:77 msgctxt "image-action" msgid "Create a new image" -msgstr "Créer une nouvelle image" +msgstr "Crée une nouvelle image" #: ../app/actions/image-actions.c:82 msgctxt "image-action" @@ -5503,7 +5636,7 @@ msgstr "_Dupliquer" #: ../app/actions/image-actions.c:83 msgctxt "image-action" msgid "Create a duplicate of this image" -msgstr "Créer une copie de cette image" +msgstr "Crée une copie de cette image" #: ../app/actions/image-actions.c:88 msgctxt "image-action" @@ -5523,7 +5656,7 @@ msgstr "Convertir au profil colorimétrique…" #: ../app/actions/image-actions.c:95 msgctxt "image-action" msgid "Apply a color profile to the image" -msgstr "Appliquer un profil de couleur à l’image" +msgstr "Applique un profil de couleur à l’image" #: ../app/actions/image-actions.c:100 msgctxt "image-action" @@ -5533,7 +5666,7 @@ msgstr "_Rejeter le profil de couleur" #: ../app/actions/image-actions.c:101 msgctxt "image-action" msgid "Remove the image's color profile" -msgstr "Supprimer le profil de couleur de l’image" +msgstr "Supprime le profil de couleur de l’image" #: ../app/actions/image-actions.c:106 msgctxt "image-action" @@ -5543,7 +5676,7 @@ msgstr "_Enregistrer le profil de couleur dans un fichier…" #: ../app/actions/image-actions.c:107 msgctxt "image-action" msgid "Save the image's color profile to an ICC file" -msgstr "Enregistrer le profil de couleur de l’image dans un fichier ICC" +msgstr "Enregistre le profil de couleur de l’image dans un fichier ICC" #: ../app/actions/image-actions.c:112 msgctxt "image-action" @@ -5553,7 +5686,7 @@ msgstr "Taille du _canevas…" #: ../app/actions/image-actions.c:113 msgctxt "image-action" msgid "Adjust the image dimensions" -msgstr "Ajuster les dimensions de l’image" +msgstr "Ajuste les dimensions de l’image" #: ../app/actions/image-actions.c:118 msgctxt "image-action" @@ -5563,7 +5696,7 @@ msgstr "A_juster le canevas aux calques" #: ../app/actions/image-actions.c:119 msgctxt "image-action" msgid "Resize the image to enclose all layers" -msgstr "Redimensionner l’image pour inclure tous les calques" +msgstr "Redimensionne l’image pour inclure tous les calques" #: ../app/actions/image-actions.c:124 msgctxt "image-action" @@ -5573,7 +5706,7 @@ msgstr "A_juster le canevas à la sélection" #: ../app/actions/image-actions.c:125 msgctxt "image-action" msgid "Resize the image to the extents of the selection" -msgstr "Redimensionner l’image à l’étendue de la sélection" +msgstr "Redimensionne l’image à l’étendue de la sélection" #: ../app/actions/image-actions.c:130 msgctxt "image-action" @@ -5583,7 +5716,7 @@ msgstr "Taille de l’_impression…" #: ../app/actions/image-actions.c:131 msgctxt "image-action" msgid "Adjust the print resolution" -msgstr "Ajuster la définition d’impression" +msgstr "Ajuste la définition d’impression" #: ../app/actions/image-actions.c:136 msgctxt "image-action" @@ -5593,7 +5726,7 @@ msgstr "_Échelle et taille de l’image…" #: ../app/actions/image-actions.c:137 msgctxt "image-action" msgid "Change the size of the image content" -msgstr "Modifier la taille du contenu de l’image" +msgstr "Modifie la taille du contenu de l’image" #: ../app/actions/image-actions.c:142 msgctxt "image-action" @@ -5603,7 +5736,7 @@ msgstr "_Rogner selon la sélection" #: ../app/actions/image-actions.c:143 msgctxt "image-action" msgid "Crop the image to the extents of the selection" -msgstr "Rogner l’image suivant le contour de la sélection" +msgstr "Rogne l’image suivant le contour de la sélection" #: ../app/actions/image-actions.c:148 msgctxt "image-action" @@ -5627,7 +5760,7 @@ msgstr "Fusionner les calques _visibles…" #: ../app/actions/image-actions.c:155 msgctxt "image-action" msgid "Merge all visible layers into one layer" -msgstr "Fusionner tous les calques visibles en un seul" +msgstr "Fusionne tous les calques visibles en un seul" #: ../app/actions/image-actions.c:160 msgctxt "image-action" @@ -5637,7 +5770,7 @@ msgstr "Aplatir l’ima_ge" #: ../app/actions/image-actions.c:161 msgctxt "image-action" msgid "Merge all layers into one and remove transparency" -msgstr "Fusionner tous les calques en un seul et supprime la transparence" +msgstr "Fusionne tous les calques en un seul et supprime la transparence" #: ../app/actions/image-actions.c:166 msgctxt "image-action" @@ -5647,7 +5780,7 @@ msgstr "Configurer la g_rille…" #: ../app/actions/image-actions.c:167 msgctxt "image-action" msgid "Configure the grid for this image" -msgstr "Configurer la grille pour cette image" +msgstr "Configure la grille pour cette image" #: ../app/actions/image-actions.c:172 msgctxt "image-action" @@ -5657,7 +5790,7 @@ msgstr "_Propriétés de l’image" #: ../app/actions/image-actions.c:173 msgctxt "image-action" msgid "Display information about this image" -msgstr "Afficher des informations sur cette image" +msgstr "Affiche des informations sur cette image" #: ../app/actions/image-actions.c:181 msgctxt "image-action" @@ -5683,7 +5816,7 @@ msgstr "_RVB" #: ../app/actions/image-actions.c:194 msgctxt "image-convert-action" msgid "Convert the image to the RGB colorspace" -msgstr "Convertir l’image dans l’espace de couleurs RVB" +msgstr "Convertit l’image dans l’espace de couleurs RVB" #: ../app/actions/image-actions.c:198 ../app/actions/image-actions.c:446 msgctxt "image-convert-action" @@ -5693,7 +5826,7 @@ msgstr "Niveaux de _gris" #: ../app/actions/image-actions.c:199 msgctxt "image-convert-action" msgid "Convert the image to grayscale" -msgstr "Convertir l’image en niveaux de gris" +msgstr "Convertit l’image en niveaux de gris" #: ../app/actions/image-actions.c:203 msgctxt "image-convert-action" @@ -5703,7 +5836,7 @@ msgstr "Couleurs _indexées…" #: ../app/actions/image-actions.c:204 msgctxt "image-convert-action" msgid "Convert the image to indexed colors" -msgstr "Convertir l’image en couleurs indexées" +msgstr "Convertit l’image en couleurs indexées" #: ../app/actions/image-actions.c:211 msgctxt "image-convert-action" @@ -5713,7 +5846,7 @@ msgstr "Entier 8 bits" #: ../app/actions/image-actions.c:213 msgctxt "image-convert-action" msgid "Convert the image to 8 bit integer" -msgstr "Convertir l’image en entier 8 bits" +msgstr "Convertit l’image en entier 8 bits" #: ../app/actions/image-actions.c:217 msgctxt "image-convert-action" @@ -5723,7 +5856,7 @@ msgstr "Entier 16 bits" #: ../app/actions/image-actions.c:219 msgctxt "image-convert-action" msgid "Convert the image to 16 bit integer" -msgstr "Convertir l’image en entier 16 bits" +msgstr "Convertit l’image en entier 16 bits" #: ../app/actions/image-actions.c:223 msgctxt "image-convert-action" @@ -5733,7 +5866,7 @@ msgstr "Entier 32 bits" #: ../app/actions/image-actions.c:225 msgctxt "image-convert-action" msgid "Convert the image to 32 bit integer" -msgstr "Convertir l’image en entier 32 bits" +msgstr "Convertit l’image en entier 32 bits" #: ../app/actions/image-actions.c:229 msgctxt "image-convert-action" @@ -5743,7 +5876,7 @@ msgstr "Virgule flottante 16 bits" #: ../app/actions/image-actions.c:231 msgctxt "image-convert-action" msgid "Convert the image to 16 bit floating point" -msgstr "Convertir l’image en virgule flottante 16 bits" +msgstr "Convertit l’image en virgule flottante 16 bits" #: ../app/actions/image-actions.c:235 msgctxt "image-convert-action" @@ -5753,7 +5886,7 @@ msgstr "Virgule flottante 32 bits" #: ../app/actions/image-actions.c:237 msgctxt "image-convert-action" msgid "Convert the image to 32 bit floating point" -msgstr "Convertir l’image en virgule flottante 32 bits" +msgstr "Convertit l’image en virgule flottante 32 bits" #: ../app/actions/image-actions.c:241 msgctxt "image-convert-action" @@ -5763,7 +5896,7 @@ msgstr "Virgule flottante 64 bits" #: ../app/actions/image-actions.c:243 msgctxt "image-convert-action" msgid "Convert the image to 64 bit floating point" -msgstr "Convertir l’image en virgule flottante 64 bits" +msgstr "Convertit l’image en virgule flottante 64 bits" #: ../app/actions/image-actions.c:250 msgctxt "image-convert-action" @@ -5772,8 +5905,8 @@ msgstr "Gamma perceptuel (SRVB)" #: ../app/actions/image-actions.c:252 msgctxt "image-convert-action" -msgid "Convert the image to preceptual (sRGB) gamma" -msgstr "Convertir l’image en gamma perceptuel (sRVB)" +msgid "Convert the image to perceptual (sRGB) gamma" +msgstr "Convertit l’image en gamma perceptuel (sRVB)" #: ../app/actions/image-actions.c:256 msgctxt "image-convert-action" @@ -5783,7 +5916,7 @@ msgstr "Lumière linéaire" #: ../app/actions/image-actions.c:258 msgctxt "image-convert-action" msgid "Convert the image to linear light" -msgstr "Convertir l’image en lumière linéaire" +msgstr "Convertit l’image en lumière linéaire" #: ../app/actions/image-actions.c:265 msgctxt "image-action" @@ -5848,7 +5981,7 @@ msgstr "Niveaux de _gris…" #: ../app/actions/image-commands.c:559 #, c-format msgid "Saving color profile failed: %s" -msgstr "l’enregistrement du profil de couleur a échoué : %s" +msgstr "L’enregistrement du profil de couleur a échoué : %s" #: ../app/actions/image-commands.c:598 msgid "Save Color Profile" @@ -5880,7 +6013,7 @@ msgstr "Retournement" msgid "Rotating" msgstr "Rotation" -#: ../app/actions/image-commands.c:850 ../app/actions/layers-commands.c:802 +#: ../app/actions/image-commands.c:850 ../app/actions/layers-commands.c:779 msgid "Cannot crop because the current selection is empty." msgstr "Impossible de rogner car la sélection actuelle est vide." @@ -5929,8 +6062,8 @@ msgid "Scale Image" msgstr "Échelle et taille de l’image" #. Scaling -#: ../app/actions/image-commands.c:1453 ../app/actions/layers-commands.c:1592 -#: ../app/dialogs/preferences-dialog.c:1542 +#: ../app/actions/image-commands.c:1453 ../app/actions/layers-commands.c:1569 +#: ../app/dialogs/preferences-dialog.c:1606 #: ../app/pdb/drawable-transform-cmds.c:800 #: ../app/pdb/drawable-transform-cmds.c:891 #: ../app/pdb/image-transform-cmds.c:122 ../app/pdb/image-transform-cmds.c:158 @@ -6078,7 +6211,7 @@ msgctxt "layers-action" msgid "Edit the layer's name" msgstr "Modifier le nom du calque" -#: ../app/actions/layers-actions.c:107 ../app/actions/layers-actions.c:912 +#: ../app/actions/layers-actions.c:107 ../app/actions/layers-actions.c:914 msgctxt "layers-action" msgid "_New Layer..." msgstr "_Nouveau calque…" @@ -6088,7 +6221,7 @@ msgctxt "layers-action" msgid "Create a new layer and add it to the image" msgstr "Crée un nouveau calque et l’ajoute à l’image" -#: ../app/actions/layers-actions.c:113 ../app/actions/layers-actions.c:913 +#: ../app/actions/layers-actions.c:113 ../app/actions/layers-actions.c:915 msgctxt "layers-action" msgid "_New Layer" msgstr "_Nouveau calque" @@ -6463,43 +6596,43 @@ msgstr "Mode composite du calque : auto" #: ../app/actions/layers-actions.c:389 msgctxt "layers-action" -msgid "Source Over" -msgstr "Source sur" +msgid "Union" +msgstr "Union" #: ../app/actions/layers-actions.c:390 msgctxt "layers-action" -msgid "Layer Composite Mode: Source Over" -msgstr "Mode composite du calque : source sur (over)" +msgid "Layer Composite Mode: Union" +msgstr "Mode composite du calque : union" #: ../app/actions/layers-actions.c:395 msgctxt "layers-action" -msgid "Source Atop" -msgstr "Source au-dessus" +msgid "Clip to Backdrop" +msgstr "Attacher à la toile de fond" #: ../app/actions/layers-actions.c:396 msgctxt "layers-action" -msgid "Layer Composite Mode: Source Atop" -msgstr "Mode composite du calque : source au-dessus (atop)" +msgid "Layer Composite Mode: Clip to Backdrop" +msgstr "Mode composite du calque : attacher à la toile de fond" #: ../app/actions/layers-actions.c:401 msgctxt "layers-action" -msgid "Source In" -msgstr "Source dans" +msgid "Clip to Layer" +msgstr "Attacher au calque" #: ../app/actions/layers-actions.c:402 msgctxt "layers-action" -msgid "Layer Composite Mode: Source In" -msgstr "Mode composite du calque : source dans (in)" +msgid "Layer Composite Mode: Clip to Layer" +msgstr "Mode composite du calque : attacher au calque" #: ../app/actions/layers-actions.c:407 msgctxt "layers-action" -msgid "Destination Atop" -msgstr "Destination au-dessus" +msgid "Intersection" +msgstr "Intersection" #: ../app/actions/layers-actions.c:408 msgctxt "layers-action" -msgid "Layer Composite Mode: Destination Atop" -msgstr "Mode composite du calque : destination au-dessus (atop)" +msgid "Layer Composite Mode: Intersection" +msgstr "Mode composite du calque : intersection" #: ../app/actions/layers-actions.c:416 msgctxt "layers-action" @@ -6790,12 +6923,12 @@ msgstr "Raccourci : " msgid "-Click on thumbnail in Layers dockable" msgstr "-Cliquer sur la vignette dans le groupe de calques" -#: ../app/actions/layers-actions.c:907 ../app/actions/layers-actions.c:908 +#: ../app/actions/layers-actions.c:909 ../app/actions/layers-actions.c:910 msgctxt "layers-action" msgid "To _New Layer" msgstr "Vers _nouveau calque" -#: ../app/actions/layers-commands.c:259 ../app/actions/layers-commands.c:1441 +#: ../app/actions/layers-commands.c:259 ../app/actions/layers-commands.c:1418 msgid "Layer Attributes" msgstr "Attributs du calque" @@ -6803,9 +6936,9 @@ msgstr "Attributs du calque" msgid "Edit Layer Attributes" msgstr "Modifier les attributs du calque" -#: ../app/actions/layers-commands.c:328 ../app/actions/layers-commands.c:403 +#: ../app/actions/layers-commands.c:328 #: ../app/widgets/gimpdrawabletreeview.c:331 -#: ../app/widgets/gimplayertreeview.c:846 +#: ../app/widgets/gimplayertreeview.c:882 msgid "New Layer" msgstr "Nouveau calque" @@ -6813,31 +6946,31 @@ msgstr "Nouveau calque" msgid "Create a New Layer" msgstr "Créer un nouveau calque" -#: ../app/actions/layers-commands.c:443 ../app/core/gimptoolinfo.c:82 +#: ../app/actions/layers-commands.c:420 ../app/core/gimptoolinfo.c:82 msgid "Visible" msgstr "Visible" -#: ../app/actions/layers-commands.c:708 +#: ../app/actions/layers-commands.c:685 msgid "Set Layer Boundary Size" msgstr "Régler la taille de la bordure du calque" -#: ../app/actions/layers-commands.c:770 +#: ../app/actions/layers-commands.c:747 msgid "Scale Layer" msgstr "Échelle et taille du calque" -#: ../app/actions/layers-commands.c:812 +#: ../app/actions/layers-commands.c:789 msgid "Crop Layer to Selection" msgstr "_Rogner le calque selon la sélection" -#: ../app/actions/layers-commands.c:842 +#: ../app/actions/layers-commands.c:819 msgid "Crop Layer to Content" msgstr "Rogner le calque selon le contenu" -#: ../app/actions/layers-commands.c:855 +#: ../app/actions/layers-commands.c:832 msgid "Cannot crop because the active layer has no content." msgstr "Impossible de rogner car le calque actif est vide." -#: ../app/actions/layers-commands.c:862 +#: ../app/actions/layers-commands.c:839 msgid "Cannot crop because the active layer is already cropped to its content." msgstr "" "Impossible de rogner car le calque actif est déjà rogné jusqu’à son contenu." @@ -7202,12 +7335,12 @@ msgstr "Réinitialiser tous les filtres" #: ../app/actions/plug-in-commands.c:181 #: ../app/actions/tool-options-commands.c:196 ../app/dialogs/fill-dialog.c:114 #: ../app/dialogs/grid-dialog.c:101 ../app/dialogs/image-new-dialog.c:105 -#: ../app/dialogs/preferences-dialog.c:287 -#: ../app/dialogs/preferences-dialog.c:1094 +#: ../app/dialogs/preferences-dialog.c:288 +#: ../app/dialogs/preferences-dialog.c:1099 #: ../app/dialogs/print-size-dialog.c:123 ../app/dialogs/scale-dialog.c:136 #: ../app/dialogs/stroke-dialog.c:127 #: ../app/display/gimpdisplayshell-rotate-dialog.c:121 -#: ../app/tools/gimpfiltertool.c:320 ../app/tools/gimptransformtool.c:1172 +#: ../app/tools/gimpfiltertool.c:320 ../app/tools/gimptransformtool.c:1200 #: ../app/widgets/gimpcolordialog.c:109 msgid "_Reset" msgstr "_Réinitialiser" @@ -7644,7 +7777,7 @@ msgstr "_Ouvrir" #: ../app/core/gimppalette-import.c:510 ../app/plug-in/gimpenvirontable.c:289 #: ../app/plug-in/gimpinterpreterdb.c:233 #: ../app/tools/gimpfiltertool-settings.c:170 -#: ../app/widgets/gimptextbuffer.c:1647 +#: ../app/widgets/gimptextbuffer.c:1674 #, c-format msgid "Could not open '%s' for reading: %s" msgstr "Impossible d’ouvrir « %s » en lecture : %s" @@ -9659,7 +9792,7 @@ msgstr "Déplacer cette fenêtre vers l’écran %s" #: ../app/dialogs/grid-dialog.c:103 ../app/dialogs/image-new-dialog.c:107 #: ../app/dialogs/image-new-dialog.c:326 #: ../app/dialogs/item-options-dialog.c:146 -#: ../app/dialogs/preferences-dialog.c:1096 +#: ../app/dialogs/preferences-dialog.c:1101 #: ../app/dialogs/print-size-dialog.c:125 #: ../app/dialogs/resolution-calibrate-dialog.c:77 #: ../app/dialogs/template-options-dialog.c:119 @@ -9971,11 +10104,11 @@ msgstr "" "défaut seront utilisées. Une sauvegarde de votre configuration a été créée à " "« %s »." -#: ../app/config/gimpdialogconfig.c:307 ../app/core/gimplayer.c:431 +#: ../app/config/gimpdialogconfig.c:307 ../app/core/gimplayer.c:440 msgid "Layer" msgstr "Calque" -#: ../app/config/gimpdialogconfig.c:407 ../app/core/gimpchannel.c:291 +#: ../app/config/gimpdialogconfig.c:407 ../app/core/gimpchannel.c:269 #: ../app/operations/gimpcurvesconfig.c:111 #: ../app/operations/gimplevelsconfig.c:114 #: ../app/operations/gimpoperationthreshold.c:89 @@ -10116,20 +10249,25 @@ msgid "How many recent settings to keep around in filter tools." msgstr "Nombre de réglages récents à conserver dans les outils filtre." #: ../app/config/gimprc-blurbs.h:182 +msgid "Default to the last used settings in filter tools." +msgstr "" +"Prendre par défaut les dernières paramètres utilisés dans les outils filtre." + +#: ../app/config/gimprc-blurbs.h:185 msgid "Show advanced color options in filter tools." msgstr "Afficher les options de couleur avancées dans les outils filtre." -#: ../app/config/gimprc-blurbs.h:185 +#: ../app/config/gimprc-blurbs.h:188 msgid "Sets the text to appear in image window status bars." msgstr "" "Définit le texte apparaissant dans la barre d’état des fenêtres d’image." -#: ../app/config/gimprc-blurbs.h:188 +#: ../app/config/gimprc-blurbs.h:191 msgid "Sets the text to appear in image window titles." msgstr "" "Définit le texte apparaissant dans la barre de titre des fenêtres d’image." -#: ../app/config/gimprc-blurbs.h:191 +#: ../app/config/gimprc-blurbs.h:194 msgid "" "Promote imported images to floating point precision. Does not apply to " "indexed images." @@ -10137,7 +10275,7 @@ msgstr "" "Promouvoir les images importées à la précision en virgule flottante. Ne " "s’applique pas aux images indexées." -#: ../app/config/gimprc-blurbs.h:195 +#: ../app/config/gimprc-blurbs.h:198 msgid "" "When promoting imported images to floating point precision, also add minimal " "noise in order to distribute color values a bit." @@ -10145,27 +10283,33 @@ msgstr "" "Lors du passage d’images importées en virgule flottante, ajouter aussi un " "bruit minimal pour distribuer un peu les valeurs de couleur." -#: ../app/config/gimprc-blurbs.h:199 +#: ../app/config/gimprc-blurbs.h:202 msgid "Add an alpha channel to all layers of imported images." msgstr "Ajouter un canal alpha à tous les calques des images importées." -#: ../app/config/gimprc-blurbs.h:202 +#: ../app/config/gimprc-blurbs.h:205 msgid "Which plug-in to use for importing raw digital camera files." msgstr "Quel greffon utiliser pour l’importation des fichiers photo raw." -#: ../app/config/gimprc-blurbs.h:205 +#: ../app/config/gimprc-blurbs.h:208 msgid "Export Exif metadata by default." msgstr "Exporter les métadonnées Exif par défaut." -#: ../app/config/gimprc-blurbs.h:208 +#: ../app/config/gimprc-blurbs.h:211 msgid "Export XMP metadata by default." msgstr "Exporter les métadonnées XMP par défaut." -#: ../app/config/gimprc-blurbs.h:211 +#: ../app/config/gimprc-blurbs.h:214 msgid "Export IPTC metadata by default." msgstr "Exporter les métadonnées IPTC par défaut." -#: ../app/config/gimprc-blurbs.h:214 +#: ../app/config/gimprc-blurbs.h:217 +msgid "Try generating debug data for bug reporting when appropriate." +msgstr "" +"Tenter de générer des données de débogage pour un rapport d’anomalie quand " +"cela convient." + +#: ../app/config/gimprc-blurbs.h:220 msgid "" "When enabled, this will ensure that the full image is visible after a file " "is opened, otherwise it will be displayed with a scale of 1:1." @@ -10173,22 +10317,22 @@ msgstr "" "Si cette option est activée, les images seront intégralement visibles à leur " "ouverture, sinon elles seront affichées à l’échelle 1:1." -#: ../app/config/gimprc-blurbs.h:218 +#: ../app/config/gimprc-blurbs.h:224 msgid "" "Sets the level of interpolation used for scaling and other transformations." msgstr "" "Définit le niveau d’interpolation utilisé pour les changements d’échelle et " "autres transformations." -#: ../app/config/gimprc-blurbs.h:225 +#: ../app/config/gimprc-blurbs.h:231 msgid "Specifies the language to use for the user interface." msgstr "Définit la langue à utiliser pour l’interface utilisateur." -#: ../app/config/gimprc-blurbs.h:228 +#: ../app/config/gimprc-blurbs.h:234 msgid "How many recently opened image filenames to keep on the File menu." msgstr "Nombre de fichiers récemment ouverts à conserver dans le menu Fichier." -#: ../app/config/gimprc-blurbs.h:231 +#: ../app/config/gimprc-blurbs.h:237 msgid "" "Speed of marching ants in the selection outline. This value is in " "milliseconds (less time indicates faster marching)." @@ -10196,7 +10340,7 @@ msgstr "" "Vitesse de défilement des pointillés qui délimitent la sélection ; valeur en " "millisecondes (une durée plus courte correspond à un défilement plus rapide)." -#: ../app/config/gimprc-blurbs.h:235 +#: ../app/config/gimprc-blurbs.h:241 msgid "" "GIMP will warn the user if an attempt is made to create an image that would " "take more memory than the size specified here." @@ -10204,7 +10348,7 @@ msgstr "" "GIMP préviendra l’utilisateur si ce dernier tente de créer une image dont la " "taille mémoire dépasserait la taille indiquée ici." -#: ../app/config/gimprc-blurbs.h:245 +#: ../app/config/gimprc-blurbs.h:251 msgid "" "Sets the monitor's horizontal resolution, in dots per inch. If set to 0, " "forces the X server to be queried for both horizontal and vertical " @@ -10214,7 +10358,7 @@ msgstr "" "valeur est 0, force l’interrogation du serveur X pour les résolutions " "verticale et horizontale." -#: ../app/config/gimprc-blurbs.h:250 +#: ../app/config/gimprc-blurbs.h:256 msgid "" "Sets the monitor's vertical resolution, in dots per inch. If set to 0, " "forces the X server to be queried for both horizontal and vertical " @@ -10224,7 +10368,7 @@ msgstr "" "valeur est 0, force l’interrogation du serveur X pour les résolutions " "verticale et horizontale." -#: ../app/config/gimprc-blurbs.h:255 +#: ../app/config/gimprc-blurbs.h:261 msgid "" "If enabled, the move tool sets the edited layer or path as active. This " "used to be the default behaviour in older versions." @@ -10233,7 +10377,7 @@ msgstr "" "calque ou un chemin est cliqué. Ceci était le comportement par défaut des " "anciennes versions." -#: ../app/config/gimprc-blurbs.h:264 +#: ../app/config/gimprc-blurbs.h:270 msgid "" "Sets the size of the navigation preview available in the lower right corner " "of the image window." @@ -10241,13 +10385,13 @@ msgstr "" "Définit la taille de la vignette de navigation accessible dans le coin " "inférieur droit de la fenêtre d’image." -#: ../app/config/gimprc-blurbs.h:268 +#: ../app/config/gimprc-blurbs.h:274 msgid "Sets how many threads GIMP should use for operations that support it." msgstr "" "Définit combien de fils d’exécution GIMP doit essayer d’utiliser pour les " "opérations qui l’acceptent." -#: ../app/config/gimprc-blurbs.h:290 +#: ../app/config/gimprc-blurbs.h:296 msgid "" "Sets whether GIMP should create previews of layers and channels. Previews in " "the layers and channels dialog are nice to have but they can slow things " @@ -10257,7 +10401,7 @@ msgstr "" "dernières sont pratiques mais elle peuvent ralentir l’utilisation de GIMP " "lorsque vous travaillez sur des images de grande taille." -#: ../app/config/gimprc-blurbs.h:295 +#: ../app/config/gimprc-blurbs.h:301 msgid "" "Sets the preview size used for layers and channel previews in newly created " "dialogs." @@ -10265,11 +10409,11 @@ msgstr "" "Définit la taille par défaut des aperçus des calques et des canaux dans les " "boîtes de dialogue récemment créées." -#: ../app/config/gimprc-blurbs.h:299 +#: ../app/config/gimprc-blurbs.h:305 msgid "Sets the default quick mask color." msgstr "Définit la couleur par défaut du masque rapide" -#: ../app/config/gimprc-blurbs.h:302 +#: ../app/config/gimprc-blurbs.h:308 msgid "" "When enabled, the image window will automatically resize itself whenever the " "physical image size changes. This setting only takes effect in multi-window " @@ -10279,7 +10423,7 @@ msgstr "" "automatiquement à la taille de l’image. Ce réglage ne prend effet que dans " "le mode multi-fenêtres." -#: ../app/config/gimprc-blurbs.h:307 +#: ../app/config/gimprc-blurbs.h:313 msgid "" "When enabled, the image window will automatically resize itself when zooming " "into and out of images. This setting only takes effect in multi-window mode." @@ -10288,13 +10432,13 @@ msgstr "" "automatiquement lorsque vous ferez un zoom avant ou arrière. Ce réglage ne " "prend effet que dans le mode multi-fenêtres." -#: ../app/config/gimprc-blurbs.h:312 +#: ../app/config/gimprc-blurbs.h:318 msgid "Let GIMP try to restore your last saved session on each startup." msgstr "" "Laisser GIMP tenter de restaurer, à chaque démarrage, votre dernière session " "enregistrée." -#: ../app/config/gimprc-blurbs.h:315 +#: ../app/config/gimprc-blurbs.h:321 msgid "" "When enabled, GIMP will try to restore windows on the monitor they were open " "before. When disabled, windows will appear on the currently used monitor." @@ -10303,14 +10447,14 @@ msgstr "" "ont été ouvertes auparavant. Si désactivé, les fenêtres s’afficheront sur le " "moniteur actuellement utilisé." -#: ../app/config/gimprc-blurbs.h:320 +#: ../app/config/gimprc-blurbs.h:326 msgid "" "Remember the current tool, pattern, color, and brush across GIMP sessions." msgstr "" "Se souvenir d’une session à l’autre de l’outil, de la couleur, de la brosse " "et du motif actuels." -#: ../app/config/gimprc-blurbs.h:324 +#: ../app/config/gimprc-blurbs.h:330 msgid "" "When enabled, the same tool and tool options will be used for all input " "devices. No tool switching will occur when the input device changes." @@ -10319,7 +10463,7 @@ msgstr "" "seront utilisés pour tous les périphériques d’entrée. Aucun basculement " "d’outil n’interviendra pendant les changements de périphérique d’entrée." -#: ../app/config/gimprc-blurbs.h:329 +#: ../app/config/gimprc-blurbs.h:335 msgid "" "Keep a permanent record of all opened and saved files in the Recent " "Documents list." @@ -10327,17 +10471,17 @@ msgstr "" "Conserver une trace permanente de tous les fichiers ouverts et enregistrés " "dans la liste des documents récents." -#: ../app/config/gimprc-blurbs.h:333 +#: ../app/config/gimprc-blurbs.h:339 msgid "Save the positions and sizes of the main dialogs when GIMP exits." msgstr "" "Enregistrer les positions et tailles des fenêtres principales quand on " "quitte GIMP." -#: ../app/config/gimprc-blurbs.h:336 +#: ../app/config/gimprc-blurbs.h:342 msgid "Save the tool options when GIMP exits." msgstr "Enregistrer les options des outils quand on quitte GIMP." -#: ../app/config/gimprc-blurbs.h:342 +#: ../app/config/gimprc-blurbs.h:348 msgid "" "When enabled, all paint tools will show a preview of the current brush's " "outline." @@ -10345,7 +10489,7 @@ msgstr "" "Si cette option est activée, tous les outils de dessin à base de brosse " "afficheront un aperçu des contours de la brosse actuelle." -#: ../app/config/gimprc-blurbs.h:346 +#: ../app/config/gimprc-blurbs.h:352 msgid "" "When enabled, dialogs will show a help button that gives access to the " "related help page. Without this button, the help page can still be reached " @@ -10355,7 +10499,7 @@ msgstr "" "d’aide qui vous permettra d’accéder à la page d’aide idoine. Sans ce bouton, " "la page d’aide peut toujours être accédée par la touche F1." -#: ../app/config/gimprc-blurbs.h:351 +#: ../app/config/gimprc-blurbs.h:357 msgid "" "When enabled, the mouse pointer will be shown over the image while using a " "paint tool." @@ -10363,7 +10507,7 @@ msgstr "" "Si cette option est activée, le pointeur sera affiché par dessus l’image " "quand vous utilisez un outil de peinture." -#: ../app/config/gimprc-blurbs.h:355 +#: ../app/config/gimprc-blurbs.h:361 msgid "" "When enabled, the menubar is visible by default. This can also be toggled " "with the \"View->Show Menubar\" command." @@ -10372,7 +10516,7 @@ msgstr "" "peut aussi être activé ou désactivé via le menu « Affichage -> Afficher la " "barre de menus »." -#: ../app/config/gimprc-blurbs.h:359 +#: ../app/config/gimprc-blurbs.h:365 msgid "" "When enabled, the rulers are visible by default. This can also be toggled " "with the \"View->Show Rulers\" command." @@ -10381,7 +10525,7 @@ msgstr "" "l’affichage de ces dernières peut aussi être contrôlé via le menu " "« Affichage -> Afficher les règles »." -#: ../app/config/gimprc-blurbs.h:363 +#: ../app/config/gimprc-blurbs.h:369 msgid "" "When enabled, the scrollbars are visible by default. This can also be " "toggled with the \"View->Show Scrollbars\" command." @@ -10390,7 +10534,7 @@ msgstr "" "défaut. Cela peut aussi être activé ou désactivé via le menu « Affichage -> " "Afficher les barres de défilement »." -#: ../app/config/gimprc-blurbs.h:367 +#: ../app/config/gimprc-blurbs.h:373 msgid "" "When enabled, the statusbar is visible by default. This can also be toggled " "with the \"View->Show Statusbar\" command." @@ -10399,7 +10543,7 @@ msgstr "" "peut aussi être activé ou désactivé via la commande « Affichage -> Afficher " "la barre d’état »." -#: ../app/config/gimprc-blurbs.h:371 +#: ../app/config/gimprc-blurbs.h:377 msgid "" "When enabled, the selection is visible by default. This can also be toggled " "with the \"View->Show Selection\" command." @@ -10408,7 +10552,7 @@ msgstr "" "aussi être activé ou désactivé via la commande « Affichage -> Afficher la " "sélection »." -#: ../app/config/gimprc-blurbs.h:375 +#: ../app/config/gimprc-blurbs.h:381 msgid "" "When enabled, the layer boundary is visible by default. This can also be " "toggled with the \"View->Show Layer Boundary\" command." @@ -10417,7 +10561,7 @@ msgstr "" "Cela peut aussi être activé ou désactivé via la commande « Affichage -> " "Afficher les bords du calque »." -#: ../app/config/gimprc-blurbs.h:379 +#: ../app/config/gimprc-blurbs.h:385 msgid "" "When enabled, the guides are visible by default. This can also be toggled " "with the \"View->Show Guides\" command." @@ -10426,7 +10570,7 @@ msgstr "" "peut aussi être activé ou désactivé via la commande « Affichage -> Afficher " "les guides »." -#: ../app/config/gimprc-blurbs.h:383 +#: ../app/config/gimprc-blurbs.h:389 msgid "" "When enabled, the grid is visible by default. This can also be toggled with " "the \"View->Show Grid\" command." @@ -10435,7 +10579,7 @@ msgstr "" "aussi être activé ou désactivé via la commande « Affichage -> Afficher la " "grille »." -#: ../app/config/gimprc-blurbs.h:387 +#: ../app/config/gimprc-blurbs.h:393 msgid "" "When enabled, the sample points are visible by default. This can also be " "toggled with the \"View->Show Sample Points\" command." @@ -10444,48 +10588,48 @@ msgstr "" "visibles. l’affichage de ces derniers peut aussi être contrôlé via la " "commande « Affichage -> Afficher les points d’échantillonnage »." -#: ../app/config/gimprc-blurbs.h:391 +#: ../app/config/gimprc-blurbs.h:397 msgid "Show a tooltip when the pointer hovers over an item." msgstr "" "Afficher une bulle d’aide lorsque le pointeur est au-dessus d’un élément." -#: ../app/config/gimprc-blurbs.h:394 +#: ../app/config/gimprc-blurbs.h:400 msgid "Use GIMP in a single-window mode." msgstr "Utiliser GIMP en mode fenêtre unique." -#: ../app/config/gimprc-blurbs.h:397 +#: ../app/config/gimprc-blurbs.h:403 msgid "Hide docks and other windows, leaving only image windows." msgstr "" "Masquer les fenêtres, groupées ou isolées. Seules persistent les fenêtres " "d’images." -#: ../app/config/gimprc-blurbs.h:400 +#: ../app/config/gimprc-blurbs.h:406 msgid "Enable the N-Point Deformation tool." msgstr "Activer l’outil Déformation N-Point" -#: ../app/config/gimprc-blurbs.h:403 +#: ../app/config/gimprc-blurbs.h:409 msgid "Enable the Handle Transform tool." msgstr "Activer l’outil Transformation manuelle." -#: ../app/config/gimprc-blurbs.h:406 +#: ../app/config/gimprc-blurbs.h:412 msgid "Enable symmetry on painting." msgstr "Activer la symétrie lors du dessin." -#: ../app/config/gimprc-blurbs.h:409 +#: ../app/config/gimprc-blurbs.h:415 msgid "Enable the MyPaint Brush tool." msgstr "Activer l’outil Brosse MyPaint." -#: ../app/config/gimprc-blurbs.h:412 +#: ../app/config/gimprc-blurbs.h:418 msgid "Enable the Seamless Clone tool." msgstr "Activer l’outil Clonage sans raccord." -#: ../app/config/gimprc-blurbs.h:415 +#: ../app/config/gimprc-blurbs.h:421 msgid "What to do when the space bar is pressed in the image window." msgstr "" "Ce qui est à faire lors d’un appui sur la barre d’espace dans la fenêtre " "d’image." -#: ../app/config/gimprc-blurbs.h:418 +#: ../app/config/gimprc-blurbs.h:424 msgid "" "Sets the swap file location. GIMP uses a tile based memory allocation " "scheme. The swap file is used to quickly and easily swap tiles out to disk " @@ -10503,11 +10647,11 @@ msgstr "" "Samba, etc.). Pour ces raisons il est parfois conseillé de mettre le fichier " "d’échange dans « /tmp »." -#: ../app/config/gimprc-blurbs.h:427 +#: ../app/config/gimprc-blurbs.h:433 msgid "When enabled, menus can be torn off." msgstr "Si cette option est activée, les menus peuvent être détachés." -#: ../app/config/gimprc-blurbs.h:430 +#: ../app/config/gimprc-blurbs.h:436 msgid "" "When enabled, you can change keyboard shortcuts for menu items by hitting a " "key combination while the menu item is highlighted." @@ -10516,15 +10660,15 @@ msgstr "" "clavier des éléments des menu en appuyant sur une combinaison de touches " "tandis que l’élément de menu est surligné." -#: ../app/config/gimprc-blurbs.h:434 +#: ../app/config/gimprc-blurbs.h:440 msgid "Save changed keyboard shortcuts when GIMP exits." msgstr "Enregistrer les raccourcis clavier modifiés lorsqu’on quitte GIMP." -#: ../app/config/gimprc-blurbs.h:437 +#: ../app/config/gimprc-blurbs.h:443 msgid "Restore saved keyboard shortcuts on each GIMP startup." msgstr "Rétablir, à chaque démarrage, les raccourcis clavier enregistrés." -#: ../app/config/gimprc-blurbs.h:440 +#: ../app/config/gimprc-blurbs.h:446 msgid "" "Sets the folder for temporary storage. Files will appear here during the " "course of running GIMP. Most files will disappear when GIMP exits, but some " @@ -10537,14 +10681,14 @@ msgstr "" "Ainsi il est préférable que ce répertoire ne soit pas partagé avec d’autres " "utilisateurs." -#: ../app/config/gimprc-blurbs.h:461 +#: ../app/config/gimprc-blurbs.h:467 msgid "" "Sets the default rendering intent for the 'Convert to Color Profile' dialog." msgstr "" "Définit l’intention de rendu par défaut concernant la boîte de dialogue " "« Convertir au profil de couleur »." -#: ../app/config/gimprc-blurbs.h:464 +#: ../app/config/gimprc-blurbs.h:470 msgid "" "Sets the default 'Black Point Compensation' state for the 'Convert to Color " "Profile' dialog." @@ -10552,14 +10696,14 @@ msgstr "" "Définit l’état « Compensation du point noir » par défaut concernant la boîte " "de dialogue « Convertir au profil de couleur »." -#: ../app/config/gimprc-blurbs.h:468 +#: ../app/config/gimprc-blurbs.h:474 msgid "" "Sets the default layer dithering method for the 'Convert Precision' dialog." msgstr "" "Définit la méthode de tramage du calque par défaut concernant la boîte de " "dialogue « Convertir la précision »." -#: ../app/config/gimprc-blurbs.h:471 +#: ../app/config/gimprc-blurbs.h:477 msgid "" "Sets the default text layer dithering method for the 'Convert Precision' " "dialog." @@ -10567,20 +10711,20 @@ msgstr "" "Définit la méthode de tramage du calque de texte par défaut concernant la " "boîte de dialogue « Convertir la précision »." -#: ../app/config/gimprc-blurbs.h:474 +#: ../app/config/gimprc-blurbs.h:480 msgid "" "Sets the default channel dithering method for the 'Convert Precision' dialog." msgstr "" "Définit la méthode de tramage du canal par défaut concernant la boîte de " "dialogue « Convertir la précision »." -#: ../app/config/gimprc-blurbs.h:477 +#: ../app/config/gimprc-blurbs.h:483 msgid "Sets the default palette type for the 'Convert to Indexed' dialog." msgstr "" "Définit le type de palette par défaut concernant la boîte de dialogue " "« Convertir en couleurs indexées »." -#: ../app/config/gimprc-blurbs.h:480 +#: ../app/config/gimprc-blurbs.h:486 msgid "" "Sets the default maximum number of colors for the 'Convert to Indexed' " "dialog." @@ -10588,7 +10732,7 @@ msgstr "" "Définit le nombre maximal de couleurs concernant la boîte de dialogue " "« Convertir en couleurs indexées »." -#: ../app/config/gimprc-blurbs.h:483 +#: ../app/config/gimprc-blurbs.h:489 msgid "" "Sets the default 'Remove duplicate colors' state for the 'Convert to " "Indexed' dialog." @@ -10596,20 +10740,20 @@ msgstr "" "Définit l’état par défaut de « Supprimer les couleurs en double » " "concernant la boîte de dialogue « Convertir en couleurs indexées »." -#: ../app/config/gimprc-blurbs.h:486 +#: ../app/config/gimprc-blurbs.h:492 msgid "Sets the default dithering type for the 'Convert to Indexed' dialog." msgstr "" "Définit le type de tramage par défaut concernant la boîte de dialogue " "« Convertir en couleurs indexées »." -#: ../app/config/gimprc-blurbs.h:489 +#: ../app/config/gimprc-blurbs.h:495 msgid "" "Sets the default 'Dither alpha' state for the 'Convert to Indexed' dialog." msgstr "" "Définit l’état « Tramer l’alpha » par défaut concernant la boîte de dialogue " "« Convertir en couleurs indexées »." -#: ../app/config/gimprc-blurbs.h:492 +#: ../app/config/gimprc-blurbs.h:498 msgid "" "Sets the default 'Dither text layers' state for the 'Convert to Indexed' " "dialog." @@ -10617,150 +10761,150 @@ msgstr "" "Définit l’état « Tramer les calques de texte » par défaut concernant la " "boîte de dialogue « Convertir en couleurs indexées »." -#: ../app/config/gimprc-blurbs.h:495 +#: ../app/config/gimprc-blurbs.h:501 msgid "Sets the default fill type for the 'Canvas Size' dialog." msgstr "" "Définit le type de remplissage par défaut concernant la boîte de dialogue " "« Taille du canevas »." -#: ../app/config/gimprc-blurbs.h:498 +#: ../app/config/gimprc-blurbs.h:504 msgid "Sets the default set of layers to resize for the 'Canvas Size' dialog." msgstr "" "Définit le lot de calques par défaut à redimensionner concernant la boîte de " "dialogue « Taille du canevas »." -#: ../app/config/gimprc-blurbs.h:501 +#: ../app/config/gimprc-blurbs.h:507 msgid "" "Sets the default 'Resize text layers' state for the 'Canvas Size' dialog." msgstr "" "Définit l’état « Redimensionner les calques de texte » par défaut concernant " "la boîte de dialogue « Taille du canevas »." -#: ../app/config/gimprc-blurbs.h:504 +#: ../app/config/gimprc-blurbs.h:510 msgid "Sets the default layer name for the 'New Layer' dialog." msgstr "" "Définit le nom du calque par défaut concernant la boîte de dialogue " "« Nouveau calque »." -#: ../app/config/gimprc-blurbs.h:507 +#: ../app/config/gimprc-blurbs.h:513 msgid "Sets the default mode for the 'New Layer' dialog." msgstr "" "Définit le mode par défaut concernant la boîte de dialogue « Nouveau " "calque »." -#: ../app/config/gimprc-blurbs.h:510 +#: ../app/config/gimprc-blurbs.h:516 msgid "Sets the default blend space for the 'New Layer' dialog." msgstr "" "Définit l’espace de fusion par défaut concernant la boîte de dialogue " "« Nouveau calque »." -#: ../app/config/gimprc-blurbs.h:513 +#: ../app/config/gimprc-blurbs.h:519 msgid "Sets the default composite space for the 'New Layer' dialog." msgstr "" "Définit l’espace composite par défaut concernant la boîte de dialogue " "« Nouveau calque »." -#: ../app/config/gimprc-blurbs.h:516 +#: ../app/config/gimprc-blurbs.h:522 msgid "Sets the default composite mode for the 'New Layer' dialog." msgstr "" "Définit le mode composite par défaut concernant la boîte de dialogue " "« Nouveau calque »." -#: ../app/config/gimprc-blurbs.h:519 +#: ../app/config/gimprc-blurbs.h:525 msgid "Sets the default opacity for the 'New Layer' dialog." msgstr "" "Définit l’opacité par défaut concernant la boîte de dialogue « Nouveau " "calque »." -#: ../app/config/gimprc-blurbs.h:522 +#: ../app/config/gimprc-blurbs.h:528 msgid "Sets the default fill type for the 'New Layer' dialog." msgstr "" "Définit le type de remplissage par défaut concernant la boîte de dialogue " "« Nouveau calque »." -#: ../app/config/gimprc-blurbs.h:525 +#: ../app/config/gimprc-blurbs.h:531 msgid "Sets the default fill type for the 'Layer Boundary Size' dialog." msgstr "" "Définit le type de remplissage par défaut concernant la boîte de dialogue " "« Taille des bords du calque »." -#: ../app/config/gimprc-blurbs.h:528 +#: ../app/config/gimprc-blurbs.h:534 msgid "Sets the default mask for the 'Add Layer Mask' dialog." msgstr "" "Définit le masque par défaut concernant la boîte de dialogue « Ajouter un " "masque de calque »." -#: ../app/config/gimprc-blurbs.h:531 +#: ../app/config/gimprc-blurbs.h:537 msgid "Sets the default 'invert mask' state for the 'Add Layer Mask' dialog." msgstr "" "Définit l’état « Inverser le masque » par défaut concernant la boîte de " "dialogue « Ajouter un masque de calque »." -#: ../app/config/gimprc-blurbs.h:534 +#: ../app/config/gimprc-blurbs.h:540 msgid "Sets the default merge type for the 'Merge Visible Layers' dialog." msgstr "" "Définit le type de fusion par défaut concernant la boîte de dialogue " "« Fusionner les calques visibles »." -#: ../app/config/gimprc-blurbs.h:537 +#: ../app/config/gimprc-blurbs.h:543 msgid "" "Sets the default 'Active group only' for the 'Merge Visible Layers' dialog." msgstr "" "Définit la valeur par défaut « groupe actif uniquement » concernant la boîte " "de dialogue « Fusionner les calques visibles »." -#: ../app/config/gimprc-blurbs.h:540 +#: ../app/config/gimprc-blurbs.h:546 msgid "" "Sets the default 'Discard invisible' for the 'Merge Visible Layers' dialog." msgstr "" "Définit le « Écarter les calques invisibles » par défaut concernant la boîte " "de dialogue « Fusionner les calques visibles »." -#: ../app/config/gimprc-blurbs.h:543 +#: ../app/config/gimprc-blurbs.h:549 msgid "Sets the default channel name for the 'New Channel' dialog." msgstr "" "Définit le nom de canal par défaut concernant la boîte de dialogue « Nouveau " "canal »." -#: ../app/config/gimprc-blurbs.h:546 +#: ../app/config/gimprc-blurbs.h:552 msgid "Sets the default color and opacity for the 'New Channel' dialog." msgstr "" "Définit l’opacité et la couleur par défaut concernant la boîte de dialogue " "« Nouveau canal »." -#: ../app/config/gimprc-blurbs.h:549 +#: ../app/config/gimprc-blurbs.h:555 msgid "Sets the default path name for the 'New Path' dialog." msgstr "" "Définit le nom de chemin par défaut concernant la boîte de dialogue " "« Nouveau chemin »." -#: ../app/config/gimprc-blurbs.h:552 +#: ../app/config/gimprc-blurbs.h:558 msgid "Sets the default folder path for the 'Export Path' dialog." msgstr "" "Définit le nom de chemin de dossier par défaut concernant la boîte de " "dialogue « Exporter le chemin »." -#: ../app/config/gimprc-blurbs.h:555 +#: ../app/config/gimprc-blurbs.h:561 msgid "" "Sets the default 'Export the active path' state for the 'Export Path' dialog." msgstr "" "Définit l’état de « Exporter le chemin actif » par défaut concernant la " "boîte de dialogue « Exporter le chemin »." -#: ../app/config/gimprc-blurbs.h:558 +#: ../app/config/gimprc-blurbs.h:564 msgid "Sets the default folder path for the 'Import Path' dialog." msgstr "" "Définit le chemin de dossier par défaut concernant la boîte de dialogue " "« Importer un chemin »." -#: ../app/config/gimprc-blurbs.h:561 +#: ../app/config/gimprc-blurbs.h:567 msgid "" "Sets the default 'Merge imported paths' state for the 'Import Path' dialog." msgstr "" "Définit l’état de « Fusionner les calques importés » par défaut concernant " "la boîte de dialogue « Importer un chemin »." -#: ../app/config/gimprc-blurbs.h:564 +#: ../app/config/gimprc-blurbs.h:570 msgid "" "Sets the default 'Scale imported paths to fit size' state for the 'Import " "Path' dialog." @@ -10769,25 +10913,25 @@ msgstr "" "à l’image » par défaut concernant la boîte de dialogue « Importer un " "chemin »." -#: ../app/config/gimprc-blurbs.h:567 +#: ../app/config/gimprc-blurbs.h:573 msgid "Sets the default feather radius for the 'Feather Selection' dialog." msgstr "" "Définit le rayon d’adoucissement par défaut concernant la boîte de dialogue " "« Adoucir la sélection »." -#: ../app/config/gimprc-blurbs.h:570 +#: ../app/config/gimprc-blurbs.h:576 msgid "Sets the default grow radius for the 'Grow Selection' dialog." msgstr "" "Définit le rayon d’agrandissement par défaut concernant la boîte de dialogue " "« Agrandir la sélection »." -#: ../app/config/gimprc-blurbs.h:573 +#: ../app/config/gimprc-blurbs.h:579 msgid "Sets the default shrink radius for the 'Shrink Selection' dialog." msgstr "" "Définit le rayon de réduction par défaut concernant la boîte de dialogue " "« Réduction de la sélection »." -#: ../app/config/gimprc-blurbs.h:576 +#: ../app/config/gimprc-blurbs.h:582 msgid "" "Sets the default 'Selected areas continue outside the image' setting for the " "'Shrink Selection' dialog." @@ -10796,13 +10940,13 @@ msgstr "" "dehors de l’image » concernant la boîte de dialogue « Réduction de la " "sélection »." -#: ../app/config/gimprc-blurbs.h:580 +#: ../app/config/gimprc-blurbs.h:586 msgid "Sets the default border radius for the 'Border Selection' dialog." msgstr "" "Définit le rayon de bordure par défaut concernant la boîte de dialogue " "« Border la sélection »." -#: ../app/config/gimprc-blurbs.h:583 +#: ../app/config/gimprc-blurbs.h:589 msgid "" "Sets the default 'Selected areas continue outside the image' setting for the " "'Border Selection' dialog." @@ -10810,19 +10954,19 @@ msgstr "" "Définit le paramétrage par défaut des « Zones sélectionnées étendues en " "dehors de l’image » concernant la boîte de dialogue « Border la sélection »." -#: ../app/config/gimprc-blurbs.h:587 +#: ../app/config/gimprc-blurbs.h:593 msgid "Sets the default border style for the 'Border Selection' dialog." msgstr "" "Définit le style de bordure par défaut concernant la boîte de dialogue " "« Border la sélection »." -#: ../app/config/gimprc-blurbs.h:596 +#: ../app/config/gimprc-blurbs.h:602 msgid "Sets the size of the thumbnail shown in the Open dialog." msgstr "" "Définit la taille des aperçus affichés la fenêtre de dialogue d’ouverture " "des fichiers." -#: ../app/config/gimprc-blurbs.h:599 +#: ../app/config/gimprc-blurbs.h:605 msgid "" "The thumbnail in the Open dialog will be automatically updated if the file " "being previewed is smaller than the size set here." @@ -10831,7 +10975,7 @@ msgstr "" "automatiquement mise à jour si le fichier en question est plus petit que la " "taille indiquée ici." -#: ../app/config/gimprc-blurbs.h:603 +#: ../app/config/gimprc-blurbs.h:609 msgid "" "When the amount of pixel data exceeds this limit, GIMP will start to swap " "tiles to disk. This is a lot slower but it makes it possible to work on " @@ -10843,31 +10987,31 @@ msgstr "" "possible de travailler sur des images plus grandes que la mémoire. Si vous " "avez beaucoup de RAM, il conviendrait de définir cette valeur plus haut." -#: ../app/config/gimprc-blurbs.h:609 +#: ../app/config/gimprc-blurbs.h:615 msgid "Show the current foreground and background colors in the toolbox." msgstr "" "Afficher les couleurs de premier plan et d’arrière-plan dans la boîte à " "outils." -#: ../app/config/gimprc-blurbs.h:612 +#: ../app/config/gimprc-blurbs.h:618 msgid "Show the currently selected brush, pattern and gradient in the toolbox." msgstr "" "Afficher les brosses, motifs et dégradés actifs dans la boîte à outils." -#: ../app/config/gimprc-blurbs.h:615 +#: ../app/config/gimprc-blurbs.h:621 msgid "Show the currently active image in the toolbox." msgstr "Afficher l’image active dans la boîte à outils." -#: ../app/config/gimprc-blurbs.h:621 +#: ../app/config/gimprc-blurbs.h:627 msgid "Sets the manner in which transparency is displayed in images." msgstr "" "Définit comment les zones transparentes sont représentées dans les images." -#: ../app/config/gimprc-blurbs.h:624 +#: ../app/config/gimprc-blurbs.h:630 msgid "Sets the size of the checkerboard used to display transparency." msgstr "Définit la taille du damier utilisé pour représenter la transparence." -#: ../app/config/gimprc-blurbs.h:627 +#: ../app/config/gimprc-blurbs.h:633 msgid "" "When enabled, GIMP will not save an image if it has not been changed since " "it was opened." @@ -10875,7 +11019,7 @@ msgstr "" "Si cette option est activée, GIMP n’enregistrera l’image que si elle a été " "modifiée depuis son ouverture." -#: ../app/config/gimprc-blurbs.h:631 +#: ../app/config/gimprc-blurbs.h:637 msgid "" "Sets the minimal number of operations that can be undone. More undo levels " "are kept available until the undo-size limit is reached." @@ -10884,7 +11028,7 @@ msgstr "" "la taille limite de la mémoire d’annulation n’est pas atteinte, les " "opérations supplémentaires sont conservées." -#: ../app/config/gimprc-blurbs.h:635 +#: ../app/config/gimprc-blurbs.h:641 msgid "" "Sets an upper limit to the memory that is used per image to keep operations " "on the undo stack. Regardless of this setting, at least as many undo-levels " @@ -10894,17 +11038,17 @@ msgstr "" "conserver les opérations de la pile d’annulations. Au minimum, autant de " "niveaux d’annulations que configurés par ce paramètre pourront être annulés." -#: ../app/config/gimprc-blurbs.h:640 +#: ../app/config/gimprc-blurbs.h:646 msgid "Sets the size of the previews in the Undo History." msgstr "Définit la taille des aperçus dans l’historique d’annulation." -#: ../app/config/gimprc-blurbs.h:643 +#: ../app/config/gimprc-blurbs.h:649 msgid "When enabled, pressing F1 will open the help browser." msgstr "" "Si cette option est activée, l’appui sur la touche F1 ouvrira le navigateur " "d’aide." -#: ../app/config/gimprc-blurbs.h:646 +#: ../app/config/gimprc-blurbs.h:652 msgid "When enabled, uses OpenCL for some operations." msgstr "Si cette option est activée, utilise OpenCL pour certaines opérations." @@ -11185,527 +11329,577 @@ msgctxt "thumbnail-size" msgid "Large (256x256)" msgstr "Grand (256x256)" -#: ../app/core/core-enums.c:825 +#: ../app/core/core-enums.c:671 +msgctxt "debug-policy" +msgid "Debug warnings, critical errors and crashes" +msgstr "Déboguer les avertissements, les erreurs critiques et les plantages" + +#: ../app/core/core-enums.c:672 +msgctxt "debug-policy" +msgid "Debug critical errors and crashes" +msgstr "Déboguer les erreurs critiques et les plantages" + +#: ../app/core/core-enums.c:673 +msgctxt "debug-policy" +msgid "Debug crashes only" +msgstr "Déboguer les plantages seulement" + +#: ../app/core/core-enums.c:674 +msgctxt "debug-policy" +msgid "Never debug GIMP" +msgstr "Ne jamais déboguer GIMP" + +#: ../app/core/core-enums.c:862 msgctxt "undo-type" msgid "<>" msgstr "<>" -#: ../app/core/core-enums.c:826 +#: ../app/core/core-enums.c:863 msgctxt "undo-type" msgid "Scale image" msgstr "Échelle et taille de l’image" -#: ../app/core/core-enums.c:827 +#: ../app/core/core-enums.c:864 msgctxt "undo-type" msgid "Resize image" msgstr "Redimensionner l’image" -#: ../app/core/core-enums.c:828 +#: ../app/core/core-enums.c:865 msgctxt "undo-type" msgid "Flip image" msgstr "Retourner l’image" -#: ../app/core/core-enums.c:829 +#: ../app/core/core-enums.c:866 msgctxt "undo-type" msgid "Rotate image" msgstr "Rotation de l’image" -#: ../app/core/core-enums.c:830 +#: ../app/core/core-enums.c:867 msgctxt "undo-type" msgid "Crop image" msgstr "Découper l’image" -#: ../app/core/core-enums.c:831 +#: ../app/core/core-enums.c:868 msgctxt "undo-type" msgid "Convert image" msgstr "Convertir l’image" -#: ../app/core/core-enums.c:832 +#: ../app/core/core-enums.c:869 msgctxt "undo-type" msgid "Remove item" msgstr "Supprimer l’élément" -#: ../app/core/core-enums.c:833 +#: ../app/core/core-enums.c:870 msgctxt "undo-type" msgid "Merge layers" msgstr "Fusionner les calques" -#: ../app/core/core-enums.c:834 +#: ../app/core/core-enums.c:871 msgctxt "undo-type" msgid "Merge paths" msgstr "Fusionner les chemins" -#: ../app/core/core-enums.c:835 +#: ../app/core/core-enums.c:872 msgctxt "undo-type" msgid "Quick Mask" msgstr "Masque rapide" -#: ../app/core/core-enums.c:836 ../app/core/core-enums.c:867 +#: ../app/core/core-enums.c:873 ../app/core/core-enums.c:904 #: ../app/core/gimpimage-grid.c:64 msgctxt "undo-type" msgid "Grid" msgstr "Grille" -#: ../app/core/core-enums.c:837 ../app/core/core-enums.c:871 +#: ../app/core/core-enums.c:874 ../app/core/core-enums.c:908 msgctxt "undo-type" msgid "Guide" msgstr "Guide" -#: ../app/core/core-enums.c:838 ../app/core/core-enums.c:872 +#: ../app/core/core-enums.c:875 ../app/core/core-enums.c:909 msgctxt "undo-type" msgid "Sample Point" msgstr "Point d’échantillonnage" -#: ../app/core/core-enums.c:839 ../app/core/core-enums.c:873 +#: ../app/core/core-enums.c:876 ../app/core/core-enums.c:910 msgctxt "undo-type" msgid "Layer/Channel" msgstr "Calque/Canal" -#: ../app/core/core-enums.c:840 ../app/core/core-enums.c:874 +#: ../app/core/core-enums.c:877 ../app/core/core-enums.c:911 msgctxt "undo-type" msgid "Layer/Channel modification" msgstr "Modification calque/canal" -#: ../app/core/core-enums.c:841 ../app/core/core-enums.c:875 +#: ../app/core/core-enums.c:878 ../app/core/core-enums.c:912 msgctxt "undo-type" msgid "Selection mask" msgstr "Masque de sélection" -#: ../app/core/core-enums.c:842 ../app/core/core-enums.c:879 +#: ../app/core/core-enums.c:879 ../app/core/core-enums.c:916 msgctxt "undo-type" msgid "Item visibility" msgstr "Visibilité de l’élément" -#: ../app/core/core-enums.c:843 ../app/core/core-enums.c:880 +#: ../app/core/core-enums.c:880 ../app/core/core-enums.c:917 msgctxt "undo-type" msgid "Link/Unlink item" msgstr "Élément chaîné/non chaîné" -#: ../app/core/core-enums.c:844 +#: ../app/core/core-enums.c:881 msgctxt "undo-type" msgid "Item properties" msgstr "Propriétés de l’élément" -#: ../app/core/core-enums.c:845 ../app/core/core-enums.c:878 +#: ../app/core/core-enums.c:882 ../app/core/core-enums.c:915 msgctxt "undo-type" msgid "Move item" msgstr "Déplacer l’élément" -#: ../app/core/core-enums.c:846 +#: ../app/core/core-enums.c:883 msgctxt "undo-type" msgid "Scale item" msgstr "Échelle de l’élément" -#: ../app/core/core-enums.c:847 +#: ../app/core/core-enums.c:884 msgctxt "undo-type" msgid "Resize item" msgstr "Redimensionner l’élément" -#: ../app/core/core-enums.c:848 +#: ../app/core/core-enums.c:885 msgctxt "undo-type" msgid "Add layer" msgstr "Ajouter un calque" -#: ../app/core/core-enums.c:849 ../app/core/core-enums.c:895 +#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:936 msgctxt "undo-type" msgid "Add layer mask" msgstr "Ajouter un masque de calque" -#: ../app/core/core-enums.c:850 ../app/core/core-enums.c:897 +#: ../app/core/core-enums.c:887 ../app/core/core-enums.c:938 msgctxt "undo-type" msgid "Apply layer mask" msgstr "Appliquer le masque de calque" -#: ../app/core/core-enums.c:851 ../app/core/core-enums.c:905 +#: ../app/core/core-enums.c:888 ../app/core/core-enums.c:946 msgctxt "undo-type" msgid "Floating selection to layer" msgstr "Sélection flottante vers calque" -#: ../app/core/core-enums.c:852 +#: ../app/core/core-enums.c:889 msgctxt "undo-type" msgid "Float selection" msgstr "Sélection flottante" -#: ../app/core/core-enums.c:853 +#: ../app/core/core-enums.c:890 msgctxt "undo-type" msgid "Anchor floating selection" msgstr "Ancrer la sélection flottante" -#: ../app/core/core-enums.c:854 ../app/core/gimp-edit.c:474 +#: ../app/core/core-enums.c:891 ../app/core/gimp-edit.c:501 msgctxt "undo-type" msgid "Paste" msgstr "Coller" -#: ../app/core/core-enums.c:855 ../app/core/gimp-edit.c:808 +#: ../app/core/core-enums.c:892 ../app/core/gimp-edit.c:829 msgctxt "undo-type" msgid "Cut" msgstr "Couper" -#: ../app/core/core-enums.c:856 +#: ../app/core/core-enums.c:893 msgctxt "undo-type" msgid "Text" msgstr "Texte" -#: ../app/core/core-enums.c:857 ../app/core/core-enums.c:906 -#: ../app/core/gimpdrawable-transform.c:682 +#: ../app/core/core-enums.c:894 ../app/core/core-enums.c:947 +#: ../app/core/gimpdrawable-transform.c:692 msgctxt "undo-type" msgid "Transform" msgstr "Transformer" -#: ../app/core/core-enums.c:858 ../app/core/core-enums.c:907 +#: ../app/core/core-enums.c:895 ../app/core/core-enums.c:948 msgctxt "undo-type" msgid "Paint" msgstr "Peindre" -#: ../app/core/core-enums.c:859 ../app/core/core-enums.c:910 +#: ../app/core/core-enums.c:896 ../app/core/core-enums.c:951 msgctxt "undo-type" msgid "Attach parasite" msgstr "Attacher un parasite" -#: ../app/core/core-enums.c:860 ../app/core/core-enums.c:911 +#: ../app/core/core-enums.c:897 ../app/core/core-enums.c:952 msgctxt "undo-type" msgid "Remove parasite" msgstr "Supprimer un parasite" -#: ../app/core/core-enums.c:861 +#: ../app/core/core-enums.c:898 msgctxt "undo-type" msgid "Import paths" msgstr "Importer des chemins" -#: ../app/core/core-enums.c:862 +#: ../app/core/core-enums.c:899 msgctxt "undo-type" msgid "Plug-In" msgstr "Greffon" -#: ../app/core/core-enums.c:863 +#: ../app/core/core-enums.c:900 msgctxt "undo-type" msgid "Image type" msgstr "Type d’image" -#: ../app/core/core-enums.c:864 +#: ../app/core/core-enums.c:901 msgctxt "undo-type" msgid "Image precision" msgstr "Précision de l’image" -#: ../app/core/core-enums.c:865 +#: ../app/core/core-enums.c:902 msgctxt "undo-type" msgid "Image size" msgstr "Taille d’image" -#: ../app/core/core-enums.c:866 +#: ../app/core/core-enums.c:903 msgctxt "undo-type" msgid "Image resolution change" msgstr "Changement de résolution d’image" -#: ../app/core/core-enums.c:868 +#: ../app/core/core-enums.c:905 msgctxt "undo-type" msgid "Change metadata" msgstr "Modifier les métadonnées" -#: ../app/core/core-enums.c:869 +#: ../app/core/core-enums.c:906 msgctxt "undo-type" msgid "Change indexed palette" msgstr "Changer la palette indexée" -#: ../app/core/core-enums.c:870 +#: ../app/core/core-enums.c:907 msgctxt "undo-type" msgid "Change color managed state" msgstr "Modifier l’état de gestion des couleurs" -#: ../app/core/core-enums.c:876 +#: ../app/core/core-enums.c:913 msgctxt "undo-type" msgid "Reorder item" msgstr "Réordonner l’élément" -#: ../app/core/core-enums.c:877 +#: ../app/core/core-enums.c:914 msgctxt "undo-type" msgid "Rename item" msgstr "Renommer l’élément" -#: ../app/core/core-enums.c:881 +#: ../app/core/core-enums.c:918 msgctxt "undo-type" msgid "Item color tag" msgstr "Marque de couleur de l’élément" -#: ../app/core/core-enums.c:882 +#: ../app/core/core-enums.c:919 msgctxt "undo-type" msgid "Lock/Unlock content" msgstr "Verrouiller/Déverrouiller le contenu" -#: ../app/core/core-enums.c:883 +#: ../app/core/core-enums.c:920 msgctxt "undo-type" msgid "Lock/Unlock position" msgstr "Verrouiller/Déverrouiller la position" -#: ../app/core/core-enums.c:884 +#: ../app/core/core-enums.c:921 msgctxt "undo-type" msgid "New layer" msgstr "Nouveau calque" -#: ../app/core/core-enums.c:885 +#: ../app/core/core-enums.c:922 msgctxt "undo-type" msgid "Delete layer" msgstr "Supprimer le calque" -#: ../app/core/core-enums.c:886 +#: ../app/core/core-enums.c:923 msgctxt "undo-type" msgid "Set layer mode" msgstr "Définir le mode de calque" -#: ../app/core/core-enums.c:887 +#: ../app/core/core-enums.c:924 msgctxt "undo-type" msgid "Set layer opacity" msgstr "Régler l’opacité du calque" -#: ../app/core/core-enums.c:888 +#: ../app/core/core-enums.c:925 msgctxt "undo-type" msgid "Lock/Unlock alpha channel" msgstr "Verrouiller/Déverrouiller le canal alpha" -#: ../app/core/core-enums.c:889 +#: ../app/core/core-enums.c:926 msgctxt "undo-type" msgid "Suspend group layer resize" -msgstr "Interrompre le redimensionnement du calque de groupe" +msgstr "Interrompre le redimensionnement du groupe de calques" -#: ../app/core/core-enums.c:890 +#: ../app/core/core-enums.c:927 msgctxt "undo-type" msgid "Resume group layer resize" -msgstr "Poursuivre le redimensionnement du calque de groupe" +msgstr "Poursuivre le redimensionnement du groupe de calques" -#: ../app/core/core-enums.c:891 +#: ../app/core/core-enums.c:928 +msgctxt "undo-type" +msgid "Suspend group layer mask" +msgstr "Interrompre le masque du groupe de calques" + +#: ../app/core/core-enums.c:929 +msgctxt "undo-type" +msgid "Resume group layer mask" +msgstr "Reprendre le masque du groupe de calques" + +#: ../app/core/core-enums.c:930 +msgctxt "undo-type" +msgid "Start moving group layer" +msgstr "Commencer le déplacement du groupe de calques" + +#: ../app/core/core-enums.c:931 +msgctxt "undo-type" +msgid "End moving group layer" +msgstr "Terminer le déplacement du groupe de calques" + +#: ../app/core/core-enums.c:932 msgctxt "undo-type" msgid "Convert group layer" msgstr "Convertir un groupe de calques" -#: ../app/core/core-enums.c:892 +#: ../app/core/core-enums.c:933 msgctxt "undo-type" msgid "Text layer" msgstr "Calque de texte" -#: ../app/core/core-enums.c:893 +#: ../app/core/core-enums.c:934 msgctxt "undo-type" msgid "Text layer modification" msgstr "Modification du calque de texte" -#: ../app/core/core-enums.c:894 +#: ../app/core/core-enums.c:935 msgctxt "undo-type" msgid "Convert text layer" msgstr "Convertir un calque de texte" -#: ../app/core/core-enums.c:896 +#: ../app/core/core-enums.c:937 msgctxt "undo-type" msgid "Delete layer mask" msgstr "Supprimer le masque de calque" -#: ../app/core/core-enums.c:898 +#: ../app/core/core-enums.c:939 msgctxt "undo-type" msgid "Show layer mask" msgstr "Afficher le masque de calque" -#: ../app/core/core-enums.c:899 +#: ../app/core/core-enums.c:940 msgctxt "undo-type" msgid "New channel" msgstr "Nouveau canal" -#: ../app/core/core-enums.c:900 +#: ../app/core/core-enums.c:941 msgctxt "undo-type" msgid "Delete channel" msgstr "Supprimer le canal" -#: ../app/core/core-enums.c:901 +#: ../app/core/core-enums.c:942 msgctxt "undo-type" msgid "Channel color" msgstr "Couleur du canal" -#: ../app/core/core-enums.c:902 +#: ../app/core/core-enums.c:943 msgctxt "undo-type" msgid "New path" msgstr "Nouveau chemin" -#: ../app/core/core-enums.c:903 +#: ../app/core/core-enums.c:944 msgctxt "undo-type" msgid "Delete path" msgstr "Supprimer le chemin" -#: ../app/core/core-enums.c:904 +#: ../app/core/core-enums.c:945 msgctxt "undo-type" msgid "Path modification" msgstr "Modification du chemin" -#: ../app/core/core-enums.c:908 +#: ../app/core/core-enums.c:949 msgctxt "undo-type" msgid "Ink" msgstr "Calligraphie" -#: ../app/core/core-enums.c:909 +#: ../app/core/core-enums.c:950 msgctxt "undo-type" msgid "Select foreground" msgstr "Sélectionner la couleur de premier plan" -#: ../app/core/core-enums.c:912 +#: ../app/core/core-enums.c:953 msgctxt "undo-type" msgid "Not undoable" msgstr "Non annulable" -#: ../app/core/core-enums.c:992 +#: ../app/core/core-enums.c:1033 msgctxt "gradient-color" msgid "Fixed" msgstr "Fixé" -#: ../app/core/core-enums.c:993 +#: ../app/core/core-enums.c:1034 msgctxt "gradient-color" msgid "Foreground color" msgstr "Couleur de premier plan" #. Translators: this is an abbreviated version of "Foreground color". #. Keep it short. -#: ../app/core/core-enums.c:996 +#: ../app/core/core-enums.c:1037 msgctxt "gradient-color" msgid "FG" msgstr "PP" -#: ../app/core/core-enums.c:997 +#: ../app/core/core-enums.c:1038 msgctxt "gradient-color" msgid "Foreground color (transparent)" msgstr "Couleur de premier plan (transparent)" #. Translators: this is an abbreviated version of "Foreground color (transparent)". #. Keep it short. -#: ../app/core/core-enums.c:1000 +#: ../app/core/core-enums.c:1041 msgctxt "gradient-color" msgid "FG (t)" msgstr "PP (t)" -#: ../app/core/core-enums.c:1001 +#: ../app/core/core-enums.c:1042 msgctxt "gradient-color" msgid "Background color" msgstr "Couleur d’arrière-plan" #. Translators: this is an abbreviated version of "Background color". #. Keep it short. -#: ../app/core/core-enums.c:1004 +#: ../app/core/core-enums.c:1045 msgctxt "gradient-color" msgid "BG" msgstr "AP" -#: ../app/core/core-enums.c:1005 +#: ../app/core/core-enums.c:1046 msgctxt "gradient-color" msgid "Background color (transparent)" msgstr "Couleur d’arrière-plan (transparent)" #. Translators: this is an abbreviated version of "Background color (transparent)". #. Keep it short. -#: ../app/core/core-enums.c:1008 +#: ../app/core/core-enums.c:1049 msgctxt "gradient-color" msgid "BG (t)" msgstr "AP (t)" -#: ../app/core/core-enums.c:1037 +#: ../app/core/core-enums.c:1080 msgctxt "message-severity" msgid "Message" msgstr "Message" -#: ../app/core/core-enums.c:1038 +#: ../app/core/core-enums.c:1081 msgctxt "message-severity" msgid "Warning" msgstr "Avertissement" -#: ../app/core/core-enums.c:1039 +#: ../app/core/core-enums.c:1082 msgctxt "message-severity" msgid "Error" msgstr "Erreur" -#: ../app/core/core-enums.c:1068 +#: ../app/core/core-enums.c:1083 +msgctxt "message-severity" +msgid "WARNING" +msgstr "AVERTISSEMENT" + +#: ../app/core/core-enums.c:1084 +msgctxt "message-severity" +msgid "CRITICAL" +msgstr "CRITIQUE" + +#: ../app/core/core-enums.c:1113 msgctxt "color-profile-policy" msgid "Ask what to do" msgstr "Demander ce qu’il faut faire" -#: ../app/core/core-enums.c:1069 +#: ../app/core/core-enums.c:1114 msgctxt "color-profile-policy" msgid "Keep embedded profile" msgstr "Conserver le profil embarqué" -#: ../app/core/core-enums.c:1070 +#: ../app/core/core-enums.c:1115 msgctxt "color-profile-policy" msgid "Convert to preferred RGB color profile" msgstr "Convertir au profil colorimétrique RVB préféré" -#: ../app/core/core-enums.c:1107 +#: ../app/core/core-enums.c:1152 msgctxt "dynamics-output-type" msgid "Opacity" msgstr "Opacité" -#: ../app/core/core-enums.c:1108 +#: ../app/core/core-enums.c:1153 msgctxt "dynamics-output-type" msgid "Size" msgstr "Taille" -#: ../app/core/core-enums.c:1109 +#: ../app/core/core-enums.c:1154 msgctxt "dynamics-output-type" msgid "Angle" msgstr "Angle" -#: ../app/core/core-enums.c:1110 +#: ../app/core/core-enums.c:1155 msgctxt "dynamics-output-type" msgid "Color" msgstr "Couleur" -#: ../app/core/core-enums.c:1111 +#: ../app/core/core-enums.c:1156 msgctxt "dynamics-output-type" msgid "Hardness" msgstr "Dureté" -#: ../app/core/core-enums.c:1112 +#: ../app/core/core-enums.c:1157 msgctxt "dynamics-output-type" msgid "Force" msgstr "Force" -#: ../app/core/core-enums.c:1113 +#: ../app/core/core-enums.c:1158 msgctxt "dynamics-output-type" msgid "Aspect ratio" msgstr "Proportions" -#: ../app/core/core-enums.c:1114 +#: ../app/core/core-enums.c:1159 msgctxt "dynamics-output-type" msgid "Spacing" msgstr "Espacement" -#: ../app/core/core-enums.c:1115 +#: ../app/core/core-enums.c:1160 msgctxt "dynamics-output-type" msgid "Rate" msgstr "Taux" -#: ../app/core/core-enums.c:1116 +#: ../app/core/core-enums.c:1161 msgctxt "dynamics-output-type" msgid "Flow" msgstr "Débit" -#: ../app/core/core-enums.c:1117 +#: ../app/core/core-enums.c:1162 msgctxt "dynamics-output-type" msgid "Jitter" msgstr "Fluctuation" -#: ../app/core/core-enums.c:1145 +#: ../app/core/core-enums.c:1190 msgctxt "filter-region" msgid "Use the selection as input" msgstr "Utiliser la sélection comme entrée" -#: ../app/core/core-enums.c:1146 +#: ../app/core/core-enums.c:1191 msgctxt "filter-region" msgid "Use the entire layer as input" msgstr "Utiliser tout le calque comme entrée" -#: ../app/core/core-enums.c:1175 +#: ../app/core/core-enums.c:1220 msgctxt "channel-border-style" msgid "Hard" msgstr "Dur" -#: ../app/core/core-enums.c:1176 +#: ../app/core/core-enums.c:1221 msgctxt "channel-border-style" msgid "Smooth" msgstr "Lisse" -#: ../app/core/core-enums.c:1177 +#: ../app/core/core-enums.c:1222 msgctxt "channel-border-style" msgid "Feathered" msgstr "Adouci" @@ -11721,20 +11915,20 @@ msgid "Internal Procedures" msgstr "Procédures Internes" #. initialize the global parasite table -#: ../app/core/gimp.c:781 +#: ../app/core/gimp.c:783 msgid "Looking for data files" msgstr "Recherche des fichiers de données" -#: ../app/core/gimp.c:781 +#: ../app/core/gimp.c:783 msgid "Parasites" msgstr "Parasites" -#: ../app/core/gimp.c:790 +#: ../app/core/gimp.c:792 msgid "Fonts (this may take a while)" msgstr "Polices (ceci peut prendre un moment)" #. initialize the module list -#: ../app/core/gimp.c:799 ../app/dialogs/preferences-dialog.c:3052 +#: ../app/core/gimp.c:801 ../app/dialogs/preferences-dialog.c:3132 msgid "Modules" msgstr "Modules" @@ -11759,7 +11953,7 @@ msgstr "La suppression de « %s » a échoué : %s" #. initialize the list of gimp dynamics #: ../app/core/gimp-data-factories.c:322 ../app/core/gimpcontext.c:711 -#: ../app/dialogs/preferences-dialog.c:3016 +#: ../app/dialogs/preferences-dialog.c:3096 #: ../app/tools/gimppaintoptions-gui.c:225 msgid "Dynamics" msgstr "Dynamique de la brosse" @@ -11779,16 +11973,16 @@ msgctxt "undo-type" msgid "Cut Layer" msgstr "Couper le calque" -#: ../app/core/gimp-edit.c:286 ../app/core/gimpimage-new.c:325 +#: ../app/core/gimp-edit.c:313 ../app/core/gimpimage-new.c:325 msgid "Pasted Layer" msgstr "Calque Copié" -#: ../app/core/gimp-edit.c:703 +#: ../app/core/gimp-edit.c:724 msgctxt "undo-type" msgid "Clear" msgstr "Effacer" -#: ../app/core/gimp-edit.c:825 +#: ../app/core/gimp-edit.c:846 msgid "Global Buffer" msgstr "Presse-papiers global" @@ -11816,6 +12010,16 @@ msgstr "PP vers AP (TSV sens horaire)" msgid "FG to Transparent" msgstr "PP vers Transparent" +#: ../app/core/gimp-spawn.c:186 +#, c-format +msgid "Failed to fork (%s)" +msgstr "Échec d’embranchement (%s)" + +#: ../app/core/gimp-spawn.c:223 +#, c-format +msgid "Failed to execute child process “%s” (%s)" +msgstr "Échec à l’exécution du processus enfant « %s » (%s)" + #. This is a special string to specify the language identifier to #. * look for in the gimp-tags-default.xml file. Please translate the #. * C in it according to the name of the po file used for @@ -11939,7 +12143,7 @@ msgstr "Impossible de décoder le format abr de version %d." #: ../app/core/gimpbrush-load.c:572 ../app/core/gimpbrush-load.c:791 #, c-format -msgid "Fatal parse error in brush file: Brush size value currupt." +msgid "Fatal parse error in brush file: Brush size value corrupt." msgstr "" "Erreur fatale à l’analyse du fichier de brosse : la valeur taille de brosse " "est altérée." @@ -12063,7 +12267,7 @@ msgctxt "undo-type" msgid "Rounded Rectangle Select" msgstr "Sélection rectangulaire arrondie" -#: ../app/core/gimpchannel-select.c:440 ../app/core/gimplayer.c:439 +#: ../app/core/gimpchannel-select.c:440 ../app/core/gimplayer.c:448 msgctxt "undo-type" msgid "Alpha to Selection" msgstr "Alpha vers sélection" @@ -12089,148 +12293,148 @@ msgctxt "undo-type" msgid "Select by Indexed Color" msgstr "Sélection par couleur indexée" -#: ../app/core/gimpchannel.c:292 +#: ../app/core/gimpchannel.c:270 msgctxt "undo-type" msgid "Rename Channel" msgstr "Renommer le canal" -#: ../app/core/gimpchannel.c:293 +#: ../app/core/gimpchannel.c:271 msgctxt "undo-type" msgid "Move Channel" msgstr "Déplacer le canal" -#: ../app/core/gimpchannel.c:294 +#: ../app/core/gimpchannel.c:272 msgctxt "undo-type" msgid "Scale Channel" msgstr "Échelle et taille du canal" -#: ../app/core/gimpchannel.c:295 +#: ../app/core/gimpchannel.c:273 msgctxt "undo-type" msgid "Resize Channel" msgstr "Redimensionner le canal" -#: ../app/core/gimpchannel.c:296 +#: ../app/core/gimpchannel.c:274 msgctxt "undo-type" msgid "Flip Channel" msgstr "Retourner le canal" -#: ../app/core/gimpchannel.c:297 +#: ../app/core/gimpchannel.c:275 msgctxt "undo-type" msgid "Rotate Channel" msgstr "Rotation du canal" -#: ../app/core/gimpchannel.c:298 ../app/core/gimpdrawable-transform.c:1003 +#: ../app/core/gimpchannel.c:276 ../app/core/gimpdrawable-transform.c:1013 msgctxt "undo-type" msgid "Transform Channel" msgstr "Transformation du canal" -#: ../app/core/gimpchannel.c:299 ../app/core/gimpchannel.c:334 +#: ../app/core/gimpchannel.c:277 ../app/core/gimpchannel.c:309 msgctxt "undo-type" msgid "Fill Channel" msgstr "Remplir le canal" -#: ../app/core/gimpchannel.c:300 +#: ../app/core/gimpchannel.c:278 msgctxt "undo-type" msgid "Stroke Channel" msgstr "Tracer le canal" -#: ../app/core/gimpchannel.c:301 ../app/core/gimpselection.c:654 +#: ../app/core/gimpchannel.c:279 ../app/core/gimpselection.c:654 msgctxt "undo-type" msgid "Channel to Selection" msgstr "Canal vers Sélection" -#: ../app/core/gimpchannel.c:302 +#: ../app/core/gimpchannel.c:280 msgctxt "undo-type" msgid "Reorder Channel" msgstr "Réordonner le canal" -#: ../app/core/gimpchannel.c:303 +#: ../app/core/gimpchannel.c:281 msgctxt "undo-type" msgid "Raise Channel" msgstr "Remonter le canal" -#: ../app/core/gimpchannel.c:304 +#: ../app/core/gimpchannel.c:282 msgctxt "undo-type" msgid "Raise Channel to Top" msgstr "Envoyer le canal au sommet de la pile" -#: ../app/core/gimpchannel.c:305 +#: ../app/core/gimpchannel.c:283 msgctxt "undo-type" msgid "Lower Channel" msgstr "Descendre le canal" -#: ../app/core/gimpchannel.c:306 +#: ../app/core/gimpchannel.c:284 msgctxt "undo-type" msgid "Lower Channel to Bottom" msgstr "Envoyer le canal au bas de la pile" -#: ../app/core/gimpchannel.c:307 +#: ../app/core/gimpchannel.c:285 msgid "Channel cannot be raised higher." msgstr "Le canal ne peut pas être plus haut." -#: ../app/core/gimpchannel.c:308 +#: ../app/core/gimpchannel.c:286 msgid "Channel cannot be lowered more." msgstr "Le canal ne peut pas être plus bas." -#: ../app/core/gimpchannel.c:331 +#: ../app/core/gimpchannel.c:306 msgctxt "undo-type" msgid "Feather Channel" msgstr "Adoucir le canal" -#: ../app/core/gimpchannel.c:332 +#: ../app/core/gimpchannel.c:307 msgctxt "undo-type" msgid "Sharpen Channel" msgstr "Augmenter la netteté du canal" -#: ../app/core/gimpchannel.c:333 +#: ../app/core/gimpchannel.c:308 msgctxt "undo-type" msgid "Clear Channel" msgstr "Effacer le canal" -#: ../app/core/gimpchannel.c:335 +#: ../app/core/gimpchannel.c:310 msgctxt "undo-type" msgid "Invert Channel" msgstr "Inverser le canal" -#: ../app/core/gimpchannel.c:336 +#: ../app/core/gimpchannel.c:311 msgctxt "undo-type" msgid "Border Channel" msgstr "Bordure du canal" -#: ../app/core/gimpchannel.c:337 +#: ../app/core/gimpchannel.c:312 msgctxt "undo-type" msgid "Grow Channel" msgstr "Agrandissement du canal" -#: ../app/core/gimpchannel.c:338 +#: ../app/core/gimpchannel.c:313 msgctxt "undo-type" msgid "Shrink Channel" msgstr "Réduire le canal" -#: ../app/core/gimpchannel.c:339 +#: ../app/core/gimpchannel.c:314 msgctxt "undo-type" msgid "Flood Channel" msgstr "Inonder le canal" -#: ../app/core/gimpchannel.c:845 +#: ../app/core/gimpchannel.c:818 msgid "Cannot fill empty channel." msgstr "Impossible de remplir un canal vide." -#: ../app/core/gimpchannel.c:881 +#: ../app/core/gimpchannel.c:854 msgid "Cannot stroke empty channel." msgstr "Impossible de tracer un canal vide." -#: ../app/core/gimpchannel.c:1782 +#: ../app/core/gimpchannel.c:1677 msgctxt "undo-type" msgid "Set Channel Color" msgstr "Définir la couleur du canal" -#: ../app/core/gimpchannel.c:1833 +#: ../app/core/gimpchannel.c:1728 msgctxt "undo-type" msgid "Set Channel Opacity" msgstr "Définir l’opacité du canal" -#: ../app/core/gimpchannel.c:1924 ../app/core/gimpselection.c:168 +#: ../app/core/gimpchannel.c:1817 ../app/core/gimpselection.c:168 msgid "Selection Mask" msgstr "Masque de sélection" @@ -12252,7 +12456,7 @@ msgstr "Couleur d’arrière-plan" #: ../app/core/gimpcontext.c:687 ../app/core/gimpcontext.c:688 #: ../app/dialogs/fade-dialog.c:158 ../app/widgets/gimpbrushselect.c:175 -#: ../app/widgets/gimplayertreeview.c:286 +#: ../app/widgets/gimplayertreeview.c:295 msgid "Opacity" msgstr "Opacité" @@ -12280,7 +12484,7 @@ msgid "Pattern" msgstr "Motif" #: ../app/core/gimpcontext.c:732 ../app/core/gimpcontext.c:733 -#: ../app/tools/gimpblendoptions.c:266 ../app/tools/gimppaintoptions-gui.c:374 +#: ../app/tools/gimpblendoptions.c:283 ../app/tools/gimppaintoptions-gui.c:374 msgid "Gradient" msgstr "Dégradé" @@ -12321,11 +12525,11 @@ msgstr "" "%s" #: ../app/core/gimpdatafactory.c:539 ../app/core/gimpdatafactory.c:542 -#: ../app/core/gimpitem.c:538 ../app/core/gimpitem.c:541 +#: ../app/core/gimpitem.c:540 ../app/core/gimpitem.c:543 msgid "copy" msgstr "copier" -#: ../app/core/gimpdatafactory.c:551 ../app/core/gimpitem.c:549 +#: ../app/core/gimpdatafactory.c:551 ../app/core/gimpitem.c:551 #, c-format msgid "%s copy" msgstr "Copie de %s" @@ -12358,22 +12562,22 @@ msgstr "" msgid "You don't have any writable data folder configured." msgstr "Vous n’avez configuré aucun dossier de données accessible en écriture." -#: ../app/core/gimpdatafactory.c:902 +#: ../app/core/gimpdatafactory.c:904 #, c-format msgid "Error loading '%s': " msgstr "Erreur durant le chargement de « %s » :" -#: ../app/core/gimpdatafactory.c:908 +#: ../app/core/gimpdatafactory.c:910 #, c-format msgid "Error loading '%s'" msgstr "Erreur durant le chargement de « %s » :" -#: ../app/core/gimpdatafactory.c:917 ../app/xcf/xcf.c:438 +#: ../app/core/gimpdatafactory.c:920 ../app/xcf/xcf.c:439 #, c-format msgid "Could not open '%s' for reading: " msgstr "Impossible d’ouvrir « %s » en lecture : " -#: ../app/core/gimpdatafactory.c:976 +#: ../app/core/gimpdatafactory.c:979 #, c-format msgid "" "Failed to load data:\n" @@ -12389,12 +12593,12 @@ msgctxt "undo-type" msgid "Scale" msgstr "Mise à l’échelle" -#: ../app/core/gimpdrawable-blend.c:123 ../app/tools/gimpblendtool.c:965 +#: ../app/core/gimpdrawable-blend.c:125 ../app/tools/gimpblendtool.c:1015 msgctxt "undo-type" msgid "Blend" msgstr "Dégradé" -#: ../app/core/gimpdrawable-blend.c:216 +#: ../app/core/gimpdrawable-blend.c:213 msgid "Calculating distance map" msgstr "Calcul de la carte de distance" @@ -12416,7 +12620,7 @@ msgstr "Sélection flottante" msgid "Computing alpha of unknown pixels" msgstr "Calcul de l’alpha des pixels inconnus" -#: ../app/core/gimpdrawable-fill.c:202 ../app/vectors/gimpvectors.c:646 +#: ../app/core/gimpdrawable-fill.c:202 ../app/vectors/gimpvectors.c:668 msgid "Not enough points to fill" msgstr "Il n’y a pas assez de points à remplir" @@ -12437,26 +12641,26 @@ msgid "Offset Drawable" msgstr "Décalage du tracé" #: ../app/core/gimpdrawable-stroke.c:111 -#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:668 +#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:690 msgid "Not enough points to stroke" msgstr "Il n’y a pas assez de points pour le tracé" -#: ../app/core/gimpdrawable-transform.c:771 +#: ../app/core/gimpdrawable-transform.c:781 msgctxt "undo-type" msgid "Flip" msgstr "Retourner" -#: ../app/core/gimpdrawable-transform.c:856 +#: ../app/core/gimpdrawable-transform.c:866 msgctxt "undo-type" msgid "Rotate" msgstr "Rotation" -#: ../app/core/gimpdrawable-transform.c:1001 ../app/core/gimplayer.c:438 +#: ../app/core/gimpdrawable-transform.c:1011 ../app/core/gimplayer.c:447 msgctxt "undo-type" msgid "Transform Layer" msgstr "Transformation du calque" -#: ../app/core/gimpdrawable-transform.c:1014 +#: ../app/core/gimpdrawable-transform.c:1024 msgid "Transformation" msgstr "Transformation" @@ -12468,7 +12672,7 @@ msgstr "Niveaux de sortie" msgid "Style" msgstr "Style" -#: ../app/core/gimpfilloptions.c:111 ../app/pdb/gimppdbcontext.c:99 +#: ../app/core/gimpfilloptions.c:111 ../app/pdb/gimppdbcontext.c:100 #: ../app/tools/gimpbucketfilloptions.c:132 #: ../app/tools/gimpselectionoptions.c:80 ../app/tools/gimptextoptions.c:134 msgid "Antialiasing" @@ -12520,22 +12724,24 @@ msgstr "" msgid "File is corrupt." msgstr "Le fichier est altéré" -#: ../app/core/gimpgradient-load.c:195 ../app/core/gimpgradient-load.c:203 +#: ../app/core/gimpgradient-load.c:189 ../app/core/gimpgradient-load.c:199 +#: ../app/core/gimpgradient-load.c:211 ../app/core/gimpgradient-load.c:221 +#: ../app/core/gimpgradient-load.c:229 ../app/core/gimpgradient-load.c:237 #, c-format msgid "Corrupt segment %d." msgstr "Segment altéré %d." -#: ../app/core/gimpgradient-load.c:214 ../app/core/gimpgradient-load.c:224 +#: ../app/core/gimpgradient-load.c:248 ../app/core/gimpgradient-load.c:258 #, c-format msgid "Segments do not span the range 0-1." msgstr "Les segments ne rentrent pas dans l’intervalle 0-1." -#: ../app/core/gimpgradient-load.c:239 +#: ../app/core/gimpgradient-load.c:273 #, c-format msgid "In line %d of gradient file: " msgstr "%d du fichier de dégradé en ligne :" -#: ../app/core/gimpgradient-load.c:315 +#: ../app/core/gimpgradient-load.c:349 #, c-format msgid "No linear gradients found." msgstr "Aucun dégradé linéaire trouvé." @@ -12609,41 +12815,41 @@ msgstr "" msgid "Offset unit" msgstr "Unité de décalage" -#: ../app/core/gimpgrouplayer.c:261 +#: ../app/core/gimpgrouplayer.c:277 msgid "Layer Group" msgstr "Groupe de calques" -#: ../app/core/gimpgrouplayer.c:262 +#: ../app/core/gimpgrouplayer.c:278 msgctxt "undo-type" msgid "Rename Layer Group" msgstr "Renommer le groupe de calques" -#: ../app/core/gimpgrouplayer.c:263 +#: ../app/core/gimpgrouplayer.c:279 msgctxt "undo-type" msgid "Move Layer Group" msgstr "Déplacer le groupe de calques" -#: ../app/core/gimpgrouplayer.c:264 +#: ../app/core/gimpgrouplayer.c:280 msgctxt "undo-type" msgid "Scale Layer Group" msgstr "Échelle et taille du groupe de calques" -#: ../app/core/gimpgrouplayer.c:265 +#: ../app/core/gimpgrouplayer.c:281 msgctxt "undo-type" msgid "Resize Layer Group" msgstr "Redimensionner le groupe de calques" -#: ../app/core/gimpgrouplayer.c:266 +#: ../app/core/gimpgrouplayer.c:282 msgctxt "undo-type" msgid "Flip Layer Group" msgstr "Retourner le groupe de calques" -#: ../app/core/gimpgrouplayer.c:267 +#: ../app/core/gimpgrouplayer.c:283 msgctxt "undo-type" msgid "Rotate Layer Group" msgstr "Rotation du groupe de calques" -#: ../app/core/gimpgrouplayer.c:268 +#: ../app/core/gimpgrouplayer.c:284 msgctxt "undo-type" msgid "Transform Layer Group" msgstr "Transformation du groupe de calques" @@ -12652,29 +12858,29 @@ msgstr "Transformation du groupe de calques" msgid "Symmetry" msgstr "Symétrie" -#: ../app/core/gimpimage.c:2218 +#: ../app/core/gimpimage.c:2216 msgid " (exported)" msgstr " (exportée)" -#: ../app/core/gimpimage.c:2222 +#: ../app/core/gimpimage.c:2220 msgid " (overwritten)" msgstr " (écrasée)" -#: ../app/core/gimpimage.c:2231 +#: ../app/core/gimpimage.c:2229 msgid " (imported)" msgstr " (importée)" -#: ../app/core/gimpimage.c:2552 +#: ../app/core/gimpimage.c:2557 msgctxt "undo-type" msgid "Change Image Resolution" msgstr "Modifier la définition de l’image" -#: ../app/core/gimpimage.c:2604 +#: ../app/core/gimpimage.c:2609 msgctxt "undo-type" msgid "Change Image Unit" msgstr "Modifier l’unité de l’image" -#: ../app/core/gimpimage.c:3488 +#: ../app/core/gimpimage.c:3493 #, c-format msgid "" "'gimp-comment' parasite validation failed: comment contains invalid UTF-8" @@ -12682,52 +12888,52 @@ msgstr "" "Échec de validation du parasite « git-comment » : le commentaire contient un " "UTF-8 non valide" -#: ../app/core/gimpimage.c:3540 +#: ../app/core/gimpimage.c:3545 msgctxt "undo-type" msgid "Attach Parasite to Image" msgstr "Attacher un parasite à l’image" -#: ../app/core/gimpimage.c:3581 +#: ../app/core/gimpimage.c:3586 msgctxt "undo-type" msgid "Remove Parasite from Image" msgstr "Supprimer le parasite de l’image" -#: ../app/core/gimpimage.c:4292 +#: ../app/core/gimpimage.c:4297 msgctxt "undo-type" msgid "Add Layer" msgstr "Ajouter un calque" -#: ../app/core/gimpimage.c:4344 ../app/core/gimpimage.c:4364 +#: ../app/core/gimpimage.c:4339 ../app/core/gimpimage.c:4370 msgctxt "undo-type" msgid "Remove Layer" msgstr "Supprimer le calque" -#: ../app/core/gimpimage.c:4358 +#: ../app/core/gimpimage.c:4364 msgctxt "undo-type" msgid "Remove Floating Selection" msgstr "Supprimer la sélection flottante" -#: ../app/core/gimpimage.c:4523 +#: ../app/core/gimpimage.c:4531 msgctxt "undo-type" msgid "Add Channel" msgstr "Ajouter un canal" -#: ../app/core/gimpimage.c:4561 ../app/core/gimpimage.c:4574 +#: ../app/core/gimpimage.c:4559 ../app/core/gimpimage.c:4583 msgctxt "undo-type" msgid "Remove Channel" msgstr "Supprimer le canal" -#: ../app/core/gimpimage.c:4628 +#: ../app/core/gimpimage.c:4639 msgctxt "undo-type" msgid "Add Path" msgstr "Ajouter un chemin" -#: ../app/core/gimpimage.c:4659 +#: ../app/core/gimpimage.c:4669 ../app/core/gimpimage.c:4676 msgctxt "undo-type" msgid "Remove Path" msgstr "Supprimer le chemin" -#: ../app/core/gimpimage-arrange.c:170 +#: ../app/core/gimpimage-arrange.c:173 msgctxt "undo-type" msgid "Arrange Objects" msgstr "Arranger les objets" @@ -12797,98 +13003,98 @@ msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "Ajouter la couleur à la palette de couleurs" -#: ../app/core/gimpimage-convert-indexed.c:789 +#: ../app/core/gimpimage-convert-indexed.c:786 msgid "Cannot convert image: palette is empty." msgstr "Impossible de convertir l’image : la palette est vide." -#: ../app/core/gimpimage-convert-indexed.c:803 +#: ../app/core/gimpimage-convert-indexed.c:798 msgctxt "undo-type" msgid "Convert Image to Indexed" msgstr "Convertir l’image en couleurs indexées" -#: ../app/core/gimpimage-convert-indexed.c:884 +#: ../app/core/gimpimage-convert-indexed.c:890 msgid "Converting to indexed colors (stage 2)" msgstr "Convertir en couleurs indexées (étape 2)" -#: ../app/core/gimpimage-convert-indexed.c:932 +#: ../app/core/gimpimage-convert-indexed.c:939 msgid "Converting to indexed colors (stage 3)" msgstr "Convertir en couleurs indexées (étape 3)" -#: ../app/core/gimpimage-convert-precision.c:83 +#: ../app/core/gimpimage-convert-precision.c:76 msgctxt "undo-type" msgid "Convert Image to 8 bit linear integer" msgstr "Convertir l’image en entier 8 bits (linéaire)" -#: ../app/core/gimpimage-convert-precision.c:86 +#: ../app/core/gimpimage-convert-precision.c:79 msgctxt "undo-type" msgid "Convert Image to 8 bit gamma integer" msgstr "Convertir l’image en entier 8 bits (gamma)" -#: ../app/core/gimpimage-convert-precision.c:89 +#: ../app/core/gimpimage-convert-precision.c:82 msgctxt "undo-type" msgid "Convert Image to 16 bit linear integer" msgstr "Convertir l’image en entier 16 bits (linéaire)" -#: ../app/core/gimpimage-convert-precision.c:92 +#: ../app/core/gimpimage-convert-precision.c:85 msgctxt "undo-type" msgid "Convert Image to 16 bit gamma integer" msgstr "Convertir l’image en entier 16 bits (gamma)" -#: ../app/core/gimpimage-convert-precision.c:95 +#: ../app/core/gimpimage-convert-precision.c:88 msgctxt "undo-type" msgid "Convert Image to 32 bit linear integer" msgstr "Convertir l’image en entier 32 bits (linéaire)" -#: ../app/core/gimpimage-convert-precision.c:98 +#: ../app/core/gimpimage-convert-precision.c:91 msgctxt "undo-type" msgid "Convert Image to 32 bit gamma integer" msgstr "Convertir l’image en entier 32 bits (gamma)" -#: ../app/core/gimpimage-convert-precision.c:101 +#: ../app/core/gimpimage-convert-precision.c:94 msgctxt "undo-type" msgid "Convert Image to 16 bit linear floating point" msgstr "Convertir l’image en virgule flottante 16 bits (linéaire)" -#: ../app/core/gimpimage-convert-precision.c:104 +#: ../app/core/gimpimage-convert-precision.c:97 msgctxt "undo-type" msgid "Convert Image to 16 bit gamma floating point" msgstr "Convertir l’image en virgule flottante 16 bits (gamma)" -#: ../app/core/gimpimage-convert-precision.c:107 +#: ../app/core/gimpimage-convert-precision.c:100 msgctxt "undo-type" msgid "Convert Image to 32 bit linear floating point" msgstr "Convertir l’image en virgule flottante 32 bits (linéaire)" -#: ../app/core/gimpimage-convert-precision.c:110 +#: ../app/core/gimpimage-convert-precision.c:103 msgctxt "undo-type" msgid "Convert Image to 32 bit gamma floating point" msgstr "Convertir l’image en virgule flottante 32 bits (gamma)" -#: ../app/core/gimpimage-convert-precision.c:113 +#: ../app/core/gimpimage-convert-precision.c:106 msgctxt "undo-type" msgid "Convert Image to 64 bit linear floating point" msgstr "Convertir l’image en virgule flottante 64 bits (linéaire)" -#: ../app/core/gimpimage-convert-precision.c:116 +#: ../app/core/gimpimage-convert-precision.c:109 msgctxt "undo-type" msgid "Convert Image to 64 bit gamma floating point" msgstr "Convertir l’image en virgule flottante 64 bits (gamma)" #. dithering -#: ../app/core/gimpimage-convert-precision.c:284 -#: ../app/core/gimpimage-convert-precision.c:298 +#: ../app/core/gimpimage-convert-precision.c:267 +#: ../app/core/gimpimage-convert-precision.c:288 #: ../app/dialogs/convert-indexed-dialog.c:236 #: ../app/dialogs/convert-precision-dialog.c:221 -#: ../app/tools/gimpblendoptions.c:124 +#: ../app/tools/gimpblendoptions.c:135 msgid "Dithering" msgstr "Tramage" -#: ../app/core/gimpimage-convert-type.c:83 +#: ../app/core/gimpimage-convert-type.c:81 msgctxt "undo-type" msgid "Convert Image to RGB" msgstr "Convertir l’image en RVB" -#: ../app/core/gimpimage-convert-type.c:87 +#: ../app/core/gimpimage-convert-type.c:85 msgctxt "undo-type" msgid "Convert Image to Grayscale" msgstr "Convertir l’image en niveaux de gris" @@ -12898,7 +13104,7 @@ msgctxt "undo-type" msgid "Crop Image" msgstr "Découper l’image" -#: ../app/core/gimpimage-crop.c:75 ../app/core/gimpimage-resize.c:90 +#: ../app/core/gimpimage-crop.c:75 ../app/core/gimpimage-resize.c:91 msgctxt "undo-type" msgid "Resize Image" msgstr "Redimensionner l’image" @@ -12923,22 +13129,22 @@ msgctxt "undo-type" msgid "Move Guide" msgstr "Déplacer le guide" -#: ../app/core/gimpimage-item-list.c:113 +#: ../app/core/gimpimage-item-list.c:117 msgctxt "undo-type" msgid "Translate Items" msgstr "Déplacer l’élément" -#: ../app/core/gimpimage-item-list.c:141 +#: ../app/core/gimpimage-item-list.c:157 msgctxt "undo-type" msgid "Flip Items" msgstr "Retourner l’élément" -#: ../app/core/gimpimage-item-list.c:170 ../app/core/gimpitem-linked.c:164 +#: ../app/core/gimpimage-item-list.c:196 ../app/core/gimpitem-linked.c:164 msgctxt "undo-type" msgid "Rotate Items" msgstr "Tourner l’élément" -#: ../app/core/gimpimage-item-list.c:201 +#: ../app/core/gimpimage-item-list.c:246 msgctxt "undo-type" msgid "Transform Items" msgstr "Transformer l’élément" @@ -12961,34 +13167,38 @@ msgstr "Impossible d’aplatir une image sans calque visible." msgid "Cannot merge down a floating selection." msgstr "Impossible de fusionner une sélection flottante." -#: ../app/core/gimpimage-merge.c:270 +#: ../app/core/gimpimage-merge.c:252 +msgid "Cannot merge down an invisible layer." +msgstr "Impossible de fusionner vers le bas un calque invisible." + +#: ../app/core/gimpimage-merge.c:277 msgid "Cannot merge down to a layer group." msgstr "Impossible de fusionner vers un groupe de calques." -#: ../app/core/gimpimage-merge.c:277 +#: ../app/core/gimpimage-merge.c:284 msgid "The layer to merge down to is locked." msgstr "Le calque destinataire de la fusion est verrouillé." -#: ../app/core/gimpimage-merge.c:289 +#: ../app/core/gimpimage-merge.c:296 msgid "There is no visible layer to merge down to." msgstr "Il n’y a pas de calque visible à fusionner." -#: ../app/core/gimpimage-merge.c:299 +#: ../app/core/gimpimage-merge.c:306 msgctxt "undo-type" msgid "Merge Down" msgstr "Fusionner vers le bas" -#: ../app/core/gimpimage-merge.c:327 +#: ../app/core/gimpimage-merge.c:334 msgctxt "undo-type" msgid "Merge Layer Group" msgstr "Fusionner le groupe de calques" -#: ../app/core/gimpimage-merge.c:380 +#: ../app/core/gimpimage-merge.c:387 msgctxt "undo-type" msgid "Merge Visible Paths" msgstr "Fusionner les chemins visibles" -#: ../app/core/gimpimage-merge.c:416 +#: ../app/core/gimpimage-merge.c:423 msgid "Not enough visible paths for a merge. There must be at least two." msgstr "" "Il n’y a pas assez de chemins visibles pour une fusion. Il en faut au moins " @@ -13019,18 +13229,18 @@ msgctxt "undo-type" msgid "Move Sample Point" msgstr "Déplacer le point d’échantillonnage" -#: ../app/core/gimpimage-scale.c:86 +#: ../app/core/gimpimage-scale.c:79 msgctxt "undo-type" msgid "Scale Image" msgstr "Échelle et taille de l’image" -#: ../app/core/gimpimage-undo-push.c:964 +#: ../app/core/gimpimage-undo-push.c:1028 #, c-format msgid "Can't undo %s" msgstr "Impossible d’annuler %s" -#: ../app/core/gimpimagefile.c:750 ../app/dialogs/preferences-dialog.c:1778 -#: ../app/dialogs/preferences-dialog.c:1884 +#: ../app/core/gimpimagefile.c:750 ../app/dialogs/preferences-dialog.c:1842 +#: ../app/dialogs/preferences-dialog.c:1948 msgid "Folder" msgstr "Dossier" @@ -13083,17 +13293,17 @@ msgstr[1] "%d calques" msgid "Could not open thumbnail '%s': %s" msgstr "Impossible d’ouvrir la vignette « %s » : %s" -#: ../app/core/gimpitem.c:1955 +#: ../app/core/gimpitem.c:2075 msgctxt "undo-type" msgid "Attach Parasite" msgstr "Attacher un parasite" -#: ../app/core/gimpitem.c:1965 +#: ../app/core/gimpitem.c:2085 msgctxt "undo-type" msgid "Attach Parasite to Item" msgstr "Attacher un parasite à l’élément" -#: ../app/core/gimpitem.c:2016 ../app/core/gimpitem.c:2023 +#: ../app/core/gimpitem.c:2136 ../app/core/gimpitem.c:2143 msgctxt "undo-type" msgid "Remove Parasite from Item" msgstr "Supprimer un parasite de l’élément" @@ -13111,7 +13321,7 @@ msgctxt "undo-type" msgid "Anchor Floating Selection" msgstr "Ancrer la sélection flottante" -#: ../app/core/gimplayer-floating-selection.c:175 ../app/core/gimplayer.c:1028 +#: ../app/core/gimplayer-floating-selection.c:175 ../app/core/gimplayer.c:1037 msgid "" "Cannot create a new layer from the floating selection because it belongs to " "a layer mask or channel." @@ -13124,76 +13334,76 @@ msgctxt "undo-type" msgid "Floating Selection to Layer" msgstr "Sélection flottante vers calque" -#: ../app/core/gimplayer.c:432 +#: ../app/core/gimplayer.c:441 msgctxt "undo-type" msgid "Rename Layer" msgstr "Renommer le calque" -#: ../app/core/gimplayer.c:433 +#: ../app/core/gimplayer.c:442 msgctxt "undo-type" msgid "Move Layer" msgstr "Déplacer le calque" -#: ../app/core/gimplayer.c:434 +#: ../app/core/gimplayer.c:443 msgctxt "undo-type" msgid "Scale Layer" msgstr "Échelle et taille du calque" -#: ../app/core/gimplayer.c:435 +#: ../app/core/gimplayer.c:444 msgctxt "undo-type" msgid "Resize Layer" msgstr "Redimensionner le calque" -#: ../app/core/gimplayer.c:436 +#: ../app/core/gimplayer.c:445 msgctxt "undo-type" msgid "Flip Layer" msgstr "Retourner le calque" -#: ../app/core/gimplayer.c:437 +#: ../app/core/gimplayer.c:446 msgctxt "undo-type" msgid "Rotate Layer" msgstr "Rotation du calque" -#: ../app/core/gimplayer.c:440 +#: ../app/core/gimplayer.c:449 msgctxt "undo-type" msgid "Reorder Layer" msgstr "Réordonner le calque" -#: ../app/core/gimplayer.c:441 +#: ../app/core/gimplayer.c:450 msgctxt "undo-type" msgid "Raise Layer" msgstr "Remonter le calque" -#: ../app/core/gimplayer.c:442 +#: ../app/core/gimplayer.c:451 msgctxt "undo-type" msgid "Raise Layer to Top" msgstr "Envoyer le calque tout en haut" -#: ../app/core/gimplayer.c:443 +#: ../app/core/gimplayer.c:452 msgctxt "undo-type" msgid "Lower Layer" msgstr "Descendre le calque" -#: ../app/core/gimplayer.c:444 +#: ../app/core/gimplayer.c:453 msgctxt "undo-type" msgid "Lower Layer to Bottom" msgstr "Envoyer le Calque tout en bas" -#: ../app/core/gimplayer.c:445 +#: ../app/core/gimplayer.c:454 msgid "Layer cannot be raised higher." msgstr "Le calque ne peut pas être monté plus haut." -#: ../app/core/gimplayer.c:446 +#: ../app/core/gimplayer.c:455 msgid "Layer cannot be lowered more." msgstr "Le calque ne peut pas être descendu plus bas." -#: ../app/core/gimplayer.c:735 ../app/core/gimplayer.c:1744 +#: ../app/core/gimplayer.c:744 ../app/core/gimplayer.c:1905 #: ../app/core/gimplayermask.c:257 #, c-format msgid "%s mask" msgstr "masque %s" -#: ../app/core/gimplayer.c:774 +#: ../app/core/gimplayer.c:783 #, c-format msgid "" "Floating Selection\n" @@ -13202,64 +13412,64 @@ msgstr "" "Sélection flottante\n" "(%s)" -#: ../app/core/gimplayer.c:1650 +#: ../app/core/gimplayer.c:1811 msgid "Unable to add a layer mask since the layer already has one." msgstr "" "Impossible d’ajouter un masque au\n" "calque car il en a déjà un." -#: ../app/core/gimplayer.c:1661 +#: ../app/core/gimplayer.c:1822 msgid "Cannot add layer mask of different dimensions than specified layer." msgstr "" "Impossible d’ajouter un masque de\n" "dimensions différentes de celles du calque." -#: ../app/core/gimplayer.c:1667 +#: ../app/core/gimplayer.c:1828 msgctxt "undo-type" msgid "Add Layer Mask" msgstr "Ajouter un masque de calque" -#: ../app/core/gimplayer.c:1795 +#: ../app/core/gimplayer.c:1956 msgctxt "undo-type" msgid "Transfer Alpha to Mask" msgstr "Transfert de l’alpha vers le masque" -#: ../app/core/gimplayer.c:1947 +#: ../app/core/gimplayer.c:2112 msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "Appliquer le masque de calque" -#: ../app/core/gimplayer.c:1948 +#: ../app/core/gimplayer.c:2113 msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "Supprimer le masque de calque" -#: ../app/core/gimplayer.c:2050 +#: ../app/core/gimplayer.c:2215 msgctxt "undo-type" msgid "Enable Layer Mask" msgstr "Activer le masque de calque" -#: ../app/core/gimplayer.c:2051 +#: ../app/core/gimplayer.c:2216 msgctxt "undo-type" msgid "Disable Layer Mask" msgstr "Désactiver le masque de calque" -#: ../app/core/gimplayer.c:2127 +#: ../app/core/gimplayer.c:2292 msgctxt "undo-type" msgid "Show Layer Mask" msgstr "Afficher le masque de calque" -#: ../app/core/gimplayer.c:2200 +#: ../app/core/gimplayer.c:2365 msgctxt "undo-type" msgid "Add Alpha Channel" msgstr "Ajouter un canal alpha" -#: ../app/core/gimplayer.c:2235 +#: ../app/core/gimplayer.c:2400 msgctxt "undo-type" msgid "Remove Alpha Channel" msgstr "Supprimer le canal alpha" -#: ../app/core/gimplayer.c:2256 +#: ../app/core/gimplayer.c:2421 msgctxt "undo-type" msgid "Layer to Image Size" msgstr "Calque aux dimensions de l’image" @@ -13556,16 +13766,16 @@ msgid "Emulate brush dynamics" msgstr "Émuler une brosse dynamique" #. no undo (or redo) steps available -#: ../app/core/gimpsymmetry.c:132 ../app/widgets/gimpimagepropview.c:399 +#: ../app/core/gimpsymmetry.c:134 ../app/widgets/gimpimagepropview.c:399 #: ../app/widgets/gimpsymmetryeditor.c:169 msgid "None" msgstr "Aucun" -#: ../app/core/gimpsymmetry.c:145 +#: ../app/core/gimpsymmetry.c:148 msgid "Active" msgstr "Actif" -#: ../app/core/gimpsymmetry.c:146 +#: ../app/core/gimpsymmetry.c:149 msgid "Activate symmetry painting" msgstr "Activer la peinture en symétrie" @@ -13724,7 +13934,7 @@ msgstr "Précision" #. gamma #: ../app/core/gimptemplate.c:205 ../app/dialogs/convert-precision-dialog.c:195 #: ../app/operations/gimplevelsconfig.c:139 -#: ../app/operations/gimplevelsconfig.c:140 ../app/tools/gimplevelstool.c:496 +#: ../app/operations/gimplevelsconfig.c:140 ../app/tools/gimplevelstool.c:500 msgid "Gamma" msgstr "Gamma" @@ -13853,17 +14063,17 @@ msgctxt "plural" msgid "percent" msgstr "pour cent" -#: ../app/dialogs/about-dialog.c:117 +#: ../app/dialogs/about-dialog.c:115 msgid "About GIMP" msgstr "À propos de GIMP" -#: ../app/dialogs/about-dialog.c:126 +#: ../app/dialogs/about-dialog.c:124 msgid "Visit the GIMP website" msgstr "Visitez le site Web de GIMP" #. Translators: insert your names here, #. separated by newline -#: ../app/dialogs/about-dialog.c:132 +#: ../app/dialogs/about-dialog.c:130 msgid "translator-credits" msgstr "" "Christophe Merlet \n" @@ -13880,11 +14090,11 @@ msgstr "" "Laurent Monin \n" "Yannick Tailliez " -#: ../app/dialogs/about-dialog.c:531 +#: ../app/dialogs/about-dialog.c:529 msgid "GIMP is brought to you by" msgstr "GIMP vous est présenté par" -#: ../app/dialogs/about-dialog.c:607 +#: ../app/dialogs/about-dialog.c:605 #, c-format msgid "" "This is an unstable development release\n" @@ -14074,7 +14284,7 @@ msgid "Enable dithering of _transparency" msgstr "Activer le tramage de la _transparence" #: ../app/dialogs/convert-indexed-dialog.c:275 -#: ../app/dialogs/preferences-dialog.c:2103 +#: ../app/dialogs/preferences-dialog.c:2167 msgid "Enable dithering of text layers" msgstr "Activer le tramage des calques de texte" @@ -14134,72 +14344,76 @@ msgid "" "Are you sure you want to remove '%s' from the list and delete it on disk?" msgstr "Voulez-vous vraiment supprimer « %s » de la liste et du disque ?" -#: ../app/dialogs/dialogs-constructors.c:215 ../app/gui/gui.c:190 -#: ../app/gui/gui-message.c:215 +#: ../app/dialogs/dialogs-constructors.c:216 ../app/gui/gui.c:190 +#: ../app/gui/gui-message.c:268 msgid "GIMP Message" msgstr "Message de GIMP" -#: ../app/dialogs/dialogs.c:312 +#: ../app/dialogs/dialogs-constructors.c:225 +msgid "GIMP Debug" +msgstr "Débogage de GIMP" + +#: ../app/dialogs/dialogs.c:314 msgid "Devices" msgstr "Périphériques" -#: ../app/dialogs/dialogs.c:312 +#: ../app/dialogs/dialogs.c:314 msgid "Device Status" msgstr "État des périphériques" -#: ../app/dialogs/dialogs.c:316 +#: ../app/dialogs/dialogs.c:318 msgid "Errors" msgstr "Erreurs" -#: ../app/dialogs/dialogs.c:320 +#: ../app/dialogs/dialogs.c:322 msgid "Pointer" msgstr "Pointeur" -#: ../app/dialogs/dialogs.c:360 +#: ../app/dialogs/dialogs.c:362 msgid "History" msgstr "Historique" -#: ../app/dialogs/dialogs.c:363 +#: ../app/dialogs/dialogs.c:365 msgid "Image Templates" msgstr "Modèles d’image" -#: ../app/dialogs/dialogs.c:384 +#: ../app/dialogs/dialogs.c:386 msgid "Histogram" msgstr "Histogramme" -#: ../app/dialogs/dialogs.c:388 +#: ../app/dialogs/dialogs.c:390 msgid "Selection" msgstr "Sélection" -#: ../app/dialogs/dialogs.c:388 +#: ../app/dialogs/dialogs.c:390 msgid "Selection Editor" msgstr "Éditeur de sélection" -#: ../app/dialogs/dialogs.c:392 +#: ../app/dialogs/dialogs.c:394 msgid "Symmetry Painting" msgstr "Peinture en symétrie" -#: ../app/dialogs/dialogs.c:396 +#: ../app/dialogs/dialogs.c:398 msgid "Undo" msgstr "Annuler" -#: ../app/dialogs/dialogs.c:396 +#: ../app/dialogs/dialogs.c:398 msgid "Undo History" msgstr "Historique d’annulation" -#: ../app/dialogs/dialogs.c:406 +#: ../app/dialogs/dialogs.c:408 msgid "Navigation" msgstr "Navigation" -#: ../app/dialogs/dialogs.c:406 +#: ../app/dialogs/dialogs.c:408 msgid "Display Navigation" msgstr "Afficher la navigation" -#: ../app/dialogs/dialogs.c:412 +#: ../app/dialogs/dialogs.c:414 msgid "FG/BG" msgstr "PP/AP" -#: ../app/dialogs/dialogs.c:412 +#: ../app/dialogs/dialogs.c:414 msgid "FG/BG Color" msgstr "Couleur PP/AP" @@ -14215,7 +14429,7 @@ msgstr "_Fondu" #: ../app/dialogs/fade-dialog.c:151 #: ../app/operations/gimpoperationdesaturate.c:90 #: ../app/tools/gimppaintoptions-gui.c:119 ../app/widgets/gimpdeviceinfo.c:132 -#: ../app/widgets/gimplayertreeview.c:270 +#: ../app/widgets/gimplayertreeview.c:279 msgid "Mode" msgstr "Mode" @@ -14362,7 +14576,7 @@ msgid "Create a New Image" msgstr "Créer une nouvelle image" #: ../app/dialogs/image-new-dialog.c:138 -#: ../app/dialogs/preferences-dialog.c:1604 +#: ../app/dialogs/preferences-dialog.c:1668 msgid "_Template:" msgstr "_Modèle :" @@ -14395,8 +14609,9 @@ msgstr "Propriétés de l’image" #: ../app/dialogs/input-devices-dialog.c:62 #: ../app/dialogs/keyboard-shortcuts-dialog.c:55 #: ../app/dialogs/module-dialog.c:134 ../app/tools/gimpblendtool-editor.c:1851 -#: ../app/tools/gimpcolorpickertool.c:349 ../app/tools/gimpmeasuretool.c:650 -#: ../app/widgets/gimpcontrollerlist.c:640 ../app/widgets/gimppdbdialog.c:175 +#: ../app/tools/gimpcolorpickertool.c:349 ../app/tools/gimpmeasuretool.c:651 +#: ../app/widgets/gimpcontrollerlist.c:640 +#: ../app/widgets/gimpcriticaldialog.c:97 ../app/widgets/gimppdbdialog.c:175 #: ../app/widgets/gimpsettingsbox.c:663 ../app/widgets/gimptexteditor.c:162 msgid "_Close" msgstr "_Fermer" @@ -14533,11 +14748,11 @@ msgid "_Opacity:" msgstr "_Opacité :" #. The size labels -#: ../app/dialogs/layer-options-dialog.c:252 ../app/tools/gimpmeasuretool.c:725 +#: ../app/dialogs/layer-options-dialog.c:252 ../app/tools/gimpmeasuretool.c:726 msgid "Width:" msgstr "Largeur :" -#: ../app/dialogs/layer-options-dialog.c:258 ../app/tools/gimpmeasuretool.c:753 +#: ../app/dialogs/layer-options-dialog.c:258 ../app/tools/gimpmeasuretool.c:754 msgid "Height:" msgstr "Hauteur :" @@ -14677,7 +14892,7 @@ msgstr "Décalage du canal" #. The offset frame #: ../app/dialogs/offset-dialog.c:129 ../app/dialogs/offset-dialog.c:163 #: ../app/dialogs/resize-dialog.c:230 ../app/tools/gimpalignoptions.c:100 -#: ../app/tools/gimpalignoptions.c:107 ../app/tools/gimpblendoptions.c:84 +#: ../app/tools/gimpalignoptions.c:107 ../app/tools/gimpblendoptions.c:88 #: ../app/widgets/gimpgrideditor.c:209 msgid "Offset" msgstr "Décalage" @@ -14730,7 +14945,7 @@ msgid "Select Source" msgstr "Sélectionner la source" #: ../app/dialogs/palette-import-dialog.c:212 -#: ../app/dialogs/preferences-dialog.c:1566 +#: ../app/dialogs/preferences-dialog.c:1630 msgid "_Gradient" msgstr "_Dégradé" @@ -14794,21 +15009,21 @@ msgstr "La source sélectionnée ne contient pas de couleurs." msgid "There is no palette to import." msgstr "Il n’y a pas de palette à importer." -#: ../app/dialogs/preferences-dialog.c:279 +#: ../app/dialogs/preferences-dialog.c:280 msgid "Reset All Preferences" msgstr "Réinitialiser toutes les préférences" -#: ../app/dialogs/preferences-dialog.c:297 +#: ../app/dialogs/preferences-dialog.c:298 msgid "Do you really want to reset all preferences to default values?" msgstr "" "Voulez-vous vraiment réinitialiser toutes les préférences à leurs valeurs " "par défaut ?" -#: ../app/dialogs/preferences-dialog.c:376 +#: ../app/dialogs/preferences-dialog.c:377 msgid "You will have to restart GIMP for the following changes to take effect:" msgstr "Vous devez relancer GIMP pour que ces changements prennent effet." -#: ../app/dialogs/preferences-dialog.c:614 +#: ../app/dialogs/preferences-dialog.c:619 msgid "" "Your keyboard shortcuts will be reset to default values the next time you " "start GIMP." @@ -14816,16 +15031,16 @@ msgstr "" "Vos raccourcis clavier seront réinitialisés aux valeurs par défaut la " "prochaine fois que vous démarrerez GIMP." -#: ../app/dialogs/preferences-dialog.c:625 +#: ../app/dialogs/preferences-dialog.c:630 msgid "Remove all Keyboard Shortcuts" msgstr "Enlever tous les raccourcis clavier" -#: ../app/dialogs/preferences-dialog.c:647 +#: ../app/dialogs/preferences-dialog.c:652 msgid "Do you really want to remove all keyboard shortcuts from all menus?" msgstr "" "Voulez-vous vraiment enlever tous les raccourcis clavier de tous les menus ?" -#: ../app/dialogs/preferences-dialog.c:688 +#: ../app/dialogs/preferences-dialog.c:693 msgid "" "Your window setup will be reset to default values the next time you start " "GIMP." @@ -14833,7 +15048,7 @@ msgstr "" "Vos paramètres des fenêtres seront réinitialisés, aux valeurs par défaut, la " "prochaine fois que vous démarrerez GIMP." -#: ../app/dialogs/preferences-dialog.c:723 +#: ../app/dialogs/preferences-dialog.c:728 msgid "" "Your input device settings will be reset to default values the next time you " "start GIMP." @@ -14841,7 +15056,7 @@ msgstr "" "Vos périphériques d’entrée seront réinitialisés aux valeurs par défaut la " "prochaine fois que vous démarrerez GIMP." -#: ../app/dialogs/preferences-dialog.c:765 +#: ../app/dialogs/preferences-dialog.c:770 msgid "" "Your tool options will be reset to default values the next time you start " "GIMP." @@ -14849,110 +15064,110 @@ msgstr "" "Vos options des outils seront réinitialisés aux valeurs par défaut la " "prochaine fois que vous démarrerez GIMP." -#: ../app/dialogs/preferences-dialog.c:817 -#: ../app/dialogs/preferences-dialog.c:2376 +#: ../app/dialogs/preferences-dialog.c:822 +#: ../app/dialogs/preferences-dialog.c:2456 msgid "There's a local installation of the user manual." msgstr "Il y a une copie locale du manuel de l’utilisateur." -#: ../app/dialogs/preferences-dialog.c:822 -#: ../app/dialogs/preferences-dialog.c:2382 +#: ../app/dialogs/preferences-dialog.c:827 +#: ../app/dialogs/preferences-dialog.c:2462 msgid "The user manual is not installed locally." msgstr "Le manuel de l’utilisateur n’est pas installé localement." -#: ../app/dialogs/preferences-dialog.c:929 +#: ../app/dialogs/preferences-dialog.c:934 msgid "Show _menubar" msgstr "Afficher la barre de _menu" -#: ../app/dialogs/preferences-dialog.c:933 +#: ../app/dialogs/preferences-dialog.c:938 msgid "Show _rulers" msgstr "Afficher les _règles" -#: ../app/dialogs/preferences-dialog.c:936 +#: ../app/dialogs/preferences-dialog.c:941 msgid "Show scroll_bars" msgstr "Afficher les barres de _défilement" -#: ../app/dialogs/preferences-dialog.c:939 +#: ../app/dialogs/preferences-dialog.c:944 msgid "Show s_tatusbar" msgstr "Afficher la barre d’é_tat" -#: ../app/dialogs/preferences-dialog.c:947 +#: ../app/dialogs/preferences-dialog.c:952 msgid "Show s_election" msgstr "Afficher la _sélection" -#: ../app/dialogs/preferences-dialog.c:950 +#: ../app/dialogs/preferences-dialog.c:955 msgid "Show _layer boundary" msgstr "Afficher les _bords du calque" -#: ../app/dialogs/preferences-dialog.c:953 +#: ../app/dialogs/preferences-dialog.c:958 msgid "Show _guides" msgstr "Afficher les g_uides" -#: ../app/dialogs/preferences-dialog.c:956 +#: ../app/dialogs/preferences-dialog.c:961 msgid "Show gri_d" msgstr "Afficher la g_rille" -#: ../app/dialogs/preferences-dialog.c:962 +#: ../app/dialogs/preferences-dialog.c:967 msgid "Canvas _padding mode:" msgstr "Mode de _remplissage du canevas :" -#: ../app/dialogs/preferences-dialog.c:967 +#: ../app/dialogs/preferences-dialog.c:972 msgid "Custom p_adding color:" msgstr "Couleur de remplissage _personnalisée :" -#: ../app/dialogs/preferences-dialog.c:968 +#: ../app/dialogs/preferences-dialog.c:973 msgid "Select Custom Canvas Padding Color" msgstr "Sélectionner des couleurs de remplissage personnalisés du canevas" -#: ../app/dialogs/preferences-dialog.c:998 +#: ../app/dialogs/preferences-dialog.c:1003 msgid "Snap to Guides" msgstr "Aligner sur les guides" -#: ../app/dialogs/preferences-dialog.c:1001 +#: ../app/dialogs/preferences-dialog.c:1006 msgid "Snap to Grid" msgstr "Aligner sur la grille" -#: ../app/dialogs/preferences-dialog.c:1009 +#: ../app/dialogs/preferences-dialog.c:1014 msgid "Snap to Canvas Edges" msgstr "Aligner sur les bords du canevas" -#: ../app/dialogs/preferences-dialog.c:1012 +#: ../app/dialogs/preferences-dialog.c:1017 msgid "Snap to Active Path" msgstr "Aligner sur le chemin actif" -#: ../app/dialogs/preferences-dialog.c:1089 +#: ../app/dialogs/preferences-dialog.c:1094 msgid "Preferences" msgstr "Préférences" -#: ../app/dialogs/preferences-dialog.c:1125 -#: ../app/dialogs/preferences-dialog.c:1126 +#: ../app/dialogs/preferences-dialog.c:1130 +#: ../app/dialogs/preferences-dialog.c:1131 msgid "System Resources" msgstr "Resources système" -#: ../app/dialogs/preferences-dialog.c:1133 +#: ../app/dialogs/preferences-dialog.c:1138 msgid "Resource Consumption" msgstr "Consommation des ressources" -#: ../app/dialogs/preferences-dialog.c:1143 +#: ../app/dialogs/preferences-dialog.c:1148 msgid "Minimal number of _undo levels:" msgstr "Nombre minimal de niveaux d’_annulation :" -#: ../app/dialogs/preferences-dialog.c:1146 +#: ../app/dialogs/preferences-dialog.c:1151 msgid "Maximum undo _memory:" msgstr "_Mémoire maximale pour l’annulation :" -#: ../app/dialogs/preferences-dialog.c:1149 +#: ../app/dialogs/preferences-dialog.c:1154 msgid "Tile cache _size:" msgstr "Taille du _cache d’image :" -#: ../app/dialogs/preferences-dialog.c:1152 +#: ../app/dialogs/preferences-dialog.c:1157 msgid "Maximum _new image size:" msgstr "Taille ma_ximale de la nouvelle image :" -#: ../app/dialogs/preferences-dialog.c:1157 +#: ../app/dialogs/preferences-dialog.c:1162 msgid "Number of _threads to use:" msgstr "Nombre de _fils d’exécution à utiliser :" -#: ../app/dialogs/preferences-dialog.c:1162 +#: ../app/dialogs/preferences-dialog.c:1167 msgid "" "Threading support is not yet stable.\n" "Setting this to greater than one might\n" @@ -14964,726 +15179,774 @@ msgstr "" "des erreurs dans l’image ou un plantage." #. Hardware Acceleration -#: ../app/dialogs/preferences-dialog.c:1172 +#: ../app/dialogs/preferences-dialog.c:1177 msgid "Hardware Acceleration" msgstr "Accélération matérielle" -#: ../app/dialogs/preferences-dialog.c:1176 +#: ../app/dialogs/preferences-dialog.c:1181 msgid "Use OpenCL" msgstr "Utiliser OpenCL" #. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1180 +#: ../app/dialogs/preferences-dialog.c:1185 msgid "Image Thumbnails" msgstr "Vignettes d’image" -#: ../app/dialogs/preferences-dialog.c:1185 +#: ../app/dialogs/preferences-dialog.c:1190 msgid "Size of _thumbnails:" msgstr "_Taille des vignettes :" -#: ../app/dialogs/preferences-dialog.c:1189 +#: ../app/dialogs/preferences-dialog.c:1194 msgid "Maximum _filesize for thumbnailing:" msgstr "Taille max_imale pour les fichiers de vignettes :" -#: ../app/dialogs/preferences-dialog.c:1199 +#: ../app/dialogs/preferences-dialog.c:1204 msgid "Keep record of used files in the Recent Documents list" msgstr "Mémoriser les fichiers utilisés dans la liste des documents récents" -#: ../app/dialogs/preferences-dialog.c:1208 -#: ../app/dialogs/preferences-dialog.c:1209 +#. TODO: icon needed. +#: ../app/dialogs/preferences-dialog.c:1219 +#: ../app/dialogs/preferences-dialog.c:1220 +msgid "Debugging" +msgstr "Débogage" + +#: ../app/dialogs/preferences-dialog.c:1227 +msgid "" +"We hope you will never need these settings, but as all software, GIMP has " +"bugs, and crashes can occur. If it happens, you can help us by reporting " +"bugs." +msgstr "" +"Nou espérons que vous n’aurez jamais affaire à ces réglages, mais comme tout " +"logiciel, GIMP a aussi des bogues, et un plantage peut survenir. Si cela " +"arrive, vous pouvez nous aider en établissant un rapport d’anomalie." + +#: ../app/dialogs/preferences-dialog.c:1236 +msgid "Bug Reporting" +msgstr "Rapport d’anomalie" + +#: ../app/dialogs/preferences-dialog.c:1243 +msgid "Debug _policy:" +msgstr "_Politique de débogage :" + +#: ../app/dialogs/preferences-dialog.c:1255 +msgid "This feature requires \"gdb\" or \"lldb\" installed on your system." +msgstr "" +"Cette fonctionnalité nécessite que « gdb » ou « lldb » soit installé sur " +"votre système." + +#: ../app/dialogs/preferences-dialog.c:1259 +msgid "" +"This feature is more efficient with \"gdb\" or \"lldb\" installed on your " +"system." +msgstr "" +"Cette fonctionnalité est plus efficace si « gdb » ou « lldb » est installé " +"sur votre système." + +#: ../app/dialogs/preferences-dialog.c:1272 +#: ../app/dialogs/preferences-dialog.c:1273 msgid "Color Management" msgstr "Gestion des couleurs" -#: ../app/dialogs/preferences-dialog.c:1218 +#: ../app/dialogs/preferences-dialog.c:1282 msgid "Reset Color Management" msgstr "Réinitialiser la gestion des couleurs" -#: ../app/dialogs/preferences-dialog.c:1241 +#: ../app/dialogs/preferences-dialog.c:1305 msgid "Image display _mode:" msgstr "_Mode d’affichage de l’image :" #. Color Managed Display -#: ../app/dialogs/preferences-dialog.c:1245 +#: ../app/dialogs/preferences-dialog.c:1309 msgid "Color Managed Display" msgstr "Affichage avec gestion des couleurs" -#: ../app/dialogs/preferences-dialog.c:1254 +#: ../app/dialogs/preferences-dialog.c:1318 msgid "Select Monitor Color Profile" msgstr "Sélectionner le profil colorimétrique du moniteur" -#: ../app/dialogs/preferences-dialog.c:1255 +#: ../app/dialogs/preferences-dialog.c:1319 msgid "_Monitor profile:" msgstr "Profil m_oniteur :" -#: ../app/dialogs/preferences-dialog.c:1261 +#: ../app/dialogs/preferences-dialog.c:1325 msgid "_Try to use the system monitor profile" msgstr "Essayer d’utiliser le profil du moniteur système" -#: ../app/dialogs/preferences-dialog.c:1270 +#: ../app/dialogs/preferences-dialog.c:1334 msgid "_Rendering intent:" msgstr "Mode de _rendu :" -#: ../app/dialogs/preferences-dialog.c:1275 +#: ../app/dialogs/preferences-dialog.c:1339 msgid "Use _black point compensation" msgstr "Utiliser la compensation du point _noir" -#: ../app/dialogs/preferences-dialog.c:1283 -#: ../app/dialogs/preferences-dialog.c:1319 ../app/paint/gimpinkoptions.c:93 +#: ../app/dialogs/preferences-dialog.c:1347 +#: ../app/dialogs/preferences-dialog.c:1383 ../app/paint/gimpinkoptions.c:93 msgid "Speed" msgstr "Vitesse" -#: ../app/dialogs/preferences-dialog.c:1284 -#: ../app/dialogs/preferences-dialog.c:1320 +#: ../app/dialogs/preferences-dialog.c:1348 +#: ../app/dialogs/preferences-dialog.c:1384 msgid "Precision / Color Fidelity" msgstr "Précision / Fidélité des couleurs" -#: ../app/dialogs/preferences-dialog.c:1285 +#: ../app/dialogs/preferences-dialog.c:1349 msgid "_Optimize image display for:" msgstr "_Optimiser l’affichage de l’image pour :" #. Print Simulation (Soft-proofing) -#: ../app/dialogs/preferences-dialog.c:1289 +#: ../app/dialogs/preferences-dialog.c:1353 msgid "Soft-Proofing" msgstr "Épreuve sur écran" -#: ../app/dialogs/preferences-dialog.c:1299 +#: ../app/dialogs/preferences-dialog.c:1363 msgid "Select Soft-Proofing Color Profile" msgstr "Sélectionner le profil colorimétrique d’épreuve sur écran" -#: ../app/dialogs/preferences-dialog.c:1300 +#: ../app/dialogs/preferences-dialog.c:1364 msgid "_Soft-proofing profile:" msgstr "Profil d’épreuve sur écran :" -#: ../app/dialogs/preferences-dialog.c:1306 +#: ../app/dialogs/preferences-dialog.c:1370 msgid "Re_ndering intent:" msgstr "Mo_de de rendu :" -#: ../app/dialogs/preferences-dialog.c:1311 +#: ../app/dialogs/preferences-dialog.c:1375 msgid "Use black _point compensation" msgstr "Utiliser la compensation du _point noir" -#: ../app/dialogs/preferences-dialog.c:1321 +#: ../app/dialogs/preferences-dialog.c:1385 msgid "O_ptimize soft-proofing for:" msgstr "O_ptimiser l’épreuve sur écran pour :" -#: ../app/dialogs/preferences-dialog.c:1330 +#: ../app/dialogs/preferences-dialog.c:1394 msgid "Mark out of gamut colors" msgstr "Indiquer les couleurs hors gamme" -#: ../app/dialogs/preferences-dialog.c:1335 +#: ../app/dialogs/preferences-dialog.c:1399 msgid "Select Warning Color" msgstr "Sélectionnez une couleur d’alerte" #. Preferred profiles -#: ../app/dialogs/preferences-dialog.c:1346 +#: ../app/dialogs/preferences-dialog.c:1410 msgid "Preferred Profiles" msgstr "Profils préférés" -#: ../app/dialogs/preferences-dialog.c:1355 +#: ../app/dialogs/preferences-dialog.c:1419 msgid "Select Preferred RGB Color Profile" msgstr "Sélectionner un profil colorimétrique RVB préféré" -#: ../app/dialogs/preferences-dialog.c:1356 +#: ../app/dialogs/preferences-dialog.c:1420 msgid "_RGB profile:" msgstr "Profil _RVB :" -#: ../app/dialogs/preferences-dialog.c:1363 +#: ../app/dialogs/preferences-dialog.c:1427 msgid "Select Preferred Grayscale Color Profile" msgstr "Sélectionner le profil colorimétrique niveaux de gris préféré" -#: ../app/dialogs/preferences-dialog.c:1364 +#: ../app/dialogs/preferences-dialog.c:1428 msgid "_Grayscale profile:" msgstr "Profil Niveaux de _gris" -#: ../app/dialogs/preferences-dialog.c:1371 +#: ../app/dialogs/preferences-dialog.c:1435 msgid "Select CMYK Color Profile" msgstr "Sélectionner un profil colorimétrique CMJN" -#: ../app/dialogs/preferences-dialog.c:1372 +#: ../app/dialogs/preferences-dialog.c:1436 msgid "_CMYK profile:" msgstr "Profil _CMJN :" #. Policies -#: ../app/dialogs/preferences-dialog.c:1377 +#: ../app/dialogs/preferences-dialog.c:1441 msgid "Policies" msgstr "Principes" -#: ../app/dialogs/preferences-dialog.c:1382 +#: ../app/dialogs/preferences-dialog.c:1446 msgid "File Open behaviour:" msgstr "Comportement à l’ouverture d’un fichier :" #. Filter Dialogs -#: ../app/dialogs/preferences-dialog.c:1386 +#: ../app/dialogs/preferences-dialog.c:1450 +#: ../app/dialogs/preferences-dialog.c:2171 msgid "Filter Dialogs" msgstr "Boîtes de dialogue des filtres" -#: ../app/dialogs/preferences-dialog.c:1390 +#: ../app/dialogs/preferences-dialog.c:1454 +#: ../app/dialogs/preferences-dialog.c:2183 msgid "Show advanced color options" msgstr "Afficher les options de couleur avancées" -#: ../app/dialogs/preferences-dialog.c:1404 -#: ../app/dialogs/preferences-dialog.c:1405 +#: ../app/dialogs/preferences-dialog.c:1468 +#: ../app/dialogs/preferences-dialog.c:1469 msgid "Image Import & Export" msgstr "Importation et exportation d’images" #. Import Policies -#: ../app/dialogs/preferences-dialog.c:1411 +#: ../app/dialogs/preferences-dialog.c:1475 msgid "Import Policies" msgstr "Principes d’importation" -#: ../app/dialogs/preferences-dialog.c:1415 +#: ../app/dialogs/preferences-dialog.c:1479 msgid "Promote imported images to _floating point precision" msgstr "Transformer les images importées en précision virgule _flottante" -#: ../app/dialogs/preferences-dialog.c:1421 +#: ../app/dialogs/preferences-dialog.c:1485 msgid "Dither images when promoting to floating point" msgstr "Tramer les images lors de leur transformation en virgule flottante" -#: ../app/dialogs/preferences-dialog.c:1426 +#: ../app/dialogs/preferences-dialog.c:1490 msgid "Add an alpha channel to imported images" msgstr "Ajouter un canal alpha aux images importées" -#: ../app/dialogs/preferences-dialog.c:1431 -#: ../app/dialogs/preferences-dialog.c:2030 +#: ../app/dialogs/preferences-dialog.c:1495 +#: ../app/dialogs/preferences-dialog.c:2094 msgid "Color profile policy:" msgstr "Politique de profil de couleur :" #. Export Policies -#: ../app/dialogs/preferences-dialog.c:1435 +#: ../app/dialogs/preferences-dialog.c:1499 msgid "Export Policies" msgstr "Principes d’exportation" -#: ../app/dialogs/preferences-dialog.c:1439 +#: ../app/dialogs/preferences-dialog.c:1503 msgid "Export Exif metadata by default when available" msgstr "Exporter par défaut les métadonnées Exif quand il y en a" -#: ../app/dialogs/preferences-dialog.c:1442 +#: ../app/dialogs/preferences-dialog.c:1506 msgid "Export XMP metadata by default when available" msgstr "Exporter par défaut les métadonnées XMP quand il y en a" -#: ../app/dialogs/preferences-dialog.c:1445 +#: ../app/dialogs/preferences-dialog.c:1509 msgid "Export IPTC metadata by default when available" msgstr "Exporter par défaut les métadonnées IPTC quand il y en a" -#: ../app/dialogs/preferences-dialog.c:1448 +#: ../app/dialogs/preferences-dialog.c:1512 msgid "Metadata can contain sensitive information." msgstr "Les métadonnées peuvent contenir des informations sensibles." #. Raw Image Importer -#: ../app/dialogs/preferences-dialog.c:1453 +#: ../app/dialogs/preferences-dialog.c:1517 msgid "Raw Image Importer" msgstr "Importateur d’image raw" -#: ../app/dialogs/preferences-dialog.c:1486 +#: ../app/dialogs/preferences-dialog.c:1550 msgid "Experimental Playground" msgstr "Aire de jeu expérimentale" -#: ../app/dialogs/preferences-dialog.c:1487 +#: ../app/dialogs/preferences-dialog.c:1551 msgid "Playground" msgstr "Aire de jeu" -#: ../app/dialogs/preferences-dialog.c:1492 +#: ../app/dialogs/preferences-dialog.c:1556 msgid "Insane Options" msgstr "Options folles" -#: ../app/dialogs/preferences-dialog.c:1496 +#: ../app/dialogs/preferences-dialog.c:1560 msgid "_N-Point Deformation tool" msgstr "Outil Déformation _N-Point" -#: ../app/dialogs/preferences-dialog.c:1499 +#: ../app/dialogs/preferences-dialog.c:1563 msgid "_Seamless Clone tool" msgstr "Outil Clonage _sans raccord" -#: ../app/dialogs/preferences-dialog.c:1509 -#: ../app/dialogs/preferences-dialog.c:1510 +#: ../app/dialogs/preferences-dialog.c:1573 +#: ../app/dialogs/preferences-dialog.c:1574 msgctxt "preferences" msgid "Tool Options" msgstr "Options des outils" #. General #. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1518 -#: ../app/dialogs/preferences-dialog.c:2320 -#: ../app/dialogs/preferences-dialog.c:2648 -#: ../app/dialogs/preferences-dialog.c:2879 +#: ../app/dialogs/preferences-dialog.c:1582 +#: ../app/dialogs/preferences-dialog.c:2400 +#: ../app/dialogs/preferences-dialog.c:2728 +#: ../app/dialogs/preferences-dialog.c:2959 #: ../app/widgets/gimpcontrollereditor.c:186 msgid "General" msgstr "Général" -#: ../app/dialogs/preferences-dialog.c:1521 +#: ../app/dialogs/preferences-dialog.c:1585 msgid "_Save tool options on exit" msgstr "Enregistrer à la _sortie les options des outils" -#: ../app/dialogs/preferences-dialog.c:1525 +#: ../app/dialogs/preferences-dialog.c:1589 msgid "Save Tool Options _Now" msgstr "Enregistrer _maintenant les options des outils" -#: ../app/dialogs/preferences-dialog.c:1532 +#: ../app/dialogs/preferences-dialog.c:1596 msgid "_Reset Saved Tool Options to Default Values" msgstr "_Restaurer les options des outils aux valeurs par défaut" -#: ../app/dialogs/preferences-dialog.c:1546 +#: ../app/dialogs/preferences-dialog.c:1610 msgid "Default _interpolation:" msgstr "_Interpolation par défaut :" #. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1553 +#: ../app/dialogs/preferences-dialog.c:1617 msgid "Paint Options Shared Between Tools" msgstr "Options de peinture partagées entre les outils" -#: ../app/dialogs/preferences-dialog.c:1557 +#: ../app/dialogs/preferences-dialog.c:1621 msgid "_Brush" msgstr "_Brosse" -#: ../app/dialogs/preferences-dialog.c:1560 +#: ../app/dialogs/preferences-dialog.c:1624 msgid "_Dynamics" msgstr "_Dynamique" -#: ../app/dialogs/preferences-dialog.c:1563 +#: ../app/dialogs/preferences-dialog.c:1627 msgid "_Pattern" msgstr "_Motif" #. Move Tool -#: ../app/dialogs/preferences-dialog.c:1570 +#: ../app/dialogs/preferences-dialog.c:1634 msgid "Move Tool" msgstr "Outil de déplacement" -#: ../app/dialogs/preferences-dialog.c:1574 +#: ../app/dialogs/preferences-dialog.c:1638 msgid "Set layer or path as active" msgstr "Définir le calque ou le chemin comme actif" -#: ../app/dialogs/preferences-dialog.c:1587 +#: ../app/dialogs/preferences-dialog.c:1651 msgid "Default New Image" msgstr "Nouvelle image par défaut" -#: ../app/dialogs/preferences-dialog.c:1588 +#: ../app/dialogs/preferences-dialog.c:1652 msgid "Default Image" msgstr "Image par défaut" -#: ../app/dialogs/preferences-dialog.c:1624 +#: ../app/dialogs/preferences-dialog.c:1688 msgid "Quick Mask color:" msgstr "Couleur du masque rapide" -#: ../app/dialogs/preferences-dialog.c:1625 +#: ../app/dialogs/preferences-dialog.c:1689 msgid "Set the default Quick Mask color" msgstr "Définir la couleur par défaut du masque rapide" -#: ../app/dialogs/preferences-dialog.c:1635 +#: ../app/dialogs/preferences-dialog.c:1699 msgid "Default Image Grid" msgstr "Grille d’image par défaut" -#: ../app/dialogs/preferences-dialog.c:1636 +#: ../app/dialogs/preferences-dialog.c:1700 msgid "Default Grid" msgstr "Grille par défaut" -#: ../app/dialogs/preferences-dialog.c:1655 +#: ../app/dialogs/preferences-dialog.c:1719 msgid "User Interface" msgstr "Interface utilisateur" -#: ../app/dialogs/preferences-dialog.c:1656 +#: ../app/dialogs/preferences-dialog.c:1720 msgid "Interface" msgstr "Interface" -#: ../app/dialogs/preferences-dialog.c:1665 ../app/tools/gimptextoptions.c:151 +#: ../app/dialogs/preferences-dialog.c:1729 ../app/tools/gimptextoptions.c:151 msgid "Language" msgstr "Langue" #. Previews -#: ../app/dialogs/preferences-dialog.c:1671 +#: ../app/dialogs/preferences-dialog.c:1735 msgid "Previews" msgstr "Aperçus" -#: ../app/dialogs/preferences-dialog.c:1674 +#: ../app/dialogs/preferences-dialog.c:1738 msgid "_Enable layer & channel previews" msgstr "_Activer les aperçus de calque & canal" -#: ../app/dialogs/preferences-dialog.c:1680 +#: ../app/dialogs/preferences-dialog.c:1744 msgid "_Default layer & channel preview size:" msgstr "Taille par défaut de l’aperç_u de calque & canal :" -#: ../app/dialogs/preferences-dialog.c:1683 +#: ../app/dialogs/preferences-dialog.c:1747 msgid "_Undo preview size:" msgstr "Taille de l’aperçu d’ann_ulation :" -#: ../app/dialogs/preferences-dialog.c:1686 +#: ../app/dialogs/preferences-dialog.c:1750 msgid "Na_vigation preview size:" msgstr "Taille de l’aperçu de _navigation :" #. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1690 +#: ../app/dialogs/preferences-dialog.c:1754 msgid "Keyboard Shortcuts" msgstr "Raccourcis clavier" -#: ../app/dialogs/preferences-dialog.c:1694 +#: ../app/dialogs/preferences-dialog.c:1758 msgid "_Use dynamic keyboard shortcuts" msgstr "Utiliser les raccourcis clavier _dynamiques" -#: ../app/dialogs/preferences-dialog.c:1698 +#: ../app/dialogs/preferences-dialog.c:1762 msgid "Configure _Keyboard Shortcuts..." msgstr "C_onfigurer les raccourcis clavier…" -#: ../app/dialogs/preferences-dialog.c:1705 +#: ../app/dialogs/preferences-dialog.c:1769 msgid "_Save keyboard shortcuts on exit" msgstr "_Enregistrer à la sortie les raccourcis clavier" -#: ../app/dialogs/preferences-dialog.c:1709 +#: ../app/dialogs/preferences-dialog.c:1773 msgid "Save Keyboard Shortcuts _Now" msgstr "Enregistrer _maintenant les raccourcis" -#: ../app/dialogs/preferences-dialog.c:1716 +#: ../app/dialogs/preferences-dialog.c:1780 msgid "_Reset Keyboard Shortcuts to Default Values" msgstr "_Rétablir les raccourcis clavier aux valeurs par défaut" -#: ../app/dialogs/preferences-dialog.c:1725 +#: ../app/dialogs/preferences-dialog.c:1789 msgid "Remove _All Keyboard Shortcuts" msgstr "Supprimer _tous les raccourcis clavier" -#: ../app/dialogs/preferences-dialog.c:1737 -#: ../app/dialogs/preferences-dialog.c:1738 -#: ../app/dialogs/preferences-dialog.c:1773 +#: ../app/dialogs/preferences-dialog.c:1801 +#: ../app/dialogs/preferences-dialog.c:1802 +#: ../app/dialogs/preferences-dialog.c:1837 msgid "Theme" msgstr "Thème" -#: ../app/dialogs/preferences-dialog.c:1743 +#: ../app/dialogs/preferences-dialog.c:1807 msgid "Select Theme" msgstr "Sélectionner un thème" -#: ../app/dialogs/preferences-dialog.c:1825 +#: ../app/dialogs/preferences-dialog.c:1889 msgid "Reload C_urrent Theme" msgstr "Recharger le _thème actuel" -#: ../app/dialogs/preferences-dialog.c:1837 -#: ../app/dialogs/preferences-dialog.c:1838 -#: ../app/dialogs/preferences-dialog.c:1879 +#: ../app/dialogs/preferences-dialog.c:1901 +#: ../app/dialogs/preferences-dialog.c:1902 +#: ../app/dialogs/preferences-dialog.c:1943 msgid "Icon Theme" msgstr "Thème d’icône" -#: ../app/dialogs/preferences-dialog.c:1843 +#: ../app/dialogs/preferences-dialog.c:1907 msgid "Select an Icon Theme" msgstr "Sélectionner un thème d’icône" #. Appearance -#: ../app/dialogs/preferences-dialog.c:1967 -#: ../app/dialogs/preferences-dialog.c:2719 ../app/widgets/gimpgrideditor.c:134 +#: ../app/dialogs/preferences-dialog.c:2031 +#: ../app/dialogs/preferences-dialog.c:2799 ../app/widgets/gimpgrideditor.c:134 msgid "Appearance" msgstr "Apparence" -#: ../app/dialogs/preferences-dialog.c:1971 +#: ../app/dialogs/preferences-dialog.c:2035 msgid "Show GIMP _logo (drag-and-drop target)" msgstr "Afficher le _logo de GIMP (cible de glisser-déposer)" -#: ../app/dialogs/preferences-dialog.c:1975 +#: ../app/dialogs/preferences-dialog.c:2039 msgid "Show _foreground & background color" msgstr "Afficher la couleur de _premier et d’arrière-plan" -#: ../app/dialogs/preferences-dialog.c:1979 +#: ../app/dialogs/preferences-dialog.c:2043 msgid "Show active _brush, pattern & gradient" msgstr "Afficher les _brosses, motifs et dégradés actifs" -#: ../app/dialogs/preferences-dialog.c:1983 +#: ../app/dialogs/preferences-dialog.c:2047 msgid "Show active _image" msgstr "Afficher l’_image active" #. Tool Editor -#: ../app/dialogs/preferences-dialog.c:1991 +#: ../app/dialogs/preferences-dialog.c:2055 msgid "Tools Configuration" msgstr "Configuration des outils" -#: ../app/dialogs/preferences-dialog.c:2007 -#: ../app/dialogs/preferences-dialog.c:2008 +#: ../app/dialogs/preferences-dialog.c:2071 +#: ../app/dialogs/preferences-dialog.c:2072 msgid "Dialog Defaults" msgstr "Valeurs par défaut des boîtes de dialogue" -#: ../app/dialogs/preferences-dialog.c:2017 +#: ../app/dialogs/preferences-dialog.c:2081 msgid "Reset Dialog Defaults" msgstr "Réinitialiser les valeurs par défaut des boîtes de dialogue" #. Color profile import dialog -#: ../app/dialogs/preferences-dialog.c:2025 +#: ../app/dialogs/preferences-dialog.c:2089 msgid "Color Profile Import Dialog" msgstr "Boîte de dialogue d’importation de profil de couleur" #. All color profile chooser dialogs -#: ../app/dialogs/preferences-dialog.c:2034 +#: ../app/dialogs/preferences-dialog.c:2098 msgid "Color Profile File Dialogs" msgstr "Boîtes de dialogue de profil de couleur" -#: ../app/dialogs/preferences-dialog.c:2039 +#: ../app/dialogs/preferences-dialog.c:2103 msgid "Profile folder:" msgstr "Dossier des profils :" -#: ../app/dialogs/preferences-dialog.c:2040 +#: ../app/dialogs/preferences-dialog.c:2104 msgid "Select Default Folder for Color Profiles" msgstr "Sélectionner un dossier par défaut pour les profils de couleurs" #. Convert to Color Profile Dialog -#: ../app/dialogs/preferences-dialog.c:2044 +#: ../app/dialogs/preferences-dialog.c:2108 msgid "Convert to Color Profile Dialog" msgstr "Boîte de dialogue « Convertir en profil colorimétrique »" -#: ../app/dialogs/preferences-dialog.c:2049 +#: ../app/dialogs/preferences-dialog.c:2113 msgid "Rendering intent:" msgstr "Mode de rendu :" -#: ../app/dialogs/preferences-dialog.c:2053 +#: ../app/dialogs/preferences-dialog.c:2117 msgid "Black point compensation" msgstr "Compensation du point noir" #. Convert Precision Dialog -#: ../app/dialogs/preferences-dialog.c:2057 +#: ../app/dialogs/preferences-dialog.c:2121 msgid "Precision Conversion Dialog" msgstr "Boîte de dialogue « Conversion de précision »" -#: ../app/dialogs/preferences-dialog.c:2064 +#: ../app/dialogs/preferences-dialog.c:2128 msgid "Dither layers:" msgstr "Tramage des calques :" -#: ../app/dialogs/preferences-dialog.c:2069 +#: ../app/dialogs/preferences-dialog.c:2133 msgid "Dither text layers:" msgstr "Tramage des calques de texte :" -#: ../app/dialogs/preferences-dialog.c:2074 +#: ../app/dialogs/preferences-dialog.c:2138 msgid "Dither channels/masks:" msgstr "Tramage des canaux/masques :" #. Convert Indexed Dialog -#: ../app/dialogs/preferences-dialog.c:2078 +#: ../app/dialogs/preferences-dialog.c:2142 msgid "Indexed Conversion Dialog" msgstr "Boîte de dialogue « Conversion en couleurs indexées »" -#: ../app/dialogs/preferences-dialog.c:2083 +#: ../app/dialogs/preferences-dialog.c:2147 msgid "Colormap:" msgstr "Palette :" -#: ../app/dialogs/preferences-dialog.c:2086 +#: ../app/dialogs/preferences-dialog.c:2150 msgid "Maximum number of colors:" msgstr "Nombre maximal de couleurs :" -#: ../app/dialogs/preferences-dialog.c:2090 +#: ../app/dialogs/preferences-dialog.c:2154 msgid "Remove unused and duplicate colors from colormap" msgstr "Enlever les couleurs non utilisées et en double de la palette" -#: ../app/dialogs/preferences-dialog.c:2096 +#: ../app/dialogs/preferences-dialog.c:2160 msgid "Color dithering:" msgstr "Tramage des couleurs :" -#: ../app/dialogs/preferences-dialog.c:2100 +#: ../app/dialogs/preferences-dialog.c:2164 msgid "Enable dithering of transparency" msgstr "Activer le tramage de la transparence" +#: ../app/dialogs/preferences-dialog.c:2176 +msgid "Keep recent settings:" +msgstr "Conserver les paramètres récents :" + +#: ../app/dialogs/preferences-dialog.c:2180 +msgid "Default to the last used settings" +msgstr "Prendre par défaut les derniers paramètres utilisés" + #. Canvas Size Dialog -#: ../app/dialogs/preferences-dialog.c:2107 +#: ../app/dialogs/preferences-dialog.c:2187 msgid "Canvas Size Dialog" msgstr "Boîte de dialogue « Taille du canevas »" -#: ../app/dialogs/preferences-dialog.c:2112 -#: ../app/dialogs/preferences-dialog.c:2141 +#: ../app/dialogs/preferences-dialog.c:2192 +#: ../app/dialogs/preferences-dialog.c:2221 msgid "Fill with:" msgstr "Remplir avec :" -#: ../app/dialogs/preferences-dialog.c:2115 +#: ../app/dialogs/preferences-dialog.c:2195 msgid "Resize layers:" msgstr "Redimensionner les calques :" -#: ../app/dialogs/preferences-dialog.c:2119 +#: ../app/dialogs/preferences-dialog.c:2199 msgid "Resize text layers" msgstr "Redimensionner les calques de texte" #. New Layer Dialog -#: ../app/dialogs/preferences-dialog.c:2123 +#: ../app/dialogs/preferences-dialog.c:2203 msgid "New Layer Dialog" msgstr "Boîte de dialogue « Nouveau calque »" -#: ../app/dialogs/preferences-dialog.c:2128 +#: ../app/dialogs/preferences-dialog.c:2208 msgid "Layer name:" msgstr "Nom du calque :" -#: ../app/dialogs/preferences-dialog.c:2132 +#: ../app/dialogs/preferences-dialog.c:2212 msgid "Fill type:" msgstr "Type de remplissage :" #. Layer Boundary Size Dialog -#: ../app/dialogs/preferences-dialog.c:2136 +#: ../app/dialogs/preferences-dialog.c:2216 msgid "Layer Boundary Size Dialog" msgstr "Boîte de dialogue « Taille de la bordure du calque »" #. Add Layer Mask Dialog -#: ../app/dialogs/preferences-dialog.c:2145 +#: ../app/dialogs/preferences-dialog.c:2225 msgid "Add Layer Mask Dialog" msgstr "Boîte de dialogue « Ajout d’un masque de calque »" -#: ../app/dialogs/preferences-dialog.c:2150 +#: ../app/dialogs/preferences-dialog.c:2230 msgid "Layer mask type:" msgstr "Type de masque de calque :" -#: ../app/dialogs/preferences-dialog.c:2154 +#: ../app/dialogs/preferences-dialog.c:2234 msgid "Invert mask" msgstr "Inverser le masque" #. Merge Layers Dialog -#: ../app/dialogs/preferences-dialog.c:2158 +#: ../app/dialogs/preferences-dialog.c:2238 msgid "Merge Layers Dialog" msgstr "Boîte de dialogue « Fusionner les calques »" -#: ../app/dialogs/preferences-dialog.c:2165 +#: ../app/dialogs/preferences-dialog.c:2245 msgid "Merged layer size:" msgstr "Taille du calque fusionné :" -#: ../app/dialogs/preferences-dialog.c:2169 +#: ../app/dialogs/preferences-dialog.c:2249 msgid "Merge within active group only" msgstr "Fusionner dans le groupe actif uniquement" -#: ../app/dialogs/preferences-dialog.c:2172 +#: ../app/dialogs/preferences-dialog.c:2252 msgid "Discard invisible layers" msgstr "Écarter les calques invisibles" #. New Channel Dialog -#: ../app/dialogs/preferences-dialog.c:2176 +#: ../app/dialogs/preferences-dialog.c:2256 msgid "New Channel Dialog" msgstr "Boîte de dialogue « Nouveau canal »" -#: ../app/dialogs/preferences-dialog.c:2181 +#: ../app/dialogs/preferences-dialog.c:2261 msgid "Channel name:" msgstr "Nom du canal :" -#: ../app/dialogs/preferences-dialog.c:2185 +#: ../app/dialogs/preferences-dialog.c:2265 msgid "Color and opacity:" msgstr "Couleur et opacité :" -#: ../app/dialogs/preferences-dialog.c:2186 +#: ../app/dialogs/preferences-dialog.c:2266 msgid "Default New Channel Color and Opacity" msgstr "Couleur et opacité du nouveau canal par défaut" #. New Path Dialog -#: ../app/dialogs/preferences-dialog.c:2191 +#: ../app/dialogs/preferences-dialog.c:2271 msgid "New Path Dialog" msgstr "Boîte de dialogue « Nouveau chemin »" -#: ../app/dialogs/preferences-dialog.c:2196 +#: ../app/dialogs/preferences-dialog.c:2276 msgid "Path name:" msgstr "Nom du chemin :" #. Export Path Dialog -#: ../app/dialogs/preferences-dialog.c:2200 +#: ../app/dialogs/preferences-dialog.c:2280 msgid "Export Paths Dialog" msgstr "Boîte de dialogue Exporter les chemins" -#: ../app/dialogs/preferences-dialog.c:2205 +#: ../app/dialogs/preferences-dialog.c:2285 msgid "Export folder:" msgstr "Dossier d’exportation :" -#: ../app/dialogs/preferences-dialog.c:2206 +#: ../app/dialogs/preferences-dialog.c:2286 msgid "Select Default Folder for Exporting Paths" msgstr "Sélectionner un dossier par défaut pour l’exportation des chemins" -#: ../app/dialogs/preferences-dialog.c:2210 +#: ../app/dialogs/preferences-dialog.c:2290 msgid "Export the active path only" msgstr "Exporter le chemin actif uniquement" #. Import Path Dialog -#: ../app/dialogs/preferences-dialog.c:2214 +#: ../app/dialogs/preferences-dialog.c:2294 msgid "Import Paths Dialog" msgstr "Boîte de dialogue « Importer des chemins »" -#: ../app/dialogs/preferences-dialog.c:2219 +#: ../app/dialogs/preferences-dialog.c:2299 msgid "Import folder:" msgstr "Dossier d’importation :" -#: ../app/dialogs/preferences-dialog.c:2220 +#: ../app/dialogs/preferences-dialog.c:2300 msgid "Select Default Folder for Importing Paths" msgstr "Sélectionner un dossier par défaut pour l’importation des chemins" -#: ../app/dialogs/preferences-dialog.c:2224 +#: ../app/dialogs/preferences-dialog.c:2304 msgid "Merge imported paths" msgstr "Fusionner les chemins importés" -#: ../app/dialogs/preferences-dialog.c:2227 +#: ../app/dialogs/preferences-dialog.c:2307 msgid "Scale imported paths" msgstr "Mise à l’échelle des chemins importés" #. Feather Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2231 +#: ../app/dialogs/preferences-dialog.c:2311 msgid "Feather Selection Dialog" msgstr "Boîte de dialogue « Adoucir la sélection »" -#: ../app/dialogs/preferences-dialog.c:2236 +#: ../app/dialogs/preferences-dialog.c:2316 msgid "Feather radius:" msgstr "Rayon d’adoucissement :" #. Grow Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2240 +#: ../app/dialogs/preferences-dialog.c:2320 msgid "Grow Selection Dialog" msgstr "Boîte de dialogue « Agrandir la sélection »" -#: ../app/dialogs/preferences-dialog.c:2245 +#: ../app/dialogs/preferences-dialog.c:2325 msgid "Grow radius:" msgstr "Rayon d’agrandissement :" #. Shrink Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2249 +#: ../app/dialogs/preferences-dialog.c:2329 msgid "Shrink Selection Dialog" msgstr "Boîte de dialogue « Réduire la sélection »" -#: ../app/dialogs/preferences-dialog.c:2254 +#: ../app/dialogs/preferences-dialog.c:2334 msgid "Shrink radius:" msgstr "Rayon de réduction :" -#: ../app/dialogs/preferences-dialog.c:2258 -#: ../app/dialogs/preferences-dialog.c:2275 +#: ../app/dialogs/preferences-dialog.c:2338 +#: ../app/dialogs/preferences-dialog.c:2355 msgid "Selected areas continue outside the image" msgstr "Les zones sélectionnées continuent en dehors de l’image" #. Border Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2262 +#: ../app/dialogs/preferences-dialog.c:2342 msgid "Border Selection Dialog" msgstr "Boîte de dialogue « Sélection de bordure »" -#: ../app/dialogs/preferences-dialog.c:2267 +#: ../app/dialogs/preferences-dialog.c:2347 msgid "Border radius:" msgstr "Rayon de bordure :" -#: ../app/dialogs/preferences-dialog.c:2271 +#: ../app/dialogs/preferences-dialog.c:2351 msgid "Border style:" msgstr "Style de bordure :" #. Fill Options Dialog -#: ../app/dialogs/preferences-dialog.c:2279 +#: ../app/dialogs/preferences-dialog.c:2359 msgid "Fill Selection Outline & Fill Path Dialogs" msgstr "" "Boîtes de dialogue « Remplir le contour de la sélection » et « Remplir le " "chemin »" #. Stroke Options Dialog -#: ../app/dialogs/preferences-dialog.c:2288 +#: ../app/dialogs/preferences-dialog.c:2368 msgid "Stroke Selection & Stroke Path Dialogs" msgstr "Boîtes de dialogue « Tracer la sélection » et « Tracer le chemin »" -#: ../app/dialogs/preferences-dialog.c:2311 -#: ../app/dialogs/preferences-dialog.c:2312 +#: ../app/dialogs/preferences-dialog.c:2391 +#: ../app/dialogs/preferences-dialog.c:2392 msgid "Help System" msgstr "Système d’aide" -#: ../app/dialogs/preferences-dialog.c:2323 +#: ../app/dialogs/preferences-dialog.c:2403 msgid "Show _tooltips" msgstr "Afficher les _bulles d’aide" -#: ../app/dialogs/preferences-dialog.c:2326 +#: ../app/dialogs/preferences-dialog.c:2406 msgid "Show help _buttons" msgstr "Afficher les boutons d’aid_e" -#: ../app/dialogs/preferences-dialog.c:2331 +#: ../app/dialogs/preferences-dialog.c:2411 msgid "Use the online version" msgstr "Utiliser la version en ligne" -#: ../app/dialogs/preferences-dialog.c:2332 +#: ../app/dialogs/preferences-dialog.c:2412 msgid "Use a locally installed copy" msgstr "Utiliser une copie locale" -#: ../app/dialogs/preferences-dialog.c:2333 +#: ../app/dialogs/preferences-dialog.c:2413 msgid "User manual:" msgstr "Manuel de l’utilisateur :" -#: ../app/dialogs/preferences-dialog.c:2344 +#: ../app/dialogs/preferences-dialog.c:2424 msgid "User interface language" msgstr "Langue de l’interface utilisateur" @@ -15691,15 +15954,15 @@ msgstr "Langue de l’interface utilisateur" #. * that doesn't use the help browser, so don't bother showing #. * the combo. #. -#: ../app/dialogs/preferences-dialog.c:2403 +#: ../app/dialogs/preferences-dialog.c:2483 msgid "Help Browser" msgstr "Navigateur d’aide" -#: ../app/dialogs/preferences-dialog.c:2410 +#: ../app/dialogs/preferences-dialog.c:2490 msgid "H_elp browser to use:" msgstr "_Navigateur d’aide à utiliser :" -#: ../app/dialogs/preferences-dialog.c:2416 +#: ../app/dialogs/preferences-dialog.c:2496 msgid "" "The GIMP help browser doesn't seem to be installed. Using the web browser " "instead." @@ -15708,452 +15971,452 @@ msgstr "" "Utilisation d’un navigateur Web à la place." #. Action Search -#: ../app/dialogs/preferences-dialog.c:2433 +#: ../app/dialogs/preferences-dialog.c:2513 msgid "Action Search" msgstr "Recherche d’action" -#: ../app/dialogs/preferences-dialog.c:2437 +#: ../app/dialogs/preferences-dialog.c:2517 msgid "Show _unavailable actions" msgstr "Afficher les actions _non-disponibles" -#: ../app/dialogs/preferences-dialog.c:2440 +#: ../app/dialogs/preferences-dialog.c:2520 msgid "Maximum History Size:" msgstr "Taille maximale de l’historique :" -#: ../app/dialogs/preferences-dialog.c:2444 +#: ../app/dialogs/preferences-dialog.c:2524 msgid "Clear Action History" msgstr "Vider l’historique des actions" -#: ../app/dialogs/preferences-dialog.c:2459 -#: ../app/dialogs/preferences-dialog.c:2460 +#: ../app/dialogs/preferences-dialog.c:2539 +#: ../app/dialogs/preferences-dialog.c:2540 msgid "Display" msgstr "Affichage" #. Transparency -#: ../app/dialogs/preferences-dialog.c:2468 +#: ../app/dialogs/preferences-dialog.c:2548 msgid "Transparency" msgstr "Transparence" -#: ../app/dialogs/preferences-dialog.c:2472 +#: ../app/dialogs/preferences-dialog.c:2552 msgid "_Check style:" msgstr "_Style de damier :" -#: ../app/dialogs/preferences-dialog.c:2475 +#: ../app/dialogs/preferences-dialog.c:2555 msgid "Check _size:" msgstr "_Taille du damier :" -#: ../app/dialogs/preferences-dialog.c:2478 +#: ../app/dialogs/preferences-dialog.c:2558 msgid "Monitor Resolution" msgstr "Définition du moniteur" #. Pixels -#: ../app/dialogs/preferences-dialog.c:2482 ../app/display/gimpcursorview.c:215 +#: ../app/dialogs/preferences-dialog.c:2562 ../app/display/gimpcursorview.c:215 #: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:234 msgid "Pixels" msgstr "Pixels" -#: ../app/dialogs/preferences-dialog.c:2500 ../app/widgets/gimpgrideditor.c:195 +#: ../app/dialogs/preferences-dialog.c:2580 ../app/widgets/gimpgrideditor.c:195 #: ../app/widgets/gimpgrideditor.c:230 msgid "Horizontal" msgstr "Horizontal" -#: ../app/dialogs/preferences-dialog.c:2502 ../app/widgets/gimpgrideditor.c:197 +#: ../app/dialogs/preferences-dialog.c:2582 ../app/widgets/gimpgrideditor.c:197 #: ../app/widgets/gimpgrideditor.c:232 msgid "Vertical" msgstr "Vertical" -#: ../app/dialogs/preferences-dialog.c:2504 +#: ../app/dialogs/preferences-dialog.c:2584 #: ../app/widgets/gimpimagepropview.c:457 msgid "ppi" msgstr "ppp" -#: ../app/dialogs/preferences-dialog.c:2523 +#: ../app/dialogs/preferences-dialog.c:2603 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "_Depuis le système (actuellement %d x %d ppp)" -#: ../app/dialogs/preferences-dialog.c:2541 +#: ../app/dialogs/preferences-dialog.c:2621 msgid "_Enter manually" msgstr "Saisir _manuellement" -#: ../app/dialogs/preferences-dialog.c:2556 +#: ../app/dialogs/preferences-dialog.c:2636 msgid "C_alibrate..." msgstr "_Calibrer…" -#: ../app/dialogs/preferences-dialog.c:2584 -#: ../app/dialogs/preferences-dialog.c:2585 +#: ../app/dialogs/preferences-dialog.c:2664 +#: ../app/dialogs/preferences-dialog.c:2665 msgid "Window Management" msgstr "Gestion des fenêtres" -#: ../app/dialogs/preferences-dialog.c:2590 +#: ../app/dialogs/preferences-dialog.c:2670 msgid "Window Manager Hints" msgstr "Préconisations au gestionnaire des fenêtres" -#: ../app/dialogs/preferences-dialog.c:2596 +#: ../app/dialogs/preferences-dialog.c:2676 msgid "Hint for _docks and toolbox:" msgstr "Préconisation pour les groupes de fenêtres et la _boîte à outils :" -#: ../app/dialogs/preferences-dialog.c:2599 +#: ../app/dialogs/preferences-dialog.c:2679 msgid "Focus" msgstr "Focus" -#: ../app/dialogs/preferences-dialog.c:2603 +#: ../app/dialogs/preferences-dialog.c:2683 msgid "Activate the _focused image" msgstr "Activer le _focus sur image" #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2607 +#: ../app/dialogs/preferences-dialog.c:2687 msgid "Window Positions" msgstr "Emplacements des fenêtres" -#: ../app/dialogs/preferences-dialog.c:2610 +#: ../app/dialogs/preferences-dialog.c:2690 msgid "_Save window positions on exit" msgstr "_Enregistrer à la sortie la position des fenêtres" -#: ../app/dialogs/preferences-dialog.c:2613 +#: ../app/dialogs/preferences-dialog.c:2693 msgid "Open windows on the same _monitor they were open before" msgstr "Ouvrir les fenêtres sur le même _moniteur qu’avant" -#: ../app/dialogs/preferences-dialog.c:2617 +#: ../app/dialogs/preferences-dialog.c:2697 msgid "Save Window Positions _Now" msgstr "Enregistrer _maintenant la position des fenêtres" -#: ../app/dialogs/preferences-dialog.c:2624 +#: ../app/dialogs/preferences-dialog.c:2704 msgid "_Reset Saved Window Positions to Default Values" msgstr "_Restaurer les positions enregistrées aux valeurs par défaut" -#: ../app/dialogs/preferences-dialog.c:2639 -#: ../app/dialogs/preferences-dialog.c:2640 +#: ../app/dialogs/preferences-dialog.c:2719 +#: ../app/dialogs/preferences-dialog.c:2720 msgid "Image Windows" msgstr "Fenêtres d’images" -#: ../app/dialogs/preferences-dialog.c:2651 +#: ../app/dialogs/preferences-dialog.c:2731 msgid "Use \"_Dot for dot\" by default" msgstr "Utiliser « _point pour point » par défaut" -#: ../app/dialogs/preferences-dialog.c:2657 +#: ../app/dialogs/preferences-dialog.c:2737 msgid "Marching _ants speed:" msgstr "_Vitesse de défilement des pointillés :" #. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2661 +#: ../app/dialogs/preferences-dialog.c:2741 msgid "Zoom & Resize Behavior" msgstr "Comportement du zoom et du redimensionnement" -#: ../app/dialogs/preferences-dialog.c:2665 +#: ../app/dialogs/preferences-dialog.c:2745 msgid "Resize window on _zoom" msgstr "Redimensionner la fenêtre après un _zoom" -#: ../app/dialogs/preferences-dialog.c:2668 +#: ../app/dialogs/preferences-dialog.c:2748 msgid "Resize window on image _size change" msgstr "Redimensionner la fenêtre après un changement de _taille d’image" -#: ../app/dialogs/preferences-dialog.c:2674 +#: ../app/dialogs/preferences-dialog.c:2754 msgid "Show entire image" msgstr "Afficher l’_image entière" -#: ../app/dialogs/preferences-dialog.c:2676 +#: ../app/dialogs/preferences-dialog.c:2756 msgid "Initial zoom _ratio:" msgstr "_Facteur de zoom initial :" #. Space Bar -#: ../app/dialogs/preferences-dialog.c:2680 +#: ../app/dialogs/preferences-dialog.c:2760 msgid "Space Bar" msgstr "Barre espace" -#: ../app/dialogs/preferences-dialog.c:2686 +#: ../app/dialogs/preferences-dialog.c:2766 msgid "_While space bar is pressed:" msgstr "T_ant que la barre espace est appuyée :" #. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2690 +#: ../app/dialogs/preferences-dialog.c:2770 msgid "Mouse Pointers" msgstr "Pointeurs de souris" -#: ../app/dialogs/preferences-dialog.c:2694 +#: ../app/dialogs/preferences-dialog.c:2774 msgid "Show _brush outline" msgstr "Affi_cher le contour de la brosse" -#: ../app/dialogs/preferences-dialog.c:2697 +#: ../app/dialogs/preferences-dialog.c:2777 msgid "Show pointer for paint _tools" msgstr "Afficher le pointeur pour les _outils de peinture" -#: ../app/dialogs/preferences-dialog.c:2703 +#: ../app/dialogs/preferences-dialog.c:2783 msgid "Pointer _mode:" msgstr "Mod_e de pointage :" -#: ../app/dialogs/preferences-dialog.c:2706 +#: ../app/dialogs/preferences-dialog.c:2786 msgid "Pointer _handedness:" msgstr "_Manualité du pointeur :" -#: ../app/dialogs/preferences-dialog.c:2718 +#: ../app/dialogs/preferences-dialog.c:2798 msgid "Image Window Appearance" msgstr "Apparence de la fenêtre d’images" -#: ../app/dialogs/preferences-dialog.c:2726 +#: ../app/dialogs/preferences-dialog.c:2806 msgid "Default Appearance in Normal Mode" msgstr "Apparence par défaut en mode normal" -#: ../app/dialogs/preferences-dialog.c:2731 +#: ../app/dialogs/preferences-dialog.c:2811 msgid "Default Appearance in Fullscreen Mode" msgstr "Apparence par défaut en mode plein écran" -#: ../app/dialogs/preferences-dialog.c:2740 +#: ../app/dialogs/preferences-dialog.c:2820 msgid "Image Title & Statusbar Format" msgstr "Format du titre et de la barre d’état de l’image" -#: ../app/dialogs/preferences-dialog.c:2741 +#: ../app/dialogs/preferences-dialog.c:2821 msgid "Title & Status" msgstr "Titre et état" -#: ../app/dialogs/preferences-dialog.c:2759 +#: ../app/dialogs/preferences-dialog.c:2839 msgid "Current format" msgstr "Format actuel" -#: ../app/dialogs/preferences-dialog.c:2760 +#: ../app/dialogs/preferences-dialog.c:2840 msgid "Default format" msgstr "Format par défaut" -#: ../app/dialogs/preferences-dialog.c:2761 +#: ../app/dialogs/preferences-dialog.c:2841 msgid "Show zoom percentage" msgstr "Afficher le pourcentage de zoom" -#: ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/preferences-dialog.c:2842 msgid "Show zoom ratio" msgstr "Afficher le facteur d’échelle" -#: ../app/dialogs/preferences-dialog.c:2763 +#: ../app/dialogs/preferences-dialog.c:2843 msgid "Show image size" msgstr "Afficher la taille de l’image" -#: ../app/dialogs/preferences-dialog.c:2764 +#: ../app/dialogs/preferences-dialog.c:2844 msgid "Show drawable size" msgstr "Afficher la taille des objets graphiques" -#: ../app/dialogs/preferences-dialog.c:2777 +#: ../app/dialogs/preferences-dialog.c:2857 msgid "Image Title Format" msgstr "Format du titre de l’image" -#: ../app/dialogs/preferences-dialog.c:2779 +#: ../app/dialogs/preferences-dialog.c:2859 msgid "Image Statusbar Format" msgstr "Format de la barre d’état de l’image" -#: ../app/dialogs/preferences-dialog.c:2863 +#: ../app/dialogs/preferences-dialog.c:2943 msgid "Image Window Snapping Behavior" msgstr "Comportement de l’alignement de la fenêtre d’image" -#: ../app/dialogs/preferences-dialog.c:2864 +#: ../app/dialogs/preferences-dialog.c:2944 msgid "Snapping" msgstr "Alignement" -#: ../app/dialogs/preferences-dialog.c:2871 +#: ../app/dialogs/preferences-dialog.c:2951 msgid "Default Behavior in Normal Mode" msgstr "Comportement par défaut en mode normal" -#: ../app/dialogs/preferences-dialog.c:2875 +#: ../app/dialogs/preferences-dialog.c:2955 msgid "Default Behavior in Fullscreen Mode" msgstr "Comportement par défaut en mode plein écran" -#: ../app/dialogs/preferences-dialog.c:2884 +#: ../app/dialogs/preferences-dialog.c:2964 msgid "_Snapping distance:" msgstr "Distance d’_alignement :" -#: ../app/dialogs/preferences-dialog.c:2893 -#: ../app/dialogs/preferences-dialog.c:2894 +#: ../app/dialogs/preferences-dialog.c:2973 +#: ../app/dialogs/preferences-dialog.c:2974 msgid "Input Devices" msgstr "Périphériques d’entrée" #. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2900 +#: ../app/dialogs/preferences-dialog.c:2980 msgid "Extended Input Devices" msgstr "Périphériques d’entrée étendus" -#: ../app/dialogs/preferences-dialog.c:2904 +#: ../app/dialogs/preferences-dialog.c:2984 msgid "S_hare tool and tool options between input devices" msgstr "_Partager l’outil et ses options entre les périphériques d’entrée" -#: ../app/dialogs/preferences-dialog.c:2908 +#: ../app/dialogs/preferences-dialog.c:2988 msgid "Configure E_xtended Input Devices..." msgstr "_Configurer les périphériques d’entrée étendus" -#: ../app/dialogs/preferences-dialog.c:2915 +#: ../app/dialogs/preferences-dialog.c:2995 msgid "_Save input device settings on exit" msgstr "_Enregistrer l’état des périphériques en quittant" -#: ../app/dialogs/preferences-dialog.c:2919 +#: ../app/dialogs/preferences-dialog.c:2999 msgid "Save Input Device Settings _Now" msgstr "Enregistrer l’état des périphériques _maintenant" -#: ../app/dialogs/preferences-dialog.c:2926 +#: ../app/dialogs/preferences-dialog.c:3006 msgid "_Reset Saved Input Device Settings to Default Values" msgstr "_Restaurer l’état enregistré des périphériques aux valeurs par défaut" -#: ../app/dialogs/preferences-dialog.c:2941 +#: ../app/dialogs/preferences-dialog.c:3021 msgid "Additional Input Controllers" msgstr "Contrôleurs d’entrée additionnels" -#: ../app/dialogs/preferences-dialog.c:2942 +#: ../app/dialogs/preferences-dialog.c:3022 msgid "Input Controllers" msgstr "Contrôleurs d’entrée" -#: ../app/dialogs/preferences-dialog.c:2957 -#: ../app/dialogs/preferences-dialog.c:2958 +#: ../app/dialogs/preferences-dialog.c:3037 +#: ../app/dialogs/preferences-dialog.c:3038 msgid "Folders" msgstr "Dossiers" -#: ../app/dialogs/preferences-dialog.c:2974 +#: ../app/dialogs/preferences-dialog.c:3054 msgid "Temporary folder:" msgstr "Dossier temporaire :" -#: ../app/dialogs/preferences-dialog.c:2975 +#: ../app/dialogs/preferences-dialog.c:3055 msgid "Select Folder for Temporary Files" msgstr "Sélectionner un dossier pour les fichiers temporaires" -#: ../app/dialogs/preferences-dialog.c:2979 +#: ../app/dialogs/preferences-dialog.c:3059 msgid "Swap folder:" msgstr "Dossier d’échange (swap) :" -#: ../app/dialogs/preferences-dialog.c:2980 +#: ../app/dialogs/preferences-dialog.c:3060 msgid "Select Swap Folder" msgstr "Sélectionnez un dossier d’échange (swap)" -#: ../app/dialogs/preferences-dialog.c:3012 +#: ../app/dialogs/preferences-dialog.c:3092 msgid "Brush Folders" msgstr "Dossiers des brosses" -#: ../app/dialogs/preferences-dialog.c:3014 +#: ../app/dialogs/preferences-dialog.c:3094 msgid "Select Brush Folders" msgstr "Sélectionner les dossiers de brosses" -#: ../app/dialogs/preferences-dialog.c:3016 +#: ../app/dialogs/preferences-dialog.c:3096 msgid "Dynamics Folders" msgstr "Dossiers des dynamiques de brosse" -#: ../app/dialogs/preferences-dialog.c:3018 +#: ../app/dialogs/preferences-dialog.c:3098 msgid "Select Dynamics Folders" msgstr "Sélectionner les dossiers des dynamiques" -#: ../app/dialogs/preferences-dialog.c:3020 +#: ../app/dialogs/preferences-dialog.c:3100 msgid "Pattern Folders" msgstr "Dossiers des motifs" -#: ../app/dialogs/preferences-dialog.c:3022 +#: ../app/dialogs/preferences-dialog.c:3102 msgid "Select Pattern Folders" msgstr "Sélectionner les dossiers de motifs" -#: ../app/dialogs/preferences-dialog.c:3024 +#: ../app/dialogs/preferences-dialog.c:3104 msgid "Palette Folders" msgstr "Dossiers des palettes" -#: ../app/dialogs/preferences-dialog.c:3026 +#: ../app/dialogs/preferences-dialog.c:3106 msgid "Select Palette Folders" msgstr "Sélectionner les dossiers de palettes" -#: ../app/dialogs/preferences-dialog.c:3028 +#: ../app/dialogs/preferences-dialog.c:3108 msgid "Gradient Folders" msgstr "Dossiers des dégradés" -#: ../app/dialogs/preferences-dialog.c:3030 +#: ../app/dialogs/preferences-dialog.c:3110 msgid "Select Gradient Folders" msgstr "Sélectionner les dossiers de dégradés" -#: ../app/dialogs/preferences-dialog.c:3032 +#: ../app/dialogs/preferences-dialog.c:3112 msgid "Font Folders" msgstr "Dossiers des polices" -#: ../app/dialogs/preferences-dialog.c:3034 +#: ../app/dialogs/preferences-dialog.c:3114 msgid "Select Font Folders" msgstr "Sélectionner les dossiers des polices" -#: ../app/dialogs/preferences-dialog.c:3036 +#: ../app/dialogs/preferences-dialog.c:3116 msgid "Tool Preset Folders" msgstr "Dossiers des préréglages d’outils" -#: ../app/dialogs/preferences-dialog.c:3038 +#: ../app/dialogs/preferences-dialog.c:3118 msgid "Select Tool Preset Folders" msgstr "Sélectionner les dossiers des préréglages d’outils" -#: ../app/dialogs/preferences-dialog.c:3040 +#: ../app/dialogs/preferences-dialog.c:3120 msgid "MyPaint Brush Folders" msgstr "Dossiers des brosses MyPaint" -#: ../app/dialogs/preferences-dialog.c:3042 +#: ../app/dialogs/preferences-dialog.c:3122 msgid "Select MyPaint Brush Folders" msgstr "Sélectionner les dossiers de brosses Mypaint" -#: ../app/dialogs/preferences-dialog.c:3044 +#: ../app/dialogs/preferences-dialog.c:3124 msgid "Plug-in Folders" msgstr "Dossiers des greffons" -#: ../app/dialogs/preferences-dialog.c:3046 +#: ../app/dialogs/preferences-dialog.c:3126 msgid "Select plug-in Folders" msgstr "Sélectionner les dossiers de greffons" -#: ../app/dialogs/preferences-dialog.c:3048 +#: ../app/dialogs/preferences-dialog.c:3128 msgid "Scripts" msgstr "Scripts" -#: ../app/dialogs/preferences-dialog.c:3048 +#: ../app/dialogs/preferences-dialog.c:3128 msgid "Script-Fu Folders" msgstr "Dossiers des Script-Fu" -#: ../app/dialogs/preferences-dialog.c:3050 +#: ../app/dialogs/preferences-dialog.c:3130 msgid "Select Script-Fu Folders" msgstr "Sélectionner les dossiers de Script-Fu" -#: ../app/dialogs/preferences-dialog.c:3052 +#: ../app/dialogs/preferences-dialog.c:3132 msgid "Module Folders" msgstr "Dossiers des modules" -#: ../app/dialogs/preferences-dialog.c:3054 +#: ../app/dialogs/preferences-dialog.c:3134 msgid "Select Module Folders" msgstr "Sélectionner les dossiers de modules" -#: ../app/dialogs/preferences-dialog.c:3056 +#: ../app/dialogs/preferences-dialog.c:3136 msgid "Interpreters" msgstr "Interpréteurs" -#: ../app/dialogs/preferences-dialog.c:3056 +#: ../app/dialogs/preferences-dialog.c:3136 msgid "Interpreter Folders" msgstr "Dossiers d’interpréteur" -#: ../app/dialogs/preferences-dialog.c:3058 +#: ../app/dialogs/preferences-dialog.c:3138 msgid "Select Interpreter Folders" msgstr "Sélectionner les dossiers d’interpréteur" -#: ../app/dialogs/preferences-dialog.c:3060 +#: ../app/dialogs/preferences-dialog.c:3140 msgid "Environment" msgstr "Environnement" -#: ../app/dialogs/preferences-dialog.c:3060 +#: ../app/dialogs/preferences-dialog.c:3140 msgid "Environment Folders" msgstr "Dossiers d’environnement" -#: ../app/dialogs/preferences-dialog.c:3062 +#: ../app/dialogs/preferences-dialog.c:3142 msgid "Select Environment Folders" msgstr "Sélectionner les dossiers d’environnement" -#: ../app/dialogs/preferences-dialog.c:3064 +#: ../app/dialogs/preferences-dialog.c:3144 msgid "Themes" msgstr "Thèmes" -#: ../app/dialogs/preferences-dialog.c:3064 +#: ../app/dialogs/preferences-dialog.c:3144 msgid "Theme Folders" msgstr "Dossiers des thèmes" -#: ../app/dialogs/preferences-dialog.c:3066 +#: ../app/dialogs/preferences-dialog.c:3146 msgid "Select Theme Folders" msgstr "Sélectionner les dossiers de thèmes" -#: ../app/dialogs/preferences-dialog.c:3068 +#: ../app/dialogs/preferences-dialog.c:3148 msgid "Icon Themes" msgstr "Thèmes d’icône" -#: ../app/dialogs/preferences-dialog.c:3068 +#: ../app/dialogs/preferences-dialog.c:3148 msgid "Icon Theme Folders" msgstr "Dossiers des thèmes d’icône" -#: ../app/dialogs/preferences-dialog.c:3070 +#: ../app/dialogs/preferences-dialog.c:3150 msgid "Select Icon Theme Folders" msgstr "Sélectionner les dossiers de thèmes d’icône" @@ -16540,10 +16803,10 @@ msgstr "Déplacer" #: ../app/display/gimpcursorview.c:250 ../app/display/gimpcursorview.c:256 #: ../app/display/gimpcursorview.c:275 ../app/display/gimpcursorview.c:281 #: ../app/display/gimpcursorview.c:297 ../app/display/gimpcursorview.c:304 -#: ../app/display/gimpcursorview.c:706 ../app/display/gimpcursorview.c:708 -#: ../app/display/gimpcursorview.c:710 ../app/display/gimpcursorview.c:712 -#: ../app/display/gimpcursorview.c:791 ../app/display/gimpcursorview.c:792 +#: ../app/display/gimpcursorview.c:708 ../app/display/gimpcursorview.c:710 +#: ../app/display/gimpcursorview.c:712 ../app/display/gimpcursorview.c:714 #: ../app/display/gimpcursorview.c:793 ../app/display/gimpcursorview.c:794 +#: ../app/display/gimpcursorview.c:795 ../app/display/gimpcursorview.c:796 msgid "n/a" msgstr "n/d" @@ -16579,7 +16842,7 @@ msgstr "L" msgid "H" msgstr "H" -#: ../app/display/gimpcursorview.c:337 +#: ../app/display/gimpcursorview.c:339 msgid "_Sample Merged" msgstr "_Échantillonner sur tous les calques" @@ -16604,7 +16867,7 @@ msgstr "Naviguer dans l’affichage d’image" msgid "Drop image files here to open them" msgstr "Déposer les fichiers d’images ici pour les ouvrir" -#: ../app/display/gimpdisplayshell-callbacks.c:540 +#: ../app/display/gimpdisplayshell-callbacks.c:551 #, c-format msgid "" "Unstable Development Version\n" @@ -16703,9 +16966,9 @@ msgstr "Impossible de modifier les pixels des groupes de calques." #: ../app/display/gimpdisplayshell-dnd.c:368 ../app/tools/gimpblendtool.c:250 #: ../app/tools/gimpbucketfilltool.c:144 ../app/tools/gimpcagetool.c:227 -#: ../app/tools/gimpcroptool.c:443 ../app/tools/gimpfiltertool.c:275 +#: ../app/tools/gimpcroptool.c:462 ../app/tools/gimpfiltertool.c:275 #: ../app/tools/gimppainttool.c:279 ../app/tools/gimpselectiontool.c:432 -#: ../app/tools/gimptransformtool.c:1404 ../app/tools/gimpwarptool.c:629 +#: ../app/tools/gimptransformtool.c:1435 ../app/tools/gimpwarptool.c:629 msgid "The active layer's pixels are locked." msgstr "Les pixels du calque actif sont verrouillés." @@ -16724,13 +16987,13 @@ msgid "Drop color to layer" msgstr "Déposer une couleur sur le calque" #: ../app/display/gimpdisplayshell-dnd.c:569 -#: ../app/widgets/gimplayertreeview.c:735 +#: ../app/widgets/gimplayertreeview.c:756 msgid "Drop layers" msgstr "Déposer les calques" #: ../app/display/gimpdisplayshell-dnd.c:706 #: ../app/display/gimpdisplayshell-dnd.c:724 -#: ../app/widgets/gimplayertreeview.c:810 ../app/widgets/gimptoolbox-dnd.c:272 +#: ../app/widgets/gimplayertreeview.c:831 ../app/widgets/gimptoolbox-dnd.c:272 msgid "Dropped Buffer" msgstr "Presse-papiers déposé" @@ -16752,7 +17015,7 @@ msgstr "Image enregistrée comme « %s »" msgid "Image exported to '%s'" msgstr "Image exportée en « %s »" -#: ../app/display/gimpdisplayshell-layer-select.c:125 +#: ../app/display/gimpdisplayshell-layer-select.c:128 msgid "Layer Select" msgstr "Sélection de calque" @@ -16765,7 +17028,7 @@ msgid "Select Rotation Angle" msgstr "Sélectionner l’angle de rotation" #: ../app/display/gimpdisplayshell-rotate-dialog.c:154 -#: ../app/tools/gimpmeasuretool.c:697 +#: ../app/tools/gimpmeasuretool.c:698 msgid "Angle:" msgstr "Angle :" @@ -16810,8 +17073,8 @@ msgid "not color managed" msgstr "couleurs non gérées" #: ../app/display/gimpdisplayshell-utils.c:149 -#: ../app/tools/gimpmeasuretool.c:680 ../app/tools/gimpmeasuretool.c:736 -#: ../app/tools/gimpmeasuretool.c:764 +#: ../app/tools/gimpmeasuretool.c:528 ../app/tools/gimpmeasuretool.c:681 +#: ../app/tools/gimpmeasuretool.c:737 ../app/tools/gimpmeasuretool.c:765 msgid "pixels" msgstr "pixels" @@ -16844,33 +17107,33 @@ msgstr "Cliquez-glissez pour déplacer ce point" msgid "Click-Drag to move all points" msgstr "Cliquez-glissez pour déplacer tous les points" -#: ../app/display/gimptoolhandlegrid.c:849 -#: ../app/display/gimptooltransformgrid.c:1720 +#: ../app/display/gimptoolhandlegrid.c:837 +#: ../app/display/gimptooltransformgrid.c:1773 msgid "Click-Drag to move" msgstr "Cliquez-glissez pour déplacer" -#: ../app/display/gimptoolhandlegrid.c:852 +#: ../app/display/gimptoolhandlegrid.c:840 msgid "Click-Drag to rotate and scale" msgstr "Cliquez-glissez pour la rotation et mise à l’échelle" -#: ../app/display/gimptoolhandlegrid.c:855 +#: ../app/display/gimptoolhandlegrid.c:843 msgid "Click-Drag to shear and scale" msgstr "Cliquez-glissez pour cisailler et mettre à l’échelle" -#: ../app/display/gimptoolhandlegrid.c:858 -#: ../app/display/gimptooltransformgrid.c:1708 +#: ../app/display/gimptoolhandlegrid.c:846 +#: ../app/display/gimptooltransformgrid.c:1761 msgid "Click-Drag to change perspective" msgstr "Cliquez-glissez pour changer la perspective" -#: ../app/display/gimptoolhandlegrid.c:869 +#: ../app/display/gimptoolhandlegrid.c:857 msgid "Click to add a handle" msgstr "Cliquez pour ajouter une poignée" -#: ../app/display/gimptoolhandlegrid.c:875 +#: ../app/display/gimptoolhandlegrid.c:863 msgid "Click-Drag to move this handle" msgstr "Cliquez-glissez pour déplacer cette poignée" -#: ../app/display/gimptoolhandlegrid.c:880 +#: ../app/display/gimptoolhandlegrid.c:868 msgid "Click-Drag to remove this handle" msgstr "Cliquez-glissez pour supprimer cette poignée" @@ -17114,20 +17377,20 @@ msgstr "Rectangle : " msgid "Position: " msgstr "Position : " -#: ../app/display/gimptooltransformgrid.c:1713 -#: ../app/display/gimptooltransformgrid.c:1718 +#: ../app/display/gimptooltransformgrid.c:1766 +#: ../app/display/gimptooltransformgrid.c:1771 msgid "Click-Drag to scale" msgstr "Cliquez-glissez pour mettre à l’échelle" -#: ../app/display/gimptooltransformgrid.c:1722 +#: ../app/display/gimptooltransformgrid.c:1775 msgid "Click-Drag to move the pivot point" msgstr "Cliquez-glissez pour déplacer le point pivot" -#: ../app/display/gimptooltransformgrid.c:1727 +#: ../app/display/gimptooltransformgrid.c:1780 msgid "Click-Drag to shear" msgstr "Cliquez-glissez pour cisailler" -#: ../app/display/gimptooltransformgrid.c:1729 +#: ../app/display/gimptooltransformgrid.c:1782 msgid "Click-Drag to rotate" msgstr "Cliquez-glissez pour une rotation" @@ -17320,23 +17583,23 @@ msgstr "Auto" #: ../app/operations/operations-enums.c:60 msgctxt "layer-composite-mode" -msgid "Source over" -msgstr "Source sur (over)" +msgid "Union" +msgstr "Union" #: ../app/operations/operations-enums.c:61 msgctxt "layer-composite-mode" -msgid "Source atop" -msgstr "Source au-dessus (atop)" +msgid "Clip to backdrop" +msgstr "Attacher à la toile de fond" #: ../app/operations/operations-enums.c:62 msgctxt "layer-composite-mode" -msgid "Destination atop" -msgstr "Destination au-dessus (atop)" +msgid "Clip to layer" +msgstr "Attacher au calque" #: ../app/operations/operations-enums.c:63 msgctxt "layer-composite-mode" -msgid "Source in" -msgstr "Source dans (in)" +msgid "Intersection" +msgstr "Intersection" #: ../app/operations/operations-enums.c:153 msgctxt "layer-mode" @@ -18032,7 +18295,7 @@ msgstr "Transformer les couleurs en niveaux de gris" #: ../app/operations/gimpoperationdesaturate.c:91 msgid "Choose shade of gray based on" -msgstr "Choisir la nuance de gris basée sur" +msgstr "Choisir la nuance de gris fondée sur" #: ../app/operations/gimpoperationhuesaturation.c:65 msgid "Adjust hue, saturation, and lightness" @@ -18084,10 +18347,43 @@ msgstr "" msgid "default:LTR" msgstr "\"\"" +#: ../app/gui/gui.c:326 +msgid "Image Recovery" +msgstr "Récupération de l’image" + +#: ../app/gui/gui.c:328 +msgid "_Discard" +msgstr "_Abandonner" + +#: ../app/gui/gui.c:329 +msgid "_Recover" +msgstr "_Récupérer" + +#: ../app/gui/gui.c:340 +msgid "Eeek! It looks like GIMP recovered from a crash!" +msgstr "Oui ! Il semble bien que GIMP se soit rétabli après son plantage !" + +#. TRANSLATORS: even if English singular form does +#. * not use %d, you can use %d for translation in +#. * any singular/plural form of your language if +#. * suited. It will just work and be replaced by the +#. * number of images as expected. +#. +#: ../app/gui/gui.c:349 +#, c-format +msgid "" +"An image was salvaged from the crash. Do you want to try and recover it?" +msgid_plural "" +"%d images were salvaged from the crash. Do you want to try and recover them?" +msgstr[0] "" +"Une image a été sauvée après un plantage. Voulez-vous tenter de la récupérer ?" +msgstr[1] "" +"%d images ont été sauvées après un plantage. Voulez-vous tenter de les récupérer ?" + #. load the recent documents after gimp_real_restore() because we #. * need the mime-types implemented by plug-ins #. -#: ../app/gui/gui.c:543 +#: ../app/gui/gui.c:594 msgid "Documents" msgstr "Documents" @@ -18112,11 +18408,11 @@ msgstr "Déplacement seulement" msgid "Flow" msgstr "Débit" -#: ../app/paint/gimpbrushcore.c:394 +#: ../app/paint/gimpbrushcore.c:393 msgid "No brushes available for use with this tool." msgstr "Aucune brosse disponible pour être utilisée avec cet outil." -#: ../app/paint/gimpbrushcore.c:401 +#: ../app/paint/gimpbrushcore.c:400 msgid "No paint dynamics available for use with this tool." msgstr "" "Aucune dynamique de brosse disponible pour être utilisée avec cet outil." @@ -18198,8 +18494,8 @@ msgid "Tilt" msgstr "Inclinaison" #. Blob shape widgets -#: ../app/paint/gimpinkoptions.c:106 ../app/tools/gimpblendoptions.c:90 -#: ../app/tools/gimpblendoptions.c:277 ../app/tools/gimpinkoptions-gui.c:103 +#: ../app/paint/gimpinkoptions.c:106 ../app/tools/gimpblendoptions.c:94 +#: ../app/tools/gimpblendoptions.c:294 ../app/tools/gimpinkoptions-gui.c:103 msgid "Shape" msgstr "Forme" @@ -18380,8 +18676,8 @@ msgstr "Inverser" msgid "Reverse direction of fading" msgstr "Inverse le sens d’estompement" -#: ../app/paint/gimppaintoptions.c:327 ../app/tools/gimpblendoptions.c:97 -#: ../app/tools/gimpblendoptions.c:286 ../app/tools/gimppaintoptions-gui.c:356 +#: ../app/paint/gimppaintoptions.c:327 ../app/tools/gimpblendoptions.c:108 +#: ../app/tools/gimpblendoptions.c:315 ../app/tools/gimppaintoptions-gui.c:356 msgid "Repeat" msgstr "Répétition" @@ -18418,7 +18714,7 @@ msgstr "Crayon" msgid "Perspective Clone" msgstr "Clonage en perspective" -#: ../app/paint/gimpsmudge.c:85 ../app/tools/gimpsmudgetool.c:55 +#: ../app/paint/gimpsmudge.c:86 ../app/tools/gimpsmudgetool.c:55 msgid "Smudge" msgstr "Barbouillage" @@ -18454,7 +18750,7 @@ msgstr "Définissez d’abord une image source" msgid "Alignment" msgstr "Alignement" -#: ../app/paint/gimpsourceoptions.c:71 ../app/pdb/gimppdbcontext.c:127 +#: ../app/paint/gimpsourceoptions.c:71 ../app/pdb/gimppdbcontext.c:128 #: ../app/tools/gimpbucketfilloptions.c:117 ../app/tools/gimpcoloroptions.c:69 #: ../app/tools/gimphealtool.c:99 ../app/tools/gimpregionselectoptions.c:97 msgid "Sample merged" @@ -18892,53 +19188,57 @@ msgstr "" "La procédure « %s » a été appelée avec un type erroné pour le paramètre n°" "%d. %s attendu, %s obtenu." -#: ../app/pdb/gimppdbcontext.c:100 ../app/tools/gimpselectionoptions.c:81 +#: ../app/pdb/gimppdbcontext.c:101 ../app/tools/gimpselectionoptions.c:81 msgid "Smooth edges" msgstr "Lisser les contours" -#: ../app/pdb/gimppdbcontext.c:106 +#: ../app/pdb/gimppdbcontext.c:107 msgid "Feather" msgstr "Adoucir" -#: ../app/pdb/gimppdbcontext.c:113 +#: ../app/pdb/gimppdbcontext.c:114 msgid "Feather radius X" msgstr "Rayon d’adoucissement X" -#: ../app/pdb/gimppdbcontext.c:120 +#: ../app/pdb/gimppdbcontext.c:121 msgid "Feather radius Y" msgstr "Rayon d’adoucissement Y" -#: ../app/pdb/gimppdbcontext.c:134 +#: ../app/pdb/gimppdbcontext.c:135 msgid "Sample criterion" msgstr "Critère d’échantillonnage" -#: ../app/pdb/gimppdbcontext.c:142 +#: ../app/pdb/gimppdbcontext.c:143 msgid "Sample threshold" msgstr "Seuil d’échantillonnage" -#: ../app/pdb/gimppdbcontext.c:149 +#: ../app/pdb/gimppdbcontext.c:150 msgid "Sample transparent" msgstr "Échantillonner le transparent" -#: ../app/pdb/gimppdbcontext.c:156 ../app/tools/gimpbucketfilloptions.c:124 +#: ../app/pdb/gimppdbcontext.c:157 ../app/tools/gimpbucketfilloptions.c:124 #: ../app/tools/gimpregionselectoptions.c:104 msgid "Diagonal neighbors" msgstr "Voisins diagonaux" -#: ../app/pdb/gimppdbcontext.c:163 ../app/tools/gimptransformoptions.c:124 +#: ../app/pdb/gimppdbcontext.c:164 ../app/tools/gimptransformoptions.c:124 #: ../app/tools/gimptransformoptions.c:440 ../app/tools/gimpwarpoptions.c:119 #: ../app/tools/gimpwarpoptions.c:322 msgid "Interpolation" msgstr "Type d’interpolation" -#: ../app/pdb/gimppdbcontext.c:171 +#: ../app/pdb/gimppdbcontext.c:172 msgid "Transform direction" msgstr "Sens de transformation" -#: ../app/pdb/gimppdbcontext.c:179 +#: ../app/pdb/gimppdbcontext.c:180 msgid "Transform resize" msgstr "Redimensionner la transformation" +#: ../app/pdb/gimppdbcontext.c:195 +msgid "Distance metric" +msgstr "Métrique de distance" + #: ../app/pdb/gimpprocedure.c:467 ../app/plug-in/gimppluginprocframe.c:191 #, c-format msgid "Procedure '%s' returned no return values" @@ -19399,7 +19699,7 @@ msgstr "Interpréteur erroné indiqué dans le fichier d’interpréteur %s : % msgid "Bad binary format string in interpreter file %s" msgstr "Format binaire erroné dans le fichier d’interpréteur %s" -#: ../app/plug-in/gimpplugin.c:629 +#: ../app/plug-in/gimpplugin.c:622 #, c-format msgid "" "Plug-in crashed: \"%s\"\n" @@ -19596,11 +19896,11 @@ msgstr "Intervalle de destination" msgid "Gray Handling" msgstr "Poignée grise" -#: ../app/propgui/gimppropgui-color-to-alpha.c:179 +#: ../app/propgui/gimppropgui-color-to-alpha.c:109 msgid "Pick farthest full-transparency color" msgstr "Prélever la couleur en pleine transparence la plus éloignée" -#: ../app/propgui/gimppropgui-color-to-alpha.c:201 +#: ../app/propgui/gimppropgui-color-to-alpha.c:131 msgid "Pick nearest full-opacity color" msgstr "Prélever la couleur en pleine transparence la plus proche" @@ -19636,7 +19936,7 @@ msgstr "Augmenter la netteté" msgid "Other Options" msgstr "Options d’estompement" -#: ../app/propgui/gimppropgui-generic.c:177 +#: ../app/propgui/gimppropgui-generic.c:185 msgid "Pick coordinates from the image" msgstr "Relever les coordonnées dans l’image" @@ -19700,6 +20000,10 @@ msgstr "_Saturation" msgid "R_eset Color" msgstr "Ré_initialiser la couleur" +#: ../app/propgui/gimppropgui-recursive-transform.c:125 +msgid "Recursive Transform: " +msgstr "Transformation récursive : " + #: ../app/propgui/gimppropgui-shadows-highlights.c:62 msgid "Shadows" msgstr "Tons sombres" @@ -19805,11 +20109,11 @@ msgstr "Choisissez parmi une liste de températures de couleurs communes" msgid "New Seed" msgstr "Nouveau germe" -#: ../app/propgui/gimppropgui.c:374 +#: ../app/propgui/gimppropgui.c:375 msgid "Pick color from the image" msgstr "Prélever une couleur dans l’image" -#: ../app/propgui/gimppropgui.c:514 +#: ../app/propgui/gimppropgui.c:517 msgid "This operation has no editable properties" msgstr "Cette opération n’a pas de propriétés modifiables" @@ -19823,7 +20127,7 @@ msgstr "" "Portez ce vieux whisky\n" "au juge blond qui fume." -#: ../app/text/gimptext-compat.c:106 ../app/tools/gimptexttool.c:1462 +#: ../app/text/gimptext-compat.c:106 ../app/tools/gimptexttool.c:1472 msgid "Add Text Layer" msgstr "Ajouter un calque de texte" @@ -20048,47 +20352,55 @@ msgstr "Cliquez pour sélectionner ce chemin comme premier élément" msgid "Click to add this path to the list" msgstr "Cliquez pour ajouter ce chemin à la liste" -#: ../app/tools/gimpblendoptions.c:105 +#: ../app/tools/gimpblendoptions.c:101 ../app/tools/gimpblendoptions.c:303 +msgid "Metric" +msgstr "Métrique" + +#: ../app/tools/gimpblendoptions.c:102 +msgid "Metric to use for the distance calculation" +msgstr "Métrique à utiliser pour le calcul de distance" + +#: ../app/tools/gimpblendoptions.c:116 msgid "Adaptive Supersampling" msgstr "Sur-échantillonnage adaptatif" -#: ../app/tools/gimpblendoptions.c:111 +#: ../app/tools/gimpblendoptions.c:122 msgid "Max depth" msgstr "Profondeur max" -#: ../app/tools/gimpblendoptions.c:117 ../app/tools/gimpbucketfilloptions.c:142 +#: ../app/tools/gimpblendoptions.c:128 ../app/tools/gimpbucketfilloptions.c:142 #: ../app/tools/gimpregionselectoptions.c:112 #: ../app/tools/gimpthresholdtool.c:87 msgid "Threshold" msgstr "Seuil" -#: ../app/tools/gimpblendoptions.c:131 +#: ../app/tools/gimpblendoptions.c:142 msgid "Instant mode" msgstr "Mode instantané" -#: ../app/tools/gimpblendoptions.c:132 +#: ../app/tools/gimpblendoptions.c:143 msgid "Commit gradient instantly" msgstr "Valider le dégradé instantanément" -#: ../app/tools/gimpblendoptions.c:138 +#: ../app/tools/gimpblendoptions.c:149 msgid "Modify active gradient" msgstr "Modifier le dégradé actif" -#: ../app/tools/gimpblendoptions.c:139 +#: ../app/tools/gimpblendoptions.c:150 msgid "Modify the active gradient in-place" msgstr "Modifier le dégradé actif en place" -#: ../app/tools/gimpblendoptions.c:271 ../app/tools/gimppaintoptions-gui.c:379 +#: ../app/tools/gimpblendoptions.c:288 ../app/tools/gimppaintoptions-gui.c:379 msgid "Edit this gradient" msgstr "Modifier ce dégradé" #. the instant toggle -#: ../app/tools/gimpblendoptions.c:326 +#: ../app/tools/gimpblendoptions.c:356 #, c-format msgid "Instant mode (%s)" msgstr "Mode instantané (%s)" -#: ../app/tools/gimpblendoptions.c:346 +#: ../app/tools/gimpblendoptions.c:376 msgid "" "The active gradient is non-writable and cannot be edited directly. Uncheck " "this option to edit a copy of it." @@ -20116,7 +20428,7 @@ msgstr "Cliquez-glissez pour pour tracer un dégradé" #: ../app/tools/gimpblendtool.c:257 ../app/tools/gimpbucketfilltool.c:151 #: ../app/tools/gimpcagetool.c:234 ../app/tools/gimpfiltertool.c:282 #: ../app/tools/gimpforegroundselecttool.c:288 ../app/tools/gimppainttool.c:286 -#: ../app/tools/gimptransformtool.c:1412 ../app/tools/gimpwarptool.c:640 +#: ../app/tools/gimptransformtool.c:1443 ../app/tools/gimpwarptool.c:640 msgid "The active layer is not visible." msgstr "Le calque actif n’est pas visible." @@ -20124,7 +20436,7 @@ msgstr "Le calque actif n’est pas visible." msgid "No gradient available for use with this tool." msgstr "Aucun dégradé disponible pour être utilisé avec cet outil." -#: ../app/tools/gimpblendtool.c:571 +#: ../app/tools/gimpblendtool.c:614 msgid "Blend: " msgstr "Dégradé :" @@ -20578,33 +20890,33 @@ msgid "How to fill new areas created by 'Allow growing'" msgstr "" "Comment remplir les nouvelles zones créées par « Autoriser l’agrandissement »" -#: ../app/tools/gimpcroptool.c:115 +#: ../app/tools/gimpcroptool.c:118 msgid "Crop" msgstr "Découpage" -#: ../app/tools/gimpcroptool.c:116 +#: ../app/tools/gimpcroptool.c:119 msgid "Crop Tool: Remove edge areas from image or layer" msgstr "" "Outil de découpage : supprime les régions en bordure d’une image ou d’un " "calque" -#: ../app/tools/gimpcroptool.c:117 +#: ../app/tools/gimpcroptool.c:120 msgid "_Crop" msgstr "Déc_oupage" -#: ../app/tools/gimpcroptool.c:154 +#: ../app/tools/gimpcroptool.c:158 msgid "Click-Drag to draw a crop rectangle" msgstr "Cliquez-glissez pour créer un rectangle de découpage" -#: ../app/tools/gimpcroptool.c:263 +#: ../app/tools/gimpcroptool.c:278 msgid "Click or press Enter to crop" msgstr "Cliquer ou appuyer sur Entrée pour découper" -#: ../app/tools/gimpcroptool.c:366 +#: ../app/tools/gimpcroptool.c:385 msgid "Crop to: " msgstr "Rogner jusqu’à : " -#: ../app/tools/gimpcroptool.c:436 +#: ../app/tools/gimpcroptool.c:455 msgid "There is no active layer to crop." msgstr "Il n’y a pas de calque actif à découper." @@ -20659,15 +20971,15 @@ msgstr "Ajuster les courbes en lumière linéaire" msgid "Adjust curves perceptually" msgstr "Ajuster les courbes perceptuellement" -#: ../app/tools/gimpcurvestool.c:539 ../app/widgets/gimpdeviceinfoeditor.c:464 +#: ../app/tools/gimpcurvestool.c:543 ../app/widgets/gimpdeviceinfoeditor.c:464 msgid "Curve _type:" msgstr "_Type de courbe :" -#: ../app/tools/gimpcurvestool.c:656 ../app/tools/gimplevelstool.c:739 +#: ../app/tools/gimpcurvestool.c:661 ../app/tools/gimplevelstool.c:744 msgid "Could not read header: " msgstr "Impossible de lire l’en-tête :" -#: ../app/tools/gimpcurvestool.c:730 +#: ../app/tools/gimpcurvestool.c:735 msgid "Use _old curves file format" msgstr "Utiliser le format de fichier avec _anciennes courbes" @@ -20717,13 +21029,13 @@ msgstr "%s pour éclaircir" msgid "Type (%s)" msgstr "Type (%s)" -#: ../app/tools/gimpeditselectiontool.c:444 -#: ../app/tools/gimpeditselectiontool.c:612 +#: ../app/tools/gimpeditselectiontool.c:449 +#: ../app/tools/gimpeditselectiontool.c:623 msgid "Move: " msgstr "Déplacement : " -#: ../app/tools/gimpeditselectiontool.c:868 -#: ../app/tools/gimpeditselectiontool.c:1127 +#: ../app/tools/gimpeditselectiontool.c:879 +#: ../app/tools/gimpeditselectiontool.c:1138 msgid "Move Floating Selection" msgstr "Déplacer la sélection flottante" @@ -20818,12 +21130,12 @@ msgstr "%s : basculer original et filtré" msgid "%s: switch horizontal and vertical" msgstr "%s : basculer horizontal et vertical" -#: ../app/tools/gimpfiltertool.c:1295 ../app/tools/gimpfiltertool-settings.c:71 +#: ../app/tools/gimpfiltertool.c:1298 ../app/tools/gimpfiltertool-settings.c:71 #, c-format msgid "Import '%s' Settings" msgstr "Importer des paramètres de « %s »" -#: ../app/tools/gimpfiltertool.c:1297 ../app/tools/gimpfiltertool-settings.c:73 +#: ../app/tools/gimpfiltertool.c:1300 ../app/tools/gimpfiltertool-settings.c:73 #, c-format msgid "Export '%s' Settings" msgstr "Exporter les paramètres de « %s »" @@ -21045,7 +21357,7 @@ msgid "Fuzzy Select" msgstr "Sélection approximative" #: ../app/tools/gimpgegltool.c:78 ../app/tools/gimpgegltool.c:539 -#: ../app/tools/gimpgegltool.c:540 ../app/tools/gimpoperationtool.c:131 +#: ../app/tools/gimpgegltool.c:540 ../app/tools/gimpoperationtool.c:134 msgid "GEGL Operation" msgstr "Action GEGL" @@ -21053,7 +21365,7 @@ msgstr "Action GEGL" msgid "GEGL Tool: Use an arbitrary GEGL operation" msgstr "Outil GEGL : utilise une action GEGL arbitraire" -#: ../app/tools/gimpgegltool.c:80 ../app/tools/gimpoperationtool.c:133 +#: ../app/tools/gimpgegltool.c:80 ../app/tools/gimpoperationtool.c:136 msgid "_GEGL Operation..." msgstr "Action GEGL…" @@ -21062,6 +21374,14 @@ msgstr "Action GEGL…" msgid "Select an operation from the list above" msgstr "Sélectionner une opération dans la liste ci-dessus" +#: ../app/tools/gimpgenerictransformtool.c:83 +msgid "Transform Matrix" +msgstr "Matrice de transformation" + +#: ../app/tools/gimpgenerictransformtool.c:114 +msgid "Invalid transform" +msgstr "Transformation non valide" + #: ../app/tools/gimpguidetool.c:274 msgid "Remove Guide" msgstr "Supprimer le guide" @@ -21095,17 +21415,17 @@ msgstr "Déplacer les poignées de transformation" msgid "Remove transform handles" msgstr "Supprimer les poignées de transformation" -#: ../app/tools/gimphandletransformtool.c:116 +#: ../app/tools/gimphandletransformtool.c:115 msgid "Handle Transform" msgstr "Transformation par poignées" -#: ../app/tools/gimphandletransformtool.c:117 +#: ../app/tools/gimphandletransformtool.c:116 msgid "Handle Transform Tool: Deform the layer, selection or path with handles" msgstr "" "Outil de transformation par poignées : déformation du calque, de la " "sélection ou du chemin avec des poignées" -#: ../app/tools/gimphandletransformtool.c:119 +#: ../app/tools/gimphandletransformtool.c:118 msgid "_Handle Transform" msgstr "Transformation par _poignées" @@ -21113,12 +21433,7 @@ msgstr "Transformation par _poignées" msgid "Handle transformation" msgstr "Transformation par poignées" -#: ../app/tools/gimphandletransformtool.c:213 -#: ../app/tools/gimpperspectivetool.c:127 -msgid "Transformation Matrix" -msgstr "Matrice de transformation" - -#: ../app/tools/gimphandletransformtool.c:380 +#: ../app/tools/gimphandletransformtool.c:310 msgctxt "undo-type" msgid "Handle transform" msgstr "Transformation par poignées" @@ -21270,37 +21585,37 @@ msgstr "Ajuster les niveaux perceptuellement" msgid "Input Levels" msgstr "Niveaux d’entrée" -#: ../app/tools/gimplevelstool.c:488 +#: ../app/tools/gimplevelstool.c:492 msgid "Clamp _input" msgstr "_Limiter l’entrée" #. Output levels frame -#: ../app/tools/gimplevelstool.c:531 +#: ../app/tools/gimplevelstool.c:535 msgid "Output Levels" msgstr "Niveaux de sortie" -#: ../app/tools/gimplevelstool.c:579 +#: ../app/tools/gimplevelstool.c:583 msgid "Clamp outpu_t" msgstr "Limiter la sor_tie" #. all channels frame -#: ../app/tools/gimplevelstool.c:594 +#: ../app/tools/gimplevelstool.c:598 msgid "All Channels" msgstr "Tous les canaux" -#: ../app/tools/gimplevelstool.c:606 +#: ../app/tools/gimplevelstool.c:610 msgid "_Auto Input Levels" msgstr "Niveaux d’entrée _automatiques" -#: ../app/tools/gimplevelstool.c:609 +#: ../app/tools/gimplevelstool.c:613 msgid "Adjust levels for all channels automatically" msgstr "Ajuster les niveaux de tous les canaux automatiquement" -#: ../app/tools/gimplevelstool.c:636 +#: ../app/tools/gimplevelstool.c:640 msgid "Edit these Settings as Curves" msgstr "Modifier ces paramètres comme Courbes" -#: ../app/tools/gimplevelstool.c:855 +#: ../app/tools/gimplevelstool.c:860 msgid "Use _old levels file format" msgstr "Utiliser le format de fichier avec _anciens niveaux" @@ -21339,31 +21654,31 @@ msgstr "_Zoom" msgid "Open a floating dialog to view details about measurements" msgstr "Ouvrir une fenêtre temporaire pour visualiser le détail des mesures" -#: ../app/tools/gimpmeasuretool.c:122 +#: ../app/tools/gimpmeasuretool.c:121 msgid "Measure" msgstr "Mesure" -#: ../app/tools/gimpmeasuretool.c:123 +#: ../app/tools/gimpmeasuretool.c:122 msgid "Measure Tool: Measure distances and angles" msgstr "Outil de mesure : mesure les distances et les angles" -#: ../app/tools/gimpmeasuretool.c:124 +#: ../app/tools/gimpmeasuretool.c:123 msgid "_Measure" msgstr "_Mesure" -#: ../app/tools/gimpmeasuretool.c:157 +#: ../app/tools/gimpmeasuretool.c:156 msgid "Click-Drag to create a line" msgstr "Cliquez-glissez pour créer une ligne" -#: ../app/tools/gimpmeasuretool.c:335 +#: ../app/tools/gimpmeasuretool.c:334 msgid "Add Guides" msgstr "Ajouter des guides" -#: ../app/tools/gimpmeasuretool.c:644 +#: ../app/tools/gimpmeasuretool.c:645 msgid "Measure Distances and Angles" msgstr "Mesurer les distances et les angles" -#: ../app/tools/gimpmeasuretool.c:669 +#: ../app/tools/gimpmeasuretool.c:670 msgid "Distance:" msgstr "Distance :" @@ -21414,7 +21729,7 @@ msgstr "_Déplacement" msgid "There is no path to move." msgstr "Il n’y a pas de chemin à déplacer." -#: ../app/tools/gimpmovetool.c:257 ../app/tools/gimptransformtool.c:1439 +#: ../app/tools/gimpmovetool.c:257 ../app/tools/gimptransformtool.c:1470 msgid "The active path's position is locked." msgstr "La position du chemin actif est verrouillée." @@ -21501,18 +21816,18 @@ msgstr "" msgid "_N-Point Deformation" msgstr "Déformation _N-Point" -#: ../app/tools/gimpoperationtool.c:132 +#: ../app/tools/gimpoperationtool.c:135 msgid "Operation Tool: Use an arbitrary GEGL operation" msgstr "Action GEGL : cet outil utilise une action GEGL arbitraire" #. don't translate "Aux" -#: ../app/tools/gimpoperationtool.c:536 +#: ../app/tools/gimpoperationtool.c:547 #, c-format msgid "Aux Input" msgstr "Entrée _Aux" #. don't translate "Aux" -#: ../app/tools/gimpoperationtool.c:542 +#: ../app/tools/gimpoperationtool.c:553 #, c-format msgid "Aux%d Input" msgstr "Entrée _Aux%d" @@ -21565,7 +21880,7 @@ msgstr "Options d’estompement" msgid "Color Options" msgstr "Options de couleur" -#: ../app/tools/gimppaintoptions-gui.c:621 +#: ../app/tools/gimppaintoptions-gui.c:622 msgid "Link to brush default" msgstr "Lier à la brosse par défaut" @@ -21625,11 +21940,11 @@ msgstr "" msgid "_Perspective" msgstr "_Perspective" -#: ../app/tools/gimpperspectivetool.c:116 +#: ../app/tools/gimpperspectivetool.c:117 msgid "Perspective transformation" msgstr "Transformation Perspective" -#: ../app/tools/gimpperspectivetool.c:244 +#: ../app/tools/gimpperspectivetool.c:182 msgctxt "undo-type" msgid "Perspective" msgstr "Perspective" @@ -21720,7 +22035,7 @@ msgid "Size:" msgstr "Taille :" #. Auto Shrink -#: ../app/tools/gimprectangleoptions.c:1066 +#: ../app/tools/gimprectangleoptions.c:1067 msgid "Auto Shrink" msgstr "Réduction automatique" @@ -21763,7 +22078,7 @@ msgstr "Permet aux régions complètement transparentes d’être sélectionnabl #: ../app/tools/gimpregionselectoptions.c:98 msgid "Base selection on all visible layers" -msgstr "Sélection basée sur tous les calques visibles" +msgstr "Sélection fondée sur tous les calques visibles" #: ../app/tools/gimpregionselectoptions.c:119 #: ../app/tools/gimpregionselectoptions.c:281 @@ -22088,39 +22403,39 @@ msgstr "Boîte :" msgid "Language:" msgstr "Langue :" -#: ../app/tools/gimptexttool.c:197 +#: ../app/tools/gimptexttool.c:203 msgid "Text" msgstr "Texte" -#: ../app/tools/gimptexttool.c:198 +#: ../app/tools/gimptexttool.c:204 msgid "Text Tool: Create or edit text layers" msgstr "Outil texte : créé ou modifie des calques de texte" -#: ../app/tools/gimptexttool.c:199 +#: ../app/tools/gimptexttool.c:205 msgid "Te_xt" msgstr "Te_xte" -#: ../app/tools/gimptexttool.c:944 +#: ../app/tools/gimptexttool.c:953 msgid "Text box: " msgstr "Boîte de texte : " -#: ../app/tools/gimptexttool.c:1075 +#: ../app/tools/gimptexttool.c:1084 msgid "Reshape Text Layer" msgstr "Redessine le calque de texte" -#: ../app/tools/gimptexttool.c:1573 ../app/tools/gimptexttool.c:1576 +#: ../app/tools/gimptexttool.c:1583 ../app/tools/gimptexttool.c:1586 msgid "Confirm Text Editing" msgstr "Confirmer l’édition du texte" -#: ../app/tools/gimptexttool.c:1580 +#: ../app/tools/gimptexttool.c:1590 msgid "Create _New Layer" msgstr "Créer un _nouveau calque" -#: ../app/tools/gimptexttool.c:1582 +#: ../app/tools/gimptexttool.c:1592 msgid "_Edit" msgstr "É_dition" -#: ../app/tools/gimptexttool.c:1604 +#: ../app/tools/gimptexttool.c:1614 msgid "" "The layer you selected is a text layer but it has been modified using other " "tools. Editing the layer with the text tool will discard these " @@ -22155,7 +22470,7 @@ msgstr "_Auto" msgid "Automatically adjust to optimal binarization threshold" msgstr "Ajuster automatiquement au seuil de binarisation optimal" -#: ../app/tools/gimptool.c:1192 +#: ../app/tools/gimptool.c:1193 msgid "Can't work on an empty image, add a layer first" msgstr "Impossible de travailler sur une image vide, ajoutez d’abord un calque" @@ -22312,62 +22627,62 @@ msgstr "Tra_nsformer" msgid "Transforming" msgstr "Transformation" -#: ../app/tools/gimptransformtool.c:258 +#: ../app/tools/gimptransformtool.c:259 #, c-format msgid "The selection does not intersect with the layer." msgstr "La sélection n’a pas d’intersection avec le calque." -#: ../app/tools/gimptransformtool.c:512 ../app/tools/gimptransformtool.c:524 +#: ../app/tools/gimptransformtool.c:514 ../app/tools/gimptransformtool.c:526 msgid "Transform Step" msgstr "Étape de transformation" -#: ../app/tools/gimptransformtool.c:1399 +#: ../app/tools/gimptransformtool.c:982 +msgid "The current transform is invalid" +msgstr "La transformation actuelle n'est pas valide" + +#: ../app/tools/gimptransformtool.c:1430 msgid "There is no layer to transform." msgstr "Il n’y a pas de calque à transformer." -#: ../app/tools/gimptransformtool.c:1406 +#: ../app/tools/gimptransformtool.c:1437 msgid "The active layer's position and size are locked." msgstr "La position et la taille du calque actif sont verrouillées." -#: ../app/tools/gimptransformtool.c:1419 +#: ../app/tools/gimptransformtool.c:1450 msgid "There is no selection to transform." msgstr "Aucune sélection à transformer." -#: ../app/tools/gimptransformtool.c:1432 +#: ../app/tools/gimptransformtool.c:1463 msgid "There is no path to transform." msgstr "Il n’y a pas de chemin à transformer." -#: ../app/tools/gimptransformtool.c:1437 +#: ../app/tools/gimptransformtool.c:1468 msgid "The active path's strokes are locked." msgstr "Les tracés de chemin actifs sont verrouillés." -#: ../app/tools/gimptransformtool.c:1441 +#: ../app/tools/gimptransformtool.c:1472 msgid "The active path has no strokes." msgstr "Le chemin actif n’a aucun tracé." -#: ../app/tools/gimpunifiedtransformtool.c:86 +#: ../app/tools/gimpunifiedtransformtool.c:87 msgid "Unified Transform" msgstr "Transformation unifiée" -#: ../app/tools/gimpunifiedtransformtool.c:87 +#: ../app/tools/gimpunifiedtransformtool.c:88 msgid "Unified Transform Tool: Transform the layer, selection or path" msgstr "" "Outil de transformation unifiée : transformation du calque, de la sélection " "ou du chemin" -#: ../app/tools/gimpunifiedtransformtool.c:89 +#: ../app/tools/gimpunifiedtransformtool.c:90 msgid "_Unified Transform" msgstr "Transformation _unifiée" -#: ../app/tools/gimpunifiedtransformtool.c:113 +#: ../app/tools/gimpunifiedtransformtool.c:115 msgid "Unified transform" msgstr "Transformation unifiée" -#: ../app/tools/gimpunifiedtransformtool.c:124 -msgid "Transform Matrix" -msgstr "Matrice de transformation" - -#: ../app/tools/gimpunifiedtransformtool.c:251 +#: ../app/tools/gimpunifiedtransformtool.c:190 msgctxt "undo-type" msgid "Unified Transform" msgstr "Transformation unifiée" @@ -22713,7 +23028,7 @@ msgstr "Retourner le chemin" msgid "Rotate Path" msgstr "Faire pivoter le chemin" -#: ../app/vectors/gimpvectors.c:615 +#: ../app/vectors/gimpvectors.c:616 msgid "Transform Path" msgstr "Transformer le chemin" @@ -22821,7 +23136,7 @@ msgid "Percentage of width of brush" msgstr "Pourcentage de largeur de brosse" #: ../app/widgets/gimpbufferview.c:189 ../app/widgets/gimpbufferview.c:290 -#: ../app/widgets/gimpeditor.c:758 +#: ../app/widgets/gimpeditor.c:759 msgid "(None)" msgstr "(Aucun)" @@ -22872,147 +23187,147 @@ msgstr "" "entrée accepte aussi les noms CSS de couleur." #. TRANSLATORS: X for the X coordinate. -#: ../app/widgets/gimpcolorframe.c:193 +#: ../app/widgets/gimpcolorframe.c:201 msgctxt "Coordinates" msgid "X:" msgstr "X :" #. TRANSLATORS: Y for the Y coordinate. -#: ../app/widgets/gimpcolorframe.c:207 +#: ../app/widgets/gimpcolorframe.c:215 msgctxt "Coordinates" msgid "Y:" msgstr "Y :" #. TRANSLATORS: n/a for Not Available. -#: ../app/widgets/gimpcolorframe.c:637 ../app/widgets/gimpcolorframe.c:639 +#: ../app/widgets/gimpcolorframe.c:674 ../app/widgets/gimpcolorframe.c:676 msgctxt "Coordinates" msgid "n/a" msgstr "n/d" #. TRANSLATORS: V for Value (grayscale) -#: ../app/widgets/gimpcolorframe.c:712 +#: ../app/widgets/gimpcolorframe.c:749 msgctxt "Grayscale" msgid "V:" msgstr "Val :" #. TRANSLATORS: A for Alpha (color transparency) -#: ../app/widgets/gimpcolorframe.c:716 ../app/widgets/gimpcolorframe.c:729 -#: ../app/widgets/gimpcolorframe.c:765 ../app/widgets/gimpcolorframe.c:807 -#: ../app/widgets/gimpcolorframe.c:835 ../app/widgets/gimpcolorframe.c:867 -#: ../app/widgets/gimpcolorframe.c:901 +#: ../app/widgets/gimpcolorframe.c:753 ../app/widgets/gimpcolorframe.c:766 +#: ../app/widgets/gimpcolorframe.c:802 ../app/widgets/gimpcolorframe.c:844 +#: ../app/widgets/gimpcolorframe.c:872 ../app/widgets/gimpcolorframe.c:904 +#: ../app/widgets/gimpcolorframe.c:938 msgctxt "Alpha channel" msgid "A:" msgstr "A :" #. TRANSLATORS: R for Red (RGB) -#: ../app/widgets/gimpcolorframe.c:721 ../app/widgets/gimpcolorframe.c:757 +#: ../app/widgets/gimpcolorframe.c:758 ../app/widgets/gimpcolorframe.c:794 msgctxt "RGB" msgid "R:" msgstr "R :" #. TRANSLATORS: G for Green (RGB) -#: ../app/widgets/gimpcolorframe.c:723 ../app/widgets/gimpcolorframe.c:759 +#: ../app/widgets/gimpcolorframe.c:760 ../app/widgets/gimpcolorframe.c:796 msgctxt "RGB" msgid "G:" msgstr "V :" #. TRANSLATORS: B for Blue (RGB) -#: ../app/widgets/gimpcolorframe.c:725 ../app/widgets/gimpcolorframe.c:761 +#: ../app/widgets/gimpcolorframe.c:762 ../app/widgets/gimpcolorframe.c:798 msgctxt "RGB" msgid "B:" msgstr "B :" #. TRANSLATORS: Index of the color in the palette. -#: ../app/widgets/gimpcolorframe.c:734 +#: ../app/widgets/gimpcolorframe.c:771 msgctxt "Indexed color" msgid "Index:" msgstr "Index :" #. TRANSLATORS: Hex for Hexadecimal (representation of a color) -#: ../app/widgets/gimpcolorframe.c:768 +#: ../app/widgets/gimpcolorframe.c:805 msgctxt "Color representation" msgid "Hex:" msgstr "Hexa :" #. TRANSLATORS: H for Hue (HSV color space) -#: ../app/widgets/gimpcolorframe.c:799 +#: ../app/widgets/gimpcolorframe.c:836 msgctxt "HSV color space" msgid "H:" msgstr "T :" #. TRANSLATORS: S for Saturation (HSV color space) -#: ../app/widgets/gimpcolorframe.c:801 +#: ../app/widgets/gimpcolorframe.c:838 msgctxt "HSV color space" msgid "S:" msgstr "S :" #. TRANSLATORS: V for Value (HSV color space) -#: ../app/widgets/gimpcolorframe.c:803 +#: ../app/widgets/gimpcolorframe.c:840 msgctxt "HSV color space" msgid "V:" msgstr "Val :" #. TRANSLATORS: L for Lightness (LCH color space) -#: ../app/widgets/gimpcolorframe.c:827 +#: ../app/widgets/gimpcolorframe.c:864 msgctxt "LCH color space" msgid "L*:" msgstr "L* :" #. TRANSLATORS: C for Chroma (LCH color space) -#: ../app/widgets/gimpcolorframe.c:829 +#: ../app/widgets/gimpcolorframe.c:866 msgctxt "LCH color space" msgid "C*:" msgstr "C* :" #. TRANSLATORS: H for Hue angle (LCH color space) -#: ../app/widgets/gimpcolorframe.c:831 +#: ../app/widgets/gimpcolorframe.c:868 msgctxt "LCH color space" msgid "h°:" msgstr "h° :" #. TRANSLATORS: L* for Lightness (Lab color space) -#: ../app/widgets/gimpcolorframe.c:859 +#: ../app/widgets/gimpcolorframe.c:896 msgctxt "Lab color space" msgid "L*:" msgstr "L* :" #. TRANSLATORS: a* color channel in Lab color space -#: ../app/widgets/gimpcolorframe.c:861 +#: ../app/widgets/gimpcolorframe.c:898 msgctxt "Lab color space" msgid "a*:" msgstr "a* :" #. TRANSLATORS: b* color channel in Lab color space -#: ../app/widgets/gimpcolorframe.c:863 +#: ../app/widgets/gimpcolorframe.c:900 msgctxt "Lab color space" msgid "b*:" msgstr "b* :" #. TRANSLATORS: C for Cyan (CMYK) -#: ../app/widgets/gimpcolorframe.c:891 +#: ../app/widgets/gimpcolorframe.c:928 msgctxt "CMYK" msgid "C:" msgstr "C :" #. TRANSLATORS: M for Magenta (CMYK) -#: ../app/widgets/gimpcolorframe.c:893 +#: ../app/widgets/gimpcolorframe.c:930 msgctxt "CMYK" msgid "M:" msgstr "M :" #. TRANSLATORS: Y for Yellow (CMYK) -#: ../app/widgets/gimpcolorframe.c:895 +#: ../app/widgets/gimpcolorframe.c:932 msgctxt "CMYK" msgid "Y:" msgstr "J :" #. TRANSLATORS: K for Key/black (CMYK) -#: ../app/widgets/gimpcolorframe.c:897 +#: ../app/widgets/gimpcolorframe.c:934 msgctxt "CMYK" msgid "K:" msgstr "N :" -#: ../app/widgets/gimpcolorframe.c:959 +#: ../app/widgets/gimpcolorframe.c:996 msgctxt "Color value" msgid "n/a" msgstr "n/d" @@ -23368,111 +23683,311 @@ msgstr "Roulette de la souris" msgid "Mouse Wheel Events" msgstr "Événements de la roulette de la souris" -#: ../app/widgets/gimpdashboard.c:293 ../app/widgets/gimpdashboard.c:345 +#: ../app/widgets/gimpcriticaldialog.c:54 +msgid "Copy Bug Information" +msgstr "Copier l’information de bogue" + +#: ../app/widgets/gimpcriticaldialog.c:55 +msgid "Open Bug Tracker" +msgstr "Ouvrir le pisteur de bogues" + +#: ../app/widgets/gimpcriticaldialog.c:132 +#: ../app/widgets/gimpcriticaldialog.c:443 +msgid "" +"To help us improve GIMP, you can report the bug with these simple steps:" +msgstr "" +"Pour nous aider à améliorer GIMP, vous pouvez établir un rapport d’anomalie " +"avec les étapes simples suivantes :" + +#: ../app/widgets/gimpcriticaldialog.c:134 +#: ../app/widgets/gimpcriticaldialog.c:445 +msgid "Copy the bug information to the clipboard by clicking: " +msgstr "Copiez l’information de bogue dans le presse-papiers en cliquant sur : " + +#: ../app/widgets/gimpcriticaldialog.c:136 +#: ../app/widgets/gimpcriticaldialog.c:447 +msgid "Open our bug tracker in the browser by clicking: " +msgstr "Ouvrez le pisteur de bogues dans le navigateur en cliquant sur : " + +#: ../app/widgets/gimpcriticaldialog.c:138 +#: ../app/widgets/gimpcriticaldialog.c:449 +msgid "Create a login if you don't have one yet." +msgstr "Créez un identifiant de compte si vous n’en possédez pas." + +#: ../app/widgets/gimpcriticaldialog.c:139 +#: ../app/widgets/gimpcriticaldialog.c:450 +msgid "Paste the clipboard text in a new bug report." +msgstr "Collez le contenu du presse-papiers dans un nouveau rapport d’anomalie." + +#: ../app/widgets/gimpcriticaldialog.c:140 +#: ../app/widgets/gimpcriticaldialog.c:451 +msgid "" +"Add relevant information in English in the bug report explaining what you " +"were doing when this error occurred." +msgstr "" +"Ajoutez les informations en anglais dans le rapport d’anomalie en expliquant " +"ce que vous faisiez quand l’erreur est survenue." + +#: ../app/widgets/gimpcriticaldialog.c:142 +msgid "" +"This error may have left GIMP in an inconsistent state. It is advised to " +"save your work and restart GIMP." +msgstr "" +"Cette erreur pourrait avoir laissé GIMP dans un état instable. Il est " +"conseillé d’enregistrer votre travail et de rédémarrer GIMP." + +#: ../app/widgets/gimpcriticaldialog.c:153 +msgid "" +"You can also close the dialog directly but reporting bugs is the best way to " +"make your software awesome." +msgstr "" +"Vous pouvez aussi fermer la boîte de dialogue sans rien faire, mais ce " +"serait dommage, car les rapports d’anomalie sont un des meilleurs moyens " +"d’améliorer GIMP." + +#: ../app/widgets/gimpcriticaldialog.c:226 +msgid "The operating system is out of memory or resources." +msgstr "" +"Le système d’exploitation est au bout de sa mémoire et de ses resources." + +#: ../app/widgets/gimpcriticaldialog.c:229 +msgid "The specified file was not found." +msgstr "Impossible de trouver le fichier indiqué." + +#: ../app/widgets/gimpcriticaldialog.c:232 +msgid "The specified path was not found." +msgstr "Impossible de trouver le chemin indiqué." + +#: ../app/widgets/gimpcriticaldialog.c:235 +msgid "" +"The .exe file is invalid (non-Microsoft Win32 .exe or error in .exe image)." +msgstr "" +"Le fichier .exe n’est pas valable (le .exe n’appartient pas à Microsoft " +"Win32, ou il y a une erreur dans l’image .exe)." + +#: ../app/widgets/gimpcriticaldialog.c:238 +msgid "The operating system denied access to the specified file." +msgstr "Le système d’exploitation a refusé d’accéder au fichier indiqué." + +#: ../app/widgets/gimpcriticaldialog.c:241 +msgid "The file name association is incomplete or invalid." +msgstr "L’association du nom de fichier est incomplète ou non valide." + +#: ../app/widgets/gimpcriticaldialog.c:244 +msgid "DDE transaction busy" +msgstr "La transaction d’échange de données dynamiques (DDE) est très chargée" + +#: ../app/widgets/gimpcriticaldialog.c:247 +msgid "The DDE transaction failed." +msgstr "Échec de la transaction DDE." + +#: ../app/widgets/gimpcriticaldialog.c:250 +msgid "The DDE transaction timed out." +msgstr "Le délai de la transaction DDE a expiré." + +#: ../app/widgets/gimpcriticaldialog.c:253 +msgid "The specified DLL was not found." +msgstr "La DLL indiquée n’a pas été trouvée." + +#: ../app/widgets/gimpcriticaldialog.c:256 +msgid "There is no application associated with the given file name extension." +msgstr "" +"Aucune application n’est associée à l’extension de nom de fichier indiquée." + +#: ../app/widgets/gimpcriticaldialog.c:259 +msgid "There was not enough memory to complete the operation." +msgstr "Manque de mémoire pour achever l’opération." + +#: ../app/widgets/gimpcriticaldialog.c:262 +msgid "A sharing violation occurred." +msgstr "Une violation de partage est survenue." + +#: ../app/widgets/gimpcriticaldialog.c:265 +msgid "Unknown Microsoft Windows error." +msgstr "Erreur Microsoft Windows inconnue." + +#: ../app/widgets/gimpcriticaldialog.c:268 +#, c-format +msgid "Failed to open '%s': %s" +msgstr "Impossible d’ouvrir « %s » : %s" + +#: ../app/widgets/gimpcriticaldialog.c:409 +#, c-format +msgid "GIMP crashed with a fatal error: %s" +msgstr "GIMP s’est planté avec l’erreur fatale : %s" + +#. First error. Let's just display it. +#: ../app/widgets/gimpcriticaldialog.c:416 +#, c-format +msgid "GIMP encountered an error: %s" +msgstr "GIMP a rencontré l’erreur : %s" + +#. Let's not display all errors. They will be in the bug report +#. * part anyway. +#. +#: ../app/widgets/gimpcriticaldialog.c:424 +#, c-format +msgid "GIMP encountered several critical errors!" +msgstr "GIMP a rencontré plusieurs erreurs critiques !" + +#: ../app/widgets/gimpcriticaldialog.c:476 +msgid "_Restart GIMP" +msgstr "_Redémarrer GIMP" + +#: ../app/widgets/gimpdashboard.c:346 ../app/widgets/gimpdashboard.c:398 msgctxt "dashboard-variable" msgid "Occupied" msgstr "Occupé" -#: ../app/widgets/gimpdashboard.c:294 +#: ../app/widgets/gimpdashboard.c:347 msgid "Tile cache occupied size" msgstr "Taille prise par le cache d’image" -#: ../app/widgets/gimpdashboard.c:303 +#: ../app/widgets/gimpdashboard.c:356 msgctxt "dashboard-variable" msgid "Maximum" msgstr "Maximum" -#: ../app/widgets/gimpdashboard.c:304 +#: ../app/widgets/gimpdashboard.c:357 msgid "Maximal tile cache occupied size" msgstr "Taille d’occupation maximale du cache d’image" -#: ../app/widgets/gimpdashboard.c:313 ../app/widgets/gimpdashboard.c:365 +#: ../app/widgets/gimpdashboard.c:366 ../app/widgets/gimpdashboard.c:418 msgctxt "dashboard-variable" msgid "Limit" msgstr "Limite" -#: ../app/widgets/gimpdashboard.c:314 +#: ../app/widgets/gimpdashboard.c:367 msgid "Tile cache size limit" msgstr "Limite de taille du cache d’image" -#: ../app/widgets/gimpdashboard.c:322 +#: ../app/widgets/gimpdashboard.c:375 msgctxt "dashboard-variable" msgid "Compression" msgstr "Compression" -#: ../app/widgets/gimpdashboard.c:323 +#: ../app/widgets/gimpdashboard.c:376 msgid "Tile cache compression ratio" msgstr "Taux de compression du cache d’image" -#: ../app/widgets/gimpdashboard.c:332 +#: ../app/widgets/gimpdashboard.c:385 msgctxt "dashboard-variable" msgid "Hit/Miss" msgstr "Réussite/Échec" -#: ../app/widgets/gimpdashboard.c:333 +#: ../app/widgets/gimpdashboard.c:386 msgid "Tile cache hit/miss ratio" msgstr "Rapport réussite/échec du cache d’image" -#: ../app/widgets/gimpdashboard.c:346 +#: ../app/widgets/gimpdashboard.c:399 msgid "Swap file occupied size" msgstr "Taille d’occupation du fichier d’échange" -#: ../app/widgets/gimpdashboard.c:355 +#: ../app/widgets/gimpdashboard.c:408 msgctxt "dashboard-variable" msgid "Size" msgstr "Taille" -#: ../app/widgets/gimpdashboard.c:356 +#: ../app/widgets/gimpdashboard.c:409 msgid "Swap file size" msgstr "Taille du fichier d’échange" -#: ../app/widgets/gimpdashboard.c:366 +#: ../app/widgets/gimpdashboard.c:419 msgid "Swap file size limit" msgstr "Limite de taille du fichier d’échange" -#: ../app/widgets/gimpdashboard.c:373 +#: ../app/widgets/gimpdashboard.c:426 msgctxt "dashboard-variable" msgid "Busy" msgstr "Occupé" -#: ../app/widgets/gimpdashboard.c:374 +#: ../app/widgets/gimpdashboard.c:427 msgid "Whether there is work queued for the swap file" msgstr "Indique s’il existe du travail en attente pour le fichier d’échange" -#: ../app/widgets/gimpdashboard.c:387 +#: ../app/widgets/gimpdashboard.c:440 +msgctxt "dashboard-variable" +msgid "Usage" +msgstr "Utilisation" + +#: ../app/widgets/gimpdashboard.c:441 +msgid "Total CPU usage" +msgstr "Utilisation totale du CPU" + +#: ../app/widgets/gimpdashboard.c:449 ../app/widgets/gimpdashboard.c:459 +msgctxt "dashboard-variable" +msgid "Active" +msgstr "Actif" + +#: ../app/widgets/gimpdashboard.c:450 +msgid "Whether the CPU is active" +msgstr "Indique si le CPU est actif" + +#: ../app/widgets/gimpdashboard.c:460 +msgid "Total amount of time the CPU has been active" +msgstr "Durée totale d’activité du CPU" + +#: ../app/widgets/gimpdashboard.c:473 +msgctxt "dashboard-variable" +msgid "Mipmapped" +msgstr "Données MIPmap" + +#: ../app/widgets/gimpdashboard.c:474 +msgid "Total size of processed mipmapped data" +msgstr "Taille totale des données MIPmap traitées" + +#: ../app/widgets/gimpdashboard.c:486 msgctxt "dashboard-group" msgid "Cache" msgstr "Cache" -#: ../app/widgets/gimpdashboard.c:388 +#: ../app/widgets/gimpdashboard.c:487 msgid "In-memory tile cache" msgstr "Cache d’image en mémoire" -#: ../app/widgets/gimpdashboard.c:423 +#: ../app/widgets/gimpdashboard.c:523 msgctxt "dashboard-group" msgid "Swap" msgstr "Échange (swap)" -#: ../app/widgets/gimpdashboard.c:424 +#: ../app/widgets/gimpdashboard.c:524 msgid "On-disk tile swap" msgstr "Zone d’échange des images sur disque" -#: ../app/widgets/gimpdashboard.c:595 +#: ../app/widgets/gimpdashboard.c:553 +msgctxt "dashboard-group" +msgid "CPU" +msgstr "CPU" + +#: ../app/widgets/gimpdashboard.c:554 +msgid "CPU usage" +msgstr "Utilisation du CPU" + +#: ../app/widgets/gimpdashboard.c:583 +msgctxt "dashboard-group" +msgid "Misc" +msgstr "Divers" + +#: ../app/widgets/gimpdashboard.c:584 +msgid "Miscellaneous information" +msgstr "Informations diverses" + +#: ../app/widgets/gimpdashboard.c:744 msgid "Select fields" msgstr "Sélectionner les champs" #. Tranlators: "N/A" is an abbreviation for "not available" -#: ../app/widgets/gimpdashboard.c:1824 +#: ../app/widgets/gimpdashboard.c:2323 msgctxt "dashboard-value" msgid "N/A" msgstr "N/D" -#: ../app/widgets/gimpdashboard.c:1832 +#: ../app/widgets/gimpdashboard.c:2332 msgctxt "dashboard-value" msgid "Yes" msgstr "Oui" -#: ../app/widgets/gimpdashboard.c:1833 +#: ../app/widgets/gimpdashboard.c:2333 msgctxt "dashboard-value" msgid "No" msgstr "Non" @@ -24081,11 +24596,11 @@ msgstr "Langue système" msgid "Switch to another group of modes" msgstr "Basculer vers un autre groupe de modes" -#: ../app/widgets/gimplayertreeview.c:310 +#: ../app/widgets/gimplayertreeview.c:319 msgid "Lock alpha channel" msgstr "Verrouiller le canal alpha" -#: ../app/widgets/gimpmessagebox.c:442 +#: ../app/widgets/gimpmessagebox.c:395 #, c-format msgid "Message repeated once." msgid_plural "Message repeated %d times." @@ -24113,7 +24628,7 @@ msgstr "Colonnes :" msgid "You can drop dockable dialogs here" msgstr "Vous pouvez déposer les fenêtres ancrables ici" -# Impossible d'agrandir cette fenêtre et le texte fr n'y tient pas +# Impossible d’agrandir cette fenêtre et le texte fr n’y tient pas #: ../app/widgets/gimppickablepopup.c:206 #: ../app/widgets/gimppickablepopup.c:423 msgid "Select an image in the left pane" @@ -24347,20 +24862,20 @@ msgstr "L’attribut \"%s\" sur l’élément <%s> n’est pas valide dans ce co msgid "Outermost element in text must be not <%s>" msgstr "L’élément le plus extérieur dans le texte doit être , pas <%s>" -#: ../app/widgets/gimptextbuffer.c:1684 +#: ../app/widgets/gimptextbuffer.c:1711 #, c-format msgid "Input file '%s' appears truncated: %s" msgstr "Le fichier « %s » semble tronqué : %s" -#: ../app/widgets/gimptextbuffer.c:1702 +#: ../app/widgets/gimptextbuffer.c:1729 #, c-format msgid "Invalid UTF-8 data in file '%s'." msgstr "Chaîne de caractères UTF-8 non valide dans le fichier « %s »." -#: ../app/widgets/gimptextbuffer.c:1751 +#: ../app/widgets/gimptextbuffer.c:1778 #, c-format -msgid "Writing palette file '%s' failed: %s" -msgstr "L’écriture du fichier de palette « %s » a échoué : %s" +msgid "Writing text file '%s' failed: %s" +msgstr "L’écriture du fichier texte « %s » a échoué : %s" #: ../app/widgets/gimptexteditor.c:220 msgid "_Use selected font" @@ -24610,22 +25125,22 @@ msgstr "%s (essayez %s, %s)" msgid "%s (try %s, %s, %s)" msgstr "%s (essayez %s, %s, %s)" -#: ../app/widgets/gimpwidgets-utils.c:1654 +#: ../app/widgets/gimpwidgets-utils.c:1658 #, c-format msgid "Built-in grayscale (%s)" msgstr "Niveau de gris intégré (%s)" -#: ../app/widgets/gimpwidgets-utils.c:1661 +#: ../app/widgets/gimpwidgets-utils.c:1665 #, c-format msgid "Built-in RGB (%s)" msgstr "RVB intégré (%s)" -#: ../app/widgets/gimpwidgets-utils.c:1678 +#: ../app/widgets/gimpwidgets-utils.c:1682 #, c-format msgid "Preferred grayscale (%s)" msgstr "Niveau de gris préféré (%s)" -#: ../app/widgets/gimpwidgets-utils.c:1685 +#: ../app/widgets/gimpwidgets-utils.c:1689 #, c-format msgid "Preferred RGB (%s)" msgstr "RVB préféré (%s)" @@ -24760,45 +25275,45 @@ msgctxt "tab-style" msgid "Undefined" msgstr "Non définie" -#: ../app/xcf/xcf.c:113 ../app/xcf/xcf.c:184 +#: ../app/xcf/xcf.c:114 ../app/xcf/xcf.c:185 msgid "GIMP XCF image" msgstr "Image GIMP XCF" -#: ../app/xcf/xcf.c:271 ../app/xcf/xcf.c:359 +#: ../app/xcf/xcf.c:272 ../app/xcf/xcf.c:360 msgid "Memory Stream" msgstr "Flux mémoire" -#: ../app/xcf/xcf.c:282 +#: ../app/xcf/xcf.c:283 #, c-format msgid "Opening '%s'" msgstr "Ouverture de « %s »" -#: ../app/xcf/xcf.c:324 +#: ../app/xcf/xcf.c:325 #, c-format msgid "XCF error: unsupported XCF file version %d encountered" msgstr "Erreur XCF : la version %d du format XCF non prise en charge" -#: ../app/xcf/xcf.c:382 +#: ../app/xcf/xcf.c:383 #, c-format msgid "Saving '%s'" msgstr "Enregistrement de « %s »" -#: ../app/xcf/xcf.c:389 +#: ../app/xcf/xcf.c:390 #, c-format msgid "Closing '%s'" msgstr "Fermer %s" -#: ../app/xcf/xcf.c:396 +#: ../app/xcf/xcf.c:397 #, c-format msgid "Error writing '%s': " msgstr "Erreur durant l’écriture de « %s » : " -#: ../app/xcf/xcf.c:490 +#: ../app/xcf/xcf.c:491 #, c-format msgid "Error creating '%s': " msgstr "Erreur durant la lecture de « %s » : " -#: ../app/xcf/xcf-load.c:305 +#: ../app/xcf/xcf-load.c:342 #, c-format msgid "" "Corrupt 'exif-data' parasite discovered.\n" @@ -24807,7 +25322,7 @@ msgstr "" "Un parasite « exif-data » altéré a été détecté.\n" "Les données exif ne peuvent pas être déplacées : %s" -#: ../app/xcf/xcf-load.c:342 +#: ../app/xcf/xcf-load.c:379 msgid "" "Corrupt 'gimp-metadata' parasite discovered.\n" "XMP data could not be migrated." @@ -24815,7 +25330,7 @@ msgstr "" "Un parasite « gimp-metadata » altéré a été détecté.\n" "Les données XMP ne peuvent pas être déplacées : %s" -#: ../app/xcf/xcf-load.c:362 +#: ../app/xcf/xcf-load.c:399 #, c-format msgid "" "Corrupt 'gimp-metadata' parasite discovered.\n" @@ -24824,7 +25339,7 @@ msgstr "" "Un parasite « gimp-metadata » altéré a été détecté.\n" "Les données XMP ne peuvent pas être déplacées : %s" -#: ../app/xcf/xcf-load.c:549 +#: ../app/xcf/xcf-load.c:586 msgid "" "This XCF file is corrupt! I have loaded as much of it as I can, but it is " "incomplete." @@ -24832,7 +25347,7 @@ msgstr "" "Le fichier XCF est endommagé ! Toutes les données valides ont été chargées " "mais le résultat reste incomplet." -#: ../app/xcf/xcf-load.c:560 +#: ../app/xcf/xcf-load.c:597 msgid "" "This XCF file is corrupt! I could not even salvage any partial image data " "from it." @@ -24840,7 +25355,7 @@ msgstr "" "Le fichier XCF est endommagé ! Aucune donnée exploitable n’a pu être " "extraite." -#: ../app/xcf/xcf-load.c:652 +#: ../app/xcf/xcf-load.c:689 msgid "" "XCF warning: version 0 of XCF file format\n" "did not save indexed colormaps correctly.\n" @@ -24869,6 +25384,10 @@ msgid "Error writing XCF: unsupported BPC when writing pixel: %d" msgstr "" "Erreur d’écriture du XCF : BPC non géré lors de l’écriture de pixel : %d" +#: ../app-tools/gimp-debug-tool.c:78 +msgid "GIMP Crash Debug" +msgstr "Débogage d’un plantage de GIMP" + #: ../data/tags/gimp-tags-default.xml.in.h:1 msgid "round" msgstr "arrondi" diff --git a/po/it.po b/po/it.po index f4bdee3f45..ac1dbfd280 100644 --- a/po/it.po +++ b/po/it.po @@ -35,8 +35,8 @@ msgid "" msgstr "" "Project-Id-Version: gimp 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-05 16:37+0100\n" -"PO-Revision-Date: 2018-03-05 16:41+0100\n" +"POT-Creation-Date: 2018-04-15 17:50+0200\n" +"PO-Revision-Date: 2018-04-15 17:46+0200\n" "Last-Translator: Marco Ciampa \n" "Language-Team: gimp@erlug.linux.it\n" "Language: it\n" @@ -100,59 +100,256 @@ msgstr "Fotoritocco in GIMP" #: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:8 msgid "" +"First release of the 2.10 series which prominently features the port to a " +"new image processing engine, GEGL. The most outstanding changes are:" +msgstr "" +"Primo rilascio della serie 2.10 che come offre principalmente il port di un " +"nuovo motore di elaborazione immagini, GEGL. I cambiamenti più di spicco " +"sono:" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:9 +msgid "High bit depth color processing (16/32-bit per color channel)" +msgstr "Elaborazione ad alta profondità di colore (16/32 bit per canale)" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:10 +msgid "" +"Color management is a core feature now, most widgets and preview areas are " +"color-managed" +msgstr "" +"Ora la gestione del colore è una funzionalità di base, il colore di buona " +"parte delle finestre e delle aree di anteprima è gestito" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:11 +msgid "" +"On-canvas effect preview, with split view for before/after processing pixels" +msgstr "" +"Anteprima automatica, con vista divisa prima/dopo dell'elaborazione dei pixel" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:12 +msgid "" +"Multi-threaded and hardware-accelerated rendering, processing and painting" +msgstr "" +"Elaborazione del disegno e del rendering multi thread e accelerato in " +"hardware" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:13 +msgid "Most tools improved, several new transformation tools" +msgstr "Molti strumenti migliorati, diversi nuovi strumenti di trasformazione" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:14 +msgid "" +"Improved support for many image formats, in particular better PSD importing" +msgstr "" +"Migliorato il supporto a molti formati immagine, in particolare " +"l'importazione di PSD" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:15 +msgid "Newly supported image formats: OpenEXR, RGBE, WebP, HGT…" +msgstr "Nuovi formati immagine supportati: OpenEXR, WebP, HGT..." + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:16 +msgid "" +"Improved digital painting: canvas rotation and flipping, symmetry painting, " +"MyPaint brushes…" +msgstr "" +"Migliorato il disegno digitale: rotazione e ribaltamento immagini, disegno " +"simmetrico, pennelli MyPaint..." + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:17 +msgid "Metadata viewing and editing for Exif, XMP, IPTC, and DICOM" +msgstr "Visualizzazione metadati per Exif, MXP, IPTC, e DICOM" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:18 +msgid "Basic HiDPI support: automatically or user-selected icon size" +msgstr "" +"Supporto base HiDPI: dimensione icone automatica o selezionabile dall'utente" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:19 +msgid "New themes for GIMP: Light, Gray, Dark, and System" +msgstr "Nuovi temi per GIMP: Light, Gray, Dark, e System" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:20 +msgid "And much, much more…" +msgstr "E molto, molto altro ancora..." + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:21 +msgid "" +"In this second release candidate before GIMP 2.10.0, while debugging is " +"still a prime target, a new focus has been put on speed and optimization in " +"order to provide a smoother painting experience. Bigger changes are:" +msgstr "" +"In questo secondo candidato al rilascio prima di GIMP 2.10.0, mentre la " +"stabilità è ancora l'obiettivo primario, è stato data importanza anche alla " +"velocità e all'ottimizzazione in modo da fornire un'esperienza di disegno " +"ancora migliore. I cambiamenti maggiori sono:" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:22 +msgid "" +"Major core optimizations for painting and display, including parallelized " +"painting code." +msgstr "" +"Grande ottimizzazione del nucleo nel disegno e nella visualizzazione, " +"comprendente la parallelizzazione del codice di disegno." + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:23 +msgid "Symmetries are now preserved in XCF files (saved as image parasites)." +msgstr "" +"Le simmetrie ora vengono mantenute nei file XCF (salvate come parassiti " +"dell'immagine)." + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:24 +msgid "" +"\"Light\" and \"Dark\" themes rewritten from scratch to get rid of various " +"usability issues. \"Lighter\" and \"Darker\" themes removed." +msgstr "" +"I temi \"Light\" e \"Dark\" sono stati riscritti da zero per eliminare " +"diversi problemi di usabilità. I temi \"Lighter\" e \"Darker\" sono stati " +"rimossi." + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:25 +msgid "" +"New GimpToolGyroscope on-canvas control, currently used for the Panorama " +"Projection filter. The widget provides on-canvas interaction for 3D rotation " +"(yaw, pitch, roll)." +msgstr "" +"Nuovo strumento di controllo sull'immagine StrumentoGiroscopioGimp, " +"attualmente usato per il filtro di proiezione panoramica. La finestra " +"fornisce interazione sul disegno per la rotazione 3D (imbardata, beccheggio, " +"rollio)." + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:26 +msgid "" +"Plug-in debugging improved to output stack traces from plug-ins with --stack-" +"trace-mode command line option not only on receiving signals but also on " +"warnings and critical errors when \"fatal-warnings\" debug key is set." +msgstr "" +"Il debug dei plugin è migliorato; ora genera le tracce dello stack dei " +"plugin tramite l'opzione a riga di comando --stack-trace-mode non solo alla " +"ricezione di segnali ma anche quando ci sono avvertimenti e errori critici, " +"se viene impostata la chiave di debug \"fatal-warnings\"." + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:27 +msgid "" +"For more information, see https://www.gimp.org/news/2018/04/14/gimp-2-10-rc2-" +"released/" +msgstr "" +"Per ulteriori informazioni, consultare https://www.gimp.org/news/2018/04/14/" +"gimp-2-10-rc2-released/" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:28 +msgid "" +"GIMP 2.10.0-RC1 is the first release candidate before GIMP 2.10.0 stable " +"release, with a focus on debugging and stability. Other than the many bug " +"fixes, most notable improvements are:" +msgstr "" +"GIMP 2.10.0-RC1 è la prima versione candidata al rilascio stabile di GIMP " +"2.10.0, con l'obiettivo dell'assenza di difetti e stabilità. Oltre alle " +"molte correzioni difetti, i miglioramenti più evidenti sono:" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:29 +msgid "New dashboard dockable to monitor GIMP resource usage" +msgstr "" +"Nuovo cruscotto agganciabile per controllare l'uso delle risorse di GIMP" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:30 +msgid "" +"New debug dialog to produce back traces and other debug data, encouraging to " +"report bugs" +msgstr "" +"Una nuova finestra di dialogo di debug per produrre back trace ed altri dati " +"utili per il debug, che incoraggia a riportare i difetti" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:31 +msgid "Unsaved images can now be recovered after a crash" +msgstr "Le immagini non salvate ora possono essere recuperate dopo un crash" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:32 +msgid "Layer masks on layer groups" +msgstr "Maschere di livello sui gruppi livello." + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:33 +msgid "JPEG 2000 support improved for high bit depth and various color spaces" +msgstr "" +"Il supporto a JPEG 2000 è stato migliorato nella gestione della profondità e " +"negli spazi di colore" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:34 +msgid "Screenshot and color picking improved on various platforms" +msgstr "" +"La cattura schermate e il prelievo colore sono stati migliorati in molte " +"piattaforme" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:35 +msgid "Metadata defaults preferences now available" +msgstr "Le preferenze predefinite dei metadati sono ora disponibili" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:36 +msgid "Various GUI polishing" +msgstr "Diversi miglioramenti all'interfaccia utente" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:37 +msgid "" +"For more information, see https://www.gimp.org/news/2018/03/23/gimp-2-10-rc1-" +"released/" +msgstr "" +"Per ulteriori informazioni, consultare https://www.gimp.org/news/2018/03/23/" +"gimp-2-10-rc1-released/" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:38 +msgid "" "GIMP 2.9.8 introduces on-canvas gradient editing and various enhancements " "while focusing on bugfixing and stability." msgstr "" "GIMP 2.9.8 introduce la modifica dei gradienti sul disegno e vari altri " "miglioramenti mantenendo l'obiettivo di correzione dei difetti e stabilità." -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:9 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:39 msgid "On-canvas gradient editing" msgstr "Modifica del gradiente sul disegno" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:10 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:40 msgid "Notification when an image is over/underexposed" msgstr "Notifica quando un'immagine è sovra o sotto esposta" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:11 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:41 msgid "Better and faster color management" msgstr "Gestione del colore migliorata e velocizzata" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:12 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:42 msgid "Support for color picker and screenshots in Wayland on KDE Plasma" msgstr "" "Supporto per il prelievo colore e cattura schermate in Wayland su KDE Plasma" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:13 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:43 msgid "Paste in place feature" msgstr "Funzione di incolla sul posto" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:14 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:44 msgid "Many usability improvements" msgstr "Molti miglioramenti di usabilità" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:15 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:45 msgid "Manual can be displayed in the user's preferred language" msgstr "Il manuale può essere mostrato nella lingua preferita dall'utente" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:16 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:46 msgid "Improvements for the Wavelet Decompose filter" msgstr "Miglioramenti nel filtro di decomposizione Wavelet" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:17 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:47 msgid "Improved compatibility with Photoshop .psd files" msgstr "Migliorata la compatibilità con i file .psd di Photoshop" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:18 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:48 msgid "New support for password-protected PDF" msgstr "Nuovo supporto per i PDF protetti da password" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:19 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:49 msgid "New support for HGT format (Digital Elevation Model data)" msgstr "" "Nuovo supporto per il formato HGT (dati di elevazione del modello digitale)" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:20 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:50 msgid "" "For more information, see https://www.gimp.org/news/2017/12/12/gimp-2-9-8-" "released/" @@ -233,109 +430,113 @@ msgstr "uso di %s in versione %s (compilato con versione %s)" msgid "%s version %s" msgstr "%s versione %s" -#: ../app/main.c:155 +#: ../app/main.c:157 msgid "Show version information and exit" msgstr "Mostra le informazioni sulla versione e esce" -#: ../app/main.c:160 +#: ../app/main.c:162 msgid "Show license information and exit" msgstr "Mostra le informazioni sulla licenza e esce" -#: ../app/main.c:165 +#: ../app/main.c:167 msgid "Be more verbose" msgstr "Sii più prolisso" -#: ../app/main.c:170 +#: ../app/main.c:172 msgid "Start a new GIMP instance" msgstr "Esegui una nuova istanza di GIMP" -#: ../app/main.c:175 +#: ../app/main.c:177 msgid "Open images as new" msgstr "Apri le immagini come nuove" -#: ../app/main.c:180 +#: ../app/main.c:182 msgid "Run without a user interface" msgstr "Esegui senza interfaccia utente" -#: ../app/main.c:185 +#: ../app/main.c:187 msgid "Do not load brushes, gradients, patterns, ..." msgstr "Non caricare pennelli, gradienti, motivi, ..." -#: ../app/main.c:190 +#: ../app/main.c:192 msgid "Do not load any fonts" msgstr "Non caricare nessun carattere" -#: ../app/main.c:195 +#: ../app/main.c:197 msgid "Do not show a splash screen" msgstr "Non mostrare la schermata iniziale" -#: ../app/main.c:200 +#: ../app/main.c:202 msgid "Do not use shared memory between GIMP and plug-ins" msgstr "Non utilizzare la memoria condivisa tra GIMP e i plug-in" -#: ../app/main.c:205 +#: ../app/main.c:207 msgid "Do not use special CPU acceleration functions" msgstr "Non utilizzare le speciali accelerazioni CPU" -#: ../app/main.c:210 +#: ../app/main.c:212 msgid "Use an alternate sessionrc file" msgstr "Usa un file sessionrc alternativo" -#: ../app/main.c:215 +#: ../app/main.c:217 msgid "Use an alternate user gimprc file" msgstr "Usa un file gimprc utente alternativo" -#: ../app/main.c:220 +#: ../app/main.c:222 msgid "Use an alternate system gimprc file" msgstr "Usa un file gimprc di sistema alternativo" -#: ../app/main.c:225 +#: ../app/main.c:227 msgid "Batch command to run (can be used multiple times)" msgstr "Comando batch da eseguire (può essere usato più di una volta)" -#: ../app/main.c:230 +#: ../app/main.c:232 msgid "The procedure to process batch commands with" msgstr "La procedura per elaborare i comandi batch" -#: ../app/main.c:235 +#: ../app/main.c:237 msgid "Send messages to console instead of using a dialog" msgstr "Mostra messaggi sulla console invece che in una finestra di dialogo" #. don't translate the mode names (off|on|warn) -#: ../app/main.c:241 +#: ../app/main.c:243 msgid "PDB compatibility mode (off|on|warn)" msgstr "Modalità compatibile PDB (off|on|warn)" #. don't translate the mode names (never|query|always) -#: ../app/main.c:247 +#: ../app/main.c:249 msgid "Debug in case of a crash (never|query|always)" msgstr "Esegui il debug nel caso di un blocco (never|query|always)" -#: ../app/main.c:252 +#: ../app/main.c:254 msgid "Enable non-fatal debugging signal handlers" msgstr "Abilita debugging dei segnali non fatali" -#: ../app/main.c:257 +#: ../app/main.c:259 msgid "Make all warnings fatal" msgstr "Fai in modo che tutti gli avvertimenti (warning) siano fatali" -#: ../app/main.c:262 +#: ../app/main.c:264 msgid "Output a gimprc file with default settings" msgstr "Genera un file gimprc con valori predefiniti" -#: ../app/main.c:278 +#: ../app/main.c:280 msgid "Output a sorted list of deprecated procedures in the PDB" msgstr "Genera un elenco ordinato delle procedure sconsigliate nel PDB" -#: ../app/main.c:283 +#: ../app/main.c:285 msgid "Show a preferences page with experimental features" msgstr "Mostra una pagina di preferenze con caratteristiche sperimentali" -#: ../app/main.c:459 +#: ../app/main.c:290 +msgid "Show an image submenu with debug actions" +msgstr "Mostra un sottomenu immagine con azioni di debug" + +#: ../app/main.c:466 msgid "[FILE|URI...]" msgstr "[FILE|URI...]" -#: ../app/main.c:477 +#: ../app/main.c:484 msgid "" "GIMP could not initialize the graphical user interface.\n" "Make sure a proper setup for your display environment exists." @@ -343,21 +544,21 @@ msgstr "" "GIMP non può inizializzare l'interfaccia grafica.\n" "Controllare l'esistenza di una corretta impostazione dell'ambiente grafico." -#: ../app/main.c:496 +#: ../app/main.c:503 msgid "Another GIMP instance is already running." msgstr "Un'altra istanza di GIMP è già in esecuzione." -#: ../app/main.c:586 +#: ../app/main.c:594 msgid "GIMP output. Type any character to close this window." msgstr "" "Messaggi di GIMP. Premere un tasto qualsiasi per chiudere questa finestra." -#: ../app/main.c:587 +#: ../app/main.c:595 #, c-format msgid "(Type any character to close this window)\n" msgstr "(premere un tasto qualsiasi per chiudere questa finestra)\n" -#: ../app/main.c:604 +#: ../app/main.c:612 msgid "GIMP output. You can minimize this window, but don't close it." msgstr "" "Messaggi di GIMP. È possibile ridurre a icona questa finestra ma non " @@ -399,7 +600,7 @@ msgstr "Modifica pennello" #. initialize the list of gimp brushes #: ../app/actions/actions.c:114 ../app/core/gimp-data-factories.c:317 -#: ../app/dialogs/dialogs.c:335 ../app/dialogs/preferences-dialog.c:3072 +#: ../app/dialogs/dialogs.c:335 ../app/dialogs/preferences-dialog.c:3092 msgid "Brushes" msgstr "Pennelli" @@ -447,7 +648,7 @@ msgstr "Agganciabile" #. Document History #: ../app/actions/actions.c:147 ../app/dialogs/dialogs.c:362 -#: ../app/dialogs/preferences-dialog.c:1197 +#: ../app/dialogs/preferences-dialog.c:1201 msgid "Document History" msgstr "Cronologia documenti" @@ -481,7 +682,7 @@ msgid "Filters" msgstr "Filtri" #: ../app/actions/actions.c:171 ../app/dialogs/dialogs.c:353 -#: ../app/dialogs/preferences-dialog.c:3092 +#: ../app/dialogs/preferences-dialog.c:3112 msgid "Fonts" msgstr "Caratteri" @@ -492,12 +693,12 @@ msgstr "Modifica del gradiente" #. initialize the list of gimp gradients #: ../app/actions/actions.c:177 ../app/core/gimp-data-factories.c:342 -#: ../app/dialogs/dialogs.c:347 ../app/dialogs/preferences-dialog.c:3088 +#: ../app/dialogs/dialogs.c:347 ../app/dialogs/preferences-dialog.c:3108 msgid "Gradients" msgstr "Gradienti" #: ../app/actions/actions.c:180 ../app/core/gimp-data-factories.c:353 -#: ../app/dialogs/dialogs.c:359 ../app/dialogs/preferences-dialog.c:3096 +#: ../app/dialogs/dialogs.c:359 ../app/dialogs/preferences-dialog.c:3116 msgid "Tool Presets" msgstr "Preimpostazioni strumento" @@ -526,7 +727,7 @@ msgstr "Livelli" #. initialize the list of mypaint brushes #: ../app/actions/actions.c:198 ../app/core/gimp-data-factories.c:327 -#: ../app/dialogs/dialogs.c:341 ../app/dialogs/preferences-dialog.c:3100 +#: ../app/dialogs/dialogs.c:341 ../app/dialogs/preferences-dialog.c:3120 msgid "MyPaint Brushes" msgstr "Pennelli MyPaint" @@ -537,23 +738,23 @@ msgstr "Modifica tavolozza" #. initialize the list of gimp palettes #: ../app/actions/actions.c:204 ../app/core/gimp-data-factories.c:337 -#: ../app/dialogs/dialogs.c:350 ../app/dialogs/preferences-dialog.c:3084 +#: ../app/dialogs/dialogs.c:350 ../app/dialogs/preferences-dialog.c:3104 msgid "Palettes" msgstr "Tavolozze" #. initialize the list of gimp patterns #: ../app/actions/actions.c:207 ../app/core/gimp-data-factories.c:332 -#: ../app/dialogs/dialogs.c:344 ../app/dialogs/preferences-dialog.c:3080 +#: ../app/dialogs/dialogs.c:344 ../app/dialogs/preferences-dialog.c:3100 msgid "Patterns" msgstr "Motivi" -#: ../app/actions/actions.c:210 ../app/dialogs/preferences-dialog.c:3104 +#: ../app/actions/actions.c:210 ../app/dialogs/preferences-dialog.c:3124 msgid "Plug-ins" msgstr "Plug-in" #. Quick Mask Color #: ../app/actions/actions.c:213 ../app/core/gimpchannel.c:383 -#: ../app/dialogs/preferences-dialog.c:1680 +#: ../app/dialogs/preferences-dialog.c:1684 msgid "Quick Mask" msgstr "Maschera veloce" @@ -566,7 +767,7 @@ msgid "Select" msgstr "Seleziona" #. initialize the template list -#: ../app/actions/actions.c:222 ../app/core/gimp.c:795 +#: ../app/actions/actions.c:222 ../app/core/gimp.c:797 #: ../app/dialogs/dialogs.c:365 msgid "Templates" msgstr "Modelli" @@ -580,7 +781,7 @@ msgid "Text Editor" msgstr "Modifica del testo" #: ../app/actions/actions.c:231 ../app/dialogs/dialogs.c:310 -#: ../app/gui/gui.c:499 +#: ../app/gui/gui.c:550 msgid "Tool Options" msgstr "Opzioni strumento" @@ -1088,7 +1289,7 @@ msgid "Select the channel below the current channel" msgstr "Seleziona il canale sotto il canale corrente" #: ../app/actions/channels-commands.c:111 -#: ../app/actions/channels-commands.c:537 +#: ../app/actions/channels-commands.c:517 msgid "Channel Attributes" msgstr "Attributi di canale" @@ -1106,7 +1307,6 @@ msgid "_Fill opacity:" msgstr "_Opacità riempimento:" #: ../app/actions/channels-commands.c:156 -#: ../app/actions/channels-commands.c:209 #: ../app/widgets/gimpchanneltreeview.c:327 msgid "New Channel" msgstr "Nuovo canale" @@ -1119,10 +1319,10 @@ msgstr "Crea un nuovo canale" msgid "New Channel Color" msgstr "Nuovo colore del canale" -#: ../app/actions/channels-commands.c:294 ../app/core/gimpimage-new.c:278 +#: ../app/actions/channels-commands.c:274 ../app/core/gimpimage-new.c:278 #: ../app/display/gimpdisplayshell-dnd.c:670 #: ../app/widgets/gimpchanneltreeview.c:258 -#: ../app/widgets/gimplayertreeview.c:784 +#: ../app/widgets/gimplayertreeview.c:805 #, c-format msgid "%s Channel Copy" msgstr "Copia canale %s" @@ -2433,81 +2633,86 @@ msgstr "Menu cruscotto" #: ../app/actions/dashboard-actions.c:44 msgctxt "dashboard-action" +msgid "Groups" +msgstr "Gruppi" + +#: ../app/actions/dashboard-actions.c:46 +msgctxt "dashboard-action" msgid "Update Interval" msgstr "Intervallo di aggiornamento" -#: ../app/actions/dashboard-actions.c:46 +#: ../app/actions/dashboard-actions.c:48 msgctxt "dashboard-action" msgid "History Duration" msgstr "Durata cronologia" -#: ../app/actions/dashboard-actions.c:49 +#: ../app/actions/dashboard-actions.c:51 msgctxt "dashboard-action" msgid "Reset" msgstr "Reimposta" -#: ../app/actions/dashboard-actions.c:50 +#: ../app/actions/dashboard-actions.c:52 msgctxt "dashboard-action" msgid "Reset cumulative data" msgstr "Reimposta dati cumulativi" -#: ../app/actions/dashboard-actions.c:58 +#: ../app/actions/dashboard-actions.c:60 msgctxt "dashboard-action" msgid "Low Swap Space Warning" msgstr "Avvertimento di poco spazio di scambio" -#: ../app/actions/dashboard-actions.c:59 +#: ../app/actions/dashboard-actions.c:61 msgctxt "dashboard-action" msgid "Raise the dashboard when the swap size approaches its limit" msgstr "" "Alza il cruscotto quando lo spazio di scambio si avvicina al suo limite" -#: ../app/actions/dashboard-actions.c:69 +#: ../app/actions/dashboard-actions.c:71 msgctxt "dashboard-update-interval" msgid "0.25 Seconds" msgstr "0.25 secondi" -#: ../app/actions/dashboard-actions.c:74 +#: ../app/actions/dashboard-actions.c:76 msgctxt "dashboard-update-interval" msgid "0.5 Seconds" msgstr "0.5 secondi" -#: ../app/actions/dashboard-actions.c:79 +#: ../app/actions/dashboard-actions.c:81 msgctxt "dashboard-update-interval" msgid "1 Second" msgstr "1 secondo" -#: ../app/actions/dashboard-actions.c:84 +#: ../app/actions/dashboard-actions.c:86 msgctxt "dashboard-update-interval" msgid "2 Seconds" msgstr "2 secondi" -#: ../app/actions/dashboard-actions.c:89 +#: ../app/actions/dashboard-actions.c:91 msgctxt "dashboard-update-interval" msgid "4 Seconds" msgstr "4 secondi" -#: ../app/actions/dashboard-actions.c:97 +#: ../app/actions/dashboard-actions.c:99 msgctxt "dashboard-history-duration" msgid "15 Seconds" msgstr "15 secondi" -#: ../app/actions/dashboard-actions.c:102 +#: ../app/actions/dashboard-actions.c:104 msgctxt "dashboard-history-duration" msgid "30 Seconds" msgstr "30 secondi" -#: ../app/actions/dashboard-actions.c:107 +#: ../app/actions/dashboard-actions.c:109 msgctxt "dashboard-history-duration" msgid "60 Seconds" msgstr "60 secondi" -#: ../app/actions/dashboard-actions.c:112 +#: ../app/actions/dashboard-actions.c:114 msgctxt "dashboard-history-duration" msgid "120 Seconds" msgstr "120 secondi" -#: ../app/actions/dashboard-actions.c:117 +#: ../app/actions/dashboard-actions.c:119 msgctxt "dashboard-history-duration" msgid "240 Seconds" msgstr "240 secondi" @@ -2515,10 +2720,10 @@ msgstr "240 secondi" #: ../app/actions/data-commands.c:90 ../app/actions/documents-commands.c:383 #: ../app/actions/file-commands.c:205 ../app/dialogs/file-open-dialog.c:212 #: ../app/dialogs/file-open-dialog.c:253 -#: ../app/dialogs/file-open-location-dialog.c:218 -#: ../app/dialogs/file-open-location-dialog.c:228 +#: ../app/dialogs/file-open-location-dialog.c:223 +#: ../app/dialogs/file-open-location-dialog.c:239 #: ../app/display/gimpdisplayshell-dnd.c:614 -#: ../app/widgets/gimplayertreeview.c:744 ../app/widgets/gimptoolbox.c:805 +#: ../app/widgets/gimplayertreeview.c:765 ../app/widgets/gimptoolbox.c:805 #: ../app/widgets/gimptoolbox-dnd.c:170 #, c-format msgid "" @@ -2531,8 +2736,8 @@ msgstr "" "%s" #: ../app/actions/data-commands.c:114 ../app/actions/tool-options-commands.c:74 -#: ../app/core/gimpbrushgenerated-load.c:120 ../app/core/gimpimage.c:1964 -#: ../app/core/gimppalette.c:461 ../app/core/gimppalette-import.c:211 +#: ../app/core/gimpbrushgenerated-load.c:120 ../app/core/gimpimage.c:1971 +#: ../app/core/gimppalette.c:461 ../app/core/gimppalette-import.c:213 #: ../app/core/gimppalette-load.c:186 #: ../app/dialogs/palette-import-dialog.c:778 ../app/widgets/gimpdnd-xds.c:89 msgid "Untitled" @@ -2945,8 +3150,8 @@ msgid "Search commands by keyword, and run them" msgstr "Cerca comandi per parola-chiave e li esegue" #: ../app/actions/dialogs-actions.c:357 -#: ../app/dialogs/preferences-dialog.c:2018 -#: ../app/dialogs/preferences-dialog.c:2019 ../app/widgets/gimptoolbox.c:529 +#: ../app/dialogs/preferences-dialog.c:2022 +#: ../app/dialogs/preferences-dialog.c:2023 ../app/widgets/gimptoolbox.c:529 msgid "Toolbox" msgstr "Pannello strumenti" @@ -3235,7 +3440,7 @@ msgstr "Cancella la cronologia documenti" #: ../app/actions/error-console-commands.c:96 #: ../app/actions/file-commands.c:416 #: ../app/actions/gradient-editor-commands.c:478 -#: ../app/actions/gradient-editor-commands.c:580 +#: ../app/actions/gradient-editor-commands.c:581 #: ../app/actions/gradients-commands.c:78 ../app/actions/plug-in-commands.c:180 #: ../app/actions/templates-commands.c:244 #: ../app/actions/text-editor-commands.c:64 @@ -3261,8 +3466,8 @@ msgstr "Cancella la cronologia documenti" #: ../app/dialogs/offset-dialog.c:136 #: ../app/dialogs/palette-import-dialog.c:162 #: ../app/dialogs/preferences-dialog.c:287 -#: ../app/dialogs/preferences-dialog.c:633 -#: ../app/dialogs/preferences-dialog.c:1096 +#: ../app/dialogs/preferences-dialog.c:637 +#: ../app/dialogs/preferences-dialog.c:1100 #: ../app/dialogs/print-size-dialog.c:124 ../app/dialogs/quit-dialog.c:171 #: ../app/dialogs/resize-dialog.c:186 #: ../app/dialogs/resolution-calibrate-dialog.c:76 @@ -3274,9 +3479,9 @@ msgstr "Cancella la cronologia documenti" #: ../app/display/gimpdisplayshell-filter-dialog.c:87 #: ../app/display/gimpdisplayshell-rotate-dialog.c:122 #: ../app/display/gimpdisplayshell-scale-dialog.c:122 -#: ../app/tools/gimpfiltertool.c:321 -#: ../app/tools/gimpforegroundselecttool.c:307 ../app/tools/gimptexttool.c:1581 -#: ../app/tools/gimptransformtool.c:1201 ../app/widgets/gimpactionview.c:669 +#: ../app/tools/gimpfiltertool.c:323 +#: ../app/tools/gimpforegroundselecttool.c:313 ../app/tools/gimptexttool.c:1591 +#: ../app/tools/gimptransformtool.c:1215 ../app/widgets/gimpactionview.c:669 #: ../app/widgets/gimpcolordialog.c:110 #: ../app/widgets/gimpcontrollereditor.c:660 #: ../app/widgets/gimpcontrollerlist.c:564 @@ -3288,7 +3493,7 @@ msgid "_Cancel" msgstr "A_nnulla" #: ../app/actions/documents-commands.c:231 ../app/actions/edit-commands.c:161 -#: ../app/dialogs/preferences-dialog.c:634 +#: ../app/dialogs/preferences-dialog.c:638 msgid "Cl_ear" msgstr "Canc_ella" @@ -3863,7 +4068,7 @@ msgstr "Copia con nome" msgid "Copy Visible Named " msgstr "Copia visibile con nome " -#: ../app/actions/edit-commands.c:569 ../app/display/gimpdisplayshell-dnd.c:479 +#: ../app/actions/edit-commands.c:571 ../app/display/gimpdisplayshell-dnd.c:479 msgid "Pasted as new layer because the target is a layer group." msgstr "" "Incollato come nuovo livello dato che l'obiettivo è un gruppo di livelli." @@ -4996,7 +5201,7 @@ msgctxt "fonts-action" msgid "Rescan the installed fonts" msgstr "Rileggi i caratteri installati" -#: ../app/actions/gimpgeglprocedure.c:320 +#: ../app/actions/gimpgeglprocedure.c:323 #, c-format msgid "There are no last settings for '%s', showing the filter dialog instead." msgstr "" @@ -5326,27 +5531,27 @@ msgstr "" "Seleziona quante volte\n" "duplicare la selezione." -#: ../app/actions/gradient-editor-commands.c:562 +#: ../app/actions/gradient-editor-commands.c:563 msgid "Split Segment Uniformly" msgstr "Dividi il segmento uniformemente" -#: ../app/actions/gradient-editor-commands.c:563 +#: ../app/actions/gradient-editor-commands.c:564 msgid "Split Gradient Segment Uniformly" msgstr "Dividi il segmento di gradiente uniformemente" -#: ../app/actions/gradient-editor-commands.c:567 +#: ../app/actions/gradient-editor-commands.c:568 msgid "Split Segments Uniformly" msgstr "Dividi i segmenti uniformemente" -#: ../app/actions/gradient-editor-commands.c:568 +#: ../app/actions/gradient-editor-commands.c:569 msgid "Split Gradient Segments Uniformly" msgstr "Dividi i segmenti di gradiente uniformemente" -#: ../app/actions/gradient-editor-commands.c:581 +#: ../app/actions/gradient-editor-commands.c:582 msgid "_Split" msgstr "_Dividi" -#: ../app/actions/gradient-editor-commands.c:603 +#: ../app/actions/gradient-editor-commands.c:604 msgid "" "Select the number of uniform parts\n" "in which to split the selected segment." @@ -5354,7 +5559,7 @@ msgstr "" "Seleziona in quante parti uniformi\n" "vuoi dividere il segmento selezionato." -#: ../app/actions/gradient-editor-commands.c:606 +#: ../app/actions/gradient-editor-commands.c:607 msgid "" "Select the number of uniform parts\n" "in which to split the segments in the selection." @@ -5942,7 +6147,7 @@ msgstr "Riflessione" msgid "Rotating" msgstr "Rotazione" -#: ../app/actions/image-commands.c:850 ../app/actions/layers-commands.c:802 +#: ../app/actions/image-commands.c:850 ../app/actions/layers-commands.c:779 msgid "Cannot crop because the current selection is empty." msgstr "Non è possibile ritagliare perché la regione selezionata è vuota." @@ -5993,8 +6198,8 @@ msgid "Scale Image" msgstr "Scala immagine" #. Scaling -#: ../app/actions/image-commands.c:1453 ../app/actions/layers-commands.c:1592 -#: ../app/dialogs/preferences-dialog.c:1602 +#: ../app/actions/image-commands.c:1453 ../app/actions/layers-commands.c:1569 +#: ../app/dialogs/preferences-dialog.c:1606 #: ../app/pdb/drawable-transform-cmds.c:800 #: ../app/pdb/drawable-transform-cmds.c:891 #: ../app/pdb/image-transform-cmds.c:122 ../app/pdb/image-transform-cmds.c:158 @@ -6529,43 +6734,43 @@ msgstr "Modalità composizione livello: auto" #: ../app/actions/layers-actions.c:389 msgctxt "layers-action" -msgid "Source Over" -msgstr "Sorgente sopra" +msgid "Union" +msgstr "Unione" #: ../app/actions/layers-actions.c:390 msgctxt "layers-action" -msgid "Layer Composite Mode: Source Over" -msgstr "Modalità composizione livello: sorgente sopra" +msgid "Layer Composite Mode: Union" +msgstr "Modalità composizione livello: unione" #: ../app/actions/layers-actions.c:395 msgctxt "layers-action" -msgid "Source Atop" -msgstr "Sorgente in cima" +msgid "Clip to Backdrop" +msgstr "Ritaglio allo sfondo" #: ../app/actions/layers-actions.c:396 msgctxt "layers-action" -msgid "Layer Composite Mode: Source Atop" -msgstr "Modalità composizione livello: sorgente in cima" +msgid "Layer Composite Mode: Clip to Backdrop" +msgstr "Modalità composizione livello: ritaglio allo sfondo" #: ../app/actions/layers-actions.c:401 msgctxt "layers-action" -msgid "Source In" -msgstr "Sorgente in" +msgid "Clip to Layer" +msgstr "Ritaglia al livello" #: ../app/actions/layers-actions.c:402 msgctxt "layers-action" -msgid "Layer Composite Mode: Source In" -msgstr "Modalità composizione livello: sorgente in" +msgid "Layer Composite Mode: Clip to Layer" +msgstr "Modalità composizione livello: ritaglio al livello" #: ../app/actions/layers-actions.c:407 msgctxt "layers-action" -msgid "Destination Atop" -msgstr "Destinazione in cima" +msgid "Intersection" +msgstr "Intersezione" #: ../app/actions/layers-actions.c:408 msgctxt "layers-action" -msgid "Layer Composite Mode: Destination Atop" -msgstr "Modalità composizione livello: destinazione in cima" +msgid "Layer Composite Mode: Intersection" +msgstr "Modalità composizione livello: intersezione" #: ../app/actions/layers-actions.c:416 msgctxt "layers-action" @@ -6861,7 +7066,7 @@ msgctxt "layers-action" msgid "To _New Layer" msgstr "A _nuovo livello" -#: ../app/actions/layers-commands.c:259 ../app/actions/layers-commands.c:1441 +#: ../app/actions/layers-commands.c:259 ../app/actions/layers-commands.c:1418 msgid "Layer Attributes" msgstr "Attributi di livello" @@ -6869,9 +7074,9 @@ msgstr "Attributi di livello" msgid "Edit Layer Attributes" msgstr "Modifica attributi livello" -#: ../app/actions/layers-commands.c:328 ../app/actions/layers-commands.c:403 +#: ../app/actions/layers-commands.c:328 #: ../app/widgets/gimpdrawabletreeview.c:331 -#: ../app/widgets/gimplayertreeview.c:846 +#: ../app/widgets/gimplayertreeview.c:882 msgid "New Layer" msgstr "Nuovo livello" @@ -6879,31 +7084,31 @@ msgstr "Nuovo livello" msgid "Create a New Layer" msgstr "Crea un nuovo livello" -#: ../app/actions/layers-commands.c:443 ../app/core/gimptoolinfo.c:82 +#: ../app/actions/layers-commands.c:420 ../app/core/gimptoolinfo.c:82 msgid "Visible" msgstr "Visibile" -#: ../app/actions/layers-commands.c:708 +#: ../app/actions/layers-commands.c:685 msgid "Set Layer Boundary Size" msgstr "Imposta dimensioni margini del livello" -#: ../app/actions/layers-commands.c:770 +#: ../app/actions/layers-commands.c:747 msgid "Scale Layer" msgstr "Scala livello" -#: ../app/actions/layers-commands.c:812 +#: ../app/actions/layers-commands.c:789 msgid "Crop Layer to Selection" msgstr "Ritaglia il livello alla selezione" -#: ../app/actions/layers-commands.c:842 +#: ../app/actions/layers-commands.c:819 msgid "Crop Layer to Content" msgstr "Ritaglia il livello al contenuto" -#: ../app/actions/layers-commands.c:855 +#: ../app/actions/layers-commands.c:832 msgid "Cannot crop because the active layer has no content." msgstr "Impossibile ritagliare perché il livello attivo selezionato è vuoto." -#: ../app/actions/layers-commands.c:862 +#: ../app/actions/layers-commands.c:839 msgid "Cannot crop because the active layer is already cropped to its content." msgstr "" "Impossibile ritagliare perché il livello attivo è già stato ritagliato ai " @@ -7264,11 +7469,11 @@ msgstr "Reimposta tutti i filtri" #: ../app/actions/tool-options-commands.c:196 ../app/dialogs/fill-dialog.c:114 #: ../app/dialogs/grid-dialog.c:101 ../app/dialogs/image-new-dialog.c:105 #: ../app/dialogs/preferences-dialog.c:288 -#: ../app/dialogs/preferences-dialog.c:1095 +#: ../app/dialogs/preferences-dialog.c:1099 #: ../app/dialogs/print-size-dialog.c:123 ../app/dialogs/scale-dialog.c:136 #: ../app/dialogs/stroke-dialog.c:127 #: ../app/display/gimpdisplayshell-rotate-dialog.c:121 -#: ../app/tools/gimpfiltertool.c:320 ../app/tools/gimptransformtool.c:1200 +#: ../app/tools/gimpfiltertool.c:322 ../app/tools/gimptransformtool.c:1214 #: ../app/widgets/gimpcolordialog.c:109 msgid "_Reset" msgstr "_Reimposta" @@ -7551,11 +7756,11 @@ msgstr "" "Durante la bordatura, agire come se le aree selezionate stessero continuando " "fuori dall'immagine." -#: ../app/actions/select-commands.c:415 +#: ../app/actions/select-commands.c:423 msgid "Fill Selection Outline" msgstr "Riempi contorno selezione" -#: ../app/actions/select-commands.c:444 +#: ../app/actions/select-commands.c:452 msgid "Stroke Selection" msgstr "Delinea selezione" @@ -7699,10 +7904,10 @@ msgstr "_Apri" #: ../app/actions/text-editor-commands.c:139 #: ../app/actions/text-tool-commands.c:209 ../app/config/gimpconfig-file.c:71 -#: ../app/core/gimppalette-import.c:510 ../app/plug-in/gimpenvirontable.c:289 +#: ../app/core/gimppalette-import.c:512 ../app/plug-in/gimpenvirontable.c:289 #: ../app/plug-in/gimpinterpreterdb.c:233 #: ../app/tools/gimpfiltertool-settings.c:170 -#: ../app/widgets/gimptextbuffer.c:1647 +#: ../app/widgets/gimptextbuffer.c:1674 #, c-format msgid "Could not open '%s' for reading: %s" msgstr "Impossibile aprire \"%s\" in lettura: %s" @@ -9716,14 +9921,14 @@ msgstr "Sposta questa finestra sullo schermo %s" #: ../app/dialogs/grid-dialog.c:103 ../app/dialogs/image-new-dialog.c:107 #: ../app/dialogs/image-new-dialog.c:326 #: ../app/dialogs/item-options-dialog.c:146 -#: ../app/dialogs/preferences-dialog.c:1097 +#: ../app/dialogs/preferences-dialog.c:1101 #: ../app/dialogs/print-size-dialog.c:125 #: ../app/dialogs/resolution-calibrate-dialog.c:77 #: ../app/dialogs/template-options-dialog.c:119 #: ../app/display/gimpdisplayshell-filter-dialog.c:88 #: ../app/display/gimpdisplayshell-rotate-dialog.c:123 #: ../app/display/gimpdisplayshell-scale-dialog.c:123 ../app/gui/gui.c:193 -#: ../app/tools/gimpfiltertool.c:322 ../app/widgets/gimpcolordialog.c:111 +#: ../app/tools/gimpfiltertool.c:324 ../app/widgets/gimpcolordialog.c:111 #: ../app/widgets/gimpcontrollereditor.c:661 #: ../app/widgets/gimperrordialog.c:76 ../app/widgets/gimpfiledialog.c:188 msgid "_OK" @@ -10006,7 +10211,7 @@ msgid "Error parsing '%%s': line longer than %s characters." msgstr "Errore durante l'analisi di \"%%s\": riga più lunga di %s caratteri." #: ../app/config/gimpconfig-file.c:152 ../app/config/gimpconfig-file.c:196 -#: ../app/core/gimp-tags.c:144 ../app/gui/themes.c:361 +#: ../app/core/gimp-tags.c:144 ../app/gui/themes.c:344 #: ../app/tools/gimpfiltertool-settings.c:227 #, c-format msgid "Error writing '%s': %s" @@ -10029,7 +10234,7 @@ msgstr "" "predefiniti. È stata fatta una copia di salvataggio della configurazione su " "\"%s\"." -#: ../app/config/gimpdialogconfig.c:307 ../app/core/gimplayer.c:438 +#: ../app/config/gimpdialogconfig.c:307 ../app/core/gimplayer.c:440 msgid "Layer" msgstr "Livello" @@ -10170,19 +10375,24 @@ msgstr "" "Quante impostazioni usate recentemente mantenere negli strumenti filtro." #: ../app/config/gimprc-blurbs.h:182 +msgid "Default to the last used settings in filter tools." +msgstr "" +"Di default imposta le ultime impostazioni usate negli strumenti filtro." + +#: ../app/config/gimprc-blurbs.h:185 msgid "Show advanced color options in filter tools." msgstr "Mostra opzioni colore avanzate negli strumenti filtro." -#: ../app/config/gimprc-blurbs.h:185 +#: ../app/config/gimprc-blurbs.h:188 msgid "Sets the text to appear in image window status bars." msgstr "" "Imposta il testo che appare nella barra di stato della finestra immagine" -#: ../app/config/gimprc-blurbs.h:188 +#: ../app/config/gimprc-blurbs.h:191 msgid "Sets the text to appear in image window titles." msgstr "Imposta il testo che appare nei titoli delle finestre immagine" -#: ../app/config/gimprc-blurbs.h:191 +#: ../app/config/gimprc-blurbs.h:194 msgid "" "Promote imported images to floating point precision. Does not apply to " "indexed images." @@ -10190,7 +10400,7 @@ msgstr "" "Promuove le immagini importate alla precisione in virgola mobile. Non si " "applica a immagini indicizzate." -#: ../app/config/gimprc-blurbs.h:195 +#: ../app/config/gimprc-blurbs.h:198 msgid "" "When promoting imported images to floating point precision, also add minimal " "noise in order to distribute color values a bit." @@ -10199,32 +10409,32 @@ msgstr "" "aggiunge anche un disturbo minimo in modo da distribuire un po' i valori di " "colore." -#: ../app/config/gimprc-blurbs.h:199 +#: ../app/config/gimprc-blurbs.h:202 msgid "Add an alpha channel to all layers of imported images." msgstr "Aggiungi canale alfa a tutti i livelli delle immagini importate." -#: ../app/config/gimprc-blurbs.h:202 +#: ../app/config/gimprc-blurbs.h:205 msgid "Which plug-in to use for importing raw digital camera files." msgstr "" "Che plug-in usare per importare file di immagini fotografiche in formato RAW." -#: ../app/config/gimprc-blurbs.h:205 +#: ../app/config/gimprc-blurbs.h:208 msgid "Export Exif metadata by default." msgstr "Esporta i file Exif come impostazione predefinita." -#: ../app/config/gimprc-blurbs.h:208 +#: ../app/config/gimprc-blurbs.h:211 msgid "Export XMP metadata by default." msgstr "Esporta i metadati XMP come impostazione predefinita." -#: ../app/config/gimprc-blurbs.h:211 +#: ../app/config/gimprc-blurbs.h:214 msgid "Export IPTC metadata by default." msgstr "Esporta i metadati IPTC come impostazione predefinita." -#: ../app/config/gimprc-blurbs.h:214 +#: ../app/config/gimprc-blurbs.h:217 msgid "Try generating debug data for bug reporting when appropriate." msgstr "Prova a generare i dati di debug per il rapporto bug quando è il caso." -#: ../app/config/gimprc-blurbs.h:217 +#: ../app/config/gimprc-blurbs.h:220 msgid "" "When enabled, this will ensure that the full image is visible after a file " "is opened, otherwise it will be displayed with a scale of 1:1." @@ -10232,23 +10442,23 @@ msgstr "" "Se abilitata, garantirà che l'intera immagine sia visibile dopo l'apertura " "del file, altrimenti sarà visualizzata con scala 1:1." -#: ../app/config/gimprc-blurbs.h:221 +#: ../app/config/gimprc-blurbs.h:224 msgid "" "Sets the level of interpolation used for scaling and other transformations." msgstr "" "Imposta il livello di interpolazione usato per scalare e altre " "trasformazioni." -#: ../app/config/gimprc-blurbs.h:228 +#: ../app/config/gimprc-blurbs.h:231 msgid "Specifies the language to use for the user interface." msgstr "Specifica la lingua da usare per l'interfaccia utente." -#: ../app/config/gimprc-blurbs.h:231 +#: ../app/config/gimprc-blurbs.h:234 msgid "How many recently opened image filenames to keep on the File menu." msgstr "" "Quanti nomi di file immagine aperti recentemente mantenere nel menu file." -#: ../app/config/gimprc-blurbs.h:234 +#: ../app/config/gimprc-blurbs.h:237 msgid "" "Speed of marching ants in the selection outline. This value is in " "milliseconds (less time indicates faster marching)." @@ -10256,7 +10466,7 @@ msgstr "" "Velocità dell'animazione del tratteggio di selezione. Il valore è in " "millisecondi (un tempo inferiore indica una velocità superiore)." -#: ../app/config/gimprc-blurbs.h:238 +#: ../app/config/gimprc-blurbs.h:241 msgid "" "GIMP will warn the user if an attempt is made to create an image that would " "take more memory than the size specified here." @@ -10264,7 +10474,7 @@ msgstr "" "GIMP avvertirà l'utente se si è tentato di creare un'immagine che occupa più " "memoria di quella specificata qui." -#: ../app/config/gimprc-blurbs.h:248 +#: ../app/config/gimprc-blurbs.h:251 msgid "" "Sets the monitor's horizontal resolution, in dots per inch. If set to 0, " "forces the X server to be queried for both horizontal and vertical " @@ -10274,7 +10484,7 @@ msgstr "" "impostato a 0, forza il server X ad essere interrogato sia per le " "informazioni di risoluzione orizzontale che verticale." -#: ../app/config/gimprc-blurbs.h:253 +#: ../app/config/gimprc-blurbs.h:256 msgid "" "Sets the monitor's vertical resolution, in dots per inch. If set to 0, " "forces the X server to be queried for both horizontal and vertical " @@ -10284,7 +10494,7 @@ msgstr "" "impostato a 0, forza il server X ad essere interrogato sia per le " "informazioni di risoluzione orizzontale che verticale." -#: ../app/config/gimprc-blurbs.h:258 +#: ../app/config/gimprc-blurbs.h:261 msgid "" "If enabled, the move tool sets the edited layer or path as active. This " "used to be the default behaviour in older versions." @@ -10293,7 +10503,7 @@ msgstr "" "modificato come attivo. Era il comportamento predefinito nelle vecchie " "versioni." -#: ../app/config/gimprc-blurbs.h:267 +#: ../app/config/gimprc-blurbs.h:270 msgid "" "Sets the size of the navigation preview available in the lower right corner " "of the image window." @@ -10301,13 +10511,13 @@ msgstr "" "Imposta la dimensione dell'anteprima di navigazione, accessibile nella parte " "in basso a destra della finestra immagine." -#: ../app/config/gimprc-blurbs.h:271 +#: ../app/config/gimprc-blurbs.h:274 msgid "Sets how many threads GIMP should use for operations that support it." msgstr "" "Imposta il numero di thread che GIMP dovrebbe usare per le operazioni che li " "supportano." -#: ../app/config/gimprc-blurbs.h:293 +#: ../app/config/gimprc-blurbs.h:296 msgid "" "Sets whether GIMP should create previews of layers and channels. Previews in " "the layers and channels dialog are nice to have but they can slow things " @@ -10317,7 +10527,7 @@ msgstr "" "anteprime nelle finestre dei livelli e canali sono utili ma possono " "rallentare se si lavora con immagini molto grandi." -#: ../app/config/gimprc-blurbs.h:298 +#: ../app/config/gimprc-blurbs.h:301 msgid "" "Sets the preview size used for layers and channel previews in newly created " "dialogs." @@ -10325,11 +10535,11 @@ msgstr "" "Imposta la dimensione dell'anteprima per livelli e canali nelle nuove " "finestre di dialogo." -#: ../app/config/gimprc-blurbs.h:302 +#: ../app/config/gimprc-blurbs.h:305 msgid "Sets the default quick mask color." msgstr "Imposta il colore predefinito della maschera veloce." -#: ../app/config/gimprc-blurbs.h:305 +#: ../app/config/gimprc-blurbs.h:308 msgid "" "When enabled, the image window will automatically resize itself whenever the " "physical image size changes. This setting only takes effect in multi-window " @@ -10339,7 +10549,7 @@ msgstr "" "viene modificata l'ampiezza fisica dell'immagine. Questa impostazione avrà " "effetto solo in modalità multi-finestra." -#: ../app/config/gimprc-blurbs.h:310 +#: ../app/config/gimprc-blurbs.h:313 msgid "" "When enabled, the image window will automatically resize itself when zooming " "into and out of images. This setting only takes effect in multi-window mode." @@ -10348,13 +10558,13 @@ msgstr "" "si esegue uno zoom sull'immagine. Questa impostazione avrà effetto solo in " "modalità multi-finestra." -#: ../app/config/gimprc-blurbs.h:315 +#: ../app/config/gimprc-blurbs.h:318 msgid "Let GIMP try to restore your last saved session on each startup." msgstr "" "Lascia che GIMP tenti di ripristinare l'ultima sessione salvata ad ogni " "avvio." -#: ../app/config/gimprc-blurbs.h:318 +#: ../app/config/gimprc-blurbs.h:321 msgid "" "When enabled, GIMP will try to restore windows on the monitor they were open " "before. When disabled, windows will appear on the currently used monitor." @@ -10363,13 +10573,13 @@ msgstr "" "dov'erano aperte in precedenza. Se disabilitata, le finestre appariranno " "sullo schermo attualmente in uso." -#: ../app/config/gimprc-blurbs.h:323 +#: ../app/config/gimprc-blurbs.h:326 msgid "" "Remember the current tool, pattern, color, and brush across GIMP sessions." msgstr "" "Ricorda strumento, motivo, colore e pennello nelle sessioni successive." -#: ../app/config/gimprc-blurbs.h:327 +#: ../app/config/gimprc-blurbs.h:330 msgid "" "When enabled, the same tool and tool options will be used for all input " "devices. No tool switching will occur when the input device changes." @@ -10378,7 +10588,7 @@ msgstr "" "dispositivi di ingresso. Non verranno effettuati cambiamenti di strumento al " "cambiare dello strumento di ingresso." -#: ../app/config/gimprc-blurbs.h:332 +#: ../app/config/gimprc-blurbs.h:335 msgid "" "Keep a permanent record of all opened and saved files in the Recent " "Documents list." @@ -10386,17 +10596,17 @@ msgstr "" "Mantenere la registrazione di tutti i file aperti e salvati nella cronologia " "dei documenti." -#: ../app/config/gimprc-blurbs.h:336 +#: ../app/config/gimprc-blurbs.h:339 msgid "Save the positions and sizes of the main dialogs when GIMP exits." msgstr "" "Salva le posizioni e l'ampiezza delle finestre di dialogo principali " "all'uscita di GIMP." -#: ../app/config/gimprc-blurbs.h:339 +#: ../app/config/gimprc-blurbs.h:342 msgid "Save the tool options when GIMP exits." msgstr "Salva le opzioni degli strumenti all'uscita da GIMP." -#: ../app/config/gimprc-blurbs.h:345 +#: ../app/config/gimprc-blurbs.h:348 msgid "" "When enabled, all paint tools will show a preview of the current brush's " "outline." @@ -10404,7 +10614,7 @@ msgstr "" "Se abilitata, tutti gli strumenti di disegno mostreranno un'anteprima del " "contorno del pennello corrente." -#: ../app/config/gimprc-blurbs.h:349 +#: ../app/config/gimprc-blurbs.h:352 msgid "" "When enabled, dialogs will show a help button that gives access to the " "related help page. Without this button, the help page can still be reached " @@ -10414,7 +10624,7 @@ msgstr "" "alla pagina di aiuto relativa. Senza questo tasto, la pagina di aiuto sarà " "ancora disponibile ma tramite il tasto F1." -#: ../app/config/gimprc-blurbs.h:354 +#: ../app/config/gimprc-blurbs.h:357 msgid "" "When enabled, the mouse pointer will be shown over the image while using a " "paint tool." @@ -10422,7 +10632,7 @@ msgstr "" "Se abilitata, il puntatore del mouse verrà mostrato sopra l'immagine mentre " "si usa uno strumento di disegno." -#: ../app/config/gimprc-blurbs.h:358 +#: ../app/config/gimprc-blurbs.h:361 msgid "" "When enabled, the menubar is visible by default. This can also be toggled " "with the \"View->Show Menubar\" command." @@ -10430,7 +10640,7 @@ msgstr "" "Se abilitata, la barra dei menu è visibile. Questo può essere modificato " "anche con il comando \"Visualizza->Barra dei menu\"." -#: ../app/config/gimprc-blurbs.h:362 +#: ../app/config/gimprc-blurbs.h:365 msgid "" "When enabled, the rulers are visible by default. This can also be toggled " "with the \"View->Show Rulers\" command." @@ -10438,7 +10648,7 @@ msgstr "" "Se abilitata, i righelli sono visibili. Questo comportamento può essere " "modificato anche con il comando \"Visualizza->Righelli\"" -#: ../app/config/gimprc-blurbs.h:366 +#: ../app/config/gimprc-blurbs.h:369 msgid "" "When enabled, the scrollbars are visible by default. This can also be " "toggled with the \"View->Show Scrollbars\" command." @@ -10446,7 +10656,7 @@ msgstr "" "Se abilitata, le barre di scorrimento sono visibili. Questo comportamento " "può essere modificato con il comando \"Visualizza->Barre di scorrimento\"." -#: ../app/config/gimprc-blurbs.h:370 +#: ../app/config/gimprc-blurbs.h:373 msgid "" "When enabled, the statusbar is visible by default. This can also be toggled " "with the \"View->Show Statusbar\" command." @@ -10454,7 +10664,7 @@ msgstr "" "Se abilitata, la barra di stato è visibile. Questo comportamento può essere " "modificato anche con il comando \"Visualizza->Barra di stato\"." -#: ../app/config/gimprc-blurbs.h:374 +#: ../app/config/gimprc-blurbs.h:377 msgid "" "When enabled, the selection is visible by default. This can also be toggled " "with the \"View->Show Selection\" command." @@ -10462,7 +10672,7 @@ msgstr "" "Se abilitata, la selezione è visibile. Questo comportamento può essere " "modificato anche con il comando \"Visualizza->Selezione\"." -#: ../app/config/gimprc-blurbs.h:378 +#: ../app/config/gimprc-blurbs.h:381 msgid "" "When enabled, the layer boundary is visible by default. This can also be " "toggled with the \"View->Show Layer Boundary\" command." @@ -10470,7 +10680,7 @@ msgstr "" "Se abilitata, i margini del livello sono visibili. Questo comportamento può " "essere modificato anche con il comando \"Visualizza->Margini del livello\"." -#: ../app/config/gimprc-blurbs.h:382 +#: ../app/config/gimprc-blurbs.h:385 msgid "" "When enabled, the guides are visible by default. This can also be toggled " "with the \"View->Show Guides\" command." @@ -10478,7 +10688,7 @@ msgstr "" "Se abilitata, le guide sono visibili. Questo comportamento può essere " "modificato anche con il comando \"Visualizza->Guide\"." -#: ../app/config/gimprc-blurbs.h:386 +#: ../app/config/gimprc-blurbs.h:389 msgid "" "When enabled, the grid is visible by default. This can also be toggled with " "the \"View->Show Grid\" command." @@ -10486,7 +10696,7 @@ msgstr "" "Se abilitata, la griglia è visibile. Questo comportamento può essere " "modificato anche con il comando \"Visualizza->Griglia\"." -#: ../app/config/gimprc-blurbs.h:390 +#: ../app/config/gimprc-blurbs.h:393 msgid "" "When enabled, the sample points are visible by default. This can also be " "toggled with the \"View->Show Sample Points\" command." @@ -10495,45 +10705,45 @@ msgstr "" "può essere modificato anche con il comando \"Visualizza->Punti di " "campionamento\"" -#: ../app/config/gimprc-blurbs.h:394 +#: ../app/config/gimprc-blurbs.h:397 msgid "Show a tooltip when the pointer hovers over an item." msgstr "Mostra un suggerimento quando il puntatore passa sopra un elemento." -#: ../app/config/gimprc-blurbs.h:397 +#: ../app/config/gimprc-blurbs.h:400 msgid "Use GIMP in a single-window mode." msgstr "Usa GIMP in modalità a finestra singola." -#: ../app/config/gimprc-blurbs.h:400 +#: ../app/config/gimprc-blurbs.h:403 msgid "Hide docks and other windows, leaving only image windows." msgstr "" "Nascondi i pannelli e le altre finestre, lasciando solo le finestre immagine." -#: ../app/config/gimprc-blurbs.h:403 +#: ../app/config/gimprc-blurbs.h:406 msgid "Enable the N-Point Deformation tool." msgstr "Abilita lo strumento di deformazione a N punti." -#: ../app/config/gimprc-blurbs.h:406 +#: ../app/config/gimprc-blurbs.h:409 msgid "Enable the Handle Transform tool." msgstr "Abilita lo strumento di deformazione ad appigli." -#: ../app/config/gimprc-blurbs.h:409 +#: ../app/config/gimprc-blurbs.h:412 msgid "Enable symmetry on painting." msgstr "Abilita simmetria sul disegno." -#: ../app/config/gimprc-blurbs.h:412 +#: ../app/config/gimprc-blurbs.h:415 msgid "Enable the MyPaint Brush tool." msgstr "Abilita lo strumento pennello MyPaint." -#: ../app/config/gimprc-blurbs.h:415 +#: ../app/config/gimprc-blurbs.h:418 msgid "Enable the Seamless Clone tool." msgstr "Abilita lo strumento di clone continuo." -#: ../app/config/gimprc-blurbs.h:418 +#: ../app/config/gimprc-blurbs.h:421 msgid "What to do when the space bar is pressed in the image window." msgstr "" "Cosa fare quando la barra spazio viene premuta nella finestra immagine." -#: ../app/config/gimprc-blurbs.h:421 +#: ../app/config/gimprc-blurbs.h:424 msgid "" "Sets the swap file location. GIMP uses a tile based memory allocation " "scheme. The swap file is used to quickly and easily swap tiles out to disk " @@ -10550,11 +10760,11 @@ msgstr "" "file di scambio viene creato in una cartella montata su NFS. Per queste " "ragioni è preferibile mettere il file di scambio in \"/tmp\"." -#: ../app/config/gimprc-blurbs.h:430 +#: ../app/config/gimprc-blurbs.h:433 msgid "When enabled, menus can be torn off." msgstr "Se abilitata, i menu possono essere staccati." -#: ../app/config/gimprc-blurbs.h:433 +#: ../app/config/gimprc-blurbs.h:436 msgid "" "When enabled, you can change keyboard shortcuts for menu items by hitting a " "key combination while the menu item is highlighted." @@ -10562,15 +10772,15 @@ msgstr "" "Se abilitata, mentre la voce del menu è selezionata, è possibile modificare " "i tasti scorciatoia per le voci di menu premendo una combinazione di tasti." -#: ../app/config/gimprc-blurbs.h:437 +#: ../app/config/gimprc-blurbs.h:440 msgid "Save changed keyboard shortcuts when GIMP exits." msgstr "All'uscita da GIMP, salva i tasti scorciatoia modificati." -#: ../app/config/gimprc-blurbs.h:440 +#: ../app/config/gimprc-blurbs.h:443 msgid "Restore saved keyboard shortcuts on each GIMP startup." msgstr "Ripristina i tasti scorciatoia salvati ad ogni avvio di GIMP." -#: ../app/config/gimprc-blurbs.h:443 +#: ../app/config/gimprc-blurbs.h:446 msgid "" "Sets the folder for temporary storage. Files will appear here during the " "course of running GIMP. Most files will disappear when GIMP exits, but some " @@ -10582,14 +10792,14 @@ msgstr "" "GIMP ma altri potrebbero restare, perciò è meglio che questa cartella non " "venga condivisa con altri utenti. " -#: ../app/config/gimprc-blurbs.h:464 +#: ../app/config/gimprc-blurbs.h:467 msgid "" "Sets the default rendering intent for the 'Convert to Color Profile' dialog." msgstr "" "Imposta l'intento di rendering per la finestra di dialogo \"Converti al " "profilo colore\"." -#: ../app/config/gimprc-blurbs.h:467 +#: ../app/config/gimprc-blurbs.h:470 msgid "" "Sets the default 'Black Point Compensation' state for the 'Convert to Color " "Profile' dialog." @@ -10597,14 +10807,14 @@ msgstr "" "Imposta lo stato predefinito \"Compensazione del punto nero\" per la " "finestra di dialogo \"Converti al profilo colore\"." -#: ../app/config/gimprc-blurbs.h:471 +#: ../app/config/gimprc-blurbs.h:474 msgid "" "Sets the default layer dithering method for the 'Convert Precision' dialog." msgstr "" "Imposta il metodo di dithering per la finestra di dialogo \"Precisione " "conversione\"." -#: ../app/config/gimprc-blurbs.h:474 +#: ../app/config/gimprc-blurbs.h:477 msgid "" "Sets the default text layer dithering method for the 'Convert Precision' " "dialog." @@ -10612,20 +10822,20 @@ msgstr "" "Imposta il metodo di dithering del livello testo predefinito per la finestra " "di dialogo \"Precisione conversione\"." -#: ../app/config/gimprc-blurbs.h:477 +#: ../app/config/gimprc-blurbs.h:480 msgid "" "Sets the default channel dithering method for the 'Convert Precision' dialog." msgstr "" "Imposta il metodo di dithering del canale predefinito per la finestra di " "dialogo \"Precisione conversione\"." -#: ../app/config/gimprc-blurbs.h:480 +#: ../app/config/gimprc-blurbs.h:483 msgid "Sets the default palette type for the 'Convert to Indexed' dialog." msgstr "" "Imposta il tipo di tavolozza predefinita per la finestra di dialogo " "\"Converti in indicizzata\"." -#: ../app/config/gimprc-blurbs.h:483 +#: ../app/config/gimprc-blurbs.h:486 msgid "" "Sets the default maximum number of colors for the 'Convert to Indexed' " "dialog." @@ -10633,7 +10843,7 @@ msgstr "" "Imposta il numero massimo di colori per la finestra di dialogo \"Converti in " "indicizzata\"." -#: ../app/config/gimprc-blurbs.h:486 +#: ../app/config/gimprc-blurbs.h:489 msgid "" "Sets the default 'Remove duplicate colors' state for the 'Convert to " "Indexed' dialog." @@ -10641,20 +10851,20 @@ msgstr "" "Imposta lo stato predefinito \"Rimuovi colori duplicati\" per la finestra di " "dialogo \"Converti in indicizzata\"." -#: ../app/config/gimprc-blurbs.h:489 +#: ../app/config/gimprc-blurbs.h:492 msgid "Sets the default dithering type for the 'Convert to Indexed' dialog." msgstr "" "Imposta il tipo di rendering predefinito per la finestra di dialogo " "\"Converti in indicizzata\"." -#: ../app/config/gimprc-blurbs.h:492 +#: ../app/config/gimprc-blurbs.h:495 msgid "" "Sets the default 'Dither alpha' state for the 'Convert to Indexed' dialog." msgstr "" "Imposta lo stato predefinito \"Dither alfa\" per la finestra di dialogo " "\"Converti in indicizzata\"." -#: ../app/config/gimprc-blurbs.h:495 +#: ../app/config/gimprc-blurbs.h:498 msgid "" "Sets the default 'Dither text layers' state for the 'Convert to Indexed' " "dialog." @@ -10662,148 +10872,148 @@ msgstr "" "Imposta lo stato predefinito \"Dither livelli di testo\" per la finestra di " "dialogo \"Coverti in indicizzata\"." -#: ../app/config/gimprc-blurbs.h:498 +#: ../app/config/gimprc-blurbs.h:501 msgid "Sets the default fill type for the 'Canvas Size' dialog." msgstr "" "Imposta il tipo di riempimento predefinito per la finestra di dialogo " "\"Dimensione superficie\"." -#: ../app/config/gimprc-blurbs.h:501 +#: ../app/config/gimprc-blurbs.h:504 msgid "Sets the default set of layers to resize for the 'Canvas Size' dialog." msgstr "" "Imposta l'insieme di livelli da ridimensionare predefinito per la finestra " "di dialogo \"Dimensione superficie\"." -#: ../app/config/gimprc-blurbs.h:504 +#: ../app/config/gimprc-blurbs.h:507 msgid "" "Sets the default 'Resize text layers' state for the 'Canvas Size' dialog." msgstr "" "Imposta lo stato predefinito di \"Ridimensiona livelli di testo\" per la " "finestra di dialogo \"Dimensioni superficie\"." -#: ../app/config/gimprc-blurbs.h:507 +#: ../app/config/gimprc-blurbs.h:510 msgid "Sets the default layer name for the 'New Layer' dialog." msgstr "" "Imposta il nome livello predefinito per la finestra di dialogo \"Nuovo " "livello\"." -#: ../app/config/gimprc-blurbs.h:510 +#: ../app/config/gimprc-blurbs.h:513 msgid "Sets the default mode for the 'New Layer' dialog." msgstr "" "Imposta la modalità predefinita per la finestra di dialogo \"Nuovo livello\"." -#: ../app/config/gimprc-blurbs.h:513 +#: ../app/config/gimprc-blurbs.h:516 msgid "Sets the default blend space for the 'New Layer' dialog." msgstr "" "Imposta lo spazio di fusione predefinito per la finestra di dialogo \"Nuovo " "livello\"." -#: ../app/config/gimprc-blurbs.h:516 +#: ../app/config/gimprc-blurbs.h:519 msgid "Sets the default composite space for the 'New Layer' dialog." msgstr "" "Imposta lo spazio di composizione predefinito per la finestra di dialogo " "\"Nuovo livello\"." -#: ../app/config/gimprc-blurbs.h:519 +#: ../app/config/gimprc-blurbs.h:522 msgid "Sets the default composite mode for the 'New Layer' dialog." msgstr "" "Imposta la modalità composita predefinita per la finestra di dialogo \"Nuovo " "livello\"." -#: ../app/config/gimprc-blurbs.h:522 +#: ../app/config/gimprc-blurbs.h:525 msgid "Sets the default opacity for the 'New Layer' dialog." msgstr "" "Imposta l'opacità predefinita per la finestra di dialogo \"Nuovo livello\"." -#: ../app/config/gimprc-blurbs.h:525 +#: ../app/config/gimprc-blurbs.h:528 msgid "Sets the default fill type for the 'New Layer' dialog." msgstr "" "Imposta il tipo di riempimento predefinito per la finestra di dialogo " "\"Nuovo livello\"." -#: ../app/config/gimprc-blurbs.h:528 +#: ../app/config/gimprc-blurbs.h:531 msgid "Sets the default fill type for the 'Layer Boundary Size' dialog." msgstr "" "Imposta il tipo di riempimento predefinito per la finestra di dialogo " "\"Dimensioni margini del livello\"." -#: ../app/config/gimprc-blurbs.h:531 +#: ../app/config/gimprc-blurbs.h:534 msgid "Sets the default mask for the 'Add Layer Mask' dialog." msgstr "" "Imposta la maschera predefinita per la finestra di dialogo \"Aggiungi " "maschera di livello\"." -#: ../app/config/gimprc-blurbs.h:534 +#: ../app/config/gimprc-blurbs.h:537 msgid "Sets the default 'invert mask' state for the 'Add Layer Mask' dialog." msgstr "" "Imposta lo stato predefinito \"Inverti maschera\" per la finestra di dialogo " "\"Aggiungi maschera di livello\"." -#: ../app/config/gimprc-blurbs.h:537 +#: ../app/config/gimprc-blurbs.h:540 msgid "Sets the default merge type for the 'Merge Visible Layers' dialog." msgstr "" "Imposta il tipo di fusione predefinita per la finestra di dialogo \"Fondi " "livelli visibili\"." -#: ../app/config/gimprc-blurbs.h:540 +#: ../app/config/gimprc-blurbs.h:543 msgid "" "Sets the default 'Active group only' for the 'Merge Visible Layers' dialog." msgstr "" "Imposta \"Solo gruppo attivo\" per la finestra di dialogo \"Fondi livelli " "visibili\"." -#: ../app/config/gimprc-blurbs.h:543 +#: ../app/config/gimprc-blurbs.h:546 msgid "" "Sets the default 'Discard invisible' for the 'Merge Visible Layers' dialog." msgstr "" "Imposta \"Abbandona i livelli invisibili\" per la finestra di dialogo " "\"Fondi livelli visibili\"." -#: ../app/config/gimprc-blurbs.h:546 +#: ../app/config/gimprc-blurbs.h:549 msgid "Sets the default channel name for the 'New Channel' dialog." msgstr "" "Imposta il nome canale predefinito per la finestra di dialogo \"Nuovo canale" "\"." -#: ../app/config/gimprc-blurbs.h:549 +#: ../app/config/gimprc-blurbs.h:552 msgid "Sets the default color and opacity for the 'New Channel' dialog." msgstr "" "Imposta il colore e l'opacità predefiniti per la finestra di dialogo \"Nuovo " "canale\"." -#: ../app/config/gimprc-blurbs.h:552 +#: ../app/config/gimprc-blurbs.h:555 msgid "Sets the default path name for the 'New Path' dialog." msgstr "" "Imposta il nome del tracciato predefinito per la finestra di dialogo \"Nuovo " "tracciato\"." -#: ../app/config/gimprc-blurbs.h:555 +#: ../app/config/gimprc-blurbs.h:558 msgid "Sets the default folder path for the 'Export Path' dialog." msgstr "" "Imposta il percorso cartella predefinito per la finestra di dialogo " "\"Esporta tracciato\"." -#: ../app/config/gimprc-blurbs.h:558 +#: ../app/config/gimprc-blurbs.h:561 msgid "" "Sets the default 'Export the active path' state for the 'Export Path' dialog." msgstr "" "Imposta lo stato predefinito \"Esporta il tracciato attivo\" per la finestra " "di dialogo \"Esporta tracciato\"." -#: ../app/config/gimprc-blurbs.h:561 +#: ../app/config/gimprc-blurbs.h:564 msgid "Sets the default folder path for the 'Import Path' dialog." msgstr "" "Imposta il percorso cartella predefinito per la finestra di dialogo " "\"Importa tracciato\"." -#: ../app/config/gimprc-blurbs.h:564 +#: ../app/config/gimprc-blurbs.h:567 msgid "" "Sets the default 'Merge imported paths' state for the 'Import Path' dialog." msgstr "" "Imposta lo stato predefinito \"Fondi tracciati importati\" per la finestra " "di dialogo \"Importa tracciato\"." -#: ../app/config/gimprc-blurbs.h:567 +#: ../app/config/gimprc-blurbs.h:570 msgid "" "Sets the default 'Scale imported paths to fit size' state for the 'Import " "Path' dialog." @@ -10811,25 +11021,25 @@ msgstr "" "Imposta lo stato predefinito \"Scala i tracciati importati all'immagine\" " "per la finestra di dialogo \"Importa tracciato\"." -#: ../app/config/gimprc-blurbs.h:570 +#: ../app/config/gimprc-blurbs.h:573 msgid "Sets the default feather radius for the 'Feather Selection' dialog." msgstr "" "Imposta il raggio di sfumatura predefinito per la finestra di dialogo " "\"Selezione sfumata\"." -#: ../app/config/gimprc-blurbs.h:573 +#: ../app/config/gimprc-blurbs.h:576 msgid "Sets the default grow radius for the 'Grow Selection' dialog." msgstr "" "Imposta il raggio di allargamento predefinito per la finestra di dialogo " "\"Allarga selezione\"." -#: ../app/config/gimprc-blurbs.h:576 +#: ../app/config/gimprc-blurbs.h:579 msgid "Sets the default shrink radius for the 'Shrink Selection' dialog." msgstr "" "Imposta il raggio predefinito di restringimento per la finestra di dialogo " "\"Riduci selezione\"." -#: ../app/config/gimprc-blurbs.h:579 +#: ../app/config/gimprc-blurbs.h:582 msgid "" "Sets the default 'Selected areas continue outside the image' setting for the " "'Shrink Selection' dialog." @@ -10838,13 +11048,13 @@ msgstr "" "continuano fuori dall'immagine\" per la finestra di dialogo \"Riduci " "selezione\"." -#: ../app/config/gimprc-blurbs.h:583 +#: ../app/config/gimprc-blurbs.h:586 msgid "Sets the default border radius for the 'Border Selection' dialog." msgstr "" "Imposta il raggio del bordo predefinito per la finestra di dialogo " "\"Selezione bordo\"." -#: ../app/config/gimprc-blurbs.h:586 +#: ../app/config/gimprc-blurbs.h:589 msgid "" "Sets the default 'Selected areas continue outside the image' setting for the " "'Border Selection' dialog." @@ -10853,19 +11063,19 @@ msgstr "" "continuano fuori dall'immagine\" per la finestra di dialogo \"Selezione bordo" "\"." -#: ../app/config/gimprc-blurbs.h:590 +#: ../app/config/gimprc-blurbs.h:593 msgid "Sets the default border style for the 'Border Selection' dialog." msgstr "" "Imposta lo stile bordo predefinito per la finestra di dialogo \"Selezione " "bordo\"." -#: ../app/config/gimprc-blurbs.h:599 +#: ../app/config/gimprc-blurbs.h:602 msgid "Sets the size of the thumbnail shown in the Open dialog." msgstr "" "Imposta la dimensione delle miniature mostrate nella finestra di apertura " "file." -#: ../app/config/gimprc-blurbs.h:602 +#: ../app/config/gimprc-blurbs.h:605 msgid "" "The thumbnail in the Open dialog will be automatically updated if the file " "being previewed is smaller than the size set here." @@ -10873,7 +11083,7 @@ msgstr "" "La miniatura nella finestra di dialogo di apertura file sarà aggiornata " "automaticamente se il file è più piccolo della dimensione qui impostata." -#: ../app/config/gimprc-blurbs.h:606 +#: ../app/config/gimprc-blurbs.h:609 msgid "" "When the amount of pixel data exceeds this limit, GIMP will start to swap " "tiles to disk. This is a lot slower but it makes it possible to work on " @@ -10886,33 +11096,33 @@ msgstr "" "Se si possiede molta memoria RAM può essere desiderabile impostare la voce " "ad un valore maggiore." -#: ../app/config/gimprc-blurbs.h:612 +#: ../app/config/gimprc-blurbs.h:615 msgid "Show the current foreground and background colors in the toolbox." msgstr "" "Mostra i colori di primo piano e sfondo correnti nel pannello degli " "strumenti." -#: ../app/config/gimprc-blurbs.h:615 +#: ../app/config/gimprc-blurbs.h:618 msgid "Show the currently selected brush, pattern and gradient in the toolbox." msgstr "" "Mostra il pennello, motivo e gradiente attualmente selezionati nel pannello " "degli strumenti." -#: ../app/config/gimprc-blurbs.h:618 +#: ../app/config/gimprc-blurbs.h:621 msgid "Show the currently active image in the toolbox." msgstr "Mostra l'immagine attiva nella casella degli strumenti" -#: ../app/config/gimprc-blurbs.h:624 +#: ../app/config/gimprc-blurbs.h:627 msgid "Sets the manner in which transparency is displayed in images." msgstr "" "Imposta la maniera in cui viene visualizzata la trasparenza nelle immagini." -#: ../app/config/gimprc-blurbs.h:627 +#: ../app/config/gimprc-blurbs.h:630 msgid "Sets the size of the checkerboard used to display transparency." msgstr "" "Imposta la grandezza della scacchiera usata per mostrare la trasparenza." -#: ../app/config/gimprc-blurbs.h:630 +#: ../app/config/gimprc-blurbs.h:633 msgid "" "When enabled, GIMP will not save an image if it has not been changed since " "it was opened." @@ -10920,7 +11130,7 @@ msgstr "" "Se abilitata, GIMP non salverà l'immagine se questa non è stata modificata " "dalla sua apertura." -#: ../app/config/gimprc-blurbs.h:634 +#: ../app/config/gimprc-blurbs.h:637 msgid "" "Sets the minimal number of operations that can be undone. More undo levels " "are kept available until the undo-size limit is reached." @@ -10929,7 +11139,7 @@ msgstr "" "viene raggiunta la dimensione massima, vengono mantenuti disponibili più " "livelli di annullamento." -#: ../app/config/gimprc-blurbs.h:638 +#: ../app/config/gimprc-blurbs.h:641 msgid "" "Sets an upper limit to the memory that is used per image to keep operations " "on the undo stack. Regardless of this setting, at least as many undo-levels " @@ -10940,15 +11150,15 @@ msgstr "" "potranno essere effettuati al massimo tanti livelli di annullamento quanti " "sono stati configurati." -#: ../app/config/gimprc-blurbs.h:643 +#: ../app/config/gimprc-blurbs.h:646 msgid "Sets the size of the previews in the Undo History." msgstr "Imposta la dimensione delle anteprime nella cronologia annullamenti." -#: ../app/config/gimprc-blurbs.h:646 +#: ../app/config/gimprc-blurbs.h:649 msgid "When enabled, pressing F1 will open the help browser." msgstr "Se abilitata, premendo F1 si aprirà il visualizzatore dell'aiuto." -#: ../app/config/gimprc-blurbs.h:649 +#: ../app/config/gimprc-blurbs.h:652 msgid "When enabled, uses OpenCL for some operations." msgstr "Se abilitata, usa OpenCL per alcune operazioni." @@ -11248,547 +11458,557 @@ msgctxt "debug-policy" msgid "Never debug GIMP" msgstr "Nessun debug di GIMP" -#: ../app/core/core-enums.c:860 +#: ../app/core/core-enums.c:862 msgctxt "undo-type" msgid "<>" msgstr "<>" -#: ../app/core/core-enums.c:861 +#: ../app/core/core-enums.c:863 msgctxt "undo-type" msgid "Scale image" msgstr "Scala immagine" -#: ../app/core/core-enums.c:862 +#: ../app/core/core-enums.c:864 msgctxt "undo-type" msgid "Resize image" msgstr "Ridimensiona immagine" -#: ../app/core/core-enums.c:863 +#: ../app/core/core-enums.c:865 msgctxt "undo-type" msgid "Flip image" msgstr "Rifletti immagine" -#: ../app/core/core-enums.c:864 +#: ../app/core/core-enums.c:866 msgctxt "undo-type" msgid "Rotate image" msgstr "Ruota immagine" -#: ../app/core/core-enums.c:865 +#: ../app/core/core-enums.c:867 msgctxt "undo-type" msgid "Crop image" msgstr "Ritaglia immagine" -#: ../app/core/core-enums.c:866 +#: ../app/core/core-enums.c:868 msgctxt "undo-type" msgid "Convert image" msgstr "Converti immagine" -#: ../app/core/core-enums.c:867 +#: ../app/core/core-enums.c:869 msgctxt "undo-type" msgid "Remove item" msgstr "Rimuovi l'elemento" -#: ../app/core/core-enums.c:868 +#: ../app/core/core-enums.c:870 msgctxt "undo-type" msgid "Merge layers" msgstr "Fondi i livelli" -#: ../app/core/core-enums.c:869 +#: ../app/core/core-enums.c:871 msgctxt "undo-type" msgid "Merge paths" msgstr "Fondi tracciati" -#: ../app/core/core-enums.c:870 +#: ../app/core/core-enums.c:872 msgctxt "undo-type" msgid "Quick Mask" msgstr "Maschera veloce" -#: ../app/core/core-enums.c:871 ../app/core/core-enums.c:902 +#: ../app/core/core-enums.c:873 ../app/core/core-enums.c:904 #: ../app/core/gimpimage-grid.c:64 msgctxt "undo-type" msgid "Grid" msgstr "Griglia" -#: ../app/core/core-enums.c:872 ../app/core/core-enums.c:906 +#: ../app/core/core-enums.c:874 ../app/core/core-enums.c:908 msgctxt "undo-type" msgid "Guide" msgstr "Guida" -#: ../app/core/core-enums.c:873 ../app/core/core-enums.c:907 +#: ../app/core/core-enums.c:875 ../app/core/core-enums.c:909 msgctxt "undo-type" msgid "Sample Point" msgstr "Punto di campionamento" -#: ../app/core/core-enums.c:874 ../app/core/core-enums.c:908 +#: ../app/core/core-enums.c:876 ../app/core/core-enums.c:910 msgctxt "undo-type" msgid "Layer/Channel" msgstr "Livello/Canale" -#: ../app/core/core-enums.c:875 ../app/core/core-enums.c:909 +#: ../app/core/core-enums.c:877 ../app/core/core-enums.c:911 msgctxt "undo-type" msgid "Layer/Channel modification" msgstr "Livello/Modifica canale" -#: ../app/core/core-enums.c:876 ../app/core/core-enums.c:910 +#: ../app/core/core-enums.c:878 ../app/core/core-enums.c:912 msgctxt "undo-type" msgid "Selection mask" msgstr "Maschera di selezione" -#: ../app/core/core-enums.c:877 ../app/core/core-enums.c:914 +#: ../app/core/core-enums.c:879 ../app/core/core-enums.c:916 msgctxt "undo-type" msgid "Item visibility" msgstr "Visibilità elemento" -#: ../app/core/core-enums.c:878 ../app/core/core-enums.c:915 +#: ../app/core/core-enums.c:880 ../app/core/core-enums.c:917 msgctxt "undo-type" msgid "Link/Unlink item" msgstr "Collega/Scollega elemento" -#: ../app/core/core-enums.c:879 +#: ../app/core/core-enums.c:881 msgctxt "undo-type" msgid "Item properties" msgstr "Proprietà dell'elemento" -#: ../app/core/core-enums.c:880 ../app/core/core-enums.c:913 +#: ../app/core/core-enums.c:882 ../app/core/core-enums.c:915 msgctxt "undo-type" msgid "Move item" msgstr "Sposta elemento" -#: ../app/core/core-enums.c:881 +#: ../app/core/core-enums.c:883 msgctxt "undo-type" msgid "Scale item" msgstr "Scala elemento" -#: ../app/core/core-enums.c:882 +#: ../app/core/core-enums.c:884 msgctxt "undo-type" msgid "Resize item" msgstr "Ridimensiona elemento" -#: ../app/core/core-enums.c:883 +#: ../app/core/core-enums.c:885 msgctxt "undo-type" msgid "Add layer" msgstr "Aggiungi livello" -#: ../app/core/core-enums.c:884 ../app/core/core-enums.c:932 +#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:936 msgctxt "undo-type" msgid "Add layer mask" msgstr "Aggiungi maschera di livello" -#: ../app/core/core-enums.c:885 ../app/core/core-enums.c:934 +#: ../app/core/core-enums.c:887 ../app/core/core-enums.c:938 msgctxt "undo-type" msgid "Apply layer mask" msgstr "Applica maschera di livello" -#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:942 +#: ../app/core/core-enums.c:888 ../app/core/core-enums.c:946 msgctxt "undo-type" msgid "Floating selection to layer" msgstr "Selezione fluttuante al livello" -#: ../app/core/core-enums.c:887 +#: ../app/core/core-enums.c:889 msgctxt "undo-type" msgid "Float selection" msgstr "Selezione fluttuante" -#: ../app/core/core-enums.c:888 +#: ../app/core/core-enums.c:890 msgctxt "undo-type" msgid "Anchor floating selection" msgstr "Àncora selezione fluttuante" -#: ../app/core/core-enums.c:889 ../app/core/gimp-edit.c:479 +#: ../app/core/core-enums.c:891 ../app/core/gimp-edit.c:501 msgctxt "undo-type" msgid "Paste" msgstr "Incolla" -#: ../app/core/core-enums.c:890 ../app/core/gimp-edit.c:813 +#: ../app/core/core-enums.c:892 ../app/core/gimp-edit.c:829 msgctxt "undo-type" msgid "Cut" msgstr "Taglia" -#: ../app/core/core-enums.c:891 +#: ../app/core/core-enums.c:893 msgctxt "undo-type" msgid "Text" msgstr "Testo" -#: ../app/core/core-enums.c:892 ../app/core/core-enums.c:943 +#: ../app/core/core-enums.c:894 ../app/core/core-enums.c:947 #: ../app/core/gimpdrawable-transform.c:692 msgctxt "undo-type" msgid "Transform" msgstr "Trasforma" -#: ../app/core/core-enums.c:893 ../app/core/core-enums.c:944 +#: ../app/core/core-enums.c:895 ../app/core/core-enums.c:948 msgctxt "undo-type" msgid "Paint" msgstr "Disegna" -#: ../app/core/core-enums.c:894 ../app/core/core-enums.c:947 +#: ../app/core/core-enums.c:896 ../app/core/core-enums.c:951 msgctxt "undo-type" msgid "Attach parasite" msgstr "Allega parasite" -#: ../app/core/core-enums.c:895 ../app/core/core-enums.c:948 +#: ../app/core/core-enums.c:897 ../app/core/core-enums.c:952 msgctxt "undo-type" msgid "Remove parasite" msgstr "Rimuovi parasite" -#: ../app/core/core-enums.c:896 +#: ../app/core/core-enums.c:898 msgctxt "undo-type" msgid "Import paths" msgstr "Importa tracciati" -#: ../app/core/core-enums.c:897 +#: ../app/core/core-enums.c:899 msgctxt "undo-type" msgid "Plug-In" msgstr "Plug-in" -#: ../app/core/core-enums.c:898 +#: ../app/core/core-enums.c:900 msgctxt "undo-type" msgid "Image type" msgstr "Tipo di immagine" -#: ../app/core/core-enums.c:899 +#: ../app/core/core-enums.c:901 msgctxt "undo-type" msgid "Image precision" msgstr "Precisione immagine" -#: ../app/core/core-enums.c:900 +#: ../app/core/core-enums.c:902 msgctxt "undo-type" msgid "Image size" msgstr "Dimensione immagine" -#: ../app/core/core-enums.c:901 +#: ../app/core/core-enums.c:903 msgctxt "undo-type" msgid "Image resolution change" msgstr "Cambio risoluzione immagine" -#: ../app/core/core-enums.c:903 +#: ../app/core/core-enums.c:905 msgctxt "undo-type" msgid "Change metadata" msgstr "Cambio metadati" -#: ../app/core/core-enums.c:904 +#: ../app/core/core-enums.c:906 msgctxt "undo-type" msgid "Change indexed palette" msgstr "Cambio tavolozza indicizzata" -#: ../app/core/core-enums.c:905 +#: ../app/core/core-enums.c:907 msgctxt "undo-type" msgid "Change color managed state" msgstr "Cambia lo stato della gestione del colore" -#: ../app/core/core-enums.c:911 +#: ../app/core/core-enums.c:913 msgctxt "undo-type" msgid "Reorder item" msgstr "Riordino elemento" -#: ../app/core/core-enums.c:912 +#: ../app/core/core-enums.c:914 msgctxt "undo-type" msgid "Rename item" msgstr "Rinomina elemento" -#: ../app/core/core-enums.c:916 +#: ../app/core/core-enums.c:918 msgctxt "undo-type" msgid "Item color tag" msgstr "Etichetta colore elemento" -#: ../app/core/core-enums.c:917 +#: ../app/core/core-enums.c:919 msgctxt "undo-type" msgid "Lock/Unlock content" msgstr "Blocca/sblocca il contenuto" -#: ../app/core/core-enums.c:918 +#: ../app/core/core-enums.c:920 msgctxt "undo-type" msgid "Lock/Unlock position" msgstr "Blocca/sblocca la posizione" -#: ../app/core/core-enums.c:919 +#: ../app/core/core-enums.c:921 msgctxt "undo-type" msgid "New layer" msgstr "Nuovo livello" -#: ../app/core/core-enums.c:920 +#: ../app/core/core-enums.c:922 msgctxt "undo-type" msgid "Delete layer" msgstr "Cancella livello" -#: ../app/core/core-enums.c:921 +#: ../app/core/core-enums.c:923 msgctxt "undo-type" msgid "Set layer mode" msgstr "Imposta la modalità del livello" -#: ../app/core/core-enums.c:922 +#: ../app/core/core-enums.c:924 msgctxt "undo-type" msgid "Set layer opacity" msgstr "Imposta l'opacità del livello" -#: ../app/core/core-enums.c:923 +#: ../app/core/core-enums.c:925 msgctxt "undo-type" msgid "Lock/Unlock alpha channel" msgstr "Blocca/sblocca canale alfa" -#: ../app/core/core-enums.c:924 +#: ../app/core/core-enums.c:926 msgctxt "undo-type" msgid "Suspend group layer resize" msgstr "Sospendi il ridimensionamento del gruppo livelli" -#: ../app/core/core-enums.c:925 +#: ../app/core/core-enums.c:927 msgctxt "undo-type" msgid "Resume group layer resize" msgstr "Riprendi il ridimensionamento del gruppo livelli" -#: ../app/core/core-enums.c:926 +#: ../app/core/core-enums.c:928 msgctxt "undo-type" msgid "Suspend group layer mask" msgstr "Sospendi la maschera del gruppo livelli" -#: ../app/core/core-enums.c:927 +#: ../app/core/core-enums.c:929 msgctxt "undo-type" msgid "Resume group layer mask" msgstr "Riprendi la maschera del gruppo livelli" -#: ../app/core/core-enums.c:928 +#: ../app/core/core-enums.c:930 +msgctxt "undo-type" +msgid "Start moving group layer" +msgstr "Inizio spostamento gruppo livelli" + +#: ../app/core/core-enums.c:931 +msgctxt "undo-type" +msgid "End moving group layer" +msgstr "Fine spostamento gruppo livelli" + +#: ../app/core/core-enums.c:932 msgctxt "undo-type" msgid "Convert group layer" msgstr "Converti il gruppo livelli" -#: ../app/core/core-enums.c:929 +#: ../app/core/core-enums.c:933 msgctxt "undo-type" msgid "Text layer" msgstr "Livello testo" -#: ../app/core/core-enums.c:930 +#: ../app/core/core-enums.c:934 msgctxt "undo-type" msgid "Text layer modification" msgstr "Modifica livello testo" -#: ../app/core/core-enums.c:931 +#: ../app/core/core-enums.c:935 msgctxt "undo-type" msgid "Convert text layer" msgstr "Converti il livello di testo" -#: ../app/core/core-enums.c:933 +#: ../app/core/core-enums.c:937 msgctxt "undo-type" msgid "Delete layer mask" msgstr "Elimina maschera di livello" -#: ../app/core/core-enums.c:935 +#: ../app/core/core-enums.c:939 msgctxt "undo-type" msgid "Show layer mask" msgstr "Mostra maschera di livello" -#: ../app/core/core-enums.c:936 +#: ../app/core/core-enums.c:940 msgctxt "undo-type" msgid "New channel" msgstr "Nuovo canale" -#: ../app/core/core-enums.c:937 +#: ../app/core/core-enums.c:941 msgctxt "undo-type" msgid "Delete channel" msgstr "Elimina canale" -#: ../app/core/core-enums.c:938 +#: ../app/core/core-enums.c:942 msgctxt "undo-type" msgid "Channel color" msgstr "Colore canale" -#: ../app/core/core-enums.c:939 +#: ../app/core/core-enums.c:943 msgctxt "undo-type" msgid "New path" msgstr "Nuovo tracciato" -#: ../app/core/core-enums.c:940 +#: ../app/core/core-enums.c:944 msgctxt "undo-type" msgid "Delete path" msgstr "Cancella tracciato" -#: ../app/core/core-enums.c:941 +#: ../app/core/core-enums.c:945 msgctxt "undo-type" msgid "Path modification" msgstr "Modifica tracciato" -#: ../app/core/core-enums.c:945 +#: ../app/core/core-enums.c:949 msgctxt "undo-type" msgid "Ink" msgstr "Stilo" -#: ../app/core/core-enums.c:946 +#: ../app/core/core-enums.c:950 msgctxt "undo-type" msgid "Select foreground" msgstr "Seleziona primo piano" -#: ../app/core/core-enums.c:949 +#: ../app/core/core-enums.c:953 msgctxt "undo-type" msgid "Not undoable" msgstr "Non annullabile" -#: ../app/core/core-enums.c:1029 +#: ../app/core/core-enums.c:1033 msgctxt "gradient-color" msgid "Fixed" msgstr "Fisso" -#: ../app/core/core-enums.c:1030 +#: ../app/core/core-enums.c:1034 msgctxt "gradient-color" msgid "Foreground color" msgstr "Colore di primo piano" #. Translators: this is an abbreviated version of "Foreground color". #. Keep it short. -#: ../app/core/core-enums.c:1033 +#: ../app/core/core-enums.c:1037 msgctxt "gradient-color" msgid "FG" msgstr "PP" -#: ../app/core/core-enums.c:1034 +#: ../app/core/core-enums.c:1038 msgctxt "gradient-color" msgid "Foreground color (transparent)" msgstr "Colore di primo piano (trasparente)" #. Translators: this is an abbreviated version of "Foreground color (transparent)". #. Keep it short. -#: ../app/core/core-enums.c:1037 +#: ../app/core/core-enums.c:1041 msgctxt "gradient-color" msgid "FG (t)" msgstr "PP (t)" -#: ../app/core/core-enums.c:1038 +#: ../app/core/core-enums.c:1042 msgctxt "gradient-color" msgid "Background color" msgstr "Colore di sfondo" #. Translators: this is an abbreviated version of "Background color". #. Keep it short. -#: ../app/core/core-enums.c:1041 +#: ../app/core/core-enums.c:1045 msgctxt "gradient-color" msgid "BG" msgstr "SF" -#: ../app/core/core-enums.c:1042 +#: ../app/core/core-enums.c:1046 msgctxt "gradient-color" msgid "Background color (transparent)" msgstr "Colore di sfondo (trasparente)" #. Translators: this is an abbreviated version of "Background color (transparent)". #. Keep it short. -#: ../app/core/core-enums.c:1045 +#: ../app/core/core-enums.c:1049 msgctxt "gradient-color" msgid "BG (t)" msgstr "SF (t)" -#: ../app/core/core-enums.c:1076 +#: ../app/core/core-enums.c:1080 msgctxt "message-severity" msgid "Message" msgstr "Messaggio" -#: ../app/core/core-enums.c:1077 +#: ../app/core/core-enums.c:1081 msgctxt "message-severity" msgid "Warning" msgstr "Attenzione" -#: ../app/core/core-enums.c:1078 +#: ../app/core/core-enums.c:1082 msgctxt "message-severity" msgid "Error" msgstr "Errore" -#: ../app/core/core-enums.c:1079 +#: ../app/core/core-enums.c:1083 msgctxt "message-severity" msgid "WARNING" msgstr "ATTENZIONE" -#: ../app/core/core-enums.c:1080 +#: ../app/core/core-enums.c:1084 msgctxt "message-severity" msgid "CRITICAL" msgstr "CRITICITÀ" -#: ../app/core/core-enums.c:1109 +#: ../app/core/core-enums.c:1113 msgctxt "color-profile-policy" msgid "Ask what to do" msgstr "Domanda cosa fare" -#: ../app/core/core-enums.c:1110 +#: ../app/core/core-enums.c:1114 msgctxt "color-profile-policy" msgid "Keep embedded profile" msgstr "Mantieni il profilo incorporato" -#: ../app/core/core-enums.c:1111 +#: ../app/core/core-enums.c:1115 msgctxt "color-profile-policy" msgid "Convert to preferred RGB color profile" msgstr "Converte al profilo colore RGB preferito" -#: ../app/core/core-enums.c:1148 +#: ../app/core/core-enums.c:1152 msgctxt "dynamics-output-type" msgid "Opacity" msgstr "Opacità" -#: ../app/core/core-enums.c:1149 +#: ../app/core/core-enums.c:1153 msgctxt "dynamics-output-type" msgid "Size" msgstr "Dimensione" -#: ../app/core/core-enums.c:1150 +#: ../app/core/core-enums.c:1154 msgctxt "dynamics-output-type" msgid "Angle" msgstr "Angolo" -#: ../app/core/core-enums.c:1151 +#: ../app/core/core-enums.c:1155 msgctxt "dynamics-output-type" msgid "Color" msgstr "Colore" -#: ../app/core/core-enums.c:1152 +#: ../app/core/core-enums.c:1156 msgctxt "dynamics-output-type" msgid "Hardness" msgstr "Durezza" -#: ../app/core/core-enums.c:1153 +#: ../app/core/core-enums.c:1157 msgctxt "dynamics-output-type" msgid "Force" msgstr "Forza" -#: ../app/core/core-enums.c:1154 +#: ../app/core/core-enums.c:1158 msgctxt "dynamics-output-type" msgid "Aspect ratio" msgstr "Rapporto dimensioni" -#: ../app/core/core-enums.c:1155 +#: ../app/core/core-enums.c:1159 msgctxt "dynamics-output-type" msgid "Spacing" msgstr "Spaziatura" -#: ../app/core/core-enums.c:1156 +#: ../app/core/core-enums.c:1160 msgctxt "dynamics-output-type" msgid "Rate" msgstr "Frequenza" -#: ../app/core/core-enums.c:1157 +#: ../app/core/core-enums.c:1161 msgctxt "dynamics-output-type" msgid "Flow" msgstr "Flusso" -#: ../app/core/core-enums.c:1158 +#: ../app/core/core-enums.c:1162 msgctxt "dynamics-output-type" msgid "Jitter" msgstr "Tremolio" -#: ../app/core/core-enums.c:1186 +#: ../app/core/core-enums.c:1190 msgctxt "filter-region" msgid "Use the selection as input" msgstr "Usa la selezione come ingresso" -#: ../app/core/core-enums.c:1187 +#: ../app/core/core-enums.c:1191 msgctxt "filter-region" msgid "Use the entire layer as input" msgstr "Usa l'intero livello come ingresso" -#: ../app/core/core-enums.c:1216 +#: ../app/core/core-enums.c:1220 msgctxt "channel-border-style" msgid "Hard" msgstr "Netto" -#: ../app/core/core-enums.c:1217 +#: ../app/core/core-enums.c:1221 msgctxt "channel-border-style" msgid "Smooth" msgstr "Smussato" -#: ../app/core/core-enums.c:1218 +#: ../app/core/core-enums.c:1222 msgctxt "channel-border-style" msgid "Feathered" msgstr "Sfumato" @@ -11804,20 +12024,20 @@ msgid "Internal Procedures" msgstr "Procedure interne" #. initialize the global parasite table -#: ../app/core/gimp.c:781 +#: ../app/core/gimp.c:783 msgid "Looking for data files" msgstr "Inizializzazione" -#: ../app/core/gimp.c:781 +#: ../app/core/gimp.c:783 msgid "Parasites" msgstr "Parasites" -#: ../app/core/gimp.c:790 +#: ../app/core/gimp.c:792 msgid "Fonts (this may take a while)" msgstr "Caratteri (può metterci parecchio tempo)" #. initialize the module list -#: ../app/core/gimp.c:799 ../app/dialogs/preferences-dialog.c:3112 +#: ../app/core/gimp.c:801 ../app/dialogs/preferences-dialog.c:3132 msgid "Modules" msgstr "Moduli" @@ -11841,7 +12061,7 @@ msgstr "La cancellazione di \"%s\" è fallita: %s" #. initialize the list of gimp dynamics #: ../app/core/gimp-data-factories.c:322 ../app/core/gimpcontext.c:711 -#: ../app/dialogs/preferences-dialog.c:3076 +#: ../app/dialogs/preferences-dialog.c:3096 #: ../app/tools/gimppaintoptions-gui.c:225 msgid "Dynamics" msgstr "Dinamiche" @@ -11861,16 +12081,16 @@ msgctxt "undo-type" msgid "Cut Layer" msgstr "Taglia livello" -#: ../app/core/gimp-edit.c:291 ../app/core/gimpimage-new.c:325 +#: ../app/core/gimp-edit.c:313 ../app/core/gimpimage-new.c:325 msgid "Pasted Layer" msgstr "Livello incollato" -#: ../app/core/gimp-edit.c:708 +#: ../app/core/gimp-edit.c:724 msgctxt "undo-type" msgid "Clear" msgstr "Cancella" -#: ../app/core/gimp-edit.c:830 +#: ../app/core/gimp-edit.c:846 msgid "Global Buffer" msgstr "Buffer globale" @@ -11898,12 +12118,12 @@ msgstr "Da pp a sf (HSV orario)" msgid "FG to Transparent" msgstr "Da pp a trasparente" -#: ../app/core/gimp-spawn.c:176 +#: ../app/core/gimp-spawn.c:186 #, c-format msgid "Failed to fork (%s)" msgstr "Fork fallito (%s)" -#: ../app/core/gimp-spawn.c:213 +#: ../app/core/gimp-spawn.c:223 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Fallita l'esecuzione di un processo figlio “%s” (%s)" @@ -12073,7 +12293,7 @@ msgstr "" "Errore fatale di analisi file pennello: dati pennello compresso RLE " "danneggiati." -#: ../app/core/gimpbrush.c:150 ../app/paint/gimppaintoptions.c:213 +#: ../app/core/gimpbrush.c:150 ../app/paint/gimppaintoptions.c:215 msgid "Brush Spacing" msgstr "Spaziatura pennello" @@ -12117,15 +12337,15 @@ msgstr "Raggio pennello" msgid "Brush Spikes" msgstr "Punte pennello" -#: ../app/core/gimpbrushgenerated.c:157 ../app/paint/gimppaintoptions.c:220 +#: ../app/core/gimpbrushgenerated.c:157 ../app/paint/gimppaintoptions.c:222 msgid "Brush Hardness" msgstr "Durezza pennello" -#: ../app/core/gimpbrushgenerated.c:165 ../app/paint/gimppaintoptions.c:199 +#: ../app/core/gimpbrushgenerated.c:165 ../app/paint/gimppaintoptions.c:201 msgid "Brush Aspect Ratio" msgstr "Rapporto dimensioni pennello" -#: ../app/core/gimpbrushgenerated.c:172 ../app/paint/gimppaintoptions.c:206 +#: ../app/core/gimpbrushgenerated.c:172 ../app/paint/gimppaintoptions.c:208 msgid "Brush Angle" msgstr "Angolo pennello" @@ -12149,7 +12369,7 @@ msgctxt "undo-type" msgid "Rounded Rectangle Select" msgstr "Selezione rettangolare arrotondata" -#: ../app/core/gimpchannel-select.c:440 ../app/core/gimplayer.c:446 +#: ../app/core/gimpchannel-select.c:440 ../app/core/gimplayer.c:448 msgctxt "undo-type" msgid "Alpha to Selection" msgstr "Alfa a selezione" @@ -12220,7 +12440,7 @@ msgctxt "undo-type" msgid "Stroke Channel" msgstr "Delinea canale" -#: ../app/core/gimpchannel.c:279 ../app/core/gimpselection.c:654 +#: ../app/core/gimpchannel.c:279 msgctxt "undo-type" msgid "Channel to Selection" msgstr "Canale a selezione" @@ -12298,25 +12518,25 @@ msgctxt "undo-type" msgid "Flood Channel" msgstr "Allaga canale" -#: ../app/core/gimpchannel.c:818 +#: ../app/core/gimpchannel.c:850 msgid "Cannot fill empty channel." msgstr "Impossibile riempire un canale vuoto." -#: ../app/core/gimpchannel.c:854 +#: ../app/core/gimpchannel.c:886 msgid "Cannot stroke empty channel." msgstr "Impossibile delineare un canale vuoto." -#: ../app/core/gimpchannel.c:1677 +#: ../app/core/gimpchannel.c:1709 msgctxt "undo-type" msgid "Set Channel Color" msgstr "Imposta il colore del canale" -#: ../app/core/gimpchannel.c:1728 +#: ../app/core/gimpchannel.c:1760 msgctxt "undo-type" msgid "Set Channel Opacity" msgstr "Imposta opacità canale" -#: ../app/core/gimpchannel.c:1817 ../app/core/gimpselection.c:168 +#: ../app/core/gimpchannel.c:1849 ../app/core/gimpselection.c:168 msgid "Selection Mask" msgstr "Maschera di selezione" @@ -12338,7 +12558,7 @@ msgstr "Colore di sfondo" #: ../app/core/gimpcontext.c:687 ../app/core/gimpcontext.c:688 #: ../app/dialogs/fade-dialog.c:158 ../app/widgets/gimpbrushselect.c:175 -#: ../app/widgets/gimplayertreeview.c:286 +#: ../app/widgets/gimplayertreeview.c:295 msgid "Opacity" msgstr "Opacità" @@ -12366,7 +12586,9 @@ msgid "Pattern" msgstr "Motivo" #: ../app/core/gimpcontext.c:732 ../app/core/gimpcontext.c:733 -#: ../app/tools/gimpblendoptions.c:266 ../app/tools/gimppaintoptions-gui.c:374 +#: ../app/pdb/drawable-edit-cmds.c:248 ../app/pdb/edit-cmds.c:797 +#: ../app/tools/gimpgradientoptions.c:284 ../app/tools/gimpgradienttool.c:156 +#: ../app/tools/gimppaintoptions-gui.c:378 msgid "Gradient" msgstr "Gradiente" @@ -12470,20 +12692,11 @@ msgstr "" "\n" "%s" -#: ../app/core/gimpdrawable.c:469 +#: ../app/core/gimpdrawable.c:480 msgctxt "undo-type" msgid "Scale" msgstr "Scala" -#: ../app/core/gimpdrawable-blend.c:123 ../app/tools/gimpblendtool.c:965 -msgctxt "undo-type" -msgid "Blend" -msgstr "Sfumatura" - -#: ../app/core/gimpdrawable-blend.c:216 -msgid "Calculating distance map" -msgstr "Calcolo della mappa della distanza" - #: ../app/core/gimpdrawable-bucket-fill.c:180 msgctxt "undo-type" msgid "Bucket Fill" @@ -12511,6 +12724,15 @@ msgctxt "undo-type" msgid "Render Stroke" msgstr "Disegna il delineato" +#: ../app/core/gimpdrawable-gradient.c:127 ../app/tools/gimpgradienttool.c:1016 +msgctxt "undo-type" +msgid "Gradient" +msgstr "Gradiente" + +#: ../app/core/gimpdrawable-gradient.c:215 +msgid "Calculating distance map" +msgstr "Calcolo della mappa della distanza" + #: ../app/core/gimpdrawable-levels.c:72 #: ../app/tools/gimpforegroundselectoptions.c:116 #: ../app/tools/gimplevelstool.c:132 @@ -12537,7 +12759,7 @@ msgctxt "undo-type" msgid "Rotate" msgstr "Ruota" -#: ../app/core/gimpdrawable-transform.c:1011 ../app/core/gimplayer.c:445 +#: ../app/core/gimpdrawable-transform.c:1011 ../app/core/gimplayer.c:447 msgctxt "undo-type" msgid "Transform Layer" msgstr "Trasforma livello" @@ -12554,7 +12776,7 @@ msgstr "Tipo di uscita" msgid "Style" msgstr "Stile" -#: ../app/core/gimpfilloptions.c:111 ../app/pdb/gimppdbcontext.c:99 +#: ../app/core/gimpfilloptions.c:111 ../app/pdb/gimppdbcontext.c:100 #: ../app/tools/gimpbucketfilloptions.c:132 #: ../app/tools/gimpselectionoptions.c:80 ../app/tools/gimptextoptions.c:134 msgid "Antialiasing" @@ -12605,22 +12827,24 @@ msgstr "Stringa UTF-8 non valida in file gradiente '%s'." msgid "File is corrupt." msgstr "Il file è rovinato." -#: ../app/core/gimpgradient-load.c:195 ../app/core/gimpgradient-load.c:203 +#: ../app/core/gimpgradient-load.c:189 ../app/core/gimpgradient-load.c:199 +#: ../app/core/gimpgradient-load.c:211 ../app/core/gimpgradient-load.c:221 +#: ../app/core/gimpgradient-load.c:229 ../app/core/gimpgradient-load.c:237 #, c-format msgid "Corrupt segment %d." msgstr "Rovinato segmento %d." -#: ../app/core/gimpgradient-load.c:214 ../app/core/gimpgradient-load.c:224 +#: ../app/core/gimpgradient-load.c:248 ../app/core/gimpgradient-load.c:258 #, c-format msgid "Segments do not span the range 0-1." msgstr "I segmenti non coprono il campo 0-1." -#: ../app/core/gimpgradient-load.c:239 +#: ../app/core/gimpgradient-load.c:273 #, c-format msgid "In line %d of gradient file: " msgstr "Alla riga %d del file gradiente: " -#: ../app/core/gimpgradient-load.c:315 +#: ../app/core/gimpgradient-load.c:349 #, c-format msgid "No linear gradients found." msgstr "Non è stato trovato nessun gradiente lineare." @@ -12694,41 +12918,41 @@ msgstr "" msgid "Offset unit" msgstr "Unità scostamento" -#: ../app/core/gimpgrouplayer.c:275 +#: ../app/core/gimpgrouplayer.c:277 msgid "Layer Group" msgstr "Gruppo livelli" -#: ../app/core/gimpgrouplayer.c:276 +#: ../app/core/gimpgrouplayer.c:278 msgctxt "undo-type" msgid "Rename Layer Group" msgstr "Rinomina gruppo livelli" -#: ../app/core/gimpgrouplayer.c:277 +#: ../app/core/gimpgrouplayer.c:279 msgctxt "undo-type" msgid "Move Layer Group" msgstr "Sposta gruppo livelli" -#: ../app/core/gimpgrouplayer.c:278 +#: ../app/core/gimpgrouplayer.c:280 msgctxt "undo-type" msgid "Scale Layer Group" msgstr "Scala gruppo livelli" -#: ../app/core/gimpgrouplayer.c:279 +#: ../app/core/gimpgrouplayer.c:281 msgctxt "undo-type" msgid "Resize Layer Group" msgstr "Ridimensiona gruppo livelli" -#: ../app/core/gimpgrouplayer.c:280 +#: ../app/core/gimpgrouplayer.c:282 msgctxt "undo-type" msgid "Flip Layer Group" msgstr "Rifletti gruppo livelli" -#: ../app/core/gimpgrouplayer.c:281 +#: ../app/core/gimpgrouplayer.c:283 msgctxt "undo-type" msgid "Rotate Layer Group" msgstr "Ruota gruppo livelli" -#: ../app/core/gimpgrouplayer.c:282 +#: ../app/core/gimpgrouplayer.c:284 msgctxt "undo-type" msgid "Transform Layer Group" msgstr "Trasforma gruppo livelli" @@ -12737,29 +12961,29 @@ msgstr "Trasforma gruppo livelli" msgid "Symmetry" msgstr "Simmetria" -#: ../app/core/gimpimage.c:2216 +#: ../app/core/gimpimage.c:2223 msgid " (exported)" msgstr " (esportata)" -#: ../app/core/gimpimage.c:2220 +#: ../app/core/gimpimage.c:2227 msgid " (overwritten)" msgstr " (sovrascritta)" -#: ../app/core/gimpimage.c:2229 +#: ../app/core/gimpimage.c:2236 msgid " (imported)" msgstr " (importata)" -#: ../app/core/gimpimage.c:2557 +#: ../app/core/gimpimage.c:2564 msgctxt "undo-type" msgid "Change Image Resolution" msgstr "Cambia risoluzione immagine" -#: ../app/core/gimpimage.c:2609 +#: ../app/core/gimpimage.c:2616 msgctxt "undo-type" msgid "Change Image Unit" msgstr "Cambia unità immagine" -#: ../app/core/gimpimage.c:3493 +#: ../app/core/gimpimage.c:3500 #, c-format msgid "" "'gimp-comment' parasite validation failed: comment contains invalid UTF-8" @@ -12767,47 +12991,47 @@ msgstr "" "validazione parassita 'gimp-comment' fallita: il commento contiene UTF-8 non " "valido" -#: ../app/core/gimpimage.c:3545 +#: ../app/core/gimpimage.c:3552 msgctxt "undo-type" msgid "Attach Parasite to Image" msgstr "Allega parassita all'immagine" -#: ../app/core/gimpimage.c:3586 +#: ../app/core/gimpimage.c:3593 msgctxt "undo-type" msgid "Remove Parasite from Image" msgstr "Rimuovi parassita dall'immagine" -#: ../app/core/gimpimage.c:4297 +#: ../app/core/gimpimage.c:4304 msgctxt "undo-type" msgid "Add Layer" msgstr "Aggiungi livello" -#: ../app/core/gimpimage.c:4339 ../app/core/gimpimage.c:4370 +#: ../app/core/gimpimage.c:4346 ../app/core/gimpimage.c:4377 msgctxt "undo-type" msgid "Remove Layer" msgstr "Rimuovi livello" -#: ../app/core/gimpimage.c:4364 +#: ../app/core/gimpimage.c:4371 msgctxt "undo-type" msgid "Remove Floating Selection" msgstr "Rimuovi selezione fluttuante" -#: ../app/core/gimpimage.c:4531 +#: ../app/core/gimpimage.c:4538 msgctxt "undo-type" msgid "Add Channel" msgstr "Aggiungi canale" -#: ../app/core/gimpimage.c:4559 ../app/core/gimpimage.c:4583 +#: ../app/core/gimpimage.c:4566 ../app/core/gimpimage.c:4590 msgctxt "undo-type" msgid "Remove Channel" msgstr "Rimuovi canale" -#: ../app/core/gimpimage.c:4639 +#: ../app/core/gimpimage.c:4646 msgctxt "undo-type" msgid "Add Path" msgstr "Aggiungi tracciato" -#: ../app/core/gimpimage.c:4669 ../app/core/gimpimage.c:4676 +#: ../app/core/gimpimage.c:4676 ../app/core/gimpimage.c:4683 msgctxt "undo-type" msgid "Remove Path" msgstr "Rimuovi tracciato" @@ -12881,98 +13105,98 @@ msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "Aggiungi colore alla mappa colore" -#: ../app/core/gimpimage-convert-indexed.c:789 +#: ../app/core/gimpimage-convert-indexed.c:786 msgid "Cannot convert image: palette is empty." msgstr "Impossibile convertire l'immagine: la tavolozza è vuota." -#: ../app/core/gimpimage-convert-indexed.c:803 +#: ../app/core/gimpimage-convert-indexed.c:798 msgctxt "undo-type" msgid "Convert Image to Indexed" msgstr "Converti immagine in indicizzata" -#: ../app/core/gimpimage-convert-indexed.c:884 +#: ../app/core/gimpimage-convert-indexed.c:890 msgid "Converting to indexed colors (stage 2)" msgstr "Conversione in colori indicizzati (fase 2)" -#: ../app/core/gimpimage-convert-indexed.c:932 +#: ../app/core/gimpimage-convert-indexed.c:939 msgid "Converting to indexed colors (stage 3)" msgstr "Conversione in colori indicizzati (fase 3)" -#: ../app/core/gimpimage-convert-precision.c:83 +#: ../app/core/gimpimage-convert-precision.c:76 msgctxt "undo-type" msgid "Convert Image to 8 bit linear integer" msgstr "Converti immagine a 8 bit interi lineari" -#: ../app/core/gimpimage-convert-precision.c:86 +#: ../app/core/gimpimage-convert-precision.c:79 msgctxt "undo-type" msgid "Convert Image to 8 bit gamma integer" msgstr "Converti immagine a 8 bit interi gamma" -#: ../app/core/gimpimage-convert-precision.c:89 +#: ../app/core/gimpimage-convert-precision.c:82 msgctxt "undo-type" msgid "Convert Image to 16 bit linear integer" msgstr "Converti immagine a 16 bit interi lineari" -#: ../app/core/gimpimage-convert-precision.c:92 +#: ../app/core/gimpimage-convert-precision.c:85 msgctxt "undo-type" msgid "Convert Image to 16 bit gamma integer" msgstr "Converti immagine a 16 bit interi gamma" -#: ../app/core/gimpimage-convert-precision.c:95 +#: ../app/core/gimpimage-convert-precision.c:88 msgctxt "undo-type" msgid "Convert Image to 32 bit linear integer" msgstr "Converti immagine a 32 bit interi lineari" -#: ../app/core/gimpimage-convert-precision.c:98 +#: ../app/core/gimpimage-convert-precision.c:91 msgctxt "undo-type" msgid "Convert Image to 32 bit gamma integer" msgstr "Converti immagine a 32 bit interi gamma" -#: ../app/core/gimpimage-convert-precision.c:101 +#: ../app/core/gimpimage-convert-precision.c:94 msgctxt "undo-type" msgid "Convert Image to 16 bit linear floating point" msgstr "Converti l'immagine a 16 bit in virgola mobile lineari" -#: ../app/core/gimpimage-convert-precision.c:104 +#: ../app/core/gimpimage-convert-precision.c:97 msgctxt "undo-type" msgid "Convert Image to 16 bit gamma floating point" msgstr "Converti l'immagine a 16 bit in virgola mobile gamma" -#: ../app/core/gimpimage-convert-precision.c:107 +#: ../app/core/gimpimage-convert-precision.c:100 msgctxt "undo-type" msgid "Convert Image to 32 bit linear floating point" msgstr "Converti l'immagine a 32 bit in virgola mobile lineari" -#: ../app/core/gimpimage-convert-precision.c:110 +#: ../app/core/gimpimage-convert-precision.c:103 msgctxt "undo-type" msgid "Convert Image to 32 bit gamma floating point" msgstr "Converti l'immagine a 32 bit in virgola mobile gamma" -#: ../app/core/gimpimage-convert-precision.c:113 +#: ../app/core/gimpimage-convert-precision.c:106 msgctxt "undo-type" msgid "Convert Image to 64 bit linear floating point" msgstr "Converti l'immagine a 64 bit in virgola mobile lineari" -#: ../app/core/gimpimage-convert-precision.c:116 +#: ../app/core/gimpimage-convert-precision.c:109 msgctxt "undo-type" msgid "Convert Image to 64 bit gamma floating point" msgstr "Converti l'immagine a 64 bit in virgola mobile gamma" #. dithering -#: ../app/core/gimpimage-convert-precision.c:284 -#: ../app/core/gimpimage-convert-precision.c:298 +#: ../app/core/gimpimage-convert-precision.c:267 +#: ../app/core/gimpimage-convert-precision.c:288 #: ../app/dialogs/convert-indexed-dialog.c:236 #: ../app/dialogs/convert-precision-dialog.c:221 -#: ../app/tools/gimpblendoptions.c:124 +#: ../app/tools/gimpgradientoptions.c:136 msgid "Dithering" msgstr "Dithering" -#: ../app/core/gimpimage-convert-type.c:83 +#: ../app/core/gimpimage-convert-type.c:81 msgctxt "undo-type" msgid "Convert Image to RGB" msgstr "Converti immagine in RGB" -#: ../app/core/gimpimage-convert-type.c:87 +#: ../app/core/gimpimage-convert-type.c:85 msgctxt "undo-type" msgid "Convert Image to Grayscale" msgstr "Converti immagine in scala di grigi" @@ -12982,7 +13206,7 @@ msgctxt "undo-type" msgid "Crop Image" msgstr "Ritaglia immagine" -#: ../app/core/gimpimage-crop.c:75 ../app/core/gimpimage-resize.c:90 +#: ../app/core/gimpimage-crop.c:75 ../app/core/gimpimage-resize.c:91 msgctxt "undo-type" msgid "Resize Image" msgstr "Ridimensiona immagine" @@ -13007,22 +13231,22 @@ msgctxt "undo-type" msgid "Move Guide" msgstr "Sposta guida" -#: ../app/core/gimpimage-item-list.c:116 +#: ../app/core/gimpimage-item-list.c:117 msgctxt "undo-type" msgid "Translate Items" msgstr "Trasla gli elementi" -#: ../app/core/gimpimage-item-list.c:156 +#: ../app/core/gimpimage-item-list.c:157 msgctxt "undo-type" msgid "Flip Items" msgstr "Rifletti gli elementi" -#: ../app/core/gimpimage-item-list.c:195 ../app/core/gimpitem-linked.c:164 +#: ../app/core/gimpimage-item-list.c:196 ../app/core/gimpitem-linked.c:164 msgctxt "undo-type" msgid "Rotate Items" msgstr "Routa gli elementi" -#: ../app/core/gimpimage-item-list.c:236 +#: ../app/core/gimpimage-item-list.c:246 msgctxt "undo-type" msgid "Transform Items" msgstr "Trasforma gli elementi" @@ -13082,12 +13306,12 @@ msgstr "" "Non ci sono abbastanza tracciati visibili da fondere. Ce ne devono essere " "almeno due." -#: ../app/core/gimpimage-quick-mask.c:89 +#: ../app/core/gimpimage-quick-mask.c:88 msgctxt "undo-type" msgid "Enable Quick Mask" msgstr "Abilita maschera veloce" -#: ../app/core/gimpimage-quick-mask.c:121 +#: ../app/core/gimpimage-quick-mask.c:120 msgctxt "undo-type" msgid "Disable Quick Mask" msgstr "Disabilita maschera veloce" @@ -13107,18 +13331,18 @@ msgctxt "undo-type" msgid "Move Sample Point" msgstr "Sposta punto di campionamento" -#: ../app/core/gimpimage-scale.c:86 +#: ../app/core/gimpimage-scale.c:79 msgctxt "undo-type" msgid "Scale Image" msgstr "Scala immagine" -#: ../app/core/gimpimage-undo-push.c:996 +#: ../app/core/gimpimage-undo-push.c:1028 #, c-format msgid "Can't undo %s" msgstr "Impossibile annullare %s" -#: ../app/core/gimpimagefile.c:750 ../app/dialogs/preferences-dialog.c:1838 -#: ../app/dialogs/preferences-dialog.c:1944 +#: ../app/core/gimpimagefile.c:750 ../app/dialogs/preferences-dialog.c:1842 +#: ../app/dialogs/preferences-dialog.c:1948 msgid "Folder" msgstr "Cartella" @@ -13171,17 +13395,17 @@ msgstr[1] "%d livelli" msgid "Could not open thumbnail '%s': %s" msgstr "Impossibile aprire la miniatura '%s': %s." -#: ../app/core/gimpitem.c:2022 +#: ../app/core/gimpitem.c:2075 msgctxt "undo-type" msgid "Attach Parasite" msgstr "Allega parassita" -#: ../app/core/gimpitem.c:2032 +#: ../app/core/gimpitem.c:2085 msgctxt "undo-type" msgid "Attach Parasite to Item" msgstr "Allega parassita all'elemento" -#: ../app/core/gimpitem.c:2083 ../app/core/gimpitem.c:2090 +#: ../app/core/gimpitem.c:2136 ../app/core/gimpitem.c:2143 msgctxt "undo-type" msgid "Remove Parasite from Item" msgstr "Rimuovi parassita dall'elemento" @@ -13199,7 +13423,7 @@ msgctxt "undo-type" msgid "Anchor Floating Selection" msgstr "Àncora selezione fluttuante" -#: ../app/core/gimplayer-floating-selection.c:175 ../app/core/gimplayer.c:1035 +#: ../app/core/gimplayer-floating-selection.c:175 ../app/core/gimplayer.c:1037 msgid "" "Cannot create a new layer from the floating selection because it belongs to " "a layer mask or channel." @@ -13212,76 +13436,76 @@ msgctxt "undo-type" msgid "Floating Selection to Layer" msgstr "Selezione fluttuante al livello" -#: ../app/core/gimplayer.c:439 +#: ../app/core/gimplayer.c:441 msgctxt "undo-type" msgid "Rename Layer" msgstr "Rinomina livello" -#: ../app/core/gimplayer.c:440 +#: ../app/core/gimplayer.c:442 msgctxt "undo-type" msgid "Move Layer" msgstr "Sposta livello" -#: ../app/core/gimplayer.c:441 +#: ../app/core/gimplayer.c:443 msgctxt "undo-type" msgid "Scale Layer" msgstr "Scala livello" -#: ../app/core/gimplayer.c:442 +#: ../app/core/gimplayer.c:444 msgctxt "undo-type" msgid "Resize Layer" msgstr "Ridimensiona Livello" -#: ../app/core/gimplayer.c:443 +#: ../app/core/gimplayer.c:445 msgctxt "undo-type" msgid "Flip Layer" msgstr "Rifletti livello" -#: ../app/core/gimplayer.c:444 +#: ../app/core/gimplayer.c:446 msgctxt "undo-type" msgid "Rotate Layer" msgstr "Ruota livello" -#: ../app/core/gimplayer.c:447 +#: ../app/core/gimplayer.c:449 msgctxt "undo-type" msgid "Reorder Layer" msgstr "Ordina il livello" -#: ../app/core/gimplayer.c:448 +#: ../app/core/gimplayer.c:450 msgctxt "undo-type" msgid "Raise Layer" msgstr "Alza il livello" -#: ../app/core/gimplayer.c:449 +#: ../app/core/gimplayer.c:451 msgctxt "undo-type" msgid "Raise Layer to Top" msgstr "Alza il livello fino in cima" -#: ../app/core/gimplayer.c:450 +#: ../app/core/gimplayer.c:452 msgctxt "undo-type" msgid "Lower Layer" msgstr "Abbassa il livello" -#: ../app/core/gimplayer.c:451 +#: ../app/core/gimplayer.c:453 msgctxt "undo-type" msgid "Lower Layer to Bottom" msgstr "Abbassa il livello fino in fondo" -#: ../app/core/gimplayer.c:452 +#: ../app/core/gimplayer.c:454 msgid "Layer cannot be raised higher." msgstr "Il livello non può essere alzato ulteriormente." -#: ../app/core/gimplayer.c:453 +#: ../app/core/gimplayer.c:455 msgid "Layer cannot be lowered more." msgstr "Il livello non può essere abbassato ulteriormente." -#: ../app/core/gimplayer.c:742 ../app/core/gimplayer.c:1812 +#: ../app/core/gimplayer.c:744 ../app/core/gimplayer.c:1905 #: ../app/core/gimplayermask.c:257 #, c-format msgid "%s mask" msgstr "%s maschera" -#: ../app/core/gimplayer.c:781 +#: ../app/core/gimplayer.c:783 #, c-format msgid "" "Floating Selection\n" @@ -13290,64 +13514,64 @@ msgstr "" "Selezione fluttuante\n" "(%s)" -#: ../app/core/gimplayer.c:1718 +#: ../app/core/gimplayer.c:1811 msgid "Unable to add a layer mask since the layer already has one." msgstr "" "Impossibile aggiungere una maschera di livello dato che il livello ne ha già " "una." -#: ../app/core/gimplayer.c:1729 +#: ../app/core/gimplayer.c:1822 msgid "Cannot add layer mask of different dimensions than specified layer." msgstr "" "Impossibile aggiungere maschera livello con dimensioni diverse dal livello " "specificato." -#: ../app/core/gimplayer.c:1735 +#: ../app/core/gimplayer.c:1828 msgctxt "undo-type" msgid "Add Layer Mask" msgstr "Aggiungi maschera di livello" -#: ../app/core/gimplayer.c:1863 +#: ../app/core/gimplayer.c:1956 msgctxt "undo-type" msgid "Transfer Alpha to Mask" msgstr "Trasferimento alfa su maschera" -#: ../app/core/gimplayer.c:2019 +#: ../app/core/gimplayer.c:2112 msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "Applica maschera di livello" -#: ../app/core/gimplayer.c:2020 +#: ../app/core/gimplayer.c:2113 msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "Elimina maschera di livello" -#: ../app/core/gimplayer.c:2122 +#: ../app/core/gimplayer.c:2215 msgctxt "undo-type" msgid "Enable Layer Mask" msgstr "Abilita maschera di livello" -#: ../app/core/gimplayer.c:2123 +#: ../app/core/gimplayer.c:2216 msgctxt "undo-type" msgid "Disable Layer Mask" msgstr "Disabilita maschera di livello" -#: ../app/core/gimplayer.c:2199 +#: ../app/core/gimplayer.c:2292 msgctxt "undo-type" msgid "Show Layer Mask" msgstr "Mostra maschera di livello" -#: ../app/core/gimplayer.c:2272 +#: ../app/core/gimplayer.c:2365 msgctxt "undo-type" msgid "Add Alpha Channel" msgstr "Aggiungi canale alfa" -#: ../app/core/gimplayer.c:2307 +#: ../app/core/gimplayer.c:2400 msgctxt "undo-type" msgid "Remove Alpha Channel" msgstr "Rimuovi canale alfa" -#: ../app/core/gimplayer.c:2328 +#: ../app/core/gimplayer.c:2421 msgctxt "undo-type" msgid "Layer to Image Size" msgstr "Livello a dimensione immagine" @@ -13379,17 +13603,17 @@ msgstr "Fallita deserializzazione pennello MyPaint." #. TRANSLATORS: the "%s" is an item title and "%u" is the number of #. occurrences for this item. -#: ../app/core/gimppalette-import.c:210 +#: ../app/core/gimppalette-import.c:212 #, c-format msgid "%s (occurs %u)" msgstr "%s (%u ricorrenze)" -#: ../app/core/gimppalette-import.c:423 +#: ../app/core/gimppalette-import.c:425 #, c-format msgid "Index %d" msgstr "Indice %d" -#: ../app/core/gimppalette-import.c:545 +#: ../app/core/gimppalette-import.c:547 #, c-format msgid "Unknown type of palette file: %s" msgstr "Tipo file tavolozza sconosciuto: %s" @@ -13568,22 +13792,22 @@ msgstr "Nessuna selezione da riempire." msgid "There is no selection to stroke." msgstr "Nessuna selezione da disegnare." -#: ../app/core/gimpselection.c:749 +#: ../app/core/gimpselection.c:696 msgid "Unable to cut or copy because the selected region is empty." msgstr "" "Non è possibile a tagliare o copiare perché la regione selezionata è vuota." -#: ../app/core/gimpselection.c:867 +#: ../app/core/gimpselection.c:814 msgid "Cannot float selection because the selected region is empty." msgstr "" "Non è possibile la selezione fluttuante perché la regione selezionata è vuota" -#: ../app/core/gimpselection.c:874 +#: ../app/core/gimpselection.c:821 msgctxt "undo-type" msgid "Float Selection" msgstr "Selezione fluttuante" -#: ../app/core/gimpselection.c:892 +#: ../app/core/gimpselection.c:839 msgid "Floated Layer" msgstr "Livello fluttuante" @@ -13635,16 +13859,16 @@ msgid "Emulate brush dynamics" msgstr "Emula le dinamiche del pennello" #. no undo (or redo) steps available -#: ../app/core/gimpsymmetry.c:132 ../app/widgets/gimpimagepropview.c:399 +#: ../app/core/gimpsymmetry.c:134 ../app/widgets/gimpimagepropview.c:399 #: ../app/widgets/gimpsymmetryeditor.c:169 msgid "None" msgstr "Nessuna" -#: ../app/core/gimpsymmetry.c:145 +#: ../app/core/gimpsymmetry.c:148 msgid "Active" msgstr "Attiva" -#: ../app/core/gimpsymmetry.c:146 +#: ../app/core/gimpsymmetry.c:149 msgid "Activate symmetry painting" msgstr "Attiva disegno simmetrico" @@ -14047,7 +14271,7 @@ msgid "Select Soft-Proof Profile" msgstr "Seleziona il profilo del softproof" #: ../app/dialogs/color-profile-dialog.c:209 -#: ../app/tools/gimpforegroundselecttool.c:308 +#: ../app/tools/gimpforegroundselecttool.c:314 msgid "_Select" msgstr "_Seleziona" @@ -14142,7 +14366,7 @@ msgid "Enable dithering of _transparency" msgstr "Abilita dithering della _trasparenza" #: ../app/dialogs/convert-indexed-dialog.c:275 -#: ../app/dialogs/preferences-dialog.c:2163 +#: ../app/dialogs/preferences-dialog.c:2167 msgid "Enable dithering of text layers" msgstr "Abilita il dithering dei livelli di testo" @@ -14287,7 +14511,7 @@ msgstr "Dissol_venza" #: ../app/dialogs/fade-dialog.c:151 #: ../app/operations/gimpoperationdesaturate.c:90 #: ../app/tools/gimppaintoptions-gui.c:119 ../app/widgets/gimpdeviceinfo.c:132 -#: ../app/widgets/gimplayertreeview.c:270 +#: ../app/widgets/gimplayertreeview.c:279 msgid "Mode" msgstr "Modalità" @@ -14430,7 +14654,7 @@ msgid "Create a New Image" msgstr "Crea una nuova immagine" #: ../app/dialogs/image-new-dialog.c:138 -#: ../app/dialogs/preferences-dialog.c:1664 +#: ../app/dialogs/preferences-dialog.c:1668 msgid "_Template:" msgstr "_Modelli:" @@ -14462,9 +14686,9 @@ msgstr "Proprietà dell'immagine" #: ../app/dialogs/image-properties-dialog.c:68 #: ../app/dialogs/input-devices-dialog.c:62 #: ../app/dialogs/keyboard-shortcuts-dialog.c:55 -#: ../app/dialogs/module-dialog.c:134 ../app/tools/gimpblendtool-editor.c:1851 -#: ../app/tools/gimpcolorpickertool.c:349 ../app/tools/gimpmeasuretool.c:651 -#: ../app/widgets/gimpcontrollerlist.c:640 +#: ../app/dialogs/module-dialog.c:134 ../app/tools/gimpcolorpickertool.c:349 +#: ../app/tools/gimpgradienttool-editor.c:1854 +#: ../app/tools/gimpmeasuretool.c:651 ../app/widgets/gimpcontrollerlist.c:640 #: ../app/widgets/gimpcriticaldialog.c:97 ../app/widgets/gimppdbdialog.c:175 #: ../app/widgets/gimpsettingsbox.c:663 ../app/widgets/gimptexteditor.c:162 msgid "_Close" @@ -14746,7 +14970,7 @@ msgstr "Spostamento canale" #. The offset frame #: ../app/dialogs/offset-dialog.c:129 ../app/dialogs/offset-dialog.c:163 #: ../app/dialogs/resize-dialog.c:230 ../app/tools/gimpalignoptions.c:100 -#: ../app/tools/gimpalignoptions.c:107 ../app/tools/gimpblendoptions.c:84 +#: ../app/tools/gimpalignoptions.c:107 ../app/tools/gimpgradientoptions.c:89 #: ../app/widgets/gimpgrideditor.c:209 msgid "Offset" msgstr "Scostamento" @@ -14799,7 +15023,7 @@ msgid "Select Source" msgstr "Seleziona sorgente" #: ../app/dialogs/palette-import-dialog.c:212 -#: ../app/dialogs/preferences-dialog.c:1626 +#: ../app/dialogs/preferences-dialog.c:1630 msgid "_Gradient" msgstr "_Gradiente" @@ -14851,7 +15075,7 @@ msgstr "I_ntervallo:" #. The "Preview" frame #: ../app/dialogs/palette-import-dialog.c:360 -#: ../app/tools/gimpforegroundselecttool.c:1214 +#: ../app/tools/gimpforegroundselecttool.c:1223 msgid "Preview" msgstr "Anteprima" @@ -14876,7 +15100,7 @@ msgid "You will have to restart GIMP for the following changes to take effect:" msgstr "" "È necessario riavviare GIMP affinché i seguenti cambiamenti abbiano effetto:" -#: ../app/dialogs/preferences-dialog.c:615 +#: ../app/dialogs/preferences-dialog.c:619 msgid "" "Your keyboard shortcuts will be reset to default values the next time you " "start GIMP." @@ -14884,15 +15108,15 @@ msgstr "" "I tasti scorciatoia saranno reimpostati ai valori predefiniti al prossimo " "riavvio di GIMP." -#: ../app/dialogs/preferences-dialog.c:626 +#: ../app/dialogs/preferences-dialog.c:630 msgid "Remove all Keyboard Shortcuts" msgstr "Rimuovere tutti i tasti scorciatoia" -#: ../app/dialogs/preferences-dialog.c:648 +#: ../app/dialogs/preferences-dialog.c:652 msgid "Do you really want to remove all keyboard shortcuts from all menus?" msgstr "Sicuri di voler rimuovere tutti i tasti scorciatoia da tutti i menu?" -#: ../app/dialogs/preferences-dialog.c:689 +#: ../app/dialogs/preferences-dialog.c:693 msgid "" "Your window setup will be reset to default values the next time you start " "GIMP." @@ -14900,7 +15124,7 @@ msgstr "" "Le impostazioni della finestra saranno reimpostate ai valori predefiniti al " "prossimo riavvio di GIMP." -#: ../app/dialogs/preferences-dialog.c:724 +#: ../app/dialogs/preferences-dialog.c:728 msgid "" "Your input device settings will be reset to default values the next time you " "start GIMP." @@ -14908,7 +15132,7 @@ msgstr "" "Le impostazioni dei dispositivi di ingresso saranno reimpostate ai valori " "predefiniti al prossimo riavvio di GIMP." -#: ../app/dialogs/preferences-dialog.c:766 +#: ../app/dialogs/preferences-dialog.c:770 msgid "" "Your tool options will be reset to default values the next time you start " "GIMP." @@ -14916,110 +15140,110 @@ msgstr "" "Le opzioni degli strumenti saranno reimpostate ai valori predefiniti al " "prossimo riavvio di GIMP." -#: ../app/dialogs/preferences-dialog.c:818 -#: ../app/dialogs/preferences-dialog.c:2436 +#: ../app/dialogs/preferences-dialog.c:822 +#: ../app/dialogs/preferences-dialog.c:2456 msgid "There's a local installation of the user manual." msgstr "Non c'è alcuna installazione locale del manuale utente." -#: ../app/dialogs/preferences-dialog.c:823 -#: ../app/dialogs/preferences-dialog.c:2442 +#: ../app/dialogs/preferences-dialog.c:827 +#: ../app/dialogs/preferences-dialog.c:2462 msgid "The user manual is not installed locally." msgstr "Il manuale utente non è stato installato localmente." -#: ../app/dialogs/preferences-dialog.c:930 +#: ../app/dialogs/preferences-dialog.c:934 msgid "Show _menubar" msgstr "Mostra barra dei _menu" -#: ../app/dialogs/preferences-dialog.c:934 +#: ../app/dialogs/preferences-dialog.c:938 msgid "Show _rulers" msgstr "Mostra _righelli" -#: ../app/dialogs/preferences-dialog.c:937 +#: ../app/dialogs/preferences-dialog.c:941 msgid "Show scroll_bars" msgstr "Mostra _barre di scorrimento" -#: ../app/dialogs/preferences-dialog.c:940 +#: ../app/dialogs/preferences-dialog.c:944 msgid "Show s_tatusbar" msgstr "Mostra barra di s_tato" -#: ../app/dialogs/preferences-dialog.c:948 +#: ../app/dialogs/preferences-dialog.c:952 msgid "Show s_election" msgstr "Mostra s_elezione" -#: ../app/dialogs/preferences-dialog.c:951 +#: ../app/dialogs/preferences-dialog.c:955 msgid "Show _layer boundary" msgstr "Mostra margini del _livello" -#: ../app/dialogs/preferences-dialog.c:954 +#: ../app/dialogs/preferences-dialog.c:958 msgid "Show _guides" msgstr "Mostra le _guide" -#: ../app/dialogs/preferences-dialog.c:957 +#: ../app/dialogs/preferences-dialog.c:961 msgid "Show gri_d" msgstr "Mostra la grig_lia" -#: ../app/dialogs/preferences-dialog.c:963 +#: ../app/dialogs/preferences-dialog.c:967 msgid "Canvas _padding mode:" msgstr "Modalità riempimento su_perficie:" -#: ../app/dialogs/preferences-dialog.c:968 +#: ../app/dialogs/preferences-dialog.c:972 msgid "Custom p_adding color:" msgstr "Colore person_alizzato di riempimento:" -#: ../app/dialogs/preferences-dialog.c:969 +#: ../app/dialogs/preferences-dialog.c:973 msgid "Select Custom Canvas Padding Color" msgstr "Imposta colore personalizzato di riempimento superficie" -#: ../app/dialogs/preferences-dialog.c:999 +#: ../app/dialogs/preferences-dialog.c:1003 msgid "Snap to Guides" msgstr "Guide magnetiche" -#: ../app/dialogs/preferences-dialog.c:1002 +#: ../app/dialogs/preferences-dialog.c:1006 msgid "Snap to Grid" msgstr "Griglia magnetica" -#: ../app/dialogs/preferences-dialog.c:1010 +#: ../app/dialogs/preferences-dialog.c:1014 msgid "Snap to Canvas Edges" msgstr "Bordi della superficie magnetici" -#: ../app/dialogs/preferences-dialog.c:1013 +#: ../app/dialogs/preferences-dialog.c:1017 msgid "Snap to Active Path" msgstr "Tracciato attivo magnetico" -#: ../app/dialogs/preferences-dialog.c:1090 +#: ../app/dialogs/preferences-dialog.c:1094 msgid "Preferences" msgstr "Preferenze" -#: ../app/dialogs/preferences-dialog.c:1126 -#: ../app/dialogs/preferences-dialog.c:1127 +#: ../app/dialogs/preferences-dialog.c:1130 +#: ../app/dialogs/preferences-dialog.c:1131 msgid "System Resources" msgstr "Risorse di sistema" -#: ../app/dialogs/preferences-dialog.c:1134 +#: ../app/dialogs/preferences-dialog.c:1138 msgid "Resource Consumption" msgstr "Gestione risorse" -#: ../app/dialogs/preferences-dialog.c:1144 +#: ../app/dialogs/preferences-dialog.c:1148 msgid "Minimal number of _undo levels:" msgstr "Numero minimo di ann_ullamenti:" -#: ../app/dialogs/preferences-dialog.c:1147 +#: ../app/dialogs/preferences-dialog.c:1151 msgid "Maximum undo _memory:" msgstr "_Memoria massima annullamenti:" -#: ../app/dialogs/preferences-dialog.c:1150 +#: ../app/dialogs/preferences-dialog.c:1154 msgid "Tile cache _size:" msgstr "Dimen_sione cache riquadri:" -#: ../app/dialogs/preferences-dialog.c:1153 +#: ../app/dialogs/preferences-dialog.c:1157 msgid "Maximum _new image size:" msgstr "Dimensione massima _nuova immagine:" -#: ../app/dialogs/preferences-dialog.c:1158 +#: ../app/dialogs/preferences-dialog.c:1162 msgid "Number of _threads to use:" msgstr "Numero di _thread da usare:" -#: ../app/dialogs/preferences-dialog.c:1163 +#: ../app/dialogs/preferences-dialog.c:1167 msgid "" "Threading support is not yet stable.\n" "Setting this to greater than one might\n" @@ -15030,40 +15254,40 @@ msgstr "" "comportare errori nelle immagini o blocchi del programma." #. Hardware Acceleration -#: ../app/dialogs/preferences-dialog.c:1173 +#: ../app/dialogs/preferences-dialog.c:1177 msgid "Hardware Acceleration" msgstr "Accelerazione hardware" -#: ../app/dialogs/preferences-dialog.c:1177 +#: ../app/dialogs/preferences-dialog.c:1181 msgid "Use OpenCL" msgstr "Usa OpenCL" #. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1181 +#: ../app/dialogs/preferences-dialog.c:1185 msgid "Image Thumbnails" msgstr "Miniature immagini" -#: ../app/dialogs/preferences-dialog.c:1186 +#: ../app/dialogs/preferences-dialog.c:1190 msgid "Size of _thumbnails:" msgstr "Dimen_sione delle miniature:" -#: ../app/dialogs/preferences-dialog.c:1190 +#: ../app/dialogs/preferences-dialog.c:1194 msgid "Maximum _filesize for thumbnailing:" msgstr "Massima dimensione _file per le miniature:" -#: ../app/dialogs/preferences-dialog.c:1200 +#: ../app/dialogs/preferences-dialog.c:1204 msgid "Keep record of used files in the Recent Documents list" msgstr "" "Mantenere la registrazione dei file usati recentemente nella cronologia dei " "documenti" #. TODO: icon needed. -#: ../app/dialogs/preferences-dialog.c:1215 -#: ../app/dialogs/preferences-dialog.c:1216 +#: ../app/dialogs/preferences-dialog.c:1219 +#: ../app/dialogs/preferences-dialog.c:1220 msgid "Debugging" msgstr "Debugging" -#: ../app/dialogs/preferences-dialog.c:1223 +#: ../app/dialogs/preferences-dialog.c:1227 msgid "" "We hope you will never need these settings, but as all software, GIMP has " "bugs, and crashes can occur. If it happens, you can help us by reporting " @@ -15073,21 +15297,21 @@ msgstr "" "GIMP ha dei difetti o bug, e i blocchi (crash) possono succedere. Quando " "questo accade, puoi dare una mano facendo rapporto sui bug." -#: ../app/dialogs/preferences-dialog.c:1232 +#: ../app/dialogs/preferences-dialog.c:1236 msgid "Bug Reporting" msgstr "Fare rapporto bug" -#: ../app/dialogs/preferences-dialog.c:1239 -msgid "Try generating debug data for bug reporting when appropriate" -msgstr "Prova a generare i dati di debug per il rapporto bug quando è il caso" +#: ../app/dialogs/preferences-dialog.c:1243 +msgid "Debug _policy:" +msgstr "_Politica del debug:" -#: ../app/dialogs/preferences-dialog.c:1251 +#: ../app/dialogs/preferences-dialog.c:1255 msgid "This feature requires \"gdb\" or \"lldb\" installed on your system." msgstr "" "Questa funzione richiede che \"gdb\" o \"lldb\" siano installati sul proprio " "sistema." -#: ../app/dialogs/preferences-dialog.c:1255 +#: ../app/dialogs/preferences-dialog.c:1259 msgid "" "This feature is more efficient with \"gdb\" or \"lldb\" installed on your " "system." @@ -15095,704 +15319,714 @@ msgstr "" "Questa funzione è più efficiente con \"gdb\" o \"lldb\" installati sul " "proprio sistema." -#: ../app/dialogs/preferences-dialog.c:1268 -#: ../app/dialogs/preferences-dialog.c:1269 +#: ../app/dialogs/preferences-dialog.c:1272 +#: ../app/dialogs/preferences-dialog.c:1273 msgid "Color Management" msgstr "Gestione del colore" -#: ../app/dialogs/preferences-dialog.c:1278 +#: ../app/dialogs/preferences-dialog.c:1282 msgid "Reset Color Management" msgstr "Reimposta la gestione del colore" -#: ../app/dialogs/preferences-dialog.c:1301 +#: ../app/dialogs/preferences-dialog.c:1305 msgid "Image display _mode:" msgstr "_Modalità visualizzazione immagine:" #. Color Managed Display -#: ../app/dialogs/preferences-dialog.c:1305 +#: ../app/dialogs/preferences-dialog.c:1309 msgid "Color Managed Display" msgstr "Visualizzazione con gestione del colore" -#: ../app/dialogs/preferences-dialog.c:1314 +#: ../app/dialogs/preferences-dialog.c:1318 msgid "Select Monitor Color Profile" msgstr "Seleziona il profilo colore del monitor" -#: ../app/dialogs/preferences-dialog.c:1315 +#: ../app/dialogs/preferences-dialog.c:1319 msgid "_Monitor profile:" msgstr "Profilo _monitor:" -#: ../app/dialogs/preferences-dialog.c:1321 +#: ../app/dialogs/preferences-dialog.c:1325 msgid "_Try to use the system monitor profile" msgstr "_Prova ad usare il profilo monitor del sistema" -#: ../app/dialogs/preferences-dialog.c:1330 +#: ../app/dialogs/preferences-dialog.c:1334 msgid "_Rendering intent:" msgstr "Intento di _rendering:" -#: ../app/dialogs/preferences-dialog.c:1335 +#: ../app/dialogs/preferences-dialog.c:1339 msgid "Use _black point compensation" msgstr "Usa la compensazione del punto _nero" -#: ../app/dialogs/preferences-dialog.c:1343 -#: ../app/dialogs/preferences-dialog.c:1379 ../app/paint/gimpinkoptions.c:93 +#: ../app/dialogs/preferences-dialog.c:1347 +#: ../app/dialogs/preferences-dialog.c:1383 ../app/paint/gimpinkoptions.c:93 msgid "Speed" msgstr "Velocità" -#: ../app/dialogs/preferences-dialog.c:1344 -#: ../app/dialogs/preferences-dialog.c:1380 +#: ../app/dialogs/preferences-dialog.c:1348 +#: ../app/dialogs/preferences-dialog.c:1384 msgid "Precision / Color Fidelity" msgstr "Precisione / Fedeltà del colore" -#: ../app/dialogs/preferences-dialog.c:1345 +#: ../app/dialogs/preferences-dialog.c:1349 msgid "_Optimize image display for:" msgstr "_Ottimizza la visualizzazione immagine per:" #. Print Simulation (Soft-proofing) -#: ../app/dialogs/preferences-dialog.c:1349 +#: ../app/dialogs/preferences-dialog.c:1353 msgid "Soft-Proofing" msgstr "Softproof" -#: ../app/dialogs/preferences-dialog.c:1359 +#: ../app/dialogs/preferences-dialog.c:1363 msgid "Select Soft-Proofing Color Profile" msgstr "Seleziona il profilo colore del softproof" -#: ../app/dialogs/preferences-dialog.c:1360 +#: ../app/dialogs/preferences-dialog.c:1364 msgid "_Soft-proofing profile:" msgstr "Profilo _softproof:" -#: ../app/dialogs/preferences-dialog.c:1366 +#: ../app/dialogs/preferences-dialog.c:1370 msgid "Re_ndering intent:" msgstr "Intento di re_ndering:" -#: ../app/dialogs/preferences-dialog.c:1371 +#: ../app/dialogs/preferences-dialog.c:1375 msgid "Use black _point compensation" msgstr "Usa compensazione del _punto nero" -#: ../app/dialogs/preferences-dialog.c:1381 +#: ../app/dialogs/preferences-dialog.c:1385 msgid "O_ptimize soft-proofing for:" msgstr "Ottimizza il soft_proof per:" -#: ../app/dialogs/preferences-dialog.c:1390 +#: ../app/dialogs/preferences-dialog.c:1394 msgid "Mark out of gamut colors" msgstr "Evidenzia i colori fuori gamut" -#: ../app/dialogs/preferences-dialog.c:1395 +#: ../app/dialogs/preferences-dialog.c:1399 msgid "Select Warning Color" msgstr "Selezione colore di avvertimento" #. Preferred profiles -#: ../app/dialogs/preferences-dialog.c:1406 +#: ../app/dialogs/preferences-dialog.c:1410 msgid "Preferred Profiles" msgstr "Profili preferiti" -#: ../app/dialogs/preferences-dialog.c:1415 +#: ../app/dialogs/preferences-dialog.c:1419 msgid "Select Preferred RGB Color Profile" msgstr "Seleziona il profilo colore RGB preferito" -#: ../app/dialogs/preferences-dialog.c:1416 +#: ../app/dialogs/preferences-dialog.c:1420 msgid "_RGB profile:" msgstr "Profilo _RGB:" -#: ../app/dialogs/preferences-dialog.c:1423 +#: ../app/dialogs/preferences-dialog.c:1427 msgid "Select Preferred Grayscale Color Profile" msgstr "Seleziona il profilo colore scala di grigi preferito" -#: ../app/dialogs/preferences-dialog.c:1424 +#: ../app/dialogs/preferences-dialog.c:1428 msgid "_Grayscale profile:" msgstr "Profilo scala di _grigi:" -#: ../app/dialogs/preferences-dialog.c:1431 +#: ../app/dialogs/preferences-dialog.c:1435 msgid "Select CMYK Color Profile" msgstr "Seleziona il profilo colore CMYK" -#: ../app/dialogs/preferences-dialog.c:1432 +#: ../app/dialogs/preferences-dialog.c:1436 msgid "_CMYK profile:" msgstr "Profilo _CMYK:" #. Policies -#: ../app/dialogs/preferences-dialog.c:1437 +#: ../app/dialogs/preferences-dialog.c:1441 msgid "Policies" msgstr "Politiche" -#: ../app/dialogs/preferences-dialog.c:1442 +#: ../app/dialogs/preferences-dialog.c:1446 msgid "File Open behaviour:" msgstr "Comportamento apertura file:" #. Filter Dialogs -#: ../app/dialogs/preferences-dialog.c:1446 +#: ../app/dialogs/preferences-dialog.c:1450 +#: ../app/dialogs/preferences-dialog.c:2171 msgid "Filter Dialogs" msgstr "Finestre di dialogo filtri" -#: ../app/dialogs/preferences-dialog.c:1450 +#: ../app/dialogs/preferences-dialog.c:1454 +#: ../app/dialogs/preferences-dialog.c:2183 msgid "Show advanced color options" msgstr "Mostra opzioni colore avanzate" -#: ../app/dialogs/preferences-dialog.c:1464 -#: ../app/dialogs/preferences-dialog.c:1465 +#: ../app/dialogs/preferences-dialog.c:1468 +#: ../app/dialogs/preferences-dialog.c:1469 msgid "Image Import & Export" msgstr "Importazione e esportazione immagine" #. Import Policies -#: ../app/dialogs/preferences-dialog.c:1471 +#: ../app/dialogs/preferences-dialog.c:1475 msgid "Import Policies" msgstr "Politiche di importazione" -#: ../app/dialogs/preferences-dialog.c:1475 +#: ../app/dialogs/preferences-dialog.c:1479 msgid "Promote imported images to _floating point precision" msgstr "Promuove l'immagine importata alla precisione della _virgola mobile" -#: ../app/dialogs/preferences-dialog.c:1481 +#: ../app/dialogs/preferences-dialog.c:1485 msgid "Dither images when promoting to floating point" msgstr "" "Esegue il dithering dell'immagine durante la promozione a virgola mobile" -#: ../app/dialogs/preferences-dialog.c:1486 +#: ../app/dialogs/preferences-dialog.c:1490 msgid "Add an alpha channel to imported images" msgstr "Aggiungi il canale alfa alle immagini importate" -#: ../app/dialogs/preferences-dialog.c:1491 -#: ../app/dialogs/preferences-dialog.c:2090 +#: ../app/dialogs/preferences-dialog.c:1495 +#: ../app/dialogs/preferences-dialog.c:2094 msgid "Color profile policy:" msgstr "Politica del profilo colore:" #. Export Policies -#: ../app/dialogs/preferences-dialog.c:1495 +#: ../app/dialogs/preferences-dialog.c:1499 msgid "Export Policies" msgstr "Politiche di esportazione" -#: ../app/dialogs/preferences-dialog.c:1499 +#: ../app/dialogs/preferences-dialog.c:1503 msgid "Export Exif metadata by default when available" msgstr "" "Esporta i metadati Exif quando disponibili come impostazione predefinita" -#: ../app/dialogs/preferences-dialog.c:1502 +#: ../app/dialogs/preferences-dialog.c:1506 msgid "Export XMP metadata by default when available" msgstr "" "Esporta i metadati XMP quando disponibili come impostazione predefinita" -#: ../app/dialogs/preferences-dialog.c:1505 +#: ../app/dialogs/preferences-dialog.c:1509 msgid "Export IPTC metadata by default when available" msgstr "" "Esporta i metadati IPTC quando disponibili come impostazione predefinita" -#: ../app/dialogs/preferences-dialog.c:1508 +#: ../app/dialogs/preferences-dialog.c:1512 msgid "Metadata can contain sensitive information." msgstr "I metadati possono contenere informazioni sensibili." #. Raw Image Importer -#: ../app/dialogs/preferences-dialog.c:1513 +#: ../app/dialogs/preferences-dialog.c:1517 msgid "Raw Image Importer" msgstr "Importatore immagini RAW" -#: ../app/dialogs/preferences-dialog.c:1546 +#: ../app/dialogs/preferences-dialog.c:1550 msgid "Experimental Playground" msgstr "Terreno di gioco sperimentale" -#: ../app/dialogs/preferences-dialog.c:1547 +#: ../app/dialogs/preferences-dialog.c:1551 msgid "Playground" msgstr "Terreno di gioco" -#: ../app/dialogs/preferences-dialog.c:1552 +#: ../app/dialogs/preferences-dialog.c:1556 msgid "Insane Options" msgstr "Opzioni pazze" -#: ../app/dialogs/preferences-dialog.c:1556 +#: ../app/dialogs/preferences-dialog.c:1560 msgid "_N-Point Deformation tool" msgstr "Strumento di deformazione a _N punti" -#: ../app/dialogs/preferences-dialog.c:1559 +#: ../app/dialogs/preferences-dialog.c:1563 msgid "_Seamless Clone tool" msgstr "_Strumento clone continuo" -#: ../app/dialogs/preferences-dialog.c:1569 -#: ../app/dialogs/preferences-dialog.c:1570 +#: ../app/dialogs/preferences-dialog.c:1573 +#: ../app/dialogs/preferences-dialog.c:1574 msgctxt "preferences" msgid "Tool Options" msgstr "Opzioni strumento" #. General #. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1578 -#: ../app/dialogs/preferences-dialog.c:2380 -#: ../app/dialogs/preferences-dialog.c:2708 -#: ../app/dialogs/preferences-dialog.c:2939 +#: ../app/dialogs/preferences-dialog.c:1582 +#: ../app/dialogs/preferences-dialog.c:2400 +#: ../app/dialogs/preferences-dialog.c:2728 +#: ../app/dialogs/preferences-dialog.c:2959 #: ../app/widgets/gimpcontrollereditor.c:186 msgid "General" msgstr "Generale" -#: ../app/dialogs/preferences-dialog.c:1581 +#: ../app/dialogs/preferences-dialog.c:1585 msgid "_Save tool options on exit" msgstr "_Salva le opzioni degli strumenti all'uscita" -#: ../app/dialogs/preferences-dialog.c:1585 +#: ../app/dialogs/preferences-dialog.c:1589 msgid "Save Tool Options _Now" msgstr "Salva ora le opzioni strume_nti" -#: ../app/dialogs/preferences-dialog.c:1592 +#: ../app/dialogs/preferences-dialog.c:1596 msgid "_Reset Saved Tool Options to Default Values" msgstr "_Reimposta le opzioni degli strumenti salvate ai valori predefiniti" -#: ../app/dialogs/preferences-dialog.c:1606 +#: ../app/dialogs/preferences-dialog.c:1610 msgid "Default _interpolation:" msgstr "_Interpolazione predefinita:" #. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1613 +#: ../app/dialogs/preferences-dialog.c:1617 msgid "Paint Options Shared Between Tools" msgstr "Opzioni di disegno condivise tra gli strumenti" -#: ../app/dialogs/preferences-dialog.c:1617 +#: ../app/dialogs/preferences-dialog.c:1621 msgid "_Brush" msgstr "_Pennello" -#: ../app/dialogs/preferences-dialog.c:1620 +#: ../app/dialogs/preferences-dialog.c:1624 msgid "_Dynamics" msgstr "_Dinamiche" -#: ../app/dialogs/preferences-dialog.c:1623 +#: ../app/dialogs/preferences-dialog.c:1627 msgid "_Pattern" msgstr "_Motivo" #. Move Tool -#: ../app/dialogs/preferences-dialog.c:1630 +#: ../app/dialogs/preferences-dialog.c:1634 msgid "Move Tool" msgstr "Strumento sposta" -#: ../app/dialogs/preferences-dialog.c:1634 +#: ../app/dialogs/preferences-dialog.c:1638 msgid "Set layer or path as active" msgstr "Imposta il livello o il tracciato come attivo" -#: ../app/dialogs/preferences-dialog.c:1647 +#: ../app/dialogs/preferences-dialog.c:1651 msgid "Default New Image" msgstr "Nuova immagine predefinita" -#: ../app/dialogs/preferences-dialog.c:1648 +#: ../app/dialogs/preferences-dialog.c:1652 msgid "Default Image" msgstr "Immagine predefinita" -#: ../app/dialogs/preferences-dialog.c:1684 +#: ../app/dialogs/preferences-dialog.c:1688 msgid "Quick Mask color:" msgstr "Colore maschera veloce:" -#: ../app/dialogs/preferences-dialog.c:1685 +#: ../app/dialogs/preferences-dialog.c:1689 msgid "Set the default Quick Mask color" msgstr "Imposta il colore predefinito della maschera veloce" -#: ../app/dialogs/preferences-dialog.c:1695 +#: ../app/dialogs/preferences-dialog.c:1699 msgid "Default Image Grid" msgstr "Griglia immagine predefinita" -#: ../app/dialogs/preferences-dialog.c:1696 +#: ../app/dialogs/preferences-dialog.c:1700 msgid "Default Grid" msgstr "Griglia predefinita" -#: ../app/dialogs/preferences-dialog.c:1715 +#: ../app/dialogs/preferences-dialog.c:1719 msgid "User Interface" msgstr "Interfaccia utente" -#: ../app/dialogs/preferences-dialog.c:1716 +#: ../app/dialogs/preferences-dialog.c:1720 msgid "Interface" msgstr "Interfaccia" -#: ../app/dialogs/preferences-dialog.c:1725 ../app/tools/gimptextoptions.c:151 +#: ../app/dialogs/preferences-dialog.c:1729 ../app/tools/gimptextoptions.c:151 msgid "Language" msgstr "Lingua" #. Previews -#: ../app/dialogs/preferences-dialog.c:1731 +#: ../app/dialogs/preferences-dialog.c:1735 msgid "Previews" msgstr "Anteprime" -#: ../app/dialogs/preferences-dialog.c:1734 +#: ../app/dialogs/preferences-dialog.c:1738 msgid "_Enable layer & channel previews" msgstr "_Abilita anteprime dei livelli e dei canali" -#: ../app/dialogs/preferences-dialog.c:1740 +#: ../app/dialogs/preferences-dialog.c:1744 msgid "_Default layer & channel preview size:" msgstr "_Dimensione predefinita anteprime dei livelli e dei canali:" -#: ../app/dialogs/preferences-dialog.c:1743 +#: ../app/dialogs/preferences-dialog.c:1747 msgid "_Undo preview size:" msgstr "Dimensione anteprima ann_ullamento:" -#: ../app/dialogs/preferences-dialog.c:1746 +#: ../app/dialogs/preferences-dialog.c:1750 msgid "Na_vigation preview size:" msgstr "Dimensione anteprima na_vigazione:" #. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1750 +#: ../app/dialogs/preferences-dialog.c:1754 msgid "Keyboard Shortcuts" msgstr "Tasti scorciatoia" -#: ../app/dialogs/preferences-dialog.c:1754 +#: ../app/dialogs/preferences-dialog.c:1758 msgid "_Use dynamic keyboard shortcuts" msgstr "_Usa tasti scorciatoia dinamici" -#: ../app/dialogs/preferences-dialog.c:1758 +#: ../app/dialogs/preferences-dialog.c:1762 msgid "Configure _Keyboard Shortcuts..." msgstr "Configura _tasti scorciatoia..." -#: ../app/dialogs/preferences-dialog.c:1765 +#: ../app/dialogs/preferences-dialog.c:1769 msgid "_Save keyboard shortcuts on exit" msgstr "_Salva i tasti scorciatoia all'uscita" -#: ../app/dialogs/preferences-dialog.c:1769 +#: ../app/dialogs/preferences-dialog.c:1773 msgid "Save Keyboard Shortcuts _Now" msgstr "Salva _ora i tasti scorciatoia" -#: ../app/dialogs/preferences-dialog.c:1776 +#: ../app/dialogs/preferences-dialog.c:1780 msgid "_Reset Keyboard Shortcuts to Default Values" msgstr "_Ripristina i tasti scorciatoia ai valori predefiniti" -#: ../app/dialogs/preferences-dialog.c:1785 +#: ../app/dialogs/preferences-dialog.c:1789 msgid "Remove _All Keyboard Shortcuts" msgstr "Rimuovi _tutti i tasti scorciatoia" -#: ../app/dialogs/preferences-dialog.c:1797 -#: ../app/dialogs/preferences-dialog.c:1798 -#: ../app/dialogs/preferences-dialog.c:1833 +#: ../app/dialogs/preferences-dialog.c:1801 +#: ../app/dialogs/preferences-dialog.c:1802 +#: ../app/dialogs/preferences-dialog.c:1837 msgid "Theme" msgstr "Tema" -#: ../app/dialogs/preferences-dialog.c:1803 +#: ../app/dialogs/preferences-dialog.c:1807 msgid "Select Theme" msgstr "Seleziona tema" -#: ../app/dialogs/preferences-dialog.c:1885 +#: ../app/dialogs/preferences-dialog.c:1889 msgid "Reload C_urrent Theme" msgstr "Ricarica il tema c_orrente" -#: ../app/dialogs/preferences-dialog.c:1897 -#: ../app/dialogs/preferences-dialog.c:1898 -#: ../app/dialogs/preferences-dialog.c:1939 +#: ../app/dialogs/preferences-dialog.c:1901 +#: ../app/dialogs/preferences-dialog.c:1902 +#: ../app/dialogs/preferences-dialog.c:1943 msgid "Icon Theme" msgstr "Tema icone" -#: ../app/dialogs/preferences-dialog.c:1903 +#: ../app/dialogs/preferences-dialog.c:1907 msgid "Select an Icon Theme" msgstr "Seleziona tema icone" #. Appearance -#: ../app/dialogs/preferences-dialog.c:2027 -#: ../app/dialogs/preferences-dialog.c:2779 ../app/widgets/gimpgrideditor.c:134 +#: ../app/dialogs/preferences-dialog.c:2031 +#: ../app/dialogs/preferences-dialog.c:2799 ../app/widgets/gimpgrideditor.c:134 msgid "Appearance" msgstr "Aspetto" -#: ../app/dialogs/preferences-dialog.c:2031 +#: ../app/dialogs/preferences-dialog.c:2035 msgid "Show GIMP _logo (drag-and-drop target)" msgstr "Mostra il _logo di GIMP (obiettivo trascina-e-rilascia)" -#: ../app/dialogs/preferences-dialog.c:2035 +#: ../app/dialogs/preferences-dialog.c:2039 msgid "Show _foreground & background color" msgstr "Mostra i colori di primo piano e s_fondo" -#: ../app/dialogs/preferences-dialog.c:2039 +#: ../app/dialogs/preferences-dialog.c:2043 msgid "Show active _brush, pattern & gradient" msgstr "Mostra il _pennello, il motivo e il gradiente attivi" -#: ../app/dialogs/preferences-dialog.c:2043 +#: ../app/dialogs/preferences-dialog.c:2047 msgid "Show active _image" msgstr "Mostra _immagine attiva" #. Tool Editor -#: ../app/dialogs/preferences-dialog.c:2051 +#: ../app/dialogs/preferences-dialog.c:2055 msgid "Tools Configuration" msgstr "Configurazione strumenti" -#: ../app/dialogs/preferences-dialog.c:2067 -#: ../app/dialogs/preferences-dialog.c:2068 +#: ../app/dialogs/preferences-dialog.c:2071 +#: ../app/dialogs/preferences-dialog.c:2072 msgid "Dialog Defaults" msgstr "Valori predefiniti delle finestre di dialogo" -#: ../app/dialogs/preferences-dialog.c:2077 +#: ../app/dialogs/preferences-dialog.c:2081 msgid "Reset Dialog Defaults" msgstr "Reimposta finestre di dialogo ai valori predefiniti" #. Color profile import dialog -#: ../app/dialogs/preferences-dialog.c:2085 +#: ../app/dialogs/preferences-dialog.c:2089 msgid "Color Profile Import Dialog" msgstr "Finestra di dialogo di importazione profilo" #. All color profile chooser dialogs -#: ../app/dialogs/preferences-dialog.c:2094 +#: ../app/dialogs/preferences-dialog.c:2098 msgid "Color Profile File Dialogs" msgstr "Finestre di dialogo dei file di profili di colore" -#: ../app/dialogs/preferences-dialog.c:2099 +#: ../app/dialogs/preferences-dialog.c:2103 msgid "Profile folder:" msgstr "Cartella del profilo:" -#: ../app/dialogs/preferences-dialog.c:2100 +#: ../app/dialogs/preferences-dialog.c:2104 msgid "Select Default Folder for Color Profiles" msgstr "Selezionare la cartella predefinita per i profili colore" #. Convert to Color Profile Dialog -#: ../app/dialogs/preferences-dialog.c:2104 +#: ../app/dialogs/preferences-dialog.c:2108 msgid "Convert to Color Profile Dialog" msgstr "Finestra di dialogo \"Converti al profilo colore\"" -#: ../app/dialogs/preferences-dialog.c:2109 +#: ../app/dialogs/preferences-dialog.c:2113 msgid "Rendering intent:" msgstr "Intento di rendering:" -#: ../app/dialogs/preferences-dialog.c:2113 +#: ../app/dialogs/preferences-dialog.c:2117 msgid "Black point compensation" msgstr "Compensazione del punto nero" #. Convert Precision Dialog -#: ../app/dialogs/preferences-dialog.c:2117 +#: ../app/dialogs/preferences-dialog.c:2121 msgid "Precision Conversion Dialog" msgstr "Finestra di dialogo \"Conversione di precisione\"" -#: ../app/dialogs/preferences-dialog.c:2124 +#: ../app/dialogs/preferences-dialog.c:2128 msgid "Dither layers:" msgstr "Dither livelli:" -#: ../app/dialogs/preferences-dialog.c:2129 +#: ../app/dialogs/preferences-dialog.c:2133 msgid "Dither text layers:" msgstr "Dither livelli di testo:" -#: ../app/dialogs/preferences-dialog.c:2134 +#: ../app/dialogs/preferences-dialog.c:2138 msgid "Dither channels/masks:" msgstr "Dither canali/maschere:" #. Convert Indexed Dialog -#: ../app/dialogs/preferences-dialog.c:2138 +#: ../app/dialogs/preferences-dialog.c:2142 msgid "Indexed Conversion Dialog" msgstr "Finestra di dialogo \"Conversione a indicizzata\"" -#: ../app/dialogs/preferences-dialog.c:2143 +#: ../app/dialogs/preferences-dialog.c:2147 msgid "Colormap:" msgstr "Mappa colore:" -#: ../app/dialogs/preferences-dialog.c:2146 +#: ../app/dialogs/preferences-dialog.c:2150 msgid "Maximum number of colors:" msgstr "Numero massimo di colori:" -#: ../app/dialogs/preferences-dialog.c:2150 +#: ../app/dialogs/preferences-dialog.c:2154 msgid "Remove unused and duplicate colors from colormap" msgstr "Rimuovere colori doppi e inutilizzati dalla mappa colore" -#: ../app/dialogs/preferences-dialog.c:2156 +#: ../app/dialogs/preferences-dialog.c:2160 msgid "Color dithering:" msgstr "Dithering di colore:" -#: ../app/dialogs/preferences-dialog.c:2160 +#: ../app/dialogs/preferences-dialog.c:2164 msgid "Enable dithering of transparency" msgstr "Abilita dithering della trasparenza" +#: ../app/dialogs/preferences-dialog.c:2176 +msgid "Keep recent settings:" +msgstr "Mantieni le impostazioni recenti:" + +#: ../app/dialogs/preferences-dialog.c:2180 +msgid "Default to the last used settings" +msgstr "Imposta di default le ultime impostazioni usate" + #. Canvas Size Dialog -#: ../app/dialogs/preferences-dialog.c:2167 +#: ../app/dialogs/preferences-dialog.c:2187 msgid "Canvas Size Dialog" msgstr "Finestra Dimensione superficie" -#: ../app/dialogs/preferences-dialog.c:2172 -#: ../app/dialogs/preferences-dialog.c:2201 +#: ../app/dialogs/preferences-dialog.c:2192 +#: ../app/dialogs/preferences-dialog.c:2221 msgid "Fill with:" msgstr "Riempi con:" -#: ../app/dialogs/preferences-dialog.c:2175 +#: ../app/dialogs/preferences-dialog.c:2195 msgid "Resize layers:" msgstr "Ridimensiona livelli:" -#: ../app/dialogs/preferences-dialog.c:2179 +#: ../app/dialogs/preferences-dialog.c:2199 msgid "Resize text layers" msgstr "Ridimensiona i livelli di testo" #. New Layer Dialog -#: ../app/dialogs/preferences-dialog.c:2183 +#: ../app/dialogs/preferences-dialog.c:2203 msgid "New Layer Dialog" msgstr "Finestra di dialogo \"Nuovo livello\"" -#: ../app/dialogs/preferences-dialog.c:2188 +#: ../app/dialogs/preferences-dialog.c:2208 msgid "Layer name:" msgstr "Nome livello:" -#: ../app/dialogs/preferences-dialog.c:2192 +#: ../app/dialogs/preferences-dialog.c:2212 msgid "Fill type:" msgstr "Tipo riempimento:" #. Layer Boundary Size Dialog -#: ../app/dialogs/preferences-dialog.c:2196 +#: ../app/dialogs/preferences-dialog.c:2216 msgid "Layer Boundary Size Dialog" msgstr "Finestra imposta dimensioni margini del livello" #. Add Layer Mask Dialog -#: ../app/dialogs/preferences-dialog.c:2205 +#: ../app/dialogs/preferences-dialog.c:2225 msgid "Add Layer Mask Dialog" msgstr "Finestra di dialogo \"Aggiungi maschera di livello\"" -#: ../app/dialogs/preferences-dialog.c:2210 +#: ../app/dialogs/preferences-dialog.c:2230 msgid "Layer mask type:" msgstr "Tipo di maschera di livello:" -#: ../app/dialogs/preferences-dialog.c:2214 +#: ../app/dialogs/preferences-dialog.c:2234 msgid "Invert mask" msgstr "Inverti maschera" #. Merge Layers Dialog -#: ../app/dialogs/preferences-dialog.c:2218 +#: ../app/dialogs/preferences-dialog.c:2238 msgid "Merge Layers Dialog" msgstr "Finestra di dialogo \"Fondi i livelli\"" -#: ../app/dialogs/preferences-dialog.c:2225 +#: ../app/dialogs/preferences-dialog.c:2245 msgid "Merged layer size:" msgstr "Dimensione livello fuso:" -#: ../app/dialogs/preferences-dialog.c:2229 +#: ../app/dialogs/preferences-dialog.c:2249 msgid "Merge within active group only" msgstr "Fondi solo dentro il gruppo attivo" -#: ../app/dialogs/preferences-dialog.c:2232 +#: ../app/dialogs/preferences-dialog.c:2252 msgid "Discard invisible layers" msgstr "Abbandona i livelli invisibili" #. New Channel Dialog -#: ../app/dialogs/preferences-dialog.c:2236 +#: ../app/dialogs/preferences-dialog.c:2256 msgid "New Channel Dialog" msgstr "Finestra di dialogo \"Nuovo canale\"" -#: ../app/dialogs/preferences-dialog.c:2241 +#: ../app/dialogs/preferences-dialog.c:2261 msgid "Channel name:" msgstr "Nome canale:" -#: ../app/dialogs/preferences-dialog.c:2245 +#: ../app/dialogs/preferences-dialog.c:2265 msgid "Color and opacity:" msgstr "Colore e opacità:" -#: ../app/dialogs/preferences-dialog.c:2246 +#: ../app/dialogs/preferences-dialog.c:2266 msgid "Default New Channel Color and Opacity" msgstr "Valori predefiniti nuovi colore e opacità del canale" #. New Path Dialog -#: ../app/dialogs/preferences-dialog.c:2251 +#: ../app/dialogs/preferences-dialog.c:2271 msgid "New Path Dialog" msgstr "Finestra di dialogo \"Nuovo tracciato\"" -#: ../app/dialogs/preferences-dialog.c:2256 +#: ../app/dialogs/preferences-dialog.c:2276 msgid "Path name:" msgstr "Nome tracciato:" #. Export Path Dialog -#: ../app/dialogs/preferences-dialog.c:2260 +#: ../app/dialogs/preferences-dialog.c:2280 msgid "Export Paths Dialog" msgstr "Finestra di dialogo \"Esporta tracciato\"" -#: ../app/dialogs/preferences-dialog.c:2265 +#: ../app/dialogs/preferences-dialog.c:2285 msgid "Export folder:" msgstr "Cartella esportazioni:" -#: ../app/dialogs/preferences-dialog.c:2266 +#: ../app/dialogs/preferences-dialog.c:2286 msgid "Select Default Folder for Exporting Paths" msgstr "Selezionare la cartella predefinita per l'esportazione tracciati" -#: ../app/dialogs/preferences-dialog.c:2270 +#: ../app/dialogs/preferences-dialog.c:2290 msgid "Export the active path only" msgstr "Esporta solo il tracciato corrente" #. Import Path Dialog -#: ../app/dialogs/preferences-dialog.c:2274 +#: ../app/dialogs/preferences-dialog.c:2294 msgid "Import Paths Dialog" msgstr "Finestra di dialogo \"Importa tracciati\"" -#: ../app/dialogs/preferences-dialog.c:2279 +#: ../app/dialogs/preferences-dialog.c:2299 msgid "Import folder:" msgstr "Cartella importazioni:" -#: ../app/dialogs/preferences-dialog.c:2280 +#: ../app/dialogs/preferences-dialog.c:2300 msgid "Select Default Folder for Importing Paths" msgstr "Selezionare la cartella predefinita per l'importazione dei tracciati" -#: ../app/dialogs/preferences-dialog.c:2284 +#: ../app/dialogs/preferences-dialog.c:2304 msgid "Merge imported paths" msgstr "Fondi i tracciati importati" -#: ../app/dialogs/preferences-dialog.c:2287 +#: ../app/dialogs/preferences-dialog.c:2307 msgid "Scale imported paths" msgstr "Scala i tracciati importati" #. Feather Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2291 +#: ../app/dialogs/preferences-dialog.c:2311 msgid "Feather Selection Dialog" msgstr "Finestra di dialogo \"Selezione sfumata\"" -#: ../app/dialogs/preferences-dialog.c:2296 +#: ../app/dialogs/preferences-dialog.c:2316 msgid "Feather radius:" msgstr "Raggio sfumatura:" #. Grow Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2300 +#: ../app/dialogs/preferences-dialog.c:2320 msgid "Grow Selection Dialog" msgstr "Finestra di dialogo \"Allarga la selezione\"" -#: ../app/dialogs/preferences-dialog.c:2305 +#: ../app/dialogs/preferences-dialog.c:2325 msgid "Grow radius:" msgstr "Raggio di crescita:" #. Shrink Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2309 +#: ../app/dialogs/preferences-dialog.c:2329 msgid "Shrink Selection Dialog" msgstr "Finestra di dialogo \"Riduci la selezione\"" -#: ../app/dialogs/preferences-dialog.c:2314 +#: ../app/dialogs/preferences-dialog.c:2334 msgid "Shrink radius:" msgstr "Raggio di riduzione:" -#: ../app/dialogs/preferences-dialog.c:2318 -#: ../app/dialogs/preferences-dialog.c:2335 +#: ../app/dialogs/preferences-dialog.c:2338 +#: ../app/dialogs/preferences-dialog.c:2355 msgid "Selected areas continue outside the image" msgstr "Le aree selezionate continuano fuori dall'immagine" #. Border Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2322 +#: ../app/dialogs/preferences-dialog.c:2342 msgid "Border Selection Dialog" msgstr "Finestra di dialogo \"Selezione bordo\"" -#: ../app/dialogs/preferences-dialog.c:2327 +#: ../app/dialogs/preferences-dialog.c:2347 msgid "Border radius:" msgstr "Raggio bordo:" -#: ../app/dialogs/preferences-dialog.c:2331 +#: ../app/dialogs/preferences-dialog.c:2351 msgid "Border style:" msgstr "Stile bordo:" #. Fill Options Dialog -#: ../app/dialogs/preferences-dialog.c:2339 +#: ../app/dialogs/preferences-dialog.c:2359 msgid "Fill Selection Outline & Fill Path Dialogs" msgstr "" "Finestre di dialogo \"Riempi contorno selezione\" e \"Riempi tracciato\"" #. Stroke Options Dialog -#: ../app/dialogs/preferences-dialog.c:2348 +#: ../app/dialogs/preferences-dialog.c:2368 msgid "Stroke Selection & Stroke Path Dialogs" msgstr "Finestre di dialogo \"Delinea selezione\" e \"Delinea tracciato\"" -#: ../app/dialogs/preferences-dialog.c:2371 -#: ../app/dialogs/preferences-dialog.c:2372 +#: ../app/dialogs/preferences-dialog.c:2391 +#: ../app/dialogs/preferences-dialog.c:2392 msgid "Help System" msgstr "Aiuto" -#: ../app/dialogs/preferences-dialog.c:2383 +#: ../app/dialogs/preferences-dialog.c:2403 msgid "Show _tooltips" msgstr "Mostra i suggerimen_ti" -#: ../app/dialogs/preferences-dialog.c:2386 +#: ../app/dialogs/preferences-dialog.c:2406 msgid "Show help _buttons" msgstr "Mostra _tasti di aiuto" -#: ../app/dialogs/preferences-dialog.c:2391 +#: ../app/dialogs/preferences-dialog.c:2411 msgid "Use the online version" msgstr "Usa la versione online" -#: ../app/dialogs/preferences-dialog.c:2392 +#: ../app/dialogs/preferences-dialog.c:2412 msgid "Use a locally installed copy" msgstr "Usa la versione installata localmente" -#: ../app/dialogs/preferences-dialog.c:2393 +#: ../app/dialogs/preferences-dialog.c:2413 msgid "User manual:" msgstr "Manuale utente:" -#: ../app/dialogs/preferences-dialog.c:2404 +#: ../app/dialogs/preferences-dialog.c:2424 msgid "User interface language" msgstr "Lingua interfaccia utente" @@ -15800,15 +16034,15 @@ msgstr "Lingua interfaccia utente" #. * that doesn't use the help browser, so don't bother showing #. * the combo. #. -#: ../app/dialogs/preferences-dialog.c:2463 +#: ../app/dialogs/preferences-dialog.c:2483 msgid "Help Browser" msgstr "Visualizzatore dell'aiuto" -#: ../app/dialogs/preferences-dialog.c:2470 +#: ../app/dialogs/preferences-dialog.c:2490 msgid "H_elp browser to use:" msgstr "Visualizzatore dell'aiuto da utilizzar_e:" -#: ../app/dialogs/preferences-dialog.c:2476 +#: ../app/dialogs/preferences-dialog.c:2496 msgid "" "The GIMP help browser doesn't seem to be installed. Using the web browser " "instead." @@ -15817,453 +16051,453 @@ msgstr "" "un programma di navigazione web in sua vece." #. Action Search -#: ../app/dialogs/preferences-dialog.c:2493 +#: ../app/dialogs/preferences-dialog.c:2513 msgid "Action Search" msgstr "Ricerca azione" -#: ../app/dialogs/preferences-dialog.c:2497 +#: ../app/dialogs/preferences-dialog.c:2517 msgid "Show _unavailable actions" msgstr "Mostra azioni non dis_ponibili" -#: ../app/dialogs/preferences-dialog.c:2500 +#: ../app/dialogs/preferences-dialog.c:2520 msgid "Maximum History Size:" msgstr "Dimensione massima cronologia:" -#: ../app/dialogs/preferences-dialog.c:2504 +#: ../app/dialogs/preferences-dialog.c:2524 msgid "Clear Action History" msgstr "Cancella cronologia azioni" -#: ../app/dialogs/preferences-dialog.c:2519 -#: ../app/dialogs/preferences-dialog.c:2520 +#: ../app/dialogs/preferences-dialog.c:2539 +#: ../app/dialogs/preferences-dialog.c:2540 msgid "Display" msgstr "Visualizzazione" #. Transparency -#: ../app/dialogs/preferences-dialog.c:2528 +#: ../app/dialogs/preferences-dialog.c:2548 msgid "Transparency" msgstr "Trasparenza" -#: ../app/dialogs/preferences-dialog.c:2532 +#: ../app/dialogs/preferences-dialog.c:2552 msgid "_Check style:" msgstr "Stile s_cacchi:" -#: ../app/dialogs/preferences-dialog.c:2535 +#: ../app/dialogs/preferences-dialog.c:2555 msgid "Check _size:" msgstr "Dimen_sione scacchi:" -#: ../app/dialogs/preferences-dialog.c:2538 +#: ../app/dialogs/preferences-dialog.c:2558 msgid "Monitor Resolution" msgstr "Risoluzione monitor" #. Pixels -#: ../app/dialogs/preferences-dialog.c:2542 ../app/display/gimpcursorview.c:215 +#: ../app/dialogs/preferences-dialog.c:2562 ../app/display/gimpcursorview.c:215 #: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:234 msgid "Pixels" msgstr "Pixel" -#: ../app/dialogs/preferences-dialog.c:2560 ../app/widgets/gimpgrideditor.c:195 +#: ../app/dialogs/preferences-dialog.c:2580 ../app/widgets/gimpgrideditor.c:195 #: ../app/widgets/gimpgrideditor.c:230 msgid "Horizontal" msgstr "Orizzontale" -#: ../app/dialogs/preferences-dialog.c:2562 ../app/widgets/gimpgrideditor.c:197 +#: ../app/dialogs/preferences-dialog.c:2582 ../app/widgets/gimpgrideditor.c:197 #: ../app/widgets/gimpgrideditor.c:232 msgid "Vertical" msgstr "Verticale" -#: ../app/dialogs/preferences-dialog.c:2564 +#: ../app/dialogs/preferences-dialog.c:2584 #: ../app/widgets/gimpimagepropview.c:457 msgid "ppi" msgstr "ppi" -#: ../app/dialogs/preferences-dialog.c:2583 +#: ../app/dialogs/preferences-dialog.c:2603 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "_Rileva automaticamente (attualmente %d × %d ppi)" -#: ../app/dialogs/preferences-dialog.c:2601 +#: ../app/dialogs/preferences-dialog.c:2621 msgid "_Enter manually" msgstr "_Inserisci manualmente" -#: ../app/dialogs/preferences-dialog.c:2616 +#: ../app/dialogs/preferences-dialog.c:2636 msgid "C_alibrate..." msgstr "C_alibratura..." -#: ../app/dialogs/preferences-dialog.c:2644 -#: ../app/dialogs/preferences-dialog.c:2645 +#: ../app/dialogs/preferences-dialog.c:2664 +#: ../app/dialogs/preferences-dialog.c:2665 msgid "Window Management" msgstr "Gestione finestre" -#: ../app/dialogs/preferences-dialog.c:2650 +#: ../app/dialogs/preferences-dialog.c:2670 msgid "Window Manager Hints" msgstr "Suggerimenti del gestore finestre" -#: ../app/dialogs/preferences-dialog.c:2656 +#: ../app/dialogs/preferences-dialog.c:2676 msgid "Hint for _docks and toolbox:" msgstr "Suggerimento per le finestre ag_ganciabili e per gli strumenti:" -#: ../app/dialogs/preferences-dialog.c:2659 +#: ../app/dialogs/preferences-dialog.c:2679 msgid "Focus" msgstr "Focus" -#: ../app/dialogs/preferences-dialog.c:2663 +#: ../app/dialogs/preferences-dialog.c:2683 msgid "Activate the _focused image" msgstr "Attiva l'immagine in _focus" #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2667 +#: ../app/dialogs/preferences-dialog.c:2687 msgid "Window Positions" msgstr "Posizione finestra" -#: ../app/dialogs/preferences-dialog.c:2670 +#: ../app/dialogs/preferences-dialog.c:2690 msgid "_Save window positions on exit" msgstr "_Salva le posizioni delle finestre all'uscita" -#: ../app/dialogs/preferences-dialog.c:2673 +#: ../app/dialogs/preferences-dialog.c:2693 msgid "Open windows on the same _monitor they were open before" msgstr "Apri le finestre sullo stesso scher_mo dov'erano aperte prima" -#: ../app/dialogs/preferences-dialog.c:2677 +#: ../app/dialogs/preferences-dialog.c:2697 msgid "Save Window Positions _Now" msgstr "Salva _ora la posizione delle finestre" -#: ../app/dialogs/preferences-dialog.c:2684 +#: ../app/dialogs/preferences-dialog.c:2704 msgid "_Reset Saved Window Positions to Default Values" msgstr "_Reimposta la posizione delle finestre salvata ai valori predefiniti" -#: ../app/dialogs/preferences-dialog.c:2699 -#: ../app/dialogs/preferences-dialog.c:2700 +#: ../app/dialogs/preferences-dialog.c:2719 +#: ../app/dialogs/preferences-dialog.c:2720 msgid "Image Windows" msgstr "Finestre immagine" -#: ../app/dialogs/preferences-dialog.c:2711 +#: ../app/dialogs/preferences-dialog.c:2731 msgid "Use \"_Dot for dot\" by default" msgstr "Usa \"punto per punto\" come pre_definito" -#: ../app/dialogs/preferences-dialog.c:2717 +#: ../app/dialogs/preferences-dialog.c:2737 msgid "Marching _ants speed:" msgstr "Velocità _animazione selezione:" #. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2721 +#: ../app/dialogs/preferences-dialog.c:2741 msgid "Zoom & Resize Behavior" msgstr "Comportamento dello zoom e del ridimensionamento" -#: ../app/dialogs/preferences-dialog.c:2725 +#: ../app/dialogs/preferences-dialog.c:2745 msgid "Resize window on _zoom" msgstr "Ridimensiona finestra ad ogni _zoom" -#: ../app/dialogs/preferences-dialog.c:2728 +#: ../app/dialogs/preferences-dialog.c:2748 msgid "Resize window on image _size change" msgstr "Ridimensiona la finestra ad ogni modifica di _ampiezza" -#: ../app/dialogs/preferences-dialog.c:2734 +#: ../app/dialogs/preferences-dialog.c:2754 msgid "Show entire image" msgstr "Mostra immagine intera" -#: ../app/dialogs/preferences-dialog.c:2736 +#: ../app/dialogs/preferences-dialog.c:2756 msgid "Initial zoom _ratio:" msgstr "_Rapporto di zoom iniziale:" #. Space Bar -#: ../app/dialogs/preferences-dialog.c:2740 +#: ../app/dialogs/preferences-dialog.c:2760 msgid "Space Bar" msgstr "Barra spazio" -#: ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/preferences-dialog.c:2766 msgid "_While space bar is pressed:" msgstr "_Mentre la barra spazio è premuta:" #. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2750 +#: ../app/dialogs/preferences-dialog.c:2770 msgid "Mouse Pointers" msgstr "Puntatori del mouse" -#: ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/preferences-dialog.c:2774 msgid "Show _brush outline" msgstr "Mostra il _bordo esterno del pennello" -#: ../app/dialogs/preferences-dialog.c:2757 +#: ../app/dialogs/preferences-dialog.c:2777 msgid "Show pointer for paint _tools" msgstr "Mostra il puntatore con gli s_trumenti di disegno" -#: ../app/dialogs/preferences-dialog.c:2763 +#: ../app/dialogs/preferences-dialog.c:2783 msgid "Pointer _mode:" msgstr "_Modalità puntatore:" -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2786 msgid "Pointer _handedness:" msgstr "Durez_za del puntatore:" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2798 msgid "Image Window Appearance" msgstr "Aspetto finestre immagine" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2806 msgid "Default Appearance in Normal Mode" msgstr "Visualizzazione predefinita in modalità normale" -#: ../app/dialogs/preferences-dialog.c:2791 +#: ../app/dialogs/preferences-dialog.c:2811 msgid "Default Appearance in Fullscreen Mode" msgstr "Visualizzazione predefinita in modalità a schermo pieno" -#: ../app/dialogs/preferences-dialog.c:2800 +#: ../app/dialogs/preferences-dialog.c:2820 msgid "Image Title & Statusbar Format" msgstr "Formato del titolo immagine e della barra di stato" -#: ../app/dialogs/preferences-dialog.c:2801 +#: ../app/dialogs/preferences-dialog.c:2821 msgid "Title & Status" msgstr "Titolo e stato" -#: ../app/dialogs/preferences-dialog.c:2819 +#: ../app/dialogs/preferences-dialog.c:2839 msgid "Current format" msgstr "Formato corrente" -#: ../app/dialogs/preferences-dialog.c:2820 +#: ../app/dialogs/preferences-dialog.c:2840 msgid "Default format" msgstr "Formato predefinito" -#: ../app/dialogs/preferences-dialog.c:2821 +#: ../app/dialogs/preferences-dialog.c:2841 msgid "Show zoom percentage" msgstr "Mostra percentuale dello zoom" -#: ../app/dialogs/preferences-dialog.c:2822 +#: ../app/dialogs/preferences-dialog.c:2842 msgid "Show zoom ratio" msgstr "Mostra rapporto zoom" -#: ../app/dialogs/preferences-dialog.c:2823 +#: ../app/dialogs/preferences-dialog.c:2843 msgid "Show image size" msgstr "Mostra dimensione immagine" -#: ../app/dialogs/preferences-dialog.c:2824 +#: ../app/dialogs/preferences-dialog.c:2844 msgid "Show drawable size" msgstr "Mostra dimensione area disegnabile" -#: ../app/dialogs/preferences-dialog.c:2837 +#: ../app/dialogs/preferences-dialog.c:2857 msgid "Image Title Format" msgstr "Formato del titolo immagine" -#: ../app/dialogs/preferences-dialog.c:2839 +#: ../app/dialogs/preferences-dialog.c:2859 msgid "Image Statusbar Format" msgstr "Formato della barra di stato dell'immagine" -#: ../app/dialogs/preferences-dialog.c:2923 +#: ../app/dialogs/preferences-dialog.c:2943 msgid "Image Window Snapping Behavior" msgstr "Comportamento magnetismo finestra immagine" -#: ../app/dialogs/preferences-dialog.c:2924 +#: ../app/dialogs/preferences-dialog.c:2944 msgid "Snapping" msgstr "Magnetismo" -#: ../app/dialogs/preferences-dialog.c:2931 +#: ../app/dialogs/preferences-dialog.c:2951 msgid "Default Behavior in Normal Mode" msgstr "Comportamento predefinito in modalità normale" -#: ../app/dialogs/preferences-dialog.c:2935 +#: ../app/dialogs/preferences-dialog.c:2955 msgid "Default Behavior in Fullscreen Mode" msgstr "Comportamento predefinito in modalità a schermo pieno" -#: ../app/dialogs/preferences-dialog.c:2944 +#: ../app/dialogs/preferences-dialog.c:2964 msgid "_Snapping distance:" msgstr "Distanza magneti_smo:" -#: ../app/dialogs/preferences-dialog.c:2953 -#: ../app/dialogs/preferences-dialog.c:2954 +#: ../app/dialogs/preferences-dialog.c:2973 +#: ../app/dialogs/preferences-dialog.c:2974 msgid "Input Devices" msgstr "Dispositivi di ingresso" #. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2960 +#: ../app/dialogs/preferences-dialog.c:2980 msgid "Extended Input Devices" msgstr "Dispositivi di ingresso estesi" -#: ../app/dialogs/preferences-dialog.c:2964 +#: ../app/dialogs/preferences-dialog.c:2984 msgid "S_hare tool and tool options between input devices" msgstr "Condividi strumenti e opzioni strumenti tra dispositivi d'ingresso" -#: ../app/dialogs/preferences-dialog.c:2968 +#: ../app/dialogs/preferences-dialog.c:2988 msgid "Configure E_xtended Input Devices..." msgstr "Configurazione dispositivi di ingresso _estesi..." -#: ../app/dialogs/preferences-dialog.c:2975 +#: ../app/dialogs/preferences-dialog.c:2995 msgid "_Save input device settings on exit" msgstr "All'uscita _salva lo stato dei dispositivi di ingresso" -#: ../app/dialogs/preferences-dialog.c:2979 +#: ../app/dialogs/preferences-dialog.c:2999 msgid "Save Input Device Settings _Now" msgstr "Salva _ora lo stato dei dispositivi di ingresso" -#: ../app/dialogs/preferences-dialog.c:2986 +#: ../app/dialogs/preferences-dialog.c:3006 msgid "_Reset Saved Input Device Settings to Default Values" msgstr "" "_Reimposta lo stato dei dispositivi di ingresso salvato ai valori predefiniti" -#: ../app/dialogs/preferences-dialog.c:3001 +#: ../app/dialogs/preferences-dialog.c:3021 msgid "Additional Input Controllers" msgstr "Controllori di ingresso aggiuntivi" -#: ../app/dialogs/preferences-dialog.c:3002 +#: ../app/dialogs/preferences-dialog.c:3022 msgid "Input Controllers" msgstr "Controllori di ingresso" -#: ../app/dialogs/preferences-dialog.c:3017 -#: ../app/dialogs/preferences-dialog.c:3018 +#: ../app/dialogs/preferences-dialog.c:3037 +#: ../app/dialogs/preferences-dialog.c:3038 msgid "Folders" msgstr "Cartelle" -#: ../app/dialogs/preferences-dialog.c:3034 +#: ../app/dialogs/preferences-dialog.c:3054 msgid "Temporary folder:" msgstr "Cartella file temporanei:" -#: ../app/dialogs/preferences-dialog.c:3035 +#: ../app/dialogs/preferences-dialog.c:3055 msgid "Select Folder for Temporary Files" msgstr "Selezionare la cartella per i file temporanei" -#: ../app/dialogs/preferences-dialog.c:3039 +#: ../app/dialogs/preferences-dialog.c:3059 msgid "Swap folder:" msgstr "Cartella di scambio:" -#: ../app/dialogs/preferences-dialog.c:3040 +#: ../app/dialogs/preferences-dialog.c:3060 msgid "Select Swap Folder" msgstr "Seleziona la cartella di scambio" -#: ../app/dialogs/preferences-dialog.c:3072 +#: ../app/dialogs/preferences-dialog.c:3092 msgid "Brush Folders" msgstr "Cartelle pennelli" -#: ../app/dialogs/preferences-dialog.c:3074 +#: ../app/dialogs/preferences-dialog.c:3094 msgid "Select Brush Folders" msgstr "Seleziona le cartelle dei pennelli" -#: ../app/dialogs/preferences-dialog.c:3076 +#: ../app/dialogs/preferences-dialog.c:3096 msgid "Dynamics Folders" msgstr "Cartelle delle dinamiche" -#: ../app/dialogs/preferences-dialog.c:3078 +#: ../app/dialogs/preferences-dialog.c:3098 msgid "Select Dynamics Folders" msgstr "Seleziona le cartelle delle dinamiche" -#: ../app/dialogs/preferences-dialog.c:3080 +#: ../app/dialogs/preferences-dialog.c:3100 msgid "Pattern Folders" msgstr "Cartelle motivi" -#: ../app/dialogs/preferences-dialog.c:3082 +#: ../app/dialogs/preferences-dialog.c:3102 msgid "Select Pattern Folders" msgstr "Seleziona le cartelle dei motivi" -#: ../app/dialogs/preferences-dialog.c:3084 +#: ../app/dialogs/preferences-dialog.c:3104 msgid "Palette Folders" msgstr "Cartelle delle tavolozze" -#: ../app/dialogs/preferences-dialog.c:3086 +#: ../app/dialogs/preferences-dialog.c:3106 msgid "Select Palette Folders" msgstr "Seleziona le cartelle delle tavolozze" -#: ../app/dialogs/preferences-dialog.c:3088 +#: ../app/dialogs/preferences-dialog.c:3108 msgid "Gradient Folders" msgstr "Cartelle dei gradienti" -#: ../app/dialogs/preferences-dialog.c:3090 +#: ../app/dialogs/preferences-dialog.c:3110 msgid "Select Gradient Folders" msgstr "Seleziona le cartelle dei gradienti" -#: ../app/dialogs/preferences-dialog.c:3092 +#: ../app/dialogs/preferences-dialog.c:3112 msgid "Font Folders" msgstr "Cartelle dei caratteri" -#: ../app/dialogs/preferences-dialog.c:3094 +#: ../app/dialogs/preferences-dialog.c:3114 msgid "Select Font Folders" msgstr "Seleziona le cartelle dei caratteri" -#: ../app/dialogs/preferences-dialog.c:3096 +#: ../app/dialogs/preferences-dialog.c:3116 msgid "Tool Preset Folders" msgstr "Cartelle preimpostazioni strumento" -#: ../app/dialogs/preferences-dialog.c:3098 +#: ../app/dialogs/preferences-dialog.c:3118 msgid "Select Tool Preset Folders" msgstr "Seleziona le cartelle delle preimpostazioni strumento" -#: ../app/dialogs/preferences-dialog.c:3100 +#: ../app/dialogs/preferences-dialog.c:3120 msgid "MyPaint Brush Folders" msgstr "Cartelle pennelli MyPaint" -#: ../app/dialogs/preferences-dialog.c:3102 +#: ../app/dialogs/preferences-dialog.c:3122 msgid "Select MyPaint Brush Folders" msgstr "Seleziona le cartelle pennelli MyPaint" -#: ../app/dialogs/preferences-dialog.c:3104 +#: ../app/dialogs/preferences-dialog.c:3124 msgid "Plug-in Folders" msgstr "Cartelle plug-in" -#: ../app/dialogs/preferences-dialog.c:3106 +#: ../app/dialogs/preferences-dialog.c:3126 msgid "Select plug-in Folders" msgstr "Seleziona le cartelle plug-in" -#: ../app/dialogs/preferences-dialog.c:3108 +#: ../app/dialogs/preferences-dialog.c:3128 msgid "Scripts" msgstr "Script" -#: ../app/dialogs/preferences-dialog.c:3108 +#: ../app/dialogs/preferences-dialog.c:3128 msgid "Script-Fu Folders" msgstr "Cartelle Script-Fu" -#: ../app/dialogs/preferences-dialog.c:3110 +#: ../app/dialogs/preferences-dialog.c:3130 msgid "Select Script-Fu Folders" msgstr "Seleziona le cartelle Script-Fu" -#: ../app/dialogs/preferences-dialog.c:3112 +#: ../app/dialogs/preferences-dialog.c:3132 msgid "Module Folders" msgstr "Cartelle dei moduli" -#: ../app/dialogs/preferences-dialog.c:3114 +#: ../app/dialogs/preferences-dialog.c:3134 msgid "Select Module Folders" msgstr "Seleziona le cartelle dei moduli" -#: ../app/dialogs/preferences-dialog.c:3116 +#: ../app/dialogs/preferences-dialog.c:3136 msgid "Interpreters" msgstr "Interpreti" -#: ../app/dialogs/preferences-dialog.c:3116 +#: ../app/dialogs/preferences-dialog.c:3136 msgid "Interpreter Folders" msgstr "Cartelle interpreti" -#: ../app/dialogs/preferences-dialog.c:3118 +#: ../app/dialogs/preferences-dialog.c:3138 msgid "Select Interpreter Folders" msgstr "Seleziona le cartelle interpreti" -#: ../app/dialogs/preferences-dialog.c:3120 +#: ../app/dialogs/preferences-dialog.c:3140 msgid "Environment" msgstr "Ambiente" -#: ../app/dialogs/preferences-dialog.c:3120 +#: ../app/dialogs/preferences-dialog.c:3140 msgid "Environment Folders" msgstr "Cartelle di ambiente" -#: ../app/dialogs/preferences-dialog.c:3122 +#: ../app/dialogs/preferences-dialog.c:3142 msgid "Select Environment Folders" msgstr "Seleziona le cartelle di ambiente" -#: ../app/dialogs/preferences-dialog.c:3124 +#: ../app/dialogs/preferences-dialog.c:3144 msgid "Themes" msgstr "Temi" -#: ../app/dialogs/preferences-dialog.c:3124 +#: ../app/dialogs/preferences-dialog.c:3144 msgid "Theme Folders" msgstr "Cartelle dei temi" -#: ../app/dialogs/preferences-dialog.c:3126 +#: ../app/dialogs/preferences-dialog.c:3146 msgid "Select Theme Folders" msgstr "Seleziona le cartelle dei temi" -#: ../app/dialogs/preferences-dialog.c:3128 +#: ../app/dialogs/preferences-dialog.c:3148 msgid "Icon Themes" msgstr "Temi icone" -#: ../app/dialogs/preferences-dialog.c:3128 +#: ../app/dialogs/preferences-dialog.c:3148 msgid "Icon Theme Folders" msgstr "Cartelle dei temi icone" -#: ../app/dialogs/preferences-dialog.c:3130 +#: ../app/dialogs/preferences-dialog.c:3150 msgid "Select Icon Theme Folders" msgstr "Seleziona le cartelle dei temi icone" @@ -16423,7 +16657,7 @@ msgstr "_Verticale:" msgid "Image Size" msgstr "Dimensione immagine" -#: ../app/dialogs/scale-dialog.c:181 ../app/paint/gimppaintoptions.c:403 +#: ../app/dialogs/scale-dialog.c:181 ../app/paint/gimppaintoptions.c:412 msgid "Quality" msgstr "Qualità" @@ -16645,10 +16879,10 @@ msgstr "Sposta" #: ../app/display/gimpcursorview.c:250 ../app/display/gimpcursorview.c:256 #: ../app/display/gimpcursorview.c:275 ../app/display/gimpcursorview.c:281 #: ../app/display/gimpcursorview.c:297 ../app/display/gimpcursorview.c:304 -#: ../app/display/gimpcursorview.c:706 ../app/display/gimpcursorview.c:708 -#: ../app/display/gimpcursorview.c:710 ../app/display/gimpcursorview.c:712 -#: ../app/display/gimpcursorview.c:791 ../app/display/gimpcursorview.c:792 +#: ../app/display/gimpcursorview.c:708 ../app/display/gimpcursorview.c:710 +#: ../app/display/gimpcursorview.c:712 ../app/display/gimpcursorview.c:714 #: ../app/display/gimpcursorview.c:793 ../app/display/gimpcursorview.c:794 +#: ../app/display/gimpcursorview.c:795 ../app/display/gimpcursorview.c:796 msgid "n/a" msgstr "n/a" @@ -16684,7 +16918,7 @@ msgstr "L" msgid "H" msgstr "A" -#: ../app/display/gimpcursorview.c:337 +#: ../app/display/gimpcursorview.c:339 msgid "_Sample Merged" msgstr "Campionamento diffu_so" @@ -16692,24 +16926,24 @@ msgstr "Campionamento diffu_so" msgid "Access the image menu" msgstr "Accedi al menu immagine" -#: ../app/display/gimpdisplayshell.c:667 +#: ../app/display/gimpdisplayshell.c:670 msgid "Zoom image when window size changes" msgstr "Zooma l'immagine quando cambia la dimensione della finestra" -#: ../app/display/gimpdisplayshell.c:696 +#: ../app/display/gimpdisplayshell.c:699 msgid "Toggle Quick Mask" msgstr "Commuta maschera veloce" -#: ../app/display/gimpdisplayshell.c:719 +#: ../app/display/gimpdisplayshell.c:722 msgid "Navigate the image display" msgstr "Naviga nella finestra immagine" -#: ../app/display/gimpdisplayshell.c:789 ../app/display/gimpdisplayshell.c:1445 +#: ../app/display/gimpdisplayshell.c:792 ../app/display/gimpdisplayshell.c:1448 #: ../app/widgets/gimptoolbox.c:251 msgid "Drop image files here to open them" msgstr "Trascina e rilascia qui i file immagine per aprirli" -#: ../app/display/gimpdisplayshell-callbacks.c:551 +#: ../app/display/gimpdisplayshell-callbacks.c:565 #, c-format msgid "" "Unstable Development Version\n" @@ -16800,17 +17034,19 @@ msgstr "Nuovo livello" msgid "Drop New Path" msgstr "Nuovo tracciato" -#: ../app/display/gimpdisplayshell-dnd.c:360 ../app/tools/gimpblendtool.c:243 +#: ../app/display/gimpdisplayshell-dnd.c:360 #: ../app/tools/gimpbucketfilltool.c:137 ../app/tools/gimpcagetool.c:220 -#: ../app/tools/gimpfiltertool.c:268 ../app/tools/gimpselectiontool.c:427 +#: ../app/tools/gimpfiltertool.c:270 ../app/tools/gimpgradienttool.c:243 +#: ../app/tools/gimpselectiontool.c:427 msgid "Cannot modify the pixels of layer groups." msgstr "Impossibile modificare i pixel di un gruppo di livelli." -#: ../app/display/gimpdisplayshell-dnd.c:368 ../app/tools/gimpblendtool.c:250 +#: ../app/display/gimpdisplayshell-dnd.c:368 #: ../app/tools/gimpbucketfilltool.c:144 ../app/tools/gimpcagetool.c:227 -#: ../app/tools/gimpcroptool.c:462 ../app/tools/gimpfiltertool.c:275 -#: ../app/tools/gimppainttool.c:279 ../app/tools/gimpselectiontool.c:432 -#: ../app/tools/gimptransformtool.c:1435 ../app/tools/gimpwarptool.c:629 +#: ../app/tools/gimpcroptool.c:462 ../app/tools/gimpfiltertool.c:277 +#: ../app/tools/gimpgradienttool.c:250 ../app/tools/gimppainttool.c:277 +#: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:1449 +#: ../app/tools/gimpwarptool.c:629 msgid "The active layer's pixels are locked." msgstr "I pixel del livello attivo sono bloccati." @@ -16829,13 +17065,13 @@ msgid "Drop color to layer" msgstr "Rilascia il colore sul livello" #: ../app/display/gimpdisplayshell-dnd.c:569 -#: ../app/widgets/gimplayertreeview.c:735 +#: ../app/widgets/gimplayertreeview.c:756 msgid "Drop layers" msgstr "Rilascia i livelli" #: ../app/display/gimpdisplayshell-dnd.c:706 #: ../app/display/gimpdisplayshell-dnd.c:724 -#: ../app/widgets/gimplayertreeview.c:810 ../app/widgets/gimptoolbox-dnd.c:272 +#: ../app/widgets/gimplayertreeview.c:831 ../app/widgets/gimptoolbox-dnd.c:272 msgid "Dropped Buffer" msgstr "Buffer rilasciato" @@ -16857,7 +17093,7 @@ msgstr "Immagine salvata su \"%s\"" msgid "Image exported to '%s'" msgstr "Immagine esportata su \"%s\"" -#: ../app/display/gimpdisplayshell-layer-select.c:125 +#: ../app/display/gimpdisplayshell-layer-select.c:128 msgid "Layer Select" msgstr "Selezione livello" @@ -16920,7 +17156,7 @@ msgstr "gestione del colore non attiva" msgid "pixels" msgstr "pixel" -#: ../app/display/gimpstatusbar.c:456 +#: ../app/display/gimpstatusbar.c:460 #, c-format msgid "Cancel %s" msgstr "Cancella %s" @@ -16949,6 +17185,45 @@ msgstr "Fare clic e trascinare per spostare questo punto" msgid "Click-Drag to move all points" msgstr "Fare clic e trascinare per spostare tutti i punti" +#: ../app/display/gimptoolgyroscope.c:702 +msgid "Click-Drag to zoom" +msgstr "Fare clic e trascinare per fare zoom" + +#: ../app/display/gimptoolgyroscope.c:706 +#, c-format +msgid "%s for constrained steps" +msgstr "%s per i passi bloccati" + +#: ../app/display/gimptoolgyroscope.c:713 +#: ../app/display/gimptooltransformgrid.c:1782 +msgid "Click-Drag to rotate" +msgstr "Fare clic e trascinare per ruotare" + +#: ../app/display/gimptoolgyroscope.c:717 ../app/display/gimptoolline.c:1490 +#: ../app/tools/gimppainttool.c:569 +#, c-format +msgid "%s for constrained angles" +msgstr "%s per gli angoli bloccati" + +#: ../app/display/gimptoolgyroscope.c:722 +msgid "Click-Drag to pan" +msgstr "Fare clic e trascinare il pan" + +#: ../app/display/gimptoolgyroscope.c:728 +#, c-format +msgid "%s to rotate" +msgstr "%s per ruotare" + +#: ../app/display/gimptoolgyroscope.c:729 +#, c-format +msgid "%s for a constrained axis" +msgstr "%s per un asse bloccato" + +#: ../app/display/gimptoolgyroscope.c:730 +#, c-format +msgid "%s to zoom" +msgstr "%s per fare zoom" + #: ../app/display/gimptoolhandlegrid.c:837 #: ../app/display/gimptooltransformgrid.c:1773 msgid "Click-Drag to move" @@ -16987,11 +17262,6 @@ msgstr "Linea: " msgid "Click-Drag to move the endpoint" msgstr "Fare clic e trascinare per spostare il punto" -#: ../app/display/gimptoolline.c:1490 ../app/tools/gimppainttool.c:657 -#, c-format -msgid "%s for constrained angles" -msgstr "%s per gli angoli bloccati" - #: ../app/display/gimptoolline.c:1497 msgid "Release to remove the slider" msgstr "Rilasciare per rimuovere il cursore" @@ -17225,10 +17495,6 @@ msgstr "Fare clic e trascinare per spostare il punto cardine" msgid "Click-Drag to shear" msgstr "Fare clic e trascinare per inclinare" -#: ../app/display/gimptooltransformgrid.c:1782 -msgid "Click-Drag to rotate" -msgstr "Fare clic e trascinare per ruotare" - #: ../app/file/file-open.c:116 ../app/file/file-save.c:114 msgid "Not a regular file" msgstr "Non è un file normale" @@ -17416,23 +17682,23 @@ msgstr "Auto" #: ../app/operations/operations-enums.c:60 msgctxt "layer-composite-mode" -msgid "Source over" -msgstr "Sorgente sopra" +msgid "Union" +msgstr "Unione" #: ../app/operations/operations-enums.c:61 msgctxt "layer-composite-mode" -msgid "Source atop" -msgstr "Sorgente in cima" +msgid "Clip to backdrop" +msgstr "Ritaglio allo sfondo" #: ../app/operations/operations-enums.c:62 msgctxt "layer-composite-mode" -msgid "Destination atop" -msgstr "Destinazione in cima" +msgid "Clip to layer" +msgstr "Ritaglio al livello" #: ../app/operations/operations-enums.c:63 msgctxt "layer-composite-mode" -msgid "Source in" -msgstr "Sorgente in" +msgid "Intersection" +msgstr "Intersezione" #: ../app/operations/operations-enums.c:153 msgctxt "layer-mode" @@ -18181,10 +18447,42 @@ msgstr "" msgid "default:LTR" msgstr "default:LTR" +#: ../app/gui/gui.c:326 +msgid "Image Recovery" +msgstr "Recupero immagine" + +#: ../app/gui/gui.c:328 +msgid "_Discard" +msgstr "Abban_dona" + +#: ../app/gui/gui.c:329 +msgid "_Recover" +msgstr "_Recupera" + +#: ../app/gui/gui.c:340 +msgid "Eeek! It looks like GIMP recovered from a crash!" +msgstr "Eeek! Sembra che GIMP sia ripartito dopo un crash!" + +#. TRANSLATORS: even if English singular form does +#. * not use %d, you can use %d for translation in +#. * any singular/plural form of your language if +#. * suited. It will just work and be replaced by the +#. * number of images as expected. +#. +#: ../app/gui/gui.c:349 +#, c-format +msgid "" +"An image was salvaged from the crash. Do you want to try and recover it?" +msgid_plural "" +"%d images were salvaged from the crash. Do you want to try and recover them?" +msgstr[0] "Un'immagine è stata salvata dal crash. Vuoi provare a recuperarla?" +msgstr[1] "" +"%d immagini sono state salvate dal crash. Vuoi provare a recuperarle?" + #. load the recent documents after gimp_real_restore() because we #. * need the mime-types implemented by plug-ins #. -#: ../app/gui/gui.c:543 +#: ../app/gui/gui.c:594 msgid "Documents" msgstr "Documenti" @@ -18209,11 +18507,11 @@ msgstr "Solo movimento" msgid "Flow" msgstr "Flusso" -#: ../app/paint/gimpbrushcore.c:394 +#: ../app/paint/gimpbrushcore.c:378 msgid "No brushes available for use with this tool." msgstr "Nessun pennello disponibile da usare con questo strumento." -#: ../app/paint/gimpbrushcore.c:401 +#: ../app/paint/gimpbrushcore.c:385 msgid "No paint dynamics available for use with this tool." msgstr "Nessuna dinamica di disegno disponibile per questo strumento." @@ -18275,7 +18573,7 @@ msgid "Ink" msgstr "Stilo" #: ../app/paint/gimpinkoptions.c:74 ../app/paint/gimpinkoptions.c:87 -#: ../app/paint/gimppaintoptions.c:191 ../app/tools/gimpwarpoptions.c:91 +#: ../app/paint/gimppaintoptions.c:193 ../app/tools/gimpwarpoptions.c:91 msgid "Size" msgstr "Dimensione" @@ -18284,7 +18582,7 @@ msgid "Ink Blob Size" msgstr "Dimensione macchia stilo" #: ../app/paint/gimpinkoptions.c:80 ../app/paint/gimpinkoptions.c:119 -#: ../app/paint/gimppaintoptions.c:205 ../app/widgets/gimpbrusheditor.c:200 +#: ../app/paint/gimppaintoptions.c:207 ../app/widgets/gimpbrusheditor.c:200 msgid "Angle" msgstr "Angolo" @@ -18294,8 +18592,8 @@ msgid "Tilt" msgstr "Inclinazione" #. Blob shape widgets -#: ../app/paint/gimpinkoptions.c:106 ../app/tools/gimpblendoptions.c:90 -#: ../app/tools/gimpblendoptions.c:277 ../app/tools/gimpinkoptions-gui.c:103 +#: ../app/paint/gimpinkoptions.c:106 ../app/tools/gimpgradientoptions.c:95 +#: ../app/tools/gimpgradientoptions.c:305 ../app/tools/gimpinkoptions-gui.c:103 msgid "Shape" msgstr "Taglio" @@ -18329,7 +18627,7 @@ msgstr "Raggio" msgid "Base Opacity" msgstr "Opacità base" -#: ../app/paint/gimpmybrushoptions.c:100 ../app/paint/gimppaintoptions.c:219 +#: ../app/paint/gimpmybrushoptions.c:100 ../app/paint/gimppaintoptions.c:221 #: ../app/tools/gimpwarpoptions.c:98 ../app/widgets/gimpbrusheditor.c:178 msgid "Hardness" msgstr "Durezza" @@ -18354,154 +18652,164 @@ msgstr "Pennello" msgid "Paint" msgstr "Disegna" -#: ../app/paint/gimppaintoptions.c:192 +#: ../app/paint/gimppaintoptions.c:194 msgid "Brush Size" msgstr "Dimensione pennello" -#: ../app/paint/gimppaintoptions.c:198 +#: ../app/paint/gimppaintoptions.c:200 msgid "Aspect Ratio" msgstr "Rapporto dimensioni" -#: ../app/paint/gimppaintoptions.c:212 ../app/tools/gimpwarpoptions.c:112 +#: ../app/paint/gimppaintoptions.c:214 ../app/tools/gimpwarpoptions.c:112 #: ../app/widgets/gimpbrusheditor.c:211 #: ../app/widgets/gimpbrushfactoryview.c:81 ../app/widgets/gimpgrideditor.c:174 msgid "Spacing" msgstr "Spaziatura" -#: ../app/paint/gimppaintoptions.c:226 +#: ../app/paint/gimppaintoptions.c:228 msgid "Force" msgstr "Forza" -#: ../app/paint/gimppaintoptions.c:227 +#: ../app/paint/gimppaintoptions.c:229 msgid "Brush Force" msgstr "Forza pennello" -#: ../app/paint/gimppaintoptions.c:233 +#: ../app/paint/gimppaintoptions.c:235 msgid "Link Size" msgstr "Dimensione collegamento" -#: ../app/paint/gimppaintoptions.c:234 +#: ../app/paint/gimppaintoptions.c:236 msgid "Link brush size to brush native" msgstr "Collega la dimensione pennello all'originale" -#: ../app/paint/gimppaintoptions.c:240 +#: ../app/paint/gimppaintoptions.c:242 msgid "Link Aspect Ratio" msgstr "Rapporto dimensioni collegamento" -#: ../app/paint/gimppaintoptions.c:241 +#: ../app/paint/gimppaintoptions.c:243 msgid "Link brush aspect ratio to brush native" msgstr "Collega il rapporto dimensioni pennello all'originale" -#: ../app/paint/gimppaintoptions.c:247 +#: ../app/paint/gimppaintoptions.c:249 msgid "Link Angle" msgstr "Angolo collegamento" -#: ../app/paint/gimppaintoptions.c:248 +#: ../app/paint/gimppaintoptions.c:250 msgid "Link brush angle to brush native" msgstr "Collega l'angolo pennello all'originale" -#: ../app/paint/gimppaintoptions.c:254 +#: ../app/paint/gimppaintoptions.c:256 msgid "Link Spacing" msgstr "Spaziatura collegamento" -#: ../app/paint/gimppaintoptions.c:255 +#: ../app/paint/gimppaintoptions.c:257 msgid "Link brush spacing to brush native" msgstr "Collega la spaziatura pennello all'originale" -#: ../app/paint/gimppaintoptions.c:261 +#: ../app/paint/gimppaintoptions.c:263 msgid "Link Hardness" msgstr "Durezza collegamento" -#: ../app/paint/gimppaintoptions.c:262 +#: ../app/paint/gimppaintoptions.c:264 msgid "Link brush hardness to brush native" msgstr "Collega la durezza pennello all'originale" -#: ../app/paint/gimppaintoptions.c:268 +#: ../app/paint/gimppaintoptions.c:270 msgid "Lock brush to view" msgstr "Blocca il pennello alla vista" -#: ../app/paint/gimppaintoptions.c:269 +#: ../app/paint/gimppaintoptions.c:271 msgid "Keep brush appearance fixed relative to the view" msgstr "Mantieni l'aspetto del pennello bloccato relativamente alla vista" -#: ../app/paint/gimppaintoptions.c:275 +#: ../app/paint/gimppaintoptions.c:277 msgid "Incremental" msgstr "Incrementale" -#: ../app/paint/gimppaintoptions.c:276 +#: ../app/paint/gimppaintoptions.c:278 msgid "Every stamp has its own opacity" msgstr "Ogni timbro possiede una propria opacità" -#: ../app/paint/gimppaintoptions.c:283 +#: ../app/paint/gimppaintoptions.c:285 msgid "Hard edge" msgstr "Margine netto" -#: ../app/paint/gimppaintoptions.c:284 +#: ../app/paint/gimppaintoptions.c:286 msgid "Ignore fuzziness of the current brush" msgstr "Ignora le increspature del pennello corrente" -#: ../app/paint/gimppaintoptions.c:290 +#: ../app/paint/gimppaintoptions.c:292 msgid "Apply Jitter" msgstr "Applica tremolio" -#: ../app/paint/gimppaintoptions.c:291 +#: ../app/paint/gimppaintoptions.c:293 msgid "Scatter brush as you paint" msgstr "Distribuisci il pennello durante il disegno" -#: ../app/paint/gimppaintoptions.c:296 +#: ../app/paint/gimppaintoptions.c:298 msgid "Amount" msgstr "Intensità" -#: ../app/paint/gimppaintoptions.c:297 +#: ../app/paint/gimppaintoptions.c:299 msgid "Distance of scattering" msgstr "Distanza della distribuzione" -#: ../app/paint/gimppaintoptions.c:303 +#: ../app/paint/gimppaintoptions.c:305 msgid "Dynamics Options" msgstr "Opzioni delle dinamiche" -#: ../app/paint/gimppaintoptions.c:310 +#: ../app/paint/gimppaintoptions.c:312 msgid "Fade length" msgstr "Lunghezza dissolvenza " -#: ../app/paint/gimppaintoptions.c:311 +#: ../app/paint/gimppaintoptions.c:313 msgid "Distance over which strokes fade out" msgstr "Distanza oltre la quale il tratto si dissolve" -#: ../app/paint/gimppaintoptions.c:321 ../app/widgets/gimpviewablebox.c:381 +#: ../app/paint/gimppaintoptions.c:323 ../app/widgets/gimpviewablebox.c:385 msgid "Reverse" msgstr "Inverso" -#: ../app/paint/gimppaintoptions.c:322 +#: ../app/paint/gimppaintoptions.c:324 msgid "Reverse direction of fading" msgstr "Inverti la direzione della dissolvenza" -#: ../app/paint/gimppaintoptions.c:327 ../app/tools/gimpblendoptions.c:97 -#: ../app/tools/gimpblendoptions.c:286 ../app/tools/gimppaintoptions-gui.c:356 +#: ../app/paint/gimppaintoptions.c:329 ../app/tools/gimpgradientoptions.c:109 +#: ../app/tools/gimpgradientoptions.c:326 +#: ../app/tools/gimppaintoptions-gui.c:356 msgid "Repeat" msgstr "Ripetizione" -#: ../app/paint/gimppaintoptions.c:328 +#: ../app/paint/gimppaintoptions.c:330 msgid "How fade is repeated as you paint" msgstr "Come la dissolvenza viene ripetuta durante il disegno" -#: ../app/paint/gimppaintoptions.c:397 +#: ../app/paint/gimppaintoptions.c:342 ../app/tools/gimpgradientoptions.c:298 +#: ../app/tools/gimppaintoptions-gui.c:392 +msgid "Blend Color Space" +msgstr "Spazio colore sfumatura" + +#: ../app/paint/gimppaintoptions.c:343 +msgid "Which color space to use when blending RGB gradient segments" +msgstr "Che spazio colore usare quando si sfumano i segmenti del gradiente RGB" + +#: ../app/paint/gimppaintoptions.c:406 msgid "Smooth stroke" msgstr "Smussa delineatura" -#: ../app/paint/gimppaintoptions.c:398 +#: ../app/paint/gimppaintoptions.c:407 msgid "Paint smoother strokes" msgstr "Disegna tratteggi più smussati" -#: ../app/paint/gimppaintoptions.c:404 +#: ../app/paint/gimppaintoptions.c:413 msgid "Depth of smoothing" msgstr "Profondità della smussatura" -#: ../app/paint/gimppaintoptions.c:409 +#: ../app/paint/gimppaintoptions.c:418 msgid "Weight" msgstr "Peso" -#: ../app/paint/gimppaintoptions.c:410 +#: ../app/paint/gimppaintoptions.c:419 msgid "Gravity of the pen" msgstr "Gravità della matita" @@ -18514,7 +18822,7 @@ msgstr "Matita" msgid "Perspective Clone" msgstr "Clona in prospettiva" -#: ../app/paint/gimpsmudge.c:85 ../app/tools/gimpsmudgetool.c:55 +#: ../app/paint/gimpsmudge.c:86 ../app/tools/gimpsmudgetool.c:55 msgid "Smudge" msgstr "Sfumino" @@ -18550,7 +18858,7 @@ msgstr "Prima è necessario impostare un'immagine sorgente." msgid "Alignment" msgstr "Allineamento" -#: ../app/paint/gimpsourceoptions.c:71 ../app/pdb/gimppdbcontext.c:127 +#: ../app/paint/gimpsourceoptions.c:71 ../app/pdb/gimppdbcontext.c:128 #: ../app/tools/gimpbucketfilloptions.c:117 ../app/tools/gimpcoloroptions.c:69 #: ../app/tools/gimphealtool.c:99 ../app/tools/gimpregionselectoptions.c:97 msgid "Sample merged" @@ -18644,7 +18952,7 @@ msgstr "Soglia" msgid "Plug-in" msgstr "Plug-in" -#: ../app/pdb/drawable-cmds.c:963 ../app/tools/gimpforegroundselecttool.c:987 +#: ../app/pdb/drawable-cmds.c:963 ../app/tools/gimpforegroundselecttool.c:993 msgctxt "command" msgid "Foreground Select" msgstr "Selezione primo piano" @@ -18663,8 +18971,8 @@ msgstr "Inversione" #: ../app/pdb/drawable-transform-cmds.c:455 #: ../app/pdb/item-transform-cmds.c:270 ../app/pdb/transform-tools-cmds.c:171 #: ../app/tools/gimpperspectivetool.c:85 -#: ../app/tools/gimptransformoptions.c:552 -#: ../app/tools/gimptransformoptions.c:561 +#: ../app/tools/gimptransformoptions.c:560 +#: ../app/tools/gimptransformoptions.c:569 msgid "Perspective" msgstr "Prospettiva" @@ -18687,10 +18995,6 @@ msgstr "Trasformazione 2D" msgid "2D Transforming" msgstr "Trasformazione 2D in corso" -#: ../app/pdb/edit-cmds.c:797 -msgid "Blending" -msgstr "Sfumatura in corso" - #: ../app/pdb/floating-sel-cmds.c:69 msgid "Cannot remove this layer because it is not a floating selection." msgstr "" @@ -18986,53 +19290,57 @@ msgstr "" "La procedura \"%s\" è stata chiamata con un argomento di tipo errato #%d. " "Era previsto %s, ottenuto invece %s. " -#: ../app/pdb/gimppdbcontext.c:100 ../app/tools/gimpselectionoptions.c:81 +#: ../app/pdb/gimppdbcontext.c:101 ../app/tools/gimpselectionoptions.c:81 msgid "Smooth edges" msgstr "Smussa margini" -#: ../app/pdb/gimppdbcontext.c:106 +#: ../app/pdb/gimppdbcontext.c:107 msgid "Feather" msgstr "Sfumata" -#: ../app/pdb/gimppdbcontext.c:113 +#: ../app/pdb/gimppdbcontext.c:114 msgid "Feather radius X" msgstr "Raggio X sfumatura" -#: ../app/pdb/gimppdbcontext.c:120 +#: ../app/pdb/gimppdbcontext.c:121 msgid "Feather radius Y" msgstr "Sfumatura raggio Y" -#: ../app/pdb/gimppdbcontext.c:134 +#: ../app/pdb/gimppdbcontext.c:135 msgid "Sample criterion" msgstr "Criteri di campionamento" -#: ../app/pdb/gimppdbcontext.c:142 +#: ../app/pdb/gimppdbcontext.c:143 msgid "Sample threshold" msgstr "Soglia campionamento" -#: ../app/pdb/gimppdbcontext.c:149 +#: ../app/pdb/gimppdbcontext.c:150 msgid "Sample transparent" msgstr "Campione trasparente" -#: ../app/pdb/gimppdbcontext.c:156 ../app/tools/gimpbucketfilloptions.c:124 +#: ../app/pdb/gimppdbcontext.c:157 ../app/tools/gimpbucketfilloptions.c:124 #: ../app/tools/gimpregionselectoptions.c:104 msgid "Diagonal neighbors" msgstr "Vicini diagonali" -#: ../app/pdb/gimppdbcontext.c:163 ../app/tools/gimptransformoptions.c:124 -#: ../app/tools/gimptransformoptions.c:440 ../app/tools/gimpwarpoptions.c:119 +#: ../app/pdb/gimppdbcontext.c:164 ../app/tools/gimptransformoptions.c:124 +#: ../app/tools/gimptransformoptions.c:448 ../app/tools/gimpwarpoptions.c:119 #: ../app/tools/gimpwarpoptions.c:322 msgid "Interpolation" msgstr "Interpolazione" -#: ../app/pdb/gimppdbcontext.c:171 +#: ../app/pdb/gimppdbcontext.c:172 msgid "Transform direction" msgstr "Direzione di trasformazione" -#: ../app/pdb/gimppdbcontext.c:179 +#: ../app/pdb/gimppdbcontext.c:180 msgid "Transform resize" msgstr "Ridimensione trasformazione" +#: ../app/pdb/gimppdbcontext.c:195 +msgid "Distance metric" +msgstr "Metrica distanza" + #: ../app/pdb/gimpprocedure.c:467 ../app/plug-in/gimppluginprocframe.c:191 #, c-format msgid "Procedure '%s' returned no return values" @@ -19493,7 +19801,7 @@ msgstr "Riferimento a interprete errato in file interprete %s: %s" msgid "Bad binary format string in interpreter file %s" msgstr "Stringa di formato binario errato in file interprete %s" -#: ../app/plug-in/gimpplugin.c:632 +#: ../app/plug-in/gimpplugin.c:622 #, c-format msgid "" "Plug-in crashed: \"%s\"\n" @@ -19730,7 +20038,7 @@ msgstr "Bordi affilati" msgid "Other Options" msgstr "Altre opzioni" -#: ../app/propgui/gimppropgui-generic.c:177 +#: ../app/propgui/gimppropgui-generic.c:185 msgid "Pick coordinates from the image" msgstr "Prelievo coordinate dall'immagine" @@ -19794,6 +20102,10 @@ msgstr "_Saturazione" msgid "R_eset Color" msgstr "R_eimposta il colore" +#: ../app/propgui/gimppropgui-panorama-projection.c:125 +msgid "Panorama Projection: " +msgstr "Proiezione panorama:" + #: ../app/propgui/gimppropgui-recursive-transform.c:125 msgid "Recursive Transform: " msgstr "Trasformazione ricorsiva:" @@ -19902,11 +20214,11 @@ msgstr "Scegliere da un elenco di temperature di colore tipiche" msgid "New Seed" msgstr "Nuovo seme" -#: ../app/propgui/gimppropgui.c:375 +#: ../app/propgui/gimppropgui.c:376 msgid "Pick color from the image" msgstr "Prelievo colore dall'immagine" -#: ../app/propgui/gimppropgui.c:517 +#: ../app/propgui/gimppropgui.c:520 msgid "This operation has no editable properties" msgstr "Questa operazione non ha proprietà modificabili" @@ -19920,7 +20232,7 @@ msgstr "" "Mai posto quiz vaghi\n" "o indecifrabili." -#: ../app/text/gimptext-compat.c:106 ../app/tools/gimptexttool.c:1462 +#: ../app/text/gimptext-compat.c:106 ../app/tools/gimptexttool.c:1472 msgid "Add Text Layer" msgstr "Aggiungi livello testo" @@ -19978,7 +20290,7 @@ msgstr "" "Il testo non può essere renderizzato. È probabilmente troppo grande. " "Accorciarlo o usare un carattere più piccolo." -#: ../app/text/gimptextlayer-xcf.c:77 +#: ../app/text/gimptextlayer-xcf.c:78 #, c-format msgid "" "Problems parsing the text parasite for layer '%s':\n" @@ -20146,172 +20458,6 @@ msgstr "Fare clic per prendere questo tracciato come prima voce" msgid "Click to add this path to the list" msgstr "Fare clic per aggiungere questo tracciato alla lista" -#: ../app/tools/gimpblendoptions.c:105 -msgid "Adaptive Supersampling" -msgstr "Sovracampionamento adattivo" - -#: ../app/tools/gimpblendoptions.c:111 -msgid "Max depth" -msgstr "Profondità max" - -#: ../app/tools/gimpblendoptions.c:117 ../app/tools/gimpbucketfilloptions.c:142 -#: ../app/tools/gimpregionselectoptions.c:112 -#: ../app/tools/gimpthresholdtool.c:87 -msgid "Threshold" -msgstr "Soglia" - -#: ../app/tools/gimpblendoptions.c:131 -msgid "Instant mode" -msgstr "Modalità istantanea" - -#: ../app/tools/gimpblendoptions.c:132 -msgid "Commit gradient instantly" -msgstr "Imposta il gradiente istantaneamente" - -#: ../app/tools/gimpblendoptions.c:138 -msgid "Modify active gradient" -msgstr "Modifica il gradiente attivo" - -#: ../app/tools/gimpblendoptions.c:139 -msgid "Modify the active gradient in-place" -msgstr "Modifica il gradiente attivo sul posto" - -#: ../app/tools/gimpblendoptions.c:271 ../app/tools/gimppaintoptions-gui.c:379 -msgid "Edit this gradient" -msgstr "Modifica questo gradiente" - -#. the instant toggle -#: ../app/tools/gimpblendoptions.c:326 -#, c-format -msgid "Instant mode (%s)" -msgstr "Modalità istantanea (%s)" - -#: ../app/tools/gimpblendoptions.c:346 -msgid "" -"The active gradient is non-writable and cannot be edited directly. Uncheck " -"this option to edit a copy of it." -msgstr "" -"Il gradiente attivo è non scrivibile e non può essere modificato " -"direttamente. Togliere la spunta a questa opzione per modificarne una copia " -"di esso." - -#: ../app/tools/gimpblendtool.c:156 -msgid "Blend" -msgstr "Sfumatura" - -#: ../app/tools/gimpblendtool.c:157 -msgid "Blend Tool: Fill selected area with a color gradient" -msgstr "" -"Strumento sfumatura: riempie l'area selezionata con un gradiente di colore" - -#: ../app/tools/gimpblendtool.c:158 -msgid "Blen_d" -msgstr "S_fumatura" - -#: ../app/tools/gimpblendtool.c:213 -msgid "Click-Drag to draw a gradient" -msgstr "Fare clic e trascinare per disegnare un gradiente" - -#: ../app/tools/gimpblendtool.c:257 ../app/tools/gimpbucketfilltool.c:151 -#: ../app/tools/gimpcagetool.c:234 ../app/tools/gimpfiltertool.c:282 -#: ../app/tools/gimpforegroundselecttool.c:288 ../app/tools/gimppainttool.c:286 -#: ../app/tools/gimptransformtool.c:1443 ../app/tools/gimpwarptool.c:640 -msgid "The active layer is not visible." -msgstr "Il livello attivo non è visibile." - -#: ../app/tools/gimpblendtool.c:264 -msgid "No gradient available for use with this tool." -msgstr "Nessun motivo disponibile con questo strumento." - -#: ../app/tools/gimpblendtool.c:571 -msgid "Blend: " -msgstr "Sfumatura:" - -#. the position labels -#: ../app/tools/gimpblendtool-editor.c:1280 -msgid "X:" -msgstr "X:" - -#: ../app/tools/gimpblendtool-editor.c:1286 -msgid "Y:" -msgstr "Y:" - -#. the color label -#: ../app/tools/gimpblendtool-editor.c:1339 ../app/tools/gimptextoptions.c:583 -msgid "Color:" -msgstr "Colore:" - -#: ../app/tools/gimpblendtool-editor.c:1347 -msgid "Change Endpoint Color" -msgstr "Cambia il colore del capo" - -#. the position label -#: ../app/tools/gimpblendtool-editor.c:1385 -#: ../app/tools/gimpblendtool-editor.c:1505 -#: ../app/tools/gimprectangleoptions.c:1031 -msgid "Position:" -msgstr "Posizione:" - -#. the color labels -#: ../app/tools/gimpblendtool-editor.c:1410 -msgid "Left color:" -msgstr "Colore sinistro:" - -#: ../app/tools/gimpblendtool-editor.c:1416 -msgid "Right color:" -msgstr "Colore destro:" - -#: ../app/tools/gimpblendtool-editor.c:1443 -#: ../app/tools/gimpblendtool-editor.c:1452 -msgid "Change Stop Color" -msgstr "Cambia il colore dello stop" - -#: ../app/tools/gimpblendtool-editor.c:1474 -msgid "Delete stop" -msgstr "Cancella stop" - -#. the type label -#: ../app/tools/gimpblendtool-editor.c:1530 -msgid "Blending:" -msgstr "Sfumatura:" - -#. the color label -#: ../app/tools/gimpblendtool-editor.c:1552 -msgid "Coloring:" -msgstr "Colorazione:" - -#: ../app/tools/gimpblendtool-editor.c:1586 -msgid "New stop at midpoint" -msgstr "Nuovo stop al punto intermedio" - -#: ../app/tools/gimpblendtool-editor.c:1594 -msgid "Center midpoint" -msgstr "Centra punto intermedio" - -#: ../app/tools/gimpblendtool-editor.c:1657 -msgid "Start Endpoint" -msgstr "Capo iniziale" - -#: ../app/tools/gimpblendtool-editor.c:1665 -msgid "End Endpoint" -msgstr "Capo finale" - -#: ../app/tools/gimpblendtool-editor.c:1718 -#, c-format -msgid "Stop %d" -msgstr "Stop %d" - -#: ../app/tools/gimpblendtool-editor.c:1786 -#, c-format -msgid "Midpoint %d" -msgstr "Punto intermedio %d" - -# CHECK: questo è un verbo o no? -#: ../app/tools/gimpblendtool-editor.c:2364 -#: ../app/tools/gimpblendtool-editor.c:2373 -msgid "Blend Step" -msgstr "Mescola passo" - #: ../app/tools/gimpbrightnesscontrasttool.c:97 msgid "Brightness-Contrast" msgstr "Luminosità-contrasto" @@ -20370,6 +20516,13 @@ msgstr "" "(vedere soglia). Disabilita l'antialiasing per riempire l'intera area " "uniformemente." +#: ../app/tools/gimpbucketfilloptions.c:142 +#: ../app/tools/gimpgradientoptions.c:129 +#: ../app/tools/gimpregionselectoptions.c:112 +#: ../app/tools/gimpthresholdtool.c:87 +msgid "Threshold" +msgstr "Soglia" + #: ../app/tools/gimpbucketfilloptions.c:143 #: ../app/tools/gimpregionselectoptions.c:113 msgid "Maximum color difference" @@ -20421,6 +20574,14 @@ msgstr "" msgid "_Bucket Fill" msgstr "_Riempimento colore" +#: ../app/tools/gimpbucketfilltool.c:151 ../app/tools/gimpcagetool.c:234 +#: ../app/tools/gimpfiltertool.c:284 +#: ../app/tools/gimpforegroundselecttool.c:288 +#: ../app/tools/gimpgradienttool.c:257 ../app/tools/gimppainttool.c:284 +#: ../app/tools/gimptransformtool.c:1457 ../app/tools/gimpwarptool.c:640 +msgid "The active layer is not visible." +msgstr "Il livello attivo non è visibile." + #: ../app/tools/gimpbycolorselecttool.c:67 msgid "Select by Color" msgstr "Selezione per colore" @@ -20558,11 +20719,11 @@ msgstr "Prelievo c_olore" msgid "Click in any image to view its color" msgstr "Fare clic sull'immagine per visualizzare il colore" -#: ../app/tools/gimpcolorpickertool.c:260 ../app/tools/gimppainttool.c:500 +#: ../app/tools/gimpcolorpickertool.c:260 ../app/tools/gimppainttool.c:412 msgid "Click in any image to pick the foreground color" msgstr "Fare clic sull'immagine per prelevare il colore di primo piano" -#: ../app/tools/gimpcolorpickertool.c:268 ../app/tools/gimppainttool.c:506 +#: ../app/tools/gimpcolorpickertool.c:268 ../app/tools/gimppainttool.c:418 msgid "Click in any image to pick the background color" msgstr "Fare clic sull'immagine per prelevare il colore di sfondo" @@ -20868,48 +21029,48 @@ msgid "Color _managed" msgstr "Colore _gestito" #. The Color Options expander -#: ../app/tools/gimpfiltertool.c:371 +#: ../app/tools/gimpfiltertool.c:373 msgid "Advanced Color Options" msgstr "Opzioni colore avanzate" -#: ../app/tools/gimpfiltertool.c:390 +#: ../app/tools/gimpfiltertool.c:392 msgid "Convert pixels to built-in sRGB to apply filter (slow)" msgstr "Converte i pixel in sRGB incorporato per applicare il filtro (lento)" -#: ../app/tools/gimpfiltertool.c:391 +#: ../app/tools/gimpfiltertool.c:393 msgid "Assume pixels are built-in sRGB (ignore actual image color space)" msgstr "" "Presume che i pixel siano in sRGB incorporato (ignora lo spazio colore " "immagine corrente)" -#: ../app/tools/gimpfiltertool.c:626 +#: ../app/tools/gimpfiltertool.c:628 msgid "Click to switch the original and filtered sides" msgstr "Fare clic per passare dal lato originale a quello filtrato o viceversa" -#: ../app/tools/gimpfiltertool.c:630 +#: ../app/tools/gimpfiltertool.c:632 msgid "Click to switch between vertical and horizontal" msgstr "Fare clic per passare da verticale a orizzontale o viceversa" -#: ../app/tools/gimpfiltertool.c:634 +#: ../app/tools/gimpfiltertool.c:636 msgid "Click to move the split guide" msgstr "Fare clic per spostare la separazione" -#: ../app/tools/gimpfiltertool.c:636 +#: ../app/tools/gimpfiltertool.c:638 #, c-format msgid "%s: switch original and filtered" msgstr "%s: commuta originale e filtrato" -#: ../app/tools/gimpfiltertool.c:637 +#: ../app/tools/gimpfiltertool.c:639 #, c-format msgid "%s: switch horizontal and vertical" msgstr "%s: commuta orizzontale e verticale" -#: ../app/tools/gimpfiltertool.c:1295 ../app/tools/gimpfiltertool-settings.c:71 +#: ../app/tools/gimpfiltertool.c:1300 ../app/tools/gimpfiltertool-settings.c:71 #, c-format msgid "Import '%s' Settings" msgstr "Importa le impostazioni \"%s\"" -#: ../app/tools/gimpfiltertool.c:1297 ../app/tools/gimpfiltertool-settings.c:73 +#: ../app/tools/gimpfiltertool.c:1302 ../app/tools/gimpfiltertool-settings.c:73 #, c-format msgid "Export '%s' Settings" msgstr "Esporta le impostazioni \"%s\"" @@ -20931,7 +21092,7 @@ msgstr "Tipo di riflessione" msgid "Direction of flipping" msgstr "Direzione della riflessione" -#: ../app/tools/gimpflipoptions.c:139 ../app/tools/gimptransformoptions.c:425 +#: ../app/tools/gimpflipoptions.c:139 ../app/tools/gimptransformoptions.c:433 msgid "Transform:" msgstr "Trasforma:" @@ -20942,7 +21103,7 @@ msgid "Direction (%s)" msgstr "Direzione (%s)" #: ../app/tools/gimpflipoptions.c:170 ../app/tools/gimptransformoptions.c:132 -#: ../app/tools/gimptransformoptions.c:447 +#: ../app/tools/gimptransformoptions.c:455 msgid "Clipping" msgstr "Ritaglio" @@ -21055,43 +21216,43 @@ msgstr "" msgid "F_oreground Select" msgstr "Prim_o piano" -#: ../app/tools/gimpforegroundselecttool.c:301 +#: ../app/tools/gimpforegroundselecttool.c:307 msgid "Dialog for foreground select" msgstr "Finestra per la selezione primo piano" -#: ../app/tools/gimpforegroundselecttool.c:319 +#: ../app/tools/gimpforegroundselecttool.c:325 msgid "_Preview mask" msgstr "Ante_prima maschera" -#: ../app/tools/gimpforegroundselecttool.c:330 +#: ../app/tools/gimpforegroundselecttool.c:336 msgid "Select foreground pixels" msgstr "Seleziona i pixel in primo piano" -#: ../app/tools/gimpforegroundselecttool.c:606 +#: ../app/tools/gimpforegroundselecttool.c:612 msgid "Roughly outline the object to extract" msgstr "Delinea grossolanamente l'oggetto da estrarre" -#: ../app/tools/gimpforegroundselecttool.c:627 +#: ../app/tools/gimpforegroundselecttool.c:633 msgid "Selecting foreground," msgstr "Selezione primo piano," -#: ../app/tools/gimpforegroundselecttool.c:629 +#: ../app/tools/gimpforegroundselecttool.c:635 msgid "Selecting background," msgstr "Selezione sfondo," -#: ../app/tools/gimpforegroundselecttool.c:631 +#: ../app/tools/gimpforegroundselecttool.c:637 msgid "Selecting unknown," msgstr "Selezione sconosciuta," -#: ../app/tools/gimpforegroundselecttool.c:634 +#: ../app/tools/gimpforegroundselecttool.c:640 msgid "press Enter to preview." msgstr "premere invio l'anteprima." -#: ../app/tools/gimpforegroundselecttool.c:636 +#: ../app/tools/gimpforegroundselecttool.c:642 msgid "press Escape to exit preview or Enter to apply." msgstr "Esc per uscire dall'anteprima o Invio per applicare." -#: ../app/tools/gimpforegroundselecttool.c:1210 +#: ../app/tools/gimpforegroundselecttool.c:1219 msgid "Paint mask" msgstr "Maschera di disegno" @@ -21130,7 +21291,7 @@ msgid "Fuzzy Select" msgstr "Selezione fuzzy" #: ../app/tools/gimpgegltool.c:78 ../app/tools/gimpgegltool.c:539 -#: ../app/tools/gimpgegltool.c:540 ../app/tools/gimpoperationtool.c:131 +#: ../app/tools/gimpgegltool.c:540 ../app/tools/gimpoperationtool.c:134 msgid "GEGL Operation" msgstr "Operazione GEGL" @@ -21138,7 +21299,7 @@ msgstr "Operazione GEGL" msgid "GEGL Tool: Use an arbitrary GEGL operation" msgstr "Strumento GEGL: usa una qualsiasi operazione GEGL" -#: ../app/tools/gimpgegltool.c:80 ../app/tools/gimpoperationtool.c:133 +#: ../app/tools/gimpgegltool.c:80 ../app/tools/gimpoperationtool.c:136 msgid "_GEGL Operation..." msgstr "Operazione _GEGL... " @@ -21155,6 +21316,165 @@ msgstr "Matrice di trasformazione" msgid "Invalid transform" msgstr "Trasformazione non valida" +#: ../app/tools/gimpgradientoptions.c:102 +#: ../app/tools/gimpgradientoptions.c:314 +msgid "Metric" +msgstr "Metrica" + +#: ../app/tools/gimpgradientoptions.c:103 +msgid "Metric to use for the distance calculation" +msgstr "Metrica da usare per il calcolo delle distanze" + +#: ../app/tools/gimpgradientoptions.c:117 +msgid "Adaptive Supersampling" +msgstr "Sovracampionamento adattivo" + +#: ../app/tools/gimpgradientoptions.c:123 +msgid "Max depth" +msgstr "Profondità max" + +#: ../app/tools/gimpgradientoptions.c:143 +msgid "Instant mode" +msgstr "Modalità istantanea" + +#: ../app/tools/gimpgradientoptions.c:144 +msgid "Commit gradient instantly" +msgstr "Imposta il gradiente istantaneamente" + +#: ../app/tools/gimpgradientoptions.c:150 +msgid "Modify active gradient" +msgstr "Modifica il gradiente attivo" + +#: ../app/tools/gimpgradientoptions.c:151 +msgid "Modify the active gradient in-place" +msgstr "Modifica il gradiente attivo sul posto" + +#: ../app/tools/gimpgradientoptions.c:290 +#: ../app/tools/gimppaintoptions-gui.c:384 +msgid "Edit this gradient" +msgstr "Modifica questo gradiente" + +#. the instant toggle +#: ../app/tools/gimpgradientoptions.c:367 +#, c-format +msgid "Instant mode (%s)" +msgstr "Modalità istantanea (%s)" + +#: ../app/tools/gimpgradientoptions.c:387 +msgid "" +"The active gradient is non-writable and cannot be edited directly. Uncheck " +"this option to edit a copy of it." +msgstr "" +"Il gradiente attivo è non scrivibile e non può essere modificato " +"direttamente. Togliere la spunta a questa opzione per modificarne una copia " +"di esso." + +#: ../app/tools/gimpgradienttool.c:157 +msgid "Gradient Tool: Fill selected area with a color gradient" +msgstr "" +"Strumento gradiente: riempie l'area selezionata con un gradiente di colore" + +#: ../app/tools/gimpgradienttool.c:158 +msgid "Gra_dient" +msgstr "Gra_diente" + +#: ../app/tools/gimpgradienttool.c:213 +msgid "Click-Drag to draw a gradient" +msgstr "Fare clic e trascinare per disegnare un gradiente" + +#: ../app/tools/gimpgradienttool.c:264 +msgid "No gradient available for use with this tool." +msgstr "Nessun motivo disponibile con questo strumento." + +#: ../app/tools/gimpgradienttool.c:614 +msgid "Gradient: " +msgstr "Gradiente:" + +#. the position labels +#: ../app/tools/gimpgradienttool-editor.c:1283 +msgid "X:" +msgstr "X:" + +#: ../app/tools/gimpgradienttool-editor.c:1289 +msgid "Y:" +msgstr "Y:" + +#. the color label +#: ../app/tools/gimpgradienttool-editor.c:1342 +#: ../app/tools/gimptextoptions.c:583 +msgid "Color:" +msgstr "Colore:" + +#: ../app/tools/gimpgradienttool-editor.c:1350 +msgid "Change Endpoint Color" +msgstr "Cambia il colore del capo" + +#. the position label +#: ../app/tools/gimpgradienttool-editor.c:1388 +#: ../app/tools/gimpgradienttool-editor.c:1508 +#: ../app/tools/gimprectangleoptions.c:1031 +msgid "Position:" +msgstr "Posizione:" + +#. the color labels +#: ../app/tools/gimpgradienttool-editor.c:1413 +msgid "Left color:" +msgstr "Colore sinistro:" + +#: ../app/tools/gimpgradienttool-editor.c:1419 +msgid "Right color:" +msgstr "Colore destro:" + +#: ../app/tools/gimpgradienttool-editor.c:1446 +#: ../app/tools/gimpgradienttool-editor.c:1455 +msgid "Change Stop Color" +msgstr "Cambia il colore dello stop" + +#: ../app/tools/gimpgradienttool-editor.c:1477 +msgid "Delete stop" +msgstr "Cancella stop" + +#. the type label +#: ../app/tools/gimpgradienttool-editor.c:1533 +msgid "Blending:" +msgstr "Sfumatura:" + +#. the color label +#: ../app/tools/gimpgradienttool-editor.c:1555 +msgid "Coloring:" +msgstr "Colorazione:" + +#: ../app/tools/gimpgradienttool-editor.c:1589 +msgid "New stop at midpoint" +msgstr "Nuovo stop al punto intermedio" + +#: ../app/tools/gimpgradienttool-editor.c:1597 +msgid "Center midpoint" +msgstr "Centra punto intermedio" + +#: ../app/tools/gimpgradienttool-editor.c:1660 +msgid "Start Endpoint" +msgstr "Capo iniziale" + +#: ../app/tools/gimpgradienttool-editor.c:1668 +msgid "End Endpoint" +msgstr "Capo finale" + +#: ../app/tools/gimpgradienttool-editor.c:1721 +#, c-format +msgid "Stop %d" +msgstr "Stop %d" + +#: ../app/tools/gimpgradienttool-editor.c:1789 +#, c-format +msgid "Midpoint %d" +msgstr "Punto intermedio %d" + +#: ../app/tools/gimpgradienttool-editor.c:2366 +#: ../app/tools/gimpgradienttool-editor.c:2375 +msgid "Gradient Step" +msgstr "Passo gradiente" + #: ../app/tools/gimpguidetool.c:274 msgid "Remove Guide" msgstr "Rimuovi guida" @@ -21503,7 +21823,7 @@ msgstr "_Sposta" msgid "There is no path to move." msgstr "Nessun tracciato da spostare." -#: ../app/tools/gimpmovetool.c:257 ../app/tools/gimptransformtool.c:1470 +#: ../app/tools/gimpmovetool.c:257 ../app/tools/gimptransformtool.c:1484 msgid "The active path's position is locked." msgstr "La posizione del tracciato attivo è bloccata." @@ -21565,8 +21885,8 @@ msgid "Show lattice" msgstr "Mostra reticolo" #: ../app/tools/gimpnpointdeformationoptions.c:230 -#: ../app/tools/gimpscaletool.c:90 ../app/tools/gimptransformoptions.c:546 -#: ../app/tools/gimptransformoptions.c:557 +#: ../app/tools/gimpscaletool.c:90 ../app/tools/gimptransformoptions.c:554 +#: ../app/tools/gimptransformoptions.c:565 msgid "Scale" msgstr "Scala" @@ -21590,18 +21910,18 @@ msgstr "" msgid "_N-Point Deformation" msgstr "Deformazione a _N punti" -#: ../app/tools/gimpoperationtool.c:132 +#: ../app/tools/gimpoperationtool.c:135 msgid "Operation Tool: Use an arbitrary GEGL operation" msgstr "Strumento operazione: usa una qualsiasi operazione GEGL" #. don't translate "Aux" -#: ../app/tools/gimpoperationtool.c:536 +#: ../app/tools/gimpoperationtool.c:547 #, c-format msgid "Aux Input" msgstr "Ingresso aux" #. don't translate "Aux" -#: ../app/tools/gimpoperationtool.c:542 +#: ../app/tools/gimpoperationtool.c:553 #, c-format msgid "Aux%d Input" msgstr "Ingresso aux%d" @@ -21654,28 +21974,28 @@ msgstr "Opzioni di dissolvenza" msgid "Color Options" msgstr "Opzioni colore" -#: ../app/tools/gimppaintoptions-gui.c:622 +#: ../app/tools/gimppaintoptions-gui.c:636 msgid "Link to brush default" msgstr "Collega al predefinito del pennello" -#: ../app/tools/gimppainttool.c:157 +#: ../app/tools/gimppainttool.c:158 msgid "Click to paint" msgstr "Fare clic per disegnare" -#: ../app/tools/gimppainttool.c:158 +#: ../app/tools/gimppainttool.c:159 msgid "Click to draw the line" msgstr "Clic per disegnare la riga" -#: ../app/tools/gimppainttool.c:159 +#: ../app/tools/gimppainttool.c:160 #, c-format msgid "%s to pick a color" msgstr "%s per prelevare un colore" -#: ../app/tools/gimppainttool.c:272 +#: ../app/tools/gimppainttool.c:270 msgid "Cannot paint on layer groups." msgstr "Impossibile disegnare sui gruppi livello." -#: ../app/tools/gimppainttool.c:688 +#: ../app/tools/gimppainttool.c:600 #, c-format msgid "%s for a straight line" msgstr "%s per una riga diritta" @@ -21874,7 +22194,7 @@ msgstr "Disegna la maschera della regione selezionata" msgid "Move the mouse to change threshold" msgstr "Spostare il mouse per cambiare la soglia" -#: ../app/tools/gimprotatetool.c:95 ../app/tools/gimptransformoptions.c:548 +#: ../app/tools/gimprotatetool.c:95 ../app/tools/gimptransformoptions.c:556 msgid "Rotate" msgstr "Ruota" @@ -22017,8 +22337,8 @@ msgstr "Fare clic e trascinare per spostare una copia dei pixel selezionati" msgid "Click to anchor the floating selection" msgstr "Fare clic per àncorare la selezione fluttuante" -#: ../app/tools/gimpsheartool.c:88 ../app/tools/gimptransformoptions.c:550 -#: ../app/tools/gimptransformoptions.c:559 +#: ../app/tools/gimpsheartool.c:88 ../app/tools/gimptransformoptions.c:558 +#: ../app/tools/gimptransformoptions.c:567 msgid "Shear" msgstr "Inclina" @@ -22175,39 +22495,39 @@ msgstr "Rettangolo:" msgid "Language:" msgstr "Lingua:" -#: ../app/tools/gimptexttool.c:197 +#: ../app/tools/gimptexttool.c:203 msgid "Text" msgstr "Testo" -#: ../app/tools/gimptexttool.c:198 +#: ../app/tools/gimptexttool.c:204 msgid "Text Tool: Create or edit text layers" msgstr "Strumento testo: crea o modifica livelli di testo" -#: ../app/tools/gimptexttool.c:199 +#: ../app/tools/gimptexttool.c:205 msgid "Te_xt" msgstr "_Testo" -#: ../app/tools/gimptexttool.c:944 +#: ../app/tools/gimptexttool.c:953 msgid "Text box: " msgstr "Riquadro di testo: " -#: ../app/tools/gimptexttool.c:1075 +#: ../app/tools/gimptexttool.c:1084 msgid "Reshape Text Layer" msgstr "Risagoma il livello di testo" -#: ../app/tools/gimptexttool.c:1573 ../app/tools/gimptexttool.c:1576 +#: ../app/tools/gimptexttool.c:1583 ../app/tools/gimptexttool.c:1586 msgid "Confirm Text Editing" msgstr "Conferma modifica del testo" -#: ../app/tools/gimptexttool.c:1580 +#: ../app/tools/gimptexttool.c:1590 msgid "Create _New Layer" msgstr "Crea un _nuovo livello" -#: ../app/tools/gimptexttool.c:1582 +#: ../app/tools/gimptexttool.c:1592 msgid "_Edit" msgstr "_Modifica" -#: ../app/tools/gimptexttool.c:1604 +#: ../app/tools/gimptexttool.c:1614 msgid "" "The layer you selected is a text layer but it has been modified using other " "tools. Editing the layer with the text tool will discard these " @@ -22275,7 +22595,7 @@ msgid "Opacity of the preview image" msgstr "Opacità della finestra di anteprima" #: ../app/tools/gimptransformoptions.c:154 -#: ../app/tools/gimptransformoptions.c:468 +#: ../app/tools/gimptransformoptions.c:476 msgid "Guides" msgstr "Guide" @@ -22285,109 +22605,109 @@ msgstr "" "Dimensione di una cella di griglia per guide di composizione di numero " "variabile" -#: ../app/tools/gimptransformoptions.c:491 +#: ../app/tools/gimptransformoptions.c:499 #, c-format msgid "15 degrees (%s)" msgstr "15 gradi (%s)" -#: ../app/tools/gimptransformoptions.c:498 +#: ../app/tools/gimptransformoptions.c:506 msgid "Limit rotation steps to 15 degrees" msgstr "Limita i passi di rotazione a 15 gradi" -#: ../app/tools/gimptransformoptions.c:508 +#: ../app/tools/gimptransformoptions.c:516 #, c-format msgid "Keep aspect (%s)" msgstr "Mantieni l'aspetto (%s)" -#: ../app/tools/gimptransformoptions.c:515 +#: ../app/tools/gimptransformoptions.c:523 msgid "Keep the original aspect ratio" msgstr "Mantieni il rapporto proporzioni originale" -#: ../app/tools/gimptransformoptions.c:520 +#: ../app/tools/gimptransformoptions.c:528 #, c-format msgid "Around center (%s)" msgstr "Attorno al centro (%s)" -#: ../app/tools/gimptransformoptions.c:527 +#: ../app/tools/gimptransformoptions.c:535 msgid "Scale around the center point" msgstr "Scala attorno al punto centrale" -#: ../app/tools/gimptransformoptions.c:543 +#: ../app/tools/gimptransformoptions.c:551 #, c-format msgid "Constrain (%s)" msgstr "Vincola (%s)" -#: ../app/tools/gimptransformoptions.c:544 +#: ../app/tools/gimptransformoptions.c:552 msgid "Move" msgstr "Sposta" -#: ../app/tools/gimptransformoptions.c:545 +#: ../app/tools/gimptransformoptions.c:553 #, c-format msgid "Constrain movement to 45 degree angles from center (%s)" msgstr "Vincola il movimento in angoli di 45 gradi dal centro (%s)" -#: ../app/tools/gimptransformoptions.c:547 +#: ../app/tools/gimptransformoptions.c:555 #, c-format msgid "Maintain aspect ratio when scaling (%s)" msgstr "Mantiene il rapporto dimensioni durante la scalatura (%s)" -#: ../app/tools/gimptransformoptions.c:549 +#: ../app/tools/gimptransformoptions.c:557 #, c-format msgid "Constrain rotation to 15 degree increments (%s)" msgstr "Vincola la rotazione in incrementi di 15 gradi (%s)" -#: ../app/tools/gimptransformoptions.c:551 +#: ../app/tools/gimptransformoptions.c:559 #, c-format msgid "Shear along edge direction only (%s)" msgstr "Inclina solo lungo la direzione dei bordi (%s)" -#: ../app/tools/gimptransformoptions.c:553 +#: ../app/tools/gimptransformoptions.c:561 #, c-format msgid "Constrain perspective handles to move along edges and diagonal (%s)" msgstr "" "Vincola gli appigli della prospettiva a muoversi lungo i bordi e diagonali " "(%s)" -#: ../app/tools/gimptransformoptions.c:556 +#: ../app/tools/gimptransformoptions.c:564 #, c-format msgid "From pivot (%s)" msgstr "Dal perno (%s)" -#: ../app/tools/gimptransformoptions.c:558 +#: ../app/tools/gimptransformoptions.c:566 #, c-format msgid "Scale from pivot point (%s)" msgstr "Scala dal punto perno (%s)" -#: ../app/tools/gimptransformoptions.c:560 +#: ../app/tools/gimptransformoptions.c:568 #, c-format msgid "Shear opposite edge by same amount (%s)" msgstr "Inclina i bordi opposti della stessa quantità (%s)" -#: ../app/tools/gimptransformoptions.c:562 +#: ../app/tools/gimptransformoptions.c:570 #, c-format msgid "Maintain position of pivot while changing perspective (%s)" msgstr "" "Mantiene la posizione dei perni durante la modifica di prospettiva (%s)" -#: ../app/tools/gimptransformoptions.c:565 +#: ../app/tools/gimptransformoptions.c:573 msgid "Pivot" msgstr "Perno" -#: ../app/tools/gimptransformoptions.c:566 +#: ../app/tools/gimptransformoptions.c:574 #, c-format msgid "Snap (%s)" msgstr "Magnetismo (%s)" -#: ../app/tools/gimptransformoptions.c:567 +#: ../app/tools/gimptransformoptions.c:575 #, c-format msgid "Snap pivot to corners and center (%s)" msgstr "Rende magnetici i perni per gli angoli e il centro (%s)" -#: ../app/tools/gimptransformoptions.c:568 +#: ../app/tools/gimptransformoptions.c:576 msgid "Lock" msgstr "Blocca" -#: ../app/tools/gimptransformoptions.c:569 +#: ../app/tools/gimptransformoptions.c:577 msgid "Lock pivot position to canvas" msgstr "Blocca la posizione dei perni sull'area disegnabile" @@ -22408,31 +22728,31 @@ msgstr "La selezione non si interseca con il livello." msgid "Transform Step" msgstr "Passo di trasformazione" -#: ../app/tools/gimptransformtool.c:982 +#: ../app/tools/gimptransformtool.c:996 msgid "The current transform is invalid" msgstr "La trasformazione corrente non è valida" -#: ../app/tools/gimptransformtool.c:1430 +#: ../app/tools/gimptransformtool.c:1444 msgid "There is no layer to transform." msgstr "Nessun livello da trasformare." -#: ../app/tools/gimptransformtool.c:1437 +#: ../app/tools/gimptransformtool.c:1451 msgid "The active layer's position and size are locked." msgstr "La posizione e la dimensione del livello attivo sono bloccate." -#: ../app/tools/gimptransformtool.c:1450 +#: ../app/tools/gimptransformtool.c:1464 msgid "There is no selection to transform." msgstr "Nessuna selezione da trasformare." -#: ../app/tools/gimptransformtool.c:1463 +#: ../app/tools/gimptransformtool.c:1477 msgid "There is no path to transform." msgstr "Nessun tracciato da trasformare." -#: ../app/tools/gimptransformtool.c:1468 +#: ../app/tools/gimptransformtool.c:1482 msgid "The active path's strokes are locked." msgstr "Le delineature del tracciato attivo sono bloccate." -#: ../app/tools/gimptransformtool.c:1472 +#: ../app/tools/gimptransformtool.c:1486 msgid "The active path has no strokes." msgstr "Il tracciato attivo non ha tratti." @@ -22908,7 +23228,7 @@ msgid "Percentage of width of brush" msgstr "Percentuale di larghezza del pennello" #: ../app/widgets/gimpbufferview.c:189 ../app/widgets/gimpbufferview.c:290 -#: ../app/widgets/gimpeditor.c:758 +#: ../app/widgets/gimpeditor.c:759 msgid "(None)" msgstr "(Nessuno)" @@ -22959,147 +23279,147 @@ msgstr "" "accetta anche nomi di colore CSS." #. TRANSLATORS: X for the X coordinate. -#: ../app/widgets/gimpcolorframe.c:193 +#: ../app/widgets/gimpcolorframe.c:201 msgctxt "Coordinates" msgid "X:" msgstr "X:" #. TRANSLATORS: Y for the Y coordinate. -#: ../app/widgets/gimpcolorframe.c:207 +#: ../app/widgets/gimpcolorframe.c:215 msgctxt "Coordinates" msgid "Y:" msgstr "Y:" #. TRANSLATORS: n/a for Not Available. -#: ../app/widgets/gimpcolorframe.c:637 ../app/widgets/gimpcolorframe.c:639 +#: ../app/widgets/gimpcolorframe.c:674 ../app/widgets/gimpcolorframe.c:676 msgctxt "Coordinates" msgid "n/a" msgstr "n/d" #. TRANSLATORS: V for Value (grayscale) -#: ../app/widgets/gimpcolorframe.c:712 +#: ../app/widgets/gimpcolorframe.c:749 msgctxt "Grayscale" msgid "V:" msgstr "V:" #. TRANSLATORS: A for Alpha (color transparency) -#: ../app/widgets/gimpcolorframe.c:716 ../app/widgets/gimpcolorframe.c:729 -#: ../app/widgets/gimpcolorframe.c:765 ../app/widgets/gimpcolorframe.c:807 -#: ../app/widgets/gimpcolorframe.c:835 ../app/widgets/gimpcolorframe.c:867 -#: ../app/widgets/gimpcolorframe.c:901 +#: ../app/widgets/gimpcolorframe.c:753 ../app/widgets/gimpcolorframe.c:766 +#: ../app/widgets/gimpcolorframe.c:802 ../app/widgets/gimpcolorframe.c:844 +#: ../app/widgets/gimpcolorframe.c:872 ../app/widgets/gimpcolorframe.c:904 +#: ../app/widgets/gimpcolorframe.c:938 msgctxt "Alpha channel" msgid "A:" msgstr "A:" #. TRANSLATORS: R for Red (RGB) -#: ../app/widgets/gimpcolorframe.c:721 ../app/widgets/gimpcolorframe.c:757 +#: ../app/widgets/gimpcolorframe.c:758 ../app/widgets/gimpcolorframe.c:794 msgctxt "RGB" msgid "R:" msgstr "R:" #. TRANSLATORS: G for Green (RGB) -#: ../app/widgets/gimpcolorframe.c:723 ../app/widgets/gimpcolorframe.c:759 +#: ../app/widgets/gimpcolorframe.c:760 ../app/widgets/gimpcolorframe.c:796 msgctxt "RGB" msgid "G:" msgstr "G:" #. TRANSLATORS: B for Blue (RGB) -#: ../app/widgets/gimpcolorframe.c:725 ../app/widgets/gimpcolorframe.c:761 +#: ../app/widgets/gimpcolorframe.c:762 ../app/widgets/gimpcolorframe.c:798 msgctxt "RGB" msgid "B:" msgstr "B:" #. TRANSLATORS: Index of the color in the palette. -#: ../app/widgets/gimpcolorframe.c:734 +#: ../app/widgets/gimpcolorframe.c:771 msgctxt "Indexed color" msgid "Index:" msgstr "Indice:" #. TRANSLATORS: Hex for Hexadecimal (representation of a color) -#: ../app/widgets/gimpcolorframe.c:768 +#: ../app/widgets/gimpcolorframe.c:805 msgctxt "Color representation" msgid "Hex:" msgstr "Esa:" #. TRANSLATORS: H for Hue (HSV color space) -#: ../app/widgets/gimpcolorframe.c:799 +#: ../app/widgets/gimpcolorframe.c:836 msgctxt "HSV color space" msgid "H:" msgstr "H:" #. TRANSLATORS: S for Saturation (HSV color space) -#: ../app/widgets/gimpcolorframe.c:801 +#: ../app/widgets/gimpcolorframe.c:838 msgctxt "HSV color space" msgid "S:" msgstr "S:" #. TRANSLATORS: V for Value (HSV color space) -#: ../app/widgets/gimpcolorframe.c:803 +#: ../app/widgets/gimpcolorframe.c:840 msgctxt "HSV color space" msgid "V:" msgstr "V:" #. TRANSLATORS: L for Lightness (LCH color space) -#: ../app/widgets/gimpcolorframe.c:827 +#: ../app/widgets/gimpcolorframe.c:864 msgctxt "LCH color space" msgid "L*:" msgstr "L*:" #. TRANSLATORS: C for Chroma (LCH color space) -#: ../app/widgets/gimpcolorframe.c:829 +#: ../app/widgets/gimpcolorframe.c:866 msgctxt "LCH color space" msgid "C*:" msgstr "C*:" #. TRANSLATORS: H for Hue angle (LCH color space) -#: ../app/widgets/gimpcolorframe.c:831 +#: ../app/widgets/gimpcolorframe.c:868 msgctxt "LCH color space" msgid "h°:" msgstr "h°:" #. TRANSLATORS: L* for Lightness (Lab color space) -#: ../app/widgets/gimpcolorframe.c:859 +#: ../app/widgets/gimpcolorframe.c:896 msgctxt "Lab color space" msgid "L*:" msgstr "L*:" #. TRANSLATORS: a* color channel in Lab color space -#: ../app/widgets/gimpcolorframe.c:861 +#: ../app/widgets/gimpcolorframe.c:898 msgctxt "Lab color space" msgid "a*:" msgstr "a*:" #. TRANSLATORS: b* color channel in Lab color space -#: ../app/widgets/gimpcolorframe.c:863 +#: ../app/widgets/gimpcolorframe.c:900 msgctxt "Lab color space" msgid "b*:" msgstr "b*:" #. TRANSLATORS: C for Cyan (CMYK) -#: ../app/widgets/gimpcolorframe.c:891 +#: ../app/widgets/gimpcolorframe.c:928 msgctxt "CMYK" msgid "C:" msgstr "C:" #. TRANSLATORS: M for Magenta (CMYK) -#: ../app/widgets/gimpcolorframe.c:893 +#: ../app/widgets/gimpcolorframe.c:930 msgctxt "CMYK" msgid "M:" msgstr "M:" #. TRANSLATORS: Y for Yellow (CMYK) -#: ../app/widgets/gimpcolorframe.c:895 +#: ../app/widgets/gimpcolorframe.c:932 msgctxt "CMYK" msgid "Y:" msgstr "Y:" #. TRANSLATORS: K for Key/black (CMYK) -#: ../app/widgets/gimpcolorframe.c:897 +#: ../app/widgets/gimpcolorframe.c:934 msgctxt "CMYK" msgid "K:" msgstr "K:" -#: ../app/widgets/gimpcolorframe.c:959 +#: ../app/widgets/gimpcolorframe.c:996 msgctxt "Color value" msgid "n/a" msgstr "n/d" @@ -23605,142 +23925,160 @@ msgstr "GIMP ha riscontrato diversi errori critici!" msgid "_Restart GIMP" msgstr "_Riavvia GIMP" -#: ../app/widgets/gimpdashboard.c:332 ../app/widgets/gimpdashboard.c:384 +#: ../app/widgets/gimpdashboard.c:346 ../app/widgets/gimpdashboard.c:398 msgctxt "dashboard-variable" msgid "Occupied" msgstr "Occupato" -#: ../app/widgets/gimpdashboard.c:333 +#: ../app/widgets/gimpdashboard.c:347 msgid "Tile cache occupied size" msgstr "Dimensione cache riquadri occupata" -#: ../app/widgets/gimpdashboard.c:342 +#: ../app/widgets/gimpdashboard.c:356 msgctxt "dashboard-variable" msgid "Maximum" msgstr "Massimo" -#: ../app/widgets/gimpdashboard.c:343 +#: ../app/widgets/gimpdashboard.c:357 msgid "Maximal tile cache occupied size" msgstr "Dimensione massima cache riquadri occupata" -#: ../app/widgets/gimpdashboard.c:352 ../app/widgets/gimpdashboard.c:404 +#: ../app/widgets/gimpdashboard.c:366 ../app/widgets/gimpdashboard.c:418 msgctxt "dashboard-variable" msgid "Limit" msgstr "Limite" -#: ../app/widgets/gimpdashboard.c:353 +#: ../app/widgets/gimpdashboard.c:367 msgid "Tile cache size limit" msgstr "Limite dimensione cache riquadri" -#: ../app/widgets/gimpdashboard.c:361 +#: ../app/widgets/gimpdashboard.c:375 msgctxt "dashboard-variable" msgid "Compression" msgstr "Compressione" -#: ../app/widgets/gimpdashboard.c:362 +#: ../app/widgets/gimpdashboard.c:376 msgid "Tile cache compression ratio" msgstr "Rapporto di compressione cache riquadri" -#: ../app/widgets/gimpdashboard.c:371 +#: ../app/widgets/gimpdashboard.c:385 msgctxt "dashboard-variable" msgid "Hit/Miss" msgstr "Hit/Miss" -#: ../app/widgets/gimpdashboard.c:372 +#: ../app/widgets/gimpdashboard.c:386 msgid "Tile cache hit/miss ratio" msgstr "Rapporto hit/miss cache riquadri" -#: ../app/widgets/gimpdashboard.c:385 +#: ../app/widgets/gimpdashboard.c:399 msgid "Swap file occupied size" msgstr "Dimensione occupazione file di scambio" -#: ../app/widgets/gimpdashboard.c:394 +#: ../app/widgets/gimpdashboard.c:408 msgctxt "dashboard-variable" msgid "Size" msgstr "Dimensione" -#: ../app/widgets/gimpdashboard.c:395 +#: ../app/widgets/gimpdashboard.c:409 msgid "Swap file size" msgstr "Dimensione file di scambio" -#: ../app/widgets/gimpdashboard.c:405 +#: ../app/widgets/gimpdashboard.c:419 msgid "Swap file size limit" msgstr "Limite dimensione file di scambio" -#: ../app/widgets/gimpdashboard.c:412 +#: ../app/widgets/gimpdashboard.c:426 msgctxt "dashboard-variable" msgid "Busy" msgstr "Occupato" -#: ../app/widgets/gimpdashboard.c:413 +#: ../app/widgets/gimpdashboard.c:427 msgid "Whether there is work queued for the swap file" msgstr "Se c'è lavoro in coda per il file di scambio" -#: ../app/widgets/gimpdashboard.c:426 +#: ../app/widgets/gimpdashboard.c:440 msgctxt "dashboard-variable" msgid "Usage" msgstr "Uso" -#: ../app/widgets/gimpdashboard.c:427 +#: ../app/widgets/gimpdashboard.c:441 msgid "Total CPU usage" msgstr "Uso totale CPU" -#: ../app/widgets/gimpdashboard.c:435 ../app/widgets/gimpdashboard.c:445 +#: ../app/widgets/gimpdashboard.c:449 ../app/widgets/gimpdashboard.c:459 msgctxt "dashboard-variable" msgid "Active" msgstr "Attiva" -#: ../app/widgets/gimpdashboard.c:436 +#: ../app/widgets/gimpdashboard.c:450 msgid "Whether the CPU is active" msgstr "Se la CPU è attiva" -#: ../app/widgets/gimpdashboard.c:446 +#: ../app/widgets/gimpdashboard.c:460 msgid "Total amount of time the CPU has been active" msgstr "Quantità totale di tempo durante il quale la CPU è stata attiva" -#: ../app/widgets/gimpdashboard.c:460 +#: ../app/widgets/gimpdashboard.c:473 +msgctxt "dashboard-variable" +msgid "Mipmapped" +msgstr "Mipmap" + +#: ../app/widgets/gimpdashboard.c:474 +msgid "Total size of processed mipmapped data" +msgstr "Dimensione totale dei dati mipmap elaborati" + +#: ../app/widgets/gimpdashboard.c:486 msgctxt "dashboard-group" msgid "Cache" msgstr "Cache" -#: ../app/widgets/gimpdashboard.c:461 +#: ../app/widgets/gimpdashboard.c:487 msgid "In-memory tile cache" msgstr "Cache riquadri in memoria" -#: ../app/widgets/gimpdashboard.c:496 +#: ../app/widgets/gimpdashboard.c:523 msgctxt "dashboard-group" msgid "Swap" msgstr "Scambio" -#: ../app/widgets/gimpdashboard.c:497 +#: ../app/widgets/gimpdashboard.c:524 msgid "On-disk tile swap" msgstr "Scambio riquadri su disco" -#: ../app/widgets/gimpdashboard.c:525 +#: ../app/widgets/gimpdashboard.c:553 msgctxt "dashboard-group" msgid "CPU" msgstr "CPU" -#: ../app/widgets/gimpdashboard.c:526 +#: ../app/widgets/gimpdashboard.c:554 msgid "CPU usage" msgstr "Uso CPU" -#: ../app/widgets/gimpdashboard.c:698 +#: ../app/widgets/gimpdashboard.c:583 +msgctxt "dashboard-group" +msgid "Misc" +msgstr "Varie" + +#: ../app/widgets/gimpdashboard.c:584 +msgid "Miscellaneous information" +msgstr "Informazioni varie" + +#: ../app/widgets/gimpdashboard.c:744 msgid "Select fields" msgstr "Seleziona campi" #. Tranlators: "N/A" is an abbreviation for "not available" -#: ../app/widgets/gimpdashboard.c:2162 +#: ../app/widgets/gimpdashboard.c:2323 msgctxt "dashboard-value" msgid "N/A" msgstr "n/d" -#: ../app/widgets/gimpdashboard.c:2171 +#: ../app/widgets/gimpdashboard.c:2332 msgctxt "dashboard-value" msgid "Yes" msgstr "Sì" -#: ../app/widgets/gimpdashboard.c:2172 +#: ../app/widgets/gimpdashboard.c:2333 msgctxt "dashboard-value" msgid "No" msgstr "No" @@ -24007,84 +24345,84 @@ msgstr "Riempi di colore" msgid "_Antialiasing" msgstr "_Antialiasing" -#: ../app/widgets/gimpgradienteditor.c:754 +#: ../app/widgets/gimpgradienteditor.c:756 #, c-format msgid "Zoom factor: %d:1" msgstr "Fattore di zoom: %d:1" -#: ../app/widgets/gimpgradienteditor.c:757 +#: ../app/widgets/gimpgradienteditor.c:759 #, c-format msgid "Displaying [%0.4f, %0.4f]" msgstr "Visualizzazione [%0.4f, %0.4f]" -#: ../app/widgets/gimpgradienteditor.c:957 +#: ../app/widgets/gimpgradienteditor.c:959 #, c-format msgid "Position: %0.4f" msgstr "Posizione: %0.4f" -#: ../app/widgets/gimpgradienteditor.c:958 +#: ../app/widgets/gimpgradienteditor.c:960 #, c-format msgid "RGB (%0.3f, %0.3f, %0.3f)" msgstr "RGB (%0.3f, %0.3f, %0.3f)" -#: ../app/widgets/gimpgradienteditor.c:960 +#: ../app/widgets/gimpgradienteditor.c:962 #, c-format msgid "HSV (%0.1f, %0.1f, %0.1f)" msgstr "HSV (%0.1f, %0.1f, %0.1f)" -#: ../app/widgets/gimpgradienteditor.c:962 +#: ../app/widgets/gimpgradienteditor.c:964 #, c-format msgid "Luminance: %0.1f Opacity: %0.1f" msgstr "Luminosità: %0.1f Opacità: %0.1f" -#: ../app/widgets/gimpgradienteditor.c:994 +#: ../app/widgets/gimpgradienteditor.c:996 #, c-format msgid "RGB (%d, %d, %d)" msgstr "RGB (%d, %d, %d)" -#: ../app/widgets/gimpgradienteditor.c:1005 +#: ../app/widgets/gimpgradienteditor.c:1007 msgid "Foreground color set to:" msgstr "Colore di primo piano impostato a:" -#: ../app/widgets/gimpgradienteditor.c:1012 +#: ../app/widgets/gimpgradienteditor.c:1014 msgid "Background color set to:" msgstr "Colore di sfondo impostato a:" -#: ../app/widgets/gimpgradienteditor.c:1240 -#: ../app/widgets/gimpgradienteditor.c:1301 +#: ../app/widgets/gimpgradienteditor.c:1242 +#: ../app/widgets/gimpgradienteditor.c:1303 #, c-format msgid "%s-Drag: move & compress" msgstr "%s-Trascina: sposta e comprime" -#: ../app/widgets/gimpgradienteditor.c:1245 +#: ../app/widgets/gimpgradienteditor.c:1247 msgid "Drag: move" msgstr "Trascina: sposta" -#: ../app/widgets/gimpgradienteditor.c:1252 -#: ../app/widgets/gimpgradienteditor.c:1265 -#: ../app/widgets/gimpgradienteditor.c:1278 -#: ../app/widgets/gimpgradienteditor.c:1299 +#: ../app/widgets/gimpgradienteditor.c:1254 +#: ../app/widgets/gimpgradienteditor.c:1267 +#: ../app/widgets/gimpgradienteditor.c:1280 +#: ../app/widgets/gimpgradienteditor.c:1301 #, c-format msgid "%s-Click: extend selection" msgstr "%s-Clic: estende la selezione" -#: ../app/widgets/gimpgradienteditor.c:1257 -#: ../app/widgets/gimpgradienteditor.c:1270 +#: ../app/widgets/gimpgradienteditor.c:1259 +#: ../app/widgets/gimpgradienteditor.c:1272 msgid "Click: select" msgstr "Clic: selezione" -#: ../app/widgets/gimpgradienteditor.c:1283 -#: ../app/widgets/gimpgradienteditor.c:1305 +#: ../app/widgets/gimpgradienteditor.c:1285 +#: ../app/widgets/gimpgradienteditor.c:1307 msgid "Click: select Drag: move" msgstr "Clic: selezione Trascina: sposta" -#: ../app/widgets/gimpgradienteditor.c:1520 -#: ../app/widgets/gimpgradienteditor.c:1528 +#: ../app/widgets/gimpgradienteditor.c:1522 +#: ../app/widgets/gimpgradienteditor.c:1530 #, c-format msgid "Handle position: %0.4f" msgstr "Posizione appiglio: %0.4f" -#: ../app/widgets/gimpgradienteditor.c:1545 +#: ../app/widgets/gimpgradienteditor.c:1547 #, c-format msgid "Distance: %0.4f" msgstr "Distanza: %0.4f" @@ -24348,7 +24686,7 @@ msgstr "Lingua di sistema" msgid "Switch to another group of modes" msgstr "Passa ad un altro gruppo di modalità" -#: ../app/widgets/gimplayertreeview.c:310 +#: ../app/widgets/gimplayertreeview.c:319 msgid "Lock alpha channel" msgstr "Blocca canale alfa" @@ -24609,20 +24947,20 @@ msgstr "L'attributo \"%s\" non è valido sull'elemento <%s> in questo contesto" msgid "Outermost element in text must be not <%s>" msgstr "L'elemento più esterno nel testo deve essere un non <%s>" -#: ../app/widgets/gimptextbuffer.c:1684 +#: ../app/widgets/gimptextbuffer.c:1711 #, c-format msgid "Input file '%s' appears truncated: %s" msgstr "Il file in ingresso \"%s\" sembra troncato: %s" -#: ../app/widgets/gimptextbuffer.c:1702 +#: ../app/widgets/gimptextbuffer.c:1729 #, c-format msgid "Invalid UTF-8 data in file '%s'." msgstr "Dato UTF-8 non valido nel file '%s'" -#: ../app/widgets/gimptextbuffer.c:1751 +#: ../app/widgets/gimptextbuffer.c:1778 #, c-format -msgid "Writing palette file '%s' failed: %s" -msgstr "Scrittura file tavolozza \"%s\" fallita: %s" +msgid "Writing text file '%s' failed: %s" +msgstr "Scrittura file testo \"%s\" fallita: %s" #: ../app/widgets/gimptexteditor.c:220 msgid "_Use selected font" @@ -24821,31 +25159,31 @@ msgstr "Blocca le delineature del tracciato" msgid "Lock path position" msgstr "Blocca la posizione del tracciato" -#: ../app/widgets/gimpviewablebox.c:91 +#: ../app/widgets/gimpviewablebox.c:94 msgid "Open the brush selection dialog" msgstr "Apri la finestra di selezione pennelli" -#: ../app/widgets/gimpviewablebox.c:159 +#: ../app/widgets/gimpviewablebox.c:162 msgid "Open the dynamics selection dialog" msgstr "Apri la finestra della selezione dinamiche" -#: ../app/widgets/gimpviewablebox.c:226 +#: ../app/widgets/gimpviewablebox.c:229 msgid "Open the MyPaint brush selection dialog" msgstr "Apri la finestra di selezione pennelli MyPaint" -#: ../app/widgets/gimpviewablebox.c:289 +#: ../app/widgets/gimpviewablebox.c:292 msgid "Open the pattern selection dialog" msgstr "Apri la finestra di selezione motivi" -#: ../app/widgets/gimpviewablebox.c:358 +#: ../app/widgets/gimpviewablebox.c:362 msgid "Open the gradient selection dialog" msgstr "Apri la finestra di selezione gradienti" -#: ../app/widgets/gimpviewablebox.c:476 +#: ../app/widgets/gimpviewablebox.c:501 msgid "Open the palette selection dialog" msgstr "Apri la finestra di selezione tavolozze" -#: ../app/widgets/gimpviewablebox.c:542 +#: ../app/widgets/gimpviewablebox.c:567 msgid "Open the font selection dialog" msgstr "Apri la finestra della selezione caratteri" @@ -25057,7 +25395,7 @@ msgstr "Errore durante la scrittura di \"%s\": " msgid "Error creating '%s': " msgstr "Errore durante la creazione di \"%s\":" -#: ../app/xcf/xcf-load.c:305 +#: ../app/xcf/xcf-load.c:342 #, c-format msgid "" "Corrupt 'exif-data' parasite discovered.\n" @@ -25066,7 +25404,7 @@ msgstr "" "Scoperto parassita 'exif-data' rovinato.\n" "I dati Exif non possono essere migrati: %s" -#: ../app/xcf/xcf-load.c:342 +#: ../app/xcf/xcf-load.c:379 msgid "" "Corrupt 'gimp-metadata' parasite discovered.\n" "XMP data could not be migrated." @@ -25074,7 +25412,7 @@ msgstr "" "Scoperto parassita 'gimp-metadata' rovinato.\n" "I dati XMP non possono essere migrati." -#: ../app/xcf/xcf-load.c:362 +#: ../app/xcf/xcf-load.c:399 #, c-format msgid "" "Corrupt 'gimp-metadata' parasite discovered.\n" @@ -25083,7 +25421,7 @@ msgstr "" "Scoperto parassita 'gimp-metadata' rovinato.\n" "I dati XMP non possono essere migrati: %s" -#: ../app/xcf/xcf-load.c:549 +#: ../app/xcf/xcf-load.c:586 msgid "" "This XCF file is corrupt! I have loaded as much of it as I can, but it is " "incomplete." @@ -25091,7 +25429,7 @@ msgstr "" "Questo file XCF è danneggiato! È stato caricato tutto quello che si è " "potuto, ma è incompleto." -#: ../app/xcf/xcf-load.c:560 +#: ../app/xcf/xcf-load.c:597 msgid "" "This XCF file is corrupt! I could not even salvage any partial image data " "from it." @@ -25099,7 +25437,7 @@ msgstr "" "Questo file XCF è danneggiato! Non è stato possibile ripristinare neanche " "una parte di esso." -#: ../app/xcf/xcf-load.c:652 +#: ../app/xcf/xcf-load.c:689 msgid "" "XCF warning: version 0 of XCF file format\n" "did not save indexed colormaps correctly.\n" @@ -25128,7 +25466,7 @@ msgstr "" "Errore durante la scrittura XCF: BPC non supportato durante la scrittura del " "pixel: %d" -#: ../tools/gimp-debug-tool.c:78 +#: ../app-tools/gimp-debug-tool.c:78 msgid "GIMP Crash Debug" msgstr "Correzione dei crash di GIMP" diff --git a/po/pl.po b/po/pl.po index 8125fbbeb7..4e8b1baacd 100644 --- a/po/pl.po +++ b/po/pl.po @@ -23,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: gimp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-25 20:44+0200\n" -"PO-Revision-Date: 2018-03-25 20:45+0200\n" +"POT-Creation-Date: 2018-04-14 21:17+0200\n" +"PO-Revision-Date: 2018-04-14 21:18+0200\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -88,6 +88,144 @@ msgstr "Obróbka zdjęć w GIMP-ie" #: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:8 msgid "" +"First release of the 2.10 series which prominently features the port to a " +"new image processing engine, GEGL. The most outstanding changes are:" +msgstr "" +"Pierwsze wydanie z serii 2.10, w której przede wszystkim przeniesiono " +"program do nowego mechanizmu przetwarzania obrazów, GEGL. Najbardziej " +"wyróżniające się zmiany:" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:9 +msgid "High bit depth color processing (16/32-bit per color channel)" +msgstr "Przetwarzanie kolorów o wysokiej głębi (16/32 bity na kanał kolorów)" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:10 +msgid "" +"Color management is a core feature now, most widgets and preview areas are " +"color-managed" +msgstr "" +"Zarządzanie kolorami to teraz główna funkcja, większość widżetów i obszarów " +"podglądu podlega zarządzaniu kolorami" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:11 +msgid "" +"On-canvas effect preview, with split view for before/after processing pixels" +msgstr "" +"Podgląd efektów na obrazie, z podzielonym widokiem na przed/po przetworzeniu " +"pikseli" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:12 +msgid "" +"Multi-threaded and hardware-accelerated rendering, processing and painting" +msgstr "" +"Wielowątkowe i przyspieszane sprzętowo renderowanie, przetwarzanie " +"i malowanie" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:13 +msgid "Most tools improved, several new transformation tools" +msgstr "" +"Ulepszono większość narzędzi, dodano kilka nowych narzędzi przekształceń" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:14 +msgid "" +"Improved support for many image formats, in particular better PSD importing" +msgstr "" +"Ulepszona obsługa wielu formatów obrazów, zwłaszcza lepsze importowanie " +"obrazów PSD" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:15 +msgid "Newly supported image formats: OpenEXR, RGBE, WebP, HGT…" +msgstr "Nowo obsługiwane formaty obrazów: OpenEXR, RGBE, WebP, HGT…" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:16 +msgid "" +"Improved digital painting: canvas rotation and flipping, symmetry painting, " +"MyPaint brushes…" +msgstr "" +"Ulepszone malowanie cyfrowe: obracanie i odbijanie płótna, malowanie " +"symetryczne, pędzle programu MyPaint…" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:17 +msgid "Metadata viewing and editing for Exif, XMP, IPTC, and DICOM" +msgstr "Przeglądanie i modyfikowanie metadanych Exif, XMP, IPTC i DICOM" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:18 +msgid "Basic HiDPI support: automatically or user-selected icon size" +msgstr "" +"Podstawowa obsługa monitorów o wysokiej rozdzielczości: automatyczne lub " +"wybrane przez użytkownika rozmiary ikon" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:19 +msgid "New themes for GIMP: Light, Gray, Dark, and System" +msgstr "Nowe motywy programu: jasny, szary, ciemny i systemowy" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:20 +msgid "And much, much more…" +msgstr "Oraz wiele, wiele więcej…" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:21 +msgid "" +"In this second release candidate before GIMP 2.10.0, while debugging is " +"still a prime target, a new focus has been put on speed and optimization in " +"order to provide a smoother painting experience. Bigger changes are:" +msgstr "" +"W drugim wydaniu kandydackim przed GIMP 2.10.0, chociaż debugowanie jest " +"nadal głównym celem, skupiliśmy się także na prędkości i optymalizacji, aby " +"rysowanie było płynniejsze. Większe zmiany w tym wydaniu:" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:22 +msgid "" +"Major core optimizations for painting and display, including parallelized " +"painting code." +msgstr "" +"Duże optymalizacje rdzenia programu w zakresie rysowania i wyświetlania, " +"w tym wielowątkowy kod rysowania." + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:23 +msgid "Symmetries are now preserved in XCF files (saved as image parasites)." +msgstr "" +"Symetrie w plikach XCF są teraz zachowywane (zapisywane jako dane " +"pasożytnicze obrazu)." + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:24 +msgid "" +"\"Light\" and \"Dark\" themes rewritten from scratch to get rid of various " +"usability issues. \"Lighter\" and \"Darker\" themes removed." +msgstr "" +"„Jasny” i „Ciemny” motyw zostały przepisane od zera, aby pozbyć się różnych " +"problemów z interfejsem. Usunięto motywy „Jaśniejszy” i „Ciemniejszy”." + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:25 +msgid "" +"New GimpToolGyroscope on-canvas control, currently used for the Panorama " +"Projection filter. The widget provides on-canvas interaction for 3D rotation " +"(yaw, pitch, roll)." +msgstr "" +"Nowe narzędzie sterowania na płótnie GimpToolGyroscope, obecnie używane " +"przez filtr rzutu panoramy. Ten widżet zapewnia sterowanie obrotem 3D na " +"płótnie (odchylenie, kąt, walec)." + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:26 +msgid "" +"Plug-in debugging improved to output stack traces from plug-ins with --stack-" +"trace-mode command line option not only on receiving signals but also on " +"warnings and critical errors when \"fatal-warnings\" debug key is set." +msgstr "" +"Ulepszono debugowanie wtyczek, aby otrzymywać wyjątki za pomocą opcji " +"wiersza poleceń --stack-trace-mode nie tylko po sygnałach przychodzących, " +"ale także po ostrzeżeniach i błędach krytycznych, kiedy ustawiony jest klucz " +"debugowania „fatal-warnings”." + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:27 +msgid "" +"For more information, see https://www.gimp.org/news/2018/04/14/gimp-2-10-rc2-" +"released/" +msgstr "" +"https://www.gimp.org/news/2018/04/14/gimp-2-10-rc2-released/ zawiera więcej " +"informacji (w języku angielskim)." + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:28 +msgid "" "GIMP 2.10.0-RC1 is the first release candidate before GIMP 2.10.0 stable " "release, with a focus on debugging and stability. Other than the many bug " "fixes, most notable improvements are:" @@ -96,12 +234,12 @@ msgstr "" "GIMP 2.10.0, skupiające się na debugowaniu i stabilności. Oprócz wielu " "poprawek błędów najważniejsze ulepszenia to:" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:9 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:29 msgid "New dashboard dockable to monitor GIMP resource usage" msgstr "" "Nowy panel wydajności do monitorowania użycia zasobów przez program GIMP" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:10 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:30 msgid "" "New debug dialog to produce back traces and other debug data, encouraging to " "report bugs" @@ -109,33 +247,33 @@ msgstr "" "Nowe okno debugowania do generowania wyjątków i innych danych debugowania, " "zachęcające do zgłaszania błędów" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:11 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:31 msgid "Unsaved images can now be recovered after a crash" msgstr "Po awarii można teraz odzyskać niezapisane obrazy" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:12 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:32 msgid "Layer masks on layer groups" msgstr "Maski warstw w grupach warstw" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:13 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:33 msgid "JPEG 2000 support improved for high bit depth and various color spaces" msgstr "" "Ulepszona obsługa formatu JPEG 2000 o głębię wysokobitową i różne " "przestrzenie kolorów" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:14 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:34 msgid "Screenshot and color picking improved on various platforms" msgstr "Ulepszenia zrzutów ekranu i wyboru kolorów na różnych platformach" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:15 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:35 msgid "Metadata defaults preferences now available" msgstr "Preferencje domyślnego zachowania metadanych są teraz dostępne" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:16 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:36 msgid "Various GUI polishing" msgstr "Różne poprawki interfejsu" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:17 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:37 msgid "" "For more information, see https://www.gimp.org/news/2018/03/23/gimp-2-10-rc1-" "released/" @@ -143,7 +281,7 @@ msgstr "" "https://www.gimp.org/news/2018/03/23/gimp-2-10-rc1-released/ zawiera więcej " "informacji (w języku angielskim)." -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:18 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:38 msgid "" "GIMP 2.9.8 introduces on-canvas gradient editing and various enhancements " "while focusing on bugfixing and stability." @@ -151,53 +289,53 @@ msgstr "" "GIMP 2.9.8 dodaje modyfikowanie gradientów na obszarze rysowania oraz różne " "ulepszenia, jednocześnie skupiając się na poprawkach błędów i stabilności." -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:19 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:39 msgid "On-canvas gradient editing" msgstr "Modyfikowanie gradientów na obszarze rysowania" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:20 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:40 msgid "Notification when an image is over/underexposed" msgstr "Powiadomienie, kiedy obraz jest prześwietlony/niedoświetlony" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:21 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:41 msgid "Better and faster color management" msgstr "Lepsze i szybsze zarządzania kolorami" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:22 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:42 msgid "Support for color picker and screenshots in Wayland on KDE Plasma" msgstr "" "Wybieranie kolorów i wykonywanie zrzutów ekranu w środowisku KDE Plasma " "używającym technologii Wayland" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:23 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:43 msgid "Paste in place feature" msgstr "Wklejanie w tym samym miejscu" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:24 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:44 msgid "Many usability improvements" msgstr "Wiele ulepszeń użyteczności" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:25 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:45 msgid "Manual can be displayed in the user's preferred language" msgstr "Podręcznik może być wyświetlany w preferowanym języku użytkownika" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:26 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:46 msgid "Improvements for the Wavelet Decompose filter" msgstr "Ulepszenia filtru rozkład falki" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:27 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:47 msgid "Improved compatibility with Photoshop .psd files" msgstr "Ulepszona zgodność z plikami .psd programu Photoshop" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:28 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:48 msgid "New support for password-protected PDF" msgstr "Obsługa plików PDF chronionych hasłem" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:29 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:49 msgid "New support for HGT format (Digital Elevation Model data)" msgstr "Obsługa formatu HGT (dane cyfrowego modelu wysokościowego)" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:30 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:50 msgid "" "For more information, see https://www.gimp.org/news/2017/12/12/gimp-2-9-8-" "released/" @@ -284,110 +422,114 @@ msgstr "Używa %s w wersji %s (skompilowano z wersją %s)" msgid "%s version %s" msgstr "%s w wersji %s" -#: ../app/main.c:155 +#: ../app/main.c:157 msgid "Show version information and exit" msgstr "Wyświetla informację o wersji i kończy działanie" -#: ../app/main.c:160 +#: ../app/main.c:162 msgid "Show license information and exit" msgstr "Wyświetla informację o licencji i kończy działanie" -#: ../app/main.c:165 +#: ../app/main.c:167 msgid "Be more verbose" msgstr "Wyświetla więcej informacji" -#: ../app/main.c:170 +#: ../app/main.c:172 msgid "Start a new GIMP instance" msgstr "Uruchamia nowe wystąpienie programu GIMP" -#: ../app/main.c:175 +#: ../app/main.c:177 msgid "Open images as new" msgstr "Otwiera obraz jako nowy" -#: ../app/main.c:180 +#: ../app/main.c:182 msgid "Run without a user interface" msgstr "Uruchamia bez interfejsu użytkownika" -#: ../app/main.c:185 +#: ../app/main.c:187 msgid "Do not load brushes, gradients, patterns, ..." msgstr "Nie wczytuje pędzli, gradientów, deseni itp." -#: ../app/main.c:190 +#: ../app/main.c:192 msgid "Do not load any fonts" msgstr "Nie wczytuje żadnych czcionek" -#: ../app/main.c:195 +#: ../app/main.c:197 msgid "Do not show a splash screen" msgstr "Nie wyświetla ekranu powitalnego" -#: ../app/main.c:200 +#: ../app/main.c:202 msgid "Do not use shared memory between GIMP and plug-ins" msgstr "Nie wykorzystuje pamięci dzielonej pomiędzy programem GIMP a wtyczkami" -#: ../app/main.c:205 +#: ../app/main.c:207 msgid "Do not use special CPU acceleration functions" msgstr "" "Nie wykorzystuje specjalnych instrukcji procesora przyśpieszających działanie" -#: ../app/main.c:210 +#: ../app/main.c:212 msgid "Use an alternate sessionrc file" msgstr "Używa alternatywnego pliku sessionrc" -#: ../app/main.c:215 +#: ../app/main.c:217 msgid "Use an alternate user gimprc file" msgstr "Używa alternatywnego pliku gimprc użytkownika" -#: ../app/main.c:220 +#: ../app/main.c:222 msgid "Use an alternate system gimprc file" msgstr "Używa alternatywnego systemowego plik gimprc" -#: ../app/main.c:225 +#: ../app/main.c:227 msgid "Batch command to run (can be used multiple times)" msgstr "Polecenie wsadowe do uruchomienia (może być używane wielokrotnie)" -#: ../app/main.c:230 +#: ../app/main.c:232 msgid "The procedure to process batch commands with" msgstr "Procedura, za pomocą której przetwarzać polecenia wsadowe" -#: ../app/main.c:235 +#: ../app/main.c:237 msgid "Send messages to console instead of using a dialog" msgstr "Wyświetla komunikaty w konsoli zamiast w oknie dialogowym" #. don't translate the mode names (off|on|warn) -#: ../app/main.c:241 +#: ../app/main.c:243 msgid "PDB compatibility mode (off|on|warn)" msgstr "Tryb kompatybilności PDB (off|on|warn)" #. don't translate the mode names (never|query|always) -#: ../app/main.c:247 +#: ../app/main.c:249 msgid "Debug in case of a crash (never|query|always)" msgstr "Debuguje w przypadku awarii programu (never|query|always)" -#: ../app/main.c:252 +#: ../app/main.c:254 msgid "Enable non-fatal debugging signal handlers" msgstr "Włącza obsługę debugowania niekrytycznych sygnałów" -#: ../app/main.c:257 +#: ../app/main.c:259 msgid "Make all warnings fatal" msgstr "Traktuje wszystkie ostrzeżenia jako krytyczne" -#: ../app/main.c:262 +#: ../app/main.c:264 msgid "Output a gimprc file with default settings" msgstr "Wypisuje plik gimprc z domyślnymi ustawieniami" -#: ../app/main.c:278 +#: ../app/main.c:280 msgid "Output a sorted list of deprecated procedures in the PDB" msgstr "Wypisuje uporządkowaną listę przestarzałych procedur w PDB" -#: ../app/main.c:283 +#: ../app/main.c:285 msgid "Show a preferences page with experimental features" msgstr "Wyświetla stronę preferencji z eksperymentalnymi funkcjami" -#: ../app/main.c:459 +#: ../app/main.c:290 +msgid "Show an image submenu with debug actions" +msgstr "Wyświetla podmenu obrazu z działaniami debugowania" + +#: ../app/main.c:466 msgid "[FILE|URI...]" msgstr "[PLIK|URI…]" -#: ../app/main.c:477 +#: ../app/main.c:484 msgid "" "GIMP could not initialize the graphical user interface.\n" "Make sure a proper setup for your display environment exists." @@ -395,20 +537,20 @@ msgstr "" "Program GIMP nie może zainicjować interfejsu graficznego.\n" "Proszę się upewnić, że ustawienia środowiska wyświetlania są poprawne." -#: ../app/main.c:496 +#: ../app/main.c:503 msgid "Another GIMP instance is already running." msgstr "Inne wystąpienie programu GIMP jest już uruchomione." -#: ../app/main.c:586 +#: ../app/main.c:594 msgid "GIMP output. Type any character to close this window." msgstr "Wyjście programu GIMP. Wpisanie dowolnego znaku zamknie to okno." -#: ../app/main.c:587 +#: ../app/main.c:595 #, c-format msgid "(Type any character to close this window)\n" msgstr "(Wpisanie dowolnego znaku zamknie to okno)\n" -#: ../app/main.c:604 +#: ../app/main.c:612 msgid "GIMP output. You can minimize this window, but don't close it." msgstr "" "Wyjście programu GIMP. Można zminimalizować to okno, ale nie należy go " @@ -451,7 +593,7 @@ msgstr "Edytor pędzli" #. initialize the list of gimp brushes #: ../app/actions/actions.c:114 ../app/core/gimp-data-factories.c:317 -#: ../app/dialogs/dialogs.c:335 ../app/dialogs/preferences-dialog.c:3072 +#: ../app/dialogs/dialogs.c:335 ../app/dialogs/preferences-dialog.c:3092 msgid "Brushes" msgstr "Pędzle" @@ -499,7 +641,7 @@ msgstr "Element dokowalny" #. Document History #: ../app/actions/actions.c:147 ../app/dialogs/dialogs.c:362 -#: ../app/dialogs/preferences-dialog.c:1197 +#: ../app/dialogs/preferences-dialog.c:1201 msgid "Document History" msgstr "Historia dokumentów" @@ -533,7 +675,7 @@ msgid "Filters" msgstr "Filtry" #: ../app/actions/actions.c:171 ../app/dialogs/dialogs.c:353 -#: ../app/dialogs/preferences-dialog.c:3092 +#: ../app/dialogs/preferences-dialog.c:3112 msgid "Fonts" msgstr "Czcionki" @@ -544,12 +686,12 @@ msgstr "Edytor gradientów" #. initialize the list of gimp gradients #: ../app/actions/actions.c:177 ../app/core/gimp-data-factories.c:342 -#: ../app/dialogs/dialogs.c:347 ../app/dialogs/preferences-dialog.c:3088 +#: ../app/dialogs/dialogs.c:347 ../app/dialogs/preferences-dialog.c:3108 msgid "Gradients" msgstr "Gradienty" #: ../app/actions/actions.c:180 ../app/core/gimp-data-factories.c:353 -#: ../app/dialogs/dialogs.c:359 ../app/dialogs/preferences-dialog.c:3096 +#: ../app/dialogs/dialogs.c:359 ../app/dialogs/preferences-dialog.c:3116 msgid "Tool Presets" msgstr "Ustawienia narzędzia" @@ -578,7 +720,7 @@ msgstr "Warstwy" #. initialize the list of mypaint brushes #: ../app/actions/actions.c:198 ../app/core/gimp-data-factories.c:327 -#: ../app/dialogs/dialogs.c:341 ../app/dialogs/preferences-dialog.c:3100 +#: ../app/dialogs/dialogs.c:341 ../app/dialogs/preferences-dialog.c:3120 msgid "MyPaint Brushes" msgstr "Pędzle programu MyPaint" @@ -589,23 +731,23 @@ msgstr "Edytor palety" #. initialize the list of gimp palettes #: ../app/actions/actions.c:204 ../app/core/gimp-data-factories.c:337 -#: ../app/dialogs/dialogs.c:350 ../app/dialogs/preferences-dialog.c:3084 +#: ../app/dialogs/dialogs.c:350 ../app/dialogs/preferences-dialog.c:3104 msgid "Palettes" msgstr "Palety" #. initialize the list of gimp patterns #: ../app/actions/actions.c:207 ../app/core/gimp-data-factories.c:332 -#: ../app/dialogs/dialogs.c:344 ../app/dialogs/preferences-dialog.c:3080 +#: ../app/dialogs/dialogs.c:344 ../app/dialogs/preferences-dialog.c:3100 msgid "Patterns" msgstr "Desenie" -#: ../app/actions/actions.c:210 ../app/dialogs/preferences-dialog.c:3104 +#: ../app/actions/actions.c:210 ../app/dialogs/preferences-dialog.c:3124 msgid "Plug-ins" msgstr "Wtyczki" #. Quick Mask Color #: ../app/actions/actions.c:213 ../app/core/gimpchannel.c:383 -#: ../app/dialogs/preferences-dialog.c:1680 +#: ../app/dialogs/preferences-dialog.c:1684 msgid "Quick Mask" msgstr "Szybka maska" @@ -618,7 +760,7 @@ msgid "Select" msgstr "Zaznaczenie" #. initialize the template list -#: ../app/actions/actions.c:222 ../app/core/gimp.c:795 +#: ../app/actions/actions.c:222 ../app/core/gimp.c:797 #: ../app/dialogs/dialogs.c:365 msgid "Templates" msgstr "Szablony" @@ -2481,82 +2623,87 @@ msgstr "Menu panelu wydajności" #: ../app/actions/dashboard-actions.c:44 msgctxt "dashboard-action" +msgid "Groups" +msgstr "Grupy" + +#: ../app/actions/dashboard-actions.c:46 +msgctxt "dashboard-action" msgid "Update Interval" msgstr "Czas między aktualizacjami" -#: ../app/actions/dashboard-actions.c:46 +#: ../app/actions/dashboard-actions.c:48 msgctxt "dashboard-action" msgid "History Duration" msgstr "Czas trwania historii" -#: ../app/actions/dashboard-actions.c:49 +#: ../app/actions/dashboard-actions.c:51 msgctxt "dashboard-action" msgid "Reset" msgstr "Przywróć" -#: ../app/actions/dashboard-actions.c:50 +#: ../app/actions/dashboard-actions.c:52 msgctxt "dashboard-action" msgid "Reset cumulative data" msgstr "Przywraca narastające dane" -#: ../app/actions/dashboard-actions.c:58 +#: ../app/actions/dashboard-actions.c:60 msgctxt "dashboard-action" msgid "Low Swap Space Warning" msgstr "Ostrzeżenie o małej ilości miejsca w pamięci wymiany" -#: ../app/actions/dashboard-actions.c:59 +#: ../app/actions/dashboard-actions.c:61 msgctxt "dashboard-action" msgid "Raise the dashboard when the swap size approaches its limit" msgstr "" "Podnosi panel wydajności, kiedy rozmiar pamięci wymiany zbliża się do " "ograniczenia" -#: ../app/actions/dashboard-actions.c:69 +#: ../app/actions/dashboard-actions.c:71 msgctxt "dashboard-update-interval" msgid "0.25 Seconds" msgstr "0,25 sekundy" -#: ../app/actions/dashboard-actions.c:74 +#: ../app/actions/dashboard-actions.c:76 msgctxt "dashboard-update-interval" msgid "0.5 Seconds" msgstr "0,5 sekundy" -#: ../app/actions/dashboard-actions.c:79 +#: ../app/actions/dashboard-actions.c:81 msgctxt "dashboard-update-interval" msgid "1 Second" msgstr "1 sekunda" -#: ../app/actions/dashboard-actions.c:84 +#: ../app/actions/dashboard-actions.c:86 msgctxt "dashboard-update-interval" msgid "2 Seconds" msgstr "2 sekundy" -#: ../app/actions/dashboard-actions.c:89 +#: ../app/actions/dashboard-actions.c:91 msgctxt "dashboard-update-interval" msgid "4 Seconds" msgstr "4 sekundy" -#: ../app/actions/dashboard-actions.c:97 +#: ../app/actions/dashboard-actions.c:99 msgctxt "dashboard-history-duration" msgid "15 Seconds" msgstr "15 sekund" -#: ../app/actions/dashboard-actions.c:102 +#: ../app/actions/dashboard-actions.c:104 msgctxt "dashboard-history-duration" msgid "30 Seconds" msgstr "30 sekund" -#: ../app/actions/dashboard-actions.c:107 +#: ../app/actions/dashboard-actions.c:109 msgctxt "dashboard-history-duration" msgid "60 Seconds" msgstr "60 sekund" -#: ../app/actions/dashboard-actions.c:112 +#: ../app/actions/dashboard-actions.c:114 msgctxt "dashboard-history-duration" msgid "120 Seconds" msgstr "120 sekund" -#: ../app/actions/dashboard-actions.c:117 +#: ../app/actions/dashboard-actions.c:119 msgctxt "dashboard-history-duration" msgid "240 Seconds" msgstr "240 sekund" @@ -2564,8 +2711,8 @@ msgstr "240 sekund" #: ../app/actions/data-commands.c:90 ../app/actions/documents-commands.c:383 #: ../app/actions/file-commands.c:205 ../app/dialogs/file-open-dialog.c:212 #: ../app/dialogs/file-open-dialog.c:253 -#: ../app/dialogs/file-open-location-dialog.c:218 -#: ../app/dialogs/file-open-location-dialog.c:228 +#: ../app/dialogs/file-open-location-dialog.c:223 +#: ../app/dialogs/file-open-location-dialog.c:239 #: ../app/display/gimpdisplayshell-dnd.c:614 #: ../app/widgets/gimplayertreeview.c:765 ../app/widgets/gimptoolbox.c:805 #: ../app/widgets/gimptoolbox-dnd.c:170 @@ -2580,8 +2727,8 @@ msgstr "" "%s" #: ../app/actions/data-commands.c:114 ../app/actions/tool-options-commands.c:74 -#: ../app/core/gimpbrushgenerated-load.c:120 ../app/core/gimpimage.c:1964 -#: ../app/core/gimppalette.c:461 ../app/core/gimppalette-import.c:211 +#: ../app/core/gimpbrushgenerated-load.c:120 ../app/core/gimpimage.c:1971 +#: ../app/core/gimppalette.c:461 ../app/core/gimppalette-import.c:213 #: ../app/core/gimppalette-load.c:186 #: ../app/dialogs/palette-import-dialog.c:778 ../app/widgets/gimpdnd-xds.c:89 msgid "Untitled" @@ -2994,8 +3141,8 @@ msgid "Search commands by keyword, and run them" msgstr "Wyszukuje polecenia według słów kluczowych, i je wykonuje" #: ../app/actions/dialogs-actions.c:357 -#: ../app/dialogs/preferences-dialog.c:2018 -#: ../app/dialogs/preferences-dialog.c:2019 ../app/widgets/gimptoolbox.c:529 +#: ../app/dialogs/preferences-dialog.c:2022 +#: ../app/dialogs/preferences-dialog.c:2023 ../app/widgets/gimptoolbox.c:529 msgid "Toolbox" msgstr "Przybornik" @@ -3284,7 +3431,7 @@ msgstr "Czyszczenie historii dokumentów" #: ../app/actions/error-console-commands.c:96 #: ../app/actions/file-commands.c:416 #: ../app/actions/gradient-editor-commands.c:478 -#: ../app/actions/gradient-editor-commands.c:580 +#: ../app/actions/gradient-editor-commands.c:581 #: ../app/actions/gradients-commands.c:78 ../app/actions/plug-in-commands.c:180 #: ../app/actions/templates-commands.c:244 #: ../app/actions/text-editor-commands.c:64 @@ -3310,8 +3457,8 @@ msgstr "Czyszczenie historii dokumentów" #: ../app/dialogs/offset-dialog.c:136 #: ../app/dialogs/palette-import-dialog.c:162 #: ../app/dialogs/preferences-dialog.c:287 -#: ../app/dialogs/preferences-dialog.c:633 -#: ../app/dialogs/preferences-dialog.c:1096 +#: ../app/dialogs/preferences-dialog.c:637 +#: ../app/dialogs/preferences-dialog.c:1100 #: ../app/dialogs/print-size-dialog.c:124 ../app/dialogs/quit-dialog.c:171 #: ../app/dialogs/resize-dialog.c:186 #: ../app/dialogs/resolution-calibrate-dialog.c:76 @@ -3323,9 +3470,9 @@ msgstr "Czyszczenie historii dokumentów" #: ../app/display/gimpdisplayshell-filter-dialog.c:87 #: ../app/display/gimpdisplayshell-rotate-dialog.c:122 #: ../app/display/gimpdisplayshell-scale-dialog.c:122 -#: ../app/tools/gimpfiltertool.c:321 -#: ../app/tools/gimpforegroundselecttool.c:307 ../app/tools/gimptexttool.c:1591 -#: ../app/tools/gimptransformtool.c:1201 ../app/widgets/gimpactionview.c:669 +#: ../app/tools/gimpfiltertool.c:323 +#: ../app/tools/gimpforegroundselecttool.c:313 ../app/tools/gimptexttool.c:1591 +#: ../app/tools/gimptransformtool.c:1215 ../app/widgets/gimpactionview.c:669 #: ../app/widgets/gimpcolordialog.c:110 #: ../app/widgets/gimpcontrollereditor.c:660 #: ../app/widgets/gimpcontrollerlist.c:564 @@ -3337,7 +3484,7 @@ msgid "_Cancel" msgstr "_Anuluj" #: ../app/actions/documents-commands.c:231 ../app/actions/edit-commands.c:161 -#: ../app/dialogs/preferences-dialog.c:634 +#: ../app/dialogs/preferences-dialog.c:638 msgid "Cl_ear" msgstr "Wy_czyść" @@ -5036,7 +5183,7 @@ msgctxt "fonts-action" msgid "Rescan the installed fonts" msgstr "Odświeża listę zainstalowanych czcionek" -#: ../app/actions/gimpgeglprocedure.c:320 +#: ../app/actions/gimpgeglprocedure.c:323 #, c-format msgid "There are no last settings for '%s', showing the filter dialog instead." msgstr "" @@ -5366,27 +5513,27 @@ msgstr "" "Proszę określić, ile razy powinno\n" "zostać powielone zaznaczenie." -#: ../app/actions/gradient-editor-commands.c:562 +#: ../app/actions/gradient-editor-commands.c:563 msgid "Split Segment Uniformly" msgstr "Podziel segment równomiernie" -#: ../app/actions/gradient-editor-commands.c:563 +#: ../app/actions/gradient-editor-commands.c:564 msgid "Split Gradient Segment Uniformly" msgstr "Równomierny podział segmentu gradientu" -#: ../app/actions/gradient-editor-commands.c:567 +#: ../app/actions/gradient-editor-commands.c:568 msgid "Split Segments Uniformly" msgstr "Podziel segmenty równomiernie" -#: ../app/actions/gradient-editor-commands.c:568 +#: ../app/actions/gradient-editor-commands.c:569 msgid "Split Gradient Segments Uniformly" msgstr "Równomierny podział segmentów gradientu" -#: ../app/actions/gradient-editor-commands.c:581 +#: ../app/actions/gradient-editor-commands.c:582 msgid "_Split" msgstr "Po_dziel" -#: ../app/actions/gradient-editor-commands.c:603 +#: ../app/actions/gradient-editor-commands.c:604 msgid "" "Select the number of uniform parts\n" "in which to split the selected segment." @@ -5394,7 +5541,7 @@ msgstr "" "Proszę podać liczbę jednakowych części,\n" "na jakie ma zostać podzielony zaznaczony segment." -#: ../app/actions/gradient-editor-commands.c:606 +#: ../app/actions/gradient-editor-commands.c:607 msgid "" "Select the number of uniform parts\n" "in which to split the segments in the selection." @@ -6031,7 +6178,7 @@ msgstr "Skalowanie obrazu" #. Scaling #: ../app/actions/image-commands.c:1453 ../app/actions/layers-commands.c:1569 -#: ../app/dialogs/preferences-dialog.c:1602 +#: ../app/dialogs/preferences-dialog.c:1606 #: ../app/pdb/drawable-transform-cmds.c:800 #: ../app/pdb/drawable-transform-cmds.c:891 #: ../app/pdb/image-transform-cmds.c:122 ../app/pdb/image-transform-cmds.c:158 @@ -7296,11 +7443,11 @@ msgstr "Przywracanie wszystkich filtrów" #: ../app/actions/tool-options-commands.c:196 ../app/dialogs/fill-dialog.c:114 #: ../app/dialogs/grid-dialog.c:101 ../app/dialogs/image-new-dialog.c:105 #: ../app/dialogs/preferences-dialog.c:288 -#: ../app/dialogs/preferences-dialog.c:1095 +#: ../app/dialogs/preferences-dialog.c:1099 #: ../app/dialogs/print-size-dialog.c:123 ../app/dialogs/scale-dialog.c:136 #: ../app/dialogs/stroke-dialog.c:127 #: ../app/display/gimpdisplayshell-rotate-dialog.c:121 -#: ../app/tools/gimpfiltertool.c:320 ../app/tools/gimptransformtool.c:1200 +#: ../app/tools/gimpfiltertool.c:322 ../app/tools/gimptransformtool.c:1214 #: ../app/widgets/gimpcolordialog.c:109 msgid "_Reset" msgstr "_Przywróć" @@ -7583,11 +7730,11 @@ msgstr "" "Podczas dodawania obramowania zaznaczone obszary są traktowane tak, jakby " "znajdowały się także poza obrazem." -#: ../app/actions/select-commands.c:415 +#: ../app/actions/select-commands.c:423 msgid "Fill Selection Outline" msgstr "Wypełnienie krawędzi zaznaczenia" -#: ../app/actions/select-commands.c:444 +#: ../app/actions/select-commands.c:452 msgid "Stroke Selection" msgstr "Rysowanie wzdłuż zaznaczenia" @@ -7730,7 +7877,7 @@ msgstr "_Otwórz" #: ../app/actions/text-editor-commands.c:139 #: ../app/actions/text-tool-commands.c:209 ../app/config/gimpconfig-file.c:71 -#: ../app/core/gimppalette-import.c:510 ../app/plug-in/gimpenvirontable.c:289 +#: ../app/core/gimppalette-import.c:512 ../app/plug-in/gimpenvirontable.c:289 #: ../app/plug-in/gimpinterpreterdb.c:233 #: ../app/tools/gimpfiltertool-settings.c:170 #: ../app/widgets/gimptextbuffer.c:1674 @@ -9744,14 +9891,14 @@ msgstr "Przenieś to okno na ekran %s" #: ../app/dialogs/grid-dialog.c:103 ../app/dialogs/image-new-dialog.c:107 #: ../app/dialogs/image-new-dialog.c:326 #: ../app/dialogs/item-options-dialog.c:146 -#: ../app/dialogs/preferences-dialog.c:1097 +#: ../app/dialogs/preferences-dialog.c:1101 #: ../app/dialogs/print-size-dialog.c:125 #: ../app/dialogs/resolution-calibrate-dialog.c:77 #: ../app/dialogs/template-options-dialog.c:119 #: ../app/display/gimpdisplayshell-filter-dialog.c:88 #: ../app/display/gimpdisplayshell-rotate-dialog.c:123 #: ../app/display/gimpdisplayshell-scale-dialog.c:123 ../app/gui/gui.c:193 -#: ../app/tools/gimpfiltertool.c:322 ../app/widgets/gimpcolordialog.c:111 +#: ../app/tools/gimpfiltertool.c:324 ../app/widgets/gimpcolordialog.c:111 #: ../app/widgets/gimpcontrollereditor.c:661 #: ../app/widgets/gimperrordialog.c:76 ../app/widgets/gimpfiledialog.c:188 msgid "_OK" @@ -10033,7 +10180,7 @@ msgid "Error parsing '%%s': line longer than %s characters." msgstr "Błąd podczas przetwarzania „%%s”: wiersz jest dłuższy niż %s znaków." #: ../app/config/gimpconfig-file.c:152 ../app/config/gimpconfig-file.c:196 -#: ../app/core/gimp-tags.c:144 ../app/gui/themes.c:361 +#: ../app/core/gimp-tags.c:144 ../app/gui/themes.c:344 #: ../app/tools/gimpfiltertool-settings.c:227 #, c-format msgid "Error writing '%s': %s" @@ -10193,18 +10340,23 @@ msgstr "" "Liczba wyświetlanych ostatnio używanych ustawień w narzędziach filtrowania." #: ../app/config/gimprc-blurbs.h:182 +msgid "Default to the last used settings in filter tools." +msgstr "" +"Domyślne używanie ostatnio używanych ustawień w narzędziach filtrowania." + +#: ../app/config/gimprc-blurbs.h:185 msgid "Show advanced color options in filter tools." msgstr "Wyświetlanie zaawansowanych opcji kolorów w narzędziach filtrowania." -#: ../app/config/gimprc-blurbs.h:185 +#: ../app/config/gimprc-blurbs.h:188 msgid "Sets the text to appear in image window status bars." msgstr "Ustawia napis pojawiający się na pasku stanu okna z obrazem." -#: ../app/config/gimprc-blurbs.h:188 +#: ../app/config/gimprc-blurbs.h:191 msgid "Sets the text to appear in image window titles." msgstr "Ustawia napis pojawiający się na pasku tytułowym okna z obrazem." -#: ../app/config/gimprc-blurbs.h:191 +#: ../app/config/gimprc-blurbs.h:194 msgid "" "Promote imported images to floating point precision. Does not apply to " "indexed images." @@ -10212,7 +10364,7 @@ msgstr "" "Konwertowanie importowanych obrazów do dokładności zmiennoprzecinkowej. Nie " "wpływa na obrazy indeksowane." -#: ../app/config/gimprc-blurbs.h:195 +#: ../app/config/gimprc-blurbs.h:198 msgid "" "When promoting imported images to floating point precision, also add minimal " "noise in order to distribute color values a bit." @@ -10220,32 +10372,32 @@ msgstr "" "Dodawanie minimalnego szumu podczas konwertowania importowanych obrazów do " "dokładności zmiennoprzecinkowej, aby nieco rozłożyć wartości kolorów." -#: ../app/config/gimprc-blurbs.h:199 +#: ../app/config/gimprc-blurbs.h:202 msgid "Add an alpha channel to all layers of imported images." msgstr "Dodawanie kanału alfa do wszystkich warstw importowanych obrazów." -#: ../app/config/gimprc-blurbs.h:202 +#: ../app/config/gimprc-blurbs.h:205 msgid "Which plug-in to use for importing raw digital camera files." msgstr "Której wtyczki używać do importowania plików Raw aparatów cyfrowych." -#: ../app/config/gimprc-blurbs.h:205 +#: ../app/config/gimprc-blurbs.h:208 msgid "Export Exif metadata by default." msgstr "Domyślne eksportowanie metadanych Exif." -#: ../app/config/gimprc-blurbs.h:208 +#: ../app/config/gimprc-blurbs.h:211 msgid "Export XMP metadata by default." msgstr "Domyślne eksportowanie metadanych XMP." -#: ../app/config/gimprc-blurbs.h:211 +#: ../app/config/gimprc-blurbs.h:214 msgid "Export IPTC metadata by default." msgstr "Domyślne eksportowanie metadanych IPTC." -#: ../app/config/gimprc-blurbs.h:214 +#: ../app/config/gimprc-blurbs.h:217 msgid "Try generating debug data for bug reporting when appropriate." msgstr "" "Tworzenie danych debugowania w celu zgłaszania błędów, kiedy to możliwe." -#: ../app/config/gimprc-blurbs.h:217 +#: ../app/config/gimprc-blurbs.h:220 msgid "" "When enabled, this will ensure that the full image is visible after a file " "is opened, otherwise it will be displayed with a scale of 1:1." @@ -10254,22 +10406,22 @@ msgstr "" "sposób, aby cały obraz był widoczny. Jeśli opcja nie jest włączona, skala " "ustawiana jest zawsze na 1∶1." -#: ../app/config/gimprc-blurbs.h:221 +#: ../app/config/gimprc-blurbs.h:224 msgid "" "Sets the level of interpolation used for scaling and other transformations." msgstr "" "Poziom interpolacji wykorzystywany przy skalowaniu i innych " "przekształceniach." -#: ../app/config/gimprc-blurbs.h:228 +#: ../app/config/gimprc-blurbs.h:231 msgid "Specifies the language to use for the user interface." msgstr "Ustawia język używany przez interfejs użytkownika." -#: ../app/config/gimprc-blurbs.h:231 +#: ../app/config/gimprc-blurbs.h:234 msgid "How many recently opened image filenames to keep on the File menu." msgstr "Liczba wyświetlanych ostatnio otwartych plików w menu „Plik”." -#: ../app/config/gimprc-blurbs.h:234 +#: ../app/config/gimprc-blurbs.h:237 msgid "" "Speed of marching ants in the selection outline. This value is in " "milliseconds (less time indicates faster marching)." @@ -10277,7 +10429,7 @@ msgstr "" "Prędkość animacji obwódki widocznej wokół zaznaczonego obszaru. Wartość jest " "podana w milisekundach (krótszy czas oznacza szybszą animację)." -#: ../app/config/gimprc-blurbs.h:238 +#: ../app/config/gimprc-blurbs.h:241 msgid "" "GIMP will warn the user if an attempt is made to create an image that would " "take more memory than the size specified here." @@ -10285,7 +10437,7 @@ msgstr "" "Program GIMP wyświetli ostrzeżenie, jeżeli ilość pamięci niezbędna do " "utworzenia obrazu przekroczy podaną tutaj wartość." -#: ../app/config/gimprc-blurbs.h:248 +#: ../app/config/gimprc-blurbs.h:251 msgid "" "Sets the monitor's horizontal resolution, in dots per inch. If set to 0, " "forces the X server to be queried for both horizontal and vertical " @@ -10294,7 +10446,7 @@ msgstr "" "Ustala rozdzielczość poziomą monitora w punktach na cal. Jeżeli ustawione " "jest 0, wymusza zapytanie serwera X o rozdzielczość pionową i poziomą." -#: ../app/config/gimprc-blurbs.h:253 +#: ../app/config/gimprc-blurbs.h:256 msgid "" "Sets the monitor's vertical resolution, in dots per inch. If set to 0, " "forces the X server to be queried for both horizontal and vertical " @@ -10303,7 +10455,7 @@ msgstr "" "Ustala rozdzielczość pionową monitora w punktach na cal. Jeżeli ustawione " "jest 0, wymusza zapytanie serwera X o rozdzielczość pionową i poziomą." -#: ../app/config/gimprc-blurbs.h:258 +#: ../app/config/gimprc-blurbs.h:261 msgid "" "If enabled, the move tool sets the edited layer or path as active. This " "used to be the default behaviour in older versions." @@ -10312,7 +10464,7 @@ msgstr "" "jako aktywną. Zachowanie to występowało jako domyślne w starszych wersjach " "programu." -#: ../app/config/gimprc-blurbs.h:267 +#: ../app/config/gimprc-blurbs.h:270 msgid "" "Sets the size of the navigation preview available in the lower right corner " "of the image window." @@ -10320,13 +10472,13 @@ msgstr "" "Ustala rozmiar podglądu nawigacyjnego, widocznego w prawym dolnym rogu okna " "obrazu." -#: ../app/config/gimprc-blurbs.h:271 +#: ../app/config/gimprc-blurbs.h:274 msgid "Sets how many threads GIMP should use for operations that support it." msgstr "" "Określa liczbę wątków, jaką program GIMP może używać dla działań " "obsługujących wielowątkowość." -#: ../app/config/gimprc-blurbs.h:293 +#: ../app/config/gimprc-blurbs.h:296 msgid "" "Sets whether GIMP should create previews of layers and channels. Previews in " "the layers and channels dialog are nice to have but they can slow things " @@ -10336,7 +10488,7 @@ msgstr "" "Podglądy w oknie warstw i kanałów ułatwiają pracę, jednak przy pracy " "z dużymi obrazami mogą negatywnie wpłynąć na prędkość działania programu." -#: ../app/config/gimprc-blurbs.h:298 +#: ../app/config/gimprc-blurbs.h:301 msgid "" "Sets the preview size used for layers and channel previews in newly created " "dialogs." @@ -10344,11 +10496,11 @@ msgstr "" "Ustawia rozmiar podglądu warstw i kanałów w nowo utworzonych oknach " "dialogowych." -#: ../app/config/gimprc-blurbs.h:302 +#: ../app/config/gimprc-blurbs.h:305 msgid "Sets the default quick mask color." msgstr "Ustawia domyślny kolor szybkiej maski." -#: ../app/config/gimprc-blurbs.h:305 +#: ../app/config/gimprc-blurbs.h:308 msgid "" "When enabled, the image window will automatically resize itself whenever the " "physical image size changes. This setting only takes effect in multi-window " @@ -10358,7 +10510,7 @@ msgstr "" "fizycznych wymiarów obrazu. To ustawienie jest uwzględniane tylko w trybie " "wielu okien." -#: ../app/config/gimprc-blurbs.h:310 +#: ../app/config/gimprc-blurbs.h:313 msgid "" "When enabled, the image window will automatically resize itself when zooming " "into and out of images. This setting only takes effect in multi-window mode." @@ -10367,13 +10519,13 @@ msgstr "" "powiększenia obrazu. To ustawienie jest uwzględniane tylko w trybie wielu " "okien." -#: ../app/config/gimprc-blurbs.h:315 +#: ../app/config/gimprc-blurbs.h:318 msgid "Let GIMP try to restore your last saved session on each startup." msgstr "" "Powoduje, że przy każdym uruchomieniu programu GIMP przywracana jest " "poprzednia zapisana sesja." -#: ../app/config/gimprc-blurbs.h:318 +#: ../app/config/gimprc-blurbs.h:321 msgid "" "When enabled, GIMP will try to restore windows on the monitor they were open " "before. When disabled, windows will appear on the currently used monitor." @@ -10382,14 +10534,14 @@ msgstr "" "na którym były poprzednio otwarte. Wyłączenie powoduje, że okna będą " "otwierane na obecnie używanym monitorze." -#: ../app/config/gimprc-blurbs.h:323 +#: ../app/config/gimprc-blurbs.h:326 msgid "" "Remember the current tool, pattern, color, and brush across GIMP sessions." msgstr "" "Powoduje zapamiętywanie aktywnego narzędzia, desenia, koloru oraz pędzla " "między sesjami programu GIMP." -#: ../app/config/gimprc-blurbs.h:327 +#: ../app/config/gimprc-blurbs.h:330 msgid "" "When enabled, the same tool and tool options will be used for all input " "devices. No tool switching will occur when the input device changes." @@ -10398,7 +10550,7 @@ msgstr "" "urządzenia wejściowe. Podczas zmiany urządzenia wejściowego narzędzie nie " "będzie przełączane." -#: ../app/config/gimprc-blurbs.h:332 +#: ../app/config/gimprc-blurbs.h:335 msgid "" "Keep a permanent record of all opened and saved files in the Recent " "Documents list." @@ -10406,19 +10558,19 @@ msgstr "" "Zachowuje wszystkie wpisy otwartych i zapisanych plików na liście historii " "dokumentów." -#: ../app/config/gimprc-blurbs.h:336 +#: ../app/config/gimprc-blurbs.h:339 msgid "Save the positions and sizes of the main dialogs when GIMP exits." msgstr "" "Powoduje zapisywanie położeń i rozmiarów głównych okien dialogowych przed " "zakończeniem działania programu GIMP." -#: ../app/config/gimprc-blurbs.h:339 +#: ../app/config/gimprc-blurbs.h:342 msgid "Save the tool options when GIMP exits." msgstr "" "Powoduje zapisywanie opcji narzędzi przed zakończeniem działania program " "GIMP." -#: ../app/config/gimprc-blurbs.h:345 +#: ../app/config/gimprc-blurbs.h:348 msgid "" "When enabled, all paint tools will show a preview of the current brush's " "outline." @@ -10426,7 +10578,7 @@ msgstr "" "Powoduje wyświetlanie podglądu kształtu aktywnego pędzla podczas używania " "któregokolwiek z narzędzi rysowania." -#: ../app/config/gimprc-blurbs.h:349 +#: ../app/config/gimprc-blurbs.h:352 msgid "" "When enabled, dialogs will show a help button that gives access to the " "related help page. Without this button, the help page can still be reached " @@ -10436,14 +10588,14 @@ msgstr "" "dostęp do strony pomocy powiązanej z oknem. Przy wyłączonej opcji pomoc " "nadal będzie dostępna przez naciśnięcie klawisza F1." -#: ../app/config/gimprc-blurbs.h:354 +#: ../app/config/gimprc-blurbs.h:357 msgid "" "When enabled, the mouse pointer will be shown over the image while using a " "paint tool." msgstr "" "Powoduje, że w czasie rysowania nad obrazem wyświetlany jest kursor myszy." -#: ../app/config/gimprc-blurbs.h:358 +#: ../app/config/gimprc-blurbs.h:361 msgid "" "When enabled, the menubar is visible by default. This can also be toggled " "with the \"View->Show Menubar\" command." @@ -10451,7 +10603,7 @@ msgstr "" "Powoduje, że domyślnie pasek menu jest widoczny. Ustawienie można zmienić " "w dowolnej chwili za pomocą polecenia „Widok → Pasek menu”." -#: ../app/config/gimprc-blurbs.h:362 +#: ../app/config/gimprc-blurbs.h:365 msgid "" "When enabled, the rulers are visible by default. This can also be toggled " "with the \"View->Show Rulers\" command." @@ -10459,7 +10611,7 @@ msgstr "" "Powoduje, że domyślnie linijki są widoczne. Ustawienie można zmienić " "w dowolnej chwili za pomocą polecenia „Widok → Linijki”." -#: ../app/config/gimprc-blurbs.h:366 +#: ../app/config/gimprc-blurbs.h:369 msgid "" "When enabled, the scrollbars are visible by default. This can also be " "toggled with the \"View->Show Scrollbars\" command." @@ -10467,7 +10619,7 @@ msgstr "" "Powoduje, że domyślnie paski przewijania są widoczne. Ustawienie można " "zmienić w dowolnej chwili za pomocą polecenia „Widok → Paski przewijania”." -#: ../app/config/gimprc-blurbs.h:370 +#: ../app/config/gimprc-blurbs.h:373 msgid "" "When enabled, the statusbar is visible by default. This can also be toggled " "with the \"View->Show Statusbar\" command." @@ -10475,7 +10627,7 @@ msgstr "" "Powoduje, że domyślnie pasek stanu jest widoczny. Ustawienie można zmienić " "w dowolnej chwili za pomocą polecenia „Widok → Pasek stanu”." -#: ../app/config/gimprc-blurbs.h:374 +#: ../app/config/gimprc-blurbs.h:377 msgid "" "When enabled, the selection is visible by default. This can also be toggled " "with the \"View->Show Selection\" command." @@ -10483,7 +10635,7 @@ msgstr "" "Powoduje, że domyślnie zaznaczenie jest widoczne. Ustawienie można zmienić " "w dowolnej chwili za pomocą polecenia „Widok → Zaznaczenie”." -#: ../app/config/gimprc-blurbs.h:378 +#: ../app/config/gimprc-blurbs.h:381 msgid "" "When enabled, the layer boundary is visible by default. This can also be " "toggled with the \"View->Show Layer Boundary\" command." @@ -10491,7 +10643,7 @@ msgstr "" "Powoduje, że domyślnie granice warstwy są widoczne. Ustawienie można zmienić " "w dowolnej chwili za pomocą polecenia „Widok → Granice warstwy”." -#: ../app/config/gimprc-blurbs.h:382 +#: ../app/config/gimprc-blurbs.h:385 msgid "" "When enabled, the guides are visible by default. This can also be toggled " "with the \"View->Show Guides\" command." @@ -10499,7 +10651,7 @@ msgstr "" "Powoduje, że domyślnie prowadnice są widoczne. Ustawienie można zmienić " "w dowolnej chwili za pomocą polecenia „Widok → Prowadnice”." -#: ../app/config/gimprc-blurbs.h:386 +#: ../app/config/gimprc-blurbs.h:389 msgid "" "When enabled, the grid is visible by default. This can also be toggled with " "the \"View->Show Grid\" command." @@ -10507,7 +10659,7 @@ msgstr "" "Powoduje, że domyślnie siatka jest widoczna. Ustawienie można zmienić " "w dowolnej chwili za pomocą polecenia „Widok → Siatka”." -#: ../app/config/gimprc-blurbs.h:390 +#: ../app/config/gimprc-blurbs.h:393 msgid "" "When enabled, the sample points are visible by default. This can also be " "toggled with the \"View->Show Sample Points\" command." @@ -10515,43 +10667,43 @@ msgstr "" "Powoduje, że domyślnie punkty wzorcowe są widoczne. Ustawienie można zmienić " "w dowolnej chwili za pomocą polecenia „Widok → Punkty wzorcowe”." -#: ../app/config/gimprc-blurbs.h:394 +#: ../app/config/gimprc-blurbs.h:397 msgid "Show a tooltip when the pointer hovers over an item." msgstr "Wyświetla podpowiedź, kiedy kursor jest nad narzędziem." -#: ../app/config/gimprc-blurbs.h:397 +#: ../app/config/gimprc-blurbs.h:400 msgid "Use GIMP in a single-window mode." msgstr "Uruchamia program GIMP w trybie jednego okna." -#: ../app/config/gimprc-blurbs.h:400 +#: ../app/config/gimprc-blurbs.h:403 msgid "Hide docks and other windows, leaving only image windows." msgstr "Ukrywa doki oraz inne okna, zostawiając jedynie okna z obrazem." -#: ../app/config/gimprc-blurbs.h:403 +#: ../app/config/gimprc-blurbs.h:406 msgid "Enable the N-Point Deformation tool." msgstr "Włącza narzędzie zniekształcania za pomocą wielu punktów." -#: ../app/config/gimprc-blurbs.h:406 +#: ../app/config/gimprc-blurbs.h:409 msgid "Enable the Handle Transform tool." msgstr "Włącza narzędzie przekształcania za pomocą uchwytów." -#: ../app/config/gimprc-blurbs.h:409 +#: ../app/config/gimprc-blurbs.h:412 msgid "Enable symmetry on painting." msgstr "Włącza symetrię malowania." -#: ../app/config/gimprc-blurbs.h:412 +#: ../app/config/gimprc-blurbs.h:415 msgid "Enable the MyPaint Brush tool." msgstr "Włącza narzędzie pędzli programu MyPaint." -#: ../app/config/gimprc-blurbs.h:415 +#: ../app/config/gimprc-blurbs.h:418 msgid "Enable the Seamless Clone tool." msgstr "Włącza bezszwowe narzędzie klonowania." -#: ../app/config/gimprc-blurbs.h:418 +#: ../app/config/gimprc-blurbs.h:421 msgid "What to do when the space bar is pressed in the image window." msgstr "Określa, co zrobić po wciśnięciu spacji w oknie obrazu." -#: ../app/config/gimprc-blurbs.h:421 +#: ../app/config/gimprc-blurbs.h:424 msgid "" "Sets the swap file location. GIMP uses a tile based memory allocation " "scheme. The swap file is used to quickly and easily swap tiles out to disk " @@ -10568,11 +10720,11 @@ msgstr "" "przez NFS). W większości przypadków zaleca się umiejscowienie go w katalogu " "„/tmp”." -#: ../app/config/gimprc-blurbs.h:430 +#: ../app/config/gimprc-blurbs.h:433 msgid "When enabled, menus can be torn off." msgstr "Umożliwia odrywanie menu." -#: ../app/config/gimprc-blurbs.h:433 +#: ../app/config/gimprc-blurbs.h:436 msgid "" "When enabled, you can change keyboard shortcuts for menu items by hitting a " "key combination while the menu item is highlighted." @@ -10581,19 +10733,19 @@ msgstr "" "przez naciśnięcie wybranej kombinacji klawiszy, kiedy dana pozycja jest " "aktywna." -#: ../app/config/gimprc-blurbs.h:437 +#: ../app/config/gimprc-blurbs.h:440 msgid "Save changed keyboard shortcuts when GIMP exits." msgstr "" "Powoduje zapisywanie skrótów klawiszowych przed zakończeniem działania " "programu GIMP." -#: ../app/config/gimprc-blurbs.h:440 +#: ../app/config/gimprc-blurbs.h:443 msgid "Restore saved keyboard shortcuts on each GIMP startup." msgstr "" "Powoduje przywracanie zapisanych skrótów klawiszowych przy uruchamianiu " "programu GIMP." -#: ../app/config/gimprc-blurbs.h:443 +#: ../app/config/gimprc-blurbs.h:446 msgid "" "Sets the folder for temporary storage. Files will appear here during the " "course of running GIMP. Most files will disappear when GIMP exits, but some " @@ -10606,14 +10758,14 @@ msgstr "" "istnieje możliwość, że część plików pozostanie, więc zaleca się, aby katalog " "ten nie był współdzielony z innymi użytkownikami." -#: ../app/config/gimprc-blurbs.h:464 +#: ../app/config/gimprc-blurbs.h:467 msgid "" "Sets the default rendering intent for the 'Convert to Color Profile' dialog." msgstr "" "Ustawia domyślny sposób odwzorowania barw dla okna dialogowego „Konwersja na " "profil kolorów”." -#: ../app/config/gimprc-blurbs.h:467 +#: ../app/config/gimprc-blurbs.h:470 msgid "" "Sets the default 'Black Point Compensation' state for the 'Convert to Color " "Profile' dialog." @@ -10621,14 +10773,14 @@ msgstr "" "Ustawia domyślny stan opcji „Kompensacja czarnego punktu” dla okna " "dialogowego „Konwersja na profil kolorów”." -#: ../app/config/gimprc-blurbs.h:471 +#: ../app/config/gimprc-blurbs.h:474 msgid "" "Sets the default layer dithering method for the 'Convert Precision' dialog." msgstr "" "Ustawia domyślną metodę ditheringu warstw dla okna dialogowego „Konwersja " "dokładności”." -#: ../app/config/gimprc-blurbs.h:474 +#: ../app/config/gimprc-blurbs.h:477 msgid "" "Sets the default text layer dithering method for the 'Convert Precision' " "dialog." @@ -10636,20 +10788,20 @@ msgstr "" "Ustawia domyślną metodę ditheringu warstw tekstowych dla okna dialogowego " "„Konwersja dokładności”." -#: ../app/config/gimprc-blurbs.h:477 +#: ../app/config/gimprc-blurbs.h:480 msgid "" "Sets the default channel dithering method for the 'Convert Precision' dialog." msgstr "" "Ustawia domyślną metodę ditheringu kanałów dla okna dialogowego „Konwersja " "dokładności”." -#: ../app/config/gimprc-blurbs.h:480 +#: ../app/config/gimprc-blurbs.h:483 msgid "Sets the default palette type for the 'Convert to Indexed' dialog." msgstr "" "Ustawia domyślny typ palety dla okna dialogowego „Konwersja do trybu " "indeksowanego”." -#: ../app/config/gimprc-blurbs.h:483 +#: ../app/config/gimprc-blurbs.h:486 msgid "" "Sets the default maximum number of colors for the 'Convert to Indexed' " "dialog." @@ -10657,7 +10809,7 @@ msgstr "" "Ustawia domyślną maksymalną liczbę kolorów dla okna dialogowego „Konwersja " "do trybu indeksowanego”." -#: ../app/config/gimprc-blurbs.h:486 +#: ../app/config/gimprc-blurbs.h:489 msgid "" "Sets the default 'Remove duplicate colors' state for the 'Convert to " "Indexed' dialog." @@ -10665,20 +10817,20 @@ msgstr "" "Ustawia domyślny stan opcji „Usuwanie podwójnych kolorów” dla okna " "dialogowego „Konwersja do trybu indeksowanego”." -#: ../app/config/gimprc-blurbs.h:489 +#: ../app/config/gimprc-blurbs.h:492 msgid "Sets the default dithering type for the 'Convert to Indexed' dialog." msgstr "" "Ustawia domyślny typ ditheringu dla okna dialogowego „Konwersja do trybu " "indeksowanego”." -#: ../app/config/gimprc-blurbs.h:492 +#: ../app/config/gimprc-blurbs.h:495 msgid "" "Sets the default 'Dither alpha' state for the 'Convert to Indexed' dialog." msgstr "" "Ustawia domyślny stan opcji „Dithering alfy” dla okna dialogowego „Konwersja " "do trybu indeksowanego”." -#: ../app/config/gimprc-blurbs.h:495 +#: ../app/config/gimprc-blurbs.h:498 msgid "" "Sets the default 'Dither text layers' state for the 'Convert to Indexed' " "dialog." @@ -10686,127 +10838,127 @@ msgstr "" "Ustawia domyślny stan opcji „Dithering warstw tekstowych” dla okna " "dialogowego „Konwersja do trybu indeksowanego”." -#: ../app/config/gimprc-blurbs.h:498 +#: ../app/config/gimprc-blurbs.h:501 msgid "Sets the default fill type for the 'Canvas Size' dialog." msgstr "" "Ustawia domyślny typ wypełnienia dla okna dialogowego „Wymiary płótna”." -#: ../app/config/gimprc-blurbs.h:501 +#: ../app/config/gimprc-blurbs.h:504 msgid "Sets the default set of layers to resize for the 'Canvas Size' dialog." msgstr "" "Ustawia domyślny zestaw warstw do zmiany wymiarów dla okna dialogowego " "„Wymiary płótna”." -#: ../app/config/gimprc-blurbs.h:504 +#: ../app/config/gimprc-blurbs.h:507 msgid "" "Sets the default 'Resize text layers' state for the 'Canvas Size' dialog." msgstr "" "Ustawia domyślny stan opcji „Zmiana wymiarów warstw tekstowych” dla okna " "dialogowego „Wymiary płótna”." -#: ../app/config/gimprc-blurbs.h:507 +#: ../app/config/gimprc-blurbs.h:510 msgid "Sets the default layer name for the 'New Layer' dialog." msgstr "Ustawia domyślną nazwę warstwy dla okna dialogowego „Nowa warstwa”." -#: ../app/config/gimprc-blurbs.h:510 +#: ../app/config/gimprc-blurbs.h:513 msgid "Sets the default mode for the 'New Layer' dialog." msgstr "Ustawia domyślny tryb dla okna dialogowego „Nowa warstwa”." -#: ../app/config/gimprc-blurbs.h:513 +#: ../app/config/gimprc-blurbs.h:516 msgid "Sets the default blend space for the 'New Layer' dialog." msgstr "" "Ustawia domyślną przestrzeń gradientu dla okna dialogowego „Nowa warstwa”." -#: ../app/config/gimprc-blurbs.h:516 +#: ../app/config/gimprc-blurbs.h:519 msgid "Sets the default composite space for the 'New Layer' dialog." msgstr "" "Ustawia domyślną przestrzeń mieszania dla okna dialogowego „Nowa warstwa”." -#: ../app/config/gimprc-blurbs.h:519 +#: ../app/config/gimprc-blurbs.h:522 msgid "Sets the default composite mode for the 'New Layer' dialog." msgstr "Ustawia domyślny tryb mieszania dla okna dialogowego „Nowa warstwa”." -#: ../app/config/gimprc-blurbs.h:522 +#: ../app/config/gimprc-blurbs.h:525 msgid "Sets the default opacity for the 'New Layer' dialog." msgstr "Ustawia domyślną wartość krycia dla okna dialogowego „Nowa warstwa”." -#: ../app/config/gimprc-blurbs.h:525 +#: ../app/config/gimprc-blurbs.h:528 msgid "Sets the default fill type for the 'New Layer' dialog." msgstr "Ustawia domyślny typ wypełnienia dla okna dialogowego „Nowa warstwa”." -#: ../app/config/gimprc-blurbs.h:528 +#: ../app/config/gimprc-blurbs.h:531 msgid "Sets the default fill type for the 'Layer Boundary Size' dialog." msgstr "" "Ustawia domyślny typ wypełnienia dla okna dialogowego „Wymiary granic " "warstwy”." -#: ../app/config/gimprc-blurbs.h:531 +#: ../app/config/gimprc-blurbs.h:534 msgid "Sets the default mask for the 'Add Layer Mask' dialog." msgstr "Ustawia domyślną maskę dla okna dialogowego „Dodanie maski warstwy”." -#: ../app/config/gimprc-blurbs.h:534 +#: ../app/config/gimprc-blurbs.h:537 msgid "Sets the default 'invert mask' state for the 'Add Layer Mask' dialog." msgstr "" "Ustawia domyślny stan „odwrócenia maski” dla okna dialogowego „Dodanie maski " "warstwy”." -#: ../app/config/gimprc-blurbs.h:537 +#: ../app/config/gimprc-blurbs.h:540 msgid "Sets the default merge type for the 'Merge Visible Layers' dialog." msgstr "" "Ustawia domyślny typ łączenia dla okna dialogowego „Połączenie widocznych " "warstw”." -#: ../app/config/gimprc-blurbs.h:540 +#: ../app/config/gimprc-blurbs.h:543 msgid "" "Sets the default 'Active group only' for the 'Merge Visible Layers' dialog." msgstr "" "Ustawia domyślną wartość opcji „Tylko aktywna grupa” dla okna dialogowego " "„Połączenie widocznych warstw”." -#: ../app/config/gimprc-blurbs.h:543 +#: ../app/config/gimprc-blurbs.h:546 msgid "" "Sets the default 'Discard invisible' for the 'Merge Visible Layers' dialog." msgstr "" "Ustawia domyślną wartość opcji „Pomijanie niewidocznych” dla okna " "dialogowego „Połączenie widocznych warstw”." -#: ../app/config/gimprc-blurbs.h:546 +#: ../app/config/gimprc-blurbs.h:549 msgid "Sets the default channel name for the 'New Channel' dialog." msgstr "Ustawia domyślną nazwę kanału dla okna dialogowego „Nowy kanał”." -#: ../app/config/gimprc-blurbs.h:549 +#: ../app/config/gimprc-blurbs.h:552 msgid "Sets the default color and opacity for the 'New Channel' dialog." msgstr "Ustawia domyślny kolor i krycie dla okna dialogowego „Nowy kanał”." -#: ../app/config/gimprc-blurbs.h:552 +#: ../app/config/gimprc-blurbs.h:555 msgid "Sets the default path name for the 'New Path' dialog." msgstr "Ustawia domyślną nazwę ścieżki dla okna dialogowego „Nowa ścieżka”." -#: ../app/config/gimprc-blurbs.h:555 +#: ../app/config/gimprc-blurbs.h:558 msgid "Sets the default folder path for the 'Export Path' dialog." msgstr "" "Ustawia domyślną ścieżkę do katalogu dla okna dialogowego „Eksport ścieżki”." -#: ../app/config/gimprc-blurbs.h:558 +#: ../app/config/gimprc-blurbs.h:561 msgid "" "Sets the default 'Export the active path' state for the 'Export Path' dialog." msgstr "" "Ustawia domyślny stan opcji „Eksport aktywnej ścieżki” dla okna dialogowego " "„Eksport ścieżki”." -#: ../app/config/gimprc-blurbs.h:561 +#: ../app/config/gimprc-blurbs.h:564 msgid "Sets the default folder path for the 'Import Path' dialog." msgstr "" "Ustawia domyślną ścieżkę do katalogu dla okna dialogowego „Import ścieżki”." -#: ../app/config/gimprc-blurbs.h:564 +#: ../app/config/gimprc-blurbs.h:567 msgid "" "Sets the default 'Merge imported paths' state for the 'Import Path' dialog." msgstr "" "Ustawia domyślny stan opcji „Połączenie zaimportowanych ścieżek” dla okna " "dialogowego „Import ścieżki”." -#: ../app/config/gimprc-blurbs.h:567 +#: ../app/config/gimprc-blurbs.h:570 msgid "" "Sets the default 'Scale imported paths to fit size' state for the 'Import " "Path' dialog." @@ -10814,25 +10966,25 @@ msgstr "" "Ustawia domyślny stan opcji „Przeskalowanie ścieżek do wymiarów obrazu” dla " "okna dialogowego „Import ścieżki”." -#: ../app/config/gimprc-blurbs.h:570 +#: ../app/config/gimprc-blurbs.h:573 msgid "Sets the default feather radius for the 'Feather Selection' dialog." msgstr "" "Ustawia domyślny promień zmiękczenia dla okna dialogowego „Zmiękczenie " "zaznaczenia”." -#: ../app/config/gimprc-blurbs.h:573 +#: ../app/config/gimprc-blurbs.h:576 msgid "Sets the default grow radius for the 'Grow Selection' dialog." msgstr "" "Ustawia domyślny promień powiększenia dla okna dialogowego „Powiększenie " "zaznaczenia”." -#: ../app/config/gimprc-blurbs.h:576 +#: ../app/config/gimprc-blurbs.h:579 msgid "Sets the default shrink radius for the 'Shrink Selection' dialog." msgstr "" "Ustawia domyślny promień zmniejszenia dla okna dialogowego „Zmniejszenie " "zaznaczenia”." -#: ../app/config/gimprc-blurbs.h:579 +#: ../app/config/gimprc-blurbs.h:582 msgid "" "Sets the default 'Selected areas continue outside the image' setting for the " "'Shrink Selection' dialog." @@ -10840,13 +10992,13 @@ msgstr "" "Ustawia domyślne ustawienie „Zaznaczone obszary znajdują się także poza " "obrazem” dla okna dialogowego „Zmniejszenie zaznaczenia”." -#: ../app/config/gimprc-blurbs.h:583 +#: ../app/config/gimprc-blurbs.h:586 msgid "Sets the default border radius for the 'Border Selection' dialog." msgstr "" "Ustawia domyślny promień obramowania dla okna dialogowego „Obramowanie " "zaznaczenia”." -#: ../app/config/gimprc-blurbs.h:586 +#: ../app/config/gimprc-blurbs.h:589 msgid "" "Sets the default 'Selected areas continue outside the image' setting for the " "'Border Selection' dialog." @@ -10854,17 +11006,17 @@ msgstr "" "Ustawia domyślne ustawienie „Zaznaczone obszary znajdują się także poza " "obrazem” dla okna dialogowego „Obramowanie zaznaczenia”." -#: ../app/config/gimprc-blurbs.h:590 +#: ../app/config/gimprc-blurbs.h:593 msgid "Sets the default border style for the 'Border Selection' dialog." msgstr "" "Ustawia domyślny styl obramowania dla okna dialogowego „Obramowanie " "zaznaczenia”." -#: ../app/config/gimprc-blurbs.h:599 +#: ../app/config/gimprc-blurbs.h:602 msgid "Sets the size of the thumbnail shown in the Open dialog." msgstr "Ustawia rozmiar miniatur w oknie wyboru pliku." -#: ../app/config/gimprc-blurbs.h:602 +#: ../app/config/gimprc-blurbs.h:605 msgid "" "The thumbnail in the Open dialog will be automatically updated if the file " "being previewed is smaller than the size set here." @@ -10873,7 +11025,7 @@ msgstr "" "mniejszy od podanej tutaj wartości, nastąpi automatyczne zaktualizowanie " "jego miniatury." -#: ../app/config/gimprc-blurbs.h:606 +#: ../app/config/gimprc-blurbs.h:609 msgid "" "When the amount of pixel data exceeds this limit, GIMP will start to swap " "tiles to disk. This is a lot slower but it makes it possible to work on " @@ -10885,29 +11037,29 @@ msgstr "" "niemieszczących się w pamięci. Jeżeli w komputerze jest dużą ilość pamięci " "RAM, to można zwiększyć tę wartość." -#: ../app/config/gimprc-blurbs.h:612 +#: ../app/config/gimprc-blurbs.h:615 msgid "Show the current foreground and background colors in the toolbox." msgstr "" "Wyświetla bieżący kolor pierwszoplanowy oraz tła z kolorem tła w przyborniku." -#: ../app/config/gimprc-blurbs.h:615 +#: ../app/config/gimprc-blurbs.h:618 msgid "Show the currently selected brush, pattern and gradient in the toolbox." msgstr "Wyświetla obecnie zaznaczony pędzel, deseń i gradient w przyborniku." -#: ../app/config/gimprc-blurbs.h:618 +#: ../app/config/gimprc-blurbs.h:621 msgid "Show the currently active image in the toolbox." msgstr "Wyświetla obecnie aktywny obraz w przyborniku." -#: ../app/config/gimprc-blurbs.h:624 +#: ../app/config/gimprc-blurbs.h:627 msgid "Sets the manner in which transparency is displayed in images." msgstr "Ustala sposób prezentowania przezroczystości w obrazie." -#: ../app/config/gimprc-blurbs.h:627 +#: ../app/config/gimprc-blurbs.h:630 msgid "Sets the size of the checkerboard used to display transparency." msgstr "" "Ustawia rozmiar szachownicy używanej dla zobrazowania przezroczystości." -#: ../app/config/gimprc-blurbs.h:630 +#: ../app/config/gimprc-blurbs.h:633 msgid "" "When enabled, GIMP will not save an image if it has not been changed since " "it was opened." @@ -10915,7 +11067,7 @@ msgstr "" "Powoduje, że program GIMP nie zapisuje obrazu, dopóki nie zostanie zmieniony " "(odkąd zostanie otwarty)." -#: ../app/config/gimprc-blurbs.h:634 +#: ../app/config/gimprc-blurbs.h:637 msgid "" "Sets the minimal number of operations that can be undone. More undo levels " "are kept available until the undo-size limit is reached." @@ -10924,7 +11076,7 @@ msgstr "" "cofnięcia większej liczby działań istnieje do czasu osiągnięcia ograniczenia " "rozmiaru historii działań." -#: ../app/config/gimprc-blurbs.h:638 +#: ../app/config/gimprc-blurbs.h:641 msgid "" "Sets an upper limit to the memory that is used per image to keep operations " "on the undo stack. Regardless of this setting, at least as many undo-levels " @@ -10935,15 +11087,15 @@ msgstr "" "gwarantuje jednak możliwość cofnięcia przynajmniej takiej liczby działań, " "jaką skonfigurowano jako minimalną." -#: ../app/config/gimprc-blurbs.h:643 +#: ../app/config/gimprc-blurbs.h:646 msgid "Sets the size of the previews in the Undo History." msgstr "Ustawia rozmiar podglądów w historii działań." -#: ../app/config/gimprc-blurbs.h:646 +#: ../app/config/gimprc-blurbs.h:649 msgid "When enabled, pressing F1 will open the help browser." msgstr "Powoduje uruchomienie przeglądarki pomocy po naciśnięciu klawisza F1." -#: ../app/config/gimprc-blurbs.h:649 +#: ../app/config/gimprc-blurbs.h:652 msgid "When enabled, uses OpenCL for some operations." msgstr "Kiedy jest włączone, używa OpenCL do wykonywania niektórych działań." @@ -11809,20 +11961,20 @@ msgid "Internal Procedures" msgstr "Wewnętrzne procedury" #. initialize the global parasite table -#: ../app/core/gimp.c:781 +#: ../app/core/gimp.c:783 msgid "Looking for data files" msgstr "Wyszukiwanie plików z danymi" -#: ../app/core/gimp.c:781 +#: ../app/core/gimp.c:783 msgid "Parasites" msgstr "Dane pasożytnicze" -#: ../app/core/gimp.c:790 +#: ../app/core/gimp.c:792 msgid "Fonts (this may take a while)" msgstr "Czcionki (może to zająć kilka minut)" #. initialize the module list -#: ../app/core/gimp.c:799 ../app/dialogs/preferences-dialog.c:3112 +#: ../app/core/gimp.c:801 ../app/dialogs/preferences-dialog.c:3132 msgid "Modules" msgstr "Moduły" @@ -11847,7 +11999,7 @@ msgstr "Usunięcie „%s” się nie powiodło: %s" #. initialize the list of gimp dynamics #: ../app/core/gimp-data-factories.c:322 ../app/core/gimpcontext.c:711 -#: ../app/dialogs/preferences-dialog.c:3076 +#: ../app/dialogs/preferences-dialog.c:3096 #: ../app/tools/gimppaintoptions-gui.c:225 msgid "Dynamics" msgstr "Dynamika" @@ -12088,7 +12240,7 @@ msgstr "" "Krytyczny błąd podczas przetwarzania pliku z pędzlami: dane pędzla " "skompresowane za pomocą RLE są uszkodzone." -#: ../app/core/gimpbrush.c:150 ../app/paint/gimppaintoptions.c:213 +#: ../app/core/gimpbrush.c:150 ../app/paint/gimppaintoptions.c:215 msgid "Brush Spacing" msgstr "Odstępy pędzla" @@ -12132,15 +12284,15 @@ msgstr "Promień pędzla" msgid "Brush Spikes" msgstr "Ostrza pędzla" -#: ../app/core/gimpbrushgenerated.c:157 ../app/paint/gimppaintoptions.c:220 +#: ../app/core/gimpbrushgenerated.c:157 ../app/paint/gimppaintoptions.c:222 msgid "Brush Hardness" msgstr "Twardość pędzla" -#: ../app/core/gimpbrushgenerated.c:165 ../app/paint/gimppaintoptions.c:199 +#: ../app/core/gimpbrushgenerated.c:165 ../app/paint/gimppaintoptions.c:201 msgid "Brush Aspect Ratio" msgstr "Proporcje pędzla" -#: ../app/core/gimpbrushgenerated.c:172 ../app/paint/gimppaintoptions.c:206 +#: ../app/core/gimpbrushgenerated.c:172 ../app/paint/gimppaintoptions.c:208 msgid "Brush Angle" msgstr "Nachylenie pędzla" @@ -12237,7 +12389,7 @@ msgctxt "undo-type" msgid "Stroke Channel" msgstr "Rysowanie wzdłuż kanału" -#: ../app/core/gimpchannel.c:279 ../app/core/gimpselection.c:654 +#: ../app/core/gimpchannel.c:279 msgctxt "undo-type" msgid "Channel to Selection" msgstr "Kanał na zaznaczenie" @@ -12315,25 +12467,25 @@ msgctxt "undo-type" msgid "Flood Channel" msgstr "Zalanie kanału" -#: ../app/core/gimpchannel.c:818 +#: ../app/core/gimpchannel.c:850 msgid "Cannot fill empty channel." msgstr "Nie można wypełniać na obszarze pustego kanału." -#: ../app/core/gimpchannel.c:854 +#: ../app/core/gimpchannel.c:886 msgid "Cannot stroke empty channel." msgstr "Nie można rysować na obszarze pustego kanału." -#: ../app/core/gimpchannel.c:1677 +#: ../app/core/gimpchannel.c:1709 msgctxt "undo-type" msgid "Set Channel Color" msgstr "Ustawienie koloru kanału" -#: ../app/core/gimpchannel.c:1728 +#: ../app/core/gimpchannel.c:1760 msgctxt "undo-type" msgid "Set Channel Opacity" msgstr "Ustawienie krycia kanału" -#: ../app/core/gimpchannel.c:1817 ../app/core/gimpselection.c:168 +#: ../app/core/gimpchannel.c:1849 ../app/core/gimpselection.c:168 msgid "Selection Mask" msgstr "Maska zaznaczenia" @@ -12383,7 +12535,8 @@ msgid "Pattern" msgstr "Deseń" #: ../app/core/gimpcontext.c:732 ../app/core/gimpcontext.c:733 -#: ../app/tools/gimpblendoptions.c:283 ../app/tools/gimppaintoptions-gui.c:374 +#: ../app/pdb/edit-cmds.c:797 ../app/tools/gimpgradientoptions.c:284 +#: ../app/tools/gimpgradienttool.c:156 ../app/tools/gimppaintoptions-gui.c:378 msgid "Gradient" msgstr "Gradient" @@ -12486,20 +12639,11 @@ msgstr "" "\n" "%s" -#: ../app/core/gimpdrawable.c:469 +#: ../app/core/gimpdrawable.c:480 msgctxt "undo-type" msgid "Scale" msgstr "Skalowanie" -#: ../app/core/gimpdrawable-blend.c:125 ../app/tools/gimpblendtool.c:1015 -msgctxt "undo-type" -msgid "Blend" -msgstr "Gradient" - -#: ../app/core/gimpdrawable-blend.c:213 -msgid "Calculating distance map" -msgstr "Obliczanie mapy odległości" - #: ../app/core/gimpdrawable-bucket-fill.c:180 msgctxt "undo-type" msgid "Bucket Fill" @@ -12527,6 +12671,15 @@ msgctxt "undo-type" msgid "Render Stroke" msgstr "Rysowanie pociągnięcia" +#: ../app/core/gimpdrawable-gradient.c:127 ../app/tools/gimpgradienttool.c:1016 +msgctxt "undo-type" +msgid "Gradient" +msgstr "Gradient" + +#: ../app/core/gimpdrawable-gradient.c:215 +msgid "Calculating distance map" +msgstr "Obliczanie mapy odległości" + #: ../app/core/gimpdrawable-levels.c:72 #: ../app/tools/gimpforegroundselectoptions.c:116 #: ../app/tools/gimplevelstool.c:132 @@ -12621,22 +12774,24 @@ msgstr "Nieprawidłowy ciąg UTF-8 w pliku „%s” z gradientem." msgid "File is corrupt." msgstr "Plik jest uszkodzony." -#: ../app/core/gimpgradient-load.c:195 ../app/core/gimpgradient-load.c:203 +#: ../app/core/gimpgradient-load.c:189 ../app/core/gimpgradient-load.c:199 +#: ../app/core/gimpgradient-load.c:211 ../app/core/gimpgradient-load.c:221 +#: ../app/core/gimpgradient-load.c:229 ../app/core/gimpgradient-load.c:237 #, c-format msgid "Corrupt segment %d." msgstr "Uszkodzony fragment %d." -#: ../app/core/gimpgradient-load.c:214 ../app/core/gimpgradient-load.c:224 +#: ../app/core/gimpgradient-load.c:248 ../app/core/gimpgradient-load.c:258 #, c-format msgid "Segments do not span the range 0-1." msgstr "Segmenty nie zawierają się w zakresie 0-1." -#: ../app/core/gimpgradient-load.c:239 +#: ../app/core/gimpgradient-load.c:273 #, c-format msgid "In line %d of gradient file: " msgstr "W %d. wierszu pliku z gradientem: " -#: ../app/core/gimpgradient-load.c:315 +#: ../app/core/gimpgradient-load.c:349 #, c-format msgid "No linear gradients found." msgstr "Nie odnaleziono gradientów liniowych." @@ -12749,29 +12904,29 @@ msgstr "Przekształcenie grupy warstw" msgid "Symmetry" msgstr "Symetria" -#: ../app/core/gimpimage.c:2216 +#: ../app/core/gimpimage.c:2223 msgid " (exported)" msgstr " (wyeksportowany)" -#: ../app/core/gimpimage.c:2220 +#: ../app/core/gimpimage.c:2227 msgid " (overwritten)" msgstr " (zastąpiony)" -#: ../app/core/gimpimage.c:2229 +#: ../app/core/gimpimage.c:2236 msgid " (imported)" msgstr " (zaimportowany)" -#: ../app/core/gimpimage.c:2557 +#: ../app/core/gimpimage.c:2564 msgctxt "undo-type" msgid "Change Image Resolution" msgstr "Zmiana rozdzielczości obrazu" -#: ../app/core/gimpimage.c:2609 +#: ../app/core/gimpimage.c:2616 msgctxt "undo-type" msgid "Change Image Unit" msgstr "Zmiana jednostki obrazu" -#: ../app/core/gimpimage.c:3493 +#: ../app/core/gimpimage.c:3500 #, c-format msgid "" "'gimp-comment' parasite validation failed: comment contains invalid UTF-8" @@ -12779,47 +12934,47 @@ msgstr "" "Sprawdzenie poprawności danych pasożytniczych „gimp-comment” się nie " "powiodło: komentarz zawiera nieprawidłowe UTF-8" -#: ../app/core/gimpimage.c:3545 +#: ../app/core/gimpimage.c:3552 msgctxt "undo-type" msgid "Attach Parasite to Image" msgstr "Dołączenie do obrazu danych pasożytniczych" -#: ../app/core/gimpimage.c:3586 +#: ../app/core/gimpimage.c:3593 msgctxt "undo-type" msgid "Remove Parasite from Image" msgstr "Usunięcie z obrazu danych pasożytniczych" -#: ../app/core/gimpimage.c:4297 +#: ../app/core/gimpimage.c:4304 msgctxt "undo-type" msgid "Add Layer" msgstr "Dodanie warstwy" -#: ../app/core/gimpimage.c:4339 ../app/core/gimpimage.c:4370 +#: ../app/core/gimpimage.c:4346 ../app/core/gimpimage.c:4377 msgctxt "undo-type" msgid "Remove Layer" msgstr "Usunięcie warstwy" -#: ../app/core/gimpimage.c:4364 +#: ../app/core/gimpimage.c:4371 msgctxt "undo-type" msgid "Remove Floating Selection" msgstr "Usunięcie oderwanego zaznaczenia" -#: ../app/core/gimpimage.c:4531 +#: ../app/core/gimpimage.c:4538 msgctxt "undo-type" msgid "Add Channel" msgstr "Dodanie kanału" -#: ../app/core/gimpimage.c:4559 ../app/core/gimpimage.c:4583 +#: ../app/core/gimpimage.c:4566 ../app/core/gimpimage.c:4590 msgctxt "undo-type" msgid "Remove Channel" msgstr "Usunięcie kanału" -#: ../app/core/gimpimage.c:4639 +#: ../app/core/gimpimage.c:4646 msgctxt "undo-type" msgid "Add Path" msgstr "Dodanie ścieżki" -#: ../app/core/gimpimage.c:4669 ../app/core/gimpimage.c:4676 +#: ../app/core/gimpimage.c:4676 ../app/core/gimpimage.c:4683 msgctxt "undo-type" msgid "Remove Path" msgstr "Usunięcie ścieżki" @@ -12911,75 +13066,75 @@ msgstr "Konwertowanie do kolorów indeksowanych (2. poziom)" msgid "Converting to indexed colors (stage 3)" msgstr "Konwertowanie do kolorów indeksowanych (3. poziom)" -#: ../app/core/gimpimage-convert-precision.c:75 +#: ../app/core/gimpimage-convert-precision.c:76 msgctxt "undo-type" msgid "Convert Image to 8 bit linear integer" msgstr "Konwersja obrazu do trybu 8-bitowego (liniowego, stałoprzecinkowego)" -#: ../app/core/gimpimage-convert-precision.c:78 +#: ../app/core/gimpimage-convert-precision.c:79 msgctxt "undo-type" msgid "Convert Image to 8 bit gamma integer" msgstr "Konwersja obrazu do trybu 8-bitowego (gamma, stałoprzecinkowego)" -#: ../app/core/gimpimage-convert-precision.c:81 +#: ../app/core/gimpimage-convert-precision.c:82 msgctxt "undo-type" msgid "Convert Image to 16 bit linear integer" msgstr "Konwersja obrazu do trybu 16-bitowego (liniowego, stałoprzecinkowego)" -#: ../app/core/gimpimage-convert-precision.c:84 +#: ../app/core/gimpimage-convert-precision.c:85 msgctxt "undo-type" msgid "Convert Image to 16 bit gamma integer" msgstr "Konwersja obrazu do trybu 16-bitowego (gamma, stałoprzecinkowego)" -#: ../app/core/gimpimage-convert-precision.c:87 +#: ../app/core/gimpimage-convert-precision.c:88 msgctxt "undo-type" msgid "Convert Image to 32 bit linear integer" msgstr "Konwersja obrazu do trybu 32-bitowego (liniowego, stałoprzecinkowego)" -#: ../app/core/gimpimage-convert-precision.c:90 +#: ../app/core/gimpimage-convert-precision.c:91 msgctxt "undo-type" msgid "Convert Image to 32 bit gamma integer" msgstr "Konwersja obrazu do trybu 32-bitowego (gamma, stałoprzecinkowego)" -#: ../app/core/gimpimage-convert-precision.c:93 +#: ../app/core/gimpimage-convert-precision.c:94 msgctxt "undo-type" msgid "Convert Image to 16 bit linear floating point" msgstr "" "Konwersja obrazu do trybu 16-bitowego (liniowego, zmiennoprzecinkowego)" -#: ../app/core/gimpimage-convert-precision.c:96 +#: ../app/core/gimpimage-convert-precision.c:97 msgctxt "undo-type" msgid "Convert Image to 16 bit gamma floating point" msgstr "Konwersja obrazu do trybu 16-bitowego (gamma, zmiennoprzecinkowego)" -#: ../app/core/gimpimage-convert-precision.c:99 +#: ../app/core/gimpimage-convert-precision.c:100 msgctxt "undo-type" msgid "Convert Image to 32 bit linear floating point" msgstr "" "Konwersja obrazu do trybu 32-bitowego (liniowego, zmiennoprzecinkowego)" -#: ../app/core/gimpimage-convert-precision.c:102 +#: ../app/core/gimpimage-convert-precision.c:103 msgctxt "undo-type" msgid "Convert Image to 32 bit gamma floating point" msgstr "Konwersja obrazu do trybu 32-bitowego (gamma, zmiennoprzecinkowego)" -#: ../app/core/gimpimage-convert-precision.c:105 +#: ../app/core/gimpimage-convert-precision.c:106 msgctxt "undo-type" msgid "Convert Image to 64 bit linear floating point" msgstr "" "Konwersja obrazu do trybu 64-bitowego (liniowego, zmiennoprzecinkowego)" -#: ../app/core/gimpimage-convert-precision.c:108 +#: ../app/core/gimpimage-convert-precision.c:109 msgctxt "undo-type" msgid "Convert Image to 64 bit gamma floating point" msgstr "Konwersja obrazu do trybu 64-bitowego (gamma, zmiennoprzecinkowego)" #. dithering -#: ../app/core/gimpimage-convert-precision.c:264 +#: ../app/core/gimpimage-convert-precision.c:267 #: ../app/core/gimpimage-convert-precision.c:288 #: ../app/dialogs/convert-indexed-dialog.c:236 #: ../app/dialogs/convert-precision-dialog.c:221 -#: ../app/tools/gimpblendoptions.c:135 +#: ../app/tools/gimpgradientoptions.c:136 msgid "Dithering" msgstr "Dithering" @@ -13098,12 +13253,12 @@ msgstr "" "Niewystarczająca liczba widocznych ścieżek do połączenia. Potrzebne są co " "najmniej dwie." -#: ../app/core/gimpimage-quick-mask.c:89 +#: ../app/core/gimpimage-quick-mask.c:88 msgctxt "undo-type" msgid "Enable Quick Mask" msgstr "Włączenie szybkiej maski" -#: ../app/core/gimpimage-quick-mask.c:121 +#: ../app/core/gimpimage-quick-mask.c:120 msgctxt "undo-type" msgid "Disable Quick Mask" msgstr "Wyłączenie szybkiej maski" @@ -13133,8 +13288,8 @@ msgstr "Skalowanie obrazu" msgid "Can't undo %s" msgstr "Nie można cofnąć działania „%s”" -#: ../app/core/gimpimagefile.c:750 ../app/dialogs/preferences-dialog.c:1838 -#: ../app/dialogs/preferences-dialog.c:1944 +#: ../app/core/gimpimagefile.c:750 ../app/dialogs/preferences-dialog.c:1842 +#: ../app/dialogs/preferences-dialog.c:1948 msgid "Folder" msgstr "Katalog" @@ -13393,17 +13548,17 @@ msgstr "Deserializacja pędzla programu MyPaint się nie powiodła." #. TRANSLATORS: the "%s" is an item title and "%u" is the number of #. occurrences for this item. -#: ../app/core/gimppalette-import.c:210 +#: ../app/core/gimppalette-import.c:212 #, c-format msgid "%s (occurs %u)" msgstr "%s (wystąpienia: %u)" -#: ../app/core/gimppalette-import.c:423 +#: ../app/core/gimppalette-import.c:425 #, c-format msgid "Index %d" msgstr "%d. indeks" -#: ../app/core/gimppalette-import.c:545 +#: ../app/core/gimppalette-import.c:547 #, c-format msgid "Unknown type of palette file: %s" msgstr "Nieznany typ pliku palety: %s" @@ -13589,20 +13744,20 @@ msgstr "Brak zaznaczenia do wypełnienia." msgid "There is no selection to stroke." msgstr "Brak zaznaczenia do narysowania." -#: ../app/core/gimpselection.c:749 +#: ../app/core/gimpselection.c:696 msgid "Unable to cut or copy because the selected region is empty." msgstr "Nie można wyciąć lub skopiować, ponieważ zaznaczony obszar jest pusty." -#: ../app/core/gimpselection.c:867 +#: ../app/core/gimpselection.c:814 msgid "Cannot float selection because the selected region is empty." msgstr "Nie można oderwać zaznaczenia, ponieważ zaznaczony obszar jest pusty." -#: ../app/core/gimpselection.c:874 +#: ../app/core/gimpselection.c:821 msgctxt "undo-type" msgid "Float Selection" msgstr "Oderwanie zaznaczenia" -#: ../app/core/gimpselection.c:892 +#: ../app/core/gimpselection.c:839 msgid "Floated Layer" msgstr "Oderwana warstwa" @@ -13654,16 +13809,16 @@ msgid "Emulate brush dynamics" msgstr "Emulowanie dynamiki pędzla" #. no undo (or redo) steps available -#: ../app/core/gimpsymmetry.c:132 ../app/widgets/gimpimagepropview.c:399 +#: ../app/core/gimpsymmetry.c:134 ../app/widgets/gimpimagepropview.c:399 #: ../app/widgets/gimpsymmetryeditor.c:169 msgid "None" msgstr "Brak" -#: ../app/core/gimpsymmetry.c:145 +#: ../app/core/gimpsymmetry.c:148 msgid "Active" msgstr "Aktywne" -#: ../app/core/gimpsymmetry.c:146 +#: ../app/core/gimpsymmetry.c:149 msgid "Activate symmetry painting" msgstr "Uruchamia malowanie symetryczne" @@ -14070,7 +14225,7 @@ msgid "Select Soft-Proof Profile" msgstr "Wybór profilu symulacji wydruku" #: ../app/dialogs/color-profile-dialog.c:209 -#: ../app/tools/gimpforegroundselecttool.c:308 +#: ../app/tools/gimpforegroundselecttool.c:314 msgid "_Select" msgstr "_Wybierz" @@ -14165,7 +14320,7 @@ msgid "Enable dithering of _transparency" msgstr "D_ithering przezroczystości" #: ../app/dialogs/convert-indexed-dialog.c:275 -#: ../app/dialogs/preferences-dialog.c:2163 +#: ../app/dialogs/preferences-dialog.c:2167 msgid "Enable dithering of text layers" msgstr "Dithering warstw tekstowych" @@ -14455,7 +14610,7 @@ msgid "Create a New Image" msgstr "Utworzenie nowego obrazu" #: ../app/dialogs/image-new-dialog.c:138 -#: ../app/dialogs/preferences-dialog.c:1664 +#: ../app/dialogs/preferences-dialog.c:1668 msgid "_Template:" msgstr "Sza_blon:" @@ -14486,9 +14641,9 @@ msgstr "Właściwości obrazu" #: ../app/dialogs/image-properties-dialog.c:68 #: ../app/dialogs/input-devices-dialog.c:62 #: ../app/dialogs/keyboard-shortcuts-dialog.c:55 -#: ../app/dialogs/module-dialog.c:134 ../app/tools/gimpblendtool-editor.c:1851 -#: ../app/tools/gimpcolorpickertool.c:349 ../app/tools/gimpmeasuretool.c:651 -#: ../app/widgets/gimpcontrollerlist.c:640 +#: ../app/dialogs/module-dialog.c:134 ../app/tools/gimpcolorpickertool.c:349 +#: ../app/tools/gimpgradienttool-editor.c:1854 +#: ../app/tools/gimpmeasuretool.c:651 ../app/widgets/gimpcontrollerlist.c:640 #: ../app/widgets/gimpcriticaldialog.c:97 ../app/widgets/gimppdbdialog.c:175 #: ../app/widgets/gimpsettingsbox.c:663 ../app/widgets/gimptexteditor.c:162 msgid "_Close" @@ -14768,7 +14923,7 @@ msgstr "Przesunięcie kanału" #. The offset frame #: ../app/dialogs/offset-dialog.c:129 ../app/dialogs/offset-dialog.c:163 #: ../app/dialogs/resize-dialog.c:230 ../app/tools/gimpalignoptions.c:100 -#: ../app/tools/gimpalignoptions.c:107 ../app/tools/gimpblendoptions.c:88 +#: ../app/tools/gimpalignoptions.c:107 ../app/tools/gimpgradientoptions.c:89 #: ../app/widgets/gimpgrideditor.c:209 msgid "Offset" msgstr "Przesunięcie" @@ -14821,7 +14976,7 @@ msgid "Select Source" msgstr "Wybór źródła" #: ../app/dialogs/palette-import-dialog.c:212 -#: ../app/dialogs/preferences-dialog.c:1626 +#: ../app/dialogs/preferences-dialog.c:1630 msgid "_Gradient" msgstr "_Gradient" @@ -14873,7 +15028,7 @@ msgstr "Ok_res:" #. The "Preview" frame #: ../app/dialogs/palette-import-dialog.c:360 -#: ../app/tools/gimpforegroundselecttool.c:1214 +#: ../app/tools/gimpforegroundselecttool.c:1223 msgid "Preview" msgstr "Podgląd" @@ -14898,7 +15053,7 @@ msgid "You will have to restart GIMP for the following changes to take effect:" msgstr "" "Należy ponownie uruchomić program GIMP, aby uwzględnić poniższe zmiany:" -#: ../app/dialogs/preferences-dialog.c:615 +#: ../app/dialogs/preferences-dialog.c:619 msgid "" "Your keyboard shortcuts will be reset to default values the next time you " "start GIMP." @@ -14906,15 +15061,15 @@ msgstr "" "Skróty klawiszowe zostaną ustawione na wartości domyślne przy następnym " "uruchomieniu programu GIMP." -#: ../app/dialogs/preferences-dialog.c:626 +#: ../app/dialogs/preferences-dialog.c:630 msgid "Remove all Keyboard Shortcuts" msgstr "Usunięcie wszystkich skrótów klawiszowych" -#: ../app/dialogs/preferences-dialog.c:648 +#: ../app/dialogs/preferences-dialog.c:652 msgid "Do you really want to remove all keyboard shortcuts from all menus?" msgstr "Na pewno usunąć wszystkie skróty klawiszowe z wszystkich menu?" -#: ../app/dialogs/preferences-dialog.c:689 +#: ../app/dialogs/preferences-dialog.c:693 msgid "" "Your window setup will be reset to default values the next time you start " "GIMP." @@ -14922,7 +15077,7 @@ msgstr "" "Ustawienia okien zostaną ustawione na wartości domyślne przy następnym " "uruchomieniu programu GIMP." -#: ../app/dialogs/preferences-dialog.c:724 +#: ../app/dialogs/preferences-dialog.c:728 msgid "" "Your input device settings will be reset to default values the next time you " "start GIMP." @@ -14930,7 +15085,7 @@ msgstr "" "Ustawienia urządzenia wprowadzania zostaną ustawione na wartości domyślne " "przy następnym uruchomieniu programu GIMP." -#: ../app/dialogs/preferences-dialog.c:766 +#: ../app/dialogs/preferences-dialog.c:770 msgid "" "Your tool options will be reset to default values the next time you start " "GIMP." @@ -14938,110 +15093,110 @@ msgstr "" "Ustawienia narzędzi zostaną ustawione na wartości domyślne przy następnym " "uruchomieniu programu GIMP." -#: ../app/dialogs/preferences-dialog.c:818 -#: ../app/dialogs/preferences-dialog.c:2436 +#: ../app/dialogs/preferences-dialog.c:822 +#: ../app/dialogs/preferences-dialog.c:2456 msgid "There's a local installation of the user manual." msgstr "Podręcznik użytkownika jest zainstalowany na komputerze." -#: ../app/dialogs/preferences-dialog.c:823 -#: ../app/dialogs/preferences-dialog.c:2442 +#: ../app/dialogs/preferences-dialog.c:827 +#: ../app/dialogs/preferences-dialog.c:2462 msgid "The user manual is not installed locally." msgstr "Podręcznik użytkownika nie jest zainstalowany na komputerze." -#: ../app/dialogs/preferences-dialog.c:930 +#: ../app/dialogs/preferences-dialog.c:934 msgid "Show _menubar" msgstr "Pasek _menu" -#: ../app/dialogs/preferences-dialog.c:934 +#: ../app/dialogs/preferences-dialog.c:938 msgid "Show _rulers" msgstr "_Linijki" -#: ../app/dialogs/preferences-dialog.c:937 +#: ../app/dialogs/preferences-dialog.c:941 msgid "Show scroll_bars" msgstr "Pas_ki przewijania" -#: ../app/dialogs/preferences-dialog.c:940 +#: ../app/dialogs/preferences-dialog.c:944 msgid "Show s_tatusbar" msgstr "Pasek _stanu" -#: ../app/dialogs/preferences-dialog.c:948 +#: ../app/dialogs/preferences-dialog.c:952 msgid "Show s_election" msgstr "_Zaznaczenie" -#: ../app/dialogs/preferences-dialog.c:951 +#: ../app/dialogs/preferences-dialog.c:955 msgid "Show _layer boundary" msgstr "G_ranice warstwy" -#: ../app/dialogs/preferences-dialog.c:954 +#: ../app/dialogs/preferences-dialog.c:958 msgid "Show _guides" msgstr "Pr_owadnice" -#: ../app/dialogs/preferences-dialog.c:957 +#: ../app/dialogs/preferences-dialog.c:961 msgid "Show gri_d" msgstr "Sia_tka" -#: ../app/dialogs/preferences-dialog.c:963 +#: ../app/dialogs/preferences-dialog.c:967 msgid "Canvas _padding mode:" msgstr "Wygląd wyściół_ki płótna:" -#: ../app/dialogs/preferences-dialog.c:968 +#: ../app/dialogs/preferences-dialog.c:972 msgid "Custom p_adding color:" msgstr "Wybrany k_olor wyściółki płótna:" -#: ../app/dialogs/preferences-dialog.c:969 +#: ../app/dialogs/preferences-dialog.c:973 msgid "Select Custom Canvas Padding Color" msgstr "Wybór koloru wyściółki płótna" -#: ../app/dialogs/preferences-dialog.c:999 +#: ../app/dialogs/preferences-dialog.c:1003 msgid "Snap to Guides" msgstr "Przyciąganie do prowadnic" -#: ../app/dialogs/preferences-dialog.c:1002 +#: ../app/dialogs/preferences-dialog.c:1006 msgid "Snap to Grid" msgstr "Przyciąganie do siatki" -#: ../app/dialogs/preferences-dialog.c:1010 +#: ../app/dialogs/preferences-dialog.c:1014 msgid "Snap to Canvas Edges" msgstr "Przyciąganie do krawędzi płótna" -#: ../app/dialogs/preferences-dialog.c:1013 +#: ../app/dialogs/preferences-dialog.c:1017 msgid "Snap to Active Path" msgstr "Przyciąganie do aktywnej ścieżki" -#: ../app/dialogs/preferences-dialog.c:1090 +#: ../app/dialogs/preferences-dialog.c:1094 msgid "Preferences" msgstr "Preferencje" -#: ../app/dialogs/preferences-dialog.c:1126 -#: ../app/dialogs/preferences-dialog.c:1127 +#: ../app/dialogs/preferences-dialog.c:1130 +#: ../app/dialogs/preferences-dialog.c:1131 msgid "System Resources" msgstr "Zasoby systemowe" -#: ../app/dialogs/preferences-dialog.c:1134 +#: ../app/dialogs/preferences-dialog.c:1138 msgid "Resource Consumption" msgstr "Wykorzystywanie zasobów" -#: ../app/dialogs/preferences-dialog.c:1144 +#: ../app/dialogs/preferences-dialog.c:1148 msgid "Minimal number of _undo levels:" msgstr "Mi_nimalna liczba poziomów cofania:" -#: ../app/dialogs/preferences-dialog.c:1147 +#: ../app/dialogs/preferences-dialog.c:1151 msgid "Maximum undo _memory:" msgstr "_Maksymalna pamięć dla historii działań:" -#: ../app/dialogs/preferences-dialog.c:1150 +#: ../app/dialogs/preferences-dialog.c:1154 msgid "Tile cache _size:" msgstr "_Rozmiar pamięci podręcznej kafli:" -#: ../app/dialogs/preferences-dialog.c:1153 +#: ../app/dialogs/preferences-dialog.c:1157 msgid "Maximum _new image size:" msgstr "Maksymal_ny rozmiar nowego obrazu:" -#: ../app/dialogs/preferences-dialog.c:1158 +#: ../app/dialogs/preferences-dialog.c:1162 msgid "Number of _threads to use:" msgstr "_Liczba używanych wątków:" -#: ../app/dialogs/preferences-dialog.c:1163 +#: ../app/dialogs/preferences-dialog.c:1167 msgid "" "Threading support is not yet stable.\n" "Setting this to greater than one might\n" @@ -15052,38 +15207,38 @@ msgstr "" "spowodować błędy na obrazach lub awarie programu." #. Hardware Acceleration -#: ../app/dialogs/preferences-dialog.c:1173 +#: ../app/dialogs/preferences-dialog.c:1177 msgid "Hardware Acceleration" msgstr "Przyspieszenie sprzętowe" -#: ../app/dialogs/preferences-dialog.c:1177 +#: ../app/dialogs/preferences-dialog.c:1181 msgid "Use OpenCL" msgstr "Użycie OpenCL" #. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1181 +#: ../app/dialogs/preferences-dialog.c:1185 msgid "Image Thumbnails" msgstr "Miniatury obrazów" -#: ../app/dialogs/preferences-dialog.c:1186 +#: ../app/dialogs/preferences-dialog.c:1190 msgid "Size of _thumbnails:" msgstr "Wymiary m_iniatur:" -#: ../app/dialogs/preferences-dialog.c:1190 +#: ../app/dialogs/preferences-dialog.c:1194 msgid "Maximum _filesize for thumbnailing:" msgstr "Ma_ksymalny rozmiar miniaturyzowanych plików:" -#: ../app/dialogs/preferences-dialog.c:1200 +#: ../app/dialogs/preferences-dialog.c:1204 msgid "Keep record of used files in the Recent Documents list" msgstr "Zachowywanie używanych plików na liście historii dokumentów" #. TODO: icon needed. -#: ../app/dialogs/preferences-dialog.c:1215 -#: ../app/dialogs/preferences-dialog.c:1216 +#: ../app/dialogs/preferences-dialog.c:1219 +#: ../app/dialogs/preferences-dialog.c:1220 msgid "Debugging" msgstr "Debugowanie" -#: ../app/dialogs/preferences-dialog.c:1223 +#: ../app/dialogs/preferences-dialog.c:1227 msgid "" "We hope you will never need these settings, but as all software, GIMP has " "bugs, and crashes can occur. If it happens, you can help us by reporting " @@ -15093,20 +15248,20 @@ msgstr "" "oprogramowanie, GIMP ma błędy i mogą wystąpić awarie. Jeśli tak się zdarzy, " "to prosimy nam pomóc je zgłaszając." -#: ../app/dialogs/preferences-dialog.c:1232 +#: ../app/dialogs/preferences-dialog.c:1236 msgid "Bug Reporting" msgstr "Zgłaszanie błędów" -#: ../app/dialogs/preferences-dialog.c:1239 -msgid "Debug Policy" -msgstr "Zachowanie debugowania" +#: ../app/dialogs/preferences-dialog.c:1243 +msgid "Debug _policy:" +msgstr "_Zachowanie debugowania:" -#: ../app/dialogs/preferences-dialog.c:1251 +#: ../app/dialogs/preferences-dialog.c:1255 msgid "This feature requires \"gdb\" or \"lldb\" installed on your system." msgstr "" "Ta funkcja wymaga zainstalowania programu „gdb” lub „lldb” na komputerze." -#: ../app/dialogs/preferences-dialog.c:1255 +#: ../app/dialogs/preferences-dialog.c:1259 msgid "" "This feature is more efficient with \"gdb\" or \"lldb\" installed on your " "system." @@ -15114,702 +15269,712 @@ msgstr "" "Ta funkcja jest wydajniejsza po zainstalowaniu programu „gdb” lub „lldb” na " "komputerze." -#: ../app/dialogs/preferences-dialog.c:1268 -#: ../app/dialogs/preferences-dialog.c:1269 +#: ../app/dialogs/preferences-dialog.c:1272 +#: ../app/dialogs/preferences-dialog.c:1273 msgid "Color Management" msgstr "Zarządzanie kolorami" -#: ../app/dialogs/preferences-dialog.c:1278 +#: ../app/dialogs/preferences-dialog.c:1282 msgid "Reset Color Management" msgstr "Ustaw domyślne wartości zarządzania kolorami" -#: ../app/dialogs/preferences-dialog.c:1301 +#: ../app/dialogs/preferences-dialog.c:1305 msgid "Image display _mode:" msgstr "_Tryb wyświetlania obrazu:" #. Color Managed Display -#: ../app/dialogs/preferences-dialog.c:1305 +#: ../app/dialogs/preferences-dialog.c:1309 msgid "Color Managed Display" msgstr "Zarządzanie kolorami ekranu" -#: ../app/dialogs/preferences-dialog.c:1314 +#: ../app/dialogs/preferences-dialog.c:1318 msgid "Select Monitor Color Profile" msgstr "Wybór profilu kolorów monitora" -#: ../app/dialogs/preferences-dialog.c:1315 +#: ../app/dialogs/preferences-dialog.c:1319 msgid "_Monitor profile:" msgstr "Profil _monitora:" -#: ../app/dialogs/preferences-dialog.c:1321 +#: ../app/dialogs/preferences-dialog.c:1325 msgid "_Try to use the system monitor profile" msgstr "_Używanie systemowego profilu monitora" -#: ../app/dialogs/preferences-dialog.c:1330 +#: ../app/dialogs/preferences-dialog.c:1334 msgid "_Rendering intent:" msgstr "Sposób _odwzorowania barw:" -#: ../app/dialogs/preferences-dialog.c:1335 +#: ../app/dialogs/preferences-dialog.c:1339 msgid "Use _black point compensation" msgstr "Kompensacja _czarnego punktu" -#: ../app/dialogs/preferences-dialog.c:1343 -#: ../app/dialogs/preferences-dialog.c:1379 ../app/paint/gimpinkoptions.c:93 +#: ../app/dialogs/preferences-dialog.c:1347 +#: ../app/dialogs/preferences-dialog.c:1383 ../app/paint/gimpinkoptions.c:93 msgid "Speed" msgstr "Prędkość" -#: ../app/dialogs/preferences-dialog.c:1344 -#: ../app/dialogs/preferences-dialog.c:1380 +#: ../app/dialogs/preferences-dialog.c:1348 +#: ../app/dialogs/preferences-dialog.c:1384 msgid "Precision / Color Fidelity" msgstr "Dokładność/wierność kolorów" -#: ../app/dialogs/preferences-dialog.c:1345 +#: ../app/dialogs/preferences-dialog.c:1349 msgid "_Optimize image display for:" msgstr "_Optymalizacja wyświetlania obrazu dla:" #. Print Simulation (Soft-proofing) -#: ../app/dialogs/preferences-dialog.c:1349 +#: ../app/dialogs/preferences-dialog.c:1353 msgid "Soft-Proofing" msgstr "Symulacja wydruku" -#: ../app/dialogs/preferences-dialog.c:1359 +#: ../app/dialogs/preferences-dialog.c:1363 msgid "Select Soft-Proofing Color Profile" msgstr "Wybór profilu kolorów symulacji wydruku" -#: ../app/dialogs/preferences-dialog.c:1360 +#: ../app/dialogs/preferences-dialog.c:1364 msgid "_Soft-proofing profile:" msgstr "Profil _symulacji wydruku:" -#: ../app/dialogs/preferences-dialog.c:1366 +#: ../app/dialogs/preferences-dialog.c:1370 msgid "Re_ndering intent:" msgstr "Sposób o_dwzorowania barw:" -#: ../app/dialogs/preferences-dialog.c:1371 +#: ../app/dialogs/preferences-dialog.c:1375 msgid "Use black _point compensation" msgstr "Kompensacja c_zarnego punktu" -#: ../app/dialogs/preferences-dialog.c:1381 +#: ../app/dialogs/preferences-dialog.c:1385 msgid "O_ptimize soft-proofing for:" msgstr "Op_tymalizacja symulacji wydruku dla:" -#: ../app/dialogs/preferences-dialog.c:1390 +#: ../app/dialogs/preferences-dialog.c:1394 msgid "Mark out of gamut colors" msgstr "Wyróżnienie kolorów spoza skali" -#: ../app/dialogs/preferences-dialog.c:1395 +#: ../app/dialogs/preferences-dialog.c:1399 msgid "Select Warning Color" msgstr "Wybór koloru ostrzeżeń" #. Preferred profiles -#: ../app/dialogs/preferences-dialog.c:1406 +#: ../app/dialogs/preferences-dialog.c:1410 msgid "Preferred Profiles" msgstr "Preferowane profile" -#: ../app/dialogs/preferences-dialog.c:1415 +#: ../app/dialogs/preferences-dialog.c:1419 msgid "Select Preferred RGB Color Profile" msgstr "Wybór preferowanego profilu kolorów RGB" -#: ../app/dialogs/preferences-dialog.c:1416 +#: ../app/dialogs/preferences-dialog.c:1420 msgid "_RGB profile:" msgstr "Profil _RGB:" -#: ../app/dialogs/preferences-dialog.c:1423 +#: ../app/dialogs/preferences-dialog.c:1427 msgid "Select Preferred Grayscale Color Profile" msgstr "Wybór preferowanego profilu kolorów odcieni szarości" -#: ../app/dialogs/preferences-dialog.c:1424 +#: ../app/dialogs/preferences-dialog.c:1428 msgid "_Grayscale profile:" msgstr "Profil _odcieni szarości:" -#: ../app/dialogs/preferences-dialog.c:1431 +#: ../app/dialogs/preferences-dialog.c:1435 msgid "Select CMYK Color Profile" msgstr "Wybór profilu koloru CMYK" -#: ../app/dialogs/preferences-dialog.c:1432 +#: ../app/dialogs/preferences-dialog.c:1436 msgid "_CMYK profile:" msgstr "Profil _CMYK:" #. Policies -#: ../app/dialogs/preferences-dialog.c:1437 +#: ../app/dialogs/preferences-dialog.c:1441 msgid "Policies" msgstr "Zachowanie" -#: ../app/dialogs/preferences-dialog.c:1442 +#: ../app/dialogs/preferences-dialog.c:1446 msgid "File Open behaviour:" msgstr "Zachowanie okna otwierania plików:" #. Filter Dialogs -#: ../app/dialogs/preferences-dialog.c:1446 +#: ../app/dialogs/preferences-dialog.c:1450 +#: ../app/dialogs/preferences-dialog.c:2171 msgid "Filter Dialogs" msgstr "Okna filtrowania" -#: ../app/dialogs/preferences-dialog.c:1450 +#: ../app/dialogs/preferences-dialog.c:1454 +#: ../app/dialogs/preferences-dialog.c:2183 msgid "Show advanced color options" msgstr "Zaawansowane opcje kolorów" -#: ../app/dialogs/preferences-dialog.c:1464 -#: ../app/dialogs/preferences-dialog.c:1465 +#: ../app/dialogs/preferences-dialog.c:1468 +#: ../app/dialogs/preferences-dialog.c:1469 msgid "Image Import & Export" msgstr "Import i eksport obrazów" #. Import Policies -#: ../app/dialogs/preferences-dialog.c:1471 +#: ../app/dialogs/preferences-dialog.c:1475 msgid "Import Policies" msgstr "Zachowanie importu" -#: ../app/dialogs/preferences-dialog.c:1475 +#: ../app/dialogs/preferences-dialog.c:1479 msgid "Promote imported images to _floating point precision" msgstr "" "_Konwertowanie importowanych obrazów do dokładności zmiennoprzecinkowej" -#: ../app/dialogs/preferences-dialog.c:1481 +#: ../app/dialogs/preferences-dialog.c:1485 msgid "Dither images when promoting to floating point" msgstr "" "Wykonywanie ditheringu na obrazach podczas konwertowania do dokładności " "zmiennoprzecinkowej" -#: ../app/dialogs/preferences-dialog.c:1486 +#: ../app/dialogs/preferences-dialog.c:1490 msgid "Add an alpha channel to imported images" msgstr "Dodawanie kanału alfa do importowanych obrazów" -#: ../app/dialogs/preferences-dialog.c:1491 -#: ../app/dialogs/preferences-dialog.c:2090 +#: ../app/dialogs/preferences-dialog.c:1495 +#: ../app/dialogs/preferences-dialog.c:2094 msgid "Color profile policy:" msgstr "Zachowanie profilu kolorów:" #. Export Policies -#: ../app/dialogs/preferences-dialog.c:1495 +#: ../app/dialogs/preferences-dialog.c:1499 msgid "Export Policies" msgstr "Zachowanie eksportu" -#: ../app/dialogs/preferences-dialog.c:1499 +#: ../app/dialogs/preferences-dialog.c:1503 msgid "Export Exif metadata by default when available" msgstr "Domyślne eksportowanie metadanych Exif, kiedy są dostępne" -#: ../app/dialogs/preferences-dialog.c:1502 +#: ../app/dialogs/preferences-dialog.c:1506 msgid "Export XMP metadata by default when available" msgstr "Domyślne eksportowanie metadanych XMP, kiedy są dostępne" -#: ../app/dialogs/preferences-dialog.c:1505 +#: ../app/dialogs/preferences-dialog.c:1509 msgid "Export IPTC metadata by default when available" msgstr "Domyślne eksportowanie metadanych IPTC, kiedy są dostępne" -#: ../app/dialogs/preferences-dialog.c:1508 +#: ../app/dialogs/preferences-dialog.c:1512 msgid "Metadata can contain sensitive information." msgstr "Metadane mogą zawierać prywatne informacje." #. Raw Image Importer -#: ../app/dialogs/preferences-dialog.c:1513 +#: ../app/dialogs/preferences-dialog.c:1517 msgid "Raw Image Importer" msgstr "Import obrazów Raw" -#: ../app/dialogs/preferences-dialog.c:1546 +#: ../app/dialogs/preferences-dialog.c:1550 msgid "Experimental Playground" msgstr "Eksperymentalny plac zabaw" -#: ../app/dialogs/preferences-dialog.c:1547 +#: ../app/dialogs/preferences-dialog.c:1551 msgid "Playground" msgstr "Plac zabaw" -#: ../app/dialogs/preferences-dialog.c:1552 +#: ../app/dialogs/preferences-dialog.c:1556 msgid "Insane Options" msgstr "Szalone opcje" -#: ../app/dialogs/preferences-dialog.c:1556 +#: ../app/dialogs/preferences-dialog.c:1560 msgid "_N-Point Deformation tool" msgstr "_Zniekształcanie za pomocą wielu punktów" -#: ../app/dialogs/preferences-dialog.c:1559 +#: ../app/dialogs/preferences-dialog.c:1563 msgid "_Seamless Clone tool" msgstr "_Bezszwowe klonowanie" -#: ../app/dialogs/preferences-dialog.c:1569 -#: ../app/dialogs/preferences-dialog.c:1570 +#: ../app/dialogs/preferences-dialog.c:1573 +#: ../app/dialogs/preferences-dialog.c:1574 msgctxt "preferences" msgid "Tool Options" msgstr "Opcje narzędzi" #. General #. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1578 -#: ../app/dialogs/preferences-dialog.c:2380 -#: ../app/dialogs/preferences-dialog.c:2708 -#: ../app/dialogs/preferences-dialog.c:2939 +#: ../app/dialogs/preferences-dialog.c:1582 +#: ../app/dialogs/preferences-dialog.c:2400 +#: ../app/dialogs/preferences-dialog.c:2728 +#: ../app/dialogs/preferences-dialog.c:2959 #: ../app/widgets/gimpcontrollereditor.c:186 msgid "General" msgstr "Ogólne" -#: ../app/dialogs/preferences-dialog.c:1581 +#: ../app/dialogs/preferences-dialog.c:1585 msgid "_Save tool options on exit" msgstr "_Zapisywanie opcji narzędzi przy zakończeniu" -#: ../app/dialogs/preferences-dialog.c:1585 +#: ../app/dialogs/preferences-dialog.c:1589 msgid "Save Tool Options _Now" msgstr "Zapisz opcje _narzędzi" -#: ../app/dialogs/preferences-dialog.c:1592 +#: ../app/dialogs/preferences-dialog.c:1596 msgid "_Reset Saved Tool Options to Default Values" msgstr "_Ustaw zapisane opcje narzędzi na wartości domyślne" -#: ../app/dialogs/preferences-dialog.c:1606 +#: ../app/dialogs/preferences-dialog.c:1610 msgid "Default _interpolation:" msgstr "Domyślna _interpolacja:" #. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1613 +#: ../app/dialogs/preferences-dialog.c:1617 msgid "Paint Options Shared Between Tools" msgstr "Opcje rysowania współdzielone przez narzędzia" -#: ../app/dialogs/preferences-dialog.c:1617 +#: ../app/dialogs/preferences-dialog.c:1621 msgid "_Brush" msgstr "_Pędzel" -#: ../app/dialogs/preferences-dialog.c:1620 +#: ../app/dialogs/preferences-dialog.c:1624 msgid "_Dynamics" msgstr "_Dynamika" -#: ../app/dialogs/preferences-dialog.c:1623 +#: ../app/dialogs/preferences-dialog.c:1627 msgid "_Pattern" msgstr "_Deseń" #. Move Tool -#: ../app/dialogs/preferences-dialog.c:1630 +#: ../app/dialogs/preferences-dialog.c:1634 msgid "Move Tool" msgstr "Przesuwanie" -#: ../app/dialogs/preferences-dialog.c:1634 +#: ../app/dialogs/preferences-dialog.c:1638 msgid "Set layer or path as active" msgstr "Ustawianie warstwy lub ścieżki jako aktywną" -#: ../app/dialogs/preferences-dialog.c:1647 +#: ../app/dialogs/preferences-dialog.c:1651 msgid "Default New Image" msgstr "Domyślny nowy obraz" -#: ../app/dialogs/preferences-dialog.c:1648 +#: ../app/dialogs/preferences-dialog.c:1652 msgid "Default Image" msgstr "Domyślny obraz" -#: ../app/dialogs/preferences-dialog.c:1684 +#: ../app/dialogs/preferences-dialog.c:1688 msgid "Quick Mask color:" msgstr "Kolor szybkiej maski:" -#: ../app/dialogs/preferences-dialog.c:1685 +#: ../app/dialogs/preferences-dialog.c:1689 msgid "Set the default Quick Mask color" msgstr "Ustawienie domyślnego koloru szybkiej maski" -#: ../app/dialogs/preferences-dialog.c:1695 +#: ../app/dialogs/preferences-dialog.c:1699 msgid "Default Image Grid" msgstr "Domyślna siatka obrazu" -#: ../app/dialogs/preferences-dialog.c:1696 +#: ../app/dialogs/preferences-dialog.c:1700 msgid "Default Grid" msgstr "Domyślna siatka" -#: ../app/dialogs/preferences-dialog.c:1715 +#: ../app/dialogs/preferences-dialog.c:1719 msgid "User Interface" msgstr "Interfejs użytkownika" -#: ../app/dialogs/preferences-dialog.c:1716 +#: ../app/dialogs/preferences-dialog.c:1720 msgid "Interface" msgstr "Interfejs" -#: ../app/dialogs/preferences-dialog.c:1725 ../app/tools/gimptextoptions.c:151 +#: ../app/dialogs/preferences-dialog.c:1729 ../app/tools/gimptextoptions.c:151 msgid "Language" msgstr "Język" #. Previews -#: ../app/dialogs/preferences-dialog.c:1731 +#: ../app/dialogs/preferences-dialog.c:1735 msgid "Previews" msgstr "Podglądy" -#: ../app/dialogs/preferences-dialog.c:1734 +#: ../app/dialogs/preferences-dialog.c:1738 msgid "_Enable layer & channel previews" msgstr "_Kanały i warstwy" -#: ../app/dialogs/preferences-dialog.c:1740 +#: ../app/dialogs/preferences-dialog.c:1744 msgid "_Default layer & channel preview size:" msgstr "_Domyślny rozmiar podglądu warstwy i kanału:" -#: ../app/dialogs/preferences-dialog.c:1743 +#: ../app/dialogs/preferences-dialog.c:1747 msgid "_Undo preview size:" msgstr "Rozmiar podglądu _cofania:" -#: ../app/dialogs/preferences-dialog.c:1746 +#: ../app/dialogs/preferences-dialog.c:1750 msgid "Na_vigation preview size:" msgstr "Rozmiar podglądu _nawigacyjnego:" #. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1750 +#: ../app/dialogs/preferences-dialog.c:1754 msgid "Keyboard Shortcuts" msgstr "Skróty klawiszowe" -#: ../app/dialogs/preferences-dialog.c:1754 +#: ../app/dialogs/preferences-dialog.c:1758 msgid "_Use dynamic keyboard shortcuts" msgstr "_Dynamiczne" -#: ../app/dialogs/preferences-dialog.c:1758 +#: ../app/dialogs/preferences-dialog.c:1762 msgid "Configure _Keyboard Shortcuts..." msgstr "S_konfiguruj…" -#: ../app/dialogs/preferences-dialog.c:1765 +#: ../app/dialogs/preferences-dialog.c:1769 msgid "_Save keyboard shortcuts on exit" msgstr "Zap_isywanie skrótów przed zakończeniem" -#: ../app/dialogs/preferences-dialog.c:1769 +#: ../app/dialogs/preferences-dialog.c:1773 msgid "Save Keyboard Shortcuts _Now" msgstr "_Zapisz skróty" -#: ../app/dialogs/preferences-dialog.c:1776 +#: ../app/dialogs/preferences-dialog.c:1780 msgid "_Reset Keyboard Shortcuts to Default Values" msgstr "_Ustaw domyślne wartości skrótów" -#: ../app/dialogs/preferences-dialog.c:1785 +#: ../app/dialogs/preferences-dialog.c:1789 msgid "Remove _All Keyboard Shortcuts" msgstr "U_suń wszystkie skróty" -#: ../app/dialogs/preferences-dialog.c:1797 -#: ../app/dialogs/preferences-dialog.c:1798 -#: ../app/dialogs/preferences-dialog.c:1833 +#: ../app/dialogs/preferences-dialog.c:1801 +#: ../app/dialogs/preferences-dialog.c:1802 +#: ../app/dialogs/preferences-dialog.c:1837 msgid "Theme" msgstr "Motyw" -#: ../app/dialogs/preferences-dialog.c:1803 +#: ../app/dialogs/preferences-dialog.c:1807 msgid "Select Theme" msgstr "Wybór motywu" -#: ../app/dialogs/preferences-dialog.c:1885 +#: ../app/dialogs/preferences-dialog.c:1889 msgid "Reload C_urrent Theme" msgstr "Odśwież _bieżący motyw" -#: ../app/dialogs/preferences-dialog.c:1897 -#: ../app/dialogs/preferences-dialog.c:1898 -#: ../app/dialogs/preferences-dialog.c:1939 +#: ../app/dialogs/preferences-dialog.c:1901 +#: ../app/dialogs/preferences-dialog.c:1902 +#: ../app/dialogs/preferences-dialog.c:1943 msgid "Icon Theme" msgstr "Motyw ikon" -#: ../app/dialogs/preferences-dialog.c:1903 +#: ../app/dialogs/preferences-dialog.c:1907 msgid "Select an Icon Theme" msgstr "Wybór motywu ikon" #. Appearance -#: ../app/dialogs/preferences-dialog.c:2027 -#: ../app/dialogs/preferences-dialog.c:2779 ../app/widgets/gimpgrideditor.c:134 +#: ../app/dialogs/preferences-dialog.c:2031 +#: ../app/dialogs/preferences-dialog.c:2799 ../app/widgets/gimpgrideditor.c:134 msgid "Appearance" msgstr "Wygląd" -#: ../app/dialogs/preferences-dialog.c:2031 +#: ../app/dialogs/preferences-dialog.c:2035 msgid "Show GIMP _logo (drag-and-drop target)" msgstr "_Logo programu GIMP (na które można przeciągać elementy)" -#: ../app/dialogs/preferences-dialog.c:2035 +#: ../app/dialogs/preferences-dialog.c:2039 msgid "Show _foreground & background color" msgstr "_Kolor pierwszoplanowy i tła" -#: ../app/dialogs/preferences-dialog.c:2039 +#: ../app/dialogs/preferences-dialog.c:2043 msgid "Show active _brush, pattern & gradient" msgstr "Ak_tywny pędzel, deseń i gradient" -#: ../app/dialogs/preferences-dialog.c:2043 +#: ../app/dialogs/preferences-dialog.c:2047 msgid "Show active _image" msgstr "Aktywny o_braz" #. Tool Editor -#: ../app/dialogs/preferences-dialog.c:2051 +#: ../app/dialogs/preferences-dialog.c:2055 msgid "Tools Configuration" msgstr "Konfiguracja narzędzi" -#: ../app/dialogs/preferences-dialog.c:2067 -#: ../app/dialogs/preferences-dialog.c:2068 +#: ../app/dialogs/preferences-dialog.c:2071 +#: ../app/dialogs/preferences-dialog.c:2072 msgid "Dialog Defaults" msgstr "Domyślne wartości okien dialogowych" -#: ../app/dialogs/preferences-dialog.c:2077 +#: ../app/dialogs/preferences-dialog.c:2081 msgid "Reset Dialog Defaults" msgstr "Ustaw domyślne wartości okien dialogowych" #. Color profile import dialog -#: ../app/dialogs/preferences-dialog.c:2085 +#: ../app/dialogs/preferences-dialog.c:2089 msgid "Color Profile Import Dialog" msgstr "Okno importu profilu kolorów" #. All color profile chooser dialogs -#: ../app/dialogs/preferences-dialog.c:2094 +#: ../app/dialogs/preferences-dialog.c:2098 msgid "Color Profile File Dialogs" msgstr "Okna plików profilów kolorów" -#: ../app/dialogs/preferences-dialog.c:2099 +#: ../app/dialogs/preferences-dialog.c:2103 msgid "Profile folder:" msgstr "Katalog profili:" -#: ../app/dialogs/preferences-dialog.c:2100 +#: ../app/dialogs/preferences-dialog.c:2104 msgid "Select Default Folder for Color Profiles" msgstr "Wybór domyślnego katalogu profili kolorów" #. Convert to Color Profile Dialog -#: ../app/dialogs/preferences-dialog.c:2104 +#: ../app/dialogs/preferences-dialog.c:2108 msgid "Convert to Color Profile Dialog" msgstr "Okno konwersji do profilu kolorów" -#: ../app/dialogs/preferences-dialog.c:2109 +#: ../app/dialogs/preferences-dialog.c:2113 msgid "Rendering intent:" msgstr "Sposób odwzorowania barw:" -#: ../app/dialogs/preferences-dialog.c:2113 +#: ../app/dialogs/preferences-dialog.c:2117 msgid "Black point compensation" msgstr "Kompensacja czarnego punktu" #. Convert Precision Dialog -#: ../app/dialogs/preferences-dialog.c:2117 +#: ../app/dialogs/preferences-dialog.c:2121 msgid "Precision Conversion Dialog" msgstr "Okno konwersji dokładności" -#: ../app/dialogs/preferences-dialog.c:2124 +#: ../app/dialogs/preferences-dialog.c:2128 msgid "Dither layers:" msgstr "Dithering warstw:" -#: ../app/dialogs/preferences-dialog.c:2129 +#: ../app/dialogs/preferences-dialog.c:2133 msgid "Dither text layers:" msgstr "Dithering warstw tekstowych:" -#: ../app/dialogs/preferences-dialog.c:2134 +#: ../app/dialogs/preferences-dialog.c:2138 msgid "Dither channels/masks:" msgstr "Dithering kanałów/masek:" #. Convert Indexed Dialog -#: ../app/dialogs/preferences-dialog.c:2138 +#: ../app/dialogs/preferences-dialog.c:2142 msgid "Indexed Conversion Dialog" msgstr "Okno konwersji do trybu indeksowanego" -#: ../app/dialogs/preferences-dialog.c:2143 +#: ../app/dialogs/preferences-dialog.c:2147 msgid "Colormap:" msgstr "Paleta kolorów:" -#: ../app/dialogs/preferences-dialog.c:2146 +#: ../app/dialogs/preferences-dialog.c:2150 msgid "Maximum number of colors:" msgstr "Maksymalna liczba kolorów:" -#: ../app/dialogs/preferences-dialog.c:2150 +#: ../app/dialogs/preferences-dialog.c:2154 msgid "Remove unused and duplicate colors from colormap" msgstr "Usunięcie nieużywanych i podwójnych kolorów z palety kolorów" -#: ../app/dialogs/preferences-dialog.c:2156 +#: ../app/dialogs/preferences-dialog.c:2160 msgid "Color dithering:" msgstr "Dithering kolorów:" -#: ../app/dialogs/preferences-dialog.c:2160 +#: ../app/dialogs/preferences-dialog.c:2164 msgid "Enable dithering of transparency" msgstr "Dithering przezroczystości" +#: ../app/dialogs/preferences-dialog.c:2176 +msgid "Keep recent settings:" +msgstr "Zachowywanie ostatnich ustawień:" + +#: ../app/dialogs/preferences-dialog.c:2180 +msgid "Default to the last used settings" +msgstr "Domyślne używanie ostatnio używanych ustawień" + #. Canvas Size Dialog -#: ../app/dialogs/preferences-dialog.c:2167 +#: ../app/dialogs/preferences-dialog.c:2187 msgid "Canvas Size Dialog" msgstr "Okno wymiarów płótna" -#: ../app/dialogs/preferences-dialog.c:2172 -#: ../app/dialogs/preferences-dialog.c:2201 +#: ../app/dialogs/preferences-dialog.c:2192 +#: ../app/dialogs/preferences-dialog.c:2221 msgid "Fill with:" msgstr "Wypełnienie:" -#: ../app/dialogs/preferences-dialog.c:2175 +#: ../app/dialogs/preferences-dialog.c:2195 msgid "Resize layers:" msgstr "Zmiana wymiarów warstw:" -#: ../app/dialogs/preferences-dialog.c:2179 +#: ../app/dialogs/preferences-dialog.c:2199 msgid "Resize text layers" msgstr "Zmiana wymiarów warstw tekstowych" #. New Layer Dialog -#: ../app/dialogs/preferences-dialog.c:2183 +#: ../app/dialogs/preferences-dialog.c:2203 msgid "New Layer Dialog" msgstr "Okno nowej warstwy" -#: ../app/dialogs/preferences-dialog.c:2188 +#: ../app/dialogs/preferences-dialog.c:2208 msgid "Layer name:" msgstr "Nazwa warstwy:" -#: ../app/dialogs/preferences-dialog.c:2192 +#: ../app/dialogs/preferences-dialog.c:2212 msgid "Fill type:" msgstr "Typ wypełnienia:" #. Layer Boundary Size Dialog -#: ../app/dialogs/preferences-dialog.c:2196 +#: ../app/dialogs/preferences-dialog.c:2216 msgid "Layer Boundary Size Dialog" msgstr "Okno wymiarów granic warstwy" #. Add Layer Mask Dialog -#: ../app/dialogs/preferences-dialog.c:2205 +#: ../app/dialogs/preferences-dialog.c:2225 msgid "Add Layer Mask Dialog" msgstr "Oko dodania maski warstwy" -#: ../app/dialogs/preferences-dialog.c:2210 +#: ../app/dialogs/preferences-dialog.c:2230 msgid "Layer mask type:" msgstr "Typ maski warstwy:" -#: ../app/dialogs/preferences-dialog.c:2214 +#: ../app/dialogs/preferences-dialog.c:2234 msgid "Invert mask" msgstr "Odwrócenie maski" #. Merge Layers Dialog -#: ../app/dialogs/preferences-dialog.c:2218 +#: ../app/dialogs/preferences-dialog.c:2238 msgid "Merge Layers Dialog" msgstr "Okno łączenia warstw" -#: ../app/dialogs/preferences-dialog.c:2225 +#: ../app/dialogs/preferences-dialog.c:2245 msgid "Merged layer size:" msgstr "Wymiary połączonej warstwy:" -#: ../app/dialogs/preferences-dialog.c:2229 +#: ../app/dialogs/preferences-dialog.c:2249 msgid "Merge within active group only" msgstr "Łączenie tylko w obrębie aktywnej grupy" -#: ../app/dialogs/preferences-dialog.c:2232 +#: ../app/dialogs/preferences-dialog.c:2252 msgid "Discard invisible layers" msgstr "Pomijanie niewidocznych warstw" #. New Channel Dialog -#: ../app/dialogs/preferences-dialog.c:2236 +#: ../app/dialogs/preferences-dialog.c:2256 msgid "New Channel Dialog" msgstr "Okno nowego kanału" -#: ../app/dialogs/preferences-dialog.c:2241 +#: ../app/dialogs/preferences-dialog.c:2261 msgid "Channel name:" msgstr "Nazwa kanału:" -#: ../app/dialogs/preferences-dialog.c:2245 +#: ../app/dialogs/preferences-dialog.c:2265 msgid "Color and opacity:" msgstr "Kolor i krycie:" -#: ../app/dialogs/preferences-dialog.c:2246 +#: ../app/dialogs/preferences-dialog.c:2266 msgid "Default New Channel Color and Opacity" msgstr "Domyślny kolor i krycie nowego kanału" #. New Path Dialog -#: ../app/dialogs/preferences-dialog.c:2251 +#: ../app/dialogs/preferences-dialog.c:2271 msgid "New Path Dialog" msgstr "Okno nowej ścieżki" -#: ../app/dialogs/preferences-dialog.c:2256 +#: ../app/dialogs/preferences-dialog.c:2276 msgid "Path name:" msgstr "Nazwa ścieżki:" #. Export Path Dialog -#: ../app/dialogs/preferences-dialog.c:2260 +#: ../app/dialogs/preferences-dialog.c:2280 msgid "Export Paths Dialog" msgstr "Okno eksportu ścieżek" -#: ../app/dialogs/preferences-dialog.c:2265 +#: ../app/dialogs/preferences-dialog.c:2285 msgid "Export folder:" msgstr "Katalog eksportu:" -#: ../app/dialogs/preferences-dialog.c:2266 +#: ../app/dialogs/preferences-dialog.c:2286 msgid "Select Default Folder for Exporting Paths" msgstr "Wybór domyślnego katalogu do eksportowania ścieżek" -#: ../app/dialogs/preferences-dialog.c:2270 +#: ../app/dialogs/preferences-dialog.c:2290 msgid "Export the active path only" msgstr "Eksport tylko aktywnej ścieżki" #. Import Path Dialog -#: ../app/dialogs/preferences-dialog.c:2274 +#: ../app/dialogs/preferences-dialog.c:2294 msgid "Import Paths Dialog" msgstr "Okno importu ścieżek" -#: ../app/dialogs/preferences-dialog.c:2279 +#: ../app/dialogs/preferences-dialog.c:2299 msgid "Import folder:" msgstr "Katalog importu:" -#: ../app/dialogs/preferences-dialog.c:2280 +#: ../app/dialogs/preferences-dialog.c:2300 msgid "Select Default Folder for Importing Paths" msgstr "Wybór domyślnego katalogu do importowania ścieżek" -#: ../app/dialogs/preferences-dialog.c:2284 +#: ../app/dialogs/preferences-dialog.c:2304 msgid "Merge imported paths" msgstr "Połączenie zaimportowanych ścieżek" -#: ../app/dialogs/preferences-dialog.c:2287 +#: ../app/dialogs/preferences-dialog.c:2307 msgid "Scale imported paths" msgstr "Przeskalowanie zaimportowanych ścieżek" #. Feather Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2291 +#: ../app/dialogs/preferences-dialog.c:2311 msgid "Feather Selection Dialog" msgstr "Okno zmiękczenia zaznaczenia" -#: ../app/dialogs/preferences-dialog.c:2296 +#: ../app/dialogs/preferences-dialog.c:2316 msgid "Feather radius:" msgstr "Promień zmiękczenia:" #. Grow Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2300 +#: ../app/dialogs/preferences-dialog.c:2320 msgid "Grow Selection Dialog" msgstr "Okno powiększenia zaznaczenia" -#: ../app/dialogs/preferences-dialog.c:2305 +#: ../app/dialogs/preferences-dialog.c:2325 msgid "Grow radius:" msgstr "Promień powiększenia:" #. Shrink Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2309 +#: ../app/dialogs/preferences-dialog.c:2329 msgid "Shrink Selection Dialog" msgstr "Okno zmniejszenia zaznaczenia" -#: ../app/dialogs/preferences-dialog.c:2314 +#: ../app/dialogs/preferences-dialog.c:2334 msgid "Shrink radius:" msgstr "Promień zmniejszenia:" -#: ../app/dialogs/preferences-dialog.c:2318 -#: ../app/dialogs/preferences-dialog.c:2335 +#: ../app/dialogs/preferences-dialog.c:2338 +#: ../app/dialogs/preferences-dialog.c:2355 msgid "Selected areas continue outside the image" msgstr "Zaznaczone obszary znajdują się także poza obrazem" #. Border Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2322 +#: ../app/dialogs/preferences-dialog.c:2342 msgid "Border Selection Dialog" msgstr "Okno obramowania zaznaczenia" -#: ../app/dialogs/preferences-dialog.c:2327 +#: ../app/dialogs/preferences-dialog.c:2347 msgid "Border radius:" msgstr "Promień obramowania:" -#: ../app/dialogs/preferences-dialog.c:2331 +#: ../app/dialogs/preferences-dialog.c:2351 msgid "Border style:" msgstr "Styl obramowania:" #. Fill Options Dialog -#: ../app/dialogs/preferences-dialog.c:2339 +#: ../app/dialogs/preferences-dialog.c:2359 msgid "Fill Selection Outline & Fill Path Dialogs" msgstr "Okna wypełniania krawędzi zaznaczenia i wypełniania ścieżki" #. Stroke Options Dialog -#: ../app/dialogs/preferences-dialog.c:2348 +#: ../app/dialogs/preferences-dialog.c:2368 msgid "Stroke Selection & Stroke Path Dialogs" msgstr "Okna rysowania wzdłuż zaznaczenia i rysowania wzdłuż ścieżki" -#: ../app/dialogs/preferences-dialog.c:2371 -#: ../app/dialogs/preferences-dialog.c:2372 +#: ../app/dialogs/preferences-dialog.c:2391 +#: ../app/dialogs/preferences-dialog.c:2392 msgid "Help System" msgstr "System pomocy" -#: ../app/dialogs/preferences-dialog.c:2383 +#: ../app/dialogs/preferences-dialog.c:2403 msgid "Show _tooltips" msgstr "Po_dpowiedzi" -#: ../app/dialogs/preferences-dialog.c:2386 +#: ../app/dialogs/preferences-dialog.c:2406 msgid "Show help _buttons" msgstr "Przyciski po_mocy" -#: ../app/dialogs/preferences-dialog.c:2391 +#: ../app/dialogs/preferences-dialog.c:2411 msgid "Use the online version" msgstr "Wersja sieciowa" -#: ../app/dialogs/preferences-dialog.c:2392 +#: ../app/dialogs/preferences-dialog.c:2412 msgid "Use a locally installed copy" msgstr "Kopia zainstalowana na komputerze" -#: ../app/dialogs/preferences-dialog.c:2393 +#: ../app/dialogs/preferences-dialog.c:2413 msgid "User manual:" msgstr "Podręcznik użytkownika:" -#: ../app/dialogs/preferences-dialog.c:2404 +#: ../app/dialogs/preferences-dialog.c:2424 msgid "User interface language" msgstr "Język interfejsu użytkownika" @@ -15817,15 +15982,15 @@ msgstr "Język interfejsu użytkownika" #. * that doesn't use the help browser, so don't bother showing #. * the combo. #. -#: ../app/dialogs/preferences-dialog.c:2463 +#: ../app/dialogs/preferences-dialog.c:2483 msgid "Help Browser" msgstr "Przeglądarka pomocy" -#: ../app/dialogs/preferences-dialog.c:2470 +#: ../app/dialogs/preferences-dialog.c:2490 msgid "H_elp browser to use:" msgstr "Prz_eglądarka pomocy:" -#: ../app/dialogs/preferences-dialog.c:2476 +#: ../app/dialogs/preferences-dialog.c:2496 msgid "" "The GIMP help browser doesn't seem to be installed. Using the web browser " "instead." @@ -15834,453 +15999,453 @@ msgstr "" "przeglądarki WWW zamiast niej." #. Action Search -#: ../app/dialogs/preferences-dialog.c:2493 +#: ../app/dialogs/preferences-dialog.c:2513 msgid "Action Search" msgstr "Wyszukiwanie działań" -#: ../app/dialogs/preferences-dialog.c:2497 +#: ../app/dialogs/preferences-dialog.c:2517 msgid "Show _unavailable actions" msgstr "_Niedostępne działania" -#: ../app/dialogs/preferences-dialog.c:2500 +#: ../app/dialogs/preferences-dialog.c:2520 msgid "Maximum History Size:" msgstr "Maksymalny rozmiar historii:" -#: ../app/dialogs/preferences-dialog.c:2504 +#: ../app/dialogs/preferences-dialog.c:2524 msgid "Clear Action History" msgstr "Wyczyszczenie historii działań" -#: ../app/dialogs/preferences-dialog.c:2519 -#: ../app/dialogs/preferences-dialog.c:2520 +#: ../app/dialogs/preferences-dialog.c:2539 +#: ../app/dialogs/preferences-dialog.c:2540 msgid "Display" msgstr "Wyświetlanie" #. Transparency -#: ../app/dialogs/preferences-dialog.c:2528 +#: ../app/dialogs/preferences-dialog.c:2548 msgid "Transparency" msgstr "Przezroczystość" -#: ../app/dialogs/preferences-dialog.c:2532 +#: ../app/dialogs/preferences-dialog.c:2552 msgid "_Check style:" msgstr "Wygląd pola sza_chownicy:" -#: ../app/dialogs/preferences-dialog.c:2535 +#: ../app/dialogs/preferences-dialog.c:2555 msgid "Check _size:" msgstr "_Rozmiar pola szachownicy:" -#: ../app/dialogs/preferences-dialog.c:2538 +#: ../app/dialogs/preferences-dialog.c:2558 msgid "Monitor Resolution" msgstr "Rozdzielczość monitora" #. Pixels -#: ../app/dialogs/preferences-dialog.c:2542 ../app/display/gimpcursorview.c:215 +#: ../app/dialogs/preferences-dialog.c:2562 ../app/display/gimpcursorview.c:215 #: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:234 msgid "Pixels" msgstr "piksele" -#: ../app/dialogs/preferences-dialog.c:2560 ../app/widgets/gimpgrideditor.c:195 +#: ../app/dialogs/preferences-dialog.c:2580 ../app/widgets/gimpgrideditor.c:195 #: ../app/widgets/gimpgrideditor.c:230 msgid "Horizontal" msgstr "Poziomo" -#: ../app/dialogs/preferences-dialog.c:2562 ../app/widgets/gimpgrideditor.c:197 +#: ../app/dialogs/preferences-dialog.c:2582 ../app/widgets/gimpgrideditor.c:197 #: ../app/widgets/gimpgrideditor.c:232 msgid "Vertical" msgstr "Pionowo" -#: ../app/dialogs/preferences-dialog.c:2564 +#: ../app/dialogs/preferences-dialog.c:2584 #: ../app/widgets/gimpimagepropview.c:457 msgid "ppi" msgstr "ppi" -#: ../app/dialogs/preferences-dialog.c:2583 +#: ../app/dialogs/preferences-dialog.c:2603 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "_Wykrywanie automatycznie (obecnie %d×%d ppi)" -#: ../app/dialogs/preferences-dialog.c:2601 +#: ../app/dialogs/preferences-dialog.c:2621 msgid "_Enter manually" msgstr "_Wprowadzenie ręczne" -#: ../app/dialogs/preferences-dialog.c:2616 +#: ../app/dialogs/preferences-dialog.c:2636 msgid "C_alibrate..." msgstr "S_kalibruj…" -#: ../app/dialogs/preferences-dialog.c:2644 -#: ../app/dialogs/preferences-dialog.c:2645 +#: ../app/dialogs/preferences-dialog.c:2664 +#: ../app/dialogs/preferences-dialog.c:2665 msgid "Window Management" msgstr "Zarządzanie oknami" -#: ../app/dialogs/preferences-dialog.c:2650 +#: ../app/dialogs/preferences-dialog.c:2670 msgid "Window Manager Hints" msgstr "Podpowiedzi menedżera okien" -#: ../app/dialogs/preferences-dialog.c:2656 +#: ../app/dialogs/preferences-dialog.c:2676 msgid "Hint for _docks and toolbox:" msgstr "Podpowiedź dla _doków i przybornika:" -#: ../app/dialogs/preferences-dialog.c:2659 +#: ../app/dialogs/preferences-dialog.c:2679 msgid "Focus" msgstr "Aktywowanie okien" -#: ../app/dialogs/preferences-dialog.c:2663 +#: ../app/dialogs/preferences-dialog.c:2683 msgid "Activate the _focused image" msgstr "A_ktywowanie obrazu z kursorem" #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2667 +#: ../app/dialogs/preferences-dialog.c:2687 msgid "Window Positions" msgstr "Położenia okien" -#: ../app/dialogs/preferences-dialog.c:2670 +#: ../app/dialogs/preferences-dialog.c:2690 msgid "_Save window positions on exit" msgstr "Zapisywanie położeń okien przed za_kończeniem" -#: ../app/dialogs/preferences-dialog.c:2673 +#: ../app/dialogs/preferences-dialog.c:2693 msgid "Open windows on the same _monitor they were open before" msgstr "Otwieranie okien na tym samym _monitorze, co poprzednio" -#: ../app/dialogs/preferences-dialog.c:2677 +#: ../app/dialogs/preferences-dialog.c:2697 msgid "Save Window Positions _Now" msgstr "_Zapisz położenia okien" -#: ../app/dialogs/preferences-dialog.c:2684 +#: ../app/dialogs/preferences-dialog.c:2704 msgid "_Reset Saved Window Positions to Default Values" msgstr "_Ustaw zapisane pozycje okien na wartości domyślne" -#: ../app/dialogs/preferences-dialog.c:2699 -#: ../app/dialogs/preferences-dialog.c:2700 +#: ../app/dialogs/preferences-dialog.c:2719 +#: ../app/dialogs/preferences-dialog.c:2720 msgid "Image Windows" msgstr "Okna z obrazami" -#: ../app/dialogs/preferences-dialog.c:2711 +#: ../app/dialogs/preferences-dialog.c:2731 msgid "Use \"_Dot for dot\" by default" msgstr "Domyślne ustawienie „_Punkt do punktu”" -#: ../app/dialogs/preferences-dialog.c:2717 +#: ../app/dialogs/preferences-dialog.c:2737 msgid "Marching _ants speed:" msgstr "Prędkość a_nimacji obwódki:" #. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2721 +#: ../app/dialogs/preferences-dialog.c:2741 msgid "Zoom & Resize Behavior" msgstr "Zachowanie przy powiększaniu i zmianie wymiarów" -#: ../app/dialogs/preferences-dialog.c:2725 +#: ../app/dialogs/preferences-dialog.c:2745 msgid "Resize window on _zoom" msgstr "Zmienianie wymiarów okna przy po_większeniu" -#: ../app/dialogs/preferences-dialog.c:2728 +#: ../app/dialogs/preferences-dialog.c:2748 msgid "Resize window on image _size change" msgstr "Zmienianie wymiarów okna przy z_mianie wymiarów obrazu" -#: ../app/dialogs/preferences-dialog.c:2734 +#: ../app/dialogs/preferences-dialog.c:2754 msgid "Show entire image" msgstr "Wyświetlanie całego obrazu" -#: ../app/dialogs/preferences-dialog.c:2736 +#: ../app/dialogs/preferences-dialog.c:2756 msgid "Initial zoom _ratio:" msgstr "Począ_tkowy współczynnik powiększenia:" #. Space Bar -#: ../app/dialogs/preferences-dialog.c:2740 +#: ../app/dialogs/preferences-dialog.c:2760 msgid "Space Bar" msgstr "Spacja" -#: ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/preferences-dialog.c:2766 msgid "_While space bar is pressed:" msgstr "_Po naciśnięciu klawisza spacji:" #. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2750 +#: ../app/dialogs/preferences-dialog.c:2770 msgid "Mouse Pointers" msgstr "Kursory myszy" -#: ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/preferences-dialog.c:2774 msgid "Show _brush outline" msgstr "O_bwódka pędzla" -#: ../app/dialogs/preferences-dialog.c:2757 +#: ../app/dialogs/preferences-dialog.c:2777 msgid "Show pointer for paint _tools" msgstr "Kursor dla narzędzi _rysowania" -#: ../app/dialogs/preferences-dialog.c:2763 +#: ../app/dialogs/preferences-dialog.c:2783 msgid "Pointer _mode:" msgstr "_Tryb rysowania:" -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2786 msgid "Pointer _handedness:" msgstr "P_rawo lub leworęczność kursora:" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2798 msgid "Image Window Appearance" msgstr "Wygląd okna z obrazem" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2806 msgid "Default Appearance in Normal Mode" msgstr "Domyślny wygląd w trybie zwykłym" -#: ../app/dialogs/preferences-dialog.c:2791 +#: ../app/dialogs/preferences-dialog.c:2811 msgid "Default Appearance in Fullscreen Mode" msgstr "Domyślny wygląd w trybie pełnoekranowym" -#: ../app/dialogs/preferences-dialog.c:2800 +#: ../app/dialogs/preferences-dialog.c:2820 msgid "Image Title & Statusbar Format" msgstr "Format tytułu obrazu i opisu na pasku stanu" -#: ../app/dialogs/preferences-dialog.c:2801 +#: ../app/dialogs/preferences-dialog.c:2821 msgid "Title & Status" msgstr "Tytuł i stan" -#: ../app/dialogs/preferences-dialog.c:2819 +#: ../app/dialogs/preferences-dialog.c:2839 msgid "Current format" msgstr "Bieżący format" -#: ../app/dialogs/preferences-dialog.c:2820 +#: ../app/dialogs/preferences-dialog.c:2840 msgid "Default format" msgstr "Domyślny format" -#: ../app/dialogs/preferences-dialog.c:2821 +#: ../app/dialogs/preferences-dialog.c:2841 msgid "Show zoom percentage" msgstr "Procentowe powiększenie" -#: ../app/dialogs/preferences-dialog.c:2822 +#: ../app/dialogs/preferences-dialog.c:2842 msgid "Show zoom ratio" msgstr "Współczynnik powiększenia" -#: ../app/dialogs/preferences-dialog.c:2823 +#: ../app/dialogs/preferences-dialog.c:2843 msgid "Show image size" msgstr "Rozmiar obrazu" -#: ../app/dialogs/preferences-dialog.c:2824 +#: ../app/dialogs/preferences-dialog.c:2844 msgid "Show drawable size" msgstr "Rozmiar obszaru rysowania" -#: ../app/dialogs/preferences-dialog.c:2837 +#: ../app/dialogs/preferences-dialog.c:2857 msgid "Image Title Format" msgstr "Format tytułu obrazu" -#: ../app/dialogs/preferences-dialog.c:2839 +#: ../app/dialogs/preferences-dialog.c:2859 msgid "Image Statusbar Format" msgstr "Format opisu na pasku stanu obrazu" -#: ../app/dialogs/preferences-dialog.c:2923 +#: ../app/dialogs/preferences-dialog.c:2943 msgid "Image Window Snapping Behavior" msgstr "Zachowanie przyciągania okna z obrazem" -#: ../app/dialogs/preferences-dialog.c:2924 +#: ../app/dialogs/preferences-dialog.c:2944 msgid "Snapping" msgstr "Przyciąganie" -#: ../app/dialogs/preferences-dialog.c:2931 +#: ../app/dialogs/preferences-dialog.c:2951 msgid "Default Behavior in Normal Mode" msgstr "Domyślne zachowanie w trybie zwykłym" -#: ../app/dialogs/preferences-dialog.c:2935 +#: ../app/dialogs/preferences-dialog.c:2955 msgid "Default Behavior in Fullscreen Mode" msgstr "Domyślne zachowanie w trybie pełnoekranowym" -#: ../app/dialogs/preferences-dialog.c:2944 +#: ../app/dialogs/preferences-dialog.c:2964 msgid "_Snapping distance:" msgstr "_Zasięg przyciągania:" -#: ../app/dialogs/preferences-dialog.c:2953 -#: ../app/dialogs/preferences-dialog.c:2954 +#: ../app/dialogs/preferences-dialog.c:2973 +#: ../app/dialogs/preferences-dialog.c:2974 msgid "Input Devices" msgstr "Urządzenia wejściowe" #. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2960 +#: ../app/dialogs/preferences-dialog.c:2980 msgid "Extended Input Devices" msgstr "Dodatkowe urządzenia wejściowe" -#: ../app/dialogs/preferences-dialog.c:2964 +#: ../app/dialogs/preferences-dialog.c:2984 msgid "S_hare tool and tool options between input devices" msgstr "" "_Współdzielenie narzędzia i opcji narzędzia między urządzeniami wejściowymi" -#: ../app/dialogs/preferences-dialog.c:2968 +#: ../app/dialogs/preferences-dialog.c:2988 msgid "Configure E_xtended Input Devices..." msgstr "S_konfiguruj dodatkowe urządzenia wejściowe…" -#: ../app/dialogs/preferences-dialog.c:2975 +#: ../app/dialogs/preferences-dialog.c:2995 msgid "_Save input device settings on exit" msgstr "Zap_isywanie ustawień urządzeń wejściowych przed zakończeniem" -#: ../app/dialogs/preferences-dialog.c:2979 +#: ../app/dialogs/preferences-dialog.c:2999 msgid "Save Input Device Settings _Now" msgstr "_Zapisz ustawienia urządzeń wejściowych" -#: ../app/dialogs/preferences-dialog.c:2986 +#: ../app/dialogs/preferences-dialog.c:3006 msgid "_Reset Saved Input Device Settings to Default Values" msgstr "_Ustaw zapisane ustawienia urządzeń wejściowych na wartości domyślne" -#: ../app/dialogs/preferences-dialog.c:3001 +#: ../app/dialogs/preferences-dialog.c:3021 msgid "Additional Input Controllers" msgstr "Dodatkowe urządzenia sterujące" -#: ../app/dialogs/preferences-dialog.c:3002 +#: ../app/dialogs/preferences-dialog.c:3022 msgid "Input Controllers" msgstr "Urządzenia sterujące" -#: ../app/dialogs/preferences-dialog.c:3017 -#: ../app/dialogs/preferences-dialog.c:3018 +#: ../app/dialogs/preferences-dialog.c:3037 +#: ../app/dialogs/preferences-dialog.c:3038 msgid "Folders" msgstr "Katalogi" -#: ../app/dialogs/preferences-dialog.c:3034 +#: ../app/dialogs/preferences-dialog.c:3054 msgid "Temporary folder:" msgstr "Katalog tymczasowy:" -#: ../app/dialogs/preferences-dialog.c:3035 +#: ../app/dialogs/preferences-dialog.c:3055 msgid "Select Folder for Temporary Files" msgstr "Wybór katalogu dla plików tymczasowych" -#: ../app/dialogs/preferences-dialog.c:3039 +#: ../app/dialogs/preferences-dialog.c:3059 msgid "Swap folder:" msgstr "Katalog wymiany:" -#: ../app/dialogs/preferences-dialog.c:3040 +#: ../app/dialogs/preferences-dialog.c:3060 msgid "Select Swap Folder" msgstr "Wybór katalogu wymiany" -#: ../app/dialogs/preferences-dialog.c:3072 +#: ../app/dialogs/preferences-dialog.c:3092 msgid "Brush Folders" msgstr "Katalogi z pędzlami" -#: ../app/dialogs/preferences-dialog.c:3074 +#: ../app/dialogs/preferences-dialog.c:3094 msgid "Select Brush Folders" msgstr "Wybór katalogów z pędzlami" -#: ../app/dialogs/preferences-dialog.c:3076 +#: ../app/dialogs/preferences-dialog.c:3096 msgid "Dynamics Folders" msgstr "Katalogi z dynamiką" -#: ../app/dialogs/preferences-dialog.c:3078 +#: ../app/dialogs/preferences-dialog.c:3098 msgid "Select Dynamics Folders" msgstr "Wybór katalogów z dynamiką" -#: ../app/dialogs/preferences-dialog.c:3080 +#: ../app/dialogs/preferences-dialog.c:3100 msgid "Pattern Folders" msgstr "Katalogi z deseniami" -#: ../app/dialogs/preferences-dialog.c:3082 +#: ../app/dialogs/preferences-dialog.c:3102 msgid "Select Pattern Folders" msgstr "Wybór katalogów z deseniami" -#: ../app/dialogs/preferences-dialog.c:3084 +#: ../app/dialogs/preferences-dialog.c:3104 msgid "Palette Folders" msgstr "Katalogi z paletami" -#: ../app/dialogs/preferences-dialog.c:3086 +#: ../app/dialogs/preferences-dialog.c:3106 msgid "Select Palette Folders" msgstr "Wybór katalogów z paletami" -#: ../app/dialogs/preferences-dialog.c:3088 +#: ../app/dialogs/preferences-dialog.c:3108 msgid "Gradient Folders" msgstr "Katalogi z gradientami" -#: ../app/dialogs/preferences-dialog.c:3090 +#: ../app/dialogs/preferences-dialog.c:3110 msgid "Select Gradient Folders" msgstr "Wybór katalogów z gradientami" -#: ../app/dialogs/preferences-dialog.c:3092 +#: ../app/dialogs/preferences-dialog.c:3112 msgid "Font Folders" msgstr "Katalogi z czcionkami" -#: ../app/dialogs/preferences-dialog.c:3094 +#: ../app/dialogs/preferences-dialog.c:3114 msgid "Select Font Folders" msgstr "Wybór katalogów z czcionkami" -#: ../app/dialogs/preferences-dialog.c:3096 +#: ../app/dialogs/preferences-dialog.c:3116 msgid "Tool Preset Folders" msgstr "Katalogi z ustawieniami narzędzi" -#: ../app/dialogs/preferences-dialog.c:3098 +#: ../app/dialogs/preferences-dialog.c:3118 msgid "Select Tool Preset Folders" msgstr "Wybór katalogów z ustawieniami narzędzi" -#: ../app/dialogs/preferences-dialog.c:3100 +#: ../app/dialogs/preferences-dialog.c:3120 msgid "MyPaint Brush Folders" msgstr "Katalogi z pędzlami programu MyPaint" -#: ../app/dialogs/preferences-dialog.c:3102 +#: ../app/dialogs/preferences-dialog.c:3122 msgid "Select MyPaint Brush Folders" msgstr "Wybór katalogów z pędzlami programu MyPaint" -#: ../app/dialogs/preferences-dialog.c:3104 +#: ../app/dialogs/preferences-dialog.c:3124 msgid "Plug-in Folders" msgstr "Katalogi z wtyczkami" -#: ../app/dialogs/preferences-dialog.c:3106 +#: ../app/dialogs/preferences-dialog.c:3126 msgid "Select plug-in Folders" msgstr "Wybór katalogów z wtyczkami" -#: ../app/dialogs/preferences-dialog.c:3108 +#: ../app/dialogs/preferences-dialog.c:3128 msgid "Scripts" msgstr "Skrypty" -#: ../app/dialogs/preferences-dialog.c:3108 +#: ../app/dialogs/preferences-dialog.c:3128 msgid "Script-Fu Folders" msgstr "Katalogi ze Script-Fu" -#: ../app/dialogs/preferences-dialog.c:3110 +#: ../app/dialogs/preferences-dialog.c:3130 msgid "Select Script-Fu Folders" msgstr "Wybór katalogów ze Script-Fu" -#: ../app/dialogs/preferences-dialog.c:3112 +#: ../app/dialogs/preferences-dialog.c:3132 msgid "Module Folders" msgstr "Katalogi z modułami" -#: ../app/dialogs/preferences-dialog.c:3114 +#: ../app/dialogs/preferences-dialog.c:3134 msgid "Select Module Folders" msgstr "Wybór katalogów z modułami" -#: ../app/dialogs/preferences-dialog.c:3116 +#: ../app/dialogs/preferences-dialog.c:3136 msgid "Interpreters" msgstr "Interpretery" -#: ../app/dialogs/preferences-dialog.c:3116 +#: ../app/dialogs/preferences-dialog.c:3136 msgid "Interpreter Folders" msgstr "Katalogi interpretera" -#: ../app/dialogs/preferences-dialog.c:3118 +#: ../app/dialogs/preferences-dialog.c:3138 msgid "Select Interpreter Folders" msgstr "Wybór katalogów interpretera" -#: ../app/dialogs/preferences-dialog.c:3120 +#: ../app/dialogs/preferences-dialog.c:3140 msgid "Environment" msgstr "Środowisko" -#: ../app/dialogs/preferences-dialog.c:3120 +#: ../app/dialogs/preferences-dialog.c:3140 msgid "Environment Folders" msgstr "Katalogi ze zmiennymi środowiskowymi" -#: ../app/dialogs/preferences-dialog.c:3122 +#: ../app/dialogs/preferences-dialog.c:3142 msgid "Select Environment Folders" msgstr "Wybór katalogów ze zmiennymi środowiskowymi" -#: ../app/dialogs/preferences-dialog.c:3124 +#: ../app/dialogs/preferences-dialog.c:3144 msgid "Themes" msgstr "Motywy" -#: ../app/dialogs/preferences-dialog.c:3124 +#: ../app/dialogs/preferences-dialog.c:3144 msgid "Theme Folders" msgstr "Katalogi z motywami" -#: ../app/dialogs/preferences-dialog.c:3126 +#: ../app/dialogs/preferences-dialog.c:3146 msgid "Select Theme Folders" msgstr "Wybór katalogów z motywami" -#: ../app/dialogs/preferences-dialog.c:3128 +#: ../app/dialogs/preferences-dialog.c:3148 msgid "Icon Themes" msgstr "Motywy ikon" -#: ../app/dialogs/preferences-dialog.c:3128 +#: ../app/dialogs/preferences-dialog.c:3148 msgid "Icon Theme Folders" msgstr "Katalogi z motywami ikon" -#: ../app/dialogs/preferences-dialog.c:3130 +#: ../app/dialogs/preferences-dialog.c:3150 msgid "Select Icon Theme Folders" msgstr "Wybór katalogów z motywami ikon" @@ -16442,7 +16607,7 @@ msgstr "Pio_nowo:" msgid "Image Size" msgstr "Wymiary obrazu" -#: ../app/dialogs/scale-dialog.c:181 ../app/paint/gimppaintoptions.c:403 +#: ../app/dialogs/scale-dialog.c:181 ../app/paint/gimppaintoptions.c:412 msgid "Quality" msgstr "Jakość" @@ -16666,10 +16831,10 @@ msgstr "Przesunięcie" #: ../app/display/gimpcursorview.c:250 ../app/display/gimpcursorview.c:256 #: ../app/display/gimpcursorview.c:275 ../app/display/gimpcursorview.c:281 #: ../app/display/gimpcursorview.c:297 ../app/display/gimpcursorview.c:304 -#: ../app/display/gimpcursorview.c:706 ../app/display/gimpcursorview.c:708 -#: ../app/display/gimpcursorview.c:710 ../app/display/gimpcursorview.c:712 -#: ../app/display/gimpcursorview.c:791 ../app/display/gimpcursorview.c:792 +#: ../app/display/gimpcursorview.c:708 ../app/display/gimpcursorview.c:710 +#: ../app/display/gimpcursorview.c:712 ../app/display/gimpcursorview.c:714 #: ../app/display/gimpcursorview.c:793 ../app/display/gimpcursorview.c:794 +#: ../app/display/gimpcursorview.c:795 ../app/display/gimpcursorview.c:796 msgid "n/a" msgstr "Nie dotyczy" @@ -16705,7 +16870,7 @@ msgstr "Szer." msgid "H" msgstr "Wys." -#: ../app/display/gimpcursorview.c:337 +#: ../app/display/gimpcursorview.c:339 msgid "_Sample Merged" msgstr "Próbkowanie w_szystkich warstw" @@ -16713,24 +16878,24 @@ msgstr "Próbkowanie w_szystkich warstw" msgid "Access the image menu" msgstr "Dostęp do menu obrazu" -#: ../app/display/gimpdisplayshell.c:667 +#: ../app/display/gimpdisplayshell.c:670 msgid "Zoom image when window size changes" msgstr "Zmiana powiększenia przy zmianie wymiarów okna" -#: ../app/display/gimpdisplayshell.c:696 +#: ../app/display/gimpdisplayshell.c:699 msgid "Toggle Quick Mask" msgstr "Przełącz szybką maskę" -#: ../app/display/gimpdisplayshell.c:719 +#: ../app/display/gimpdisplayshell.c:722 msgid "Navigate the image display" msgstr "Kontroluje wyświetlanie obrazu" -#: ../app/display/gimpdisplayshell.c:789 ../app/display/gimpdisplayshell.c:1445 +#: ../app/display/gimpdisplayshell.c:792 ../app/display/gimpdisplayshell.c:1448 #: ../app/widgets/gimptoolbox.c:251 msgid "Drop image files here to open them" msgstr "Upuszczenie plików obrazów w tym miejscu otworzy je" -#: ../app/display/gimpdisplayshell-callbacks.c:551 +#: ../app/display/gimpdisplayshell-callbacks.c:565 #, c-format msgid "" "Unstable Development Version\n" @@ -16830,17 +16995,19 @@ msgstr "Upuszczenie nowej warstwy" msgid "Drop New Path" msgstr "Upuszczenie nowej ścieżki" -#: ../app/display/gimpdisplayshell-dnd.c:360 ../app/tools/gimpblendtool.c:243 +#: ../app/display/gimpdisplayshell-dnd.c:360 #: ../app/tools/gimpbucketfilltool.c:137 ../app/tools/gimpcagetool.c:220 -#: ../app/tools/gimpfiltertool.c:268 ../app/tools/gimpselectiontool.c:427 +#: ../app/tools/gimpfiltertool.c:270 ../app/tools/gimpgradienttool.c:243 +#: ../app/tools/gimpselectiontool.c:427 msgid "Cannot modify the pixels of layer groups." msgstr "Nie można zmodyfikować pikseli grup warstw." -#: ../app/display/gimpdisplayshell-dnd.c:368 ../app/tools/gimpblendtool.c:250 +#: ../app/display/gimpdisplayshell-dnd.c:368 #: ../app/tools/gimpbucketfilltool.c:144 ../app/tools/gimpcagetool.c:227 -#: ../app/tools/gimpcroptool.c:462 ../app/tools/gimpfiltertool.c:275 -#: ../app/tools/gimppainttool.c:279 ../app/tools/gimpselectiontool.c:432 -#: ../app/tools/gimptransformtool.c:1435 ../app/tools/gimpwarptool.c:629 +#: ../app/tools/gimpcroptool.c:462 ../app/tools/gimpfiltertool.c:277 +#: ../app/tools/gimpgradienttool.c:250 ../app/tools/gimppainttool.c:277 +#: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:1449 +#: ../app/tools/gimpwarptool.c:629 msgid "The active layer's pixels are locked." msgstr "Aktywne piksele warstwy są zablokowane." @@ -16887,7 +17054,7 @@ msgstr "Zapisano obraz do „%s”" msgid "Image exported to '%s'" msgstr "Wyeksportowano obraz do „%s”" -#: ../app/display/gimpdisplayshell-layer-select.c:125 +#: ../app/display/gimpdisplayshell-layer-select.c:128 msgid "Layer Select" msgstr "Wybór warstwy" @@ -16950,7 +17117,7 @@ msgstr "bez zarządzania kolorami" msgid "pixels" msgstr "piksele" -#: ../app/display/gimpstatusbar.c:456 +#: ../app/display/gimpstatusbar.c:460 #, c-format msgid "Cancel %s" msgstr "Anuluj %s" @@ -16979,6 +17146,45 @@ msgstr "Kliknięcie i przeciągnięcie przemieści ten punkt" msgid "Click-Drag to move all points" msgstr "Kliknięcie i przeciągnięcie przemieści wszystkie punkty" +#: ../app/display/gimptoolgyroscope.c:702 +msgid "Click-Drag to zoom" +msgstr "Kliknięcie i przeciągnięcie powiększy" + +#: ../app/display/gimptoolgyroscope.c:706 +#, c-format +msgid "%s for constrained steps" +msgstr "%s dla wymuszonych kroków" + +#: ../app/display/gimptoolgyroscope.c:713 +#: ../app/display/gimptooltransformgrid.c:1782 +msgid "Click-Drag to rotate" +msgstr "Kliknięcie i przeciągnięcie obróci" + +#: ../app/display/gimptoolgyroscope.c:717 ../app/display/gimptoolline.c:1490 +#: ../app/tools/gimppainttool.c:569 +#, c-format +msgid "%s for constrained angles" +msgstr "%s dla wymuszonych kątów" + +#: ../app/display/gimptoolgyroscope.c:722 +msgid "Click-Drag to pan" +msgstr "Kliknięcie i przeciągnięcie przesunie" + +#: ../app/display/gimptoolgyroscope.c:728 +#, c-format +msgid "%s to rotate" +msgstr "%s obróci" + +#: ../app/display/gimptoolgyroscope.c:729 +#, c-format +msgid "%s for a constrained axis" +msgstr "%s dla wymuszonej osi" + +#: ../app/display/gimptoolgyroscope.c:730 +#, c-format +msgid "%s to zoom" +msgstr "%s powiększy" + #: ../app/display/gimptoolhandlegrid.c:837 #: ../app/display/gimptooltransformgrid.c:1773 msgid "Click-Drag to move" @@ -17017,11 +17223,6 @@ msgstr "Linia: " msgid "Click-Drag to move the endpoint" msgstr "Kliknięcie i przeciągnięcie przemieści punkt końcowy" -#: ../app/display/gimptoolline.c:1490 ../app/tools/gimppainttool.c:657 -#, c-format -msgid "%s for constrained angles" -msgstr "%s dla wymuszonych kątów" - #: ../app/display/gimptoolline.c:1497 msgid "Release to remove the slider" msgstr "Zwolnienie usunie suwak" @@ -17256,10 +17457,6 @@ msgstr "Kliknięcie i przeciągnięcie przemieści punkt osi" msgid "Click-Drag to shear" msgstr "Kliknięcie i przeciągnięcie nachyli" -#: ../app/display/gimptooltransformgrid.c:1782 -msgid "Click-Drag to rotate" -msgstr "Kliknięcie i przeciągnięcie obróci" - #: ../app/file/file-open.c:116 ../app/file/file-save.c:114 msgid "Not a regular file" msgstr "To nie jest zwykły plik" @@ -18272,11 +18469,11 @@ msgstr "Tylko ruch" msgid "Flow" msgstr "Strumień" -#: ../app/paint/gimpbrushcore.c:394 +#: ../app/paint/gimpbrushcore.c:378 msgid "No brushes available for use with this tool." msgstr "Brak dostępnych pędzli dla tego narzędzia." -#: ../app/paint/gimpbrushcore.c:401 +#: ../app/paint/gimpbrushcore.c:385 msgid "No paint dynamics available for use with this tool." msgstr "Brak dostępnych dynamik rysowania dla tego narzędzia." @@ -18338,7 +18535,7 @@ msgid "Ink" msgstr "Stalówka" #: ../app/paint/gimpinkoptions.c:74 ../app/paint/gimpinkoptions.c:87 -#: ../app/paint/gimppaintoptions.c:191 ../app/tools/gimpwarpoptions.c:91 +#: ../app/paint/gimppaintoptions.c:193 ../app/tools/gimpwarpoptions.c:91 msgid "Size" msgstr "Rozmiar" @@ -18347,7 +18544,7 @@ msgid "Ink Blob Size" msgstr "Rozmiar kropli tuszu" #: ../app/paint/gimpinkoptions.c:80 ../app/paint/gimpinkoptions.c:119 -#: ../app/paint/gimppaintoptions.c:205 ../app/widgets/gimpbrusheditor.c:200 +#: ../app/paint/gimppaintoptions.c:207 ../app/widgets/gimpbrusheditor.c:200 msgid "Angle" msgstr "Kąt" @@ -18357,8 +18554,8 @@ msgid "Tilt" msgstr "Nachylenie" #. Blob shape widgets -#: ../app/paint/gimpinkoptions.c:106 ../app/tools/gimpblendoptions.c:94 -#: ../app/tools/gimpblendoptions.c:294 ../app/tools/gimpinkoptions-gui.c:103 +#: ../app/paint/gimpinkoptions.c:106 ../app/tools/gimpgradientoptions.c:95 +#: ../app/tools/gimpgradientoptions.c:305 ../app/tools/gimpinkoptions-gui.c:103 msgid "Shape" msgstr "Kształt" @@ -18392,7 +18589,7 @@ msgstr "Promień" msgid "Base Opacity" msgstr "Krycie bazowe" -#: ../app/paint/gimpmybrushoptions.c:100 ../app/paint/gimppaintoptions.c:219 +#: ../app/paint/gimpmybrushoptions.c:100 ../app/paint/gimppaintoptions.c:221 #: ../app/tools/gimpwarpoptions.c:98 ../app/widgets/gimpbrusheditor.c:178 msgid "Hardness" msgstr "Twardość" @@ -18417,154 +18614,165 @@ msgstr "Pędzel" msgid "Paint" msgstr "Rysowanie" -#: ../app/paint/gimppaintoptions.c:192 +#: ../app/paint/gimppaintoptions.c:194 msgid "Brush Size" msgstr "Rozmiar pędzla" -#: ../app/paint/gimppaintoptions.c:198 +#: ../app/paint/gimppaintoptions.c:200 msgid "Aspect Ratio" msgstr "Proporcje" -#: ../app/paint/gimppaintoptions.c:212 ../app/tools/gimpwarpoptions.c:112 +#: ../app/paint/gimppaintoptions.c:214 ../app/tools/gimpwarpoptions.c:112 #: ../app/widgets/gimpbrusheditor.c:211 #: ../app/widgets/gimpbrushfactoryview.c:81 ../app/widgets/gimpgrideditor.c:174 msgid "Spacing" msgstr "Odstępy" -#: ../app/paint/gimppaintoptions.c:226 +#: ../app/paint/gimppaintoptions.c:228 msgid "Force" msgstr "Siła" -#: ../app/paint/gimppaintoptions.c:227 +#: ../app/paint/gimppaintoptions.c:229 msgid "Brush Force" msgstr "Siła pędzla" -#: ../app/paint/gimppaintoptions.c:233 +#: ../app/paint/gimppaintoptions.c:235 msgid "Link Size" msgstr "Dowiązanie rozmiaru" -#: ../app/paint/gimppaintoptions.c:234 +#: ../app/paint/gimppaintoptions.c:236 msgid "Link brush size to brush native" msgstr "Dowiązuje rozmiar do natywnej wartości pędzla" -#: ../app/paint/gimppaintoptions.c:240 +#: ../app/paint/gimppaintoptions.c:242 msgid "Link Aspect Ratio" msgstr "Dowiązanie proporcji" -#: ../app/paint/gimppaintoptions.c:241 +#: ../app/paint/gimppaintoptions.c:243 msgid "Link brush aspect ratio to brush native" msgstr "Dowiązuje proporcje do natywnej wartości pędzla" -#: ../app/paint/gimppaintoptions.c:247 +#: ../app/paint/gimppaintoptions.c:249 msgid "Link Angle" msgstr "Dowiązanie kąta" -#: ../app/paint/gimppaintoptions.c:248 +#: ../app/paint/gimppaintoptions.c:250 msgid "Link brush angle to brush native" msgstr "Dowiązuje kąt do natywnej wartości pędzla" -#: ../app/paint/gimppaintoptions.c:254 +#: ../app/paint/gimppaintoptions.c:256 msgid "Link Spacing" msgstr "Dowiązanie odstępu" -#: ../app/paint/gimppaintoptions.c:255 +#: ../app/paint/gimppaintoptions.c:257 msgid "Link brush spacing to brush native" msgstr "Dowiązuje odstęp do natywnej wartości pędzla" -#: ../app/paint/gimppaintoptions.c:261 +#: ../app/paint/gimppaintoptions.c:263 msgid "Link Hardness" msgstr "Dowiązanie twardości" -#: ../app/paint/gimppaintoptions.c:262 +#: ../app/paint/gimppaintoptions.c:264 msgid "Link brush hardness to brush native" msgstr "Dowiązuje twardość do natywnej wartości pędzla" -#: ../app/paint/gimppaintoptions.c:268 +#: ../app/paint/gimppaintoptions.c:270 msgid "Lock brush to view" msgstr "Zablokowanie pędzla do widoku" -#: ../app/paint/gimppaintoptions.c:269 +#: ../app/paint/gimppaintoptions.c:271 msgid "Keep brush appearance fixed relative to the view" msgstr "Utrzymuje stały wygląd pędzla względnie do widoku" -#: ../app/paint/gimppaintoptions.c:275 +#: ../app/paint/gimppaintoptions.c:277 msgid "Incremental" msgstr "Przyrostowe" -#: ../app/paint/gimppaintoptions.c:276 +#: ../app/paint/gimppaintoptions.c:278 msgid "Every stamp has its own opacity" msgstr "Każda pieczątka ma swoje własne krycie" -#: ../app/paint/gimppaintoptions.c:283 +#: ../app/paint/gimppaintoptions.c:285 msgid "Hard edge" msgstr "Twarda krawędź" -#: ../app/paint/gimppaintoptions.c:284 +#: ../app/paint/gimppaintoptions.c:286 msgid "Ignore fuzziness of the current brush" msgstr "Ignorowanie rozmycia bieżącego pędzla" -#: ../app/paint/gimppaintoptions.c:290 +#: ../app/paint/gimppaintoptions.c:292 msgid "Apply Jitter" msgstr "Drganie" -#: ../app/paint/gimppaintoptions.c:291 +#: ../app/paint/gimppaintoptions.c:293 msgid "Scatter brush as you paint" msgstr "Rozpraszanie pędzla podczas rysowania" -#: ../app/paint/gimppaintoptions.c:296 +#: ../app/paint/gimppaintoptions.c:298 msgid "Amount" msgstr "Ilość" -#: ../app/paint/gimppaintoptions.c:297 +#: ../app/paint/gimppaintoptions.c:299 msgid "Distance of scattering" msgstr "Dystans rozpraszania" -#: ../app/paint/gimppaintoptions.c:303 +#: ../app/paint/gimppaintoptions.c:305 msgid "Dynamics Options" msgstr "Opcje dynamiki" -#: ../app/paint/gimppaintoptions.c:310 +#: ../app/paint/gimppaintoptions.c:312 msgid "Fade length" msgstr "Długość zanikania" -#: ../app/paint/gimppaintoptions.c:311 +#: ../app/paint/gimppaintoptions.c:313 msgid "Distance over which strokes fade out" msgstr "Dystans, po którym krzywe zanikają" -#: ../app/paint/gimppaintoptions.c:321 ../app/widgets/gimpviewablebox.c:381 +#: ../app/paint/gimppaintoptions.c:323 ../app/widgets/gimpviewablebox.c:385 msgid "Reverse" msgstr "Odwrócenie" -#: ../app/paint/gimppaintoptions.c:322 +#: ../app/paint/gimppaintoptions.c:324 msgid "Reverse direction of fading" msgstr "Odwrócony kierunek zanikania" -#: ../app/paint/gimppaintoptions.c:327 ../app/tools/gimpblendoptions.c:108 -#: ../app/tools/gimpblendoptions.c:315 ../app/tools/gimppaintoptions-gui.c:356 +#: ../app/paint/gimppaintoptions.c:329 ../app/tools/gimpgradientoptions.c:109 +#: ../app/tools/gimpgradientoptions.c:326 +#: ../app/tools/gimppaintoptions-gui.c:356 msgid "Repeat" msgstr "Okresowość" -#: ../app/paint/gimppaintoptions.c:328 +#: ../app/paint/gimppaintoptions.c:330 msgid "How fade is repeated as you paint" msgstr "Jak zanikanie jest powtarzane podczas rysowania" -#: ../app/paint/gimppaintoptions.c:397 +#: ../app/paint/gimppaintoptions.c:342 ../app/tools/gimpgradientoptions.c:298 +#: ../app/tools/gimppaintoptions-gui.c:392 +msgid "Blend Color Space" +msgstr "Przestrzeń kolorów gradientu" + +#: ../app/paint/gimppaintoptions.c:343 +msgid "Which color space to use when blending RGB gradient segments" +msgstr "" +"Której przestrzeni kolorów używać podczas mieszania segmentów gradientu RGB" + +#: ../app/paint/gimppaintoptions.c:406 msgid "Smooth stroke" msgstr "Płynne rysowanie" -#: ../app/paint/gimppaintoptions.c:398 +#: ../app/paint/gimppaintoptions.c:407 msgid "Paint smoother strokes" msgstr "Rysowanie gładkich krzywych" -#: ../app/paint/gimppaintoptions.c:404 +#: ../app/paint/gimppaintoptions.c:413 msgid "Depth of smoothing" msgstr "Głębia wygładzania" -#: ../app/paint/gimppaintoptions.c:409 +#: ../app/paint/gimppaintoptions.c:418 msgid "Weight" msgstr "Waga" -#: ../app/paint/gimppaintoptions.c:410 +#: ../app/paint/gimppaintoptions.c:419 msgid "Gravity of the pen" msgstr "Ciążenie ołówka" @@ -18577,7 +18785,7 @@ msgstr "Ołówek" msgid "Perspective Clone" msgstr "Klon perspektywy" -#: ../app/paint/gimpsmudge.c:85 ../app/tools/gimpsmudgetool.c:55 +#: ../app/paint/gimpsmudge.c:86 ../app/tools/gimpsmudgetool.c:55 msgid "Smudge" msgstr "Rozsmarowywanie" @@ -18707,7 +18915,7 @@ msgstr "Progowanie" msgid "Plug-in" msgstr "Wtyczka" -#: ../app/pdb/drawable-cmds.c:963 ../app/tools/gimpforegroundselecttool.c:987 +#: ../app/pdb/drawable-cmds.c:963 ../app/tools/gimpforegroundselecttool.c:993 msgctxt "command" msgid "Foreground Select" msgstr "Zaznaczenie pierwszego planu" @@ -18726,8 +18934,8 @@ msgstr "Odwrócenie" #: ../app/pdb/drawable-transform-cmds.c:455 #: ../app/pdb/item-transform-cmds.c:270 ../app/pdb/transform-tools-cmds.c:171 #: ../app/tools/gimpperspectivetool.c:85 -#: ../app/tools/gimptransformoptions.c:552 -#: ../app/tools/gimptransformoptions.c:561 +#: ../app/tools/gimptransformoptions.c:560 +#: ../app/tools/gimptransformoptions.c:569 msgid "Perspective" msgstr "Perspektywa" @@ -18750,10 +18958,6 @@ msgstr "Przekształcenia 2D" msgid "2D Transforming" msgstr "Przekształcanie 2D" -#: ../app/pdb/edit-cmds.c:797 -msgid "Blending" -msgstr "Mieszanie" - #: ../app/pdb/floating-sel-cmds.c:69 msgid "Cannot remove this layer because it is not a floating selection." msgstr "" @@ -19082,7 +19286,7 @@ msgid "Diagonal neighbors" msgstr "Sąsiedzi po przekątnej" #: ../app/pdb/gimppdbcontext.c:164 ../app/tools/gimptransformoptions.c:124 -#: ../app/tools/gimptransformoptions.c:440 ../app/tools/gimpwarpoptions.c:119 +#: ../app/tools/gimptransformoptions.c:448 ../app/tools/gimpwarpoptions.c:119 #: ../app/tools/gimpwarpoptions.c:322 msgid "Interpolation" msgstr "Interpolacja" @@ -19857,6 +20061,10 @@ msgstr "_Nasycenie" msgid "R_eset Color" msgstr "P_rzywróć kolor" +#: ../app/propgui/gimppropgui-panorama-projection.c:125 +msgid "Panorama Projection: " +msgstr "Rzut panoramy: " + #: ../app/propgui/gimppropgui-recursive-transform.c:125 msgid "Recursive Transform: " msgstr "Przekształcenie rekurencyjne: " @@ -19966,11 +20174,11 @@ msgstr "Wybiera z listy często używanych temperatur kolorów" msgid "New Seed" msgstr "Nowe ziarno" -#: ../app/propgui/gimppropgui.c:375 +#: ../app/propgui/gimppropgui.c:376 msgid "Pick color from the image" msgstr "Proszę wybrać kolor z obrazu" -#: ../app/propgui/gimppropgui.c:517 +#: ../app/propgui/gimppropgui.c:520 msgid "This operation has no editable properties" msgstr "To działanie nie ma modyfikowalnych właściwości" @@ -20040,7 +20248,7 @@ msgstr "" "Tekst nie może zostać wyświetlony. Prawdopodobnie jest za duży. Proszę go " "skrócić lub użyć mniejszej czcionki." -#: ../app/text/gimptextlayer-xcf.c:77 +#: ../app/text/gimptextlayer-xcf.c:78 #, c-format msgid "" "Problems parsing the text parasite for layer '%s':\n" @@ -20208,177 +20416,6 @@ msgstr "Kliknięcie wybierze pierwszą ścieżkę" msgid "Click to add this path to the list" msgstr "Kliknięcie doda tę ścieżkę do listy" -#: ../app/tools/gimpblendoptions.c:101 ../app/tools/gimpblendoptions.c:303 -msgid "Metric" -msgstr "Metryka" - -#: ../app/tools/gimpblendoptions.c:102 -msgid "Metric to use for the distance calculation" -msgstr "Metryka używana do obliczania odległości" - -#: ../app/tools/gimpblendoptions.c:116 -msgid "Adaptive Supersampling" -msgstr "Nadpróbkowanie adaptatywne" - -#: ../app/tools/gimpblendoptions.c:122 -msgid "Max depth" -msgstr "Maksymalna głębia" - -#: ../app/tools/gimpblendoptions.c:128 ../app/tools/gimpbucketfilloptions.c:142 -#: ../app/tools/gimpregionselectoptions.c:112 -#: ../app/tools/gimpthresholdtool.c:87 -msgid "Threshold" -msgstr "Progowanie" - -#: ../app/tools/gimpblendoptions.c:142 -msgid "Instant mode" -msgstr "Tryb natychmiastowy" - -#: ../app/tools/gimpblendoptions.c:143 -msgid "Commit gradient instantly" -msgstr "Od razu zatwierdza gradient" - -#: ../app/tools/gimpblendoptions.c:149 -msgid "Modify active gradient" -msgstr "Modyfikuj aktywny gradient" - -#: ../app/tools/gimpblendoptions.c:150 -msgid "Modify the active gradient in-place" -msgstr "Modyfikuje aktywny gradient na płótnie" - -#: ../app/tools/gimpblendoptions.c:288 ../app/tools/gimppaintoptions-gui.c:379 -msgid "Edit this gradient" -msgstr "Modyfikuje ten gradient" - -#. the instant toggle -#: ../app/tools/gimpblendoptions.c:356 -#, c-format -msgid "Instant mode (%s)" -msgstr "Tryb natychmiastowy (%s)" - -#: ../app/tools/gimpblendoptions.c:376 -msgid "" -"The active gradient is non-writable and cannot be edited directly. Uncheck " -"this option to edit a copy of it." -msgstr "" -"Aktywny gradient nie jest zapisywalny i nie może być modyfikowany " -"bezpośrednio. Odznaczenie tej opcji umożliwi modyfikowanie jego kopii." - -#: ../app/tools/gimpblendtool.c:156 -msgid "Blend" -msgstr "Gradient" - -#: ../app/tools/gimpblendtool.c:157 -msgid "Blend Tool: Fill selected area with a color gradient" -msgstr "Gradient: wypełnia zaznaczony obszar kolorem z gradientu" - -#: ../app/tools/gimpblendtool.c:158 -msgid "Blen_d" -msgstr "_Gradient" - -#: ../app/tools/gimpblendtool.c:213 -msgid "Click-Drag to draw a gradient" -msgstr "Kliknięcie i przeciągnięcie rysuje gradient" - -#: ../app/tools/gimpblendtool.c:257 ../app/tools/gimpbucketfilltool.c:151 -#: ../app/tools/gimpcagetool.c:234 ../app/tools/gimpfiltertool.c:282 -#: ../app/tools/gimpforegroundselecttool.c:288 ../app/tools/gimppainttool.c:286 -#: ../app/tools/gimptransformtool.c:1443 ../app/tools/gimpwarptool.c:640 -msgid "The active layer is not visible." -msgstr "Aktywna warstwa jest niewidoczna." - -#: ../app/tools/gimpblendtool.c:264 -msgid "No gradient available for use with this tool." -msgstr "Brak dostępnych gradientów dla tego narzędzia." - -#: ../app/tools/gimpblendtool.c:614 -msgid "Blend: " -msgstr "Gradient: " - -#. the position labels -#: ../app/tools/gimpblendtool-editor.c:1280 -msgid "X:" -msgstr "Poziomo:" - -#: ../app/tools/gimpblendtool-editor.c:1286 -msgid "Y:" -msgstr "Pionowo:" - -#. the color label -#: ../app/tools/gimpblendtool-editor.c:1339 ../app/tools/gimptextoptions.c:583 -msgid "Color:" -msgstr "Kolor:" - -#: ../app/tools/gimpblendtool-editor.c:1347 -msgid "Change Endpoint Color" -msgstr "Zmiana koloru punktu końcowego" - -#. the position label -#: ../app/tools/gimpblendtool-editor.c:1385 -#: ../app/tools/gimpblendtool-editor.c:1505 -#: ../app/tools/gimprectangleoptions.c:1031 -msgid "Position:" -msgstr "Położenie:" - -#. the color labels -#: ../app/tools/gimpblendtool-editor.c:1410 -msgid "Left color:" -msgstr "Lewy kolor:" - -#: ../app/tools/gimpblendtool-editor.c:1416 -msgid "Right color:" -msgstr "Prawy kolor:" - -#: ../app/tools/gimpblendtool-editor.c:1443 -#: ../app/tools/gimpblendtool-editor.c:1452 -msgid "Change Stop Color" -msgstr "Zmiana koloru przerwy" - -#: ../app/tools/gimpblendtool-editor.c:1474 -msgid "Delete stop" -msgstr "Usuń przerwę" - -#. the type label -#: ../app/tools/gimpblendtool-editor.c:1530 -msgid "Blending:" -msgstr "Mieszanie:" - -#. the color label -#: ../app/tools/gimpblendtool-editor.c:1552 -msgid "Coloring:" -msgstr "Kolory:" - -#: ../app/tools/gimpblendtool-editor.c:1586 -msgid "New stop at midpoint" -msgstr "Nowa przerwa w punkcie pośrednim" - -#: ../app/tools/gimpblendtool-editor.c:1594 -msgid "Center midpoint" -msgstr "Wyśrodkowany punkt pośredni" - -#: ../app/tools/gimpblendtool-editor.c:1657 -msgid "Start Endpoint" -msgstr "Pierwszy punkt końcowy" - -#: ../app/tools/gimpblendtool-editor.c:1665 -msgid "End Endpoint" -msgstr "Ostatni punkt końcowy" - -#: ../app/tools/gimpblendtool-editor.c:1718 -#, c-format -msgid "Stop %d" -msgstr "%d. przerwa" - -#: ../app/tools/gimpblendtool-editor.c:1786 -#, c-format -msgid "Midpoint %d" -msgstr "%d. punkt pośredni" - -#: ../app/tools/gimpblendtool-editor.c:2364 -#: ../app/tools/gimpblendtool-editor.c:2373 -msgid "Blend Step" -msgstr "Krok gradientu" - #: ../app/tools/gimpbrightnesscontrasttool.c:97 msgid "Brightness-Contrast" msgstr "Jasność i kontrast" @@ -20438,6 +20475,13 @@ msgstr "" "Opiera krycie wypełnienia na różnicy kolorów z klikniętego piksela (proszę " "zobaczyć próg). Wyłączenie wygładzania wypełni cały obszar równomiernie." +#: ../app/tools/gimpbucketfilloptions.c:142 +#: ../app/tools/gimpgradientoptions.c:129 +#: ../app/tools/gimpregionselectoptions.c:112 +#: ../app/tools/gimpthresholdtool.c:87 +msgid "Threshold" +msgstr "Progowanie" + #: ../app/tools/gimpbucketfilloptions.c:143 #: ../app/tools/gimpregionselectoptions.c:113 msgid "Maximum color difference" @@ -20488,6 +20532,14 @@ msgstr "Wypełnienie kubełkiem: wypełnia zaznaczony obszar kolorem lub desenie msgid "_Bucket Fill" msgstr "Wyp_ełnienie kubełkiem" +#: ../app/tools/gimpbucketfilltool.c:151 ../app/tools/gimpcagetool.c:234 +#: ../app/tools/gimpfiltertool.c:284 +#: ../app/tools/gimpforegroundselecttool.c:288 +#: ../app/tools/gimpgradienttool.c:257 ../app/tools/gimppainttool.c:284 +#: ../app/tools/gimptransformtool.c:1457 ../app/tools/gimpwarptool.c:640 +msgid "The active layer is not visible." +msgstr "Aktywna warstwa jest niewidoczna." + #: ../app/tools/gimpbycolorselecttool.c:67 msgid "Select by Color" msgstr "Zaznaczenie według koloru" @@ -20625,11 +20677,11 @@ msgstr "Po_branie koloru" msgid "Click in any image to view its color" msgstr "Kliknięcie w dowolnym obrazie wyświetli jego kolor" -#: ../app/tools/gimpcolorpickertool.c:260 ../app/tools/gimppainttool.c:500 +#: ../app/tools/gimpcolorpickertool.c:260 ../app/tools/gimppainttool.c:412 msgid "Click in any image to pick the foreground color" msgstr "Kliknięcie w dowolnym obrazie pobierze jego kolor pierwszoplanowy" -#: ../app/tools/gimpcolorpickertool.c:268 ../app/tools/gimppainttool.c:506 +#: ../app/tools/gimpcolorpickertool.c:268 ../app/tools/gimppainttool.c:418 msgid "Click in any image to pick the background color" msgstr "Kliknięcie w dowolnym obrazie pobierze jego kolor tła" @@ -20931,50 +20983,50 @@ msgid "Color _managed" msgstr "_Zarządzanie kolorami" #. The Color Options expander -#: ../app/tools/gimpfiltertool.c:371 +#: ../app/tools/gimpfiltertool.c:373 msgid "Advanced Color Options" msgstr "Zaawansowane opcje kolorów" -#: ../app/tools/gimpfiltertool.c:390 +#: ../app/tools/gimpfiltertool.c:392 msgid "Convert pixels to built-in sRGB to apply filter (slow)" msgstr "" "Konwertowanie pikseli do wbudowanej przestrzeni sRGB, aby zastosować filtr " "(wolne)" -#: ../app/tools/gimpfiltertool.c:391 +#: ../app/tools/gimpfiltertool.c:393 msgid "Assume pixels are built-in sRGB (ignore actual image color space)" msgstr "" "Przyjmowanie, że piksele są we wbudowanej przestrzeni sRGB (ignorowanie " "prawdziwej przestrzeni kolorów obrazu)" -#: ../app/tools/gimpfiltertool.c:626 +#: ../app/tools/gimpfiltertool.c:628 msgid "Click to switch the original and filtered sides" msgstr "Kliknięcie przełączy oryginalną i filtrowaną stronę" -#: ../app/tools/gimpfiltertool.c:630 +#: ../app/tools/gimpfiltertool.c:632 msgid "Click to switch between vertical and horizontal" msgstr "Kliknięcie przełączy między pionowym a poziomym widokiem" -#: ../app/tools/gimpfiltertool.c:634 +#: ../app/tools/gimpfiltertool.c:636 msgid "Click to move the split guide" msgstr "Kliknięcie przemieści prowadnicę podziału" -#: ../app/tools/gimpfiltertool.c:636 +#: ../app/tools/gimpfiltertool.c:638 #, c-format msgid "%s: switch original and filtered" msgstr "%s: przełącza oryginalną i filtrowaną stronę" -#: ../app/tools/gimpfiltertool.c:637 +#: ../app/tools/gimpfiltertool.c:639 #, c-format msgid "%s: switch horizontal and vertical" msgstr "%s: przełącza między poziomym a pionowym widokiem" -#: ../app/tools/gimpfiltertool.c:1298 ../app/tools/gimpfiltertool-settings.c:71 +#: ../app/tools/gimpfiltertool.c:1300 ../app/tools/gimpfiltertool-settings.c:71 #, c-format msgid "Import '%s' Settings" msgstr "Importowanie ustawień „%s”" -#: ../app/tools/gimpfiltertool.c:1300 ../app/tools/gimpfiltertool-settings.c:73 +#: ../app/tools/gimpfiltertool.c:1302 ../app/tools/gimpfiltertool-settings.c:73 #, c-format msgid "Export '%s' Settings" msgstr "Eksportowanie ustawień „%s”" @@ -20996,7 +21048,7 @@ msgstr "Typ odbicia" msgid "Direction of flipping" msgstr "Kierunek odbicia" -#: ../app/tools/gimpflipoptions.c:139 ../app/tools/gimptransformoptions.c:425 +#: ../app/tools/gimpflipoptions.c:139 ../app/tools/gimptransformoptions.c:433 msgid "Transform:" msgstr "Przekształcenie:" @@ -21007,7 +21059,7 @@ msgid "Direction (%s)" msgstr "Kierunek (%s)" #: ../app/tools/gimpflipoptions.c:170 ../app/tools/gimptransformoptions.c:132 -#: ../app/tools/gimptransformoptions.c:447 +#: ../app/tools/gimptransformoptions.c:455 msgid "Clipping" msgstr "Przycinanie" @@ -21118,45 +21170,45 @@ msgstr "" msgid "F_oreground Select" msgstr "Zaznaczenie pi_erwszego planu" -#: ../app/tools/gimpforegroundselecttool.c:301 +#: ../app/tools/gimpforegroundselecttool.c:307 msgid "Dialog for foreground select" msgstr "Okno dialogowe dla zaznaczenia pierwszego planu" -#: ../app/tools/gimpforegroundselecttool.c:319 +#: ../app/tools/gimpforegroundselecttool.c:325 msgid "_Preview mask" msgstr "_Podgląd maski" -#: ../app/tools/gimpforegroundselecttool.c:330 +#: ../app/tools/gimpforegroundselecttool.c:336 msgid "Select foreground pixels" msgstr "Zaznacza piksele pierwszego planu" -#: ../app/tools/gimpforegroundselecttool.c:606 +#: ../app/tools/gimpforegroundselecttool.c:612 msgid "Roughly outline the object to extract" msgstr "Nierówno obrysowuje obiekt do wydobycia" -#: ../app/tools/gimpforegroundselecttool.c:627 +#: ../app/tools/gimpforegroundselecttool.c:633 msgid "Selecting foreground," msgstr "Zaznaczenie pierwszego planu," -#: ../app/tools/gimpforegroundselecttool.c:629 +#: ../app/tools/gimpforegroundselecttool.c:635 msgid "Selecting background," msgstr "Zaznaczenie tła," -#: ../app/tools/gimpforegroundselecttool.c:631 +#: ../app/tools/gimpforegroundselecttool.c:637 msgid "Selecting unknown," msgstr "Zaznaczenie nieznanego," -#: ../app/tools/gimpforegroundselecttool.c:634 +#: ../app/tools/gimpforegroundselecttool.c:640 msgid "press Enter to preview." msgstr "naciśnięcie klawisza Enter wyświetli podgląd." -#: ../app/tools/gimpforegroundselecttool.c:636 +#: ../app/tools/gimpforegroundselecttool.c:642 msgid "press Escape to exit preview or Enter to apply." msgstr "" "naciśnięcie klawisza Escape wyłączy podgląd, a naciśnięcie klawisza Enter " "zastosuje." -#: ../app/tools/gimpforegroundselecttool.c:1210 +#: ../app/tools/gimpforegroundselecttool.c:1219 msgid "Paint mask" msgstr "Maska rysowania" @@ -21219,6 +21271,163 @@ msgstr "Przekształcenie macierzowe" msgid "Invalid transform" msgstr "Nieprawidłowe przekształcenie" +#: ../app/tools/gimpgradientoptions.c:102 +#: ../app/tools/gimpgradientoptions.c:314 +msgid "Metric" +msgstr "Metryka" + +#: ../app/tools/gimpgradientoptions.c:103 +msgid "Metric to use for the distance calculation" +msgstr "Metryka używana do obliczania odległości" + +#: ../app/tools/gimpgradientoptions.c:117 +msgid "Adaptive Supersampling" +msgstr "Nadpróbkowanie adaptatywne" + +#: ../app/tools/gimpgradientoptions.c:123 +msgid "Max depth" +msgstr "Maksymalna głębia" + +#: ../app/tools/gimpgradientoptions.c:143 +msgid "Instant mode" +msgstr "Tryb natychmiastowy" + +#: ../app/tools/gimpgradientoptions.c:144 +msgid "Commit gradient instantly" +msgstr "Od razu zatwierdza gradient" + +#: ../app/tools/gimpgradientoptions.c:150 +msgid "Modify active gradient" +msgstr "Modyfikuj aktywny gradient" + +#: ../app/tools/gimpgradientoptions.c:151 +msgid "Modify the active gradient in-place" +msgstr "Modyfikuje aktywny gradient na płótnie" + +#: ../app/tools/gimpgradientoptions.c:290 +#: ../app/tools/gimppaintoptions-gui.c:384 +msgid "Edit this gradient" +msgstr "Modyfikuje ten gradient" + +#. the instant toggle +#: ../app/tools/gimpgradientoptions.c:367 +#, c-format +msgid "Instant mode (%s)" +msgstr "Tryb natychmiastowy (%s)" + +#: ../app/tools/gimpgradientoptions.c:387 +msgid "" +"The active gradient is non-writable and cannot be edited directly. Uncheck " +"this option to edit a copy of it." +msgstr "" +"Aktywny gradient nie jest zapisywalny i nie może być modyfikowany " +"bezpośrednio. Odznaczenie tej opcji umożliwi modyfikowanie jego kopii." + +#: ../app/tools/gimpgradienttool.c:157 +msgid "Gradient Tool: Fill selected area with a color gradient" +msgstr "Gradient: wypełnia zaznaczony obszar kolorem z gradientu" + +#: ../app/tools/gimpgradienttool.c:158 +msgid "Gra_dient" +msgstr "Gra_dient" + +#: ../app/tools/gimpgradienttool.c:213 +msgid "Click-Drag to draw a gradient" +msgstr "Kliknięcie i przeciągnięcie rysuje gradient" + +#: ../app/tools/gimpgradienttool.c:264 +msgid "No gradient available for use with this tool." +msgstr "Brak dostępnych gradientów dla tego narzędzia." + +#: ../app/tools/gimpgradienttool.c:614 +msgid "Gradient: " +msgstr "Gradient: " + +#. the position labels +#: ../app/tools/gimpgradienttool-editor.c:1283 +msgid "X:" +msgstr "Poziomo:" + +#: ../app/tools/gimpgradienttool-editor.c:1289 +msgid "Y:" +msgstr "Pionowo:" + +#. the color label +#: ../app/tools/gimpgradienttool-editor.c:1342 +#: ../app/tools/gimptextoptions.c:583 +msgid "Color:" +msgstr "Kolor:" + +#: ../app/tools/gimpgradienttool-editor.c:1350 +msgid "Change Endpoint Color" +msgstr "Zmiana koloru punktu końcowego" + +#. the position label +#: ../app/tools/gimpgradienttool-editor.c:1388 +#: ../app/tools/gimpgradienttool-editor.c:1508 +#: ../app/tools/gimprectangleoptions.c:1031 +msgid "Position:" +msgstr "Położenie:" + +#. the color labels +#: ../app/tools/gimpgradienttool-editor.c:1413 +msgid "Left color:" +msgstr "Lewy kolor:" + +#: ../app/tools/gimpgradienttool-editor.c:1419 +msgid "Right color:" +msgstr "Prawy kolor:" + +#: ../app/tools/gimpgradienttool-editor.c:1446 +#: ../app/tools/gimpgradienttool-editor.c:1455 +msgid "Change Stop Color" +msgstr "Zmiana koloru przerwy" + +#: ../app/tools/gimpgradienttool-editor.c:1477 +msgid "Delete stop" +msgstr "Usuń przerwę" + +#. the type label +#: ../app/tools/gimpgradienttool-editor.c:1533 +msgid "Blending:" +msgstr "Mieszanie:" + +#. the color label +#: ../app/tools/gimpgradienttool-editor.c:1555 +msgid "Coloring:" +msgstr "Kolory:" + +#: ../app/tools/gimpgradienttool-editor.c:1589 +msgid "New stop at midpoint" +msgstr "Nowa przerwa w punkcie pośrednim" + +#: ../app/tools/gimpgradienttool-editor.c:1597 +msgid "Center midpoint" +msgstr "Wyśrodkowany punkt pośredni" + +#: ../app/tools/gimpgradienttool-editor.c:1660 +msgid "Start Endpoint" +msgstr "Pierwszy punkt końcowy" + +#: ../app/tools/gimpgradienttool-editor.c:1668 +msgid "End Endpoint" +msgstr "Ostatni punkt końcowy" + +#: ../app/tools/gimpgradienttool-editor.c:1721 +#, c-format +msgid "Stop %d" +msgstr "%d. przerwa" + +#: ../app/tools/gimpgradienttool-editor.c:1789 +#, c-format +msgid "Midpoint %d" +msgstr "%d. punkt pośredni" + +#: ../app/tools/gimpgradienttool-editor.c:2366 +#: ../app/tools/gimpgradienttool-editor.c:2375 +msgid "Gradient Step" +msgstr "Krok gradientu" + #: ../app/tools/gimpguidetool.c:274 msgid "Remove Guide" msgstr "Usuń prowadnicę" @@ -21563,7 +21772,7 @@ msgstr "_Przesunięcie" msgid "There is no path to move." msgstr "Brak ścieżki do przeniesienia." -#: ../app/tools/gimpmovetool.c:257 ../app/tools/gimptransformtool.c:1470 +#: ../app/tools/gimpmovetool.c:257 ../app/tools/gimptransformtool.c:1484 msgid "The active path's position is locked." msgstr "Położenie aktywnej ścieżki jest zablokowane." @@ -21626,8 +21835,8 @@ msgid "Show lattice" msgstr "Kratka" #: ../app/tools/gimpnpointdeformationoptions.c:230 -#: ../app/tools/gimpscaletool.c:90 ../app/tools/gimptransformoptions.c:546 -#: ../app/tools/gimptransformoptions.c:557 +#: ../app/tools/gimpscaletool.c:90 ../app/tools/gimptransformoptions.c:554 +#: ../app/tools/gimptransformoptions.c:565 msgid "Scale" msgstr "Skalowanie" @@ -21715,28 +21924,28 @@ msgstr "Opcje zanikania" msgid "Color Options" msgstr "Opcje kolorów" -#: ../app/tools/gimppaintoptions-gui.c:622 +#: ../app/tools/gimppaintoptions-gui.c:636 msgid "Link to brush default" msgstr "Wiąże z domyślną wartością pędzla" -#: ../app/tools/gimppainttool.c:157 +#: ../app/tools/gimppainttool.c:158 msgid "Click to paint" msgstr "Kliknięcie rysuje" -#: ../app/tools/gimppainttool.c:158 +#: ../app/tools/gimppainttool.c:159 msgid "Click to draw the line" msgstr "Kliknięcie rysuje linię" -#: ../app/tools/gimppainttool.c:159 +#: ../app/tools/gimppainttool.c:160 #, c-format msgid "%s to pick a color" msgstr "%s wybiera kolor" -#: ../app/tools/gimppainttool.c:272 +#: ../app/tools/gimppainttool.c:270 msgid "Cannot paint on layer groups." msgstr "Nie można narysować grup warstw." -#: ../app/tools/gimppainttool.c:688 +#: ../app/tools/gimppainttool.c:600 #, c-format msgid "%s for a straight line" msgstr "%s rysuje prostą linię" @@ -21930,7 +22139,7 @@ msgstr "Rysuje maskę zaznaczonego obszaru" msgid "Move the mouse to change threshold" msgstr "Poruszenie myszą zmieni próg" -#: ../app/tools/gimprotatetool.c:95 ../app/tools/gimptransformoptions.c:548 +#: ../app/tools/gimprotatetool.c:95 ../app/tools/gimptransformoptions.c:556 msgid "Rotate" msgstr "Obrót" @@ -22070,8 +22279,8 @@ msgstr "Kliknięcie i przeciągnięcie przemieści kopię zaznaczonych pikseli" msgid "Click to anchor the floating selection" msgstr "Kliknięcie zakotwiczy oderwane zaznaczenie" -#: ../app/tools/gimpsheartool.c:88 ../app/tools/gimptransformoptions.c:550 -#: ../app/tools/gimptransformoptions.c:559 +#: ../app/tools/gimpsheartool.c:88 ../app/tools/gimptransformoptions.c:558 +#: ../app/tools/gimptransformoptions.c:567 msgid "Shear" msgstr "Nachylenie" @@ -22325,7 +22534,7 @@ msgid "Opacity of the preview image" msgstr "Krycie obrazu podglądu" #: ../app/tools/gimptransformoptions.c:154 -#: ../app/tools/gimptransformoptions.c:468 +#: ../app/tools/gimptransformoptions.c:476 msgid "Guides" msgstr "Prowadnice" @@ -22333,107 +22542,107 @@ msgstr "Prowadnice" msgid "Size of a grid cell for variable number of composition guides" msgstr "Rozmiar komórki siatki dla zmiennej liczby prowadnic kompozycji" -#: ../app/tools/gimptransformoptions.c:491 +#: ../app/tools/gimptransformoptions.c:499 #, c-format msgid "15 degrees (%s)" msgstr "15 stopni (%s)" -#: ../app/tools/gimptransformoptions.c:498 +#: ../app/tools/gimptransformoptions.c:506 msgid "Limit rotation steps to 15 degrees" msgstr "Ograniczenie kroków obrotu do 15 stopni" -#: ../app/tools/gimptransformoptions.c:508 +#: ../app/tools/gimptransformoptions.c:516 #, c-format msgid "Keep aspect (%s)" msgstr "Stałe proporcje (%s)" -#: ../app/tools/gimptransformoptions.c:515 +#: ../app/tools/gimptransformoptions.c:523 msgid "Keep the original aspect ratio" msgstr "Utrzymywanie pierwotnych proporcji" -#: ../app/tools/gimptransformoptions.c:520 +#: ../app/tools/gimptransformoptions.c:528 #, c-format msgid "Around center (%s)" msgstr "Wokół środka (%s)" -#: ../app/tools/gimptransformoptions.c:527 +#: ../app/tools/gimptransformoptions.c:535 msgid "Scale around the center point" msgstr "Skalowanie wokół punktu środkowego" -#: ../app/tools/gimptransformoptions.c:543 +#: ../app/tools/gimptransformoptions.c:551 #, c-format msgid "Constrain (%s)" msgstr "Ograniczenie (%s)" -#: ../app/tools/gimptransformoptions.c:544 +#: ../app/tools/gimptransformoptions.c:552 msgid "Move" msgstr "Ruch" -#: ../app/tools/gimptransformoptions.c:545 +#: ../app/tools/gimptransformoptions.c:553 #, c-format msgid "Constrain movement to 45 degree angles from center (%s)" msgstr "Ograniczenie ruchu do 45 stopni od środka (%s)" -#: ../app/tools/gimptransformoptions.c:547 +#: ../app/tools/gimptransformoptions.c:555 #, c-format msgid "Maintain aspect ratio when scaling (%s)" msgstr "Utrzymywanie proporcji podczas skalowania (%s)" -#: ../app/tools/gimptransformoptions.c:549 +#: ../app/tools/gimptransformoptions.c:557 #, c-format msgid "Constrain rotation to 15 degree increments (%s)" msgstr "Ograniczenie obrotu do 15-stopniowych kroków (%s)" -#: ../app/tools/gimptransformoptions.c:551 +#: ../app/tools/gimptransformoptions.c:559 #, c-format msgid "Shear along edge direction only (%s)" msgstr "Nachylanie tylko wzdłuż kierunku krawędzi (%s)" -#: ../app/tools/gimptransformoptions.c:553 +#: ../app/tools/gimptransformoptions.c:561 #, c-format msgid "Constrain perspective handles to move along edges and diagonal (%s)" msgstr "" "Ograniczenie ruchu uchwytów perspektywy wzdłuż krawędzi i przekątnej (%s)" -#: ../app/tools/gimptransformoptions.c:556 +#: ../app/tools/gimptransformoptions.c:564 #, c-format msgid "From pivot (%s)" msgstr "Od osi (%s)" -#: ../app/tools/gimptransformoptions.c:558 +#: ../app/tools/gimptransformoptions.c:566 #, c-format msgid "Scale from pivot point (%s)" msgstr "Skalowanie od punktu osi (%s)" -#: ../app/tools/gimptransformoptions.c:560 +#: ../app/tools/gimptransformoptions.c:568 #, c-format msgid "Shear opposite edge by same amount (%s)" msgstr "Nachylanie przeciwległej krawędzi o tę samą wartość (%s)" -#: ../app/tools/gimptransformoptions.c:562 +#: ../app/tools/gimptransformoptions.c:570 #, c-format msgid "Maintain position of pivot while changing perspective (%s)" msgstr "Utrzymywanie położenia osi podczas zmieniania perspektywy (%s)" -#: ../app/tools/gimptransformoptions.c:565 +#: ../app/tools/gimptransformoptions.c:573 msgid "Pivot" msgstr "Oś" -#: ../app/tools/gimptransformoptions.c:566 +#: ../app/tools/gimptransformoptions.c:574 #, c-format msgid "Snap (%s)" msgstr "Przyciąganie (%s)" -#: ../app/tools/gimptransformoptions.c:567 +#: ../app/tools/gimptransformoptions.c:575 #, c-format msgid "Snap pivot to corners and center (%s)" msgstr "Przyciąganie osi do rogów i środka (%s)" -#: ../app/tools/gimptransformoptions.c:568 +#: ../app/tools/gimptransformoptions.c:576 msgid "Lock" msgstr "Blokowanie" -#: ../app/tools/gimptransformoptions.c:569 +#: ../app/tools/gimptransformoptions.c:577 msgid "Lock pivot position to canvas" msgstr "Blokowanie położenia osi do płótna" @@ -22454,31 +22663,31 @@ msgstr "Zaznaczenie nie przecina się z warstwą." msgid "Transform Step" msgstr "Krok przekształcenia" -#: ../app/tools/gimptransformtool.c:982 +#: ../app/tools/gimptransformtool.c:996 msgid "The current transform is invalid" msgstr "Bieżące przekształcenie jest nieprawidłowe" -#: ../app/tools/gimptransformtool.c:1430 +#: ../app/tools/gimptransformtool.c:1444 msgid "There is no layer to transform." msgstr "Brak warstwy do przekształcenia." -#: ../app/tools/gimptransformtool.c:1437 +#: ../app/tools/gimptransformtool.c:1451 msgid "The active layer's position and size are locked." msgstr "Położenie i wymiary aktywnej warstwy są zablokowane." -#: ../app/tools/gimptransformtool.c:1450 +#: ../app/tools/gimptransformtool.c:1464 msgid "There is no selection to transform." msgstr "Brak zaznaczenia do przekształcenia." -#: ../app/tools/gimptransformtool.c:1463 +#: ../app/tools/gimptransformtool.c:1477 msgid "There is no path to transform." msgstr "Brak ścieżki do przekształcenia." -#: ../app/tools/gimptransformtool.c:1468 +#: ../app/tools/gimptransformtool.c:1482 msgid "The active path's strokes are locked." msgstr "Krzywe aktywnej ścieżki są zablokowane." -#: ../app/tools/gimptransformtool.c:1472 +#: ../app/tools/gimptransformtool.c:1486 msgid "The active path has no strokes." msgstr "Aktywna ścieżka nie ma krzywych." @@ -23006,147 +23215,147 @@ msgstr "" "przyjmuje także nazwy kolorów języka CSS." #. TRANSLATORS: X for the X coordinate. -#: ../app/widgets/gimpcolorframe.c:193 +#: ../app/widgets/gimpcolorframe.c:201 msgctxt "Coordinates" msgid "X:" msgstr "X:" #. TRANSLATORS: Y for the Y coordinate. -#: ../app/widgets/gimpcolorframe.c:207 +#: ../app/widgets/gimpcolorframe.c:215 msgctxt "Coordinates" msgid "Y:" msgstr "Y:" #. TRANSLATORS: n/a for Not Available. -#: ../app/widgets/gimpcolorframe.c:637 ../app/widgets/gimpcolorframe.c:639 +#: ../app/widgets/gimpcolorframe.c:674 ../app/widgets/gimpcolorframe.c:676 msgctxt "Coordinates" msgid "n/a" msgstr "Niedostępne" #. TRANSLATORS: V for Value (grayscale) -#: ../app/widgets/gimpcolorframe.c:712 +#: ../app/widgets/gimpcolorframe.c:749 msgctxt "Grayscale" msgid "V:" msgstr "W:" #. TRANSLATORS: A for Alpha (color transparency) -#: ../app/widgets/gimpcolorframe.c:716 ../app/widgets/gimpcolorframe.c:729 -#: ../app/widgets/gimpcolorframe.c:765 ../app/widgets/gimpcolorframe.c:807 -#: ../app/widgets/gimpcolorframe.c:835 ../app/widgets/gimpcolorframe.c:867 -#: ../app/widgets/gimpcolorframe.c:901 +#: ../app/widgets/gimpcolorframe.c:753 ../app/widgets/gimpcolorframe.c:766 +#: ../app/widgets/gimpcolorframe.c:802 ../app/widgets/gimpcolorframe.c:844 +#: ../app/widgets/gimpcolorframe.c:872 ../app/widgets/gimpcolorframe.c:904 +#: ../app/widgets/gimpcolorframe.c:938 msgctxt "Alpha channel" msgid "A:" msgstr "A:" #. TRANSLATORS: R for Red (RGB) -#: ../app/widgets/gimpcolorframe.c:721 ../app/widgets/gimpcolorframe.c:757 +#: ../app/widgets/gimpcolorframe.c:758 ../app/widgets/gimpcolorframe.c:794 msgctxt "RGB" msgid "R:" msgstr "R:" #. TRANSLATORS: G for Green (RGB) -#: ../app/widgets/gimpcolorframe.c:723 ../app/widgets/gimpcolorframe.c:759 +#: ../app/widgets/gimpcolorframe.c:760 ../app/widgets/gimpcolorframe.c:796 msgctxt "RGB" msgid "G:" msgstr "G:" #. TRANSLATORS: B for Blue (RGB) -#: ../app/widgets/gimpcolorframe.c:725 ../app/widgets/gimpcolorframe.c:761 +#: ../app/widgets/gimpcolorframe.c:762 ../app/widgets/gimpcolorframe.c:798 msgctxt "RGB" msgid "B:" msgstr "B:" #. TRANSLATORS: Index of the color in the palette. -#: ../app/widgets/gimpcolorframe.c:734 +#: ../app/widgets/gimpcolorframe.c:771 msgctxt "Indexed color" msgid "Index:" msgstr "Indeks:" #. TRANSLATORS: Hex for Hexadecimal (representation of a color) -#: ../app/widgets/gimpcolorframe.c:768 +#: ../app/widgets/gimpcolorframe.c:805 msgctxt "Color representation" msgid "Hex:" msgstr "Szesnastkowo:" #. TRANSLATORS: H for Hue (HSV color space) -#: ../app/widgets/gimpcolorframe.c:799 +#: ../app/widgets/gimpcolorframe.c:836 msgctxt "HSV color space" msgid "H:" msgstr "H:" #. TRANSLATORS: S for Saturation (HSV color space) -#: ../app/widgets/gimpcolorframe.c:801 +#: ../app/widgets/gimpcolorframe.c:838 msgctxt "HSV color space" msgid "S:" msgstr "S:" #. TRANSLATORS: V for Value (HSV color space) -#: ../app/widgets/gimpcolorframe.c:803 +#: ../app/widgets/gimpcolorframe.c:840 msgctxt "HSV color space" msgid "V:" msgstr "V:" #. TRANSLATORS: L for Lightness (LCH color space) -#: ../app/widgets/gimpcolorframe.c:827 +#: ../app/widgets/gimpcolorframe.c:864 msgctxt "LCH color space" msgid "L*:" msgstr "L*:" #. TRANSLATORS: C for Chroma (LCH color space) -#: ../app/widgets/gimpcolorframe.c:829 +#: ../app/widgets/gimpcolorframe.c:866 msgctxt "LCH color space" msgid "C*:" msgstr "C*:" #. TRANSLATORS: H for Hue angle (LCH color space) -#: ../app/widgets/gimpcolorframe.c:831 +#: ../app/widgets/gimpcolorframe.c:868 msgctxt "LCH color space" msgid "h°:" msgstr "h°:" #. TRANSLATORS: L* for Lightness (Lab color space) -#: ../app/widgets/gimpcolorframe.c:859 +#: ../app/widgets/gimpcolorframe.c:896 msgctxt "Lab color space" msgid "L*:" msgstr "L*:" #. TRANSLATORS: a* color channel in Lab color space -#: ../app/widgets/gimpcolorframe.c:861 +#: ../app/widgets/gimpcolorframe.c:898 msgctxt "Lab color space" msgid "a*:" msgstr "a*:" #. TRANSLATORS: b* color channel in Lab color space -#: ../app/widgets/gimpcolorframe.c:863 +#: ../app/widgets/gimpcolorframe.c:900 msgctxt "Lab color space" msgid "b*:" msgstr "b*:" #. TRANSLATORS: C for Cyan (CMYK) -#: ../app/widgets/gimpcolorframe.c:891 +#: ../app/widgets/gimpcolorframe.c:928 msgctxt "CMYK" msgid "C:" msgstr "C:" #. TRANSLATORS: M for Magenta (CMYK) -#: ../app/widgets/gimpcolorframe.c:893 +#: ../app/widgets/gimpcolorframe.c:930 msgctxt "CMYK" msgid "M:" msgstr "M:" #. TRANSLATORS: Y for Yellow (CMYK) -#: ../app/widgets/gimpcolorframe.c:895 +#: ../app/widgets/gimpcolorframe.c:932 msgctxt "CMYK" msgid "Y:" msgstr "Y:" #. TRANSLATORS: K for Key/black (CMYK) -#: ../app/widgets/gimpcolorframe.c:897 +#: ../app/widgets/gimpcolorframe.c:934 msgctxt "CMYK" msgid "K:" msgstr "K:" -#: ../app/widgets/gimpcolorframe.c:959 +#: ../app/widgets/gimpcolorframe.c:996 msgctxt "Color value" msgid "n/a" msgstr "Niedostępne" @@ -23649,142 +23858,160 @@ msgstr "Wystąpiło kilka krytycznych błędów programu GIMP." msgid "_Restart GIMP" msgstr "_Uruchom program GIMP ponownie" -#: ../app/widgets/gimpdashboard.c:332 ../app/widgets/gimpdashboard.c:384 +#: ../app/widgets/gimpdashboard.c:346 ../app/widgets/gimpdashboard.c:398 msgctxt "dashboard-variable" msgid "Occupied" msgstr "Zajęte" -#: ../app/widgets/gimpdashboard.c:333 +#: ../app/widgets/gimpdashboard.c:347 msgid "Tile cache occupied size" msgstr "Rozmiar zajętej pamięci podręcznej kafli" -#: ../app/widgets/gimpdashboard.c:342 +#: ../app/widgets/gimpdashboard.c:356 msgctxt "dashboard-variable" msgid "Maximum" msgstr "Maksymalnie" -#: ../app/widgets/gimpdashboard.c:343 +#: ../app/widgets/gimpdashboard.c:357 msgid "Maximal tile cache occupied size" msgstr "Maksymalny rozmiar zajętej pamięci podręcznej kafli" -#: ../app/widgets/gimpdashboard.c:352 ../app/widgets/gimpdashboard.c:404 +#: ../app/widgets/gimpdashboard.c:366 ../app/widgets/gimpdashboard.c:418 msgctxt "dashboard-variable" msgid "Limit" msgstr "Ograniczenie" -#: ../app/widgets/gimpdashboard.c:353 +#: ../app/widgets/gimpdashboard.c:367 msgid "Tile cache size limit" msgstr "Ograniczenie rozmiaru pamięci podręcznej kafli" -#: ../app/widgets/gimpdashboard.c:361 +#: ../app/widgets/gimpdashboard.c:375 msgctxt "dashboard-variable" msgid "Compression" msgstr "Kompresja" -#: ../app/widgets/gimpdashboard.c:362 +#: ../app/widgets/gimpdashboard.c:376 msgid "Tile cache compression ratio" msgstr "Współczynnik kompresji pamięci podręcznej kafli" -#: ../app/widgets/gimpdashboard.c:371 +#: ../app/widgets/gimpdashboard.c:385 msgctxt "dashboard-variable" msgid "Hit/Miss" msgstr "Trafienia/pudła" -#: ../app/widgets/gimpdashboard.c:372 +#: ../app/widgets/gimpdashboard.c:386 msgid "Tile cache hit/miss ratio" msgstr "Proporcja trafień do pudeł pamięci podręcznej kafli" -#: ../app/widgets/gimpdashboard.c:385 +#: ../app/widgets/gimpdashboard.c:399 msgid "Swap file occupied size" msgstr "Rozmiar zajętego pliku wymiany" -#: ../app/widgets/gimpdashboard.c:394 +#: ../app/widgets/gimpdashboard.c:408 msgctxt "dashboard-variable" msgid "Size" msgstr "Rozmiar" -#: ../app/widgets/gimpdashboard.c:395 +#: ../app/widgets/gimpdashboard.c:409 msgid "Swap file size" msgstr "Rozmiar pliku wymiany" -#: ../app/widgets/gimpdashboard.c:405 +#: ../app/widgets/gimpdashboard.c:419 msgid "Swap file size limit" msgstr "Ograniczenie rozmiaru pliku wymiany" -#: ../app/widgets/gimpdashboard.c:412 +#: ../app/widgets/gimpdashboard.c:426 msgctxt "dashboard-variable" msgid "Busy" msgstr "Zajęte" -#: ../app/widgets/gimpdashboard.c:413 +#: ../app/widgets/gimpdashboard.c:427 msgid "Whether there is work queued for the swap file" msgstr "Czy coś jest w kolejce pliku wymiany" -#: ../app/widgets/gimpdashboard.c:426 +#: ../app/widgets/gimpdashboard.c:440 msgctxt "dashboard-variable" msgid "Usage" msgstr "Użycie" -#: ../app/widgets/gimpdashboard.c:427 +#: ../app/widgets/gimpdashboard.c:441 msgid "Total CPU usage" msgstr "Całkowite użycie procesora" -#: ../app/widgets/gimpdashboard.c:435 ../app/widgets/gimpdashboard.c:445 +#: ../app/widgets/gimpdashboard.c:449 ../app/widgets/gimpdashboard.c:459 msgctxt "dashboard-variable" msgid "Active" msgstr "Aktywny" -#: ../app/widgets/gimpdashboard.c:436 +#: ../app/widgets/gimpdashboard.c:450 msgid "Whether the CPU is active" msgstr "Czy procesor jest aktywny" -#: ../app/widgets/gimpdashboard.c:446 +#: ../app/widgets/gimpdashboard.c:460 msgid "Total amount of time the CPU has been active" msgstr "Całkowity czas, przez jaki procesor był aktywny" -#: ../app/widgets/gimpdashboard.c:460 +#: ../app/widgets/gimpdashboard.c:473 +msgctxt "dashboard-variable" +msgid "Mipmapped" +msgstr "Mipmapowane" + +#: ../app/widgets/gimpdashboard.c:474 +msgid "Total size of processed mipmapped data" +msgstr "Całkowity rozmiar przetworzonych mipmapowanych danych" + +#: ../app/widgets/gimpdashboard.c:486 msgctxt "dashboard-group" msgid "Cache" msgstr "Pamięć podręczna" -#: ../app/widgets/gimpdashboard.c:461 +#: ../app/widgets/gimpdashboard.c:487 msgid "In-memory tile cache" msgstr "Pamięć podręczna kafli w pamięci" -#: ../app/widgets/gimpdashboard.c:496 +#: ../app/widgets/gimpdashboard.c:523 msgctxt "dashboard-group" msgid "Swap" msgstr "Pamięć wymiany" -#: ../app/widgets/gimpdashboard.c:497 +#: ../app/widgets/gimpdashboard.c:524 msgid "On-disk tile swap" msgstr "Pamięć wymiany kafli na dysku" -#: ../app/widgets/gimpdashboard.c:525 +#: ../app/widgets/gimpdashboard.c:553 msgctxt "dashboard-group" msgid "CPU" msgstr "Procesor" -#: ../app/widgets/gimpdashboard.c:526 +#: ../app/widgets/gimpdashboard.c:554 msgid "CPU usage" msgstr "Użycie procesora" -#: ../app/widgets/gimpdashboard.c:698 +#: ../app/widgets/gimpdashboard.c:583 +msgctxt "dashboard-group" +msgid "Misc" +msgstr "Różne" + +#: ../app/widgets/gimpdashboard.c:584 +msgid "Miscellaneous information" +msgstr "Różne informacje" + +#: ../app/widgets/gimpdashboard.c:744 msgid "Select fields" msgstr "Zaznacz pola" #. Tranlators: "N/A" is an abbreviation for "not available" -#: ../app/widgets/gimpdashboard.c:2162 +#: ../app/widgets/gimpdashboard.c:2323 msgctxt "dashboard-value" msgid "N/A" msgstr "Niedostępne" -#: ../app/widgets/gimpdashboard.c:2171 +#: ../app/widgets/gimpdashboard.c:2332 msgctxt "dashboard-value" msgid "Yes" msgstr "Tak" -#: ../app/widgets/gimpdashboard.c:2172 +#: ../app/widgets/gimpdashboard.c:2333 msgctxt "dashboard-value" msgid "No" msgstr "Nie" @@ -24049,84 +24276,84 @@ msgstr "Wypełnienie kolorem" msgid "_Antialiasing" msgstr "_Wygładzanie" -#: ../app/widgets/gimpgradienteditor.c:754 +#: ../app/widgets/gimpgradienteditor.c:756 #, c-format msgid "Zoom factor: %d:1" msgstr "Współczynnik powiększenia: %d∶1" -#: ../app/widgets/gimpgradienteditor.c:757 +#: ../app/widgets/gimpgradienteditor.c:759 #, c-format msgid "Displaying [%0.4f, %0.4f]" msgstr "Wyświetlanie [%0.4f, %0.4f]" -#: ../app/widgets/gimpgradienteditor.c:957 +#: ../app/widgets/gimpgradienteditor.c:959 #, c-format msgid "Position: %0.4f" msgstr "Położenie: %0.4f" -#: ../app/widgets/gimpgradienteditor.c:958 +#: ../app/widgets/gimpgradienteditor.c:960 #, c-format msgid "RGB (%0.3f, %0.3f, %0.3f)" msgstr "RGB (%0.3f, %0.3f, %0.3f)" -#: ../app/widgets/gimpgradienteditor.c:960 +#: ../app/widgets/gimpgradienteditor.c:962 #, c-format msgid "HSV (%0.1f, %0.1f, %0.1f)" msgstr "HSV (%0.1f, %0.1f, %0.1f)" -#: ../app/widgets/gimpgradienteditor.c:962 +#: ../app/widgets/gimpgradienteditor.c:964 #, c-format msgid "Luminance: %0.1f Opacity: %0.1f" msgstr "Luminancja: %0.1f Krycie: %0.1f" -#: ../app/widgets/gimpgradienteditor.c:994 +#: ../app/widgets/gimpgradienteditor.c:996 #, c-format msgid "RGB (%d, %d, %d)" msgstr "RGB (%d, %d, %d)" -#: ../app/widgets/gimpgradienteditor.c:1005 +#: ../app/widgets/gimpgradienteditor.c:1007 msgid "Foreground color set to:" msgstr "Kolor pierwszoplanowy ustawiony na:" -#: ../app/widgets/gimpgradienteditor.c:1012 +#: ../app/widgets/gimpgradienteditor.c:1014 msgid "Background color set to:" msgstr "Kolor tła ustawiony na:" -#: ../app/widgets/gimpgradienteditor.c:1240 -#: ../app/widgets/gimpgradienteditor.c:1301 +#: ../app/widgets/gimpgradienteditor.c:1242 +#: ../app/widgets/gimpgradienteditor.c:1303 #, c-format msgid "%s-Drag: move & compress" msgstr "%s-przeciągnięcie: przesuwa ze ścieśnieniem" -#: ../app/widgets/gimpgradienteditor.c:1245 +#: ../app/widgets/gimpgradienteditor.c:1247 msgid "Drag: move" msgstr "Przeciągnięcie: przesuwa" -#: ../app/widgets/gimpgradienteditor.c:1252 -#: ../app/widgets/gimpgradienteditor.c:1265 -#: ../app/widgets/gimpgradienteditor.c:1278 -#: ../app/widgets/gimpgradienteditor.c:1299 +#: ../app/widgets/gimpgradienteditor.c:1254 +#: ../app/widgets/gimpgradienteditor.c:1267 +#: ../app/widgets/gimpgradienteditor.c:1280 +#: ../app/widgets/gimpgradienteditor.c:1301 #, c-format msgid "%s-Click: extend selection" msgstr "%s-kliknięcie: poszerza zaznaczenie" -#: ../app/widgets/gimpgradienteditor.c:1257 -#: ../app/widgets/gimpgradienteditor.c:1270 +#: ../app/widgets/gimpgradienteditor.c:1259 +#: ../app/widgets/gimpgradienteditor.c:1272 msgid "Click: select" msgstr "Kliknięcie: zaznacza" -#: ../app/widgets/gimpgradienteditor.c:1283 -#: ../app/widgets/gimpgradienteditor.c:1305 +#: ../app/widgets/gimpgradienteditor.c:1285 +#: ../app/widgets/gimpgradienteditor.c:1307 msgid "Click: select Drag: move" msgstr "Kliknięcie: zaznacza Przeciągnięcie: przesuwa" -#: ../app/widgets/gimpgradienteditor.c:1520 -#: ../app/widgets/gimpgradienteditor.c:1528 +#: ../app/widgets/gimpgradienteditor.c:1522 +#: ../app/widgets/gimpgradienteditor.c:1530 #, c-format msgid "Handle position: %0.4f" msgstr "Położenie uchwytu: %0.4f" -#: ../app/widgets/gimpgradienteditor.c:1545 +#: ../app/widgets/gimpgradienteditor.c:1547 #, c-format msgid "Distance: %0.4f" msgstr "Odległość: %0.4f" @@ -24860,31 +25087,31 @@ msgstr "Blokuje krzywe ścieżki" msgid "Lock path position" msgstr "Blokuje położenie ścieżki" -#: ../app/widgets/gimpviewablebox.c:91 +#: ../app/widgets/gimpviewablebox.c:94 msgid "Open the brush selection dialog" msgstr "Otwiera okno wyboru pędzla" -#: ../app/widgets/gimpviewablebox.c:159 +#: ../app/widgets/gimpviewablebox.c:162 msgid "Open the dynamics selection dialog" msgstr "Otwiera okno wyboru dynamiki" -#: ../app/widgets/gimpviewablebox.c:226 +#: ../app/widgets/gimpviewablebox.c:229 msgid "Open the MyPaint brush selection dialog" msgstr "Otwiera okno wyboru pędzla programu MyPaint" -#: ../app/widgets/gimpviewablebox.c:289 +#: ../app/widgets/gimpviewablebox.c:292 msgid "Open the pattern selection dialog" msgstr "Otwiera okno wyboru desenia" -#: ../app/widgets/gimpviewablebox.c:358 +#: ../app/widgets/gimpviewablebox.c:362 msgid "Open the gradient selection dialog" msgstr "Otwiera okno wyboru gradientu" -#: ../app/widgets/gimpviewablebox.c:476 +#: ../app/widgets/gimpviewablebox.c:501 msgid "Open the palette selection dialog" msgstr "Otwarcie okna wyboru palety" -#: ../app/widgets/gimpviewablebox.c:542 +#: ../app/widgets/gimpviewablebox.c:567 msgid "Open the font selection dialog" msgstr "Otwiera okno wyboru czcionki" @@ -25096,7 +25323,7 @@ msgstr "Błąd podczas zapisywania „%s”: " msgid "Error creating '%s': " msgstr "Błąd podczas tworzenia „%s”: " -#: ../app/xcf/xcf-load.c:305 +#: ../app/xcf/xcf-load.c:342 #, c-format msgid "" "Corrupt 'exif-data' parasite discovered.\n" @@ -25105,7 +25332,7 @@ msgstr "" "Wykryto uszkodzone dane pasożytnicze „exif-data”.\n" "Nie można migrować danych Exif: %s" -#: ../app/xcf/xcf-load.c:342 +#: ../app/xcf/xcf-load.c:379 msgid "" "Corrupt 'gimp-metadata' parasite discovered.\n" "XMP data could not be migrated." @@ -25113,7 +25340,7 @@ msgstr "" "Wykryto uszkodzone dane pasożytnicze „gimp-metadata”.\n" "Nie można migrować danych XMP." -#: ../app/xcf/xcf-load.c:362 +#: ../app/xcf/xcf-load.c:399 #, c-format msgid "" "Corrupt 'gimp-metadata' parasite discovered.\n" @@ -25122,7 +25349,7 @@ msgstr "" "Wykryto uszkodzone dane pasożytnicze „gimp-metadata”.\n" "Nie można migrować danych XMP: %s" -#: ../app/xcf/xcf-load.c:549 +#: ../app/xcf/xcf-load.c:586 msgid "" "This XCF file is corrupt! I have loaded as much of it as I can, but it is " "incomplete." @@ -25130,14 +25357,14 @@ msgstr "" "Ten plik XCF jest uszkodzony. Tylko część pliku została wczytana, dlatego " "jest niekompletny." -#: ../app/xcf/xcf-load.c:560 +#: ../app/xcf/xcf-load.c:597 msgid "" "This XCF file is corrupt! I could not even salvage any partial image data " "from it." msgstr "" "Ten plik XCF jest uszkodzony. Nie można było wczytać nawet części pliku." -#: ../app/xcf/xcf-load.c:652 +#: ../app/xcf/xcf-load.c:689 msgid "" "XCF warning: version 0 of XCF file format\n" "did not save indexed colormaps correctly.\n" diff --git a/po/ru.po b/po/ru.po index 9f5a7da39c..2510e97903 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,18 +1,17 @@ -# translation of gimp.po to Russian +# Translation of GIMP to Russian # Copyright (C) 1999-2002,2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. # # Valek Filippov , 1999-2002. # Anatoly A. Yakushin , 2003, 2004. # Roxana Kolosova , 2003-2006. -# Александр Прокудин , 2005, 2006, 2007, 2009, 2010, 2011, 2012. -# Alexandre Prokoudine , 2015, 2016, 2017, 2018. +# Alexandre Prokoudine , 2005-2018, 2018. # msgid "" msgstr "" -"Project-Id-Version: GIMP 2.10rc1\n" +"Project-Id-Version: GIMP 2.10rc2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-25 17:53+0300\n" -"PO-Revision-Date: 2018-03-25 23:27+0300\n" +"POT-Creation-Date: 2018-04-15 03:10+0300\n" +"PO-Revision-Date: 2018-04-15 17:34+0300\n" "Last-Translator: Alexandre Prokoudine \n" "Language-Team: русский <>\n" "Language: ru\n" @@ -66,111 +65,236 @@ msgstr "Редактирование фотографий в GIMP" #: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:8 msgid "" +"First release of the 2.10 series which prominently features the port to a " +"new image processing engine, GEGL. The most outstanding changes are:" +msgstr "" +"Главным новшеством первой версии GIMP в серии 2.10 стал порт на GEGL, новый " +"движок обработки графики. Основные изменения таковы:" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:9 +msgid "High bit depth color processing (16/32-bit per color channel)" +msgstr "Обработка с высокой разрядностью (16/32 бит на цветовой канал)" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:10 +msgid "" +"Color management is a core feature now, most widgets and preview areas are " +"color-managed" +msgstr "" +"Управление цветом стало полноправной возможностью программы, большинство " +"виджетов и областей предпросмотра теперь цветоуправляемы" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:11 +msgid "" +"On-canvas effect preview, with split view for before/after processing pixels" +msgstr "" +"Предпросмотр эффектов прямо на холсте, с раздельным просмотром пикселей до и " +"после обработки" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:12 +msgid "" +"Multi-threaded and hardware-accelerated rendering, processing and painting" +msgstr "Многопоточная и аппаратно-ускоренные отрисовка, обработка и рисование" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:13 +msgid "Most tools improved, several new transformation tools" +msgstr "" +"Улучшения в уже существовавших инструментах и несколько новых инструментов " +"трансформации" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:14 +msgid "" +"Improved support for many image formats, in particular better PSD importing" +msgstr "" +"Улучшена поддержка многих форматов файлов, в частности, усовершенствован " +"импорт PSD" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:15 +msgid "Newly supported image formats: OpenEXR, RGBE, WebP, HGT…" +msgstr "Добавлена поддержка новых форматов файлов: OpenEXR, RGBE, WebP, HGT…" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:16 +msgid "" +"Improved digital painting: canvas rotation and flipping, symmetry painting, " +"MyPaint brushes…" +msgstr "" +"Улучшен инструментарий для художников: появилось вращение и зеркалирование " +"холста, добавлена кисть MyPaint…" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:17 +msgid "Metadata viewing and editing for Exif, XMP, IPTC, and DICOM" +msgstr "" +"Появились средства просмотра и редактирования метаданных Exif, XMP, IPTC и " +"DICOM" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:18 +msgid "Basic HiDPI support: automatically or user-selected icon size" +msgstr "" +"Базовая поддержка HiDPI: автоматический или пользовательский выбор размеров " +"значков" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:19 +msgid "New themes for GIMP: Light, Gray, Dark, and System" +msgstr "Новые темы интерфейса для GIMP: светлая, серая, тёмная и системная" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:20 +msgid "And much, much more…" +msgstr "И многое, многое другое…" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:21 +msgid "" +"In this second release candidate before GIMP 2.10.0, while debugging is " +"still a prime target, a new focus has been put on speed and optimization in " +"order to provide a smoother painting experience. Bigger changes are:" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:22 +msgid "" +"Major core optimizations for painting and display, including parallelized " +"painting code." +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:23 +msgid "Symmetries are now preserved in XCF files (saved as image parasites)." +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:24 +msgid "" +"\"Light\" and \"Dark\" themes rewritten from scratch to get rid of various " +"usability issues. \"Lighter\" and \"Darker\" themes removed." +msgstr "" +"Светлая и темная темы переписаны с нуля и теперь не содержат прежних проблем" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:25 +msgid "" +"New GimpToolGyroscope on-canvas control, currently used for the Panorama " +"Projection filter. The widget provides on-canvas interaction for 3D rotation " +"(yaw, pitch, roll)." +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:26 +msgid "" +"Plug-in debugging improved to output stack traces from plug-ins with --stack-" +"trace-mode command line option not only on receiving signals but also on " +"warnings and critical errors when \"fatal-warnings\" debug key is set." +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:27 +#, fuzzy +msgid "" +"For more information, see https://www.gimp.org/news/2018/04/14/gimp-2-10-rc2-" +"released/" +msgstr "" +"Подробности читайте здесь: https://www.gimp.org/news/2018/03/23/gimp-2-10-" +"rc1-released/" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:28 +msgid "" "GIMP 2.10.0-RC1 is the first release candidate before GIMP 2.10.0 stable " "release, with a focus on debugging and stability. Other than the many bug " "fixes, most notable improvements are:" msgstr "" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:9 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:29 msgid "New dashboard dockable to monitor GIMP resource usage" msgstr "Новая панель GIMP, показывающая расход системных ресурсов" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:10 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:30 msgid "" "New debug dialog to produce back traces and other debug data, encouraging to " "report bugs" msgstr "" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:11 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:31 msgid "Unsaved images can now be recovered after a crash" msgstr "" "Несохраненные изображения теперь могут быть восстановлены после падения" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:12 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:32 msgid "Layer masks on layer groups" msgstr "Маски на группах слоев" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:13 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:33 msgid "JPEG 2000 support improved for high bit depth and various color spaces" msgstr "" "Улучшено чтение JPEG2000: поддерживается более высокая разрядность и разные " "цветовые пространства" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:14 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:34 msgid "Screenshot and color picking improved on various platforms" msgstr "" "Улучшено создание снимков экрана и снятие цвета пипеткой на разных платформах" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:15 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:35 msgid "Metadata defaults preferences now available" -msgstr "" +msgstr "Появился выбор, сохранять или не сохранять по умолчанию метаданные" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:16 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:36 msgid "Various GUI polishing" msgstr "Различные улучшения в пользовательском интерфейсе" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:17 -#, fuzzy +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:37 msgid "" "For more information, see https://www.gimp.org/news/2018/03/23/gimp-2-10-rc1-" "released/" msgstr "" -"Подробности читайте здесь: https://www.gimp.org/news/2017/12/12/gimp-2-9-8-" -"released/" +"Подробности читайте здесь: https://www.gimp.org/news/2018/03/23/gimp-2-10-" +"rc1-released/" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:18 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:38 msgid "" "GIMP 2.9.8 introduces on-canvas gradient editing and various enhancements " "while focusing on bugfixing and stability." msgstr "" +"В GIMP 2.9.8 появилось редактирование градиентов на холсте, а также внесены " +"различные улучшения. Однако в основном разработчики все же исправляли ошибки." -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:19 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:39 msgid "On-canvas gradient editing" msgstr "Редактирование градиентов на холсте" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:20 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:40 msgid "Notification when an image is over/underexposed" msgstr "Уведомление о пере- и недоэкспонированности изображения" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:21 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:41 msgid "Better and faster color management" msgstr "Ускоренное и улучшенное управление цветом" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:22 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:42 msgid "Support for color picker and screenshots in Wayland on KDE Plasma" -msgstr "" +msgstr "Поддержка цветовой пипетки и снятия скриншотов в Wayland на KDE Plasma" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:23 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:43 msgid "Paste in place feature" msgstr "Вставка на место" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:24 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:44 msgid "Many usability improvements" msgstr "Улучшения в юзабилити" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:25 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:45 msgid "Manual can be displayed in the user's preferred language" msgstr "" "Руководство пользователя может быть показано на языке, выбранном " "пользователем" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:26 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:46 msgid "Improvements for the Wavelet Decompose filter" msgstr "Улучшения в фильтре частотного разбора" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:27 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:47 msgid "Improved compatibility with Photoshop .psd files" msgstr "Улучшенная поддержка файлов Adobe Photoshop" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:28 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:48 msgid "New support for password-protected PDF" msgstr "Поддержка файлов PDF, закрытых на пароль" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:29 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:49 msgid "New support for HGT format (Digital Elevation Model data)" msgstr "Поддержка формата HGT (данные Digital Elevation Model)" -#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:30 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:50 msgid "" "For more information, see https://www.gimp.org/news/2017/12/12/gimp-2-9-8-" "released/" @@ -255,109 +379,113 @@ msgstr "используя %s версии %s (собранной с верси msgid "%s version %s" msgstr "%s версии %s" -#: ../app/main.c:155 +#: ../app/main.c:157 msgid "Show version information and exit" msgstr "Показать номер версии и выйти" -#: ../app/main.c:160 +#: ../app/main.c:162 msgid "Show license information and exit" msgstr "Показать лицензионные условия и выйти" -#: ../app/main.c:165 +#: ../app/main.c:167 msgid "Be more verbose" msgstr "Давать более подробную информацию" -#: ../app/main.c:170 +#: ../app/main.c:172 msgid "Start a new GIMP instance" msgstr "Запустить новую копию GIMP" -#: ../app/main.c:175 +#: ../app/main.c:177 msgid "Open images as new" msgstr "Открыть изображения как новые" -#: ../app/main.c:180 +#: ../app/main.c:182 msgid "Run without a user interface" msgstr "Запустить без пользовательского интерфейса" -#: ../app/main.c:185 +#: ../app/main.c:187 msgid "Do not load brushes, gradients, patterns, ..." msgstr "Не загружать кисти, градиенты, текстуры, ..." -#: ../app/main.c:190 +#: ../app/main.c:192 msgid "Do not load any fonts" msgstr "Не загружать шрифты" -#: ../app/main.c:195 +#: ../app/main.c:197 msgid "Do not show a splash screen" msgstr "Не показывать заставку при запуске" -#: ../app/main.c:200 +#: ../app/main.c:202 msgid "Do not use shared memory between GIMP and plug-ins" msgstr "Не использовать разделяемую память между GIMP и его расширениями" -#: ../app/main.c:205 +#: ../app/main.c:207 msgid "Do not use special CPU acceleration functions" msgstr "Не использовать функции ускорения центрального процессора" -#: ../app/main.c:210 +#: ../app/main.c:212 msgid "Use an alternate sessionrc file" msgstr "Использовать альтернативный файл sessionrc" -#: ../app/main.c:215 +#: ../app/main.c:217 msgid "Use an alternate user gimprc file" msgstr "Использовать альтернативный пользовательский файл gimprc" -#: ../app/main.c:220 +#: ../app/main.c:222 msgid "Use an alternate system gimprc file" msgstr "Использовать альтернативный системный файл gimprc" -#: ../app/main.c:225 +#: ../app/main.c:227 msgid "Batch command to run (can be used multiple times)" msgstr "Команда для пакетной обработки (можно использовать неоднократно)" -#: ../app/main.c:230 +#: ../app/main.c:232 msgid "The procedure to process batch commands with" msgstr "Процедура для запуска команды пакетной обработки" -#: ../app/main.c:235 +#: ../app/main.c:237 msgid "Send messages to console instead of using a dialog" msgstr "Показывать сообщения в консоли вместо диалоговых окон" #. don't translate the mode names (off|on|warn) -#: ../app/main.c:241 +#: ../app/main.c:243 msgid "PDB compatibility mode (off|on|warn)" msgstr "Режим совместимости с PDB (off|on|warn)" #. don't translate the mode names (never|query|always) -#: ../app/main.c:247 +#: ../app/main.c:249 msgid "Debug in case of a crash (never|query|always)" msgstr "Отладка в случае падения приложения (never|query|always)" -#: ../app/main.c:252 +#: ../app/main.c:254 msgid "Enable non-fatal debugging signal handlers" msgstr "Разрешить отладку обработчиков сигналов для нефатальных сигналов" -#: ../app/main.c:257 +#: ../app/main.c:259 msgid "Make all warnings fatal" msgstr "Считать все предупреждения фатальными" -#: ../app/main.c:262 +#: ../app/main.c:264 msgid "Output a gimprc file with default settings" msgstr "Показать файл gimprc с параметрами по умолчанию" -#: ../app/main.c:278 +#: ../app/main.c:280 msgid "Output a sorted list of deprecated procedures in the PDB" msgstr "Показать отсортированный список устаревших процедур в PDB" -#: ../app/main.c:283 +#: ../app/main.c:285 msgid "Show a preferences page with experimental features" msgstr "Показать страницу с экспериментальными функциями в диалоге настройки" -#: ../app/main.c:459 +#: ../app/main.c:290 +msgid "Show an image submenu with debug actions" +msgstr "" + +#: ../app/main.c:466 msgid "[FILE|URI...]" msgstr "[ФАЙЛ|URI...]" -#: ../app/main.c:477 +#: ../app/main.c:484 msgid "" "GIMP could not initialize the graphical user interface.\n" "Make sure a proper setup for your display environment exists." @@ -365,20 +493,20 @@ msgstr "" "GIMP не смог запустить графический интерфейс пользователя.\n" "Убедитесь в правильности настроек вашего видеоадаптера." -#: ../app/main.c:496 +#: ../app/main.c:503 msgid "Another GIMP instance is already running." msgstr "Уже запущена другая копия GIMP" -#: ../app/main.c:586 +#: ../app/main.c:594 msgid "GIMP output. Type any character to close this window." msgstr "Вывод GIMP. Введите любой символ для закрытия этого окна." -#: ../app/main.c:587 +#: ../app/main.c:595 #, c-format msgid "(Type any character to close this window)\n" msgstr "(Введите любой символ для закрытия этого окна.)\n" -#: ../app/main.c:604 +#: ../app/main.c:612 msgid "GIMP output. You can minimize this window, but don't close it." msgstr "Вывод GIMP. Вы можете свернуть это окно, но не закрывайте его." @@ -417,7 +545,7 @@ msgstr "Редактор кисти" #. initialize the list of gimp brushes #: ../app/actions/actions.c:114 ../app/core/gimp-data-factories.c:317 -#: ../app/dialogs/dialogs.c:335 ../app/dialogs/preferences-dialog.c:3072 +#: ../app/dialogs/dialogs.c:335 ../app/dialogs/preferences-dialog.c:3092 msgid "Brushes" msgstr "Кисти" @@ -465,7 +593,7 @@ msgstr "Панель" #. Document History #: ../app/actions/actions.c:147 ../app/dialogs/dialogs.c:362 -#: ../app/dialogs/preferences-dialog.c:1197 +#: ../app/dialogs/preferences-dialog.c:1201 msgid "Document History" msgstr "Недавние изображения" @@ -499,7 +627,7 @@ msgid "Filters" msgstr "Фильтры" #: ../app/actions/actions.c:171 ../app/dialogs/dialogs.c:353 -#: ../app/dialogs/preferences-dialog.c:3092 +#: ../app/dialogs/preferences-dialog.c:3112 msgid "Fonts" msgstr "Шрифты" @@ -510,12 +638,12 @@ msgstr "Редактор градиентов" #. initialize the list of gimp gradients #: ../app/actions/actions.c:177 ../app/core/gimp-data-factories.c:342 -#: ../app/dialogs/dialogs.c:347 ../app/dialogs/preferences-dialog.c:3088 +#: ../app/dialogs/dialogs.c:347 ../app/dialogs/preferences-dialog.c:3108 msgid "Gradients" msgstr "Градиенты" #: ../app/actions/actions.c:180 ../app/core/gimp-data-factories.c:353 -#: ../app/dialogs/dialogs.c:359 ../app/dialogs/preferences-dialog.c:3096 +#: ../app/dialogs/dialogs.c:359 ../app/dialogs/preferences-dialog.c:3116 msgid "Tool Presets" msgstr "Профили инструментов" @@ -544,7 +672,7 @@ msgstr "Слои" #. initialize the list of mypaint brushes #: ../app/actions/actions.c:198 ../app/core/gimp-data-factories.c:327 -#: ../app/dialogs/dialogs.c:341 ../app/dialogs/preferences-dialog.c:3100 +#: ../app/dialogs/dialogs.c:341 ../app/dialogs/preferences-dialog.c:3120 msgid "MyPaint Brushes" msgstr "Кисти MyPaint" @@ -555,23 +683,23 @@ msgstr "Редактор палитры образцов" #. initialize the list of gimp palettes #: ../app/actions/actions.c:204 ../app/core/gimp-data-factories.c:337 -#: ../app/dialogs/dialogs.c:350 ../app/dialogs/preferences-dialog.c:3084 +#: ../app/dialogs/dialogs.c:350 ../app/dialogs/preferences-dialog.c:3104 msgid "Palettes" msgstr "Палитры образцов" #. initialize the list of gimp patterns #: ../app/actions/actions.c:207 ../app/core/gimp-data-factories.c:332 -#: ../app/dialogs/dialogs.c:344 ../app/dialogs/preferences-dialog.c:3080 +#: ../app/dialogs/dialogs.c:344 ../app/dialogs/preferences-dialog.c:3100 msgid "Patterns" msgstr "Текстуры" -#: ../app/actions/actions.c:210 ../app/dialogs/preferences-dialog.c:3104 +#: ../app/actions/actions.c:210 ../app/dialogs/preferences-dialog.c:3124 msgid "Plug-ins" msgstr "Плагины" #. Quick Mask Color #: ../app/actions/actions.c:213 ../app/core/gimpchannel.c:383 -#: ../app/dialogs/preferences-dialog.c:1680 +#: ../app/dialogs/preferences-dialog.c:1684 msgid "Quick Mask" msgstr "Быстрая маска" @@ -584,7 +712,7 @@ msgid "Select" msgstr "Выделение" #. initialize the template list -#: ../app/actions/actions.c:222 ../app/core/gimp.c:795 +#: ../app/actions/actions.c:222 ../app/core/gimp.c:797 #: ../app/dialogs/dialogs.c:365 msgid "Templates" msgstr "Шаблоны" @@ -2447,82 +2575,87 @@ msgstr "Меню монитора ресурсов" #: ../app/actions/dashboard-actions.c:44 msgctxt "dashboard-action" +msgid "Groups" +msgstr "Группы" + +#: ../app/actions/dashboard-actions.c:46 +msgctxt "dashboard-action" msgid "Update Interval" msgstr "Интервал обновления" -#: ../app/actions/dashboard-actions.c:46 +#: ../app/actions/dashboard-actions.c:48 msgctxt "dashboard-action" msgid "History Duration" msgstr "Длительность истории" -#: ../app/actions/dashboard-actions.c:49 +#: ../app/actions/dashboard-actions.c:51 msgctxt "dashboard-action" msgid "Reset" msgstr "Сбросить" -#: ../app/actions/dashboard-actions.c:50 +#: ../app/actions/dashboard-actions.c:52 msgctxt "dashboard-action" msgid "Reset cumulative data" msgstr "Сбросить накопленные данные" -#: ../app/actions/dashboard-actions.c:58 +#: ../app/actions/dashboard-actions.c:60 msgctxt "dashboard-action" msgid "Low Swap Space Warning" msgstr "Предупреждать о нехватке ресурсов" -#: ../app/actions/dashboard-actions.c:59 +#: ../app/actions/dashboard-actions.c:61 msgctxt "dashboard-action" msgid "Raise the dashboard when the swap size approaches its limit" msgstr "" "Открыть панель монитора ресурсов, когда выделенное для подкачки пространство " "начинает заканчиваться" -#: ../app/actions/dashboard-actions.c:69 +#: ../app/actions/dashboard-actions.c:71 msgctxt "dashboard-update-interval" msgid "0.25 Seconds" msgstr "0,25 секунды" -#: ../app/actions/dashboard-actions.c:74 +#: ../app/actions/dashboard-actions.c:76 msgctxt "dashboard-update-interval" msgid "0.5 Seconds" msgstr "0,5 секунды" -#: ../app/actions/dashboard-actions.c:79 +#: ../app/actions/dashboard-actions.c:81 msgctxt "dashboard-update-interval" msgid "1 Second" msgstr "1 секунда" -#: ../app/actions/dashboard-actions.c:84 +#: ../app/actions/dashboard-actions.c:86 msgctxt "dashboard-update-interval" msgid "2 Seconds" msgstr "2 секунды" -#: ../app/actions/dashboard-actions.c:89 +#: ../app/actions/dashboard-actions.c:91 msgctxt "dashboard-update-interval" msgid "4 Seconds" msgstr "4 секунды" -#: ../app/actions/dashboard-actions.c:97 +#: ../app/actions/dashboard-actions.c:99 msgctxt "dashboard-history-duration" msgid "15 Seconds" msgstr "15 секунд" -#: ../app/actions/dashboard-actions.c:102 +#: ../app/actions/dashboard-actions.c:104 msgctxt "dashboard-history-duration" msgid "30 Seconds" msgstr "30 секунд" -#: ../app/actions/dashboard-actions.c:107 +#: ../app/actions/dashboard-actions.c:109 msgctxt "dashboard-history-duration" msgid "60 Seconds" msgstr "60 секунд" -#: ../app/actions/dashboard-actions.c:112 +#: ../app/actions/dashboard-actions.c:114 msgctxt "dashboard-history-duration" msgid "120 Seconds" msgstr "120 секунд" -#: ../app/actions/dashboard-actions.c:117 +#: ../app/actions/dashboard-actions.c:119 msgctxt "dashboard-history-duration" msgid "240 Seconds" msgstr "240 секунд" @@ -2530,8 +2663,8 @@ msgstr "240 секунд" #: ../app/actions/data-commands.c:90 ../app/actions/documents-commands.c:383 #: ../app/actions/file-commands.c:205 ../app/dialogs/file-open-dialog.c:212 #: ../app/dialogs/file-open-dialog.c:253 -#: ../app/dialogs/file-open-location-dialog.c:218 -#: ../app/dialogs/file-open-location-dialog.c:228 +#: ../app/dialogs/file-open-location-dialog.c:223 +#: ../app/dialogs/file-open-location-dialog.c:239 #: ../app/display/gimpdisplayshell-dnd.c:614 #: ../app/widgets/gimplayertreeview.c:765 ../app/widgets/gimptoolbox.c:805 #: ../app/widgets/gimptoolbox-dnd.c:170 @@ -2546,8 +2679,8 @@ msgstr "" "%s" #: ../app/actions/data-commands.c:114 ../app/actions/tool-options-commands.c:74 -#: ../app/core/gimpbrushgenerated-load.c:120 ../app/core/gimpimage.c:1964 -#: ../app/core/gimppalette.c:461 ../app/core/gimppalette-import.c:211 +#: ../app/core/gimpbrushgenerated-load.c:120 ../app/core/gimpimage.c:1971 +#: ../app/core/gimppalette.c:461 ../app/core/gimppalette-import.c:213 #: ../app/core/gimppalette-load.c:186 #: ../app/dialogs/palette-import-dialog.c:778 ../app/widgets/gimpdnd-xds.c:89 msgid "Untitled" @@ -2960,8 +3093,8 @@ msgid "Search commands by keyword, and run them" msgstr "Найти действие по ключевым словам и выполнить его" #: ../app/actions/dialogs-actions.c:357 -#: ../app/dialogs/preferences-dialog.c:2018 -#: ../app/dialogs/preferences-dialog.c:2019 ../app/widgets/gimptoolbox.c:529 +#: ../app/dialogs/preferences-dialog.c:2022 +#: ../app/dialogs/preferences-dialog.c:2023 ../app/widgets/gimptoolbox.c:529 msgid "Toolbox" msgstr "Панель инструментов" @@ -3250,7 +3383,7 @@ msgstr "Забыть открывавшиеся документы" #: ../app/actions/error-console-commands.c:96 #: ../app/actions/file-commands.c:416 #: ../app/actions/gradient-editor-commands.c:478 -#: ../app/actions/gradient-editor-commands.c:580 +#: ../app/actions/gradient-editor-commands.c:581 #: ../app/actions/gradients-commands.c:78 ../app/actions/plug-in-commands.c:180 #: ../app/actions/templates-commands.c:244 #: ../app/actions/text-editor-commands.c:64 @@ -3276,8 +3409,8 @@ msgstr "Забыть открывавшиеся документы" #: ../app/dialogs/offset-dialog.c:136 #: ../app/dialogs/palette-import-dialog.c:162 #: ../app/dialogs/preferences-dialog.c:287 -#: ../app/dialogs/preferences-dialog.c:633 -#: ../app/dialogs/preferences-dialog.c:1096 +#: ../app/dialogs/preferences-dialog.c:637 +#: ../app/dialogs/preferences-dialog.c:1100 #: ../app/dialogs/print-size-dialog.c:124 ../app/dialogs/quit-dialog.c:171 #: ../app/dialogs/resize-dialog.c:186 #: ../app/dialogs/resolution-calibrate-dialog.c:76 @@ -3289,9 +3422,9 @@ msgstr "Забыть открывавшиеся документы" #: ../app/display/gimpdisplayshell-filter-dialog.c:87 #: ../app/display/gimpdisplayshell-rotate-dialog.c:122 #: ../app/display/gimpdisplayshell-scale-dialog.c:122 -#: ../app/tools/gimpfiltertool.c:321 -#: ../app/tools/gimpforegroundselecttool.c:307 ../app/tools/gimptexttool.c:1591 -#: ../app/tools/gimptransformtool.c:1201 ../app/widgets/gimpactionview.c:669 +#: ../app/tools/gimpfiltertool.c:323 +#: ../app/tools/gimpforegroundselecttool.c:313 ../app/tools/gimptexttool.c:1591 +#: ../app/tools/gimptransformtool.c:1215 ../app/widgets/gimpactionview.c:669 #: ../app/widgets/gimpcolordialog.c:110 #: ../app/widgets/gimpcontrollereditor.c:660 #: ../app/widgets/gimpcontrollerlist.c:564 @@ -3303,7 +3436,7 @@ msgid "_Cancel" msgstr "О_тмена" #: ../app/actions/documents-commands.c:231 ../app/actions/edit-commands.c:161 -#: ../app/dialogs/preferences-dialog.c:634 +#: ../app/dialogs/preferences-dialog.c:638 msgid "Cl_ear" msgstr "О_чистить" @@ -5007,7 +5140,7 @@ msgctxt "fonts-action" msgid "Rescan the installed fonts" msgstr "Повторно просканировать установленные шрифты" -#: ../app/actions/gimpgeglprocedure.c:320 +#: ../app/actions/gimpgeglprocedure.c:323 #, c-format msgid "There are no last settings for '%s', showing the filter dialog instead." msgstr "" @@ -5335,27 +5468,27 @@ msgstr "" "Выбор числа создаваемых\n" "копий выделения." -#: ../app/actions/gradient-editor-commands.c:562 +#: ../app/actions/gradient-editor-commands.c:563 msgid "Split Segment Uniformly" msgstr "Равномерно разделить сегмент" -#: ../app/actions/gradient-editor-commands.c:563 +#: ../app/actions/gradient-editor-commands.c:564 msgid "Split Gradient Segment Uniformly" msgstr "Равномерно разделить сегмент градиента" -#: ../app/actions/gradient-editor-commands.c:567 +#: ../app/actions/gradient-editor-commands.c:568 msgid "Split Segments Uniformly" msgstr "Равномерно разделить сегменты" -#: ../app/actions/gradient-editor-commands.c:568 +#: ../app/actions/gradient-editor-commands.c:569 msgid "Split Gradient Segments Uniformly" msgstr "Равномерно разделить сегменты градиента" -#: ../app/actions/gradient-editor-commands.c:581 +#: ../app/actions/gradient-editor-commands.c:582 msgid "_Split" msgstr "_Разделить" -#: ../app/actions/gradient-editor-commands.c:603 +#: ../app/actions/gradient-editor-commands.c:604 msgid "" "Select the number of uniform parts\n" "in which to split the selected segment." @@ -5363,7 +5496,7 @@ msgstr "" "Выберите число равных частей \n" "на которые надо разделить сегмент" -#: ../app/actions/gradient-editor-commands.c:606 +#: ../app/actions/gradient-editor-commands.c:607 msgid "" "Select the number of uniform parts\n" "in which to split the segments in the selection." @@ -6005,7 +6138,7 @@ msgstr "Изменить размер изображения" #. Scaling #: ../app/actions/image-commands.c:1453 ../app/actions/layers-commands.c:1569 -#: ../app/dialogs/preferences-dialog.c:1602 +#: ../app/dialogs/preferences-dialog.c:1606 #: ../app/pdb/drawable-transform-cmds.c:800 #: ../app/pdb/drawable-transform-cmds.c:891 #: ../app/pdb/image-transform-cmds.c:122 ../app/pdb/image-transform-cmds.c:158 @@ -6545,10 +6678,9 @@ msgid "Layer Composite Mode: Union" msgstr "Режим совмещения слоёв: объединение" #: ../app/actions/layers-actions.c:395 -#, fuzzy msgctxt "layers-action" msgid "Clip to Backdrop" -msgstr "Нажмите для увеличения резкости" +msgstr "Обрезка до фона" #: ../app/actions/layers-actions.c:396 #, fuzzy @@ -6557,10 +6689,9 @@ msgid "Layer Composite Mode: Clip to Backdrop" msgstr "Режим совмещения" #: ../app/actions/layers-actions.c:401 -#, fuzzy msgctxt "layers-action" msgid "Clip to Layer" -msgstr "Отразить текстовый слой" +msgstr "Обрезка до слоя" #: ../app/actions/layers-actions.c:402 #, fuzzy @@ -7277,11 +7408,11 @@ msgstr "Сбросить параметров фильтров" #: ../app/actions/tool-options-commands.c:196 ../app/dialogs/fill-dialog.c:114 #: ../app/dialogs/grid-dialog.c:101 ../app/dialogs/image-new-dialog.c:105 #: ../app/dialogs/preferences-dialog.c:288 -#: ../app/dialogs/preferences-dialog.c:1095 +#: ../app/dialogs/preferences-dialog.c:1099 #: ../app/dialogs/print-size-dialog.c:123 ../app/dialogs/scale-dialog.c:136 #: ../app/dialogs/stroke-dialog.c:127 #: ../app/display/gimpdisplayshell-rotate-dialog.c:121 -#: ../app/tools/gimpfiltertool.c:320 ../app/tools/gimptransformtool.c:1200 +#: ../app/tools/gimpfiltertool.c:322 ../app/tools/gimptransformtool.c:1214 #: ../app/widgets/gimpcolordialog.c:109 msgid "_Reset" msgstr "С_бросить" @@ -7562,11 +7693,11 @@ msgstr "Стиль границы" msgid "When bordering, act as if selected areas continued outside the image." msgstr "" -#: ../app/actions/select-commands.c:415 +#: ../app/actions/select-commands.c:423 msgid "Fill Selection Outline" msgstr "Залить выделение" -#: ../app/actions/select-commands.c:444 +#: ../app/actions/select-commands.c:452 msgid "Stroke Selection" msgstr "Обвести выделенную область" @@ -7709,7 +7840,7 @@ msgstr "_Открыть" #: ../app/actions/text-editor-commands.c:139 #: ../app/actions/text-tool-commands.c:209 ../app/config/gimpconfig-file.c:71 -#: ../app/core/gimppalette-import.c:510 ../app/plug-in/gimpenvirontable.c:289 +#: ../app/core/gimppalette-import.c:512 ../app/plug-in/gimpenvirontable.c:289 #: ../app/plug-in/gimpinterpreterdb.c:233 #: ../app/tools/gimpfiltertool-settings.c:170 #: ../app/widgets/gimptextbuffer.c:1674 @@ -8065,7 +8196,7 @@ msgstr "Аэрограф, частота: увеличить на 10" #: ../app/actions/tools-actions.c:183 msgctxt "tools-action" msgid "Airbrush Flow: Set" -msgstr "Аэрограф" +msgstr "Аэрограф, поток: установить" #: ../app/actions/tools-actions.c:187 msgctxt "tools-action" @@ -8140,12 +8271,12 @@ msgstr "Инструмент, непрозрачность: увеличить #: ../app/actions/tools-actions.c:296 msgctxt "tools-action" msgid "Tool's Opacity: Decrease Relative" -msgstr "" +msgstr "Инструмент, непрозрачность: уменьшить относительно" #: ../app/actions/tools-actions.c:300 msgctxt "tools-action" msgid "Tool's Opacity: Increase Relative" -msgstr "" +msgstr "Инструмент, непрозрачность: увеличить относительно" #: ../app/actions/tools-actions.c:308 msgctxt "tools-action" @@ -8190,262 +8321,262 @@ msgstr "Инструмент, размер: увеличить на 10" #: ../app/actions/tools-actions.c:340 msgctxt "tools-action" msgid "Tool's Size: Decrease Relative" -msgstr "" +msgstr "Инструмент, размер: уменьшить относительно" #: ../app/actions/tools-actions.c:344 msgctxt "tools-action" msgid "Tool's Size: Increase Relative" -msgstr "" +msgstr "Инструмент, размер: увеличить относительно" #: ../app/actions/tools-actions.c:352 msgctxt "tools-action" msgid "Tool's Aspect Ratio: Set" -msgstr "Соотношение сторон кисти" +msgstr "Инструмент, соотношение сторон: установить" #: ../app/actions/tools-actions.c:356 msgctxt "tools-action" msgid "Tool's Aspect Ratio: Set To Default Value" -msgstr "_Восстановить исходные параметры инструментов" +msgstr "Инструмент, соотношение сторон: восстановить исходное значение" #: ../app/actions/tools-actions.c:360 msgctxt "tools-action" msgid "Tool's Aspect Ratio: Minimize" -msgstr "" +msgstr "Инструмент, соотношение сторон: сделать минимальным" #: ../app/actions/tools-actions.c:364 msgctxt "tools-action" msgid "Tool's Aspect Ratio: Maximize" -msgstr "" +msgstr "Инструмент, соотношение сторон: сделать максимальным" #: ../app/actions/tools-actions.c:368 msgctxt "tools-action" msgid "Tool's Aspect Ratio: Decrease by 0.1" -msgstr "" +msgstr "Инструмент, соотношение сторон: уменьшить на 0,1" #: ../app/actions/tools-actions.c:372 msgctxt "tools-action" msgid "Tool's Aspect Ratio: Increase by 0.1" -msgstr "" +msgstr "Инструмент, соотношение сторон: увеличить на 0,1" #: ../app/actions/tools-actions.c:376 msgctxt "tools-action" msgid "Tool's Aspect Ratio: Decrease by 1" -msgstr "" +msgstr "Инструмент, соотношение сторон: уменьшить на 1" #: ../app/actions/tools-actions.c:380 msgctxt "tools-action" msgid "Tool's Aspect Ratio: Increase by 1" -msgstr "" +msgstr "Инструмент, соотношение сторон: увеличить на 1" #: ../app/actions/tools-actions.c:384 msgctxt "tools-action" msgid "Tool's Aspect Ratio: Decrease Relative" -msgstr "" +msgstr "Инструмент, соотношение сторон: уменьшить относительно" #: ../app/actions/tools-actions.c:388 msgctxt "tools-action" msgid "Tool's Aspect Ratio: Increase Relative" -msgstr "" +msgstr "Инструмент, соотношение сторон: увеличить относительно" #: ../app/actions/tools-actions.c:396 msgctxt "tools-action" msgid "Tool's Angle: Set" -msgstr "" +msgstr "Инструмент, угол: установить" #: ../app/actions/tools-actions.c:400 msgctxt "tools-action" msgid "Tool's Angle: Set Angle To Default Value" -msgstr "" +msgstr "Инструмент, угол: восстановить исходное значение" #: ../app/actions/tools-actions.c:404 msgctxt "tools-action" msgid "Tool's Angle: Minimize" -msgstr "" +msgstr "Инструмент, угол: сделать минимальным" #: ../app/actions/tools-actions.c:408 msgctxt "tools-action" msgid "Tool's Angle: Maximize" -msgstr "" +msgstr "Инструмент, угол: сделать максимальным" #: ../app/actions/tools-actions.c:412 msgctxt "tools-action" msgid "Tool's Angle: Decrease by 1°" -msgstr "" +msgstr "Инструмент, угол: уменьшить на 1°" #: ../app/actions/tools-actions.c:416 msgctxt "tools-action" msgid "Tool's Angle: Increase by 1°" -msgstr "" +msgstr "Инструмент, угол: увеличить на 1°" #: ../app/actions/tools-actions.c:420 msgctxt "tools-action" msgid "Tool's Angle: Decrease by 15°" -msgstr "" +msgstr "Инструмент, угол: уменьшить на 15°" #: ../app/actions/tools-actions.c:424 msgctxt "tools-action" msgid "Tool's Angle: Increase by 15°" -msgstr "" +msgstr "Инструмент, угол: увеличить на 15°" #: ../app/actions/tools-actions.c:428 msgctxt "tools-action" msgid "Tool's Angle: Decrease Relative" -msgstr "" +msgstr "Инструмент, угол: уменьшить относительно" #: ../app/actions/tools-actions.c:432 msgctxt "tools-action" msgid "Tool's Angle: Increase Relative" -msgstr "" +msgstr "Инструмент, угол: увеличить относительно" #: ../app/actions/tools-actions.c:440 msgctxt "tools-action" msgid "Tool's Spacing: Set" -msgstr "" +msgstr "Инструмент, интервал: установить" #: ../app/actions/tools-actions.c:444 msgctxt "tools-action" msgid "Tool's Spacing: Set To Default Value" -msgstr "_Восстановить исходные параметры инструментов" +msgstr "Инструмент, интервал: восстановить исходное значение" #: ../app/actions/tools-actions.c:448 msgctxt "tools-action" msgid "Tool's Spacing: Minimize" -msgstr "" +msgstr "Инструмент, интервал: сделать минимальным" #: ../app/actions/tools-actions.c:452 msgctxt "tools-action" msgid "Tool's Spacing: Maximize" -msgstr "" +msgstr "Инструмент, интервал: сделать максимальным" #: ../app/actions/tools-actions.c:456 msgctxt "tools-action" msgid "Tool's Spacing: Decrease by 1" -msgstr "" +msgstr "Инструмент, интервал: уменьшить на 1" #: ../app/actions/tools-actions.c:460 msgctxt "tools-action" msgid "Tool's Spacing: Increase by 1" -msgstr "" +msgstr "Инструмент, интервал: увеличить на 1" #: ../app/actions/tools-actions.c:464 msgctxt "tools-action" msgid "Tool's Spacing: Decrease by 10" -msgstr "" +msgstr "Инструмент, интервал: уменьшить на 10" #: ../app/actions/tools-actions.c:468 msgctxt "tools-action" msgid "Tool's Spacing: Increase by 10" -msgstr "" +msgstr "Инструмент, интервал: увеличить на 10" #: ../app/actions/tools-actions.c:472 msgctxt "tools-action" msgid "Tool's Spacing: Decrease Relative" -msgstr "" +msgstr "Инструмент, интервал: уменьшить относительно" #: ../app/actions/tools-actions.c:476 msgctxt "tools-action" msgid "Tool's Spacing: Increase Relative" -msgstr "" +msgstr "Инструмент, интервал: увеличить относительно" #: ../app/actions/tools-actions.c:484 msgctxt "tools-action" msgid "Tool's Hardness: Set" -msgstr "Профиль инструмента" +msgstr "Инструмент, жёсткость: установить" #: ../app/actions/tools-actions.c:488 msgctxt "tools-action" msgid "Tool's Hardness: Set to Default Value" -msgstr "Восстановить значения по умолчанию" +msgstr "Инструмент, жёсткость: восстановить значение по умолчанию" #: ../app/actions/tools-actions.c:492 msgctxt "tools-action" msgid "Tool's Hardness: Minimize" -msgstr "" +msgstr "Инструмент, жёсткость: сделать минимальным" #: ../app/actions/tools-actions.c:496 msgctxt "tools-action" msgid "Tool's Hardness: Maximize" -msgstr "" +msgstr "Инструмент, жёсткость: сделать максимальным" #: ../app/actions/tools-actions.c:500 msgctxt "tools-action" msgid "Tool's Hardness: Decrease by 1" -msgstr "" +msgstr "Инструмент, жёсткость: уменьшить на 1" #: ../app/actions/tools-actions.c:504 msgctxt "tools-action" msgid "Tool's Hardness: Increase by 1" -msgstr "" +msgstr "Инструмент, жёсткость: увеличить на 1" #: ../app/actions/tools-actions.c:508 msgctxt "tools-action" msgid "Tool's Hardness: Decrease by 10" -msgstr "" +msgstr "Инструмент, жёсткость: уменьшить на 10" #: ../app/actions/tools-actions.c:512 msgctxt "tools-action" msgid "Tool's Hardness: Increase by 10" -msgstr "" +msgstr "Инструмент, жёсткость: увеличить на 10" #: ../app/actions/tools-actions.c:516 msgctxt "tools-action" msgid "Tool's Hardness: Decrease Relative" -msgstr "" +msgstr "Инструмент, жёсткость: уменьшить относительно" #: ../app/actions/tools-actions.c:520 msgctxt "tools-action" msgid "Tool's Hardness: Increase Relative" -msgstr "" +msgstr "Инструмент, жёсткость: увеличить относительно" #: ../app/actions/tools-actions.c:528 msgctxt "tools-action" msgid "Tool's Force: Set" -msgstr "Профиль инструмента" +msgstr "Инструмент, сила: установить" #: ../app/actions/tools-actions.c:532 msgctxt "tools-action" msgid "Tool's Force: Set to Default Value" -msgstr "Восстановить значения по умолчанию" +msgstr "Инструмент, сила: восстановить значение по умолчанию" #: ../app/actions/tools-actions.c:536 msgctxt "tools-action" msgid "Tool's Force: Minimize" -msgstr "" +msgstr "Инструмент, сила: сделать минимальной" #: ../app/actions/tools-actions.c:540 msgctxt "tools-action" msgid "Tool's Force: Maximize" -msgstr "" +msgstr "Инструмент, сила: сделать максимальной" #: ../app/actions/tools-actions.c:544 msgctxt "tools-action" msgid "Tool's Force: Decrease by 1" -msgstr "" +msgstr "Инструмент, сила: уменьшить на 1" #: ../app/actions/tools-actions.c:548 msgctxt "tools-action" msgid "Tool's Force: Increase by 1" -msgstr "" +msgstr "Инструмент, сила: увеличить на 1" #: ../app/actions/tools-actions.c:552 msgctxt "tools-action" msgid "Tool's Force: Decrease by 10" -msgstr "" +msgstr "Инструмент, сила: уменьшить на 10" #: ../app/actions/tools-actions.c:556 msgctxt "tools-action" msgid "Tool's Force: Increase by 10" -msgstr "" +msgstr "Инструмент, сила: увеличить на 10" #: ../app/actions/tools-actions.c:560 msgctxt "tools-action" msgid "Tool's Force: Decrease Relative" -msgstr "" +msgstr "Инструмент, сила: уменьшить относительно" #: ../app/actions/tools-actions.c:564 msgctxt "tools-action" msgid "Tool's Force: Increase Relative" -msgstr "" +msgstr "Инструмент, сила: увеличить относительно" #: ../app/actions/vectors-actions.c:46 msgctxt "vectors-action" @@ -9724,14 +9855,14 @@ msgstr "Переместить это окно на экран %s" #: ../app/dialogs/grid-dialog.c:103 ../app/dialogs/image-new-dialog.c:107 #: ../app/dialogs/image-new-dialog.c:326 #: ../app/dialogs/item-options-dialog.c:146 -#: ../app/dialogs/preferences-dialog.c:1097 +#: ../app/dialogs/preferences-dialog.c:1101 #: ../app/dialogs/print-size-dialog.c:125 #: ../app/dialogs/resolution-calibrate-dialog.c:77 #: ../app/dialogs/template-options-dialog.c:119 #: ../app/display/gimpdisplayshell-filter-dialog.c:88 #: ../app/display/gimpdisplayshell-rotate-dialog.c:123 #: ../app/display/gimpdisplayshell-scale-dialog.c:123 ../app/gui/gui.c:193 -#: ../app/tools/gimpfiltertool.c:322 ../app/widgets/gimpcolordialog.c:111 +#: ../app/tools/gimpfiltertool.c:324 ../app/widgets/gimpcolordialog.c:111 #: ../app/widgets/gimpcontrollereditor.c:661 #: ../app/widgets/gimperrordialog.c:76 ../app/widgets/gimpfiledialog.c:188 msgid "_OK" @@ -10013,7 +10144,7 @@ msgid "Error parsing '%%s': line longer than %s characters." msgstr "" #: ../app/config/gimpconfig-file.c:152 ../app/config/gimpconfig-file.c:196 -#: ../app/core/gimp-tags.c:144 ../app/gui/themes.c:361 +#: ../app/core/gimp-tags.c:144 ../app/gui/themes.c:344 #: ../app/tools/gimpfiltertool-settings.c:227 #, c-format msgid "Error writing '%s': %s" @@ -10035,7 +10166,7 @@ msgstr "" "Произошла ошибка при чтении файла '%s'. Будут использованы параметры по " "умолчанию. Резервная копия вашей конфигурации была создана в '%s'." -#: ../app/config/gimpdialogconfig.c:307 ../app/core/gimplayer.c:438 +#: ../app/config/gimpdialogconfig.c:307 ../app/core/gimplayer.c:440 msgid "Layer" msgstr "Слой" @@ -10087,9 +10218,8 @@ msgid "How to handle embedded color profiles when opening a file." msgstr "Как обрабатывать встроенные цветовые схемы при открытии файла." #: ../app/config/gimprc-blurbs.h:46 -#, fuzzy msgid "Sets the default folder path for all color profile file dialogs." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgstr "" #: ../app/config/gimprc-blurbs.h:49 msgid "Sets the type of mouse pointers to use." @@ -10167,56 +10297,60 @@ msgid "How many recent settings to keep around in filter tools." msgstr "Количество названий ранее открывавшихся файлов, отображаемых в меню." #: ../app/config/gimprc-blurbs.h:182 +msgid "Default to the last used settings in filter tools." +msgstr "Использовать в фильтрах последние параметры по умолчанию" + +#: ../app/config/gimprc-blurbs.h:185 msgid "Show advanced color options in filter tools." msgstr "" "Показывать параметры управления цветом в диалогах фильтров на основе GEGL" -#: ../app/config/gimprc-blurbs.h:185 +#: ../app/config/gimprc-blurbs.h:188 msgid "Sets the text to appear in image window status bars." msgstr "Установите форму текста, отображающегося в строке состояния" -#: ../app/config/gimprc-blurbs.h:188 +#: ../app/config/gimprc-blurbs.h:191 msgid "Sets the text to appear in image window titles." msgstr "Установите форму текста, отображающегося в заголовке окна изображения" -#: ../app/config/gimprc-blurbs.h:191 +#: ../app/config/gimprc-blurbs.h:194 msgid "" "Promote imported images to floating point precision. Does not apply to " "indexed images." msgstr "" -#: ../app/config/gimprc-blurbs.h:195 +#: ../app/config/gimprc-blurbs.h:198 msgid "" "When promoting imported images to floating point precision, also add minimal " "noise in order to distribute color values a bit." msgstr "" -#: ../app/config/gimprc-blurbs.h:199 +#: ../app/config/gimprc-blurbs.h:202 msgid "Add an alpha channel to all layers of imported images." msgstr "" "Добавлять отсутствующий альфа-канал во все слои импортируемых изображений" -#: ../app/config/gimprc-blurbs.h:202 +#: ../app/config/gimprc-blurbs.h:205 msgid "Which plug-in to use for importing raw digital camera files." msgstr "Какой плагин использовать для импорта raw-файлов цифровых фотокамер." -#: ../app/config/gimprc-blurbs.h:205 +#: ../app/config/gimprc-blurbs.h:208 msgid "Export Exif metadata by default." msgstr "Экспортировать метаданные Exif по умолчанию" -#: ../app/config/gimprc-blurbs.h:208 +#: ../app/config/gimprc-blurbs.h:211 msgid "Export XMP metadata by default." msgstr "Экспортировать метаданные XMP по умолчанию" -#: ../app/config/gimprc-blurbs.h:211 +#: ../app/config/gimprc-blurbs.h:214 msgid "Export IPTC metadata by default." msgstr "Экспортировать метаданные IPTC по умолчанию" -#: ../app/config/gimprc-blurbs.h:214 +#: ../app/config/gimprc-blurbs.h:217 msgid "Try generating debug data for bug reporting when appropriate." msgstr "Попробовать создать данные отладки для отчёта об ошибке" -#: ../app/config/gimprc-blurbs.h:217 +#: ../app/config/gimprc-blurbs.h:220 msgid "" "When enabled, this will ensure that the full image is visible after a file " "is opened, otherwise it will be displayed with a scale of 1:1." @@ -10224,22 +10358,22 @@ msgstr "" "Если включено, масштаб открываемого изображения установлен по размеру окна " "или в масштабе 1:1." -#: ../app/config/gimprc-blurbs.h:221 +#: ../app/config/gimprc-blurbs.h:224 msgid "" "Sets the level of interpolation used for scaling and other transformations." msgstr "" "Установить уровень интерполяции, используемый при масштабировании и подобных " "изменениях." -#: ../app/config/gimprc-blurbs.h:228 +#: ../app/config/gimprc-blurbs.h:231 msgid "Specifies the language to use for the user interface." msgstr "Определяет язык пользовательского интерфейса" -#: ../app/config/gimprc-blurbs.h:231 +#: ../app/config/gimprc-blurbs.h:234 msgid "How many recently opened image filenames to keep on the File menu." msgstr "Количество названий ранее открывавшихся файлов, отображаемых в меню." -#: ../app/config/gimprc-blurbs.h:234 +#: ../app/config/gimprc-blurbs.h:237 msgid "" "Speed of marching ants in the selection outline. This value is in " "milliseconds (less time indicates faster marching)." @@ -10248,7 +10382,7 @@ msgstr "" "в миллисекундах (чем меньше значение, тем быстрее движется граница\n" "выделенной области)." -#: ../app/config/gimprc-blurbs.h:238 +#: ../app/config/gimprc-blurbs.h:241 msgid "" "GIMP will warn the user if an attempt is made to create an image that would " "take more memory than the size specified here." @@ -10256,7 +10390,7 @@ msgstr "" "При попытке создать файл, размер которого превышает указанное здесь " "значение, GIMP предупредит вас об этом." -#: ../app/config/gimprc-blurbs.h:248 +#: ../app/config/gimprc-blurbs.h:251 msgid "" "Sets the monitor's horizontal resolution, in dots per inch. If set to 0, " "forces the X server to be queried for both horizontal and vertical " @@ -10265,7 +10399,7 @@ msgstr "" "Установить горизонтальное разрешение монитора в точках на дюйм. При нулевом " "значении устанавливается системное значение." -#: ../app/config/gimprc-blurbs.h:253 +#: ../app/config/gimprc-blurbs.h:256 msgid "" "Sets the monitor's vertical resolution, in dots per inch. If set to 0, " "forces the X server to be queried for both horizontal and vertical " @@ -10274,7 +10408,7 @@ msgstr "" "Установить вертикальное разрешение монитора в точках на дюйм. При нулевом " "значении устанавливается системное значение." -#: ../app/config/gimprc-blurbs.h:258 +#: ../app/config/gimprc-blurbs.h:261 msgid "" "If enabled, the move tool sets the edited layer or path as active. This " "used to be the default behaviour in older versions." @@ -10282,7 +10416,7 @@ msgstr "" "Если включено, инструмент «Перемещение» делает активным перемещаемый слой " "или контур. В прошлых версиях такое поведение было включено по умолчанию." -#: ../app/config/gimprc-blurbs.h:267 +#: ../app/config/gimprc-blurbs.h:270 msgid "" "Sets the size of the navigation preview available in the lower right corner " "of the image window." @@ -10290,11 +10424,11 @@ msgstr "" "Установить размер окна навигации, находящегося в правом нижнем углу окна " "изображения." -#: ../app/config/gimprc-blurbs.h:271 +#: ../app/config/gimprc-blurbs.h:274 msgid "Sets how many threads GIMP should use for operations that support it." msgstr "Установить количество процессоров, используемых GIMP одновременно." -#: ../app/config/gimprc-blurbs.h:293 +#: ../app/config/gimprc-blurbs.h:296 msgid "" "Sets whether GIMP should create previews of layers and channels. Previews in " "the layers and channels dialog are nice to have but they can slow things " @@ -10304,67 +10438,67 @@ msgstr "" "каналов — приятная вещь, но ее использование может существенно замедлить " "работу с большими изображениями." -#: ../app/config/gimprc-blurbs.h:298 +#: ../app/config/gimprc-blurbs.h:301 msgid "" "Sets the preview size used for layers and channel previews in newly created " "dialogs." msgstr "Устанавливает размер миниатюры слоев и каналов." -#: ../app/config/gimprc-blurbs.h:302 +#: ../app/config/gimprc-blurbs.h:305 msgid "Sets the default quick mask color." msgstr "" -#: ../app/config/gimprc-blurbs.h:305 +#: ../app/config/gimprc-blurbs.h:308 msgid "" "When enabled, the image window will automatically resize itself whenever the " "physical image size changes. This setting only takes effect in multi-window " "mode." msgstr "Размер окна автоматически изменяется при масштабировании изображения." -#: ../app/config/gimprc-blurbs.h:310 +#: ../app/config/gimprc-blurbs.h:313 msgid "" "When enabled, the image window will automatically resize itself when zooming " "into and out of images. This setting only takes effect in multi-window mode." msgstr "" "Размер окна автоматически изменяется при масштабировании вида изображения." -#: ../app/config/gimprc-blurbs.h:315 +#: ../app/config/gimprc-blurbs.h:318 msgid "Let GIMP try to restore your last saved session on each startup." msgstr "Восстанавливать последнюю сохраненную позицию окон при каждом запуске." -#: ../app/config/gimprc-blurbs.h:318 +#: ../app/config/gimprc-blurbs.h:321 msgid "" "When enabled, GIMP will try to restore windows on the monitor they were open " "before. When disabled, windows will appear on the currently used monitor." msgstr "" -#: ../app/config/gimprc-blurbs.h:323 +#: ../app/config/gimprc-blurbs.h:326 msgid "" "Remember the current tool, pattern, color, and brush across GIMP sessions." msgstr "Запомнить текущие инструменты, текстуры, цвета и кисти." -#: ../app/config/gimprc-blurbs.h:327 +#: ../app/config/gimprc-blurbs.h:330 msgid "" "When enabled, the same tool and tool options will be used for all input " "devices. No tool switching will occur when the input device changes." msgstr "" -#: ../app/config/gimprc-blurbs.h:332 +#: ../app/config/gimprc-blurbs.h:335 msgid "" "Keep a permanent record of all opened and saved files in the Recent " "Documents list." msgstr "" "Добавлять все открываемые и сохраняемые файлы в список недавних изображений." -#: ../app/config/gimprc-blurbs.h:336 +#: ../app/config/gimprc-blurbs.h:339 msgid "Save the positions and sizes of the main dialogs when GIMP exits." msgstr "Сохранить положение и размеры главных диалогов при закрытии GIMP." -#: ../app/config/gimprc-blurbs.h:339 +#: ../app/config/gimprc-blurbs.h:342 msgid "Save the tool options when GIMP exits." msgstr "Сохранить параметры инструментов при выходе из GIMP." -#: ../app/config/gimprc-blurbs.h:345 +#: ../app/config/gimprc-blurbs.h:348 msgid "" "When enabled, all paint tools will show a preview of the current brush's " "outline." @@ -10372,7 +10506,7 @@ msgstr "" "Если включено, все инструменты для рисования показывают очертания активной " "кисти." -#: ../app/config/gimprc-blurbs.h:349 +#: ../app/config/gimprc-blurbs.h:352 msgid "" "When enabled, dialogs will show a help button that gives access to the " "related help page. Without this button, the help page can still be reached " @@ -10382,13 +10516,13 @@ msgstr "" "которой вызывается система помощи. Если выключено, справочную систему можно " "вызвать нажатием клавиши F1." -#: ../app/config/gimprc-blurbs.h:354 +#: ../app/config/gimprc-blurbs.h:357 msgid "" "When enabled, the mouse pointer will be shown over the image while using a " "paint tool." msgstr "Если включено, при рисовании виден курсор инструмента." -#: ../app/config/gimprc-blurbs.h:358 +#: ../app/config/gimprc-blurbs.h:361 msgid "" "When enabled, the menubar is visible by default. This can also be toggled " "with the \"View->Show Menubar\" command." @@ -10396,7 +10530,7 @@ msgstr "" "Если включено, панель меню по умолчанию отображается. Это также можно " "сделать командой «Вид > Показывать панель меню»." -#: ../app/config/gimprc-blurbs.h:362 +#: ../app/config/gimprc-blurbs.h:365 msgid "" "When enabled, the rulers are visible by default. This can also be toggled " "with the \"View->Show Rulers\" command." @@ -10404,7 +10538,7 @@ msgstr "" "Если включено, линейки по умолчанию отображаются. Это также можно сделать " "командой «Вид > Показывать линейки»." -#: ../app/config/gimprc-blurbs.h:366 +#: ../app/config/gimprc-blurbs.h:369 msgid "" "When enabled, the scrollbars are visible by default. This can also be " "toggled with the \"View->Show Scrollbars\" command." @@ -10412,7 +10546,7 @@ msgstr "" "Если включено, полосы прокрутки по умолчанию отображаются. Это также можно " "сделать командой «Вид > Показывать полосы прокрутки»." -#: ../app/config/gimprc-blurbs.h:370 +#: ../app/config/gimprc-blurbs.h:373 msgid "" "When enabled, the statusbar is visible by default. This can also be toggled " "with the \"View->Show Statusbar\" command." @@ -10420,7 +10554,7 @@ msgstr "" "Если включено, строка состояния по умолчанию отображается. Это также можно " "сделать командой «Вид > Показывать строку состояния»." -#: ../app/config/gimprc-blurbs.h:374 +#: ../app/config/gimprc-blurbs.h:377 msgid "" "When enabled, the selection is visible by default. This can also be toggled " "with the \"View->Show Selection\" command." @@ -10428,7 +10562,7 @@ msgstr "" "Если включено, выделение области по умолчанию отображается. Это также можно " "сделать командой «Вид > Показывать выделение»." -#: ../app/config/gimprc-blurbs.h:378 +#: ../app/config/gimprc-blurbs.h:381 msgid "" "When enabled, the layer boundary is visible by default. This can also be " "toggled with the \"View->Show Layer Boundary\" command." @@ -10436,7 +10570,7 @@ msgstr "" "Если включено, граница слоя по умолчанию отображается. Это также можно " "сделать командой «Вид > Показывать границы слоя»." -#: ../app/config/gimprc-blurbs.h:382 +#: ../app/config/gimprc-blurbs.h:385 msgid "" "When enabled, the guides are visible by default. This can also be toggled " "with the \"View->Show Guides\" command." @@ -10444,7 +10578,7 @@ msgstr "" "Если включено, направляющие по умолчанию отображаются. Это также можно " "сделать командой «Вид > Показывать направляющие»." -#: ../app/config/gimprc-blurbs.h:386 +#: ../app/config/gimprc-blurbs.h:389 msgid "" "When enabled, the grid is visible by default. This can also be toggled with " "the \"View->Show Grid\" command." @@ -10452,7 +10586,7 @@ msgstr "" "Если включено, сетка по умолчанию отображается. Это также можно сделать " "командой «Вид > Показывать сетку»." -#: ../app/config/gimprc-blurbs.h:390 +#: ../app/config/gimprc-blurbs.h:393 msgid "" "When enabled, the sample points are visible by default. This can also be " "toggled with the \"View->Show Sample Points\" command." @@ -10460,43 +10594,43 @@ msgstr "" "Если включено, образцовые точки по умолчанию отображаются. Это также можно " "сделать командой «Вид > Показывать образцовые точки»." -#: ../app/config/gimprc-blurbs.h:394 +#: ../app/config/gimprc-blurbs.h:397 msgid "Show a tooltip when the pointer hovers over an item." msgstr "Показывать всплывающую подсказку по наведению на объект." -#: ../app/config/gimprc-blurbs.h:397 +#: ../app/config/gimprc-blurbs.h:400 msgid "Use GIMP in a single-window mode." msgstr "Использовать GIMP в однооконном режиме" -#: ../app/config/gimprc-blurbs.h:400 +#: ../app/config/gimprc-blurbs.h:403 msgid "Hide docks and other windows, leaving only image windows." msgstr "Скрыть все диалоги и панели, оставить только окна изображений" -#: ../app/config/gimprc-blurbs.h:403 +#: ../app/config/gimprc-blurbs.h:406 msgid "Enable the N-Point Deformation tool." msgstr "Включить инструмент Деформация по N-точкам" -#: ../app/config/gimprc-blurbs.h:406 +#: ../app/config/gimprc-blurbs.h:409 msgid "Enable the Handle Transform tool." msgstr "Включить инструмент Преобразование по точкам" -#: ../app/config/gimprc-blurbs.h:409 +#: ../app/config/gimprc-blurbs.h:412 msgid "Enable symmetry on painting." msgstr "Использовать симметрию при рисовании." -#: ../app/config/gimprc-blurbs.h:412 +#: ../app/config/gimprc-blurbs.h:415 msgid "Enable the MyPaint Brush tool." msgstr "Включить инструмент Кисть MyPaint" -#: ../app/config/gimprc-blurbs.h:415 +#: ../app/config/gimprc-blurbs.h:418 msgid "Enable the Seamless Clone tool." msgstr "Включить инструмент Бесшовное клонирование" -#: ../app/config/gimprc-blurbs.h:418 +#: ../app/config/gimprc-blurbs.h:421 msgid "What to do when the space bar is pressed in the image window." msgstr "Что делать, когда в окне изображения нажимают пробел." -#: ../app/config/gimprc-blurbs.h:421 +#: ../app/config/gimprc-blurbs.h:424 msgid "" "Sets the swap file location. GIMP uses a tile based memory allocation " "scheme. The swap file is used to quickly and easily swap tiles out to disk " @@ -10511,11 +10645,11 @@ msgstr "" "замедлиться, если файл подкачки создан в папке, которая смонтирована поверх " "NFS. В этом случае, возможно, лучше всего поместить файл подкачки в \"/tmp\"." -#: ../app/config/gimprc-blurbs.h:430 +#: ../app/config/gimprc-blurbs.h:433 msgid "When enabled, menus can be torn off." msgstr "Если включено, меню можно отцепить от панели инструментов." -#: ../app/config/gimprc-blurbs.h:433 +#: ../app/config/gimprc-blurbs.h:436 msgid "" "When enabled, you can change keyboard shortcuts for menu items by hitting a " "key combination while the menu item is highlighted." @@ -10523,15 +10657,15 @@ msgstr "" "Если включено, комбинации клавиш для быстрого доступа к подсвеченному пункту " "меню можно менять «на лету»." -#: ../app/config/gimprc-blurbs.h:437 +#: ../app/config/gimprc-blurbs.h:440 msgid "Save changed keyboard shortcuts when GIMP exits." msgstr "Сохранить измененные комбинации клавиши при выходе из GIMP." -#: ../app/config/gimprc-blurbs.h:440 +#: ../app/config/gimprc-blurbs.h:443 msgid "Restore saved keyboard shortcuts on each GIMP startup." msgstr "Восстановить сохраненные комбинации клавиш при запуске GIMP." -#: ../app/config/gimprc-blurbs.h:443 +#: ../app/config/gimprc-blurbs.h:446 msgid "" "Sets the folder for temporary storage. Files will appear here during the " "course of running GIMP. Most files will disappear when GIMP exits, but some " @@ -10543,208 +10677,207 @@ msgstr "" "окончания работы с GIMP, однако некоторые останутся, поэтому не стоит давать " "другим пользователям права на просмотр и изменение этого каталога." -#: ../app/config/gimprc-blurbs.h:464 +#: ../app/config/gimprc-blurbs.h:467 msgid "" "Sets the default rendering intent for the 'Convert to Color Profile' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgstr "" -#: ../app/config/gimprc-blurbs.h:467 +#: ../app/config/gimprc-blurbs.h:470 msgid "" "Sets the default 'Black Point Compensation' state for the 'Convert to Color " "Profile' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." - -#: ../app/config/gimprc-blurbs.h:471 -msgid "" -"Sets the default layer dithering method for the 'Convert Precision' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgstr "" #: ../app/config/gimprc-blurbs.h:474 msgid "" -"Sets the default text layer dithering method for the 'Convert Precision' " -"dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +"Sets the default layer dithering method for the 'Convert Precision' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:477 msgid "" -"Sets the default channel dithering method for the 'Convert Precision' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +"Sets the default text layer dithering method for the 'Convert Precision' " +"dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:480 -msgid "Sets the default palette type for the 'Convert to Indexed' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "" +"Sets the default channel dithering method for the 'Convert Precision' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:483 -msgid "" -"Sets the default maximum number of colors for the 'Convert to Indexed' " -"dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "Sets the default palette type for the 'Convert to Indexed' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:486 msgid "" -"Sets the default 'Remove duplicate colors' state for the 'Convert to " -"Indexed' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +"Sets the default maximum number of colors for the 'Convert to Indexed' " +"dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:489 -msgid "Sets the default dithering type for the 'Convert to Indexed' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "" +"Sets the default 'Remove duplicate colors' state for the 'Convert to " +"Indexed' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:492 -msgid "" -"Sets the default 'Dither alpha' state for the 'Convert to Indexed' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "Sets the default dithering type for the 'Convert to Indexed' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:495 msgid "" -"Sets the default 'Dither text layers' state for the 'Convert to Indexed' " -"dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +"Sets the default 'Dither alpha' state for the 'Convert to Indexed' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:498 -msgid "Sets the default fill type for the 'Canvas Size' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "" +"Sets the default 'Dither text layers' state for the 'Convert to Indexed' " +"dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:501 -msgid "Sets the default set of layers to resize for the 'Canvas Size' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "Sets the default fill type for the 'Canvas Size' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:504 -msgid "" -"Sets the default 'Resize text layers' state for the 'Canvas Size' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "Sets the default set of layers to resize for the 'Canvas Size' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:507 +msgid "" +"Sets the default 'Resize text layers' state for the 'Canvas Size' dialog." +msgstr "" + +#: ../app/config/gimprc-blurbs.h:510 msgid "Sets the default layer name for the 'New Layer' dialog." msgstr "" "Установить используемое по умолчанию название слоя в диалоге «Новый слой»" -#: ../app/config/gimprc-blurbs.h:510 -msgid "Sets the default mode for the 'New Layer' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." - #: ../app/config/gimprc-blurbs.h:513 -msgid "Sets the default blend space for the 'New Layer' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "Sets the default mode for the 'New Layer' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:516 -msgid "Sets the default composite space for the 'New Layer' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "Sets the default blend space for the 'New Layer' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:519 -msgid "Sets the default composite mode for the 'New Layer' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "Sets the default composite space for the 'New Layer' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:522 -msgid "Sets the default opacity for the 'New Layer' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "Sets the default composite mode for the 'New Layer' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:525 -msgid "Sets the default fill type for the 'New Layer' dialog." +msgid "Sets the default opacity for the 'New Layer' dialog." msgstr "" -"Установить используемый по умолчанию тип заливки в диалоге «Новый слой»" #: ../app/config/gimprc-blurbs.h:528 -msgid "Sets the default fill type for the 'Layer Boundary Size' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "Sets the default fill type for the 'New Layer' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:531 -msgid "Sets the default mask for the 'Add Layer Mask' dialog." +msgid "Sets the default fill type for the 'Layer Boundary Size' dialog." msgstr "" #: ../app/config/gimprc-blurbs.h:534 +msgid "Sets the default mask for the 'Add Layer Mask' dialog." +msgstr "" + +#: ../app/config/gimprc-blurbs.h:537 msgid "Sets the default 'invert mask' state for the 'Add Layer Mask' dialog." msgstr "" "Устанавить используемое по умолчанию состояние переключателя «Инвертировать " "маску» в диалоге «Создать маску слоя»" -#: ../app/config/gimprc-blurbs.h:537 -msgid "Sets the default merge type for the 'Merge Visible Layers' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." - #: ../app/config/gimprc-blurbs.h:540 -msgid "" -"Sets the default 'Active group only' for the 'Merge Visible Layers' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "Sets the default merge type for the 'Merge Visible Layers' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:543 msgid "" -"Sets the default 'Discard invisible' for the 'Merge Visible Layers' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +"Sets the default 'Active group only' for the 'Merge Visible Layers' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:546 -msgid "Sets the default channel name for the 'New Channel' dialog." +msgid "" +"Sets the default 'Discard invisible' for the 'Merge Visible Layers' dialog." msgstr "" #: ../app/config/gimprc-blurbs.h:549 -msgid "Sets the default color and opacity for the 'New Channel' dialog." +msgid "Sets the default channel name for the 'New Channel' dialog." msgstr "" #: ../app/config/gimprc-blurbs.h:552 -msgid "Sets the default path name for the 'New Path' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "Sets the default color and opacity for the 'New Channel' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:555 -msgid "Sets the default folder path for the 'Export Path' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "Sets the default path name for the 'New Path' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:558 -msgid "" -"Sets the default 'Export the active path' state for the 'Export Path' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "Sets the default folder path for the 'Export Path' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:561 -msgid "Sets the default folder path for the 'Import Path' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "" +"Sets the default 'Export the active path' state for the 'Export Path' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:564 -msgid "" -"Sets the default 'Merge imported paths' state for the 'Import Path' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "Sets the default folder path for the 'Import Path' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:567 msgid "" -"Sets the default 'Scale imported paths to fit size' state for the 'Import " -"Path' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +"Sets the default 'Merge imported paths' state for the 'Import Path' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:570 -msgid "Sets the default feather radius for the 'Feather Selection' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "" +"Sets the default 'Scale imported paths to fit size' state for the 'Import " +"Path' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:573 -msgid "Sets the default grow radius for the 'Grow Selection' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "Sets the default feather radius for the 'Feather Selection' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:576 -msgid "Sets the default shrink radius for the 'Shrink Selection' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgid "Sets the default grow radius for the 'Grow Selection' dialog." +msgstr "" #: ../app/config/gimprc-blurbs.h:579 +msgid "Sets the default shrink radius for the 'Shrink Selection' dialog." +msgstr "" + +#: ../app/config/gimprc-blurbs.h:582 msgid "" "Sets the default 'Selected areas continue outside the image' setting for the " "'Shrink Selection' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:583 -msgid "Sets the default border radius for the 'Border Selection' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." - #: ../app/config/gimprc-blurbs.h:586 +msgid "Sets the default border radius for the 'Border Selection' dialog." +msgstr "" + +#: ../app/config/gimprc-blurbs.h:589 msgid "" "Sets the default 'Selected areas continue outside the image' setting for the " "'Border Selection' dialog." msgstr "" -#: ../app/config/gimprc-blurbs.h:590 +#: ../app/config/gimprc-blurbs.h:593 msgid "Sets the default border style for the 'Border Selection' dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." - -#: ../app/config/gimprc-blurbs.h:599 -msgid "Sets the size of the thumbnail shown in the Open dialog." -msgstr "Установить размер миниатюры в диалоге открытия файлов." +msgstr "" #: ../app/config/gimprc-blurbs.h:602 +msgid "Sets the size of the thumbnail shown in the Open dialog." +msgstr "" + +#: ../app/config/gimprc-blurbs.h:605 msgid "" "The thumbnail in the Open dialog will be automatically updated if the file " "being previewed is smaller than the size set here." @@ -10752,7 +10885,7 @@ msgstr "" "Если размер файла предпросмотра окажется меньше указанного здесь значения, " "то предпросмотр в диалоге открытия будет обновлен автоматически." -#: ../app/config/gimprc-blurbs.h:606 +#: ../app/config/gimprc-blurbs.h:609 msgid "" "When the amount of pixel data exceeds this limit, GIMP will start to swap " "tiles to disk. This is a lot slower but it makes it possible to work on " @@ -10764,35 +10897,35 @@ msgstr "" "обрабатывать данные, не помещающиеся в оперативную память. Если оперативной " "памяти много, это значение лучше увеличить." -#: ../app/config/gimprc-blurbs.h:612 +#: ../app/config/gimprc-blurbs.h:615 msgid "Show the current foreground and background colors in the toolbox." msgstr "" "Показывать текущий цвет переднего и заднего плана в панели инструментов." -#: ../app/config/gimprc-blurbs.h:615 +#: ../app/config/gimprc-blurbs.h:618 msgid "Show the currently selected brush, pattern and gradient in the toolbox." msgstr "Показывать активную кисть, текстуру и градиент в панели инструментов." -#: ../app/config/gimprc-blurbs.h:618 +#: ../app/config/gimprc-blurbs.h:621 msgid "Show the currently active image in the toolbox." msgstr "Показывать активное изображение в панели инструментов." -#: ../app/config/gimprc-blurbs.h:624 +#: ../app/config/gimprc-blurbs.h:627 msgid "Sets the manner in which transparency is displayed in images." msgstr "Определяет, как будет отображаться прозрачность в изображении." -#: ../app/config/gimprc-blurbs.h:627 +#: ../app/config/gimprc-blurbs.h:630 msgid "Sets the size of the checkerboard used to display transparency." msgstr "Устанавливает размер клеток, отображающих прозрачность." -#: ../app/config/gimprc-blurbs.h:630 +#: ../app/config/gimprc-blurbs.h:633 msgid "" "When enabled, GIMP will not save an image if it has not been changed since " "it was opened." msgstr "" "Если включено, файлы, не изменившиеся после загрузки, не будут сохраняться." -#: ../app/config/gimprc-blurbs.h:634 +#: ../app/config/gimprc-blurbs.h:637 msgid "" "Sets the minimal number of operations that can be undone. More undo levels " "are kept available until the undo-size limit is reached." @@ -10801,7 +10934,7 @@ msgstr "" "отмен возможно до тех пор, пока не использована вся память, отведенная для " "этого." -#: ../app/config/gimprc-blurbs.h:638 +#: ../app/config/gimprc-blurbs.h:641 msgid "" "Sets an upper limit to the memory that is used per image to keep operations " "on the undo stack. Regardless of this setting, at least as many undo-levels " @@ -10811,15 +10944,15 @@ msgstr "" "изображении. Предел может быть превышен для использования количества отмен, " "указанного в настройках." -#: ../app/config/gimprc-blurbs.h:643 +#: ../app/config/gimprc-blurbs.h:646 msgid "Sets the size of the previews in the Undo History." msgstr "Устанавливает размер просмотра для истории действий." -#: ../app/config/gimprc-blurbs.h:646 +#: ../app/config/gimprc-blurbs.h:649 msgid "When enabled, pressing F1 will open the help browser." msgstr "Когда эта опция включена, кнопкой F1 вызывается система помощи." -#: ../app/config/gimprc-blurbs.h:649 +#: ../app/config/gimprc-blurbs.h:652 msgid "When enabled, uses OpenCL for some operations." msgstr "Если включено, использовать OpenCL для некоторых операций." @@ -11119,549 +11252,559 @@ msgctxt "debug-policy" msgid "Never debug GIMP" msgstr "Не выполнять отладку" -#: ../app/core/core-enums.c:860 +#: ../app/core/core-enums.c:862 msgctxt "undo-type" msgid "<>" msgstr "<<неправильно>>" -#: ../app/core/core-enums.c:861 +#: ../app/core/core-enums.c:863 msgctxt "undo-type" msgid "Scale image" msgstr "Смена размера изображения" -#: ../app/core/core-enums.c:862 +#: ../app/core/core-enums.c:864 msgctxt "undo-type" msgid "Resize image" msgstr "Изменить размер изображения" -#: ../app/core/core-enums.c:863 +#: ../app/core/core-enums.c:865 msgctxt "undo-type" msgid "Flip image" msgstr "Зеркально отразить изображение" -#: ../app/core/core-enums.c:864 +#: ../app/core/core-enums.c:866 msgctxt "undo-type" msgid "Rotate image" msgstr "Повернуть изображение" -#: ../app/core/core-enums.c:865 +#: ../app/core/core-enums.c:867 msgctxt "undo-type" msgid "Crop image" msgstr "Кадрировать изображение" -#: ../app/core/core-enums.c:866 +#: ../app/core/core-enums.c:868 msgctxt "undo-type" msgid "Convert image" msgstr "Преобразовать изображение" -#: ../app/core/core-enums.c:867 +#: ../app/core/core-enums.c:869 msgctxt "undo-type" msgid "Remove item" msgstr "Удалить объект" -#: ../app/core/core-enums.c:868 +#: ../app/core/core-enums.c:870 msgctxt "undo-type" msgid "Merge layers" msgstr "Объединить слои" -#: ../app/core/core-enums.c:869 +#: ../app/core/core-enums.c:871 msgctxt "undo-type" msgid "Merge paths" msgstr "Объединить контуры" -#: ../app/core/core-enums.c:870 +#: ../app/core/core-enums.c:872 msgctxt "undo-type" msgid "Quick Mask" msgstr "Быстрая маска" -#: ../app/core/core-enums.c:871 ../app/core/core-enums.c:902 +#: ../app/core/core-enums.c:873 ../app/core/core-enums.c:904 #: ../app/core/gimpimage-grid.c:64 msgctxt "undo-type" msgid "Grid" msgstr "Сетка" -#: ../app/core/core-enums.c:872 ../app/core/core-enums.c:906 +#: ../app/core/core-enums.c:874 ../app/core/core-enums.c:908 msgctxt "undo-type" msgid "Guide" msgstr "Направляющая" -#: ../app/core/core-enums.c:873 ../app/core/core-enums.c:907 +#: ../app/core/core-enums.c:875 ../app/core/core-enums.c:909 msgctxt "undo-type" msgid "Sample Point" msgstr "Образцовая точка" -#: ../app/core/core-enums.c:874 ../app/core/core-enums.c:908 +#: ../app/core/core-enums.c:876 ../app/core/core-enums.c:910 msgctxt "undo-type" msgid "Layer/Channel" msgstr "Слой/Канал" -#: ../app/core/core-enums.c:875 ../app/core/core-enums.c:909 +#: ../app/core/core-enums.c:877 ../app/core/core-enums.c:911 msgctxt "undo-type" msgid "Layer/Channel modification" msgstr "Изменение слоя/канала" -#: ../app/core/core-enums.c:876 ../app/core/core-enums.c:910 +#: ../app/core/core-enums.c:878 ../app/core/core-enums.c:912 msgctxt "undo-type" msgid "Selection mask" msgstr "Маска выделения" -#: ../app/core/core-enums.c:877 ../app/core/core-enums.c:914 +#: ../app/core/core-enums.c:879 ../app/core/core-enums.c:916 msgctxt "undo-type" msgid "Item visibility" msgstr "Видимость объекта" -#: ../app/core/core-enums.c:878 ../app/core/core-enums.c:915 +#: ../app/core/core-enums.c:880 ../app/core/core-enums.c:917 msgctxt "undo-type" msgid "Link/Unlink item" msgstr "(Рас)соединение объекта" -#: ../app/core/core-enums.c:879 +#: ../app/core/core-enums.c:881 msgctxt "undo-type" msgid "Item properties" msgstr "Свойства элемента" -#: ../app/core/core-enums.c:880 ../app/core/core-enums.c:913 +#: ../app/core/core-enums.c:882 ../app/core/core-enums.c:915 msgctxt "undo-type" msgid "Move item" msgstr "Перемещение объекта" -#: ../app/core/core-enums.c:881 +#: ../app/core/core-enums.c:883 msgctxt "undo-type" msgid "Scale item" msgstr "Масштабирование объекта" -#: ../app/core/core-enums.c:882 +#: ../app/core/core-enums.c:884 msgctxt "undo-type" msgid "Resize item" msgstr "Смена размера объекта" -#: ../app/core/core-enums.c:883 +#: ../app/core/core-enums.c:885 msgctxt "undo-type" msgid "Add layer" msgstr "Добавление слоя" -#: ../app/core/core-enums.c:884 ../app/core/core-enums.c:932 +#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:936 msgctxt "undo-type" msgid "Add layer mask" msgstr "Добавление маски слоя" -#: ../app/core/core-enums.c:885 ../app/core/core-enums.c:934 +#: ../app/core/core-enums.c:887 ../app/core/core-enums.c:938 msgctxt "undo-type" msgid "Apply layer mask" msgstr "Применение маски слоя" -#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:942 +#: ../app/core/core-enums.c:888 ../app/core/core-enums.c:946 msgctxt "undo-type" msgid "Floating selection to layer" msgstr "Плавающее выделение в слой" -#: ../app/core/core-enums.c:887 +#: ../app/core/core-enums.c:889 msgctxt "undo-type" msgid "Float selection" msgstr "Плавающее выделение" -#: ../app/core/core-enums.c:888 +#: ../app/core/core-enums.c:890 msgctxt "undo-type" msgid "Anchor floating selection" msgstr "Прицепить плавающее выделение" -#: ../app/core/core-enums.c:889 ../app/core/gimp-edit.c:501 +#: ../app/core/core-enums.c:891 ../app/core/gimp-edit.c:501 msgctxt "undo-type" msgid "Paste" msgstr "Вставить" -#: ../app/core/core-enums.c:890 ../app/core/gimp-edit.c:829 +#: ../app/core/core-enums.c:892 ../app/core/gimp-edit.c:829 msgctxt "undo-type" msgid "Cut" msgstr "Вырезать" -#: ../app/core/core-enums.c:891 +#: ../app/core/core-enums.c:893 msgctxt "undo-type" msgid "Text" msgstr "Текст" -#: ../app/core/core-enums.c:892 ../app/core/core-enums.c:943 +#: ../app/core/core-enums.c:894 ../app/core/core-enums.c:947 #: ../app/core/gimpdrawable-transform.c:692 msgctxt "undo-type" msgid "Transform" msgstr "Преобразование" -#: ../app/core/core-enums.c:893 ../app/core/core-enums.c:944 +#: ../app/core/core-enums.c:895 ../app/core/core-enums.c:948 msgctxt "undo-type" msgid "Paint" msgstr "Рисование" -#: ../app/core/core-enums.c:894 ../app/core/core-enums.c:947 +#: ../app/core/core-enums.c:896 ../app/core/core-enums.c:951 msgctxt "undo-type" msgid "Attach parasite" msgstr "Добавить паразита" -#: ../app/core/core-enums.c:895 ../app/core/core-enums.c:948 +#: ../app/core/core-enums.c:897 ../app/core/core-enums.c:952 msgctxt "undo-type" msgid "Remove parasite" msgstr "Убрать паразита" -#: ../app/core/core-enums.c:896 +#: ../app/core/core-enums.c:898 msgctxt "undo-type" msgid "Import paths" msgstr "Импортировать контуры" -#: ../app/core/core-enums.c:897 +#: ../app/core/core-enums.c:899 msgctxt "undo-type" msgid "Plug-In" msgstr "Расширение" -#: ../app/core/core-enums.c:898 +#: ../app/core/core-enums.c:900 msgctxt "undo-type" msgid "Image type" msgstr "Тип изображения" -#: ../app/core/core-enums.c:899 +#: ../app/core/core-enums.c:901 msgctxt "undo-type" msgid "Image precision" msgstr "Точность изображения" -#: ../app/core/core-enums.c:900 +#: ../app/core/core-enums.c:902 msgctxt "undo-type" msgid "Image size" msgstr "Размер изображения" -#: ../app/core/core-enums.c:901 +#: ../app/core/core-enums.c:903 msgctxt "undo-type" msgid "Image resolution change" msgstr "Размер изображенияСмена разрешения изображения" -#: ../app/core/core-enums.c:903 +#: ../app/core/core-enums.c:905 msgctxt "undo-type" msgid "Change metadata" msgstr "Изменение метаданных" -#: ../app/core/core-enums.c:904 +#: ../app/core/core-enums.c:906 msgctxt "undo-type" msgid "Change indexed palette" msgstr "Сменить индексированную палитру" -#: ../app/core/core-enums.c:905 +#: ../app/core/core-enums.c:907 msgctxt "undo-type" msgid "Change color managed state" msgstr "Смена режима управления цветом" -#: ../app/core/core-enums.c:911 +#: ../app/core/core-enums.c:913 msgctxt "undo-type" msgid "Reorder item" msgstr "Реорганизация элемента" -#: ../app/core/core-enums.c:912 +#: ../app/core/core-enums.c:914 msgctxt "undo-type" msgid "Rename item" msgstr "Переименование элемента" -#: ../app/core/core-enums.c:916 +#: ../app/core/core-enums.c:918 msgctxt "undo-type" msgid "Item color tag" msgstr "Цветовая метка объекта" -#: ../app/core/core-enums.c:917 +#: ../app/core/core-enums.c:919 msgctxt "undo-type" msgid "Lock/Unlock content" msgstr "(Раз)блокировка содержимого" -#: ../app/core/core-enums.c:918 +#: ../app/core/core-enums.c:920 msgctxt "undo-type" msgid "Lock/Unlock position" msgstr "(Раз)блокировка позиции" -#: ../app/core/core-enums.c:919 +#: ../app/core/core-enums.c:921 msgctxt "undo-type" msgid "New layer" msgstr "Новый слой" -#: ../app/core/core-enums.c:920 +#: ../app/core/core-enums.c:922 msgctxt "undo-type" msgid "Delete layer" msgstr "Удаление слоя" -#: ../app/core/core-enums.c:921 +#: ../app/core/core-enums.c:923 msgctxt "undo-type" msgid "Set layer mode" msgstr "Смена режима слоя" -#: ../app/core/core-enums.c:922 +#: ../app/core/core-enums.c:924 msgctxt "undo-type" msgid "Set layer opacity" msgstr "Смена непрозрачности слоя" -#: ../app/core/core-enums.c:923 +#: ../app/core/core-enums.c:925 msgctxt "undo-type" msgid "Lock/Unlock alpha channel" msgstr "(Раз)блокировка альфа-канала" -#: ../app/core/core-enums.c:924 +#: ../app/core/core-enums.c:926 msgctxt "undo-type" msgid "Suspend group layer resize" msgstr "Прекращение изменения группы слоёв" -#: ../app/core/core-enums.c:925 +#: ../app/core/core-enums.c:927 msgctxt "undo-type" msgid "Resume group layer resize" msgstr "Возобновление изменения размера группы слоев" -#: ../app/core/core-enums.c:926 +#: ../app/core/core-enums.c:928 #, fuzzy msgctxt "undo-type" msgid "Suspend group layer mask" msgstr "Прекращение изменения группы слоёв" -#: ../app/core/core-enums.c:927 +#: ../app/core/core-enums.c:929 #, fuzzy msgctxt "undo-type" msgid "Resume group layer mask" msgstr "Возобновление изменения размера группы слоев" -#: ../app/core/core-enums.c:928 +#: ../app/core/core-enums.c:930 +msgctxt "undo-type" +msgid "Start moving group layer" +msgstr "Начало перемещения группы слоёв" + +#: ../app/core/core-enums.c:931 +msgctxt "undo-type" +msgid "End moving group layer" +msgstr "Конец перемещения группы слоёв" + +#: ../app/core/core-enums.c:932 msgctxt "undo-type" msgid "Convert group layer" msgstr "Преобразование группы слоев" -#: ../app/core/core-enums.c:929 +#: ../app/core/core-enums.c:933 msgctxt "undo-type" msgid "Text layer" msgstr "Текстовый слой" -#: ../app/core/core-enums.c:930 +#: ../app/core/core-enums.c:934 msgctxt "undo-type" msgid "Text layer modification" msgstr "Изменение текстового слоя" -#: ../app/core/core-enums.c:931 +#: ../app/core/core-enums.c:935 msgctxt "undo-type" msgid "Convert text layer" msgstr "Преобразование текстового слоя" -#: ../app/core/core-enums.c:933 +#: ../app/core/core-enums.c:937 msgctxt "undo-type" msgid "Delete layer mask" msgstr "Удалить маску слоя" -#: ../app/core/core-enums.c:935 +#: ../app/core/core-enums.c:939 msgctxt "undo-type" msgid "Show layer mask" msgstr "Показать маску слоя" -#: ../app/core/core-enums.c:936 +#: ../app/core/core-enums.c:940 msgctxt "undo-type" msgid "New channel" msgstr "Новый канал" -#: ../app/core/core-enums.c:937 +#: ../app/core/core-enums.c:941 msgctxt "undo-type" msgid "Delete channel" msgstr "Удаление канала" -#: ../app/core/core-enums.c:938 +#: ../app/core/core-enums.c:942 msgctxt "undo-type" msgid "Channel color" msgstr "Цвет канала" -#: ../app/core/core-enums.c:939 +#: ../app/core/core-enums.c:943 msgctxt "undo-type" msgid "New path" msgstr "Новый контур" -#: ../app/core/core-enums.c:940 +#: ../app/core/core-enums.c:944 msgctxt "undo-type" msgid "Delete path" msgstr "Удалить контур" -#: ../app/core/core-enums.c:941 +#: ../app/core/core-enums.c:945 msgctxt "undo-type" msgid "Path modification" msgstr "Изменение контура" -#: ../app/core/core-enums.c:945 +#: ../app/core/core-enums.c:949 msgctxt "undo-type" msgid "Ink" msgstr "Перо" -#: ../app/core/core-enums.c:946 +#: ../app/core/core-enums.c:950 msgctxt "undo-type" msgid "Select foreground" msgstr "Выбрать цвет переднего плана" -#: ../app/core/core-enums.c:949 +#: ../app/core/core-enums.c:953 msgctxt "undo-type" msgid "Not undoable" msgstr "Действие не отменяемо" -#: ../app/core/core-enums.c:1029 +#: ../app/core/core-enums.c:1033 msgctxt "gradient-color" msgid "Fixed" msgstr "Фиксированный" -#: ../app/core/core-enums.c:1030 +#: ../app/core/core-enums.c:1034 msgctxt "gradient-color" msgid "Foreground color" msgstr "Цвет переднего плана" #. Translators: this is an abbreviated version of "Foreground color". #. Keep it short. -#: ../app/core/core-enums.c:1033 +#: ../app/core/core-enums.c:1037 msgctxt "gradient-color" msgid "FG" msgstr "ПП" -#: ../app/core/core-enums.c:1034 +#: ../app/core/core-enums.c:1038 msgctxt "gradient-color" msgid "Foreground color (transparent)" msgstr "Цвет переднего плана (полупрозрачный)" #. Translators: this is an abbreviated version of "Foreground color (transparent)". #. Keep it short. -#: ../app/core/core-enums.c:1037 +#: ../app/core/core-enums.c:1041 msgctxt "gradient-color" msgid "FG (t)" msgstr "ПП (п)" -#: ../app/core/core-enums.c:1038 +#: ../app/core/core-enums.c:1042 msgctxt "gradient-color" msgid "Background color" msgstr "Цвет фона" #. Translators: this is an abbreviated version of "Background color". #. Keep it short. -#: ../app/core/core-enums.c:1041 +#: ../app/core/core-enums.c:1045 msgctxt "gradient-color" msgid "BG" msgstr "ЗП" -#: ../app/core/core-enums.c:1042 +#: ../app/core/core-enums.c:1046 msgctxt "gradient-color" msgid "Background color (transparent)" msgstr "Цвет фона (полупрозрачный)" #. Translators: this is an abbreviated version of "Background color (transparent)". #. Keep it short. -#: ../app/core/core-enums.c:1045 +#: ../app/core/core-enums.c:1049 msgctxt "gradient-color" msgid "BG (t)" msgstr "ЗП (т)" -#: ../app/core/core-enums.c:1076 +#: ../app/core/core-enums.c:1080 msgctxt "message-severity" msgid "Message" msgstr "Сообщение" -#: ../app/core/core-enums.c:1077 +#: ../app/core/core-enums.c:1081 msgctxt "message-severity" msgid "Warning" msgstr "Предупреждение" -#: ../app/core/core-enums.c:1078 +#: ../app/core/core-enums.c:1082 msgctxt "message-severity" msgid "Error" msgstr "Ошибка" -#: ../app/core/core-enums.c:1079 +#: ../app/core/core-enums.c:1083 msgctxt "message-severity" msgid "WARNING" msgstr "ПРЕДУПРЕЖДЕНИЕ" -#: ../app/core/core-enums.c:1080 +#: ../app/core/core-enums.c:1084 msgctxt "message-severity" msgid "CRITICAL" msgstr "КРИТИЧЕСКАЯ ОШИБКА" -#: ../app/core/core-enums.c:1109 +#: ../app/core/core-enums.c:1113 msgctxt "color-profile-policy" msgid "Ask what to do" msgstr "Спрашивать, что делать" -#: ../app/core/core-enums.c:1110 +#: ../app/core/core-enums.c:1114 msgctxt "color-profile-policy" msgid "Keep embedded profile" msgstr "Сохранять встроенный профиль" -#: ../app/core/core-enums.c:1111 +#: ../app/core/core-enums.c:1115 msgctxt "color-profile-policy" msgid "Convert to preferred RGB color profile" msgstr "Конвертировать в предпочитаемый RGB" -#: ../app/core/core-enums.c:1148 +#: ../app/core/core-enums.c:1152 msgctxt "dynamics-output-type" msgid "Opacity" msgstr "Непрозрачность" -#: ../app/core/core-enums.c:1149 +#: ../app/core/core-enums.c:1153 msgctxt "dynamics-output-type" msgid "Size" msgstr "Размер" -#: ../app/core/core-enums.c:1150 +#: ../app/core/core-enums.c:1154 msgctxt "dynamics-output-type" msgid "Angle" msgstr "Угол" -#: ../app/core/core-enums.c:1151 +#: ../app/core/core-enums.c:1155 msgctxt "dynamics-output-type" msgid "Color" msgstr "Цвет" -#: ../app/core/core-enums.c:1152 +#: ../app/core/core-enums.c:1156 msgctxt "dynamics-output-type" msgid "Hardness" msgstr "Жёсткость" -#: ../app/core/core-enums.c:1153 +#: ../app/core/core-enums.c:1157 msgctxt "dynamics-output-type" msgid "Force" msgstr "Сила" -#: ../app/core/core-enums.c:1154 +#: ../app/core/core-enums.c:1158 msgctxt "dynamics-output-type" msgid "Aspect ratio" msgstr "Соотношение сторон" -#: ../app/core/core-enums.c:1155 +#: ../app/core/core-enums.c:1159 msgctxt "dynamics-output-type" msgid "Spacing" msgstr "Интервал" -#: ../app/core/core-enums.c:1156 +#: ../app/core/core-enums.c:1160 msgctxt "dynamics-output-type" msgid "Rate" msgstr "Скорость" -#: ../app/core/core-enums.c:1157 +#: ../app/core/core-enums.c:1161 msgctxt "dynamics-output-type" msgid "Flow" msgstr "Поток" -#: ../app/core/core-enums.c:1158 +#: ../app/core/core-enums.c:1162 msgctxt "dynamics-output-type" msgid "Jitter" msgstr "Дрожание" -#: ../app/core/core-enums.c:1186 +#: ../app/core/core-enums.c:1190 msgctxt "filter-region" msgid "Use the selection as input" msgstr "Обрабатывать выделение" -#: ../app/core/core-enums.c:1187 +#: ../app/core/core-enums.c:1191 msgctxt "filter-region" msgid "Use the entire layer as input" msgstr "Обрабатывать весь слой" -#: ../app/core/core-enums.c:1216 +#: ../app/core/core-enums.c:1220 msgctxt "channel-border-style" msgid "Hard" msgstr "Жёсткость" -#: ../app/core/core-enums.c:1217 +#: ../app/core/core-enums.c:1221 msgctxt "channel-border-style" msgid "Smooth" msgstr "Сглаженная" -#: ../app/core/core-enums.c:1218 +#: ../app/core/core-enums.c:1222 msgctxt "channel-border-style" msgid "Feathered" msgstr "С растушёвкой" @@ -11677,20 +11820,20 @@ msgid "Internal Procedures" msgstr "Внутренние процедуры" #. initialize the global parasite table -#: ../app/core/gimp.c:781 +#: ../app/core/gimp.c:783 msgid "Looking for data files" msgstr "Поиск файлов данных" -#: ../app/core/gimp.c:781 +#: ../app/core/gimp.c:783 msgid "Parasites" msgstr "Паразиты" -#: ../app/core/gimp.c:790 +#: ../app/core/gimp.c:792 msgid "Fonts (this may take a while)" msgstr "Шрифты (их загрузка может длиться долго)" #. initialize the module list -#: ../app/core/gimp.c:799 ../app/dialogs/preferences-dialog.c:3112 +#: ../app/core/gimp.c:801 ../app/dialogs/preferences-dialog.c:3132 msgid "Modules" msgstr "Модули" @@ -11716,7 +11859,7 @@ msgstr "Невозможно удалить \"%s\": %s" #. initialize the list of gimp dynamics #: ../app/core/gimp-data-factories.c:322 ../app/core/gimpcontext.c:711 -#: ../app/dialogs/preferences-dialog.c:3076 +#: ../app/dialogs/preferences-dialog.c:3096 #: ../app/tools/gimppaintoptions-gui.c:225 msgid "Dynamics" msgstr "Динамика рисования" @@ -11775,9 +11918,9 @@ msgid "FG to Transparent" msgstr "Основной в прозрачный" #: ../app/core/gimp-spawn.c:186 -#, fuzzy, c-format +#, c-format msgid "Failed to fork (%s)" -msgstr "Не удалось открыть '%s': %s" +msgstr "Не удалось разветвить процесс (%s)" #: ../app/core/gimp-spawn.c:223 #, c-format @@ -11946,7 +12089,7 @@ msgstr "" "Неисправимая ошибка разбора файла кисти: повреждены данные кисти, сжатой " "методом RLE." -#: ../app/core/gimpbrush.c:150 ../app/paint/gimppaintoptions.c:213 +#: ../app/core/gimpbrush.c:150 ../app/paint/gimppaintoptions.c:215 msgid "Brush Spacing" msgstr "Интервал кисти" @@ -11990,15 +12133,15 @@ msgstr "Радиус кисти" msgid "Brush Spikes" msgstr "Лучи кисти" -#: ../app/core/gimpbrushgenerated.c:157 ../app/paint/gimppaintoptions.c:220 +#: ../app/core/gimpbrushgenerated.c:157 ../app/paint/gimppaintoptions.c:222 msgid "Brush Hardness" msgstr "Жесткость кисти" -#: ../app/core/gimpbrushgenerated.c:165 ../app/paint/gimppaintoptions.c:199 +#: ../app/core/gimpbrushgenerated.c:165 ../app/paint/gimppaintoptions.c:201 msgid "Brush Aspect Ratio" msgstr "Соотношение сторон кисти" -#: ../app/core/gimpbrushgenerated.c:172 ../app/paint/gimppaintoptions.c:206 +#: ../app/core/gimpbrushgenerated.c:172 ../app/paint/gimppaintoptions.c:208 msgid "Brush Angle" msgstr "Угол кисти" @@ -12022,7 +12165,7 @@ msgctxt "undo-type" msgid "Rounded Rectangle Select" msgstr "Прямоугольное закругленное выделение" -#: ../app/core/gimpchannel-select.c:440 ../app/core/gimplayer.c:446 +#: ../app/core/gimpchannel-select.c:440 ../app/core/gimplayer.c:448 msgctxt "undo-type" msgid "Alpha to Selection" msgstr "Альфа-канал в выделение" @@ -12093,7 +12236,7 @@ msgctxt "undo-type" msgid "Stroke Channel" msgstr "Обвести канал" -#: ../app/core/gimpchannel.c:279 ../app/core/gimpselection.c:654 +#: ../app/core/gimpchannel.c:279 msgctxt "undo-type" msgid "Channel to Selection" msgstr "Канал в выделение" @@ -12171,25 +12314,25 @@ msgctxt "undo-type" msgid "Flood Channel" msgstr "Отражение канала" -#: ../app/core/gimpchannel.c:818 +#: ../app/core/gimpchannel.c:850 msgid "Cannot fill empty channel." msgstr "Невозможно обвести пустой канал" -#: ../app/core/gimpchannel.c:854 +#: ../app/core/gimpchannel.c:886 msgid "Cannot stroke empty channel." msgstr "Невозможно обвести пустой канал" -#: ../app/core/gimpchannel.c:1677 +#: ../app/core/gimpchannel.c:1709 msgctxt "undo-type" msgid "Set Channel Color" msgstr "Изменение цвета канала" -#: ../app/core/gimpchannel.c:1728 +#: ../app/core/gimpchannel.c:1760 msgctxt "undo-type" msgid "Set Channel Opacity" msgstr "Изменение непрозрачности канала" -#: ../app/core/gimpchannel.c:1817 ../app/core/gimpselection.c:168 +#: ../app/core/gimpchannel.c:1849 ../app/core/gimpselection.c:168 msgid "Selection Mask" msgstr "Маска выделенной области" @@ -12239,7 +12382,8 @@ msgid "Pattern" msgstr "Текстура" #: ../app/core/gimpcontext.c:732 ../app/core/gimpcontext.c:733 -#: ../app/tools/gimpblendoptions.c:283 ../app/tools/gimppaintoptions-gui.c:374 +#: ../app/pdb/edit-cmds.c:797 ../app/tools/gimpgradientoptions.c:284 +#: ../app/tools/gimpgradienttool.c:156 ../app/tools/gimppaintoptions-gui.c:378 msgid "Gradient" msgstr "Градиент" @@ -12336,20 +12480,11 @@ msgstr "" "\n" "%s" -#: ../app/core/gimpdrawable.c:469 +#: ../app/core/gimpdrawable.c:480 msgctxt "undo-type" msgid "Scale" msgstr "Масштабирование" -#: ../app/core/gimpdrawable-blend.c:125 ../app/tools/gimpblendtool.c:1015 -msgctxt "undo-type" -msgid "Blend" -msgstr "Градиентная заливка" - -#: ../app/core/gimpdrawable-blend.c:213 -msgid "Calculating distance map" -msgstr "Рассчитывается карта расстояний" - #: ../app/core/gimpdrawable-bucket-fill.c:180 msgctxt "undo-type" msgid "Bucket Fill" @@ -12377,6 +12512,16 @@ msgctxt "undo-type" msgid "Render Stroke" msgstr "Отрисовка обводки" +#: ../app/core/gimpdrawable-gradient.c:127 ../app/tools/gimpgradienttool.c:1016 +#, fuzzy +msgctxt "undo-type" +msgid "Gradient" +msgstr "Градиент" + +#: ../app/core/gimpdrawable-gradient.c:215 +msgid "Calculating distance map" +msgstr "Рассчитывается карта расстояний" + #: ../app/core/gimpdrawable-levels.c:72 #: ../app/tools/gimpforegroundselectoptions.c:116 #: ../app/tools/gimplevelstool.c:132 @@ -12403,7 +12548,7 @@ msgctxt "undo-type" msgid "Rotate" msgstr "Вращение" -#: ../app/core/gimpdrawable-transform.c:1011 ../app/core/gimplayer.c:445 +#: ../app/core/gimpdrawable-transform.c:1011 ../app/core/gimplayer.c:447 msgctxt "undo-type" msgid "Transform Layer" msgstr "Преобразование слоя" @@ -12471,22 +12616,24 @@ msgstr "Недопустимая строка UTF-8 в файле градиен msgid "File is corrupt." msgstr "Файл повреждён." -#: ../app/core/gimpgradient-load.c:195 ../app/core/gimpgradient-load.c:203 +#: ../app/core/gimpgradient-load.c:189 ../app/core/gimpgradient-load.c:199 +#: ../app/core/gimpgradient-load.c:211 ../app/core/gimpgradient-load.c:221 +#: ../app/core/gimpgradient-load.c:229 ../app/core/gimpgradient-load.c:237 #, c-format msgid "Corrupt segment %d." msgstr "Повреждённый сегмент %d." -#: ../app/core/gimpgradient-load.c:214 ../app/core/gimpgradient-load.c:224 +#: ../app/core/gimpgradient-load.c:248 ../app/core/gimpgradient-load.c:258 #, c-format msgid "Segments do not span the range 0-1." msgstr "Cегменты не находятся в промежутке от 0 до 1." -#: ../app/core/gimpgradient-load.c:239 +#: ../app/core/gimpgradient-load.c:273 #, c-format msgid "In line %d of gradient file: " msgstr "В строке %d файла градиента: " -#: ../app/core/gimpgradient-load.c:315 +#: ../app/core/gimpgradient-load.c:349 #, c-format msgid "No linear gradients found." msgstr "Линейные градиенты не найдены." @@ -12558,41 +12705,41 @@ msgstr "" msgid "Offset unit" msgstr "Единица смещения" -#: ../app/core/gimpgrouplayer.c:275 +#: ../app/core/gimpgrouplayer.c:277 msgid "Layer Group" msgstr "Группа слоёв" -#: ../app/core/gimpgrouplayer.c:276 +#: ../app/core/gimpgrouplayer.c:278 msgctxt "undo-type" msgid "Rename Layer Group" msgstr "Переименование группы слоёв" -#: ../app/core/gimpgrouplayer.c:277 +#: ../app/core/gimpgrouplayer.c:279 msgctxt "undo-type" msgid "Move Layer Group" msgstr "Перемещение группы слоёв" -#: ../app/core/gimpgrouplayer.c:278 +#: ../app/core/gimpgrouplayer.c:280 msgctxt "undo-type" msgid "Scale Layer Group" msgstr "Масштабирование группы слоёв" -#: ../app/core/gimpgrouplayer.c:279 +#: ../app/core/gimpgrouplayer.c:281 msgctxt "undo-type" msgid "Resize Layer Group" msgstr "Смена размера группы слоёв" -#: ../app/core/gimpgrouplayer.c:280 +#: ../app/core/gimpgrouplayer.c:282 msgctxt "undo-type" msgid "Flip Layer Group" msgstr "Отражение группы слоёв" -#: ../app/core/gimpgrouplayer.c:281 +#: ../app/core/gimpgrouplayer.c:283 msgctxt "undo-type" msgid "Rotate Layer Group" msgstr "Вращение группы слоёв" -#: ../app/core/gimpgrouplayer.c:282 +#: ../app/core/gimpgrouplayer.c:284 msgctxt "undo-type" msgid "Transform Layer Group" msgstr "Преобразование группы слоёв" @@ -12601,75 +12748,75 @@ msgstr "Преобразование группы слоёв" msgid "Symmetry" msgstr "Симметрия" -#: ../app/core/gimpimage.c:2216 +#: ../app/core/gimpimage.c:2223 msgid " (exported)" msgstr " (экспортировано)" -#: ../app/core/gimpimage.c:2220 +#: ../app/core/gimpimage.c:2227 msgid " (overwritten)" msgstr " (перезаписано)" -#: ../app/core/gimpimage.c:2229 +#: ../app/core/gimpimage.c:2236 msgid " (imported)" msgstr " (импортировано)" -#: ../app/core/gimpimage.c:2557 +#: ../app/core/gimpimage.c:2564 msgctxt "undo-type" msgid "Change Image Resolution" msgstr "Смена разрешения изображения" -#: ../app/core/gimpimage.c:2609 +#: ../app/core/gimpimage.c:2616 msgctxt "undo-type" msgid "Change Image Unit" msgstr "Смена единицы измерения" -#: ../app/core/gimpimage.c:3493 +#: ../app/core/gimpimage.c:3500 #, c-format msgid "" "'gimp-comment' parasite validation failed: comment contains invalid UTF-8" msgstr "" -#: ../app/core/gimpimage.c:3545 +#: ../app/core/gimpimage.c:3552 msgctxt "undo-type" msgid "Attach Parasite to Image" msgstr "Присоединение паразита к изображению" -#: ../app/core/gimpimage.c:3586 +#: ../app/core/gimpimage.c:3593 msgctxt "undo-type" msgid "Remove Parasite from Image" msgstr "Удаление паразита из изображения" -#: ../app/core/gimpimage.c:4297 +#: ../app/core/gimpimage.c:4304 msgctxt "undo-type" msgid "Add Layer" msgstr "Добавление слоя" -#: ../app/core/gimpimage.c:4339 ../app/core/gimpimage.c:4370 +#: ../app/core/gimpimage.c:4346 ../app/core/gimpimage.c:4377 msgctxt "undo-type" msgid "Remove Layer" msgstr "Удаление слоя" -#: ../app/core/gimpimage.c:4364 +#: ../app/core/gimpimage.c:4371 msgctxt "undo-type" msgid "Remove Floating Selection" msgstr "Удаление плавающего выделения" -#: ../app/core/gimpimage.c:4531 +#: ../app/core/gimpimage.c:4538 msgctxt "undo-type" msgid "Add Channel" msgstr "Добавление канала" -#: ../app/core/gimpimage.c:4559 ../app/core/gimpimage.c:4583 +#: ../app/core/gimpimage.c:4566 ../app/core/gimpimage.c:4590 msgctxt "undo-type" msgid "Remove Channel" msgstr "Удаление канала" -#: ../app/core/gimpimage.c:4639 +#: ../app/core/gimpimage.c:4646 msgctxt "undo-type" msgid "Add Path" msgstr "Добавление контура" -#: ../app/core/gimpimage.c:4669 ../app/core/gimpimage.c:4676 +#: ../app/core/gimpimage.c:4676 ../app/core/gimpimage.c:4683 msgctxt "undo-type" msgid "Remove Path" msgstr "Удаление контура" @@ -12740,98 +12887,98 @@ msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "Добавление цвета в цветовую карту" -#: ../app/core/gimpimage-convert-indexed.c:789 +#: ../app/core/gimpimage-convert-indexed.c:786 msgid "Cannot convert image: palette is empty." msgstr "Невозможно преобразовать изображение: палитра пуста." -#: ../app/core/gimpimage-convert-indexed.c:803 +#: ../app/core/gimpimage-convert-indexed.c:798 msgctxt "undo-type" msgid "Convert Image to Indexed" msgstr "Преобразование в индексированное" -#: ../app/core/gimpimage-convert-indexed.c:884 +#: ../app/core/gimpimage-convert-indexed.c:890 msgid "Converting to indexed colors (stage 2)" msgstr "Идёт преобразование в индексированные цвета (2 этап)..." -#: ../app/core/gimpimage-convert-indexed.c:932 +#: ../app/core/gimpimage-convert-indexed.c:939 msgid "Converting to indexed colors (stage 3)" msgstr "Идёт преобразование в индексированные цвета (3 этап)..." -#: ../app/core/gimpimage-convert-precision.c:83 +#: ../app/core/gimpimage-convert-precision.c:76 msgctxt "undo-type" msgid "Convert Image to 8 bit linear integer" msgstr "Преобразование в индексированное" -#: ../app/core/gimpimage-convert-precision.c:86 +#: ../app/core/gimpimage-convert-precision.c:79 msgctxt "undo-type" msgid "Convert Image to 8 bit gamma integer" msgstr "Преобразование в индексированное" -#: ../app/core/gimpimage-convert-precision.c:89 +#: ../app/core/gimpimage-convert-precision.c:82 msgctxt "undo-type" msgid "Convert Image to 16 bit linear integer" msgstr "Преобразование в индексированное" -#: ../app/core/gimpimage-convert-precision.c:92 +#: ../app/core/gimpimage-convert-precision.c:85 msgctxt "undo-type" msgid "Convert Image to 16 bit gamma integer" msgstr "Преобразование в индексированное" -#: ../app/core/gimpimage-convert-precision.c:95 +#: ../app/core/gimpimage-convert-precision.c:88 msgctxt "undo-type" msgid "Convert Image to 32 bit linear integer" msgstr "Преобразование в индексированное" -#: ../app/core/gimpimage-convert-precision.c:98 +#: ../app/core/gimpimage-convert-precision.c:91 msgctxt "undo-type" msgid "Convert Image to 32 bit gamma integer" msgstr "Преобразование в индексированное" -#: ../app/core/gimpimage-convert-precision.c:101 +#: ../app/core/gimpimage-convert-precision.c:94 msgctxt "undo-type" msgid "Convert Image to 16 bit linear floating point" msgstr "Преобразовать изображение в индексированное" -#: ../app/core/gimpimage-convert-precision.c:104 +#: ../app/core/gimpimage-convert-precision.c:97 msgctxt "undo-type" msgid "Convert Image to 16 bit gamma floating point" msgstr "Преобразовать изображение в индексированное" -#: ../app/core/gimpimage-convert-precision.c:107 +#: ../app/core/gimpimage-convert-precision.c:100 msgctxt "undo-type" msgid "Convert Image to 32 bit linear floating point" msgstr "Преобразовать изображение в индексированное" -#: ../app/core/gimpimage-convert-precision.c:110 +#: ../app/core/gimpimage-convert-precision.c:103 msgctxt "undo-type" msgid "Convert Image to 32 bit gamma floating point" msgstr "Преобразовать изображение в индексированное" -#: ../app/core/gimpimage-convert-precision.c:113 +#: ../app/core/gimpimage-convert-precision.c:106 msgctxt "undo-type" msgid "Convert Image to 64 bit linear floating point" msgstr "Преобразовать изображение в индексированное" -#: ../app/core/gimpimage-convert-precision.c:116 +#: ../app/core/gimpimage-convert-precision.c:109 msgctxt "undo-type" msgid "Convert Image to 64 bit gamma floating point" msgstr "Преобразовать изображение в индексированное" #. dithering -#: ../app/core/gimpimage-convert-precision.c:284 -#: ../app/core/gimpimage-convert-precision.c:298 +#: ../app/core/gimpimage-convert-precision.c:267 +#: ../app/core/gimpimage-convert-precision.c:288 #: ../app/dialogs/convert-indexed-dialog.c:236 #: ../app/dialogs/convert-precision-dialog.c:221 -#: ../app/tools/gimpblendoptions.c:135 +#: ../app/tools/gimpgradientoptions.c:136 msgid "Dithering" msgstr "Подмешивание шума" -#: ../app/core/gimpimage-convert-type.c:83 +#: ../app/core/gimpimage-convert-type.c:81 msgctxt "undo-type" msgid "Convert Image to RGB" msgstr "Преобразование в RGB" -#: ../app/core/gimpimage-convert-type.c:87 +#: ../app/core/gimpimage-convert-type.c:85 msgctxt "undo-type" msgid "Convert Image to Grayscale" msgstr "Преобразование в градации серого" @@ -12841,7 +12988,7 @@ msgctxt "undo-type" msgid "Crop Image" msgstr "Кадрирование изображения" -#: ../app/core/gimpimage-crop.c:75 ../app/core/gimpimage-resize.c:90 +#: ../app/core/gimpimage-crop.c:75 ../app/core/gimpimage-resize.c:91 msgctxt "undo-type" msgid "Resize Image" msgstr "Смена размера изображения" @@ -12866,22 +13013,22 @@ msgctxt "undo-type" msgid "Move Guide" msgstr "Перемещение направляющей" -#: ../app/core/gimpimage-item-list.c:116 +#: ../app/core/gimpimage-item-list.c:117 msgctxt "undo-type" msgid "Translate Items" msgstr "Перенос элементов" -#: ../app/core/gimpimage-item-list.c:156 +#: ../app/core/gimpimage-item-list.c:157 msgctxt "undo-type" msgid "Flip Items" msgstr "Отражение элементов" -#: ../app/core/gimpimage-item-list.c:195 ../app/core/gimpitem-linked.c:164 +#: ../app/core/gimpimage-item-list.c:196 ../app/core/gimpitem-linked.c:164 msgctxt "undo-type" msgid "Rotate Items" msgstr "Вращение элементов" -#: ../app/core/gimpimage-item-list.c:236 +#: ../app/core/gimpimage-item-list.c:246 msgctxt "undo-type" msgid "Transform Items" msgstr "Преобразование элементов" @@ -12940,12 +13087,12 @@ msgid "Not enough visible paths for a merge. There must be at least two." msgstr "" "Недостаточно видимых контуров для объединения. Должно быть хотя бы два." -#: ../app/core/gimpimage-quick-mask.c:89 +#: ../app/core/gimpimage-quick-mask.c:88 msgctxt "undo-type" msgid "Enable Quick Mask" msgstr "Включение быстрой маски" -#: ../app/core/gimpimage-quick-mask.c:121 +#: ../app/core/gimpimage-quick-mask.c:120 msgctxt "undo-type" msgid "Disable Quick Mask" msgstr "Выключение быстрой маски" @@ -12965,18 +13112,18 @@ msgctxt "undo-type" msgid "Move Sample Point" msgstr "Перемещение образцовой точки" -#: ../app/core/gimpimage-scale.c:86 +#: ../app/core/gimpimage-scale.c:79 msgctxt "undo-type" msgid "Scale Image" msgstr "Смена размера изображения" -#: ../app/core/gimpimage-undo-push.c:996 +#: ../app/core/gimpimage-undo-push.c:1028 #, c-format msgid "Can't undo %s" msgstr "Невозможно отменить %s" -#: ../app/core/gimpimagefile.c:750 ../app/dialogs/preferences-dialog.c:1838 -#: ../app/dialogs/preferences-dialog.c:1944 +#: ../app/core/gimpimagefile.c:750 ../app/dialogs/preferences-dialog.c:1842 +#: ../app/dialogs/preferences-dialog.c:1948 msgid "Folder" msgstr "Каталог" @@ -13031,17 +13178,17 @@ msgstr[2] "%d слоёв" msgid "Could not open thumbnail '%s': %s" msgstr "Не удалось открыть файл миниатюр '%s': %s" -#: ../app/core/gimpitem.c:2022 +#: ../app/core/gimpitem.c:2075 msgctxt "undo-type" msgid "Attach Parasite" msgstr "Присоединение паразита" -#: ../app/core/gimpitem.c:2032 +#: ../app/core/gimpitem.c:2085 msgctxt "undo-type" msgid "Attach Parasite to Item" msgstr "Присоединение паразита к объекту" -#: ../app/core/gimpitem.c:2083 ../app/core/gimpitem.c:2090 +#: ../app/core/gimpitem.c:2136 ../app/core/gimpitem.c:2143 msgctxt "undo-type" msgid "Remove Parasite from Item" msgstr "Удаление паразита из объекта" @@ -13059,7 +13206,7 @@ msgctxt "undo-type" msgid "Anchor Floating Selection" msgstr "Прикрепление плавающего выделения" -#: ../app/core/gimplayer-floating-selection.c:175 ../app/core/gimplayer.c:1035 +#: ../app/core/gimplayer-floating-selection.c:175 ../app/core/gimplayer.c:1037 msgid "" "Cannot create a new layer from the floating selection because it belongs to " "a layer mask or channel." @@ -13073,76 +13220,76 @@ msgctxt "undo-type" msgid "Floating Selection to Layer" msgstr "Плавающее выделение в слой" -#: ../app/core/gimplayer.c:439 +#: ../app/core/gimplayer.c:441 msgctxt "undo-type" msgid "Rename Layer" msgstr "Переименование слоя" -#: ../app/core/gimplayer.c:440 +#: ../app/core/gimplayer.c:442 msgctxt "undo-type" msgid "Move Layer" msgstr "Перемещение слоя" -#: ../app/core/gimplayer.c:441 +#: ../app/core/gimplayer.c:443 msgctxt "undo-type" msgid "Scale Layer" msgstr "Масштабирование слоя" -#: ../app/core/gimplayer.c:442 +#: ../app/core/gimplayer.c:444 msgctxt "undo-type" msgid "Resize Layer" msgstr "Смена размера слоя" -#: ../app/core/gimplayer.c:443 +#: ../app/core/gimplayer.c:445 msgctxt "undo-type" msgid "Flip Layer" msgstr "Отражение слоя" -#: ../app/core/gimplayer.c:444 +#: ../app/core/gimplayer.c:446 msgctxt "undo-type" msgid "Rotate Layer" msgstr "Вращение слоя" -#: ../app/core/gimplayer.c:447 +#: ../app/core/gimplayer.c:449 msgctxt "undo-type" msgid "Reorder Layer" msgstr "Реорганизация слоёв" -#: ../app/core/gimplayer.c:448 +#: ../app/core/gimplayer.c:450 msgctxt "undo-type" msgid "Raise Layer" msgstr "Поднятие слоя" -#: ../app/core/gimplayer.c:449 +#: ../app/core/gimplayer.c:451 msgctxt "undo-type" msgid "Raise Layer to Top" msgstr "Поднятие слоя наверх" -#: ../app/core/gimplayer.c:450 +#: ../app/core/gimplayer.c:452 msgctxt "undo-type" msgid "Lower Layer" msgstr "Опускание слоя" -#: ../app/core/gimplayer.c:451 +#: ../app/core/gimplayer.c:453 msgctxt "undo-type" msgid "Lower Layer to Bottom" msgstr "Опускание слоя вниз" -#: ../app/core/gimplayer.c:452 +#: ../app/core/gimplayer.c:454 msgid "Layer cannot be raised higher." msgstr "Cлой невозможно поднять выше." -#: ../app/core/gimplayer.c:453 +#: ../app/core/gimplayer.c:455 msgid "Layer cannot be lowered more." msgstr "Слой невозможно опустить ниже." -#: ../app/core/gimplayer.c:742 ../app/core/gimplayer.c:1812 +#: ../app/core/gimplayer.c:744 ../app/core/gimplayer.c:1905 #: ../app/core/gimplayermask.c:257 #, c-format msgid "%s mask" msgstr "%s маска" -#: ../app/core/gimplayer.c:781 +#: ../app/core/gimplayer.c:783 #, c-format msgid "" "Floating Selection\n" @@ -13151,62 +13298,62 @@ msgstr "" "Плавающее выделение\n" "(%s)" -#: ../app/core/gimplayer.c:1718 +#: ../app/core/gimplayer.c:1811 msgid "Unable to add a layer mask since the layer already has one." msgstr "Не удалось добавить маску слоя, так как у слоя уже есть маска." -#: ../app/core/gimplayer.c:1729 +#: ../app/core/gimplayer.c:1822 msgid "Cannot add layer mask of different dimensions than specified layer." msgstr "" "Невозможно добавить маску слоя, отличающуюся\n" " размерами от указанного слоя." -#: ../app/core/gimplayer.c:1735 +#: ../app/core/gimplayer.c:1828 msgctxt "undo-type" msgid "Add Layer Mask" msgstr "Добавление маски слоя" -#: ../app/core/gimplayer.c:1863 +#: ../app/core/gimplayer.c:1956 msgctxt "undo-type" msgid "Transfer Alpha to Mask" msgstr "Создание маски из альфа-канала" -#: ../app/core/gimplayer.c:2019 +#: ../app/core/gimplayer.c:2112 msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "Применение маски слоя" -#: ../app/core/gimplayer.c:2020 +#: ../app/core/gimplayer.c:2113 msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "Удаление маски слоя" -#: ../app/core/gimplayer.c:2122 +#: ../app/core/gimplayer.c:2215 msgctxt "undo-type" msgid "Enable Layer Mask" msgstr "Включить маску слоя" -#: ../app/core/gimplayer.c:2123 +#: ../app/core/gimplayer.c:2216 msgctxt "undo-type" msgid "Disable Layer Mask" msgstr "Выключить маску слоя" -#: ../app/core/gimplayer.c:2199 +#: ../app/core/gimplayer.c:2292 msgctxt "undo-type" msgid "Show Layer Mask" msgstr "Показывание маски слоя" -#: ../app/core/gimplayer.c:2272 +#: ../app/core/gimplayer.c:2365 msgctxt "undo-type" msgid "Add Alpha Channel" msgstr "Добавление альфа-канала" -#: ../app/core/gimplayer.c:2307 +#: ../app/core/gimplayer.c:2400 msgctxt "undo-type" msgid "Remove Alpha Channel" msgstr "Удаление альфа-канала" -#: ../app/core/gimplayer.c:2328 +#: ../app/core/gimplayer.c:2421 msgctxt "undo-type" msgid "Layer to Image Size" msgstr "Слой к размеру изображения" @@ -13238,17 +13385,17 @@ msgstr "Применить сохранённую кисть" #. TRANSLATORS: the "%s" is an item title and "%u" is the number of #. occurrences for this item. -#: ../app/core/gimppalette-import.c:210 +#: ../app/core/gimppalette-import.c:212 #, c-format msgid "%s (occurs %u)" msgstr "%s (встречается %u раз)" -#: ../app/core/gimppalette-import.c:423 +#: ../app/core/gimppalette-import.c:425 #, c-format msgid "Index %d" msgstr "Индекс %d" -#: ../app/core/gimppalette-import.c:545 +#: ../app/core/gimppalette-import.c:547 #, c-format msgid "Unknown type of palette file: %s" msgstr "Неизвестный тип файла палитры: %s" @@ -13426,22 +13573,22 @@ msgstr "Нет заливаемого выделения." msgid "There is no selection to stroke." msgstr "Нет обводимого выделения" -#: ../app/core/gimpselection.c:749 +#: ../app/core/gimpselection.c:696 msgid "Unable to cut or copy because the selected region is empty." msgstr "Не удалось вырезать/скопировать: выделенная область пуста." -#: ../app/core/gimpselection.c:867 +#: ../app/core/gimpselection.c:814 msgid "Cannot float selection because the selected region is empty." msgstr "" "Невозможно создать плавающее выделение,\n" "потому что выделенная область пуста." -#: ../app/core/gimpselection.c:874 +#: ../app/core/gimpselection.c:821 msgctxt "undo-type" msgid "Float Selection" msgstr "Выделение в плавающий слой" -#: ../app/core/gimpselection.c:892 +#: ../app/core/gimpselection.c:839 msgid "Floated Layer" msgstr "Плавающий слой" @@ -13493,16 +13640,16 @@ msgid "Emulate brush dynamics" msgstr "Имитировать динамику кисти" #. no undo (or redo) steps available -#: ../app/core/gimpsymmetry.c:132 ../app/widgets/gimpimagepropview.c:399 +#: ../app/core/gimpsymmetry.c:134 ../app/widgets/gimpimagepropview.c:399 #: ../app/widgets/gimpsymmetryeditor.c:169 msgid "None" msgstr "Нет" -#: ../app/core/gimpsymmetry.c:145 +#: ../app/core/gimpsymmetry.c:148 msgid "Active" msgstr "Активный контур" -#: ../app/core/gimpsymmetry.c:146 +#: ../app/core/gimpsymmetry.c:149 msgid "Activate symmetry painting" msgstr "Включить симметричное рисование" @@ -13904,7 +14051,7 @@ msgid "Select Soft-Proof Profile" msgstr "Выбор цветового профиля принтера" #: ../app/dialogs/color-profile-dialog.c:209 -#: ../app/tools/gimpforegroundselecttool.c:308 +#: ../app/tools/gimpforegroundselecttool.c:314 msgid "_Select" msgstr "В_ыделить" @@ -13999,7 +14146,7 @@ msgid "Enable dithering of _transparency" msgstr "Применить к _альфа-каналу" #: ../app/dialogs/convert-indexed-dialog.c:275 -#: ../app/dialogs/preferences-dialog.c:2163 +#: ../app/dialogs/preferences-dialog.c:2167 msgid "Enable dithering of text layers" msgstr "Применить подмешивание шума к текстовым слоям" @@ -14287,7 +14434,7 @@ msgid "Create a New Image" msgstr "Создать новое изображение" #: ../app/dialogs/image-new-dialog.c:138 -#: ../app/dialogs/preferences-dialog.c:1664 +#: ../app/dialogs/preferences-dialog.c:1668 msgid "_Template:" msgstr "_Шаблон:" @@ -14318,9 +14465,9 @@ msgstr "Свойства изображения" #: ../app/dialogs/image-properties-dialog.c:68 #: ../app/dialogs/input-devices-dialog.c:62 #: ../app/dialogs/keyboard-shortcuts-dialog.c:55 -#: ../app/dialogs/module-dialog.c:134 ../app/tools/gimpblendtool-editor.c:1851 -#: ../app/tools/gimpcolorpickertool.c:349 ../app/tools/gimpmeasuretool.c:651 -#: ../app/widgets/gimpcontrollerlist.c:640 +#: ../app/dialogs/module-dialog.c:134 ../app/tools/gimpcolorpickertool.c:349 +#: ../app/tools/gimpgradienttool-editor.c:1854 +#: ../app/tools/gimpmeasuretool.c:651 ../app/widgets/gimpcontrollerlist.c:640 #: ../app/widgets/gimpcriticaldialog.c:97 ../app/widgets/gimppdbdialog.c:175 #: ../app/widgets/gimpsettingsbox.c:663 ../app/widgets/gimptexteditor.c:162 msgid "_Close" @@ -14601,7 +14748,7 @@ msgstr "Смещение канала" #. The offset frame #: ../app/dialogs/offset-dialog.c:129 ../app/dialogs/offset-dialog.c:163 #: ../app/dialogs/resize-dialog.c:230 ../app/tools/gimpalignoptions.c:100 -#: ../app/tools/gimpalignoptions.c:107 ../app/tools/gimpblendoptions.c:88 +#: ../app/tools/gimpalignoptions.c:107 ../app/tools/gimpgradientoptions.c:89 #: ../app/widgets/gimpgrideditor.c:209 msgid "Offset" msgstr "Смещение" @@ -14654,7 +14801,7 @@ msgid "Select Source" msgstr "Выбрать источник" #: ../app/dialogs/palette-import-dialog.c:212 -#: ../app/dialogs/preferences-dialog.c:1626 +#: ../app/dialogs/preferences-dialog.c:1630 msgid "_Gradient" msgstr "_Градиент" @@ -14706,7 +14853,7 @@ msgstr "_Интервал:" #. The "Preview" frame #: ../app/dialogs/palette-import-dialog.c:360 -#: ../app/tools/gimpforegroundselecttool.c:1214 +#: ../app/tools/gimpforegroundselecttool.c:1223 msgid "Preview" msgstr "Просмотр" @@ -14732,22 +14879,22 @@ msgstr "" "Надо перезапустить GIMP, чтобы\n" "подействовали следующие изменения:" -#: ../app/dialogs/preferences-dialog.c:615 +#: ../app/dialogs/preferences-dialog.c:619 msgid "" "Your keyboard shortcuts will be reset to default values the next time you " "start GIMP." msgstr "" "При следующем запуске GIMP будут использованы типовые комбинации клавиш." -#: ../app/dialogs/preferences-dialog.c:626 +#: ../app/dialogs/preferences-dialog.c:630 msgid "Remove all Keyboard Shortcuts" msgstr "Удалить все комбинации клавиш" -#: ../app/dialogs/preferences-dialog.c:648 +#: ../app/dialogs/preferences-dialog.c:652 msgid "Do you really want to remove all keyboard shortcuts from all menus?" msgstr "Действительно удалить все комбинации клавиш из всех меню?" -#: ../app/dialogs/preferences-dialog.c:689 +#: ../app/dialogs/preferences-dialog.c:693 msgid "" "Your window setup will be reset to default values the next time you start " "GIMP." @@ -14755,7 +14902,7 @@ msgstr "" "При следующем запуске GIMP для окон будут использованы предпочтения по " "умолчанию." -#: ../app/dialogs/preferences-dialog.c:724 +#: ../app/dialogs/preferences-dialog.c:728 msgid "" "Your input device settings will be reset to default values the next time you " "start GIMP." @@ -14763,7 +14910,7 @@ msgstr "" "При следующем запуске GIMP для устройств ввода будут использованы " "предпочтения по умолчанию." -#: ../app/dialogs/preferences-dialog.c:766 +#: ../app/dialogs/preferences-dialog.c:770 msgid "" "Your tool options will be reset to default values the next time you start " "GIMP." @@ -14771,110 +14918,110 @@ msgstr "" "При следующем запуске GIMP для параметров инструментов будут использованы " "исходные параметры." -#: ../app/dialogs/preferences-dialog.c:818 -#: ../app/dialogs/preferences-dialog.c:2436 +#: ../app/dialogs/preferences-dialog.c:822 +#: ../app/dialogs/preferences-dialog.c:2456 msgid "There's a local installation of the user manual." msgstr "Руководство пользователя установлено локально" -#: ../app/dialogs/preferences-dialog.c:823 -#: ../app/dialogs/preferences-dialog.c:2442 +#: ../app/dialogs/preferences-dialog.c:827 +#: ../app/dialogs/preferences-dialog.c:2462 msgid "The user manual is not installed locally." msgstr "Руководство пользователя не установлено локально" -#: ../app/dialogs/preferences-dialog.c:930 +#: ../app/dialogs/preferences-dialog.c:934 msgid "Show _menubar" msgstr "Показывать _панель меню" -#: ../app/dialogs/preferences-dialog.c:934 +#: ../app/dialogs/preferences-dialog.c:938 msgid "Show _rulers" msgstr "Показывать _линейки" -#: ../app/dialogs/preferences-dialog.c:937 +#: ../app/dialogs/preferences-dialog.c:941 msgid "Show scroll_bars" msgstr "Показывать полосы п_рокрутки" -#: ../app/dialogs/preferences-dialog.c:940 +#: ../app/dialogs/preferences-dialog.c:944 msgid "Show s_tatusbar" msgstr "Показывать с_троку состояния" -#: ../app/dialogs/preferences-dialog.c:948 +#: ../app/dialogs/preferences-dialog.c:952 msgid "Show s_election" msgstr "Показывать _выделение" -#: ../app/dialogs/preferences-dialog.c:951 +#: ../app/dialogs/preferences-dialog.c:955 msgid "Show _layer boundary" msgstr "Показывать _границы слоя" -#: ../app/dialogs/preferences-dialog.c:954 +#: ../app/dialogs/preferences-dialog.c:958 msgid "Show _guides" msgstr "Показывать _направляющие" -#: ../app/dialogs/preferences-dialog.c:957 +#: ../app/dialogs/preferences-dialog.c:961 msgid "Show gri_d" msgstr "Показывать _сетку" -#: ../app/dialogs/preferences-dialog.c:963 +#: ../app/dialogs/preferences-dialog.c:967 msgid "Canvas _padding mode:" msgstr "Цвет фона вокруг изображения:" -#: ../app/dialogs/preferences-dialog.c:968 +#: ../app/dialogs/preferences-dialog.c:972 msgid "Custom p_adding color:" msgstr "Определить цвет фона:" -#: ../app/dialogs/preferences-dialog.c:969 +#: ../app/dialogs/preferences-dialog.c:973 msgid "Select Custom Canvas Padding Color" msgstr "Установить свой цвет фона вокруг изображения" -#: ../app/dialogs/preferences-dialog.c:999 +#: ../app/dialogs/preferences-dialog.c:1003 msgid "Snap to Guides" msgstr "Прилипать к направляющим" -#: ../app/dialogs/preferences-dialog.c:1002 +#: ../app/dialogs/preferences-dialog.c:1006 msgid "Snap to Grid" msgstr "Прилипать к сетке" -#: ../app/dialogs/preferences-dialog.c:1010 +#: ../app/dialogs/preferences-dialog.c:1014 msgid "Snap to Canvas Edges" msgstr "Прилипать к краям холста" -#: ../app/dialogs/preferences-dialog.c:1013 +#: ../app/dialogs/preferences-dialog.c:1017 msgid "Snap to Active Path" msgstr "Прилипать к активному контуру" -#: ../app/dialogs/preferences-dialog.c:1090 +#: ../app/dialogs/preferences-dialog.c:1094 msgid "Preferences" msgstr "Параметры" -#: ../app/dialogs/preferences-dialog.c:1126 -#: ../app/dialogs/preferences-dialog.c:1127 +#: ../app/dialogs/preferences-dialog.c:1130 +#: ../app/dialogs/preferences-dialog.c:1131 msgid "System Resources" msgstr "Системные ресурсы" -#: ../app/dialogs/preferences-dialog.c:1134 +#: ../app/dialogs/preferences-dialog.c:1138 msgid "Resource Consumption" msgstr "Конфигурирование ресурсов" -#: ../app/dialogs/preferences-dialog.c:1144 +#: ../app/dialogs/preferences-dialog.c:1148 msgid "Minimal number of _undo levels:" msgstr "Мин. число _уровней отмены:" -#: ../app/dialogs/preferences-dialog.c:1147 +#: ../app/dialogs/preferences-dialog.c:1151 msgid "Maximum undo _memory:" msgstr "Максимально памяти для _отмены:" -#: ../app/dialogs/preferences-dialog.c:1150 +#: ../app/dialogs/preferences-dialog.c:1154 msgid "Tile cache _size:" msgstr "Размер _кэша:" -#: ../app/dialogs/preferences-dialog.c:1153 +#: ../app/dialogs/preferences-dialog.c:1157 msgid "Maximum _new image size:" msgstr "Макс. размер _нового изображения:" -#: ../app/dialogs/preferences-dialog.c:1158 +#: ../app/dialogs/preferences-dialog.c:1162 msgid "Number of _threads to use:" msgstr "Число используемых _потоков:" -#: ../app/dialogs/preferences-dialog.c:1163 +#: ../app/dialogs/preferences-dialog.c:1167 msgid "" "Threading support is not yet stable.\n" "Setting this to greater than one might\n" @@ -14885,38 +15032,38 @@ msgstr "" "привести к ошибкам и падению программы." #. Hardware Acceleration -#: ../app/dialogs/preferences-dialog.c:1173 +#: ../app/dialogs/preferences-dialog.c:1177 msgid "Hardware Acceleration" msgstr "Аппаратное ускорение" -#: ../app/dialogs/preferences-dialog.c:1177 +#: ../app/dialogs/preferences-dialog.c:1181 msgid "Use OpenCL" msgstr "Использовать OpenCL" #. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1181 +#: ../app/dialogs/preferences-dialog.c:1185 msgid "Image Thumbnails" msgstr "Миниатюры изображений" -#: ../app/dialogs/preferences-dialog.c:1186 +#: ../app/dialogs/preferences-dialog.c:1190 msgid "Size of _thumbnails:" msgstr "Размер файлов _миниатюр:" -#: ../app/dialogs/preferences-dialog.c:1190 +#: ../app/dialogs/preferences-dialog.c:1194 msgid "Maximum _filesize for thumbnailing:" msgstr "Макс. размер _файлов миниатюр:" -#: ../app/dialogs/preferences-dialog.c:1200 +#: ../app/dialogs/preferences-dialog.c:1204 msgid "Keep record of used files in the Recent Documents list" msgstr "Хранить список недавно открывавшихся файлов" #. TODO: icon needed. -#: ../app/dialogs/preferences-dialog.c:1215 -#: ../app/dialogs/preferences-dialog.c:1216 +#: ../app/dialogs/preferences-dialog.c:1219 +#: ../app/dialogs/preferences-dialog.c:1220 msgid "Debugging" msgstr "Отладка" -#: ../app/dialogs/preferences-dialog.c:1223 +#: ../app/dialogs/preferences-dialog.c:1227 msgid "" "We hope you will never need these settings, but as all software, GIMP has " "bugs, and crashes can occur. If it happens, you can help us by reporting " @@ -14925,19 +15072,19 @@ msgstr "" "В любой программе бывают ошибки.\n" "Будем признательны за сообщения о проблемах при работе с GIMP." -#: ../app/dialogs/preferences-dialog.c:1232 +#: ../app/dialogs/preferences-dialog.c:1236 msgid "Bug Reporting" msgstr "Отчёты об ошибках" -#: ../app/dialogs/preferences-dialog.c:1239 -msgid "Debug Policy" -msgstr "Параметры отладки" +#: ../app/dialogs/preferences-dialog.c:1243 +msgid "Debug _policy:" +msgstr "_Когда выполнять отладку:" -#: ../app/dialogs/preferences-dialog.c:1251 +#: ../app/dialogs/preferences-dialog.c:1255 msgid "This feature requires \"gdb\" or \"lldb\" installed on your system." msgstr "В системе не хватает приложения GDB или LLDB для работы этой функции." -#: ../app/dialogs/preferences-dialog.c:1255 +#: ../app/dialogs/preferences-dialog.c:1259 msgid "" "This feature is more efficient with \"gdb\" or \"lldb\" installed on your " "system." @@ -14945,703 +15092,711 @@ msgstr "" "Эта функция работает эффективнее, когда в системе установлено приложение GDB " "или LLDB" -#: ../app/dialogs/preferences-dialog.c:1268 -#: ../app/dialogs/preferences-dialog.c:1269 +#: ../app/dialogs/preferences-dialog.c:1272 +#: ../app/dialogs/preferences-dialog.c:1273 msgid "Color Management" msgstr "Управление цветом" -#: ../app/dialogs/preferences-dialog.c:1278 +#: ../app/dialogs/preferences-dialog.c:1282 msgid "Reset Color Management" msgstr "Обнулить параметры управления цветом" -#: ../app/dialogs/preferences-dialog.c:1301 +#: ../app/dialogs/preferences-dialog.c:1305 msgid "Image display _mode:" msgstr "_Режим показа изображений:" #. Color Managed Display -#: ../app/dialogs/preferences-dialog.c:1305 +#: ../app/dialogs/preferences-dialog.c:1309 msgid "Color Managed Display" msgstr "Цветоуправляемый экран" -#: ../app/dialogs/preferences-dialog.c:1314 +#: ../app/dialogs/preferences-dialog.c:1318 msgid "Select Monitor Color Profile" msgstr "Выберите цветовой профиль монитора" -#: ../app/dialogs/preferences-dialog.c:1315 +#: ../app/dialogs/preferences-dialog.c:1319 msgid "_Monitor profile:" msgstr "Профиль _монитора:" -#: ../app/dialogs/preferences-dialog.c:1321 +#: ../app/dialogs/preferences-dialog.c:1325 msgid "_Try to use the system monitor profile" msgstr "_Использовать системный ICC-профиль монитора" -#: ../app/dialogs/preferences-dialog.c:1330 +#: ../app/dialogs/preferences-dialog.c:1334 msgid "_Rendering intent:" msgstr "Тип _цветопередачи:" -#: ../app/dialogs/preferences-dialog.c:1335 +#: ../app/dialogs/preferences-dialog.c:1339 msgid "Use _black point compensation" msgstr "Использовать _компенсацию чёрной точки" -#: ../app/dialogs/preferences-dialog.c:1343 -#: ../app/dialogs/preferences-dialog.c:1379 ../app/paint/gimpinkoptions.c:93 +#: ../app/dialogs/preferences-dialog.c:1347 +#: ../app/dialogs/preferences-dialog.c:1383 ../app/paint/gimpinkoptions.c:93 msgid "Speed" msgstr "Скорость" -#: ../app/dialogs/preferences-dialog.c:1344 -#: ../app/dialogs/preferences-dialog.c:1380 +#: ../app/dialogs/preferences-dialog.c:1348 +#: ../app/dialogs/preferences-dialog.c:1384 msgid "Precision / Color Fidelity" msgstr "Точность цветовоспризведения" -#: ../app/dialogs/preferences-dialog.c:1345 +#: ../app/dialogs/preferences-dialog.c:1349 msgid "_Optimize image display for:" msgstr "Пр_едпочитать:" #. Print Simulation (Soft-proofing) -#: ../app/dialogs/preferences-dialog.c:1349 +#: ../app/dialogs/preferences-dialog.c:1353 msgid "Soft-Proofing" msgstr "Программная цветопроба" -#: ../app/dialogs/preferences-dialog.c:1359 +#: ../app/dialogs/preferences-dialog.c:1363 msgid "Select Soft-Proofing Color Profile" msgstr "Выберите профиль для программной цветопробы" -#: ../app/dialogs/preferences-dialog.c:1360 +#: ../app/dialogs/preferences-dialog.c:1364 msgid "_Soft-proofing profile:" msgstr "Профиль для _цветопробы:" -#: ../app/dialogs/preferences-dialog.c:1366 +#: ../app/dialogs/preferences-dialog.c:1370 msgid "Re_ndering intent:" msgstr "_Тип цветопередачи:" -#: ../app/dialogs/preferences-dialog.c:1371 +#: ../app/dialogs/preferences-dialog.c:1375 msgid "Use black _point compensation" msgstr "Использовать компенсацию _чёрной точки" -#: ../app/dialogs/preferences-dialog.c:1381 +#: ../app/dialogs/preferences-dialog.c:1385 msgid "O_ptimize soft-proofing for:" msgstr "Предпо_читать:" -#: ../app/dialogs/preferences-dialog.c:1390 +#: ../app/dialogs/preferences-dialog.c:1394 msgid "Mark out of gamut colors" msgstr "Помечать цвета вне цветового охвата" -#: ../app/dialogs/preferences-dialog.c:1395 +#: ../app/dialogs/preferences-dialog.c:1399 msgid "Select Warning Color" msgstr "Выберите цвет предупреждения" #. Preferred profiles -#: ../app/dialogs/preferences-dialog.c:1406 +#: ../app/dialogs/preferences-dialog.c:1410 msgid "Preferred Profiles" msgstr "Предпочитаемые профили" -#: ../app/dialogs/preferences-dialog.c:1415 +#: ../app/dialogs/preferences-dialog.c:1419 msgid "Select Preferred RGB Color Profile" msgstr "Выберите предпочитаемый цветовой профиль RGB" -#: ../app/dialogs/preferences-dialog.c:1416 +#: ../app/dialogs/preferences-dialog.c:1420 msgid "_RGB profile:" msgstr "Проф_иль RGB:" -#: ../app/dialogs/preferences-dialog.c:1423 +#: ../app/dialogs/preferences-dialog.c:1427 msgid "Select Preferred Grayscale Color Profile" msgstr "Выберите предпочитаемый цветовой профиль для градаций серого" -#: ../app/dialogs/preferences-dialog.c:1424 +#: ../app/dialogs/preferences-dialog.c:1428 msgid "_Grayscale profile:" msgstr "Профиль _градаций серого:" -#: ../app/dialogs/preferences-dialog.c:1431 +#: ../app/dialogs/preferences-dialog.c:1435 msgid "Select CMYK Color Profile" msgstr "Выберите профиль CMYK" -#: ../app/dialogs/preferences-dialog.c:1432 +#: ../app/dialogs/preferences-dialog.c:1436 msgid "_CMYK profile:" msgstr "Профиль _CMYK:" #. Policies -#: ../app/dialogs/preferences-dialog.c:1437 +#: ../app/dialogs/preferences-dialog.c:1441 msgid "Policies" msgstr "Правила" -#: ../app/dialogs/preferences-dialog.c:1442 +#: ../app/dialogs/preferences-dialog.c:1446 msgid "File Open behaviour:" msgstr "При открытии файла:" #. Filter Dialogs -#: ../app/dialogs/preferences-dialog.c:1446 +#: ../app/dialogs/preferences-dialog.c:1450 +#: ../app/dialogs/preferences-dialog.c:2171 msgid "Filter Dialogs" msgstr "Диалоги фильтров" -#: ../app/dialogs/preferences-dialog.c:1450 +#: ../app/dialogs/preferences-dialog.c:1454 +#: ../app/dialogs/preferences-dialog.c:2183 msgid "Show advanced color options" msgstr "Показывать параметры управления цветом" -#: ../app/dialogs/preferences-dialog.c:1464 -#: ../app/dialogs/preferences-dialog.c:1465 +#: ../app/dialogs/preferences-dialog.c:1468 +#: ../app/dialogs/preferences-dialog.c:1469 msgid "Image Import & Export" msgstr "Импорт и экспорт графики" #. Import Policies -#: ../app/dialogs/preferences-dialog.c:1471 +#: ../app/dialogs/preferences-dialog.c:1475 msgid "Import Policies" msgstr "Правила импорта" -#: ../app/dialogs/preferences-dialog.c:1475 +#: ../app/dialogs/preferences-dialog.c:1479 msgid "Promote imported images to _floating point precision" msgstr "Автоматически конвертировать в режим 32-бит с _плавающей точкой" -#: ../app/dialogs/preferences-dialog.c:1481 +#: ../app/dialogs/preferences-dialog.c:1485 msgid "Dither images when promoting to floating point" msgstr "Подмешивать шум при конвертировании в данные с плавающей точкой" -#: ../app/dialogs/preferences-dialog.c:1486 +#: ../app/dialogs/preferences-dialog.c:1490 msgid "Add an alpha channel to imported images" msgstr "Добавлять альфа-канал в импортируемые изображения" -#: ../app/dialogs/preferences-dialog.c:1491 -#: ../app/dialogs/preferences-dialog.c:2090 +#: ../app/dialogs/preferences-dialog.c:1495 +#: ../app/dialogs/preferences-dialog.c:2094 msgid "Color profile policy:" msgstr "Обработка ICC-профилей:" #. Export Policies -#: ../app/dialogs/preferences-dialog.c:1495 +#: ../app/dialogs/preferences-dialog.c:1499 msgid "Export Policies" msgstr "Правила экспорта" -#: ../app/dialogs/preferences-dialog.c:1499 +#: ../app/dialogs/preferences-dialog.c:1503 msgid "Export Exif metadata by default when available" msgstr "Экспортировать метаданные Exif по умолчанию, если они доступны" -#: ../app/dialogs/preferences-dialog.c:1502 +#: ../app/dialogs/preferences-dialog.c:1506 msgid "Export XMP metadata by default when available" msgstr "Экспортировать метаданные XMP по умолчанию, если они доступны" -#: ../app/dialogs/preferences-dialog.c:1505 +#: ../app/dialogs/preferences-dialog.c:1509 msgid "Export IPTC metadata by default when available" msgstr "Экспортировать метаданные IPTC по умолчанию, если они доступны" -#: ../app/dialogs/preferences-dialog.c:1508 +#: ../app/dialogs/preferences-dialog.c:1512 msgid "Metadata can contain sensitive information." msgstr "Метаданные могут содержать приватную информацию" #. Raw Image Importer -#: ../app/dialogs/preferences-dialog.c:1513 +#: ../app/dialogs/preferences-dialog.c:1517 msgid "Raw Image Importer" msgstr "Импорт фотографий в raw" -#: ../app/dialogs/preferences-dialog.c:1546 +#: ../app/dialogs/preferences-dialog.c:1550 msgid "Experimental Playground" msgstr "Экспериментальные функции" -#: ../app/dialogs/preferences-dialog.c:1547 +#: ../app/dialogs/preferences-dialog.c:1551 msgid "Playground" msgstr "Экспериментальные функции" -#: ../app/dialogs/preferences-dialog.c:1552 +#: ../app/dialogs/preferences-dialog.c:1556 msgid "Insane Options" msgstr "Функции, требующие серьёзной доработки" -#: ../app/dialogs/preferences-dialog.c:1556 +#: ../app/dialogs/preferences-dialog.c:1560 msgid "_N-Point Deformation tool" msgstr "Инструмент _деформации по точкам" -#: ../app/dialogs/preferences-dialog.c:1559 +#: ../app/dialogs/preferences-dialog.c:1563 msgid "_Seamless Clone tool" msgstr "Инструмент _бесшовного клонирования" -#: ../app/dialogs/preferences-dialog.c:1569 -#: ../app/dialogs/preferences-dialog.c:1570 +#: ../app/dialogs/preferences-dialog.c:1573 +#: ../app/dialogs/preferences-dialog.c:1574 msgctxt "preferences" msgid "Tool Options" msgstr "Параметры инструментов" #. General #. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1578 -#: ../app/dialogs/preferences-dialog.c:2380 -#: ../app/dialogs/preferences-dialog.c:2708 -#: ../app/dialogs/preferences-dialog.c:2939 +#: ../app/dialogs/preferences-dialog.c:1582 +#: ../app/dialogs/preferences-dialog.c:2400 +#: ../app/dialogs/preferences-dialog.c:2728 +#: ../app/dialogs/preferences-dialog.c:2959 #: ../app/widgets/gimpcontrollereditor.c:186 msgid "General" msgstr "Общая" -#: ../app/dialogs/preferences-dialog.c:1581 +#: ../app/dialogs/preferences-dialog.c:1585 msgid "_Save tool options on exit" msgstr "_Сохранять параметры инструментов при выходе" -#: ../app/dialogs/preferences-dialog.c:1585 +#: ../app/dialogs/preferences-dialog.c:1589 msgid "Save Tool Options _Now" msgstr "Сохранить _параметры инструментов" -#: ../app/dialogs/preferences-dialog.c:1592 +#: ../app/dialogs/preferences-dialog.c:1596 msgid "_Reset Saved Tool Options to Default Values" msgstr "_Восстановить исходные параметры инструментов" -#: ../app/dialogs/preferences-dialog.c:1606 +#: ../app/dialogs/preferences-dialog.c:1610 msgid "Default _interpolation:" msgstr "_Интерполяция по умолчанию:" #. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1613 +#: ../app/dialogs/preferences-dialog.c:1617 msgid "Paint Options Shared Between Tools" msgstr "Параметры рисования разделены между инструментами" -#: ../app/dialogs/preferences-dialog.c:1617 +#: ../app/dialogs/preferences-dialog.c:1621 msgid "_Brush" msgstr "_Кисть" -#: ../app/dialogs/preferences-dialog.c:1620 +#: ../app/dialogs/preferences-dialog.c:1624 msgid "_Dynamics" msgstr "_Динамика" -#: ../app/dialogs/preferences-dialog.c:1623 +#: ../app/dialogs/preferences-dialog.c:1627 msgid "_Pattern" msgstr "_Текстура" #. Move Tool -#: ../app/dialogs/preferences-dialog.c:1630 +#: ../app/dialogs/preferences-dialog.c:1634 msgid "Move Tool" msgstr "Инструмент перемещения" -#: ../app/dialogs/preferences-dialog.c:1634 +#: ../app/dialogs/preferences-dialog.c:1638 msgid "Set layer or path as active" msgstr "Делать слой или контур активным" -#: ../app/dialogs/preferences-dialog.c:1647 +#: ../app/dialogs/preferences-dialog.c:1651 msgid "Default New Image" msgstr "Свойства нового изображения" -#: ../app/dialogs/preferences-dialog.c:1648 +#: ../app/dialogs/preferences-dialog.c:1652 msgid "Default Image" msgstr "Изображение по умолчанию" -#: ../app/dialogs/preferences-dialog.c:1684 +#: ../app/dialogs/preferences-dialog.c:1688 msgid "Quick Mask color:" msgstr "Цвет быстрой маски:" -#: ../app/dialogs/preferences-dialog.c:1685 +#: ../app/dialogs/preferences-dialog.c:1689 msgid "Set the default Quick Mask color" msgstr "Установить цвет быстрой маски по умолчанию" -#: ../app/dialogs/preferences-dialog.c:1695 +#: ../app/dialogs/preferences-dialog.c:1699 msgid "Default Image Grid" msgstr "Параметры сетки" -#: ../app/dialogs/preferences-dialog.c:1696 +#: ../app/dialogs/preferences-dialog.c:1700 msgid "Default Grid" msgstr "Параметры сетки" -#: ../app/dialogs/preferences-dialog.c:1715 +#: ../app/dialogs/preferences-dialog.c:1719 msgid "User Interface" msgstr "Пользовательский интерфейс" -#: ../app/dialogs/preferences-dialog.c:1716 +#: ../app/dialogs/preferences-dialog.c:1720 msgid "Interface" msgstr "Интерфейс" -#: ../app/dialogs/preferences-dialog.c:1725 ../app/tools/gimptextoptions.c:151 +#: ../app/dialogs/preferences-dialog.c:1729 ../app/tools/gimptextoptions.c:151 msgid "Language" msgstr "Язык" #. Previews -#: ../app/dialogs/preferences-dialog.c:1731 +#: ../app/dialogs/preferences-dialog.c:1735 msgid "Previews" msgstr "Предварительный просмотр" -#: ../app/dialogs/preferences-dialog.c:1734 +#: ../app/dialogs/preferences-dialog.c:1738 msgid "_Enable layer & channel previews" msgstr "Включить м_иниатюры слоев и каналов" -#: ../app/dialogs/preferences-dialog.c:1740 +#: ../app/dialogs/preferences-dialog.c:1744 msgid "_Default layer & channel preview size:" msgstr "_Размер миниатюр слоев и каналов:" -#: ../app/dialogs/preferences-dialog.c:1743 +#: ../app/dialogs/preferences-dialog.c:1747 msgid "_Undo preview size:" msgstr "Раз_мер предпросмотра истории:" -#: ../app/dialogs/preferences-dialog.c:1746 +#: ../app/dialogs/preferences-dialog.c:1750 msgid "Na_vigation preview size:" msgstr "Ра_змер окна навигации:" #. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1750 +#: ../app/dialogs/preferences-dialog.c:1754 msgid "Keyboard Shortcuts" msgstr "Клавиатурные комбинации" -#: ../app/dialogs/preferences-dialog.c:1754 +#: ../app/dialogs/preferences-dialog.c:1758 msgid "_Use dynamic keyboard shortcuts" msgstr "_Использовать динамические комбинации клавиш" -#: ../app/dialogs/preferences-dialog.c:1758 +#: ../app/dialogs/preferences-dialog.c:1762 msgid "Configure _Keyboard Shortcuts..." msgstr "Настроить _комбинации клавиш..." -#: ../app/dialogs/preferences-dialog.c:1765 +#: ../app/dialogs/preferences-dialog.c:1769 msgid "_Save keyboard shortcuts on exit" msgstr "_Сохранять комбинации клавиш при выходе" -#: ../app/dialogs/preferences-dialog.c:1769 +#: ../app/dialogs/preferences-dialog.c:1773 msgid "Save Keyboard Shortcuts _Now" msgstr "Сохранить комбинации клавиш _сейчас" -#: ../app/dialogs/preferences-dialog.c:1776 +#: ../app/dialogs/preferences-dialog.c:1780 msgid "_Reset Keyboard Shortcuts to Default Values" msgstr "_Восстановить исходные комбинации клавиш" -#: ../app/dialogs/preferences-dialog.c:1785 +#: ../app/dialogs/preferences-dialog.c:1789 msgid "Remove _All Keyboard Shortcuts" msgstr "Удалить все ком_бинации клавиш" -#: ../app/dialogs/preferences-dialog.c:1797 -#: ../app/dialogs/preferences-dialog.c:1798 -#: ../app/dialogs/preferences-dialog.c:1833 +#: ../app/dialogs/preferences-dialog.c:1801 +#: ../app/dialogs/preferences-dialog.c:1802 +#: ../app/dialogs/preferences-dialog.c:1837 msgid "Theme" msgstr "Тема" -#: ../app/dialogs/preferences-dialog.c:1803 +#: ../app/dialogs/preferences-dialog.c:1807 msgid "Select Theme" msgstr "Выбрать тему" -#: ../app/dialogs/preferences-dialog.c:1885 +#: ../app/dialogs/preferences-dialog.c:1889 msgid "Reload C_urrent Theme" msgstr "_Обновить текущую тему" -#: ../app/dialogs/preferences-dialog.c:1897 -#: ../app/dialogs/preferences-dialog.c:1898 -#: ../app/dialogs/preferences-dialog.c:1939 +#: ../app/dialogs/preferences-dialog.c:1901 +#: ../app/dialogs/preferences-dialog.c:1902 +#: ../app/dialogs/preferences-dialog.c:1943 msgid "Icon Theme" msgstr "Тема значков" -#: ../app/dialogs/preferences-dialog.c:1903 +#: ../app/dialogs/preferences-dialog.c:1907 msgid "Select an Icon Theme" msgstr "Выбрать тему значков" #. Appearance -#: ../app/dialogs/preferences-dialog.c:2027 -#: ../app/dialogs/preferences-dialog.c:2779 ../app/widgets/gimpgrideditor.c:134 +#: ../app/dialogs/preferences-dialog.c:2031 +#: ../app/dialogs/preferences-dialog.c:2799 ../app/widgets/gimpgrideditor.c:134 msgid "Appearance" msgstr "Внешний вид" -#: ../app/dialogs/preferences-dialog.c:2031 +#: ../app/dialogs/preferences-dialog.c:2035 msgid "Show GIMP _logo (drag-and-drop target)" msgstr "" "Показывать _логотип GIMP (на него можно перетаскивать изображения для " "открытия)" -#: ../app/dialogs/preferences-dialog.c:2035 +#: ../app/dialogs/preferences-dialog.c:2039 msgid "Show _foreground & background color" msgstr "Показывать цвет _переднего плана и фона" -#: ../app/dialogs/preferences-dialog.c:2039 +#: ../app/dialogs/preferences-dialog.c:2043 msgid "Show active _brush, pattern & gradient" msgstr "Показывать активные _кисти, текстуры и градиенты" -#: ../app/dialogs/preferences-dialog.c:2043 +#: ../app/dialogs/preferences-dialog.c:2047 msgid "Show active _image" msgstr "Показывать активное _изображение" #. Tool Editor -#: ../app/dialogs/preferences-dialog.c:2051 +#: ../app/dialogs/preferences-dialog.c:2055 msgid "Tools Configuration" msgstr "Видимые в панели инструменты" -#: ../app/dialogs/preferences-dialog.c:2067 -#: ../app/dialogs/preferences-dialog.c:2068 +#: ../app/dialogs/preferences-dialog.c:2071 +#: ../app/dialogs/preferences-dialog.c:2072 msgid "Dialog Defaults" msgstr "Параметры по умолчанию" -#: ../app/dialogs/preferences-dialog.c:2077 +#: ../app/dialogs/preferences-dialog.c:2081 msgid "Reset Dialog Defaults" msgstr "Обнулить параметры диалогов по умолчанию" #. Color profile import dialog -#: ../app/dialogs/preferences-dialog.c:2085 +#: ../app/dialogs/preferences-dialog.c:2089 msgid "Color Profile Import Dialog" msgstr "Диалог «Импортировать цветовой профиль»" #. All color profile chooser dialogs -#: ../app/dialogs/preferences-dialog.c:2094 -#, fuzzy +#: ../app/dialogs/preferences-dialog.c:2098 msgid "Color Profile File Dialogs" -msgstr "Диалог «Импортировать цветовой профиль»" +msgstr "Диалоги выбора ICC-файлов" -#: ../app/dialogs/preferences-dialog.c:2099 +#: ../app/dialogs/preferences-dialog.c:2103 msgid "Profile folder:" msgstr "Папка с профилями:" -#: ../app/dialogs/preferences-dialog.c:2100 -#, fuzzy +#: ../app/dialogs/preferences-dialog.c:2104 msgid "Select Default Folder for Color Profiles" -msgstr "Выберите каталог для временных файлов" +msgstr "Выберите каталог с цветовыми профилями для использования по умолчанию" #. Convert to Color Profile Dialog -#: ../app/dialogs/preferences-dialog.c:2104 +#: ../app/dialogs/preferences-dialog.c:2108 msgid "Convert to Color Profile Dialog" msgstr "Диалог «Сконвертировать по цветовому профилю»" -#: ../app/dialogs/preferences-dialog.c:2109 +#: ../app/dialogs/preferences-dialog.c:2113 msgid "Rendering intent:" msgstr "Тип цветопередачи:" -#: ../app/dialogs/preferences-dialog.c:2113 +#: ../app/dialogs/preferences-dialog.c:2117 msgid "Black point compensation" msgstr "Компенсация чёрной точки" #. Convert Precision Dialog -#: ../app/dialogs/preferences-dialog.c:2117 +#: ../app/dialogs/preferences-dialog.c:2121 msgid "Precision Conversion Dialog" msgstr "Диалог «Смена точности»" -#: ../app/dialogs/preferences-dialog.c:2124 +#: ../app/dialogs/preferences-dialog.c:2128 msgid "Dither layers:" msgstr "Подмешивание шума в растровые слои:" -#: ../app/dialogs/preferences-dialog.c:2129 +#: ../app/dialogs/preferences-dialog.c:2133 msgid "Dither text layers:" msgstr "Подмешивание шума в текстовые слои:" -#: ../app/dialogs/preferences-dialog.c:2134 +#: ../app/dialogs/preferences-dialog.c:2138 msgid "Dither channels/masks:" msgstr "Подмешивание шума в каналы/маски:" #. Convert Indexed Dialog -#: ../app/dialogs/preferences-dialog.c:2138 +#: ../app/dialogs/preferences-dialog.c:2142 msgid "Indexed Conversion Dialog" msgstr "Диалог «Преобразование изображения в индексированное»" -#: ../app/dialogs/preferences-dialog.c:2143 +#: ../app/dialogs/preferences-dialog.c:2147 msgid "Colormap:" msgstr "Цветовая карта:" -#: ../app/dialogs/preferences-dialog.c:2146 +#: ../app/dialogs/preferences-dialog.c:2150 msgid "Maximum number of colors:" msgstr "Максимальное число цветов:" -#: ../app/dialogs/preferences-dialog.c:2150 +#: ../app/dialogs/preferences-dialog.c:2154 msgid "Remove unused and duplicate colors from colormap" msgstr "Удалить неиспользуемые цвета из цветовой карты" -#: ../app/dialogs/preferences-dialog.c:2156 +#: ../app/dialogs/preferences-dialog.c:2160 msgid "Color dithering:" msgstr "Подмешивание шума:" -#: ../app/dialogs/preferences-dialog.c:2160 +#: ../app/dialogs/preferences-dialog.c:2164 msgid "Enable dithering of transparency" msgstr "Применить к альфа-каналу" +#: ../app/dialogs/preferences-dialog.c:2176 +msgid "Keep recent settings:" +msgstr "Сколько последних настроек запоминать:" + +#: ../app/dialogs/preferences-dialog.c:2180 +msgid "Default to the last used settings" +msgstr "Использовать последние параметры по умолчанию" + #. Canvas Size Dialog -#: ../app/dialogs/preferences-dialog.c:2167 +#: ../app/dialogs/preferences-dialog.c:2187 msgid "Canvas Size Dialog" msgstr "Диалог «Размер холста»" -#: ../app/dialogs/preferences-dialog.c:2172 -#: ../app/dialogs/preferences-dialog.c:2201 +#: ../app/dialogs/preferences-dialog.c:2192 +#: ../app/dialogs/preferences-dialog.c:2221 msgid "Fill with:" msgstr "Заливка:" -#: ../app/dialogs/preferences-dialog.c:2175 +#: ../app/dialogs/preferences-dialog.c:2195 msgid "Resize layers:" msgstr "Изменить размер слоёв:" -#: ../app/dialogs/preferences-dialog.c:2179 +#: ../app/dialogs/preferences-dialog.c:2199 msgid "Resize text layers" msgstr "Изменить размер текстовых слоёв" #. New Layer Dialog -#: ../app/dialogs/preferences-dialog.c:2183 +#: ../app/dialogs/preferences-dialog.c:2203 msgid "New Layer Dialog" msgstr "Диалог «Создать слой»" -#: ../app/dialogs/preferences-dialog.c:2188 +#: ../app/dialogs/preferences-dialog.c:2208 msgid "Layer name:" msgstr "Имя слоя:" -#: ../app/dialogs/preferences-dialog.c:2192 +#: ../app/dialogs/preferences-dialog.c:2212 msgid "Fill type:" msgstr "Тип заливки:" #. Layer Boundary Size Dialog -#: ../app/dialogs/preferences-dialog.c:2196 +#: ../app/dialogs/preferences-dialog.c:2216 msgid "Layer Boundary Size Dialog" msgstr "Диалог «Границы слоя»" #. Add Layer Mask Dialog -#: ../app/dialogs/preferences-dialog.c:2205 +#: ../app/dialogs/preferences-dialog.c:2225 msgid "Add Layer Mask Dialog" msgstr "Диалог «Добавить маску слоя»" -#: ../app/dialogs/preferences-dialog.c:2210 +#: ../app/dialogs/preferences-dialog.c:2230 msgid "Layer mask type:" msgstr "Тип маски слоя:" -#: ../app/dialogs/preferences-dialog.c:2214 +#: ../app/dialogs/preferences-dialog.c:2234 msgid "Invert mask" msgstr "Инвертировать маску" #. Merge Layers Dialog -#: ../app/dialogs/preferences-dialog.c:2218 +#: ../app/dialogs/preferences-dialog.c:2238 msgid "Merge Layers Dialog" msgstr "Диалог «Объединить слои»" -#: ../app/dialogs/preferences-dialog.c:2225 +#: ../app/dialogs/preferences-dialog.c:2245 msgid "Merged layer size:" msgstr "Размер конечного слоя:" -#: ../app/dialogs/preferences-dialog.c:2229 +#: ../app/dialogs/preferences-dialog.c:2249 msgid "Merge within active group only" msgstr "Объединить только внутри активной группы" -#: ../app/dialogs/preferences-dialog.c:2232 +#: ../app/dialogs/preferences-dialog.c:2252 msgid "Discard invisible layers" msgstr "Отказаться от невидимых слоев" #. New Channel Dialog -#: ../app/dialogs/preferences-dialog.c:2236 +#: ../app/dialogs/preferences-dialog.c:2256 msgid "New Channel Dialog" msgstr "Диалог «Создать канал»" -#: ../app/dialogs/preferences-dialog.c:2241 +#: ../app/dialogs/preferences-dialog.c:2261 msgid "Channel name:" msgstr "Имя канала:" -#: ../app/dialogs/preferences-dialog.c:2245 +#: ../app/dialogs/preferences-dialog.c:2265 msgid "Color and opacity:" msgstr "Цвет и непрозрачность:" -#: ../app/dialogs/preferences-dialog.c:2246 +#: ../app/dialogs/preferences-dialog.c:2266 msgid "Default New Channel Color and Opacity" msgstr "Изменить название канала, его цвет и прозрачность" #. New Path Dialog -#: ../app/dialogs/preferences-dialog.c:2251 +#: ../app/dialogs/preferences-dialog.c:2271 msgid "New Path Dialog" msgstr "Диалог «Создать контур»" -#: ../app/dialogs/preferences-dialog.c:2256 +#: ../app/dialogs/preferences-dialog.c:2276 msgid "Path name:" msgstr "_Имя контура:" #. Export Path Dialog -#: ../app/dialogs/preferences-dialog.c:2260 +#: ../app/dialogs/preferences-dialog.c:2280 msgid "Export Paths Dialog" msgstr "Диалог «Экспортировать контуры»" -#: ../app/dialogs/preferences-dialog.c:2265 +#: ../app/dialogs/preferences-dialog.c:2285 msgid "Export folder:" msgstr "Папка для экспорта файлов:" -#: ../app/dialogs/preferences-dialog.c:2266 +#: ../app/dialogs/preferences-dialog.c:2286 msgid "Select Default Folder for Exporting Paths" msgstr "Выберите каталог для временных файлов" -#: ../app/dialogs/preferences-dialog.c:2270 +#: ../app/dialogs/preferences-dialog.c:2290 msgid "Export the active path only" msgstr "Экспортировать только текущий контур" #. Import Path Dialog -#: ../app/dialogs/preferences-dialog.c:2274 +#: ../app/dialogs/preferences-dialog.c:2294 msgid "Import Paths Dialog" msgstr "Диалог «Импортировать контуры»" -#: ../app/dialogs/preferences-dialog.c:2279 +#: ../app/dialogs/preferences-dialog.c:2299 msgid "Import folder:" msgstr "Папка с файлами для импорта:" -#: ../app/dialogs/preferences-dialog.c:2280 +#: ../app/dialogs/preferences-dialog.c:2300 msgid "Select Default Folder for Importing Paths" msgstr "Выберите каталог для временных файлов" -#: ../app/dialogs/preferences-dialog.c:2284 +#: ../app/dialogs/preferences-dialog.c:2304 msgid "Merge imported paths" msgstr "Объединить импортированные контуры" -#: ../app/dialogs/preferences-dialog.c:2287 +#: ../app/dialogs/preferences-dialog.c:2307 msgid "Scale imported paths" msgstr "Масштабировать импортированные контуры" #. Feather Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2291 +#: ../app/dialogs/preferences-dialog.c:2311 msgid "Feather Selection Dialog" msgstr "Диалог «Растушевать выделение»" -#: ../app/dialogs/preferences-dialog.c:2296 +#: ../app/dialogs/preferences-dialog.c:2316 msgid "Feather radius:" msgstr "Радиус растушёвки:" #. Grow Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2300 +#: ../app/dialogs/preferences-dialog.c:2320 msgid "Grow Selection Dialog" msgstr "Диалог «Увеличить выделение»" -#: ../app/dialogs/preferences-dialog.c:2305 +#: ../app/dialogs/preferences-dialog.c:2325 msgid "Grow radius:" msgstr "Радиус увеличения" #. Shrink Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2309 +#: ../app/dialogs/preferences-dialog.c:2329 msgid "Shrink Selection Dialog" msgstr "Диалог «Уменьшить выделение»" -#: ../app/dialogs/preferences-dialog.c:2314 +#: ../app/dialogs/preferences-dialog.c:2334 msgid "Shrink radius:" msgstr "Радиус уменьшения" -#: ../app/dialogs/preferences-dialog.c:2318 -#: ../app/dialogs/preferences-dialog.c:2335 +#: ../app/dialogs/preferences-dialog.c:2338 +#: ../app/dialogs/preferences-dialog.c:2355 msgid "Selected areas continue outside the image" msgstr "Выделенные области выходят за рамки изображения" #. Border Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2322 +#: ../app/dialogs/preferences-dialog.c:2342 msgid "Border Selection Dialog" msgstr "Диалог «Граница из выделения»" -#: ../app/dialogs/preferences-dialog.c:2327 +#: ../app/dialogs/preferences-dialog.c:2347 msgid "Border radius:" msgstr "Радиус границы:" -#: ../app/dialogs/preferences-dialog.c:2331 +#: ../app/dialogs/preferences-dialog.c:2351 msgid "Border style:" msgstr "Стиль границы:" #. Fill Options Dialog -#: ../app/dialogs/preferences-dialog.c:2339 +#: ../app/dialogs/preferences-dialog.c:2359 msgid "Fill Selection Outline & Fill Path Dialogs" msgstr "Диалоги «Залить выделение» и «Залить контур»" #. Stroke Options Dialog -#: ../app/dialogs/preferences-dialog.c:2348 +#: ../app/dialogs/preferences-dialog.c:2368 msgid "Stroke Selection & Stroke Path Dialogs" msgstr "Диалоги «Обвести выделение» и «Обвести контур»" -#: ../app/dialogs/preferences-dialog.c:2371 -#: ../app/dialogs/preferences-dialog.c:2372 +#: ../app/dialogs/preferences-dialog.c:2391 +#: ../app/dialogs/preferences-dialog.c:2392 msgid "Help System" msgstr "Система помощи" -#: ../app/dialogs/preferences-dialog.c:2383 +#: ../app/dialogs/preferences-dialog.c:2403 msgid "Show _tooltips" msgstr "Показывать всплывающие по_дсказки" -#: ../app/dialogs/preferences-dialog.c:2386 +#: ../app/dialogs/preferences-dialog.c:2406 msgid "Show help _buttons" msgstr "Показывать кнопку «_Справка»" -#: ../app/dialogs/preferences-dialog.c:2391 +#: ../app/dialogs/preferences-dialog.c:2411 msgid "Use the online version" msgstr "Использовать версию из Интернета" -#: ../app/dialogs/preferences-dialog.c:2392 +#: ../app/dialogs/preferences-dialog.c:2412 msgid "Use a locally installed copy" msgstr "Использовать локальную копию" -#: ../app/dialogs/preferences-dialog.c:2393 +#: ../app/dialogs/preferences-dialog.c:2413 msgid "User manual:" msgstr "Руководство пользователя:" -#: ../app/dialogs/preferences-dialog.c:2404 +#: ../app/dialogs/preferences-dialog.c:2424 msgid "User interface language" msgstr "Язык интерфейса" @@ -15649,15 +15804,15 @@ msgstr "Язык интерфейса" #. * that doesn't use the help browser, so don't bother showing #. * the combo. #. -#: ../app/dialogs/preferences-dialog.c:2463 +#: ../app/dialogs/preferences-dialog.c:2483 msgid "Help Browser" msgstr "Справочная система" -#: ../app/dialogs/preferences-dialog.c:2470 +#: ../app/dialogs/preferences-dialog.c:2490 msgid "H_elp browser to use:" msgstr "_Программа просмотра справки:" -#: ../app/dialogs/preferences-dialog.c:2476 +#: ../app/dialogs/preferences-dialog.c:2496 msgid "" "The GIMP help browser doesn't seem to be installed. Using the web browser " "instead." @@ -15666,452 +15821,452 @@ msgstr "" "использован веб-браузер." #. Action Search -#: ../app/dialogs/preferences-dialog.c:2493 +#: ../app/dialogs/preferences-dialog.c:2513 msgid "Action Search" msgstr "Поиск по действиям" -#: ../app/dialogs/preferences-dialog.c:2497 +#: ../app/dialogs/preferences-dialog.c:2517 msgid "Show _unavailable actions" msgstr "Показывать _недоступные действия" -#: ../app/dialogs/preferences-dialog.c:2500 +#: ../app/dialogs/preferences-dialog.c:2520 msgid "Maximum History Size:" msgstr "Сколько действий помнить:" -#: ../app/dialogs/preferences-dialog.c:2504 +#: ../app/dialogs/preferences-dialog.c:2524 msgid "Clear Action History" msgstr "Очистить историю действий" -#: ../app/dialogs/preferences-dialog.c:2519 -#: ../app/dialogs/preferences-dialog.c:2520 +#: ../app/dialogs/preferences-dialog.c:2539 +#: ../app/dialogs/preferences-dialog.c:2540 msgid "Display" msgstr "Дисплей" #. Transparency -#: ../app/dialogs/preferences-dialog.c:2528 +#: ../app/dialogs/preferences-dialog.c:2548 msgid "Transparency" msgstr "Прозрачный" -#: ../app/dialogs/preferences-dialog.c:2532 +#: ../app/dialogs/preferences-dialog.c:2552 msgid "_Check style:" msgstr "_Стиль клеток:" -#: ../app/dialogs/preferences-dialog.c:2535 +#: ../app/dialogs/preferences-dialog.c:2555 msgid "Check _size:" msgstr "Размер _клеток:" -#: ../app/dialogs/preferences-dialog.c:2538 +#: ../app/dialogs/preferences-dialog.c:2558 msgid "Monitor Resolution" msgstr "Разрешение монитора" #. Pixels -#: ../app/dialogs/preferences-dialog.c:2542 ../app/display/gimpcursorview.c:215 +#: ../app/dialogs/preferences-dialog.c:2562 ../app/display/gimpcursorview.c:215 #: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:234 msgid "Pixels" msgstr "px" -#: ../app/dialogs/preferences-dialog.c:2560 ../app/widgets/gimpgrideditor.c:195 +#: ../app/dialogs/preferences-dialog.c:2580 ../app/widgets/gimpgrideditor.c:195 #: ../app/widgets/gimpgrideditor.c:230 msgid "Horizontal" msgstr "Горизонтальное" -#: ../app/dialogs/preferences-dialog.c:2562 ../app/widgets/gimpgrideditor.c:197 +#: ../app/dialogs/preferences-dialog.c:2582 ../app/widgets/gimpgrideditor.c:197 #: ../app/widgets/gimpgrideditor.c:232 msgid "Vertical" msgstr "Вертикальное" -#: ../app/dialogs/preferences-dialog.c:2564 +#: ../app/dialogs/preferences-dialog.c:2584 #: ../app/widgets/gimpimagepropview.c:457 msgid "ppi" msgstr "ppi" -#: ../app/dialogs/preferences-dialog.c:2583 +#: ../app/dialogs/preferences-dialog.c:2603 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "О_пределить автоматически (сейчас %d × %d ppi)" -#: ../app/dialogs/preferences-dialog.c:2601 +#: ../app/dialogs/preferences-dialog.c:2621 msgid "_Enter manually" msgstr "_Вручную" -#: ../app/dialogs/preferences-dialog.c:2616 +#: ../app/dialogs/preferences-dialog.c:2636 msgid "C_alibrate..." msgstr "О_ткалибровать..." -#: ../app/dialogs/preferences-dialog.c:2644 -#: ../app/dialogs/preferences-dialog.c:2645 +#: ../app/dialogs/preferences-dialog.c:2664 +#: ../app/dialogs/preferences-dialog.c:2665 msgid "Window Management" msgstr "Поведение окон" -#: ../app/dialogs/preferences-dialog.c:2650 +#: ../app/dialogs/preferences-dialog.c:2670 msgid "Window Manager Hints" msgstr "Управление внешним видом окон" -#: ../app/dialogs/preferences-dialog.c:2656 +#: ../app/dialogs/preferences-dialog.c:2676 msgid "Hint for _docks and toolbox:" msgstr "Тип окна для _панелей:" -#: ../app/dialogs/preferences-dialog.c:2659 +#: ../app/dialogs/preferences-dialog.c:2679 msgid "Focus" msgstr "Фокус" -#: ../app/dialogs/preferences-dialog.c:2663 +#: ../app/dialogs/preferences-dialog.c:2683 msgid "Activate the _focused image" msgstr "_Активировать изображение в фокусе" #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2667 +#: ../app/dialogs/preferences-dialog.c:2687 msgid "Window Positions" msgstr "Расположение окон" -#: ../app/dialogs/preferences-dialog.c:2670 +#: ../app/dialogs/preferences-dialog.c:2690 msgid "_Save window positions on exit" msgstr "_Сохранять расположение окон при выходе" -#: ../app/dialogs/preferences-dialog.c:2673 +#: ../app/dialogs/preferences-dialog.c:2693 msgid "Open windows on the same _monitor they were open before" msgstr "Открывать окна на том _же мониторе, что и раньше" -#: ../app/dialogs/preferences-dialog.c:2677 +#: ../app/dialogs/preferences-dialog.c:2697 msgid "Save Window Positions _Now" msgstr "Сохранить расположение окон с_ейчас" -#: ../app/dialogs/preferences-dialog.c:2684 +#: ../app/dialogs/preferences-dialog.c:2704 msgid "_Reset Saved Window Positions to Default Values" msgstr "_Восстановить исходную позицию окон" -#: ../app/dialogs/preferences-dialog.c:2699 -#: ../app/dialogs/preferences-dialog.c:2700 +#: ../app/dialogs/preferences-dialog.c:2719 +#: ../app/dialogs/preferences-dialog.c:2720 msgid "Image Windows" msgstr "Окно изображения" -#: ../app/dialogs/preferences-dialog.c:2711 +#: ../app/dialogs/preferences-dialog.c:2731 msgid "Use \"_Dot for dot\" by default" msgstr "Использовать «_Точка за точкой» по умолчанию" -#: ../app/dialogs/preferences-dialog.c:2717 +#: ../app/dialogs/preferences-dialog.c:2737 msgid "Marching _ants speed:" msgstr "Скорость _муравьиной дорожки:" #. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2721 +#: ../app/dialogs/preferences-dialog.c:2741 msgid "Zoom & Resize Behavior" msgstr "Правила масштабирования и изменения размера" -#: ../app/dialogs/preferences-dialog.c:2725 +#: ../app/dialogs/preferences-dialog.c:2745 msgid "Resize window on _zoom" msgstr "Изменять размер окна при _масштабировании" -#: ../app/dialogs/preferences-dialog.c:2728 +#: ../app/dialogs/preferences-dialog.c:2748 msgid "Resize window on image _size change" msgstr "Изменять размер окна при _смене размера изображения" -#: ../app/dialogs/preferences-dialog.c:2734 +#: ../app/dialogs/preferences-dialog.c:2754 msgid "Show entire image" msgstr "Показывать всё изображение" -#: ../app/dialogs/preferences-dialog.c:2736 +#: ../app/dialogs/preferences-dialog.c:2756 msgid "Initial zoom _ratio:" msgstr "_Исходные пропорции масштаба:" #. Space Bar -#: ../app/dialogs/preferences-dialog.c:2740 +#: ../app/dialogs/preferences-dialog.c:2760 msgid "Space Bar" msgstr "Пробел" -#: ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/preferences-dialog.c:2766 msgid "_While space bar is pressed:" msgstr "_При нажатии пробела:" #. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2750 +#: ../app/dialogs/preferences-dialog.c:2770 msgid "Mouse Pointers" msgstr "Курсоры мыши" -#: ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/preferences-dialog.c:2774 msgid "Show _brush outline" msgstr "Показывать _контур кисти" -#: ../app/dialogs/preferences-dialog.c:2757 +#: ../app/dialogs/preferences-dialog.c:2777 msgid "Show pointer for paint _tools" msgstr "Показывать курсор мыши в режиме рисования" -#: ../app/dialogs/preferences-dialog.c:2763 +#: ../app/dialogs/preferences-dialog.c:2783 msgid "Pointer _mode:" msgstr "_Режим курсора:" -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2786 msgid "Pointer _handedness:" msgstr "_Направление курсора:" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2798 msgid "Image Window Appearance" msgstr "Внешний вид окна изображения" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2806 msgid "Default Appearance in Normal Mode" msgstr "Внешний вид по умолчанию в нормальном режиме" -#: ../app/dialogs/preferences-dialog.c:2791 +#: ../app/dialogs/preferences-dialog.c:2811 msgid "Default Appearance in Fullscreen Mode" msgstr "Внешний вид по умолчанию в полноэкранном режиме" -#: ../app/dialogs/preferences-dialog.c:2800 +#: ../app/dialogs/preferences-dialog.c:2820 msgid "Image Title & Statusbar Format" msgstr "Формат заголовка изображения и строки состояния" -#: ../app/dialogs/preferences-dialog.c:2801 +#: ../app/dialogs/preferences-dialog.c:2821 msgid "Title & Status" msgstr "Заголовок и состояние" -#: ../app/dialogs/preferences-dialog.c:2819 +#: ../app/dialogs/preferences-dialog.c:2839 msgid "Current format" msgstr "Текущий формат" -#: ../app/dialogs/preferences-dialog.c:2820 +#: ../app/dialogs/preferences-dialog.c:2840 msgid "Default format" msgstr "Исходный формат" -#: ../app/dialogs/preferences-dialog.c:2821 +#: ../app/dialogs/preferences-dialog.c:2841 msgid "Show zoom percentage" msgstr "Показывать масштаб в %" -#: ../app/dialogs/preferences-dialog.c:2822 +#: ../app/dialogs/preferences-dialog.c:2842 msgid "Show zoom ratio" msgstr "Показывать масштабный коэффициент" -#: ../app/dialogs/preferences-dialog.c:2823 +#: ../app/dialogs/preferences-dialog.c:2843 msgid "Show image size" msgstr "Показать размер изображения" -#: ../app/dialogs/preferences-dialog.c:2824 +#: ../app/dialogs/preferences-dialog.c:2844 msgid "Show drawable size" msgstr "Показать размер изображения" -#: ../app/dialogs/preferences-dialog.c:2837 +#: ../app/dialogs/preferences-dialog.c:2857 msgid "Image Title Format" msgstr "Формат заголовка изображения" -#: ../app/dialogs/preferences-dialog.c:2839 +#: ../app/dialogs/preferences-dialog.c:2859 msgid "Image Statusbar Format" msgstr "Формат строки состояния" -#: ../app/dialogs/preferences-dialog.c:2923 +#: ../app/dialogs/preferences-dialog.c:2943 msgid "Image Window Snapping Behavior" msgstr "Поведение прилипания в окне изображения" -#: ../app/dialogs/preferences-dialog.c:2924 +#: ../app/dialogs/preferences-dialog.c:2944 msgid "Snapping" msgstr "Прилипание" -#: ../app/dialogs/preferences-dialog.c:2931 +#: ../app/dialogs/preferences-dialog.c:2951 msgid "Default Behavior in Normal Mode" msgstr "Поведение по умолчанию в нормальном режиме" -#: ../app/dialogs/preferences-dialog.c:2935 +#: ../app/dialogs/preferences-dialog.c:2955 msgid "Default Behavior in Fullscreen Mode" msgstr "Поведение по умолчанию в полноэкранном режиме" -#: ../app/dialogs/preferences-dialog.c:2944 +#: ../app/dialogs/preferences-dialog.c:2964 msgid "_Snapping distance:" msgstr "_Радиус захвата:" -#: ../app/dialogs/preferences-dialog.c:2953 -#: ../app/dialogs/preferences-dialog.c:2954 +#: ../app/dialogs/preferences-dialog.c:2973 +#: ../app/dialogs/preferences-dialog.c:2974 msgid "Input Devices" msgstr "Устройства ввода" #. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2960 +#: ../app/dialogs/preferences-dialog.c:2980 msgid "Extended Input Devices" msgstr "Дополнительные устройства ввода" -#: ../app/dialogs/preferences-dialog.c:2964 +#: ../app/dialogs/preferences-dialog.c:2984 msgid "S_hare tool and tool options between input devices" msgstr "_Разделять инструменты и их параметры между устройствами ввода" -#: ../app/dialogs/preferences-dialog.c:2968 +#: ../app/dialogs/preferences-dialog.c:2988 msgid "Configure E_xtended Input Devices..." msgstr "Настроить _дополнительные устройства ввода..." -#: ../app/dialogs/preferences-dialog.c:2975 +#: ../app/dialogs/preferences-dialog.c:2995 msgid "_Save input device settings on exit" msgstr "Сохранять параметры устройств ввода при выходе" -#: ../app/dialogs/preferences-dialog.c:2979 +#: ../app/dialogs/preferences-dialog.c:2999 msgid "Save Input Device Settings _Now" msgstr "Сохранить параметры устройств ввода _сейчас" -#: ../app/dialogs/preferences-dialog.c:2986 +#: ../app/dialogs/preferences-dialog.c:3006 msgid "_Reset Saved Input Device Settings to Default Values" msgstr "_Восстановить параметры устройств ввода по умолчанию" -#: ../app/dialogs/preferences-dialog.c:3001 +#: ../app/dialogs/preferences-dialog.c:3021 msgid "Additional Input Controllers" msgstr "Дополнительные способы управления" -#: ../app/dialogs/preferences-dialog.c:3002 +#: ../app/dialogs/preferences-dialog.c:3022 msgid "Input Controllers" msgstr "Способы управления" -#: ../app/dialogs/preferences-dialog.c:3017 -#: ../app/dialogs/preferences-dialog.c:3018 +#: ../app/dialogs/preferences-dialog.c:3037 +#: ../app/dialogs/preferences-dialog.c:3038 msgid "Folders" msgstr "Каталоги" -#: ../app/dialogs/preferences-dialog.c:3034 +#: ../app/dialogs/preferences-dialog.c:3054 msgid "Temporary folder:" msgstr "Временный каталог:" -#: ../app/dialogs/preferences-dialog.c:3035 +#: ../app/dialogs/preferences-dialog.c:3055 msgid "Select Folder for Temporary Files" msgstr "Выберите каталог для временных файлов" -#: ../app/dialogs/preferences-dialog.c:3039 +#: ../app/dialogs/preferences-dialog.c:3059 msgid "Swap folder:" msgstr "Каталог подкачки:" -#: ../app/dialogs/preferences-dialog.c:3040 +#: ../app/dialogs/preferences-dialog.c:3060 msgid "Select Swap Folder" msgstr "Выбрать каталог подкачки" -#: ../app/dialogs/preferences-dialog.c:3072 +#: ../app/dialogs/preferences-dialog.c:3092 msgid "Brush Folders" msgstr "Папки с файлами кистей" -#: ../app/dialogs/preferences-dialog.c:3074 +#: ../app/dialogs/preferences-dialog.c:3094 msgid "Select Brush Folders" msgstr "Выбрать папки с кистями" -#: ../app/dialogs/preferences-dialog.c:3076 +#: ../app/dialogs/preferences-dialog.c:3096 msgid "Dynamics Folders" msgstr "Папки с файлами динамики рисования" -#: ../app/dialogs/preferences-dialog.c:3078 +#: ../app/dialogs/preferences-dialog.c:3098 msgid "Select Dynamics Folders" msgstr "Выбрать папки с файлами динамики рисования" -#: ../app/dialogs/preferences-dialog.c:3080 +#: ../app/dialogs/preferences-dialog.c:3100 msgid "Pattern Folders" msgstr "Папки с файлами текстур" -#: ../app/dialogs/preferences-dialog.c:3082 +#: ../app/dialogs/preferences-dialog.c:3102 msgid "Select Pattern Folders" msgstr "Выбрать папки с текстурами" -#: ../app/dialogs/preferences-dialog.c:3084 +#: ../app/dialogs/preferences-dialog.c:3104 msgid "Palette Folders" msgstr "Папки с файлами цветовых палитр" -#: ../app/dialogs/preferences-dialog.c:3086 +#: ../app/dialogs/preferences-dialog.c:3106 msgid "Select Palette Folders" msgstr "Выбрать папки с палитрами" -#: ../app/dialogs/preferences-dialog.c:3088 +#: ../app/dialogs/preferences-dialog.c:3108 msgid "Gradient Folders" msgstr "Папки с файлами градиентов" -#: ../app/dialogs/preferences-dialog.c:3090 +#: ../app/dialogs/preferences-dialog.c:3110 msgid "Select Gradient Folders" msgstr "Выбрать папки с градиентами" -#: ../app/dialogs/preferences-dialog.c:3092 +#: ../app/dialogs/preferences-dialog.c:3112 msgid "Font Folders" msgstr "Папки с файлами шрифтов" -#: ../app/dialogs/preferences-dialog.c:3094 +#: ../app/dialogs/preferences-dialog.c:3114 msgid "Select Font Folders" msgstr "Выбрать папки со шрифтами" -#: ../app/dialogs/preferences-dialog.c:3096 +#: ../app/dialogs/preferences-dialog.c:3116 msgid "Tool Preset Folders" msgstr "Папки с профилями инструментов" -#: ../app/dialogs/preferences-dialog.c:3098 +#: ../app/dialogs/preferences-dialog.c:3118 msgid "Select Tool Preset Folders" msgstr "Выбрать папки с профилями инструментов" -#: ../app/dialogs/preferences-dialog.c:3100 +#: ../app/dialogs/preferences-dialog.c:3120 msgid "MyPaint Brush Folders" msgstr "Папки с файлами кистей MyPaint" -#: ../app/dialogs/preferences-dialog.c:3102 +#: ../app/dialogs/preferences-dialog.c:3122 msgid "Select MyPaint Brush Folders" msgstr "Выбрать папки с кистями" -#: ../app/dialogs/preferences-dialog.c:3104 +#: ../app/dialogs/preferences-dialog.c:3124 msgid "Plug-in Folders" msgstr "Папки с файлами плагинов" -#: ../app/dialogs/preferences-dialog.c:3106 +#: ../app/dialogs/preferences-dialog.c:3126 msgid "Select plug-in Folders" msgstr "Выбрать папки с расширениями" -#: ../app/dialogs/preferences-dialog.c:3108 +#: ../app/dialogs/preferences-dialog.c:3128 msgid "Scripts" msgstr "Сценарии" -#: ../app/dialogs/preferences-dialog.c:3108 +#: ../app/dialogs/preferences-dialog.c:3128 msgid "Script-Fu Folders" msgstr "Папки с файлами сценариев Script-Fu" -#: ../app/dialogs/preferences-dialog.c:3110 +#: ../app/dialogs/preferences-dialog.c:3130 msgid "Select Script-Fu Folders" msgstr "Выбрать папки со сценариями Script-Fu" -#: ../app/dialogs/preferences-dialog.c:3112 +#: ../app/dialogs/preferences-dialog.c:3132 msgid "Module Folders" msgstr "Папки с файлами модулей" -#: ../app/dialogs/preferences-dialog.c:3114 +#: ../app/dialogs/preferences-dialog.c:3134 msgid "Select Module Folders" msgstr "Выбрать папки с модулями" -#: ../app/dialogs/preferences-dialog.c:3116 +#: ../app/dialogs/preferences-dialog.c:3136 msgid "Interpreters" msgstr "Интерпретаторы" -#: ../app/dialogs/preferences-dialog.c:3116 +#: ../app/dialogs/preferences-dialog.c:3136 msgid "Interpreter Folders" msgstr "Папки с файлами интерпретаторов" -#: ../app/dialogs/preferences-dialog.c:3118 +#: ../app/dialogs/preferences-dialog.c:3138 msgid "Select Interpreter Folders" msgstr "Выбрать папки с интерпретаторами" -#: ../app/dialogs/preferences-dialog.c:3120 +#: ../app/dialogs/preferences-dialog.c:3140 msgid "Environment" msgstr "Окружение" -#: ../app/dialogs/preferences-dialog.c:3120 +#: ../app/dialogs/preferences-dialog.c:3140 msgid "Environment Folders" msgstr "Каталоги окружения" -#: ../app/dialogs/preferences-dialog.c:3122 +#: ../app/dialogs/preferences-dialog.c:3142 msgid "Select Environment Folders" msgstr "Выбрать папки окружения" -#: ../app/dialogs/preferences-dialog.c:3124 +#: ../app/dialogs/preferences-dialog.c:3144 msgid "Themes" msgstr "Стили оформления" -#: ../app/dialogs/preferences-dialog.c:3124 +#: ../app/dialogs/preferences-dialog.c:3144 msgid "Theme Folders" msgstr "Папки со стилями оформления" -#: ../app/dialogs/preferences-dialog.c:3126 +#: ../app/dialogs/preferences-dialog.c:3146 msgid "Select Theme Folders" msgstr "Выбрать папки стилей оформления" -#: ../app/dialogs/preferences-dialog.c:3128 +#: ../app/dialogs/preferences-dialog.c:3148 msgid "Icon Themes" msgstr "Темы значков" -#: ../app/dialogs/preferences-dialog.c:3128 +#: ../app/dialogs/preferences-dialog.c:3148 msgid "Icon Theme Folders" msgstr "Папки с темами значков" -#: ../app/dialogs/preferences-dialog.c:3130 +#: ../app/dialogs/preferences-dialog.c:3150 msgid "Select Icon Theme Folders" msgstr "Выбрать папки стилей оформления" @@ -16275,7 +16430,7 @@ msgstr "Вертикальная:" msgid "Image Size" msgstr "Размер изображения" -#: ../app/dialogs/scale-dialog.c:181 ../app/paint/gimppaintoptions.c:403 +#: ../app/dialogs/scale-dialog.c:181 ../app/paint/gimppaintoptions.c:412 msgid "Quality" msgstr "Качество" @@ -16498,10 +16653,10 @@ msgstr "Перемещение" #: ../app/display/gimpcursorview.c:250 ../app/display/gimpcursorview.c:256 #: ../app/display/gimpcursorview.c:275 ../app/display/gimpcursorview.c:281 #: ../app/display/gimpcursorview.c:297 ../app/display/gimpcursorview.c:304 -#: ../app/display/gimpcursorview.c:706 ../app/display/gimpcursorview.c:708 -#: ../app/display/gimpcursorview.c:710 ../app/display/gimpcursorview.c:712 -#: ../app/display/gimpcursorview.c:791 ../app/display/gimpcursorview.c:792 +#: ../app/display/gimpcursorview.c:708 ../app/display/gimpcursorview.c:710 +#: ../app/display/gimpcursorview.c:712 ../app/display/gimpcursorview.c:714 #: ../app/display/gimpcursorview.c:793 ../app/display/gimpcursorview.c:794 +#: ../app/display/gimpcursorview.c:795 ../app/display/gimpcursorview.c:796 msgid "n/a" msgstr "н/д" @@ -16537,7 +16692,7 @@ msgstr "Ш" msgid "H" msgstr "В" -#: ../app/display/gimpcursorview.c:337 +#: ../app/display/gimpcursorview.c:339 msgid "_Sample Merged" msgstr "_Сводить слои" @@ -16545,24 +16700,24 @@ msgstr "_Сводить слои" msgid "Access the image menu" msgstr "Доступ к меню изображения" -#: ../app/display/gimpdisplayshell.c:667 +#: ../app/display/gimpdisplayshell.c:670 msgid "Zoom image when window size changes" msgstr "При изменении размера окна изменять размер изображения" -#: ../app/display/gimpdisplayshell.c:696 +#: ../app/display/gimpdisplayshell.c:699 msgid "Toggle Quick Mask" msgstr "Переключить быструю маску" -#: ../app/display/gimpdisplayshell.c:719 +#: ../app/display/gimpdisplayshell.c:722 msgid "Navigate the image display" msgstr "Навигация по изображению" -#: ../app/display/gimpdisplayshell.c:789 ../app/display/gimpdisplayshell.c:1445 +#: ../app/display/gimpdisplayshell.c:792 ../app/display/gimpdisplayshell.c:1448 #: ../app/widgets/gimptoolbox.c:251 msgid "Drop image files here to open them" msgstr "Перетащите сюда изображения, которые хотите открыть" -#: ../app/display/gimpdisplayshell-callbacks.c:551 +#: ../app/display/gimpdisplayshell-callbacks.c:565 #, c-format msgid "" "Unstable Development Version\n" @@ -16662,17 +16817,19 @@ msgstr "Новый слой извне" msgid "Drop New Path" msgstr "Новый контур извне" -#: ../app/display/gimpdisplayshell-dnd.c:360 ../app/tools/gimpblendtool.c:243 +#: ../app/display/gimpdisplayshell-dnd.c:360 #: ../app/tools/gimpbucketfilltool.c:137 ../app/tools/gimpcagetool.c:220 -#: ../app/tools/gimpfiltertool.c:268 ../app/tools/gimpselectiontool.c:427 +#: ../app/tools/gimpfiltertool.c:270 ../app/tools/gimpgradienttool.c:243 +#: ../app/tools/gimpselectiontool.c:427 msgid "Cannot modify the pixels of layer groups." msgstr "Невозможно изменять точки растра группы слоёв" -#: ../app/display/gimpdisplayshell-dnd.c:368 ../app/tools/gimpblendtool.c:250 +#: ../app/display/gimpdisplayshell-dnd.c:368 #: ../app/tools/gimpbucketfilltool.c:144 ../app/tools/gimpcagetool.c:227 -#: ../app/tools/gimpcroptool.c:462 ../app/tools/gimpfiltertool.c:275 -#: ../app/tools/gimppainttool.c:279 ../app/tools/gimpselectiontool.c:432 -#: ../app/tools/gimptransformtool.c:1435 ../app/tools/gimpwarptool.c:629 +#: ../app/tools/gimpcroptool.c:462 ../app/tools/gimpfiltertool.c:277 +#: ../app/tools/gimpgradienttool.c:250 ../app/tools/gimppainttool.c:277 +#: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:1449 +#: ../app/tools/gimpwarptool.c:629 msgid "The active layer's pixels are locked." msgstr "Точки растра активного слоя заблокированы от изменений" @@ -16719,7 +16876,7 @@ msgstr "Изображение сохранено в '%s'" msgid "Image exported to '%s'" msgstr "Изображение экспортировано в '%s'" -#: ../app/display/gimpdisplayshell-layer-select.c:125 +#: ../app/display/gimpdisplayshell-layer-select.c:128 msgid "Layer Select" msgstr "Выделить слой" @@ -16782,7 +16939,7 @@ msgstr "без управления цветом" msgid "pixels" msgstr "точки растра" -#: ../app/display/gimpstatusbar.c:456 +#: ../app/display/gimpstatusbar.c:460 #, c-format msgid "Cancel %s" msgstr "Отменить %s" @@ -16811,49 +16968,82 @@ msgstr "Нажмите и потащите, чтобы переместить т msgid "Click-Drag to move all points" msgstr "Щёлкните и потащите, чтобы переместить все точки" +#: ../app/display/gimptoolgyroscope.c:702 +msgid "Click-Drag to zoom" +msgstr "Щёлкните и потащите, чтобы приблизить или удалить" + +#: ../app/display/gimptoolgyroscope.c:706 +#, c-format +msgid "%s for constrained steps" +msgstr "%s для ограничения шага" + +#: ../app/display/gimptoolgyroscope.c:713 +#: ../app/display/gimptooltransformgrid.c:1782 +msgid "Click-Drag to rotate" +msgstr "Щёлкните и потащите, чтобы вращать" + +#: ../app/display/gimptoolgyroscope.c:717 ../app/display/gimptoolline.c:1490 +#: ../app/tools/gimppainttool.c:569 +#, c-format +msgid "%s for constrained angles" +msgstr "%s для ограничения шага угла" + +#: ../app/display/gimptoolgyroscope.c:722 +msgid "Click-Drag to pan" +msgstr "Щёлкните и потащите, чтобы панорамировать" + +#: ../app/display/gimptoolgyroscope.c:728 +#, c-format +msgid "%s to rotate" +msgstr "%s для вращения" + +#: ../app/display/gimptoolgyroscope.c:729 +#, c-format +msgid "%s for a constrained axis" +msgstr "%s для ограничения шага угла" + +#: ../app/display/gimptoolgyroscope.c:730 +#, c-format +msgid "%s to zoom" +msgstr "%s для масштабирования" + #: ../app/display/gimptoolhandlegrid.c:837 #: ../app/display/gimptooltransformgrid.c:1773 msgid "Click-Drag to move" -msgstr "Нажмите и потащите, чтобы переместить точку" +msgstr "Щёлкните и потащите, чтобы переместить" #: ../app/display/gimptoolhandlegrid.c:840 msgid "Click-Drag to rotate and scale" -msgstr "Нажмите и перетащите для создания нового выделения" +msgstr "Щёлкните и перетащите, чтобы вращать и менять размер" #: ../app/display/gimptoolhandlegrid.c:843 msgid "Click-Drag to shear and scale" -msgstr "Нажмите и перетащите для создания нового выделения" +msgstr "Щёлкните и перетащите, чтобы скашивать и менять размер" #: ../app/display/gimptoolhandlegrid.c:846 #: ../app/display/gimptooltransformgrid.c:1761 msgid "Click-Drag to change perspective" -msgstr "Щёлкните и потащите, чтобы изменить фигуру кривой" +msgstr "Щёлкните и потащите, чтобы изменить перспективу" #: ../app/display/gimptoolhandlegrid.c:857 msgid "Click to add a handle" -msgstr "Нажмите, чтобы залечить" +msgstr "Щёлкните, чтобы добавить рычаг" #: ../app/display/gimptoolhandlegrid.c:863 msgid "Click-Drag to move this handle" -msgstr "Щёлкните и потащите, чтобы переместить рычаг" +msgstr "Щёлкните и потащите, чтобы переместить этот рычаг" #: ../app/display/gimptoolhandlegrid.c:868 msgid "Click-Drag to remove this handle" -msgstr "Щёлкните и потащите, чтобы переместить рычаг" +msgstr "Щёлкните и потащите, чтобы удалить этот рычаг" #: ../app/display/gimptoolline.c:335 ../app/display/gimptoolline.c:498 msgid "Line: " msgstr "Линия: " #: ../app/display/gimptoolline.c:1484 -#, fuzzy msgid "Click-Drag to move the endpoint" -msgstr "Нажмите и потащите, чтобы переместить точку" - -#: ../app/display/gimptoolline.c:1490 ../app/tools/gimppainttool.c:657 -#, c-format -msgid "%s for constrained angles" -msgstr "%s для ограничения шага угла" +msgstr "Щёлкните и потащите, чтобы переместить концевую точку" #: ../app/display/gimptoolline.c:1497 msgid "Release to remove the slider" @@ -16865,9 +17055,10 @@ msgid "%s for constrained values" msgstr "%s для ограничения шага угла" #: ../app/display/gimptoolline.c:1511 -#, fuzzy msgid "Click-Drag to move the slider; drag away to remove the slider" -msgstr "Нажмите и перетащите для смещения маски выделения" +msgstr "" +"Щёлкните и потащите, чтобы сместить слайдер; потащите назад для удаления " +"слайдера" #: ../app/display/gimptoolline.c:1516 msgid "Click-Drag to move or remove the slider" @@ -16890,9 +17081,8 @@ msgid "Click or Click-Drag to add a new slider" msgstr "Щёлкните или щёлкните и потащите, чтобы добавить регулятор" #: ../app/display/gimptoolline.c:1553 -#, fuzzy msgid "Click-Drag to move the line" -msgstr "Нажмите и потащите, чтобы переместить точку" +msgstr "Щёлкните и потащите, чтобы переместить линию" #: ../app/display/gimptoolline.c:1565 #, c-format @@ -16901,7 +17091,7 @@ msgstr "%s для смещения всей линии" #: ../app/display/gimptoolpath.c:256 ../app/tools/gimpvectoroptions.c:71 msgid "Edit Mode" -msgstr "Тип действия" +msgstr "Режим правки" #: ../app/display/gimptoolpath.c:265 ../app/tools/gimpvectoroptions.c:79 msgid "Polygonal" @@ -17093,10 +17283,6 @@ msgstr "Нажмите и потащите, чтобы переместить т msgid "Click-Drag to shear" msgstr "Нажмите, чтобы залечить" -#: ../app/display/gimptooltransformgrid.c:1782 -msgid "Click-Drag to rotate" -msgstr "Нажмите, чтобы стереть" - #: ../app/file/file-open.c:116 ../app/file/file-save.c:114 msgid "Not a regular file" msgstr "Необычный файл" @@ -17287,16 +17473,14 @@ msgid "Union" msgstr "Объединение" #: ../app/operations/operations-enums.c:61 -#, fuzzy msgctxt "layer-composite-mode" msgid "Clip to backdrop" -msgstr "Нажмите для увеличения резкости" +msgstr "Обрезка до фона" #: ../app/operations/operations-enums.c:62 -#, fuzzy msgctxt "layer-composite-mode" msgid "Clip to layer" -msgstr "Отразить текстовый слой" +msgstr "Обрезка до слоя" #: ../app/operations/operations-enums.c:63 msgctxt "layer-composite-mode" @@ -18110,11 +18294,11 @@ msgstr "Только движение" msgid "Flow" msgstr "Поток" -#: ../app/paint/gimpbrushcore.c:394 +#: ../app/paint/gimpbrushcore.c:378 msgid "No brushes available for use with this tool." msgstr "Нет кистей, доступных для использования с этим инструментом." -#: ../app/paint/gimpbrushcore.c:401 +#: ../app/paint/gimpbrushcore.c:385 msgid "No paint dynamics available for use with this tool." msgstr "" "Нет динамик рисования, доступных для использования с этим инструментом." @@ -18177,7 +18361,7 @@ msgid "Ink" msgstr "Перо" #: ../app/paint/gimpinkoptions.c:74 ../app/paint/gimpinkoptions.c:87 -#: ../app/paint/gimppaintoptions.c:191 ../app/tools/gimpwarpoptions.c:91 +#: ../app/paint/gimppaintoptions.c:193 ../app/tools/gimpwarpoptions.c:91 msgid "Size" msgstr "Размер" @@ -18186,7 +18370,7 @@ msgid "Ink Blob Size" msgstr "Размер капли Пера" #: ../app/paint/gimpinkoptions.c:80 ../app/paint/gimpinkoptions.c:119 -#: ../app/paint/gimppaintoptions.c:205 ../app/widgets/gimpbrusheditor.c:200 +#: ../app/paint/gimppaintoptions.c:207 ../app/widgets/gimpbrusheditor.c:200 msgid "Angle" msgstr "Угол" @@ -18196,8 +18380,8 @@ msgid "Tilt" msgstr "Наклон" #. Blob shape widgets -#: ../app/paint/gimpinkoptions.c:106 ../app/tools/gimpblendoptions.c:94 -#: ../app/tools/gimpblendoptions.c:294 ../app/tools/gimpinkoptions-gui.c:103 +#: ../app/paint/gimpinkoptions.c:106 ../app/tools/gimpgradientoptions.c:95 +#: ../app/tools/gimpgradientoptions.c:305 ../app/tools/gimpinkoptions-gui.c:103 msgid "Shape" msgstr "Форма" @@ -18231,7 +18415,7 @@ msgstr "Радиус" msgid "Base Opacity" msgstr "Базовая непрозрачность" -#: ../app/paint/gimpmybrushoptions.c:100 ../app/paint/gimppaintoptions.c:219 +#: ../app/paint/gimpmybrushoptions.c:100 ../app/paint/gimppaintoptions.c:221 #: ../app/tools/gimpwarpoptions.c:98 ../app/widgets/gimpbrusheditor.c:178 msgid "Hardness" msgstr "Жёсткость" @@ -18256,154 +18440,164 @@ msgstr "Кисть" msgid "Paint" msgstr "Рисование" -#: ../app/paint/gimppaintoptions.c:192 +#: ../app/paint/gimppaintoptions.c:194 msgid "Brush Size" msgstr "Размер кисти" -#: ../app/paint/gimppaintoptions.c:198 +#: ../app/paint/gimppaintoptions.c:200 msgid "Aspect Ratio" msgstr "Соотношение сторон" -#: ../app/paint/gimppaintoptions.c:212 ../app/tools/gimpwarpoptions.c:112 +#: ../app/paint/gimppaintoptions.c:214 ../app/tools/gimpwarpoptions.c:112 #: ../app/widgets/gimpbrusheditor.c:211 #: ../app/widgets/gimpbrushfactoryview.c:81 ../app/widgets/gimpgrideditor.c:174 msgid "Spacing" msgstr "Интервал" -#: ../app/paint/gimppaintoptions.c:226 +#: ../app/paint/gimppaintoptions.c:228 msgid "Force" msgstr "Сила" -#: ../app/paint/gimppaintoptions.c:227 +#: ../app/paint/gimppaintoptions.c:229 msgid "Brush Force" msgstr "" -#: ../app/paint/gimppaintoptions.c:233 +#: ../app/paint/gimppaintoptions.c:235 msgid "Link Size" msgstr "Связать размер" -#: ../app/paint/gimppaintoptions.c:234 +#: ../app/paint/gimppaintoptions.c:236 msgid "Link brush size to brush native" msgstr "" -#: ../app/paint/gimppaintoptions.c:240 +#: ../app/paint/gimppaintoptions.c:242 msgid "Link Aspect Ratio" msgstr "Связать соотношение сторон" -#: ../app/paint/gimppaintoptions.c:241 +#: ../app/paint/gimppaintoptions.c:243 msgid "Link brush aspect ratio to brush native" msgstr "" -#: ../app/paint/gimppaintoptions.c:247 +#: ../app/paint/gimppaintoptions.c:249 msgid "Link Angle" msgstr "Связать угол" -#: ../app/paint/gimppaintoptions.c:248 +#: ../app/paint/gimppaintoptions.c:250 msgid "Link brush angle to brush native" msgstr "" -#: ../app/paint/gimppaintoptions.c:254 +#: ../app/paint/gimppaintoptions.c:256 msgid "Link Spacing" msgstr "Связать интервал" -#: ../app/paint/gimppaintoptions.c:255 +#: ../app/paint/gimppaintoptions.c:257 msgid "Link brush spacing to brush native" msgstr "" -#: ../app/paint/gimppaintoptions.c:261 +#: ../app/paint/gimppaintoptions.c:263 msgid "Link Hardness" msgstr "Связать жёсткость" -#: ../app/paint/gimppaintoptions.c:262 +#: ../app/paint/gimppaintoptions.c:264 msgid "Link brush hardness to brush native" msgstr "" -#: ../app/paint/gimppaintoptions.c:268 +#: ../app/paint/gimppaintoptions.c:270 msgid "Lock brush to view" msgstr "Привязать кисть к виду" -#: ../app/paint/gimppaintoptions.c:269 +#: ../app/paint/gimppaintoptions.c:271 msgid "Keep brush appearance fixed relative to the view" msgstr "Привязать размер и поворот кисти к виду холста" -#: ../app/paint/gimppaintoptions.c:275 +#: ../app/paint/gimppaintoptions.c:277 msgid "Incremental" msgstr "Накапливать непрозрачность" -#: ../app/paint/gimppaintoptions.c:276 +#: ../app/paint/gimppaintoptions.c:278 msgid "Every stamp has its own opacity" msgstr "У каждого «штампа» кистью может быть своя или общая непрозрачность" -#: ../app/paint/gimppaintoptions.c:283 +#: ../app/paint/gimppaintoptions.c:285 msgid "Hard edge" msgstr "Жёсткие края" -#: ../app/paint/gimppaintoptions.c:284 +#: ../app/paint/gimppaintoptions.c:286 msgid "Ignore fuzziness of the current brush" msgstr "" -#: ../app/paint/gimppaintoptions.c:290 +#: ../app/paint/gimppaintoptions.c:292 msgid "Apply Jitter" msgstr "Разброс" -#: ../app/paint/gimppaintoptions.c:291 +#: ../app/paint/gimppaintoptions.c:293 msgid "Scatter brush as you paint" msgstr "Разбрасывать мазки кистью в стороны при рисовании" -#: ../app/paint/gimppaintoptions.c:296 +#: ../app/paint/gimppaintoptions.c:298 msgid "Amount" msgstr "Расстояние" -#: ../app/paint/gimppaintoptions.c:297 +#: ../app/paint/gimppaintoptions.c:299 msgid "Distance of scattering" msgstr "Дистанция разброса" -#: ../app/paint/gimppaintoptions.c:303 +#: ../app/paint/gimppaintoptions.c:305 msgid "Dynamics Options" msgstr "Параметры динамики" -#: ../app/paint/gimppaintoptions.c:310 +#: ../app/paint/gimppaintoptions.c:312 msgid "Fade length" msgstr "Длина штриха" -#: ../app/paint/gimppaintoptions.c:311 +#: ../app/paint/gimppaintoptions.c:313 msgid "Distance over which strokes fade out" msgstr "Дистанция, на протяжении которой штрихи угасают" -#: ../app/paint/gimppaintoptions.c:321 ../app/widgets/gimpviewablebox.c:381 +#: ../app/paint/gimppaintoptions.c:323 ../app/widgets/gimpviewablebox.c:385 msgid "Reverse" msgstr "Развернуть" -#: ../app/paint/gimppaintoptions.c:322 +#: ../app/paint/gimppaintoptions.c:324 msgid "Reverse direction of fading" msgstr "Развернуть направление угасания" -#: ../app/paint/gimppaintoptions.c:327 ../app/tools/gimpblendoptions.c:108 -#: ../app/tools/gimpblendoptions.c:315 ../app/tools/gimppaintoptions-gui.c:356 +#: ../app/paint/gimppaintoptions.c:329 ../app/tools/gimpgradientoptions.c:109 +#: ../app/tools/gimpgradientoptions.c:326 +#: ../app/tools/gimppaintoptions-gui.c:356 msgid "Repeat" msgstr "Повтор" -#: ../app/paint/gimppaintoptions.c:328 +#: ../app/paint/gimppaintoptions.c:330 msgid "How fade is repeated as you paint" msgstr "Как угасание повторяется при рисовании" -#: ../app/paint/gimppaintoptions.c:397 +#: ../app/paint/gimppaintoptions.c:342 ../app/tools/gimpgradientoptions.c:298 +#: ../app/tools/gimppaintoptions-gui.c:392 +msgid "Blend Color Space" +msgstr "Пространство" + +#: ../app/paint/gimppaintoptions.c:343 +msgid "Which color space to use when blending RGB gradient segments" +msgstr "В каком пространстве смешивать сегменты RGB-градиента" + +#: ../app/paint/gimppaintoptions.c:406 msgid "Smooth stroke" msgstr "Сглаженные штрихи" -#: ../app/paint/gimppaintoptions.c:398 +#: ../app/paint/gimppaintoptions.c:407 msgid "Paint smoother strokes" msgstr "Рисовать более плавные штрихи" -#: ../app/paint/gimppaintoptions.c:404 +#: ../app/paint/gimppaintoptions.c:413 msgid "Depth of smoothing" msgstr "Глубина сглаживания" -#: ../app/paint/gimppaintoptions.c:409 +#: ../app/paint/gimppaintoptions.c:418 msgid "Weight" msgstr "Вес" -#: ../app/paint/gimppaintoptions.c:410 +#: ../app/paint/gimppaintoptions.c:419 msgid "Gravity of the pen" msgstr "Гравитация пера" @@ -18416,7 +18610,7 @@ msgstr "Карандаш" msgid "Perspective Clone" msgstr "Штамп по перспективе" -#: ../app/paint/gimpsmudge.c:85 ../app/tools/gimpsmudgetool.c:55 +#: ../app/paint/gimpsmudge.c:86 ../app/tools/gimpsmudgetool.c:55 msgid "Smudge" msgstr "Размазывание" @@ -18546,7 +18740,7 @@ msgstr "Порог" msgid "Plug-in" msgstr "Плагин" -#: ../app/pdb/drawable-cmds.c:963 ../app/tools/gimpforegroundselecttool.c:987 +#: ../app/pdb/drawable-cmds.c:963 ../app/tools/gimpforegroundselecttool.c:993 msgctxt "command" msgid "Foreground Select" msgstr "Выделение переднего плана" @@ -18565,8 +18759,8 @@ msgstr "Инвертирование" #: ../app/pdb/drawable-transform-cmds.c:455 #: ../app/pdb/item-transform-cmds.c:270 ../app/pdb/transform-tools-cmds.c:171 #: ../app/tools/gimpperspectivetool.c:85 -#: ../app/tools/gimptransformoptions.c:552 -#: ../app/tools/gimptransformoptions.c:561 +#: ../app/tools/gimptransformoptions.c:560 +#: ../app/tools/gimptransformoptions.c:569 msgid "Perspective" msgstr "Перспектива" @@ -18589,10 +18783,6 @@ msgstr "2D-преобразование" msgid "2D Transforming" msgstr "2D-преобразование" -#: ../app/pdb/edit-cmds.c:797 -msgid "Blending" -msgstr "Заливка" - #: ../app/pdb/floating-sel-cmds.c:69 msgid "Cannot remove this layer because it is not a floating selection." msgstr "Невозможно удалить этот слой, потому что это не плавающее выделение." @@ -18920,7 +19110,7 @@ msgid "Diagonal neighbors" msgstr "Соседние по диагонали" #: ../app/pdb/gimppdbcontext.c:164 ../app/tools/gimptransformoptions.c:124 -#: ../app/tools/gimptransformoptions.c:440 ../app/tools/gimpwarpoptions.c:119 +#: ../app/tools/gimptransformoptions.c:448 ../app/tools/gimpwarpoptions.c:119 #: ../app/tools/gimpwarpoptions.c:322 msgid "Interpolation" msgstr "Интерполяция" @@ -19592,9 +19782,8 @@ msgid "Gray Handling" msgstr "Обработка серого" #: ../app/propgui/gimppropgui-color-to-alpha.c:109 -#, fuzzy msgid "Pick farthest full-transparency color" -msgstr "Закрасить частично прозрачные пикселы" +msgstr "Снять самый дальний полностью прозрачный цвет" #: ../app/propgui/gimppropgui-color-to-alpha.c:131 msgid "Pick nearest full-opacity color" @@ -19696,6 +19885,10 @@ msgstr "_Насыщенность" msgid "R_eset Color" msgstr "Восстановить _цвет" +#: ../app/propgui/gimppropgui-panorama-projection.c:125 +msgid "Panorama Projection: " +msgstr "Панорамная проекция: " + #: ../app/propgui/gimppropgui-recursive-transform.c:125 msgid "Recursive Transform: " msgstr "Рекурсивная трансформация" @@ -19804,11 +19997,11 @@ msgstr "Выберите из списка температур цвета" msgid "New Seed" msgstr "Обновить зерно" -#: ../app/propgui/gimppropgui.c:375 +#: ../app/propgui/gimppropgui.c:376 msgid "Pick color from the image" msgstr "Взять цвет из изображения" -#: ../app/propgui/gimppropgui.c:517 +#: ../app/propgui/gimppropgui.c:520 msgid "This operation has no editable properties" msgstr "У этой операции нет регулируемых параметров" @@ -19876,7 +20069,7 @@ msgid "" "or use a smaller font." msgstr "" -#: ../app/text/gimptextlayer-xcf.c:77 +#: ../app/text/gimptextlayer-xcf.c:78 #, c-format msgid "" "Problems parsing the text parasite for layer '%s':\n" @@ -20041,177 +20234,6 @@ msgstr "Щёлкните, чтобы сделать этот контур пер msgid "Click to add this path to the list" msgstr "Щёлкните, чтобы добавить этот контур в список" -#: ../app/tools/gimpblendoptions.c:101 ../app/tools/gimpblendoptions.c:303 -msgid "Metric" -msgstr "Метрика" - -#: ../app/tools/gimpblendoptions.c:102 -msgid "Metric to use for the distance calculation" -msgstr "" - -#: ../app/tools/gimpblendoptions.c:116 -msgid "Adaptive Supersampling" -msgstr "Адаптивная интерполяция" - -#: ../app/tools/gimpblendoptions.c:122 -msgid "Max depth" -msgstr "Макс. глубина" - -#: ../app/tools/gimpblendoptions.c:128 ../app/tools/gimpbucketfilloptions.c:142 -#: ../app/tools/gimpregionselectoptions.c:112 -#: ../app/tools/gimpthresholdtool.c:87 -msgid "Threshold" -msgstr "Порог" - -#: ../app/tools/gimpblendoptions.c:142 -msgid "Instant mode" -msgstr "Немедленное применение" - -#: ../app/tools/gimpblendoptions.c:143 -msgid "Commit gradient instantly" -msgstr "Немедленно применять градиент" - -#: ../app/tools/gimpblendoptions.c:149 -msgid "Modify active gradient" -msgstr "Изменять активный градиент" - -#: ../app/tools/gimpblendoptions.c:150 -msgid "Modify the active gradient in-place" -msgstr "Изменить выбранный градиент на месте" - -#: ../app/tools/gimpblendoptions.c:288 ../app/tools/gimppaintoptions-gui.c:379 -msgid "Edit this gradient" -msgstr "Изменить градиент" - -#. the instant toggle -#: ../app/tools/gimpblendoptions.c:356 -#, c-format -msgid "Instant mode (%s)" -msgstr "Немедленное применение (%s)" - -#: ../app/tools/gimpblendoptions.c:376 -msgid "" -"The active gradient is non-writable and cannot be edited directly. Uncheck " -"this option to edit a copy of it." -msgstr "" -"Выбранный градиент доступен только для чтения и не может быть изменён " -"напрямую. Выключите эту функцию, чтобы редактировать копию." - -#: ../app/tools/gimpblendtool.c:156 -msgid "Blend" -msgstr "Градиентная заливка" - -#: ../app/tools/gimpblendtool.c:157 -msgid "Blend Tool: Fill selected area with a color gradient" -msgstr "Градиент: заливка цветным градиентом" - -#: ../app/tools/gimpblendtool.c:158 -msgid "Blen_d" -msgstr "_Градиентная заливка" - -#: ../app/tools/gimpblendtool.c:213 -msgid "Click-Drag to draw a gradient" -msgstr "Щёлкните или щёлкните и потащите для добавления узла" - -#: ../app/tools/gimpblendtool.c:257 ../app/tools/gimpbucketfilltool.c:151 -#: ../app/tools/gimpcagetool.c:234 ../app/tools/gimpfiltertool.c:282 -#: ../app/tools/gimpforegroundselecttool.c:288 ../app/tools/gimppainttool.c:286 -#: ../app/tools/gimptransformtool.c:1443 ../app/tools/gimpwarptool.c:640 -msgid "The active layer is not visible." -msgstr "Точки растра активного слоя заблокированы от изменений" - -#: ../app/tools/gimpblendtool.c:264 -msgid "No gradient available for use with this tool." -msgstr "Нет градиентов, доступных для использования с этим инструментом." - -#: ../app/tools/gimpblendtool.c:614 -msgid "Blend: " -msgstr "Градиентная заливка: " - -#. the position labels -#: ../app/tools/gimpblendtool-editor.c:1280 -msgid "X:" -msgstr "X:" - -#: ../app/tools/gimpblendtool-editor.c:1286 -msgid "Y:" -msgstr "Y:" - -#. the color label -#: ../app/tools/gimpblendtool-editor.c:1339 ../app/tools/gimptextoptions.c:583 -msgid "Color:" -msgstr "Цвет:" - -#: ../app/tools/gimpblendtool-editor.c:1347 -msgid "Change Endpoint Color" -msgstr "Цвет крайней точки" - -#. the position label -#: ../app/tools/gimpblendtool-editor.c:1385 -#: ../app/tools/gimpblendtool-editor.c:1505 -#: ../app/tools/gimprectangleoptions.c:1031 -msgid "Position:" -msgstr "Позиция:" - -#. the color labels -#: ../app/tools/gimpblendtool-editor.c:1410 -msgid "Left color:" -msgstr "Точка слева:" - -#: ../app/tools/gimpblendtool-editor.c:1416 -msgid "Right color:" -msgstr "Точка справа:" - -#: ../app/tools/gimpblendtool-editor.c:1443 -#: ../app/tools/gimpblendtool-editor.c:1452 -msgid "Change Stop Color" -msgstr "Изменить цвет опорной точки" - -#: ../app/tools/gimpblendtool-editor.c:1474 -msgid "Delete stop" -msgstr "Удалить опорную точку" - -#. the type label -#: ../app/tools/gimpblendtool-editor.c:1530 -msgid "Blending:" -msgstr "Смешивание:" - -#. the color label -#: ../app/tools/gimpblendtool-editor.c:1552 -msgid "Coloring:" -msgstr "Окрашивание:" - -#: ../app/tools/gimpblendtool-editor.c:1586 -msgid "New stop at midpoint" -msgstr "Создать опорную точку из срединной" - -#: ../app/tools/gimpblendtool-editor.c:1594 -msgid "Center midpoint" -msgstr "Центрировать срединную точку" - -#: ../app/tools/gimpblendtool-editor.c:1657 -msgid "Start Endpoint" -msgstr "Начальная крайняя точка" - -#: ../app/tools/gimpblendtool-editor.c:1665 -msgid "End Endpoint" -msgstr "Конечная крайняя точка" - -#: ../app/tools/gimpblendtool-editor.c:1718 -#, c-format -msgid "Stop %d" -msgstr "Опорная точка %d" - -#: ../app/tools/gimpblendtool-editor.c:1786 -#, c-format -msgid "Midpoint %d" -msgstr "Срединная точка %d" - -#: ../app/tools/gimpblendtool-editor.c:2364 -#: ../app/tools/gimpblendtool-editor.c:2373 -msgid "Blend Step" -msgstr "Пространство смешивания" - #: ../app/tools/gimpbrightnesscontrasttool.c:97 msgid "Brightness-Contrast" msgstr "Яркость-Контраст" @@ -20267,6 +20289,13 @@ msgid "" "threshold). Disable antialiasing to fill the entire area uniformly." msgstr "" +#: ../app/tools/gimpbucketfilloptions.c:142 +#: ../app/tools/gimpgradientoptions.c:129 +#: ../app/tools/gimpregionselectoptions.c:112 +#: ../app/tools/gimpthresholdtool.c:87 +msgid "Threshold" +msgstr "Порог" + #: ../app/tools/gimpbucketfilloptions.c:143 #: ../app/tools/gimpregionselectoptions.c:113 msgid "Maximum color difference" @@ -20317,6 +20346,14 @@ msgstr "Плоская заливка: заливка цветом или тек msgid "_Bucket Fill" msgstr "Плоская _заливка" +#: ../app/tools/gimpbucketfilltool.c:151 ../app/tools/gimpcagetool.c:234 +#: ../app/tools/gimpfiltertool.c:284 +#: ../app/tools/gimpforegroundselecttool.c:288 +#: ../app/tools/gimpgradienttool.c:257 ../app/tools/gimppainttool.c:284 +#: ../app/tools/gimptransformtool.c:1457 ../app/tools/gimpwarptool.c:640 +msgid "The active layer is not visible." +msgstr "Точки растра активного слоя заблокированы от изменений" + #: ../app/tools/gimpbycolorselecttool.c:67 msgid "Select by Color" msgstr "Выделение по цвету" @@ -20451,11 +20488,11 @@ msgstr "_Пипетка" msgid "Click in any image to view its color" msgstr "Щёлкните любое изображение для просмотра его цвета" -#: ../app/tools/gimpcolorpickertool.c:260 ../app/tools/gimppainttool.c:500 +#: ../app/tools/gimpcolorpickertool.c:260 ../app/tools/gimppainttool.c:412 msgid "Click in any image to pick the foreground color" msgstr "Щёлкните любое изображение, чтобы снять с него цвет переднего плана" -#: ../app/tools/gimpcolorpickertool.c:268 ../app/tools/gimppainttool.c:506 +#: ../app/tools/gimpcolorpickertool.c:268 ../app/tools/gimppainttool.c:418 msgid "Click in any image to pick the background color" msgstr "Щёлкните любое изображение, чтобы снять с него цвет фона" @@ -20556,7 +20593,7 @@ msgstr "Заливка" #: ../app/tools/gimpcropoptions.c:109 msgid "How to fill new areas created by 'Allow growing'" -msgstr "" +msgstr "Как зполнять новые области, созданные функцией «Разрешить наращивание»" #: ../app/tools/gimpcroptool.c:118 msgid "Crop" @@ -20748,54 +20785,54 @@ msgstr "Пр_едпросмотр" #: ../app/tools/gimpfilteroptions.c:78 msgid "Split _view" -msgstr "_Раздельный предпросмотр" +msgstr "Сравнение _до/после" #: ../app/tools/gimpfilteroptions.c:109 msgid "Color _managed" msgstr "С управление _цветом" #. The Color Options expander -#: ../app/tools/gimpfiltertool.c:371 +#: ../app/tools/gimpfiltertool.c:373 msgid "Advanced Color Options" msgstr "Управление цветом" -#: ../app/tools/gimpfiltertool.c:390 +#: ../app/tools/gimpfiltertool.c:392 msgid "Convert pixels to built-in sRGB to apply filter (slow)" msgstr "" -#: ../app/tools/gimpfiltertool.c:391 +#: ../app/tools/gimpfiltertool.c:393 msgid "Assume pixels are built-in sRGB (ignore actual image color space)" msgstr "" -#: ../app/tools/gimpfiltertool.c:626 +#: ../app/tools/gimpfiltertool.c:628 msgid "Click to switch the original and filtered sides" msgstr "Щёлкните, чтобы поменять местами оригинал и обработку" -#: ../app/tools/gimpfiltertool.c:630 +#: ../app/tools/gimpfiltertool.c:632 msgid "Click to switch between vertical and horizontal" msgstr "" "Щёлкните, чтобы переключиться между разделением по горизонтали и вертикали" -#: ../app/tools/gimpfiltertool.c:634 +#: ../app/tools/gimpfiltertool.c:636 msgid "Click to move the split guide" msgstr "Щёлкните для перемещения линии" -#: ../app/tools/gimpfiltertool.c:636 +#: ../app/tools/gimpfiltertool.c:638 #, c-format msgid "%s: switch original and filtered" msgstr "%s: поменять местами оригинал и обработку" -#: ../app/tools/gimpfiltertool.c:637 +#: ../app/tools/gimpfiltertool.c:639 #, c-format msgid "%s: switch horizontal and vertical" msgstr "%s: горизонталь/вертикаль" -#: ../app/tools/gimpfiltertool.c:1298 ../app/tools/gimpfiltertool-settings.c:71 +#: ../app/tools/gimpfiltertool.c:1300 ../app/tools/gimpfiltertool-settings.c:71 #, c-format msgid "Import '%s' Settings" msgstr "Импортировать параметры '%s'" -#: ../app/tools/gimpfiltertool.c:1300 ../app/tools/gimpfiltertool-settings.c:73 +#: ../app/tools/gimpfiltertool.c:1302 ../app/tools/gimpfiltertool-settings.c:73 #, c-format msgid "Export '%s' Settings" msgstr "Экспортировать параметры '%s'" @@ -20817,7 +20854,7 @@ msgstr "Тип файла" msgid "Direction of flipping" msgstr "Направление зеркального отражения" -#: ../app/tools/gimpflipoptions.c:139 ../app/tools/gimptransformoptions.c:425 +#: ../app/tools/gimpflipoptions.c:139 ../app/tools/gimptransformoptions.c:433 msgid "Transform:" msgstr "Преобразование:" @@ -20828,7 +20865,7 @@ msgid "Direction (%s)" msgstr "Направление (%s)" #: ../app/tools/gimpflipoptions.c:170 ../app/tools/gimptransformoptions.c:132 -#: ../app/tools/gimptransformoptions.c:447 +#: ../app/tools/gimptransformoptions.c:455 msgid "Clipping" msgstr "Обрезка" @@ -20939,44 +20976,44 @@ msgstr "" msgid "F_oreground Select" msgstr "Выделение _переднего плана" -#: ../app/tools/gimpforegroundselecttool.c:301 +#: ../app/tools/gimpforegroundselecttool.c:307 msgid "Dialog for foreground select" msgstr "Дилог выделения объектов" -#: ../app/tools/gimpforegroundselecttool.c:319 +#: ../app/tools/gimpforegroundselecttool.c:325 msgid "_Preview mask" msgstr "Пр_едпросмотр маски" -#: ../app/tools/gimpforegroundselecttool.c:330 +#: ../app/tools/gimpforegroundselecttool.c:336 msgid "Select foreground pixels" msgstr "Выбрать пиксели переднего плана" -#: ../app/tools/gimpforegroundselecttool.c:606 +#: ../app/tools/gimpforegroundselecttool.c:612 msgid "Roughly outline the object to extract" msgstr "Обведите извлекаемый объект на скорую руку" -#: ../app/tools/gimpforegroundselecttool.c:627 +#: ../app/tools/gimpforegroundselecttool.c:633 msgid "Selecting foreground," msgstr "Выделяется передний план," -#: ../app/tools/gimpforegroundselecttool.c:629 +#: ../app/tools/gimpforegroundselecttool.c:635 msgid "Selecting background," msgstr "Выделяет фон," -#: ../app/tools/gimpforegroundselecttool.c:631 +#: ../app/tools/gimpforegroundselecttool.c:637 msgid "Selecting unknown," msgstr "Выделяется неизвестная часть," -#: ../app/tools/gimpforegroundselecttool.c:634 +#: ../app/tools/gimpforegroundselecttool.c:640 msgid "press Enter to preview." msgstr "нажмите Ввод для предпросмотра." -#: ../app/tools/gimpforegroundselecttool.c:636 +#: ../app/tools/gimpforegroundselecttool.c:642 msgid "press Escape to exit preview or Enter to apply." msgstr "" "нажмите Escape для завершения предпросмотра, либо Ввод — для применения." -#: ../app/tools/gimpforegroundselecttool.c:1210 +#: ../app/tools/gimpforegroundselecttool.c:1219 msgid "Paint mask" msgstr "Рисуемая маска" @@ -21040,6 +21077,167 @@ msgstr "Матрица преобразования" msgid "Invalid transform" msgstr "Некорректная трансформация" +#: ../app/tools/gimpgradientoptions.c:102 +#: ../app/tools/gimpgradientoptions.c:314 +msgid "Metric" +msgstr "Метрика" + +#: ../app/tools/gimpgradientoptions.c:103 +msgid "Metric to use for the distance calculation" +msgstr "" + +#: ../app/tools/gimpgradientoptions.c:117 +msgid "Adaptive Supersampling" +msgstr "Адаптивная интерполяция" + +#: ../app/tools/gimpgradientoptions.c:123 +msgid "Max depth" +msgstr "Макс. глубина" + +#: ../app/tools/gimpgradientoptions.c:143 +msgid "Instant mode" +msgstr "Немедленное применение" + +#: ../app/tools/gimpgradientoptions.c:144 +msgid "Commit gradient instantly" +msgstr "Немедленно применять градиент" + +#: ../app/tools/gimpgradientoptions.c:150 +msgid "Modify active gradient" +msgstr "Изменять активный градиент" + +#: ../app/tools/gimpgradientoptions.c:151 +msgid "Modify the active gradient in-place" +msgstr "Изменить выбранный градиент на месте" + +#: ../app/tools/gimpgradientoptions.c:290 +#: ../app/tools/gimppaintoptions-gui.c:384 +msgid "Edit this gradient" +msgstr "Изменить градиент" + +#. the instant toggle +#: ../app/tools/gimpgradientoptions.c:367 +#, c-format +msgid "Instant mode (%s)" +msgstr "Немедленное применение (%s)" + +#: ../app/tools/gimpgradientoptions.c:387 +msgid "" +"The active gradient is non-writable and cannot be edited directly. Uncheck " +"this option to edit a copy of it." +msgstr "" +"Выбранный градиент доступен только для чтения и не может быть изменён " +"напрямую. Выключите эту функцию, чтобы редактировать копию." + +#: ../app/tools/gimpgradienttool.c:157 +#, fuzzy +msgid "Gradient Tool: Fill selected area with a color gradient" +msgstr "Градиент: заливка цветным градиентом" + +#: ../app/tools/gimpgradienttool.c:158 +#, fuzzy +msgid "Gra_dient" +msgstr "Градиент" + +#: ../app/tools/gimpgradienttool.c:213 +msgid "Click-Drag to draw a gradient" +msgstr "Щёлкните или щёлкните и потащите для добавления узла" + +#: ../app/tools/gimpgradienttool.c:264 +msgid "No gradient available for use with this tool." +msgstr "Нет градиентов, доступных для использования с этим инструментом." + +#: ../app/tools/gimpgradienttool.c:614 +#, fuzzy +msgid "Gradient: " +msgstr "Градиент:" + +#. the position labels +#: ../app/tools/gimpgradienttool-editor.c:1283 +msgid "X:" +msgstr "X:" + +#: ../app/tools/gimpgradienttool-editor.c:1289 +msgid "Y:" +msgstr "Y:" + +#. the color label +#: ../app/tools/gimpgradienttool-editor.c:1342 +#: ../app/tools/gimptextoptions.c:583 +msgid "Color:" +msgstr "Цвет:" + +#: ../app/tools/gimpgradienttool-editor.c:1350 +msgid "Change Endpoint Color" +msgstr "Цвет крайней точки" + +#. the position label +#: ../app/tools/gimpgradienttool-editor.c:1388 +#: ../app/tools/gimpgradienttool-editor.c:1508 +#: ../app/tools/gimprectangleoptions.c:1031 +msgid "Position:" +msgstr "Позиция:" + +#. the color labels +#: ../app/tools/gimpgradienttool-editor.c:1413 +msgid "Left color:" +msgstr "Точка слева:" + +#: ../app/tools/gimpgradienttool-editor.c:1419 +msgid "Right color:" +msgstr "Точка справа:" + +#: ../app/tools/gimpgradienttool-editor.c:1446 +#: ../app/tools/gimpgradienttool-editor.c:1455 +msgid "Change Stop Color" +msgstr "Изменить цвет опорной точки" + +#: ../app/tools/gimpgradienttool-editor.c:1477 +msgid "Delete stop" +msgstr "Удалить опорную точку" + +#. the type label +#: ../app/tools/gimpgradienttool-editor.c:1533 +msgid "Blending:" +msgstr "Смешивание:" + +#. the color label +#: ../app/tools/gimpgradienttool-editor.c:1555 +msgid "Coloring:" +msgstr "Окрашивание:" + +#: ../app/tools/gimpgradienttool-editor.c:1589 +msgid "New stop at midpoint" +msgstr "Создать опорную точку из срединной" + +#: ../app/tools/gimpgradienttool-editor.c:1597 +msgid "Center midpoint" +msgstr "Центрировать срединную точку" + +#: ../app/tools/gimpgradienttool-editor.c:1660 +msgid "Start Endpoint" +msgstr "Начальная крайняя точка" + +#: ../app/tools/gimpgradienttool-editor.c:1668 +msgid "End Endpoint" +msgstr "Конечная крайняя точка" + +#: ../app/tools/gimpgradienttool-editor.c:1721 +#, c-format +msgid "Stop %d" +msgstr "Опорная точка %d" + +#: ../app/tools/gimpgradienttool-editor.c:1789 +#, c-format +msgid "Midpoint %d" +msgstr "Срединная точка %d" + +#: ../app/tools/gimpgradienttool-editor.c:2366 +#: ../app/tools/gimpgradienttool-editor.c:2375 +#, fuzzy +msgid "Gradient Step" +msgstr "Градиент" + #: ../app/tools/gimpguidetool.c:274 msgid "Remove Guide" msgstr "Удалить направляющую" @@ -21379,7 +21577,7 @@ msgstr "_Перемещение" msgid "There is no path to move." msgstr "Нет перемещаемого контура." -#: ../app/tools/gimpmovetool.c:257 ../app/tools/gimptransformtool.c:1470 +#: ../app/tools/gimpmovetool.c:257 ../app/tools/gimptransformtool.c:1484 msgid "The active path's position is locked." msgstr "Активный контур заблокирован от изменений" @@ -21441,8 +21639,8 @@ msgid "Show lattice" msgstr "Показывать сетку" #: ../app/tools/gimpnpointdeformationoptions.c:230 -#: ../app/tools/gimpscaletool.c:90 ../app/tools/gimptransformoptions.c:546 -#: ../app/tools/gimptransformoptions.c:557 +#: ../app/tools/gimpscaletool.c:90 ../app/tools/gimptransformoptions.c:554 +#: ../app/tools/gimptransformoptions.c:565 msgid "Scale" msgstr "Масштабирование" @@ -21528,28 +21726,28 @@ msgstr "Параметры угасания" msgid "Color Options" msgstr "Параметры цвета" -#: ../app/tools/gimppaintoptions-gui.c:622 +#: ../app/tools/gimppaintoptions-gui.c:636 msgid "Link to brush default" msgstr "" -#: ../app/tools/gimppainttool.c:157 +#: ../app/tools/gimppainttool.c:158 msgid "Click to paint" msgstr "Нажмите, чтобы нарисовать" -#: ../app/tools/gimppainttool.c:158 +#: ../app/tools/gimppainttool.c:159 msgid "Click to draw the line" msgstr "Нажмите, чтобы нарисовать линию" -#: ../app/tools/gimppainttool.c:159 +#: ../app/tools/gimppainttool.c:160 #, c-format msgid "%s to pick a color" msgstr "%s, чтобы взять пипеткой цвет" -#: ../app/tools/gimppainttool.c:272 +#: ../app/tools/gimppainttool.c:270 msgid "Cannot paint on layer groups." msgstr "Невозможно рисовать на группе слоев" -#: ../app/tools/gimppainttool.c:688 +#: ../app/tools/gimppainttool.c:600 #, c-format msgid "%s for a straight line" msgstr "%s для рисования прямой линии" @@ -21743,7 +21941,7 @@ msgstr "Рисовать маску выделенной области" msgid "Move the mouse to change threshold" msgstr "Переместите мышь для смены порога" -#: ../app/tools/gimprotatetool.c:95 ../app/tools/gimptransformoptions.c:548 +#: ../app/tools/gimprotatetool.c:95 ../app/tools/gimptransformoptions.c:556 msgid "Rotate" msgstr "Вращение" @@ -21883,8 +22081,8 @@ msgstr "Нажмите и перетащите для смещения копи msgid "Click to anchor the floating selection" msgstr "Нажмите, чтобы прицепить плавающее выделение" -#: ../app/tools/gimpsheartool.c:88 ../app/tools/gimptransformoptions.c:550 -#: ../app/tools/gimptransformoptions.c:559 +#: ../app/tools/gimpsheartool.c:88 ../app/tools/gimptransformoptions.c:558 +#: ../app/tools/gimptransformoptions.c:567 msgid "Shear" msgstr "Наклон" @@ -22136,7 +22334,7 @@ msgid "Opacity of the preview image" msgstr "Непрозрачность предпросмотра" #: ../app/tools/gimptransformoptions.c:154 -#: ../app/tools/gimptransformoptions.c:468 +#: ../app/tools/gimptransformoptions.c:476 msgid "Guides" msgstr "Направляющие" @@ -22144,108 +22342,108 @@ msgstr "Направляющие" msgid "Size of a grid cell for variable number of composition guides" msgstr "" -#: ../app/tools/gimptransformoptions.c:491 +#: ../app/tools/gimptransformoptions.c:499 #, c-format msgid "15 degrees (%s)" msgstr "15 градусов (%s)" -#: ../app/tools/gimptransformoptions.c:498 +#: ../app/tools/gimptransformoptions.c:506 msgid "Limit rotation steps to 15 degrees" msgstr "Ограничить вращение шагами по 15 градусов" -#: ../app/tools/gimptransformoptions.c:508 +#: ../app/tools/gimptransformoptions.c:516 #, c-format msgid "Keep aspect (%s)" msgstr "Сохранить пропорции (%s)" -#: ../app/tools/gimptransformoptions.c:515 +#: ../app/tools/gimptransformoptions.c:523 msgid "Keep the original aspect ratio" msgstr "Сохранять исходное соотношение сторон" -#: ../app/tools/gimptransformoptions.c:520 +#: ../app/tools/gimptransformoptions.c:528 #, c-format msgid "Around center (%s)" msgstr "Вокруг центра (%s)" -#: ../app/tools/gimptransformoptions.c:527 +#: ../app/tools/gimptransformoptions.c:535 msgid "Scale around the center point" msgstr "Масштабировать от центральной точки" -#: ../app/tools/gimptransformoptions.c:543 +#: ../app/tools/gimptransformoptions.c:551 #, c-format msgid "Constrain (%s)" msgstr "Ограничить (%s)" -#: ../app/tools/gimptransformoptions.c:544 +#: ../app/tools/gimptransformoptions.c:552 msgid "Move" msgstr "Перемещение" -#: ../app/tools/gimptransformoptions.c:545 +#: ../app/tools/gimptransformoptions.c:553 #, c-format msgid "Constrain movement to 45 degree angles from center (%s)" msgstr "Ограничить движение шагами по 45 градусов от центра (%s)" -#: ../app/tools/gimptransformoptions.c:547 +#: ../app/tools/gimptransformoptions.c:555 #, c-format msgid "Maintain aspect ratio when scaling (%s)" msgstr "Сохранять соотношение сторон при масштабировании (%s)" -#: ../app/tools/gimptransformoptions.c:549 +#: ../app/tools/gimptransformoptions.c:557 #, c-format msgid "Constrain rotation to 15 degree increments (%s)" msgstr "Ограничить вращение шагами по 15 градусов (%s)" -#: ../app/tools/gimptransformoptions.c:551 +#: ../app/tools/gimptransformoptions.c:559 #, c-format msgid "Shear along edge direction only (%s)" msgstr "Искривлять только вдоль края (%s)" -#: ../app/tools/gimptransformoptions.c:553 +#: ../app/tools/gimptransformoptions.c:561 #, c-format msgid "Constrain perspective handles to move along edges and diagonal (%s)" msgstr "" "Ограничить перемещение вертикалью, горизонталью и диагональю при коррекции " "перспективы (%s)" -#: ../app/tools/gimptransformoptions.c:556 +#: ../app/tools/gimptransformoptions.c:564 #, c-format msgid "From pivot (%s)" msgstr "От опорной точки (%s)" -#: ../app/tools/gimptransformoptions.c:558 +#: ../app/tools/gimptransformoptions.c:566 #, c-format msgid "Scale from pivot point (%s)" msgstr "Масштабировать от опорной точки (%s)" -#: ../app/tools/gimptransformoptions.c:560 +#: ../app/tools/gimptransformoptions.c:568 #, c-format msgid "Shear opposite edge by same amount (%s)" msgstr "Искривлять противоположный край на ту же величину (%s)" -#: ../app/tools/gimptransformoptions.c:562 +#: ../app/tools/gimptransformoptions.c:570 #, c-format msgid "Maintain position of pivot while changing perspective (%s)" msgstr "Сохранять положение опорной точки при коррекции перспективы (%s)" -#: ../app/tools/gimptransformoptions.c:565 +#: ../app/tools/gimptransformoptions.c:573 msgid "Pivot" msgstr "Опорная точка" -#: ../app/tools/gimptransformoptions.c:566 +#: ../app/tools/gimptransformoptions.c:574 #, c-format msgid "Snap (%s)" msgstr "Прилипать (%s)" -#: ../app/tools/gimptransformoptions.c:567 +#: ../app/tools/gimptransformoptions.c:575 #, c-format msgid "Snap pivot to corners and center (%s)" msgstr "Прилипать опорной точкой к углам и центру (%s)" -#: ../app/tools/gimptransformoptions.c:568 +#: ../app/tools/gimptransformoptions.c:576 msgid "Lock" msgstr "Блокировать" -#: ../app/tools/gimptransformoptions.c:569 +#: ../app/tools/gimptransformoptions.c:577 msgid "Lock pivot position to canvas" msgstr "Заблокировать положение опорной точки на холсте" @@ -22266,31 +22464,31 @@ msgstr "Это выделение не пересекается со слоем. msgid "Transform Step" msgstr "Шаг преобразования" -#: ../app/tools/gimptransformtool.c:982 +#: ../app/tools/gimptransformtool.c:996 msgid "The current transform is invalid" msgstr "" -#: ../app/tools/gimptransformtool.c:1430 +#: ../app/tools/gimptransformtool.c:1444 msgid "There is no layer to transform." msgstr "Нет слоя для преобразования." -#: ../app/tools/gimptransformtool.c:1437 +#: ../app/tools/gimptransformtool.c:1451 msgid "The active layer's position and size are locked." msgstr "Размер и положение активного слоя заблокированы от изменений." -#: ../app/tools/gimptransformtool.c:1450 +#: ../app/tools/gimptransformtool.c:1464 msgid "There is no selection to transform." msgstr "Нет трансформируемого выделения." -#: ../app/tools/gimptransformtool.c:1463 +#: ../app/tools/gimptransformtool.c:1477 msgid "There is no path to transform." msgstr "Нет контура для преобразования." -#: ../app/tools/gimptransformtool.c:1468 +#: ../app/tools/gimptransformtool.c:1482 msgid "The active path's strokes are locked." msgstr "Элементы активного контура заблокированы от изменений" -#: ../app/tools/gimptransformtool.c:1472 +#: ../app/tools/gimptransformtool.c:1486 msgid "The active path has no strokes." msgstr "Активный контур заблокирован от изменений" @@ -22815,147 +23013,147 @@ msgstr "" "ввести название цвета по CSS." #. TRANSLATORS: X for the X coordinate. -#: ../app/widgets/gimpcolorframe.c:193 +#: ../app/widgets/gimpcolorframe.c:201 msgctxt "Coordinates" msgid "X:" msgstr "X:" #. TRANSLATORS: Y for the Y coordinate. -#: ../app/widgets/gimpcolorframe.c:207 +#: ../app/widgets/gimpcolorframe.c:215 msgctxt "Coordinates" msgid "Y:" msgstr "Y:" #. TRANSLATORS: n/a for Not Available. -#: ../app/widgets/gimpcolorframe.c:637 ../app/widgets/gimpcolorframe.c:639 +#: ../app/widgets/gimpcolorframe.c:674 ../app/widgets/gimpcolorframe.c:676 msgctxt "Coordinates" msgid "n/a" msgstr "н/д" #. TRANSLATORS: V for Value (grayscale) -#: ../app/widgets/gimpcolorframe.c:712 +#: ../app/widgets/gimpcolorframe.c:749 msgctxt "Grayscale" msgid "V:" msgstr "V:" #. TRANSLATORS: A for Alpha (color transparency) -#: ../app/widgets/gimpcolorframe.c:716 ../app/widgets/gimpcolorframe.c:729 -#: ../app/widgets/gimpcolorframe.c:765 ../app/widgets/gimpcolorframe.c:807 -#: ../app/widgets/gimpcolorframe.c:835 ../app/widgets/gimpcolorframe.c:867 -#: ../app/widgets/gimpcolorframe.c:901 +#: ../app/widgets/gimpcolorframe.c:753 ../app/widgets/gimpcolorframe.c:766 +#: ../app/widgets/gimpcolorframe.c:802 ../app/widgets/gimpcolorframe.c:844 +#: ../app/widgets/gimpcolorframe.c:872 ../app/widgets/gimpcolorframe.c:904 +#: ../app/widgets/gimpcolorframe.c:938 msgctxt "Alpha channel" msgid "A:" msgstr "A:" #. TRANSLATORS: R for Red (RGB) -#: ../app/widgets/gimpcolorframe.c:721 ../app/widgets/gimpcolorframe.c:757 +#: ../app/widgets/gimpcolorframe.c:758 ../app/widgets/gimpcolorframe.c:794 msgctxt "RGB" msgid "R:" msgstr "R:" #. TRANSLATORS: G for Green (RGB) -#: ../app/widgets/gimpcolorframe.c:723 ../app/widgets/gimpcolorframe.c:759 +#: ../app/widgets/gimpcolorframe.c:760 ../app/widgets/gimpcolorframe.c:796 msgctxt "RGB" msgid "G:" msgstr "G:" #. TRANSLATORS: B for Blue (RGB) -#: ../app/widgets/gimpcolorframe.c:725 ../app/widgets/gimpcolorframe.c:761 +#: ../app/widgets/gimpcolorframe.c:762 ../app/widgets/gimpcolorframe.c:798 msgctxt "RGB" msgid "B:" msgstr "B:" #. TRANSLATORS: Index of the color in the palette. -#: ../app/widgets/gimpcolorframe.c:734 +#: ../app/widgets/gimpcolorframe.c:771 msgctxt "Indexed color" msgid "Index:" msgstr "Индекс:" #. TRANSLATORS: Hex for Hexadecimal (representation of a color) -#: ../app/widgets/gimpcolorframe.c:768 +#: ../app/widgets/gimpcolorframe.c:805 msgctxt "Color representation" msgid "Hex:" msgstr "Hex:" #. TRANSLATORS: H for Hue (HSV color space) -#: ../app/widgets/gimpcolorframe.c:799 +#: ../app/widgets/gimpcolorframe.c:836 msgctxt "HSV color space" msgid "H:" msgstr "H:" #. TRANSLATORS: S for Saturation (HSV color space) -#: ../app/widgets/gimpcolorframe.c:801 +#: ../app/widgets/gimpcolorframe.c:838 msgctxt "HSV color space" msgid "S:" msgstr "S:" #. TRANSLATORS: V for Value (HSV color space) -#: ../app/widgets/gimpcolorframe.c:803 +#: ../app/widgets/gimpcolorframe.c:840 msgctxt "HSV color space" msgid "V:" msgstr "V:" #. TRANSLATORS: L for Lightness (LCH color space) -#: ../app/widgets/gimpcolorframe.c:827 +#: ../app/widgets/gimpcolorframe.c:864 msgctxt "LCH color space" msgid "L*:" msgstr "L*:" #. TRANSLATORS: C for Chroma (LCH color space) -#: ../app/widgets/gimpcolorframe.c:829 +#: ../app/widgets/gimpcolorframe.c:866 msgctxt "LCH color space" msgid "C*:" msgstr "C*:" #. TRANSLATORS: H for Hue angle (LCH color space) -#: ../app/widgets/gimpcolorframe.c:831 +#: ../app/widgets/gimpcolorframe.c:868 msgctxt "LCH color space" msgid "h°:" msgstr "h°:" #. TRANSLATORS: L* for Lightness (Lab color space) -#: ../app/widgets/gimpcolorframe.c:859 +#: ../app/widgets/gimpcolorframe.c:896 msgctxt "Lab color space" msgid "L*:" msgstr "L*:" #. TRANSLATORS: a* color channel in Lab color space -#: ../app/widgets/gimpcolorframe.c:861 +#: ../app/widgets/gimpcolorframe.c:898 msgctxt "Lab color space" msgid "a*:" msgstr "a*:" #. TRANSLATORS: b* color channel in Lab color space -#: ../app/widgets/gimpcolorframe.c:863 +#: ../app/widgets/gimpcolorframe.c:900 msgctxt "Lab color space" msgid "b*:" msgstr "b*:" #. TRANSLATORS: C for Cyan (CMYK) -#: ../app/widgets/gimpcolorframe.c:891 +#: ../app/widgets/gimpcolorframe.c:928 msgctxt "CMYK" msgid "C:" msgstr "C:" #. TRANSLATORS: M for Magenta (CMYK) -#: ../app/widgets/gimpcolorframe.c:893 +#: ../app/widgets/gimpcolorframe.c:930 msgctxt "CMYK" msgid "M:" msgstr "M:" #. TRANSLATORS: Y for Yellow (CMYK) -#: ../app/widgets/gimpcolorframe.c:895 +#: ../app/widgets/gimpcolorframe.c:932 msgctxt "CMYK" msgid "Y:" msgstr "Y:" #. TRANSLATORS: K for Key/black (CMYK) -#: ../app/widgets/gimpcolorframe.c:897 +#: ../app/widgets/gimpcolorframe.c:934 msgctxt "CMYK" msgid "K:" msgstr "K:" -#: ../app/widgets/gimpcolorframe.c:959 +#: ../app/widgets/gimpcolorframe.c:996 msgctxt "Color value" msgid "n/a" msgstr "н/д" @@ -23453,142 +23651,160 @@ msgstr "В работе GIMP возникло несколько критиче msgid "_Restart GIMP" msgstr "_Перезапустить GIMP" -#: ../app/widgets/gimpdashboard.c:332 ../app/widgets/gimpdashboard.c:384 +#: ../app/widgets/gimpdashboard.c:346 ../app/widgets/gimpdashboard.c:398 msgctxt "dashboard-variable" msgid "Occupied" msgstr "Занято" -#: ../app/widgets/gimpdashboard.c:333 +#: ../app/widgets/gimpdashboard.c:347 msgid "Tile cache occupied size" msgstr "Размер, занимаемый кэшем тайлов" -#: ../app/widgets/gimpdashboard.c:342 +#: ../app/widgets/gimpdashboard.c:356 msgctxt "dashboard-variable" msgid "Maximum" msgstr "Максимум" -#: ../app/widgets/gimpdashboard.c:343 +#: ../app/widgets/gimpdashboard.c:357 msgid "Maximal tile cache occupied size" msgstr "Максимальный размер места, занятого кэшем тайлов" -#: ../app/widgets/gimpdashboard.c:352 ../app/widgets/gimpdashboard.c:404 +#: ../app/widgets/gimpdashboard.c:366 ../app/widgets/gimpdashboard.c:418 msgctxt "dashboard-variable" msgid "Limit" msgstr "Предел" -#: ../app/widgets/gimpdashboard.c:353 +#: ../app/widgets/gimpdashboard.c:367 msgid "Tile cache size limit" msgstr "Предел размера, занимаемого кэшем тайлов" -#: ../app/widgets/gimpdashboard.c:361 +#: ../app/widgets/gimpdashboard.c:375 msgctxt "dashboard-variable" msgid "Compression" msgstr "Сжатие" -#: ../app/widgets/gimpdashboard.c:362 +#: ../app/widgets/gimpdashboard.c:376 msgid "Tile cache compression ratio" msgstr "Коэффициент сжатия, занимаемого кэшем тайлов" -#: ../app/widgets/gimpdashboard.c:371 +#: ../app/widgets/gimpdashboard.c:385 msgctxt "dashboard-variable" msgid "Hit/Miss" msgstr "Попадание/промах" -#: ../app/widgets/gimpdashboard.c:372 +#: ../app/widgets/gimpdashboard.c:386 msgid "Tile cache hit/miss ratio" msgstr "Соотношение попаданий к промахам при чтении кэша" -#: ../app/widgets/gimpdashboard.c:385 +#: ../app/widgets/gimpdashboard.c:399 msgid "Swap file occupied size" msgstr "Размер места, занимаемого файлом подкачки" -#: ../app/widgets/gimpdashboard.c:394 +#: ../app/widgets/gimpdashboard.c:408 msgctxt "dashboard-variable" msgid "Size" msgstr "Размер" -#: ../app/widgets/gimpdashboard.c:395 +#: ../app/widgets/gimpdashboard.c:409 msgid "Swap file size" msgstr "Размер файла подкачки" -#: ../app/widgets/gimpdashboard.c:405 +#: ../app/widgets/gimpdashboard.c:419 msgid "Swap file size limit" msgstr "Предел места, занимаемого файлом подкачки" -#: ../app/widgets/gimpdashboard.c:412 +#: ../app/widgets/gimpdashboard.c:426 msgctxt "dashboard-variable" msgid "Busy" msgstr "Занято" -#: ../app/widgets/gimpdashboard.c:413 +#: ../app/widgets/gimpdashboard.c:427 msgid "Whether there is work queued for the swap file" msgstr "" -#: ../app/widgets/gimpdashboard.c:426 +#: ../app/widgets/gimpdashboard.c:440 msgctxt "dashboard-variable" msgid "Usage" msgstr "Использование" -#: ../app/widgets/gimpdashboard.c:427 +#: ../app/widgets/gimpdashboard.c:441 msgid "Total CPU usage" msgstr "Общее использование ЦП" -#: ../app/widgets/gimpdashboard.c:435 ../app/widgets/gimpdashboard.c:445 +#: ../app/widgets/gimpdashboard.c:449 ../app/widgets/gimpdashboard.c:459 msgctxt "dashboard-variable" msgid "Active" msgstr "Активность" -#: ../app/widgets/gimpdashboard.c:436 +#: ../app/widgets/gimpdashboard.c:450 msgid "Whether the CPU is active" msgstr "Активен ли центральный процессор" -#: ../app/widgets/gimpdashboard.c:446 +#: ../app/widgets/gimpdashboard.c:460 msgid "Total amount of time the CPU has been active" msgstr "Общая длительность активности центрального процессора" -#: ../app/widgets/gimpdashboard.c:460 +#: ../app/widgets/gimpdashboard.c:473 +msgctxt "dashboard-variable" +msgid "Mipmapped" +msgstr "Мипмапов" + +#: ../app/widgets/gimpdashboard.c:474 +msgid "Total size of processed mipmapped data" +msgstr "Общий размер обработанных мипмапов" + +#: ../app/widgets/gimpdashboard.c:486 msgctxt "dashboard-group" msgid "Cache" msgstr "Кэш" -#: ../app/widgets/gimpdashboard.c:461 +#: ../app/widgets/gimpdashboard.c:487 msgid "In-memory tile cache" msgstr "Кэш тайлов, хранящийся в оперативной памяти" -#: ../app/widgets/gimpdashboard.c:496 +#: ../app/widgets/gimpdashboard.c:523 msgctxt "dashboard-group" msgid "Swap" msgstr "Подкачка" -#: ../app/widgets/gimpdashboard.c:497 +#: ../app/widgets/gimpdashboard.c:524 msgid "On-disk tile swap" msgstr "Файл подкачки тайлов, хранящийся на диске" -#: ../app/widgets/gimpdashboard.c:525 +#: ../app/widgets/gimpdashboard.c:553 msgctxt "dashboard-group" msgid "CPU" msgstr "Процессор" -#: ../app/widgets/gimpdashboard.c:526 +#: ../app/widgets/gimpdashboard.c:554 msgid "CPU usage" msgstr "Использование процессора" -#: ../app/widgets/gimpdashboard.c:698 +#: ../app/widgets/gimpdashboard.c:583 +msgctxt "dashboard-group" +msgid "Misc" +msgstr "Разное" + +#: ../app/widgets/gimpdashboard.c:584 +msgid "Miscellaneous information" +msgstr "Различная информация" + +#: ../app/widgets/gimpdashboard.c:744 msgid "Select fields" msgstr "Выбрать поля" #. Tranlators: "N/A" is an abbreviation for "not available" -#: ../app/widgets/gimpdashboard.c:2162 +#: ../app/widgets/gimpdashboard.c:2323 msgctxt "dashboard-value" msgid "N/A" msgstr "Н/Д" -#: ../app/widgets/gimpdashboard.c:2171 +#: ../app/widgets/gimpdashboard.c:2332 msgctxt "dashboard-value" msgid "Yes" msgstr "Да" -#: ../app/widgets/gimpdashboard.c:2172 +#: ../app/widgets/gimpdashboard.c:2333 msgctxt "dashboard-value" msgid "No" msgstr "Нет" @@ -23854,84 +24070,84 @@ msgstr "Цвет заливки" msgid "_Antialiasing" msgstr "Сгл_аживание" -#: ../app/widgets/gimpgradienteditor.c:754 +#: ../app/widgets/gimpgradienteditor.c:756 #, c-format msgid "Zoom factor: %d:1" msgstr "Масштаб: %d:1" -#: ../app/widgets/gimpgradienteditor.c:757 +#: ../app/widgets/gimpgradienteditor.c:759 #, c-format msgid "Displaying [%0.4f, %0.4f]" msgstr "Отображение [%0.4f, %0.4f]" -#: ../app/widgets/gimpgradienteditor.c:957 +#: ../app/widgets/gimpgradienteditor.c:959 #, c-format msgid "Position: %0.4f" msgstr "Позиция: %0.4f" -#: ../app/widgets/gimpgradienteditor.c:958 +#: ../app/widgets/gimpgradienteditor.c:960 #, c-format msgid "RGB (%0.3f, %0.3f, %0.3f)" msgstr "RGB (%0.3f, %0.3f, %0.3f)" -#: ../app/widgets/gimpgradienteditor.c:960 +#: ../app/widgets/gimpgradienteditor.c:962 #, c-format msgid "HSV (%0.1f, %0.1f, %0.1f)" msgstr "HSV (%0.1f, %0.1f, %0.1f)" -#: ../app/widgets/gimpgradienteditor.c:962 +#: ../app/widgets/gimpgradienteditor.c:964 #, c-format msgid "Luminance: %0.1f Opacity: %0.1f" msgstr "Светимость: %0.1f Непрозрачность: %0.1f" -#: ../app/widgets/gimpgradienteditor.c:994 +#: ../app/widgets/gimpgradienteditor.c:996 #, c-format msgid "RGB (%d, %d, %d)" msgstr "RGB (%d, %d, %d)" -#: ../app/widgets/gimpgradienteditor.c:1005 +#: ../app/widgets/gimpgradienteditor.c:1007 msgid "Foreground color set to:" msgstr "Установить цвет переднего плана:" -#: ../app/widgets/gimpgradienteditor.c:1012 +#: ../app/widgets/gimpgradienteditor.c:1014 msgid "Background color set to:" msgstr "Установить цвет фона:" -#: ../app/widgets/gimpgradienteditor.c:1240 -#: ../app/widgets/gimpgradienteditor.c:1301 +#: ../app/widgets/gimpgradienteditor.c:1242 +#: ../app/widgets/gimpgradienteditor.c:1303 #, c-format msgid "%s-Drag: move & compress" msgstr "%s-перетаскивание: переместить и сжать" -#: ../app/widgets/gimpgradienteditor.c:1245 +#: ../app/widgets/gimpgradienteditor.c:1247 msgid "Drag: move" msgstr "Нажать и потянуть: перемещение" -#: ../app/widgets/gimpgradienteditor.c:1252 -#: ../app/widgets/gimpgradienteditor.c:1265 -#: ../app/widgets/gimpgradienteditor.c:1278 -#: ../app/widgets/gimpgradienteditor.c:1299 +#: ../app/widgets/gimpgradienteditor.c:1254 +#: ../app/widgets/gimpgradienteditor.c:1267 +#: ../app/widgets/gimpgradienteditor.c:1280 +#: ../app/widgets/gimpgradienteditor.c:1301 #, c-format msgid "%s-Click: extend selection" msgstr "%s-щелчок: расширить выделение" -#: ../app/widgets/gimpgradienteditor.c:1257 -#: ../app/widgets/gimpgradienteditor.c:1270 +#: ../app/widgets/gimpgradienteditor.c:1259 +#: ../app/widgets/gimpgradienteditor.c:1272 msgid "Click: select" msgstr "Щелчок: выделение" -#: ../app/widgets/gimpgradienteditor.c:1283 -#: ../app/widgets/gimpgradienteditor.c:1305 +#: ../app/widgets/gimpgradienteditor.c:1285 +#: ../app/widgets/gimpgradienteditor.c:1307 msgid "Click: select Drag: move" msgstr "Щелчок: выделение Нажать и потянуть: перемещение" -#: ../app/widgets/gimpgradienteditor.c:1520 -#: ../app/widgets/gimpgradienteditor.c:1528 +#: ../app/widgets/gimpgradienteditor.c:1522 +#: ../app/widgets/gimpgradienteditor.c:1530 #, c-format msgid "Handle position: %0.4f" msgstr "Позиция метки: %0.4f" -#: ../app/widgets/gimpgradienteditor.c:1545 +#: ../app/widgets/gimpgradienteditor.c:1547 #, c-format msgid "Distance: %0.4f" msgstr "Расстояние: %0.4f" @@ -24463,9 +24679,9 @@ msgid "Invalid UTF-8 data in file '%s'." msgstr "Недопустимая строка UTF-8 в файле'%s'." #: ../app/widgets/gimptextbuffer.c:1778 -#, fuzzy, c-format +#, c-format msgid "Writing text file '%s' failed: %s" -msgstr "Не удалось записать файл цветовой палитры '%s': %s" +msgstr "Не удалось записать текстовый файл '%s': %s" #: ../app/widgets/gimptexteditor.c:220 msgid "_Use selected font" @@ -24663,31 +24879,31 @@ msgstr "Заблокировать контур от изменений" msgid "Lock path position" msgstr "Заблокировать положение контура" -#: ../app/widgets/gimpviewablebox.c:91 +#: ../app/widgets/gimpviewablebox.c:94 msgid "Open the brush selection dialog" msgstr "Открыть диалог выбора кисти" -#: ../app/widgets/gimpviewablebox.c:159 +#: ../app/widgets/gimpviewablebox.c:162 msgid "Open the dynamics selection dialog" msgstr "Открыть диалог выбора динамики рисования" -#: ../app/widgets/gimpviewablebox.c:226 +#: ../app/widgets/gimpviewablebox.c:229 msgid "Open the MyPaint brush selection dialog" msgstr "Открыть диалог выбора кисти MyPaint" -#: ../app/widgets/gimpviewablebox.c:289 +#: ../app/widgets/gimpviewablebox.c:292 msgid "Open the pattern selection dialog" msgstr "Открыть диалог выбора текстуры" -#: ../app/widgets/gimpviewablebox.c:358 +#: ../app/widgets/gimpviewablebox.c:362 msgid "Open the gradient selection dialog" msgstr "Открыть диалог выбора градиента" -#: ../app/widgets/gimpviewablebox.c:476 +#: ../app/widgets/gimpviewablebox.c:501 msgid "Open the palette selection dialog" msgstr "Открыть диалог выбора палитры" -#: ../app/widgets/gimpviewablebox.c:542 +#: ../app/widgets/gimpviewablebox.c:567 msgid "Open the font selection dialog" msgstr "Открыть диалог выбора шрифта" @@ -24899,40 +25115,40 @@ msgstr "Ошибка при записи '%s': " msgid "Error creating '%s': " msgstr "Ошибка при создании '%s': " -#: ../app/xcf/xcf-load.c:305 +#: ../app/xcf/xcf-load.c:342 #, c-format msgid "" "Corrupt 'exif-data' parasite discovered.\n" "Exif data could not be migrated: %s" msgstr "" -#: ../app/xcf/xcf-load.c:342 +#: ../app/xcf/xcf-load.c:379 msgid "" "Corrupt 'gimp-metadata' parasite discovered.\n" "XMP data could not be migrated." msgstr "" -#: ../app/xcf/xcf-load.c:362 +#: ../app/xcf/xcf-load.c:399 #, c-format msgid "" "Corrupt 'gimp-metadata' parasite discovered.\n" "XMP data could not be migrated: %s" msgstr "" -#: ../app/xcf/xcf-load.c:549 +#: ../app/xcf/xcf-load.c:586 msgid "" "This XCF file is corrupt! I have loaded as much of it as I can, but it is " "incomplete." msgstr "" "Этот файл XCF поврежден! Некоторую его часть все же удалось восстановить." -#: ../app/xcf/xcf-load.c:560 +#: ../app/xcf/xcf-load.c:597 msgid "" "This XCF file is corrupt! I could not even salvage any partial image data " "from it." msgstr "Этот файл XCF поврежден! Не удалось восстановить даже малую его часть!" -#: ../app/xcf/xcf-load.c:652 +#: ../app/xcf/xcf-load.c:689 msgid "" "XCF warning: version 0 of XCF file format\n" "did not save indexed colormaps correctly.\n" @@ -24973,6 +25189,32 @@ msgstr "круглые" msgid "fuzzy" msgstr "растушеванные" +#~ msgctxt "undo-type" +#~ msgid "Blend" +#~ msgstr "Градиентная заливка" + +#~ msgid "Blending" +#~ msgstr "Заливка" + +#~ msgid "Blend" +#~ msgstr "Градиентная заливка" + +#~ msgid "Blen_d" +#~ msgstr "_Градиентная заливка" + +#~ msgid "Blend: " +#~ msgstr "Градиентная заливка: " + +#~ msgid "Blend Step" +#~ msgstr "Пространство смешивания" + +#, fuzzy +#~ msgid "Core color management" +#~ msgstr "Управление цветом" + +#~ msgid "On-canvas effect preview" +#~ msgstr "Просмотр эффектов на холсте" + #~ msgid "Try generating debug data for bug reporting when appropriate" #~ msgstr "Попробовать создать данные отладки для отчёта об ошибке" @@ -26262,9 +26504,6 @@ msgstr "растушеванные" #~ msgid "Flow:" #~ msgstr "Поток:" -#~ msgid "Gradient:" -#~ msgstr "Градиент:" - #~ msgid "Threshold:" #~ msgstr "Порог:" diff --git a/po/sv.po b/po/sv.po index 55548cf054..0a05a31a12 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,38 +1,40 @@ # Swedish messages for the GIMP. -# Copyright © 1999-2015 Free Software Foundation, Inc. +# Copyright © 1999-2018 Free Software Foundation, Inc. # Tomas Ögren , 1999, 2000. # Christian Rose , 2000, 2001, 2002, 2003. # Jan Morén , 2003. # Daniel Nylander , 2007, 2008, 2009, 2010, 2011, 2012. -# Påvel Nicklasson , 2014 -# Anders Jonsson , 2015 +# Påvel Nicklasson , 2014. +# Anders Jonsson , 2015, 2018. +# Sebastian Rasmussen , 2017, 2018. # msgid "" msgstr "" "Project-Id-Version: gimp\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=Internationalisation\n" -"POT-Creation-Date: 2016-09-18 18:21+0000\n" -"PO-Revision-Date: 2016-09-19 11:29+0200\n" -"Last-Translator: Anders Jonsson \n" +"POT-Creation-Date: 2018-04-13 21:44+0000\n" +"PO-Revision-Date: 2018-04-14 21:55+0200\n" +"Last-Translator: Sebastian Rasmussen \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.7.3\n" +"X-Generator: Poedit 2.0.6\n" -#: ../desktop/gimp.appdata.xml.in.h:1 ../desktop/gimp.desktop.in.in.h:1 -#: ../app/about.h:26 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:1 +#: ../desktop/gimp.desktop.in.in.h:1 ../app/about.h:26 msgid "GNU Image Manipulation Program" msgstr "GNU:s bildmanipuleringsprogram" -#: ../desktop/gimp.appdata.xml.in.h:2 ../desktop/gimp.desktop.in.in.h:3 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:2 +#: ../desktop/gimp.desktop.in.in.h:3 msgid "Create images and edit photographs" msgstr "Skapa bilder och redigera fotografier" -#: ../desktop/gimp.appdata.xml.in.h:3 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:3 msgid "" "GIMP is an acronym for GNU Image Manipulation Program. It is a freely " "distributed program for such tasks as photo retouching, image composition " @@ -42,7 +44,7 @@ msgstr "" "distribuerat program för sådana uppgifter som fotoretuschering, " "bildkomposition och bildskapande." -#: ../desktop/gimp.appdata.xml.in.h:4 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:4 msgid "" "It has many capabilities. It can be used as a simple paint program, an " "expert quality photo retouching program, an online batch processing system, " @@ -52,7 +54,7 @@ msgstr "" "fotoretuscheringsprogram på expertnivå, ett online massbearbetningssystem, " "en massproduktionsbildåtergivare, en bildformatsomvandlare, etc." -#: ../desktop/gimp.appdata.xml.in.h:5 +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:5 msgid "" "GIMP is expandable and extensible. It is designed to be augmented with plug-" "ins and extensions to do just about anything. The advanced scripting " @@ -66,14 +68,249 @@ msgstr "" "de mest komplexa bildmanipuleringsförfaranden att enkelt skrivas. GIMP är " "tillgängligt för Linux, Microsoft Windows och OS X." -#: ../desktop/gimp.appdata.xml.in.h:6 -msgid "Screenshot showing channel mixing and layer editor" +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:6 +msgid "Painting in GIMP" +msgstr "Måla i GIMP" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:7 +msgid "Photo editing in GIMP" +msgstr "Fotoredigering i GIMP" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:8 +msgid "" +"First release of the 2.10 series which prominently features the port to a " +"new image processing engine, GEGL. The most outstanding changes are:" msgstr "" +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:9 +msgid "High bit depth color processing (16/32-bit per color channel)" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:10 +msgid "" +"Color management is a core feature now, most widgets and preview areas are " +"color-managed" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:11 +msgid "" +"On-canvas effect preview, with split view for before/after processing pixels" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:12 +msgid "" +"Multi-threaded and hardware-accelerated rendering, processing and painting" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:13 +msgid "Most tools improved, several new transformation tools" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:14 +msgid "" +"Improved support for many image formats, in particular better PSD importing" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:15 +msgid "Newly supported image formats: OpenEXR, RGBE, WebP, HGT…" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:16 +msgid "" +"Improved digital painting: canvas rotation and flipping, symmetry painting, " +"MyPaint brushes…" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:17 +msgid "Metadata viewing and editing for Exif, XMP, IPTC, and DICOM" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:18 +msgid "Basic HiDPI support: automatically or user-selected icon size" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:19 +msgid "New themes for GIMP: Light, Gray, Dark, and System" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:20 +msgid "And much, much more…" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:21 +msgid "" +"In this second release candidate before GIMP 2.10.0, while debugging is " +"still a prime target, a new focus has been put on speed and optimization in " +"order to provide a smoother painting experience. Bigger changes are:" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:22 +msgid "" +"Major core optimizations for painting and display, including parallelized " +"painting code." +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:23 +msgid "Symmetries are now preserved in XCF files (saved as image parasites)." +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:24 +msgid "" +"\"Light\" and \"Dark\" themes rewritten from scratch to get rid of various " +"usability issues. \"Lighter\" and \"Darker\" themes removed." +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:25 +msgid "" +"New GimpToolGyroscope on-canvas control, currently used for the Panorama " +"Projection filter. The widget provides on-canvas interaction for 3D rotation " +"(yaw, pitch, roll)." +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:26 +msgid "" +"Plug-in debugging improved to output stack traces from plug-ins with --stack-" +"trace-mode command line option not only on receiving signals but also on " +"warnings and critical errors when \"fatal-warnings\" debug key is set." +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:27 +msgid "" +"For more information, see https://www.gimp.org/news/2018/04/14/gimp-2-10-rc2-" +"released/" +msgstr "" +"För mer information, se https://www.gimp.org/news/2018/04/14/gimp-2-10-rc2-" +"released/" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:28 +msgid "" +"GIMP 2.10.0-RC1 is the first release candidate before GIMP 2.10.0 stable " +"release, with a focus on debugging and stability. Other than the many bug " +"fixes, most notable improvements are:" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:29 +#, fuzzy +msgid "New dashboard dockable to monitor GIMP resource usage" +msgstr "Ny dockningsbar panel för att övervaka GIMP:s resursanvändning" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:30 +msgid "" +"New debug dialog to produce back traces and other debug data, encouraging to " +"report bugs" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:31 +msgid "Unsaved images can now be recovered after a crash" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:32 +msgid "Layer masks on layer groups" +msgstr "Lagermasker på lagergrupper" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:33 +msgid "JPEG 2000 support improved for high bit depth and various color spaces" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:34 +msgid "Screenshot and color picking improved on various platforms" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:35 +#, fuzzy +#| msgid "Export XMP metadata by default when available" +msgid "Metadata defaults preferences now available" +msgstr "Exportera XMP-metadata som standard när tillgänglig" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:36 +msgid "Various GUI polishing" +msgstr "" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:37 +msgid "" +"For more information, see https://www.gimp.org/news/2018/03/23/gimp-2-10-rc1-" +"released/" +msgstr "" +"För mer information, se https://www.gimp.org/news/2018/03/23/gimp-2-10-rc1-" +"released/" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:38 +msgid "" +"GIMP 2.9.8 introduces on-canvas gradient editing and various enhancements " +"while focusing on bugfixing and stability." +msgstr "" +"GIMP 2.9.8 introducerar redigering av toningar på duken och diverse " +"förbättringar men fokus ligger på felfixar och stabilitet." + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:39 +msgid "On-canvas gradient editing" +msgstr "Gradientredigerare på duken" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:40 +msgid "Notification when an image is over/underexposed" +msgstr "Avisering när en bild är över-/underexponerad" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:41 +msgid "Better and faster color management" +msgstr "Bättre och snabbare färghantering" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:42 +msgid "Support for color picker and screenshots in Wayland on KDE Plasma" +msgstr "Stöd för färgväljare och skärmbilder i Wayland på KDE Plasma" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:43 +msgid "Paste in place feature" +msgstr "Klistra in i på plats-funktion" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:44 +msgid "Many usability improvements" +msgstr "Många förbättringar vad gäller användbarhet" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:45 +msgid "Manual can be displayed in the user's preferred language" +msgstr "Handboken kan visas i det språk som användaren föredrar" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:46 +msgid "Improvements for the Wavelet Decompose filter" +msgstr "Förbättringar för filtret Wavelet-separera" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:47 +msgid "Improved compatibility with Photoshop .psd files" +msgstr "Förbättrad kompatibilitet med Photoshops .psd-filer" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:48 +msgid "New support for password-protected PDF" +msgstr "Nytt stöd för lösenordsskyddad PDF" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:49 +msgid "New support for HGT format (Digital Elevation Model data)" +msgstr "Nytt stöd för HGT-format (Digital Elevation Model-data)" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:50 +msgid "" +"For more information, see https://www.gimp.org/news/2017/12/12/gimp-2-9-8-" +"released/" +msgstr "" +"För mer information, se https://www.gimp.org/news/2017/12/12/gimp-2-9-8-" +"released/" + +#: ../desktop/gimp-data-extras.metainfo.xml.in.h:1 +msgid "Extra files for GIMP" +msgstr "Extrafiler för GIMP" + +#: ../desktop/gimp-data-extras.metainfo.xml.in.h:2 +msgid "Patterns, gradients, and other extra files for GIMP" +msgstr "Mönster, toningar och andra extrafiler för GIMP" + #: ../desktop/gimp.desktop.in.in.h:2 msgid "Image Editor" msgstr "Bildredigerare" +#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../desktop/gimp.desktop.in.in.h:5 +msgid "GIMP;graphic;design;illustration;painting;" +msgstr "GIMP;grafik;design;illustrera;målning;rita;" + #: ../app/about.h:23 msgid "GIMP" msgstr "GIMP" @@ -94,20 +331,6 @@ msgstr "" #. * Cf. bug 762282. #. #: ../app/about.h:39 -#, fuzzy -#| msgid "" -#| "GIMP is free software: you can redistribute it and/or modify it under the " -#| "terms of the GNU General Public License as published by the Free Software " -#| "Foundation; either version 3 of the License, or (at your option) any " -#| "later version.\n" -#| "\n" -#| "GIMP is distributed in the hope that it will be useful, but WITHOUT ANY " -#| "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -#| "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " -#| "details.\n" -#| "\n" -#| "You should have received a copy of the GNU General Public License along " -#| "with GIMP. If not, see http://www.gnu.org/licenses/." msgid "" "GIMP is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -136,111 +359,125 @@ msgstr "" "ytterligare information.\n" "\n" "Du bör ha fått en kopia av GNU General Public License tillsammans med detta " -"program. Om inte, se http://www.gnu.org/licenses/." +"program. Om inte, se http://www.gnu.org/licenses/" -#: ../app/main.c:160 +#: ../app/gimp-version.c:66 ../app/gimp-version.c:164 +#, c-format +msgid "using %s version %s (compiled against version %s)" +msgstr "använder %s version %s (kompilerad mot version %s)" + +#: ../app/gimp-version.c:192 +#, c-format +msgid "%s version %s" +msgstr "%s version %s" + +#: ../app/main.c:157 msgid "Show version information and exit" msgstr "Visa versionsinformation och avsluta" -#: ../app/main.c:165 +#: ../app/main.c:162 msgid "Show license information and exit" msgstr "Visa licensinformation och avsluta" -#: ../app/main.c:170 +#: ../app/main.c:167 msgid "Be more verbose" msgstr "Var mer informativ" -#: ../app/main.c:175 +#: ../app/main.c:172 msgid "Start a new GIMP instance" msgstr "Starta en ny instans av GIMP" -#: ../app/main.c:180 +#: ../app/main.c:177 msgid "Open images as new" msgstr "Öppna bilder som nya" -#: ../app/main.c:185 +#: ../app/main.c:182 msgid "Run without a user interface" msgstr "Kör utan ett användargränssnitt" -#: ../app/main.c:190 +#: ../app/main.c:187 msgid "Do not load brushes, gradients, patterns, ..." -msgstr "Läs inte in penslar, gradienter, mönster, ..." +msgstr "Läs inte in penslar, gradienter, mönster, …" -#: ../app/main.c:195 +#: ../app/main.c:192 msgid "Do not load any fonts" msgstr "Läs inte in några typsnitt" -#: ../app/main.c:200 +#: ../app/main.c:197 msgid "Do not show a splash screen" msgstr "Visa inte en startbild" -#: ../app/main.c:205 -msgid "Do not use shared memory between GIMP and plugins" +#: ../app/main.c:202 +msgid "Do not use shared memory between GIMP and plug-ins" msgstr "Använd inte delat minne mellan GIMP och insticksmoduler" -#: ../app/main.c:210 +#: ../app/main.c:207 msgid "Do not use special CPU acceleration functions" msgstr "Använd inga särskilda acceleringsfunktioner för processorer" -#: ../app/main.c:215 +#: ../app/main.c:212 msgid "Use an alternate sessionrc file" msgstr "Använd en alternativ sessionrc-fil" -#: ../app/main.c:220 +#: ../app/main.c:217 msgid "Use an alternate user gimprc file" msgstr "Använd en alternativ användar-gimprc-fil" -#: ../app/main.c:225 +#: ../app/main.c:222 msgid "Use an alternate system gimprc file" msgstr "Använd en alternativ system-gimprc-fil" -#: ../app/main.c:230 +#: ../app/main.c:227 msgid "Batch command to run (can be used multiple times)" msgstr "Satskommando att köra (kan användas flera gånger)" -#: ../app/main.c:235 +#: ../app/main.c:232 msgid "The procedure to process batch commands with" msgstr "Proceduren att behandla satskommandon med" -#: ../app/main.c:240 +#: ../app/main.c:237 msgid "Send messages to console instead of using a dialog" msgstr "Skicka meddelanden till konsolen istället för att använda en dialog" #. don't translate the mode names (off|on|warn) -#: ../app/main.c:246 +#: ../app/main.c:243 msgid "PDB compatibility mode (off|on|warn)" msgstr "PDB-kompatibilitetsläge (off|on|warn)" #. don't translate the mode names (never|query|always) -#: ../app/main.c:252 +#: ../app/main.c:249 msgid "Debug in case of a crash (never|query|always)" msgstr "Felsök om en krasch sker (never|query|always)" -#: ../app/main.c:257 +#: ../app/main.c:254 msgid "Enable non-fatal debugging signal handlers" msgstr "Aktivera icke-ödesdiger signalhanterare för felsökning" -#: ../app/main.c:262 +#: ../app/main.c:259 msgid "Make all warnings fatal" msgstr "Gör alla varningar ödesdigra" -#: ../app/main.c:267 +#: ../app/main.c:264 msgid "Output a gimprc file with default settings" msgstr "Skriv ut en gimprc-fil med standardinställningar" -#: ../app/main.c:283 +#: ../app/main.c:280 msgid "Output a sorted list of deprecated procedures in the PDB" msgstr "Skapa en sorterad lista med föråldrade rutiner i PDB" -#: ../app/main.c:288 +#: ../app/main.c:285 msgid "Show a preferences page with experimental features" -msgstr "" +msgstr "Visa en inställningssida med experimentella funktioner" -#: ../app/main.c:491 +#: ../app/main.c:290 +msgid "Show an image submenu with debug actions" +msgstr "Visa en bildundermeny med felsökningsåtgärder" + +#: ../app/main.c:466 msgid "[FILE|URI...]" -msgstr "[FIL|URI...]" +msgstr "[FIL|URI…]" -#: ../app/main.c:509 +#: ../app/main.c:484 msgid "" "GIMP could not initialize the graphical user interface.\n" "Make sure a proper setup for your display environment exists." @@ -248,24 +485,24 @@ msgstr "" "GIMP kunde inte initiera det grafiska användargränssnittet.\n" "Kontrollera att det finns en korrekt konfiguration för din displaymiljö." -#: ../app/main.c:528 +#: ../app/main.c:503 msgid "Another GIMP instance is already running." msgstr "En annan instans av GIMP körs redan." -#: ../app/main.c:616 +#: ../app/main.c:594 msgid "GIMP output. Type any character to close this window." msgstr "GIMP-utdata. Tryck på en tangent för att stänga fönstret." -#: ../app/main.c:617 +#: ../app/main.c:595 #, c-format msgid "(Type any character to close this window)\n" msgstr "(Tryck på en tangent för att stänga fönstret)\n" -#: ../app/main.c:634 +#: ../app/main.c:612 msgid "GIMP output. You can minimize this window, but don't close it." msgstr "GIMP-utdata. Du kan minimera det här fönstret men stäng det inte." -#: ../app/sanity.c:661 +#: ../app/sanity.c:562 #, c-format msgid "" "The configured filename encoding cannot be converted to UTF-8: %s\n" @@ -276,7 +513,7 @@ msgstr "" "\n" "Kontrollera värdet på miljövariabeln G_FILENAME_ENCODING." -#: ../app/sanity.c:680 +#: ../app/sanity.c:581 #, c-format msgid "" "The name of the directory holding the GIMP user configuration cannot be " @@ -292,235 +529,223 @@ msgstr "" "Antagligen använder ditt filsystem en annan kodning än UTF-8, men du har " "inte talat om det för GLib. Ställ in miljövariabeln G_FILENAME_ENCODING." -#. show versions of libraries used by GIMP -#: ../app/version.c:63 ../app/version.c:130 -#, c-format -msgid "using %s version %s (compiled against version %s)" -msgstr "använder %s version %s (kompilerad mot version %s)" - -#: ../app/version.c:138 -#, c-format -msgid "%s version %s" -msgstr "%s version %s" - -#: ../app/actions/actions.c:110 ../app/dialogs/dialogs.c:415 +#: ../app/actions/actions.c:111 ../app/dialogs/dialogs.c:420 #: ../app/widgets/gimpbrusheditor.c:89 msgid "Brush Editor" msgstr "Penselredigerare" #. initialize the list of gimp brushes -#: ../app/actions/actions.c:113 ../app/core/gimp-data-factories.c:353 -#: ../app/dialogs/dialogs.c:328 ../app/dialogs/preferences-dialog.c:2887 +#: ../app/actions/actions.c:114 ../app/core/gimp-data-factories.c:317 +#: ../app/dialogs/dialogs.c:335 ../app/dialogs/preferences-dialog.c:3092 msgid "Brushes" msgstr "Penslar" -#: ../app/actions/actions.c:116 ../app/dialogs/dialogs.c:346 +#: ../app/actions/actions.c:117 ../app/dialogs/dialogs.c:356 msgid "Buffers" msgstr "Buffertar" -#: ../app/actions/actions.c:119 ../app/dialogs/dialogs.c:369 +#: ../app/actions/actions.c:120 ../app/dialogs/dialogs.c:374 #: ../app/widgets/gimppickablepopup.c:249 msgid "Channels" msgstr "Kanaler" -#: ../app/actions/actions.c:122 ../app/dialogs/convert-indexed-dialog.c:177 -#: ../app/dialogs/dialogs.c:377 +#: ../app/actions/actions.c:123 ../app/dialogs/convert-indexed-dialog.c:174 +#: ../app/dialogs/dialogs.c:382 msgid "Colormap" msgstr "Färgkarta" -#: ../app/actions/actions.c:125 +#: ../app/actions/actions.c:126 msgid "Context" msgstr "Sammanhang" -#: ../app/actions/actions.c:128 ../app/dialogs/dialogs.c:319 +#: ../app/actions/actions.c:129 ../app/dialogs/dialogs.c:322 msgid "Pointer Information" msgstr "Pekarinformation" -#: ../app/actions/actions.c:131 +#: ../app/actions/actions.c:132 ../app/dialogs/dialogs.c:326 +msgid "Dashboard" +msgstr "Panel" + +#: ../app/actions/actions.c:135 msgid "Debug" msgstr "Felsök" -#: ../app/actions/actions.c:134 +#: ../app/actions/actions.c:138 msgid "Dialogs" msgstr "Dialoger" -#: ../app/actions/actions.c:137 +#: ../app/actions/actions.c:141 msgid "Dock" msgstr "Docka" -#: ../app/actions/actions.c:140 +#: ../app/actions/actions.c:144 msgid "Dockable" msgstr "Dockningsbar" #. Document History -#: ../app/actions/actions.c:143 ../app/dialogs/dialogs.c:349 -#: ../app/dialogs/preferences-dialog.c:1380 +#: ../app/actions/actions.c:147 ../app/dialogs/dialogs.c:362 +#: ../app/dialogs/preferences-dialog.c:1201 msgid "Document History" msgstr "Dokumenthistorik" -#: ../app/actions/actions.c:146 +#: ../app/actions/actions.c:150 msgid "Drawable" msgstr "Rityta" -#: ../app/actions/actions.c:149 ../app/dialogs/dialogs.c:357 +#: ../app/actions/actions.c:153 ../app/dialogs/dialogs.c:338 msgid "Paint Dynamics" msgstr "Målningsdynamik" -#: ../app/actions/actions.c:152 ../app/dialogs/dialogs.c:419 +#: ../app/actions/actions.c:156 ../app/dialogs/dialogs.c:424 #: ../app/widgets/gimpdynamicseditor.c:97 msgid "Paint Dynamics Editor" msgstr "Målningsdynamikredigerare" -#: ../app/actions/actions.c:155 +#: ../app/actions/actions.c:159 msgid "Edit" msgstr "Redigera" -#: ../app/actions/actions.c:158 ../app/dialogs/dialogs.c:315 +#: ../app/actions/actions.c:162 ../app/dialogs/dialogs.c:318 msgid "Error Console" msgstr "Felkonsol" -#: ../app/actions/actions.c:161 +#: ../app/actions/actions.c:165 msgid "File" msgstr "Fil" -#: ../app/actions/actions.c:164 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "Filte_rs" +#: ../app/actions/actions.c:168 msgid "Filters" -msgstr "Filte_r" +msgstr "Filter" -#: ../app/actions/actions.c:167 ../app/dialogs/dialogs.c:343 -#: ../app/dialogs/preferences-dialog.c:2907 +#: ../app/actions/actions.c:171 ../app/dialogs/dialogs.c:353 +#: ../app/dialogs/preferences-dialog.c:3112 msgid "Fonts" msgstr "Typsnitt" -#: ../app/actions/actions.c:170 ../app/dialogs/dialogs.c:423 +#: ../app/actions/actions.c:174 ../app/dialogs/dialogs.c:428 #: ../app/widgets/gimpgradienteditor.c:271 msgid "Gradient Editor" msgstr "Gradientredigerare" #. initialize the list of gimp gradients -#: ../app/actions/actions.c:173 ../app/core/gimp-data-factories.c:378 -#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2903 +#: ../app/actions/actions.c:177 ../app/core/gimp-data-factories.c:342 +#: ../app/dialogs/dialogs.c:347 ../app/dialogs/preferences-dialog.c:3108 msgid "Gradients" msgstr "Gradienter" -#: ../app/actions/actions.c:176 ../app/core/gimp-data-factories.c:389 -#: ../app/dialogs/dialogs.c:360 ../app/dialogs/preferences-dialog.c:2911 +#: ../app/actions/actions.c:180 ../app/core/gimp-data-factories.c:353 +#: ../app/dialogs/dialogs.c:359 ../app/dialogs/preferences-dialog.c:3116 msgid "Tool Presets" -msgstr "Verktygsförval" +msgstr "Verktygsförinställning" -#: ../app/actions/actions.c:179 ../app/dialogs/dialogs.c:431 +#: ../app/actions/actions.c:183 ../app/dialogs/dialogs.c:436 #: ../app/widgets/gimptoolpreseteditor.c:94 msgid "Tool Preset Editor" -msgstr "Verktygsförvalsredigare" +msgstr "Verktygsförinställningsredigare" -#: ../app/actions/actions.c:182 +#: ../app/actions/actions.c:186 msgid "Help" msgstr "Hjälp" -#: ../app/actions/actions.c:185 +#: ../app/actions/actions.c:189 msgid "Image" msgstr "Bild" -#: ../app/actions/actions.c:188 ../app/dialogs/dialogs.c:325 +#: ../app/actions/actions.c:192 ../app/dialogs/dialogs.c:332 #: ../app/widgets/gimppickablepopup.c:179 msgid "Images" msgstr "Bilder" -#: ../app/actions/actions.c:191 ../app/dialogs/dialogs.c:365 -#: ../app/dialogs/resize-dialog.c:289 ../app/widgets/gimppickablepopup.c:230 +#: ../app/actions/actions.c:195 ../app/dialogs/dialogs.c:370 +#: ../app/dialogs/resize-dialog.c:144 ../app/widgets/gimppickablepopup.c:230 msgid "Layers" msgstr "Lager" #. initialize the list of mypaint brushes -#: ../app/actions/actions.c:194 ../app/core/gimp-data-factories.c:363 -#: ../app/dialogs/dialogs.c:331 ../app/dialogs/preferences-dialog.c:2915 -#, fuzzy -#| msgid "Paintbrush" +#: ../app/actions/actions.c:198 ../app/core/gimp-data-factories.c:327 +#: ../app/dialogs/dialogs.c:341 ../app/dialogs/preferences-dialog.c:3120 msgid "MyPaint Brushes" -msgstr "Pensel" +msgstr "MyPaint-penslar" -#: ../app/actions/actions.c:197 ../app/dialogs/dialogs.c:427 +#: ../app/actions/actions.c:201 ../app/dialogs/dialogs.c:432 #: ../app/widgets/gimppaletteeditor.c:149 msgid "Palette Editor" msgstr "Palettredigerare" #. initialize the list of gimp palettes -#: ../app/actions/actions.c:200 ../app/core/gimp-data-factories.c:373 -#: ../app/dialogs/dialogs.c:340 ../app/dialogs/preferences-dialog.c:2899 +#: ../app/actions/actions.c:204 ../app/core/gimp-data-factories.c:337 +#: ../app/dialogs/dialogs.c:350 ../app/dialogs/preferences-dialog.c:3104 msgid "Palettes" msgstr "Paletter" #. initialize the list of gimp patterns -#: ../app/actions/actions.c:203 ../app/core/gimp-data-factories.c:368 -#: ../app/dialogs/dialogs.c:334 ../app/dialogs/preferences-dialog.c:2895 +#: ../app/actions/actions.c:207 ../app/core/gimp-data-factories.c:332 +#: ../app/dialogs/dialogs.c:344 ../app/dialogs/preferences-dialog.c:3100 msgid "Patterns" msgstr "Mönster" -#: ../app/actions/actions.c:206 ../app/dialogs/preferences-dialog.c:2919 -msgid "Plug-Ins" +#: ../app/actions/actions.c:210 ../app/dialogs/preferences-dialog.c:3124 +msgid "Plug-ins" msgstr "Insticksmoduler" #. Quick Mask Color -#: ../app/actions/actions.c:209 ../app/core/gimpchannel.c:406 -#: ../app/dialogs/preferences-dialog.c:1710 +#: ../app/actions/actions.c:213 ../app/core/gimpchannel.c:383 +#: ../app/dialogs/preferences-dialog.c:1684 msgid "Quick Mask" msgstr "Snabbmask" -#: ../app/actions/actions.c:212 ../app/dialogs/dialogs.c:397 +#: ../app/actions/actions.c:216 ../app/dialogs/dialogs.c:402 msgid "Sample Points" -msgstr "Sampelspunkter" +msgstr "Samplingspunkter" -#: ../app/actions/actions.c:215 +#: ../app/actions/actions.c:219 msgid "Select" msgstr "Välj" #. initialize the template list -#: ../app/actions/actions.c:218 ../app/core/gimp.c:858 -#: ../app/dialogs/dialogs.c:352 +#: ../app/actions/actions.c:222 ../app/core/gimp.c:797 +#: ../app/dialogs/dialogs.c:365 msgid "Templates" msgstr "Mallar" -#: ../app/actions/actions.c:221 +#: ../app/actions/actions.c:225 msgid "Text Tool" msgstr "Textverktyg" -#: ../app/actions/actions.c:224 +#: ../app/actions/actions.c:228 msgid "Text Editor" msgstr "Textredigerare" -#: ../app/actions/actions.c:227 ../app/dialogs/dialogs.c:307 -#: ../app/gui/gui.c:459 +#: ../app/actions/actions.c:231 ../app/dialogs/dialogs.c:310 +#: ../app/gui/gui.c:550 msgid "Tool Options" msgstr "Verktygsalternativ" -#: ../app/actions/actions.c:230 ../app/widgets/gimptoolpalette.c:289 +#: ../app/actions/actions.c:234 ../app/widgets/gimptoolpalette.c:329 msgid "Tools" msgstr "Verktyg" -#: ../app/actions/actions.c:233 ../app/dialogs/dialogs.c:373 -#: ../app/tools/gimpvectortool.c:160 +#: ../app/actions/actions.c:237 ../app/dialogs/dialogs.c:378 +#: ../app/tools/gimpvectortool.c:163 msgid "Paths" msgstr "Banor" -#: ../app/actions/actions.c:236 +#: ../app/actions/actions.c:240 msgid "View" msgstr "Visa" -#: ../app/actions/actions.c:239 +#: ../app/actions/actions.c:243 msgid "Windows" msgstr "Fönster" #. value description and new value shown in the status bar -#: ../app/actions/actions.c:590 +#: ../app/actions/actions.c:593 #, c-format msgid "%s: %.2f" msgstr "%s: %.2f" #. value description and new value shown in the status bar -#: ../app/actions/actions.c:616 +#: ../app/actions/actions.c:619 #, c-format msgid "%s: %d" msgstr "%s: %d" @@ -581,19 +806,14 @@ msgid "Copy brush file location to clipboard" msgstr "Kopiera penselfilens plats till urklipp" #: ../app/actions/brushes-actions.c:71 -#, fuzzy -#| msgid "Module Manager" msgctxt "brushes-action" msgid "Show in _File Manager" -msgstr "Modulhanterare" +msgstr "Visa i _filhanterare" #: ../app/actions/brushes-actions.c:72 -#, fuzzy -#| msgctxt "brushes-action" -#| msgid "Copy brush file location to clipboard" msgctxt "brushes-action" msgid "Show brush file location in the file manager" -msgstr "Kopiera penselfilens plats till urklipp" +msgstr "Visa penselfilens plats i filhanteraren" #: ../app/actions/brushes-actions.c:77 msgctxt "brushes-action" @@ -618,7 +838,7 @@ msgstr "Uppdatera penslar" #: ../app/actions/brushes-actions.c:92 msgctxt "brushes-action" msgid "_Edit Brush..." -msgstr "R_edigera pensel..." +msgstr "R_edigera pensel…" #: ../app/actions/brushes-actions.c:93 msgctxt "brushes-action" @@ -632,213 +852,412 @@ msgstr "Buffertmeny" #: ../app/actions/buffers-actions.c:46 msgctxt "buffers-action" -msgid "_Paste Buffer" -msgstr "_Klistra in buffert" +msgid "Paste Buffer as _New Image" +msgstr "Klistra in buffert som _ny bild" #: ../app/actions/buffers-actions.c:47 msgctxt "buffers-action" -msgid "Paste the selected buffer" -msgstr "Klistra in i markerad buffert" - -#: ../app/actions/buffers-actions.c:52 -msgctxt "buffers-action" -msgid "Paste Buffer _Into" -msgstr "Klistra _in buffert i" - -#: ../app/actions/buffers-actions.c:53 -msgctxt "buffers-action" -msgid "Paste the selected buffer into the selection" -msgstr "Klistra in markerad buffert i markeringen" - -#: ../app/actions/buffers-actions.c:58 -msgctxt "buffers-action" -msgid "Paste Buffer as _New" -msgstr "Klistra in buffert som _ny" - -#: ../app/actions/buffers-actions.c:59 -msgctxt "buffers-action" msgid "Paste the selected buffer as a new image" msgstr "Klistra in markerad buffert som en ny bild" -#: ../app/actions/buffers-actions.c:64 +#: ../app/actions/buffers-actions.c:52 msgctxt "buffers-action" msgid "_Delete Buffer" msgstr "_Ta bort buffert" -#: ../app/actions/buffers-actions.c:65 +#: ../app/actions/buffers-actions.c:53 msgctxt "buffers-action" msgid "Delete the selected buffer" msgstr "Ta bort den markerade bufferten" -#: ../app/actions/channels-actions.c:44 +#: ../app/actions/buffers-actions.c:61 +msgctxt "buffers-action" +msgid "_Paste Buffer" +msgstr "_Klistra in buffert" + +#: ../app/actions/buffers-actions.c:62 +msgctxt "buffers-action" +msgid "Paste the selected buffer" +msgstr "Klistra in i markerad buffert" + +#: ../app/actions/buffers-actions.c:67 +msgctxt "buffers-action" +msgid "Paste Buffer In Pl_ace" +msgstr "Klistra in buffert på pl_ats" + +#: ../app/actions/buffers-actions.c:68 +msgctxt "buffers-action" +msgid "Paste the selected buffer at its original position" +msgstr "Klistra in markerad buffert på dess ursprungliga läge" + +#: ../app/actions/buffers-actions.c:73 +msgctxt "buffers-action" +msgid "Paste Buffer _Into The Selection" +msgstr "Klistra _in buffert i markeringen" + +#: ../app/actions/buffers-actions.c:74 +msgctxt "buffers-action" +msgid "Paste the selected buffer into the selection" +msgstr "Klistra in markerad buffert i markeringen" + +#: ../app/actions/buffers-actions.c:79 +msgctxt "buffers-action" +msgid "Paste Buffer Into The Selection In Place" +msgstr "Klistra in buffert på plats i markeringen" + +#: ../app/actions/buffers-actions.c:81 +msgctxt "buffers-action" +msgid "Paste the selected buffer into the selection at its original position" +msgstr "Klistra in markerad buffert i markeringen på dess ursprungliga läge" + +#: ../app/actions/buffers-actions.c:86 +msgctxt "buffers-action" +msgid "Paste Buffer as New _Layer" +msgstr "Klistra in buffert som nytt _lager" + +#: ../app/actions/buffers-actions.c:87 +msgctxt "buffers-action" +msgid "Paste the selected buffer as a new layer" +msgstr "Klistra in markerad buffert som ett nytt lager" + +#: ../app/actions/buffers-actions.c:92 +msgctxt "buffers-action" +msgid "Paste Buffer as New Layer in Place" +msgstr "Klistra in buffert på plats som nytt lager" + +#: ../app/actions/buffers-actions.c:94 +msgctxt "buffers-action" +msgid "Paste the selected buffer as a new layer at its original position" +msgstr "" +"Klistra in den markerade bufferten som ett nytt lager på dess ursprungliga " +"plats" + +#: ../app/actions/channels-actions.c:45 msgctxt "channels-action" msgid "Channels Menu" msgstr "Kanalmeny" -#: ../app/actions/channels-actions.c:48 +#: ../app/actions/channels-actions.c:49 +msgctxt "channels-action" +msgid "Color Tag" +msgstr "Färgtagg" + +#: ../app/actions/channels-actions.c:53 msgctxt "channels-action" msgid "_Edit Channel Attributes..." -msgstr "R_edigera kanalattribut..." +msgstr "R_edigera kanalattribut…" -#: ../app/actions/channels-actions.c:49 +#: ../app/actions/channels-actions.c:54 msgctxt "channels-action" msgid "Edit the channel's name, color and opacity" msgstr "Redigera kanalens namn, färg och opacitet" -#: ../app/actions/channels-actions.c:54 +#: ../app/actions/channels-actions.c:59 msgctxt "channels-action" msgid "_New Channel..." -msgstr "_Ny kanal..." +msgstr "_Ny kanal…" -#: ../app/actions/channels-actions.c:55 +#: ../app/actions/channels-actions.c:60 msgctxt "channels-action" msgid "Create a new channel" msgstr "Skapa en ny kanal" -#: ../app/actions/channels-actions.c:60 +#: ../app/actions/channels-actions.c:65 msgctxt "channels-action" msgid "_New Channel" msgstr "_Ny kanal" -#: ../app/actions/channels-actions.c:61 +#: ../app/actions/channels-actions.c:66 msgctxt "channels-action" msgid "Create a new channel with last used values" msgstr "Skapa en ny kanal med senast använda värden" -#: ../app/actions/channels-actions.c:66 +#: ../app/actions/channels-actions.c:71 msgctxt "channels-action" msgid "D_uplicate Channel" msgstr "_Duplicera kanal" -#: ../app/actions/channels-actions.c:68 +#: ../app/actions/channels-actions.c:73 msgctxt "channels-action" msgid "Create a duplicate of this channel and add it to the image" msgstr "Skapa en dubblett av den här kanalen och lägg till den till bilden" -#: ../app/actions/channels-actions.c:73 +#: ../app/actions/channels-actions.c:78 msgctxt "channels-action" msgid "_Delete Channel" msgstr "T_a bort kanal" -#: ../app/actions/channels-actions.c:74 +#: ../app/actions/channels-actions.c:79 msgctxt "channels-action" msgid "Delete this channel" msgstr "Ta bort denna kanal" -#: ../app/actions/channels-actions.c:79 +#: ../app/actions/channels-actions.c:84 msgctxt "channels-action" msgid "_Raise Channel" msgstr "_Höj kanal" -#: ../app/actions/channels-actions.c:80 +#: ../app/actions/channels-actions.c:85 msgctxt "channels-action" msgid "Raise this channel one step in the channel stack" msgstr "Höj den här kanalen ett steg i kanalstacken" -#: ../app/actions/channels-actions.c:85 +#: ../app/actions/channels-actions.c:90 msgctxt "channels-action" msgid "Raise Channel to _Top" msgstr "Höj kanal till _överst" -#: ../app/actions/channels-actions.c:87 +#: ../app/actions/channels-actions.c:92 msgctxt "channels-action" msgid "Raise this channel to the top of the channel stack" msgstr "Höj den här kanalen till överst i kanalstacken" -#: ../app/actions/channels-actions.c:92 +#: ../app/actions/channels-actions.c:97 msgctxt "channels-action" msgid "_Lower Channel" msgstr "_Sänk kanal" -#: ../app/actions/channels-actions.c:93 +#: ../app/actions/channels-actions.c:98 msgctxt "channels-action" msgid "Lower this channel one step in the channel stack" msgstr "Sänk den här kanalen ett steg i kanalstacken" -#: ../app/actions/channels-actions.c:98 +#: ../app/actions/channels-actions.c:103 msgctxt "channels-action" msgid "Lower Channel to _Bottom" msgstr "Sänk kanal till _underst" -#: ../app/actions/channels-actions.c:100 +#: ../app/actions/channels-actions.c:105 msgctxt "channels-action" msgid "Lower this channel to the bottom of the channel stack" msgstr "Sänk den här kanalen längst ner i kanalstacken" -#: ../app/actions/channels-actions.c:108 +#: ../app/actions/channels-actions.c:113 +msgctxt "channels-action" +msgid "Toggle Channel _Visibility" +msgstr "_Växla synlighet för kanal" + +#: ../app/actions/channels-actions.c:119 +msgctxt "channels-action" +msgid "Toggle Channel _Linked State" +msgstr "Växla _länkat tillstånd för kanal" + +#. GIMP_ICON_LOCK +#: ../app/actions/channels-actions.c:125 +msgctxt "channels-action" +msgid "L_ock Pixels of Channel" +msgstr "L_ås bildpunkter för kanal" + +#: ../app/actions/channels-actions.c:131 +msgctxt "channels-action" +msgid "L_ock Position of Channel" +msgstr "L_ås kanalens position" + +#: ../app/actions/channels-actions.c:140 +msgctxt "channels-action" +msgid "None" +msgstr "Ingen" + +#: ../app/actions/channels-actions.c:141 +msgctxt "channels-action" +msgid "Channel Color Tag: Clear" +msgstr "Kanalfärgtagg: Rensa" + +#: ../app/actions/channels-actions.c:146 +msgctxt "channels-action" +msgid "Blue" +msgstr "Blå" + +#: ../app/actions/channels-actions.c:147 +msgctxt "channels-action" +msgid "Channel Color Tag: Set to Blue" +msgstr "Kanalfärgtagg: Sätt till blå" + +#: ../app/actions/channels-actions.c:152 +msgctxt "channels-action" +msgid "Green" +msgstr "Grön" + +#: ../app/actions/channels-actions.c:153 +msgctxt "channels-action" +msgid "Channel Color Tag: Set to Green" +msgstr "Kanalfärgtagg: Sätt till grön" + +#: ../app/actions/channels-actions.c:158 +msgctxt "channels-action" +msgid "Yellow" +msgstr "Gul" + +#: ../app/actions/channels-actions.c:159 +msgctxt "channels-action" +msgid "Channel Color Tag: Set to Yellow" +msgstr "Kanalfärgtagg: Sätt till gul" + +#: ../app/actions/channels-actions.c:164 +msgctxt "channels-action" +msgid "Orange" +msgstr "Orange" + +#: ../app/actions/channels-actions.c:165 +msgctxt "channels-action" +msgid "Channel Color Tag: Set to Orange" +msgstr "Kanalfärgtagg: Sätt till orange" + +#: ../app/actions/channels-actions.c:170 +msgctxt "channels-action" +msgid "Brown" +msgstr "Brun" + +#: ../app/actions/channels-actions.c:171 +msgctxt "channels-action" +msgid "Channel Color Tag: Set to Brown" +msgstr "Kanalfärgtagg: Sätt till brun" + +#: ../app/actions/channels-actions.c:176 +msgctxt "channels-action" +msgid "Red" +msgstr "Röd" + +#: ../app/actions/channels-actions.c:177 +msgctxt "channels-action" +msgid "Channel Color Tag: Set to Red" +msgstr "Kanalfärgtagg: Sätt till röd" + +#: ../app/actions/channels-actions.c:182 +msgctxt "channels-action" +msgid "Violet" +msgstr "Violett" + +#: ../app/actions/channels-actions.c:183 +msgctxt "channels-action" +msgid "Channel Color Tag: Set to Violet" +msgstr "Kanalfärgtagg: Sätt till violett" + +#: ../app/actions/channels-actions.c:188 +msgctxt "channels-action" +msgid "Gray" +msgstr "Grå" + +#: ../app/actions/channels-actions.c:189 +msgctxt "channels-action" +msgid "Channel Color Tag: Set to Gray" +msgstr "Kanalfärgtagg: Sätt till grå" + +#: ../app/actions/channels-actions.c:197 msgctxt "channels-action" msgid "Channel to Sele_ction" msgstr "_Kanal till markering" -#: ../app/actions/channels-actions.c:109 +#: ../app/actions/channels-actions.c:198 msgctxt "channels-action" msgid "Replace the selection with this channel" msgstr "Ersätt markeringen med den här kanalen" -#: ../app/actions/channels-actions.c:114 +#: ../app/actions/channels-actions.c:203 msgctxt "channels-action" msgid "_Add to Selection" msgstr "_Lägg till i markering" -#: ../app/actions/channels-actions.c:115 +#: ../app/actions/channels-actions.c:204 msgctxt "channels-action" msgid "Add this channel to the current selection" msgstr "Lägg till den här kanalen till den aktuella markeringen" -#: ../app/actions/channels-actions.c:120 +#: ../app/actions/channels-actions.c:209 msgctxt "channels-action" msgid "_Subtract from Selection" -msgstr "_Ta bort från markering" +msgstr "_Subtrahera från markering" -#: ../app/actions/channels-actions.c:121 +#: ../app/actions/channels-actions.c:210 msgctxt "channels-action" msgid "Subtract this channel from the current selection" -msgstr "Ta bort den här kanalen från den aktuella markeringen" +msgstr "Subtrahera den här kanalen från den aktuella markeringen" -#: ../app/actions/channels-actions.c:126 +#: ../app/actions/channels-actions.c:215 msgctxt "channels-action" msgid "_Intersect with Selection" msgstr "_Snitt med markering" -#: ../app/actions/channels-actions.c:127 +#: ../app/actions/channels-actions.c:216 msgctxt "channels-action" msgid "Intersect this channel with the current selection" msgstr "Skär ut den här kanalen med den aktuella markeringen" -#: ../app/actions/channels-commands.c:83 ../app/actions/channels-commands.c:409 +#: ../app/actions/channels-actions.c:224 +msgctxt "channels-action" +msgid "Select _Top Channel" +msgstr "Välj _översta kanal" + +#: ../app/actions/channels-actions.c:225 +msgctxt "channels-action" +msgid "Select the topmost channel" +msgstr "Välj den översta kanalen" + +#: ../app/actions/channels-actions.c:230 +msgctxt "channels-action" +msgid "Select _Bottom Channel" +msgstr "Välj _nedersta kanal" + +#: ../app/actions/channels-actions.c:231 +msgctxt "channels-action" +msgid "Select the bottommost channel" +msgstr "Välj den nedersta kanalen" + +#: ../app/actions/channels-actions.c:236 +msgctxt "channels-action" +msgid "Select _Previous Channel" +msgstr "Välj _föregående kanal" + +#: ../app/actions/channels-actions.c:237 +msgctxt "channels-action" +msgid "Select the channel above the current channel" +msgstr "Välj kanalen ovanför den aktuella kanalen" + +#: ../app/actions/channels-actions.c:242 +msgctxt "channels-action" +msgid "Select _Next Channel" +msgstr "Välj _nästa kanal" + +#: ../app/actions/channels-actions.c:243 +msgctxt "channels-action" +msgid "Select the channel below the current channel" +msgstr "Välj kanalen under den aktuella kanalen" + +#: ../app/actions/channels-commands.c:111 +#: ../app/actions/channels-commands.c:517 msgid "Channel Attributes" msgstr "Kanalattribut" -#: ../app/actions/channels-commands.c:86 +#: ../app/actions/channels-commands.c:114 msgid "Edit Channel Attributes" msgstr "Redigera kanalattribut" -#: ../app/actions/channels-commands.c:88 +#: ../app/actions/channels-commands.c:116 msgid "Edit Channel Color" msgstr "Redigera kanalfärg" -#: ../app/actions/channels-commands.c:89 ../app/actions/channels-commands.c:123 +#: ../app/actions/channels-commands.c:117 +#: ../app/actions/channels-commands.c:162 msgid "_Fill opacity:" msgstr "_Fyllnadsopacitet:" -#: ../app/actions/channels-commands.c:117 -#: ../app/actions/channels-commands.c:162 -#: ../app/widgets/gimpchanneltreeview.c:328 +#: ../app/actions/channels-commands.c:156 +#: ../app/widgets/gimpchanneltreeview.c:327 msgid "New Channel" msgstr "Ny kanal" -#: ../app/actions/channels-commands.c:120 -msgid "New Channel Options" -msgstr "Alternativ för nya kanaler" +#: ../app/actions/channels-commands.c:159 +msgid "Create a New Channel" +msgstr "Skapa en ny kanal" -#: ../app/actions/channels-commands.c:122 +#: ../app/actions/channels-commands.c:161 msgid "New Channel Color" msgstr "Ny kanalfärg" -#: ../app/actions/channels-commands.c:247 ../app/core/gimpimage-new.c:275 -#: ../app/display/gimpdisplayshell-dnd.c:666 -#: ../app/widgets/gimpchanneltreeview.c:259 -#: ../app/widgets/gimplayertreeview.c:794 +#: ../app/actions/channels-commands.c:274 ../app/core/gimpimage-new.c:278 +#: ../app/display/gimpdisplayshell-dnd.c:670 +#: ../app/widgets/gimpchanneltreeview.c:258 +#: ../app/widgets/gimplayertreeview.c:805 #, c-format msgid "%s Channel Copy" msgstr "%s kanalkopia" @@ -851,7 +1270,7 @@ msgstr "Färgkartemeny" #: ../app/actions/colormap-actions.c:49 msgctxt "colormap-action" msgid "_Edit Color..." -msgstr "R_edigera färg..." +msgstr "R_edigera färg…" #: ../app/actions/colormap-actions.c:50 msgctxt "colormap-action" @@ -879,67 +1298,46 @@ msgid "Add current background color" msgstr "Lägg till aktuell bakgrundsfärg" #: ../app/actions/colormap-actions.c:73 -#, fuzzy -#| msgid "Select Color" msgctxt "colormap-action" msgid "_Select this Color" -msgstr "Välj färg" +msgstr "_Markera denna färg" #: ../app/actions/colormap-actions.c:74 -#, fuzzy -#| msgctxt "tools-action" -#| msgid "Select regions with similar colors" msgctxt "colormap-action" msgid "Select all pixels with this color" -msgstr "Markera regioner med liknande färger" +msgstr "Markera alla bildpunkter med denna färg" #: ../app/actions/colormap-actions.c:79 -#, fuzzy -#| msgctxt "channels-action" -#| msgid "_Add to Selection" msgctxt "colormap-action" msgid "_Add to Selection" msgstr "_Lägg till i markering" #: ../app/actions/colormap-actions.c:80 -#, fuzzy -#| msgctxt "channels-action" -#| msgid "Add this channel to the current selection" msgctxt "colormap-action" msgid "Add all pixels with this color to the current selection" -msgstr "Lägg till den här kanalen till den aktuella markeringen" +msgstr "" +"Lägg till alla bildpunkter med den här färgen till den aktuella markeringen" #: ../app/actions/colormap-actions.c:85 -#, fuzzy -#| msgctxt "channels-action" -#| msgid "_Subtract from Selection" msgctxt "colormap-action" msgid "_Subtract from Selection" msgstr "_Ta bort från markering" #: ../app/actions/colormap-actions.c:86 -#, fuzzy -#| msgctxt "channels-action" -#| msgid "Subtract this channel from the current selection" msgctxt "colormap-action" msgid "Subtract all pixels with this color from the current selection" -msgstr "Ta bort den här kanalen från den aktuella markeringen" +msgstr "" +"Ta bort alla bildpunkter med den här färgen från den aktuella markeringen" #: ../app/actions/colormap-actions.c:91 -#, fuzzy -#| msgctxt "channels-action" -#| msgid "_Intersect with Selection" msgctxt "colormap-action" msgid "_Intersect with Selection" msgstr "_Snitt med markering" #: ../app/actions/colormap-actions.c:92 -#, fuzzy -#| msgctxt "channels-action" -#| msgid "Intersect this channel with the current selection" msgctxt "colormap-action" msgid "Intersect all pixels with this color with the current selection" -msgstr "Skär ut den här kanalen med den aktuella markeringen" +msgstr "Skär alla bildpunkter med den här färgen med den aktuella markeringen" #: ../app/actions/colormap-commands.c:74 #, c-format @@ -1023,7 +1421,7 @@ msgstr "_Hårdhet" #: ../app/actions/context-actions.c:76 msgctxt "context-action" msgid "_Aspect Ratio" -msgstr "_Aspektförhållande" +msgstr "_Bildförhållande" #: ../app/actions/context-actions.c:78 msgctxt "context-action" @@ -1050,22 +1448,1102 @@ msgctxt "context-action" msgid "Exchange foreground and background colors" msgstr "Byt för- och bakgrundsfärger" -#: ../app/actions/context-commands.c:431 +#: ../app/actions/context-actions.c:97 +msgctxt "context-action" +msgid "Foreground: Set Color From Palette" +msgstr "Förgrund: Ställ in färg från palett" + +#: ../app/actions/context-actions.c:101 +msgctxt "context-action" +msgid "Foreground: Use First Palette Color" +msgstr "Förgrund: Använd första palettfärg" + +#: ../app/actions/context-actions.c:105 +msgctxt "context-action" +msgid "Foreground: Use Last Palette Color" +msgstr "Förgrund: Använd sista palettfärg" + +#: ../app/actions/context-actions.c:109 +msgctxt "context-action" +msgid "Foreground: Use Previous Palette Color" +msgstr "Förgrund: Använd föregående palettfärg" + +#: ../app/actions/context-actions.c:113 +msgctxt "context-action" +msgid "Foreground: Use Next Palette Color" +msgstr "Förgrund: Använd nästa palettfärg" + +#: ../app/actions/context-actions.c:117 +msgctxt "context-action" +msgid "Foreground: Skip Back Palette Color" +msgstr "Förgrund: Hoppa tillbaka en palettfärg" + +#: ../app/actions/context-actions.c:121 +msgctxt "context-action" +msgid "Foreground: Skip Forward Palette Color" +msgstr "Förgrund: Hoppa framåt en palettfärg" + +#: ../app/actions/context-actions.c:129 +msgctxt "context-action" +msgid "Background: Set Color From Palette" +msgstr "Bakgrund: Ställ in färg från palett" + +#: ../app/actions/context-actions.c:133 +msgctxt "context-action" +msgid "Background: Use First Palette Color" +msgstr "Bakgrund: Använd första palettfärg" + +#: ../app/actions/context-actions.c:137 +msgctxt "context-action" +msgid "Background: Use Last Palette Color" +msgstr "Bakgrund: Använd sista palettfärg" + +#: ../app/actions/context-actions.c:141 +msgctxt "context-action" +msgid "Background: Use Previous Palette Color" +msgstr "Bakgrund: Använd föregående palettfärg" + +#: ../app/actions/context-actions.c:145 +msgctxt "context-action" +msgid "Background: Use Next Palette Color" +msgstr "Bakgrund: Använd nästa palettfärg" + +#: ../app/actions/context-actions.c:149 +msgctxt "context-action" +msgid "Background: Skip Back Palette Color" +msgstr "Bakgrund: Hoppa tillbaka en palettfärg" + +#: ../app/actions/context-actions.c:153 +msgctxt "context-action" +msgid "Background: Skip Forward Palette Color" +msgstr "Bakgrund: Hoppa framåt en palettfärg" + +#: ../app/actions/context-actions.c:161 +msgctxt "context-action" +msgid "Foreground: Set Color From Colormap" +msgstr "Förgrund: Ställ in färg från färgkarta" + +#: ../app/actions/context-actions.c:165 +msgctxt "context-action" +msgid "Foreground: Use First Color From Colormap" +msgstr "Förgrund: Använd första färg i färgkarta" + +#: ../app/actions/context-actions.c:169 +msgctxt "context-action" +msgid "Foreground: Use Last Color From Colormap" +msgstr "Förgrund: Använd sista färg i färgkarta" + +#: ../app/actions/context-actions.c:173 +msgctxt "context-action" +msgid "Foreground: Use Previous Color From Colormap" +msgstr "Förgrund: Använd föregående färg i färgkarta" + +#: ../app/actions/context-actions.c:177 +msgctxt "context-action" +msgid "Foreground: Use Next Color From Colormap" +msgstr "Förgrund: Använd nästa färg i färgkarta" + +#: ../app/actions/context-actions.c:181 +msgctxt "context-action" +msgid "Foreground: Skip Back Color From Colormap" +msgstr "Förgrund: Hoppa en färg bakåt i färgkarta" + +#: ../app/actions/context-actions.c:185 +msgctxt "context-action" +msgid "Foreground: Skip Forward Color From Colormap" +msgstr "Förgrund: Hoppa en färg framåt i färgkarta" + +#: ../app/actions/context-actions.c:193 +msgctxt "context-action" +msgid "Background: Set Color From Colormap" +msgstr "Bakgrund: Ställ in färg från färgkarta" + +#: ../app/actions/context-actions.c:197 +msgctxt "context-action" +msgid "Background: Use First Color From Colormap" +msgstr "Bakgrund: Använd första färg i färgkarta" + +#: ../app/actions/context-actions.c:201 +msgctxt "context-action" +msgid "Background: Use Last Color From Colormap" +msgstr "Bakgrund: Använd sista färg i färgkarta" + +#: ../app/actions/context-actions.c:205 +msgctxt "context-action" +msgid "Background: Use Previous Color From Colormap" +msgstr "Bakgrund: Använd föregående färg i färgkarta" + +#: ../app/actions/context-actions.c:209 +msgctxt "context-action" +msgid "Background: Use Next Color From Colormap" +msgstr "Bakgrund: Använd nästa färg i färgkarta" + +#: ../app/actions/context-actions.c:213 +msgctxt "context-action" +msgid "Background: Skip Back Color From Colormap" +msgstr "Bakgrund: Hoppa en färg bakåt i färgkarta" + +#: ../app/actions/context-actions.c:217 +msgctxt "context-action" +msgid "Background: Skip Forward Color From Colormap" +msgstr "Bakgrund: Hoppa en färg framåt i färgkarta" + +#: ../app/actions/context-actions.c:225 +msgctxt "context-action" +msgid "Foreground: Set Color From Swatch" +msgstr "Förgrund: Ställ in färg från färgruta" + +#: ../app/actions/context-actions.c:229 +msgctxt "context-action" +msgid "Foreground: Use First Color From Swatch" +msgstr "Förgrund: Använd första färg i färgruta" + +#: ../app/actions/context-actions.c:233 +msgctxt "context-action" +msgid "Foreground: Use Last Color From Swatch" +msgstr "Förgrund: Använd sista färg i färgruta" + +#: ../app/actions/context-actions.c:237 +msgctxt "context-action" +msgid "Foreground: Use Previous Color From Swatch" +msgstr "Förgrund: Använd föregående färg i färgruta" + +#: ../app/actions/context-actions.c:241 +msgctxt "context-action" +msgid "Foreground: Use Next Color From Swatch" +msgstr "Förgrund: Använd nästa färg i färgruta" + +#: ../app/actions/context-actions.c:245 +msgctxt "context-action" +msgid "Foreground: Skip Back Color From Swatch" +msgstr "Förgrund: Hoppa en färg bakåt i färgruta" + +#: ../app/actions/context-actions.c:249 +msgctxt "context-action" +msgid "Foreground: Skip Forward Color From Swatch" +msgstr "Förgrund: Hoppa en färg framåt i färgruta" + +#: ../app/actions/context-actions.c:257 +msgctxt "context-action" +msgid "Background: Set Color From Swatch" +msgstr "Bakgrund: Ställ in färg från färgruta" + +#: ../app/actions/context-actions.c:261 +msgctxt "context-action" +msgid "Background: Use First Color From Swatch" +msgstr "Bakgrund: Använd första färg i färgruta" + +#: ../app/actions/context-actions.c:265 +msgctxt "context-action" +msgid "Background: Use Last Color From Swatch" +msgstr "Bakgrund: Använd sista färg i färgruta" + +#: ../app/actions/context-actions.c:269 +msgctxt "context-action" +msgid "Background: Use Previous Color From Swatch" +msgstr "Bakgrund: Använd föregående färg i färgruta" + +#: ../app/actions/context-actions.c:273 +msgctxt "context-action" +msgid "Background: Use Next Color From Swatch" +msgstr "Bakgrund: Använd nästa färg i färgruta" + +#: ../app/actions/context-actions.c:277 +msgctxt "context-action" +msgid "Background: Skip Color Back From Swatch" +msgstr "Bakgrund: Hoppa en färg bakåt i färgruta" + +#: ../app/actions/context-actions.c:281 +msgctxt "context-action" +msgid "Background: Skip Color Forward From Swatch" +msgstr "Bakgrund: Hoppa en färg framåt i färgruta" + +#: ../app/actions/context-actions.c:289 +msgctxt "context-action" +msgid "Foreground Red: Set" +msgstr "Förgrund röd: Ställ in" + +#: ../app/actions/context-actions.c:293 +msgctxt "context-action" +msgid "Foreground Red: Set to Minimum" +msgstr "Förgrund röd: Ställ in på minimum" + +#: ../app/actions/context-actions.c:297 +msgctxt "context-action" +msgid "Foreground Red: Set to Maximum" +msgstr "Förgrund röd: Ställ in på maximum" + +#: ../app/actions/context-actions.c:301 +msgctxt "context-action" +msgid "Foreground Red: Decrease by 1%" +msgstr "Förgrund röd: Minska med 1%" + +#: ../app/actions/context-actions.c:305 +msgctxt "context-action" +msgid "Foreground Red: Increase by 1%" +msgstr "Förgrund röd: Öka med 1%" + +#: ../app/actions/context-actions.c:309 +msgctxt "context-action" +msgid "Foreground Red: Decrease by 10%" +msgstr "Förgrund röd: Minska med 10%" + +#: ../app/actions/context-actions.c:313 +msgctxt "context-action" +msgid "Foreground Red: Increase by 10%" +msgstr "Förgrund röd: Öka med 10%" + +#: ../app/actions/context-actions.c:321 +msgctxt "context-action" +msgid "Foreground Green: Set" +msgstr "Förgrund grön: Ställ in" + +#: ../app/actions/context-actions.c:325 +msgctxt "context-action" +msgid "Foreground Green: Set to Minimum" +msgstr "Förgrund grön: Ställ in på minimum" + +#: ../app/actions/context-actions.c:329 +msgctxt "context-action" +msgid "Foreground Green: Set to Maximum" +msgstr "Förgrund grön: Ställ in på maximum" + +#: ../app/actions/context-actions.c:333 +msgctxt "context-action" +msgid "Foreground Green: Decrease by 1%" +msgstr "Förgrund grön: Minska med 1%" + +#: ../app/actions/context-actions.c:337 +msgctxt "context-action" +msgid "Foreground Green: Increase by 1%" +msgstr "Förgrund grön: Öka med 1%" + +#: ../app/actions/context-actions.c:341 +msgctxt "context-action" +msgid "Foreground Green: Decrease by 10%" +msgstr "Förgrund grön: Minska med 10%" + +#: ../app/actions/context-actions.c:345 +msgctxt "context-action" +msgid "Foreground Green: Increase by 10%" +msgstr "Förgrund grön: Öka med 10%" + +#: ../app/actions/context-actions.c:353 +msgctxt "context-action" +msgid "Foreground Blue: Set" +msgstr "Förgrund blå: Ställ in" + +#: ../app/actions/context-actions.c:357 +msgctxt "context-action" +msgid "Foreground Blue: Set to Minimum" +msgstr "Förgrund blå: Ställ in på minimum" + +#: ../app/actions/context-actions.c:361 +msgctxt "context-action" +msgid "Foreground Blue: Set to Maximum" +msgstr "Förgrund blå: Ställ in på maximum" + +#: ../app/actions/context-actions.c:365 +msgctxt "context-action" +msgid "Foreground Blue: Decrease by 1%" +msgstr "Förgrund blå: Minska med 1%" + +#: ../app/actions/context-actions.c:369 +msgctxt "context-action" +msgid "Foreground Blue: Increase by 1%" +msgstr "Förgrund blå: Öka med 1%" + +#: ../app/actions/context-actions.c:373 +msgctxt "context-action" +msgid "Foreground Blue: Decrease by 10%" +msgstr "Förgrund blå: Minska med 10%" + +#: ../app/actions/context-actions.c:377 +msgctxt "context-action" +msgid "Foreground Blue: Increase by 10%" +msgstr "Förgrund blå: Öka med 10%" + +#: ../app/actions/context-actions.c:385 +msgctxt "context-action" +msgid "Background Red: Set" +msgstr "Bakgrund röd: Ställ in" + +#: ../app/actions/context-actions.c:389 +msgctxt "context-action" +msgid "Background Red: Set to Minimum" +msgstr "Bakgrund röd: Ställ in på minimum" + +#: ../app/actions/context-actions.c:393 +msgctxt "context-action" +msgid "Background Red: Set to Maximum" +msgstr "Bakgrund röd: Ställ in på maximum" + +#: ../app/actions/context-actions.c:397 +msgctxt "context-action" +msgid "Background Red: Decrease by 1%" +msgstr "Bakgrund röd: Minska med 1%" + +#: ../app/actions/context-actions.c:401 +msgctxt "context-action" +msgid "Background Red: Increase by 1%" +msgstr "Bakgrund röd: Öka med 1%" + +#: ../app/actions/context-actions.c:405 +msgctxt "context-action" +msgid "Background Red: Decrease by 10%" +msgstr "Bakgrund röd: Minska med 10%" + +#: ../app/actions/context-actions.c:409 +msgctxt "context-action" +msgid "Background Red: Increase by 10%" +msgstr "Bakgrund röd: Öka med 10%" + +#: ../app/actions/context-actions.c:417 +msgctxt "context-action" +msgid "Background Green: Set" +msgstr "Bakgrund grön: Ställ in" + +#: ../app/actions/context-actions.c:421 +msgctxt "context-action" +msgid "Background Green: Set to Minimum" +msgstr "Bakgrund grön: Ställ in på minimum" + +#: ../app/actions/context-actions.c:425 +msgctxt "context-action" +msgid "Background Green: Set to Maximum" +msgstr "Bakgrund grön: Ställ in på maximum" + +#: ../app/actions/context-actions.c:429 +msgctxt "context-action" +msgid "Background Green: Decrease by 1%" +msgstr "Bakgrund grön: Minska med 1%" + +#: ../app/actions/context-actions.c:433 +msgctxt "context-action" +msgid "Background Green: Increase by 1%" +msgstr "Bakgrund grön: Öka med 1%" + +#: ../app/actions/context-actions.c:437 +msgctxt "context-action" +msgid "Background Green: Decrease by 10%" +msgstr "Bakgrund grön: Minska med 10%" + +#: ../app/actions/context-actions.c:441 +msgctxt "context-action" +msgid "Background Green: Increase by 10%" +msgstr "Bakgrund grön: Öka med 10%" + +#: ../app/actions/context-actions.c:449 +msgctxt "context-action" +msgid "Background Blue: Set" +msgstr "Bakgrund blå: Ställ in" + +#: ../app/actions/context-actions.c:453 +msgctxt "context-action" +msgid "Background Blue: Set to Minimum" +msgstr "Bakgrund blå: Ställ in på minimum" + +#: ../app/actions/context-actions.c:457 +msgctxt "context-action" +msgid "Background Blue: Set to Maximum" +msgstr "Bakgrund blå: Ställ in på maximum" + +#: ../app/actions/context-actions.c:461 +msgctxt "context-action" +msgid "Background Blue: Decrease by 1%" +msgstr "Bakgrund blå: Minska med 1%" + +#: ../app/actions/context-actions.c:465 +msgctxt "context-action" +msgid "Background Blue: Increase by 1%" +msgstr "Bakgrund blå: Öka med 1%" + +#: ../app/actions/context-actions.c:469 +msgctxt "context-action" +msgid "Background Blue: Decrease by 10%" +msgstr "Bakgrund blå: Minska med 10%" + +#: ../app/actions/context-actions.c:473 +msgctxt "context-action" +msgid "Background Blue: Increase by 10%" +msgstr "Bakgrund blå: Öka med 10%" + +#: ../app/actions/context-actions.c:481 +msgctxt "context-action" +msgid "Foreground Hue: Set" +msgstr "Förgrund nyans: Ställ in" + +#: ../app/actions/context-actions.c:485 +msgctxt "context-action" +msgid "Foreground Hue: Set to Minimum" +msgstr "Förgrund nyans: Ställ in på minimum" + +#: ../app/actions/context-actions.c:489 +msgctxt "context-action" +msgid "Foreground Hue: Set to Maximum" +msgstr "Förgrund nyans: Ställ in på maximum" + +#: ../app/actions/context-actions.c:493 +msgctxt "context-action" +msgid "Foreground Hue: Decrease by 1%" +msgstr "Förgrund nyans: Minska med 1%" + +#: ../app/actions/context-actions.c:497 +msgctxt "context-action" +msgid "Foreground Hue: Increase by 1%" +msgstr "Förgrund nyans: Öka med 1%" + +#: ../app/actions/context-actions.c:501 +msgctxt "context-action" +msgid "Foreground Hue: Decrease by 10%" +msgstr "Förgrund nyans: Minska med 10%" + +#: ../app/actions/context-actions.c:505 +msgctxt "context-action" +msgid "Foreground Hue: Increase by 10%" +msgstr "Förgrund nyans: Öka med 10%" + +#: ../app/actions/context-actions.c:513 +msgctxt "context-action" +msgid "Foreground Saturation: Set" +msgstr "Förgrund mättnad: Ställ in" + +#: ../app/actions/context-actions.c:517 +msgctxt "context-action" +msgid "Foreground Saturation: Set to Minimum" +msgstr "Förgrund mättnad: Ställ in på minimum" + +#: ../app/actions/context-actions.c:521 +msgctxt "context-action" +msgid "Foreground Saturation: Set to Maximum" +msgstr "Förgrund mättnad: Ställ in på maximum" + +#: ../app/actions/context-actions.c:525 +msgctxt "context-action" +msgid "Foreground Saturation: Decrease by 1%" +msgstr "Förgrund mättnad: Minska med 1%" + +#: ../app/actions/context-actions.c:529 +msgctxt "context-action" +msgid "Foreground Saturation: Increase by 1%" +msgstr "Förgrund mättnad: Öka med 1%" + +#: ../app/actions/context-actions.c:533 +msgctxt "context-action" +msgid "Foreground Saturation: Decrease by 10%" +msgstr "Förgrund mättnad: Minska med 10%" + +#: ../app/actions/context-actions.c:537 +msgctxt "context-action" +msgid "Foreground Saturation: Increase by 10%" +msgstr "Förgrund mättnad: Öka med 10%" + +#: ../app/actions/context-actions.c:545 +msgctxt "context-action" +msgid "Foreground Value: Set" +msgstr "Förgrund intensitet: Ställ in" + +#: ../app/actions/context-actions.c:549 +msgctxt "context-action" +msgid "Foreground Value: Set to Minimum" +msgstr "Förgrund intensitet: Ställ in på minimum" + +#: ../app/actions/context-actions.c:553 +msgctxt "context-action" +msgid "Foreground Value: Set to Maximum" +msgstr "Förgrund intensitet: Ställ in på maximum" + +#: ../app/actions/context-actions.c:557 +msgctxt "context-action" +msgid "Foreground Value: Decrease by 1%" +msgstr "Förgrund intensitet: Minska med 1%" + +#: ../app/actions/context-actions.c:561 +msgctxt "context-action" +msgid "Foreground Value: Increase by 1%" +msgstr "Förgrund intensitet: Öka med 1%" + +#: ../app/actions/context-actions.c:565 +msgctxt "context-action" +msgid "Foreground Value: Decrease by 10%" +msgstr "Förgrund intensitet: Minska med 10%" + +#: ../app/actions/context-actions.c:569 +msgctxt "context-action" +msgid "Foreground Value: Increase by 10%" +msgstr "Förgrund intensitet: Öka med 10%" + +#: ../app/actions/context-actions.c:577 +msgctxt "context-action" +msgid "Background Hue: Set" +msgstr "Bakgrund nyans: Ställ in" + +#: ../app/actions/context-actions.c:581 +msgctxt "context-action" +msgid "Background Hue: Set to Minimum" +msgstr "Bakgrund nyans: Ställ in på minimum" + +#: ../app/actions/context-actions.c:585 +msgctxt "context-action" +msgid "Background Hue: Set to Maximum" +msgstr "Bakgrund nyans: Ställ in på maximum" + +#: ../app/actions/context-actions.c:589 +msgctxt "context-action" +msgid "Background Hue: Decrease by 1%" +msgstr "Bakgrund nyans: Minska med 1%" + +#: ../app/actions/context-actions.c:593 +msgctxt "context-action" +msgid "Background Hue: Increase by 1%" +msgstr "Bakgrund nyans: Öka med 1%" + +#: ../app/actions/context-actions.c:597 +msgctxt "context-action" +msgid "Background Hue: Decrease by 10%" +msgstr "Bakgrund nyans: Minska med 10%" + +#: ../app/actions/context-actions.c:601 +msgctxt "context-action" +msgid "Background Hue: Increase by 10%" +msgstr "Bakgrund nyans: Öka med 10%" + +#: ../app/actions/context-actions.c:609 +msgctxt "context-action" +msgid "Background Saturation: Set" +msgstr "Bakgrund mättnad: Ställ in" + +#: ../app/actions/context-actions.c:613 +msgctxt "context-action" +msgid "Background Saturation: Set to Minimum" +msgstr "Bakgrund mättnad: Ställ in på minimum" + +#: ../app/actions/context-actions.c:617 +msgctxt "context-action" +msgid "Background Saturation: Set to Maximum" +msgstr "Bakgrund mättnad: Ställ in på maximum" + +#: ../app/actions/context-actions.c:621 +msgctxt "context-action" +msgid "Background Saturation: Decrease by 1%" +msgstr "Bakgrund mättnad: Minska med 1%" + +#: ../app/actions/context-actions.c:625 +msgctxt "context-action" +msgid "Background Saturation: Increase by 1%" +msgstr "Bakgrund mättnad: Öka med 1%" + +#: ../app/actions/context-actions.c:629 +msgctxt "context-action" +msgid "Background Saturation: Decrease by 10%" +msgstr "Bakgrund mättnad: Minska med 10%" + +#: ../app/actions/context-actions.c:633 +msgctxt "context-action" +msgid "Background Saturation: Increase by 10%" +msgstr "Bakgrund mättnad: Öka med 10%" + +#: ../app/actions/context-actions.c:641 +msgctxt "context-action" +msgid "Background Value: Set" +msgstr "Bakgrund intensitet: Ställ in" + +#: ../app/actions/context-actions.c:645 +msgctxt "context-action" +msgid "Background Value: Set to Minimum" +msgstr "Bakgrund intensitet: Ställ in på minimum" + +#: ../app/actions/context-actions.c:649 +msgctxt "context-action" +msgid "Background Value: Set to Maximum" +msgstr "Bakgrund intensitet: Ställ in på maximum" + +#: ../app/actions/context-actions.c:653 +msgctxt "context-action" +msgid "Background Value: Decrease by 1%" +msgstr "Bakgrund intensitet: Minska med 1%" + +#: ../app/actions/context-actions.c:657 +msgctxt "context-action" +msgid "Background Value: Increase by 1%" +msgstr "Bakgrund intensitet: Öka med 1%" + +#: ../app/actions/context-actions.c:661 +msgctxt "context-action" +msgid "Background Value: Decrease by 10%" +msgstr "Bakgrund intensitet: Minska med 10%" + +#: ../app/actions/context-actions.c:665 +msgctxt "context-action" +msgid "Background Value: Increase by 10%" +msgstr "Bakgrund intensitet: Öka med 10%" + +#: ../app/actions/context-actions.c:673 +msgctxt "context-action" +msgid "Tool Opacity: Set Transparency" +msgstr "Verktygsopacitet: Ställ in transparens" + +#: ../app/actions/context-actions.c:677 +msgctxt "context-action" +msgid "Tool Opacity: Make Completely Transparent" +msgstr "Verktygsopacitet: Gör helt transparent" + +#: ../app/actions/context-actions.c:681 +msgctxt "context-action" +msgid "Tool Opacity: Make Completely Opaque" +msgstr "Verktygsopacitet: Gör helt ogenomskinligt" + +#: ../app/actions/context-actions.c:685 +msgctxt "context-action" +msgid "Tool Opacity: Make 1% More Transparent" +msgstr "Verktygsopacitet: Gör 1% mer transparent" + +#: ../app/actions/context-actions.c:689 +msgctxt "context-action" +msgid "Tool Opacity: Make 1% More Opaque" +msgstr "Verktygsopacitet: Gör 1% mindre transparent" + +#: ../app/actions/context-actions.c:693 +msgctxt "context-action" +msgid "Tool Opacity: Make 10% More Transparent" +msgstr "Verktygsopacitet: Gör 10% mer transparent" + +#: ../app/actions/context-actions.c:697 +msgctxt "context-action" +msgid "Tool Opacity: Make 10% More Opaque" +msgstr "Verktygsopacitet: Gör 10% mindre transparent" + +#: ../app/actions/context-actions.c:705 +msgctxt "context-action" +msgid "Tool Paint Mode: Select First" +msgstr "Verktygsmålningsläge: Välj första" + +#: ../app/actions/context-actions.c:709 +msgctxt "context-action" +msgid "Tool Paint Mode: Select Last" +msgstr "Verktygsmålningsläge: Välj sista" + +#: ../app/actions/context-actions.c:713 +msgctxt "context-action" +msgid "Tool Paint Mode: Select Previous" +msgstr "Verktyg målningsläge: Välj föregående" + +#: ../app/actions/context-actions.c:717 +msgctxt "context-action" +msgid "Tool Paint Mode: Select Next" +msgstr "Verktyg målningsläge: Välj nästa" + +#: ../app/actions/context-actions.c:725 +msgctxt "context-action" +msgid "Tool Selection: Choose by Index" +msgstr "Verktygsval: Välj efter index" + +#: ../app/actions/context-actions.c:729 +msgctxt "context-action" +msgid "Tool Selection: Switch to First" +msgstr "Verktygsval: Växla till första" + +#: ../app/actions/context-actions.c:733 +msgctxt "context-action" +msgid "Tool Selection: Switch to Last" +msgstr "Verktygsval: Växla till sista" + +#: ../app/actions/context-actions.c:737 +msgctxt "context-action" +msgid "Tool Selection: Switch to Previous" +msgstr "Verktygsval: Växla till föregående" + +#: ../app/actions/context-actions.c:741 +msgctxt "context-action" +msgid "Tool Selection: Switch to Next" +msgstr "Verktygsval: Växla till nästa" + +#: ../app/actions/context-actions.c:749 +msgctxt "context-action" +msgid "Brush Selection: Select by Index" +msgstr "Penselval: Välj efter index" + +#: ../app/actions/context-actions.c:753 +msgctxt "context-action" +msgid "Brush Selection: Switch to First" +msgstr "Penselval: Växla till första" + +#: ../app/actions/context-actions.c:757 +msgctxt "context-action" +msgid "Brush Selection: Switch to Last" +msgstr "Penselval: Växla till sista" + +#: ../app/actions/context-actions.c:761 +msgctxt "context-action" +msgid "Brush Selection: Switch to Previous" +msgstr "Penselval: Växla till föregående" + +#: ../app/actions/context-actions.c:765 +msgctxt "context-action" +msgid "Brush Selection: Switch to Next" +msgstr "Penselval: Växla till nästa" + +#: ../app/actions/context-actions.c:773 +msgctxt "context-action" +msgid "Pattern Selection: Select by Index" +msgstr "Mönsterval: Välj efter index" + +#: ../app/actions/context-actions.c:777 +msgctxt "context-action" +msgid "Pattern Selection: Switch to First" +msgstr "Mönsterval: Växla till första" + +#: ../app/actions/context-actions.c:781 +msgctxt "context-action" +msgid "Pattern Selection: Switch to Last" +msgstr "Mönsterval: Växla till sista" + +#: ../app/actions/context-actions.c:785 +msgctxt "context-action" +msgid "Pattern Selection: Switch to Previous" +msgstr "Mönsterval: Växla till föregående" + +#: ../app/actions/context-actions.c:789 +msgctxt "context-action" +msgid "Pattern Selection: Switch to Next" +msgstr "Mönsterval: Växla till nästa" + +#: ../app/actions/context-actions.c:797 +msgctxt "context-action" +msgid "Palette Selection: Select by Index" +msgstr "Palettval: Välj efter index" + +#: ../app/actions/context-actions.c:801 +msgctxt "context-action" +msgid "Palette Selection: Switch to First" +msgstr "Palettval: Växla till första" + +#: ../app/actions/context-actions.c:805 +msgctxt "context-action" +msgid "Palette Selection: Switch to Last" +msgstr "Palettval: Växla till sista" + +#: ../app/actions/context-actions.c:809 +msgctxt "context-action" +msgid "Palette Selection: Switch to Previous" +msgstr "Palettval: Växla till föregående" + +#: ../app/actions/context-actions.c:813 +msgctxt "context-action" +msgid "Palette Selection: Switch to Next" +msgstr "Palettval: Växla till nästa" + +#: ../app/actions/context-actions.c:821 +msgctxt "context-action" +msgid "Gradient Selection: Select by Index" +msgstr "Gradientval: Välj efter index" + +#: ../app/actions/context-actions.c:825 +msgctxt "context-action" +msgid "Gradient Selection: Switch to First" +msgstr "Gradientval: Växla till första" + +#: ../app/actions/context-actions.c:829 +msgctxt "context-action" +msgid "Gradient Selection: Switch to Last" +msgstr "Gradientval: Växla till sista" + +#: ../app/actions/context-actions.c:833 +msgctxt "context-action" +msgid "Gradient Selection: Switch to Previous" +msgstr "Gradientval: Växla till föregående" + +#: ../app/actions/context-actions.c:837 +msgctxt "context-action" +msgid "Gradient Selection: Switch to Next" +msgstr "Gradientval: Växla till nästa" + +#: ../app/actions/context-actions.c:845 +msgctxt "context-action" +msgid "Font Selection: Select by Index" +msgstr "Typsnittsval: Välj efter index" + +#: ../app/actions/context-actions.c:849 +msgctxt "context-action" +msgid "Font Selection: Switch to First" +msgstr "Typsnittsval: Växla till första" + +#: ../app/actions/context-actions.c:853 +msgctxt "context-action" +msgid "Font Selection: Switch to Last" +msgstr "Typsnittsval: Växla till sista" + +#: ../app/actions/context-actions.c:857 +msgctxt "context-action" +msgid "Font Selection: Switch to Previous" +msgstr "Typsnittsval: Växla till föregående" + +#: ../app/actions/context-actions.c:861 +msgctxt "context-action" +msgid "Font Selection: Switch to Next" +msgstr "Typsnittsval: Växla till nästa" + +#: ../app/actions/context-actions.c:869 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Set" +msgstr "Penselmellanrum (redigerare): Ställ in" + +#: ../app/actions/context-actions.c:873 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Set to Minimum" +msgstr "Penselmellanrum (redigerare): Ställ in på minimum" + +#: ../app/actions/context-actions.c:877 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Set to Maximum" +msgstr "Penselmellanrum (redigerare): Ställ in på maximum" + +#: ../app/actions/context-actions.c:881 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Decrease by 1" +msgstr "Penselmellanrum (redigerare): Minska med 1" + +#: ../app/actions/context-actions.c:885 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Increase by 1" +msgstr "Penselmellanrum (redigerare): Öka med 1" + +#: ../app/actions/context-actions.c:889 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Decrease by 10" +msgstr "Penselmellanrum (redigerare): Minska med 10" + +#: ../app/actions/context-actions.c:893 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Increase by 10" +msgstr "Penselmellanrum (redigerare): Öka med 10" + +#: ../app/actions/context-actions.c:901 +msgctxt "context-action" +msgid "Brush Shape (Editor): Use Circular" +msgstr "Penselform (redigerare): Använd cirkulär" + +#: ../app/actions/context-actions.c:905 +msgctxt "context-action" +msgid "Brush Shape (Editor): Use Square" +msgstr "Penselform (redigerare): Använd fyrkant" + +#: ../app/actions/context-actions.c:909 +msgctxt "context-action" +msgid "Brush Shape (Editor): Use Diamond" +msgstr "Penselform (redigerare): Använd diamant" + +#: ../app/actions/context-actions.c:917 +msgctxt "context-action" +msgid "Brush Radius (Editor): Set" +msgstr "Penselradie (redigerare): Ställ in" + +#: ../app/actions/context-actions.c:921 +msgctxt "context-action" +msgid "Brush Radius (Editor): Set to Minimum" +msgstr "Penselradie (redigerare): Ställ in på minimum" + +#: ../app/actions/context-actions.c:925 +msgctxt "context-action" +msgid "Brush Radius (Editor): Set to Maximum" +msgstr "Penselradie (redigerare): Ställ in på maximum" + +#: ../app/actions/context-actions.c:929 +msgctxt "context-action" +msgid "Brush Radius (Editor): Decrease by 0.1" +msgstr "Penselradie (redigerare): Minska med 0,1" + +#: ../app/actions/context-actions.c:933 +msgctxt "context-action" +msgid "Brush Radius (Editor): Increase by 0.1" +msgstr "Penselradie (redigerare): Öka med 0,1" + +#: ../app/actions/context-actions.c:937 +msgctxt "context-action" +msgid "Brush Radius (Editor): Decrease by 1" +msgstr "Penselradie (redigerare): Minska med 1" + +#: ../app/actions/context-actions.c:941 +msgctxt "context-action" +msgid "Brush Radius (Editor): Increase by 1" +msgstr "Penselradie (redigerare): Öka med 1" + +#: ../app/actions/context-actions.c:945 +msgctxt "context-action" +msgid "Brush Radius (Editor): Decrease by 10" +msgstr "Penselradie (redigerare): Minska med 10" + +#: ../app/actions/context-actions.c:949 +msgctxt "context-action" +msgid "Brush Radius (Editor): Increase by 10" +msgstr "Penselradie (redigerare): Öka med 10" + +#: ../app/actions/context-actions.c:953 +msgctxt "context-action" +msgid "Brush Radius (Editor): Decrease Relative" +msgstr "Penselradie (redigerare): Minska relativt" + +#: ../app/actions/context-actions.c:957 +msgctxt "context-action" +msgid "Brush Radius (Editor): Increase Relative" +msgstr "Penselradie (redigerare): Öka relativt" + +#: ../app/actions/context-actions.c:965 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Set" +msgstr "Penselpiggar (redigerare): Ställ in" + +#: ../app/actions/context-actions.c:969 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Set to Minimum" +msgstr "Penselpiggar (redigerare): Ställ in på minimum" + +#: ../app/actions/context-actions.c:973 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Set to Maximum" +msgstr "Penselpiggar (redigerare): Ställ in på maximum" + +#: ../app/actions/context-actions.c:977 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Decrease by 1" +msgstr "Penselpiggar (redigerare): Minska med 1" + +#: ../app/actions/context-actions.c:981 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Increase by 1" +msgstr "Penselpiggar (redigerare): Öka med 1" + +#: ../app/actions/context-actions.c:985 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Decrease by 4" +msgstr "Penselpiggar (redigerare): Minska med 4" + +#: ../app/actions/context-actions.c:989 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Increase by 4" +msgstr "Penselpiggar (redigerare): Öka med 4" + +#: ../app/actions/context-actions.c:997 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Set" +msgstr "Penselhårdhet (redigerare): Ställ in" + +#: ../app/actions/context-actions.c:1001 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Set to Minimum" +msgstr "Penselhårdhet (redigerare): Ställ in på minimum" + +#: ../app/actions/context-actions.c:1005 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Set to Maximum" +msgstr "Penselhårdhet (redigerare): Ställ in på maximum" + +#: ../app/actions/context-actions.c:1009 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Decrease by 0.01" +msgstr "Penselhårdhet (redigerare): Minska med 0,01" + +#: ../app/actions/context-actions.c:1013 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Increase by 0.01" +msgstr "Penselhårdhet (redigerare): Öka med 0,01" + +#: ../app/actions/context-actions.c:1017 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Decrease by 0.1" +msgstr "Penselhårdhet (redigerare): Minska med 0,1" + +#: ../app/actions/context-actions.c:1021 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Increase by 0.1" +msgstr "Penselhårdhet (redigerare): Öka med 0,1" + +#: ../app/actions/context-actions.c:1029 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Set" +msgstr "Penselns bildförhållande (Redigerare): Ställ in" + +#: ../app/actions/context-actions.c:1033 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Set to Minimum" +msgstr "Penselbildförhållande (Redigerare): Ställ in på minimum" + +#: ../app/actions/context-actions.c:1037 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Set to Maximum" +msgstr "Penselbildförhållande (Redigerare): Ställ in på maximum" + +#: ../app/actions/context-actions.c:1041 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Decrease by 0.1" +msgstr "Penselbildförhållande (Redigerare): Minska med 0,1" + +#: ../app/actions/context-actions.c:1045 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Increase by 0.1" +msgstr "Penselbildförhållande (Redigerare): Öka med 0,1" + +#: ../app/actions/context-actions.c:1049 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Decrease by 1" +msgstr "Penselns bildförhållande (Redigerare): Minska med 1" + +#: ../app/actions/context-actions.c:1053 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Increase by 1" +msgstr "Penselns bildförhållande (Redigerare): Öka med 1" + +#: ../app/actions/context-actions.c:1061 +msgctxt "context-action" +msgid "Brush Angle (Editor): Set" +msgstr "Penselvinkel (redigerare): Ställ in" + +#: ../app/actions/context-actions.c:1065 +msgctxt "context-action" +msgid "Brush Angle (Editor): Make Horizontal" +msgstr "Penselvinkel (redigerare): Gör horisontell" + +#: ../app/actions/context-actions.c:1069 +msgctxt "context-action" +msgid "Brush Angle (Editor): Make Vertical" +msgstr "Penselvinkel (redigerare): Gör vertikal" + +#: ../app/actions/context-actions.c:1073 +msgctxt "context-action" +msgid "Brush Angle (Editor): Rotate Right by 1°" +msgstr "Penselvinkel (redigerare): Rotera 1° åt höger" + +#: ../app/actions/context-actions.c:1077 +msgctxt "context-action" +msgid "Brush Angle (Editor): Rotate Left by 1°" +msgstr "Penselvinkel (redigerare): Rotera 1° åt vänster" + +#: ../app/actions/context-actions.c:1081 +msgctxt "context-action" +msgid "Brush Angle (Editor): Rotate Right by 15°" +msgstr "Penselvinkel (redigerare): Rotera 15° åt höger" + +#: ../app/actions/context-actions.c:1085 +msgctxt "context-action" +msgid "Brush Angle (Editor): Rotate Left by 15°" +msgstr "Penselvinkel (redigerare): Rotera 15° åt vänster" + +#: ../app/actions/context-commands.c:411 #, c-format msgid "Paint Mode: %s" msgstr "Målningsläge: %s" -#: ../app/actions/context-commands.c:557 +#: ../app/actions/context-commands.c:537 #, c-format msgid "Brush Shape: %s" msgstr "Penselform: %s" -#: ../app/actions/context-commands.c:617 +#: ../app/actions/context-commands.c:597 #, c-format msgid "Brush Radius: %2.2f" msgstr "Penselradie: %2.2f" -#: ../app/actions/context-commands.c:725 +#: ../app/actions/context-commands.c:705 #, c-format msgid "Brush Angle: %2.2f" msgstr "Penselvinkel: %2.2f" @@ -1085,13 +2563,103 @@ msgctxt "cursor-info-action" msgid "Use the composite color of all visible layers" msgstr "Använd kompositfärgen för alla synliga lager" +#: ../app/actions/dashboard-actions.c:40 +msgctxt "dashboard-action" +msgid "Dashboard Menu" +msgstr "Panelmeny" + +#: ../app/actions/dashboard-actions.c:44 +msgctxt "dashboard-action" +msgid "Groups" +msgstr "Grupper" + +#: ../app/actions/dashboard-actions.c:46 +msgctxt "dashboard-action" +msgid "Update Interval" +msgstr "Uppdateringsintervall" + +#: ../app/actions/dashboard-actions.c:48 +msgctxt "dashboard-action" +msgid "History Duration" +msgstr "Historikvaraktighet" + +#: ../app/actions/dashboard-actions.c:51 +msgctxt "dashboard-action" +msgid "Reset" +msgstr "Återställ" + +#: ../app/actions/dashboard-actions.c:52 +msgctxt "dashboard-action" +msgid "Reset cumulative data" +msgstr "Återställ kumulativ data" + +#: ../app/actions/dashboard-actions.c:60 +msgctxt "dashboard-action" +msgid "Low Swap Space Warning" +msgstr "Varning för lite växlingsutrymme" + +#: ../app/actions/dashboard-actions.c:61 +msgctxt "dashboard-action" +msgid "Raise the dashboard when the swap size approaches its limit" +msgstr "Höj panelen när storleken för växlingsutrymme når sin gräns" + +#: ../app/actions/dashboard-actions.c:71 +msgctxt "dashboard-update-interval" +msgid "0.25 Seconds" +msgstr "0,25 sekunder" + +#: ../app/actions/dashboard-actions.c:76 +msgctxt "dashboard-update-interval" +msgid "0.5 Seconds" +msgstr "0,5 sekunder" + +#: ../app/actions/dashboard-actions.c:81 +msgctxt "dashboard-update-interval" +msgid "1 Second" +msgstr "1 sekund" + +#: ../app/actions/dashboard-actions.c:86 +msgctxt "dashboard-update-interval" +msgid "2 Seconds" +msgstr "2 sekunder" + +#: ../app/actions/dashboard-actions.c:91 +msgctxt "dashboard-update-interval" +msgid "4 Seconds" +msgstr "4 sekunder" + +#: ../app/actions/dashboard-actions.c:99 +msgctxt "dashboard-history-duration" +msgid "15 Seconds" +msgstr "15 sekunder" + +#: ../app/actions/dashboard-actions.c:104 +msgctxt "dashboard-history-duration" +msgid "30 Seconds" +msgstr "30 sekunder" + +#: ../app/actions/dashboard-actions.c:109 +msgctxt "dashboard-history-duration" +msgid "60 Seconds" +msgstr "60 sekunder" + +#: ../app/actions/dashboard-actions.c:114 +msgctxt "dashboard-history-duration" +msgid "120 Seconds" +msgstr "120 sekunder" + +#: ../app/actions/dashboard-actions.c:119 +msgctxt "dashboard-history-duration" +msgid "240 Seconds" +msgstr "240 sekunder" + #: ../app/actions/data-commands.c:90 ../app/actions/documents-commands.c:383 #: ../app/actions/file-commands.c:205 ../app/dialogs/file-open-dialog.c:212 #: ../app/dialogs/file-open-dialog.c:253 -#: ../app/dialogs/file-open-location-dialog.c:218 -#: ../app/dialogs/file-open-location-dialog.c:228 -#: ../app/display/gimpdisplayshell-dnd.c:610 -#: ../app/widgets/gimplayertreeview.c:754 ../app/widgets/gimptoolbox.c:809 +#: ../app/dialogs/file-open-location-dialog.c:223 +#: ../app/dialogs/file-open-location-dialog.c:239 +#: ../app/display/gimpdisplayshell-dnd.c:614 +#: ../app/widgets/gimplayertreeview.c:765 ../app/widgets/gimptoolbox.c:805 #: ../app/widgets/gimptoolbox-dnd.c:170 #, c-format msgid "" @@ -1099,23 +2667,23 @@ msgid "" "\n" "%s" msgstr "" -"Öppnande av \"%s\" misslyckades:\n" +"Öppnande av ”%s” misslyckades:\n" "\n" "%s" #: ../app/actions/data-commands.c:114 ../app/actions/tool-options-commands.c:74 -#: ../app/core/gimpbrushgenerated-load.c:120 ../app/core/gimpimage.c:1998 -#: ../app/core/gimppalette.c:451 ../app/core/gimppalette-import.c:208 +#: ../app/core/gimpbrushgenerated-load.c:120 ../app/core/gimpimage.c:1971 +#: ../app/core/gimppalette.c:461 ../app/core/gimppalette-import.c:213 #: ../app/core/gimppalette-load.c:186 -#: ../app/dialogs/palette-import-dialog.c:771 ../app/widgets/gimpdnd-xds.c:89 +#: ../app/dialogs/palette-import-dialog.c:778 ../app/widgets/gimpdnd-xds.c:89 msgid "Untitled" msgstr "Namnlös" -#: ../app/actions/data-commands.c:213 ../app/actions/documents-commands.c:189 -#: ../app/actions/file-commands.c:544 +#: ../app/actions/data-commands.c:212 ../app/actions/documents-commands.c:189 +#: ../app/actions/file-commands.c:519 #, c-format msgid "Can't show file in file manager: %s" -msgstr "" +msgstr "Kan inte visa fil i filhanterare: %s" #: ../app/actions/dialogs-actions.c:47 msgctxt "windows-action" @@ -1145,15 +2713,12 @@ msgstr "Öppna dialogrutan för enhetsstatus" #: ../app/actions/dialogs-actions.c:65 msgctxt "dialogs-action" msgid "_Symmetry Painting" -msgstr "" +msgstr "_Symmetrimålning" #: ../app/actions/dialogs-actions.c:66 -#, fuzzy -#| msgctxt "dialogs-action" -#| msgid "Open the layers dialog" msgctxt "dialogs-action" msgid "Open the symmetry dialog" -msgstr "Öppna dialogrutan för lager" +msgstr "Öppna symmetridialogrutan" #: ../app/actions/dialogs-actions.c:71 msgctxt "dialogs-action" @@ -1248,12 +2813,12 @@ msgstr "Öppna dialogrutan för pekarinformation" #: ../app/actions/dialogs-actions.c:125 msgctxt "dialogs-action" msgid "_Sample Points" -msgstr "_Sampelpunkter" +msgstr "_Samplingspunkter" #: ../app/actions/dialogs-actions.c:126 msgctxt "dialogs-action" msgid "Open the sample points dialog" -msgstr "Öppna dialogrutan för sampelpunkter" +msgstr "Öppna dialogrutan för samplingspunkter" #: ../app/actions/dialogs-actions.c:131 msgctxt "dialogs-action" @@ -1306,19 +2871,14 @@ msgid "Open the paint dynamics editor" msgstr "Öppna dialogrutan för målningsdynamik" #: ../app/actions/dialogs-actions.c:161 -#, fuzzy -#| msgid "_Paintbrush" msgctxt "dialogs-action" msgid "_MyPaint Brushes" -msgstr "_Pensel" +msgstr "_MyPaint-penslar" #: ../app/actions/dialogs-actions.c:162 -#, fuzzy -#| msgctxt "dialogs-action" -#| msgid "Open the brushes dialog" msgctxt "dialogs-action" msgid "Open the mypaint brushes dialog" -msgstr "Öppna dialogrutan för penslar" +msgstr "Öppna dialogrutan för MyPaint-penslar" #: ../app/actions/dialogs-actions.c:167 msgctxt "dialogs-action" @@ -1373,12 +2933,12 @@ msgstr "Öppna palettredigeraren" #: ../app/actions/dialogs-actions.c:197 msgctxt "dialogs-action" msgid "Tool presets" -msgstr "Verktygsförval" +msgstr "Verktygsförinställning" #: ../app/actions/dialogs-actions.c:198 msgctxt "dialogs-action" msgid "Open tool presets dialog" -msgstr "Öppna dialogrutan för verktygsförval" +msgstr "Öppna dialogrutan för verktygsförinställning" #: ../app/actions/dialogs-actions.c:203 msgctxt "dialogs-action" @@ -1440,96 +3000,106 @@ msgctxt "dialogs-action" msgid "Open the error console" msgstr "Öppna felkonsolen" -#: ../app/actions/dialogs-actions.c:244 +#: ../app/actions/dialogs-actions.c:239 +msgctxt "dialogs-action" +msgid "_Dashboard" +msgstr "_Panel" + +#: ../app/actions/dialogs-actions.c:240 +msgctxt "dialogs-action" +msgid "Open the dashboard" +msgstr "Öppna panelen" + +#: ../app/actions/dialogs-actions.c:250 msgctxt "dialogs-action" msgid "_Preferences" msgstr "I_nställningar" -#: ../app/actions/dialogs-actions.c:245 +#: ../app/actions/dialogs-actions.c:251 msgctxt "dialogs-action" msgid "Open the preferences dialog" msgstr "Öppna dialogrutan för inställningar" -#: ../app/actions/dialogs-actions.c:250 +#: ../app/actions/dialogs-actions.c:256 msgctxt "dialogs-action" msgid "_Input Devices" msgstr "_Inmatningsenheter" -#: ../app/actions/dialogs-actions.c:251 +#: ../app/actions/dialogs-actions.c:257 msgctxt "dialogs-action" msgid "Open the input devices editor" msgstr "Öppna redigerare för inmatningsenheter" -#: ../app/actions/dialogs-actions.c:256 +#: ../app/actions/dialogs-actions.c:262 msgctxt "dialogs-action" msgid "_Keyboard Shortcuts" msgstr "_Tangentbordsgenvägar" -#: ../app/actions/dialogs-actions.c:257 +#: ../app/actions/dialogs-actions.c:263 msgctxt "dialogs-action" msgid "Open the keyboard shortcuts editor" msgstr "Öppna redigeraren för tangentbordsgenvägar" -#: ../app/actions/dialogs-actions.c:262 +#: ../app/actions/dialogs-actions.c:268 msgctxt "dialogs-action" msgid "_Modules" msgstr "_Moduler" -#: ../app/actions/dialogs-actions.c:263 +#: ../app/actions/dialogs-actions.c:269 msgctxt "dialogs-action" msgid "Open the module manager dialog" msgstr "Öppna dialogrutan för modulhanteraren" -#: ../app/actions/dialogs-actions.c:268 +#: ../app/actions/dialogs-actions.c:274 msgctxt "dialogs-action" msgid "_Tip of the Day" msgstr "_Dagens tips" -#: ../app/actions/dialogs-actions.c:269 +#: ../app/actions/dialogs-actions.c:275 msgctxt "dialogs-action" msgid "Show some helpful tips on using GIMP" msgstr "Visa några hjälpfulla tips om användning av GIMP" -#: ../app/actions/dialogs-actions.c:275 ../app/actions/dialogs-actions.c:282 +#: ../app/actions/dialogs-actions.c:281 ../app/actions/dialogs-actions.c:288 msgctxt "dialogs-action" msgid "About GIMP" msgstr "Om GIMP" -#: ../app/actions/dialogs-actions.c:277 +#: ../app/actions/dialogs-actions.c:283 msgctxt "dialogs-action" msgid "About" msgstr "Om" -#: ../app/actions/dialogs-actions.c:279 +#: ../app/actions/dialogs-actions.c:285 msgctxt "dialogs-action" msgid "_About" msgstr "_Om" -#: ../app/actions/dialogs-actions.c:287 +#: ../app/actions/dialogs-actions.c:293 msgctxt "dialogs-action" msgid "_Search and Run a Command" -msgstr "" +msgstr "_Sök och kör ett kommando" -#: ../app/actions/dialogs-actions.c:288 +#: ../app/actions/dialogs-actions.c:294 msgctxt "dialogs-action" msgid "Search commands by keyword, and run them" -msgstr "" +msgstr "Sök kommandon efter nyckelord och kör dem" -#: ../app/actions/dialogs-actions.c:351 -#: ../app/dialogs/preferences-dialog.c:2044 -#: ../app/dialogs/preferences-dialog.c:2045 ../app/widgets/gimptoolbox.c:533 +#: ../app/actions/dialogs-actions.c:357 +#: ../app/dialogs/preferences-dialog.c:2022 +#: ../app/dialogs/preferences-dialog.c:2023 ../app/widgets/gimptoolbox.c:529 msgid "Toolbox" msgstr "Verktygslåda" -#: ../app/actions/dialogs-actions.c:352 +#: ../app/actions/dialogs-actions.c:358 msgid "Raise the toolbox" msgstr "Höj verktygslådan" -#: ../app/actions/dialogs-actions.c:356 +#: ../app/actions/dialogs-actions.c:362 msgid "New Toolbox" msgstr "Ny verktygslåda" -#: ../app/actions/dialogs-actions.c:357 +#: ../app/actions/dialogs-actions.c:363 msgid "Create a new toolbox" msgstr "Skapa en ny verktygslåda" @@ -1546,7 +3116,7 @@ msgstr "Stäng docka" #: ../app/actions/dock-actions.c:55 msgctxt "dock-action" msgid "_Open Display..." -msgstr "_Öppna display..." +msgstr "_Öppna display…" #: ../app/actions/dock-actions.c:56 msgctxt "dock-action" @@ -1663,7 +3233,7 @@ msgctxt "tab-style" msgid "St_atus & Text" msgstr "St_atus och text" -#: ../app/actions/dockable-actions.c:117 ../app/widgets/widgets-enums.c:255 +#: ../app/actions/dockable-actions.c:117 ../app/widgets/widgets-enums.c:261 msgctxt "tab-style" msgid "Automatic" msgstr "Automatiskt" @@ -1739,19 +3309,14 @@ msgid "Copy image location to clipboard" msgstr "Kopiera bildens plats till urklipp" #: ../app/actions/documents-actions.c:70 -#, fuzzy -#| msgid "Module Manager" msgctxt "documents-action" msgid "Show in _File Manager" -msgstr "Modulhanterare" +msgstr "Visa i _filhanterare" #: ../app/actions/documents-actions.c:71 -#, fuzzy -#| msgctxt "documents-action" -#| msgid "Copy image location to clipboard" msgctxt "documents-action" msgid "Show image location in the file manager" -msgstr "Kopiera bildens plats till urklipp" +msgstr "Visa bildfilens plats i filhanteraren" #: ../app/actions/documents-actions.c:76 msgctxt "documents-action" @@ -1808,6 +3373,67 @@ msgstr "" msgid "Clear Document History" msgstr "Töm dokumenthistorik" +#: ../app/actions/documents-commands.c:230 ../app/actions/edit-commands.c:160 +#: ../app/actions/error-console-commands.c:96 +#: ../app/actions/file-commands.c:416 +#: ../app/actions/gradient-editor-commands.c:478 +#: ../app/actions/gradient-editor-commands.c:581 +#: ../app/actions/gradients-commands.c:78 ../app/actions/plug-in-commands.c:180 +#: ../app/actions/templates-commands.c:244 +#: ../app/actions/text-editor-commands.c:64 +#: ../app/actions/text-tool-commands.c:118 +#: ../app/actions/tool-options-commands.c:195 +#: ../app/actions/window-commands.c:75 +#: ../app/dialogs/color-profile-dialog.c:136 +#: ../app/dialogs/color-profile-dialog.c:154 +#: ../app/dialogs/color-profile-dialog.c:172 +#: ../app/dialogs/color-profile-dialog.c:190 +#: ../app/dialogs/color-profile-dialog.c:208 +#: ../app/dialogs/convert-indexed-dialog.c:138 +#: ../app/dialogs/convert-precision-dialog.c:165 +#: ../app/dialogs/data-delete-dialog.c:86 ../app/dialogs/fade-dialog.c:120 +#: ../app/dialogs/file-open-location-dialog.c:80 +#: ../app/dialogs/file-save-dialog.c:714 ../app/dialogs/fill-dialog.c:115 +#: ../app/dialogs/grid-dialog.c:102 +#: ../app/dialogs/image-merge-layers-dialog.c:100 +#: ../app/dialogs/image-new-dialog.c:106 ../app/dialogs/image-new-dialog.c:325 +#: ../app/dialogs/image-scale-dialog.c:210 +#: ../app/dialogs/item-options-dialog.c:145 +#: ../app/dialogs/layer-add-mask-dialog.c:110 +#: ../app/dialogs/offset-dialog.c:136 +#: ../app/dialogs/palette-import-dialog.c:162 +#: ../app/dialogs/preferences-dialog.c:287 +#: ../app/dialogs/preferences-dialog.c:637 +#: ../app/dialogs/preferences-dialog.c:1100 +#: ../app/dialogs/print-size-dialog.c:124 ../app/dialogs/quit-dialog.c:171 +#: ../app/dialogs/resize-dialog.c:186 +#: ../app/dialogs/resolution-calibrate-dialog.c:76 +#: ../app/dialogs/scale-dialog.c:137 ../app/dialogs/stroke-dialog.c:128 +#: ../app/dialogs/template-options-dialog.c:118 +#: ../app/dialogs/vectors-export-dialog.c:83 +#: ../app/dialogs/vectors-import-dialog.c:88 +#: ../app/display/gimpdisplayshell-close.c:179 +#: ../app/display/gimpdisplayshell-filter-dialog.c:87 +#: ../app/display/gimpdisplayshell-rotate-dialog.c:122 +#: ../app/display/gimpdisplayshell-scale-dialog.c:122 +#: ../app/tools/gimpfiltertool.c:323 +#: ../app/tools/gimpforegroundselecttool.c:313 ../app/tools/gimptexttool.c:1591 +#: ../app/tools/gimptransformtool.c:1215 ../app/widgets/gimpactionview.c:669 +#: ../app/widgets/gimpcolordialog.c:110 +#: ../app/widgets/gimpcontrollereditor.c:660 +#: ../app/widgets/gimpcontrollerlist.c:564 +#: ../app/widgets/gimpdeviceeditor.c:508 ../app/widgets/gimpdnd-xds.c:228 +#: ../app/widgets/gimpfiledialog.c:324 ../app/widgets/gimphelp.c:447 +#: ../app/widgets/gimphelp.c:796 ../app/widgets/gimpiconpicker.c:488 +#: ../app/widgets/gimpprogressdialog.c:91 ../app/widgets/gimpsettingsbox.c:734 +msgid "_Cancel" +msgstr "_Avbryt" + +#: ../app/actions/documents-commands.c:231 ../app/actions/edit-commands.c:161 +#: ../app/dialogs/preferences-dialog.c:638 +msgid "Cl_ear" +msgstr "T_öm" + #: ../app/actions/documents-commands.c:246 msgid "Clear the Recent Documents list?" msgstr "Töm Senaste dokument-listan?" @@ -1832,180 +3458,109 @@ msgstr "Automatisk kontrastförbättring" #: ../app/actions/drawable-actions.c:51 msgctxt "drawable-action" -msgid "In_vert" -msgstr "In_vertera" - -#: ../app/actions/drawable-actions.c:52 -msgctxt "drawable-action" -msgid "Invert the colors" -msgstr "Invertera färgerna" - -#: ../app/actions/drawable-actions.c:57 -#, fuzzy -#| msgctxt "select-action" -#| msgid "_Invert" -msgctxt "drawable-action" -msgid "_Value Invert" -msgstr "_Invertera" - -#: ../app/actions/drawable-actions.c:58 -msgctxt "drawable-action" -msgid "Invert the brightness of each pixel" -msgstr "" - -#: ../app/actions/drawable-actions.c:63 -msgctxt "drawable-action" msgid "_White Balance" msgstr "_Vitbalans" -#: ../app/actions/drawable-actions.c:64 +#: ../app/actions/drawable-actions.c:52 msgctxt "drawable-action" msgid "Automatic white balance correction" msgstr "Automatisk korrigering av vitbalans" -#: ../app/actions/drawable-actions.c:69 -msgctxt "drawable-action" -msgid "_Dilate" -msgstr "" - -#: ../app/actions/drawable-actions.c:70 -msgctxt "drawable-action" -msgid "Grow lighter areas of the image" -msgstr "" - -#: ../app/actions/drawable-actions.c:75 -msgctxt "drawable-action" -msgid "E_rode" -msgstr "" - -#: ../app/actions/drawable-actions.c:76 -msgctxt "drawable-action" -msgid "Grow darker areas of the image" -msgstr "" - -#: ../app/actions/drawable-actions.c:81 +#: ../app/actions/drawable-actions.c:57 msgctxt "drawable-action" msgid "_Offset..." -msgstr "_Position..." +msgstr "_Position…" -#: ../app/actions/drawable-actions.c:83 +#: ../app/actions/drawable-actions.c:59 msgctxt "drawable-action" msgid "Shift the pixels, optionally wrapping them at the borders" msgstr "Flytta bildpunkterna, bryt dem eventuellt vid kanterna" -#: ../app/actions/drawable-actions.c:91 +#: ../app/actions/drawable-actions.c:67 msgctxt "drawable-action" -msgid "_Visible" -msgstr "_Synlig" +msgid "Toggle Drawable _Visibility" +msgstr "_Växla synlighet för rityta" -#: ../app/actions/drawable-actions.c:92 +#: ../app/actions/drawable-actions.c:73 msgctxt "drawable-action" -msgid "Toggle visibility" -msgstr "Växla synlighet" +msgid "Toggle Drawable _Linked State" +msgstr "Växla _länkat tillstånd för rityta" -#: ../app/actions/drawable-actions.c:98 +#. GIMP_ICON_LOCK +#: ../app/actions/drawable-actions.c:79 msgctxt "drawable-action" -msgid "_Linked" -msgstr "_Länkad" +msgid "L_ock Pixels of Drawable" +msgstr "L_ås bildpunkter för rityta" -#: ../app/actions/drawable-actions.c:99 -msgctxt "drawable-action" -msgid "Toggle the linked state" -msgstr "Växla länkat tillstånd" - -#. GIMP_STOCK_LOCK -#: ../app/actions/drawable-actions.c:105 -msgctxt "drawable-action" -msgid "L_ock pixels" -msgstr "L_ås bildpunkter" - -#: ../app/actions/drawable-actions.c:107 +#: ../app/actions/drawable-actions.c:81 msgctxt "drawable-action" msgid "Keep the pixels on this drawable from being modified" -msgstr "Skydda pixlar på ritytan från att ändras" +msgstr "Skydda bildpunkterna på den här ritytan från att ändras" -#: ../app/actions/drawable-actions.c:113 -#, fuzzy -#| msgid "Lock alpha channel" +#: ../app/actions/drawable-actions.c:87 msgctxt "drawable-action" -msgid "L_ock position of channel" -msgstr "Lås alfakanal" +msgid "L_ock Position of Drawable" +msgstr "L_ås position för rityta" -#: ../app/actions/drawable-actions.c:115 -#, fuzzy -#| msgctxt "drawable-action" -#| msgid "Keep the pixels on this drawable from being modified" +#: ../app/actions/drawable-actions.c:89 msgctxt "drawable-action" msgid "Keep the position on this drawable from being modified" -msgstr "Skydda pixlar på ritytan från att ändras" +msgstr "Skydda positionen för denna rityta från att ändras" -#: ../app/actions/drawable-actions.c:124 +#: ../app/actions/drawable-actions.c:98 msgctxt "drawable-action" msgid "Flip _Horizontally" msgstr "Vänd _horisontellt" -#: ../app/actions/drawable-actions.c:125 +#: ../app/actions/drawable-actions.c:99 msgctxt "drawable-action" -msgid "Flip horizontally" -msgstr "Vänd horisontellt" +msgid "Flip drawable horizontally" +msgstr "Vänd ritytan horisontellt" -#: ../app/actions/drawable-actions.c:130 +#: ../app/actions/drawable-actions.c:104 msgctxt "drawable-action" msgid "Flip _Vertically" msgstr "_Vänd vertikalt" -#: ../app/actions/drawable-actions.c:131 +#: ../app/actions/drawable-actions.c:105 msgctxt "drawable-action" -msgid "Flip vertically" -msgstr "Vänd vertikalt" +msgid "Flip drawable vertically" +msgstr "Vänd ritytan vertikalt" -#: ../app/actions/drawable-actions.c:139 +#: ../app/actions/drawable-actions.c:113 msgctxt "drawable-action" msgid "Rotate 90° _clockwise" -msgstr "Rotera 90° m_edsols" +msgstr "Rotera 90° m_edurs" -#: ../app/actions/drawable-actions.c:140 +#: ../app/actions/drawable-actions.c:114 msgctxt "drawable-action" -msgid "Rotate 90 degrees to the right" -msgstr "Rotera 90 grader åt höger" +msgid "Rotate drawable 90 degrees to the right" +msgstr "Rotera ritytan 90 grader åt höger" -#: ../app/actions/drawable-actions.c:145 +#: ../app/actions/drawable-actions.c:119 msgctxt "drawable-action" msgid "Rotate _180°" msgstr "Rotera _180°" -#: ../app/actions/drawable-actions.c:146 +#: ../app/actions/drawable-actions.c:120 msgctxt "drawable-action" -msgid "Turn upside-down" -msgstr "Vänd upp och ned" +msgid "Turn drawable upside-down" +msgstr "Vänd ritytan upp och ned" -#: ../app/actions/drawable-actions.c:151 +#: ../app/actions/drawable-actions.c:125 msgctxt "drawable-action" msgid "Rotate 90° counter-clock_wise" -msgstr "Rotera 90° m_otsols" +msgstr "Rotera 90° m_oturs" -#: ../app/actions/drawable-actions.c:152 +#: ../app/actions/drawable-actions.c:126 msgctxt "drawable-action" -msgid "Rotate 90 degrees to the left" -msgstr "Rotera 90 grader åt vänster" +msgid "Rotate drawable 90 degrees to the left" +msgstr "Rotera ritytan 90 grader åt vänster" -#: ../app/actions/drawable-commands.c:73 ../app/actions/drawable-commands.c:89 -#: ../app/pdb/color-cmds.c:388 -msgid "Invert" -msgstr "Invertera" - -#: ../app/actions/drawable-commands.c:110 +#: ../app/actions/drawable-commands.c:89 msgid "White Balance operates only on RGB color layers." msgstr "Vitbalans fungerar endast på RGB-lager." -#: ../app/actions/drawable-commands.c:144 -msgid "Dilate" -msgstr "" - -#: ../app/actions/drawable-commands.c:176 -msgid "Erode" -msgstr "" - #: ../app/actions/dynamics-actions.c:43 msgctxt "dynamics-action" msgid "Paint Dynamics Menu" @@ -2042,19 +3597,14 @@ msgid "Copy dynamics file location to clipboard" msgstr "Kopiera dynamikfilens plats till urklipp" #: ../app/actions/dynamics-actions.c:65 -#, fuzzy -#| msgid "Module Manager" msgctxt "dynamics-action" msgid "Show in _File Manager" -msgstr "Modulhanterare" +msgstr "Visa i _filhanterare" #: ../app/actions/dynamics-actions.c:66 -#, fuzzy -#| msgctxt "dynamics-action" -#| msgid "Copy dynamics file location to clipboard" msgctxt "dynamics-action" msgid "Show dynamics file location in the file manager" -msgstr "Kopiera dynamikfilens plats till urklipp" +msgstr "Kopiera dynamikfilens plats i filhanteraren" #: ../app/actions/dynamics-actions.c:71 msgctxt "dynamics-action" @@ -2079,15 +3629,12 @@ msgstr "Uppdatera dynamik" #: ../app/actions/dynamics-actions.c:86 msgctxt "dynamics-action" msgid "_Edit Dynamics..." -msgstr "R_edigera dynamik..." +msgstr "R_edigera dynamik…" #: ../app/actions/dynamics-actions.c:87 -#, fuzzy -#| msgctxt "dynamics-action" -#| msgid "Edit dynamics" msgctxt "dynamics-action" msgid "Edit this dynamics" -msgstr "Redigera dynamik" +msgstr "Redigera denna dynamik" #: ../app/actions/dynamics-editor-actions.c:43 msgctxt "dynamics-editor-action" @@ -2172,7 +3719,7 @@ msgstr "Ta bort alla åtgärder från ångringshistoriken" #: ../app/actions/edit-actions.c:105 msgctxt "edit-action" msgid "_Fade..." -msgstr "_Tona..." +msgstr "_Tona…" #: ../app/actions/edit-actions.c:107 msgctxt "edit-action" @@ -2199,7 +3746,7 @@ msgctxt "edit-action" msgid "Copy the selected pixels to the clipboard" msgstr "Kopiera de markerade bildpunkterna till urklipp" -#. GIMP_STOCK_COPY_VISIBLE, +#. GIMP_ICON_COPY_VISIBLE, #: ../app/actions/edit-actions.c:124 msgctxt "edit-action" msgid "Copy _Visible" @@ -2212,217 +3759,266 @@ msgstr "Kopiera vad som är synligt i den markerade regionen" #: ../app/actions/edit-actions.c:130 msgctxt "edit-action" -msgid "_Paste" -msgstr "Klistra _in" - -#: ../app/actions/edit-actions.c:131 -msgctxt "edit-action" -msgid "Paste the content of the clipboard" -msgstr "Klistra in innehållet i urklipp" - -#: ../app/actions/edit-actions.c:136 -msgctxt "edit-action" -msgid "Paste _Into" -msgstr "Klist_ra in i" - -#: ../app/actions/edit-actions.c:138 -msgctxt "edit-action" -msgid "Paste the content of the clipboard into the current selection" -msgstr "Klistra in innehållet i urklipp till den aktuella markeringen" - -#: ../app/actions/edit-actions.c:143 -msgctxt "edit-action" msgid "From _Clipboard" msgstr "Från _urklipp" -#: ../app/actions/edit-actions.c:144 ../app/actions/edit-actions.c:150 +#: ../app/actions/edit-actions.c:131 ../app/actions/edit-actions.c:137 msgctxt "edit-action" msgid "Create a new image from the content of the clipboard" msgstr "Skapa en ny bild från innehållet i urklipp" -#: ../app/actions/edit-actions.c:149 +#: ../app/actions/edit-actions.c:136 msgctxt "edit-action" msgid "_New Image" msgstr "_Ny bild" -#: ../app/actions/edit-actions.c:155 -msgctxt "edit-action" -msgid "New _Layer" -msgstr "Nytt _lager" - -#: ../app/actions/edit-actions.c:156 -msgctxt "edit-action" -msgid "Create a new layer from the content of the clipboard" -msgstr "Skapa ett nytt lager från innehållet i urklipp" - -#: ../app/actions/edit-actions.c:161 +#: ../app/actions/edit-actions.c:142 msgctxt "edit-action" msgid "Cu_t Named..." -msgstr "Kli_pp ut namngiven..." +msgstr "Kli_pp ut namngiven…" -#: ../app/actions/edit-actions.c:162 +#: ../app/actions/edit-actions.c:143 msgctxt "edit-action" msgid "Move the selected pixels to a named buffer" msgstr "Flytta de markerade bildpunkterna till en namngiven buffert" -#: ../app/actions/edit-actions.c:167 +#: ../app/actions/edit-actions.c:148 msgctxt "edit-action" msgid "_Copy Named..." -msgstr "Kopie_ra namngiven..." +msgstr "Kopie_ra namngiven…" -#: ../app/actions/edit-actions.c:168 +#: ../app/actions/edit-actions.c:149 msgctxt "edit-action" msgid "Copy the selected pixels to a named buffer" msgstr "Kopiera de markerade bildpunkterna till en namngiven buffert" -#. GIMP_STOCK_COPY_VISIBLE, -#: ../app/actions/edit-actions.c:173 +#. GIMP_ICON_COPY_VISIBLE, +#: ../app/actions/edit-actions.c:154 msgctxt "edit-action" msgid "Copy _Visible Named..." -msgstr "Kopiera _synlig namngiven..." +msgstr "Kopiera _synlig namngiven…" -#: ../app/actions/edit-actions.c:175 +#: ../app/actions/edit-actions.c:156 msgctxt "edit-action" msgid "Copy what is visible in the selected region to a named buffer" msgstr "" "Kopiera vad som är synligt i den markerade regionen till en namngiven buffert" -#: ../app/actions/edit-actions.c:180 +#: ../app/actions/edit-actions.c:161 msgctxt "edit-action" msgid "_Paste Named..." -msgstr "Klistra in namngi_ven..." +msgstr "Klistra in namngi_ven…" -#: ../app/actions/edit-actions.c:181 +#: ../app/actions/edit-actions.c:162 msgctxt "edit-action" msgid "Paste the content of a named buffer" msgstr "Klistra in innehållet för en namngiven buffert" -#: ../app/actions/edit-actions.c:186 +#: ../app/actions/edit-actions.c:167 msgctxt "edit-action" msgid "Cl_ear" msgstr "T_öm" -#: ../app/actions/edit-actions.c:187 +#: ../app/actions/edit-actions.c:168 msgctxt "edit-action" msgid "Clear the selected pixels" msgstr "Töm de markerade bildpunkterna" -#: ../app/actions/edit-actions.c:195 +#: ../app/actions/edit-actions.c:176 +msgctxt "edit-action" +msgid "_Paste" +msgstr "Klistra _in" + +#: ../app/actions/edit-actions.c:177 +msgctxt "edit-action" +msgid "Paste the content of the clipboard" +msgstr "Klistra in innehållet i urklipp" + +#: ../app/actions/edit-actions.c:182 +msgctxt "edit-action" +msgid "Paste In Place" +msgstr "Klistra in i på plats" + +#: ../app/actions/edit-actions.c:184 +msgctxt "edit-action" +msgid "Paste the content of the clipboard at its original position" +msgstr "Klistra in innehållet i urklipp på dess ursprungliga position" + +#: ../app/actions/edit-actions.c:189 +msgctxt "edit-action" +msgid "Paste _Into Selection" +msgstr "Klistra in _i markering" + +#: ../app/actions/edit-actions.c:191 +msgctxt "edit-action" +msgid "Paste the content of the clipboard into the current selection" +msgstr "Klistra in innehållet i urklipp till den aktuella markeringen" + +#: ../app/actions/edit-actions.c:196 +msgctxt "edit-action" +msgid "Paste Into Selection In Place" +msgstr "Klistra in på plats i markering" + +#: ../app/actions/edit-actions.c:198 +msgctxt "edit-action" +msgid "" +"Paste the content of the clipboard into the current selection at its " +"original position" +msgstr "" +"Klistra in innehållet i urklipp i den aktuella markeringen på dess " +"ursprungliga position" + +#: ../app/actions/edit-actions.c:204 +msgctxt "edit-action" +msgid "New _Layer" +msgstr "Nytt _lager" + +#: ../app/actions/edit-actions.c:205 +msgctxt "edit-action" +msgid "Create a new layer from the content of the clipboard" +msgstr "Skapa ett nytt lager från innehållet i urklipp" + +#: ../app/actions/edit-actions.c:210 +msgctxt "edit-action" +msgid "New Layer In _Place" +msgstr "Nytt lager på _plats" + +#: ../app/actions/edit-actions.c:212 +msgctxt "edit-action" +msgid "" +"Create a new layer from the content of the clipboard and place it at its " +"original position" +msgstr "" +"Skapa ett nytt lager från innehållet i urklipp och placera det på dess " +"ursprungliga position" + +#: ../app/actions/edit-actions.c:221 msgctxt "edit-action" msgid "Fill with _FG Color" msgstr "Fyll med _förgrundsfärg" -#: ../app/actions/edit-actions.c:196 +#: ../app/actions/edit-actions.c:222 msgctxt "edit-action" msgid "Fill the selection using the foreground color" msgstr "Fyll markeringen med förgrundsfärgen" -#: ../app/actions/edit-actions.c:201 +#: ../app/actions/edit-actions.c:227 msgctxt "edit-action" msgid "Fill with B_G Color" msgstr "Fyll med _bakgrundsfärg" -#: ../app/actions/edit-actions.c:202 +#: ../app/actions/edit-actions.c:228 msgctxt "edit-action" msgid "Fill the selection using the background color" msgstr "Fyll markeringen med bakgrundsfärgen" -#: ../app/actions/edit-actions.c:207 +#: ../app/actions/edit-actions.c:233 msgctxt "edit-action" msgid "Fill _with Pattern" msgstr "Fyll m_ed mönster" -#: ../app/actions/edit-actions.c:208 +#: ../app/actions/edit-actions.c:234 msgctxt "edit-action" msgid "Fill the selection using the active pattern" msgstr "Fyll markeringen med aktivt mönster" -#: ../app/actions/edit-actions.c:323 ../app/actions/edit-actions.c:325 +#: ../app/actions/edit-actions.c:344 ../app/actions/edit-actions.c:346 #, c-format msgid "_Undo %s" msgstr "_Ångra %s" -#: ../app/actions/edit-actions.c:329 ../app/actions/edit-actions.c:331 +#: ../app/actions/edit-actions.c:350 ../app/actions/edit-actions.c:352 #, c-format msgid "_Redo %s" msgstr "_Gör om %s" -#: ../app/actions/edit-actions.c:345 +#: ../app/actions/edit-actions.c:366 #, c-format msgid "_Fade %s..." -msgstr "_Tona %s..." +msgstr "_Tona %s…" -#: ../app/actions/edit-actions.c:357 +#: ../app/actions/edit-actions.c:378 msgid "_Undo" msgstr "_Ångra" -#: ../app/actions/edit-actions.c:358 +#: ../app/actions/edit-actions.c:379 msgid "_Redo" msgstr "_Gör om" -#: ../app/actions/edit-actions.c:359 +#: ../app/actions/edit-actions.c:380 msgid "_Fade..." -msgstr "_Tona..." +msgstr "_Tona…" #: ../app/actions/edit-commands.c:152 msgid "Clear Undo History" msgstr "Töm ångringshistorik" -#: ../app/actions/edit-commands.c:178 +#: ../app/actions/edit-commands.c:179 msgid "Really clear image's undo history?" msgstr "Verkligen tömma bildens ångringshistorik?" -#: ../app/actions/edit-commands.c:191 +#: ../app/actions/edit-commands.c:192 #, c-format msgid "Clearing the undo history of this image will gain %s of memory." msgstr "" "Att tömma ångringshistoriken för den här bilden kommer att frigöra %s minne." -#: ../app/actions/edit-commands.c:242 -msgid "Cut pixels to the clipboard" -msgstr "Klipp ut bildpunkter till urklipp" +#: ../app/actions/edit-commands.c:248 +msgid "Cut layer to the clipboard." +msgstr "Klipp ut lager till urklipp." -#: ../app/actions/edit-commands.c:272 ../app/actions/edit-commands.c:301 -msgid "Copied pixels to the clipboard" -msgstr "Kopierade bildpunkter till urklipp" +#: ../app/actions/edit-commands.c:249 +msgid "Cut pixels to the clipboard." +msgstr "Klipp ut bildpunkter till urklipp." -#: ../app/actions/edit-commands.c:365 ../app/actions/edit-commands.c:401 -#: ../app/actions/edit-commands.c:580 ../app/tools/gimpseamlessclonetool.c:295 +#: ../app/actions/edit-commands.c:284 +msgid "Copied layer to the clipboard." +msgstr "Kopierade lager till urklipp." + +#: ../app/actions/edit-commands.c:285 ../app/actions/edit-commands.c:314 +msgid "Copied pixels to the clipboard." +msgstr "Kopierade bildpunkter till urklipp." + +#: ../app/actions/edit-commands.c:393 ../app/actions/edit-commands.c:599 +#: ../app/tools/gimpseamlessclonetool.c:295 msgid "There is no image data in the clipboard to paste." msgstr "Det finns ingen bilddata i urklipp att klistra in." -#: ../app/actions/edit-commands.c:388 ../app/core/gimpbrushclipboard.c:168 -#: ../app/core/gimppatternclipboard.c:168 ../app/widgets/gimpclipboard.c:346 -msgid "Clipboard" -msgstr "Urklippshanterare" - -#: ../app/actions/edit-commands.c:415 +#: ../app/actions/edit-commands.c:408 msgid "Cut Named" msgstr "Klipp ut namngiven" -#: ../app/actions/edit-commands.c:418 ../app/actions/edit-commands.c:438 -#: ../app/actions/edit-commands.c:458 +#: ../app/actions/edit-commands.c:411 ../app/actions/edit-commands.c:431 +#: ../app/actions/edit-commands.c:451 msgid "Enter a name for this buffer" -msgstr "Ange namn för denna buffert" +msgstr "Ange ett namn för denna buffert" -#: ../app/actions/edit-commands.c:435 +#: ../app/actions/edit-commands.c:428 msgid "Copy Named" msgstr "Kopiera namngiven" -#: ../app/actions/edit-commands.c:455 +#: ../app/actions/edit-commands.c:448 msgid "Copy Visible Named " msgstr "Kopiera synlig namngiven " -#: ../app/actions/edit-commands.c:597 +#: ../app/actions/edit-commands.c:571 ../app/display/gimpdisplayshell-dnd.c:479 +msgid "Pasted as new layer because the target is a layer group." +msgstr "Klistrades in som ett nytt lager eftersom målet är en lagergrupp." + +#: ../app/actions/edit-commands.c:578 ../app/display/gimpdisplayshell-dnd.c:488 +msgid "Pasted as new layer because the target's pixels are locked." +msgstr "Klistrades in som ett nytt lager eftersom målets bildpunkter är låsta." + +#: ../app/actions/edit-commands.c:616 msgid "There is no active layer or channel to cut from." msgstr "Det finns inget aktivt lager eller kanal att klippa ifrån." -#: ../app/actions/edit-commands.c:602 ../app/actions/edit-commands.c:634 -#: ../app/actions/edit-commands.c:658 +#: ../app/actions/edit-commands.c:621 ../app/actions/edit-commands.c:653 +#: ../app/actions/edit-commands.c:677 msgid "(Unnamed Buffer)" msgstr "(Namnlös buffert)" -#: ../app/actions/edit-commands.c:629 +#: ../app/actions/edit-commands.c:648 msgid "There is no active layer or channel to copy from." msgstr "Det finns inget aktivt lager eller kanal att kopiera ifrån." @@ -2451,41 +4047,85 @@ msgctxt "error-console-action" msgid "Select all error messages" msgstr "Markera alla felmeddelanden" -#: ../app/actions/error-console-actions.c:59 +#: ../app/actions/error-console-actions.c:56 +msgctxt "error-console-action" +msgid "_Highlight" +msgstr "_Markera" + +#: ../app/actions/error-console-actions.c:63 msgctxt "error-console-action" msgid "_Save Error Log to File..." -msgstr "_Spara fellogg till fil..." +msgstr "_Spara fellogg till fil…" -#: ../app/actions/error-console-actions.c:60 +#: ../app/actions/error-console-actions.c:64 msgctxt "error-console-action" msgid "Write all error messages to a file" msgstr "Skriv alla felmeddelanden till en fil" -#: ../app/actions/error-console-actions.c:65 +#: ../app/actions/error-console-actions.c:69 msgctxt "error-console-action" msgid "Save S_election to File..." -msgstr "Spara _markering till fil..." +msgstr "Spara _markering till fil…" -#: ../app/actions/error-console-actions.c:66 +#: ../app/actions/error-console-actions.c:70 msgctxt "error-console-action" msgid "Write the selected error messages to a file" msgstr "Skriv de markerade felmeddelandena till en fil" -#: ../app/actions/error-console-commands.c:85 +#: ../app/actions/error-console-actions.c:78 +msgctxt "error-console-action" +msgid "_Errors" +msgstr "_Fel" + +#: ../app/actions/error-console-actions.c:79 +msgctxt "error-console-action" +msgid "Highlight error console on errors" +msgstr "Markera felkonsol vid fel" + +#: ../app/actions/error-console-actions.c:85 +msgctxt "error-console-action" +msgid "_Warnings" +msgstr "_Varningar" + +#: ../app/actions/error-console-actions.c:86 +msgctxt "error-console-action" +msgid "Highlight error console on warnings" +msgstr "Markera felkonsol vid varningar" + +#: ../app/actions/error-console-actions.c:92 +msgctxt "error-console-action" +msgid "_Messages" +msgstr "_Meddelanden" + +#: ../app/actions/error-console-actions.c:93 +msgctxt "error-console-action" +msgid "Highlight error console on messages" +msgstr "Markera felkonsol vid meddelanden" + +#: ../app/actions/error-console-commands.c:84 msgid "Cannot save. Nothing is selected." msgstr "Kan inte spara. Inget är markerat." -#: ../app/actions/error-console-commands.c:96 +#: ../app/actions/error-console-commands.c:93 msgid "Save Error Log to File" msgstr "Spara fellogg till fil" -#: ../app/actions/error-console-commands.c:158 +#: ../app/actions/error-console-commands.c:97 +#: ../app/actions/gradients-commands.c:79 ../app/dialogs/file-save-dialog.c:715 +#: ../app/dialogs/input-devices-dialog.c:63 +#: ../app/dialogs/vectors-export-dialog.c:84 +#: ../app/display/gimpdisplayshell-close.c:177 +#: ../app/widgets/gimpsavedialog.c:143 ../app/widgets/gimpsettingsbox.c:736 +msgid "_Save" +msgstr "_Spara" + +#: ../app/actions/error-console-commands.c:188 #, c-format msgid "" "Error writing file '%s':\n" "%s" msgstr "" -"Fel vid skrivning av filen \"%s\":\n" +"Fel vid skrivning av filen ”%s”:\n" "%s" #: ../app/actions/file-actions.c:71 @@ -2506,7 +4146,7 @@ msgstr "Öppna _tidigare" #: ../app/actions/file-actions.c:76 msgctxt "file-action" msgid "_Open..." -msgstr "_Öppna..." +msgstr "_Öppna…" #: ../app/actions/file-actions.c:77 msgctxt "file-action" @@ -2516,7 +4156,7 @@ msgstr "Öppna en bildfil" #: ../app/actions/file-actions.c:82 msgctxt "file-action" msgid "Op_en as Layers..." -msgstr "Öppna som _lager..." +msgstr "Öppna som _lager…" #: ../app/actions/file-actions.c:83 msgctxt "file-action" @@ -2526,7 +4166,7 @@ msgstr "Öppna en bildfil som lager" #: ../app/actions/file-actions.c:88 msgctxt "file-action" msgid "Open _Location..." -msgstr "Öppna pla_ts..." +msgstr "Öppna pla_ts…" #: ../app/actions/file-actions.c:89 msgctxt "file-action" @@ -2536,7 +4176,7 @@ msgstr "Öppna en bildfil från en angiven plats" #: ../app/actions/file-actions.c:94 msgctxt "file-action" msgid "Create Template..." -msgstr "Skapa mall..." +msgstr "Skapa mall…" #: ../app/actions/file-actions.c:95 msgctxt "file-action" @@ -2564,32 +4204,24 @@ msgid "Close all opened images" msgstr "Stäng alla öppna bilder" #: ../app/actions/file-actions.c:112 -#, fuzzy -#| msgctxt "documents-action" -#| msgid "Copy Image _Location" msgctxt "file-action" msgid "Copy _Image Location" -msgstr "Kopiera bildens _plats" +msgstr "Kopiera _bildens plats" #: ../app/actions/file-actions.c:113 -#, fuzzy -#| msgctxt "documents-action" -#| msgid "Copy image location to clipboard" msgctxt "file-action" msgid "Copy image file location to clipboard" -msgstr "Kopiera bildens plats till urklipp" +msgstr "Kopiera bildfilens plats till urklipp" #: ../app/actions/file-actions.c:118 -#, fuzzy -#| msgid "Module Manager" msgctxt "file-action" msgid "Show in _File Manager" -msgstr "Modulhanterare" +msgstr "Visa i _filhanterare" #: ../app/actions/file-actions.c:119 msgctxt "file-action" msgid "Show image file location in the file manager" -msgstr "" +msgstr "Visa bildfilens plats i filhanteraren" #: ../app/actions/file-actions.c:124 msgctxt "file-action" @@ -2601,7 +4233,7 @@ msgctxt "file-action" msgid "Quit the GNU Image Manipulation Program" msgstr "Avsluta GNU:s bildmanipuleringsprogram" -#: ../app/actions/file-actions.c:133 ../app/actions/file-actions.c:314 +#: ../app/actions/file-actions.c:133 ../app/actions/file-actions.c:308 msgctxt "file-action" msgid "_Save" msgstr "_Spara" @@ -2614,7 +4246,7 @@ msgstr "Spara denna bild" #: ../app/actions/file-actions.c:139 msgctxt "file-action" msgid "Save _As..." -msgstr "Spara s_om..." +msgstr "Spara s_om…" #: ../app/actions/file-actions.c:140 msgctxt "file-action" @@ -2624,7 +4256,7 @@ msgstr "Spara denna bild med ett annat namn" #: ../app/actions/file-actions.c:145 msgctxt "file-action" msgid "Save a Cop_y..." -msgstr "Spara en _kopia..." +msgstr "Spara en _kopia…" #: ../app/actions/file-actions.c:147 msgctxt "file-action" @@ -2638,25 +4270,22 @@ msgstr "" #: ../app/actions/file-actions.c:153 msgctxt "file-action" msgid "Save and Close..." -msgstr "Spara och stäng..." +msgstr "Spara och stäng…" #: ../app/actions/file-actions.c:154 msgctxt "file-action" msgid "Save this image and close its window" msgstr "Spara denna bild och stäng dess fönster" -#: ../app/actions/file-actions.c:159 ../app/actions/file-actions.c:339 -#, fuzzy -#| msgctxt "file-action" -#| msgid "Export As..." +#: ../app/actions/file-actions.c:159 ../app/actions/file-actions.c:333 msgctxt "file-action" msgid "Export..." -msgstr "Exportera som..." +msgstr "Exportera…" #: ../app/actions/file-actions.c:160 msgctxt "file-action" -msgid "Export the image again" -msgstr "Exportera bilden igen" +msgid "Export the image" +msgstr "Exportera bilden" #: ../app/actions/file-actions.c:165 msgctxt "file-action" @@ -2671,32 +4300,29 @@ msgstr "Exportera bilden tillbaka till den importerade filen i importformatet" #: ../app/actions/file-actions.c:171 msgctxt "file-action" msgid "Export As..." -msgstr "Exportera som..." +msgstr "Exportera som…" #: ../app/actions/file-actions.c:172 msgctxt "file-action" msgid "Export the image to various file formats such as PNG or JPEG" msgstr "Exportera bilden till olika filformat såsom PNG eller JPEG" -#: ../app/actions/file-actions.c:320 -#, fuzzy -#| msgctxt "file-action" -#| msgid "_Save" +#: ../app/actions/file-actions.c:314 msgctxt "file-action" msgid "_Save..." -msgstr "_Spara" +msgstr "_Spara…" -#: ../app/actions/file-actions.c:325 +#: ../app/actions/file-actions.c:319 #, c-format msgid "Export to %s" msgstr "Exportera till %s" -#: ../app/actions/file-actions.c:331 +#: ../app/actions/file-actions.c:325 #, c-format msgid "Over_write %s" msgstr "Skriv ö_ver %s" -#: ../app/actions/file-commands.c:118 ../app/actions/file-commands.c:567 +#: ../app/actions/file-commands.c:118 ../app/actions/file-commands.c:542 #: ../app/widgets/gimpopendialog.c:66 msgid "Open Image" msgstr "Öppna bild" @@ -2705,47 +4331,45 @@ msgstr "Öppna bild" msgid "Open Image as Layers" msgstr "Öppna bild som lager" -#: ../app/actions/file-commands.c:279 ../app/widgets/gimpsavedialog.c:260 -#, c-format -msgid "" -"The image uses features from %s and cannot be saved for older GIMP versions." -msgstr "" - -#: ../app/actions/file-commands.c:302 +#: ../app/actions/file-commands.c:277 msgid "No changes need to be saved" msgstr "Inga ändringar behöver sparas" -#: ../app/actions/file-commands.c:309 ../app/actions/file-commands.c:780 -#: ../app/widgets/gimpsavedialog.c:138 +#: ../app/actions/file-commands.c:284 ../app/actions/file-commands.c:751 +#: ../app/widgets/gimpsavedialog.c:140 msgid "Save Image" msgstr "Spara bild" -#: ../app/actions/file-commands.c:315 +#: ../app/actions/file-commands.c:290 msgid "Save a Copy of the Image" msgstr "Spara en kopia av bilden" -#: ../app/actions/file-commands.c:392 +#: ../app/actions/file-commands.c:367 msgid "Create New Template" msgstr "Skapa en ny mall" -#: ../app/actions/file-commands.c:396 +#: ../app/actions/file-commands.c:371 msgid "Enter a name for this template" -msgstr "Ange namn för denna mall" +msgstr "Ange ett namn för denna mall" -#: ../app/actions/file-commands.c:424 +#: ../app/actions/file-commands.c:399 msgid "Revert failed. No file name associated with this image." msgstr "Återgång misslyckades. Inget filnamn är associerat med den här bilden." -#: ../app/actions/file-commands.c:436 +#: ../app/actions/file-commands.c:411 msgid "Revert Image" msgstr "Återgå till gammal bild" -#: ../app/actions/file-commands.c:460 +#: ../app/actions/file-commands.c:417 +msgid "_Revert" +msgstr "_Återgå" + +#: ../app/actions/file-commands.c:435 #, c-format msgid "Revert '%s' to '%s'?" -msgstr "Återgå från \"%s\" till \"%s\"?" +msgstr "Återgå från ”%s” till ”%s”?" -#: ../app/actions/file-commands.c:465 +#: ../app/actions/file-commands.c:440 msgid "" "By reverting the image to the state saved on disk, you will lose all " "changes, including all undo information." @@ -2753,795 +4377,741 @@ msgstr "" "Genom att återgå till den sparade versionen kommer du att förlora alla dina " "ändringar, inklusive all ångringsinformation." -#: ../app/actions/file-commands.c:803 +#: ../app/actions/file-commands.c:773 msgid "(Unnamed Template)" msgstr "(Namnlös mall)" -#: ../app/actions/file-commands.c:850 +#: ../app/actions/file-commands.c:820 #, c-format msgid "" "Reverting to '%s' failed:\n" "\n" "%s" msgstr "" -"Återgång till \"%s\" misslyckades:\n" +"Återgång till ”%s” misslyckades:\n" "\n" "%s" -#: ../app/actions/filters-actions.c:55 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "Filte_rs" +#: ../app/actions/filters-actions.c:58 msgctxt "filters-action" msgid "Filte_rs" msgstr "Filte_r" -#: ../app/actions/filters-actions.c:57 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "Recently Used" +#: ../app/actions/filters-actions.c:60 msgctxt "filters-action" msgid "Recently Used" msgstr "Senast använda" -#: ../app/actions/filters-actions.c:59 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "_Blur" +#: ../app/actions/filters-actions.c:62 msgctxt "filters-action" msgid "_Blur" msgstr "_Oskärpa" -#: ../app/actions/filters-actions.c:61 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "_Noise" +#: ../app/actions/filters-actions.c:64 msgctxt "filters-action" msgid "_Noise" msgstr "_Brus" -#: ../app/actions/filters-actions.c:63 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "Edge-De_tect" +#: ../app/actions/filters-actions.c:66 msgctxt "filters-action" msgid "Edge-De_tect" msgstr "_Leta kanter" -#: ../app/actions/filters-actions.c:65 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "En_hance" +#: ../app/actions/filters-actions.c:68 msgctxt "filters-action" msgid "En_hance" msgstr "Fö_rbättra" -#: ../app/actions/filters-actions.c:67 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "C_ombine" +#: ../app/actions/filters-actions.c:70 msgctxt "filters-action" msgid "C_ombine" msgstr "K_ombinera" -#: ../app/actions/filters-actions.c:69 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "_Generic" +#: ../app/actions/filters-actions.c:72 msgctxt "filters-action" msgid "_Generic" msgstr "_Allmänna" -#: ../app/actions/filters-actions.c:71 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "_Light and Shadow" +#: ../app/actions/filters-actions.c:74 msgctxt "filters-action" msgid "_Light and Shadow" msgstr "_Ljus och skugga" -#: ../app/actions/filters-actions.c:73 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "_Distorts" +#: ../app/actions/filters-actions.c:76 msgctxt "filters-action" msgid "_Distorts" -msgstr "För_vräng" +msgstr "För_vrängningar" -#: ../app/actions/filters-actions.c:75 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "_Artistic" +#: ../app/actions/filters-actions.c:78 msgctxt "filters-action" msgid "_Artistic" -msgstr "Ar_tistiska" +msgstr "Ar_tistisk" -#: ../app/actions/filters-actions.c:77 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "_Decor" +#: ../app/actions/filters-actions.c:80 msgctxt "filters-action" msgid "_Decor" msgstr "_Dekor" -#: ../app/actions/filters-actions.c:79 -#, fuzzy -#| msgctxt "image-action" -#| msgid "_Map" +#: ../app/actions/filters-actions.c:82 msgctxt "filters-action" msgid "_Map" msgstr "_Mappa" -#: ../app/actions/filters-actions.c:81 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "_Render" +#: ../app/actions/filters-actions.c:84 msgctxt "filters-action" msgid "_Render" msgstr "_Rendera" -#: ../app/actions/filters-actions.c:83 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "_Clouds" +#: ../app/actions/filters-actions.c:86 msgctxt "filters-action" msgid "_Clouds" msgstr "_Moln" -#: ../app/actions/filters-actions.c:85 -#, fuzzy -#| msgctxt "image-action" -#| msgid "_Scale Image..." +#: ../app/actions/filters-actions.c:88 msgctxt "filters-action" msgid "_Fractals" -msgstr "_Skala bild..." +msgstr "_Fraktaler" -#: ../app/actions/filters-actions.c:87 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "_Nature" +#: ../app/actions/filters-actions.c:90 msgctxt "filters-action" msgid "_Nature" msgstr "_Natur" -#: ../app/actions/filters-actions.c:89 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "_Noise" +#: ../app/actions/filters-actions.c:92 msgctxt "filters-action" msgid "N_oise" msgstr "_Brus" -#: ../app/actions/filters-actions.c:91 -#, fuzzy -#| msgid "_Pattern" +#: ../app/actions/filters-actions.c:94 msgctxt "filters-action" msgid "_Pattern" msgstr "_Mönster" -#: ../app/actions/filters-actions.c:93 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "_Web" +#: ../app/actions/filters-actions.c:96 msgctxt "filters-action" msgid "_Web" msgstr "_Webb" -#: ../app/actions/filters-actions.c:95 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "An_imation" +#: ../app/actions/filters-actions.c:98 msgctxt "filters-action" msgid "An_imation" msgstr "An_imation" -#: ../app/actions/filters-actions.c:101 +#: ../app/actions/filters-actions.c:104 msgctxt "filters-action" -msgid "_Alien Map..." -msgstr "" - -#: ../app/actions/filters-actions.c:106 -#, fuzzy -#| msgid "_Antialiasing" -msgctxt "filters-action" -msgid "_Antialias..." +msgid "_Antialias" msgstr "_Kantutjämning" -#: ../app/actions/filters-actions.c:111 +#: ../app/actions/filters-actions.c:109 +msgctxt "filters-action" +msgid "_Color Enhance" +msgstr "Färg_balans" + +#: ../app/actions/filters-actions.c:114 +msgctxt "filters-action" +msgid "_Linear Invert" +msgstr "_Linjärinvertera" + +#: ../app/actions/filters-actions.c:119 +msgctxt "filters-action" +msgid "In_vert" +msgstr "In_vertera" + +#: ../app/actions/filters-actions.c:124 +msgctxt "filters-action" +msgid "_Value Invert" +msgstr "_Värdesinvertera" + +#: ../app/actions/filters-actions.c:129 +msgctxt "filters-action" +msgid "_Stretch Contrast HSV" +msgstr "_Sträck ut kontrast NMI" + +#: ../app/actions/filters-actions.c:137 +msgctxt "filters-action" +msgid "_Dilate" +msgstr "_Utvidga" + +#: ../app/actions/filters-actions.c:138 +msgctxt "drawable-action" +msgid "Grow lighter areas of the image" +msgstr "Väx ljusare områden i bilden" + +#: ../app/actions/filters-actions.c:153 +msgctxt "filters-action" +msgid "_Erode" +msgstr "_Erodera" + +#: ../app/actions/filters-actions.c:154 +msgctxt "drawable-action" +msgid "Grow darker areas of the image" +msgstr "Väx mörkare områden i bilden" + +#: ../app/actions/filters-actions.c:172 +msgctxt "filters-action" +msgid "_Alien Map..." +msgstr "_Rymdglöd…" + +#: ../app/actions/filters-actions.c:177 msgctxt "filters-action" msgid "_Apply Canvas..." -msgstr "" +msgstr "_Tillämpa duk…" -#: ../app/actions/filters-actions.c:116 -#, fuzzy -#| msgctxt "view-action" -#| msgid "Display _Filters..." +#: ../app/actions/filters-actions.c:182 msgctxt "filters-action" msgid "Apply _Lens..." -msgstr "Visnings_filter..." +msgstr "Tillämpa _lins…" -#: ../app/actions/filters-actions.c:121 +#: ../app/actions/filters-actions.c:187 +msgctxt "filters-action" +msgid "B_rightness-Contrast..." +msgstr "L_jusstyrka-Kontrast…" + +#: ../app/actions/filters-actions.c:192 msgctxt "filters-action" msgid "_Bump Map..." -msgstr "" +msgstr "_Bumpmap…" -#: ../app/actions/filters-actions.c:126 -#, fuzzy -#| msgid "Color _Balance..." +#: ../app/actions/filters-actions.c:197 msgctxt "filters-action" msgid "_Color to Gray..." -msgstr "Färg_balans..." +msgstr "_Färg till grå…" -#: ../app/actions/filters-actions.c:131 +#: ../app/actions/filters-actions.c:202 msgctxt "filters-action" msgid "Ca_rtoon..." -msgstr "" +msgstr "Seri_eteckning…" -#: ../app/actions/filters-actions.c:136 -#, fuzzy -#| msgctxt "channels-action" -#| msgid "_New Channel..." +#: ../app/actions/filters-actions.c:207 msgctxt "filters-action" msgid "_Channel Mixer..." -msgstr "_Ny kanal..." +msgstr "_Kanalmixer…" -#: ../app/actions/filters-actions.c:141 +#: ../app/actions/filters-actions.c:212 msgctxt "filters-action" msgid "_Checkerboard..." -msgstr "" +msgstr "_Schackrutor…" -#: ../app/actions/filters-actions.c:146 -#, fuzzy -#| msgid "Color _Balance..." +#: ../app/actions/filters-actions.c:217 msgctxt "filters-action" -msgid "_Color Enhance..." -msgstr "Färg_balans..." +msgid "Color _Balance..." +msgstr "Färg_balans…" -#: ../app/actions/filters-actions.c:151 -#, fuzzy -#| msgid "Color _Balance..." +#: ../app/actions/filters-actions.c:222 msgctxt "filters-action" msgid "_Color Exchange..." -msgstr "Färg_balans..." +msgstr "Färg_byte…" -#: ../app/actions/filters-actions.c:156 -#, fuzzy -#| msgid "Colori_ze..." +#: ../app/actions/filters-actions.c:227 msgctxt "filters-action" -msgid "Color _Reduction..." -msgstr "Färg_lägg..." +msgid "Colori_ze..." +msgstr "Färg_lägg…" -#: ../app/actions/filters-actions.c:161 -#, fuzzy -#| msgctxt "colormap-action" -#| msgid "_Edit Color..." +#: ../app/actions/filters-actions.c:232 +msgctxt "filters-action" +msgid "Dithe_r..." +msgstr "_Färgutjämna…" + +#: ../app/actions/filters-actions.c:237 msgctxt "filters-action" msgid "_Rotate Colors..." -msgstr "R_edigera färg..." +msgstr "_Rotera färger…" -#: ../app/actions/filters-actions.c:166 -#, fuzzy -#| msgctxt "file-action" -#| msgid "Create Template..." +#: ../app/actions/filters-actions.c:242 msgctxt "filters-action" msgid "Color T_emperature..." -msgstr "Skapa mall..." +msgstr "Färgt_emperatur…" -#: ../app/actions/filters-actions.c:171 -#, fuzzy -#| msgid "Color _Balance..." +#: ../app/actions/filters-actions.c:247 msgctxt "filters-action" msgid "Color to _Alpha..." -msgstr "Färg_balans..." +msgstr "Färg till _alfa…" -#: ../app/actions/filters-actions.c:176 -#, fuzzy -#| msgid "Transformation Matrix" +#: ../app/actions/filters-actions.c:252 +msgctxt "filters-action" +msgid "_Extract Component..." +msgstr "_Extrahera komponent…" + +#: ../app/actions/filters-actions.c:257 msgctxt "filters-action" msgid "_Convolution Matrix..." -msgstr "Transformationsmatris" +msgstr "_Faltningsmatris…" -#: ../app/actions/filters-actions.c:181 +#: ../app/actions/filters-actions.c:262 msgctxt "filters-action" msgid "_Cubism..." -msgstr "" +msgstr "_Kubism…" -#: ../app/actions/filters-actions.c:186 -#, fuzzy -#| msgid "_Desaturate..." +#: ../app/actions/filters-actions.c:267 +msgctxt "filters-action" +msgid "_Curves..." +msgstr "_Kurvor…" + +#: ../app/actions/filters-actions.c:272 msgctxt "filters-action" msgid "_Deinterlace..." -msgstr "A_vmätta..." +msgstr "A_vflätning…" -#: ../app/actions/filters-actions.c:191 -#, fuzzy -#| msgid "_Desaturate..." +#: ../app/actions/filters-actions.c:277 msgctxt "filters-action" msgid "_Desaturate..." -msgstr "A_vmätta..." +msgstr "A_vmätta…" -#: ../app/actions/filters-actions.c:196 +#: ../app/actions/filters-actions.c:282 msgctxt "filters-action" msgid "Difference of Gaussians..." -msgstr "" +msgstr "Gaussisk differens…" -#: ../app/actions/filters-actions.c:201 -#, fuzzy -#| msgctxt "patterns-action" -#| msgid "_Edit Pattern..." +#: ../app/actions/filters-actions.c:287 msgctxt "filters-action" msgid "Diffraction Patterns..." -msgstr "R_edigera mönster..." +msgstr "Diffraktionsmönster…" -#: ../app/actions/filters-actions.c:206 -#, fuzzy -#| msgid "_Desaturate..." +#: ../app/actions/filters-actions.c:292 msgctxt "filters-action" msgid "Displace..." -msgstr "A_vmätta..." +msgstr "Förskjut…" -#: ../app/actions/filters-actions.c:211 -#, fuzzy -#| msgid "Distance:" +#: ../app/actions/filters-actions.c:297 msgctxt "filters-action" msgid "Distance Map..." -msgstr "Avstånd:" +msgstr "Avståndskarta…" -#: ../app/actions/filters-actions.c:216 -#, fuzzy -#| msgctxt "select-action" -#| msgid "_Grow..." +#: ../app/actions/filters-actions.c:302 msgctxt "filters-action" msgid "_Drop Shadow..." -msgstr "Först_ora..." +msgstr "_Skuggkastning…" -#: ../app/actions/filters-actions.c:221 -#, fuzzy -#| msgid "_Fade..." +#: ../app/actions/filters-actions.c:307 msgctxt "filters-action" msgid "_Edge..." -msgstr "_Tona..." +msgstr "_Kant…" -#: ../app/actions/filters-actions.c:226 -#, fuzzy -#| msgid "_Replace" +#: ../app/actions/filters-actions.c:312 msgctxt "filters-action" msgid "_Laplace" -msgstr "_Ersätt" +msgstr "_Laplace" -#: ../app/actions/filters-actions.c:231 +#: ../app/actions/filters-actions.c:317 +msgctxt "filters-action" +msgid "_Neon..." +msgstr "_Neon…" + +#: ../app/actions/filters-actions.c:322 msgctxt "filters-action" msgid "_Sobel..." -msgstr "" +msgstr "_Sobel…" -#: ../app/actions/filters-actions.c:236 +#: ../app/actions/filters-actions.c:327 msgctxt "filters-action" msgid "_Emboss..." -msgstr "" +msgstr "_Ciselera…" -#: ../app/actions/filters-actions.c:241 -#, fuzzy -#| msgid "_Fade..." +#: ../app/actions/filters-actions.c:332 msgctxt "filters-action" msgid "En_grave..." -msgstr "_Tona..." +msgstr "_Gravera…" -#: ../app/actions/filters-actions.c:246 -#, fuzzy -#| msgid "Exposure" +#: ../app/actions/filters-actions.c:337 msgctxt "filters-action" msgid "E_xposure..." -msgstr "Exponering" +msgstr "E_xponering…" -#: ../app/actions/filters-actions.c:251 -#, fuzzy -#| msgctxt "image-action" -#| msgid "_Scale Image..." +#: ../app/actions/filters-actions.c:342 +msgctxt "filters-action" +msgid "_Fattal et al. 2002..." +msgstr "_Fattal et al. 2002…" + +#: ../app/actions/filters-actions.c:347 msgctxt "filters-action" msgid "_Fractal Trace..." -msgstr "_Skala bild..." +msgstr "_Fraktalspår…" -#: ../app/actions/filters-actions.c:256 +#: ../app/actions/filters-actions.c:352 msgctxt "filters-action" msgid "_Gaussian Blur..." -msgstr "" +msgstr "_Gaussisk oskärpa…" -#: ../app/actions/filters-actions.c:261 +#: ../app/actions/filters-actions.c:357 msgctxt "filters-action" msgid "_Selective Gaussian Blur..." -msgstr "" +msgstr "_Selektiv gaussisk oskärpa…" -#: ../app/actions/filters-actions.c:266 -#, fuzzy -#| msgid "_GEGL Operation..." +#: ../app/actions/filters-actions.c:362 msgctxt "filters-action" msgid "_GEGL graph..." -msgstr "_GEGL-operation..." +msgstr "_GEGL-graf…" -#: ../app/actions/filters-actions.c:271 -#, fuzzy -#| msgid "Grid" +#: ../app/actions/filters-actions.c:367 msgctxt "filters-action" msgid "_Grid..." -msgstr "Rutnät" +msgstr "_Rutnät…" -#: ../app/actions/filters-actions.c:276 +#: ../app/actions/filters-actions.c:372 msgctxt "filters-action" msgid "_High Pass..." -msgstr "" +msgstr "_Högpass…" -#: ../app/actions/filters-actions.c:281 +#: ../app/actions/filters-actions.c:377 +msgctxt "filters-action" +msgid "Hue-_Chroma..." +msgstr "Nyans-_Krominans…" + +#: ../app/actions/filters-actions.c:382 +msgctxt "filters-action" +msgid "Hue-_Saturation..." +msgstr "Nyans-_Mättnad…" + +#: ../app/actions/filters-actions.c:387 msgctxt "filters-action" msgid "_Illusion..." -msgstr "" +msgstr "_Illusion…" -#: ../app/actions/filters-actions.c:286 +#: ../app/actions/filters-actions.c:392 +msgctxt "filters-action" +msgid "_Image Gradient..." +msgstr "_Bildgradient…" + +#: ../app/actions/filters-actions.c:397 msgctxt "filters-action" msgid "_Kaleidoscope..." -msgstr "" +msgstr "_Kalejdoskop…" -#: ../app/actions/filters-actions.c:291 -#, fuzzy -#| msgctxt "file-action" -#| msgid "Open _Location..." +#: ../app/actions/filters-actions.c:402 msgctxt "filters-action" msgid "Lens Distortion..." -msgstr "Öppna pla_ts..." +msgstr "Linsförvrängning…" -#: ../app/actions/filters-actions.c:296 +#: ../app/actions/filters-actions.c:407 msgctxt "filters-action" msgid "Lens Flare..." -msgstr "" +msgstr "Linsöverstrålning…" -#: ../app/actions/filters-actions.c:301 -#, fuzzy -#| msgid "_Fade..." +#: ../app/actions/filters-actions.c:412 +msgctxt "filters-action" +msgid "_Levels..." +msgstr "_Nivåer…" + +#: ../app/actions/filters-actions.c:417 +msgctxt "filters-action" +msgid "_Mantiuk 2006..." +msgstr "_Mantiuk 2006…" + +#: ../app/actions/filters-actions.c:422 msgctxt "filters-action" msgid "_Maze..." -msgstr "_Tona..." +msgstr "_Labyrint…" -#: ../app/actions/filters-actions.c:306 -#, fuzzy -#| msgctxt "channels-action" -#| msgid "_New Channel..." +#: ../app/actions/filters-actions.c:427 +msgctxt "filters-action" +msgid "_Median Blur..." +msgstr "_Medianoskärpa…" + +#: ../app/actions/filters-actions.c:432 msgctxt "filters-action" msgid "_Mono Mixer..." -msgstr "_Ny kanal..." +msgstr "_Monomixer…" -#: ../app/actions/filters-actions.c:311 +#: ../app/actions/filters-actions.c:437 msgctxt "filters-action" msgid "_Mosaic..." -msgstr "" +msgstr "_Mosaik…" -#: ../app/actions/filters-actions.c:316 -#, fuzzy -#| msgctxt "tools-action" -#| msgid "_Arbitrary Rotation..." +#: ../app/actions/filters-actions.c:442 msgctxt "filters-action" msgid "_Circular Motion Blur..." -msgstr "_Godtycklig rotering..." +msgstr "_Cirkulär rörelseoskärpa…" -#: ../app/actions/filters-actions.c:321 +#: ../app/actions/filters-actions.c:447 msgctxt "filters-action" msgid "_Linear Motion Blur..." -msgstr "" +msgstr "_Linjär rörelseoskärpa…" -#: ../app/actions/filters-actions.c:326 +#: ../app/actions/filters-actions.c:452 msgctxt "filters-action" msgid "_Zoom Motion Blur..." -msgstr "" +msgstr "_Zoomrörelseoskärpa…" -#: ../app/actions/filters-actions.c:331 -#, fuzzy -#| msgid "Colori_ze..." +#: ../app/actions/filters-actions.c:457 msgctxt "filters-action" msgid "_Cell Noise..." -msgstr "Färg_lägg..." +msgstr "_Cellbrus…" -#: ../app/actions/filters-actions.c:336 +#: ../app/actions/filters-actions.c:462 msgctxt "filters-action" msgid "CIE lch Noise..." -msgstr "" +msgstr "CIE lch-brus…" -#: ../app/actions/filters-actions.c:341 +#: ../app/actions/filters-actions.c:467 msgctxt "filters-action" msgid "HSV Noise..." -msgstr "" +msgstr "NMI-brus…" -#: ../app/actions/filters-actions.c:346 +#: ../app/actions/filters-actions.c:472 msgctxt "filters-action" msgid "_Hurl..." -msgstr "" +msgstr "_Kast…" -#: ../app/actions/filters-actions.c:351 -#, fuzzy -#| msgctxt "image-action" -#| msgid "_Print Size..." +#: ../app/actions/filters-actions.c:477 msgctxt "filters-action" msgid "_Perlin Noise..." -msgstr "_Utskriftsstorlek..." +msgstr "_Perlin-brus…" -#: ../app/actions/filters-actions.c:356 -#, fuzzy -#| msgctxt "select-action" -#| msgid "S_hrink..." +#: ../app/actions/filters-actions.c:482 msgctxt "filters-action" msgid "_Pick..." -msgstr "För_minska..." +msgstr "_Välj…" -#: ../app/actions/filters-actions.c:361 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "_Noise" +#: ../app/actions/filters-actions.c:487 msgctxt "filters-action" msgid "_RGB Noise..." -msgstr "_Brus" +msgstr "_RGB-brus…" -#: ../app/actions/filters-actions.c:366 -#, fuzzy -#| msgid "No selection" +#: ../app/actions/filters-actions.c:492 msgctxt "filters-action" msgid "Noise R_eduction..." -msgstr "Ingen markering" +msgstr "Brusr_educering…" -#: ../app/actions/filters-actions.c:371 -#, fuzzy -#| msgctxt "dialogs-action" -#| msgid "_Sample Points" +#: ../app/actions/filters-actions.c:497 msgctxt "filters-action" msgid "_Simplex Noise..." -msgstr "_Sampelpunkter" +msgstr "_Simplex-brus…" -#: ../app/actions/filters-actions.c:376 -#, fuzzy -#| msgctxt "layers-action" -#| msgid "_Scale Layer..." +#: ../app/actions/filters-actions.c:502 msgctxt "filters-action" msgid "_Slur..." -msgstr "S_kala lager..." +msgstr "_Slamma…" -#: ../app/actions/filters-actions.c:381 +#: ../app/actions/filters-actions.c:507 msgctxt "filters-action" msgid "_Solid Noise..." -msgstr "" +msgstr "_Enfärgat brus…" -#: ../app/actions/filters-actions.c:386 -#, fuzzy -#| msgid "_Threshold..." +#: ../app/actions/filters-actions.c:512 msgctxt "filters-action" msgid "Sp_read..." -msgstr "_Tröskelvärde..." +msgstr "Sp_rida…" -#: ../app/actions/filters-actions.c:391 +#: ../app/actions/filters-actions.c:517 msgctxt "filters-action" msgid "Oili_fy..." -msgstr "" +msgstr "_Oljifiera…" -#: ../app/actions/filters-actions.c:396 +#: ../app/actions/filters-actions.c:522 msgctxt "filters-action" msgid "_Panorama Projection..." -msgstr "" +msgstr "_Panoramaprojektion…" -#: ../app/actions/filters-actions.c:401 +#: ../app/actions/filters-actions.c:527 msgctxt "filters-action" msgid "_Photocopy..." -msgstr "" +msgstr "_Fotokopia…" -#: ../app/actions/filters-actions.c:406 -#, fuzzy -#| msgid "_Posterize..." +#: ../app/actions/filters-actions.c:532 msgctxt "filters-action" msgid "_Pixelize..." -msgstr "_Posterisering..." +msgstr "_Pixelera…" -#: ../app/actions/filters-actions.c:411 +#: ../app/actions/filters-actions.c:537 msgctxt "filters-action" msgid "_Plasma..." -msgstr "" +msgstr "_Plasma…" -#: ../app/actions/filters-actions.c:416 +#: ../app/actions/filters-actions.c:542 msgctxt "filters-action" msgid "P_olar Coordinates..." -msgstr "" +msgstr "P_olära koordinater…" -#: ../app/actions/filters-actions.c:421 -#, fuzzy -#| msgid "_Posterize..." +#: ../app/actions/filters-actions.c:547 msgctxt "filters-action" msgid "_Posterize..." -msgstr "_Posterisering..." +msgstr "_Färgreduktion…" -#: ../app/actions/filters-actions.c:426 +#: ../app/actions/filters-actions.c:552 msgctxt "filters-action" msgid "_Red Eye Removal..." -msgstr "" +msgstr "Borttagning av _röda ögon…" -#: ../app/actions/filters-actions.c:431 +#: ../app/actions/filters-actions.c:557 +msgctxt "filters-action" +msgid "_Reinhard 2005..." +msgstr "_Reinhard 2005…" + +#: ../app/actions/filters-actions.c:562 +msgctxt "filters-action" +msgid "RGB _Clip..." +msgstr "RGB-_klipp…" + +#: ../app/actions/filters-actions.c:567 msgctxt "filters-action" msgid "_Ripple..." -msgstr "" +msgstr "_Krusa…" -#: ../app/actions/filters-actions.c:436 -#, fuzzy -#| msgctxt "layer-mode-effects" -#| msgid "Saturation" +#: ../app/actions/filters-actions.c:572 msgctxt "filters-action" msgid "Sat_uration..." -msgstr "Mättnad" +msgstr "_Mättnad…" -#: ../app/actions/filters-actions.c:441 -#, fuzzy -#| msgctxt "patterns-action" -#| msgid "_Edit Pattern..." +#: ../app/actions/filters-actions.c:577 msgctxt "filters-action" msgid "_Semi-Flatten..." -msgstr "R_edigera mönster..." +msgstr "_Halvutplattning…" -#: ../app/actions/filters-actions.c:446 +#: ../app/actions/filters-actions.c:582 msgctxt "filters-action" msgid "_Sepia..." -msgstr "" +msgstr "_Sepia…" -#: ../app/actions/filters-actions.c:451 -#, fuzzy -#| msgctxt "drawable-action" -#| msgid "_Offset..." +#: ../app/actions/filters-actions.c:587 +msgctxt "filters-action" +msgid "S_hadows-Highlights..." +msgstr "Skuggor-_högdagrar…" + +#: ../app/actions/filters-actions.c:592 msgctxt "filters-action" msgid "_Shift..." -msgstr "_Position..." +msgstr "_Skifta…" -#: ../app/actions/filters-actions.c:456 -#, fuzzy -#| msgid "_Curves..." +#: ../app/actions/filters-actions.c:597 msgctxt "filters-action" msgid "_Sinus..." -msgstr "_Kurvor..." +msgstr "_Sinus…" -#: ../app/actions/filters-actions.c:461 +#: ../app/actions/filters-actions.c:602 +msgctxt "filters-action" +msgid "_Simple Linear Iterative Clustering..." +msgstr "_Enkel linjär iterativ klustring…" + +#: ../app/actions/filters-actions.c:607 +msgctxt "filters-action" +msgid "_Symmetric Nearest Neighbor..." +msgstr "_Symmetriskt närmaste grannar…" + +#: ../app/actions/filters-actions.c:612 msgctxt "filters-action" msgid "_Softglow..." -msgstr "" +msgstr "_Mjuk glöd…" -#: ../app/actions/filters-actions.c:466 -#, fuzzy -#| msgid "B_rightness-Contrast..." +#: ../app/actions/filters-actions.c:617 +msgctxt "filters-action" +msgid "S_piral..." +msgstr "S_piral…" + +#: ../app/actions/filters-actions.c:622 msgctxt "filters-action" msgid "_Stretch Contrast..." -msgstr "L_jusstyrka-Kontrast..." +msgstr "_Sträck ut kontrast…" -#: ../app/actions/filters-actions.c:471 +#: ../app/actions/filters-actions.c:627 msgctxt "filters-action" -msgid "_Stretch Contrast HSV..." -msgstr "" +msgid "_Stress..." +msgstr "_Belasta…" -#: ../app/actions/filters-actions.c:476 +#: ../app/actions/filters-actions.c:632 msgctxt "filters-action" msgid "Super_nova..." -msgstr "" +msgstr "Super_nova…" -#: ../app/actions/filters-actions.c:481 -#, fuzzy -#| msgid "_Threshold..." +#: ../app/actions/filters-actions.c:637 +msgctxt "filters-action" +msgid "_Threshold..." +msgstr "_Tröskelvärde…" + +#: ../app/actions/filters-actions.c:642 msgctxt "filters-action" msgid "_Threshold Alpha..." -msgstr "_Tröskelvärde..." +msgstr "_Tröskelvärde alfa…" -#: ../app/actions/filters-actions.c:486 -#, fuzzy -#| msgctxt "image-action" -#| msgid "Can_vas Size..." +#: ../app/actions/filters-actions.c:647 msgctxt "filters-action" msgid "_Glass Tile..." -msgstr "Storlek på r_ityta..." +msgstr "_Glasplatta…" -#: ../app/actions/filters-actions.c:491 -#, fuzzy -#| msgctxt "image-action" -#| msgid "Can_vas Size..." +#: ../app/actions/filters-actions.c:652 msgctxt "filters-action" msgid "_Paper Tile..." -msgstr "Storlek på r_ityta..." +msgstr "_Pappersplatta…" -#: ../app/actions/filters-actions.c:496 +#: ../app/actions/filters-actions.c:657 msgctxt "filters-action" msgid "_Tile Seamless..." -msgstr "" +msgstr "Pla_ttlägg sömlöst…" -#: ../app/actions/filters-actions.c:501 +#: ../app/actions/filters-actions.c:662 msgctxt "filters-action" msgid "_Unsharp Mask..." -msgstr "" +msgstr "_Oskarp mask…" -#: ../app/actions/filters-actions.c:506 -#, fuzzy -#| msgctxt "image-action" -#| msgid "_Scale Image..." +#: ../app/actions/filters-actions.c:667 msgctxt "filters-action" msgid "_Value Propagate..." -msgstr "_Skala bild..." +msgstr "_Värdepropagering…" -#: ../app/actions/filters-actions.c:511 -#, fuzzy -#| msgid "_GEGL Operation..." +#: ../app/actions/filters-actions.c:672 msgctxt "filters-action" msgid "Vi_deo Degradation..." -msgstr "_GEGL-operation..." +msgstr "_Videoförsämring…" -#: ../app/actions/filters-actions.c:516 -#, fuzzy -#| msgctxt "palettes-action" -#| msgid "_Edit Palette..." +#: ../app/actions/filters-actions.c:677 msgctxt "filters-action" msgid "_Vignette..." -msgstr "R_edigera palett..." +msgstr "_Vinjett…" -#: ../app/actions/filters-actions.c:521 -#, fuzzy -#| msgid "_Curves..." +#: ../app/actions/filters-actions.c:682 +msgctxt "filters-action" +msgid "_Waterpixels..." +msgstr "_Vattenbildpunkter…" + +#: ../app/actions/filters-actions.c:687 msgctxt "filters-action" msgid "_Waves..." -msgstr "_Kurvor..." +msgstr "_Vågor…" -#: ../app/actions/filters-actions.c:526 +#: ../app/actions/filters-actions.c:692 msgctxt "filters-action" msgid "W_hirl and Pinch..." -msgstr "" +msgstr "_Virvel och knipning…" -#: ../app/actions/filters-actions.c:531 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "_Indexed..." +#: ../app/actions/filters-actions.c:697 msgctxt "filters-action" msgid "W_ind..." -msgstr "_Indexerad..." +msgstr "_Vind…" -#: ../app/actions/filters-actions.c:539 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "Re_peat Last" +#: ../app/actions/filters-actions.c:705 msgctxt "filters-action" msgid "Re_peat Last" msgstr "Upp_repa senaste" -#: ../app/actions/filters-actions.c:541 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "Rerun the last used plug-in using the same settings" +#: ../app/actions/filters-actions.c:707 msgctxt "filters-action" msgid "Rerun the last used filter using the same settings" -msgstr "Kör senast använda insticksmodul igen med samma inställningar" +msgstr "Kör senast använda filter igen med samma inställningar" -#: ../app/actions/filters-actions.c:546 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "R_e-Show Last" +#: ../app/actions/filters-actions.c:712 msgctxt "filters-action" msgid "R_e-Show Last" msgstr "Visa s_enaste igen" -#: ../app/actions/filters-actions.c:547 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "Show the last used plug-in dialog again" +#: ../app/actions/filters-actions.c:713 msgctxt "filters-action" msgid "Show the last used filter dialog again" -msgstr "Visa dialogrutan för senast använda insticksmodul igen" +msgstr "Visa dialogrutan för senast använda filter igen" -#: ../app/actions/filters-actions.c:820 +#: ../app/actions/filters-actions.c:1037 #, c-format msgid "Re_peat \"%s\"" -msgstr "U_pprepa \"%s\"" +msgstr "U_pprepa ”%s”" -#: ../app/actions/filters-actions.c:821 +#: ../app/actions/filters-actions.c:1038 #, c-format msgid "R_e-Show \"%s\"" -msgstr "V_isa \"%s\" igen" +msgstr "V_isa ”%s” igen" -#: ../app/actions/filters-actions.c:859 +#: ../app/actions/filters-actions.c:1076 msgid "Repeat Last" msgstr "Upprepa senaste" -#: ../app/actions/filters-actions.c:861 +#: ../app/actions/filters-actions.c:1078 msgid "Re-Show Last" msgstr "Visa senaste igen" @@ -3560,10 +5130,11 @@ msgctxt "fonts-action" msgid "Rescan the installed fonts" msgstr "Sök igenom installerade typsnitt igen" -#: ../app/actions/gimpgeglprocedure.c:300 +#: ../app/actions/gimpgeglprocedure.c:323 #, c-format msgid "There are no last settings for '%s', showing the filter dialog instead." msgstr "" +"Det finns inga senaste inställningar för ”%s”, visar filterdialogen istället." #: ../app/actions/gradient-editor-actions.c:46 msgctxt "gradient-editor-action" @@ -3603,12 +5174,12 @@ msgstr "_Spara högerfärg till" #: ../app/actions/gradient-editor-actions.c:67 msgctxt "gradient-editor-action" msgid "L_eft Endpoint's Color..." -msgstr "_Vänstra ändpunktens färg..." +msgstr "_Vänstra ändpunktens färg…" #: ../app/actions/gradient-editor-actions.c:72 msgctxt "gradient-editor-action" msgid "R_ight Endpoint's Color..." -msgstr "_Högra ändpunktens färg..." +msgstr "_Högra ändpunktens färg…" #: ../app/actions/gradient-editor-actions.c:112 msgctxt "gradient-editor-action" @@ -3764,75 +5335,75 @@ msgstr "Zooma allt" msgid "Zoom all" msgstr "Zooma allt" -#: ../app/actions/gradient-editor-actions.c:777 +#: ../app/actions/gradient-editor-actions.c:779 msgid "_Blending Function for Segment" msgstr "_Toningsfunktion för segment" -#: ../app/actions/gradient-editor-actions.c:779 +#: ../app/actions/gradient-editor-actions.c:781 msgid "Coloring _Type for Segment" msgstr "Färgnings_typ för segment" -#: ../app/actions/gradient-editor-actions.c:782 +#: ../app/actions/gradient-editor-actions.c:784 msgid "_Flip Segment" msgstr "_Vänd på segment" -#: ../app/actions/gradient-editor-actions.c:784 -msgid "_Replicate Segment..." -msgstr "_Replikera segment..." - #: ../app/actions/gradient-editor-actions.c:786 +msgid "_Replicate Segment..." +msgstr "_Replikera segment…" + +#: ../app/actions/gradient-editor-actions.c:788 msgid "Split Segment at _Midpoint" msgstr "_Dela segment vid mittpunkt" -#: ../app/actions/gradient-editor-actions.c:788 -msgid "Split Segment _Uniformly..." -msgstr "Dela segment _likformigt..." - #: ../app/actions/gradient-editor-actions.c:790 +msgid "Split Segment _Uniformly..." +msgstr "Dela segment _likformigt…" + +#: ../app/actions/gradient-editor-actions.c:792 msgid "_Delete Segment" msgstr "_Ta bort segment" -#: ../app/actions/gradient-editor-actions.c:792 +#: ../app/actions/gradient-editor-actions.c:794 msgid "Re-_center Segment's Midpoint" msgstr "_Centrera segmentets mittpunkt" -#: ../app/actions/gradient-editor-actions.c:794 +#: ../app/actions/gradient-editor-actions.c:796 msgid "Re-distribute _Handles in Segment" msgstr "_Återfördela handtagen i segment" -#: ../app/actions/gradient-editor-actions.c:799 +#: ../app/actions/gradient-editor-actions.c:801 msgid "_Blending Function for Selection" msgstr "_Toningsfunktion för markering" -#: ../app/actions/gradient-editor-actions.c:801 +#: ../app/actions/gradient-editor-actions.c:803 msgid "Coloring _Type for Selection" msgstr "Färgnings_typ för markering" -#: ../app/actions/gradient-editor-actions.c:804 +#: ../app/actions/gradient-editor-actions.c:806 msgid "_Flip Selection" msgstr "_Vänd markering" -#: ../app/actions/gradient-editor-actions.c:806 -msgid "_Replicate Selection..." -msgstr "_Replikera markering..." - #: ../app/actions/gradient-editor-actions.c:808 +msgid "_Replicate Selection..." +msgstr "_Replikera markering…" + +#: ../app/actions/gradient-editor-actions.c:810 msgid "Split Segments at _Midpoints" msgstr "_Dela segment vid mittpunkter" -#: ../app/actions/gradient-editor-actions.c:810 -msgid "Split Segments _Uniformly..." -msgstr "Dela segmenten _likformigt..." - #: ../app/actions/gradient-editor-actions.c:812 +msgid "Split Segments _Uniformly..." +msgstr "Dela segmenten _likformigt…" + +#: ../app/actions/gradient-editor-actions.c:814 msgid "_Delete Selection" msgstr "_Ta bort markering" -#: ../app/actions/gradient-editor-actions.c:814 +#: ../app/actions/gradient-editor-actions.c:816 msgid "Re-_center Midpoints in Selection" msgstr "_Centrera mittpunkter i markering" -#: ../app/actions/gradient-editor-actions.c:816 +#: ../app/actions/gradient-editor-actions.c:818 msgid "Re-distribute _Handles in Selection" msgstr "_Återfördela handtagen i markering" @@ -3844,35 +5415,35 @@ msgstr "Vänstra ändpunktens färg" msgid "Gradient Segment's Left Endpoint Color" msgstr "Gradientsegmentets vänstra ändpunktsfärg" -#: ../app/actions/gradient-editor-commands.c:239 +#: ../app/actions/gradient-editor-commands.c:237 msgid "Right Endpoint Color" msgstr "Högra ändpunktens färg" -#: ../app/actions/gradient-editor-commands.c:241 +#: ../app/actions/gradient-editor-commands.c:239 msgid "Gradient Segment's Right Endpoint Color" msgstr "Gradientsegmentets högra ändpunktsfärg" -#: ../app/actions/gradient-editor-commands.c:464 +#: ../app/actions/gradient-editor-commands.c:460 msgid "Replicate Segment" msgstr "Replikera segment" -#: ../app/actions/gradient-editor-commands.c:465 +#: ../app/actions/gradient-editor-commands.c:461 msgid "Replicate Gradient Segment" msgstr "Replikera gradientsegment" -#: ../app/actions/gradient-editor-commands.c:469 +#: ../app/actions/gradient-editor-commands.c:465 msgid "Replicate Selection" msgstr "Replikera markering" -#: ../app/actions/gradient-editor-commands.c:470 +#: ../app/actions/gradient-editor-commands.c:466 msgid "Replicate Gradient Selection" msgstr "Replikera markering av gradient" -#: ../app/actions/gradient-editor-commands.c:483 -msgid "Replicate" -msgstr "Replikera" +#: ../app/actions/gradient-editor-commands.c:479 +msgid "_Replicate" +msgstr "_Replikera" -#: ../app/actions/gradient-editor-commands.c:504 +#: ../app/actions/gradient-editor-commands.c:500 msgid "" "Select the number of times\n" "to replicate the selected segment." @@ -3880,7 +5451,7 @@ msgstr "" "Välj antalet gånger det\n" "markerade segmentet ska replikeras." -#: ../app/actions/gradient-editor-commands.c:507 +#: ../app/actions/gradient-editor-commands.c:503 msgid "" "Select the number of times\n" "to replicate the selection." @@ -3888,27 +5459,27 @@ msgstr "" "Välj antalet gånger som\n" "markeringen ska replikeras." -#: ../app/actions/gradient-editor-commands.c:566 +#: ../app/actions/gradient-editor-commands.c:563 msgid "Split Segment Uniformly" msgstr "Dela segment likformigt" -#: ../app/actions/gradient-editor-commands.c:567 +#: ../app/actions/gradient-editor-commands.c:564 msgid "Split Gradient Segment Uniformly" -msgstr "Dela gradientsegmentet likformigt" +msgstr "Dela gradientsegment likformigt" -#: ../app/actions/gradient-editor-commands.c:571 +#: ../app/actions/gradient-editor-commands.c:568 msgid "Split Segments Uniformly" -msgstr "Dela segmenten likformigt" +msgstr "Dela segment likformigt" -#: ../app/actions/gradient-editor-commands.c:572 +#: ../app/actions/gradient-editor-commands.c:569 msgid "Split Gradient Segments Uniformly" -msgstr "Dela gradientsegmenten likformigt" +msgstr "Dela gradientsegment likformigt" -#: ../app/actions/gradient-editor-commands.c:585 -msgid "Split" -msgstr "Dela" +#: ../app/actions/gradient-editor-commands.c:582 +msgid "_Split" +msgstr "D_ela" -#: ../app/actions/gradient-editor-commands.c:607 +#: ../app/actions/gradient-editor-commands.c:604 msgid "" "Select the number of uniform parts\n" "in which to split the selected segment." @@ -3916,7 +5487,7 @@ msgstr "" "Välj antalet likformiga delar som du\n" "vill dela det markerade segmentet i." -#: ../app/actions/gradient-editor-commands.c:610 +#: ../app/actions/gradient-editor-commands.c:607 msgid "" "Select the number of uniform parts\n" "in which to split the segments in the selection." @@ -3960,24 +5531,19 @@ msgid "Copy gradient file location to clipboard" msgstr "Kopiera gradientfilens plats till urklipp" #: ../app/actions/gradients-actions.c:66 -#, fuzzy -#| msgid "Module Manager" msgctxt "gradients-action" msgid "Show in _File Manager" -msgstr "Modulhanterare" +msgstr "Visa i _filhanterare" #: ../app/actions/gradients-actions.c:67 -#, fuzzy -#| msgctxt "gradients-action" -#| msgid "Copy gradient file location to clipboard" msgctxt "gradients-action" msgid "Show gradient file location in the file manager" -msgstr "Kopiera gradientfilens plats till urklipp" +msgstr "Visa gradientfilens plats i filhanteraren" #: ../app/actions/gradients-actions.c:72 msgctxt "gradients-action" msgid "Save as _POV-Ray..." -msgstr "Spara som _POV-Ray..." +msgstr "Spara som _POV-Ray…" #: ../app/actions/gradients-actions.c:73 msgctxt "gradients-action" @@ -4007,20 +5573,17 @@ msgstr "Uppdatera gradienter" #: ../app/actions/gradients-actions.c:93 msgctxt "gradients-action" msgid "_Edit Gradient..." -msgstr "R_edigera gradient..." +msgstr "R_edigera gradient…" #: ../app/actions/gradients-actions.c:94 -#, fuzzy -#| msgctxt "gradients-action" -#| msgid "Edit gradient" msgctxt "gradients-action" msgid "Edit this gradient" -msgstr "Redigera gradient" +msgstr "Redigera denna gradient" -#: ../app/actions/gradients-commands.c:66 +#: ../app/actions/gradients-commands.c:72 #, c-format msgid "Save '%s' as POV-Ray" -msgstr "Spara \"%s\" som POV-Ray" +msgstr "Spara ”%s” som POV-Ray" #: ../app/actions/help-actions.c:38 ../app/actions/help-actions.c:41 msgctxt "help-action" @@ -4058,553 +5621,516 @@ msgid "_Mode" msgstr "_Läge" #: ../app/actions/image-actions.c:60 -#, fuzzy -#| msgid "_Previous Tip" msgctxt "image-action" msgid "Pr_ecision" -msgstr "_Föregående tips" +msgstr "Pr_ecision" #: ../app/actions/image-actions.c:62 -#, fuzzy -#| msgid "Color Management" msgctxt "image-action" msgid "Color Ma_nagement" -msgstr "Färghantering" +msgstr "Färgha_ntering" #: ../app/actions/image-actions.c:63 msgctxt "image-action" msgid "_Transform" -msgstr "_Transformera" +msgstr "_Transform" #: ../app/actions/image-actions.c:64 msgctxt "image-action" msgid "_Guides" msgstr "_Hjälplinjer" -#: ../app/actions/image-actions.c:66 +#: ../app/actions/image-actions.c:65 +msgctxt "image-action" +msgid "Meta_data" +msgstr "Meta_data" + +#: ../app/actions/image-actions.c:67 msgctxt "image-action" msgid "_Colors" msgstr "_Färger" -#: ../app/actions/image-actions.c:67 +#: ../app/actions/image-actions.c:68 msgctxt "image-action" msgid "I_nfo" msgstr "I_nfo" -#: ../app/actions/image-actions.c:68 +#: ../app/actions/image-actions.c:69 msgctxt "image-action" msgid "_Auto" msgstr "_Auto" -#: ../app/actions/image-actions.c:69 +#: ../app/actions/image-actions.c:70 msgctxt "image-action" msgid "_Map" msgstr "_Mappa" -#: ../app/actions/image-actions.c:70 +#: ../app/actions/image-actions.c:71 +msgctxt "image-action" +msgid "_Tone Mapping" +msgstr "_Tonmappning" + +#: ../app/actions/image-actions.c:72 msgctxt "image-action" msgid "C_omponents" msgstr "K_omponenter" -#: ../app/actions/image-actions.c:71 -#, fuzzy -#| msgid "Desaturate" +#: ../app/actions/image-actions.c:73 msgctxt "image-action" msgid "D_esaturate" -msgstr "Avfärga" +msgstr "_Avmätta" -#: ../app/actions/image-actions.c:74 +#: ../app/actions/image-actions.c:76 msgctxt "image-action" msgid "_New..." -msgstr "_Ny..." +msgstr "_Ny…" -#: ../app/actions/image-actions.c:75 +#: ../app/actions/image-actions.c:77 msgctxt "image-action" msgid "Create a new image" msgstr "Skapa en ny bild" -#: ../app/actions/image-actions.c:80 +#: ../app/actions/image-actions.c:82 msgctxt "image-action" msgid "_Duplicate" msgstr "_Duplicera" -#: ../app/actions/image-actions.c:81 +#: ../app/actions/image-actions.c:83 msgctxt "image-action" msgid "Create a duplicate of this image" msgstr "Skapa en dubblett av denna bild" -#: ../app/actions/image-actions.c:86 -#, fuzzy -#| msgid "Color Profile" +#: ../app/actions/image-actions.c:88 msgctxt "image-action" msgid "_Assign Color Profile..." -msgstr "Färgprofil" +msgstr "_Tilldela färgprofil…" -#: ../app/actions/image-actions.c:87 -#, fuzzy -#| msgid "Can't apply color profile to grayscale image (%s)" +#: ../app/actions/image-actions.c:89 msgctxt "image-action" msgid "Set a color profile on the image" -msgstr "Kan inte använda färgprofil på gråskalebild (%s)" +msgstr "Ställ in en färgprofil för bilden" -#: ../app/actions/image-actions.c:92 -#, fuzzy -#| msgid "Select Monitor Color Profile" +#: ../app/actions/image-actions.c:94 msgctxt "image-action" msgid "_Convert to Color Profile..." -msgstr "Välj färgprofil för skärm" +msgstr "_Konvertera till färgprofil…" -#: ../app/actions/image-actions.c:93 -#, fuzzy -#| msgid "Can't apply color profile to grayscale image (%s)" +#: ../app/actions/image-actions.c:95 msgctxt "image-action" msgid "Apply a color profile to the image" -msgstr "Kan inte använda färgprofil på gråskalebild (%s)" +msgstr "Tillämpa en färgprofil för bilden" -#: ../app/actions/image-actions.c:98 -#, fuzzy -#| msgid "Color Profile" +#: ../app/actions/image-actions.c:100 msgctxt "image-action" msgid "_Discard Color Profile" -msgstr "Färgprofil" +msgstr "_Förkasta färgprofil" -#: ../app/actions/image-actions.c:99 -#, fuzzy -#| msgctxt "view-action" -#| msgid "Display the image's color sample points" +#: ../app/actions/image-actions.c:101 msgctxt "image-action" msgid "Remove the image's color profile" -msgstr "Visa bildens färgsampelpunkter" +msgstr "Ta bort bildens färgprofil" -#: ../app/actions/image-actions.c:104 -#, fuzzy -#| msgctxt "error-console-action" -#| msgid "_Save Error Log to File..." +#: ../app/actions/image-actions.c:106 msgctxt "image-action" msgid "_Save Color Profile to File..." -msgstr "_Spara fellogg till fil..." +msgstr "_Spara färgprofil till fil…" -#: ../app/actions/image-actions.c:105 -#, fuzzy -#| msgctxt "view-action" -#| msgid "Display the image's color sample points" +#: ../app/actions/image-actions.c:107 msgctxt "image-action" msgid "Save the image's color profile to an ICC file" -msgstr "Visa bildens färgsampelpunkter" +msgstr "Visa bildens färgprofil till en ICC-fil" -#: ../app/actions/image-actions.c:110 +#: ../app/actions/image-actions.c:112 msgctxt "image-action" msgid "Can_vas Size..." -msgstr "Storlek på r_ityta..." +msgstr "Storlek på r_ityta…" -#: ../app/actions/image-actions.c:111 +#: ../app/actions/image-actions.c:113 msgctxt "image-action" msgid "Adjust the image dimensions" msgstr "Justera bildens dimensioner" -#: ../app/actions/image-actions.c:116 +#: ../app/actions/image-actions.c:118 msgctxt "image-action" msgid "Fit Canvas to L_ayers" msgstr "An_passa rityta till lager" -#: ../app/actions/image-actions.c:117 +#: ../app/actions/image-actions.c:119 msgctxt "image-action" msgid "Resize the image to enclose all layers" msgstr "Ändra storlek på bilden för att inkludera alla lager" -#: ../app/actions/image-actions.c:122 +#: ../app/actions/image-actions.c:124 msgctxt "image-action" msgid "F_it Canvas to Selection" msgstr "Anpassa r_ityta till markering" -#: ../app/actions/image-actions.c:123 +#: ../app/actions/image-actions.c:125 msgctxt "image-action" msgid "Resize the image to the extents of the selection" msgstr "Ändra bildens storlek till markeringens storlek" -#: ../app/actions/image-actions.c:128 +#: ../app/actions/image-actions.c:130 msgctxt "image-action" msgid "_Print Size..." -msgstr "_Utskriftsstorlek..." +msgstr "_Utskriftsstorlek…" -#: ../app/actions/image-actions.c:129 +#: ../app/actions/image-actions.c:131 msgctxt "image-action" msgid "Adjust the print resolution" msgstr "Justera utskriftsupplösningen" -#: ../app/actions/image-actions.c:134 +#: ../app/actions/image-actions.c:136 msgctxt "image-action" msgid "_Scale Image..." -msgstr "_Skala bild..." +msgstr "_Skala bild…" -#: ../app/actions/image-actions.c:135 +#: ../app/actions/image-actions.c:137 msgctxt "image-action" msgid "Change the size of the image content" msgstr "Ändra storleken för bildinnehållet" -#: ../app/actions/image-actions.c:140 +#: ../app/actions/image-actions.c:142 msgctxt "image-action" msgid "_Crop to Selection" msgstr "Besk_är till markering" -#: ../app/actions/image-actions.c:141 +#: ../app/actions/image-actions.c:143 msgctxt "image-action" msgid "Crop the image to the extents of the selection" msgstr "Beskär bilden till markeringens storlek" -#: ../app/actions/image-actions.c:146 +#: ../app/actions/image-actions.c:148 msgctxt "image-action" msgid "Crop to C_ontent" -msgstr "" +msgstr "Beskär till _innehåll" -#: ../app/actions/image-actions.c:147 -#, fuzzy -#| msgctxt "image-action" -#| msgid "Crop the image to the extents of the selection" +#: ../app/actions/image-actions.c:149 msgctxt "image-action" msgid "" "Crop the image to the extents of its content (remove empty borders from the " "image)" -msgstr "Beskär bilden till markeringens storlek" +msgstr "" +"Beskär bilden till innehållets storlek (ta bort tomma kanter från bilden)" -#: ../app/actions/image-actions.c:152 +#: ../app/actions/image-actions.c:154 msgctxt "image-action" msgid "Merge Visible _Layers..." -msgstr "Sammanfoga _synliga lager..." +msgstr "Sammanfoga _synliga lager…" -#: ../app/actions/image-actions.c:153 +#: ../app/actions/image-actions.c:155 msgctxt "image-action" msgid "Merge all visible layers into one layer" msgstr "Sammanfoga alla synliga lager till ett lager" -#: ../app/actions/image-actions.c:158 +#: ../app/actions/image-actions.c:160 msgctxt "image-action" msgid "_Flatten Image" msgstr "_Platta ut bilden" -#: ../app/actions/image-actions.c:159 +#: ../app/actions/image-actions.c:161 msgctxt "image-action" msgid "Merge all layers into one and remove transparency" msgstr "Sammanfoga alla lager till ett och ta bort transparens" -#: ../app/actions/image-actions.c:164 +#: ../app/actions/image-actions.c:166 msgctxt "image-action" msgid "Configure G_rid..." -msgstr "Konfigurera _rutnät..." +msgstr "Konfigurera _rutnät…" -#: ../app/actions/image-actions.c:165 +#: ../app/actions/image-actions.c:167 msgctxt "image-action" msgid "Configure the grid for this image" msgstr "Konfigurera rutnätet för denna bild" -#: ../app/actions/image-actions.c:170 +#: ../app/actions/image-actions.c:172 msgctxt "image-action" msgid "Image Pr_operties" msgstr "Bilde_genskaper" -#: ../app/actions/image-actions.c:171 +#: ../app/actions/image-actions.c:173 msgctxt "image-action" msgid "Display information about this image" msgstr "Visa information om den här bilden" -#: ../app/actions/image-actions.c:179 -#, fuzzy -#| msgid "Color Management" +#: ../app/actions/image-actions.c:181 msgctxt "image-action" msgid "_Enable Color Management" -msgstr "Färghantering" +msgstr "_Aktivera färghantering" -#: ../app/actions/image-actions.c:180 +#: ../app/actions/image-actions.c:182 msgctxt "image-action" msgid "" "Whether the image is color managed. Disabling color management is equivalent " "to assigning a built-in sRGB color profile. Better leave color management " "enabled." msgstr "" +"Huruvida bilden är färghanterad. Att inaktivera färghantering är detsamma " +"som att tilldela den inbyggda färgprofilen sRGB. Det är bäst att lämna " +"färghantering aktiverat." -#: ../app/actions/image-actions.c:191 ../app/actions/image-actions.c:436 +#: ../app/actions/image-actions.c:193 ../app/actions/image-actions.c:444 msgctxt "image-convert-action" msgid "_RGB" msgstr "_RGB" -#: ../app/actions/image-actions.c:192 +#: ../app/actions/image-actions.c:194 msgctxt "image-convert-action" msgid "Convert the image to the RGB colorspace" msgstr "Konvertera bilden till RGB-färgrymden" -#: ../app/actions/image-actions.c:196 ../app/actions/image-actions.c:438 +#: ../app/actions/image-actions.c:198 ../app/actions/image-actions.c:446 msgctxt "image-convert-action" msgid "_Grayscale" msgstr "_Gråskala" -#: ../app/actions/image-actions.c:197 +#: ../app/actions/image-actions.c:199 msgctxt "image-convert-action" msgid "Convert the image to grayscale" msgstr "Konvertera bilden till gråskala" -#: ../app/actions/image-actions.c:201 +#: ../app/actions/image-actions.c:203 msgctxt "image-convert-action" msgid "_Indexed..." -msgstr "_Indexerad..." +msgstr "_Indexerad…" -#: ../app/actions/image-actions.c:202 +#: ../app/actions/image-actions.c:204 msgctxt "image-convert-action" msgid "Convert the image to indexed colors" msgstr "Konvertera bilden till indexerade färger" -#: ../app/actions/image-actions.c:209 +#: ../app/actions/image-actions.c:211 msgctxt "image-convert-action" msgid "8 bit integer" -msgstr "" +msgstr "8 bitars heltal" -#: ../app/actions/image-actions.c:211 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "Convert the image to indexed colors" +#: ../app/actions/image-actions.c:213 msgctxt "image-convert-action" msgid "Convert the image to 8 bit integer" -msgstr "Konvertera bilden till indexerade färger" - -#: ../app/actions/image-actions.c:215 -msgctxt "image-convert-action" -msgid "16 bit integer" -msgstr "" +msgstr "Konvertera bilden till 8-bit heltal" #: ../app/actions/image-actions.c:217 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "Convert the image to indexed colors" +msgctxt "image-convert-action" +msgid "16 bit integer" +msgstr "16 bitars heltal" + +#: ../app/actions/image-actions.c:219 msgctxt "image-convert-action" msgid "Convert the image to 16 bit integer" -msgstr "Konvertera bilden till indexerade färger" - -#: ../app/actions/image-actions.c:221 -msgctxt "image-convert-action" -msgid "32 bit integer" -msgstr "" +msgstr "Konvertera bilden till 16-bit heltal" #: ../app/actions/image-actions.c:223 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "Convert the image to indexed colors" +msgctxt "image-convert-action" +msgid "32 bit integer" +msgstr "32 bitars heltal" + +#: ../app/actions/image-actions.c:225 msgctxt "image-convert-action" msgid "Convert the image to 32 bit integer" -msgstr "Konvertera bilden till indexerade färger" - -#: ../app/actions/image-actions.c:227 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "Convert the image to indexed colors" -msgctxt "image-convert-action" -msgid "16 bit floating point" -msgstr "Konvertera bilden till indexerade färger" +msgstr "Konvertera bilden till 32-bit heltal" #: ../app/actions/image-actions.c:229 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "Convert the image to indexed colors" +msgctxt "image-convert-action" +msgid "16 bit floating point" +msgstr "16-bit flyttal" + +#: ../app/actions/image-actions.c:231 msgctxt "image-convert-action" msgid "Convert the image to 16 bit floating point" -msgstr "Konvertera bilden till indexerade färger" - -#: ../app/actions/image-actions.c:233 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "Convert the image to indexed colors" -msgctxt "image-convert-action" -msgid "32 bit floating point" -msgstr "Konvertera bilden till indexerade färger" +msgstr "Konvertera bilden till 16-bit flyttal" #: ../app/actions/image-actions.c:235 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "Convert the image to indexed colors" +msgctxt "image-convert-action" +msgid "32 bit floating point" +msgstr "32-bit flyttal" + +#: ../app/actions/image-actions.c:237 msgctxt "image-convert-action" msgid "Convert the image to 32 bit floating point" -msgstr "Konvertera bilden till indexerade färger" - -#: ../app/actions/image-actions.c:239 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "Convert the image to indexed colors" -msgctxt "image-convert-action" -msgid "64 bit floating point" -msgstr "Konvertera bilden till indexerade färger" +msgstr "Konvertera bilden till 32-bit flyttal" #: ../app/actions/image-actions.c:241 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "Convert the image to indexed colors" +msgctxt "image-convert-action" +msgid "64 bit floating point" +msgstr "64-bit flyttal" + +#: ../app/actions/image-actions.c:243 msgctxt "image-convert-action" msgid "Convert the image to 64 bit floating point" -msgstr "Konvertera bilden till indexerade färger" - -#: ../app/actions/image-actions.c:248 -msgctxt "image-convert-action" -msgid "Perceptual gamma (sRGB)" -msgstr "" +msgstr "Konvertera bilden till 64-bit flyttal" #: ../app/actions/image-actions.c:250 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "Convert the image to grayscale" msgctxt "image-convert-action" -msgid "Convert the image to preceptual (sRGB) gamma" -msgstr "Konvertera bilden till gråskala" +msgid "Perceptual gamma (sRGB)" +msgstr "Perceptuell gamma (sRGB)" -#: ../app/actions/image-actions.c:254 -#, fuzzy -#| msgctxt "layer-mode-effects" -#| msgid "Hard light" +#: ../app/actions/image-actions.c:252 msgctxt "image-convert-action" -msgid "Linear light" -msgstr "Hårt ljus" +msgid "Convert the image to perceptual (sRGB) gamma" +msgstr "Konvertera bilden till perceptuell (sRGB) gamma" #: ../app/actions/image-actions.c:256 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "Convert the image to indexed colors" +msgctxt "image-convert-action" +msgid "Linear light" +msgstr "Linjärt ljus" + +#: ../app/actions/image-actions.c:258 msgctxt "image-convert-action" msgid "Convert the image to linear light" -msgstr "Konvertera bilden till indexerade färger" +msgstr "Konvertera bilden till linjärt ljus" -#: ../app/actions/image-actions.c:263 +#: ../app/actions/image-actions.c:265 msgctxt "image-action" msgid "Flip _Horizontally" msgstr "Vänd _horisontellt" -#: ../app/actions/image-actions.c:264 +#: ../app/actions/image-actions.c:266 msgctxt "image-action" msgid "Flip image horizontally" msgstr "Vänd bilden horisontellt" -#: ../app/actions/image-actions.c:269 +#: ../app/actions/image-actions.c:271 msgctxt "image-action" msgid "Flip _Vertically" msgstr "_Vänd vertikalt" -#: ../app/actions/image-actions.c:270 +#: ../app/actions/image-actions.c:272 msgctxt "image-action" msgid "Flip image vertically" msgstr "Vänd bilden vertikalt" -#: ../app/actions/image-actions.c:278 +#: ../app/actions/image-actions.c:280 msgctxt "image-action" msgid "Rotate 90° _clockwise" -msgstr "Rotera 90° m_edsols" +msgstr "Rotera 90° m_edurs" -#: ../app/actions/image-actions.c:279 +#: ../app/actions/image-actions.c:281 msgctxt "image-action" msgid "Rotate the image 90 degrees to the right" msgstr "Rotera bilden 90 grader åt höger" -#: ../app/actions/image-actions.c:284 +#: ../app/actions/image-actions.c:286 msgctxt "image-action" msgid "Rotate _180°" msgstr "Rotera _180°" -#: ../app/actions/image-actions.c:285 +#: ../app/actions/image-actions.c:287 msgctxt "image-action" msgid "Turn the image upside-down" msgstr "Vänd bilden upp och ned" -#: ../app/actions/image-actions.c:290 +#: ../app/actions/image-actions.c:292 msgctxt "image-action" msgid "Rotate 90° counter-clock_wise" -msgstr "Rotera 90° m_otsols" +msgstr "Rotera 90° m_oturs" -#: ../app/actions/image-actions.c:291 +#: ../app/actions/image-actions.c:293 msgctxt "image-action" msgid "Rotate the image 90 degrees to the left" msgstr "Rotera bilden 90 grader åt vänster" -#: ../app/actions/image-actions.c:429 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "_RGB" +#: ../app/actions/image-actions.c:437 msgctxt "image-convert-action" msgid "_RGB..." -msgstr "_RGB" +msgstr "_RGB…" -#: ../app/actions/image-actions.c:431 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "_Grayscale" +#: ../app/actions/image-actions.c:439 msgctxt "image-convert-action" msgid "_Grayscale..." -msgstr "_Gråskala" +msgstr "_Gråskala…" -#: ../app/actions/image-commands.c:438 -#, fuzzy, c-format -#| msgid "Opening '%s' failed: %s" +#: ../app/actions/image-commands.c:559 +#, c-format msgid "Saving color profile failed: %s" -msgstr "Öppnande av \"%s\" misslyckades: %s" +msgstr "Sparande av färgprofil misslyckades: %s" -#: ../app/actions/image-commands.c:477 -#, fuzzy -#| msgid "Color Profile" +#: ../app/actions/image-commands.c:598 msgid "Save Color Profile" -msgstr "Färgprofil" +msgstr "Spara färgprofil" -#: ../app/actions/image-commands.c:520 +#: ../app/actions/image-commands.c:646 msgid "Set Image Canvas Size" -msgstr "Ställ in storlek på bildrityta" +msgstr "Ställ in storlek på rityta" -#: ../app/actions/image-commands.c:549 ../app/actions/image-commands.c:573 -#: ../app/actions/image-commands.c:911 +#: ../app/actions/image-commands.c:676 ../app/actions/image-commands.c:700 +#: ../app/actions/image-commands.c:1358 msgid "Resizing" msgstr "Ändrar storlek" -#: ../app/actions/image-commands.c:606 +#: ../app/actions/image-commands.c:733 msgid "Set Image Print Resolution" -msgstr "Ange bildupplösning för utskrift" +msgstr "Ställ in bildupplösning för utskrift" -#: ../app/actions/image-commands.c:682 ../app/pdb/drawable-transform-cmds.c:166 +#: ../app/actions/image-commands.c:799 ../app/pdb/drawable-transform-cmds.c:166 #: ../app/pdb/drawable-transform-cmds.c:256 #: ../app/pdb/item-transform-cmds.c:170 msgid "Flipping" msgstr "Vänder" -#: ../app/actions/image-commands.c:706 ../app/pdb/drawable-transform-cmds.c:617 +#: ../app/actions/image-commands.c:823 ../app/pdb/drawable-transform-cmds.c:617 #: ../app/pdb/drawable-transform-cmds.c:711 #: ../app/pdb/image-transform-cmds.c:250 ../app/pdb/item-transform-cmds.c:443 -#: ../app/pdb/transform-tools-cmds.c:255 ../app/tools/gimprotatetool.c:126 +#: ../app/pdb/transform-tools-cmds.c:255 ../app/tools/gimprotatetool.c:129 msgid "Rotating" msgstr "Roterar" -#: ../app/actions/image-commands.c:732 ../app/actions/layers-commands.c:716 +#: ../app/actions/image-commands.c:850 ../app/actions/layers-commands.c:779 msgid "Cannot crop because the current selection is empty." msgstr "Kan inte beskära eftersom den aktuella markeringen är tom." -#: ../app/actions/image-commands.c:766 -#, fuzzy -#| msgid "Cannot crop because the current selection is empty." +#: ../app/actions/image-commands.c:888 msgid "Cannot crop because the image has no content." -msgstr "Kan inte beskära eftersom den aktuella markeringen är tom." +msgstr "Kan inte beskära eftersom bilden inte har något innehåll." -#: ../app/actions/image-commands.c:772 -#, fuzzy -#| msgid "Cannot crop because the current selection is empty." +#: ../app/actions/image-commands.c:894 msgid "Cannot crop because the image is already cropped to its content." -msgstr "Kan inte beskära eftersom den aktuella markeringen är tom." +msgstr "Kan inte beskära eftersom bilden redan är beskuren till innehållet." -#: ../app/actions/image-commands.c:959 +#: ../app/actions/image-commands.c:1029 +#, c-format +msgid "Converting to RGB (%s)" +msgstr "Konverterar till RGB (%s)" + +#: ../app/actions/image-commands.c:1067 +#, c-format +msgid "Converting to grayscale (%s)" +msgstr "Konverterar till gråskala (%s)" + +#: ../app/actions/image-commands.c:1129 +msgid "Converting to indexed colors" +msgstr "Konverterar till indexerade färger" + +#: ../app/actions/image-commands.c:1217 +#, c-format +msgid "Converting image to %s" +msgstr "Konverterar bild till %s" + +#: ../app/actions/image-commands.c:1248 +msgid "Assign color profile" +msgstr "Tilldela färgprofil" + +#: ../app/actions/image-commands.c:1294 +#, c-format +msgid "Converting to '%s'" +msgstr "Konverterar till ”%s”" + +#: ../app/actions/image-commands.c:1400 msgid "Change Print Size" msgstr "Ändra utskriftsstorlek" -#: ../app/actions/image-commands.c:1000 +#: ../app/actions/image-commands.c:1444 msgid "Scale Image" msgstr "Skala bild" #. Scaling -#: ../app/actions/image-commands.c:1011 ../app/actions/layers-commands.c:1267 -#: ../app/dialogs/preferences-dialog.c:1632 +#: ../app/actions/image-commands.c:1453 ../app/actions/layers-commands.c:1569 +#: ../app/dialogs/preferences-dialog.c:1606 #: ../app/pdb/drawable-transform-cmds.c:800 #: ../app/pdb/drawable-transform-cmds.c:891 #: ../app/pdb/image-transform-cmds.c:122 ../app/pdb/image-transform-cmds.c:158 -#: ../app/pdb/item-transform-cmds.c:534 ../app/pdb/layer-cmds.c:396 -#: ../app/pdb/layer-cmds.c:443 ../app/pdb/transform-tools-cmds.c:346 -#: ../app/tools/gimpscaletool.c:119 +#: ../app/pdb/item-transform-cmds.c:534 ../app/pdb/layer-cmds.c:401 +#: ../app/pdb/layer-cmds.c:448 ../app/pdb/transform-tools-cmds.c:346 +#: ../app/tools/gimpscaletool.c:121 msgid "Scaling" msgstr "Skalning" @@ -4643,717 +6169,946 @@ msgctxt "images-action" msgid "Delete this image" msgstr "Ta bort denna bild" -#: ../app/actions/layers-actions.c:49 +#: ../app/actions/items-commands.c:208 ../app/actions/items-commands.c:253 +msgid "There is no active layer or channel to fill." +msgstr "Det finns inget aktivt lager eller kanal att fylla." + +#: ../app/actions/items-commands.c:293 ../app/actions/items-commands.c:338 +msgid "There is no active layer or channel to stroke to." +msgstr "Det finns inget aktivt lager eller kanal att stryka till." + +#: ../app/actions/layers-actions.c:52 msgctxt "layers-action" msgid "Layers Menu" msgstr "Lagermeny" -#: ../app/actions/layers-actions.c:53 +#: ../app/actions/layers-actions.c:56 +msgctxt "layers-action" +msgid "Blend Space" +msgstr "Toningsrymd" + +#: ../app/actions/layers-actions.c:60 +msgctxt "layers-action" +msgid "Composite Space" +msgstr "Kompositrymd" + +#: ../app/actions/layers-actions.c:64 +msgctxt "layers-action" +msgid "Composite Mode" +msgstr "Kompositläge" + +#: ../app/actions/layers-actions.c:68 +msgctxt "layers-action" +msgid "Color Tag" +msgstr "Färgtagg" + +#: ../app/actions/layers-actions.c:72 msgctxt "layers-action" msgid "_Layer" msgstr "_Lager" -#: ../app/actions/layers-actions.c:55 +#: ../app/actions/layers-actions.c:74 msgctxt "layers-action" msgid "Stac_k" msgstr "Stac_k" -#: ../app/actions/layers-actions.c:57 +#: ../app/actions/layers-actions.c:76 msgctxt "layers-action" msgid "_Mask" msgstr "_Mask" -#: ../app/actions/layers-actions.c:59 +#: ../app/actions/layers-actions.c:78 msgctxt "layers-action" msgid "Tr_ansparency" msgstr "_Transparens" -#: ../app/actions/layers-actions.c:61 +#: ../app/actions/layers-actions.c:80 msgctxt "layers-action" msgid "_Transform" -msgstr "_Transformera" +msgstr "_Transform" -#: ../app/actions/layers-actions.c:63 +#: ../app/actions/layers-actions.c:82 msgctxt "layers-action" msgid "_Properties" msgstr "_Egenskaper" -#: ../app/actions/layers-actions.c:65 +#: ../app/actions/layers-actions.c:84 msgctxt "layers-action" msgid "_Opacity" msgstr "_Opacitet" -#: ../app/actions/layers-actions.c:67 +#: ../app/actions/layers-actions.c:86 msgctxt "layers-action" msgid "Layer _Mode" msgstr "Lager_läge" -#: ../app/actions/layers-actions.c:70 +#: ../app/actions/layers-actions.c:89 msgctxt "layers-action" -msgid "Te_xt Tool" -msgstr "Te_xtverktyg" +msgid "Default Edit Action" +msgstr "Standardredigeringsåtgärd" -#: ../app/actions/layers-actions.c:71 +#: ../app/actions/layers-actions.c:90 msgctxt "layers-action" -msgid "Activate the text tool on this text layer" -msgstr "Aktivera textverktyget på det här textlagret" +msgid "Activate the default edit action for this type of layer" +msgstr "Aktivera standardredigeringsåtgärden för denna typ av lager" -#: ../app/actions/layers-actions.c:76 +#: ../app/actions/layers-actions.c:95 +msgctxt "layers-action" +msgid "Edit Te_xt on canvas" +msgstr "Redigera te_xt på rityta" + +#: ../app/actions/layers-actions.c:96 +msgctxt "layers-action" +msgid "Edit this text layer content on canvas" +msgstr "Redigera innehållet för detta textlager på ritytan" + +#: ../app/actions/layers-actions.c:101 msgctxt "layers-action" msgid "_Edit Layer Attributes..." -msgstr "R_edigera lagerattribut..." +msgstr "R_edigera lagerattribut…" -#: ../app/actions/layers-actions.c:77 +#: ../app/actions/layers-actions.c:102 msgctxt "layers-action" msgid "Edit the layer's name" msgstr "Redigera lagrets namn" -#: ../app/actions/layers-actions.c:82 ../app/actions/layers-actions.c:635 +#: ../app/actions/layers-actions.c:107 ../app/actions/layers-actions.c:914 msgctxt "layers-action" msgid "_New Layer..." -msgstr "_Nytt lager..." +msgstr "_Nytt lager…" -#: ../app/actions/layers-actions.c:83 +#: ../app/actions/layers-actions.c:108 msgctxt "layers-action" msgid "Create a new layer and add it to the image" msgstr "Skapa ett nytt lager och lägg till det till bilden" -#: ../app/actions/layers-actions.c:88 ../app/actions/layers-actions.c:636 +#: ../app/actions/layers-actions.c:113 ../app/actions/layers-actions.c:915 msgctxt "layers-action" msgid "_New Layer" msgstr "_Nytt lager" -#: ../app/actions/layers-actions.c:89 +#: ../app/actions/layers-actions.c:114 msgctxt "layers-action" msgid "Create a new layer with last used values" msgstr "Skapa ett nytt lager med senast använda värden" -#: ../app/actions/layers-actions.c:94 +#: ../app/actions/layers-actions.c:119 msgctxt "layers-action" msgid "New from _Visible" msgstr "Nytt från _synlig" -#: ../app/actions/layers-actions.c:96 +#: ../app/actions/layers-actions.c:121 msgctxt "layers-action" msgid "Create a new layer from what is visible in this image" msgstr "Skapa ett nytt lager från vad som är synligt i denna bild" -#: ../app/actions/layers-actions.c:101 -#, fuzzy -#| msgctxt "layers-action" -#| msgid "New Layer _Group..." +#: ../app/actions/layers-actions.c:126 msgctxt "layers-action" msgid "New Layer _Group" -msgstr "Ny lager_grupp..." +msgstr "Ny lager_grupp" -#: ../app/actions/layers-actions.c:102 +#: ../app/actions/layers-actions.c:127 msgctxt "layers-action" msgid "Create a new layer group and add it to the image" msgstr "Skapa en ny lagergrupp och lägg till den till bilden" -#: ../app/actions/layers-actions.c:107 +#: ../app/actions/layers-actions.c:132 msgctxt "layers-action" msgid "D_uplicate Layer" msgstr "_Duplicera lager" -#: ../app/actions/layers-actions.c:109 +#: ../app/actions/layers-actions.c:134 msgctxt "layers-action" msgid "Create a duplicate of the layer and add it to the image" msgstr "Skapa en dubblett av lagret och lägg till det till bilden" -#: ../app/actions/layers-actions.c:114 +#: ../app/actions/layers-actions.c:139 msgctxt "layers-action" msgid "_Delete Layer" msgstr "_Ta bort lager" -#: ../app/actions/layers-actions.c:115 +#: ../app/actions/layers-actions.c:140 msgctxt "layers-action" msgid "Delete this layer" msgstr "Ta bort detta lager" -#: ../app/actions/layers-actions.c:120 +#: ../app/actions/layers-actions.c:145 msgctxt "layers-action" msgid "_Raise Layer" msgstr "_Höj lager" -#: ../app/actions/layers-actions.c:121 +#: ../app/actions/layers-actions.c:146 msgctxt "layers-action" msgid "Raise this layer one step in the layer stack" msgstr "Höj det här lagret ett steg i lagerstacken" -#: ../app/actions/layers-actions.c:126 +#: ../app/actions/layers-actions.c:151 msgctxt "layers-action" msgid "Layer to _Top" msgstr "_Lager till toppen" -#: ../app/actions/layers-actions.c:127 +#: ../app/actions/layers-actions.c:152 msgctxt "layers-action" msgid "Move this layer to the top of the layer stack" msgstr "Flytta det här lagret till toppen i lagerstacken" -#: ../app/actions/layers-actions.c:132 +#: ../app/actions/layers-actions.c:157 msgctxt "layers-action" msgid "_Lower Layer" msgstr "_Sänk lager" -#: ../app/actions/layers-actions.c:133 +#: ../app/actions/layers-actions.c:158 msgctxt "layers-action" msgid "Lower this layer one step in the layer stack" msgstr "Sänk det här lagret ett steg i lagerstacken" -#: ../app/actions/layers-actions.c:138 +#: ../app/actions/layers-actions.c:163 msgctxt "layers-action" msgid "Layer to _Bottom" msgstr "Lager till _botten" -#: ../app/actions/layers-actions.c:139 +#: ../app/actions/layers-actions.c:164 msgctxt "layers-action" msgid "Move this layer to the bottom of the layer stack" msgstr "Flytta det här lagret till botten i lagerstacken" -#: ../app/actions/layers-actions.c:144 +#: ../app/actions/layers-actions.c:169 msgctxt "layers-action" msgid "_Anchor Layer" msgstr "För_ankra lager" -#: ../app/actions/layers-actions.c:145 +#: ../app/actions/layers-actions.c:170 msgctxt "layers-action" msgid "Anchor the floating layer" msgstr "Förankra det flytande lagret" -#: ../app/actions/layers-actions.c:150 +#: ../app/actions/layers-actions.c:175 msgctxt "layers-action" msgid "Merge Do_wn" msgstr "Sammanfoga _nedåt" -#: ../app/actions/layers-actions.c:151 +#: ../app/actions/layers-actions.c:176 msgctxt "layers-action" msgid "Merge this layer with the first visible layer below it" msgstr "Sammanfoga det här lagret med första synliga lager under det" -#: ../app/actions/layers-actions.c:156 +#: ../app/actions/layers-actions.c:181 msgctxt "layers-action" msgid "Merge Layer Group" msgstr "Sammanfoga lagergrupp" -#: ../app/actions/layers-actions.c:157 +#: ../app/actions/layers-actions.c:182 msgctxt "layers-action" msgid "Merge the layer group's layers into one normal layer" msgstr "Sammanfoga lagergruppens lager till ett normalt lager" -#: ../app/actions/layers-actions.c:162 +#: ../app/actions/layers-actions.c:187 msgctxt "layers-action" msgid "Merge _Visible Layers..." -msgstr "Sammanfoga _synliga lager..." +msgstr "Sammanfoga _synliga lager…" -#: ../app/actions/layers-actions.c:163 +#: ../app/actions/layers-actions.c:188 msgctxt "layers-action" msgid "Merge all visible layers into one layer" msgstr "Sammanfoga alla synliga lager till ett lager" -#: ../app/actions/layers-actions.c:168 +#: ../app/actions/layers-actions.c:193 msgctxt "layers-action" msgid "_Flatten Image" msgstr "_Platta ut bilden" -#: ../app/actions/layers-actions.c:169 +#: ../app/actions/layers-actions.c:194 msgctxt "layers-action" msgid "Merge all layers into one and remove transparency" msgstr "Sammanfoga alla lager till ett och ta bort transparens" -#: ../app/actions/layers-actions.c:174 +#: ../app/actions/layers-actions.c:199 msgctxt "layers-action" msgid "_Discard Text Information" msgstr "_Förkasta textinformation" -#: ../app/actions/layers-actions.c:175 +#: ../app/actions/layers-actions.c:200 msgctxt "layers-action" msgid "Turn this text layer into a normal layer" msgstr "Gör om det här textlagret till ett vanligt lager" -#: ../app/actions/layers-actions.c:180 +#: ../app/actions/layers-actions.c:205 msgctxt "layers-action" msgid "Text to _Path" msgstr "Text till _bana" -#: ../app/actions/layers-actions.c:181 +#: ../app/actions/layers-actions.c:206 msgctxt "layers-action" msgid "Create a path from this text layer" msgstr "Skapa en bana från detta textlager" -#: ../app/actions/layers-actions.c:186 +#: ../app/actions/layers-actions.c:211 msgctxt "layers-action" msgid "Text alon_g Path" msgstr "Text län_gs bana" -#: ../app/actions/layers-actions.c:187 +#: ../app/actions/layers-actions.c:212 msgctxt "layers-action" msgid "Warp this layer's text along the current path" msgstr "Vrid lagrets text längs den aktuella banan" -#: ../app/actions/layers-actions.c:192 +#: ../app/actions/layers-actions.c:217 msgctxt "layers-action" msgid "Layer B_oundary Size..." -msgstr "St_orlek på lagergräns..." +msgstr "St_orlek på lagergräns…" -#: ../app/actions/layers-actions.c:193 +#: ../app/actions/layers-actions.c:218 msgctxt "layers-action" msgid "Adjust the layer dimensions" msgstr "Justera lagrets dimensioner" -#: ../app/actions/layers-actions.c:198 +#: ../app/actions/layers-actions.c:223 msgctxt "layers-action" msgid "Layer to _Image Size" msgstr "Lagerstorlek som _bilden" -#: ../app/actions/layers-actions.c:199 +#: ../app/actions/layers-actions.c:224 msgctxt "layers-action" msgid "Resize the layer to the size of the image" msgstr "Ändra storlek på lagret till storleken för bilden" -#: ../app/actions/layers-actions.c:204 +#: ../app/actions/layers-actions.c:229 msgctxt "layers-action" msgid "_Scale Layer..." -msgstr "S_kala lager..." +msgstr "S_kala lager…" -#: ../app/actions/layers-actions.c:205 +#: ../app/actions/layers-actions.c:230 msgctxt "layers-action" msgid "Change the size of the layer content" msgstr "Ändra storleken på lagerinnehållet" -#: ../app/actions/layers-actions.c:210 +#: ../app/actions/layers-actions.c:235 msgctxt "layers-action" msgid "_Crop to Selection" msgstr "Besk_är till markering" -#: ../app/actions/layers-actions.c:211 +#: ../app/actions/layers-actions.c:236 msgctxt "layers-action" msgid "Crop the layer to the extents of the selection" msgstr "Beskär lagret till markeringens storlek" -#: ../app/actions/layers-actions.c:216 +#: ../app/actions/layers-actions.c:241 msgctxt "layers-action" msgid "Crop to C_ontent" -msgstr "" +msgstr "Beskär till _innehåll" -#: ../app/actions/layers-actions.c:217 -#, fuzzy -#| msgctxt "layers-action" -#| msgid "Crop the layer to the extents of the selection" +#: ../app/actions/layers-actions.c:242 msgctxt "layers-action" msgid "" "Crop the layer to the extents of its content (remove empty borders from the " "layer)" -msgstr "Beskär lagret till markeringens storlek" +msgstr "" +"Beskär lagret till innehållets storlek (ta bort tomma kanter från lagret)" -#: ../app/actions/layers-actions.c:222 ../app/actions/layers-actions.c:232 +#: ../app/actions/layers-actions.c:247 ../app/actions/layers-actions.c:257 msgctxt "layers-action" msgid "Add La_yer Mask..." -msgstr "L_ägg till lagermask..." +msgstr "L_ägg till lagermask…" -#: ../app/actions/layers-actions.c:224 ../app/actions/layers-actions.c:234 +#: ../app/actions/layers-actions.c:249 ../app/actions/layers-actions.c:259 msgctxt "layers-action" msgid "Add a mask that allows non-destructive editing of transparency" msgstr "" "Lägg till en mask som tillåter icke-förstörande redigering av transparens" -#: ../app/actions/layers-actions.c:239 -#, fuzzy -#| msgid "Add Layer Mask" +#: ../app/actions/layers-actions.c:264 msgctxt "layers-action" msgid "Add La_yer Mask" -msgstr "Lägg till lagermask" +msgstr "Lägg till _lagermask" -#: ../app/actions/layers-actions.c:241 -#, fuzzy -#| msgctxt "vectors-action" -#| msgid "Create a new path with last used values" +#: ../app/actions/layers-actions.c:266 msgctxt "layers-action" msgid "Add a mask with last used values" -msgstr "Skapa en ny bana med senast använda värden" +msgstr "Lägg till en mask med senast använda värden" -#: ../app/actions/layers-actions.c:246 +#: ../app/actions/layers-actions.c:271 msgctxt "layers-action" msgid "Add Alpha C_hannel" msgstr "Lägg till al_fakanal" -#: ../app/actions/layers-actions.c:247 +#: ../app/actions/layers-actions.c:272 msgctxt "layers-action" msgid "Add transparency information to the layer" msgstr "Lägg till transparensinformation till lagret" -#: ../app/actions/layers-actions.c:252 +#: ../app/actions/layers-actions.c:277 msgctxt "layers-action" msgid "_Remove Alpha Channel" msgstr "_Ta bort alfakanal" -#: ../app/actions/layers-actions.c:253 +#: ../app/actions/layers-actions.c:278 msgctxt "layers-action" msgid "Remove transparency information from the layer" msgstr "Ta bort transparensinformation från lagret" -#: ../app/actions/layers-actions.c:261 -msgctxt "layers-action" -msgid "Lock Alph_a Channel" -msgstr "Lås al_fakanal" - -#: ../app/actions/layers-actions.c:263 -msgctxt "layers-action" -msgid "Keep transparency information on this layer from being modified" -msgstr "Låt inte transparensinformation på det här lagret ändras" - -#: ../app/actions/layers-actions.c:269 +#: ../app/actions/layers-actions.c:286 msgctxt "layers-action" msgid "_Edit Layer Mask" msgstr "R_edigera lagermask" -#: ../app/actions/layers-actions.c:270 +#: ../app/actions/layers-actions.c:287 msgctxt "layers-action" msgid "Work on the layer mask" msgstr "Arbeta på lagermasken" -#: ../app/actions/layers-actions.c:276 +#: ../app/actions/layers-actions.c:293 msgctxt "layers-action" msgid "S_how Layer Mask" msgstr "Vis_a lagermask" -#: ../app/actions/layers-actions.c:282 +#: ../app/actions/layers-actions.c:299 msgctxt "layers-action" msgid "_Disable Layer Mask" msgstr "_Inaktivera lagermask" -#: ../app/actions/layers-actions.c:283 +#: ../app/actions/layers-actions.c:300 msgctxt "layers-action" msgid "Dismiss the effect of the layer mask" msgstr "Ta bort effekten för lagermasken" -#: ../app/actions/layers-actions.c:292 +#: ../app/actions/layers-actions.c:306 +msgctxt "layers-action" +msgid "Toggle Layer _Visibility" +msgstr "_Växla synlighet för lager" + +#: ../app/actions/layers-actions.c:312 +msgctxt "layers-action" +msgid "Toggle Layer _Linked State" +msgstr "Växla _länkat tillstånd för lager" + +#. GIMP_ICON_LOCK +#: ../app/actions/layers-actions.c:318 +msgctxt "layers-action" +msgid "L_ock Pixels of Layer" +msgstr "L_ås bildpunkter för lager" + +#: ../app/actions/layers-actions.c:324 +msgctxt "layers-action" +msgid "L_ock Position of Layer" +msgstr "L_ås position för lager" + +#: ../app/actions/layers-actions.c:330 +msgctxt "layers-action" +msgid "Lock Alph_a Channel" +msgstr "Lås al_fakanal" + +#: ../app/actions/layers-actions.c:332 +msgctxt "layers-action" +msgid "Keep transparency information on this layer from being modified" +msgstr "Låt inte transparensinformation på det här lagret ändras" + +#: ../app/actions/layers-actions.c:341 ../app/actions/layers-actions.c:362 +#: ../app/actions/layers-actions.c:383 +msgctxt "layers-action" +msgid "Auto" +msgstr "Auto" + +#: ../app/actions/layers-actions.c:342 +msgctxt "layers-action" +msgid "Layer Blend Space: Auto" +msgstr "Lagertoningsrymd: Auto" + +#: ../app/actions/layers-actions.c:347 ../app/actions/layers-actions.c:368 +msgctxt "layers-action" +msgid "RGB (linear)" +msgstr "RGB (linjär)" + +#: ../app/actions/layers-actions.c:348 +msgctxt "layers-action" +msgid "Layer Blend Space: RGB (linear)" +msgstr "Lagertoningsrymd: RGB (linjär)" + +#: ../app/actions/layers-actions.c:353 ../app/actions/layers-actions.c:374 +msgctxt "layers-action" +msgid "RGB (perceptual)" +msgstr "RGB (perceptuell)" + +#: ../app/actions/layers-actions.c:354 +msgctxt "layers-action" +msgid "Layer Blend Space: RGB (perceptual)" +msgstr "Lagertoningsrymd: RGB (perceptuell)" + +#: ../app/actions/layers-actions.c:363 +msgctxt "layers-action" +msgid "Layer Composite Space: Auto" +msgstr "Lagerkompositrymd: Auto" + +#: ../app/actions/layers-actions.c:369 +msgctxt "layers-action" +msgid "Layer Composite Space: RGB (linear)" +msgstr "Lagerkompositrymd: RGB (linjär)" + +#: ../app/actions/layers-actions.c:375 +msgctxt "layers-action" +msgid "Layer Composite Space: RGB (perceptual)" +msgstr "Lagerkompositrymd: RGB (perceptuell)" + +#: ../app/actions/layers-actions.c:384 +msgctxt "layers-action" +msgid "Layer Composite Mode: Auto" +msgstr "Lagerkompositläge: Auto" + +#: ../app/actions/layers-actions.c:389 +msgctxt "layers-action" +msgid "Union" +msgstr "Union" + +#: ../app/actions/layers-actions.c:390 +msgctxt "layers-action" +msgid "Layer Composite Mode: Union" +msgstr "Lagerkompositläge: Union" + +#: ../app/actions/layers-actions.c:395 +msgctxt "layers-action" +msgid "Clip to Backdrop" +msgstr "Klipp mot bakgrund" + +#: ../app/actions/layers-actions.c:396 +msgctxt "layers-action" +msgid "Layer Composite Mode: Clip to Backdrop" +msgstr "Lagerkompositläge: Klipp mot bakgrund" + +#: ../app/actions/layers-actions.c:401 +msgctxt "layers-action" +msgid "Clip to Layer" +msgstr "Klipp till lager" + +#: ../app/actions/layers-actions.c:402 +msgctxt "layers-action" +msgid "Layer Composite Mode: Clip to Layer" +msgstr "Lagerkompositläge: Klipp mot lager" + +#: ../app/actions/layers-actions.c:407 +msgctxt "layers-action" +msgid "Intersection" +msgstr "Skärning" + +#: ../app/actions/layers-actions.c:408 +msgctxt "layers-action" +msgid "Layer Composite Mode: Intersection" +msgstr "Lagerkompositläge: Skärning" + +#: ../app/actions/layers-actions.c:416 +msgctxt "layers-action" +msgid "None" +msgstr "Ingen" + +#: ../app/actions/layers-actions.c:417 +msgctxt "layers-action" +msgid "Layer Color Tag: Clear" +msgstr "Lagerfärgtagg: Klar" + +#: ../app/actions/layers-actions.c:422 +msgctxt "layers-action" +msgid "Blue" +msgstr "Blå" + +#: ../app/actions/layers-actions.c:423 +msgctxt "layers-action" +msgid "Layer Color Tag: Set to Blue" +msgstr "Lagerfärgtagg: Sätt till blå" + +#: ../app/actions/layers-actions.c:428 +msgctxt "layers-action" +msgid "Green" +msgstr "Grön" + +#: ../app/actions/layers-actions.c:429 +msgctxt "layers-action" +msgid "Layer Color Tag: Set to Green" +msgstr "Lagerfärgtagg: Sätt till grön" + +#: ../app/actions/layers-actions.c:434 +msgctxt "layers-action" +msgid "Yellow" +msgstr "Gul" + +#: ../app/actions/layers-actions.c:435 +msgctxt "layers-action" +msgid "Layer Color Tag: Set to Yellow" +msgstr "Lagerfärgtagg: Sätt till gul" + +#: ../app/actions/layers-actions.c:440 +msgctxt "layers-action" +msgid "Orange" +msgstr "Orange" + +#: ../app/actions/layers-actions.c:441 +msgctxt "layers-action" +msgid "Layer Color Tag: Set to Orange" +msgstr "Lagerfärgtagg: Sätt till orange" + +#: ../app/actions/layers-actions.c:446 +msgctxt "layers-action" +msgid "Brown" +msgstr "Brun" + +#: ../app/actions/layers-actions.c:447 +msgctxt "layers-action" +msgid "Layer Color Tag: Set to Brown" +msgstr "Lagerfärgtagg: Sätt till brun" + +#: ../app/actions/layers-actions.c:452 +msgctxt "layers-action" +msgid "Red" +msgstr "Röd" + +#: ../app/actions/layers-actions.c:453 +msgctxt "layers-action" +msgid "Layer Color Tag: Set to Red" +msgstr "Lagerfärgtagg: Sätt till röd" + +#: ../app/actions/layers-actions.c:458 +msgctxt "layers-action" +msgid "Violet" +msgstr "Violett" + +#: ../app/actions/layers-actions.c:459 +msgctxt "layers-action" +msgid "Layer Color Tag: Set to Violet" +msgstr "Lagerfärgtagg: Sätt till violett" + +#: ../app/actions/layers-actions.c:464 +msgctxt "layers-action" +msgid "Gray" +msgstr "Grå" + +#: ../app/actions/layers-actions.c:465 +msgctxt "layers-action" +msgid "Layer Color Tag: Set to Gray" +msgstr "Lagerfärgtagg: Sätt till grå" + +#: ../app/actions/layers-actions.c:473 msgctxt "layers-action" msgid "Apply Layer _Mask" msgstr "_Tillämpa lagermask" -#: ../app/actions/layers-actions.c:293 +#: ../app/actions/layers-actions.c:474 msgctxt "layers-action" msgid "Apply the effect of the layer mask and remove it" msgstr "Tillämpa effekten för lagermasken och ta bort den" -#: ../app/actions/layers-actions.c:298 +#: ../app/actions/layers-actions.c:479 msgctxt "layers-action" msgid "Delete Layer Mas_k" msgstr "_Ta bort lagermask" -#: ../app/actions/layers-actions.c:299 +#: ../app/actions/layers-actions.c:480 msgctxt "layers-action" msgid "Remove the layer mask and its effect" msgstr "Ta bort lagermasken och dess effekt" -#: ../app/actions/layers-actions.c:307 +#: ../app/actions/layers-actions.c:488 msgctxt "layers-action" msgid "_Mask to Selection" msgstr "_Mask till markering" -#: ../app/actions/layers-actions.c:308 +#: ../app/actions/layers-actions.c:489 msgctxt "layers-action" msgid "Replace the selection with the layer mask" msgstr "Ersätt markeringen med lagermasken" -#: ../app/actions/layers-actions.c:313 +#: ../app/actions/layers-actions.c:494 msgctxt "layers-action" msgid "_Add to Selection" msgstr "_Lägg till i markering" -#: ../app/actions/layers-actions.c:314 +#: ../app/actions/layers-actions.c:495 msgctxt "layers-action" msgid "Add the layer mask to the current selection" msgstr "Lägg till lagermasken till den aktuella markeringen" -#: ../app/actions/layers-actions.c:319 ../app/actions/layers-actions.c:348 +#: ../app/actions/layers-actions.c:500 ../app/actions/layers-actions.c:529 msgctxt "layers-action" msgid "_Subtract from Selection" msgstr "_Ta bort från markering" -#: ../app/actions/layers-actions.c:320 +#: ../app/actions/layers-actions.c:501 msgctxt "layers-action" msgid "Subtract the layer mask from the current selection" msgstr "Ta bort lagermasken från den aktuella markeringen" -#: ../app/actions/layers-actions.c:325 ../app/actions/layers-actions.c:355 +#: ../app/actions/layers-actions.c:506 ../app/actions/layers-actions.c:536 msgctxt "layers-action" msgid "_Intersect with Selection" msgstr "_Snitt med markering" -#: ../app/actions/layers-actions.c:326 +#: ../app/actions/layers-actions.c:507 msgctxt "layers-action" msgid "Intersect the layer mask with the current selection" msgstr "Skär ut lagermasken med den aktuella markeringen" -#: ../app/actions/layers-actions.c:334 +#: ../app/actions/layers-actions.c:515 msgctxt "layers-action" msgid "Al_pha to Selection" msgstr "_Alfa till markering" -#: ../app/actions/layers-actions.c:336 +#: ../app/actions/layers-actions.c:517 msgctxt "layers-action" msgid "Replace the selection with the layer's alpha channel" msgstr "Ersätt markeringen med lagrets alfakanal" -#: ../app/actions/layers-actions.c:341 +#: ../app/actions/layers-actions.c:522 msgctxt "layers-action" msgid "A_dd to Selection" msgstr "_Lägg till i markering" -#: ../app/actions/layers-actions.c:343 +#: ../app/actions/layers-actions.c:524 msgctxt "layers-action" msgid "Add the layer's alpha channel to the current selection" msgstr "Lägg till lagrets alfakanal till den aktuella markeringen" -#: ../app/actions/layers-actions.c:350 +#: ../app/actions/layers-actions.c:531 msgctxt "layers-action" msgid "Subtract the layer's alpha channel from the current selection" msgstr "Ta bort lagrets alfakanal från den aktuella markeringen" -#: ../app/actions/layers-actions.c:357 +#: ../app/actions/layers-actions.c:538 msgctxt "layers-action" msgid "Intersect the layer's alpha channel with the current selection" msgstr "Skär ut lagrets alfakanal med den aktuella markeringen" -#: ../app/actions/layers-actions.c:365 +#: ../app/actions/layers-actions.c:546 msgctxt "layers-action" msgid "Select _Top Layer" msgstr "Välj _översta lagret" -#: ../app/actions/layers-actions.c:366 +#: ../app/actions/layers-actions.c:547 msgctxt "layers-action" msgid "Select the topmost layer" msgstr "Välj det översta lagret" -#: ../app/actions/layers-actions.c:371 +#: ../app/actions/layers-actions.c:552 msgctxt "layers-action" msgid "Select _Bottom Layer" msgstr "Välj _nedersta lagret" -#: ../app/actions/layers-actions.c:372 +#: ../app/actions/layers-actions.c:553 msgctxt "layers-action" msgid "Select the bottommost layer" msgstr "Välj det nedersta lagret" -#: ../app/actions/layers-actions.c:377 +#: ../app/actions/layers-actions.c:558 msgctxt "layers-action" msgid "Select _Previous Layer" msgstr "Välj _föregående lager" -#: ../app/actions/layers-actions.c:378 +#: ../app/actions/layers-actions.c:559 msgctxt "layers-action" msgid "Select the layer above the current layer" msgstr "Välj lagret ovanför det aktuella lagret" -#: ../app/actions/layers-actions.c:383 +#: ../app/actions/layers-actions.c:564 msgctxt "layers-action" msgid "Select _Next Layer" msgstr "Välj _nästa lager" -#: ../app/actions/layers-actions.c:384 +#: ../app/actions/layers-actions.c:565 msgctxt "layers-action" msgid "Select the layer below the current layer" msgstr "Välj lagret under det aktuella lagret" +#: ../app/actions/layers-actions.c:573 +msgctxt "layers-action" +msgid "Layer Opacity: Set" +msgstr "Lageropacitet: Sätt" + +#: ../app/actions/layers-actions.c:577 +msgctxt "layers-action" +msgid "Layer Opacity: Make Completely Transparent" +msgstr "Lageropacitet: Gör helt transparent" + +#: ../app/actions/layers-actions.c:581 +msgctxt "layers-action" +msgid "Layer Opacity: Make Completely Opaque" +msgstr "Lageropacitet: Gör helt ogenomskinligt" + +#: ../app/actions/layers-actions.c:585 +msgctxt "layers-action" +msgid "Layer Opacity: Make More Transparent" +msgstr "Lageropacitet: Gör mer transparent" + +#: ../app/actions/layers-actions.c:589 +msgctxt "layers-action" +msgid "Layer Opacity: Make More Opaque" +msgstr "Lageropacitet: Gör mer ogenomskinligt" + +#: ../app/actions/layers-actions.c:593 +msgctxt "layers-action" +msgid "Layer Opacity: Make 10% More Transparent" +msgstr "Lageropacitet: Gör 10% mer transparent" + +#: ../app/actions/layers-actions.c:597 +msgctxt "layers-action" +msgid "Layer Opacity: Make 10% More Opaque" +msgstr "Lageropacitet: Gör 10% mer ogenomskinligt" + +#: ../app/actions/layers-actions.c:605 +msgctxt "layers-action" +msgid "Layer Mode: Select First" +msgstr "Lagerläge: Välj första" + +#: ../app/actions/layers-actions.c:609 +msgctxt "layers-action" +msgid "Layer Mode: Select Last" +msgstr "Lagerläge: Välj sista" + +#: ../app/actions/layers-actions.c:613 +msgctxt "layers-action" +msgid "Layer Mode: Select Previous" +msgstr "Lagerläge: Välj föregående" + +#: ../app/actions/layers-actions.c:617 +msgctxt "layers-action" +msgid "Layer Mode: Select Next" +msgstr "Lagerläge: Välj nästa" + #. Will be followed with e.g. "Shift-Click #. on thumbnail" #. -#: ../app/actions/layers-actions.c:465 +#: ../app/actions/layers-actions.c:646 msgid "Shortcut: " msgstr "Genväg: " #. Will be prepended with a modifier key #. string, e.g. "Shift" #. -#: ../app/actions/layers-actions.c:470 +#: ../app/actions/layers-actions.c:651 msgid "-Click on thumbnail in Layers dockable" msgstr "-Klicka på miniatyrbild i dockningsbara lager" -#: ../app/actions/layers-actions.c:630 ../app/actions/layers-actions.c:631 +#: ../app/actions/layers-actions.c:909 ../app/actions/layers-actions.c:910 msgctxt "layers-action" msgid "To _New Layer" msgstr "Till _nytt lager" -#: ../app/actions/layers-commands.c:213 +#: ../app/actions/layers-commands.c:259 ../app/actions/layers-commands.c:1418 msgid "Layer Attributes" msgstr "Lagerattribut" -#: ../app/actions/layers-commands.c:216 +#: ../app/actions/layers-commands.c:262 msgid "Edit Layer Attributes" msgstr "Redigera lagerattribut" -#: ../app/actions/layers-commands.c:265 ../app/actions/layers-commands.c:326 +#: ../app/actions/layers-commands.c:328 #: ../app/widgets/gimpdrawabletreeview.c:331 -#: ../app/widgets/gimplayertreeview.c:855 +#: ../app/widgets/gimplayertreeview.c:882 msgid "New Layer" msgstr "Nytt lager" -#: ../app/actions/layers-commands.c:268 +#: ../app/actions/layers-commands.c:331 msgid "Create a New Layer" msgstr "Skapa ett nytt lager" -#: ../app/actions/layers-commands.c:366 ../app/core/gimptoolinfo.c:82 +#: ../app/actions/layers-commands.c:420 ../app/core/gimptoolinfo.c:82 msgid "Visible" msgstr "Synlig" -#: ../app/actions/layers-commands.c:637 +#: ../app/actions/layers-commands.c:685 msgid "Set Layer Boundary Size" msgstr "Ställ in storlek på lagergräns" -#: ../app/actions/layers-commands.c:687 +#: ../app/actions/layers-commands.c:747 msgid "Scale Layer" msgstr "Skala lager" -#: ../app/actions/layers-commands.c:725 -#, fuzzy -#| msgctxt "image-action" -#| msgid "_Crop to Selection" +#: ../app/actions/layers-commands.c:789 msgid "Crop Layer to Selection" -msgstr "Besk_är till markering" +msgstr "Beskär lager till markering" -#: ../app/actions/layers-commands.c:754 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Lower Layer to Bottom" +#: ../app/actions/layers-commands.c:819 msgid "Crop Layer to Content" -msgstr "Sänk lager till nederst" +msgstr "Beskär lager till innehåll" -#: ../app/actions/layers-commands.c:766 -#, fuzzy -#| msgid "Cannot crop because the current selection is empty." +#: ../app/actions/layers-commands.c:832 msgid "Cannot crop because the active layer has no content." -msgstr "Kan inte beskära eftersom den aktuella markeringen är tom." +msgstr "Kan inte beskära eftersom det aktiva lagret inte har något innehåll." -#: ../app/actions/layers-commands.c:772 -#, fuzzy -#| msgid "Cannot crop because the current selection is empty." +#: ../app/actions/layers-commands.c:839 msgid "Cannot crop because the active layer is already cropped to its content." -msgstr "Kan inte beskära eftersom den aktuella markeringen är tom." - -#: ../app/actions/layers-commands.c:1196 -msgid "Please select a channel first" -msgstr "Välj en kanal först" +msgstr "" +"Kan inte beskära eftersom det aktiva lagret redan är beskuret till " +"innehållet." #: ../app/actions/mypaint-brushes-actions.c:43 -#, fuzzy -#| msgctxt "brushes-action" -#| msgid "Brushes Menu" msgctxt "mypaint-brushes-action" msgid "MyPaint Brushes Menu" -msgstr "Penselmeny" +msgstr "MyPaint-penselmeny" #: ../app/actions/mypaint-brushes-actions.c:47 -#, fuzzy -#| msgctxt "brushes-action" -#| msgid "_New Brush" msgctxt "mypaint-brushes-action" msgid "_New MyPaint Brush" -msgstr "_Ny pensel" +msgstr "_Ny MyPaint-pensel" #: ../app/actions/mypaint-brushes-actions.c:48 -#, fuzzy -#| msgctxt "brushes-action" -#| msgid "Create a new brush" msgctxt "mypaint-brushes-action" msgid "Create a new MyPaint brush" -msgstr "Skapa en ny pensel" +msgstr "Skapa en ny MyPaint-pensel" #: ../app/actions/mypaint-brushes-actions.c:53 -#, fuzzy -#| msgctxt "brushes-action" -#| msgid "D_uplicate Brush" msgctxt "mypaint-brushes-action" msgid "D_uplicate MyPaint Brush" -msgstr "Du_plicera pensel" +msgstr "Du_plicera MyPaint-pensel" #: ../app/actions/mypaint-brushes-actions.c:54 -#, fuzzy -#| msgctxt "brushes-action" -#| msgid "Duplicate this brush" msgctxt "mypaint-brushes-action" msgid "Duplicate this MyPaint brush" -msgstr "Duplicera denna pensel" +msgstr "Duplicera denna MyPaint-pensel" #: ../app/actions/mypaint-brushes-actions.c:59 -#, fuzzy -#| msgctxt "brushes-action" -#| msgid "Copy Brush _Location" msgctxt "mypaint-brushes-action" msgid "Copy MyPaint Brush _Location" -msgstr "Kopiera _penselplats" +msgstr "Kopiera MyPaint-pensel_plats" #: ../app/actions/mypaint-brushes-actions.c:60 -#, fuzzy -#| msgctxt "brushes-action" -#| msgid "Copy brush file location to clipboard" msgctxt "mypaint-brushes-action" msgid "Copy MyPaint brush file location to clipboard" -msgstr "Kopiera penselfilens plats till urklipp" +msgstr "Kopiera MyPaint-penselfilens plats till urklipp" #: ../app/actions/mypaint-brushes-actions.c:65 -#, fuzzy -#| msgid "Module Manager" msgctxt "mypaint-brushes-action" msgid "Show in _File Manager" -msgstr "Modulhanterare" +msgstr "Visa i _filhanterare" #: ../app/actions/mypaint-brushes-actions.c:66 -#, fuzzy -#| msgctxt "brushes-action" -#| msgid "Copy brush file location to clipboard" msgctxt "mypaint-brushes-action" msgid "Show MyPaint brush file location in the file manager" -msgstr "Kopiera penselfilens plats till urklipp" +msgstr "Visa MyPaint-penselfilens plats i filhanteraren" #: ../app/actions/mypaint-brushes-actions.c:71 -#, fuzzy -#| msgctxt "brushes-action" -#| msgid "_Delete Brush" msgctxt "mypaint-brushes-action" msgid "_Delete MyPaint Brush" -msgstr "_Ta bort pensel" +msgstr "_Ta bort MyPaint-pensel" #: ../app/actions/mypaint-brushes-actions.c:72 -#, fuzzy -#| msgctxt "brushes-action" -#| msgid "Delete this brush" msgctxt "mypaint-brushes-action" msgid "Delete this MyPaint brush" -msgstr "Ta bort denna pensel" +msgstr "Ta bort denna MyPaint-pensel" #: ../app/actions/mypaint-brushes-actions.c:77 -#, fuzzy -#| msgctxt "brushes-action" -#| msgid "_Refresh Brushes" msgctxt "mypaint-brushes-action" msgid "_Refresh MyPaint Brushes" -msgstr "_Uppdatera penslar" +msgstr "_Uppdatera MyPaint-penslar" #: ../app/actions/mypaint-brushes-actions.c:78 -#, fuzzy -#| msgctxt "brushes-action" -#| msgid "Refresh brushes" msgctxt "mypaint-brushes-action" msgid "Refresh MyPaint brushes" -msgstr "Uppdatera penslar" +msgstr "Uppdatera MyPaint-penslar" #: ../app/actions/mypaint-brushes-actions.c:86 -#, fuzzy -#| msgctxt "brushes-action" -#| msgid "_Edit Brush..." msgctxt "mypaint-brushes-action" msgid "_Edit MyPaint Brush..." -msgstr "R_edigera pensel..." +msgstr "R_edigera MyPaint-pensel…" #: ../app/actions/mypaint-brushes-actions.c:87 -#, fuzzy -#| msgctxt "brushes-action" -#| msgid "Edit this brush" msgctxt "mypaint-brushes-action" msgid "Edit MyPaint brush" -msgstr "Redigera denna pensel" +msgstr "Redigera MyPaint-pensel" #: ../app/actions/palette-editor-actions.c:44 msgctxt "palette-editor-action" @@ -5363,7 +7118,7 @@ msgstr "Palettredigeringsmeny" #: ../app/actions/palette-editor-actions.c:48 msgctxt "palette-editor-action" msgid "_Edit Color..." -msgstr "R_edigera färg..." +msgstr "R_edigera färg…" #: ../app/actions/palette-editor-actions.c:49 msgctxt "palette-editor-action" @@ -5417,11 +7172,11 @@ msgstr "Zooma _ut" msgid "Zoom _All" msgstr "_Zooma allt" -#: ../app/actions/palette-editor-commands.c:69 +#: ../app/actions/palette-editor-commands.c:70 msgid "Edit Palette Color" msgstr "Redigera palettfärg" -#: ../app/actions/palette-editor-commands.c:71 +#: ../app/actions/palette-editor-commands.c:72 msgid "Edit Color Palette Entry" msgstr "Redigera färgpalettpost" @@ -5443,7 +7198,7 @@ msgstr "Skapa en ny palett" #: ../app/actions/palettes-actions.c:54 msgctxt "palettes-action" msgid "_Import Palette..." -msgstr "_Importera palett..." +msgstr "_Importera palett…" #: ../app/actions/palettes-actions.c:55 msgctxt "palettes-action" @@ -5463,7 +7218,7 @@ msgstr "Duplicera denna palett" #: ../app/actions/palettes-actions.c:66 msgctxt "palettes-action" msgid "_Merge Palettes..." -msgstr "_Sammanfoga paletter..." +msgstr "_Sammanfoga paletter…" #: ../app/actions/palettes-actions.c:67 msgctxt "palettes-action" @@ -5481,19 +7236,14 @@ msgid "Copy palette file location to clipboard" msgstr "Kopiera palettfilens plats till urklipp" #: ../app/actions/palettes-actions.c:78 -#, fuzzy -#| msgid "Module Manager" msgctxt "palettes-action" msgid "Show in _File Manager" -msgstr "Modulhanterare" +msgstr "Visa i _filhanterare" #: ../app/actions/palettes-actions.c:79 -#, fuzzy -#| msgctxt "palettes-action" -#| msgid "Copy palette file location to clipboard" msgctxt "palettes-action" msgid "Show palette file location in the file manager" -msgstr "Kopiera palettfilens plats till urklipp" +msgstr "Visa palettfilens plats i filhanteraren" #: ../app/actions/palettes-actions.c:84 msgctxt "palettes-action" @@ -5518,23 +7268,24 @@ msgstr "Uppdatera paletter" #: ../app/actions/palettes-actions.c:99 msgctxt "palettes-action" msgid "_Edit Palette..." -msgstr "R_edigera palett..." +msgstr "R_edigera palett…" #: ../app/actions/palettes-actions.c:100 -#, fuzzy -#| msgctxt "palettes-action" -#| msgid "Edit palette" msgctxt "palettes-action" msgid "Edit this palette" -msgstr "Redigera palett" +msgstr "Redigera denna palett" -#: ../app/actions/palettes-commands.c:75 -msgid "Merge Palette" -msgstr "Sammanfoga palett" +#: ../app/actions/palettes-commands.c:83 +msgid "Merge Palettes" +msgstr "Sammanfoga paletter" -#: ../app/actions/palettes-commands.c:79 +#: ../app/actions/palettes-commands.c:87 msgid "Enter a name for the merged palette" -msgstr "Ange namn för den sammanfogade paletten" +msgstr "Ange ett namn för den sammanfogade paletten" + +#: ../app/actions/palettes-commands.c:123 +msgid "There must be at least two palettes selected to merge." +msgstr "Det måste finnas minst två paletter valda att sammanfoga." #: ../app/actions/patterns-actions.c:43 msgctxt "patterns-action" @@ -5582,19 +7333,14 @@ msgid "Copy pattern file location to clipboard" msgstr "Kopiera mönsterfilens plats till urklipp" #: ../app/actions/patterns-actions.c:71 -#, fuzzy -#| msgid "Module Manager" msgctxt "patterns-action" msgid "Show in _File Manager" -msgstr "Modulhanterare" +msgstr "Visa i _filhanterare" #: ../app/actions/patterns-actions.c:72 -#, fuzzy -#| msgctxt "patterns-action" -#| msgid "Copy pattern file location to clipboard" msgctxt "patterns-action" msgid "Show pattern file location in the file manager" -msgstr "Kopiera mönsterfilens plats till urklipp" +msgstr "Visa mönsterfilens plats i filhanteraren" #: ../app/actions/patterns-actions.c:77 msgctxt "patterns-action" @@ -5619,7 +7365,7 @@ msgstr "Uppdatera mönster" #: ../app/actions/patterns-actions.c:92 msgctxt "patterns-action" msgid "_Edit Pattern..." -msgstr "R_edigera mönster..." +msgstr "R_edigera mönster…" #: ../app/actions/patterns-actions.c:93 msgctxt "patterns-action" @@ -5636,11 +7382,24 @@ msgctxt "plug-in-action" msgid "Reset all plug-ins to their default settings" msgstr "Återställ alla insticksmoduler till deras standardinställningar" -#: ../app/actions/plug-in-commands.c:167 +#: ../app/actions/plug-in-commands.c:175 msgid "Reset all Filters" msgstr "Återställ alla filter" -#: ../app/actions/plug-in-commands.c:186 +#: ../app/actions/plug-in-commands.c:181 +#: ../app/actions/tool-options-commands.c:196 ../app/dialogs/fill-dialog.c:114 +#: ../app/dialogs/grid-dialog.c:101 ../app/dialogs/image-new-dialog.c:105 +#: ../app/dialogs/preferences-dialog.c:288 +#: ../app/dialogs/preferences-dialog.c:1099 +#: ../app/dialogs/print-size-dialog.c:123 ../app/dialogs/scale-dialog.c:136 +#: ../app/dialogs/stroke-dialog.c:127 +#: ../app/display/gimpdisplayshell-rotate-dialog.c:121 +#: ../app/tools/gimpfiltertool.c:322 ../app/tools/gimptransformtool.c:1214 +#: ../app/widgets/gimpcolordialog.c:109 +msgid "_Reset" +msgstr "_Återställ" + +#: ../app/actions/plug-in-commands.c:195 msgid "Do you really want to reset all filters to default values?" msgstr "Vill du verkligen återställa alla filter till standardvärden?" @@ -5652,7 +7411,7 @@ msgstr "Snabbmaskmeny" #: ../app/actions/quick-mask-actions.c:47 msgctxt "quick-mask-action" msgid "_Configure Color and Opacity..." -msgstr "_Konfigurera färg och opacitet..." +msgstr "_Konfigurera färg och opacitet…" #: ../app/actions/quick-mask-actions.c:55 msgctxt "quick-mask-action" @@ -5674,19 +7433,19 @@ msgctxt "quick-mask-action" msgid "Mask _Unselected Areas" msgstr "Maskera _omarkerade områden" -#: ../app/actions/quick-mask-commands.c:105 +#: ../app/actions/quick-mask-commands.c:122 msgid "Quick Mask Attributes" msgstr "Redigera snabbmaskattribut" -#: ../app/actions/quick-mask-commands.c:108 +#: ../app/actions/quick-mask-commands.c:125 msgid "Edit Quick Mask Attributes" msgstr "Redigera snabbmaskattribut" -#: ../app/actions/quick-mask-commands.c:110 +#: ../app/actions/quick-mask-commands.c:127 msgid "Edit Quick Mask Color" msgstr "Redigera snabbmaskfärg" -#: ../app/actions/quick-mask-commands.c:111 +#: ../app/actions/quick-mask-commands.c:128 msgid "_Mask opacity:" msgstr "_Maskopacitet:" @@ -5696,7 +7455,7 @@ msgstr "_Maskopacitet:" #: ../app/actions/sample-points-actions.c:40 msgctxt "sample-points-action" msgid "Sample Point Menu" -msgstr "Sampelpunktsmeny" +msgstr "Samplingspunktsmeny" #: ../app/actions/sample-points-actions.c:47 msgctxt "sample-points-action" @@ -5761,7 +7520,7 @@ msgstr "Skapa en flytande markering" #: ../app/actions/select-actions.c:74 msgctxt "select-action" msgid "Fea_ther..." -msgstr "Fj_äder..." +msgstr "Fj_ädra…" #: ../app/actions/select-actions.c:76 msgctxt "select-action" @@ -5781,7 +7540,7 @@ msgstr "Ta bort luddighet från markeringen" #: ../app/actions/select-actions.c:87 msgctxt "select-action" msgid "S_hrink..." -msgstr "För_minska..." +msgstr "För_minska…" #: ../app/actions/select-actions.c:88 msgctxt "select-action" @@ -5791,7 +7550,7 @@ msgstr "Förminska markeringen" #: ../app/actions/select-actions.c:93 msgctxt "select-action" msgid "_Grow..." -msgstr "Först_ora..." +msgstr "Först_ora…" #: ../app/actions/select-actions.c:94 msgctxt "select-action" @@ -5801,7 +7560,7 @@ msgstr "Förstora markeringen" #: ../app/actions/select-actions.c:99 msgctxt "select-action" msgid "Bo_rder..." -msgstr "Kan_t..." +msgstr "Kan_t…" #: ../app/actions/select-actions.c:100 msgctxt "select-action" @@ -5809,19 +7568,14 @@ msgid "Replace the selection by its border" msgstr "Ersätt markeringen med dess kant" #: ../app/actions/select-actions.c:105 -#, fuzzy -#| msgid "Remove Controller" msgctxt "select-action" msgid "Re_move Holes" -msgstr "Ta bort enheten" +msgstr "Ta _bort hålen" #: ../app/actions/select-actions.c:106 -#, fuzzy -#| msgctxt "select-action" -#| msgid "Remove fuzziness from the selection" msgctxt "select-action" msgid "Remove holes from the selection" -msgstr "Ta bort luddighet från markeringen" +msgstr "Ta bort hålen från markeringen" #: ../app/actions/select-actions.c:111 msgctxt "select-action" @@ -5834,41 +7588,29 @@ msgid "Save the selection to a channel" msgstr "Spara markeringen till en kanal" #: ../app/actions/select-actions.c:117 -#, fuzzy -#| msgctxt "view-action" -#| msgid "Display the selection outline" msgctxt "select-action" msgid "_Fill Selection Outline..." -msgstr "Visa markeringens kontur" +msgstr "_Fyll markeringens kontur…" #: ../app/actions/select-actions.c:118 -#, fuzzy -#| msgctxt "view-action" -#| msgid "Display the selection outline" msgctxt "select-action" msgid "Fill the selection outline" -msgstr "Visa markeringens kontur" +msgstr "Fyll markeringskonturen" #: ../app/actions/select-actions.c:123 -#, fuzzy -#| msgctxt "view-action" -#| msgid "Display the selection outline" msgctxt "select-action" msgid "_Fill Selection Outline" -msgstr "Visa markeringens kontur" +msgstr "_Fyll markeringskontur" #: ../app/actions/select-actions.c:124 -#, fuzzy -#| msgctxt "select-action" -#| msgid "Stroke the selection with last used values" msgctxt "select-action" msgid "Fill the selection outline with last used values" -msgstr "Stryk längs markering med senast använda värden" +msgstr "Fyll markeringskonturen med senast använda värden" #: ../app/actions/select-actions.c:129 msgctxt "select-action" msgid "_Stroke Selection..." -msgstr "_Stryk längs markering..." +msgstr "_Stryk längs markering…" #: ../app/actions/select-actions.c:130 msgctxt "select-action" @@ -5885,82 +7627,63 @@ msgctxt "select-action" msgid "Stroke the selection with last used values" msgstr "Stryk längs markering med senast använda värden" -#: ../app/actions/select-commands.c:158 +#: ../app/actions/select-commands.c:156 msgid "Feather Selection" msgstr "Fjädra markering" -#: ../app/actions/select-commands.c:162 +#: ../app/actions/select-commands.c:160 msgid "Feather selection by" -msgstr "Fjädermarkera med" +msgstr "Fjädra markering med" -#: ../app/actions/select-commands.c:211 +#: ../app/actions/select-commands.c:216 msgid "Shrink Selection" msgstr "Krymp markering" -#: ../app/actions/select-commands.c:215 +#: ../app/actions/select-commands.c:220 msgid "Shrink selection by" msgstr "Krymp markering med" #. Edge lock button -#: ../app/actions/select-commands.c:224 ../app/actions/select-commands.c:334 -#, fuzzy -#| msgid "Select a single contiguous area" +#: ../app/actions/select-commands.c:230 ../app/actions/select-commands.c:356 msgid "_Selected areas continue outside the image" -msgstr "Markera ett enda sammanhängande område" +msgstr "_Valda områden fortsätter utanför bilden" -#: ../app/actions/select-commands.c:227 +#: ../app/actions/select-commands.c:233 msgid "When shrinking, act as if selected areas continued outside the image." msgstr "" +"Vid förminskning, agera som om markerade områden fortsätter utanför bilden." -#: ../app/actions/select-commands.c:265 +#: ../app/actions/select-commands.c:278 msgid "Grow Selection" -msgstr "Öka markering" +msgstr "Väx markering" -#: ../app/actions/select-commands.c:269 +#: ../app/actions/select-commands.c:282 msgid "Grow selection by" -msgstr "Öka markering med" +msgstr "Väx markering med" -#: ../app/actions/select-commands.c:308 +#: ../app/actions/select-commands.c:329 msgid "Border Selection" msgstr "Kantmarkering" -#: ../app/actions/select-commands.c:312 +#: ../app/actions/select-commands.c:333 msgid "Border selection by" msgstr "Kantmarkering med" -#: ../app/actions/select-commands.c:323 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Reorder item" +#: ../app/actions/select-commands.c:345 msgid "Border style" -msgstr "Ordna om objekt" +msgstr "Kantstil" -#: ../app/actions/select-commands.c:337 +# sebras: Har jag tolkat bordering rätt? +#: ../app/actions/select-commands.c:359 msgid "When bordering, act as if selected areas continued outside the image." msgstr "" +"Om intilliggande, agera som om markerade områden fortsätter utanför bilden." -#: ../app/actions/select-commands.c:400 ../app/actions/select-commands.c:441 -#: ../app/actions/vectors-commands.c:397 ../app/actions/vectors-commands.c:440 -#: ../app/dialogs/fill-dialog.c:163 -#, fuzzy -#| msgid "There is no active layer or channel to cut from." -msgid "There is no active layer or channel to fill." -msgstr "Det finns inget aktivt lager eller kanal att klippa ifrån." - -#: ../app/actions/select-commands.c:412 -#, fuzzy -#| msgctxt "view-action" -#| msgid "Display the selection outline" +#: ../app/actions/select-commands.c:423 msgid "Fill Selection Outline" -msgstr "Visa markeringens kontur" +msgstr "Fyll markeringskontur" -#: ../app/actions/select-commands.c:478 ../app/actions/select-commands.c:521 -#: ../app/actions/vectors-commands.c:477 ../app/actions/vectors-commands.c:521 -#: ../app/dialogs/stroke-dialog.c:282 -msgid "There is no active layer or channel to stroke to." -msgstr "Det finns inget aktivt lager eller kanal att stryka till." - -#: ../app/actions/select-commands.c:490 +#: ../app/actions/select-commands.c:452 msgid "Stroke Selection" msgstr "Stryk längs markering" @@ -5982,7 +7705,7 @@ msgstr "Skapa en ny bild från den valda mallen" #: ../app/actions/templates-actions.c:52 msgctxt "templates-action" msgid "_New Template..." -msgstr "_Ny mall..." +msgstr "_Ny mall…" #: ../app/actions/templates-actions.c:53 msgctxt "templates-action" @@ -5992,7 +7715,7 @@ msgstr "Skapa en ny mall" #: ../app/actions/templates-actions.c:58 msgctxt "templates-action" msgid "D_uplicate Template..." -msgstr "_Duplicera mall..." +msgstr "_Duplicera mall…" #: ../app/actions/templates-actions.c:59 msgctxt "templates-action" @@ -6002,7 +7725,7 @@ msgstr "Duplicera denna mall" #: ../app/actions/templates-actions.c:64 msgctxt "templates-action" msgid "_Edit Template..." -msgstr "R_edigera mall..." +msgstr "R_edigera mall…" #: ../app/actions/templates-actions.c:65 msgctxt "templates-action" @@ -6019,29 +7742,33 @@ msgctxt "templates-action" msgid "Delete this template" msgstr "Ta bort denna mall" -#: ../app/actions/templates-commands.c:120 +#: ../app/actions/templates-commands.c:131 msgid "New Template" msgstr "Ny mall" -#: ../app/actions/templates-commands.c:123 +#: ../app/actions/templates-commands.c:134 msgid "Create a New Template" msgstr "Skapa en ny mall" -#: ../app/actions/templates-commands.c:183 -#: ../app/actions/templates-commands.c:186 +#: ../app/actions/templates-commands.c:201 +#: ../app/actions/templates-commands.c:204 msgid "Edit Template" msgstr "Redigera mall" -#: ../app/actions/templates-commands.c:221 +#: ../app/actions/templates-commands.c:240 msgid "Delete Template" msgstr "Ta bort mall" -#: ../app/actions/templates-commands.c:247 +#: ../app/actions/templates-commands.c:245 +#: ../app/dialogs/data-delete-dialog.c:87 ../app/widgets/gimpdeviceeditor.c:509 +msgid "_Delete" +msgstr "_Ta bort" + +#: ../app/actions/templates-commands.c:266 #, c-format msgid "" "Are you sure you want to delete template '%s' from the list and from disk?" -msgstr "" -"Är du säker att du vill ta bort mallen \"%s\" från listan och från disk?" +msgstr "Är du säker att du vill ta bort mallen ”%s” från listan och från disk?" #: ../app/actions/text-editor-actions.c:44 msgctxt "text-editor-action" @@ -6083,20 +7810,29 @@ msgctxt "text-editor-action" msgid "From right to left" msgstr "Från höger till vänster" -#: ../app/actions/text-editor-commands.c:63 -#: ../app/actions/text-tool-commands.c:118 +#: ../app/actions/text-editor-commands.c:60 +#: ../app/actions/text-tool-commands.c:114 msgid "Open Text File (UTF-8)" msgstr "Öppna textfil (UTF-8)" -#: ../app/actions/text-editor-commands.c:144 -#: ../app/actions/text-tool-commands.c:217 ../app/config/gimpconfig-file.c:71 -#: ../app/core/gimppalette-import.c:506 ../app/plug-in/gimpenvirontable.c:289 +#: ../app/actions/text-editor-commands.c:65 +#: ../app/actions/text-tool-commands.c:119 +#: ../app/dialogs/file-open-location-dialog.c:81 +#: ../app/dialogs/vectors-import-dialog.c:89 +#: ../app/widgets/gimpiconpicker.c:489 ../app/widgets/gimpopendialog.c:69 +#: ../app/widgets/gimpsettingsbox.c:736 +msgid "_Open" +msgstr "_Öppna" + +#: ../app/actions/text-editor-commands.c:139 +#: ../app/actions/text-tool-commands.c:209 ../app/config/gimpconfig-file.c:71 +#: ../app/core/gimppalette-import.c:512 ../app/plug-in/gimpenvirontable.c:289 #: ../app/plug-in/gimpinterpreterdb.c:233 -#: ../app/tools/gimpfiltertool-settings.c:168 -#: ../app/widgets/gimptextbuffer.c:1647 +#: ../app/tools/gimpfiltertool-settings.c:170 +#: ../app/widgets/gimptextbuffer.c:1674 #, c-format msgid "Could not open '%s' for reading: %s" -msgstr "Kunde inte öppna \"%s\" för läsning: %s" +msgstr "Kunde inte öppna ”%s” för läsning: %s" #: ../app/actions/text-tool-actions.c:50 msgctxt "text-tool-action" @@ -6131,7 +7867,7 @@ msgstr "_Ta bort" #: ../app/actions/text-tool-actions.c:78 msgctxt "text-tool-action" msgid "_Open text file..." -msgstr "_Öppna textfil..." +msgstr "_Öppna textfil…" #: ../app/actions/text-tool-actions.c:83 msgctxt "text-tool-action" @@ -6181,27 +7917,27 @@ msgstr "Meny för verktygsalternativ" #: ../app/actions/tool-options-actions.c:61 msgctxt "tool-options-action" msgid "_Save Tool Preset" -msgstr "_Spara verktygsförval" +msgstr "_Spara verktygsförinställning" #: ../app/actions/tool-options-actions.c:65 msgctxt "tool-options-action" msgid "_Restore Tool Preset" -msgstr "Åte_rställ verktygsförval" +msgstr "Åte_rställ verktygsförinställning" #: ../app/actions/tool-options-actions.c:69 msgctxt "tool-options-action" msgid "E_dit Tool Preset" -msgstr "Re_digera verktygsförval" +msgstr "Re_digera verktygsförinställning" #: ../app/actions/tool-options-actions.c:73 msgctxt "tool-options-action" msgid "_Delete Tool Preset" -msgstr "Ta bort verktygsf_örval" +msgstr "Ta bort verktygsf_örinställning" #: ../app/actions/tool-options-actions.c:77 msgctxt "tool-options-action" msgid "_New Tool Preset..." -msgstr "_Nytt verktygsförval..." +msgstr "_Ny verktygsförinställning…" #: ../app/actions/tool-options-actions.c:82 msgctxt "tool-options-action" @@ -6227,116 +7963,143 @@ msgstr "Återställ alla verktygsalternativ" msgid "Reset All Tool Options" msgstr "Återställ alla verktygsalternativ" -#: ../app/actions/tool-options-commands.c:211 +#: ../app/actions/tool-options-commands.c:212 msgid "Do you really want to reset all tool options to default values?" msgstr "" "Vill du verkligen återställa alla verktygsalternativ till standardvärden?" -#: ../app/actions/tool-preset-editor-actions.c:43 +#: ../app/actions/tool-preset-editor-actions.c:44 msgctxt "tool-preset-editor-action" msgid "Tool Preset Editor Menu" -msgstr "Verktygsförvalsredigeringsmeny" +msgstr "Verktygsförinställningsredigeringsmeny" -#: ../app/actions/tool-preset-editor-actions.c:51 +#: ../app/actions/tool-preset-editor-actions.c:48 +msgctxt "tool-preset-editor-action" +msgid "_Save Tool Options to Preset" +msgstr "_Spara verktygsalternativ till förinställning" + +#: ../app/actions/tool-preset-editor-actions.c:49 +msgctxt "tool-preset-editor-action" +msgid "Save the active tool options to this tool preset" +msgstr "Spara aktiva verktygsalternativ till denna verktygsförinställning" + +#: ../app/actions/tool-preset-editor-actions.c:55 +msgctxt "tool-preset-editor-action" +msgid "_Restore Tool Preset" +msgstr "Åte_rställ verktygsförinställning" + +#: ../app/actions/tool-preset-editor-actions.c:56 +msgctxt "tool-preset-editor-action" +msgid "Restore this tool preset" +msgstr "Ta bort denna verktygsförinställning" + +#: ../app/actions/tool-preset-editor-actions.c:65 msgctxt "tool-preset-editor-action" msgid "Edit Active Tool Preset" -msgstr "Redigera aktivt verktygsförval" +msgstr "Redigera aktiv verktygsförinställning" + +#: ../app/actions/tool-preset-editor-commands.c:64 +#: ../app/actions/tool-presets-commands.c:67 +#, c-format +msgid "Can't save '%s' tool options to an existing '%s' tool preset." +msgstr "" +"Kan inte spara ”%s” verktygsinställningar till en befintlig ”%s” " +"verktygsförinställning." #: ../app/actions/tool-presets-actions.c:46 msgctxt "tool-presets-action" msgid "Tool Presets Menu" -msgstr "Verktygsförvalsmeny" +msgstr "Verktygsförinställningsmeny" #: ../app/actions/tool-presets-actions.c:50 msgctxt "tool-presets-action" msgid "_New Tool Preset" -msgstr "_Nytt verktygsförval" +msgstr "_Ny verktygsförinställning" #: ../app/actions/tool-presets-actions.c:51 msgctxt "tool-presets-action" msgid "Create a new tool preset" -msgstr "Skapa ett nytt verktygsförval" +msgstr "Skapa en ny verktygsförinställning" #: ../app/actions/tool-presets-actions.c:56 msgctxt "tool-presets-action" msgid "D_uplicate Tool Preset" -msgstr "D_uplicera verktygsförval" +msgstr "D_uplicera verktygsförinställning" #: ../app/actions/tool-presets-actions.c:57 msgctxt "tool-presets-action" msgid "Duplicate this tool preset" -msgstr "Duplicera detta verktygsförval" +msgstr "Duplicera denna verktygsförinställning" #: ../app/actions/tool-presets-actions.c:62 msgctxt "tool-presets-action" msgid "Copy Tool Preset _Location" -msgstr "Kopiera verktygsförva_lplats" +msgstr "Kopiera verktygsförinstä_llningsplats" #: ../app/actions/tool-presets-actions.c:63 msgctxt "tool-presets-action" msgid "Copy tool preset file location to clipboard" -msgstr "Kopiera verktygsförvalsfilens plats till urklipp" +msgstr "Kopiera verktygsförinställningsfilens plats till urklipp" #: ../app/actions/tool-presets-actions.c:68 -#, fuzzy -#| msgid "Module Manager" msgctxt "tool-presets-action" msgid "Show in _File Manager" -msgstr "Modulhanterare" +msgstr "Visa i _filhanterare" #: ../app/actions/tool-presets-actions.c:69 -#, fuzzy -#| msgctxt "tool-presets-action" -#| msgid "Copy tool preset file location to clipboard" msgctxt "tool-presets-action" msgid "Show tool preset file location in the file manager" -msgstr "Kopiera verktygsförvalsfilens plats till urklipp" +msgstr "Visa verktygsförinställningsfilens plats i filhanteraren" #: ../app/actions/tool-presets-actions.c:74 -#, fuzzy -#| msgctxt "tool-options-action" -#| msgid "_Restore Tool Preset" msgctxt "tool-presets-action" -msgid "_Restore Tool Preset" -msgstr "Åte_rställ verktygsförval" +msgid "_Save Tool Options to Preset" +msgstr "_Spara verktygsalternativ till förinställning" #: ../app/actions/tool-presets-actions.c:75 -#, fuzzy -#| msgctxt "tool-presets-action" -#| msgid "Delete this tool preset" msgctxt "tool-presets-action" -msgid "Restore this tool preset" -msgstr "Ta bort detta verktygsförval" - -#: ../app/actions/tool-presets-actions.c:80 -msgctxt "tool-presets-action" -msgid "_Delete Tool Preset" -msgstr "Ta bort verkty_gsförval" +msgid "Save the active tool options to this tool preset" +msgstr "Spara aktiva verktygsalternativ till denna verktygsförinställning" #: ../app/actions/tool-presets-actions.c:81 msgctxt "tool-presets-action" -msgid "Delete this tool preset" -msgstr "Ta bort detta verktygsförval" +msgid "_Restore Tool Preset" +msgstr "Åte_rställ verktygsförinställning" -#: ../app/actions/tool-presets-actions.c:86 +#: ../app/actions/tool-presets-actions.c:82 msgctxt "tool-presets-action" -msgid "_Refresh Tool Presets" -msgstr "Uppdatera ve_rktygsförval" +msgid "Restore this tool preset" +msgstr "Ta bort denna verktygsförinställning" #: ../app/actions/tool-presets-actions.c:87 msgctxt "tool-presets-action" -msgid "Refresh tool presets" -msgstr "Uppdatera verktygsförval" +msgid "_Delete Tool Preset" +msgstr "Ta bort verkty_gsförinställning" -#: ../app/actions/tool-presets-actions.c:95 +#: ../app/actions/tool-presets-actions.c:88 +msgctxt "tool-presets-action" +msgid "Delete this tool preset" +msgstr "Ta bort denna verktygsförinställning" + +#: ../app/actions/tool-presets-actions.c:93 +msgctxt "tool-presets-action" +msgid "_Refresh Tool Presets" +msgstr "Uppdatera ve_rktygsförinställning" + +#: ../app/actions/tool-presets-actions.c:94 +msgctxt "tool-presets-action" +msgid "Refresh tool presets" +msgstr "Uppdatera verktygsförinställning" + +#: ../app/actions/tool-presets-actions.c:102 msgctxt "tool-presets-action" msgid "_Edit Tool Preset..." -msgstr "R_edigera verktygsförval..." +msgstr "R_edigera verktygsförinställning…" -#: ../app/actions/tool-presets-actions.c:96 +#: ../app/actions/tool-presets-actions.c:103 msgctxt "tool-presets-action" msgid "Edit this tool preset" -msgstr "Redigera detta verktygsförval" +msgstr "Redigera denna verktygsförinställning" #: ../app/actions/tools-actions.c:46 msgctxt "tools-action" @@ -6376,312 +8139,857 @@ msgstr "Markera regioner med liknande färger" #: ../app/actions/tools-actions.c:62 msgctxt "tools-action" msgid "_Arbitrary Rotation..." -msgstr "_Godtycklig rotering..." +msgstr "_Godtycklig rotering…" #: ../app/actions/tools-actions.c:63 msgctxt "tools-action" msgid "Rotate by an arbitrary angle" msgstr "Rotera med en godtycklig vinkel" -#: ../app/actions/vectors-actions.c:44 +#: ../app/actions/tools-actions.c:151 +msgctxt "tools-action" +msgid "Airbrush Rate: Set" +msgstr "Hastighet för färgspruta: Ställ in" + +#: ../app/actions/tools-actions.c:155 +msgctxt "tools-action" +msgid "Airbrush Rate: Set to Minimum" +msgstr "Hastighet för färgspruta: Ställ in på minimum" + +#: ../app/actions/tools-actions.c:159 +msgctxt "tools-action" +msgid "Airbrush Rate: Set to Maximum" +msgstr "Hastighet för färgspruta: Ställ in på maximum" + +#: ../app/actions/tools-actions.c:163 +msgctxt "tools-action" +msgid "Airbrush Rate: Decrease by 1" +msgstr "Hastighet för färgspruta: Minska med 1" + +#: ../app/actions/tools-actions.c:167 +msgctxt "tools-action" +msgid "Airbrush Rate: Increase by 1" +msgstr "Hastighet för färgspruta: Öka med 1" + +#: ../app/actions/tools-actions.c:171 +msgctxt "tools-action" +msgid "Airbrush Rate: Decrease by 10" +msgstr "Hastighet för färgspruta: Minska med 10" + +#: ../app/actions/tools-actions.c:175 +msgctxt "tools-action" +msgid "Airbrush Rate: Increase by 10" +msgstr "Hastighet för färgspruta: Öka med 10" + +#: ../app/actions/tools-actions.c:183 +msgctxt "tools-action" +msgid "Airbrush Flow: Set" +msgstr "Flöde för färgspruta: Ställ in" + +#: ../app/actions/tools-actions.c:187 +msgctxt "tools-action" +msgid "Airbrush Flow: Set to Minimum" +msgstr "Flöde för färgspruta: Ställ in på minimum" + +#: ../app/actions/tools-actions.c:191 +msgctxt "tools-action" +msgid "Airbrush Flow: Set to Maximum" +msgstr "Flöde för färgspruta: Ställ in på maximum" + +#: ../app/actions/tools-actions.c:195 +msgctxt "tools-action" +msgid "Airbrush Flow: Decrease by 1" +msgstr "Flöde för färgspruta: Minska med 1" + +#: ../app/actions/tools-actions.c:199 +msgctxt "tools-action" +msgid "Airbrush Flow: Increase by 1" +msgstr "Flöde för färgspruta: Öka med 1" + +#: ../app/actions/tools-actions.c:203 +msgctxt "tools-action" +msgid "Airbrush Flow: Decrease by 10" +msgstr "Flöde för färgspruta: Minska med 10" + +#: ../app/actions/tools-actions.c:207 +msgctxt "tools-action" +msgid "Airbrush Flow: Increase by 10" +msgstr "Flöde för färgspruta: Öka med 10" + +#: ../app/actions/tools-actions.c:264 +msgctxt "tools-action" +msgid "Tool's Opacity: Set" +msgstr "Verktygsopacitet: Ställ in" + +#: ../app/actions/tools-actions.c:268 +msgctxt "tools-action" +msgid "Tool's Opacity: Set to Default Value" +msgstr "Verktygsopacitet: Ställ in på standardvärde" + +#: ../app/actions/tools-actions.c:272 +msgctxt "tools-action" +msgid "Tool's Opacity: Minimize" +msgstr "Verktygsopacitet: Minimera" + +#: ../app/actions/tools-actions.c:276 +msgctxt "tools-action" +msgid "Tool's Opacity: Maximize" +msgstr "Verktygsopacitet: Maximera" + +#: ../app/actions/tools-actions.c:280 +msgctxt "tools-action" +msgid "Tool's Opacity: Decrease by 1" +msgstr "Verktygsopacitet: Minska med 1" + +#: ../app/actions/tools-actions.c:284 +msgctxt "tools-action" +msgid "Tool's Opacity: Increase by 1" +msgstr "Verktygsopacitet: Öka med 1" + +#: ../app/actions/tools-actions.c:288 +msgctxt "tools-action" +msgid "Tool's Opacity: Decrease by 10" +msgstr "Verktygsopacitet: Minska med 10" + +#: ../app/actions/tools-actions.c:292 +msgctxt "tools-action" +msgid "Tool's Opacity: Increase by 10" +msgstr "Verktygsopacitet: Öka med 10" + +#: ../app/actions/tools-actions.c:296 +msgctxt "tools-action" +msgid "Tool's Opacity: Decrease Relative" +msgstr "Verktygsopacitet: Minska relativt" + +#: ../app/actions/tools-actions.c:300 +msgctxt "tools-action" +msgid "Tool's Opacity: Increase Relative" +msgstr "Verktygsopacitet: Öka relativt" + +#: ../app/actions/tools-actions.c:308 +msgctxt "tools-action" +msgid "Tool's Size: Set" +msgstr "Verktygsstorlek: Ställ in" + +#: ../app/actions/tools-actions.c:312 +msgctxt "tools-action" +msgid "Tool's Size: Set to Default Value" +msgstr "Verktygsstorlek: Ställ in till standardvärde" + +#: ../app/actions/tools-actions.c:316 +msgctxt "tools-action" +msgid "Tool's Size: Minimize" +msgstr "Verktygsstorlek: Minimera" + +#: ../app/actions/tools-actions.c:320 +msgctxt "tools-action" +msgid "Tool's Size: Maximize" +msgstr "Verktygsstorlek: Maximera" + +#: ../app/actions/tools-actions.c:324 +msgctxt "tools-action" +msgid "Tool's Size: Decrease by 1" +msgstr "Verktygsstorlek: Minska med 1" + +#: ../app/actions/tools-actions.c:328 +msgctxt "tools-action" +msgid "Tool's Size: Increase by 1" +msgstr "Verktygsstorlek: Öka med 1" + +#: ../app/actions/tools-actions.c:332 +msgctxt "tools-action" +msgid "Tool's Size: Decrease by 10" +msgstr "Verktygsstorlek: Minska med 10" + +#: ../app/actions/tools-actions.c:336 +msgctxt "tools-action" +msgid "Tool's Size: Increase by 10" +msgstr "Verktygsstorlek: Öka med 10" + +#: ../app/actions/tools-actions.c:340 +msgctxt "tools-action" +msgid "Tool's Size: Decrease Relative" +msgstr "Verktygsstorlek: Minska relativt" + +#: ../app/actions/tools-actions.c:344 +msgctxt "tools-action" +msgid "Tool's Size: Increase Relative" +msgstr "Verktygsstorlek: Öka relativt" + +#: ../app/actions/tools-actions.c:352 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Set" +msgstr "Verktygets bildförhållande: Ställ in" + +#: ../app/actions/tools-actions.c:356 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Set To Default Value" +msgstr "Verktygets bildförhållande: Ställ in till standardvärde" + +#: ../app/actions/tools-actions.c:360 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Minimize" +msgstr "Verktygets bildförhållande: Minimera" + +#: ../app/actions/tools-actions.c:364 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Maximize" +msgstr "Verktygets bildförhållande: Maximera" + +#: ../app/actions/tools-actions.c:368 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Decrease by 0.1" +msgstr "Verktygets bildförhållande: Minska med 0,1" + +#: ../app/actions/tools-actions.c:372 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Increase by 0.1" +msgstr "Verktygets bildförhållande: Öka med 0,1" + +#: ../app/actions/tools-actions.c:376 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Decrease by 1" +msgstr "Verktygets bildförhållande: Minska med 1" + +#: ../app/actions/tools-actions.c:380 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Increase by 1" +msgstr "Verktygets bildförhållande: Öka med 1" + +#: ../app/actions/tools-actions.c:384 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Decrease Relative" +msgstr "Verktygets bildförhållande: Minska relativt" + +#: ../app/actions/tools-actions.c:388 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Increase Relative" +msgstr "Verktygets bildförhållande: Öka relativt" + +#: ../app/actions/tools-actions.c:396 +msgctxt "tools-action" +msgid "Tool's Angle: Set" +msgstr "Verktygsvinkel: Ställ in" + +#: ../app/actions/tools-actions.c:400 +msgctxt "tools-action" +msgid "Tool's Angle: Set Angle To Default Value" +msgstr "Verktygsvinkel: Ställ in vinkel till standardvärde" + +#: ../app/actions/tools-actions.c:404 +msgctxt "tools-action" +msgid "Tool's Angle: Minimize" +msgstr "Verktygsvinkel: Minimera" + +#: ../app/actions/tools-actions.c:408 +msgctxt "tools-action" +msgid "Tool's Angle: Maximize" +msgstr "Verktygsvinkel: Maximera" + +#: ../app/actions/tools-actions.c:412 +msgctxt "tools-action" +msgid "Tool's Angle: Decrease by 1°" +msgstr "Verktygsvinkel: Minska med 1°" + +#: ../app/actions/tools-actions.c:416 +msgctxt "tools-action" +msgid "Tool's Angle: Increase by 1°" +msgstr "Verktygsvinkel: Öka med 1°" + +#: ../app/actions/tools-actions.c:420 +msgctxt "tools-action" +msgid "Tool's Angle: Decrease by 15°" +msgstr "Verktygsvinkel: Minska med 15°" + +#: ../app/actions/tools-actions.c:424 +msgctxt "tools-action" +msgid "Tool's Angle: Increase by 15°" +msgstr "Verktygsvinkel: Öka med 15°" + +#: ../app/actions/tools-actions.c:428 +msgctxt "tools-action" +msgid "Tool's Angle: Decrease Relative" +msgstr "Verktygsvinkel: Minska relativt" + +#: ../app/actions/tools-actions.c:432 +msgctxt "tools-action" +msgid "Tool's Angle: Increase Relative" +msgstr "Verktygsvinkel: Öka relativt" + +#: ../app/actions/tools-actions.c:440 +msgctxt "tools-action" +msgid "Tool's Spacing: Set" +msgstr "Verktygsmellanrum: Ställ in" + +#: ../app/actions/tools-actions.c:444 +msgctxt "tools-action" +msgid "Tool's Spacing: Set To Default Value" +msgstr "Verktygsmellanrum: Ställ in till standardvärde" + +#: ../app/actions/tools-actions.c:448 +msgctxt "tools-action" +msgid "Tool's Spacing: Minimize" +msgstr "Verktygsmellanrum: Minimera" + +#: ../app/actions/tools-actions.c:452 +msgctxt "tools-action" +msgid "Tool's Spacing: Maximize" +msgstr "Verktygsmellanrum: Maximera" + +#: ../app/actions/tools-actions.c:456 +msgctxt "tools-action" +msgid "Tool's Spacing: Decrease by 1" +msgstr "Verktygsmellanrum: Minska med 1" + +#: ../app/actions/tools-actions.c:460 +msgctxt "tools-action" +msgid "Tool's Spacing: Increase by 1" +msgstr "Verktygsmellanrum: Öka med 1" + +#: ../app/actions/tools-actions.c:464 +msgctxt "tools-action" +msgid "Tool's Spacing: Decrease by 10" +msgstr "Verktygsmellanrum: Minska med 10" + +#: ../app/actions/tools-actions.c:468 +msgctxt "tools-action" +msgid "Tool's Spacing: Increase by 10" +msgstr "Verktygsmellanrum: Öka med 10" + +#: ../app/actions/tools-actions.c:472 +msgctxt "tools-action" +msgid "Tool's Spacing: Decrease Relative" +msgstr "Verktygsmellanrum: Minska relativt" + +#: ../app/actions/tools-actions.c:476 +msgctxt "tools-action" +msgid "Tool's Spacing: Increase Relative" +msgstr "Verktygsmellanrum: Öka relativt" + +#: ../app/actions/tools-actions.c:484 +msgctxt "tools-action" +msgid "Tool's Hardness: Set" +msgstr "Verktygshårdhet: Ställ in" + +#: ../app/actions/tools-actions.c:488 +msgctxt "tools-action" +msgid "Tool's Hardness: Set to Default Value" +msgstr "Verktygshårdhet: Ställ in till standardvärde" + +#: ../app/actions/tools-actions.c:492 +msgctxt "tools-action" +msgid "Tool's Hardness: Minimize" +msgstr "Verktygshårdhet: Minimera" + +#: ../app/actions/tools-actions.c:496 +msgctxt "tools-action" +msgid "Tool's Hardness: Maximize" +msgstr "Verktygshårdhet: Maximera" + +#: ../app/actions/tools-actions.c:500 +msgctxt "tools-action" +msgid "Tool's Hardness: Decrease by 1" +msgstr "Verktygshårdhet: Minska med 1" + +#: ../app/actions/tools-actions.c:504 +msgctxt "tools-action" +msgid "Tool's Hardness: Increase by 1" +msgstr "Verktygshårdhet: Öka med 1" + +#: ../app/actions/tools-actions.c:508 +msgctxt "tools-action" +msgid "Tool's Hardness: Decrease by 10" +msgstr "Verktygshårdhet: Minska med 10" + +#: ../app/actions/tools-actions.c:512 +msgctxt "tools-action" +msgid "Tool's Hardness: Increase by 10" +msgstr "Verktygshårdhet: Öka med 10" + +#: ../app/actions/tools-actions.c:516 +msgctxt "tools-action" +msgid "Tool's Hardness: Decrease Relative" +msgstr "Verktygshårdhet: Minska relativt" + +#: ../app/actions/tools-actions.c:520 +msgctxt "tools-action" +msgid "Tool's Hardness: Increase Relative" +msgstr "Verktygshårdhet: Öka relativt" + +#: ../app/actions/tools-actions.c:528 +msgctxt "tools-action" +msgid "Tool's Force: Set" +msgstr "Verktygskraft: Ställ in" + +#: ../app/actions/tools-actions.c:532 +msgctxt "tools-action" +msgid "Tool's Force: Set to Default Value" +msgstr "Verktygskraft: Ställ in till standardvärde" + +#: ../app/actions/tools-actions.c:536 +msgctxt "tools-action" +msgid "Tool's Force: Minimize" +msgstr "Verktygskraft: Minimera" + +#: ../app/actions/tools-actions.c:540 +msgctxt "tools-action" +msgid "Tool's Force: Maximize" +msgstr "Verktygskraft: Maximera" + +#: ../app/actions/tools-actions.c:544 +msgctxt "tools-action" +msgid "Tool's Force: Decrease by 1" +msgstr "Verktygskraft: Minska med 1" + +#: ../app/actions/tools-actions.c:548 +msgctxt "tools-action" +msgid "Tool's Force: Increase by 1" +msgstr "Verktygskraft: Öka med 1" + +#: ../app/actions/tools-actions.c:552 +msgctxt "tools-action" +msgid "Tool's Force: Decrease by 10" +msgstr "Verktygskraft: Minska med 10" + +#: ../app/actions/tools-actions.c:556 +msgctxt "tools-action" +msgid "Tool's Force: Increase by 10" +msgstr "Verktygskraft: Öka med 10" + +#: ../app/actions/tools-actions.c:560 +msgctxt "tools-action" +msgid "Tool's Force: Decrease Relative" +msgstr "Verktygskraft: Minska relativt" + +#: ../app/actions/tools-actions.c:564 +msgctxt "tools-action" +msgid "Tool's Force: Increase Relative" +msgstr "Verktygskraft: Öka relativt" + +#: ../app/actions/vectors-actions.c:46 msgctxt "vectors-action" msgid "Paths Menu" msgstr "Banmeny" -#: ../app/actions/vectors-actions.c:48 +#: ../app/actions/vectors-actions.c:50 msgctxt "vectors-action" -msgid "Path _Tool" -msgstr "_Banverktyg" - -#: ../app/actions/vectors-actions.c:53 -msgctxt "vectors-action" -msgid "_Edit Path Attributes..." -msgstr "R_edigera banattribut..." +msgid "Color Tag" +msgstr "Färgtagg" #: ../app/actions/vectors-actions.c:54 msgctxt "vectors-action" +msgid "Edit Pa_th" +msgstr "Redigera _bana" + +#: ../app/actions/vectors-actions.c:55 +msgctxt "vectors-action" +msgid "Edit the active path" +msgstr "Redigera aktiv bana" + +#: ../app/actions/vectors-actions.c:60 +msgctxt "vectors-action" +msgid "_Edit Path Attributes..." +msgstr "R_edigera banattribut…" + +#: ../app/actions/vectors-actions.c:61 +msgctxt "vectors-action" msgid "Edit path attributes" msgstr "Redigera banattribut" -#: ../app/actions/vectors-actions.c:59 +#: ../app/actions/vectors-actions.c:66 msgctxt "vectors-action" msgid "_New Path..." -msgstr "_Ny bana..." +msgstr "_Ny bana…" -#: ../app/actions/vectors-actions.c:60 +#: ../app/actions/vectors-actions.c:67 msgctxt "vectors-action" msgid "Create a new path..." -msgstr "Skapa en ny bana..." +msgstr "Skapa en ny bana…" -#: ../app/actions/vectors-actions.c:65 +#: ../app/actions/vectors-actions.c:72 msgctxt "vectors-action" msgid "_New Path with last values" msgstr "_Ny bana med senaste värden" -#: ../app/actions/vectors-actions.c:66 +#: ../app/actions/vectors-actions.c:73 msgctxt "vectors-action" msgid "Create a new path with last used values" msgstr "Skapa en ny bana med senast använda värden" -#: ../app/actions/vectors-actions.c:71 +#: ../app/actions/vectors-actions.c:78 msgctxt "vectors-action" msgid "D_uplicate Path" msgstr "_Duplicera bana" -#: ../app/actions/vectors-actions.c:72 +#: ../app/actions/vectors-actions.c:79 msgctxt "vectors-action" msgid "Duplicate this path" msgstr "Duplicera denna bana" -#: ../app/actions/vectors-actions.c:77 +#: ../app/actions/vectors-actions.c:84 msgctxt "vectors-action" msgid "_Delete Path" msgstr "_Ta bort bana" -#: ../app/actions/vectors-actions.c:78 +#: ../app/actions/vectors-actions.c:85 msgctxt "vectors-action" msgid "Delete this path" msgstr "Ta bort denna bana" -#: ../app/actions/vectors-actions.c:83 +#: ../app/actions/vectors-actions.c:90 msgctxt "vectors-action" msgid "Merge _Visible Paths" msgstr "Sammanfoga _synliga banor" -#: ../app/actions/vectors-actions.c:88 +#: ../app/actions/vectors-actions.c:95 msgctxt "vectors-action" msgid "_Raise Path" msgstr "_Höj bana" -#: ../app/actions/vectors-actions.c:89 +#: ../app/actions/vectors-actions.c:96 msgctxt "vectors-action" msgid "Raise this path" msgstr "Höj denna bana" -#: ../app/actions/vectors-actions.c:94 +#: ../app/actions/vectors-actions.c:101 msgctxt "vectors-action" msgid "Raise Path to _Top" msgstr "Höj banan till _överst" -#: ../app/actions/vectors-actions.c:95 +#: ../app/actions/vectors-actions.c:102 msgctxt "vectors-action" msgid "Raise this path to the top" msgstr "Höj denna bana till överst" -#: ../app/actions/vectors-actions.c:100 +#: ../app/actions/vectors-actions.c:107 msgctxt "vectors-action" msgid "_Lower Path" msgstr "_Sänk bana" -#: ../app/actions/vectors-actions.c:101 +#: ../app/actions/vectors-actions.c:108 msgctxt "vectors-action" msgid "Lower this path" msgstr "Sänk denna bana" -#: ../app/actions/vectors-actions.c:106 +#: ../app/actions/vectors-actions.c:113 msgctxt "vectors-action" msgid "Lower Path to _Bottom" msgstr "Sänk banan till _underst" -#: ../app/actions/vectors-actions.c:107 +#: ../app/actions/vectors-actions.c:114 msgctxt "vectors-action" msgid "Lower this path to the bottom" msgstr "Sänk denna bana till underst" -#: ../app/actions/vectors-actions.c:112 -#, fuzzy -#| msgctxt "vectors-action" -#| msgid "_New Path..." +#: ../app/actions/vectors-actions.c:119 msgctxt "vectors-action" msgid "Fill Path..." -msgstr "_Ny bana..." +msgstr "Fyll bana…" -#: ../app/actions/vectors-actions.c:113 -#, fuzzy -#| msgctxt "vectors-action" -#| msgid "Paint along the path" +#: ../app/actions/vectors-actions.c:120 msgctxt "vectors-action" msgid "Fill the path" -msgstr "Måla längs banan" - -#: ../app/actions/vectors-actions.c:118 -#, fuzzy -#| msgid "Flip Path" -msgctxt "vectors-action" -msgid "Fill Path" -msgstr "Vänd bana" - -#: ../app/actions/vectors-actions.c:119 -#, fuzzy -#| msgctxt "vectors-action" -#| msgid "Paint along the path with last values" -msgctxt "vectors-action" -msgid "Fill the path with last values" -msgstr "Måla längs banan med senaste värden" - -#: ../app/actions/vectors-actions.c:124 -msgctxt "vectors-action" -msgid "Stro_ke Path..." -msgstr "Str_yk längs bana..." +msgstr "Fyll banan" #: ../app/actions/vectors-actions.c:125 msgctxt "vectors-action" +msgid "Fill Path" +msgstr "Fyll bana" + +#: ../app/actions/vectors-actions.c:126 +msgctxt "vectors-action" +msgid "Fill the path with last values" +msgstr "Fyll banan med senaste värden" + +#: ../app/actions/vectors-actions.c:131 +msgctxt "vectors-action" +msgid "Stro_ke Path..." +msgstr "Str_yk längs bana…" + +#: ../app/actions/vectors-actions.c:132 +msgctxt "vectors-action" msgid "Paint along the path" msgstr "Måla längs banan" -#: ../app/actions/vectors-actions.c:130 +#: ../app/actions/vectors-actions.c:137 msgctxt "vectors-action" msgid "Stro_ke Path" msgstr "Stry_k längs bana" -#: ../app/actions/vectors-actions.c:131 +#: ../app/actions/vectors-actions.c:138 msgctxt "vectors-action" msgid "Paint along the path with last values" msgstr "Måla längs banan med senaste värden" -#: ../app/actions/vectors-actions.c:136 +#: ../app/actions/vectors-actions.c:143 msgctxt "vectors-action" msgid "Co_py Path" msgstr "_Kopiera bana" -#: ../app/actions/vectors-actions.c:141 +#: ../app/actions/vectors-actions.c:148 msgctxt "vectors-action" msgid "Paste Pat_h" msgstr "K_listra in bana" -#: ../app/actions/vectors-actions.c:146 +#: ../app/actions/vectors-actions.c:153 msgctxt "vectors-action" msgid "E_xport Path..." -msgstr "E_xportera bana..." +msgstr "E_xportera bana…" -#: ../app/actions/vectors-actions.c:151 +#: ../app/actions/vectors-actions.c:158 msgctxt "vectors-action" msgid "I_mport Path..." -msgstr "_Importera bana..." +msgstr "_Importera bana…" -#: ../app/actions/vectors-actions.c:159 +#: ../app/actions/vectors-actions.c:166 msgctxt "vectors-action" -msgid "_Visible" -msgstr "_Synlig" +msgid "Toggle Path _Visibility" +msgstr "Växla banans _synlighet" -#: ../app/actions/vectors-actions.c:165 +#: ../app/actions/vectors-actions.c:172 msgctxt "vectors-action" -msgid "_Linked" -msgstr "_Länkad" +msgid "Toggle Path _Linked State" +msgstr "Växla _länkat tillstånd för bana" -#. GIMP_STOCK_LOCK -#: ../app/actions/vectors-actions.c:171 +#. GIMP_ICON_LOCK +#: ../app/actions/vectors-actions.c:178 msgctxt "vectors-action" -msgid "L_ock strokes" -msgstr "L_ås streck" +msgid "L_ock Strokes of Path" +msgstr "L_ås streck för bana" -#: ../app/actions/vectors-actions.c:177 -#, fuzzy -#| msgctxt "vectors-action" -#| msgid "L_ock strokes" +#: ../app/actions/vectors-actions.c:184 msgctxt "vectors-action" -msgid "L_ock position" -msgstr "L_ås streck" +msgid "L_ock Position of Path" +msgstr "L_ås banposition" -#: ../app/actions/vectors-actions.c:186 +#: ../app/actions/vectors-actions.c:193 +msgctxt "vectors-action" +msgid "None" +msgstr "Ingen" + +#: ../app/actions/vectors-actions.c:194 +msgctxt "vectors-action" +msgid "Path Color Tag: Clear" +msgstr "Banfärgtagg: Rensa" + +#: ../app/actions/vectors-actions.c:199 +msgctxt "vectors-action" +msgid "Blue" +msgstr "Blå" + +#: ../app/actions/vectors-actions.c:200 +msgctxt "vectors-action" +msgid "Path Color Tag: Set to Blue" +msgstr "Banfärgtagg: Sätt till blå" + +#: ../app/actions/vectors-actions.c:205 +msgctxt "vectors-action" +msgid "Green" +msgstr "Grön" + +#: ../app/actions/vectors-actions.c:206 +msgctxt "vectors-action" +msgid "Path Color Tag: Set to Green" +msgstr "Banfärgtagg: Sätt till grön" + +#: ../app/actions/vectors-actions.c:211 +msgctxt "vectors-action" +msgid "Yellow" +msgstr "Gul" + +#: ../app/actions/vectors-actions.c:212 +msgctxt "vectors-action" +msgid "Path Color Tag: Set to Yellow" +msgstr "Banfärgtagg: Sätt till gul" + +#: ../app/actions/vectors-actions.c:217 +msgctxt "vectors-action" +msgid "Orange" +msgstr "Orange" + +#: ../app/actions/vectors-actions.c:218 +msgctxt "vectors-action" +msgid "Path Color Tag: Set to Orange" +msgstr "Banfärgtagg: Sätt till orange" + +#: ../app/actions/vectors-actions.c:223 +msgctxt "vectors-action" +msgid "Brown" +msgstr "Brun" + +#: ../app/actions/vectors-actions.c:224 +msgctxt "vectors-action" +msgid "Path Color Tag: Set to Brown" +msgstr "Banfärgtagg: Sätt till brun" + +#: ../app/actions/vectors-actions.c:229 +msgctxt "vectors-action" +msgid "Red" +msgstr "Röd" + +#: ../app/actions/vectors-actions.c:230 +msgctxt "vectors-action" +msgid "Path Color Tag: Set to Red" +msgstr "Banfärgtagg: Sätt till röd" + +#: ../app/actions/vectors-actions.c:235 +msgctxt "vectors-action" +msgid "Violet" +msgstr "Violett" + +#: ../app/actions/vectors-actions.c:236 +msgctxt "vectors-action" +msgid "Path Color Tag: Set to Violet" +msgstr "Banfärgtagg: Sätt till violett" + +#: ../app/actions/vectors-actions.c:241 +msgctxt "vectors-action" +msgid "Gray" +msgstr "Grå" + +#: ../app/actions/vectors-actions.c:242 +msgctxt "vectors-action" +msgid "Path Color Tag: Set to Gray" +msgstr "Banfärgtagg: Sätt till grå" + +#: ../app/actions/vectors-actions.c:250 msgctxt "vectors-action" msgid "Path to Sele_ction" msgstr "_Bana till markering" -#: ../app/actions/vectors-actions.c:187 +#: ../app/actions/vectors-actions.c:251 msgctxt "vectors-action" msgid "Path to selection" msgstr "Bana till markering" -#: ../app/actions/vectors-actions.c:192 +#: ../app/actions/vectors-actions.c:256 msgctxt "vectors-action" msgid "Fr_om Path" msgstr "Fr_ån bana" -#: ../app/actions/vectors-actions.c:193 +#: ../app/actions/vectors-actions.c:257 msgctxt "vectors-action" msgid "Replace selection with path" msgstr "Ersätt markeringen med bana" -#: ../app/actions/vectors-actions.c:198 +#: ../app/actions/vectors-actions.c:262 msgctxt "vectors-action" msgid "_Add to Selection" msgstr "_Lägg till i markering" -#: ../app/actions/vectors-actions.c:199 +#: ../app/actions/vectors-actions.c:263 msgctxt "vectors-action" msgid "Add path to selection" msgstr "Lägg till bana till markering" -#: ../app/actions/vectors-actions.c:204 +#: ../app/actions/vectors-actions.c:268 msgctxt "vectors-action" msgid "_Subtract from Selection" msgstr "_Ta bort från markering" -#: ../app/actions/vectors-actions.c:205 +#: ../app/actions/vectors-actions.c:269 msgctxt "vectors-action" msgid "Subtract path from selection" msgstr "Ta bort bana från markering" -#: ../app/actions/vectors-actions.c:210 +#: ../app/actions/vectors-actions.c:274 msgctxt "vectors-action" msgid "_Intersect with Selection" msgstr "_Snitt med markering" -#: ../app/actions/vectors-actions.c:211 +#: ../app/actions/vectors-actions.c:275 msgctxt "vectors-action" msgid "Intersect path with selection" msgstr "Skär ut bana med markering" -#: ../app/actions/vectors-actions.c:219 +#: ../app/actions/vectors-actions.c:283 msgctxt "vectors-action" msgid "Selecti_on to Path" msgstr "_Markering till bana" -#: ../app/actions/vectors-actions.c:220 ../app/actions/vectors-actions.c:226 +#: ../app/actions/vectors-actions.c:284 ../app/actions/vectors-actions.c:290 msgctxt "vectors-action" msgid "Selection to path" msgstr "Markering till bana" -#: ../app/actions/vectors-actions.c:225 +#: ../app/actions/vectors-actions.c:289 msgctxt "vectors-action" msgid "To _Path" msgstr "Till _bana" -#: ../app/actions/vectors-actions.c:231 +#: ../app/actions/vectors-actions.c:295 msgctxt "vectors-action" msgid "Selection to Path (_Advanced)" msgstr "Markering till bana (_avancerat)" -#: ../app/actions/vectors-actions.c:232 +#: ../app/actions/vectors-actions.c:296 msgctxt "vectors-action" msgid "Advanced options" msgstr "Avancerade alternativ" -#: ../app/actions/vectors-commands.c:141 +#: ../app/actions/vectors-actions.c:304 +msgctxt "vectors-action" +msgid "Select _Top Path" +msgstr "Välj _översta bana" + +#: ../app/actions/vectors-actions.c:305 +msgctxt "vectors-action" +msgid "Select the topmost path" +msgstr "Välj den översta banan" + +#: ../app/actions/vectors-actions.c:310 +msgctxt "vectors-action" +msgid "Select _Bottom Path" +msgstr "Välj _nedersta bana" + +#: ../app/actions/vectors-actions.c:311 +msgctxt "vectors-action" +msgid "Select the bottommost path" +msgstr "Välj den nedersta banan" + +#: ../app/actions/vectors-actions.c:316 +msgctxt "vectors-action" +msgid "Select _Previous Path" +msgstr "Välj _föregående bana" + +#: ../app/actions/vectors-actions.c:317 +msgctxt "vectors-action" +msgid "Select the path above the current path" +msgstr "Välj banan ovanför den aktuella banan" + +#: ../app/actions/vectors-actions.c:322 +msgctxt "vectors-action" +msgid "Select _Next Path" +msgstr "Välj _nästa bana" + +#: ../app/actions/vectors-actions.c:323 +msgctxt "vectors-action" +msgid "Select the vector below the current path" +msgstr "Välj vektorn under den aktuella banan" + +#: ../app/actions/vectors-commands.c:162 ../app/actions/vectors-commands.c:719 msgid "Path Attributes" msgstr "Banattribut" -#: ../app/actions/vectors-commands.c:144 +#: ../app/actions/vectors-commands.c:165 msgid "Edit Path Attributes" msgstr "Redigera banattribut" -#: ../app/actions/vectors-commands.c:171 +#: ../app/actions/vectors-commands.c:203 msgid "New Path" msgstr "Ny bana" -#: ../app/actions/vectors-commands.c:174 -msgid "New Path Options" -msgstr "Alternativ för ny bana" +#: ../app/actions/vectors-commands.c:206 +msgid "Create a New Path" +msgstr "Skapa en ny bana" -#: ../app/actions/vectors-commands.c:410 -#, fuzzy -#| msgid "Flip Path" +#: ../app/actions/vectors-commands.c:425 ../app/tools/gimpvectoroptions.c:202 +#: ../app/tools/gimpvectortool.c:740 msgid "Fill Path" -msgstr "Vänd bana" +msgstr "Fyll bana" -#: ../app/actions/vectors-commands.c:489 ../app/tools/gimpvectoroptions.c:202 -#: ../app/tools/gimpvectortool.c:1977 +#: ../app/actions/vectors-commands.c:455 ../app/tools/gimpvectoroptions.c:210 +#: ../app/tools/gimpvectortool.c:812 msgid "Stroke Path" msgstr "Stryk längs bana" @@ -6696,11 +9004,9 @@ msgid "_Zoom" msgstr "_Zooma" #: ../app/actions/view-actions.c:72 -#, fuzzy -#| msgid "_Rotate" msgctxt "view-action" msgid "_Flip & Rotate" -msgstr "_Rotera" +msgstr "_Vänd & rotera" #: ../app/actions/view-actions.c:73 msgctxt "view-action" @@ -6708,25 +9014,19 @@ msgid "_Padding Color" msgstr "_Utfyllnadsfärg" #: ../app/actions/view-actions.c:76 -#, fuzzy -#| msgid "Color Management" msgctxt "view-action" msgid "_Color Management" -msgstr "Färghantering" +msgstr "_Färghantering" #: ../app/actions/view-actions.c:79 -#, fuzzy -#| msgid "_Display rendering intent:" msgctxt "view-action" msgid "Display _Rendering Intent" -msgstr "_Visa återgivningsmetod:" +msgstr "_Renderingsåtergivning för skärm" #: ../app/actions/view-actions.c:82 -#, fuzzy -#| msgid "_Softproof rendering intent:" msgctxt "view-action" msgid "Soft-Proofing Re_ndering Intent" -msgstr "_Softproof återgivningsmetod:" +msgstr "Re_nderingsåtergivningsmetod för korrekturgranskning" #: ../app/actions/view-actions.c:85 msgctxt "view-action" @@ -6774,20 +9074,14 @@ msgid "Adjust the zoom ratio so that the entire window is used" msgstr "Justera zoomfaktorn så att hela fönstret används" #: ../app/actions/view-actions.c:113 -#, fuzzy -#| msgctxt "image-action" -#| msgid "_Crop to Selection" msgctxt "view-action" msgid "Zoom to _Selection" -msgstr "Besk_är till markering" +msgstr "Zooma till _markering" #: ../app/actions/view-actions.c:114 -#, fuzzy -#| msgctxt "view-action" -#| msgid "Adjust the zoom ratio so that the entire window is used" msgctxt "view-action" msgid "Adjust the zoom ratio so that the selection fills the window" -msgstr "Justera zoomfaktorn så att hela fönstret används" +msgstr "Justera zoomfaktorn så att markeringen fyller fönstret" #: ../app/actions/view-actions.c:119 msgctxt "view-action" @@ -6800,20 +9094,14 @@ msgid "Restore the previous zoom level" msgstr "Återställ föregående zoomnivå" #: ../app/actions/view-actions.c:125 -#, fuzzy -#| msgctxt "view-zoom-action" -#| msgid "Othe_r..." msgctxt "view-action" -msgid "Othe_r..." -msgstr "A_nnat..." +msgid "Othe_r rotation angle..." +msgstr "Annan _rotationsvinkel…" #: ../app/actions/view-actions.c:126 -#, fuzzy -#| msgctxt "view-zoom-action" -#| msgid "Set a custom zoom factor" msgctxt "view-action" msgid "Set a custom rotation angle" -msgstr "Ställ in en anpassad zoomfaktor" +msgstr "Ställ in en anpassad rotationsvinkel" #: ../app/actions/view-actions.c:131 msgctxt "view-action" @@ -6828,7 +9116,7 @@ msgstr "Visa ett överblicksfönster för denna bild" #: ../app/actions/view-actions.c:137 msgctxt "view-action" msgid "Display _Filters..." -msgstr "Visnings_filter..." +msgstr "Visnings_filter…" #: ../app/actions/view-actions.c:138 msgctxt "view-action" @@ -6836,668 +9124,710 @@ msgid "Configure filters applied to this view" msgstr "Konfigurera filter tillämpade på denna vy" #: ../app/actions/view-actions.c:143 -#, fuzzy -#| msgctxt "view-padding-color" -#| msgid "As in _Preferences" msgctxt "view-action" msgid "As in _Preferences" -msgstr "Som i i_nställningarna" +msgstr "Som i _inställningarna" #: ../app/actions/view-actions.c:145 -#, fuzzy -#| msgctxt "view-padding-color" -#| msgid "Reset padding color to what's configured in preferences" msgctxt "view-action" msgid "Reset color management to what's configured in preferences" -msgstr "" -"Återställ utfyllnadsfärg till vad som är konfigurerat i inställningarna" +msgstr "Återställ färghantering till vad som är konfigurerat i inställningarna" #: ../app/actions/view-actions.c:150 msgctxt "view-action" +msgid "Soft-_Proofing Profile..." +msgstr "_Profil för korrekturgranskning…" + +#: ../app/actions/view-actions.c:151 +msgctxt "view-action" +msgid "Set the soft-proofing profile" +msgstr "Ställ in profil för korrekturgranskning" + +#: ../app/actions/view-actions.c:156 +msgctxt "view-action" msgid "Shrink _Wrap" msgstr "Kr_ymppaketera" -#: ../app/actions/view-actions.c:151 +#: ../app/actions/view-actions.c:157 msgctxt "view-action" msgid "Reduce the image window to the size of the image display" msgstr "Minska bildfönstret till storleken för bildvisningen" -#: ../app/actions/view-actions.c:156 +#: ../app/actions/view-actions.c:162 msgctxt "view-action" msgid "_Open Display..." -msgstr "_Öppna display..." +msgstr "_Öppna display…" -#: ../app/actions/view-actions.c:157 +#: ../app/actions/view-actions.c:163 msgctxt "view-action" msgid "Connect to another display" msgstr "Anslut till en annan display" -#: ../app/actions/view-actions.c:165 +#: ../app/actions/view-actions.c:171 msgctxt "view-action" msgid "_Dot for Dot" msgstr "_Punkt för punkt" -#: ../app/actions/view-actions.c:166 +#: ../app/actions/view-actions.c:172 msgctxt "view-action" msgid "A pixel on the screen represents an image pixel" msgstr "En bildpunkt på skärmen representerar en bildpunkt i bilden" -#: ../app/actions/view-actions.c:172 -#, fuzzy -#| msgid "Color Management" +#: ../app/actions/view-actions.c:178 msgctxt "view-action" msgid "_Color-Manage this View" -msgstr "Färghantering" - -#: ../app/actions/view-actions.c:173 -#, fuzzy -#| msgid "Enter a name for this buffer" -msgctxt "view-action" -msgid "Use color management for this view" -msgstr "Ange namn för denna buffert" +msgstr "_Färghantera denna vy" #: ../app/actions/view-actions.c:179 -#, fuzzy -#| msgctxt "context-action" -#| msgid "_Colors" +msgctxt "view-action" +msgid "Use color management for this view" +msgstr "Använd färghantering för denna vy" + +#: ../app/actions/view-actions.c:185 msgctxt "view-action" msgid "_Proof Colors" -msgstr "_Färger" +msgstr "_Korrekturgranska färger" -#: ../app/actions/view-actions.c:180 +#: ../app/actions/view-actions.c:186 msgctxt "view-action" msgid "Use this view for soft-proofing" -msgstr "" +msgstr "Använd denna vy för korrekturgranskning" -#: ../app/actions/view-actions.c:186 ../app/actions/view-actions.c:193 +#: ../app/actions/view-actions.c:192 ../app/actions/view-actions.c:199 msgctxt "view-action" msgid "_Black Point Compensation" -msgstr "" +msgstr "_Svartpunktskompensering" -#: ../app/actions/view-actions.c:187 +#: ../app/actions/view-actions.c:193 msgctxt "view-action" msgid "Use black point compensation for image display" -msgstr "" - -#: ../app/actions/view-actions.c:194 -msgctxt "view-action" -msgid "Use black point compensation for soft-proofing" -msgstr "" +msgstr "Använd svartpunktskompensering för bildvisning" #: ../app/actions/view-actions.c:200 -#, fuzzy -#| msgid "Mark out of gamut colors" +msgctxt "view-action" +msgid "Use black point compensation for soft-proofing" +msgstr "Använd svartpunktskompensering för korrekturgranskning" + +#: ../app/actions/view-actions.c:206 msgctxt "view-action" msgid "_Mark Out Of Gamut Colors" -msgstr "Markera färger utanför färgomfång" +msgstr "_Markera färger utanför färgomfång" -#: ../app/actions/view-actions.c:201 +#: ../app/actions/view-actions.c:207 msgctxt "view-action" msgid "" "When soft-proofing, mark colors which cannot be represented in the target " "color space" msgstr "" +"Under korrekturgranskning kommer färger att markeras som inte kan " +"representeras i målfärgrymden" -#: ../app/actions/view-actions.c:208 +#: ../app/actions/view-actions.c:214 msgctxt "view-action" msgid "Show _Selection" msgstr "Visa m_arkering" -#: ../app/actions/view-actions.c:209 +#: ../app/actions/view-actions.c:215 msgctxt "view-action" msgid "Display the selection outline" msgstr "Visa markeringens kontur" -#: ../app/actions/view-actions.c:215 +#: ../app/actions/view-actions.c:221 msgctxt "view-action" msgid "Show _Layer Boundary" msgstr "Visa _lagergräns" -#: ../app/actions/view-actions.c:216 +#: ../app/actions/view-actions.c:222 msgctxt "view-action" msgid "Draw a border around the active layer" msgstr "Rita en ram runt det aktiva lagret" -#: ../app/actions/view-actions.c:222 +#: ../app/actions/view-actions.c:228 msgctxt "view-action" msgid "Show _Guides" msgstr "Visa _hjälplinjer" -#: ../app/actions/view-actions.c:223 +#: ../app/actions/view-actions.c:229 msgctxt "view-action" msgid "Display the image's guides" msgstr "Visa bildens hjälplinjer" -#: ../app/actions/view-actions.c:229 +#: ../app/actions/view-actions.c:235 msgctxt "view-action" msgid "S_how Grid" msgstr "Visa r_utnät" -#: ../app/actions/view-actions.c:230 +#: ../app/actions/view-actions.c:236 msgctxt "view-action" msgid "Display the image's grid" msgstr "Visa bildens rutnät" -#: ../app/actions/view-actions.c:236 +#: ../app/actions/view-actions.c:242 msgctxt "view-action" msgid "Show Sample Points" -msgstr "Visa sampelpunkter" - -#: ../app/actions/view-actions.c:237 -msgctxt "view-action" -msgid "Display the image's color sample points" -msgstr "Visa bildens färgsampelpunkter" +msgstr "Visa samplingspunkter" #: ../app/actions/view-actions.c:243 msgctxt "view-action" +msgid "Display the image's color sample points" +msgstr "Visa bildens färgsamplingspunkter" + +#: ../app/actions/view-actions.c:249 +msgctxt "view-action" msgid "Sn_ap to Guides" msgstr "Fäs_t mot hjälplinjer" -#: ../app/actions/view-actions.c:244 +#: ../app/actions/view-actions.c:250 msgctxt "view-action" msgid "Tool operations snap to guides" msgstr "Verktygsåtgärder fäster mot hjälplinjer" -#: ../app/actions/view-actions.c:250 +#: ../app/actions/view-actions.c:256 msgctxt "view-action" msgid "Sna_p to Grid" msgstr "Fäst m_ot rutnät" -#: ../app/actions/view-actions.c:251 +#: ../app/actions/view-actions.c:257 msgctxt "view-action" msgid "Tool operations snap to the grid" msgstr "Verktygsåtgärder fäster mot rutnätet" -#: ../app/actions/view-actions.c:257 +#: ../app/actions/view-actions.c:263 msgctxt "view-action" msgid "Snap to _Canvas Edges" msgstr "Fäst mot _ritytans kanter" -#: ../app/actions/view-actions.c:258 +#: ../app/actions/view-actions.c:264 msgctxt "view-action" msgid "Tool operations snap to the canvas edges" msgstr "Verktygsåtgärder fäster mot ritytans kanter" -#: ../app/actions/view-actions.c:264 +#: ../app/actions/view-actions.c:270 msgctxt "view-action" msgid "Snap t_o Active Path" msgstr "Fäst mot a_ktiv bana" -#: ../app/actions/view-actions.c:265 +#: ../app/actions/view-actions.c:271 msgctxt "view-action" msgid "Tool operations snap to the active path" msgstr "Verktygsåtgärder fäster mot aktiv bana" -#: ../app/actions/view-actions.c:271 +#: ../app/actions/view-actions.c:277 msgctxt "view-action" msgid "Show _Menubar" msgstr "Visa _menyrad" -#: ../app/actions/view-actions.c:272 +#: ../app/actions/view-actions.c:278 msgctxt "view-action" msgid "Show this window's menubar" msgstr "Visa detta fönsters menyrad" -#: ../app/actions/view-actions.c:278 +#: ../app/actions/view-actions.c:284 msgctxt "view-action" msgid "Show R_ulers" msgstr "Visa _linjaler" -#: ../app/actions/view-actions.c:279 +#: ../app/actions/view-actions.c:285 msgctxt "view-action" msgid "Show this window's rulers" msgstr "Visa detta fönsters linjaler" -#: ../app/actions/view-actions.c:285 +#: ../app/actions/view-actions.c:291 msgctxt "view-action" msgid "Show Scroll_bars" msgstr "Visa rullnings_lister" -#: ../app/actions/view-actions.c:286 +#: ../app/actions/view-actions.c:292 msgctxt "view-action" msgid "Show this window's scrollbars" msgstr "Visa detta fönsters rullningslister" -#: ../app/actions/view-actions.c:292 +#: ../app/actions/view-actions.c:298 msgctxt "view-action" msgid "Show S_tatusbar" msgstr "Visa s_tatusrad" -#: ../app/actions/view-actions.c:293 +#: ../app/actions/view-actions.c:299 msgctxt "view-action" msgid "Show this window's statusbar" msgstr "Visa detta fönsters statusrad" -#: ../app/actions/view-actions.c:299 +#: ../app/actions/view-actions.c:305 msgctxt "view-action" msgid "Fullscr_een" msgstr "Helskär_m" -#: ../app/actions/view-actions.c:300 +#: ../app/actions/view-actions.c:306 msgctxt "view-action" msgid "Toggle fullscreen view" msgstr "Växla helskärmsvy" -#: ../app/actions/view-actions.c:324 +#: ../app/actions/view-actions.c:315 +msgctxt "view-action" +msgid "Set zoom factor" +msgstr "Ställ in zoomfaktor" + +#: ../app/actions/view-actions.c:320 +msgctxt "view-action" +msgid "Zoom out as far as possible" +msgstr "Zooma ut så långt som möjligt" + +#: ../app/actions/view-actions.c:325 +msgctxt "view-action" +msgid "Zoom in as far as possible" +msgstr "Zoom in så långt som möjligt" + +#: ../app/actions/view-actions.c:330 msgctxt "view-zoom-action" msgid "Zoom _Out" msgstr "Zooma _ut" -#: ../app/actions/view-actions.c:325 ../app/actions/view-actions.c:337 +#: ../app/actions/view-actions.c:331 ../app/actions/view-actions.c:343 msgctxt "view-zoom-action" msgid "Zoom out" msgstr "Zooma ut" -#: ../app/actions/view-actions.c:330 +#: ../app/actions/view-actions.c:336 msgctxt "view-zoom-action" msgid "Zoom _In" msgstr "Zooma _in" -#: ../app/actions/view-actions.c:331 ../app/actions/view-actions.c:343 +#: ../app/actions/view-actions.c:337 ../app/actions/view-actions.c:349 msgctxt "view-zoom-action" msgid "Zoom in" msgstr "Zooma in" -#: ../app/actions/view-actions.c:336 +#: ../app/actions/view-actions.c:342 msgctxt "view-zoom-action" msgid "Zoom Out" msgstr "Zooma ut" -#: ../app/actions/view-actions.c:342 +#: ../app/actions/view-actions.c:348 msgctxt "view-zoom-action" msgid "Zoom In" msgstr "Zooma in" -#: ../app/actions/view-actions.c:361 ../app/actions/view-actions.c:367 +#: ../app/actions/view-actions.c:354 +msgctxt "view-action" +msgid "Zoom out a lot" +msgstr "Zooma ut mycket" + +#: ../app/actions/view-actions.c:359 +msgctxt "view-action" +msgid "Zoom in a lot" +msgstr "Zooma in mycket" + +#: ../app/actions/view-actions.c:367 ../app/actions/view-actions.c:373 msgctxt "view-zoom-action" msgid "1_6:1 (1600%)" msgstr "1_6:1 (1600%)" -#: ../app/actions/view-actions.c:362 ../app/actions/view-actions.c:368 +#: ../app/actions/view-actions.c:368 ../app/actions/view-actions.c:374 msgctxt "view-zoom-action" msgid "Zoom 16:1" msgstr "Zooma 16:1" -#: ../app/actions/view-actions.c:373 ../app/actions/view-actions.c:379 +#: ../app/actions/view-actions.c:379 ../app/actions/view-actions.c:385 msgctxt "view-zoom-action" msgid "_8:1 (800%)" msgstr "_8:1 (800%)" -#: ../app/actions/view-actions.c:374 ../app/actions/view-actions.c:380 +#: ../app/actions/view-actions.c:380 ../app/actions/view-actions.c:386 msgctxt "view-zoom-action" msgid "Zoom 8:1" msgstr "Zooma 8:1" -#: ../app/actions/view-actions.c:385 ../app/actions/view-actions.c:391 +#: ../app/actions/view-actions.c:391 ../app/actions/view-actions.c:397 msgctxt "view-zoom-action" msgid "_4:1 (400%)" msgstr "_4:1 (400%)" -#: ../app/actions/view-actions.c:386 ../app/actions/view-actions.c:392 +#: ../app/actions/view-actions.c:392 ../app/actions/view-actions.c:398 msgctxt "view-zoom-action" msgid "Zoom 4:1" msgstr "Zooma 4:1" -#: ../app/actions/view-actions.c:397 ../app/actions/view-actions.c:403 +#: ../app/actions/view-actions.c:403 ../app/actions/view-actions.c:409 msgctxt "view-zoom-action" msgid "_2:1 (200%)" msgstr "_2:1 (200%)" -#: ../app/actions/view-actions.c:398 ../app/actions/view-actions.c:404 +#: ../app/actions/view-actions.c:404 ../app/actions/view-actions.c:410 msgctxt "view-zoom-action" msgid "Zoom 2:1" msgstr "Zooma 2:1" -#: ../app/actions/view-actions.c:409 ../app/actions/view-actions.c:415 +#: ../app/actions/view-actions.c:415 ../app/actions/view-actions.c:421 msgctxt "view-zoom-action" msgid "_1:1 (100%)" msgstr "_1:1 (100%)" -#: ../app/actions/view-actions.c:410 ../app/actions/view-actions.c:416 +#: ../app/actions/view-actions.c:416 ../app/actions/view-actions.c:422 msgctxt "view-zoom-action" msgid "Zoom 1:1" msgstr "Zooma 1:1" -#: ../app/actions/view-actions.c:421 +#: ../app/actions/view-actions.c:427 msgctxt "view-zoom-action" msgid "1:_2 (50%)" msgstr "1:_2 (50%)" -#: ../app/actions/view-actions.c:422 +#: ../app/actions/view-actions.c:428 msgctxt "view-zoom-action" msgid "Zoom 1:2" msgstr "Zooma 1:2" -#: ../app/actions/view-actions.c:427 +#: ../app/actions/view-actions.c:433 msgctxt "view-zoom-action" msgid "1:_4 (25%)" msgstr "1:_4 (25%)" -#: ../app/actions/view-actions.c:428 +#: ../app/actions/view-actions.c:434 msgctxt "view-zoom-action" msgid "Zoom 1:4" msgstr "Zooma 1:4" -#: ../app/actions/view-actions.c:433 +#: ../app/actions/view-actions.c:439 msgctxt "view-zoom-action" msgid "1:_8 (12.5%)" msgstr "1:_8 (12,5%)" -#: ../app/actions/view-actions.c:434 +#: ../app/actions/view-actions.c:440 msgctxt "view-zoom-action" msgid "Zoom 1:8" msgstr "Zooma 1:8" -#: ../app/actions/view-actions.c:439 +#: ../app/actions/view-actions.c:445 msgctxt "view-zoom-action" msgid "1:1_6 (6.25%)" msgstr "1:1_6 (6,25%)" -#: ../app/actions/view-actions.c:440 +#: ../app/actions/view-actions.c:446 msgctxt "view-zoom-action" msgid "Zoom 1:16" msgstr "Zooma 1:16" -#: ../app/actions/view-actions.c:445 +#: ../app/actions/view-actions.c:451 msgctxt "view-zoom-action" -msgid "Othe_r..." -msgstr "A_nnat..." +msgid "Othe_r zoom factor..." +msgstr "A_nnan zoomfaktor…" -#: ../app/actions/view-actions.c:446 +#: ../app/actions/view-actions.c:452 msgctxt "view-zoom-action" msgid "Set a custom zoom factor" msgstr "Ställ in en anpassad zoomfaktor" -#: ../app/actions/view-actions.c:454 -#, fuzzy -#| msgctxt "drawable-action" -#| msgid "Flip _Horizontally" +#: ../app/actions/view-actions.c:460 msgctxt "view-action" msgid "Flip Horizontally" -msgstr "Vänd _horisontellt" +msgstr "Vänd horisontellt" -#: ../app/actions/view-actions.c:460 -#, fuzzy -#| msgctxt "drawable-action" -#| msgid "Flip _Vertically" +#: ../app/actions/view-actions.c:461 +msgctxt "view-action" +msgid "Flip the view horizontally" +msgstr "Vänd vyn horisontellt" + +#: ../app/actions/view-actions.c:467 msgctxt "view-action" msgid "Flip Vertically" -msgstr "_Vänd vertikalt" +msgstr "Vänd vertikalt" -#: ../app/actions/view-actions.c:474 +#: ../app/actions/view-actions.c:468 +msgctxt "view-action" +msgid "Flip the view vertically" +msgstr "Vänd vyn vertikalt" + +#: ../app/actions/view-actions.c:482 msgctxt "view-action" msgid "_Reset Flip & Rotate" -msgstr "" - -#: ../app/actions/view-actions.c:476 -#, fuzzy -#| msgid "Reset angle to zero" -msgctxt "view-action" -msgid "Reset flipping to unflipped and the angle of rotation to 0°" -msgstr "Återställ vinkel till noll" +msgstr "_Återställ vändning & rotation" #: ../app/actions/view-actions.c:484 -#, fuzzy -#| msgctxt "drawable-action" -#| msgid "Rotate 90° _clockwise" +msgctxt "view-action" +msgid "Reset flipping to unflipped and the angle of rotation to 0°" +msgstr "Återställ vändning till ovänd och vinkel till en rotation om 0°" + +#: ../app/actions/view-actions.c:492 msgctxt "view-action" msgid "Rotate 15° _clockwise" -msgstr "Rotera 90° m_edsols" +msgstr "Rotera 15° m_edurs" -#: ../app/actions/view-actions.c:485 -#, fuzzy -#| msgctxt "drawable-action" -#| msgid "Rotate 90 degrees to the right" +#: ../app/actions/view-actions.c:493 msgctxt "view-action" -msgid "Rotate 15 degrees to the right" -msgstr "Rotera 90 grader åt höger" +msgid "Rotate the view 15 degrees to the right" +msgstr "Rotera vyn 15 grader åt höger" -#: ../app/actions/view-actions.c:490 -#, fuzzy -#| msgctxt "drawable-action" -#| msgid "Rotate 90° _clockwise" +#: ../app/actions/view-actions.c:498 msgctxt "view-action" msgid "Rotate 90° _clockwise" -msgstr "Rotera 90° m_edsols" +msgstr "Rotera 90° m_edurs" -#: ../app/actions/view-actions.c:491 -#, fuzzy -#| msgctxt "drawable-action" -#| msgid "Rotate 90 degrees to the right" +#: ../app/actions/view-actions.c:499 msgctxt "view-action" -msgid "Rotate 90 degrees to the right" -msgstr "Rotera 90 grader åt höger" +msgid "Rotate the view 90 degrees to the right" +msgstr "Rotera vyn 90 grader åt höger" -#: ../app/actions/view-actions.c:496 -#, fuzzy -#| msgctxt "drawable-action" -#| msgid "Rotate _180°" +#: ../app/actions/view-actions.c:504 msgctxt "view-action" msgid "Rotate _180°" msgstr "Rotera _180°" -#: ../app/actions/view-actions.c:497 -#, fuzzy -#| msgctxt "drawable-action" -#| msgid "Turn upside-down" +#: ../app/actions/view-actions.c:505 msgctxt "view-action" -msgid "Turn upside-down" -msgstr "Vänd upp och ned" +msgid "Turn the view upside-down" +msgstr "Vänd bilden upp och ned" -#: ../app/actions/view-actions.c:502 -#, fuzzy -#| msgctxt "drawable-action" -#| msgid "Rotate 90° counter-clock_wise" +#: ../app/actions/view-actions.c:510 msgctxt "view-action" msgid "Rotate 90° counter-clock_wise" -msgstr "Rotera 90° m_otsols" +msgstr "Rotera 90° m_oturs" -#: ../app/actions/view-actions.c:503 -#, fuzzy -#| msgctxt "drawable-action" -#| msgid "Rotate 90 degrees to the left" +#: ../app/actions/view-actions.c:511 msgctxt "view-action" -msgid "Rotate 90 degrees to the left" -msgstr "Rotera 90 grader åt vänster" +msgid "Rotate the view 90 degrees to the left" +msgstr "Rotera vyn 90 grader åt vänster" -#: ../app/actions/view-actions.c:508 -#, fuzzy -#| msgctxt "drawable-action" -#| msgid "Rotate 90° counter-clock_wise" +#: ../app/actions/view-actions.c:516 msgctxt "view-action" msgid "Rotate 15° counter-clock_wise" -msgstr "Rotera 90° m_otsols" +msgstr "Rotera 15° m_oturs" -#: ../app/actions/view-actions.c:509 -#, fuzzy -#| msgctxt "drawable-action" -#| msgid "Rotate 90 degrees to the left" +#: ../app/actions/view-actions.c:517 msgctxt "view-action" -msgid "Rotate 15 degrees to the left" -msgstr "Rotera 90 grader åt vänster" +msgid "Rotate the view 15 degrees to the left" +msgstr "Rotera vyn 15 grader åt vänster" -#: ../app/actions/view-actions.c:517 ../app/actions/view-actions.c:544 -#, fuzzy -#| msgid "Percentile:" +#: ../app/actions/view-actions.c:525 ../app/actions/view-actions.c:552 msgctxt "view-action" msgid "_Perceptual" -msgstr "Procentuellt:" +msgstr "_Perceptuell" -#: ../app/actions/view-actions.c:518 -#, fuzzy -#| msgid "_Display rendering intent:" +# sebras: Betyder Display "visa" i detta fallet eller handlar det om "Display Rendering" som rendering för skärmen? Det kan vara det senare... +#: ../app/actions/view-actions.c:526 msgctxt "view-action" msgid "Display rendering intent is perceptual" -msgstr "_Visa återgivningsmetod:" +msgstr "Renderingsåtergivningsmetod för skärm är perceptuell" -#: ../app/actions/view-actions.c:523 ../app/actions/view-actions.c:550 -#, fuzzy -#| msgctxt "palette-editor-action" -#| msgid "_Delete Color" +#: ../app/actions/view-actions.c:531 ../app/actions/view-actions.c:558 msgctxt "view-action" msgid "_Relative Colorimetric" -msgstr "_Ta bort färg" +msgstr "_Relativ kolorimetri" -#: ../app/actions/view-actions.c:524 -#, fuzzy -#| msgid "_Display rendering intent:" +# sebras: Betyder Display "visa" i detta fallet eller handlar det om "Display Rendering" som rendering för skärmen? Det kan vara det senare... +#: ../app/actions/view-actions.c:532 msgctxt "view-action" msgid "Display rendering intent is relative colorimetric" -msgstr "_Visa återgivningsmetod:" +msgstr "Renderingsåtergivningsmetod för skärm är relativ kolorimetri" -#: ../app/actions/view-actions.c:529 ../app/actions/view-actions.c:556 -#, fuzzy -#| msgid "_Saturation:" +#: ../app/actions/view-actions.c:537 ../app/actions/view-actions.c:564 msgctxt "view-action" msgid "_Saturation" -msgstr "_Mättnad:" +msgstr "_Mättnad" -#: ../app/actions/view-actions.c:530 -#, fuzzy -#| msgid "_Display rendering intent:" +# sebras: Betyder Display "visa" i detta fallet eller handlar det om "Display Rendering" som rendering för skärmen? Det kan vara det senare... +#: ../app/actions/view-actions.c:538 msgctxt "view-action" msgid "Display rendering intent is saturation" -msgstr "_Visa återgivningsmetod:" +msgstr "Renderingsåtergivningsmetod för skärm är mättnad" -#: ../app/actions/view-actions.c:535 ../app/actions/view-actions.c:562 +#: ../app/actions/view-actions.c:543 ../app/actions/view-actions.c:570 msgctxt "view-action" msgid "_Absolute Colorimetric" -msgstr "" +msgstr "_Absolut kolorimetri" -#: ../app/actions/view-actions.c:536 -#, fuzzy -#| msgid "_Display rendering intent:" +# sebras: Betyder Display "visa" i detta fallet eller handlar det om "Display Rendering" som rendering för skärmen? Det kan vara det senare... +#: ../app/actions/view-actions.c:544 msgctxt "view-action" msgid "Display rendering intent is absolute colorimetric" -msgstr "_Visa återgivningsmetod:" +msgstr "Renderingsåtergivningsmetod för skärm är absolut kolorimetri" -#: ../app/actions/view-actions.c:545 -#, fuzzy -#| msgid "_Softproof rendering intent:" +#: ../app/actions/view-actions.c:553 msgctxt "view-action" msgid "Soft-proofing rendering intent is perceptual" -msgstr "_Softproof återgivningsmetod:" +msgstr "Renderingsåtergivningsmetod för korrekturgranskning är perceptuell" -#: ../app/actions/view-actions.c:551 -#, fuzzy -#| msgid "_Softproof rendering intent:" +#: ../app/actions/view-actions.c:559 msgctxt "view-action" msgid "Soft-proofing rendering intent is relative colorimetric" -msgstr "_Softproof återgivningsmetod:" +msgstr "" +"Renderingsåtergivningsmetod för korrekturgranskning är relativ kolorimetri" -#: ../app/actions/view-actions.c:557 -#, fuzzy -#| msgid "_Softproof rendering intent:" +#: ../app/actions/view-actions.c:565 msgctxt "view-action" msgid "Soft-proofing rendering intent is saturation" -msgstr "_Softproof återgivningsmetod:" - -#: ../app/actions/view-actions.c:563 -#, fuzzy -#| msgid "_Softproof rendering intent:" -msgctxt "view-action" -msgid "Soft-proofing rendering intent is absolute colorimetric" -msgstr "_Softproof återgivningsmetod:" +msgstr "Renderingsåtergivningsmetod för korrekturgranskning är mättnad" #: ../app/actions/view-actions.c:571 +msgctxt "view-action" +msgid "Soft-proofing rendering intent is absolute colorimetric" +msgstr "" +"Renderingsåtergivningsmetod för korrekturgranskning är absolut kolorimetri" + +#: ../app/actions/view-actions.c:579 msgctxt "view-padding-color" msgid "From _Theme" msgstr "Från _tema" -#: ../app/actions/view-actions.c:572 +#: ../app/actions/view-actions.c:580 msgctxt "view-padding-color" msgid "Use the current theme's background color" msgstr "Använd bakgrundsfärgen för aktuellt tema" -#: ../app/actions/view-actions.c:577 +#: ../app/actions/view-actions.c:585 msgctxt "view-padding-color" msgid "_Light Check Color" msgstr "_Ljus rutfärg" -#: ../app/actions/view-actions.c:578 +#: ../app/actions/view-actions.c:586 msgctxt "view-padding-color" msgid "Use the light check color" msgstr "Använd ljus rutfärg" -#: ../app/actions/view-actions.c:583 +#: ../app/actions/view-actions.c:591 msgctxt "view-padding-color" msgid "_Dark Check Color" msgstr "_Mörk rutfärg" -#: ../app/actions/view-actions.c:584 +#: ../app/actions/view-actions.c:592 msgctxt "view-padding-color" msgid "Use the dark check color" msgstr "Använd mörk rutfärg" -#: ../app/actions/view-actions.c:589 -#, fuzzy -#| msgctxt "view-padding-color" -#| msgid "Select _Custom Color..." +#: ../app/actions/view-actions.c:597 msgctxt "view-padding-color" msgid "_Custom Color..." -msgstr "Välj a_npassad färg..." +msgstr "Välj a_npassad färg…" -#: ../app/actions/view-actions.c:590 +#: ../app/actions/view-actions.c:598 msgctxt "view-padding-color" msgid "Use an arbitrary color" msgstr "Använd en godtycklig färg" -#: ../app/actions/view-actions.c:595 +#: ../app/actions/view-actions.c:603 msgctxt "view-padding-color" msgid "As in _Preferences" msgstr "Som i i_nställningarna" -#: ../app/actions/view-actions.c:597 +#: ../app/actions/view-actions.c:605 msgctxt "view-padding-color" msgid "Reset padding color to what's configured in preferences" msgstr "" "Återställ utfyllnadsfärg till vad som är konfigurerat i inställningarna" -#: ../app/actions/view-actions.c:895 +#: ../app/actions/view-actions.c:613 +msgctxt "view-action" +msgid "Set horizontal scroll offset" +msgstr "Sätt horisontell rullningsposition" + +#: ../app/actions/view-actions.c:618 +msgctxt "view-action" +msgid "Scroll to left border" +msgstr "Rulla till vänsterkant" + +#: ../app/actions/view-actions.c:623 +msgctxt "view-action" +msgid "Scroll to right border" +msgstr "Rulla till högerkant" + +#: ../app/actions/view-actions.c:628 +msgctxt "view-action" +msgid "Scroll left" +msgstr "Rulla åt vänster" + +#: ../app/actions/view-actions.c:633 +msgctxt "view-action" +msgid "Scroll right" +msgstr "Rulla åt höger" + +#: ../app/actions/view-actions.c:638 +msgctxt "view-action" +msgid "Scroll page left" +msgstr "Rulla en sida åt vänster" + +#: ../app/actions/view-actions.c:643 +msgctxt "view-action" +msgid "Scroll page right" +msgstr "Rulla en sida åt höger" + +#: ../app/actions/view-actions.c:651 +msgctxt "view-action" +msgid "Set vertical scroll offset" +msgstr "Sätt vertikal rullningsposition" + +#: ../app/actions/view-actions.c:656 +msgctxt "view-action" +msgid "Scroll to top border" +msgstr "Rulla till överkant" + +#: ../app/actions/view-actions.c:661 +msgctxt "view-action" +msgid "Scroll to bottom border" +msgstr "Rulla till nederkant" + +#: ../app/actions/view-actions.c:666 +msgctxt "view-action" +msgid "Scroll up" +msgstr "Rulla uppåt" + +#: ../app/actions/view-actions.c:671 +msgctxt "view-action" +msgid "Scroll down" +msgstr "Rulla nedåt" + +#: ../app/actions/view-actions.c:676 +msgctxt "view-action" +msgid "Scroll page up" +msgstr "Rulla en sida uppåt" + +#: ../app/actions/view-actions.c:681 +msgctxt "view-action" +msgid "Scroll page down" +msgstr "Rulla en sida nedåt" + +#: ../app/actions/view-actions.c:903 #, c-format msgid "Re_vert Zoom (%d%%)" msgstr "Åters_täll zoom (%d%%)" -#: ../app/actions/view-actions.c:903 +#: ../app/actions/view-actions.c:911 msgid "Re_vert Zoom" msgstr "Åters_täll zoom" -#: ../app/actions/view-actions.c:1089 +#: ../app/actions/view-actions.c:1098 #, c-format msgid "Othe_r (%s)..." -msgstr "Anna_t (%s) ..." +msgstr "Anna_t (%s) …" -#: ../app/actions/view-actions.c:1098 +#: ../app/actions/view-actions.c:1107 #, c-format msgid "_Zoom (%s)" msgstr "_Zooma (%s)" #. please preserve the trailing space -#: ../app/actions/view-actions.c:1119 +#: ../app/actions/view-actions.c:1128 msgid "(H+V) " -msgstr "" +msgstr "(H+V) " #. please preserve the trailing space -#: ../app/actions/view-actions.c:1124 +#: ../app/actions/view-actions.c:1133 msgid "(H) " -msgstr "" +msgstr "(H) " #. please preserve the trailing space -#: ../app/actions/view-actions.c:1129 +#: ../app/actions/view-actions.c:1138 msgid "(V) " -msgstr "" +msgstr "(V) " -#: ../app/actions/view-actions.c:1136 -#, fuzzy, c-format -#| msgid "_Rotate" +#: ../app/actions/view-actions.c:1145 +#, c-format msgid "_Flip %s& Rotate (%d°)" -msgstr "_Rotera" +msgstr "_Vänd %s& Rotera (%d°)" -#: ../app/actions/view-commands.c:950 +#: ../app/actions/view-commands.c:1005 msgid "Set Canvas Padding Color" msgstr "Ställ in utfyllnadsfärg för rityta" -#: ../app/actions/view-commands.c:952 +#: ../app/actions/view-commands.c:1007 msgid "Set Custom Canvas Padding Color" msgstr "Ställ in anpassad utfyllnadsfärg för rityta" @@ -7511,284 +9841,311 @@ msgstr "Skärm %s" msgid "Move this window to screen %s" msgstr "Flytta det här fönstret till skärmen %s" -#: ../app/actions/windows-actions.c:97 +#: ../app/actions/window-commands.c:76 ../app/dialogs/file-save-dialog.c:638 +#: ../app/dialogs/grid-dialog.c:103 ../app/dialogs/image-new-dialog.c:107 +#: ../app/dialogs/image-new-dialog.c:326 +#: ../app/dialogs/item-options-dialog.c:146 +#: ../app/dialogs/preferences-dialog.c:1101 +#: ../app/dialogs/print-size-dialog.c:125 +#: ../app/dialogs/resolution-calibrate-dialog.c:77 +#: ../app/dialogs/template-options-dialog.c:119 +#: ../app/display/gimpdisplayshell-filter-dialog.c:88 +#: ../app/display/gimpdisplayshell-rotate-dialog.c:123 +#: ../app/display/gimpdisplayshell-scale-dialog.c:123 ../app/gui/gui.c:193 +#: ../app/tools/gimpfiltertool.c:324 ../app/widgets/gimpcolordialog.c:111 +#: ../app/widgets/gimpcontrollereditor.c:661 +#: ../app/widgets/gimperrordialog.c:76 ../app/widgets/gimpfiledialog.c:188 +msgid "_OK" +msgstr "_OK" + +#: ../app/actions/windows-actions.c:98 msgctxt "windows-action" msgid "_Windows" msgstr "F_önster" -#: ../app/actions/windows-actions.c:99 +#: ../app/actions/windows-actions.c:100 msgctxt "windows-action" msgid "_Recently Closed Docks" msgstr "_Senaste stängda dockningar" -#: ../app/actions/windows-actions.c:101 +#: ../app/actions/windows-actions.c:102 msgctxt "windows-action" msgid "_Dockable Dialogs" msgstr "_Dockningsbara dialoger" -#: ../app/actions/windows-actions.c:104 +#: ../app/actions/windows-actions.c:105 msgctxt "windows-action" msgid "Next Image" msgstr "Nästa bild" -#: ../app/actions/windows-actions.c:105 +#: ../app/actions/windows-actions.c:106 msgctxt "windows-action" msgid "Switch to the next image" msgstr "Växla till nästa bild" -#: ../app/actions/windows-actions.c:110 +#: ../app/actions/windows-actions.c:111 msgctxt "windows-action" msgid "Previous Image" msgstr "Föregående bild" -#: ../app/actions/windows-actions.c:111 +#: ../app/actions/windows-actions.c:112 msgctxt "windows-action" msgid "Switch to the previous image" msgstr "Växla till föregående bild" -#: ../app/actions/windows-actions.c:116 -#, fuzzy -#| msgid "Position:" +#: ../app/actions/windows-actions.c:117 msgctxt "windows-action" msgid "_Tabs Position" -msgstr "Position:" +msgstr "_Flikposition" -#: ../app/actions/windows-actions.c:122 +#: ../app/actions/windows-actions.c:123 msgctxt "windows-action" msgid "Hide Docks" msgstr "Göm dockor" -#: ../app/actions/windows-actions.c:123 -#, fuzzy -#| msgctxt "windows-action" -#| msgid "" -#| "When enabled docks and other dialogs are hidden, leaving only image " -#| "windows." +#: ../app/actions/windows-actions.c:124 msgctxt "windows-action" msgid "" "When enabled, docks and other dialogs are hidden, leaving only image windows." -msgstr "När aktiverat göms dockor och andra dialoger, bara bildfönstret visas" +msgstr "" +"När aktiverat göms dockor och andra dialoger, endast bildfönstren visas." -#: ../app/actions/windows-actions.c:129 +#: ../app/actions/windows-actions.c:130 msgctxt "windows-action" msgid "Single-Window Mode" msgstr "Ett programfönster" -#: ../app/actions/windows-actions.c:130 -#, fuzzy -#| msgctxt "windows-action" -#| msgid "When enabled GIMP is in a single-window mode." +#: ../app/actions/windows-actions.c:131 msgctxt "windows-action" msgid "When enabled, GIMP is in a single-window mode." -msgstr "När aktiverat körs GIMP i ett enda fönster" - -#: ../app/actions/windows-actions.c:139 -msgctxt "windows-tabs-position-action" -msgid "_Top" -msgstr "" +msgstr "När aktiverat körs GIMP i ett enda fönster." #: ../app/actions/windows-actions.c:140 -#, fuzzy -#| msgctxt "vectors-action" -#| msgid "Raise this path to the top" +msgctxt "windows-tabs-position-action" +msgid "_Top" +msgstr "_Topp" + +#: ../app/actions/windows-actions.c:141 msgctxt "windows-tabs-position-action" msgid "Position the tabs on the top" -msgstr "Höj denna bana till överst" - -#: ../app/actions/windows-actions.c:144 -#, fuzzy -#| msgctxt "layers-action" -#| msgid "Layer to _Bottom" -msgctxt "windows-tabs-position-action" -msgid "_Bottom" -msgstr "Lager till _botten" +msgstr "Positionera flikarna längst upp" #: ../app/actions/windows-actions.c:145 -#, fuzzy -#| msgctxt "vectors-action" -#| msgid "Lower this path to the bottom" +msgctxt "windows-tabs-position-action" +msgid "_Bottom" +msgstr "_Botten" + +#: ../app/actions/windows-actions.c:146 msgctxt "windows-tabs-position-action" msgid "Position the tabs on the bottom" -msgstr "Sänk denna bana till underst" - -#: ../app/actions/windows-actions.c:149 -msgctxt "windows-tabs-position-action" -msgid "_Left" -msgstr "" +msgstr "Positionera flikarna längst ner" #: ../app/actions/windows-actions.c:150 msgctxt "windows-tabs-position-action" -msgid "Position the tabs on the left" -msgstr "" +msgid "_Left" +msgstr "_Vänster" -#: ../app/actions/windows-actions.c:154 -#, fuzzy -#| msgid "H_eight:" +#: ../app/actions/windows-actions.c:151 msgctxt "windows-tabs-position-action" -msgid "_Right" -msgstr "H_öjd:" +msgid "Position the tabs on the left" +msgstr "Positionera flikarna till vänster" #: ../app/actions/windows-actions.c:155 msgctxt "windows-tabs-position-action" +msgid "_Right" +msgstr "_Höger" + +#: ../app/actions/windows-actions.c:156 +msgctxt "windows-tabs-position-action" msgid "Position the tabs on the right" -msgstr "" +msgstr "Positionera flikarna till höger" #: ../app/actions/windows-commands.c:183 msgid "" "The chosen recent dock contains a toolbox. Please close the currently open " "toolbox and try again." msgstr "" - -#: ../app/config/config-enums.c:24 -msgctxt "cursor-mode" -msgid "Tool icon" -msgstr "Verktygsikon" +"Den valda senaste dockan innehåller en verktygslåda. Stäng den verktygslåda " +"som är öppen för närvarande och försök igen." #: ../app/config/config-enums.c:25 -msgctxt "cursor-mode" -msgid "Tool icon with crosshair" -msgstr "Verktygsikon med korshår" - -#: ../app/config/config-enums.c:26 -msgctxt "cursor-mode" -msgid "Crosshair only" -msgstr "Endast korshår" - -#: ../app/config/config-enums.c:56 msgctxt "canvas-padding-mode" msgid "From theme" msgstr "Från tema" -#: ../app/config/config-enums.c:57 +#: ../app/config/config-enums.c:26 msgctxt "canvas-padding-mode" msgid "Light check color" msgstr "Ljus rutfärg" -#: ../app/config/config-enums.c:58 +#: ../app/config/config-enums.c:27 msgctxt "canvas-padding-mode" msgid "Dark check color" msgstr "Mörk rutfärg" -#: ../app/config/config-enums.c:59 +#: ../app/config/config-enums.c:28 msgctxt "canvas-padding-mode" msgid "Custom color" msgstr "Anpassad färg" -#: ../app/config/config-enums.c:88 -msgctxt "space-bar-action" -msgid "No action" -msgstr "Ingen åtgärd" - -#: ../app/config/config-enums.c:89 -msgctxt "space-bar-action" -msgid "Pan view" -msgstr "Panorera vy" - -#: ../app/config/config-enums.c:90 -msgctxt "space-bar-action" -msgid "Switch to Move tool" -msgstr "Växla till flyttningsverktyget" - -#: ../app/config/config-enums.c:118 -msgctxt "zoom-quality" -msgid "Low" -msgstr "Låg" - -#: ../app/config/config-enums.c:119 -msgctxt "zoom-quality" -msgid "High" -msgstr "Hög" - -#: ../app/config/config-enums.c:147 -msgctxt "help-browser-type" -msgid "GIMP help browser" -msgstr "GIMP hjälpläsare" - -#: ../app/config/config-enums.c:148 -msgctxt "help-browser-type" -msgid "Web browser" -msgstr "Webbläsare" - -#: ../app/config/config-enums.c:177 -msgctxt "window-hint" -msgid "Normal window" -msgstr "Normalt fönster" - -#: ../app/config/config-enums.c:178 -msgctxt "window-hint" -msgid "Utility window" -msgstr "Verktygsfönster" - -#: ../app/config/config-enums.c:179 -msgctxt "window-hint" -msgid "Keep above" -msgstr "Behåll ovanpå" - -#: ../app/config/config-enums.c:207 +#: ../app/config/config-enums.c:56 msgctxt "cursor-format" msgid "Black & white" msgstr "Svartvitt" -#: ../app/config/config-enums.c:208 +#: ../app/config/config-enums.c:57 msgctxt "cursor-format" msgid "Fancy" msgstr "Tjusig" -#: ../app/config/config-enums.c:236 +#: ../app/config/config-enums.c:86 +msgctxt "cursor-mode" +msgid "Tool icon" +msgstr "Verktygsikon" + +#: ../app/config/config-enums.c:87 +msgctxt "cursor-mode" +msgid "Tool icon with crosshair" +msgstr "Verktygsikon med korshår" + +#: ../app/config/config-enums.c:88 +msgctxt "cursor-mode" +msgid "Crosshair only" +msgstr "Endast korshår" + +#: ../app/config/config-enums.c:116 msgctxt "handedness" msgid "Left-handed" msgstr "Vänsterhänt" -#: ../app/config/config-enums.c:237 +#: ../app/config/config-enums.c:117 msgctxt "handedness" msgid "Right-handed" msgstr "Högerhänt" -#: ../app/config/config-enums.c:267 +#: ../app/config/config-enums.c:145 +msgctxt "help-browser-type" +msgid "GIMP help browser" +msgstr "GIMP hjälpläsare" + +#: ../app/config/config-enums.c:146 +msgctxt "help-browser-type" +msgid "Web browser" +msgstr "Webbläsare" + +#: ../app/config/config-enums.c:178 +msgctxt "icon-size" +msgid "Guess ideal size" +msgstr "Gissa ideal storlek" + +#: ../app/config/config-enums.c:179 +msgctxt "icon-size" +msgid "Theme-set size" +msgstr "Storlek satt av tema" + +#: ../app/config/config-enums.c:180 +msgctxt "icon-size" +msgid "Small size" +msgstr "Liten storlek" + +#: ../app/config/config-enums.c:181 +msgctxt "icon-size" +msgid "Medium size" +msgstr "Mellanstorlek" + +#: ../app/config/config-enums.c:182 +msgctxt "icon-size" +msgid "Large size" +msgstr "Stor storlek" + +#: ../app/config/config-enums.c:183 +msgctxt "icon-size" +msgid "Huge size" +msgstr "Jättestor storlek" + +#: ../app/config/config-enums.c:213 msgctxt "position" msgid "Top" -msgstr "" +msgstr "Topp" -#: ../app/config/config-enums.c:268 +#: ../app/config/config-enums.c:214 msgctxt "position" msgid "Bottom" -msgstr "" +msgstr "Botten" -#: ../app/config/config-enums.c:269 +#: ../app/config/config-enums.c:215 msgctxt "position" msgid "Left" -msgstr "" +msgstr "Vänster" -#: ../app/config/config-enums.c:270 -#, fuzzy -#| msgid "Weight" +#: ../app/config/config-enums.c:216 msgctxt "position" msgid "Right" -msgstr "Vikt" +msgstr "Höger" + +#: ../app/config/config-enums.c:245 +msgctxt "space-bar-action" +msgid "No action" +msgstr "Ingen åtgärd" + +#: ../app/config/config-enums.c:246 +msgctxt "space-bar-action" +msgid "Pan view" +msgstr "Panorera vy" + +#: ../app/config/config-enums.c:247 +msgctxt "space-bar-action" +msgid "Switch to Move tool" +msgstr "Växla till flyttningsverktyget" + +#: ../app/config/config-enums.c:276 +msgctxt "window-hint" +msgid "Normal window" +msgstr "Normalt fönster" + +#: ../app/config/config-enums.c:277 +msgctxt "window-hint" +msgid "Utility window" +msgstr "Verktygsfönster" + +#: ../app/config/config-enums.c:278 +msgctxt "window-hint" +msgid "Keep above" +msgstr "Behåll ovanpå" + +#: ../app/config/config-enums.c:306 +msgctxt "zoom-quality" +msgid "Low" +msgstr "Låg" + +#: ../app/config/config-enums.c:307 +msgctxt "zoom-quality" +msgid "High" +msgstr "Hög" #: ../app/config/gimpconfig-file.c:82 #, c-format msgid "Could not open '%s' for writing: %s" -msgstr "Kunde inte öppna \"%s\" för skrivning: %s" +msgstr "Kunde inte öppna ”%s” för skrivning: %s" #: ../app/config/gimpconfig-file.c:116 #, c-format msgid "Error parsing '%%s': line longer than %s characters." -msgstr "" +msgstr "Fel vid tolkning av ”%%s”: raden är längre än %s tecken." #: ../app/config/gimpconfig-file.c:152 ../app/config/gimpconfig-file.c:196 -#: ../app/core/gimp-tags.c:144 ../app/gui/themes.c:324 -#: ../app/tools/gimpfiltertool-settings.c:229 +#: ../app/core/gimp-tags.c:144 ../app/gui/themes.c:344 +#: ../app/tools/gimpfiltertool-settings.c:227 #, c-format msgid "Error writing '%s': %s" -msgstr "Fel vid skrivning av \"%s\": %s" +msgstr "Fel vid skrivning av ”%s”: %s" #: ../app/config/gimpconfig-file.c:182 ../app/plug-in/gimpenvirontable.c:369 #: ../app/plug-in/gimpinterpreterdb.c:267 -#: ../app/tools/gimpfiltertool-settings.c:180 +#: ../app/tools/gimpfiltertool-settings.c:182 #, c-format msgid "Error reading '%s': %s" -msgstr "Fel vid läsning av \"%s\": %s" +msgstr "Fel vid läsning av ”%s”: %s" #: ../app/config/gimpconfig-file.c:232 #, c-format @@ -7796,22 +10153,23 @@ msgid "" "There was an error parsing your '%s' file. Default values will be used. A " "backup of your configuration has been created at '%s'." msgstr "" -"Ett fel uppstod vid tolkningen av filen \"%s\". Standardvärden kommer att " -"användas. En säkerhetskopia av din konfiguration har skapats vid \"%s\"." +"Ett fel uppstod vid tolkningen av filen ”%s”. Standardvärden kommer att " +"användas. En säkerhetskopia av din konfiguration har skapats vid ”%s”." -#: ../app/config/gimpdialogconfig.c:145 ../app/core/gimplayer.c:325 +#: ../app/config/gimpdialogconfig.c:307 ../app/core/gimplayer.c:440 msgid "Layer" msgstr "Lager" -#: ../app/config/gimpdialogconfig.c:175 ../app/core/gimpchannel.c:289 -#: ../app/operations/gimpcurvesconfig.c:104 -#: ../app/operations/gimplevelsconfig.c:105 -#: ../app/widgets/gimpchanneltreeview.c:333 +#: ../app/config/gimpdialogconfig.c:407 ../app/core/gimpchannel.c:269 +#: ../app/operations/gimpcurvesconfig.c:111 +#: ../app/operations/gimplevelsconfig.c:114 +#: ../app/operations/gimpoperationthreshold.c:89 +#: ../app/widgets/gimpchanneltreeview.c:332 msgid "Channel" msgstr "Kanal" -#: ../app/config/gimpdialogconfig.c:190 ../app/vectors/gimpvectors.c:222 -#: ../app/widgets/gimpvectorstreeview.c:254 +#: ../app/config/gimpdialogconfig.c:422 ../app/vectors/gimpvectors.c:223 +#: ../app/widgets/gimpvectorstreeview.c:250 msgid "Path" msgstr "Bana" @@ -7826,7 +10184,7 @@ msgid "" "\"." msgstr "" "När aktiverat blir en bild den aktiva bilden när dess bildfönster får fokus. " -"Detta är användbart för fönsterhanterare med \"klicka för fokus\"." +"Detta är användbart för fönsterhanterare med ”klicka för fokus”." #: ../app/config/gimprc-blurbs.h:23 ../app/config/gimprc-blurbs.h:28 msgid "Sets the dynamics search path." @@ -7849,14 +10207,19 @@ msgid "How to handle embedded color profiles when opening a file." msgstr "Hur inbäddade färgprofiler ska hanteras när en fil öppnas." #: ../app/config/gimprc-blurbs.h:46 +msgid "Sets the default folder path for all color profile file dialogs." +msgstr "" +"Ställer in sökvägen för standardmappen för alla färgprofilsfildialoger." + +#: ../app/config/gimprc-blurbs.h:49 msgid "Sets the type of mouse pointers to use." msgstr "Ställer in typen av muspekare att använda." -#: ../app/config/gimprc-blurbs.h:49 +#: ../app/config/gimprc-blurbs.h:52 msgid "Sets the handedness for cursor positioning." msgstr "Anger höger/vänsterhänthet för muspekarposition." -#: ../app/config/gimprc-blurbs.h:52 +#: ../app/config/gimprc-blurbs.h:55 msgid "" "Context-dependent mouse pointers are helpful. They are enabled by default. " "However, they require overhead that you may want to do without." @@ -7864,7 +10227,7 @@ msgstr "" "Kontextberoende muspekare är behjälpliga. De är aktiverade som standard. De " "kräver dock resurser som du kan vilja använda till annat." -#: ../app/config/gimprc-blurbs.h:68 +#: ../app/config/gimprc-blurbs.h:71 msgid "" "When enabled, this will ensure that each pixel of an image gets mapped to a " "pixel on the screen." @@ -7872,13 +10235,13 @@ msgstr "" "När aktiverat ser detta till att varje bildelement i bilden motsvaras av ett " "bildelement på skärmen." -#: ../app/config/gimprc-blurbs.h:93 +#: ../app/config/gimprc-blurbs.h:96 msgid "This is the distance in pixels where Guide and Grid snapping activates." msgstr "" "Detta är avståndet i bildpunkter där fästning mot hjälplinjer och rutnät " -"aktiveras" +"aktiveras." -#: ../app/config/gimprc-blurbs.h:109 +#: ../app/config/gimprc-blurbs.h:112 msgid "" "Tools such as fuzzy-select and bucket fill find regions based on a seed-fill " "algorithm. The seed fill starts at the initially selected pixel and " @@ -7892,7 +10255,7 @@ msgstr "" "är större än ett angivet tröskelvärde. Detta är standardvärdet för " "tröskelvärdet." -#: ../app/config/gimprc-blurbs.h:122 +#: ../app/config/gimprc-blurbs.h:125 msgid "" "The window type hint that is set on dock windows and the toolbox window. " "This may affect the way your window manager decorates and handles these " @@ -7902,36 +10265,89 @@ msgstr "" "Detta kan påverka hur din fönsterhanterare dekorerar och hanterar dessa " "fönster." -#: ../app/config/gimprc-blurbs.h:142 +#: ../app/config/gimprc-blurbs.h:145 msgid "When enabled, the selected brush will be used for all tools." msgstr "Om aktiverad kommer den valda penseln att användas för alla verktyg." -#: ../app/config/gimprc-blurbs.h:145 +#: ../app/config/gimprc-blurbs.h:148 msgid "When enabled, the selected dynamics will be used for all tools." msgstr "Om aktiverad kommer den valda dynamiken att användas för alla verktyg." -#: ../app/config/gimprc-blurbs.h:151 +#: ../app/config/gimprc-blurbs.h:154 msgid "When enabled, the selected gradient will be used for all tools." msgstr "" "Om aktiverad kommer den valda gradienten att användas för alla verktyg." -#: ../app/config/gimprc-blurbs.h:154 +#: ../app/config/gimprc-blurbs.h:157 msgid "When enabled, the selected pattern will be used for all tools." msgstr "Om aktiverad kommer det valda mönstret att användas för alla verktyg." -#: ../app/config/gimprc-blurbs.h:168 +#: ../app/config/gimprc-blurbs.h:171 msgid "Sets the browser used by the help system." msgstr "Ställer in webbläsaren som används av hjälpsystemet." #: ../app/config/gimprc-blurbs.h:179 +msgid "How many recent settings to keep around in filter tools." +msgstr "Hur många nyligen använda filer som ska finnas i filterverktygen." + +#: ../app/config/gimprc-blurbs.h:182 +msgid "Default to the last used settings in filter tools." +msgstr "" + +#: ../app/config/gimprc-blurbs.h:185 +msgid "Show advanced color options in filter tools." +msgstr "Visa avancerade färgalternativ i filterverktyg." + +#: ../app/config/gimprc-blurbs.h:188 msgid "Sets the text to appear in image window status bars." msgstr "Ställer in texten som visas i statusraden på bildfönster." -#: ../app/config/gimprc-blurbs.h:182 +#: ../app/config/gimprc-blurbs.h:191 msgid "Sets the text to appear in image window titles." msgstr "Ställer in texten som visas i titelraden på bildfönster." -#: ../app/config/gimprc-blurbs.h:185 +#: ../app/config/gimprc-blurbs.h:194 +msgid "" +"Promote imported images to floating point precision. Does not apply to " +"indexed images." +msgstr "" +"Befordra importerade bilder till flyttalsprecision. Gäller inte för " +"indexerade bilder." + +#: ../app/config/gimprc-blurbs.h:198 +msgid "" +"When promoting imported images to floating point precision, also add minimal " +"noise in order to distribute color values a bit." +msgstr "" +"Vid befordran av importerade bilder till flyttalsprecision, lägg också till " +"minimalt med brus för att distribuera färgvärdena lite grann." + +#: ../app/config/gimprc-blurbs.h:202 +msgid "Add an alpha channel to all layers of imported images." +msgstr "Lägg till alfakanal till alla lager för importerade bilder." + +#: ../app/config/gimprc-blurbs.h:205 +msgid "Which plug-in to use for importing raw digital camera files." +msgstr "" +"Vilken insticksmodul som ska användas vid import av råa digitalkamera-filer." + +#: ../app/config/gimprc-blurbs.h:208 +msgid "Export Exif metadata by default." +msgstr "Exportera Exif-metadata som standard." + +#: ../app/config/gimprc-blurbs.h:211 +msgid "Export XMP metadata by default." +msgstr "Exportera XMP-metadata som standard." + +#: ../app/config/gimprc-blurbs.h:214 +msgid "Export IPTC metadata by default." +msgstr "Exportera IPTC-metadata som standard." + +#: ../app/config/gimprc-blurbs.h:217 +msgid "Try generating debug data for bug reporting when appropriate." +msgstr "Försök generera felsökningsdata för felrapportering när lämpligt." + +#: ../app/config/gimprc-blurbs.h:220 msgid "" "When enabled, this will ensure that the full image is visible after a file " "is opened, otherwise it will be displayed with a scale of 1:1." @@ -7939,21 +10355,21 @@ msgstr "" "När aktiverat säkerställer detta att hela bilden är synlig när filen öppnas, " "annars visas bilden i skala 1:1." -#: ../app/config/gimprc-blurbs.h:189 +#: ../app/config/gimprc-blurbs.h:224 msgid "" "Sets the level of interpolation used for scaling and other transformations." msgstr "" "Ställer in interpolationsnivån för skalning och andra transformationer." -#: ../app/config/gimprc-blurbs.h:196 +#: ../app/config/gimprc-blurbs.h:231 msgid "Specifies the language to use for the user interface." -msgstr "Ställer in språk för användargränssnittet" +msgstr "Ställer in språk för användargränssnittet." -#: ../app/config/gimprc-blurbs.h:199 +#: ../app/config/gimprc-blurbs.h:234 msgid "How many recently opened image filenames to keep on the File menu." -msgstr "Hur många nyligen använda filer som ska finnas i filmenyn." +msgstr "Hur många nyligen använda filer som ska finnas i Arkiv-menyn." -#: ../app/config/gimprc-blurbs.h:202 +#: ../app/config/gimprc-blurbs.h:237 msgid "" "Speed of marching ants in the selection outline. This value is in " "milliseconds (less time indicates faster marching)." @@ -7961,7 +10377,7 @@ msgstr "" "Hastigheten på marscherande myror i markeringens kontur. Detta värde är i " "millisekunder (mindre tid indikerar snabbare marsch)." -#: ../app/config/gimprc-blurbs.h:206 +#: ../app/config/gimprc-blurbs.h:241 msgid "" "GIMP will warn the user if an attempt is made to create an image that would " "take more memory than the size specified here." @@ -7969,7 +10385,7 @@ msgstr "" "GIMP kommer varna användaren vid försök att skapa en bild som skulle kräva " "mer minne än det som angivits här." -#: ../app/config/gimprc-blurbs.h:216 +#: ../app/config/gimprc-blurbs.h:251 msgid "" "Sets the monitor's horizontal resolution, in dots per inch. If set to 0, " "forces the X server to be queried for both horizontal and vertical " @@ -7979,7 +10395,7 @@ msgstr "" "satt till 0, frågar vi X-servern efter både horisontell och vertikal " "upplösning." -#: ../app/config/gimprc-blurbs.h:221 +#: ../app/config/gimprc-blurbs.h:256 msgid "" "Sets the monitor's vertical resolution, in dots per inch. If set to 0, " "forces the X server to be queried for both horizontal and vertical " @@ -7988,7 +10404,7 @@ msgstr "" "Ställer in skärmens vertikala upplösning i punkter per tum. Om det är satt " "till 0, frågar vi X-servern efter både horisontell och vertikal upplösning." -#: ../app/config/gimprc-blurbs.h:226 +#: ../app/config/gimprc-blurbs.h:261 msgid "" "If enabled, the move tool sets the edited layer or path as active. This " "used to be the default behaviour in older versions." @@ -7996,7 +10412,7 @@ msgstr "" "Om aktiverat ställer flyttningsverktyget in det redigerade lagret eller " "banan som aktivt. Detta var standardbeteendet i äldre versioner." -#: ../app/config/gimprc-blurbs.h:235 +#: ../app/config/gimprc-blurbs.h:270 msgid "" "Sets the size of the navigation preview available in the lower right corner " "of the image window." @@ -8004,12 +10420,13 @@ msgstr "" "Ställer in storleken på förhandsvisningen som är tillgänglig i nedre högra " "hörnet av bildfönstret." -#: ../app/config/gimprc-blurbs.h:239 -msgid "Sets how many processors GIMP should try to use simultaneously." +#: ../app/config/gimprc-blurbs.h:274 +msgid "Sets how many threads GIMP should use for operations that support it." msgstr "" -"Ställer in hur många processorer som GIMP ska försöka använda samtidigt." +"Ställer in hur många trådar som GIMP ska använda för åtgärder som har stöd " +"för det." -#: ../app/config/gimprc-blurbs.h:261 +#: ../app/config/gimprc-blurbs.h:296 msgid "" "Sets whether GIMP should create previews of layers and channels. Previews in " "the layers and channels dialog are nice to have but they can slow things " @@ -8019,60 +10436,66 @@ msgstr "" "Förhandsvisningar av lager och kanaler är trevliga att ha men de kan göra " "saker långsammare vid arbete med stora bilder." -#: ../app/config/gimprc-blurbs.h:266 +#: ../app/config/gimprc-blurbs.h:301 msgid "" "Sets the preview size used for layers and channel previews in newly created " "dialogs." msgstr "" "Ställer in förhandsvisningsstorlek för lager och kanaler i nya dialoger." -#: ../app/config/gimprc-blurbs.h:270 +#: ../app/config/gimprc-blurbs.h:305 msgid "Sets the default quick mask color." -msgstr "Anger den förvalda snabbmaskfärgen." +msgstr "Ställer in standardsnabbmaskfärgen." -#: ../app/config/gimprc-blurbs.h:273 -#, fuzzy -#| msgid "" -#| "When enabled, the image window will automatically resize itself whenever " -#| "the physical image size changes." +#: ../app/config/gimprc-blurbs.h:308 msgid "" "When enabled, the image window will automatically resize itself whenever the " "physical image size changes. This setting only takes effect in multi-window " "mode." msgstr "" "När aktiverat kommer bildfönstret automatiskt att ändra sin storlek när " -"bildens fysiska storlek ändras." +"bildens fysiska storlek ändras. Denna inställning får bara effekt i " +"flerfönsterläge." -#: ../app/config/gimprc-blurbs.h:278 -#, fuzzy -#| msgid "" -#| "When enabled, the image window will automatically resize itself when " -#| "zooming into and out of images." +#: ../app/config/gimprc-blurbs.h:313 msgid "" "When enabled, the image window will automatically resize itself when zooming " "into and out of images. This setting only takes effect in multi-window mode." msgstr "" "När aktiverat kommer bildfönstret automatiskt att ändra sin storlek när man " -"zoomar in eller ut i bilder." +"zoomar in eller ut i bilder. Denna inställning får bara effekt i " +"flerfönsterläge." -#: ../app/config/gimprc-blurbs.h:283 +#: ../app/config/gimprc-blurbs.h:318 msgid "Let GIMP try to restore your last saved session on each startup." msgstr "" "Låt GIMP försöka återskapa din senast sparade session vid varje uppstart." -#: ../app/config/gimprc-blurbs.h:286 +#: ../app/config/gimprc-blurbs.h:321 msgid "" "When enabled, GIMP will try to restore windows on the monitor they were open " "before. When disabled, windows will appear on the currently used monitor." msgstr "" +"När aktiverat kommer GIMP att försöka återställa fönster på skärmen där de " +"tidigare öppnades. När inaktiverat kommer fönster att dyka upp på den för " +"närvarande använda skärmen." -#: ../app/config/gimprc-blurbs.h:291 +#: ../app/config/gimprc-blurbs.h:326 msgid "" "Remember the current tool, pattern, color, and brush across GIMP sessions." msgstr "" "Kom ihåg aktuellt verktyg, mönster, färg och pensel mellan GIMP-sessioner." -#: ../app/config/gimprc-blurbs.h:295 +#: ../app/config/gimprc-blurbs.h:330 +msgid "" +"When enabled, the same tool and tool options will be used for all input " +"devices. No tool switching will occur when the input device changes." +msgstr "" +"När aktiverat kommer samma verktyg och verktygsalternativ att användas för " +"alla inmatningsenheter. Ingen verktygsväxling kommer att ske när " +"inmatningsenheten ändras." + +#: ../app/config/gimprc-blurbs.h:335 msgid "" "Keep a permanent record of all opened and saved files in the Recent " "Documents list." @@ -8080,16 +10503,16 @@ msgstr "" "Håll permanent information över alla öppnade och sparade filer till Senaste " "dokument-listan." -#: ../app/config/gimprc-blurbs.h:299 +#: ../app/config/gimprc-blurbs.h:339 msgid "Save the positions and sizes of the main dialogs when GIMP exits." msgstr "" "Spara positioner och storlekar på huvuddialogrutorna när GIMP avslutas." -#: ../app/config/gimprc-blurbs.h:302 +#: ../app/config/gimprc-blurbs.h:342 msgid "Save the tool options when GIMP exits." msgstr "Spara verktygsalternativen när GIMP avslutas." -#: ../app/config/gimprc-blurbs.h:308 +#: ../app/config/gimprc-blurbs.h:348 msgid "" "When enabled, all paint tools will show a preview of the current brush's " "outline." @@ -8097,7 +10520,7 @@ msgstr "" "När aktiverat kommer alla målarverktyg att visa en förhandsvisning av den " "aktuella penselns kontur." -#: ../app/config/gimprc-blurbs.h:312 +#: ../app/config/gimprc-blurbs.h:352 msgid "" "When enabled, dialogs will show a help button that gives access to the " "related help page. Without this button, the help page can still be reached " @@ -8106,7 +10529,7 @@ msgstr "" "När aktiverat kommer alla dialoger att visa en hjälpknapp som leder till " "relevant hjälp. Du kan se hjälpen även utan denna knapp genom att trycka F1." -#: ../app/config/gimprc-blurbs.h:317 +#: ../app/config/gimprc-blurbs.h:357 msgid "" "When enabled, the mouse pointer will be shown over the image while using a " "paint tool." @@ -8114,118 +10537,115 @@ msgstr "" "När aktiverad kommer muspekaren att visas över bilden när ett målarverktyg " "används." -#: ../app/config/gimprc-blurbs.h:321 +#: ../app/config/gimprc-blurbs.h:361 msgid "" "When enabled, the menubar is visible by default. This can also be toggled " "with the \"View->Show Menubar\" command." msgstr "" -"När aktiverat är menyraden synlig. Detta kan också ändras med \"Visa -> Visa " -"menyrad\"-kommandot." +"När aktiverat är menyraden synlig. Detta kan också ändras med ”Visa -> Visa " +"menyrad”-kommandot." -#: ../app/config/gimprc-blurbs.h:325 +#: ../app/config/gimprc-blurbs.h:365 msgid "" "When enabled, the rulers are visible by default. This can also be toggled " "with the \"View->Show Rulers\" command." msgstr "" -"När aktiverat är linjalerna synliga. Detta kan också ändras med \"Visa -> " -"Visa linjaler\"-kommandot." +"När aktiverat är linjalerna synliga. Detta kan också ändras med ”Visa -> " +"Visa linjaler”-kommandot." -#: ../app/config/gimprc-blurbs.h:329 +#: ../app/config/gimprc-blurbs.h:369 msgid "" "When enabled, the scrollbars are visible by default. This can also be " "toggled with the \"View->Show Scrollbars\" command." msgstr "" -"När aktiverat är rullningslisterna synliga. Detta kan också ändras med " -"\"Visa -> Visa rullningslister\"-kommandot." +"När aktiverat är rullningslisterna synliga. Detta kan också ändras med ”Visa " +"-> Visa rullningslister”-kommandot." -#: ../app/config/gimprc-blurbs.h:333 +#: ../app/config/gimprc-blurbs.h:373 msgid "" "When enabled, the statusbar is visible by default. This can also be toggled " "with the \"View->Show Statusbar\" command." msgstr "" -"När aktiverat är statusraden synlig. Detta kan också ändras med \"Visa -> " -"Visa statusrad\"-kommandot." +"När aktiverat är statusraden synlig. Detta kan också ändras med ”Visa -> " +"Visa statusrad”-kommandot." -#: ../app/config/gimprc-blurbs.h:337 +#: ../app/config/gimprc-blurbs.h:377 msgid "" "When enabled, the selection is visible by default. This can also be toggled " "with the \"View->Show Selection\" command." msgstr "" -"När aktiverat är urvalet synligt. Detta kan också ändras med \"Visa -> Visa " -"urval\"-kommandot." +"När aktiverat är urvalet synligt. Detta kan också ändras med ”Visa -> Visa " +"urval”-kommandot." -#: ../app/config/gimprc-blurbs.h:341 +#: ../app/config/gimprc-blurbs.h:381 msgid "" "When enabled, the layer boundary is visible by default. This can also be " "toggled with the \"View->Show Layer Boundary\" command." msgstr "" -"När aktiverat är lagerkanten synlig. Detta kan också ändras med \"Visa -> " -"Visa lagerkant\"-kommandot." +"När aktiverat är lagerkanten synlig. Detta kan också ändras med ”Visa -> " +"Visa lagerkant”-kommandot." -#: ../app/config/gimprc-blurbs.h:345 +#: ../app/config/gimprc-blurbs.h:385 msgid "" "When enabled, the guides are visible by default. This can also be toggled " "with the \"View->Show Guides\" command." msgstr "" -"När aktiverat är hjälplinjerna synliga. Detta kan också ändras med \"Visa -> " -"Visa hjälplinjer\"-kommandot." +"När aktiverat är hjälplinjerna synliga. Detta kan också ändras med ”Visa -> " +"Visa hjälplinjer”-kommandot." -#: ../app/config/gimprc-blurbs.h:349 +#: ../app/config/gimprc-blurbs.h:389 msgid "" "When enabled, the grid is visible by default. This can also be toggled with " "the \"View->Show Grid\" command." msgstr "" -"När aktiverat är rutnätet synligt. Detta kan också ändras med \"Visa -> Visa " -"rutnät\"-kommandot." +"När aktiverat är rutnätet synligt. Detta kan också ändras med ”Visa -> Visa " +"rutnät”-kommandot." -#: ../app/config/gimprc-blurbs.h:353 +#: ../app/config/gimprc-blurbs.h:393 msgid "" "When enabled, the sample points are visible by default. This can also be " "toggled with the \"View->Show Sample Points\" command." msgstr "" -"När aktiverat är sampelpunkterna synliga. Detta kan också ändras med " -"kommandot \"Visa -> Visa sampelpunkter\"." +"När aktiverat är samplingspunkterna synliga. Detta kan också ändras med " +"kommandot ”Visa -> Visa samplingspunkter”." -#: ../app/config/gimprc-blurbs.h:357 +#: ../app/config/gimprc-blurbs.h:397 msgid "Show a tooltip when the pointer hovers over an item." msgstr "Visa ett verktygstips när muspekaren befinner sig över ett objekt." -#: ../app/config/gimprc-blurbs.h:360 +#: ../app/config/gimprc-blurbs.h:400 msgid "Use GIMP in a single-window mode." msgstr "Kör GIMP i ett enda programfönster." -#: ../app/config/gimprc-blurbs.h:363 +#: ../app/config/gimprc-blurbs.h:403 msgid "Hide docks and other windows, leaving only image windows." msgstr "Göm dockor och andra fönster, lämna bara bildfönster." -#: ../app/config/gimprc-blurbs.h:366 -#, fuzzy -#| msgctxt "dialogs-action" -#| msgid "Open the pointer information dialog" +#: ../app/config/gimprc-blurbs.h:406 msgid "Enable the N-Point Deformation tool." -msgstr "Öppna dialogrutan för pekarinformation" +msgstr "Aktivera N-punktsdeformeringsverktyg." -#: ../app/config/gimprc-blurbs.h:369 +#: ../app/config/gimprc-blurbs.h:409 msgid "Enable the Handle Transform tool." -msgstr "" +msgstr "Aktivera handtagstransformeringsverktyget." -#: ../app/config/gimprc-blurbs.h:372 +#: ../app/config/gimprc-blurbs.h:412 msgid "Enable symmetry on painting." -msgstr "" +msgstr "Aktivera symmetri i målningen." -#: ../app/config/gimprc-blurbs.h:375 +#: ../app/config/gimprc-blurbs.h:415 msgid "Enable the MyPaint Brush tool." -msgstr "" +msgstr "Aktivera MyPaint-penselverktyget." -#: ../app/config/gimprc-blurbs.h:378 +#: ../app/config/gimprc-blurbs.h:418 msgid "Enable the Seamless Clone tool." -msgstr "" +msgstr "Aktivera det sömlösa klonverktyget." -#: ../app/config/gimprc-blurbs.h:381 +#: ../app/config/gimprc-blurbs.h:421 msgid "What to do when the space bar is pressed in the image window." msgstr "Vad som ska göras när blankstegstangenten används i bildfönstret." -#: ../app/config/gimprc-blurbs.h:384 +#: ../app/config/gimprc-blurbs.h:424 msgid "" "Sets the swap file location. GIMP uses a tile based memory allocation " "scheme. The swap file is used to quickly and easily swap tiles out to disk " @@ -8240,13 +10660,13 @@ msgstr "" "lätt kan bli mycket stor om GIMP används med stora bilder. Saker och ting " "kan också bli mycket långsamma om växlingsfilen skapas i en katalog som är " "monterad via NFS. På grund av detta kan det vara en önskvärt att lägga din " -"växlingsfil i \"tmp\"." +"växlingsfil i ”tmp”." -#: ../app/config/gimprc-blurbs.h:393 +#: ../app/config/gimprc-blurbs.h:433 msgid "When enabled, menus can be torn off." msgstr "När aktiverad kan menyer ryckas loss." -#: ../app/config/gimprc-blurbs.h:396 +#: ../app/config/gimprc-blurbs.h:436 msgid "" "When enabled, you can change keyboard shortcuts for menu items by hitting a " "key combination while the menu item is highlighted." @@ -8254,15 +10674,15 @@ msgstr "" "När aktiverad kan du ändra tangentbordsgenvägar för menyval genom att trycka " "på en tangentkombination medan menyvalet är markerat." -#: ../app/config/gimprc-blurbs.h:400 +#: ../app/config/gimprc-blurbs.h:440 msgid "Save changed keyboard shortcuts when GIMP exits." msgstr "Spara ändrade tangentbordsgenvägar när GIMP avslutas." -#: ../app/config/gimprc-blurbs.h:403 +#: ../app/config/gimprc-blurbs.h:443 msgid "Restore saved keyboard shortcuts on each GIMP startup." msgstr "Återställ sparade tangentbordsgenvägar varje gång GIMP startar." -#: ../app/config/gimprc-blurbs.h:406 +#: ../app/config/gimprc-blurbs.h:446 msgid "" "Sets the folder for temporary storage. Files will appear here during the " "course of running GIMP. Most files will disappear when GIMP exits, but some " @@ -8274,75 +10694,243 @@ msgstr "" "vissa filer kan komma att finnas kvar så det är bäst om katalogen inte delas " "med andra användare." -#: ../app/config/gimprc-blurbs.h:424 +#: ../app/config/gimprc-blurbs.h:467 +msgid "" +"Sets the default rendering intent for the 'Convert to Color Profile' dialog." +msgstr "" +"Ställer in standardåtergivningsmetod för dialogen ”Konvertera till " +"färgprofil”." + +#: ../app/config/gimprc-blurbs.h:470 +msgid "" +"Sets the default 'Black Point Compensation' state for the 'Convert to Color " +"Profile' dialog." +msgstr "" +"Ställer in standardläget för ”Svartpunktskompensering” för dialogen " +"”Konvertera till färgprofil”." + +#: ../app/config/gimprc-blurbs.h:474 +msgid "" +"Sets the default layer dithering method for the 'Convert Precision' dialog." +msgstr "" +"Ställer in standardmetod för färgutjämning av lager för dialogen ”Konvertera " +"precision”." + +#: ../app/config/gimprc-blurbs.h:477 +msgid "" +"Sets the default text layer dithering method for the 'Convert Precision' " +"dialog." +msgstr "" +"Ställer in standardmetod för färgutjämning av textlager för dialogen " +"”Konvertera precision”." + +#: ../app/config/gimprc-blurbs.h:480 +msgid "" +"Sets the default channel dithering method for the 'Convert Precision' dialog." +msgstr "" +"Ställer in standardmetoden för färgutjämning av kanaler för dialogen " +"”Konvertera precision”." + +#: ../app/config/gimprc-blurbs.h:483 +msgid "Sets the default palette type for the 'Convert to Indexed' dialog." +msgstr "Ställer in standardpalettyp för dialogen ”Konvertera till indexerad”." + +#: ../app/config/gimprc-blurbs.h:486 +msgid "" +"Sets the default maximum number of colors for the 'Convert to Indexed' " +"dialog." +msgstr "" +"Ställer in högsta standardantal färger för dialogen ”Konvertera till " +"indexerad”." + +#: ../app/config/gimprc-blurbs.h:489 +msgid "" +"Sets the default 'Remove duplicate colors' state for the 'Convert to " +"Indexed' dialog." +msgstr "" +"Ställer in standardläge för ”Ta bort duplicerade färger” för dialogen " +"”Konvertera till indexerad”." + +#: ../app/config/gimprc-blurbs.h:492 +msgid "Sets the default dithering type for the 'Convert to Indexed' dialog." +msgstr "Ställer in färgutjämningstyp för dialogen ”Konvertera till indexerad”." + +#: ../app/config/gimprc-blurbs.h:495 +msgid "" +"Sets the default 'Dither alpha' state for the 'Convert to Indexed' dialog." +msgstr "" +"Ställer in standardtillstånd för ”Färgutjämningsalfa” för dialogen " +"”Konvertera till indexerad”." + +#: ../app/config/gimprc-blurbs.h:498 +msgid "" +"Sets the default 'Dither text layers' state for the 'Convert to Indexed' " +"dialog." +msgstr "" +"Ställer in standardtillståndet för ”Färgutjämna textlager” för dialogen " +"”Konvertera till indexerad”." + +#: ../app/config/gimprc-blurbs.h:501 +msgid "Sets the default fill type for the 'Canvas Size' dialog." +msgstr "Ställer in standardfyllnadstyp för dialogen ”Storlek på rityta”." + +#: ../app/config/gimprc-blurbs.h:504 +msgid "Sets the default set of layers to resize for the 'Canvas Size' dialog." +msgstr "" +"Ställer in standarduppsättning av lager för dialogen ”Storlek på rityta”." + +#: ../app/config/gimprc-blurbs.h:507 +msgid "" +"Sets the default 'Resize text layers' state for the 'Canvas Size' dialog." +msgstr "" +"Ställer in standardtillstånd för ”Ändra storlek på textlager” för dialogen " +"”Storlek på rityta”." + +#: ../app/config/gimprc-blurbs.h:510 msgid "Sets the default layer name for the 'New Layer' dialog." -msgstr "" +msgstr "Ställer in standardlagernamnet för dialogen ”Nytt lager”." -#: ../app/config/gimprc-blurbs.h:427 +#: ../app/config/gimprc-blurbs.h:513 +msgid "Sets the default mode for the 'New Layer' dialog." +msgstr "Ställer in standardläge för dialogen ”Nytt lager”." + +#: ../app/config/gimprc-blurbs.h:516 +msgid "Sets the default blend space for the 'New Layer' dialog." +msgstr "Ställer in standardtoningsrymd för dialogen ”Nytt lager”." + +#: ../app/config/gimprc-blurbs.h:519 +msgid "Sets the default composite space for the 'New Layer' dialog." +msgstr "Ställer in standardkompositrymd för dialogen ”Nytt lager”." + +#: ../app/config/gimprc-blurbs.h:522 +msgid "Sets the default composite mode for the 'New Layer' dialog." +msgstr "Ställer in standardkompositläge för dialogen ”Nytt lager”." + +#: ../app/config/gimprc-blurbs.h:525 +msgid "Sets the default opacity for the 'New Layer' dialog." +msgstr "Ställer in standardopacitet för dialogen ”Nytt lager”." + +#: ../app/config/gimprc-blurbs.h:528 msgid "Sets the default fill type for the 'New Layer' dialog." -msgstr "" +msgstr "Ställer in standardfyllnadstyp för dialogen ”Nytt Lager”." -#: ../app/config/gimprc-blurbs.h:430 +#: ../app/config/gimprc-blurbs.h:531 +msgid "Sets the default fill type for the 'Layer Boundary Size' dialog." +msgstr "Ställer in standardfyllnadstyp för dialogen ”Storlek på lagergräns”." + +#: ../app/config/gimprc-blurbs.h:534 msgid "Sets the default mask for the 'Add Layer Mask' dialog." -msgstr "" +msgstr "Ställer in standardmask för dialogen ”Lägg till lagermask”." -#: ../app/config/gimprc-blurbs.h:433 +#: ../app/config/gimprc-blurbs.h:537 msgid "Sets the default 'invert mask' state for the 'Add Layer Mask' dialog." msgstr "" +"Ställer in standardtillståndet för ”invertera mask” för dialogen ”Lägg till " +"lagermask”." -#: ../app/config/gimprc-blurbs.h:436 +#: ../app/config/gimprc-blurbs.h:540 +msgid "Sets the default merge type for the 'Merge Visible Layers' dialog." +msgstr "" +"Ställer in standardtyp för sammanfogning för dialogen ”Sammanfoga synliga " +"lager”." + +#: ../app/config/gimprc-blurbs.h:543 +msgid "" +"Sets the default 'Active group only' for the 'Merge Visible Layers' dialog." +msgstr "" +"Ställer in standardvärde för ”Endast aktiv grupp” för dialogen ”Sammanfoga " +"synliga lager”." + +#: ../app/config/gimprc-blurbs.h:546 +msgid "" +"Sets the default 'Discard invisible' for the 'Merge Visible Layers' dialog." +msgstr "" +"Ställer in standardvärde för ”Förkasta osynliga” för dialogen ”Sammanfoga " +"synliga lager”." + +#: ../app/config/gimprc-blurbs.h:549 msgid "Sets the default channel name for the 'New Channel' dialog." -msgstr "" +msgstr "Ställer in standardkanalnamn för dialogen ”Ny kanal”." -#: ../app/config/gimprc-blurbs.h:439 +#: ../app/config/gimprc-blurbs.h:552 msgid "Sets the default color and opacity for the 'New Channel' dialog." -msgstr "" +msgstr "Ställer in standardfärg och standardopacitet för dialogen ”Ny kanal”." -#: ../app/config/gimprc-blurbs.h:442 -#, fuzzy -#| msgid "Sets the size of the thumbnail shown in the Open dialog." +#: ../app/config/gimprc-blurbs.h:555 msgid "Sets the default path name for the 'New Path' dialog." -msgstr "" -"Ställer in storleken på miniatyrbilden som visas i öppningsdialogrutan." +msgstr "Ställer in standardsökvägen för dialogen ”Ny bana”." -#: ../app/config/gimprc-blurbs.h:445 +#: ../app/config/gimprc-blurbs.h:558 +msgid "Sets the default folder path for the 'Export Path' dialog." +msgstr "Ställer in sökvägen för standardmappen för dialogen ”Exportera bana”." + +#: ../app/config/gimprc-blurbs.h:561 +msgid "" +"Sets the default 'Export the active path' state for the 'Export Path' dialog." +msgstr "" +"Ställer in standardtillståndet för ”Exportera aktiv bana” för dialogen " +"”Exportera bana”." + +#: ../app/config/gimprc-blurbs.h:564 +msgid "Sets the default folder path for the 'Import Path' dialog." +msgstr "Ställer in sökvägen för standardmappen för dialogen ”Importera bana”." + +#: ../app/config/gimprc-blurbs.h:567 +msgid "" +"Sets the default 'Merge imported paths' state for the 'Import Path' dialog." +msgstr "" +"Ställer in standardtillståndet för ”Sammanfoga importerade banor” för " +"dialogen ”Importera bana”." + +#: ../app/config/gimprc-blurbs.h:570 +msgid "" +"Sets the default 'Scale imported paths to fit size' state for the 'Import " +"Path' dialog." +msgstr "" +"Ställer in standardtillståndet för ”Skala importerade banor för att passa " +"storlek” för dialogen ”Importera bana”." + +#: ../app/config/gimprc-blurbs.h:573 msgid "Sets the default feather radius for the 'Feather Selection' dialog." -msgstr "" +msgstr "Ställer in standardfjädringsradie för dialogen ”Fjädra markering”." -#: ../app/config/gimprc-blurbs.h:448 +#: ../app/config/gimprc-blurbs.h:576 msgid "Sets the default grow radius for the 'Grow Selection' dialog." -msgstr "" +msgstr "Ställer in standardväxradie för dialogen ”Väx markering”." -#: ../app/config/gimprc-blurbs.h:451 +#: ../app/config/gimprc-blurbs.h:579 msgid "Sets the default shrink radius for the 'Shrink Selection' dialog." -msgstr "" +msgstr "Ställer in standardkrympningsradie för dialogen ”Krymp markering”." -#: ../app/config/gimprc-blurbs.h:454 +#: ../app/config/gimprc-blurbs.h:582 msgid "" "Sets the default 'Selected areas continue outside the image' setting for the " "'Shrink Selection' dialog." msgstr "" +"Ställer in standardinställning för ”Markerade områden fortsätter utanför " +"bilden” för dialogen ”Krymp markering”." -#: ../app/config/gimprc-blurbs.h:458 +#: ../app/config/gimprc-blurbs.h:586 msgid "Sets the default border radius for the 'Border Selection' dialog." -msgstr "" +msgstr "Ställer in standardkantradie för dialogen ”Kantmarkering”." -#: ../app/config/gimprc-blurbs.h:461 +#: ../app/config/gimprc-blurbs.h:589 msgid "" "Sets the default 'Selected areas continue outside the image' setting for the " "'Border Selection' dialog." msgstr "" +"Ställer in standardinställning för ”Markerade områden fortsätter utanför " +"bilden” för dialogen ”Kantmarkering”." -#: ../app/config/gimprc-blurbs.h:465 +#: ../app/config/gimprc-blurbs.h:593 msgid "Sets the default border style for the 'Border Selection' dialog." -msgstr "" +msgstr "Ställer in standardkantstil för dialogen ”Kantmarkering”." -#: ../app/config/gimprc-blurbs.h:474 +#: ../app/config/gimprc-blurbs.h:602 msgid "Sets the size of the thumbnail shown in the Open dialog." -msgstr "" -"Ställer in storleken på miniatyrbilden som visas i öppningsdialogrutan." +msgstr "Ställer in storleken på miniatyrbilden som visas i dialogen Öppna." -#: ../app/config/gimprc-blurbs.h:477 +#: ../app/config/gimprc-blurbs.h:605 msgid "" "The thumbnail in the Open dialog will be automatically updated if the file " "being previewed is smaller than the size set here." @@ -8350,40 +10938,40 @@ msgstr "" "Miniatyrbilden i öppna-dialogen uppdateras automatiskt om filen som " "förhandsgranskas är mindre än storleken som ställs in här." -#: ../app/config/gimprc-blurbs.h:481 +#: ../app/config/gimprc-blurbs.h:609 msgid "" "When the amount of pixel data exceeds this limit, GIMP will start to swap " "tiles to disk. This is a lot slower but it makes it possible to work on " "images that wouldn't fit into memory otherwise. If you have a lot of RAM, " "you may want to set this to a higher value." msgstr "" -"När mängden bildpunksdata överstiger den här gränsen kommer GIMP att börja " +"När mängden bildpunktsdata överstiger den här gränsen kommer GIMP att börja " "skriva ut plattor till disk. Det här är mycket långsammare men det gör det " "möjligt att arbeta på bilder som annars inte skulle få plats i minnet. Om du " "har mycket RAM-minne kanske du vill ställa in det här till ett högre värde." -#: ../app/config/gimprc-blurbs.h:487 +#: ../app/config/gimprc-blurbs.h:615 msgid "Show the current foreground and background colors in the toolbox." msgstr "Visa de aktuella för- och bakgrundsfärgerna i verktygslådan." -#: ../app/config/gimprc-blurbs.h:490 +#: ../app/config/gimprc-blurbs.h:618 msgid "Show the currently selected brush, pattern and gradient in the toolbox." msgstr "" "Visa för närvarande aktiv pensel, mönster och gradient i verktygslådan." -#: ../app/config/gimprc-blurbs.h:493 +#: ../app/config/gimprc-blurbs.h:621 msgid "Show the currently active image in the toolbox." msgstr "Visa den för närvarande aktiva bilden i verktygslådan." -#: ../app/config/gimprc-blurbs.h:499 +#: ../app/config/gimprc-blurbs.h:627 msgid "Sets the manner in which transparency is displayed in images." msgstr "Ställer in sättet på vilket transparens visas i bilder." -#: ../app/config/gimprc-blurbs.h:502 +#: ../app/config/gimprc-blurbs.h:630 msgid "Sets the size of the checkerboard used to display transparency." msgstr "Ställer in storleken på schackrutorna som används för transparens." -#: ../app/config/gimprc-blurbs.h:505 +#: ../app/config/gimprc-blurbs.h:633 msgid "" "When enabled, GIMP will not save an image if it has not been changed since " "it was opened." @@ -8391,15 +10979,15 @@ msgstr "" "När aktiverad kommer GIMP inte att spara en bild om den inte ändrats sedan " "den öppnades." -#: ../app/config/gimprc-blurbs.h:509 +#: ../app/config/gimprc-blurbs.h:637 msgid "" "Sets the minimal number of operations that can be undone. More undo levels " "are kept available until the undo-size limit is reached." msgstr "" "Ställer in det minsta antal åtgärder som kan ångras. Fler ångringsnivåer är " -"tillgängliga tills storlekgränsen för ångring har nådd." +"tillgängliga tills storlekgränsen för ångring nås." -#: ../app/config/gimprc-blurbs.h:513 +#: ../app/config/gimprc-blurbs.h:641 msgid "" "Sets an upper limit to the memory that is used per image to keep operations " "on the undo stack. Regardless of this setting, at least as many undo-levels " @@ -8409,23 +10997,21 @@ msgstr "" "spara åtgärder på ångringsstacken. Oberoende av denna inställning sparas " "åtminstone så många ångringsåtgärder som angivits på annat håll." -#: ../app/config/gimprc-blurbs.h:518 +#: ../app/config/gimprc-blurbs.h:646 msgid "Sets the size of the previews in the Undo History." msgstr "Ställer in storleken på förhandsgranskningar i ångringshistoriken." -#: ../app/config/gimprc-blurbs.h:521 +#: ../app/config/gimprc-blurbs.h:649 msgid "When enabled, pressing F1 will open the help browser." msgstr "När aktiverad öppnar F1 hjälpläsaren." -#: ../app/config/gimprc-blurbs.h:524 -#, fuzzy -#| msgid "When enabled, menus can be torn off." +#: ../app/config/gimprc-blurbs.h:652 msgid "When enabled, uses OpenCL for some operations." -msgstr "När aktiverad kan menyer ryckas loss." +msgstr "När aktiverad används OpenCL för vissa åtgärder." -#: ../app/config/gimprc-deserialize.c:136 ../app/core/gimp-modules.c:135 -#: ../app/core/gimp-units.c:278 ../app/gui/session.c:292 -#: ../app/plug-in/plug-in-rc.c:242 +#: ../app/config/gimprc-deserialize.c:136 ../app/core/gimp-modules.c:131 +#: ../app/core/gimp-units.c:278 ../app/gui/session.c:293 +#: ../app/plug-in/plug-in-rc.c:245 msgid "fatal parse error" msgstr "ödesdigert tolkningsfel" @@ -8467,7 +11053,7 @@ msgstr "Frihand" #: ../app/core/core-enums.c:265 msgctxt "histogram-channel" msgid "Value" -msgstr "Värde" +msgstr "Intensitet" #: ../app/core/core-enums.c:266 msgctxt "histogram-channel" @@ -8492,444 +11078,295 @@ msgstr "Alfa" #: ../app/core/core-enums.c:270 msgctxt "histogram-channel" msgid "Luminance" -msgstr "" +msgstr "Luminans" #: ../app/core/core-enums.c:271 msgctxt "histogram-channel" msgid "RGB" msgstr "RGB" -#: ../app/core/core-enums.c:328 -msgctxt "layer-mode-effects" -msgid "Normal" -msgstr "Normal" - -#: ../app/core/core-enums.c:329 -msgctxt "layer-mode-effects" -msgid "Dissolve" -msgstr "Lös upp" - -#: ../app/core/core-enums.c:330 -msgctxt "layer-mode-effects" -msgid "Behind" -msgstr "Bakom" - -#: ../app/core/core-enums.c:331 -msgctxt "layer-mode-effects" -msgid "Multiply" -msgstr "Multiplicera" - -#: ../app/core/core-enums.c:332 -msgctxt "layer-mode-effects" -msgid "Screen" -msgstr "Skärm" - -#: ../app/core/core-enums.c:333 -msgctxt "layer-mode-effects" -msgid "Old broken Overlay" -msgstr "" - -#: ../app/core/core-enums.c:334 -msgctxt "layer-mode-effects" -msgid "Difference" -msgstr "Skillnad" - -#: ../app/core/core-enums.c:335 -msgctxt "layer-mode-effects" -msgid "Addition" -msgstr "Addition" - -#: ../app/core/core-enums.c:336 -msgctxt "layer-mode-effects" -msgid "Subtract" -msgstr "Subtraktion" - -#: ../app/core/core-enums.c:337 -msgctxt "layer-mode-effects" -msgid "Darken only" -msgstr "Gör endast mörkare" - -#: ../app/core/core-enums.c:338 -msgctxt "layer-mode-effects" -msgid "Lighten only" -msgstr "Gör endast ljusare" - -#: ../app/core/core-enums.c:339 -msgctxt "layer-mode-effects" -msgid "Hue (HSV)" -msgstr "" - -#: ../app/core/core-enums.c:340 -#, fuzzy -#| msgctxt "layer-mode-effects" -#| msgid "Saturation" -msgctxt "layer-mode-effects" -msgid "Saturation (HSV)" -msgstr "Mättnad" - -#: ../app/core/core-enums.c:341 -#, fuzzy -#| msgctxt "layer-mode-effects" -#| msgid "Color" -msgctxt "layer-mode-effects" -msgid "Color (HSV)" -msgstr "Färg" - -#: ../app/core/core-enums.c:342 -#, fuzzy -#| msgctxt "layer-mode-effects" -#| msgid "Value" -msgctxt "layer-mode-effects" -msgid "Value (HSV)" -msgstr "Intensitet" - -#: ../app/core/core-enums.c:343 -msgctxt "layer-mode-effects" -msgid "Divide" -msgstr "Dividera" - -#: ../app/core/core-enums.c:344 -msgctxt "layer-mode-effects" -msgid "Dodge" -msgstr "Blek" - -#: ../app/core/core-enums.c:345 -msgctxt "layer-mode-effects" -msgid "Burn" -msgstr "Bränn" - -#: ../app/core/core-enums.c:346 -msgctxt "layer-mode-effects" -msgid "Hard light" -msgstr "Hårt ljus" - -#: ../app/core/core-enums.c:347 -msgctxt "layer-mode-effects" -msgid "Soft light" -msgstr "Mjukt ljus" - -#: ../app/core/core-enums.c:348 -msgctxt "layer-mode-effects" -msgid "Grain extract" -msgstr "Grynextrahering" - -#: ../app/core/core-enums.c:349 -msgctxt "layer-mode-effects" -msgid "Grain merge" -msgstr "Grynsammanfogning" - -#: ../app/core/core-enums.c:350 -msgctxt "layer-mode-effects" -msgid "Color erase" -msgstr "Färgsuddning" - -#: ../app/core/core-enums.c:351 -msgctxt "layer-mode-effects" -msgid "Overlay" -msgstr "Överlagring" - -#: ../app/core/core-enums.c:352 -msgctxt "layer-mode-effects" -msgid "Hue (LCH)" -msgstr "" - -#: ../app/core/core-enums.c:353 -msgctxt "layer-mode-effects" -msgid "Chroma (LCH)" -msgstr "" - -#: ../app/core/core-enums.c:354 -#, fuzzy -#| msgctxt "layer-mode-effects" -#| msgid "Color" -msgctxt "layer-mode-effects" -msgid "Color (LCH)" -msgstr "Färg" - -#: ../app/core/core-enums.c:355 -#, fuzzy -#| msgid "_Lightness:" -msgctxt "layer-mode-effects" -msgid "Lightness (LCH)" -msgstr "_Ljusstyrka:" - -#: ../app/core/core-enums.c:356 -msgctxt "layer-mode-effects" -msgid "Erase" -msgstr "Sudda" - -#: ../app/core/core-enums.c:357 -msgctxt "layer-mode-effects" -msgid "Replace" -msgstr "Ersätt" - -#: ../app/core/core-enums.c:358 -msgctxt "layer-mode-effects" -msgid "Anti erase" -msgstr "Antisudda" - -#: ../app/core/core-enums.c:386 +#: ../app/core/core-enums.c:299 msgctxt "matting-engine" msgid "Matting Global" -msgstr "" +msgstr "Mattning global" -#: ../app/core/core-enums.c:387 +#: ../app/core/core-enums.c:300 msgctxt "matting-engine" msgid "Matting Levin" -msgstr "" +msgstr "Mattning Levin" -#: ../app/core/core-enums.c:472 +#: ../app/core/core-enums.c:422 msgctxt "align-reference-type" msgid "First item" msgstr "Första objektet" -#: ../app/core/core-enums.c:473 +#: ../app/core/core-enums.c:423 msgctxt "align-reference-type" msgid "Image" msgstr "Bild" -#: ../app/core/core-enums.c:474 +#: ../app/core/core-enums.c:424 msgctxt "align-reference-type" msgid "Selection" msgstr "Markering" -#: ../app/core/core-enums.c:475 +#: ../app/core/core-enums.c:425 msgctxt "align-reference-type" msgid "Active layer" msgstr "Aktivt lager" -#: ../app/core/core-enums.c:476 +#: ../app/core/core-enums.c:426 msgctxt "align-reference-type" msgid "Active channel" msgstr "Aktiv kanal" -#: ../app/core/core-enums.c:477 +#: ../app/core/core-enums.c:427 msgctxt "align-reference-type" msgid "Active path" msgstr "Aktiv bana" -#: ../app/core/core-enums.c:505 +#: ../app/core/core-enums.c:455 msgctxt "fill-style" msgid "Solid color" msgstr "Enfärgad" -#: ../app/core/core-enums.c:506 +#: ../app/core/core-enums.c:456 msgctxt "fill-style" msgid "Pattern" msgstr "Mönster" -#: ../app/core/core-enums.c:543 +#: ../app/core/core-enums.c:493 msgctxt "dash-preset" msgid "Custom" msgstr "Anpassad" -#: ../app/core/core-enums.c:544 +#: ../app/core/core-enums.c:494 msgctxt "dash-preset" msgid "Line" msgstr "Linje" -#: ../app/core/core-enums.c:545 +#: ../app/core/core-enums.c:495 msgctxt "dash-preset" msgid "Long dashes" msgstr "Långa streck" -#: ../app/core/core-enums.c:546 +#: ../app/core/core-enums.c:496 msgctxt "dash-preset" msgid "Medium dashes" msgstr "Mellanstreck" -#: ../app/core/core-enums.c:547 +#: ../app/core/core-enums.c:497 msgctxt "dash-preset" msgid "Short dashes" msgstr "Korta streck" -#: ../app/core/core-enums.c:548 +#: ../app/core/core-enums.c:498 msgctxt "dash-preset" msgid "Sparse dots" msgstr "Glesa prickar" -#: ../app/core/core-enums.c:549 +#: ../app/core/core-enums.c:499 msgctxt "dash-preset" msgid "Normal dots" msgstr "Normala prickar" -#: ../app/core/core-enums.c:550 +#: ../app/core/core-enums.c:500 msgctxt "dash-preset" msgid "Dense dots" msgstr "Täta prickar" -#: ../app/core/core-enums.c:551 +#: ../app/core/core-enums.c:501 msgctxt "dash-preset" msgid "Stipples" msgstr "Streckning" -#: ../app/core/core-enums.c:552 +#: ../app/core/core-enums.c:502 msgctxt "dash-preset" msgid "Dash, dot" msgstr "Streck, prick" -#: ../app/core/core-enums.c:553 +#: ../app/core/core-enums.c:503 msgctxt "dash-preset" msgid "Dash, dot, dot" msgstr "Streck, prick, prick" -#: ../app/core/core-enums.c:584 +#: ../app/core/core-enums.c:534 msgctxt "item-set" msgid "None" msgstr "Ingen" -#: ../app/core/core-enums.c:585 +#: ../app/core/core-enums.c:535 msgctxt "item-set" msgid "All layers" msgstr "Alla lager" -#: ../app/core/core-enums.c:586 +#: ../app/core/core-enums.c:536 msgctxt "item-set" msgid "Image-sized layers" msgstr "Lagerstorlek efter bild" -#: ../app/core/core-enums.c:587 +#: ../app/core/core-enums.c:537 msgctxt "item-set" msgid "All visible layers" msgstr "Alla synliga lager" -#: ../app/core/core-enums.c:588 +#: ../app/core/core-enums.c:538 msgctxt "item-set" msgid "All linked layers" msgstr "Alla länkade lager" -#: ../app/core/core-enums.c:623 +#: ../app/core/core-enums.c:573 msgctxt "view-size" msgid "Tiny" msgstr "Jätteliten" -#: ../app/core/core-enums.c:624 +#: ../app/core/core-enums.c:574 msgctxt "view-size" msgid "Very small" msgstr "Mycket liten" -#: ../app/core/core-enums.c:625 +#: ../app/core/core-enums.c:575 msgctxt "view-size" msgid "Small" msgstr "Liten" -#: ../app/core/core-enums.c:626 +#: ../app/core/core-enums.c:576 msgctxt "view-size" msgid "Medium" msgstr "Mellan" -#: ../app/core/core-enums.c:627 +#: ../app/core/core-enums.c:577 msgctxt "view-size" msgid "Large" msgstr "Stor" -#: ../app/core/core-enums.c:628 +#: ../app/core/core-enums.c:578 msgctxt "view-size" msgid "Very large" msgstr "Mycket stor" -#: ../app/core/core-enums.c:629 +#: ../app/core/core-enums.c:579 msgctxt "view-size" msgid "Huge" msgstr "Jättestor" -#: ../app/core/core-enums.c:630 +#: ../app/core/core-enums.c:580 msgctxt "view-size" msgid "Enormous" msgstr "Enorm" -#: ../app/core/core-enums.c:631 +#: ../app/core/core-enums.c:581 msgctxt "view-size" msgid "Gigantic" msgstr "Gigantisk" -#: ../app/core/core-enums.c:659 +#: ../app/core/core-enums.c:609 msgctxt "view-type" msgid "View as list" msgstr "Visa som lista" -#: ../app/core/core-enums.c:660 +#: ../app/core/core-enums.c:610 msgctxt "view-type" msgid "View as grid" msgstr "Visa som rutnät" -#: ../app/core/core-enums.c:689 +#: ../app/core/core-enums.c:639 msgctxt "thumbnail-size" msgid "No thumbnails" msgstr "Inga miniatyrbilder" -#: ../app/core/core-enums.c:690 +#: ../app/core/core-enums.c:640 msgctxt "thumbnail-size" msgid "Normal (128x128)" msgstr "Normal (128×128)" -#: ../app/core/core-enums.c:691 +#: ../app/core/core-enums.c:641 msgctxt "thumbnail-size" msgid "Large (256x256)" msgstr "Stor (256×256)" -#: ../app/core/core-enums.c:874 +#: ../app/core/core-enums.c:671 +msgctxt "debug-policy" +msgid "Debug warnings, critical errors and crashes" +msgstr "Felsök varningar, kritiska fel och krascher" + +#: ../app/core/core-enums.c:672 +msgctxt "debug-policy" +msgid "Debug critical errors and crashes" +msgstr "Felsök kritiska fel och krascher" + +#: ../app/core/core-enums.c:673 +msgctxt "debug-policy" +msgid "Debug crashes only" +msgstr "Felsök endast krascher" + +#: ../app/core/core-enums.c:674 +msgctxt "debug-policy" +msgid "Never debug GIMP" +msgstr "Felsök aldrig GIMP" + +#: ../app/core/core-enums.c:862 msgctxt "undo-type" msgid "<>" msgstr "<>" -#: ../app/core/core-enums.c:875 +#: ../app/core/core-enums.c:863 msgctxt "undo-type" msgid "Scale image" msgstr "Skala bild" -#: ../app/core/core-enums.c:876 +#: ../app/core/core-enums.c:864 msgctxt "undo-type" msgid "Resize image" msgstr "Ändra storlek på bild" -#: ../app/core/core-enums.c:877 +#: ../app/core/core-enums.c:865 msgctxt "undo-type" msgid "Flip image" msgstr "Vänd bild" -#: ../app/core/core-enums.c:878 +#: ../app/core/core-enums.c:866 msgctxt "undo-type" msgid "Rotate image" msgstr "Rotera bild" -#: ../app/core/core-enums.c:879 +#: ../app/core/core-enums.c:867 msgctxt "undo-type" msgid "Crop image" msgstr "Beskär bild" -#: ../app/core/core-enums.c:880 +#: ../app/core/core-enums.c:868 msgctxt "undo-type" msgid "Convert image" msgstr "Konvertera bild" -#: ../app/core/core-enums.c:881 +#: ../app/core/core-enums.c:869 msgctxt "undo-type" msgid "Remove item" msgstr "Ta bort objekt" -#: ../app/core/core-enums.c:882 +#: ../app/core/core-enums.c:870 msgctxt "undo-type" msgid "Merge layers" msgstr "Sammanfoga lager" -#: ../app/core/core-enums.c:883 +#: ../app/core/core-enums.c:871 msgctxt "undo-type" msgid "Merge paths" msgstr "Sammanfoga banor" -#: ../app/core/core-enums.c:884 +#: ../app/core/core-enums.c:872 msgctxt "undo-type" msgid "Quick Mask" msgstr "Snabbmask" -#: ../app/core/core-enums.c:885 ../app/core/core-enums.c:916 +#: ../app/core/core-enums.c:873 ../app/core/core-enums.c:904 #: ../app/core/gimpimage-grid.c:64 msgctxt "undo-type" msgid "Grid" msgstr "Rutnät" -#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:920 +#: ../app/core/core-enums.c:874 ../app/core/core-enums.c:908 msgctxt "undo-type" msgid "Guide" msgstr "Hjälplinje" @@ -8937,536 +11374,610 @@ msgstr "Hjälplinje" # "sampel" är vad man använder i digitalteknik och bildbehandling # så vitt jag förstår # -#: ../app/core/core-enums.c:887 ../app/core/core-enums.c:921 +#: ../app/core/core-enums.c:875 ../app/core/core-enums.c:909 msgctxt "undo-type" msgid "Sample Point" -msgstr "Sampelpunkt" +msgstr "Samplingspunkt" -#: ../app/core/core-enums.c:888 ../app/core/core-enums.c:922 +#: ../app/core/core-enums.c:876 ../app/core/core-enums.c:910 msgctxt "undo-type" msgid "Layer/Channel" msgstr "Lager/Kanal" -#: ../app/core/core-enums.c:889 ../app/core/core-enums.c:923 +#: ../app/core/core-enums.c:877 ../app/core/core-enums.c:911 msgctxt "undo-type" msgid "Layer/Channel modification" msgstr "Ändring av lager/kanal" -#: ../app/core/core-enums.c:890 ../app/core/core-enums.c:924 +#: ../app/core/core-enums.c:878 ../app/core/core-enums.c:912 msgctxt "undo-type" msgid "Selection mask" msgstr "Markeringsmask" -#: ../app/core/core-enums.c:891 ../app/core/core-enums.c:928 +#: ../app/core/core-enums.c:879 ../app/core/core-enums.c:916 msgctxt "undo-type" msgid "Item visibility" msgstr "Objektsynlighet" -#: ../app/core/core-enums.c:892 ../app/core/core-enums.c:929 +#: ../app/core/core-enums.c:880 ../app/core/core-enums.c:917 msgctxt "undo-type" msgid "Link/Unlink item" msgstr "Länka/avlänka objekt" -#: ../app/core/core-enums.c:893 +#: ../app/core/core-enums.c:881 msgctxt "undo-type" msgid "Item properties" msgstr "Objektegenskaper" -#: ../app/core/core-enums.c:894 ../app/core/core-enums.c:927 +#: ../app/core/core-enums.c:882 ../app/core/core-enums.c:915 msgctxt "undo-type" msgid "Move item" msgstr "Flytta objekt" -#: ../app/core/core-enums.c:895 +#: ../app/core/core-enums.c:883 msgctxt "undo-type" msgid "Scale item" msgstr "Skala objekt" -#: ../app/core/core-enums.c:896 +#: ../app/core/core-enums.c:884 msgctxt "undo-type" msgid "Resize item" msgstr "Ändra storlek på objekt" -#: ../app/core/core-enums.c:897 +#: ../app/core/core-enums.c:885 msgctxt "undo-type" msgid "Add layer" msgstr "Lägg till lager" -#: ../app/core/core-enums.c:898 ../app/core/core-enums.c:943 +#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:936 msgctxt "undo-type" msgid "Add layer mask" msgstr "Lägg till lagermask" -#: ../app/core/core-enums.c:899 ../app/core/core-enums.c:945 +#: ../app/core/core-enums.c:887 ../app/core/core-enums.c:938 msgctxt "undo-type" msgid "Apply layer mask" msgstr "Tillämpa lagermask" -#: ../app/core/core-enums.c:900 ../app/core/core-enums.c:953 +#: ../app/core/core-enums.c:888 ../app/core/core-enums.c:946 msgctxt "undo-type" msgid "Floating selection to layer" msgstr "Flytande markering till lager" -#: ../app/core/core-enums.c:901 +#: ../app/core/core-enums.c:889 msgctxt "undo-type" msgid "Float selection" msgstr "Flytande markering" -#: ../app/core/core-enums.c:902 +#: ../app/core/core-enums.c:890 msgctxt "undo-type" msgid "Anchor floating selection" msgstr "Förankra flytande markering" -#: ../app/core/core-enums.c:903 ../app/core/gimp-edit.c:286 +#: ../app/core/core-enums.c:891 ../app/core/gimp-edit.c:501 msgctxt "undo-type" msgid "Paste" msgstr "Klistra in" -#: ../app/core/core-enums.c:904 ../app/core/gimp-edit.c:517 +#: ../app/core/core-enums.c:892 ../app/core/gimp-edit.c:829 msgctxt "undo-type" msgid "Cut" msgstr "Klipp ut" -#: ../app/core/core-enums.c:905 +#: ../app/core/core-enums.c:893 msgctxt "undo-type" msgid "Text" msgstr "Text" -#: ../app/core/core-enums.c:906 ../app/core/core-enums.c:954 -#: ../app/core/gimpdrawable-transform.c:668 +#: ../app/core/core-enums.c:894 ../app/core/core-enums.c:947 +#: ../app/core/gimpdrawable-transform.c:692 msgctxt "undo-type" msgid "Transform" msgstr "Transformera" -#: ../app/core/core-enums.c:907 ../app/core/core-enums.c:955 +#: ../app/core/core-enums.c:895 ../app/core/core-enums.c:948 msgctxt "undo-type" msgid "Paint" msgstr "Måla" -#: ../app/core/core-enums.c:908 ../app/core/core-enums.c:958 +#: ../app/core/core-enums.c:896 ../app/core/core-enums.c:951 msgctxt "undo-type" msgid "Attach parasite" msgstr "Koppla parasit" -#: ../app/core/core-enums.c:909 ../app/core/core-enums.c:959 +#: ../app/core/core-enums.c:897 ../app/core/core-enums.c:952 msgctxt "undo-type" msgid "Remove parasite" msgstr "Ta bort parasit" -#: ../app/core/core-enums.c:910 +#: ../app/core/core-enums.c:898 msgctxt "undo-type" msgid "Import paths" msgstr "Importera banor" -#: ../app/core/core-enums.c:911 +#: ../app/core/core-enums.c:899 msgctxt "undo-type" msgid "Plug-In" msgstr "Insticksmodul" -#: ../app/core/core-enums.c:912 +#: ../app/core/core-enums.c:900 msgctxt "undo-type" msgid "Image type" msgstr "Bildtyp" -#: ../app/core/core-enums.c:913 -#, fuzzy -#| msgid "Image Properties" +#: ../app/core/core-enums.c:901 msgctxt "undo-type" msgid "Image precision" -msgstr "Bildegenskaper" +msgstr "Bildprecision" -#: ../app/core/core-enums.c:914 +#: ../app/core/core-enums.c:902 msgctxt "undo-type" msgid "Image size" msgstr "Bildstorlek" -#: ../app/core/core-enums.c:915 +#: ../app/core/core-enums.c:903 msgctxt "undo-type" msgid "Image resolution change" msgstr "Ändring av bildupplösning" -#: ../app/core/core-enums.c:917 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Change Image Unit" +#: ../app/core/core-enums.c:905 msgctxt "undo-type" msgid "Change metadata" -msgstr "Ändra bildenhet" +msgstr "Ändra metadata" -#: ../app/core/core-enums.c:918 +#: ../app/core/core-enums.c:906 msgctxt "undo-type" msgid "Change indexed palette" msgstr "Ändra indexerad palett" -#: ../app/core/core-enums.c:919 -#, fuzzy -#| msgid "Change color of selected text" +#: ../app/core/core-enums.c:907 msgctxt "undo-type" msgid "Change color managed state" -msgstr "Ändra färg på markerad text" +msgstr "Ändra tillstånd för färghantering" -#: ../app/core/core-enums.c:925 +#: ../app/core/core-enums.c:913 msgctxt "undo-type" msgid "Reorder item" msgstr "Ordna om objekt" -#: ../app/core/core-enums.c:926 +#: ../app/core/core-enums.c:914 msgctxt "undo-type" msgid "Rename item" msgstr "Byt namn på objekt" -#: ../app/core/core-enums.c:930 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Lock/Unlock alpha channel" +#: ../app/core/core-enums.c:918 +msgctxt "undo-type" +msgid "Item color tag" +msgstr "Färgtagg för objekt" + +#: ../app/core/core-enums.c:919 msgctxt "undo-type" msgid "Lock/Unlock content" -msgstr "Lås/lås upp alfakanal" +msgstr "Lås/lås upp innehåll" -#: ../app/core/core-enums.c:931 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Lock/Unlock alpha channel" +#: ../app/core/core-enums.c:920 msgctxt "undo-type" msgid "Lock/Unlock position" -msgstr "Lås/lås upp alfakanal" +msgstr "Lås/lås upp position" -#: ../app/core/core-enums.c:932 +#: ../app/core/core-enums.c:921 msgctxt "undo-type" msgid "New layer" msgstr "Nytt lager" -#: ../app/core/core-enums.c:933 +#: ../app/core/core-enums.c:922 msgctxt "undo-type" msgid "Delete layer" msgstr "Ta bort lager" -#: ../app/core/core-enums.c:934 +#: ../app/core/core-enums.c:923 msgctxt "undo-type" msgid "Set layer mode" msgstr "Ställ in lagerläge" -#: ../app/core/core-enums.c:935 +#: ../app/core/core-enums.c:924 msgctxt "undo-type" msgid "Set layer opacity" msgstr "Ställ in lageropacitet" -#: ../app/core/core-enums.c:936 +#: ../app/core/core-enums.c:925 msgctxt "undo-type" msgid "Lock/Unlock alpha channel" msgstr "Lås/lås upp alfakanal" -#: ../app/core/core-enums.c:937 +#: ../app/core/core-enums.c:926 msgctxt "undo-type" msgid "Suspend group layer resize" msgstr "Upphäv storleksändring av grupperade lager" -#: ../app/core/core-enums.c:938 +#: ../app/core/core-enums.c:927 msgctxt "undo-type" msgid "Resume group layer resize" msgstr "Återuppta storleksändring av grupperade lager" -#: ../app/core/core-enums.c:939 +#: ../app/core/core-enums.c:928 +msgctxt "undo-type" +msgid "Suspend group layer mask" +msgstr "Upphäv grupplagermask" + +#: ../app/core/core-enums.c:929 +msgctxt "undo-type" +msgid "Resume group layer mask" +msgstr "Återuppta grupplagermask" + +#: ../app/core/core-enums.c:930 +msgctxt "undo-type" +msgid "Start moving group layer" +msgstr "Börja flytta grupperade lager" + +#: ../app/core/core-enums.c:931 +msgctxt "undo-type" +msgid "End moving group layer" +msgstr "Sluta flytta grupperade lager" + +#: ../app/core/core-enums.c:932 msgctxt "undo-type" msgid "Convert group layer" msgstr "Konvertera grupperade lager" -#: ../app/core/core-enums.c:940 +#: ../app/core/core-enums.c:933 msgctxt "undo-type" msgid "Text layer" msgstr "Textlager" -#: ../app/core/core-enums.c:941 +#: ../app/core/core-enums.c:934 msgctxt "undo-type" msgid "Text layer modification" msgstr "Ändring av textlager" -#: ../app/core/core-enums.c:942 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Convert group layer" +#: ../app/core/core-enums.c:935 msgctxt "undo-type" msgid "Convert text layer" -msgstr "Konvertera grupperade lager" +msgstr "Konvertera textlager" -#: ../app/core/core-enums.c:944 +#: ../app/core/core-enums.c:937 msgctxt "undo-type" msgid "Delete layer mask" msgstr "Ta bort lagermask" -#: ../app/core/core-enums.c:946 +#: ../app/core/core-enums.c:939 msgctxt "undo-type" msgid "Show layer mask" msgstr "Visa lagermask" -#: ../app/core/core-enums.c:947 +#: ../app/core/core-enums.c:940 msgctxt "undo-type" msgid "New channel" msgstr "Ny kanal" -#: ../app/core/core-enums.c:948 +#: ../app/core/core-enums.c:941 msgctxt "undo-type" msgid "Delete channel" msgstr "Ta bort kanal" -#: ../app/core/core-enums.c:949 +#: ../app/core/core-enums.c:942 msgctxt "undo-type" msgid "Channel color" msgstr "Kanalfärg" -#: ../app/core/core-enums.c:950 +#: ../app/core/core-enums.c:943 msgctxt "undo-type" msgid "New path" msgstr "Ny bana" -#: ../app/core/core-enums.c:951 +#: ../app/core/core-enums.c:944 msgctxt "undo-type" msgid "Delete path" msgstr "Ta bort bana" -#: ../app/core/core-enums.c:952 +#: ../app/core/core-enums.c:945 msgctxt "undo-type" msgid "Path modification" msgstr "Ändring av bana" -#: ../app/core/core-enums.c:956 +#: ../app/core/core-enums.c:949 msgctxt "undo-type" msgid "Ink" msgstr "Bläck" -#: ../app/core/core-enums.c:957 +#: ../app/core/core-enums.c:950 msgctxt "undo-type" msgid "Select foreground" msgstr "Välj förgrund" -#: ../app/core/core-enums.c:960 +#: ../app/core/core-enums.c:953 msgctxt "undo-type" msgid "Not undoable" msgstr "Inte möjligt att göra om" -#: ../app/core/core-enums.c:1073 +#: ../app/core/core-enums.c:1033 +msgctxt "gradient-color" +msgid "Fixed" +msgstr "Fast" + +#: ../app/core/core-enums.c:1034 +msgctxt "gradient-color" +msgid "Foreground color" +msgstr "Förgrundsfärg" + +#. Translators: this is an abbreviated version of "Foreground color". +#. Keep it short. +#: ../app/core/core-enums.c:1037 +msgctxt "gradient-color" +msgid "FG" +msgstr "FG" + +#: ../app/core/core-enums.c:1038 +msgctxt "gradient-color" +msgid "Foreground color (transparent)" +msgstr "Förgrundsfärg (transparent)" + +#. Translators: this is an abbreviated version of "Foreground color (transparent)". +#. Keep it short. +#: ../app/core/core-enums.c:1041 +msgctxt "gradient-color" +msgid "FG (t)" +msgstr "FG (t)" + +#: ../app/core/core-enums.c:1042 +msgctxt "gradient-color" +msgid "Background color" +msgstr "Bakgrundsfärg" + +#. Translators: this is an abbreviated version of "Background color". +#. Keep it short. +#: ../app/core/core-enums.c:1045 +msgctxt "gradient-color" +msgid "BG" +msgstr "BG" + +#: ../app/core/core-enums.c:1046 +msgctxt "gradient-color" +msgid "Background color (transparent)" +msgstr "Bakgrundsfärg (transparent)" + +#. Translators: this is an abbreviated version of "Background color (transparent)". +#. Keep it short. +#: ../app/core/core-enums.c:1049 +msgctxt "gradient-color" +msgid "BG (t)" +msgstr "BG (t)" + +#: ../app/core/core-enums.c:1080 msgctxt "message-severity" msgid "Message" msgstr "Meddelande" -#: ../app/core/core-enums.c:1074 +#: ../app/core/core-enums.c:1081 msgctxt "message-severity" msgid "Warning" msgstr "Varning" -#: ../app/core/core-enums.c:1075 +#: ../app/core/core-enums.c:1082 msgctxt "message-severity" msgid "Error" msgstr "Fel" -#: ../app/core/core-enums.c:1104 +#: ../app/core/core-enums.c:1083 +msgctxt "message-severity" +msgid "WARNING" +msgstr "VARNING" + +#: ../app/core/core-enums.c:1084 +msgctxt "message-severity" +msgid "CRITICAL" +msgstr "KRITISK" + +#: ../app/core/core-enums.c:1113 msgctxt "color-profile-policy" msgid "Ask what to do" msgstr "Fråga vad som ska göras" -#: ../app/core/core-enums.c:1105 +#: ../app/core/core-enums.c:1114 msgctxt "color-profile-policy" msgid "Keep embedded profile" msgstr "Behåll inbäddad profil" -#: ../app/core/core-enums.c:1106 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "Convert the image to the RGB colorspace" +#: ../app/core/core-enums.c:1115 msgctxt "color-profile-policy" msgid "Convert to preferred RGB color profile" -msgstr "Konvertera bilden till RGB-färgrymden" +msgstr "Konvertera till föredragen RGB-färgprofil" -#: ../app/core/core-enums.c:1143 +#: ../app/core/core-enums.c:1152 msgctxt "dynamics-output-type" msgid "Opacity" msgstr "Opacitet" -#: ../app/core/core-enums.c:1144 +#: ../app/core/core-enums.c:1153 msgctxt "dynamics-output-type" msgid "Size" msgstr "Storlek" -#: ../app/core/core-enums.c:1145 +#: ../app/core/core-enums.c:1154 msgctxt "dynamics-output-type" msgid "Angle" msgstr "Vinkel" -#: ../app/core/core-enums.c:1146 +#: ../app/core/core-enums.c:1155 msgctxt "dynamics-output-type" msgid "Color" msgstr "Färg" -#: ../app/core/core-enums.c:1147 +#: ../app/core/core-enums.c:1156 msgctxt "dynamics-output-type" msgid "Hardness" msgstr "Hårdhet" -#: ../app/core/core-enums.c:1148 +#: ../app/core/core-enums.c:1157 msgctxt "dynamics-output-type" msgid "Force" msgstr "Kraft" -#: ../app/core/core-enums.c:1149 +#: ../app/core/core-enums.c:1158 msgctxt "dynamics-output-type" msgid "Aspect ratio" msgstr "Bildförhållande" -#: ../app/core/core-enums.c:1150 +#: ../app/core/core-enums.c:1159 msgctxt "dynamics-output-type" msgid "Spacing" msgstr "Mellanrum" -#: ../app/core/core-enums.c:1151 +#: ../app/core/core-enums.c:1160 msgctxt "dynamics-output-type" msgid "Rate" msgstr "Frekvens" -#: ../app/core/core-enums.c:1152 +#: ../app/core/core-enums.c:1161 msgctxt "dynamics-output-type" msgid "Flow" msgstr "Flöde" -#: ../app/core/core-enums.c:1153 +#: ../app/core/core-enums.c:1162 msgctxt "dynamics-output-type" msgid "Jitter" msgstr "Jitter" -#: ../app/core/core-enums.c:1181 -#, fuzzy -#| msgctxt "dialogs-action" -#| msgid "Open the selection editor" +#: ../app/core/core-enums.c:1190 msgctxt "filter-region" msgid "Use the selection as input" -msgstr "Öppna markeringsredigeraren" +msgstr "Använd markeringen som indata" -#: ../app/core/core-enums.c:1182 -#, fuzzy -#| msgid "Use the online version" +#: ../app/core/core-enums.c:1191 msgctxt "filter-region" msgid "Use the entire layer as input" -msgstr "Använd versionen på nätet" +msgstr "Använd hela lagret som indata" -#: ../app/core/core-enums.c:1211 -#, fuzzy -#| msgid "Hardness" +#: ../app/core/core-enums.c:1220 msgctxt "channel-border-style" msgid "Hard" -msgstr "Hårdhet" +msgstr "Hård" -#: ../app/core/core-enums.c:1212 -#, fuzzy -#| msgctxt "curve-type" -#| msgid "Smooth" +#: ../app/core/core-enums.c:1221 msgctxt "channel-border-style" msgid "Smooth" msgstr "Mjuk" -#: ../app/core/core-enums.c:1213 -#, fuzzy -#| msgid "Feather edges" +#: ../app/core/core-enums.c:1222 msgctxt "channel-border-style" msgid "Feathered" -msgstr "Fjädra kanter" +msgstr "Fjädrad" -#: ../app/core/gimp.c:575 +#. initialize babl fishes +#: ../app/core/gimp.c:508 ../app/core/gimp.c:540 msgid "Initialization" msgstr "Initiering" #. register all internal procedures -#: ../app/core/gimp.c:587 +#: ../app/core/gimp.c:520 msgid "Internal Procedures" msgstr "Interna procedurer" #. initialize the global parasite table -#: ../app/core/gimp.c:844 +#: ../app/core/gimp.c:783 msgid "Looking for data files" msgstr "Letar efter datafiler" -#: ../app/core/gimp.c:844 +#: ../app/core/gimp.c:783 msgid "Parasites" msgstr "Parasiter" -#: ../app/core/gimp.c:853 +#: ../app/core/gimp.c:792 msgid "Fonts (this may take a while)" msgstr "Typsnitt (det här kan ta en stund)" #. initialize the module list -#: ../app/core/gimp.c:862 ../app/dialogs/preferences-dialog.c:2927 +#: ../app/core/gimp.c:801 ../app/dialogs/preferences-dialog.c:3132 msgid "Modules" msgstr "Moduler" #: ../app/core/gimp-batch.c:75 #, c-format msgid "No batch interpreter specified, using the default '%s'.\n" -msgstr "Ingen satstolk angiven, använder standardtolken \"%s\".\n" +msgstr "Ingen satstolk angiven, använder standardtolken ”%s”.\n" #: ../app/core/gimp-batch.c:93 ../app/core/gimp-batch.c:111 #, c-format msgid "The batch interpreter '%s' is not available. Batch mode disabled." -msgstr "Satstolken \"%s\" är inte tillgänglig. Satsläge inaktiverat." +msgstr "Satstolken ”%s” är inte tillgänglig. Satsläge inaktiverat." -#: ../app/core/gimp-contexts.c:153 ../app/core/gimptooloptions.c:352 -#: ../app/gui/session.c:427 ../app/menus/menus.c:467 -#: ../app/widgets/gimpdevices.c:201 +#: ../app/core/gimp-contexts.c:153 ../app/core/gimp-internal-data.c:304 +#: ../app/core/gimptooloptions.c:348 ../app/gui/session.c:428 +#: ../app/menus/menus.c:476 ../app/widgets/gimpdevices.c:207 #, c-format msgid "Deleting \"%s\" failed: %s" -msgstr "Ta bort \"%s\" misslyckades: %s" +msgstr "Ta bort ”%s” misslyckades: %s" #. initialize the list of gimp dynamics -#: ../app/core/gimp-data-factories.c:358 ../app/core/gimpcontext.c:711 -#: ../app/dialogs/preferences-dialog.c:2891 -#: ../app/tools/gimppaintoptions-gui.c:215 +#: ../app/core/gimp-data-factories.c:322 ../app/core/gimpcontext.c:711 +#: ../app/dialogs/preferences-dialog.c:3096 +#: ../app/tools/gimppaintoptions-gui.c:225 msgid "Dynamics" msgstr "Dynamik" #. initialize the color history -#: ../app/core/gimp-data-factories.c:383 ../app/core/gimp-palettes.c:60 -#, fuzzy -#| msgctxt "documents-action" -#| msgid "_Clear History" +#: ../app/core/gimp-data-factories.c:347 ../app/core/gimp-palettes.c:60 msgid "Color History" -msgstr "_Töm historik" +msgstr "Färghistorik" #. update tag cache -#: ../app/core/gimp-data-factories.c:395 +#: ../app/core/gimp-data-factories.c:359 msgid "Updating tag cache" msgstr "Uppdaterar taggcache" -#: ../app/core/gimp-edit.c:183 ../app/core/gimpimage-new.c:326 +#: ../app/core/gimp-edit.c:97 +msgctxt "undo-type" +msgid "Cut Layer" +msgstr "Klipp lager" + +#: ../app/core/gimp-edit.c:313 ../app/core/gimpimage-new.c:325 msgid "Pasted Layer" msgstr "Inklistrat lager" -#: ../app/core/gimp-edit.c:418 +#: ../app/core/gimp-edit.c:724 msgctxt "undo-type" msgid "Clear" msgstr "Töm" -#: ../app/core/gimp-edit.c:530 +#: ../app/core/gimp-edit.c:846 msgid "Global Buffer" msgstr "Allmän buffert" -#: ../app/core/gimp-gradients.c:63 +#: ../app/core/gimp-gradients.c:64 +msgid "Custom" +msgstr "Anpassad" + +#: ../app/core/gimp-gradients.c:74 msgid "FG to BG (RGB)" msgstr "FG till BG (RGB)" -#: ../app/core/gimp-gradients.c:71 +#: ../app/core/gimp-gradients.c:82 msgid "FG to BG (Hardedge)" msgstr "FG till BG (Hardedge)" -#: ../app/core/gimp-gradients.c:88 +#: ../app/core/gimp-gradients.c:99 msgid "FG to BG (HSV counter-clockwise)" msgstr "FG till BG (NMI moturs)" # NMI = Nyans Mättnad Intensitet -#: ../app/core/gimp-gradients.c:96 +#: ../app/core/gimp-gradients.c:107 msgid "FG to BG (HSV clockwise hue)" msgstr "FG till BG (NMI medurs-nyans)" -#: ../app/core/gimp-gradients.c:104 +#: ../app/core/gimp-gradients.c:115 msgid "FG to Transparent" msgstr "FG till Transparent" +#: ../app/core/gimp-spawn.c:186 +#, c-format +msgid "Failed to fork (%s)" +msgstr "Misslyckades med att köra fork (%s)" + +#: ../app/core/gimp-spawn.c:223 +#, c-format +msgid "Failed to execute child process “%s” (%s)" +msgstr "Misslyckades med att köra barnprocess ”%s” (%s)" + #. This is a special string to specify the language identifier to #. * look for in the gimp-tags-default.xml file. Please translate the #. * C in it according to the name of the po file used for @@ -9477,92 +11988,87 @@ msgstr "FG till Transparent" msgid "tags-locale:C" msgstr "tags-locale:sv" -#: ../app/core/gimp-user-install.c:213 +#: ../app/core/gimp-user-install.c:216 #, c-format msgid "" "It seems you have used GIMP %s before. GIMP will now migrate your user " "settings to '%s'." msgstr "" "Det verkar som om du har använt GIMP %s tidigare. GIMP kommer nu att " -"migrera dina användarinställningar till \"%s\"." +"migrera dina användarinställningar till ”%s”." -#: ../app/core/gimp-user-install.c:218 +#: ../app/core/gimp-user-install.c:221 #, c-format msgid "" "It appears that you are using GIMP for the first time. GIMP will now create " "a folder named '%s' and copy some files to it." msgstr "" "Det verkar som om du använder GIMP för första gången. GIMP kommer nu att " -"skapa en mapp med namnet \"%s\" och kopiera några filer dit." +"skapa en mapp med namnet ”%s” och kopiera några filer dit." -#: ../app/core/gimp-user-install.c:417 +#: ../app/core/gimp-user-install.c:420 #, c-format msgid "Copying file '%s' from '%s'..." -msgstr "Kopierar filen \"%s\" från \"%s\"..." +msgstr "Kopierar fil ”%s” från ”%s”…" -#: ../app/core/gimp-user-install.c:432 ../app/core/gimp-user-install.c:458 +#: ../app/core/gimp-user-install.c:435 ../app/core/gimp-user-install.c:461 #, c-format msgid "Creating folder '%s'..." -msgstr "Skapar mappen \"%s\"..." +msgstr "Skapar mappen ”%s”…" -#: ../app/core/gimp-user-install.c:443 ../app/core/gimp-user-install.c:469 +#: ../app/core/gimp-user-install.c:446 ../app/core/gimp-user-install.c:472 #, c-format msgid "Cannot create folder '%s': %s" -msgstr "Kan inte skapa mappen \"%s\": %s" +msgstr "Kan inte skapa mappen ”%s”: %s" -#: ../app/core/gimp-utils.c:553 ../app/core/gimpfilloptions.c:334 +#: ../app/core/gimp-utils.c:569 ../app/core/gimpfilloptions.c:330 msgid "No patterns available for this operation." msgstr "Inga mönster tillgängliga för denna åtgärd." -#: ../app/core/gimpbrush-load.c:173 -#, fuzzy, c-format -#| msgid "Fatal parse error in brush file '%s': Width = 0." +#: ../app/core/gimpbrush-load.c:174 +#, c-format msgid "Fatal parse error in brush file: Width = 0." -msgstr "Ödesdigert tolkningsfel i penselfilen \"%s\": Bredd = 0." +msgstr "Ödesdigert tolkningsfel i penselfil: Bredd = 0." -#: ../app/core/gimpbrush-load.c:180 -#, fuzzy, c-format -#| msgid "Fatal parse error in brush file '%s': Height = 0." +#: ../app/core/gimpbrush-load.c:181 +#, c-format msgid "Fatal parse error in brush file: Height = 0." -msgstr "Ödesdigert tolkningsfel i penselfilen \"%s\": Höjd = 0." +msgstr "Ödesdigert tolkningsfel i penselfil: Höjd = 0." -#: ../app/core/gimpbrush-load.c:187 -#, fuzzy, c-format -#| msgid "Fatal parse error in brush file '%s': Bytes = 0." +#: ../app/core/gimpbrush-load.c:188 +#, c-format msgid "Fatal parse error in brush file: Bytes = 0." -msgstr "Ödesdigert tolkningsfel i penselfilen \"%s\": Byte = 0." +msgstr "Ödesdigert tolkningsfel i penselfil: Byte = 0." -#: ../app/core/gimpbrush-load.c:212 -#, fuzzy, c-format -#| msgid "Fatal parse error in brush file '%s': Unknown depth %d." +#: ../app/core/gimpbrush-load.c:213 +#, c-format msgid "Fatal parse error in brush file: Unknown depth %d." -msgstr "Ödesdigert tolkningsfel i penselfilen \"%s\": Okänt djup %d." +msgstr "Ödesdigert tolkningsfel i penselfil: Okänt djup %d." -#: ../app/core/gimpbrush-load.c:224 -#, fuzzy, c-format -#| msgid "Fatal parse error in brush file '%s': Unknown version %d." +#: ../app/core/gimpbrush-load.c:225 +#, c-format msgid "Fatal parse error in brush file: Unknown version %d." -msgstr "Ödesdigert tolkningsfel i penselfilen \"%s\": Okänd version %d." +msgstr "Ödesdigert tolkningsfel i penselfil: Okänd version %d." -#: ../app/core/gimpbrush-load.c:245 ../app/core/gimpbrushgenerated-load.c:125 +#: ../app/core/gimpbrush-load.c:233 +#, c-format +msgid "Unsupported brush format" +msgstr "Penselformat stöds inte" + +#: ../app/core/gimpbrush-load.c:253 ../app/core/gimpbrushgenerated-load.c:125 #: ../app/core/gimpbrushpipe-load.c:75 #, c-format msgid "Invalid UTF-8 string in brush file '%s'." -msgstr "Ogiltig UTF-8-sträng i penselfilen \"%s\"." +msgstr "Ogiltig UTF-8-sträng i penselfilen ”%s”." -#: ../app/core/gimpbrush-load.c:252 ../app/core/gimppattern-load.c:116 -#: ../app/dialogs/template-options-dialog.c:84 -#: ../app/tools/gimpvectortool.c:319 +#: ../app/core/gimpbrush-load.c:260 ../app/core/gimppattern-load.c:130 +#: ../app/dialogs/template-options-dialog.c:110 +#: ../app/display/gimptoolpath.c:554 msgid "Unnamed" msgstr "Namnlös" -#: ../app/core/gimpbrush-load.c:323 -#, fuzzy, c-format -#| msgid "" -#| "Fatal parse error in brush file '%s': Unsupported brush depth %d\n" -#| "GIMP brushes must be GRAY or RGBA.\n" -#| "This might be an obsolete GIMP brush file, try loading it as image and " -#| "save it again." +#: ../app/core/gimpbrush-load.c:331 +#, c-format msgid "" "Fatal parse error in brush file:\n" "Unsupported brush depth %d\n" @@ -9570,113 +12076,129 @@ msgid "" "This might be an obsolete GIMP brush file, try loading it as image and save " "it again." msgstr "" -"Ödesdigert tolkningsfel i penselfilen '%s': Penseldjupet %d stöds inte.\n" +"Ödesdigert tolkningsfel i penselfil:\n" +"Penseldjupet %d stöds inte.\n" "GIMP-penslar måste vara GRÅ eller RGBA.\n" "Detta kan vara en föråldrad GIMP-penselfil, försök läsa in den som bild och " "spara den igen." -#: ../app/core/gimpbrush-load.c:370 -#, fuzzy, c-format -#| msgid "" -#| "Fatal parse error in brush file '%s': Unsupported brush depth %d\n" -#| "GIMP brushes must be GRAY or RGBA." +#: ../app/core/gimpbrush-load.c:378 +#, c-format msgid "" "Fatal parse error in brush file:\n" "Unsupported brush depth %d\n" "GIMP brushes must be GRAY or RGBA." msgstr "" -"Ödesdigert tolkningsfel i penselfilen \"%s\": Penseldjupet %d stöds inte.\n" +"Ödesdigert tolkningsfel i penselfil:\n" +"Penseldjupet %d stöds inte.\n" "GIMP-penslar måste vara GRÅ eller RGBA." -#: ../app/core/gimpbrush-load.c:446 -#, fuzzy, c-format -#| msgid "" -#| "Fatal parse error in brush file '%s': unable to decode abr format version " -#| "%d." +#: ../app/core/gimpbrush-load.c:454 +#, c-format msgid "Unable to decode abr format version %d." msgstr "" -"Ödesdigert tolkningsfel i penselfilen \"%s\": kunde inte avkoda abr-format " -"version %d." +"Ödesdigert tolkningsfel i penselfil: kunde inte avkoda abr-format version %d." -#: ../app/core/gimpbrush-load.c:644 -#, fuzzy, c-format -#| msgid "" -#| "Fatal parse error in brush file '%s': Wide brushes are not supported." -msgid "Fatal parse error in brush file: Wide brushes are not supported." +#: ../app/core/gimpbrush-load.c:572 ../app/core/gimpbrush-load.c:791 +#, c-format +msgid "Fatal parse error in brush file: Brush size value corrupt." msgstr "" -"Ödesdigert tolkningsfel i penselfilen \"%s\": Breda penslar stöds inte." +"Ödesdigert tolkningsfel i penselfil: Värdet för penselstorlek är felaktigt." -#: ../app/core/gimpbrush-load.c:785 -#, fuzzy -#| msgid "Fatal parse error in brush file '%s': File appears truncated." +#: ../app/core/gimpbrush-load.c:659 ../app/core/gimpbrush-load.c:849 +#, c-format +msgid "Fatal parse error in brush file: Brush dimensions out of range." +msgstr "" +"Ödesdigert tolkningsfel i penselfil: Penseldimensioner utanför intervall." + +#: ../app/core/gimpbrush-load.c:671 +#, c-format +msgid "Fatal parse error in brush file: Wide brushes are not supported." +msgstr "Ödesdigert tolkningsfel i penselfil: Breda penslar stöds inte." + +#: ../app/core/gimpbrush-load.c:820 msgid "Fatal parse error in brush file: File appears truncated: " -msgstr "Ödesdigert tolkningsfel i penselfilen \"%s\": Filen verkar avhuggen." +msgstr "Ödesdigert tolkningsfel i penselfil: Filen verkar avhuggen: " -#: ../app/core/gimpbrush-load.c:931 -#, fuzzy, c-format -#| msgid "" -#| "Fatal parse error in brush file '%s': unable to decode abr format version " -#| "%d." +#: ../app/core/gimpbrush-load.c:857 +#, c-format +msgid "Fatal parse error in brush file: Unknown compression method." +msgstr "Ödesdigert tolkningsfel i penselfil: Okänd komprimeringsmetod." + +#: ../app/core/gimpbrush-load.c:993 +#, c-format msgid "" "Fatal parse error in brush file: Unable to decode abr format version %d." msgstr "" -"Ödesdigert tolkningsfel i penselfilen \"%s\": kunde inte avkoda abr-format " -"version %d." +"Ödesdigert tolkningsfel i penselfil: kunde inte avkoda abr-format version %d." -#: ../app/core/gimpbrush.c:149 ../app/paint/gimppaintoptions.c:219 +#: ../app/core/gimpbrush-load.c:1114 ../app/core/gimpbrush-load.c:1132 +#, c-format +msgid "Fatal parse error in brush file: RLE compressed brush data corrupt." +msgstr "" +"Ödesdigert tolkningsfel i penselfil: RLE-komprimerad penseldata är skadad." + +#: ../app/core/gimpbrush.c:150 ../app/paint/gimppaintoptions.c:215 msgid "Brush Spacing" msgstr "Penselmellanrum" +#: ../app/core/gimpbrushclipboard.c:190 +msgid "Clipboard Mask" +msgstr "Urklippsmask" + +#: ../app/core/gimpbrushclipboard.c:192 ../app/core/gimppatternclipboard.c:169 +msgid "Clipboard Image" +msgstr "Urklippsbild" + #: ../app/core/gimpbrushgenerated-load.c:75 -#, fuzzy, c-format -#| msgid "not a GIMP Curves file" +#, c-format msgid "Not a GIMP brush file." -msgstr "inte en GIMP-kurvfil" +msgstr "Inte en GIMP-penselfil." #: ../app/core/gimpbrushgenerated-load.c:95 #, c-format msgid "Unknown GIMP brush version." -msgstr "" +msgstr "Okänd version av GIMP-pensel." #: ../app/core/gimpbrushgenerated-load.c:152 #, c-format msgid "Unknown GIMP brush shape." -msgstr "" +msgstr "Okänd form av GIMP-pensel." #: ../app/core/gimpbrushgenerated-load.c:242 #, c-format msgid "In line %d of brush file: " -msgstr "" +msgstr "På rad %d i penselfilen: " -#: ../app/core/gimpbrushgenerated.c:130 +#: ../app/core/gimpbrushgenerated.c:135 msgid "Brush Shape" msgstr "Penselform" -#: ../app/core/gimpbrushgenerated.c:138 +#: ../app/core/gimpbrushgenerated.c:143 msgid "Brush Radius" msgstr "Penselradie" # Osäker -#: ../app/core/gimpbrushgenerated.c:145 +#: ../app/core/gimpbrushgenerated.c:150 msgid "Brush Spikes" msgstr "Penselpiggar" -#: ../app/core/gimpbrushgenerated.c:152 ../app/paint/gimppaintoptions.c:226 +#: ../app/core/gimpbrushgenerated.c:157 ../app/paint/gimppaintoptions.c:222 msgid "Brush Hardness" msgstr "Penselhårdhet" -#: ../app/core/gimpbrushgenerated.c:160 ../app/paint/gimppaintoptions.c:205 +#: ../app/core/gimpbrushgenerated.c:165 ../app/paint/gimppaintoptions.c:201 msgid "Brush Aspect Ratio" -msgstr "Penselns aspektförhållande" +msgstr "Penselns bildförhållande" -#: ../app/core/gimpbrushgenerated.c:167 ../app/paint/gimppaintoptions.c:212 +#: ../app/core/gimpbrushgenerated.c:172 ../app/paint/gimppaintoptions.c:208 msgid "Brush Angle" msgstr "Penselvinkel" #: ../app/core/gimpbrushpipe-load.c:91 ../app/core/gimpbrushpipe-load.c:115 #, c-format msgid "Fatal parse error in brush file '%s': File is corrupt." -msgstr "Ödesdigert tolkningsfel i penselfilen \"%s\": Filen är skadad." +msgstr "Ödesdigert tolkningsfel i penselfilen ”%s”: Filen är skadad." #: ../app/core/gimpchannel-select.c:66 msgctxt "undo-type" @@ -9693,7 +12215,7 @@ msgctxt "undo-type" msgid "Rounded Rectangle Select" msgstr "Rundad rektangulär markering" -#: ../app/core/gimpchannel-select.c:440 ../app/core/gimplayer.c:333 +#: ../app/core/gimpchannel-select.c:440 ../app/core/gimplayer.c:448 msgctxt "undo-type" msgid "Alpha to Selection" msgstr "Alfakanal till markering" @@ -9715,174 +12237,160 @@ msgid "Select by Color" msgstr "Markera efter färg" #: ../app/core/gimpchannel-select.c:616 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Select by Color" msgctxt "undo-type" msgid "Select by Indexed Color" -msgstr "Markera efter färg" +msgstr "Markera efter indexerad färg" -#: ../app/core/gimpchannel.c:290 +#: ../app/core/gimpchannel.c:270 msgctxt "undo-type" msgid "Rename Channel" msgstr "Byt namn på kanal" -#: ../app/core/gimpchannel.c:291 +#: ../app/core/gimpchannel.c:271 msgctxt "undo-type" msgid "Move Channel" msgstr "Flytta kanal" -#: ../app/core/gimpchannel.c:292 +#: ../app/core/gimpchannel.c:272 msgctxt "undo-type" msgid "Scale Channel" msgstr "Skala kanal" -#: ../app/core/gimpchannel.c:293 +#: ../app/core/gimpchannel.c:273 msgctxt "undo-type" msgid "Resize Channel" msgstr "Ändra storlek på kanal" -#: ../app/core/gimpchannel.c:294 +#: ../app/core/gimpchannel.c:274 msgctxt "undo-type" msgid "Flip Channel" msgstr "Vänd kanal" -#: ../app/core/gimpchannel.c:295 +#: ../app/core/gimpchannel.c:275 msgctxt "undo-type" msgid "Rotate Channel" msgstr "Rotera kanal" -#: ../app/core/gimpchannel.c:296 ../app/core/gimpdrawable-transform.c:989 +#: ../app/core/gimpchannel.c:276 ../app/core/gimpdrawable-transform.c:1013 msgctxt "undo-type" msgid "Transform Channel" msgstr "Transformera kanal" -#: ../app/core/gimpchannel.c:297 ../app/core/gimpchannel.c:332 +#: ../app/core/gimpchannel.c:277 ../app/core/gimpchannel.c:309 msgctxt "undo-type" msgid "Fill Channel" msgstr "Fyll kanal" -#: ../app/core/gimpchannel.c:298 +#: ../app/core/gimpchannel.c:278 msgctxt "undo-type" msgid "Stroke Channel" msgstr "Stryk kanal" -#: ../app/core/gimpchannel.c:299 ../app/core/gimpselection.c:657 +#: ../app/core/gimpchannel.c:279 msgctxt "undo-type" msgid "Channel to Selection" msgstr "Kanal till markering" -#: ../app/core/gimpchannel.c:300 +#: ../app/core/gimpchannel.c:280 msgctxt "undo-type" msgid "Reorder Channel" msgstr "Ändra ordning på kanal" -#: ../app/core/gimpchannel.c:301 +#: ../app/core/gimpchannel.c:281 msgctxt "undo-type" msgid "Raise Channel" msgstr "Höj kanal" -#: ../app/core/gimpchannel.c:302 +#: ../app/core/gimpchannel.c:282 msgctxt "undo-type" msgid "Raise Channel to Top" msgstr "Höj kanal till överst" -#: ../app/core/gimpchannel.c:303 +#: ../app/core/gimpchannel.c:283 msgctxt "undo-type" msgid "Lower Channel" msgstr "Sänk kanal" -#: ../app/core/gimpchannel.c:304 +#: ../app/core/gimpchannel.c:284 msgctxt "undo-type" msgid "Lower Channel to Bottom" msgstr "Sänk kanal till nederst" -#: ../app/core/gimpchannel.c:305 +#: ../app/core/gimpchannel.c:285 msgid "Channel cannot be raised higher." msgstr "Kanalen kan inte höjas mer." -#: ../app/core/gimpchannel.c:306 +#: ../app/core/gimpchannel.c:286 msgid "Channel cannot be lowered more." msgstr "Kanalen kan inte sänkas mer." -#: ../app/core/gimpchannel.c:329 +#: ../app/core/gimpchannel.c:306 msgctxt "undo-type" msgid "Feather Channel" -msgstr "Fjädra kanal" +msgstr "Fjädringskanal" -#: ../app/core/gimpchannel.c:330 +#: ../app/core/gimpchannel.c:307 msgctxt "undo-type" msgid "Sharpen Channel" msgstr "Gör kanalen skarpare" -#: ../app/core/gimpchannel.c:331 +#: ../app/core/gimpchannel.c:308 msgctxt "undo-type" msgid "Clear Channel" msgstr "Rensa kanal" -#: ../app/core/gimpchannel.c:333 +#: ../app/core/gimpchannel.c:310 msgctxt "undo-type" msgid "Invert Channel" msgstr "Invertera kanal" -#: ../app/core/gimpchannel.c:334 +#: ../app/core/gimpchannel.c:311 msgctxt "undo-type" msgid "Border Channel" msgstr "Kantmarkera kanal" -#: ../app/core/gimpchannel.c:335 +#: ../app/core/gimpchannel.c:312 msgctxt "undo-type" msgid "Grow Channel" msgstr "Öka kanal" -#: ../app/core/gimpchannel.c:336 +#: ../app/core/gimpchannel.c:313 msgctxt "undo-type" msgid "Shrink Channel" msgstr "Minska kanal" -#: ../app/core/gimpchannel.c:337 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Flip Channel" +#: ../app/core/gimpchannel.c:314 msgctxt "undo-type" msgid "Flood Channel" -msgstr "Vänd kanal" +msgstr "Fyll kanal" -#: ../app/core/gimpchannel.c:836 -#, fuzzy -#| msgid "Cannot stroke empty channel." +#: ../app/core/gimpchannel.c:850 msgid "Cannot fill empty channel." -msgstr "Kan inte stryka tom kanal." +msgstr "Kan inte fylla tom kanal." -#: ../app/core/gimpchannel.c:872 +#: ../app/core/gimpchannel.c:886 msgid "Cannot stroke empty channel." msgstr "Kan inte stryka tom kanal." -#: ../app/core/gimpchannel.c:1785 +#: ../app/core/gimpchannel.c:1709 msgctxt "undo-type" msgid "Set Channel Color" msgstr "Ställ in kanalfärg" -#: ../app/core/gimpchannel.c:1839 +#: ../app/core/gimpchannel.c:1760 msgctxt "undo-type" msgid "Set Channel Opacity" msgstr "Ställ in kanalopacitet" -#: ../app/core/gimpchannel.c:1936 ../app/core/gimpselection.c:169 +#: ../app/core/gimpchannel.c:1849 ../app/core/gimpselection.c:168 msgid "Selection Mask" msgstr "Markeringsmask" #: ../app/core/gimpcontext.c:673 -#, fuzzy -#| msgctxt "active-color" -#| msgid "Foreground" msgid "Foreground" msgstr "Förgrund" #: ../app/core/gimpcontext.c:674 ../app/core/gimpgrid.c:94 -#, fuzzy -#| msgctxt "fill-type" -#| msgid "Foreground color" msgid "Foreground color" msgstr "Förgrundsfärg" @@ -9891,14 +12399,12 @@ msgid "Background" msgstr "Bakgrund" #: ../app/core/gimpcontext.c:681 ../app/core/gimpgrid.c:101 -#, fuzzy -#| msgctxt "fill-type" -#| msgid "Background color" msgid "Background color" msgstr "Bakgrundsfärg" #: ../app/core/gimpcontext.c:687 ../app/core/gimpcontext.c:688 -#: ../app/widgets/gimpbrushselect.c:177 ../app/widgets/gimplayertreeview.c:287 +#: ../app/dialogs/fade-dialog.c:158 ../app/widgets/gimpbrushselect.c:175 +#: ../app/widgets/gimplayertreeview.c:295 msgid "Opacity" msgstr "Opacitet" @@ -9908,32 +12414,26 @@ msgstr "Målningsläge" #: ../app/core/gimpcontext.c:704 ../app/core/gimpcontext.c:705 #: ../app/tools/gimpmybrushoptions-gui.c:54 -#: ../app/tools/gimppaintoptions-gui.c:155 +#: ../app/tools/gimppaintoptions-gui.c:162 msgid "Brush" msgstr "Pensel" #: ../app/core/gimpcontext.c:712 -#, fuzzy -#| msgid "Paint Dynamics" msgid "Paint dynamics" msgstr "Målningsdynamik" #: ../app/core/gimpcontext.c:718 ../app/core/gimpcontext.c:719 #: ../app/tools/gimpmybrushtool.c:73 -#, fuzzy -#| msgid "Paintbrush" msgid "MyPaint Brush" -msgstr "Pensel" +msgstr "MyPaint-pensel" #: ../app/core/gimpcontext.c:725 ../app/core/gimpcontext.c:726 -#, fuzzy -#| msgctxt "fill-style" -#| msgid "Pattern" msgid "Pattern" msgstr "Mönster" #: ../app/core/gimpcontext.c:732 ../app/core/gimpcontext.c:733 -#: ../app/tools/gimpblendoptions.c:225 ../app/tools/gimppaintoptions-gui.c:364 +#: ../app/pdb/edit-cmds.c:797 ../app/tools/gimpblendoptions.c:283 +#: ../app/tools/gimppaintoptions-gui.c:378 msgid "Gradient" msgstr "Färgskala" @@ -9943,30 +12443,26 @@ msgid "Palette" msgstr "Palett" #: ../app/core/gimpcontext.c:746 ../app/core/gimpcontext.c:747 -#, fuzzy -#| msgid "Tool Presets" msgid "Tool Preset" -msgstr "Verktygsförval" +msgstr "Verktygsförinställning" #: ../app/core/gimpcontext.c:753 ../app/core/gimpcontext.c:754 -#: ../app/tools/gimptextoptions.c:548 +#: ../app/tools/gimptextoptions.c:530 msgid "Font" msgstr "Typsnitt" -#: ../app/core/gimpdata.c:537 ../app/core/gimpdata.c:545 -#, fuzzy, c-format -#| msgid "Error reading '%s': %s" +#: ../app/core/gimpdata.c:582 ../app/core/gimpdata.c:590 +#, c-format msgid "Error saving '%s': " -msgstr "Fel vid läsning av \"%s\": %s" +msgstr "Fel vid sparning av ”%s”: " -#: ../app/core/gimpdata.c:551 -#, fuzzy, c-format -#| msgid "Error running '%s'" +#: ../app/core/gimpdata.c:596 +#, c-format msgid "Error saving '%s'" -msgstr "Fel vid körning av \"%s\"" +msgstr "Fel vid sparning av ”%s”" -#: ../app/core/gimpdatafactory.c:451 ../app/core/gimpdatafactory.c:476 -#: ../app/core/gimpdatafactory.c:643 ../app/core/gimpdatafactory.c:665 +#: ../app/core/gimpdatafactory.c:433 ../app/core/gimpdatafactory.c:458 +#: ../app/core/gimpdatafactory.c:625 ../app/core/gimpdatafactory.c:647 #, c-format msgid "" "Failed to save data:\n" @@ -9977,32 +12473,28 @@ msgstr "" "\n" "%s" -#: ../app/core/gimpdatafactory.c:557 ../app/core/gimpdatafactory.c:560 -#: ../app/core/gimpitem.c:502 ../app/core/gimpitem.c:505 +#: ../app/core/gimpdatafactory.c:539 ../app/core/gimpdatafactory.c:542 +#: ../app/core/gimpitem.c:540 ../app/core/gimpitem.c:543 msgid "copy" msgstr "kopia" -#: ../app/core/gimpdatafactory.c:569 ../app/core/gimpitem.c:513 +#: ../app/core/gimpdatafactory.c:551 ../app/core/gimpitem.c:551 #, c-format msgid "%s copy" msgstr "%s-kopia" -#: ../app/core/gimpdatafactory.c:760 -#, fuzzy, c-format -#| msgid "" -#| "You have a writable data folder configured (%s), but this folder does not " -#| "exist. Please create the folder or fix your configuation in the " -#| "Preferences dialog's 'Folders' section." +#: ../app/core/gimpdatafactory.c:742 +#, c-format msgid "" "You have a writable data folder configured (%s), but this folder does not " "exist. Please create the folder or fix your configuration in the Preferences " "dialog's 'Folders' section." msgstr "" "Du har en skrivbar datamapp konfigurerad (%s), men den mappen finns inte. " -"Skapa mappen eller justera din konfiguration i delen 'kataloger' i " +"Skapa mappen eller justera din konfiguration i delen ”kataloger” i " "Inställningsdialogrutan." -#: ../app/core/gimpdatafactory.c:779 +#: ../app/core/gimpdatafactory.c:761 #, c-format msgid "" "You have a writable data folder configured, but this folder is not part of " @@ -10011,32 +12503,29 @@ msgid "" msgstr "" "Du har en skrivbar datamapp konfigurerad, men den mappen är inte en del av " "din datasökväg. Du redigerade förmodligen gimprc-filen manuellt, justera " -"detta i delen 'kataloger' i Inställningsdialogrutan." +"detta i delen ”kataloger” i Inställningsdialogrutan." -#: ../app/core/gimpdatafactory.c:789 +#: ../app/core/gimpdatafactory.c:771 #, c-format msgid "You don't have any writable data folder configured." msgstr "Du har ingen skrivbar datamapp konfigurerad." -#: ../app/core/gimpdatafactory.c:920 -#, fuzzy, c-format -#| msgid "Error reading '%s': %s" +#: ../app/core/gimpdatafactory.c:904 +#, c-format msgid "Error loading '%s': " -msgstr "Fel vid läsning av \"%s\": %s" +msgstr "Fel vid inläsning av ”%s”: " -#: ../app/core/gimpdatafactory.c:926 -#, fuzzy, c-format -#| msgid "Error reading '%s': %s" +#: ../app/core/gimpdatafactory.c:910 +#, c-format msgid "Error loading '%s'" -msgstr "Fel vid läsning av \"%s\": %s" +msgstr "Fel vid inläsning av ”%s”" -#: ../app/core/gimpdatafactory.c:935 ../app/xcf/xcf.c:426 -#, fuzzy, c-format -#| msgid "Could not open '%s' for reading: %s" +#: ../app/core/gimpdatafactory.c:920 ../app/xcf/xcf.c:439 +#, c-format msgid "Could not open '%s' for reading: " -msgstr "Kunde inte öppna \"%s\" för läsning: %s" +msgstr "Kunde inte öppna ”%s” för läsning: " -#: ../app/core/gimpdatafactory.c:994 +#: ../app/core/gimpdatafactory.c:979 #, c-format msgid "" "Failed to load data:\n" @@ -10047,53 +12536,50 @@ msgstr "" "\n" "%s" -#: ../app/core/gimpdrawable.c:522 +#: ../app/core/gimpdrawable.c:480 msgctxt "undo-type" msgid "Scale" msgstr "Skala" -#: ../app/core/gimpdrawable-blend.c:150 ../app/tools/gimpblendtool.c:1183 -msgctxt "undo-type" -msgid "Blend" -msgstr "Toning" - -#: ../app/core/gimpdrawable-blend.c:240 -msgid "Calculating distance map" -msgstr "" - #: ../app/core/gimpdrawable-bucket-fill.c:180 msgctxt "undo-type" msgid "Bucket Fill" msgstr "Fyll" -#: ../app/core/gimpdrawable-equalize.c:53 +#: ../app/core/gimpdrawable-equalize.c:63 msgctxt "undo-type" msgid "Equalize" msgstr "Jämna ut" -#: ../app/core/gimpdrawable-floating-selection.c:171 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Float Selection" +#: ../app/core/gimpdrawable-floating-selection.c:191 msgid "Floating Selection" msgstr "Flytande markering" #: ../app/core/gimpdrawable-foreground-extract.c:66 msgid "Computing alpha of unknown pixels" -msgstr "" +msgstr "Beräknar alfa för okända bildpunkter" -#: ../app/core/gimpdrawable-fill.c:158 ../app/vectors/gimpvectors.c:644 +#: ../app/core/gimpdrawable-fill.c:202 ../app/vectors/gimpvectors.c:668 msgid "Not enough points to fill" msgstr "Inte tillräckligt många punkter för att fylla" -#: ../app/core/gimpdrawable-fill.c:227 +#: ../app/core/gimpdrawable-fill.c:256 msgctxt "undo-type" msgid "Render Stroke" msgstr "Rendera penseldrag" +#: ../app/core/gimpdrawable-gradient.c:125 +msgctxt "undo-type" +msgid "Gradient" +msgstr "Toning" + +#: ../app/core/gimpdrawable-gradient.c:213 +msgid "Calculating distance map" +msgstr "Beräknar avståndskarta" + #: ../app/core/gimpdrawable-levels.c:72 #: ../app/tools/gimpforegroundselectoptions.c:116 -#: ../app/tools/gimplevelstool.c:137 +#: ../app/tools/gimplevelstool.c:132 msgid "Levels" msgstr "Nivåer" @@ -10103,26 +12589,26 @@ msgid "Offset Drawable" msgstr "Position för rityta" #: ../app/core/gimpdrawable-stroke.c:111 -#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:666 +#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:690 msgid "Not enough points to stroke" msgstr "Inte tillräckligt många punkter att stryka" -#: ../app/core/gimpdrawable-transform.c:757 +#: ../app/core/gimpdrawable-transform.c:781 msgctxt "undo-type" msgid "Flip" msgstr "Vänd" -#: ../app/core/gimpdrawable-transform.c:842 +#: ../app/core/gimpdrawable-transform.c:866 msgctxt "undo-type" msgid "Rotate" msgstr "Rotera" -#: ../app/core/gimpdrawable-transform.c:987 ../app/core/gimplayer.c:332 +#: ../app/core/gimpdrawable-transform.c:1011 ../app/core/gimplayer.c:447 msgctxt "undo-type" msgid "Transform Layer" msgstr "Transformera lager" -#: ../app/core/gimpdrawable-transform.c:1000 +#: ../app/core/gimpdrawable-transform.c:1024 msgid "Transformation" msgstr "Transformation" @@ -10130,102 +12616,91 @@ msgstr "Transformation" msgid "Output type" msgstr "Utmatningstyp" -#: ../app/core/gimpfilloptions.c:108 -#, fuzzy -#| msgctxt "dockable-action" -#| msgid "_Tab Style" +#: ../app/core/gimpfilloptions.c:103 msgid "Style" -msgstr "F_likstil" +msgstr "Stil" -#: ../app/core/gimpfilloptions.c:116 ../app/pdb/gimppdbcontext.c:99 +#: ../app/core/gimpfilloptions.c:111 ../app/pdb/gimppdbcontext.c:100 #: ../app/tools/gimpbucketfilloptions.c:132 -#: ../app/tools/gimpselectionoptions.c:80 ../app/tools/gimptextoptions.c:150 +#: ../app/tools/gimpselectionoptions.c:80 ../app/tools/gimptextoptions.c:134 msgid "Antialiasing" msgstr "Kantutjämning" -#: ../app/core/gimpfilloptions.c:308 +#: ../app/core/gimpfilloptions.c:303 msgctxt "undo-type" msgid "Fill with Foreground Color" msgstr "Fyll med förgrundsfärg" -#: ../app/core/gimpfilloptions.c:313 +#: ../app/core/gimpfilloptions.c:308 msgctxt "undo-type" msgid "Fill with Background Color" msgstr "Fyll med bakgrundsfärg" -#: ../app/core/gimpfilloptions.c:318 +#: ../app/core/gimpfilloptions.c:313 msgctxt "undo-type" msgid "Fill with White" msgstr "Fyll med vitt" -#: ../app/core/gimpfilloptions.c:324 +#: ../app/core/gimpfilloptions.c:320 msgctxt "undo-type" msgid "Fill with Transparency" msgstr "Fyll med transparent" -#: ../app/core/gimpfilloptions.c:340 ../app/core/gimpfilloptions.c:408 +#: ../app/core/gimpfilloptions.c:336 ../app/core/gimpfilloptions.c:404 msgctxt "undo-type" msgid "Fill with Pattern" msgstr "Fyll med mönster" -#: ../app/core/gimpfilloptions.c:405 -#, fuzzy -#| msgid "Fill with plain color" +#: ../app/core/gimpfilloptions.c:401 msgctxt "undo-type" msgid "Fill with Solid Color" -msgstr "Fyll med vanlig färg" +msgstr "Fyll med en enda färg" #: ../app/core/gimpgradient-load.c:72 -#, fuzzy, c-format -#| msgid "not a GIMP Curves file" +#, c-format msgid "Not a GIMP gradient file." -msgstr "inte en GIMP-kurvfil" +msgstr "Inte en GIMP-gradientfil." #: ../app/core/gimpgradient-load.c:95 #, c-format msgid "Invalid UTF-8 string in gradient file '%s'." -msgstr "Ogiltig UTF-8-sträng i gradientfilen \"%s\"." +msgstr "Ogiltig UTF-8-sträng i gradientfilen ”%s”." #: ../app/core/gimpgradient-load.c:121 #, c-format msgid "File is corrupt." -msgstr "" +msgstr "Filen är skadad." -#: ../app/core/gimpgradient-load.c:195 ../app/core/gimpgradient-load.c:203 +#: ../app/core/gimpgradient-load.c:189 ../app/core/gimpgradient-load.c:199 +#: ../app/core/gimpgradient-load.c:211 ../app/core/gimpgradient-load.c:221 +#: ../app/core/gimpgradient-load.c:229 ../app/core/gimpgradient-load.c:237 #, c-format msgid "Corrupt segment %d." -msgstr "" +msgstr "Skadat segment %d." -#: ../app/core/gimpgradient-load.c:214 ../app/core/gimpgradient-load.c:224 -#, fuzzy, c-format -#| msgid "Gradient file '%s' is corrupt: Segments do not span the range 0-1." +#: ../app/core/gimpgradient-load.c:248 ../app/core/gimpgradient-load.c:258 +#, c-format msgid "Segments do not span the range 0-1." -msgstr "" -"Gradientfilen \"%s\" är skadad: Segmenten spänner inte över intervallet 0-1." +msgstr "Segmenten spänner inte över intervallet 0-1." -#: ../app/core/gimpgradient-load.c:239 -#, fuzzy, c-format -#| msgid "Invalid empty gradient name" +#: ../app/core/gimpgradient-load.c:273 +#, c-format msgid "In line %d of gradient file: " -msgstr "Ogiltigt tomt gradientnamn" +msgstr "På rad %d i gradientfil: " -#: ../app/core/gimpgradient-load.c:315 -#, fuzzy, c-format -#| msgid "No linear gradients found in '%s'" +#: ../app/core/gimpgradient-load.c:349 +#, c-format msgid "No linear gradients found." -msgstr "Inga linjära gradienter hittades i \"%s\"" +msgstr "Inga linjära gradienter hittades." #: ../app/core/gimpgradient-save.c:211 -#, fuzzy, c-format -#| msgid "Opening '%s' failed: %s" +#, c-format msgid "Writing POV file '%s' failed: %s" -msgstr "Öppnande av \"%s\" misslyckades: %s" +msgstr "Skrivning av POV-fil ”%s” misslyckades: %s" #: ../app/core/gimpgrid.c:86 -#, fuzzy -#| msgid "Line _style:" msgid "Line style" -msgstr "Linje_stil:" +msgstr "Linjestil" #: ../app/core/gimpgrid.c:87 msgid "Line style used for the grid." @@ -10241,36 +12716,28 @@ msgid "" msgstr "Bakgrundsfärgen på rutnätet; används endast för dubbelstreckad stil." #: ../app/core/gimpgrid.c:109 -#, fuzzy -#| msgid "Spacing" msgid "Spacing X" -msgstr "Mellanrum" +msgstr "X-mellanrum" #: ../app/core/gimpgrid.c:110 msgid "Horizontal spacing of grid lines." msgstr "Horisontellt avstånd mellan rutnätslinjer." #: ../app/core/gimpgrid.c:116 -#, fuzzy -#| msgid "Spacing" msgid "Spacing Y" -msgstr "Mellanrum" +msgstr "Y-mellanrum" #: ../app/core/gimpgrid.c:117 msgid "Vertical spacing of grid lines." msgstr "Vertikalt avstånd mellan rutnätslinjer." #: ../app/core/gimpgrid.c:123 -#, fuzzy -#| msgid "Spacing" msgid "Spacing unit" -msgstr "Mellanrum" +msgstr "Mellanrumsenhet" #: ../app/core/gimpgrid.c:130 -#, fuzzy -#| msgid "Offset" msgid "Offset X" -msgstr "Position" +msgstr "X-position" #: ../app/core/gimpgrid.c:131 msgid "" @@ -10278,138 +12745,136 @@ msgid "" msgstr "Horisontell början på första linjen; detta kan vara negativt." #: ../app/core/gimpgrid.c:139 -#, fuzzy -#| msgid "Offset" msgid "Offset Y" -msgstr "Position" +msgstr "Y-position" #: ../app/core/gimpgrid.c:140 msgid "Vertical offset of the first grid line; this may be a negative number." msgstr "Vertikal början på första linjen; detta kan vara negativt." #: ../app/core/gimpgrid.c:148 -#, fuzzy -#| msgid "Offset" msgid "Offset unit" -msgstr "Position" +msgstr "Positionsenhet" -#: ../app/core/gimpgrouplayer.c:228 +#: ../app/core/gimpgrouplayer.c:277 msgid "Layer Group" msgstr "Lagergrupp" -#: ../app/core/gimpgrouplayer.c:229 +#: ../app/core/gimpgrouplayer.c:278 msgctxt "undo-type" msgid "Rename Layer Group" msgstr "Byt namn på lagergrupp" -#: ../app/core/gimpgrouplayer.c:230 +#: ../app/core/gimpgrouplayer.c:279 msgctxt "undo-type" msgid "Move Layer Group" msgstr "Flytta lagergrupp" -#: ../app/core/gimpgrouplayer.c:231 +#: ../app/core/gimpgrouplayer.c:280 msgctxt "undo-type" msgid "Scale Layer Group" msgstr "Skala lagergrupp" -#: ../app/core/gimpgrouplayer.c:232 +#: ../app/core/gimpgrouplayer.c:281 msgctxt "undo-type" msgid "Resize Layer Group" msgstr "Ändra storlek på lagergrupp" -#: ../app/core/gimpgrouplayer.c:233 +#: ../app/core/gimpgrouplayer.c:282 msgctxt "undo-type" msgid "Flip Layer Group" msgstr "Vänd lagergrupp" -#: ../app/core/gimpgrouplayer.c:234 +#: ../app/core/gimpgrouplayer.c:283 msgctxt "undo-type" msgid "Rotate Layer Group" msgstr "Rotera lagergrupp" -#: ../app/core/gimpgrouplayer.c:235 +#: ../app/core/gimpgrouplayer.c:284 msgctxt "undo-type" msgid "Transform Layer Group" msgstr "Transformera lagergrupp" -#: ../app/core/gimpimage.c:642 ../app/widgets/gimpsymmetryeditor.c:178 +#: ../app/core/gimpimage.c:645 ../app/widgets/gimpsymmetryeditor.c:179 msgid "Symmetry" -msgstr "" +msgstr "Symmetri" -#: ../app/core/gimpimage.c:2250 +#: ../app/core/gimpimage.c:2223 msgid " (exported)" msgstr " (exporterad)" -#: ../app/core/gimpimage.c:2254 +#: ../app/core/gimpimage.c:2227 msgid " (overwritten)" msgstr " (överskriven)" -#: ../app/core/gimpimage.c:2263 +#: ../app/core/gimpimage.c:2236 msgid " (imported)" msgstr " (importerad)" -#: ../app/core/gimpimage.c:2497 +#: ../app/core/gimpimage.c:2564 msgctxt "undo-type" msgid "Change Image Resolution" msgstr "Ändra bildupplösning" -#: ../app/core/gimpimage.c:2549 +#: ../app/core/gimpimage.c:2616 msgctxt "undo-type" msgid "Change Image Unit" msgstr "Ändra bildenhet" -#: ../app/core/gimpimage.c:3429 +#: ../app/core/gimpimage.c:3500 #, c-format msgid "" "'gimp-comment' parasite validation failed: comment contains invalid UTF-8" msgstr "" +"”gimp-comment” parasitvalidering misslyckades: kommentar innehåller ogiltig " +"UTF-8" -#: ../app/core/gimpimage.c:3481 +#: ../app/core/gimpimage.c:3552 msgctxt "undo-type" msgid "Attach Parasite to Image" msgstr "Koppla parasit till bild" -#: ../app/core/gimpimage.c:3522 +#: ../app/core/gimpimage.c:3593 msgctxt "undo-type" msgid "Remove Parasite from Image" msgstr "Ta bort parasit från bild" -#: ../app/core/gimpimage.c:4231 +#: ../app/core/gimpimage.c:4304 msgctxt "undo-type" msgid "Add Layer" msgstr "Lägg till lager" -#: ../app/core/gimpimage.c:4281 ../app/core/gimpimage.c:4301 +#: ../app/core/gimpimage.c:4346 ../app/core/gimpimage.c:4377 msgctxt "undo-type" msgid "Remove Layer" msgstr "Ta bort lager" -#: ../app/core/gimpimage.c:4295 +#: ../app/core/gimpimage.c:4371 msgctxt "undo-type" msgid "Remove Floating Selection" msgstr "Ta bort flytande markering" -#: ../app/core/gimpimage.c:4460 +#: ../app/core/gimpimage.c:4538 msgctxt "undo-type" msgid "Add Channel" msgstr "Lägg till kanal" -#: ../app/core/gimpimage.c:4498 ../app/core/gimpimage.c:4511 +#: ../app/core/gimpimage.c:4566 ../app/core/gimpimage.c:4590 msgctxt "undo-type" msgid "Remove Channel" msgstr "Ta bort kanal" -#: ../app/core/gimpimage.c:4565 +#: ../app/core/gimpimage.c:4646 msgctxt "undo-type" msgid "Add Path" msgstr "Lägg till bana" -#: ../app/core/gimpimage.c:4596 +#: ../app/core/gimpimage.c:4676 ../app/core/gimpimage.c:4683 msgctxt "undo-type" msgid "Remove Path" msgstr "Ta bort bana" -#: ../app/core/gimpimage-arrange.c:170 +#: ../app/core/gimpimage-arrange.c:173 msgctxt "undo-type" msgid "Arrange Objects" msgstr "Arrangera objekt" @@ -10417,177 +12882,168 @@ msgstr "Arrangera objekt" #: ../app/core/gimpimage-color-profile.c:122 msgid "ICC profile validation failed: Parasite's name is not 'icc-profile'" msgstr "" +"Validering av ICC-profil misslyckades: Parasitens namn är inte ”icc-profile”" #: ../app/core/gimpimage-color-profile.c:131 msgid "" "ICC profile validation failed: Parasite's flags are not (PERSISTENT | " "UNDOABLE)" msgstr "" +"Validering av ICC-profil misslyckades: Parasitens flaggor är inte " +"(PERSISTENT | UNDOABLE)" #: ../app/core/gimpimage-color-profile.c:188 msgid "ICC profile validation failed: " -msgstr "" +msgstr "Validering av ICC-profil misslyckades: " #: ../app/core/gimpimage-color-profile.c:332 -#, fuzzy -#| msgid "Colorize operates only on RGB color layers." msgid "" "ICC profile validation failed: Color profile is not for grayscale color space" -msgstr "Färgläggning fungerar endast på RGB-lager." +msgstr "" +"Validering av ICC-profil misslyckades: Färgprofil är inte för gråskalerymd" #: ../app/core/gimpimage-color-profile.c:342 msgid "ICC profile validation failed: Color profile is not for RGB color space" msgstr "" +"Validering av ICC-profil misslyckades: Färgprofil är inte för RGB-färgrymd" #: ../app/core/gimpimage-color-profile.c:397 -#, fuzzy, c-format -#| msgid "Revert '%s' to '%s'?" +#, c-format msgid "Converting from '%s' to '%s'" -msgstr "Återgå från \"%s\" till \"%s\"?" +msgstr "Konverterar från ”%s” till ”%s”" #: ../app/core/gimpimage-color-profile.c:402 -#, fuzzy -#| msgid "Color Profile" msgid "Color profile conversion" -msgstr "Färgprofil" +msgstr "Färgprofilskonvertering" #: ../app/core/gimpimage-colormap.c:65 #, c-format msgid "Colormap of Image #%d (%s)" msgstr "Färgkarta av bild #%d(%s)" -#: ../app/core/gimpimage-colormap.c:196 +#: ../app/core/gimpimage-colormap.c:193 msgctxt "undo-type" msgid "Set Colormap" msgstr "Ställ in färgkarta" # Osäker -#: ../app/core/gimpimage-colormap.c:244 +#: ../app/core/gimpimage-colormap.c:241 msgctxt "undo-type" msgid "Unset Colormap" msgstr "Inaktivera färgkarta" -#: ../app/core/gimpimage-colormap.c:297 +#: ../app/core/gimpimage-colormap.c:294 msgctxt "undo-type" msgid "Change Colormap entry" msgstr "Ändra post i färgkarta" -#: ../app/core/gimpimage-colormap.c:325 +#: ../app/core/gimpimage-colormap.c:322 msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "Lägg till färg till färgkarta" -#: ../app/core/gimpimage-convert-indexed.c:789 +#: ../app/core/gimpimage-convert-indexed.c:786 msgid "Cannot convert image: palette is empty." msgstr "Kan inte konvertera bild: paletten är tom." -#: ../app/core/gimpimage-convert-indexed.c:803 +#: ../app/core/gimpimage-convert-indexed.c:798 msgctxt "undo-type" msgid "Convert Image to Indexed" msgstr "Konvertera bild till indexerade färger" -#: ../app/core/gimpimage-convert-indexed.c:884 +#: ../app/core/gimpimage-convert-indexed.c:890 msgid "Converting to indexed colors (stage 2)" msgstr "Konverterar till indexerade färger (fas 2)" -#: ../app/core/gimpimage-convert-indexed.c:932 +#: ../app/core/gimpimage-convert-indexed.c:939 msgid "Converting to indexed colors (stage 3)" msgstr "Konverterar till indexerade färger (fas 3)" -#: ../app/core/gimpimage-convert-precision.c:82 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Convert Image to Indexed" +#: ../app/core/gimpimage-convert-precision.c:76 msgctxt "undo-type" msgid "Convert Image to 8 bit linear integer" -msgstr "Konvertera bild till indexerade färger" +msgstr "Konvertera bild till 8-bit linjära heltal" -#: ../app/core/gimpimage-convert-precision.c:85 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Convert Image to Indexed" +#: ../app/core/gimpimage-convert-precision.c:79 msgctxt "undo-type" msgid "Convert Image to 8 bit gamma integer" -msgstr "Konvertera bild till indexerade färger" +msgstr "Konvertera bild till 8-bit gamma-heltal" -#: ../app/core/gimpimage-convert-precision.c:88 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Convert Image to Indexed" +#: ../app/core/gimpimage-convert-precision.c:82 msgctxt "undo-type" msgid "Convert Image to 16 bit linear integer" -msgstr "Konvertera bild till indexerade färger" +msgstr "Konvertera bild till 16-bit linjära heltal" -#: ../app/core/gimpimage-convert-precision.c:91 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Convert Image to Indexed" +#: ../app/core/gimpimage-convert-precision.c:85 msgctxt "undo-type" msgid "Convert Image to 16 bit gamma integer" -msgstr "Konvertera bild till indexerade färger" +msgstr "Konvertera bild till 16-bit gamma-heltal" -#: ../app/core/gimpimage-convert-precision.c:94 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Convert Image to Indexed" +#: ../app/core/gimpimage-convert-precision.c:88 msgctxt "undo-type" msgid "Convert Image to 32 bit linear integer" -msgstr "Konvertera bild till indexerade färger" +msgstr "Konvertera bild till 32-bit linjära heltal" -#: ../app/core/gimpimage-convert-precision.c:97 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Convert Image to Indexed" +#: ../app/core/gimpimage-convert-precision.c:91 msgctxt "undo-type" msgid "Convert Image to 32 bit gamma integer" -msgstr "Konvertera bild till indexerade färger" +msgstr "Konvertera bild till 32-bit gamma-heltal" + +#: ../app/core/gimpimage-convert-precision.c:94 +msgctxt "undo-type" +msgid "Convert Image to 16 bit linear floating point" +msgstr "Konvertera bild till 16-bit linjära flyttal" + +#: ../app/core/gimpimage-convert-precision.c:97 +msgctxt "undo-type" +msgid "Convert Image to 16 bit gamma floating point" +msgstr "Konvertera bild till 16-bit gamma-flyttal" #: ../app/core/gimpimage-convert-precision.c:100 msgctxt "undo-type" -msgid "Convert Image to 16 bit linear floating point" -msgstr "" +msgid "Convert Image to 32 bit linear floating point" +msgstr "Konvertera bild till 32-bit linjära flyttal" #: ../app/core/gimpimage-convert-precision.c:103 msgctxt "undo-type" -msgid "Convert Image to 16 bit gamma floating point" -msgstr "" +msgid "Convert Image to 32 bit gamma floating point" +msgstr "Konvertera bild till 32-bit gamma-flyttal" #: ../app/core/gimpimage-convert-precision.c:106 msgctxt "undo-type" -msgid "Convert Image to 32 bit linear floating point" -msgstr "" +msgid "Convert Image to 64 bit linear floating point" +msgstr "Konvertera bild till 64-bit linjära flyttal" #: ../app/core/gimpimage-convert-precision.c:109 msgctxt "undo-type" -msgid "Convert Image to 32 bit gamma floating point" -msgstr "" - -#: ../app/core/gimpimage-convert-precision.c:112 -msgctxt "undo-type" -msgid "Convert Image to 64 bit linear floating point" -msgstr "" - -#: ../app/core/gimpimage-convert-precision.c:115 -msgctxt "undo-type" msgid "Convert Image to 64 bit gamma floating point" -msgstr "" +msgstr "Konvertera bild till 64-bit gamma-flyttal" -#: ../app/core/gimpimage-convert-type.c:83 +#. dithering +#: ../app/core/gimpimage-convert-precision.c:267 +#: ../app/core/gimpimage-convert-precision.c:288 +#: ../app/dialogs/convert-indexed-dialog.c:236 +#: ../app/dialogs/convert-precision-dialog.c:221 +#: ../app/tools/gimpblendoptions.c:135 +msgid "Dithering" +msgstr "Färgutjämning" + +#: ../app/core/gimpimage-convert-type.c:81 msgctxt "undo-type" msgid "Convert Image to RGB" msgstr "Konvertera bild till RGB" -#: ../app/core/gimpimage-convert-type.c:87 +#: ../app/core/gimpimage-convert-type.c:85 msgctxt "undo-type" msgid "Convert Image to Grayscale" msgstr "Konvertera bild till gråskala" -#: ../app/core/gimpimage-crop.c:71 +#: ../app/core/gimpimage-crop.c:72 msgctxt "undo-type" msgid "Crop Image" msgstr "Beskär bild" -#: ../app/core/gimpimage-crop.c:74 ../app/core/gimpimage-resize.c:89 +#: ../app/core/gimpimage-crop.c:75 ../app/core/gimpimage-resize.c:91 msgctxt "undo-type" msgid "Resize Image" msgstr "Ändra storlek på bild" @@ -10612,173 +13068,181 @@ msgctxt "undo-type" msgid "Move Guide" msgstr "Flytta hjälplinje" -#: ../app/core/gimpimage-item-list.c:113 +#: ../app/core/gimpimage-item-list.c:117 msgctxt "undo-type" msgid "Translate Items" -msgstr "Translatera objekt" +msgstr "Förflytta objekt" -#: ../app/core/gimpimage-item-list.c:141 +#: ../app/core/gimpimage-item-list.c:157 msgctxt "undo-type" msgid "Flip Items" msgstr "Vänd objekt" -#: ../app/core/gimpimage-item-list.c:170 ../app/core/gimpitem-linked.c:164 +#: ../app/core/gimpimage-item-list.c:196 ../app/core/gimpitem-linked.c:164 msgctxt "undo-type" msgid "Rotate Items" msgstr "Rotera objekt" -#: ../app/core/gimpimage-item-list.c:201 +#: ../app/core/gimpimage-item-list.c:246 msgctxt "undo-type" msgid "Transform Items" msgstr "Transformera objekt" -#: ../app/core/gimpimage-merge.c:134 +#: ../app/core/gimpimage-merge.c:135 msgctxt "undo-type" msgid "Merge Visible Layers" msgstr "Sammanfoga synliga lager" -#: ../app/core/gimpimage-merge.c:197 +#: ../app/core/gimpimage-merge.c:198 msgctxt "undo-type" msgid "Flatten Image" msgstr "Platta ut bilden" -#: ../app/core/gimpimage-merge.c:219 +#: ../app/core/gimpimage-merge.c:220 msgid "Cannot flatten an image without any visible layer." msgstr "Kan inte platta ut en bild utan synliga lager." -#: ../app/core/gimpimage-merge.c:262 +#: ../app/core/gimpimage-merge.c:245 +msgid "Cannot merge down a floating selection." +msgstr "Kan inte sammanfoga en flytande markering nedåt." + +#: ../app/core/gimpimage-merge.c:252 +msgid "Cannot merge down an invisible layer." +msgstr "Kan inte sammanfoga osynligt lager nedåt." + +#: ../app/core/gimpimage-merge.c:277 msgid "Cannot merge down to a layer group." msgstr "Kan inte sammanfoga nedåt till en lagergrupp." -#: ../app/core/gimpimage-merge.c:269 +#: ../app/core/gimpimage-merge.c:284 msgid "The layer to merge down to is locked." msgstr "Lagret för att sammanfoga nedåt är låst." -#: ../app/core/gimpimage-merge.c:281 +#: ../app/core/gimpimage-merge.c:296 msgid "There is no visible layer to merge down to." msgstr "Det finns inget synligt lager att sammanfoga neråt till." -#: ../app/core/gimpimage-merge.c:291 +#: ../app/core/gimpimage-merge.c:306 msgctxt "undo-type" msgid "Merge Down" msgstr "Sammanfoga nedåt" -#: ../app/core/gimpimage-merge.c:319 +#: ../app/core/gimpimage-merge.c:334 msgctxt "undo-type" msgid "Merge Layer Group" msgstr "Sammanfoga lagergrupp" -#: ../app/core/gimpimage-merge.c:372 +#: ../app/core/gimpimage-merge.c:387 msgctxt "undo-type" msgid "Merge Visible Paths" msgstr "Sammanfoga synliga banor" -#: ../app/core/gimpimage-merge.c:408 +#: ../app/core/gimpimage-merge.c:423 msgid "Not enough visible paths for a merge. There must be at least two." msgstr "" "Det finns inte tillräckligt många synliga banor för att sammanfoga. Det " "måste vara minst två." -#: ../app/core/gimpimage-quick-mask.c:89 +#: ../app/core/gimpimage-quick-mask.c:88 msgctxt "undo-type" msgid "Enable Quick Mask" msgstr "Aktivera snabbmask" -#: ../app/core/gimpimage-quick-mask.c:121 +#: ../app/core/gimpimage-quick-mask.c:120 msgctxt "undo-type" msgid "Disable Quick Mask" msgstr "Inaktivera snabbmask" -#: ../app/core/gimpimage-sample-points.c:54 +#: ../app/core/gimpimage-sample-points.c:52 msgctxt "undo-type" msgid "Add Sample Point" -msgstr "Lägg till sampelpunkt" +msgstr "Lägg till samplingspunkt" -#: ../app/core/gimpimage-sample-points.c:98 +#: ../app/core/gimpimage-sample-points.c:96 msgctxt "undo-type" msgid "Remove Sample Point" -msgstr "Ta bort sampelpunkt" +msgstr "Ta bort samplingspunkt" -#: ../app/core/gimpimage-sample-points.c:125 +#: ../app/core/gimpimage-sample-points.c:123 msgctxt "undo-type" msgid "Move Sample Point" -msgstr "Flytta sampelpunkt" +msgstr "Flytta samplingspunkt" -#: ../app/core/gimpimage-scale.c:86 +#: ../app/core/gimpimage-scale.c:79 msgctxt "undo-type" msgid "Scale Image" msgstr "Skala bild" -#: ../app/core/gimpimage-undo-push.c:948 +#: ../app/core/gimpimage-undo-push.c:1028 #, c-format msgid "Can't undo %s" msgstr "Kan inte ångra %s" -#: ../app/core/gimpimagefile.c:776 ../app/dialogs/preferences-dialog.c:1868 -#: ../app/dialogs/preferences-dialog.c:1973 +#: ../app/core/gimpimagefile.c:750 ../app/dialogs/preferences-dialog.c:1842 +#: ../app/dialogs/preferences-dialog.c:1948 msgid "Folder" msgstr "Mapp" -#: ../app/core/gimpimagefile.c:781 +#: ../app/core/gimpimagefile.c:755 msgid "Special File" msgstr "Särskild fil" -#: ../app/core/gimpimagefile.c:797 +#: ../app/core/gimpimagefile.c:771 msgid "Remote File" msgstr "Fjärrfil" -#: ../app/core/gimpimagefile.c:816 +#: ../app/core/gimpimagefile.c:790 msgid "Click to create preview" msgstr "Klicka för att skapa förhandsvisning" -#: ../app/core/gimpimagefile.c:822 +#: ../app/core/gimpimagefile.c:796 msgid "Loading preview..." -msgstr "Läser in förhandsvisning..." +msgstr "Läser in förhandsvisning…" -#: ../app/core/gimpimagefile.c:828 +#: ../app/core/gimpimagefile.c:802 msgid "Preview is out of date" msgstr "Förhandsvisningen är för gammal" -#: ../app/core/gimpimagefile.c:834 +#: ../app/core/gimpimagefile.c:808 msgid "Cannot create preview" msgstr "Kan inte skapa förhandsvisning" -#: ../app/core/gimpimagefile.c:844 +#: ../app/core/gimpimagefile.c:818 msgid "(Preview may be out of date)" msgstr "(Förhandsvisningen kan vara för gammal)" #. pixel size -#: ../app/core/gimpimagefile.c:853 ../app/widgets/gimpimagepropview.c:430 -#: ../app/widgets/gimpsizebox.c:432 ../app/widgets/gimptemplateeditor.c:626 +#: ../app/core/gimpimagefile.c:827 ../app/widgets/gimpimagepropview.c:429 +#: ../app/widgets/gimpsizebox.c:432 ../app/widgets/gimptemplateeditor.c:684 #, c-format msgid "%d × %d pixel" msgid_plural "%d × %d pixels" msgstr[0] "%d × %d bildpunkt" msgstr[1] "%d × %d bildpunkter" -#: ../app/core/gimpimagefile.c:876 ../app/display/gimpdisplayshell-title.c:325 +#: ../app/core/gimpimagefile.c:850 ../app/display/gimpdisplayshell-title.c:325 #, c-format msgid "%d layer" msgid_plural "%d layers" msgstr[0] "%d lager" msgstr[1] "%d lager" -#: ../app/core/gimpimagefile.c:924 +#: ../app/core/gimpimagefile.c:898 #, c-format msgid "Could not open thumbnail '%s': %s" -msgstr "Kunde inte öppna miniatyrbild \"%s\": %s" +msgstr "Kunde inte öppna miniatyrbild ”%s”: %s" -#: ../app/core/gimpitem.c:1911 +#: ../app/core/gimpitem.c:2075 msgctxt "undo-type" msgid "Attach Parasite" msgstr "Koppla parasit" -#: ../app/core/gimpitem.c:1921 +#: ../app/core/gimpitem.c:2085 msgctxt "undo-type" msgid "Attach Parasite to Item" msgstr "Koppla parasit till objekt" -#: ../app/core/gimpitem.c:1972 ../app/core/gimpitem.c:1979 +#: ../app/core/gimpitem.c:2136 ../app/core/gimpitem.c:2143 msgctxt "undo-type" msgid "Remove Parasite from Item" msgstr "Ta bort parasit från objekt" @@ -10796,7 +13260,7 @@ msgctxt "undo-type" msgid "Anchor Floating Selection" msgstr "Förankra flytande markering" -#: ../app/core/gimplayer-floating-selection.c:175 ../app/core/gimplayer.c:845 +#: ../app/core/gimplayer-floating-selection.c:175 ../app/core/gimplayer.c:1037 msgid "" "Cannot create a new layer from the floating selection because it belongs to " "a layer mask or channel." @@ -10809,76 +13273,76 @@ msgctxt "undo-type" msgid "Floating Selection to Layer" msgstr "Flytande markering till lager" -#: ../app/core/gimplayer.c:326 +#: ../app/core/gimplayer.c:441 msgctxt "undo-type" msgid "Rename Layer" msgstr "Byt namn på lager" -#: ../app/core/gimplayer.c:327 +#: ../app/core/gimplayer.c:442 msgctxt "undo-type" msgid "Move Layer" msgstr "Flytta lager" -#: ../app/core/gimplayer.c:328 +#: ../app/core/gimplayer.c:443 msgctxt "undo-type" msgid "Scale Layer" msgstr "Skala lager" -#: ../app/core/gimplayer.c:329 +#: ../app/core/gimplayer.c:444 msgctxt "undo-type" msgid "Resize Layer" msgstr "Ändra storlek på lager" -#: ../app/core/gimplayer.c:330 +#: ../app/core/gimplayer.c:445 msgctxt "undo-type" msgid "Flip Layer" msgstr "Vänd lager" -#: ../app/core/gimplayer.c:331 +#: ../app/core/gimplayer.c:446 msgctxt "undo-type" msgid "Rotate Layer" msgstr "Rotera lager" -#: ../app/core/gimplayer.c:334 +#: ../app/core/gimplayer.c:449 msgctxt "undo-type" msgid "Reorder Layer" msgstr "Ändra ordning på lager" -#: ../app/core/gimplayer.c:335 +#: ../app/core/gimplayer.c:450 msgctxt "undo-type" msgid "Raise Layer" msgstr "Höj lager" -#: ../app/core/gimplayer.c:336 +#: ../app/core/gimplayer.c:451 msgctxt "undo-type" msgid "Raise Layer to Top" msgstr "Höj lager till överst" -#: ../app/core/gimplayer.c:337 +#: ../app/core/gimplayer.c:452 msgctxt "undo-type" msgid "Lower Layer" msgstr "Sänk lager" -#: ../app/core/gimplayer.c:338 +#: ../app/core/gimplayer.c:453 msgctxt "undo-type" msgid "Lower Layer to Bottom" msgstr "Sänk lager till nederst" -#: ../app/core/gimplayer.c:339 +#: ../app/core/gimplayer.c:454 msgid "Layer cannot be raised higher." msgstr "Lagret kan inte höjas mer." -#: ../app/core/gimplayer.c:340 +#: ../app/core/gimplayer.c:455 msgid "Layer cannot be lowered more." msgstr "Lagret kan inte sänkas mer." -#: ../app/core/gimplayer.c:568 ../app/core/gimplayer.c:1439 -#: ../app/core/gimplayermask.c:262 +#: ../app/core/gimplayer.c:744 ../app/core/gimplayer.c:1905 +#: ../app/core/gimplayermask.c:257 #, c-format msgid "%s mask" msgstr "%s-mask" -#: ../app/core/gimplayer.c:607 +#: ../app/core/gimplayer.c:783 #, c-format msgid "" "Floating Selection\n" @@ -10887,76 +13351,76 @@ msgstr "" "Flytande markering\n" "(%s)" -#: ../app/core/gimplayer.c:1342 +#: ../app/core/gimplayer.c:1811 msgid "Unable to add a layer mask since the layer already has one." msgstr "Kan inte lägga till lagermask eftersom lagret redan har en." -#: ../app/core/gimplayer.c:1353 +#: ../app/core/gimplayer.c:1822 msgid "Cannot add layer mask of different dimensions than specified layer." msgstr "" "Kan inte lägga till lagermask med andra dimensioner än det angivna lagret." -#: ../app/core/gimplayer.c:1359 +#: ../app/core/gimplayer.c:1828 msgctxt "undo-type" msgid "Add Layer Mask" msgstr "Lägg till lagermask" -#: ../app/core/gimplayer.c:1490 +#: ../app/core/gimplayer.c:1956 msgctxt "undo-type" msgid "Transfer Alpha to Mask" msgstr "Överför alfa till mask" -#: ../app/core/gimplayer.c:1641 +#: ../app/core/gimplayer.c:2112 msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "Tillämpa lagermask" -#: ../app/core/gimplayer.c:1642 +#: ../app/core/gimplayer.c:2113 msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "Ta bort lagermask" -#: ../app/core/gimplayer.c:1747 +#: ../app/core/gimplayer.c:2215 msgctxt "undo-type" msgid "Enable Layer Mask" msgstr "Aktivera lagermask" -#: ../app/core/gimplayer.c:1748 +#: ../app/core/gimplayer.c:2216 msgctxt "undo-type" msgid "Disable Layer Mask" msgstr "Inaktivera lagermask" -#: ../app/core/gimplayer.c:1827 +#: ../app/core/gimplayer.c:2292 msgctxt "undo-type" msgid "Show Layer Mask" msgstr "Visa lagermask" -#: ../app/core/gimplayer.c:1903 +#: ../app/core/gimplayer.c:2365 msgctxt "undo-type" msgid "Add Alpha Channel" msgstr "Lägg till alfakanal" -#: ../app/core/gimplayer.c:1935 +#: ../app/core/gimplayer.c:2400 msgctxt "undo-type" msgid "Remove Alpha Channel" msgstr "Ta bort alfakanal" -#: ../app/core/gimplayer.c:1955 +#: ../app/core/gimplayer.c:2421 msgctxt "undo-type" msgid "Layer to Image Size" msgstr "Lager till bildstorlek" -#: ../app/core/gimplayermask.c:84 +#: ../app/core/gimplayermask.c:82 msgctxt "undo-type" msgid "Move Layer Mask" msgstr "Flytta lagermask" -#: ../app/core/gimplayermask.c:85 +#: ../app/core/gimplayermask.c:83 msgctxt "undo-type" msgid "Layer Mask to Selection" msgstr "Lagermask till markering" -#: ../app/core/gimplayermask.c:160 +#: ../app/core/gimplayermask.c:158 #, c-format msgid "Cannot rename layer masks." msgstr "Kan inte byta namn på lagermasker." @@ -10964,20 +13428,27 @@ msgstr "Kan inte byta namn på lagermasker." #: ../app/core/gimpmybrush-load.c:75 #, c-format msgid "MyPaint brush file is unreasonably large, skipping." -msgstr "" +msgstr "MyPaint-penselfil är oresonligt stor, hoppar över." #: ../app/core/gimpmybrush-load.c:93 -#, fuzzy, c-format -#| msgid "Failed to resize swap file: %s" +#, c-format msgid "Failed to deserialize MyPaint brush." -msgstr "Misslyckades med att ändra storlek på växlingsfil: %s" +msgstr "Misslyckades med att deserialisera MyPaint-pensel." -#: ../app/core/gimppalette-import.c:419 +# TODO: (%u occurrences) bättre grammatiskt i originalet? +#. TRANSLATORS: the "%s" is an item title and "%u" is the number of +#. occurrences for this item. +#: ../app/core/gimppalette-import.c:212 +#, c-format +msgid "%s (occurs %u)" +msgstr "%s (%u förekomster)" + +#: ../app/core/gimppalette-import.c:425 #, c-format msgid "Index %d" msgstr "Index %d" -#: ../app/core/gimppalette-import.c:541 +#: ../app/core/gimppalette-import.c:547 #, c-format msgid "Unknown type of palette file: %s" msgstr "Okänd typ av palettfil: %s" @@ -10985,12 +13456,12 @@ msgstr "Okänd typ av palettfil: %s" #: ../app/core/gimppalette-load.c:70 #, c-format msgid "Missing magic header." -msgstr "" +msgstr "Magiskt huvud saknas." #: ../app/core/gimppalette-load.c:93 #, c-format msgid "Invalid UTF-8 string in palette file '%s'" -msgstr "Ogiltig UTF-8-sträng i palettfilen \"%s\"" +msgstr "Ogiltig UTF-8-sträng i palettfilen ”%s”" #: ../app/core/gimppalette-load.c:113 #, c-format @@ -10998,236 +13469,211 @@ msgid "" "Reading palette file '%s': Invalid number of columns in line %d. Using " "default value." msgstr "" -"Läser palettfilen \"%s\": Ogiltigt antal kolumner på rad %d. Använder " +"Läser palettfilen ”%s”: Ogiltigt antal kolumner på rad %d. Använder " "standardvärde." #: ../app/core/gimppalette-load.c:147 #, c-format msgid "Reading palette file '%s': Missing RED component in line %d." -msgstr "Läser palettfilen \"%s\": Saknar RÖD komponent på rad %d." +msgstr "Läser palettfilen ”%s”: Saknar RÖD komponent på rad %d." #: ../app/core/gimppalette-load.c:155 #, c-format msgid "Reading palette file '%s': Missing GREEN component in line %d." -msgstr "Läser palettfilen \"%s\": Saknar GRÖN komponent på rad %d." +msgstr "Läser palettfilen ”%s”: Saknar GRÖN komponent på rad %d." #: ../app/core/gimppalette-load.c:163 #, c-format msgid "Reading palette file '%s': Missing BLUE component in line %d." -msgstr "Läser palettfilen \"%s\": Saknar BLÅ komponent på rad %d." +msgstr "Läser palettfilen ”%s”: Saknar BLÅ komponent på rad %d." #: ../app/core/gimppalette-load.c:173 #, c-format msgid "Reading palette file '%s': RGB value out of range in line %d." msgstr "" -"Läser palettfilen \"%s\": RGB-värdet utanför giltigt intervall på rad %d." +"Läser palettfilen ”%s”: RGB-värdet utanför giltigt intervall på rad %d." #: ../app/core/gimppalette-load.c:209 ../app/core/gimppalette-load.c:456 -#, fuzzy, c-format -#| msgid "Reading palette file '%s': RGB value out of range in line %d." +#, c-format msgid "Reading palette file '%s': Read %d colors from truncated file: %s" -msgstr "" -"Läser palettfilen \"%s\": RGB-värdet utanför giltigt intervall på rad %d." +msgstr "Läser palettfilen ”%s”: Läste %d färger från avhuggen fil: %s" #: ../app/core/gimppalette-load.c:233 -#, fuzzy, c-format -#| msgid "Unknown type of palette file: %s" +#, c-format msgid "In line %d of palette file: " -msgstr "Okänd typ av palettfil: %s" +msgstr "På rad %d i palettfil: " #: ../app/core/gimppalette-load.c:429 -#, fuzzy, c-format -#| msgid "Could not read header from palette file '%s'" +#, c-format msgid "Could not read header from palette file '%s': " -msgstr "Kunde inte läsa rubrik från palettfilen \"%s\"" +msgstr "Kunde inte läsa rubrik från palettfilen ”%s”: " #: ../app/core/gimppalette-load.c:461 msgid "Premature end of file." -msgstr "" +msgstr "Oväntat slut på filen." #: ../app/core/gimppalettemru.c:120 ../app/core/gimppalettemru.c:254 -#, fuzzy -#| msgid "History" msgid "History Color" -msgstr "Historik" +msgstr "Historikfärg" #: ../app/core/gimppattern-load.c:60 -#, fuzzy -#| msgid "File is truncated in line %d" msgid "File appears truncated: " -msgstr "Filen är avkapad på rad %d" +msgstr "Fil verkar vara avhuggen: " #: ../app/core/gimppattern-load.c:77 -#, fuzzy, c-format -#| msgid "" -#| "Fatal parse error in pattern file '%s': Unknown pattern format version %d." +#, c-format msgid "Unknown pattern format version %d." -msgstr "" -"Ödesdigert tolkningsfel i mönsterfilen \"%s\": Okänd mönsterformatversion %d." +msgstr "Okänd version %d av mönsterformat." #: ../app/core/gimppattern-load.c:86 -#, fuzzy, c-format -#| msgid "" -#| "Fatal parse error in pattern file '%s: Unsupported pattern depth %d.\n" -#| "GIMP Patterns must be GRAY or RGB." +#, c-format msgid "" "Unsupported pattern depth %d.\n" "GIMP Patterns must be GRAY or RGB." msgstr "" -"Ödesdigert tolkningsfel i mönsterfilen \"%s\": Mönsterdjupet %d stöds inte.\n" +"Mönsterdjupet %d stöds inte.\n" "GIMP-mönster måste vara GRÅ eller RGB." -#: ../app/core/gimppattern-load.c:103 ../app/core/gimppattern-load.c:141 -#, fuzzy -#| msgid "File is truncated in line %d" -msgid "File appears truncated." -msgstr "Filen är avkapad på rad %d" +#: ../app/core/gimppattern-load.c:98 +#, c-format +msgid "Invalid header data in '%s': width=%lu, height=%lu, bytes=%lu" +msgstr "Ogiltig huvuddata i ”%s”: bredd=%lu, höjd=%lu, byte=%lu" -#: ../app/core/gimppattern-load.c:109 +#: ../app/core/gimppattern-load.c:117 ../app/core/gimppattern-load.c:155 +msgid "File appears truncated." +msgstr "Fil verkar vara avhuggen." + +#: ../app/core/gimppattern-load.c:123 #, c-format msgid "Invalid UTF-8 string in pattern file '%s'." -msgstr "Ogiltig UTF-8-sträng i mönsterfilen \"%s\"." +msgstr "Ogiltig UTF-8-sträng i mönsterfilen ”%s”." -#: ../app/core/gimppattern-load.c:152 -#, fuzzy -#| msgid "Fatal parse error in palette file '%s'" +#: ../app/core/gimppattern-load.c:166 msgid "Fatal parse error in pattern file: " -msgstr "Ödesdigert tolkningsfel i palettfilen \"%s\"" +msgstr "Ödesdigert tolkningsfel i palettfil: " -#: ../app/core/gimppdbprogress.c:282 ../app/widgets/gimppdbdialog.c:332 +#: ../app/core/gimppdbprogress.c:268 ../app/widgets/gimppdbdialog.c:310 #, c-format msgid "Unable to run %s callback. The corresponding plug-in may have crashed." msgstr "" "Kan inte köra %s återanrop. Den motsvarande insticksmodulen kan ha kraschat." -#: ../app/core/gimpselection.c:170 +#: ../app/core/gimpselection.c:169 msgctxt "undo-type" msgid "Move Selection" msgstr "Flytta markering" -#: ../app/core/gimpselection.c:171 -#, fuzzy -#| msgid "_Flip Selection" +#: ../app/core/gimpselection.c:170 msgctxt "undo-type" msgid "Fill Selection" -msgstr "_Vänd markering" +msgstr "Fyll markering" -#: ../app/core/gimpselection.c:172 +#: ../app/core/gimpselection.c:171 msgctxt "undo-type" msgid "Stroke Selection" msgstr "Stryk längs markering" -#: ../app/core/gimpselection.c:189 +#: ../app/core/gimpselection.c:188 msgctxt "undo-type" msgid "Feather Selection" msgstr "Fjädra markering" -#: ../app/core/gimpselection.c:190 +#: ../app/core/gimpselection.c:189 msgctxt "undo-type" msgid "Sharpen Selection" msgstr "Gör markering skarpare" -#: ../app/core/gimpselection.c:191 +#: ../app/core/gimpselection.c:190 msgctxt "undo-type" msgid "Select None" msgstr "Markera inget" -#: ../app/core/gimpselection.c:192 +#: ../app/core/gimpselection.c:191 msgctxt "undo-type" msgid "Select All" msgstr "Markera allt" -#: ../app/core/gimpselection.c:193 +#: ../app/core/gimpselection.c:192 msgctxt "undo-type" msgid "Invert Selection" msgstr "Omvänd markering" -#: ../app/core/gimpselection.c:194 +#: ../app/core/gimpselection.c:193 msgctxt "undo-type" msgid "Border Selection" msgstr "Kantmarkering" -#: ../app/core/gimpselection.c:195 +#: ../app/core/gimpselection.c:194 msgctxt "undo-type" msgid "Grow Selection" -msgstr "Öka markering" +msgstr "Väx markering" + +#: ../app/core/gimpselection.c:195 +msgctxt "undo-type" +msgid "Shrink Selection" +msgstr "Krymp markering" #: ../app/core/gimpselection.c:196 msgctxt "undo-type" -msgid "Shrink Selection" -msgstr "Minska markering" - -#: ../app/core/gimpselection.c:197 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Remove item" -msgctxt "undo-type" msgid "Remove Holes" -msgstr "Ta bort objekt" +msgstr "Ta bort hål" -#: ../app/core/gimpselection.c:303 -#, fuzzy -#| msgid "There is no selection to stroke." +#: ../app/core/gimpselection.c:304 msgid "There is no selection to fill." -msgstr "Det finns ingen markering att stryka." +msgstr "Det finns ingen markering att fylla." -#: ../app/core/gimpselection.c:339 +#: ../app/core/gimpselection.c:340 msgid "There is no selection to stroke." msgstr "Det finns ingen markering att stryka." -#: ../app/core/gimpselection.c:753 +#: ../app/core/gimpselection.c:696 msgid "Unable to cut or copy because the selected region is empty." msgstr "" "Kunde inte kopiera eller klippa ut eftersom den markerade regionen är tom." -#: ../app/core/gimpselection.c:871 +#: ../app/core/gimpselection.c:814 msgid "Cannot float selection because the selected region is empty." msgstr "" "Kan inte göra markeringen flytande eftersom den markerade regionen är tom." -#: ../app/core/gimpselection.c:878 +#: ../app/core/gimpselection.c:821 msgctxt "undo-type" msgid "Float Selection" msgstr "Flytande markering" -#: ../app/core/gimpselection.c:896 +#: ../app/core/gimpselection.c:839 msgid "Floated Layer" msgstr "Flytande lager" +#: ../app/core/gimpsettings.c:151 +#, c-format +msgid "Last used: %s" +msgstr "Senast använd: %s" + #: ../app/core/gimpstrokeoptions.c:156 msgid "Method" -msgstr "" +msgstr "Metod" #: ../app/core/gimpstrokeoptions.c:164 -#, fuzzy -#| msgid "Line width:" msgid "Line width" -msgstr "Linjebredd:" +msgstr "Linjebredd" -#: ../app/core/gimpstrokeoptions.c:171 ../app/core/gimptemplate.c:148 -#: ../app/tools/gimptextoptions.c:137 -#, fuzzy -#| msgid "Units" +#: ../app/core/gimpstrokeoptions.c:171 ../app/core/gimptemplate.c:151 +#: ../app/tools/gimptextoptions.c:121 msgid "Unit" -msgstr "Enheter" +msgstr "Enhet" #: ../app/core/gimpstrokeoptions.c:178 -#, fuzzy -#| msgid "_Cap style:" msgid "Cap style" -msgstr "_Ändpunktsstil:" +msgstr "Ändpunktsstil" #: ../app/core/gimpstrokeoptions.c:185 -#, fuzzy -#| msgid "_Join style:" msgid "Join style" -msgstr "_Fogstil:" +msgstr "Fogstil" #: ../app/core/gimpstrokeoptions.c:192 -#, fuzzy -#| msgid "_Miter limit:" msgid "Miter limit" -msgstr "_Kantgräns:" +msgstr "Geringsgräns" # FIXME: Inget bra det här #: ../app/core/gimpstrokeoptions.c:193 @@ -11235,279 +13681,217 @@ msgid "" "Convert a mitered join to a bevelled join if the miter would extend to a " "distance of more than miter-limit * line-width from the actual join point." msgstr "" -"Konvertera en kantfogning till en avfasad fogning om kanten skulle överstiga " -"avståndet miter-limit * line-width från den faktiska fogpunkten." +"Konvertera en geringsfog till en avfasad fogning om kanten skulle överstiga " +"avståndet geringsgräns * linjebredd från den faktiska fogpunkten." #: ../app/core/gimpstrokeoptions.c:202 -#, fuzzy -#| msgctxt "dash-preset" -#| msgid "Dash, dot" msgid "Dash offset" -msgstr "Streck, prick" +msgstr "Streckposition" #: ../app/core/gimpstrokeoptions.c:224 -#, fuzzy -#| msgid "_Emulate brush dynamics" msgid "Emulate brush dynamics" -msgstr "_Emulera penseldynamik" +msgstr "Emulera penseldynamik" #. no undo (or redo) steps available -#: ../app/core/gimpsymmetry.c:132 ../app/widgets/gimpimagepropview.c:399 -#: ../app/widgets/gimpsymmetryeditor.c:168 +#: ../app/core/gimpsymmetry.c:134 ../app/widgets/gimpimagepropview.c:399 +#: ../app/widgets/gimpsymmetryeditor.c:169 msgid "None" msgstr "Ingen" -#: ../app/core/gimpsymmetry.c:145 -#, fuzzy -#| msgctxt "align-reference-type" -#| msgid "Active path" +#: ../app/core/gimpsymmetry.c:148 msgid "Active" -msgstr "Aktiv bana" +msgstr "Aktiv" -#: ../app/core/gimpsymmetry.c:146 +#: ../app/core/gimpsymmetry.c:149 msgid "Activate symmetry painting" -msgstr "" +msgstr "Aktivera symmetrimålning" #: ../app/core/gimpsymmetry-mandala.c:113 msgid "Mandala" -msgstr "" +msgstr "Mandala" #: ../app/core/gimpsymmetry-mandala.c:120 -#, fuzzy -#| msgctxt "guides-type" -#| msgid "Center lines" msgid "Center abscissa" -msgstr "Centrumlinjer" +msgstr "Centrumabskissa" #: ../app/core/gimpsymmetry-mandala.c:132 -#, fuzzy -#| msgctxt "guides-type" -#| msgid "Center lines" msgid "Center ordinate" -msgstr "Centrumlinjer" +msgstr "Centrumordinata" #: ../app/core/gimpsymmetry-mandala.c:144 -#, fuzzy -#| msgctxt "guides-type" -#| msgid "Number of lines" msgid "Number of points" -msgstr "Antal linjer" +msgstr "Antal punkter" #: ../app/core/gimpsymmetry-mandala.c:152 ../app/core/gimpsymmetry-mirror.c:154 -#, fuzzy -#| msgid "Cage transform" msgid "Disable brush transform" -msgstr "Burtransformering" +msgstr "Inaktivera penseltransformering" #: ../app/core/gimpsymmetry-mandala.c:153 msgid "Disable brush rotation" -msgstr "" +msgstr "Inaktivera penselrotation" #: ../app/core/gimpsymmetry-mirror.c:123 -#, fuzzy -#| msgctxt "message-severity" -#| msgid "Error" msgid "Mirror" -msgstr "Fel" +msgstr "Spegel" #: ../app/core/gimpsymmetry-mirror.c:130 -#, fuzzy -#| msgid "Horizontal" msgid "Horizontal Symmetry" -msgstr "Horisontell" +msgstr "Horisontell symmetri" #: ../app/core/gimpsymmetry-mirror.c:131 msgid "Reflect the initial stroke across a horizontal axis" -msgstr "" +msgstr "Reflektera det inledande strecket längs en horisontell axel" #: ../app/core/gimpsymmetry-mirror.c:138 -#, fuzzy -#| msgid "Vertical" msgid "Vertical Symmetry" -msgstr "Vertikal" +msgstr "Vertikal symmetri" #: ../app/core/gimpsymmetry-mirror.c:139 msgid "Reflect the initial stroke across a vertical axis" -msgstr "" +msgstr "Reflektera det inledande strecket längs en vertikal axel" #: ../app/core/gimpsymmetry-mirror.c:146 msgid "Central Symmetry" -msgstr "" +msgstr "Centrumsymmetri" #: ../app/core/gimpsymmetry-mirror.c:147 msgid "Invert the initial stroke through a point" -msgstr "" +msgstr "Invertera det inledande strecket genom en punkt" #: ../app/core/gimpsymmetry-mirror.c:155 -#, fuzzy -#| msgctxt "select-action" -#| msgid "Dismiss the selection" msgid "Disable brush reflection" -msgstr "Förkasta markeringen" +msgstr "Inaktivera penselreflektion" #: ../app/core/gimpsymmetry-mirror.c:162 -#, fuzzy -#| msgid "Vertical offset for distribution" msgid "Vertical axis position" -msgstr "Vertikal förskjutning för distribution" +msgstr "Vertikal axelposition" #: ../app/core/gimpsymmetry-mirror.c:174 -#, fuzzy -#| msgid "Horizontal offset for distribution" msgid "Horizontal axis position" -msgstr "Horisontell förskjutning för distribution" +msgstr "Horisontell axelposition" -#: ../app/core/gimpsymmetry-tiling.c:101 -#, fuzzy -#| msgid "Scaling" +#: ../app/core/gimpsymmetry-tiling.c:102 msgid "Tiling" -msgstr "Skalning" - -#: ../app/core/gimpsymmetry-tiling.c:107 -#, fuzzy -#| msgid "I_nterval:" -msgid "Interval X" -msgstr "I_ntervall:" +msgstr "Plattläggning" #: ../app/core/gimpsymmetry-tiling.c:108 -msgid "Interval on the X axis (pixels)" -msgstr "" +msgid "Interval X" +msgstr "X-intervall" -#: ../app/core/gimpsymmetry-tiling.c:119 -#, fuzzy -#| msgid "I_nterval:" -msgid "Interval Y" -msgstr "I_ntervall:" +#: ../app/core/gimpsymmetry-tiling.c:109 +msgid "Interval on the X axis (pixels)" +msgstr "Intervall på X-axeln (bildpunkter)" #: ../app/core/gimpsymmetry-tiling.c:120 -msgid "Interval on the Y axis (pixels)" -msgstr "" +msgid "Interval Y" +msgstr "Y-intervall" -#: ../app/core/gimpsymmetry-tiling.c:131 -#, fuzzy -#| msgctxt "drawable-action" -#| msgid "_Offset..." -msgid "Shift" -msgstr "_Position..." +#: ../app/core/gimpsymmetry-tiling.c:121 +msgid "Interval on the Y axis (pixels)" +msgstr "Intervall på Y-axeln (bildpunkter)" #: ../app/core/gimpsymmetry-tiling.c:132 +msgid "Shift" +msgstr "Skift" + +#: ../app/core/gimpsymmetry-tiling.c:133 msgid "X-shift between lines (pixels)" -msgstr "" +msgstr "X-skift mellan rader (bildpunkter)" -#: ../app/core/gimpsymmetry-tiling.c:139 -#, fuzzy -#| msgctxt "vectors-action" -#| msgid "L_ock strokes" +#: ../app/core/gimpsymmetry-tiling.c:144 msgid "Max strokes X" -msgstr "L_ås streck" +msgstr "Max antal X-streck" -#: ../app/core/gimpsymmetry-tiling.c:140 -#, fuzzy -#| msgid "_Maximum number of colors:" +#: ../app/core/gimpsymmetry-tiling.c:145 msgid "Maximum number of strokes on the X axis" -msgstr "_Maximalt antal färger:" +msgstr "Maximalt antal streck på X-axeln" -#: ../app/core/gimpsymmetry-tiling.c:147 -#, fuzzy -#| msgctxt "vectors-action" -#| msgid "L_ock strokes" +#: ../app/core/gimpsymmetry-tiling.c:152 msgid "Max strokes Y" -msgstr "L_ås streck" +msgstr "Max antal Y-streck" -#: ../app/core/gimpsymmetry-tiling.c:148 -#, fuzzy -#| msgid "_Maximum number of colors:" +#: ../app/core/gimpsymmetry-tiling.c:153 msgid "Maximum number of strokes on the Y axis" -msgstr "_Maximalt antal färger:" +msgstr "Maximalt antal streck på Y-axeln" #: ../app/core/gimptagcache.c:442 -#, fuzzy, c-format -#| msgid "Error writing '%s': %s" +#, c-format msgid "Error writing '%s': %s\n" -msgstr "Fel vid skrivning av \"%s\": %s" +msgstr "Fel vid skrivning av ”%s”: %s\n" -#: ../app/core/gimptemplate.c:132 ../app/widgets/gimpgrideditor.c:195 -#: ../app/widgets/gimpgrideditor.c:227 +#: ../app/core/gimptemplate.c:135 msgid "Width" msgstr "Bredd" -#: ../app/core/gimptemplate.c:140 ../app/widgets/gimpgrideditor.c:197 -#: ../app/widgets/gimpgrideditor.c:229 +#: ../app/core/gimptemplate.c:143 msgid "Height" msgstr "Höjd" -#: ../app/core/gimptemplate.c:149 +#: ../app/core/gimptemplate.c:152 msgid "The unit used for coordinate display when not in dot-for-dot mode." msgstr "" "Enheten som används för koordinatvisning när man inte har punkt till punkt." -#: ../app/core/gimptemplate.c:156 ../app/core/gimptemplate.c:164 -#, fuzzy -#| msgid "Resolution:" +#: ../app/core/gimptemplate.c:159 ../app/core/gimptemplate.c:167 msgid "Resolution X" -msgstr "Upplösning:" +msgstr "X-upplösning" -#: ../app/core/gimptemplate.c:157 +#: ../app/core/gimptemplate.c:160 msgid "The horizontal image resolution." msgstr "Horisontell bildupplösning." -#: ../app/core/gimptemplate.c:165 +#: ../app/core/gimptemplate.c:168 msgid "The vertical image resolution." msgstr "Vertikal bildupplösning." -#: ../app/core/gimptemplate.c:172 -#, fuzzy -#| msgid "Resolution:" +#: ../app/core/gimptemplate.c:175 msgid "Resolution unit" -msgstr "Upplösning:" +msgstr "Upplösningsenhet" #. serialized name -#: ../app/core/gimptemplate.c:179 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Image type" +#: ../app/core/gimptemplate.c:182 msgid "Image type" msgstr "Bildtyp" -#: ../app/core/gimptemplate.c:186 -#, fuzzy -#| msgid "Version:" +#: ../app/core/gimptemplate.c:189 ../app/core/gimptemplate.c:196 msgid "Precision" -msgstr "Version:" +msgstr "Precision" -#: ../app/core/gimptemplate.c:193 -#, fuzzy -#| msgid "Color Management" +#. gamma +#: ../app/core/gimptemplate.c:205 ../app/dialogs/convert-precision-dialog.c:195 +#: ../app/operations/gimplevelsconfig.c:139 +#: ../app/operations/gimplevelsconfig.c:140 ../app/tools/gimplevelstool.c:500 +msgid "Gamma" +msgstr "Gamma" + +#: ../app/core/gimptemplate.c:213 msgid "Color managed" -msgstr "Färghantering" +msgstr "Färghanterad" -#: ../app/core/gimptemplate.c:194 +#: ../app/core/gimptemplate.c:214 msgid "" "Whether the image is color managed. Disabling color management is equivalent " "to choosing a built-in sRGB profile. Better leave color management enabled." msgstr "" +"Huruvida bilden är färghanterad. Att inaktivera färghantering är ekvivalent " +"med att välja den inbyggda sRGB-profilen. Det är bäst att lämna " +"färghantering aktiverat." -#: ../app/core/gimptemplate.c:203 -#, fuzzy -#| msgid "Color Profile" +#: ../app/core/gimptemplate.c:223 msgid "Color profile" msgstr "Färgprofil" -#: ../app/core/gimptemplate.c:210 ../app/tools/gimpbucketfilloptions.c:94 -#, fuzzy -#| msgid "Fill by:" +#: ../app/core/gimptemplate.c:230 ../app/tools/gimpbucketfilloptions.c:94 msgid "Fill type" -msgstr "Fyll med:" +msgstr "Fyllnadstyp" -#: ../app/core/gimptemplate.c:217 ../app/dialogs/image-properties-dialog.c:94 +#: ../app/core/gimptemplate.c:237 ../app/dialogs/image-properties-dialog.c:94 msgid "Comment" msgstr "Kommentar" -#: ../app/core/gimptemplate.c:224 -#, fuzzy -#| msgid "File Name:" +#: ../app/core/gimptemplate.c:244 msgid "Filename" -msgstr "Filnamn:" +msgstr "Filnamn" #: ../app/core/gimptoolpreset.c:147 msgid "Apply stored FG/BG" @@ -11522,10 +13906,8 @@ msgid "Apply stored dynamics" msgstr "Tillämpa lagrad dynamik" #: ../app/core/gimptoolpreset.c:168 -#, fuzzy -#| msgid "Apply stored brush" msgid "Apply stored MyPaint brush" -msgstr "Tillämpa lagrad pensel" +msgstr "Tillämpa lagrad MyPaint-pensel" # FIXME: Hitta bättre ord #: ../app/core/gimptoolpreset.c:175 @@ -11545,10 +13927,8 @@ msgid "Apply stored font" msgstr "Tillämpa lagrat typsnitt" #: ../app/core/gimptoolpreset-load.c:64 -#, fuzzy -#| msgid "Tool Preset Editor" msgid "Tool preset file is corrupt." -msgstr "Verktygsförvalsredigare" +msgstr "Verktygsförinställningsfil är skadad." #: ../app/core/gimpunit.c:60 msgctxt "unit-singular" @@ -11610,17 +13990,17 @@ msgctxt "plural" msgid "percent" msgstr "procent" -#: ../app/dialogs/about-dialog.c:117 +#: ../app/dialogs/about-dialog.c:115 msgid "About GIMP" msgstr "Om GIMP" -#: ../app/dialogs/about-dialog.c:126 +#: ../app/dialogs/about-dialog.c:124 msgid "Visit the GIMP website" msgstr "Besök webbplatsen för GIMP" #. Translators: insert your names here, #. separated by newline -#: ../app/dialogs/about-dialog.c:132 +#: ../app/dialogs/about-dialog.c:130 msgid "translator-credits" msgstr "" "Daniel Nylander \n" @@ -11629,323 +14009,249 @@ msgstr "" "Tomas Ögren\n" "Påvel Nicklasson\n" "Anders Jonsson \n" +"Sebastian Rasmussen \n" +"\n" "Skicka synpunkter på översättningen till\n" "." -#: ../app/dialogs/about-dialog.c:531 +#: ../app/dialogs/about-dialog.c:529 msgid "GIMP is brought to you by" msgstr "GIMP presenteras av" -#: ../app/dialogs/about-dialog.c:611 -#, fuzzy, c-format -#| msgid "This is an unstable development release." +#: ../app/dialogs/about-dialog.c:605 +#, c-format msgid "" "This is an unstable development release\n" "commit %s" -msgstr "Det här är en instabil utvecklingsutgåva." +msgstr "" +"Det här är en instabil utvecklingsutgåva\n" +"incheckning %s" #: ../app/dialogs/action-search-dialog.c:67 -#, fuzzy -#| msgid "Selection" msgid "Search Actions" -msgstr "Markering" +msgstr "Sökåtgärder" -#: ../app/dialogs/channel-options-dialog.c:146 +#: ../app/dialogs/channel-options-dialog.c:126 msgid "Channel _name:" msgstr "Kanal_namn:" -#: ../app/dialogs/channel-options-dialog.c:175 +#: ../app/dialogs/channel-options-dialog.c:128 +#: ../app/dialogs/layer-options-dialog.c:168 +msgid "Lock _pixels" +msgstr "Lås _bildpunkter" + +#: ../app/dialogs/channel-options-dialog.c:129 +#: ../app/dialogs/layer-options-dialog.c:169 +msgid "Lock position and _size" +msgstr "Lås position och _storlek" + +#: ../app/dialogs/channel-options-dialog.c:171 msgid "Initialize from _selection" msgstr "Initiera från _markering" -#: ../app/dialogs/color-profile-dialog.c:137 -#, fuzzy -#| msgid "Color Profile" +#: ../app/dialogs/color-profile-dialog.c:128 msgid "Assign ICC Color Profile" -msgstr "Färgprofil" +msgstr "Tilldela ICC-färgprofil" + +#: ../app/dialogs/color-profile-dialog.c:131 +msgid "Assign a color profile to the image" +msgstr "Tilldela en färgprofil till bilden" + +#: ../app/dialogs/color-profile-dialog.c:137 +msgid "_Assign" +msgstr "_Tilldela" #: ../app/dialogs/color-profile-dialog.c:140 -#, fuzzy -#| msgid "Can't apply color profile to grayscale image (%s)" -msgid "Assign a color profile to the image" -msgstr "Kan inte använda färgprofil på gråskalebild (%s)" +msgid "Assign" +msgstr "Tilldela" #: ../app/dialogs/color-profile-dialog.c:146 -#, fuzzy -#| msgctxt "vector-mode" -#| msgid "Design" -msgid "_Assign" -msgstr "Design" - -#: ../app/dialogs/color-profile-dialog.c:157 -#, fuzzy -#| msgid "Select CMYK Color Profile" msgid "Convert to ICC Color Profile" -msgstr "Välj CMYK-färgprofil" +msgstr "Konvertera till ICC-färgprofil" -#: ../app/dialogs/color-profile-dialog.c:160 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "Convert the image to the RGB colorspace" +#: ../app/dialogs/color-profile-dialog.c:149 msgid "Convert the image to a color profile" -msgstr "Konvertera bilden till RGB-färgrymden" +msgstr "Konvertera bilden till en färgprofil" -#: ../app/dialogs/color-profile-dialog.c:177 +#: ../app/dialogs/color-profile-dialog.c:155 +#: ../app/dialogs/color-profile-dialog.c:173 +#: ../app/dialogs/color-profile-dialog.c:191 +#: ../app/dialogs/color-profile-import-dialog.c:105 +#: ../app/dialogs/convert-indexed-dialog.c:139 +#: ../app/dialogs/convert-precision-dialog.c:166 +msgid "C_onvert" +msgstr "K_onvertera" + +#: ../app/dialogs/color-profile-dialog.c:158 +#: ../app/dialogs/color-profile-dialog.c:176 +#: ../app/dialogs/color-profile-dialog.c:194 +msgid "Convert to" +msgstr "Konvertera till" + +#: ../app/dialogs/color-profile-dialog.c:164 msgid "RGB Conversion" -msgstr "" +msgstr "RGB-konvertering" -#: ../app/dialogs/color-profile-dialog.c:180 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Convert Image to RGB" +#: ../app/dialogs/color-profile-dialog.c:167 msgid "Convert Image to RGB" msgstr "Konvertera bild till RGB" -#: ../app/dialogs/color-profile-dialog.c:199 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "_Grayscale" +#: ../app/dialogs/color-profile-dialog.c:182 msgid "Grayscale Conversion" -msgstr "_Gråskala" +msgstr "Gråskalekonvertering" -#: ../app/dialogs/color-profile-dialog.c:202 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Convert Image to Grayscale" +#: ../app/dialogs/color-profile-dialog.c:185 msgid "Convert Image to Grayscale" msgstr "Konvertera bild till gråskala" -#: ../app/dialogs/color-profile-dialog.c:239 -#, fuzzy -#| msgid "Color Profile" +#: ../app/dialogs/color-profile-dialog.c:200 +msgid "Soft-Proof Profile" +msgstr "Profil för korrekturgranskning" + +#: ../app/dialogs/color-profile-dialog.c:203 +msgid "Select Soft-Proof Profile" +msgstr "Välj profil för korrekturgranskning" + +#: ../app/dialogs/color-profile-dialog.c:209 +#: ../app/tools/gimpforegroundselecttool.c:314 +msgid "_Select" +msgstr "_Markera" + +#: ../app/dialogs/color-profile-dialog.c:212 +msgid "New Color Profile" +msgstr "Ny färgprofil" + +#: ../app/dialogs/color-profile-dialog.c:241 msgid "Current Color Profile" -msgstr "Färgprofil" +msgstr "Aktuell färgprofil" -#: ../app/dialogs/color-profile-dialog.c:250 -#, fuzzy -#| msgctxt "vector-mode" -#| msgid "Design" -msgid "Assign" -msgstr "Design" - -#: ../app/dialogs/color-profile-dialog.c:250 -#, fuzzy -#| msgid "C_onvert" -msgid "Convert to" -msgstr "K_onvertera" - -#: ../app/dialogs/color-profile-dialog.c:262 +#: ../app/dialogs/color-profile-dialog.c:261 msgid "Profile _details" -msgstr "" +msgstr "Profil_detaljer" -#: ../app/dialogs/color-profile-dialog.c:291 +#: ../app/dialogs/color-profile-dialog.c:290 #: ../app/dialogs/color-profile-import-dialog.c:160 -#, fuzzy -#| msgid "_Display rendering intent:" msgid "_Rendering Intent:" -msgstr "_Visa återgivningsmetod:" +msgstr "_Återgivningsmetod:" -#: ../app/dialogs/color-profile-dialog.c:307 +#: ../app/dialogs/color-profile-dialog.c:306 #: ../app/dialogs/color-profile-import-dialog.c:176 msgid "_Black Point Compensation" -msgstr "" +msgstr "_Svartpunktskompensering" -#: ../app/dialogs/color-profile-dialog.c:372 -#, fuzzy -#| msgid "Select Printer Color Profile" +#: ../app/dialogs/color-profile-dialog.c:386 msgid "Select Destination Profile" -msgstr "Välj färgprofil för skrivare" +msgstr "Välj destinationsprofil" -#: ../app/dialogs/color-profile-dialog.c:423 -#, fuzzy -#| msgid "Color Profile" -msgid "Assign color profile" -msgstr "Färgprofil" - -#: ../app/dialogs/color-profile-dialog.c:453 -#, fuzzy, c-format -#| msgctxt "undo-type" -#| msgid "Convert Image to RGB" -msgid "Converting to '%s'" -msgstr "Konvertera bild till RGB" - -#: ../app/dialogs/color-profile-dialog.c:481 -#, fuzzy, c-format -#| msgctxt "undo-type" -#| msgid "Convert Image to RGB" -msgid "Converting to RGB (%s)" -msgstr "Konvertera bild till RGB" - -#: ../app/dialogs/color-profile-dialog.c:503 -#, fuzzy, c-format -#| msgctxt "image-convert-action" -#| msgid "Convert the image to grayscale" -msgid "Converting to grayscale (%s)" -msgstr "Konvertera bilden till gråskala" +#: ../app/dialogs/color-profile-dialog.c:485 +#: ../app/widgets/gimpwidgets-constructors.c:86 +#: ../app/widgets/gimpwidgets-constructors.c:97 +msgctxt "profile" +msgid "None" +msgstr "Ingen" #: ../app/dialogs/color-profile-import-dialog.c:85 -#, fuzzy -#| msgctxt "color-profile-policy" -#| msgid "Convert to RGB workspace" msgid "Convert to Grayscale Working Space?" -msgstr "Konvertera till RGB-arbetsyta" +msgstr "Konvertera till gråskalearbetsyta?" #: ../app/dialogs/color-profile-import-dialog.c:86 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "Convert the image to the RGB colorspace" msgid "Convert the image to the grayscale working space?" -msgstr "Konvertera bilden till RGB-färgrymden" +msgstr "Konvertera bilden till gråskalearbetsytan?" #: ../app/dialogs/color-profile-import-dialog.c:90 -#, fuzzy -#| msgctxt "color-profile-policy" -#| msgid "Convert to RGB workspace" msgid "Convert to RGB Working Space?" -msgstr "Konvertera till RGB-arbetsyta" +msgstr "Konvertera till RGB-arbetsyta?" #: ../app/dialogs/color-profile-import-dialog.c:91 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "Convert the image to the RGB colorspace" msgid "Convert the image to the RGB working space?" -msgstr "Konvertera bilden till RGB-färgrymden" +msgstr "Konvertera bilden till RGB-färgrymden?" #: ../app/dialogs/color-profile-import-dialog.c:99 -#, fuzzy -#| msgid "Import settings from a file" msgid "Import the image from a color profile" -msgstr "Importera inställningar från en fil" +msgstr "Importera bild från en färgprofil" #: ../app/dialogs/color-profile-import-dialog.c:104 -msgid "Keep" -msgstr "" - -#: ../app/dialogs/color-profile-import-dialog.c:105 -#, fuzzy -#| msgid "C_onvert" -msgid "Convert" -msgstr "K_onvertera" +msgid "_Keep" +msgstr "_Behåll" #: ../app/dialogs/color-profile-import-dialog.c:122 #, c-format msgid "The image '%s' has an embedded color profile" -msgstr "" +msgstr "Bilden ”%s” har en inbäddad färgprofil" #: ../app/dialogs/color-profile-import-dialog.c:185 msgid "_Don't ask me again" -msgstr "" +msgstr "_Fråga mig inte igen" -#: ../app/dialogs/convert-indexed-dialog.c:128 +#: ../app/dialogs/convert-indexed-dialog.c:130 msgid "Indexed Color Conversion" msgstr "Konvertering av indexerad färg" -#: ../app/dialogs/convert-indexed-dialog.c:131 +#: ../app/dialogs/convert-indexed-dialog.c:133 msgid "Convert Image to Indexed Colors" msgstr "Konvertera bild indexerad färg" -#: ../app/dialogs/convert-indexed-dialog.c:141 -#: ../app/dialogs/convert-precision-dialog.c:154 -msgid "C_onvert" -msgstr "K_onvertera" - -#: ../app/dialogs/convert-indexed-dialog.c:193 +#: ../app/dialogs/convert-indexed-dialog.c:190 msgid "_Maximum number of colors:" msgstr "_Maximalt antal färger:" -#: ../app/dialogs/convert-indexed-dialog.c:222 -msgid "_Remove unused colors from colormap" -msgstr "_Ta bort oanvända färger från färgkartan" +#: ../app/dialogs/convert-indexed-dialog.c:219 +msgid "_Remove unused and duplicate colors from colormap" +msgstr "_Ta bort oanvända och duplicerade färger från färgkartan" -#. dithering -#: ../app/dialogs/convert-indexed-dialog.c:239 -#: ../app/dialogs/convert-precision-dialog.c:185 -#: ../app/tools/gimpblendoptions.c:119 -msgid "Dithering" -msgstr "Dithering" - -#: ../app/dialogs/convert-indexed-dialog.c:251 +#: ../app/dialogs/convert-indexed-dialog.c:248 msgid "Color _dithering:" -msgstr "Färg_dithering" +msgstr "Färg_utjämning:" -#: ../app/dialogs/convert-indexed-dialog.c:266 +#: ../app/dialogs/convert-indexed-dialog.c:263 msgid "Enable dithering of _transparency" -msgstr "Använd dithering av _transparens" +msgstr "Aktivera färgutjämning av _transparens" -#: ../app/dialogs/convert-indexed-dialog.c:278 -#, fuzzy -#| msgid "Enable dithering of _transparency" +#: ../app/dialogs/convert-indexed-dialog.c:275 +#: ../app/dialogs/preferences-dialog.c:2167 msgid "Enable dithering of text layers" -msgstr "Använd dithering av _transparens" +msgstr "Aktivera färgutjämning för textlager" -#: ../app/dialogs/convert-indexed-dialog.c:289 -#: ../app/dialogs/convert-precision-dialog.c:243 +#: ../app/dialogs/convert-indexed-dialog.c:286 +#: ../app/dialogs/convert-precision-dialog.c:276 msgid "Dithering text layers will make them uneditable" -msgstr "" +msgstr "Att färgutjämna textlager kommer att göra dem oredigerbara" -#: ../app/dialogs/convert-indexed-dialog.c:309 -msgid "Converting to indexed colors" -msgstr "Konverterar till indexerade färger" - -#: ../app/dialogs/convert-indexed-dialog.c:437 +#: ../app/dialogs/convert-indexed-dialog.c:410 #: ../app/pdb/image-convert-cmds.c:159 msgid "Cannot convert to a palette with more than 256 colors." msgstr "Kan inte konvertera till palett med mer än 256 färger." -#: ../app/dialogs/convert-precision-dialog.c:135 -#, fuzzy, c-format -#| msgctxt "undo-type" -#| msgid "Convert Image to RGB" +#: ../app/dialogs/convert-precision-dialog.c:154 +#, c-format msgid "Convert Image to %s" -msgstr "Konvertera bild till RGB" +msgstr "Konvertera bild till %s" -#: ../app/dialogs/convert-precision-dialog.c:139 +#: ../app/dialogs/convert-precision-dialog.c:157 msgid "Precision Conversion" -msgstr "" +msgstr "Precisionskonvertering" #: ../app/dialogs/convert-precision-dialog.c:204 -#, fuzzy -#| msgctxt "dialogs-action" -#| msgid "_Layers" -msgid "_Layers:" -msgstr "_Lager" - -#: ../app/dialogs/convert-precision-dialog.c:226 -#, fuzzy -#| msgid "Text Layer" -msgid "_Text Layers:" -msgstr "Textlager" - -#: ../app/dialogs/convert-precision-dialog.c:252 -#, fuzzy -#| msgid "Channel _name:" -msgid "_Channels and Masks:" -msgstr "Kanal_namn:" - -#. gamma -#: ../app/dialogs/convert-precision-dialog.c:272 -#: ../app/operations/gimplevelsconfig.c:112 -#: ../app/operations/gimplevelsconfig.c:113 ../app/tools/gimplevelstool.c:488 -msgid "Gamma" -msgstr "Gamma" - -#: ../app/dialogs/convert-precision-dialog.c:285 +#: ../app/widgets/gimptemplateeditor.c:425 msgid "Perceptual gamma (sRGB)" -msgstr "" +msgstr "Perceptuell gamma (sRGB)" + +#: ../app/dialogs/convert-precision-dialog.c:205 +#: ../app/widgets/gimptemplateeditor.c:424 +msgid "Linear light" +msgstr "Linjärt ljus" + +#: ../app/dialogs/convert-precision-dialog.c:237 +msgid "_Layers:" +msgstr "_Lager:" + +#: ../app/dialogs/convert-precision-dialog.c:259 +msgid "_Text Layers:" +msgstr "_Textlager:" #: ../app/dialogs/convert-precision-dialog.c:286 -#, fuzzy -#| msgctxt "layer-mode-effects" -#| msgid "Hard light" -msgid "Linear light" -msgstr "Hårt ljus" - -#: ../app/dialogs/convert-precision-dialog.c:316 -#, fuzzy, c-format -#| msgctxt "undo-type" -#| msgid "Convert Image to RGB" -msgid "Converting image to %s" -msgstr "Konvertera bild till RGB" +msgid "_Channels and Masks:" +msgstr "_Kanaler och masker:" #: ../app/dialogs/data-delete-dialog.c:82 msgid "Delete Object" @@ -11954,86 +14260,89 @@ msgstr "Ta bort objekt" #: ../app/dialogs/data-delete-dialog.c:105 #, c-format msgid "Delete '%s'?" -msgstr "Ta bort \"%s\"?" +msgstr "Ta bort ”%s”?" #: ../app/dialogs/data-delete-dialog.c:108 #, c-format msgid "" "Are you sure you want to remove '%s' from the list and delete it on disk?" msgstr "" -"Är du säker att du vill ta bort \"%s\" från listan och ta bort den från " -"disken?" +"Är du säker att du vill ta bort ”%s” från listan och ta bort den från disken?" -#: ../app/dialogs/dialogs-constructors.c:214 ../app/gui/gui.c:166 -#: ../app/gui/gui-message.c:157 +#: ../app/dialogs/dialogs-constructors.c:216 ../app/gui/gui.c:190 +#: ../app/gui/gui-message.c:268 msgid "GIMP Message" msgstr "GIMP-meddelande" -#: ../app/dialogs/dialogs.c:311 +#: ../app/dialogs/dialogs-constructors.c:225 +msgid "GIMP Debug" +msgstr "GIMP-felsökning" + +#: ../app/dialogs/dialogs.c:314 msgid "Devices" msgstr "Enheter" -#: ../app/dialogs/dialogs.c:311 +#: ../app/dialogs/dialogs.c:314 msgid "Device Status" msgstr "Enhetsstatus" -#: ../app/dialogs/dialogs.c:315 +#: ../app/dialogs/dialogs.c:318 msgid "Errors" msgstr "Fel" -#: ../app/dialogs/dialogs.c:319 +#: ../app/dialogs/dialogs.c:322 msgid "Pointer" msgstr "Pekare" -#: ../app/dialogs/dialogs.c:349 +#: ../app/dialogs/dialogs.c:362 msgid "History" msgstr "Historik" -#: ../app/dialogs/dialogs.c:352 +#: ../app/dialogs/dialogs.c:365 msgid "Image Templates" msgstr "Bildmallar" -#: ../app/dialogs/dialogs.c:381 +#: ../app/dialogs/dialogs.c:386 msgid "Histogram" msgstr "Histogram" -#: ../app/dialogs/dialogs.c:385 +#: ../app/dialogs/dialogs.c:390 msgid "Selection" msgstr "Markering" -#: ../app/dialogs/dialogs.c:385 +#: ../app/dialogs/dialogs.c:390 msgid "Selection Editor" msgstr "Markeringsredigerare" -#: ../app/dialogs/dialogs.c:389 +#: ../app/dialogs/dialogs.c:394 msgid "Symmetry Painting" -msgstr "" +msgstr "Symmetrimålning" -#: ../app/dialogs/dialogs.c:393 +#: ../app/dialogs/dialogs.c:398 msgid "Undo" msgstr "Ångra" -#: ../app/dialogs/dialogs.c:393 +#: ../app/dialogs/dialogs.c:398 msgid "Undo History" msgstr "Ångringshistorik" -#: ../app/dialogs/dialogs.c:403 +#: ../app/dialogs/dialogs.c:408 msgid "Navigation" msgstr "Navigering" -#: ../app/dialogs/dialogs.c:403 +#: ../app/dialogs/dialogs.c:408 msgid "Display Navigation" msgstr "Visningsnavigering" -#: ../app/dialogs/dialogs.c:409 +#: ../app/dialogs/dialogs.c:414 msgid "FG/BG" msgstr "FG/BG" -#: ../app/dialogs/dialogs.c:409 +#: ../app/dialogs/dialogs.c:414 msgid "FG/BG Color" msgstr "FG/BG-färg" -#: ../app/dialogs/fade-dialog.c:109 +#: ../app/dialogs/fade-dialog.c:110 #, c-format msgid "Fade %s" msgstr "Tona %s" @@ -12042,13 +14351,12 @@ msgstr "Tona %s" msgid "_Fade" msgstr "_Tona ut" -#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:346 -msgid "_Mode:" -msgstr "_Läge:" - -#: ../app/dialogs/fade-dialog.c:162 -msgid "_Opacity:" -msgstr "_Opacitet:" +#: ../app/dialogs/fade-dialog.c:151 +#: ../app/operations/gimpoperationdesaturate.c:90 +#: ../app/tools/gimppaintoptions-gui.c:119 ../app/widgets/gimpdeviceinfo.c:132 +#: ../app/widgets/gimplayertreeview.c:279 +msgid "Mode" +msgstr "Läge" #: ../app/dialogs/file-open-dialog.c:244 msgid "Open layers" @@ -12062,7 +14370,7 @@ msgstr "Öppna plats" msgid "Enter location (URI):" msgstr "Ange plats (URI):" -#: ../app/dialogs/file-save-dialog.c:452 +#: ../app/dialogs/file-save-dialog.c:458 msgid "" "Saving remote files needs to determine the file format from the file " "extension. Please enter a file extension that matches the selected file " @@ -12072,11 +14380,11 @@ msgstr "" "en filändelse som matchar det valda filformatet eller ange ingen filändelse " "alls." -#: ../app/dialogs/file-save-dialog.c:612 +#: ../app/dialogs/file-save-dialog.c:618 msgid "The given filename cannot be used for exporting" -msgstr "Det angivna filnamnet kan inte användas för att exportera." +msgstr "Det angivna filnamnet kan inte användas för att exportera" -#: ../app/dialogs/file-save-dialog.c:613 +#: ../app/dialogs/file-save-dialog.c:619 msgid "" "You can use this dialog to export to various file formats. If you want to " "save the image to the GIMP XCF format, use File→Save instead." @@ -12084,15 +14392,15 @@ msgstr "" "Du kan använda denna dialogruta för att exportera till olika filformat. Om " "du vill spara bilden till formatet GIMP XCF, använd istället Arkiv→Spara." -#: ../app/dialogs/file-save-dialog.c:616 +#: ../app/dialogs/file-save-dialog.c:622 msgid "Take me to the Save dialog" msgstr "Ta mig till dialogrutan Spara" -#: ../app/dialogs/file-save-dialog.c:620 +#: ../app/dialogs/file-save-dialog.c:626 msgid "The given filename cannot be used for saving" msgstr "Det angivna filnamnet kan inte användas för att spara" -#: ../app/dialogs/file-save-dialog.c:621 +#: ../app/dialogs/file-save-dialog.c:627 msgid "" "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." @@ -12100,15 +14408,15 @@ msgstr "" "Du kan använda denna dialogruta för att spara till formatet GIMP XCF. Använd " "Arkiv→Exportera för att exportera till andra filformat." -#: ../app/dialogs/file-save-dialog.c:623 +#: ../app/dialogs/file-save-dialog.c:629 msgid "Take me to the Export dialog" msgstr "Ta mig till dialogrutan Exportera" -#: ../app/dialogs/file-save-dialog.c:626 ../app/dialogs/file-save-dialog.c:703 +#: ../app/dialogs/file-save-dialog.c:632 ../app/dialogs/file-save-dialog.c:709 msgid "Extension Mismatch" msgstr "Filändelsen stämmer inte" -#: ../app/dialogs/file-save-dialog.c:687 +#: ../app/dialogs/file-save-dialog.c:693 msgid "" "The given filename does not have any known file extension. Please enter a " "known file extension or select a file format from the file format list." @@ -12116,123 +14424,116 @@ msgstr "" "Angivet filnamn har inte en känd filändelse. Ange en känd filändelse eller " "välj ett filformat från filformatlistan." -#: ../app/dialogs/file-save-dialog.c:719 +#: ../app/dialogs/file-save-dialog.c:725 msgid "The given file extension does not match the chosen file type." msgstr "Angiven filändelse matchar inte den valda filtypen." -#: ../app/dialogs/file-save-dialog.c:723 +#: ../app/dialogs/file-save-dialog.c:729 msgid "Do you want to save the image using this name anyway?" msgstr "Vill du spara bilden med det här namnet ändå?" -#: ../app/dialogs/file-save-dialog.c:788 +#: ../app/dialogs/file-save-dialog.c:794 msgid "Saving canceled" msgstr "Sparning avbröts" -#: ../app/dialogs/file-save-dialog.c:794 ../app/widgets/gimpdnd-xds.c:190 +#: ../app/dialogs/file-save-dialog.c:800 ../app/widgets/gimpdnd-xds.c:190 #, c-format msgid "" "Saving '%s' failed:\n" "\n" "%s" msgstr "" -"Sparande av filen \"%s\" misslyckades:\n" +"Sparande av filen ”%s” misslyckades:\n" "%s" -#: ../app/dialogs/fill-dialog.c:88 -#, fuzzy -#| msgid "Choose Stroke Style" +#: ../app/dialogs/fill-dialog.c:109 msgid "Choose Fill Style" -msgstr "Välj strykningsstil" +msgstr "Välj fyllnadsstil" -#: ../app/dialogs/fill-dialog.c:95 -#, fuzzy -#| msgctxt "file-action" -#| msgid "_File" +#: ../app/dialogs/fill-dialog.c:116 msgid "_Fill" -msgstr "_Arkiv" +msgstr "_Fyll" -#: ../app/dialogs/grid-dialog.c:85 +#: ../app/dialogs/grid-dialog.c:95 msgid "Configure Grid" msgstr "Ställ in rutnät" -#: ../app/dialogs/grid-dialog.c:86 +#: ../app/dialogs/grid-dialog.c:96 msgid "Configure Image Grid" msgstr "Ställ in rutnät för bild" -#: ../app/dialogs/grid-dialog.c:152 +#: ../app/dialogs/grid-dialog.c:161 msgid "Grid" msgstr "Rutnät" -#: ../app/dialogs/image-merge-layers-dialog.c:68 +#: ../app/dialogs/image-merge-layers-dialog.c:93 msgid "Merge Layers" msgstr "Sammanfoga lager" -#: ../app/dialogs/image-merge-layers-dialog.c:70 +#: ../app/dialogs/image-merge-layers-dialog.c:95 msgid "Layers Merge Options" msgstr "Alternativ för lagersammanfogning" -#: ../app/dialogs/image-merge-layers-dialog.c:76 +#: ../app/dialogs/image-merge-layers-dialog.c:101 msgid "_Merge" msgstr "_Sammanfoga" -#: ../app/dialogs/image-merge-layers-dialog.c:96 +#: ../app/dialogs/image-merge-layers-dialog.c:129 msgid "Final, Merged Layer should be:" msgstr "Det slutgiltiga, sammanfogade lagret ska vara:" -#: ../app/dialogs/image-merge-layers-dialog.c:100 -msgid "Expanded as necessary" -msgstr "Expanderad om så behövs" - -#: ../app/dialogs/image-merge-layers-dialog.c:103 -msgid "Clipped to image" -msgstr "Klippt efter bilden" - -#: ../app/dialogs/image-merge-layers-dialog.c:106 -msgid "Clipped to bottom layer" -msgstr "Klippt efter understa lagret" - -#: ../app/dialogs/image-merge-layers-dialog.c:114 +#: ../app/dialogs/image-merge-layers-dialog.c:138 msgid "Merge within active _group only" msgstr "Sammanfoga bara inom aktiv _grupp" -#: ../app/dialogs/image-merge-layers-dialog.c:127 +#: ../app/dialogs/image-merge-layers-dialog.c:151 msgid "_Discard invisible layers" msgstr "_Förkasta osynliga lager" -#: ../app/dialogs/image-new-dialog.c:98 +#: ../app/dialogs/image-new-dialog.c:100 msgid "Create a New Image" msgstr "Skapa en ny bild" -#: ../app/dialogs/image-new-dialog.c:136 -#: ../app/dialogs/preferences-dialog.c:1694 +#: ../app/dialogs/image-new-dialog.c:138 +#: ../app/dialogs/preferences-dialog.c:1668 msgid "_Template:" msgstr "_Mall:" -#: ../app/dialogs/image-new-dialog.c:317 +#: ../app/dialogs/image-new-dialog.c:319 msgid "Confirm Image Size" msgstr "Bekräfta bildstorlek" -#: ../app/dialogs/image-new-dialog.c:339 -#: ../app/dialogs/image-scale-dialog.c:239 +#: ../app/dialogs/image-new-dialog.c:341 +#: ../app/dialogs/image-scale-dialog.c:237 #, c-format msgid "You are trying to create an image with a size of %s." msgstr "Du försöker skapa en bild med storleken %s." -#: ../app/dialogs/image-new-dialog.c:346 +#: ../app/dialogs/image-new-dialog.c:348 #, c-format msgid "" "An image of the chosen size will use more memory than what is configured as " "\"Maximum Image Size\" in the Preferences dialog (currently %s)." msgstr "" -"En bild med den valda storleken kommer att använda mer minne än vad " -"\"Maximal bildstorlek\" är konfigurerad till i inställningsdialogen (för " -"närvarande %s)." +"En bild med den valda storleken kommer att använda mer minne än vad ”Maximal " +"bildstorlek” är konfigurerad till i inställningsdialogen (för närvarande %s)." #: ../app/dialogs/image-properties-dialog.c:60 #: ../app/dialogs/image-properties-dialog.c:63 msgid "Image Properties" msgstr "Bildegenskaper" +#: ../app/dialogs/image-properties-dialog.c:68 +#: ../app/dialogs/input-devices-dialog.c:62 +#: ../app/dialogs/keyboard-shortcuts-dialog.c:55 +#: ../app/dialogs/module-dialog.c:134 ../app/tools/gimpblendtool-editor.c:1854 +#: ../app/tools/gimpcolorpickertool.c:349 ../app/tools/gimpmeasuretool.c:651 +#: ../app/widgets/gimpcontrollerlist.c:640 +#: ../app/widgets/gimpcriticaldialog.c:97 ../app/widgets/gimppdbdialog.c:175 +#: ../app/widgets/gimpsettingsbox.c:663 ../app/widgets/gimptexteditor.c:162 +msgid "_Close" +msgstr "_Stäng" + #: ../app/dialogs/image-properties-dialog.c:84 msgid "Properties" msgstr "Egenskaper" @@ -12241,16 +14542,21 @@ msgstr "Egenskaper" msgid "Color Profile" msgstr "Färgprofil" -#: ../app/dialogs/image-scale-dialog.c:111 +#: ../app/dialogs/image-scale-dialog.c:115 msgctxt "dialog-title" msgid "Scale Image" msgstr "Skala bild" -#: ../app/dialogs/image-scale-dialog.c:205 +#: ../app/dialogs/image-scale-dialog.c:203 msgid "Confirm Scaling" msgstr "Bekräfta skalning" -#: ../app/dialogs/image-scale-dialog.c:245 +#: ../app/dialogs/image-scale-dialog.c:211 ../app/dialogs/scale-dialog.c:138 +#: ../app/tools/gimpscaletool.c:92 ../app/tools/gimpscaletool.c:110 +msgid "_Scale" +msgstr "_Skala" + +#: ../app/dialogs/image-scale-dialog.c:243 #, c-format msgid "" "Scaling the image to the chosen size will make it use more memory than what " @@ -12258,16 +14564,16 @@ msgid "" "%s)." msgstr "" "Skalning av bilden till den valda storleken innebär att den kommer att " -"använda mer minne än vad \"Maximal bildstorlek\" är konfigurerad till i " +"använda mer minne än vad ”Maximal bildstorlek” är konfigurerad till i " "inställningsdialogen (för närvarande %s)." -#: ../app/dialogs/image-scale-dialog.c:260 +#: ../app/dialogs/image-scale-dialog.c:258 msgid "" "Scaling the image to the chosen size will shrink some layers completely away." msgstr "" "Skalning av bilden till vald storlek kommer helt att krympa bort några lager." -#: ../app/dialogs/image-scale-dialog.c:264 +#: ../app/dialogs/image-scale-dialog.c:262 msgid "Is this what you want to do?" msgstr "Är detta vad du vill göra?" @@ -12275,6 +14581,23 @@ msgstr "Är detta vad du vill göra?" msgid "Configure Input Devices" msgstr "Konfigurera inmatningsenheter" +#: ../app/dialogs/item-options-dialog.c:198 +msgid "Color tag:" +msgstr "Färgtagg:" + +#. The switches frame & vbox +#: ../app/dialogs/item-options-dialog.c:259 +msgid "Switches" +msgstr "Växlar" + +#: ../app/dialogs/item-options-dialog.c:268 +msgid "_Visible" +msgstr "_Synlig" + +#: ../app/dialogs/item-options-dialog.c:277 +msgid "_Linked" +msgstr "_Länkad" + #: ../app/dialogs/keyboard-shortcuts-dialog.c:49 msgid "Configure Keyboard Shortcuts" msgstr "Konfigurera tangentbordsgenvägar" @@ -12291,49 +14614,97 @@ msgstr "" msgid "S_ave keyboard shortcuts on exit" msgstr "S_para tangentbordsgenvägar vid avslut" -#: ../app/dialogs/layer-add-mask-dialog.c:82 +#: ../app/dialogs/layer-add-mask-dialog.c:103 msgid "Add Layer Mask" msgstr "Lägg till lagermask" -#: ../app/dialogs/layer-add-mask-dialog.c:84 +#: ../app/dialogs/layer-add-mask-dialog.c:105 msgid "Add a Mask to the Layer" msgstr "Lägg till en mask till lagret" -#: ../app/dialogs/layer-add-mask-dialog.c:112 +#: ../app/dialogs/layer-add-mask-dialog.c:111 +msgid "_Add" +msgstr "_Lägg till" + +#: ../app/dialogs/layer-add-mask-dialog.c:137 msgid "Initialize Layer Mask to:" msgstr "Initialisera lagermask till:" -#: ../app/dialogs/layer-add-mask-dialog.c:143 +#: ../app/dialogs/layer-add-mask-dialog.c:168 msgid "In_vert mask" msgstr "In_vertera mask" -#: ../app/dialogs/layer-options-dialog.c:128 +#: ../app/dialogs/layer-add-mask-dialog.c:203 +msgid "Please select a channel first" +msgstr "Välj en kanal först" + +#: ../app/dialogs/layer-options-dialog.c:166 msgid "Layer _name:" msgstr "Lager_namn:" +#: ../app/dialogs/layer-options-dialog.c:188 +#: ../app/widgets/gimpdeviceinfoeditor.c:349 +msgid "_Mode:" +msgstr "_Läge:" + +#: ../app/dialogs/layer-options-dialog.c:203 +msgid "Blend space:" +msgstr "Toningsrymd:" + +#: ../app/dialogs/layer-options-dialog.c:213 +msgid "Composite space:" +msgstr "Kompositrymd:" + +#: ../app/dialogs/layer-options-dialog.c:225 +msgid "Composite mode:" +msgstr "Kompositläge:" + +#: ../app/dialogs/layer-options-dialog.c:239 +msgid "_Opacity:" +msgstr "_Opacitet:" + #. The size labels -#: ../app/dialogs/layer-options-dialog.c:142 -#: ../app/tools/gimpmeasuretool.c:1139 +#: ../app/dialogs/layer-options-dialog.c:252 ../app/tools/gimpmeasuretool.c:726 msgid "Width:" msgstr "Bredd:" -#: ../app/dialogs/layer-options-dialog.c:148 -#: ../app/tools/gimpmeasuretool.c:1167 +#: ../app/dialogs/layer-options-dialog.c:258 ../app/tools/gimpmeasuretool.c:754 msgid "Height:" msgstr "Höjd:" -#: ../app/dialogs/layer-options-dialog.c:206 -msgid "Layer Fill Type" -msgstr "Lagrets fyllnadstyp" +#. The offset labels +#: ../app/dialogs/layer-options-dialog.c:316 +#: ../app/tools/gimpalignoptions.c:380 +msgid "Offset X:" +msgstr "X-position:" -#: ../app/dialogs/layer-options-dialog.c:225 +#: ../app/dialogs/layer-options-dialog.c:322 +#: ../app/tools/gimpalignoptions.c:393 +msgid "Offset Y:" +msgstr "Y-position:" + +#: ../app/dialogs/layer-options-dialog.c:396 ../app/dialogs/resize-dialog.c:369 +#: ../app/widgets/gimptemplateeditor.c:452 +msgid "_Fill with:" +msgstr "_Fyll med:" + +#: ../app/dialogs/layer-options-dialog.c:411 +#: ../app/widgets/gimpcolordisplayeditor.c:285 +msgid "Active Filters" +msgstr "Aktiva filter" + +#: ../app/dialogs/layer-options-dialog.c:438 +msgid "Lock _alpha" +msgstr "Lås _alfakanal" + +#: ../app/dialogs/layer-options-dialog.c:450 msgid "Set name from _text" msgstr "Ställ in namn från _text" #: ../app/dialogs/lebl-dialog.c:122 #, c-format msgid "GAME OVER at level %d!" -msgstr "" +msgstr "SPELET SLUT vid nivå %d!" #. Translators: the first and third strings are similar to a #. * title, and the second string is a small information text. @@ -12342,225 +14713,231 @@ msgstr "" #: ../app/dialogs/lebl-dialog.c:129 #, c-format msgid "%1$s %2$s %3$s" -msgstr "" +msgstr "%1$s %2$s %3$s" #: ../app/dialogs/lebl-dialog.c:130 -#, fuzzy -#| msgid "Press %s to quit." msgid "Press 'q' to quit" -msgstr "Klicka på %s för att avsluta." +msgstr "Klicka på ”q” för att avsluta" #: ../app/dialogs/lebl-dialog.c:135 msgid "Paused" -msgstr "" +msgstr "Pausad" #. Translators: the first string is a title and the second #. * string is a small information text. #: ../app/dialogs/lebl-dialog.c:138 ../app/dialogs/lebl-dialog.c:149 #, c-format msgid "%1$s\t%2$s" -msgstr "" +msgstr "%1$s\t%2$s" #: ../app/dialogs/lebl-dialog.c:139 msgid "Press 'p' to unpause" -msgstr "" +msgstr "Tryck på ”p” för att fortsätta" #: ../app/dialogs/lebl-dialog.c:145 #, c-format msgid "Level: %s, Lives: %s" -msgstr "" +msgstr "Nivå: %s, Liv: %s" #: ../app/dialogs/lebl-dialog.c:150 msgid "Left/Right to move, Space to fire, 'p' to pause, 'q' to quit" msgstr "" +"Vänster/Höger för att flytta, blanksteg för att skjuta, ”p” för att pausa, " +"”q” för att avsluta" #: ../app/dialogs/lebl-dialog.c:804 msgid "Killer GEGLs from Outer Space" -msgstr "" +msgstr "Dödar-GEGL:ar från yttre rymden" -#: ../app/dialogs/module-dialog.c:127 +#: ../app/dialogs/module-dialog.c:129 msgid "Module Manager" msgstr "Modulhanterare" -#: ../app/dialogs/module-dialog.c:151 +#: ../app/dialogs/module-dialog.c:133 +msgid "_Refresh" +msgstr "_Uppdatera" + +#: ../app/dialogs/module-dialog.c:153 msgid "You will have to restart GIMP for the changes to take effect." msgstr "Du måste starta om GIMP för att ändringarna ska aktiveras." -#: ../app/dialogs/module-dialog.c:192 +#: ../app/dialogs/module-dialog.c:194 msgid "Module" msgstr "Modul" -#: ../app/dialogs/module-dialog.c:469 +#: ../app/dialogs/module-dialog.c:472 msgid "Only in memory" msgstr "Endast i minnet" -#: ../app/dialogs/module-dialog.c:474 +#: ../app/dialogs/module-dialog.c:477 msgid "No longer available" msgstr "Inte längre tillgänglig" -#: ../app/dialogs/module-dialog.c:499 +#: ../app/dialogs/module-dialog.c:502 msgid "Author:" msgstr "Upphovsman:" -#: ../app/dialogs/module-dialog.c:500 +#: ../app/dialogs/module-dialog.c:503 msgid "Version:" msgstr "Version:" -#: ../app/dialogs/module-dialog.c:501 +#: ../app/dialogs/module-dialog.c:504 msgid "Date:" msgstr "Datum:" -#: ../app/dialogs/module-dialog.c:502 +#: ../app/dialogs/module-dialog.c:505 msgid "Copyright:" msgstr "Copyright:" -#: ../app/dialogs/module-dialog.c:503 +#: ../app/dialogs/module-dialog.c:506 msgid "Location:" msgstr "Placering:" -#: ../app/dialogs/offset-dialog.c:112 +#: ../app/dialogs/offset-dialog.c:120 msgid "Offset Layer" msgstr "Lagerposition" -#: ../app/dialogs/offset-dialog.c:114 +#: ../app/dialogs/offset-dialog.c:122 msgid "Offset Layer Mask" msgstr "Lagerpositionsmask" -#: ../app/dialogs/offset-dialog.c:116 +#: ../app/dialogs/offset-dialog.c:124 msgid "Offset Channel" msgstr "Kanalposition" #. The offset frame -#: ../app/dialogs/offset-dialog.c:122 ../app/dialogs/offset-dialog.c:156 -#: ../app/dialogs/resize-dialog.c:200 ../app/tools/gimpalignoptions.c:100 -#: ../app/tools/gimpalignoptions.c:107 ../app/tools/gimpblendoptions.c:79 -#: ../app/widgets/gimpgrideditor.c:206 +#: ../app/dialogs/offset-dialog.c:129 ../app/dialogs/offset-dialog.c:163 +#: ../app/dialogs/resize-dialog.c:230 ../app/tools/gimpalignoptions.c:100 +#: ../app/tools/gimpalignoptions.c:107 ../app/tools/gimpblendoptions.c:88 +#: ../app/widgets/gimpgrideditor.c:209 msgid "Offset" msgstr "Position" #. offset, used as a verb -#: ../app/dialogs/offset-dialog.c:131 +#: ../app/dialogs/offset-dialog.c:138 msgid "_Offset" msgstr "_Position" -#: ../app/dialogs/offset-dialog.c:185 ../app/dialogs/resize-dialog.c:229 +#: ../app/dialogs/offset-dialog.c:192 ../app/dialogs/resize-dialog.c:259 msgid "_X:" msgstr "_X:" -#: ../app/dialogs/offset-dialog.c:187 ../app/dialogs/resize-dialog.c:230 +#: ../app/dialogs/offset-dialog.c:194 ../app/dialogs/resize-dialog.c:260 msgid "_Y:" msgstr "_Y:" -#: ../app/dialogs/offset-dialog.c:214 +#: ../app/dialogs/offset-dialog.c:221 msgid "By width/_2, height/2" -msgstr "" +msgstr "Genom bredd/_2, höjd/2" #. The edge behavior frame -#: ../app/dialogs/offset-dialog.c:243 +#: ../app/dialogs/offset-dialog.c:250 msgid "Edge Behavior" msgstr "Kantbeteende" -#: ../app/dialogs/offset-dialog.c:247 -#, fuzzy -#| msgid "_Wrap around" +#: ../app/dialogs/offset-dialog.c:254 msgid "W_rap around" msgstr "_Slå runt" -#: ../app/dialogs/offset-dialog.c:250 +#: ../app/dialogs/offset-dialog.c:257 msgid "Fill with _background color" msgstr "Fyll med _bakgrundsfärg" -#: ../app/dialogs/offset-dialog.c:253 +#: ../app/dialogs/offset-dialog.c:260 msgid "Make _transparent" msgstr "Gör _transparent" -#: ../app/dialogs/palette-import-dialog.c:154 +#: ../app/dialogs/palette-import-dialog.c:157 msgid "Import a New Palette" msgstr "Importera en ny palett" -#: ../app/dialogs/palette-import-dialog.c:164 +#: ../app/dialogs/palette-import-dialog.c:163 msgid "_Import" msgstr "_Importera" #. The "Source" frame -#: ../app/dialogs/palette-import-dialog.c:203 +#: ../app/dialogs/palette-import-dialog.c:201 msgid "Select Source" msgstr "Välj källa" -#: ../app/dialogs/palette-import-dialog.c:214 -#: ../app/dialogs/preferences-dialog.c:1656 +#: ../app/dialogs/palette-import-dialog.c:212 +#: ../app/dialogs/preferences-dialog.c:1630 msgid "_Gradient" msgstr "_Gradient" -#: ../app/dialogs/palette-import-dialog.c:225 +#: ../app/dialogs/palette-import-dialog.c:223 msgid "I_mage" msgstr "_Bild" -#: ../app/dialogs/palette-import-dialog.c:239 +#: ../app/dialogs/palette-import-dialog.c:237 msgid "Sample _Merged" msgstr "Sampla sa_mmanfogade" -#: ../app/dialogs/palette-import-dialog.c:251 +#: ../app/dialogs/palette-import-dialog.c:249 msgid "_Selected Pixels only" msgstr "Endast _markerade bildpunkter" -#: ../app/dialogs/palette-import-dialog.c:263 +#: ../app/dialogs/palette-import-dialog.c:261 msgid "Palette _file" msgstr "Palett_fil" #. Palette file name entry -#: ../app/dialogs/palette-import-dialog.c:292 +#: ../app/dialogs/palette-import-dialog.c:290 msgid "Select Palette File" msgstr "Välj palettfil" #. The "Import" frame -#: ../app/dialogs/palette-import-dialog.c:303 +#: ../app/dialogs/palette-import-dialog.c:301 msgid "Import Options" msgstr "Importalternativ" -#: ../app/dialogs/palette-import-dialog.c:317 +#: ../app/dialogs/palette-import-dialog.c:315 msgid "New import" msgstr "Ny import" -#: ../app/dialogs/palette-import-dialog.c:319 +#: ../app/dialogs/palette-import-dialog.c:317 msgid "Palette _name:" msgstr "Palett_namn:" -#: ../app/dialogs/palette-import-dialog.c:325 +#: ../app/dialogs/palette-import-dialog.c:323 msgid "N_umber of colors:" msgstr "_Antal färger:" -#: ../app/dialogs/palette-import-dialog.c:338 +#: ../app/dialogs/palette-import-dialog.c:337 msgid "C_olumns:" msgstr "K_olumner:" -#: ../app/dialogs/palette-import-dialog.c:350 +#: ../app/dialogs/palette-import-dialog.c:349 msgid "I_nterval:" msgstr "I_ntervall:" #. The "Preview" frame -#: ../app/dialogs/palette-import-dialog.c:361 -#: ../app/tools/gimpforegroundselecttool.c:1229 +#: ../app/dialogs/palette-import-dialog.c:360 +#: ../app/tools/gimpforegroundselecttool.c:1223 msgid "Preview" msgstr "Förhandsvisning" -#: ../app/dialogs/palette-import-dialog.c:382 +#: ../app/dialogs/palette-import-dialog.c:381 msgid "The selected source contains no colors." msgstr "Den valda källan innehåller inga färger." -#: ../app/dialogs/preferences-dialog.c:269 +#: ../app/dialogs/palette-import-dialog.c:466 +msgid "There is no palette to import." +msgstr "Det finns ingen palett att importera." + +#: ../app/dialogs/preferences-dialog.c:280 msgid "Reset All Preferences" msgstr "Återställ alla inställningar" -#: ../app/dialogs/preferences-dialog.c:287 +#: ../app/dialogs/preferences-dialog.c:298 msgid "Do you really want to reset all preferences to default values?" msgstr "Vill du verkligen återställa alla inställningar till standardvärden?" -#: ../app/dialogs/preferences-dialog.c:365 +#: ../app/dialogs/preferences-dialog.c:377 msgid "You will have to restart GIMP for the following changes to take effect:" msgstr "Du måste starta om GIMP för att följande ändringar ska ha effekt:" -#: ../app/dialogs/preferences-dialog.c:551 +#: ../app/dialogs/preferences-dialog.c:619 msgid "" "Your keyboard shortcuts will be reset to default values the next time you " "start GIMP." @@ -12568,15 +14945,15 @@ msgstr "" "Dina tangentbordsgenvägar kommer återställas till standardvärden nästa gång " "du startar GIMP." -#: ../app/dialogs/preferences-dialog.c:562 +#: ../app/dialogs/preferences-dialog.c:630 msgid "Remove all Keyboard Shortcuts" msgstr "Ta bort alla tangentbordsgenvägar" -#: ../app/dialogs/preferences-dialog.c:584 +#: ../app/dialogs/preferences-dialog.c:652 msgid "Do you really want to remove all keyboard shortcuts from all menus?" msgstr "Vill du verkligen ta bort alla tangentbordsgenvägar från alla menyer?" -#: ../app/dialogs/preferences-dialog.c:625 +#: ../app/dialogs/preferences-dialog.c:693 msgid "" "Your window setup will be reset to default values the next time you start " "GIMP." @@ -12584,7 +14961,7 @@ msgstr "" "Din fönsteruppställning kommer återställas till standardvärden nästa gång du " "startar GIMP." -#: ../app/dialogs/preferences-dialog.c:660 +#: ../app/dialogs/preferences-dialog.c:728 msgid "" "Your input device settings will be reset to default values the next time you " "start GIMP." @@ -12592,7 +14969,7 @@ msgstr "" "Dina inställningar för inmatningsenheter kommer återställas till " "standardvärden nästa gång du startar GIMP." -#: ../app/dialogs/preferences-dialog.c:702 +#: ../app/dialogs/preferences-dialog.c:770 msgid "" "Your tool options will be reset to default values the next time you start " "GIMP." @@ -12600,1317 +14977,1493 @@ msgstr "" "Dina verktygsalternativ kommer att återställas till standardvärden nästa " "gång du startar GIMP." -#: ../app/dialogs/preferences-dialog.c:1125 +#: ../app/dialogs/preferences-dialog.c:822 +#: ../app/dialogs/preferences-dialog.c:2456 +msgid "There's a local installation of the user manual." +msgstr "Det finns en lokal installation av användarhandboken." + +#: ../app/dialogs/preferences-dialog.c:827 +#: ../app/dialogs/preferences-dialog.c:2462 +msgid "The user manual is not installed locally." +msgstr "Användarhandboken är inte lokalt installerad." + +#: ../app/dialogs/preferences-dialog.c:934 msgid "Show _menubar" msgstr "Visa _menyrad" -#: ../app/dialogs/preferences-dialog.c:1129 +#: ../app/dialogs/preferences-dialog.c:938 msgid "Show _rulers" msgstr "Visa _linjaler" -#: ../app/dialogs/preferences-dialog.c:1132 +#: ../app/dialogs/preferences-dialog.c:941 msgid "Show scroll_bars" msgstr "Visa rullnings_lister" -#: ../app/dialogs/preferences-dialog.c:1135 +#: ../app/dialogs/preferences-dialog.c:944 msgid "Show s_tatusbar" msgstr "Visa s_tatusrad" -#: ../app/dialogs/preferences-dialog.c:1143 +#: ../app/dialogs/preferences-dialog.c:952 msgid "Show s_election" msgstr "Visa m_arkering" -#: ../app/dialogs/preferences-dialog.c:1146 +#: ../app/dialogs/preferences-dialog.c:955 msgid "Show _layer boundary" msgstr "Visa _lagergräns" -#: ../app/dialogs/preferences-dialog.c:1149 +#: ../app/dialogs/preferences-dialog.c:958 msgid "Show _guides" msgstr "Visa _hjälplinjer" -#: ../app/dialogs/preferences-dialog.c:1152 +#: ../app/dialogs/preferences-dialog.c:961 msgid "Show gri_d" msgstr "Visa r_utnät" -#: ../app/dialogs/preferences-dialog.c:1158 +#: ../app/dialogs/preferences-dialog.c:967 msgid "Canvas _padding mode:" msgstr "_Utfyllnadsläge för rityta:" -#: ../app/dialogs/preferences-dialog.c:1163 +#: ../app/dialogs/preferences-dialog.c:972 msgid "Custom p_adding color:" msgstr "Anpassad u_tfyllnadsfärg:" -#: ../app/dialogs/preferences-dialog.c:1164 +#: ../app/dialogs/preferences-dialog.c:973 msgid "Select Custom Canvas Padding Color" msgstr "Välj anpassad utfyllnadsfärg för rityta" -#: ../app/dialogs/preferences-dialog.c:1194 -#, fuzzy -#| msgctxt "view-action" -#| msgid "Sn_ap to Guides" +#: ../app/dialogs/preferences-dialog.c:1003 msgid "Snap to Guides" -msgstr "Fäs_t mot hjälplinjer" +msgstr "Fäst mot hjälplinjer" -#: ../app/dialogs/preferences-dialog.c:1197 -#, fuzzy -#| msgctxt "view-action" -#| msgid "Sna_p to Grid" +#: ../app/dialogs/preferences-dialog.c:1006 msgid "Snap to Grid" -msgstr "Fäst m_ot rutnät" +msgstr "Fäst mot rutnät" -#: ../app/dialogs/preferences-dialog.c:1205 -#, fuzzy -#| msgctxt "view-action" -#| msgid "Snap to _Canvas Edges" +#: ../app/dialogs/preferences-dialog.c:1014 msgid "Snap to Canvas Edges" -msgstr "Fäst mot _ritytans kanter" +msgstr "Fäst mot ritytans kanter" -#: ../app/dialogs/preferences-dialog.c:1208 -#, fuzzy -#| msgctxt "view-action" -#| msgid "Snap t_o Active Path" +#: ../app/dialogs/preferences-dialog.c:1017 msgid "Snap to Active Path" -msgstr "Fäst mot a_ktiv bana" +msgstr "Fäst mot aktiv bana" -#: ../app/dialogs/preferences-dialog.c:1283 +#: ../app/dialogs/preferences-dialog.c:1094 msgid "Preferences" msgstr "Inställningar" -#: ../app/dialogs/preferences-dialog.c:1319 -#: ../app/dialogs/preferences-dialog.c:1320 +#: ../app/dialogs/preferences-dialog.c:1130 +#: ../app/dialogs/preferences-dialog.c:1131 msgid "System Resources" -msgstr "" +msgstr "Systemresurser" -#: ../app/dialogs/preferences-dialog.c:1327 +#: ../app/dialogs/preferences-dialog.c:1138 msgid "Resource Consumption" msgstr "Resursanvändning" -#: ../app/dialogs/preferences-dialog.c:1337 +#: ../app/dialogs/preferences-dialog.c:1148 msgid "Minimal number of _undo levels:" msgstr "Minsta antal _ångringsnivåer:" -#: ../app/dialogs/preferences-dialog.c:1340 +#: ../app/dialogs/preferences-dialog.c:1151 msgid "Maximum undo _memory:" msgstr "Maximalt ångrings_minne:" -#: ../app/dialogs/preferences-dialog.c:1343 +#: ../app/dialogs/preferences-dialog.c:1154 msgid "Tile cache _size:" msgstr "Bildblockscache_storlek:" -#: ../app/dialogs/preferences-dialog.c:1346 +#: ../app/dialogs/preferences-dialog.c:1157 msgid "Maximum _new image size:" msgstr "Maximal _ny bildstorlek:" -#: ../app/dialogs/preferences-dialog.c:1351 -msgid "Number of _processors to use:" -msgstr "Antalet _processorer att använda:" +#: ../app/dialogs/preferences-dialog.c:1162 +msgid "Number of _threads to use:" +msgstr "Antal _trådar att använda:" + +#: ../app/dialogs/preferences-dialog.c:1167 +msgid "" +"Threading support is not yet stable.\n" +"Setting this to greater than one might\n" +"result in image errors or crashes." +msgstr "" +"Trådningsstöd är ännu inte stabilt.\n" +"Att sätta detta till större än ett kan\n" +"resultera i bildfel eller krascher." #. Hardware Acceleration -#: ../app/dialogs/preferences-dialog.c:1356 +#: ../app/dialogs/preferences-dialog.c:1177 msgid "Hardware Acceleration" -msgstr "" +msgstr "Hårdvaruaccelerering" -#: ../app/dialogs/preferences-dialog.c:1360 +#: ../app/dialogs/preferences-dialog.c:1181 msgid "Use OpenCL" -msgstr "" +msgstr "Använd OpenCL" #. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1364 +#: ../app/dialogs/preferences-dialog.c:1185 msgid "Image Thumbnails" msgstr "Miniatyrbilder" -#: ../app/dialogs/preferences-dialog.c:1369 +#: ../app/dialogs/preferences-dialog.c:1190 msgid "Size of _thumbnails:" msgstr "Storlek på _miniatyrbilder:" -#: ../app/dialogs/preferences-dialog.c:1373 +#: ../app/dialogs/preferences-dialog.c:1194 msgid "Maximum _filesize for thumbnailing:" msgstr "Maximal _filstorlek för miniatyrbilder:" -#: ../app/dialogs/preferences-dialog.c:1383 +#: ../app/dialogs/preferences-dialog.c:1204 msgid "Keep record of used files in the Recent Documents list" msgstr "Håll information om använda filer i Senaste dokument-listan" -#: ../app/dialogs/preferences-dialog.c:1392 -#: ../app/dialogs/preferences-dialog.c:1393 +#. TODO: icon needed. +#: ../app/dialogs/preferences-dialog.c:1219 +#: ../app/dialogs/preferences-dialog.c:1220 +msgid "Debugging" +msgstr "Felsökning" + +#: ../app/dialogs/preferences-dialog.c:1227 +msgid "" +"We hope you will never need these settings, but as all software, GIMP has " +"bugs, and crashes can occur. If it happens, you can help us by reporting " +"bugs." +msgstr "" +"Vi hoppas att du aldrig kommer behöva dessa inställningar, men som all " +"programvara så innehåller GIMP fel, och krascher kan förekomma. Om det " +"händer så kan du hjälpa oss genom att rapportera fel." + +#: ../app/dialogs/preferences-dialog.c:1236 +msgid "Bug Reporting" +msgstr "Felrapportering" + +#: ../app/dialogs/preferences-dialog.c:1243 +msgid "Debug _policy:" +msgstr "Felsöknings_policy:" + +#: ../app/dialogs/preferences-dialog.c:1255 +msgid "This feature requires \"gdb\" or \"lldb\" installed on your system." +msgstr "" +"Denna funktion kräver att ”gdb” eller ”lldb” finns installerat på ditt " +"system." + +#: ../app/dialogs/preferences-dialog.c:1259 +msgid "" +"This feature is more efficient with \"gdb\" or \"lldb\" installed on your " +"system." +msgstr "" +"Denna funktion är mer effektiv om ”gdb” eller ”lldb” finns installerat på " +"ditt system." + +#: ../app/dialogs/preferences-dialog.c:1272 +#: ../app/dialogs/preferences-dialog.c:1273 msgid "Color Management" msgstr "Färghantering" -#: ../app/dialogs/preferences-dialog.c:1421 +#: ../app/dialogs/preferences-dialog.c:1282 +msgid "Reset Color Management" +msgstr "Återställ färghantering" + +#: ../app/dialogs/preferences-dialog.c:1305 msgid "Image display _mode:" -msgstr "" +msgstr "Bildvisnings_läge:" #. Color Managed Display -#: ../app/dialogs/preferences-dialog.c:1425 -#, fuzzy -#| msgid "Color Management" +#: ../app/dialogs/preferences-dialog.c:1309 msgid "Color Managed Display" -msgstr "Färghantering" +msgstr "Färghanterad display" -#: ../app/dialogs/preferences-dialog.c:1434 +#: ../app/dialogs/preferences-dialog.c:1318 msgid "Select Monitor Color Profile" msgstr "Välj färgprofil för skärm" -#: ../app/dialogs/preferences-dialog.c:1435 +#: ../app/dialogs/preferences-dialog.c:1319 msgid "_Monitor profile:" msgstr "_Skärmprofil:" -#: ../app/dialogs/preferences-dialog.c:1440 +#: ../app/dialogs/preferences-dialog.c:1325 msgid "_Try to use the system monitor profile" -msgstr "_Försök att använd systemskärmprofilen" +msgstr "_Försök att använda systemets skärmprofil" -#: ../app/dialogs/preferences-dialog.c:1449 -#, fuzzy -#| msgid "_Display rendering intent:" +#: ../app/dialogs/preferences-dialog.c:1334 msgid "_Rendering intent:" -msgstr "_Visa återgivningsmetod:" +msgstr "Åte_rgivningsmetod:" -#: ../app/dialogs/preferences-dialog.c:1454 +#: ../app/dialogs/preferences-dialog.c:1339 msgid "Use _black point compensation" -msgstr "" +msgstr "Använd _svartpunktskompensering" -#: ../app/dialogs/preferences-dialog.c:1462 -#: ../app/dialogs/preferences-dialog.c:1497 ../app/paint/gimpinkoptions.c:93 +#: ../app/dialogs/preferences-dialog.c:1347 +#: ../app/dialogs/preferences-dialog.c:1383 ../app/paint/gimpinkoptions.c:93 msgid "Speed" msgstr "Hastighet" -#: ../app/dialogs/preferences-dialog.c:1463 -#: ../app/dialogs/preferences-dialog.c:1498 +#: ../app/dialogs/preferences-dialog.c:1348 +#: ../app/dialogs/preferences-dialog.c:1384 msgid "Precision / Color Fidelity" -msgstr "" +msgstr "Precision / färgåtergivning" -#: ../app/dialogs/preferences-dialog.c:1464 -#, fuzzy -#| msgctxt "documents-action" -#| msgid "Open image dialog" +#: ../app/dialogs/preferences-dialog.c:1349 msgid "_Optimize image display for:" -msgstr "Öppna bild-dialog" +msgstr "_Optimera bildvisning för:" #. Print Simulation (Soft-proofing) -#: ../app/dialogs/preferences-dialog.c:1468 +#: ../app/dialogs/preferences-dialog.c:1353 msgid "Soft-Proofing" -msgstr "" +msgstr "Korrekturgranskning" -#: ../app/dialogs/preferences-dialog.c:1478 -#, fuzzy -#| msgid "Select Printer Color Profile" +#: ../app/dialogs/preferences-dialog.c:1363 msgid "Select Soft-Proofing Color Profile" -msgstr "Välj färgprofil för skrivare" +msgstr "Välj färgprofil för korrekturgranskning" -#: ../app/dialogs/preferences-dialog.c:1479 -#, fuzzy -#| msgid "_Softproof rendering intent:" +#: ../app/dialogs/preferences-dialog.c:1364 msgid "_Soft-proofing profile:" -msgstr "_Softproof återgivningsmetod:" +msgstr "Profil för _korrekturgranskning:" -#: ../app/dialogs/preferences-dialog.c:1484 -#, fuzzy -#| msgid "_Display rendering intent:" +#: ../app/dialogs/preferences-dialog.c:1370 msgid "Re_ndering intent:" -msgstr "_Visa återgivningsmetod:" +msgstr "Återgiv_ningsmetod:" -#: ../app/dialogs/preferences-dialog.c:1489 +#: ../app/dialogs/preferences-dialog.c:1375 msgid "Use black _point compensation" -msgstr "" +msgstr "Använd _svartpunktskompensering" -#: ../app/dialogs/preferences-dialog.c:1499 +#: ../app/dialogs/preferences-dialog.c:1385 msgid "O_ptimize soft-proofing for:" -msgstr "" +msgstr "O_ptimera korrekturgranskning för:" -#: ../app/dialogs/preferences-dialog.c:1508 +#: ../app/dialogs/preferences-dialog.c:1394 msgid "Mark out of gamut colors" msgstr "Markera färger utanför färgomfång" -#: ../app/dialogs/preferences-dialog.c:1513 +#: ../app/dialogs/preferences-dialog.c:1399 msgid "Select Warning Color" msgstr "Välj varningsfärg" #. Preferred profiles -#: ../app/dialogs/preferences-dialog.c:1524 -#, fuzzy -#| msgid "Preferences" +#: ../app/dialogs/preferences-dialog.c:1410 msgid "Preferred Profiles" -msgstr "Inställningar" +msgstr "Föredragna profiler" -#: ../app/dialogs/preferences-dialog.c:1533 -#, fuzzy -#| msgid "Select RGB Color Profile" +#: ../app/dialogs/preferences-dialog.c:1419 msgid "Select Preferred RGB Color Profile" -msgstr "Välj RGB-färgprofil" +msgstr "Välj föredragen RGB-färgprofil" -#: ../app/dialogs/preferences-dialog.c:1534 +#: ../app/dialogs/preferences-dialog.c:1420 msgid "_RGB profile:" msgstr "_RGB-profil:" -#: ../app/dialogs/preferences-dialog.c:1540 -#, fuzzy -#| msgid "Select Printer Color Profile" +#: ../app/dialogs/preferences-dialog.c:1427 msgid "Select Preferred Grayscale Color Profile" -msgstr "Välj färgprofil för skrivare" +msgstr "Välj föredragen gråskalefärgprofil" -#: ../app/dialogs/preferences-dialog.c:1541 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "_Grayscale" +#: ../app/dialogs/preferences-dialog.c:1428 msgid "_Grayscale profile:" -msgstr "_Gråskala" +msgstr "_Gråskaleprofil:" -#: ../app/dialogs/preferences-dialog.c:1547 +#: ../app/dialogs/preferences-dialog.c:1435 msgid "Select CMYK Color Profile" msgstr "Välj CMYK-färgprofil" -#: ../app/dialogs/preferences-dialog.c:1548 +#: ../app/dialogs/preferences-dialog.c:1436 msgid "_CMYK profile:" msgstr "_CMYK-profil:" #. Policies -#: ../app/dialogs/preferences-dialog.c:1552 +#: ../app/dialogs/preferences-dialog.c:1441 msgid "Policies" -msgstr "" +msgstr "Policyer" -#: ../app/dialogs/preferences-dialog.c:1557 +#: ../app/dialogs/preferences-dialog.c:1446 msgid "File Open behaviour:" msgstr "Beteende för filöppning:" -#: ../app/dialogs/preferences-dialog.c:1573 +#. Filter Dialogs +#: ../app/dialogs/preferences-dialog.c:1450 +#: ../app/dialogs/preferences-dialog.c:2171 +msgid "Filter Dialogs" +msgstr "Filterdialoger" + +#: ../app/dialogs/preferences-dialog.c:1454 +#: ../app/dialogs/preferences-dialog.c:2183 +msgid "Show advanced color options" +msgstr "Visa avancerade färgalternativ" + +#: ../app/dialogs/preferences-dialog.c:1468 +#: ../app/dialogs/preferences-dialog.c:1469 +msgid "Image Import & Export" +msgstr "Bildimport & -export" + +#. Import Policies +#: ../app/dialogs/preferences-dialog.c:1475 +msgid "Import Policies" +msgstr "Importeringspolicyer" + +#: ../app/dialogs/preferences-dialog.c:1479 +msgid "Promote imported images to _floating point precision" +msgstr "Befordra importerade bilder till _flyttalsprecision" + +#: ../app/dialogs/preferences-dialog.c:1485 +msgid "Dither images when promoting to floating point" +msgstr "Färgutjämna bilder när de befordras till flyttal" + +#: ../app/dialogs/preferences-dialog.c:1490 +msgid "Add an alpha channel to imported images" +msgstr "Lägg till en alfakanal till importerade bilder" + +#: ../app/dialogs/preferences-dialog.c:1495 +#: ../app/dialogs/preferences-dialog.c:2094 +msgid "Color profile policy:" +msgstr "Färgprofilpolicy:" + +#. Export Policies +#: ../app/dialogs/preferences-dialog.c:1499 +msgid "Export Policies" +msgstr "Exportpolicyer" + +#: ../app/dialogs/preferences-dialog.c:1503 +msgid "Export Exif metadata by default when available" +msgstr "Exportera Exif-metadata som standard när tillgänglig" + +#: ../app/dialogs/preferences-dialog.c:1506 +msgid "Export XMP metadata by default when available" +msgstr "Exportera XMP-metadata som standard när tillgänglig" + +#: ../app/dialogs/preferences-dialog.c:1509 +msgid "Export IPTC metadata by default when available" +msgstr "Exportera IPTC-metadata som standard när tillgänglig" + +#: ../app/dialogs/preferences-dialog.c:1512 +msgid "Metadata can contain sensitive information." +msgstr "Metadata kan innehålla känslig information." + +#. Raw Image Importer +#: ../app/dialogs/preferences-dialog.c:1517 +msgid "Raw Image Importer" +msgstr "Råbildsimportör" + +#: ../app/dialogs/preferences-dialog.c:1550 msgid "Experimental Playground" -msgstr "" +msgstr "Experimentell sandlåda" -#: ../app/dialogs/preferences-dialog.c:1574 -#, fuzzy -#| msgid "Background" +#: ../app/dialogs/preferences-dialog.c:1551 msgid "Playground" -msgstr "Bakgrund" +msgstr "Sandlåda" -#: ../app/dialogs/preferences-dialog.c:1579 -#, fuzzy -#| msgid "Fade Options" +#: ../app/dialogs/preferences-dialog.c:1556 msgid "Insane Options" -msgstr "Toningsalternativ" +msgstr "Galna alternativ" -#: ../app/dialogs/preferences-dialog.c:1583 -#, fuzzy -#| msgid "Pointer Information" +#: ../app/dialogs/preferences-dialog.c:1560 msgid "_N-Point Deformation tool" -msgstr "Pekarinformation" +msgstr "_N-punktsdeformeringsverktyg" -#: ../app/dialogs/preferences-dialog.c:1586 -#, fuzzy -#| msgctxt "tools-action" -#| msgid "_Transform Tools" -msgid "_Handle Transform tool" -msgstr "_Transformeringsverktyg" - -#: ../app/dialogs/preferences-dialog.c:1589 +#: ../app/dialogs/preferences-dialog.c:1563 msgid "_Seamless Clone tool" -msgstr "" +msgstr "_Sömlöst klonverktyg" -#: ../app/dialogs/preferences-dialog.c:1599 -#: ../app/dialogs/preferences-dialog.c:1600 -#, fuzzy -#| msgid "Tool Options" +#: ../app/dialogs/preferences-dialog.c:1573 +#: ../app/dialogs/preferences-dialog.c:1574 msgctxt "preferences" msgid "Tool Options" msgstr "Verktygsalternativ" #. General #. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1608 -#: ../app/dialogs/preferences-dialog.c:2241 -#: ../app/dialogs/preferences-dialog.c:2524 -#: ../app/dialogs/preferences-dialog.c:2755 +#: ../app/dialogs/preferences-dialog.c:1582 +#: ../app/dialogs/preferences-dialog.c:2400 +#: ../app/dialogs/preferences-dialog.c:2728 +#: ../app/dialogs/preferences-dialog.c:2959 #: ../app/widgets/gimpcontrollereditor.c:186 msgid "General" msgstr "Generellt" -#: ../app/dialogs/preferences-dialog.c:1611 +#: ../app/dialogs/preferences-dialog.c:1585 msgid "_Save tool options on exit" msgstr "_Spara verktygsalternativ vid avslut" -#: ../app/dialogs/preferences-dialog.c:1615 +#: ../app/dialogs/preferences-dialog.c:1589 msgid "Save Tool Options _Now" msgstr "Spara verktygsalternativ _nu" -#: ../app/dialogs/preferences-dialog.c:1622 +#: ../app/dialogs/preferences-dialog.c:1596 msgid "_Reset Saved Tool Options to Default Values" msgstr "_Återställ sparade verktygsalternativ till standardvärden" -#: ../app/dialogs/preferences-dialog.c:1636 +#: ../app/dialogs/preferences-dialog.c:1610 msgid "Default _interpolation:" msgstr "Standard_interpolation:" #. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1643 +#: ../app/dialogs/preferences-dialog.c:1617 msgid "Paint Options Shared Between Tools" msgstr "Målningsalternativ som delas av verktyg" -#: ../app/dialogs/preferences-dialog.c:1647 +#: ../app/dialogs/preferences-dialog.c:1621 msgid "_Brush" msgstr "_Pensel" -#: ../app/dialogs/preferences-dialog.c:1650 +#: ../app/dialogs/preferences-dialog.c:1624 msgid "_Dynamics" msgstr "_Dynamik" -#: ../app/dialogs/preferences-dialog.c:1653 +#: ../app/dialogs/preferences-dialog.c:1627 msgid "_Pattern" msgstr "_Mönster" #. Move Tool -#: ../app/dialogs/preferences-dialog.c:1660 +#: ../app/dialogs/preferences-dialog.c:1634 msgid "Move Tool" msgstr "Flyttningsverktyg" -#: ../app/dialogs/preferences-dialog.c:1664 +#: ../app/dialogs/preferences-dialog.c:1638 msgid "Set layer or path as active" msgstr "Ställ in lager eller bana som aktiv" -#: ../app/dialogs/preferences-dialog.c:1677 +#: ../app/dialogs/preferences-dialog.c:1651 msgid "Default New Image" msgstr "Standard ny bild" -#: ../app/dialogs/preferences-dialog.c:1678 +#: ../app/dialogs/preferences-dialog.c:1652 msgid "Default Image" msgstr "Standardbild" -#: ../app/dialogs/preferences-dialog.c:1714 +#: ../app/dialogs/preferences-dialog.c:1688 msgid "Quick Mask color:" msgstr "Snabbmaskfärg:" -#: ../app/dialogs/preferences-dialog.c:1715 +#: ../app/dialogs/preferences-dialog.c:1689 msgid "Set the default Quick Mask color" -msgstr "Ange standardsnabbmaskfärg" +msgstr "Ställ in standardsnabbmaskfärg" -#: ../app/dialogs/preferences-dialog.c:1725 +#: ../app/dialogs/preferences-dialog.c:1699 msgid "Default Image Grid" msgstr "Standard bildrutnät" -#: ../app/dialogs/preferences-dialog.c:1726 +#: ../app/dialogs/preferences-dialog.c:1700 msgid "Default Grid" msgstr "Standardrutnät" -#: ../app/dialogs/preferences-dialog.c:1745 +#: ../app/dialogs/preferences-dialog.c:1719 msgid "User Interface" msgstr "Användargränssnitt" -#: ../app/dialogs/preferences-dialog.c:1746 +#: ../app/dialogs/preferences-dialog.c:1720 msgid "Interface" msgstr "Gränssnitt" -#: ../app/dialogs/preferences-dialog.c:1755 ../app/tools/gimptextoptions.c:167 +#: ../app/dialogs/preferences-dialog.c:1729 ../app/tools/gimptextoptions.c:151 msgid "Language" msgstr "Språk" #. Previews -#: ../app/dialogs/preferences-dialog.c:1761 +#: ../app/dialogs/preferences-dialog.c:1735 msgid "Previews" msgstr "Förhandsvisningar" -#: ../app/dialogs/preferences-dialog.c:1764 +#: ../app/dialogs/preferences-dialog.c:1738 msgid "_Enable layer & channel previews" msgstr "_Aktivera förhandsvisning av lager och kanaler" -#: ../app/dialogs/preferences-dialog.c:1770 +#: ../app/dialogs/preferences-dialog.c:1744 msgid "_Default layer & channel preview size:" msgstr "Standardstorlek för förhandsvisning av _lager och kanaler:" -#: ../app/dialogs/preferences-dialog.c:1773 -#, fuzzy -#| msgid "Na_vigation preview size:" +#: ../app/dialogs/preferences-dialog.c:1747 msgid "_Undo preview size:" -msgstr "Förhandsvisningsstorlek för _navigering:" +msgstr "Förhandsvisningsstorlek för _ångra:" -#: ../app/dialogs/preferences-dialog.c:1776 +#: ../app/dialogs/preferences-dialog.c:1750 msgid "Na_vigation preview size:" msgstr "Förhandsvisningsstorlek för _navigering:" #. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1780 +#: ../app/dialogs/preferences-dialog.c:1754 msgid "Keyboard Shortcuts" msgstr "Tangentbordsgenvägar" -#: ../app/dialogs/preferences-dialog.c:1784 +#: ../app/dialogs/preferences-dialog.c:1758 msgid "_Use dynamic keyboard shortcuts" msgstr "Använd dynamiska _tangentbordsgenvägar" -#: ../app/dialogs/preferences-dialog.c:1788 +#: ../app/dialogs/preferences-dialog.c:1762 msgid "Configure _Keyboard Shortcuts..." -msgstr "Konfigurera _tangentbordsgenvägar..." +msgstr "Konfigurera _tangentbordsgenvägar…" -#: ../app/dialogs/preferences-dialog.c:1795 +#: ../app/dialogs/preferences-dialog.c:1769 msgid "_Save keyboard shortcuts on exit" msgstr "_Spara tangentbordsgenvägar vid avslut" -#: ../app/dialogs/preferences-dialog.c:1799 +#: ../app/dialogs/preferences-dialog.c:1773 msgid "Save Keyboard Shortcuts _Now" msgstr "Spara tangentbordsgenvägar _nu" -#: ../app/dialogs/preferences-dialog.c:1806 +#: ../app/dialogs/preferences-dialog.c:1780 msgid "_Reset Keyboard Shortcuts to Default Values" msgstr "_Återställ tangentbordsgenvägar till standardvärden" -#: ../app/dialogs/preferences-dialog.c:1815 +#: ../app/dialogs/preferences-dialog.c:1789 msgid "Remove _All Keyboard Shortcuts" msgstr "Ta bort _alla tangentbordsgenvägar" -#: ../app/dialogs/preferences-dialog.c:1827 -#: ../app/dialogs/preferences-dialog.c:1828 -#: ../app/dialogs/preferences-dialog.c:1863 +#: ../app/dialogs/preferences-dialog.c:1801 +#: ../app/dialogs/preferences-dialog.c:1802 +#: ../app/dialogs/preferences-dialog.c:1837 msgid "Theme" msgstr "Tema" -#: ../app/dialogs/preferences-dialog.c:1833 +#: ../app/dialogs/preferences-dialog.c:1807 msgid "Select Theme" msgstr "Välj tema" -#: ../app/dialogs/preferences-dialog.c:1915 +#: ../app/dialogs/preferences-dialog.c:1889 msgid "Reload C_urrent Theme" msgstr "Läs om a_ktuellt tema" -#: ../app/dialogs/preferences-dialog.c:1927 -#: ../app/dialogs/preferences-dialog.c:1928 -#: ../app/dialogs/preferences-dialog.c:1968 -#, fuzzy -#| msgid "Theme" +#: ../app/dialogs/preferences-dialog.c:1901 +#: ../app/dialogs/preferences-dialog.c:1902 +#: ../app/dialogs/preferences-dialog.c:1943 msgid "Icon Theme" -msgstr "Tema" +msgstr "Ikontema" -#: ../app/dialogs/preferences-dialog.c:1933 -#, fuzzy -#| msgid "Select Theme" +#: ../app/dialogs/preferences-dialog.c:1907 msgid "Select an Icon Theme" -msgstr "Välj tema" +msgstr "Välj ett ikontema" #. Appearance -#: ../app/dialogs/preferences-dialog.c:2053 -#: ../app/dialogs/preferences-dialog.c:2595 ../app/widgets/gimpgrideditor.c:134 +#: ../app/dialogs/preferences-dialog.c:2031 +#: ../app/dialogs/preferences-dialog.c:2799 ../app/widgets/gimpgrideditor.c:134 msgid "Appearance" msgstr "Utseende" -#: ../app/dialogs/preferences-dialog.c:2057 +#: ../app/dialogs/preferences-dialog.c:2035 +msgid "Show GIMP _logo (drag-and-drop target)" +msgstr "Visa GIMP-_logotyp (dra-och-släpp-mål)" + +#: ../app/dialogs/preferences-dialog.c:2039 msgid "Show _foreground & background color" msgstr "Visa _förgrunds- och bakgrundsfärg" -#: ../app/dialogs/preferences-dialog.c:2061 +#: ../app/dialogs/preferences-dialog.c:2043 msgid "Show active _brush, pattern & gradient" msgstr "Visa aktiva _penslar, mönster och gradient" -#: ../app/dialogs/preferences-dialog.c:2065 +#: ../app/dialogs/preferences-dialog.c:2047 msgid "Show active _image" msgstr "Visa aktiv _bild" #. Tool Editor -#: ../app/dialogs/preferences-dialog.c:2073 -#, fuzzy -#| msgid "Tools configuration" +#: ../app/dialogs/preferences-dialog.c:2055 msgid "Tools Configuration" msgstr "Verktygskonfiguration" -#: ../app/dialogs/preferences-dialog.c:2089 -#: ../app/dialogs/preferences-dialog.c:2090 -#, fuzzy -#| msgctxt "dockable-action" -#| msgid "Dialogs Menu" +#: ../app/dialogs/preferences-dialog.c:2071 +#: ../app/dialogs/preferences-dialog.c:2072 msgid "Dialog Defaults" -msgstr "Dialogmeny" +msgstr "Standardval för dialoger" + +#: ../app/dialogs/preferences-dialog.c:2081 +msgid "Reset Dialog Defaults" +msgstr "Återställ standardval för dialoger" #. Color profile import dialog -#: ../app/dialogs/preferences-dialog.c:2100 -#, fuzzy -#| msgid "Color Profile" -msgid "Color Profile Import dialog" -msgstr "Färgprofil" +#: ../app/dialogs/preferences-dialog.c:2089 +msgid "Color Profile Import Dialog" +msgstr "Färgprofilsimportdialog" -#: ../app/dialogs/preferences-dialog.c:2105 -#, fuzzy -#| msgid "Color Profile" -msgid "Color profile policy:" -msgstr "Färgprofil" +#. All color profile chooser dialogs +#: ../app/dialogs/preferences-dialog.c:2098 +msgid "Color Profile File Dialogs" +msgstr "Färgprofilsfildialoger" + +#: ../app/dialogs/preferences-dialog.c:2103 +msgid "Profile folder:" +msgstr "Profilmapp:" + +#: ../app/dialogs/preferences-dialog.c:2104 +msgid "Select Default Folder for Color Profiles" +msgstr "Välj standardmapp för färgprofiler" + +#. Convert to Color Profile Dialog +#: ../app/dialogs/preferences-dialog.c:2108 +msgid "Convert to Color Profile Dialog" +msgstr "Konvertera till färgprofil-dialog" + +#: ../app/dialogs/preferences-dialog.c:2113 +msgid "Rendering intent:" +msgstr "Återgivningsmetod:" + +#: ../app/dialogs/preferences-dialog.c:2117 +msgid "Black point compensation" +msgstr "Svartpunktskompensering" + +#. Convert Precision Dialog +#: ../app/dialogs/preferences-dialog.c:2121 +msgid "Precision Conversion Dialog" +msgstr "Precisionskonverteringsdialog" + +#: ../app/dialogs/preferences-dialog.c:2128 +msgid "Dither layers:" +msgstr "Färgutjämna lager:" + +#: ../app/dialogs/preferences-dialog.c:2133 +msgid "Dither text layers:" +msgstr "Färgutjämna textlager:" + +#: ../app/dialogs/preferences-dialog.c:2138 +msgid "Dither channels/masks:" +msgstr "Färgutjämna kanaler/masker:" + +#. Convert Indexed Dialog +#: ../app/dialogs/preferences-dialog.c:2142 +msgid "Indexed Conversion Dialog" +msgstr "Indexerad konvertering-dialog" + +#: ../app/dialogs/preferences-dialog.c:2147 +msgid "Colormap:" +msgstr "Färgkarta:" + +#: ../app/dialogs/preferences-dialog.c:2150 +msgid "Maximum number of colors:" +msgstr "Maximalt antal färger:" + +#: ../app/dialogs/preferences-dialog.c:2154 +msgid "Remove unused and duplicate colors from colormap" +msgstr "Ta bort oanvända och duplicerade färger från färgkartan" + +#: ../app/dialogs/preferences-dialog.c:2160 +msgid "Color dithering:" +msgstr "Färgutjämning:" + +#: ../app/dialogs/preferences-dialog.c:2164 +msgid "Enable dithering of transparency" +msgstr "Aktivera färgutjämning av transparens" + +#: ../app/dialogs/preferences-dialog.c:2176 +msgid "Keep recent settings:" +msgstr "Behåll senaste inställningar:" + +#: ../app/dialogs/preferences-dialog.c:2180 +msgid "Default to the last used settings" +msgstr "Använd som standard de senast använda inställningarna" + +#. Canvas Size Dialog +#: ../app/dialogs/preferences-dialog.c:2187 +msgid "Canvas Size Dialog" +msgstr "Storlek på rityta" + +#: ../app/dialogs/preferences-dialog.c:2192 +#: ../app/dialogs/preferences-dialog.c:2221 +msgid "Fill with:" +msgstr "Fyll med:" + +#: ../app/dialogs/preferences-dialog.c:2195 +msgid "Resize layers:" +msgstr "Ändra storlek på lager:" + +#: ../app/dialogs/preferences-dialog.c:2199 +msgid "Resize text layers" +msgstr "Ändra storlek på textlager" #. New Layer Dialog -#: ../app/dialogs/preferences-dialog.c:2109 -#, fuzzy -#| msgid "New Layer" +#: ../app/dialogs/preferences-dialog.c:2203 msgid "New Layer Dialog" -msgstr "Nytt lager" +msgstr "Nytt lager-dialog" -#: ../app/dialogs/preferences-dialog.c:2114 -#, fuzzy -#| msgid "Layer _name:" +#: ../app/dialogs/preferences-dialog.c:2208 msgid "Layer name:" -msgstr "Lager_namn:" +msgstr "Lagernamn:" -#: ../app/dialogs/preferences-dialog.c:2118 -#, fuzzy -#| msgid "File Type:" +#: ../app/dialogs/preferences-dialog.c:2212 msgid "Fill type:" -msgstr "Filtyp:" +msgstr "Fyllnadstyp:" + +#. Layer Boundary Size Dialog +#: ../app/dialogs/preferences-dialog.c:2216 +msgid "Layer Boundary Size Dialog" +msgstr "Storlek på lagergräns-dialog" #. Add Layer Mask Dialog -#: ../app/dialogs/preferences-dialog.c:2122 -#, fuzzy -#| msgid "Add Layer Mask" +#: ../app/dialogs/preferences-dialog.c:2225 msgid "Add Layer Mask Dialog" -msgstr "Lägg till lagermask" +msgstr "Lägg till lagermask-dialog" -#: ../app/dialogs/preferences-dialog.c:2127 -#, fuzzy -#| msgid "Layer Fill Type" +#: ../app/dialogs/preferences-dialog.c:2230 msgid "Layer mask type:" -msgstr "Lagrets fyllnadstyp" +msgstr "Lagrets masktyp:" -#: ../app/dialogs/preferences-dialog.c:2131 -#, fuzzy -#| msgid "In_vert mask" +#: ../app/dialogs/preferences-dialog.c:2234 msgid "Invert mask" -msgstr "In_vertera mask" +msgstr "Invertera mask" + +#. Merge Layers Dialog +#: ../app/dialogs/preferences-dialog.c:2238 +msgid "Merge Layers Dialog" +msgstr "Sammanfoga lager-dialog" + +#: ../app/dialogs/preferences-dialog.c:2245 +msgid "Merged layer size:" +msgstr "Storlek för sammanfogat lager:" + +#: ../app/dialogs/preferences-dialog.c:2249 +msgid "Merge within active group only" +msgstr "Sammanfoga bara inom aktiv grupp" + +#: ../app/dialogs/preferences-dialog.c:2252 +msgid "Discard invisible layers" +msgstr "Förkasta osynliga lager" #. New Channel Dialog -#: ../app/dialogs/preferences-dialog.c:2135 -#, fuzzy -#| msgid "New Channel Color" +#: ../app/dialogs/preferences-dialog.c:2256 msgid "New Channel Dialog" -msgstr "Ny kanalfärg" +msgstr "Ny kanaldialog" -#: ../app/dialogs/preferences-dialog.c:2140 -#, fuzzy -#| msgid "Channel _name:" +#: ../app/dialogs/preferences-dialog.c:2261 msgid "Channel name:" -msgstr "Kanal_namn:" +msgstr "Kanalnamn:" -#: ../app/dialogs/preferences-dialog.c:2144 -#, fuzzy -#| msgid "Color space:" +#: ../app/dialogs/preferences-dialog.c:2265 msgid "Color and opacity:" -msgstr "Färgrymd:" +msgstr "Färg och opacitet:" -#: ../app/dialogs/preferences-dialog.c:2145 -#, fuzzy -#| msgctxt "channels-action" -#| msgid "Edit the channel's name, color and opacity" +#: ../app/dialogs/preferences-dialog.c:2266 msgid "Default New Channel Color and Opacity" -msgstr "Redigera kanalens namn, färg och opacitet" +msgstr "Standardvärde för nytt kanalnamn och opacitet" #. New Path Dialog -#: ../app/dialogs/preferences-dialog.c:2150 -#, fuzzy -#| msgid "New Path Options" +#: ../app/dialogs/preferences-dialog.c:2271 msgid "New Path Dialog" -msgstr "Alternativ för ny bana" +msgstr "Ny bandialog" -#: ../app/dialogs/preferences-dialog.c:2155 -#: ../app/dialogs/vectors-options-dialog.c:122 +#: ../app/dialogs/preferences-dialog.c:2276 msgid "Path name:" msgstr "Bannamn:" -#. Feather Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2159 -#, fuzzy -#| msgid "Feather Selection" -msgid "Feather Selection Dialog" -msgstr "Fjädra markering" +#. Export Path Dialog +#: ../app/dialogs/preferences-dialog.c:2280 +msgid "Export Paths Dialog" +msgstr "Exportera banor-dialog" -#: ../app/dialogs/preferences-dialog.c:2164 -#, fuzzy -#| msgid "Feather edges" +#: ../app/dialogs/preferences-dialog.c:2285 +msgid "Export folder:" +msgstr "Exportmapp:" + +#: ../app/dialogs/preferences-dialog.c:2286 +msgid "Select Default Folder for Exporting Paths" +msgstr "Välj standardmapp för export av banor" + +#: ../app/dialogs/preferences-dialog.c:2290 +msgid "Export the active path only" +msgstr "Exportera bara aktiv bana" + +#. Import Path Dialog +#: ../app/dialogs/preferences-dialog.c:2294 +msgid "Import Paths Dialog" +msgstr "Importera bandialog" + +#: ../app/dialogs/preferences-dialog.c:2299 +msgid "Import folder:" +msgstr "Importmapp:" + +#: ../app/dialogs/preferences-dialog.c:2300 +msgid "Select Default Folder for Importing Paths" +msgstr "Välj standardmapp för import av banor" + +#: ../app/dialogs/preferences-dialog.c:2304 +msgid "Merge imported paths" +msgstr "Sammanfoga importerade banor" + +#: ../app/dialogs/preferences-dialog.c:2307 +msgid "Scale imported paths" +msgstr "Skala importerade banor" + +#. Feather Selection Dialog +#: ../app/dialogs/preferences-dialog.c:2311 +msgid "Feather Selection Dialog" +msgstr "Dialog för att fjädra markering" + +#: ../app/dialogs/preferences-dialog.c:2316 msgid "Feather radius:" -msgstr "Fjädra kanter" +msgstr "Fjädringsradie:" #. Grow Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2168 -#, fuzzy -#| msgid "Grow Selection" +#: ../app/dialogs/preferences-dialog.c:2320 msgid "Grow Selection Dialog" -msgstr "Öka markering" +msgstr "Väx markering-dialog" -#: ../app/dialogs/preferences-dialog.c:2173 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Grow Channel" +#: ../app/dialogs/preferences-dialog.c:2325 msgid "Grow radius:" -msgstr "Öka kanal" +msgstr "Växradie:" #. Shrink Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2177 -#, fuzzy -#| msgid "Shrink Selection" +#: ../app/dialogs/preferences-dialog.c:2329 msgid "Shrink Selection Dialog" -msgstr "Krymp markering" +msgstr "Krymp markering-dialog" -#: ../app/dialogs/preferences-dialog.c:2182 -#, fuzzy -#| msgctxt "view-action" -#| msgid "Shrink _Wrap" +#: ../app/dialogs/preferences-dialog.c:2334 msgid "Shrink radius:" -msgstr "Kr_ymppaketera" +msgstr "Krympningsradie:" -#: ../app/dialogs/preferences-dialog.c:2186 -#: ../app/dialogs/preferences-dialog.c:2203 -#, fuzzy -#| msgid "Select a single contiguous area" +#: ../app/dialogs/preferences-dialog.c:2338 +#: ../app/dialogs/preferences-dialog.c:2355 msgid "Selected areas continue outside the image" -msgstr "Markera ett enda sammanhängande område" +msgstr "Markerade områden fortsätter utanför bilden" #. Border Selection Dialog -#: ../app/dialogs/preferences-dialog.c:2190 -#, fuzzy -#| msgid "Border Selection" +#: ../app/dialogs/preferences-dialog.c:2342 msgid "Border Selection Dialog" -msgstr "Kantmarkering" +msgstr "Kantmarkeringsdialog" -#: ../app/dialogs/preferences-dialog.c:2195 -#, fuzzy -#| msgid "Brush Radius" +#: ../app/dialogs/preferences-dialog.c:2347 msgid "Border radius:" -msgstr "Penselradie" +msgstr "Kantradie:" -#: ../app/dialogs/preferences-dialog.c:2199 -#, fuzzy -#| msgid "_Join style:" +#: ../app/dialogs/preferences-dialog.c:2351 msgid "Border style:" -msgstr "_Fogstil:" +msgstr "Kantstil:" #. Fill Options Dialog -#: ../app/dialogs/preferences-dialog.c:2207 +#: ../app/dialogs/preferences-dialog.c:2359 msgid "Fill Selection Outline & Fill Path Dialogs" -msgstr "" +msgstr "Dialogerna Fyll markeringskontur & Fyll bana" #. Stroke Options Dialog -#: ../app/dialogs/preferences-dialog.c:2216 -#, fuzzy -#| msgctxt "vectors-action" -#| msgid "Selecti_on to Path" +#: ../app/dialogs/preferences-dialog.c:2368 msgid "Stroke Selection & Stroke Path Dialogs" -msgstr "_Markering till bana" +msgstr "Dialogerna Stryk längs markering & Stryk längs bana" -#: ../app/dialogs/preferences-dialog.c:2232 -#: ../app/dialogs/preferences-dialog.c:2233 +#: ../app/dialogs/preferences-dialog.c:2391 +#: ../app/dialogs/preferences-dialog.c:2392 msgid "Help System" msgstr "Hjälpsystem" -#: ../app/dialogs/preferences-dialog.c:2244 +#: ../app/dialogs/preferences-dialog.c:2403 msgid "Show _tooltips" msgstr "Visa verktygs_tips" -#: ../app/dialogs/preferences-dialog.c:2247 +#: ../app/dialogs/preferences-dialog.c:2406 msgid "Show help _buttons" msgstr "Visa hjälp_knappar" -#: ../app/dialogs/preferences-dialog.c:2252 +#: ../app/dialogs/preferences-dialog.c:2411 msgid "Use the online version" msgstr "Använd versionen på nätet" -#: ../app/dialogs/preferences-dialog.c:2253 +#: ../app/dialogs/preferences-dialog.c:2412 msgid "Use a locally installed copy" msgstr "Använd en lokalt installerad kopia" -#: ../app/dialogs/preferences-dialog.c:2254 +#: ../app/dialogs/preferences-dialog.c:2413 msgid "User manual:" msgstr "Användarhandbok:" -#: ../app/dialogs/preferences-dialog.c:2261 -msgid "There's a local installation of the user manual." -msgstr "Det finns en lokal installation av användarhandboken." - -#: ../app/dialogs/preferences-dialog.c:2267 -msgid "The user manual is not installed locally." -msgstr "Användarhandboken är inte lokalt installerad." +#: ../app/dialogs/preferences-dialog.c:2424 +msgid "User interface language" +msgstr "Språk för användargränssnitt" #. If there is no webkit available, assume we are on a platform #. * that doesn't use the help browser, so don't bother showing #. * the combo. #. -#: ../app/dialogs/preferences-dialog.c:2280 +#: ../app/dialogs/preferences-dialog.c:2483 msgid "Help Browser" msgstr "Hjälpläsare" -#: ../app/dialogs/preferences-dialog.c:2287 +#: ../app/dialogs/preferences-dialog.c:2490 msgid "H_elp browser to use:" msgstr "Hjälp_läsare att använda:" -#: ../app/dialogs/preferences-dialog.c:2293 +#: ../app/dialogs/preferences-dialog.c:2496 msgid "" "The GIMP help browser doesn't seem to be installed. Using the web browser " "instead." msgstr "" +"GIMP:s hjälpläsare verkar inte vara installerad. Använder webbläsaren " +"istället." #. Action Search -#: ../app/dialogs/preferences-dialog.c:2310 -#, fuzzy -#| msgid "Action" +#: ../app/dialogs/preferences-dialog.c:2513 msgid "Action Search" -msgstr "Åtgärd" +msgstr "Åtgärdssökning" -#: ../app/dialogs/preferences-dialog.c:2314 -#, fuzzy -#| msgid "Show s_election" +#: ../app/dialogs/preferences-dialog.c:2517 msgid "Show _unavailable actions" -msgstr "Visa m_arkering" +msgstr "Visa _otillgängliga åtgärder" -#: ../app/dialogs/preferences-dialog.c:2317 -#, fuzzy -#| msgid "Maximum _new image size:" +#: ../app/dialogs/preferences-dialog.c:2520 msgid "Maximum History Size:" -msgstr "Maximal _ny bildstorlek:" +msgstr "Maximal historikstorlek:" -#: ../app/dialogs/preferences-dialog.c:2321 -#, fuzzy -#| msgid "Clear Undo History" +#: ../app/dialogs/preferences-dialog.c:2524 msgid "Clear Action History" -msgstr "Töm ångringshistorik" +msgstr "Töm åtgärdshistorik" -#: ../app/dialogs/preferences-dialog.c:2336 -#: ../app/dialogs/preferences-dialog.c:2337 +#: ../app/dialogs/preferences-dialog.c:2539 +#: ../app/dialogs/preferences-dialog.c:2540 msgid "Display" msgstr "Visning" #. Transparency -#: ../app/dialogs/preferences-dialog.c:2345 +#: ../app/dialogs/preferences-dialog.c:2548 msgid "Transparency" msgstr "Transparens" -#: ../app/dialogs/preferences-dialog.c:2349 +#: ../app/dialogs/preferences-dialog.c:2552 msgid "_Check style:" msgstr "_Rutstil:" -#: ../app/dialogs/preferences-dialog.c:2352 +#: ../app/dialogs/preferences-dialog.c:2555 msgid "Check _size:" msgstr "Rut_storlek:" -#: ../app/dialogs/preferences-dialog.c:2355 +#: ../app/dialogs/preferences-dialog.c:2558 msgid "Monitor Resolution" msgstr "Bildskärmsupplösning" #. Pixels -#: ../app/dialogs/preferences-dialog.c:2359 ../app/display/gimpcursorview.c:207 -#: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:231 +#: ../app/dialogs/preferences-dialog.c:2562 ../app/display/gimpcursorview.c:215 +#: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:234 msgid "Pixels" msgstr "Bildpunkter" -#: ../app/dialogs/preferences-dialog.c:2377 +#: ../app/dialogs/preferences-dialog.c:2580 ../app/widgets/gimpgrideditor.c:195 +#: ../app/widgets/gimpgrideditor.c:230 msgid "Horizontal" msgstr "Horisontell" -#: ../app/dialogs/preferences-dialog.c:2379 +#: ../app/dialogs/preferences-dialog.c:2582 ../app/widgets/gimpgrideditor.c:197 +#: ../app/widgets/gimpgrideditor.c:232 msgid "Vertical" msgstr "Vertikal" -#: ../app/dialogs/preferences-dialog.c:2381 -#: ../app/widgets/gimpimagepropview.c:459 +#: ../app/dialogs/preferences-dialog.c:2584 +#: ../app/widgets/gimpimagepropview.c:457 msgid "ppi" msgstr "punkter/tum" -#: ../app/dialogs/preferences-dialog.c:2399 +#: ../app/dialogs/preferences-dialog.c:2603 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "_Identifiera automatiskt (för tillfället %d × %d punkter/tum)" -#: ../app/dialogs/preferences-dialog.c:2417 +#: ../app/dialogs/preferences-dialog.c:2621 msgid "_Enter manually" msgstr "Ange _manuellt" -#: ../app/dialogs/preferences-dialog.c:2432 +#: ../app/dialogs/preferences-dialog.c:2636 msgid "C_alibrate..." -msgstr "K_alibrera..." +msgstr "K_alibrera…" -#: ../app/dialogs/preferences-dialog.c:2460 -#: ../app/dialogs/preferences-dialog.c:2461 +#: ../app/dialogs/preferences-dialog.c:2664 +#: ../app/dialogs/preferences-dialog.c:2665 msgid "Window Management" msgstr "Fönsterhantering" -#: ../app/dialogs/preferences-dialog.c:2466 +#: ../app/dialogs/preferences-dialog.c:2670 msgid "Window Manager Hints" -msgstr "Fönsterhintar" +msgstr "Antydan för fönsterhanterare" -#: ../app/dialogs/preferences-dialog.c:2472 +#: ../app/dialogs/preferences-dialog.c:2676 msgid "Hint for _docks and toolbox:" -msgstr "Hint för _dockor och verktygslåda:" +msgstr "Antydan för _dockor och verktygslåda:" -#: ../app/dialogs/preferences-dialog.c:2475 +#: ../app/dialogs/preferences-dialog.c:2679 msgid "Focus" msgstr "Fokus" -#: ../app/dialogs/preferences-dialog.c:2479 +#: ../app/dialogs/preferences-dialog.c:2683 msgid "Activate the _focused image" msgstr "Aktivera den _fokuserade bilden" #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2483 +#: ../app/dialogs/preferences-dialog.c:2687 msgid "Window Positions" msgstr "Fönsterpositioner" -#: ../app/dialogs/preferences-dialog.c:2486 +#: ../app/dialogs/preferences-dialog.c:2690 msgid "_Save window positions on exit" msgstr "_Spara fönsterpositioner vid avslutning" -#: ../app/dialogs/preferences-dialog.c:2489 +#: ../app/dialogs/preferences-dialog.c:2693 msgid "Open windows on the same _monitor they were open before" -msgstr "" +msgstr "Öppna fönster på samma _skärm där de var öppna förut" -#: ../app/dialogs/preferences-dialog.c:2493 +#: ../app/dialogs/preferences-dialog.c:2697 msgid "Save Window Positions _Now" msgstr "Spara fönsterpositioner _nu" -#: ../app/dialogs/preferences-dialog.c:2500 +#: ../app/dialogs/preferences-dialog.c:2704 msgid "_Reset Saved Window Positions to Default Values" msgstr "_Återställ sparade fönsterpositioner till standardvärden" -#: ../app/dialogs/preferences-dialog.c:2515 -#: ../app/dialogs/preferences-dialog.c:2516 +#: ../app/dialogs/preferences-dialog.c:2719 +#: ../app/dialogs/preferences-dialog.c:2720 msgid "Image Windows" msgstr "Bildfönster" -#: ../app/dialogs/preferences-dialog.c:2527 +#: ../app/dialogs/preferences-dialog.c:2731 msgid "Use \"_Dot for dot\" by default" -msgstr "Använd \"_punkt för punkt\" som standard" +msgstr "Använd ”_punkt för punkt” som standard" -#: ../app/dialogs/preferences-dialog.c:2533 +#: ../app/dialogs/preferences-dialog.c:2737 msgid "Marching _ants speed:" msgstr "Vandrande _myrors hastighet:" #. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2537 +#: ../app/dialogs/preferences-dialog.c:2741 msgid "Zoom & Resize Behavior" msgstr "Zoom- och storleksändringsbeteende" -#: ../app/dialogs/preferences-dialog.c:2541 +#: ../app/dialogs/preferences-dialog.c:2745 msgid "Resize window on _zoom" msgstr "Ändra storlek på fönstret vid _zoom" -#: ../app/dialogs/preferences-dialog.c:2544 +#: ../app/dialogs/preferences-dialog.c:2748 msgid "Resize window on image _size change" msgstr "Ändra storlek på fönstret vid ändring av bild_storlek" -#: ../app/dialogs/preferences-dialog.c:2550 -#, fuzzy -#| msgid "Show active _image" +#: ../app/dialogs/preferences-dialog.c:2754 msgid "Show entire image" -msgstr "Visa aktiv _bild" +msgstr "Visa hel bild" -#: ../app/dialogs/preferences-dialog.c:2552 +#: ../app/dialogs/preferences-dialog.c:2756 msgid "Initial zoom _ratio:" msgstr "Initial zoom_faktor:" #. Space Bar -#: ../app/dialogs/preferences-dialog.c:2556 +#: ../app/dialogs/preferences-dialog.c:2760 msgid "Space Bar" msgstr "Blanksteg" -#: ../app/dialogs/preferences-dialog.c:2562 +#: ../app/dialogs/preferences-dialog.c:2766 msgid "_While space bar is pressed:" msgstr "_När blankstegstangenten trycks ned:" #. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2566 +#: ../app/dialogs/preferences-dialog.c:2770 msgid "Mouse Pointers" msgstr "Muspekare" -#: ../app/dialogs/preferences-dialog.c:2570 +#: ../app/dialogs/preferences-dialog.c:2774 msgid "Show _brush outline" msgstr "Visa _penselkontur" -#: ../app/dialogs/preferences-dialog.c:2573 +#: ../app/dialogs/preferences-dialog.c:2777 msgid "Show pointer for paint _tools" msgstr "Visa pekare för målar_verktyg" -#: ../app/dialogs/preferences-dialog.c:2579 +#: ../app/dialogs/preferences-dialog.c:2783 msgid "Pointer _mode:" msgstr "Pekar_läge:" -#: ../app/dialogs/preferences-dialog.c:2582 +#: ../app/dialogs/preferences-dialog.c:2786 msgid "Pointer _handedness:" msgstr "Mus_hand:" -#: ../app/dialogs/preferences-dialog.c:2594 +#: ../app/dialogs/preferences-dialog.c:2798 msgid "Image Window Appearance" msgstr "Bildfönsterutseende" -#: ../app/dialogs/preferences-dialog.c:2602 +#: ../app/dialogs/preferences-dialog.c:2806 msgid "Default Appearance in Normal Mode" msgstr "Standardutseende i normalt läge" -#: ../app/dialogs/preferences-dialog.c:2607 +#: ../app/dialogs/preferences-dialog.c:2811 msgid "Default Appearance in Fullscreen Mode" msgstr "Standardutseende i helskärmsläge" -#: ../app/dialogs/preferences-dialog.c:2616 +#: ../app/dialogs/preferences-dialog.c:2820 msgid "Image Title & Statusbar Format" msgstr "Bildtitel och statusradsformat" -#: ../app/dialogs/preferences-dialog.c:2617 +#: ../app/dialogs/preferences-dialog.c:2821 msgid "Title & Status" msgstr "Titel och status" -#: ../app/dialogs/preferences-dialog.c:2635 +#: ../app/dialogs/preferences-dialog.c:2839 msgid "Current format" msgstr "Aktuellt format" -#: ../app/dialogs/preferences-dialog.c:2636 +#: ../app/dialogs/preferences-dialog.c:2840 msgid "Default format" msgstr "Standardformat" -#: ../app/dialogs/preferences-dialog.c:2637 +#: ../app/dialogs/preferences-dialog.c:2841 msgid "Show zoom percentage" msgstr "Visa zoomprocent" -#: ../app/dialogs/preferences-dialog.c:2638 +#: ../app/dialogs/preferences-dialog.c:2842 msgid "Show zoom ratio" msgstr "Visa zoomfaktor" -#: ../app/dialogs/preferences-dialog.c:2639 +#: ../app/dialogs/preferences-dialog.c:2843 msgid "Show image size" msgstr "Visa bildstorlek" -#: ../app/dialogs/preferences-dialog.c:2640 -#, fuzzy -#| msgid "Show image size" +#: ../app/dialogs/preferences-dialog.c:2844 msgid "Show drawable size" -msgstr "Visa bildstorlek" +msgstr "Visa ritytans storlek" -#: ../app/dialogs/preferences-dialog.c:2653 +#: ../app/dialogs/preferences-dialog.c:2857 msgid "Image Title Format" msgstr "Bildtitelformat" -#: ../app/dialogs/preferences-dialog.c:2655 +#: ../app/dialogs/preferences-dialog.c:2859 msgid "Image Statusbar Format" msgstr "Bildstatusradsformat" -#: ../app/dialogs/preferences-dialog.c:2739 -#, fuzzy -#| msgid "Image Window Appearance" +#: ../app/dialogs/preferences-dialog.c:2943 msgid "Image Window Snapping Behavior" -msgstr "Bildfönsterutseende" +msgstr "Fästbeteende för bildfönster" -#: ../app/dialogs/preferences-dialog.c:2740 -#, fuzzy -#| msgid "Flipping" +#: ../app/dialogs/preferences-dialog.c:2944 msgid "Snapping" -msgstr "Vänder" +msgstr "Fästning" -#: ../app/dialogs/preferences-dialog.c:2747 -#, fuzzy -#| msgid "Default Appearance in Normal Mode" +#: ../app/dialogs/preferences-dialog.c:2951 msgid "Default Behavior in Normal Mode" -msgstr "Standardutseende i normalt läge" +msgstr "Standardbeteende i normalt läge" -#: ../app/dialogs/preferences-dialog.c:2751 -#, fuzzy -#| msgid "Default Appearance in Fullscreen Mode" +#: ../app/dialogs/preferences-dialog.c:2955 msgid "Default Behavior in Fullscreen Mode" -msgstr "Standardutseende i helskärmsläge" +msgstr "Standardbeteende i helskärmsläge" -#: ../app/dialogs/preferences-dialog.c:2760 -#, fuzzy -#| msgid "_Snap distance:" +#: ../app/dialogs/preferences-dialog.c:2964 msgid "_Snapping distance:" -msgstr "_Fästningsavstånd:" +msgstr "_Fästavstånd:" -#: ../app/dialogs/preferences-dialog.c:2769 -#: ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/preferences-dialog.c:2973 +#: ../app/dialogs/preferences-dialog.c:2974 msgid "Input Devices" msgstr "Inmatningsenheter" #. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2776 +#: ../app/dialogs/preferences-dialog.c:2980 msgid "Extended Input Devices" msgstr "Utökade inmatningsenheter" -#: ../app/dialogs/preferences-dialog.c:2780 -msgid "Configure E_xtended Input Devices..." -msgstr "Konfigurera _utökade inmatningsenheter..." +#: ../app/dialogs/preferences-dialog.c:2984 +msgid "S_hare tool and tool options between input devices" +msgstr "_Dela verktyg och verktygsalternativ mellan inmatningsenheter" -#: ../app/dialogs/preferences-dialog.c:2787 +#: ../app/dialogs/preferences-dialog.c:2988 +msgid "Configure E_xtended Input Devices..." +msgstr "Konfigurera _utökade inmatningsenheter…" + +#: ../app/dialogs/preferences-dialog.c:2995 msgid "_Save input device settings on exit" msgstr "_Spara inställningar för inmatningsenheter vid avslutning" -#: ../app/dialogs/preferences-dialog.c:2791 +#: ../app/dialogs/preferences-dialog.c:2999 msgid "Save Input Device Settings _Now" msgstr "Spara inställningar för inmatningsenheter _nu" -#: ../app/dialogs/preferences-dialog.c:2798 +#: ../app/dialogs/preferences-dialog.c:3006 msgid "_Reset Saved Input Device Settings to Default Values" msgstr "" "_Återställ sparade inställningar för inmatningsenheter till standardvärden" -#: ../app/dialogs/preferences-dialog.c:2813 +#: ../app/dialogs/preferences-dialog.c:3021 msgid "Additional Input Controllers" msgstr "Ytterligare inmatningsenheter" -#: ../app/dialogs/preferences-dialog.c:2814 +#: ../app/dialogs/preferences-dialog.c:3022 msgid "Input Controllers" msgstr "Inmatningsenheter" -#: ../app/dialogs/preferences-dialog.c:2829 -#: ../app/dialogs/preferences-dialog.c:2830 +#: ../app/dialogs/preferences-dialog.c:3037 +#: ../app/dialogs/preferences-dialog.c:3038 msgid "Folders" msgstr "Kataloger" -#: ../app/dialogs/preferences-dialog.c:2846 +#: ../app/dialogs/preferences-dialog.c:3054 msgid "Temporary folder:" msgstr "Temporär mapp:" -#: ../app/dialogs/preferences-dialog.c:2847 +#: ../app/dialogs/preferences-dialog.c:3055 msgid "Select Folder for Temporary Files" msgstr "Välj mapp för temporärfiler" -#: ../app/dialogs/preferences-dialog.c:2851 +#: ../app/dialogs/preferences-dialog.c:3059 msgid "Swap folder:" msgstr "Växlingskatalog:" -#: ../app/dialogs/preferences-dialog.c:2852 +#: ../app/dialogs/preferences-dialog.c:3060 msgid "Select Swap Folder" msgstr "Välj växlingskatalog" -#: ../app/dialogs/preferences-dialog.c:2887 +#: ../app/dialogs/preferences-dialog.c:3092 msgid "Brush Folders" msgstr "Penselmappar" -#: ../app/dialogs/preferences-dialog.c:2889 +#: ../app/dialogs/preferences-dialog.c:3094 msgid "Select Brush Folders" msgstr "Välj penselmappar" -#: ../app/dialogs/preferences-dialog.c:2891 +#: ../app/dialogs/preferences-dialog.c:3096 msgid "Dynamics Folders" msgstr "Dynamikmappar" -#: ../app/dialogs/preferences-dialog.c:2893 +#: ../app/dialogs/preferences-dialog.c:3098 msgid "Select Dynamics Folders" msgstr "Välj dynamikmappar" -#: ../app/dialogs/preferences-dialog.c:2895 +#: ../app/dialogs/preferences-dialog.c:3100 msgid "Pattern Folders" msgstr "Mönstermappar" -#: ../app/dialogs/preferences-dialog.c:2897 +#: ../app/dialogs/preferences-dialog.c:3102 msgid "Select Pattern Folders" msgstr "Välj mönstermappar" -#: ../app/dialogs/preferences-dialog.c:2899 +#: ../app/dialogs/preferences-dialog.c:3104 msgid "Palette Folders" msgstr "Palettmappar" -#: ../app/dialogs/preferences-dialog.c:2901 +#: ../app/dialogs/preferences-dialog.c:3106 msgid "Select Palette Folders" msgstr "Välj palettmappar" -#: ../app/dialogs/preferences-dialog.c:2903 +#: ../app/dialogs/preferences-dialog.c:3108 msgid "Gradient Folders" msgstr "Gradientmappar" -#: ../app/dialogs/preferences-dialog.c:2905 +#: ../app/dialogs/preferences-dialog.c:3110 msgid "Select Gradient Folders" msgstr "Välj gradientmappar" -#: ../app/dialogs/preferences-dialog.c:2907 +#: ../app/dialogs/preferences-dialog.c:3112 msgid "Font Folders" msgstr "Typsnittsmappar" -#: ../app/dialogs/preferences-dialog.c:2909 +#: ../app/dialogs/preferences-dialog.c:3114 msgid "Select Font Folders" msgstr "Välj typsnittsmappar" -#: ../app/dialogs/preferences-dialog.c:2911 +#: ../app/dialogs/preferences-dialog.c:3116 msgid "Tool Preset Folders" -msgstr "Mappar för verktygsförval" +msgstr "Mappar för verktygsförinställning" -#: ../app/dialogs/preferences-dialog.c:2913 +#: ../app/dialogs/preferences-dialog.c:3118 msgid "Select Tool Preset Folders" -msgstr "Välj verktygsförvalsmappar" +msgstr "Välj verktygsförinställningsmappar" -#: ../app/dialogs/preferences-dialog.c:2915 -#, fuzzy -#| msgid "Brush Folders" +#: ../app/dialogs/preferences-dialog.c:3120 msgid "MyPaint Brush Folders" -msgstr "Penselmappar" +msgstr "MyPaint-penselmappar" -#: ../app/dialogs/preferences-dialog.c:2917 -#, fuzzy -#| msgid "Select Brush Folders" +#: ../app/dialogs/preferences-dialog.c:3122 msgid "Select MyPaint Brush Folders" -msgstr "Välj penselmappar" +msgstr "Välj MyPaint-penselmappar" -#: ../app/dialogs/preferences-dialog.c:2919 -msgid "Plug-In Folders" +#: ../app/dialogs/preferences-dialog.c:3124 +msgid "Plug-in Folders" msgstr "Mappar för insticksmodul" -#: ../app/dialogs/preferences-dialog.c:2921 -msgid "Select Plug-In Folders" +#: ../app/dialogs/preferences-dialog.c:3126 +msgid "Select plug-in Folders" msgstr "Välj mappar för insticksmodul" -#: ../app/dialogs/preferences-dialog.c:2923 +#: ../app/dialogs/preferences-dialog.c:3128 msgid "Scripts" msgstr "Skript" -#: ../app/dialogs/preferences-dialog.c:2923 +#: ../app/dialogs/preferences-dialog.c:3128 msgid "Script-Fu Folders" msgstr "Mappar för Script-Fu" -#: ../app/dialogs/preferences-dialog.c:2925 +#: ../app/dialogs/preferences-dialog.c:3130 msgid "Select Script-Fu Folders" msgstr "Välj mappar för Script-Fu" -#: ../app/dialogs/preferences-dialog.c:2927 +#: ../app/dialogs/preferences-dialog.c:3132 msgid "Module Folders" msgstr "Modulmappar" -#: ../app/dialogs/preferences-dialog.c:2929 +#: ../app/dialogs/preferences-dialog.c:3134 msgid "Select Module Folders" msgstr "Välj modulmappar" -#: ../app/dialogs/preferences-dialog.c:2931 +#: ../app/dialogs/preferences-dialog.c:3136 msgid "Interpreters" msgstr "Tolkar" -#: ../app/dialogs/preferences-dialog.c:2931 +#: ../app/dialogs/preferences-dialog.c:3136 msgid "Interpreter Folders" msgstr "Tolkarmappar" -#: ../app/dialogs/preferences-dialog.c:2933 +#: ../app/dialogs/preferences-dialog.c:3138 msgid "Select Interpreter Folders" msgstr "Välj tolkarmappar" -#: ../app/dialogs/preferences-dialog.c:2935 +#: ../app/dialogs/preferences-dialog.c:3140 msgid "Environment" msgstr "Miljö" -#: ../app/dialogs/preferences-dialog.c:2935 +#: ../app/dialogs/preferences-dialog.c:3140 msgid "Environment Folders" msgstr "Miljömappar" -#: ../app/dialogs/preferences-dialog.c:2937 +#: ../app/dialogs/preferences-dialog.c:3142 msgid "Select Environment Folders" msgstr "Välj miljömappar" -#: ../app/dialogs/preferences-dialog.c:2939 +#: ../app/dialogs/preferences-dialog.c:3144 msgid "Themes" msgstr "Teman" -#: ../app/dialogs/preferences-dialog.c:2939 +#: ../app/dialogs/preferences-dialog.c:3144 msgid "Theme Folders" msgstr "Temamappar" -#: ../app/dialogs/preferences-dialog.c:2941 +#: ../app/dialogs/preferences-dialog.c:3146 msgid "Select Theme Folders" msgstr "Välj temamappar" -#: ../app/dialogs/preferences-dialog.c:2943 -#, fuzzy -#| msgid "Themes" +#: ../app/dialogs/preferences-dialog.c:3148 msgid "Icon Themes" -msgstr "Teman" +msgstr "Ikonteman" -#: ../app/dialogs/preferences-dialog.c:2943 -#, fuzzy -#| msgid "Theme Folders" +#: ../app/dialogs/preferences-dialog.c:3148 msgid "Icon Theme Folders" -msgstr "Temamappar" +msgstr "Mappar för ikontema" -#: ../app/dialogs/preferences-dialog.c:2945 -#, fuzzy -#| msgid "Select Theme Folders" +#: ../app/dialogs/preferences-dialog.c:3150 msgid "Select Icon Theme Folders" -msgstr "Välj temamappar" +msgstr "Välj mappar för ikonteman" -#: ../app/dialogs/print-size-dialog.c:138 +#: ../app/dialogs/print-size-dialog.c:144 msgid "Print Size" msgstr "Utskriftsstorlek" #. the image size labels -#: ../app/dialogs/print-size-dialog.c:169 ../app/widgets/gimpsizebox.c:193 -#: ../app/widgets/gimptemplateeditor.c:195 +#: ../app/dialogs/print-size-dialog.c:175 ../app/widgets/gimpsizebox.c:193 +#: ../app/widgets/gimptemplateeditor.c:198 msgid "_Width:" msgstr "_Bredd:" -#: ../app/dialogs/print-size-dialog.c:176 ../app/widgets/gimpsizebox.c:197 -#: ../app/widgets/gimptemplateeditor.c:202 +#: ../app/dialogs/print-size-dialog.c:182 ../app/widgets/gimpsizebox.c:197 +#: ../app/widgets/gimptemplateeditor.c:205 msgid "H_eight:" msgstr "H_öjd:" #. the resolution labels -#: ../app/dialogs/print-size-dialog.c:230 ../app/widgets/gimpsizebox.c:260 -#: ../app/widgets/gimptemplateeditor.c:324 +#: ../app/dialogs/print-size-dialog.c:236 ../app/widgets/gimpsizebox.c:260 +#: ../app/widgets/gimptemplateeditor.c:327 msgid "_X resolution:" msgstr "_X upplösning:" -#: ../app/dialogs/print-size-dialog.c:237 ../app/widgets/gimpsizebox.c:263 -#: ../app/widgets/gimptemplateeditor.c:331 +#: ../app/dialogs/print-size-dialog.c:243 ../app/widgets/gimpsizebox.c:263 +#: ../app/widgets/gimptemplateeditor.c:334 msgid "_Y resolution:" -msgstr "_Y upplösning:" +msgstr "_Y-upplösning:" -#: ../app/dialogs/print-size-dialog.c:248 ../app/widgets/gimpsizebox.c:256 +#: ../app/dialogs/print-size-dialog.c:254 ../app/widgets/gimpsizebox.c:256 #, c-format msgid "pixels/%a" msgstr "bildpunkter/%a" -#: ../app/dialogs/quit-dialog.c:144 +#: ../app/dialogs/quit-dialog.c:164 msgid "Quit GIMP" msgstr "Avsluta GIMP" -#: ../app/dialogs/quit-dialog.c:144 +#: ../app/dialogs/quit-dialog.c:164 msgid "Close All Images" msgstr "Stäng alla bilder" -#: ../app/dialogs/quit-dialog.c:212 +#: ../app/dialogs/quit-dialog.c:256 msgid "If you quit GIMP now, these changes will be lost." msgstr "Om du avslutar GIMP nu kommer dessa ändringar förloras." -#: ../app/dialogs/quit-dialog.c:215 +#: ../app/dialogs/quit-dialog.c:259 msgid "If you close these images now, changes will be lost." msgstr "Om du stänger dessa bilder nu kommer ändringarna att gå förlorade." -#: ../app/dialogs/quit-dialog.c:300 +#. TRANSLATORS: unless your language +#. msgstr[0] applies to 1 only (as +#. in English), replace "one" with %d. +#: ../app/dialogs/quit-dialog.c:346 #, c-format msgid "There is one image with unsaved changes:" msgid_plural "There are %d images with unsaved changes:" msgstr[0] "Det finns en bild med osparade ändringar:" msgstr[1] "Det finns %d bilder med osparade ändringar:" -#: ../app/dialogs/quit-dialog.c:311 +#: ../app/dialogs/quit-dialog.c:357 #, c-format msgid "Press %s to quit." msgstr "Klicka på %s för att avsluta." -#: ../app/dialogs/quit-dialog.c:314 +#: ../app/dialogs/quit-dialog.c:360 #, c-format msgid "Press %s to close all images." msgstr "Klicka på %s för att stänga alla bilder." -#: ../app/dialogs/quit-dialog.c:330 +#: ../app/dialogs/quit-dialog.c:364 ../app/dialogs/user-install-dialog.c:89 +msgid "_Quit" +msgstr "_Avsluta" + +#: ../app/dialogs/quit-dialog.c:364 +msgid "Cl_ose" +msgstr "S_täng" + +#: ../app/dialogs/quit-dialog.c:388 #, c-format msgid "Press %s to discard all changes and quit." msgstr "Klicka på %s för att ignorera alla ändringar och avsluta." -#: ../app/dialogs/quit-dialog.c:333 +#: ../app/dialogs/quit-dialog.c:391 #, c-format msgid "Press %s to discard all changes and close all images." msgstr "Klicka på %s för att ignorera alla ändringar och stänga alla bilder." -#: ../app/dialogs/quit-dialog.c:341 ../app/display/gimpdisplayshell-close.c:183 +#: ../app/dialogs/quit-dialog.c:399 ../app/display/gimpdisplayshell-close.c:180 msgid "_Discard Changes" msgstr "_Förkasta ändringar" -#: ../app/dialogs/quit-dialog.c:421 +#: ../app/dialogs/quit-dialog.c:486 #, c-format msgid "Exported to %s" msgstr "Exporterad till %s" -#: ../app/dialogs/resize-dialog.c:120 +#: ../app/dialogs/quit-dialog.c:589 +msgid "Save this image" +msgstr "Spara denna bild" + +#: ../app/dialogs/quit-dialog.c:591 +msgid "Save as" +msgstr "Spara som" + +#: ../app/dialogs/resize-dialog.c:143 msgid "Canvas Size" msgstr "Storlek på rityta" -#: ../app/dialogs/resize-dialog.c:131 ../app/dialogs/scale-dialog.c:109 +#: ../app/dialogs/resize-dialog.c:155 ../app/dialogs/scale-dialog.c:114 msgid "Layer Size" msgstr "Lagerstorlek" -#: ../app/dialogs/resize-dialog.c:301 +#: ../app/dialogs/resize-dialog.c:156 +msgid "Fill With" +msgstr "Fyll med" + +#: ../app/dialogs/resize-dialog.c:185 +msgid "Re_set" +msgstr "Åter_ställ" + +#: ../app/dialogs/resize-dialog.c:187 +msgid "_Resize" +msgstr "_Ändra storlek" + +#: ../app/dialogs/resize-dialog.c:331 msgid "Resize _layers:" msgstr "Ändra storlek på _lager:" -#: ../app/dialogs/resize-dialog.c:316 -#, fuzzy -#| msgid "Resize Text Layer" +#: ../app/dialogs/resize-dialog.c:379 msgid "Resize _text layers" -msgstr "Ändra storlek på textlager" +msgstr "Ändra storlek på _textlager" + +#: ../app/dialogs/resize-dialog.c:390 +msgid "Resizing text layers will make them uneditable" +msgstr "Att skala om textlager kommer att göra dem oredigerbara" #: ../app/dialogs/resolution-calibrate-dialog.c:70 msgid "Calibrate Monitor Resolution" @@ -13929,35 +16482,31 @@ msgid "_Vertical:" msgstr "_Vertikal:" #. Image size frame -#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:173 +#: ../app/dialogs/scale-dialog.c:103 ../app/widgets/gimptemplateeditor.c:176 msgid "Image Size" msgstr "Bildstorlek" -#: ../app/dialogs/scale-dialog.c:176 ../app/paint/gimppaintoptions.c:402 +#: ../app/dialogs/scale-dialog.c:181 ../app/paint/gimppaintoptions.c:412 msgid "Quality" msgstr "Kvalitet" -#: ../app/dialogs/scale-dialog.c:188 +#: ../app/dialogs/scale-dialog.c:193 msgid "I_nterpolation:" msgstr "I_nterpolation:" -#: ../app/dialogs/scale-dialog.c:207 -msgid "" -"Indexed color layers are always scaled without interpolation. The chosen " -"interpolation type will affect channels and layer masks only." -msgstr "" -"Lager med indexerade färger skalas alltid utan interpolation. Den valda " -"interpoleringstypen kommer endast att påverka kanaler och lagermasker." - -#: ../app/dialogs/stroke-dialog.c:98 +#: ../app/dialogs/stroke-dialog.c:122 msgid "Choose Stroke Style" -msgstr "Välj strykningsstil" +msgstr "Välj streckstil" -#: ../app/dialogs/stroke-dialog.c:215 +#: ../app/dialogs/stroke-dialog.c:129 +msgid "_Stroke" +msgstr "_Penseldrag" + +#: ../app/dialogs/stroke-dialog.c:238 msgid "Paint tool:" msgstr "Målarverktyg:" -#: ../app/dialogs/stroke-dialog.c:229 +#: ../app/dialogs/stroke-dialog.c:252 msgid "_Emulate brush dynamics" msgstr "_Emulera penseldynamik" @@ -13972,8 +16521,7 @@ msgstr "GIMP-tipsfilen verkar saknas!" #: ../app/dialogs/tips-dialog.c:105 #, c-format msgid "There should be a file called '%s'. Please check your installation." -msgstr "" -"Det borde finnas en fil som heter \"%s\". Kontrollera din installation." +msgstr "Det borde finnas en fil som heter ”%s”. Kontrollera din installation." #: ../app/dialogs/tips-dialog.c:111 msgid "The GIMP tips file could not be parsed!" @@ -13992,7 +16540,7 @@ msgid "_Next Tip" msgstr "_Nästa tips" #. a link to the related section in the user manual -#: ../app/dialogs/tips-dialog.c:204 +#: ../app/dialogs/tips-dialog.c:205 msgid "Learn more" msgstr "Läs mer" @@ -14021,148 +16569,210 @@ msgstr "GIMP:s användarinstallation misslyckades; se loggfilen för detaljer." msgid "Installation Log" msgstr "Installationslogg" -#: ../app/dialogs/vectors-export-dialog.c:55 +#: ../app/dialogs/vectors-export-dialog.c:80 msgid "Export Path to SVG" msgstr "Exportera bana till SVG" -#: ../app/dialogs/vectors-export-dialog.c:90 +#: ../app/dialogs/vectors-export-dialog.c:121 msgid "Export the active path" msgstr "Exportera aktiv bana" -#: ../app/dialogs/vectors-export-dialog.c:91 +#: ../app/dialogs/vectors-export-dialog.c:122 msgid "Export all paths from this image" msgstr "Exportera alla banor från denna bild" -#: ../app/dialogs/vectors-import-dialog.c:58 +#: ../app/dialogs/vectors-import-dialog.c:85 msgid "Import Paths from SVG" msgstr "Importera bana från SVG" -#: ../app/dialogs/vectors-import-dialog.c:92 +#: ../app/dialogs/vectors-import-dialog.c:124 msgid "All files (*.*)" msgstr "Alla filer (*.*)" -#: ../app/dialogs/vectors-import-dialog.c:97 +#: ../app/dialogs/vectors-import-dialog.c:129 msgid "Scalable SVG image (*.svg)" msgstr "Skalbar SVG-bild (*.svg)" -#: ../app/dialogs/vectors-import-dialog.c:108 +#: ../app/dialogs/vectors-import-dialog.c:140 msgid "_Merge imported paths" msgstr "_Slå ihop importerade banor" -#: ../app/dialogs/vectors-import-dialog.c:118 +#: ../app/dialogs/vectors-import-dialog.c:150 msgid "_Scale imported paths to fit image" msgstr "_Skala importerade banor för att passa bilden" -#: ../app/display/display-enums.c:60 +#: ../app/dialogs/vectors-options-dialog.c:106 +msgid "Path _name:" +msgstr "Ban_namn:" + +#: ../app/dialogs/vectors-options-dialog.c:108 +msgid "Lock path _strokes" +msgstr "Lås ban_streck" + +#: ../app/dialogs/vectors-options-dialog.c:109 +msgid "Lock path _position" +msgstr "Lås ban_position" + +#: ../app/display/display-enums.c:124 msgctxt "guides-type" msgid "No guides" msgstr "Inga hjälplinjer" -#: ../app/display/display-enums.c:61 +#: ../app/display/display-enums.c:125 msgctxt "guides-type" msgid "Center lines" msgstr "Centrumlinjer" -#: ../app/display/display-enums.c:62 +#: ../app/display/display-enums.c:126 msgctxt "guides-type" msgid "Rule of thirds" msgstr "Tredjedelsregeln" -#: ../app/display/display-enums.c:63 +#: ../app/display/display-enums.c:127 msgctxt "guides-type" msgid "Rule of fifths" msgstr "Femtedelsregeln" -#: ../app/display/display-enums.c:64 +#: ../app/display/display-enums.c:128 msgctxt "guides-type" msgid "Golden sections" msgstr "Gyllene snitt" -#: ../app/display/display-enums.c:65 +#: ../app/display/display-enums.c:129 msgctxt "guides-type" msgid "Diagonal lines" msgstr "Diagonala linjer" -#: ../app/display/display-enums.c:66 +#: ../app/display/display-enums.c:130 msgctxt "guides-type" msgid "Number of lines" msgstr "Antal linjer" -#: ../app/display/display-enums.c:67 +#: ../app/display/display-enums.c:131 msgctxt "guides-type" msgid "Line spacing" msgstr "Radavstånd" -#: ../app/display/gimpcursorview.c:217 ../app/display/gimpcursorview.c:223 -#: ../app/display/gimpcursorview.c:242 ../app/display/gimpcursorview.c:248 -#: ../app/display/gimpcursorview.c:267 ../app/display/gimpcursorview.c:273 -#: ../app/display/gimpcursorview.c:289 ../app/display/gimpcursorview.c:296 -#: ../app/display/gimpcursorview.c:681 ../app/display/gimpcursorview.c:683 -#: ../app/display/gimpcursorview.c:685 ../app/display/gimpcursorview.c:687 -#: ../app/display/gimpcursorview.c:800 ../app/display/gimpcursorview.c:801 -#: ../app/display/gimpcursorview.c:802 ../app/display/gimpcursorview.c:803 -#: ../app/widgets/gimpcolorframe.c:702 -msgid "n/a" -msgstr "---" +#: ../app/display/display-enums.c:313 +msgctxt "rectangle-fixed-rule" +msgid "Aspect ratio" +msgstr "Bildförhållande" -#: ../app/display/gimpcursorview.c:220 ../app/display/gimpcursorview.c:245 -#: ../app/display/gimpcursorview.c:270 +#: ../app/display/display-enums.c:314 +msgctxt "rectangle-fixed-rule" +msgid "Width" +msgstr "Bredd" + +#: ../app/display/display-enums.c:315 +msgctxt "rectangle-fixed-rule" +msgid "Height" +msgstr "Höjd" + +#: ../app/display/display-enums.c:316 +msgctxt "rectangle-fixed-rule" +msgid "Size" +msgstr "Storlek" + +#: ../app/display/display-enums.c:409 +msgctxt "transform-handle-mode" +msgid "Add / Transform" +msgstr "Lägg till/transformera" + +#: ../app/display/display-enums.c:410 +msgctxt "transform-handle-mode" +msgid "Move" +msgstr "Flytta" + +#: ../app/display/display-enums.c:411 +msgctxt "transform-handle-mode" +msgid "Remove" +msgstr "Ta bort" + +#: ../app/display/display-enums.c:440 +msgctxt "vector-mode" +msgid "Design" +msgstr "Design" + +#: ../app/display/display-enums.c:441 +msgctxt "vector-mode" +msgid "Edit" +msgstr "Redigera" + +#: ../app/display/display-enums.c:442 +msgctxt "vector-mode" +msgid "Move" +msgstr "Flytta" + +# sebras: blir det bättre med "finns ej"? +#: ../app/display/gimpcursorview.c:225 ../app/display/gimpcursorview.c:231 +#: ../app/display/gimpcursorview.c:250 ../app/display/gimpcursorview.c:256 +#: ../app/display/gimpcursorview.c:275 ../app/display/gimpcursorview.c:281 +#: ../app/display/gimpcursorview.c:297 ../app/display/gimpcursorview.c:304 +#: ../app/display/gimpcursorview.c:708 ../app/display/gimpcursorview.c:710 +#: ../app/display/gimpcursorview.c:712 ../app/display/gimpcursorview.c:714 +#: ../app/display/gimpcursorview.c:793 ../app/display/gimpcursorview.c:794 +#: ../app/display/gimpcursorview.c:795 ../app/display/gimpcursorview.c:796 +msgid "n/a" +msgstr "-" + +#: ../app/display/gimpcursorview.c:228 ../app/display/gimpcursorview.c:253 +#: ../app/display/gimpcursorview.c:278 #: ../app/widgets/gimpdeviceinfoeditor.c:139 msgid "X" msgstr "X" -#: ../app/display/gimpcursorview.c:226 ../app/display/gimpcursorview.c:251 -#: ../app/display/gimpcursorview.c:276 +#: ../app/display/gimpcursorview.c:234 ../app/display/gimpcursorview.c:259 +#: ../app/display/gimpcursorview.c:284 #: ../app/widgets/gimpdeviceinfoeditor.c:140 msgid "Y" msgstr "Y" #. Units -#: ../app/display/gimpcursorview.c:232 +#: ../app/display/gimpcursorview.c:240 msgid "Units" msgstr "Enheter" #. Selection Bounding Box -#: ../app/display/gimpcursorview.c:257 +#: ../app/display/gimpcursorview.c:265 msgid "Selection Bounding Box" msgstr "Markeringens begränsningsyta" #. Width -#: ../app/display/gimpcursorview.c:293 +#: ../app/display/gimpcursorview.c:301 msgid "W" msgstr "B" #. Height -#: ../app/display/gimpcursorview.c:300 +#: ../app/display/gimpcursorview.c:308 msgid "H" msgstr "N" -#: ../app/display/gimpcursorview.c:329 +#: ../app/display/gimpcursorview.c:339 msgid "_Sample Merged" msgstr "Sa_mpla sammanfogade" -#: ../app/display/gimpdisplayshell.c:541 +#: ../app/display/gimpdisplayshell.c:552 msgid "Access the image menu" msgstr "Kom åt bildmenyn" -#: ../app/display/gimpdisplayshell.c:656 +#: ../app/display/gimpdisplayshell.c:670 msgid "Zoom image when window size changes" msgstr "Zooma bild när fönsterstorlek ändras" -#: ../app/display/gimpdisplayshell.c:685 +#: ../app/display/gimpdisplayshell.c:699 msgid "Toggle Quick Mask" msgstr "Visa snabbmask" -#: ../app/display/gimpdisplayshell.c:708 +#: ../app/display/gimpdisplayshell.c:722 msgid "Navigate the image display" msgstr "Navigera i bildvisningen" -#: ../app/display/gimpdisplayshell.c:778 ../app/display/gimpdisplayshell.c:1483 +#: ../app/display/gimpdisplayshell.c:792 ../app/display/gimpdisplayshell.c:1448 #: ../app/widgets/gimptoolbox.c:251 msgid "Drop image files here to open them" msgstr "Släpp bildfiler här för att öppna dem" -#: ../app/display/gimpdisplayshell-callbacks.c:533 +#: ../app/display/gimpdisplayshell-callbacks.c:565 #, c-format msgid "" "Unstable Development Version\n" @@ -14172,24 +16782,34 @@ msgid "" "Please test bugs against latest git master branch\n" "before reporting them." msgstr "" +"Instabil utvecklingsversion\n" +"\n" +"incheckning %s\n" +"\n" +"Vänligen testa fel mot senaste master-grenen i git\n" +"innan du rapporterar dem." #: ../app/display/gimpdisplayshell-close.c:168 -#: ../app/display/gimpdisplayshell-close.c:268 +#: ../app/display/gimpdisplayshell-close.c:266 #, c-format msgid "Close %s" msgstr "Stäng %s" -#: ../app/display/gimpdisplayshell-close.c:216 +#: ../app/display/gimpdisplayshell-close.c:178 +msgid "Save _As" +msgstr "Spara s_om" + +#: ../app/display/gimpdisplayshell-close.c:214 #, c-format msgid "Press %s to discard all changes and close the image." msgstr "Klicka på %s för att ignorera alla ändringar och stänga bilden." -#: ../app/display/gimpdisplayshell-close.c:276 +#: ../app/display/gimpdisplayshell-close.c:274 #, c-format msgid "Save the changes to image '%s' before closing?" -msgstr "Spara ändringar till bilden \"%s\" innan du avslutar?" +msgstr "Spara ändringar till bilden ”%s” innan du avslutar?" -#: ../app/display/gimpdisplayshell-close.c:309 +#: ../app/display/gimpdisplayshell-close.c:307 #, c-format msgid "If you don't save the image, changes from the last hour will be lost." msgid_plural "" @@ -14201,7 +16821,7 @@ msgstr[1] "" "Om du inte sparar bilden kommer du att förlora ändringar gjorda de senaste " "%d timmarna." -#: ../app/display/gimpdisplayshell-close.c:320 +#: ../app/display/gimpdisplayshell-close.c:318 #, c-format msgid "" "If you don't save the image, changes from the last hour and %d minute will " @@ -14213,10 +16833,10 @@ msgstr[0] "" "Om du inte sparar bilden kommer du att förlora ändringar gjorda den senaste " "timmen och %d minut." msgstr[1] "" -"\"Om du inte sparar bilden kommer du att förlora ändringar gjorda den " -"senaste timmen och %d minuterna." +"Om du inte sparar bilden kommer du att förlora ändringar gjorda den senaste " +"timmen och %d minuterna." -#: ../app/display/gimpdisplayshell-close.c:332 +#: ../app/display/gimpdisplayshell-close.c:330 #, c-format msgid "If you don't save the image, changes from the last minute will be lost." msgid_plural "" @@ -14228,63 +16848,57 @@ msgstr[1] "" "Om du inte sparar bilden kommer du att förlora ändringar gjorda de senaste " "%d minuterna." -#: ../app/display/gimpdisplayshell-close.c:350 +#: ../app/display/gimpdisplayshell-close.c:348 #, c-format msgid "The image has been exported to '%s'." -msgstr "Bilden har exporterats till '%s'." +msgstr "Bilden har exporterats till ”%s”." -#: ../app/display/gimpdisplayshell-dnd.c:248 -#: ../app/display/gimpdisplayshell-dnd.c:669 -#: ../app/display/gimpdisplayshell-dnd.c:728 +#: ../app/display/gimpdisplayshell-dnd.c:246 +#: ../app/display/gimpdisplayshell-dnd.c:673 +#: ../app/display/gimpdisplayshell-dnd.c:733 msgid "Drop New Layer" msgstr "Släpp nytt lager" -#: ../app/display/gimpdisplayshell-dnd.c:291 +#: ../app/display/gimpdisplayshell-dnd.c:289 msgid "Drop New Path" msgstr "Släpp ny bana" -#: ../app/display/gimpdisplayshell-dnd.c:362 -#: ../app/display/gimpdisplayshell-dnd.c:478 ../app/tools/gimpblendtool.c:245 -#: ../app/tools/gimpbucketfilltool.c:137 ../app/tools/gimpfiltertool.c:301 -#: ../app/tools/gimpselectiontool.c:427 +#: ../app/display/gimpdisplayshell-dnd.c:360 ../app/tools/gimpblendtool.c:243 +#: ../app/tools/gimpbucketfilltool.c:137 ../app/tools/gimpcagetool.c:220 +#: ../app/tools/gimpfiltertool.c:270 ../app/tools/gimpselectiontool.c:427 msgid "Cannot modify the pixels of layer groups." -msgstr "Kan inte ändra pixlarna i lagergrupper." +msgstr "Kan inte ändra bildpunkterna i lagergrupper." -#: ../app/display/gimpdisplayshell-dnd.c:370 -#: ../app/display/gimpdisplayshell-dnd.c:486 ../app/tools/gimpblendtool.c:252 -#: ../app/tools/gimpbucketfilltool.c:144 ../app/tools/gimpcroptool.c:325 -#: ../app/tools/gimpfiltertool.c:308 ../app/tools/gimppainttool.c:278 -#: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:1842 -#: ../app/tools/gimpwarptool.c:579 +#: ../app/display/gimpdisplayshell-dnd.c:368 ../app/tools/gimpblendtool.c:250 +#: ../app/tools/gimpbucketfilltool.c:144 ../app/tools/gimpcagetool.c:227 +#: ../app/tools/gimpcroptool.c:462 ../app/tools/gimpfiltertool.c:277 +#: ../app/tools/gimppainttool.c:277 ../app/tools/gimpselectiontool.c:432 +#: ../app/tools/gimptransformtool.c:1449 ../app/tools/gimpwarptool.c:629 msgid "The active layer's pixels are locked." -msgstr "Det aktiva lagrets pixlar är låsta." +msgstr "Det aktiva lagrets bildpunkter är låsta." -#: ../app/display/gimpdisplayshell-dnd.c:413 +#: ../app/display/gimpdisplayshell-dnd.c:411 #: ../app/widgets/gimpdrawabletreeview.c:247 #: ../app/widgets/gimpdrawabletreeview.c:358 -#, fuzzy -#| msgid "Drop New Layer" msgctxt "undo-type" msgid "Drop pattern to layer" -msgstr "Släpp nytt lager" +msgstr "Släpp mönster till lager" -#: ../app/display/gimpdisplayshell-dnd.c:435 +#: ../app/display/gimpdisplayshell-dnd.c:433 #: ../app/widgets/gimpdrawabletreeview.c:277 #: ../app/widgets/gimpdrawabletreeview.c:378 -#, fuzzy -#| msgid "Drop layers" msgctxt "undo-type" msgid "Drop color to layer" -msgstr "Förkasta lager" +msgstr "Släpp färg till lager" -#: ../app/display/gimpdisplayshell-dnd.c:565 -#: ../app/widgets/gimplayertreeview.c:745 +#: ../app/display/gimpdisplayshell-dnd.c:569 +#: ../app/widgets/gimplayertreeview.c:756 msgid "Drop layers" msgstr "Förkasta lager" -#: ../app/display/gimpdisplayshell-dnd.c:702 -#: ../app/display/gimpdisplayshell-dnd.c:720 -#: ../app/widgets/gimplayertreeview.c:820 ../app/widgets/gimptoolbox-dnd.c:272 +#: ../app/display/gimpdisplayshell-dnd.c:706 +#: ../app/display/gimpdisplayshell-dnd.c:724 +#: ../app/widgets/gimplayertreeview.c:831 ../app/widgets/gimptoolbox-dnd.c:272 msgid "Dropped Buffer" msgstr "Förkastad buffert" @@ -14296,44 +16910,36 @@ msgstr "Färgvisningsfilter" msgid "Configure Color Display Filters" msgstr "Konfigurera färgvisningsfilter" -#: ../app/display/gimpdisplayshell-handlers.c:869 +#: ../app/display/gimpdisplayshell-handlers.c:871 #, c-format msgid "Image saved to '%s'" -msgstr "Bilden sparades till \"%s\"" +msgstr "Bilden sparades till ”%s”" -#: ../app/display/gimpdisplayshell-handlers.c:881 +#: ../app/display/gimpdisplayshell-handlers.c:884 #, c-format msgid "Image exported to '%s'" -msgstr "Bilden exporterades till \"%s\"" +msgstr "Bilden exporterades till ”%s”" -#: ../app/display/gimpdisplayshell-layer-select.c:125 +#: ../app/display/gimpdisplayshell-layer-select.c:128 msgid "Layer Select" msgstr "Lagerval" #: ../app/display/gimpdisplayshell-rotate-dialog.c:114 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Rotate image" msgid "Rotate View" -msgstr "Rotera bild" +msgstr "Rotera vy" #: ../app/display/gimpdisplayshell-rotate-dialog.c:116 -#, fuzzy -#| msgctxt "layers-action" -#| msgid "Select _Bottom Layer" msgid "Select Rotation Angle" -msgstr "Välj _nedersta lagret" +msgstr "Välj rotationsvinkel" #: ../app/display/gimpdisplayshell-rotate-dialog.c:154 -#: ../app/tools/gimpmeasuretool.c:1111 +#: ../app/tools/gimpmeasuretool.c:698 msgid "Angle:" msgstr "Vinkel:" #: ../app/display/gimpdisplayshell-rotate-dialog.c:167 -#, fuzzy -#| msgid "15 degrees (%s)" msgid "degrees" -msgstr "15° (%s)" +msgstr "grader" #: ../app/display/gimpdisplayshell-scale-dialog.c:115 msgid "Zoom Ratio" @@ -14341,7 +16947,7 @@ msgstr "Zoomfaktor" #: ../app/display/gimpdisplayshell-scale-dialog.c:117 msgid "Select Zoom Ratio" -msgstr "Välj zoomfaktor:" +msgstr "Välj zoomfaktor" #: ../app/display/gimpdisplayshell-scale-dialog.c:162 msgid "Zoom ratio:" @@ -14361,80 +16967,416 @@ msgstr "(ren)" #: ../app/display/gimpdisplayshell-title.c:341 #: ../app/display/gimpdisplayshell-title.c:350 -#: ../app/widgets/gimpactiongroup.c:908 +#: ../app/widgets/gimpactiongroup.c:971 #: ../app/widgets/gimpbuffersourcebox.c:171 -#: ../app/widgets/gimpbuffersourcebox.c:309 +#: ../app/widgets/gimpbuffersourcebox.c:295 msgid "(none)" msgstr "(ingen)" #: ../app/display/gimpdisplayshell-title.c:473 -#, fuzzy -#| msgid "Color Management" msgid "not color managed" -msgstr "Färghantering" +msgstr "inte färghanterad" -#: ../app/display/gimpstatusbar.c:430 +#: ../app/display/gimpdisplayshell-utils.c:149 +#: ../app/tools/gimpmeasuretool.c:528 ../app/tools/gimpmeasuretool.c:681 +#: ../app/tools/gimpmeasuretool.c:737 ../app/tools/gimpmeasuretool.c:765 +msgid "pixels" +msgstr "bildpunkter" + +#: ../app/display/gimpstatusbar.c:460 #, c-format msgid "Cancel %s" msgstr "Avbryt %s" -#: ../app/file/file-open.c:119 ../app/file/file-save.c:114 +#: ../app/display/gimptoolcompass.c:811 +msgid "Click to place vertical and horizontal guides" +msgstr "Klicka för att placera vertikala och horisontella hjälplinjer" + +#: ../app/display/gimptoolcompass.c:819 +msgid "Click to place a horizontal guide" +msgstr "Klicka för att placera ut en horisontell hjälplinje" + +#: ../app/display/gimptoolcompass.c:832 +msgid "Click to place a vertical guide" +msgstr "Klicka för att placera ut en vertikal hjälplinje" + +#: ../app/display/gimptoolcompass.c:844 +msgid "Click-Drag to add a new point" +msgstr "Klicka och dra för att lägga till en ny punkt" + +#: ../app/display/gimptoolcompass.c:854 ../app/tools/gimpiscissorstool.c:911 +msgid "Click-Drag to move this point" +msgstr "Klicka och dra för att flytta den här punkten" + +#: ../app/display/gimptoolcompass.c:873 +msgid "Click-Drag to move all points" +msgstr "Klicka och dra för att flytta alla punkter" + +#: ../app/display/gimptoolgyroscope.c:702 +msgid "Click-Drag to zoom" +msgstr "Klicka och dra för att zooma" + +#: ../app/display/gimptoolgyroscope.c:706 +#, c-format +msgid "%s for constrained steps" +msgstr "%s för begränsade steg" + +#: ../app/display/gimptoolgyroscope.c:713 +#: ../app/display/gimptooltransformgrid.c:1782 +msgid "Click-Drag to rotate" +msgstr "Klicka och dra för att rotera" + +#: ../app/display/gimptoolgyroscope.c:717 ../app/display/gimptoolline.c:1490 +#: ../app/tools/gimppainttool.c:569 +#, c-format +msgid "%s for constrained angles" +msgstr "%s för begränsade vinklar" + +#: ../app/display/gimptoolgyroscope.c:722 +msgid "Click-Drag to pan" +msgstr "Klicka och dra för att panorera" + +#: ../app/display/gimptoolgyroscope.c:728 +#, c-format +msgid "%s to rotate" +msgstr "%s för att rotera" + +#: ../app/display/gimptoolgyroscope.c:729 +#, c-format +msgid "%s for a constrained axis" +msgstr "%s för en begränsad axel" + +#: ../app/display/gimptoolgyroscope.c:730 +#, c-format +msgid "%s to zoom" +msgstr "%s för att zooma" + +#: ../app/display/gimptoolhandlegrid.c:837 +#: ../app/display/gimptooltransformgrid.c:1773 +msgid "Click-Drag to move" +msgstr "Klicka och dra för att flytta" + +#: ../app/display/gimptoolhandlegrid.c:840 +msgid "Click-Drag to rotate and scale" +msgstr "Klicka och dra för att rotera och skala" + +#: ../app/display/gimptoolhandlegrid.c:843 +msgid "Click-Drag to shear and scale" +msgstr "Klicka och dra för att skeva och skala" + +#: ../app/display/gimptoolhandlegrid.c:846 +#: ../app/display/gimptooltransformgrid.c:1761 +msgid "Click-Drag to change perspective" +msgstr "Klicka och dra för att ändra perspektiv" + +#: ../app/display/gimptoolhandlegrid.c:857 +msgid "Click to add a handle" +msgstr "Klicka för att lägga till handtag" + +#: ../app/display/gimptoolhandlegrid.c:863 +msgid "Click-Drag to move this handle" +msgstr "Klicka och dra för att flytta detta handtag" + +#: ../app/display/gimptoolhandlegrid.c:868 +msgid "Click-Drag to remove this handle" +msgstr "Klicka och dra för att ta bort detta handtag" + +#: ../app/display/gimptoolline.c:335 ../app/display/gimptoolline.c:498 +msgid "Line: " +msgstr "Linje: " + +#: ../app/display/gimptoolline.c:1484 +msgid "Click-Drag to move the endpoint" +msgstr "Klicka och dra för att flytta ändpunkten" + +#: ../app/display/gimptoolline.c:1497 +msgid "Release to remove the slider" +msgstr "Släpp för att ta bort skjutreglaget" + +#: ../app/display/gimptoolline.c:1501 +#, c-format +msgid "%s for constrained values" +msgstr "%s för begränsade värden" + +#: ../app/display/gimptoolline.c:1511 +msgid "Click-Drag to move the slider; drag away to remove the slider" +msgstr "" +"Klicka och dra för att flytta skjutreglaget; dra iväg för att ta bort " +"skjutreglaget" + +#: ../app/display/gimptoolline.c:1516 +msgid "Click-Drag to move or remove the slider" +msgstr "Klicka och dra för att flytta eller ta bort skjutreglaget" + +#: ../app/display/gimptoolline.c:1521 +msgid "Click-Drag to move the slider" +msgstr "Klicka och dra för att flytta skjutreglaget" + +#: ../app/display/gimptoolline.c:1532 +msgid "Click-Drag away to remove the slider" +msgstr "Klicka och dra för att ta bort skjutreglaget" + +#: ../app/display/gimptoolline.c:1536 +msgid "Click-Drag to remove the slider" +msgstr "Klicka och dra för att ta bort skjutreglaget" + +#: ../app/display/gimptoolline.c:1547 +msgid "Click or Click-Drag to add a new slider" +msgstr "Klicka eller klicka och dra för att lägga till ett nytt skjutreglage" + +#: ../app/display/gimptoolline.c:1553 +msgid "Click-Drag to move the line" +msgstr "Klicka och dra för att flytta linjen" + +#: ../app/display/gimptoolline.c:1565 +#, c-format +msgid "%s to move the whole line" +msgstr "%s för att flytta hela linjen" + +#: ../app/display/gimptoolpath.c:256 ../app/tools/gimpvectoroptions.c:71 +msgid "Edit Mode" +msgstr "Redigeringsläge" + +#: ../app/display/gimptoolpath.c:265 ../app/tools/gimpvectoroptions.c:79 +msgid "Polygonal" +msgstr "Polygont" + +#: ../app/display/gimptoolpath.c:266 ../app/tools/gimpvectoroptions.c:80 +msgid "Restrict editing to polygons" +msgstr "Begränsa redigering till polygoner" + +#: ../app/display/gimptoolpath.c:492 +msgid "The active path is locked." +msgstr "Den aktiva banan är låst." + +#: ../app/display/gimptoolpath.c:576 +msgid "Add Stroke" +msgstr "Lägg till penseldrag" + +#: ../app/display/gimptoolpath.c:600 +msgid "Add Anchor" +msgstr "Lägg till ankare" + +#: ../app/display/gimptoolpath.c:624 +msgid "Insert Anchor" +msgstr "Lägg in ankare" + +#: ../app/display/gimptoolpath.c:653 +msgid "Drag Handle" +msgstr "Handtag" + +#: ../app/display/gimptoolpath.c:684 +msgid "Drag Anchor" +msgstr "Dra ankare" + +#: ../app/display/gimptoolpath.c:702 +msgid "Drag Anchors" +msgstr "Dra ankare" + +#: ../app/display/gimptoolpath.c:724 +msgid "Drag Curve" +msgstr "Dra kurva" + +#: ../app/display/gimptoolpath.c:753 +msgid "Connect Strokes" +msgstr "Koppla ihop penseldrag" + +#: ../app/display/gimptoolpath.c:785 +msgid "Drag Path" +msgstr "Dra bana" + +#: ../app/display/gimptoolpath.c:796 +msgid "Convert Edge" +msgstr "Konvertera kant" + +#: ../app/display/gimptoolpath.c:827 +msgid "Delete Anchor" +msgstr "Ta bort ankare" + +#: ../app/display/gimptoolpath.c:850 +msgid "Delete Segment" +msgstr "Ta bort segment" + +#: ../app/display/gimptoolpath.c:1293 +msgid "Move Anchors" +msgstr "Flytta ankare" + +#: ../app/display/gimptoolpath.c:1440 +msgid "Click to pick path to edit" +msgstr "Klicka för att välja bana att redigera" + +#: ../app/display/gimptoolpath.c:1444 +msgid "Click to create a new path" +msgstr "Klicka för att skapa en ny bana" + +#: ../app/display/gimptoolpath.c:1448 +msgid "Click to create a new component of the path" +msgstr "Klicka för att skapa ny komponent till banan" + +#: ../app/display/gimptoolpath.c:1452 +msgid "Click or Click-Drag to create a new anchor" +msgstr "Klicka eller klicka och dra för att skapa ett nytt ankare" + +#: ../app/display/gimptoolpath.c:1462 ../app/display/gimptoolpath.c:1469 +msgid "Click-Drag to move the anchor around" +msgstr "Klicka och dra för att flytta runt ankaret" + +#: ../app/display/gimptoolpath.c:1473 ../app/display/gimptoolpath.c:1496 +msgid "Click-Drag to move the anchors around" +msgstr "Klicka och dra för att flytta runt ankarna" + +#: ../app/display/gimptoolpath.c:1479 +msgid "Click-Drag to move the handle around" +msgstr "Klicka och dra för att flytta runt handtaget" + +#: ../app/display/gimptoolpath.c:1486 +msgid "Click-Drag to move the handles around symmetrically" +msgstr "Klicka och dra för att flytta handtagen symmetriskt" + +#: ../app/display/gimptoolpath.c:1501 +msgid "Click-Drag to change the shape of the curve" +msgstr "Klicka och dra för att ändra kurvans form" + +#: ../app/display/gimptoolpath.c:1504 +#, c-format +msgid "%s: symmetrical" +msgstr "%s: symmetrisk" + +#: ../app/display/gimptoolpath.c:1509 +msgid "Click-Drag to move the component around" +msgstr "Klicka och dra för att flytta runt komponenten" + +#: ../app/display/gimptoolpath.c:1517 +msgid "Click-Drag to move the path around" +msgstr "Klicka och dra för att flytta runt banan" + +#: ../app/display/gimptoolpath.c:1521 +msgid "Click-Drag to insert an anchor on the path" +msgstr "Klicka och dra för att infoga ett ankare i banan" + +#: ../app/display/gimptoolpath.c:1529 +msgid "Click to delete this anchor" +msgstr "Klicka för att ta bort det här ankaret" + +#: ../app/display/gimptoolpath.c:1533 +msgid "Click to connect this anchor with the selected endpoint" +msgstr "Klicka för att koppla ihop ankaret med den valda ändpunkten" + +#: ../app/display/gimptoolpath.c:1538 +msgid "Click to open up the path" +msgstr "Klicka för att öppna upp banan" + +#: ../app/display/gimptoolpath.c:1542 +msgid "Click to make this node angular" +msgstr "Klicka för att göra noden vinkelformad" + +#: ../app/display/gimptoolpath.c:1546 +msgid "Clicking here does nothing, try clicking on path elements." +msgstr "Att klicka här gör ingenting, prova att klicka på banelement." + +#: ../app/display/gimptoolpath.c:1754 +msgid "Delete Anchors" +msgstr "Ta bort ankare" + +#: ../app/display/gimptoolpolygon.c:866 +msgid "Click to close shape" +msgstr "Klicka för att stänga form" + +#: ../app/display/gimptoolpolygon.c:870 +msgid "Click-Drag to move segment vertex" +msgstr "Klicka och dra för att flytta segmenthörnet" + +#: ../app/display/gimptoolpolygon.c:875 +msgid "Return commits, Escape cancels, Backspace re-opens shape" +msgstr "Retur verkställer, Escape avbryter, Backsteg återöppnar form" + +#: ../app/display/gimptoolpolygon.c:879 +msgid "Return commits, Escape cancels, Backspace removes last segment" +msgstr "Return verkställer, Escape avbryter, Backsteg tar bort sista segmentet" + +#: ../app/display/gimptoolpolygon.c:883 +msgid "Click-Drag adds a free segment, Click adds a polygonal segment" +msgstr "" +"Klicka och dra lägger till ett ledigt segment, Klick lägger till ett " +"polygont segment" + +#: ../app/display/gimptoolrectangle.c:555 +#: ../app/display/gimptoolrectangle.c:875 +#: ../app/tools/gimprectangleselecttool.c:728 +msgid "Rectangle: " +msgstr "Rektangel: " + +#: ../app/display/gimptoolrectangle.c:2151 +msgid "Position: " +msgstr "Position: " + +#: ../app/display/gimptooltransformgrid.c:1766 +#: ../app/display/gimptooltransformgrid.c:1771 +msgid "Click-Drag to scale" +msgstr "Klicka och dra för att skala" + +#: ../app/display/gimptooltransformgrid.c:1775 +msgid "Click-Drag to move the pivot point" +msgstr "Klicka och dra för att flytta pivotpunkten" + +#: ../app/display/gimptooltransformgrid.c:1780 +msgid "Click-Drag to shear" +msgstr "Klicka och dra för att skeva" + +#: ../app/file/file-open.c:116 ../app/file/file-save.c:114 msgid "Not a regular file" msgstr "Inte en vanlig fil" -#: ../app/file/file-open.c:128 ../app/file/file-save.c:123 +#: ../app/file/file-open.c:125 ../app/file/file-save.c:123 msgid "Permission denied" -msgstr "" +msgstr "Åtkomst nekad" -#: ../app/file/file-open.c:236 +#: ../app/file/file-open.c:257 #, c-format msgid "%s plug-in returned SUCCESS but did not return an image" msgstr "Insticksmodulen %s returnerade LYCKADES men returnerade ingen bild" -#: ../app/file/file-open.c:247 +#: ../app/file/file-open.c:268 #, c-format msgid "%s plug-In could not open image" msgstr "Insticksmodulen %s kunde inte öppna bild" -#: ../app/file/file-open.c:643 +#: ../app/file/file-open.c:658 msgid "Image doesn't contain any layers" msgstr "Bilden innehåller inga lager" -#: ../app/file/file-open.c:702 +#: ../app/file/file-open.c:717 #, c-format msgid "Opening '%s' failed: %s" -msgstr "Öppnande av \"%s\" misslyckades: %s" +msgstr "Öppnande av ”%s” misslyckades: %s" #: ../app/file/file-remote.c:113 msgid "Mounting remote volume" -msgstr "" +msgstr "Monterar fjärrvolym" #: ../app/file/file-remote.c:289 -#, fuzzy -#| msgctxt "file-action" -#| msgid "Open an image file" msgid "Opening remote file" -msgstr "Öppna en bildfil" +msgstr "Öppnar fjärrfil" #: ../app/file/file-remote.c:357 #, c-format msgid "Downloading image (%s of %s)" -msgstr "" +msgstr "Hämtar bild (%s av %s)" #: ../app/file/file-remote.c:361 #, c-format msgid "Uploading image (%s of %s)" -msgstr "" +msgstr "Skickar bild (%s av %s)" #: ../app/file/file-remote.c:384 #, c-format msgid "Downloaded %s of image data" -msgstr "" +msgstr "Hämtade %s av bilddata" #: ../app/file/file-remote.c:388 #, c-format msgid "Uploaded %s of image data" -msgstr "" +msgstr "Skickade upp %s av bilddata" #: ../app/file/file-save.c:278 #, c-format @@ -14444,111 +17386,88 @@ msgstr "Insticksmodulen %s kunde inte spara bild" #: ../app/file/file-utils.c:65 #, c-format msgid "'%s:' is not a valid URI scheme" -msgstr "\"%s\" är inte ett giltigt URI-schema" +msgstr "”%s” är inte ett giltigt URI-schema" #: ../app/file/file-utils.c:81 ../app/file/file-utils.c:120 msgid "Invalid character sequence in URI" msgstr "Ogiltig teckensekvens i URI" -#: ../app/gegl/gimp-babl.c:263 ../app/gegl/gimp-babl.c:264 -#: ../app/gegl/gimp-babl.c:265 ../app/gegl/gimp-babl.c:266 -#: ../app/gegl/gimp-babl.c:267 ../app/gegl/gimp-babl.c:268 -#: ../app/gegl/gimp-babl.c:269 ../app/gegl/gimp-babl.c:270 -#: ../app/gegl/gimp-babl.c:271 ../app/gegl/gimp-babl.c:272 -#: ../app/gegl/gimp-babl.c:273 ../app/gegl/gimp-babl.c:274 -#, fuzzy -#| msgctxt "histogram-channel" -#| msgid "RGB" +#: ../app/gegl/gimp-babl.c:316 ../app/gegl/gimp-babl.c:317 +#: ../app/gegl/gimp-babl.c:318 ../app/gegl/gimp-babl.c:319 +#: ../app/gegl/gimp-babl.c:320 ../app/gegl/gimp-babl.c:321 +#: ../app/gegl/gimp-babl.c:322 ../app/gegl/gimp-babl.c:323 +#: ../app/gegl/gimp-babl.c:324 ../app/gegl/gimp-babl.c:325 +#: ../app/gegl/gimp-babl.c:326 ../app/gegl/gimp-babl.c:327 msgid "RGB" msgstr "RGB" -#: ../app/gegl/gimp-babl.c:276 ../app/gegl/gimp-babl.c:277 -#: ../app/gegl/gimp-babl.c:278 ../app/gegl/gimp-babl.c:279 -#: ../app/gegl/gimp-babl.c:280 ../app/gegl/gimp-babl.c:281 -#: ../app/gegl/gimp-babl.c:282 ../app/gegl/gimp-babl.c:283 -#: ../app/gegl/gimp-babl.c:284 ../app/gegl/gimp-babl.c:285 -#: ../app/gegl/gimp-babl.c:286 ../app/gegl/gimp-babl.c:287 +#: ../app/gegl/gimp-babl.c:329 ../app/gegl/gimp-babl.c:330 +#: ../app/gegl/gimp-babl.c:331 ../app/gegl/gimp-babl.c:332 +#: ../app/gegl/gimp-babl.c:333 ../app/gegl/gimp-babl.c:334 +#: ../app/gegl/gimp-babl.c:335 ../app/gegl/gimp-babl.c:336 +#: ../app/gegl/gimp-babl.c:337 ../app/gegl/gimp-babl.c:338 +#: ../app/gegl/gimp-babl.c:339 ../app/gegl/gimp-babl.c:340 msgid "RGB-alpha" -msgstr "" +msgstr "RGB-alfa" -#: ../app/gegl/gimp-babl.c:289 ../app/gegl/gimp-babl.c:290 -#: ../app/gegl/gimp-babl.c:291 ../app/gegl/gimp-babl.c:292 -#: ../app/gegl/gimp-babl.c:293 ../app/gegl/gimp-babl.c:294 -#: ../app/gegl/gimp-babl.c:295 ../app/gegl/gimp-babl.c:296 -#: ../app/gegl/gimp-babl.c:297 ../app/gegl/gimp-babl.c:298 -#: ../app/gegl/gimp-babl.c:299 ../app/gegl/gimp-babl.c:300 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "_Grayscale" +#: ../app/gegl/gimp-babl.c:342 ../app/gegl/gimp-babl.c:343 +#: ../app/gegl/gimp-babl.c:344 ../app/gegl/gimp-babl.c:345 +#: ../app/gegl/gimp-babl.c:346 ../app/gegl/gimp-babl.c:347 +#: ../app/gegl/gimp-babl.c:348 ../app/gegl/gimp-babl.c:349 +#: ../app/gegl/gimp-babl.c:350 ../app/gegl/gimp-babl.c:351 +#: ../app/gegl/gimp-babl.c:352 ../app/gegl/gimp-babl.c:353 msgid "Grayscale" -msgstr "_Gråskala" +msgstr "Gråskala" -#: ../app/gegl/gimp-babl.c:302 ../app/gegl/gimp-babl.c:303 -#: ../app/gegl/gimp-babl.c:304 ../app/gegl/gimp-babl.c:305 -#: ../app/gegl/gimp-babl.c:306 ../app/gegl/gimp-babl.c:307 -#: ../app/gegl/gimp-babl.c:308 ../app/gegl/gimp-babl.c:309 -#: ../app/gegl/gimp-babl.c:310 ../app/gegl/gimp-babl.c:311 -#: ../app/gegl/gimp-babl.c:312 ../app/gegl/gimp-babl.c:313 -#, fuzzy -#| msgctxt "image-convert-action" -#| msgid "_Grayscale" +#: ../app/gegl/gimp-babl.c:355 ../app/gegl/gimp-babl.c:356 +#: ../app/gegl/gimp-babl.c:357 ../app/gegl/gimp-babl.c:358 +#: ../app/gegl/gimp-babl.c:359 ../app/gegl/gimp-babl.c:360 +#: ../app/gegl/gimp-babl.c:361 ../app/gegl/gimp-babl.c:362 +#: ../app/gegl/gimp-babl.c:363 ../app/gegl/gimp-babl.c:364 +#: ../app/gegl/gimp-babl.c:365 ../app/gegl/gimp-babl.c:366 msgid "Grayscale-alpha" -msgstr "_Gråskala" +msgstr "Gråskala-alfa" -#: ../app/gegl/gimp-babl.c:315 ../app/gegl/gimp-babl.c:316 -#: ../app/gegl/gimp-babl.c:317 ../app/gegl/gimp-babl.c:318 -#: ../app/gegl/gimp-babl.c:319 ../app/gegl/gimp-babl.c:320 -#: ../app/gegl/gimp-babl.c:321 ../app/gegl/gimp-babl.c:322 -#: ../app/gegl/gimp-babl.c:323 ../app/gegl/gimp-babl.c:324 -#: ../app/gegl/gimp-babl.c:325 ../app/gegl/gimp-babl.c:326 -#, fuzzy -#| msgctxt "image-action" -#| msgid "C_omponents" +#: ../app/gegl/gimp-babl.c:368 ../app/gegl/gimp-babl.c:369 +#: ../app/gegl/gimp-babl.c:370 ../app/gegl/gimp-babl.c:371 +#: ../app/gegl/gimp-babl.c:372 ../app/gegl/gimp-babl.c:373 +#: ../app/gegl/gimp-babl.c:374 ../app/gegl/gimp-babl.c:375 +#: ../app/gegl/gimp-babl.c:376 ../app/gegl/gimp-babl.c:377 +#: ../app/gegl/gimp-babl.c:378 ../app/gegl/gimp-babl.c:379 msgid "Red component" -msgstr "K_omponenter" +msgstr "Röd komponent" -#: ../app/gegl/gimp-babl.c:328 ../app/gegl/gimp-babl.c:329 -#: ../app/gegl/gimp-babl.c:330 ../app/gegl/gimp-babl.c:331 -#: ../app/gegl/gimp-babl.c:332 ../app/gegl/gimp-babl.c:333 -#: ../app/gegl/gimp-babl.c:334 ../app/gegl/gimp-babl.c:335 -#: ../app/gegl/gimp-babl.c:336 ../app/gegl/gimp-babl.c:337 -#: ../app/gegl/gimp-babl.c:338 ../app/gegl/gimp-babl.c:339 -#, fuzzy -#| msgctxt "image-action" -#| msgid "C_omponents" +#: ../app/gegl/gimp-babl.c:381 ../app/gegl/gimp-babl.c:382 +#: ../app/gegl/gimp-babl.c:383 ../app/gegl/gimp-babl.c:384 +#: ../app/gegl/gimp-babl.c:385 ../app/gegl/gimp-babl.c:386 +#: ../app/gegl/gimp-babl.c:387 ../app/gegl/gimp-babl.c:388 +#: ../app/gegl/gimp-babl.c:389 ../app/gegl/gimp-babl.c:390 +#: ../app/gegl/gimp-babl.c:391 ../app/gegl/gimp-babl.c:392 msgid "Green component" -msgstr "K_omponenter" +msgstr "Grön komponent" -#: ../app/gegl/gimp-babl.c:341 ../app/gegl/gimp-babl.c:342 -#: ../app/gegl/gimp-babl.c:343 ../app/gegl/gimp-babl.c:344 -#: ../app/gegl/gimp-babl.c:345 ../app/gegl/gimp-babl.c:346 -#: ../app/gegl/gimp-babl.c:347 ../app/gegl/gimp-babl.c:348 -#: ../app/gegl/gimp-babl.c:349 ../app/gegl/gimp-babl.c:350 -#: ../app/gegl/gimp-babl.c:351 ../app/gegl/gimp-babl.c:352 -#, fuzzy -#| msgctxt "image-action" -#| msgid "C_omponents" +#: ../app/gegl/gimp-babl.c:394 ../app/gegl/gimp-babl.c:395 +#: ../app/gegl/gimp-babl.c:396 ../app/gegl/gimp-babl.c:397 +#: ../app/gegl/gimp-babl.c:398 ../app/gegl/gimp-babl.c:399 +#: ../app/gegl/gimp-babl.c:400 ../app/gegl/gimp-babl.c:401 +#: ../app/gegl/gimp-babl.c:402 ../app/gegl/gimp-babl.c:403 +#: ../app/gegl/gimp-babl.c:404 ../app/gegl/gimp-babl.c:405 msgid "Blue component" -msgstr "K_omponenter" +msgstr "Blå komponent" -#: ../app/gegl/gimp-babl.c:354 ../app/gegl/gimp-babl.c:355 -#: ../app/gegl/gimp-babl.c:356 ../app/gegl/gimp-babl.c:357 -#: ../app/gegl/gimp-babl.c:358 ../app/gegl/gimp-babl.c:359 -#, fuzzy -#| msgctxt "image-action" -#| msgid "C_omponents" +#: ../app/gegl/gimp-babl.c:407 ../app/gegl/gimp-babl.c:408 +#: ../app/gegl/gimp-babl.c:409 ../app/gegl/gimp-babl.c:410 +#: ../app/gegl/gimp-babl.c:411 ../app/gegl/gimp-babl.c:412 msgid "Alpha component" -msgstr "K_omponenter" +msgstr "Alfa-komponent" -#: ../app/gegl/gimp-babl.c:387 +#: ../app/gegl/gimp-babl.c:440 msgid "Indexed-alpha" -msgstr "" +msgstr "Indexerad-alfa" -#: ../app/gegl/gimp-babl.c:389 -#, fuzzy -#| msgid "Index %d" +#: ../app/gegl/gimp-babl.c:442 msgid "Indexed" -msgstr "Index %d" +msgstr "Indexerad" #: ../app/gegl/gimp-gegl-enums.c:24 msgctxt "cage-mode" @@ -14556,28 +17475,566 @@ msgid "Create or adjust the cage" msgstr "Skapa eller justera buren" #: ../app/gegl/gimp-gegl-enums.c:25 -#, fuzzy -#| msgctxt "cage-mode" -#| msgid "Deform the cage to deform the image" msgctxt "cage-mode" msgid "" "Deform the cage\n" "to deform the image" -msgstr "Deformera buren för att deformera bilden" +msgstr "" +"Deformera buren för\n" +"att deformera bilden" + +#: ../app/operations/operations-enums.c:25 +msgctxt "layer-color-space" +msgid "Auto" +msgstr "Auto" + +#: ../app/operations/operations-enums.c:26 +msgctxt "layer-color-space" +msgid "RGB (linear)" +msgstr "RGB (linjär)" + +#: ../app/operations/operations-enums.c:27 +msgctxt "layer-color-space" +msgid "RGB (perceptual)" +msgstr "RGB (perceptuell)" + +#: ../app/operations/operations-enums.c:28 +msgctxt "layer-color-space" +msgid "LAB" +msgstr "LAB" + +#: ../app/operations/operations-enums.c:59 +msgctxt "layer-composite-mode" +msgid "Auto" +msgstr "Auto" + +#: ../app/operations/operations-enums.c:60 +msgctxt "layer-composite-mode" +msgid "Union" +msgstr "Union" + +#: ../app/operations/operations-enums.c:61 +msgctxt "layer-composite-mode" +msgid "Clip to backdrop" +msgstr "Klipp mot bakgrund" + +#: ../app/operations/operations-enums.c:62 +msgctxt "layer-composite-mode" +msgid "Clip to layer" +msgstr "Klipp till lager" + +#: ../app/operations/operations-enums.c:63 +msgctxt "layer-composite-mode" +msgid "Intersection" +msgstr "Skärning" + +#: ../app/operations/operations-enums.c:153 +msgctxt "layer-mode" +msgid "Normal (legacy)" +msgstr "Normal (föråldrad)" + +#. Translators: this is an abbreviated version of "Normal (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:156 +msgctxt "layer-mode" +msgid "Normal (l)" +msgstr "Normal (f)" + +#: ../app/operations/operations-enums.c:157 +msgctxt "layer-mode" +msgid "Dissolve" +msgstr "Lös upp" + +#: ../app/operations/operations-enums.c:158 +msgctxt "layer-mode" +msgid "Behind (legacy)" +msgstr "Bakom (föråldrad)" + +#. Translators: this is an abbreviated version of "Behind (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:161 +msgctxt "layer-mode" +msgid "Behind (l)" +msgstr "Bakom (f)" + +#: ../app/operations/operations-enums.c:162 +msgctxt "layer-mode" +msgid "Multiply (legacy)" +msgstr "Multiplicera (föråldrad)" + +#. Translators: this is an abbreviated version of "Multiply (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:165 +msgctxt "layer-mode" +msgid "Multiply (l)" +msgstr "Multiplicera (f)" + +#: ../app/operations/operations-enums.c:166 +msgctxt "layer-mode" +msgid "Screen (legacy)" +msgstr "Skärm (föråldrad)" + +#. Translators: this is an abbreviated version of "Screen (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:169 +msgctxt "layer-mode" +msgid "Screen (l)" +msgstr "Skärm (f)" + +#: ../app/operations/operations-enums.c:170 +msgctxt "layer-mode" +msgid "Old broken Overlay" +msgstr "Gammal trasig överlagring" + +#. Translators: this is an abbreviated version of "Old broken Overlay". +#. Keep it short. +#: ../app/operations/operations-enums.c:173 +msgctxt "layer-mode" +msgid "Old Overlay" +msgstr "Gammal överlagring" + +#: ../app/operations/operations-enums.c:174 +msgctxt "layer-mode" +msgid "Difference (legacy)" +msgstr "Skillnad (föråldrad)" + +#. Translators: this is an abbreviated version of "Difference (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:177 +msgctxt "layer-mode" +msgid "Difference (l)" +msgstr "Skillnad (f)" + +#: ../app/operations/operations-enums.c:178 +msgctxt "layer-mode" +msgid "Addition (legacy)" +msgstr "Addition (föråldrad)" + +#. Translators: this is an abbreviated version of "Addition (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:181 +msgctxt "layer-mode" +msgid "Addition (l)" +msgstr "Addition (f)" + +#: ../app/operations/operations-enums.c:182 +msgctxt "layer-mode" +msgid "Subtract (legacy)" +msgstr "Subtraktion (föråldrad)" + +#. Translators: this is an abbreviated version of "Subtract (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:185 +msgctxt "layer-mode" +msgid "Subtract (l)" +msgstr "Subtraktion (f)" + +#: ../app/operations/operations-enums.c:186 +msgctxt "layer-mode" +msgid "Darken only (legacy)" +msgstr "Gör endast mörkare (föråldrad)" + +#. Translators: this is an abbreviated version of "Darken only (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:189 +msgctxt "layer-mode" +msgid "Darken only (l)" +msgstr "Gör endast mörkare (f)" + +#: ../app/operations/operations-enums.c:190 +msgctxt "layer-mode" +msgid "Lighten only (legacy)" +msgstr "Gör endast ljusare (föråldrad)" + +#. Translators: this is an abbreviated version of "Lighten only (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:193 +msgctxt "layer-mode" +msgid "Lighten only (l)" +msgstr "Gör endast ljusare (f)" + +#: ../app/operations/operations-enums.c:194 +msgctxt "layer-mode" +msgid "Hue (HSV) (legacy)" +msgstr "Nyans (NMI) (föråldrad)" + +#. Translators: this is an abbreviated version of "Hue (HSV) (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:197 +msgctxt "layer-mode" +msgid "Hue (HSV) (l)" +msgstr "Nyans (NMI) (f)" + +#: ../app/operations/operations-enums.c:198 +msgctxt "layer-mode" +msgid "Saturation (HSV) (legacy)" +msgstr "Mättnad (NMI) (föråldrad)" + +#. Translators: this is an abbreviated version of "Saturation (HSV) (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:201 +msgctxt "layer-mode" +msgid "Saturation (HSV) (l)" +msgstr "Mättnad (NMI) (f)" + +#: ../app/operations/operations-enums.c:202 +msgctxt "layer-mode" +msgid "Color (HSL) (legacy)" +msgstr "Färg (HSL) (föråldrad)" + +#. Translators: this is an abbreviated version of "Color (HSL) (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:205 +msgctxt "layer-mode" +msgid "Color (HSL) (l)" +msgstr "Färg (HSL) (f)" + +#: ../app/operations/operations-enums.c:206 +msgctxt "layer-mode" +msgid "Value (HSV) (legacy)" +msgstr "Intensitet (NMI) (föråldrad)" + +#. Translators: this is an abbreviated version of "Value (HSV) (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:209 +msgctxt "layer-mode" +msgid "Value (HSV) (l)" +msgstr "Intensitet (NMI) (f)" + +#: ../app/operations/operations-enums.c:210 +msgctxt "layer-mode" +msgid "Divide (legacy)" +msgstr "Dividera (föråldrad)" + +#. Translators: this is an abbreviated version of "Divide (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:213 +msgctxt "layer-mode" +msgid "Divide (l)" +msgstr "Dividera (f)" + +#: ../app/operations/operations-enums.c:214 +msgctxt "layer-mode" +msgid "Dodge (legacy)" +msgstr "Skugga (föråldrad)" + +#. Translators: this is an abbreviated version of "Dodge (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:217 +msgctxt "layer-mode" +msgid "Dodge (l)" +msgstr "Skugga (f)" + +#: ../app/operations/operations-enums.c:218 +msgctxt "layer-mode" +msgid "Burn (legacy)" +msgstr "Efterbelys (föråldrad)" + +#. Translators: this is an abbreviated version of "Burn (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:221 +msgctxt "layer-mode" +msgid "Burn (l)" +msgstr "Efterbelys (f)" + +#: ../app/operations/operations-enums.c:222 +msgctxt "layer-mode" +msgid "Hard light (legacy)" +msgstr "Hårt ljus (föråldrad)" + +#. Translators: this is an abbreviated version of "Hard light (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:225 +msgctxt "layer-mode" +msgid "Hard light (l)" +msgstr "Hårt ljus (f)" + +#: ../app/operations/operations-enums.c:226 +msgctxt "layer-mode" +msgid "Soft light (legacy)" +msgstr "Mjukt ljus (föråldrad)" + +#. Translators: this is an abbreviated version of "Soft light (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:229 +msgctxt "layer-mode" +msgid "Soft light (l)" +msgstr "Mjukt ljus (f)" + +#: ../app/operations/operations-enums.c:230 +msgctxt "layer-mode" +msgid "Grain extract (legacy)" +msgstr "Grynextrahering (föråldrad)" + +#. Translators: this is an abbreviated version of "Grain extract (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:233 +msgctxt "layer-mode" +msgid "Grain extract (l)" +msgstr "Grynextrahering (f)" + +#: ../app/operations/operations-enums.c:234 +msgctxt "layer-mode" +msgid "Grain merge (legacy)" +msgstr "Grynsammanfogning (föråldrad)" + +#. Translators: this is an abbreviated version of "Grain merge (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:237 +msgctxt "layer-mode" +msgid "Grain merge (l)" +msgstr "Grynsammanfogning (f)" + +#: ../app/operations/operations-enums.c:238 +msgctxt "layer-mode" +msgid "Color erase (legacy)" +msgstr "Färgsuddning (föråldrad)" + +#. Translators: this is an abbreviated version of "Color erase (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:241 +msgctxt "layer-mode" +msgid "Color erase (l)" +msgstr "Färgsuddning (f)" + +#: ../app/operations/operations-enums.c:242 +msgctxt "layer-mode" +msgid "Overlay" +msgstr "Överlagring" + +#: ../app/operations/operations-enums.c:243 +msgctxt "layer-mode" +msgid "Hue (LCH)" +msgstr "Nyans (LCH)" + +#: ../app/operations/operations-enums.c:244 +msgctxt "layer-mode" +msgid "Chroma (LCH)" +msgstr "Krominans (LCH)" + +#: ../app/operations/operations-enums.c:245 +msgctxt "layer-mode" +msgid "Color (LCH)" +msgstr "Färg (LCH)" + +#: ../app/operations/operations-enums.c:246 +msgctxt "layer-mode" +msgid "Lightness (LCH)" +msgstr "Ljusstyrka (LCH)" + +#: ../app/operations/operations-enums.c:247 +msgctxt "layer-mode" +msgid "Normal" +msgstr "Normal" + +#: ../app/operations/operations-enums.c:248 +msgctxt "layer-mode" +msgid "Behind" +msgstr "Bakom" + +#: ../app/operations/operations-enums.c:249 +msgctxt "layer-mode" +msgid "Multiply" +msgstr "Multiplicera" + +#: ../app/operations/operations-enums.c:250 +msgctxt "layer-mode" +msgid "Screen" +msgstr "Skärm" + +#: ../app/operations/operations-enums.c:251 +msgctxt "layer-mode" +msgid "Difference" +msgstr "Skillnad" + +#: ../app/operations/operations-enums.c:252 +msgctxt "layer-mode" +msgid "Addition" +msgstr "Addition" + +#: ../app/operations/operations-enums.c:253 +msgctxt "layer-mode" +msgid "Subtract" +msgstr "Subtraktion" + +#: ../app/operations/operations-enums.c:254 +msgctxt "layer-mode" +msgid "Darken only" +msgstr "Gör endast mörkare" + +#: ../app/operations/operations-enums.c:255 +msgctxt "layer-mode" +msgid "Lighten only" +msgstr "Gör endast ljusare" + +#: ../app/operations/operations-enums.c:256 +msgctxt "layer-mode" +msgid "Hue (HSV)" +msgstr "Nyans (NMI)" + +#: ../app/operations/operations-enums.c:257 +msgctxt "layer-mode" +msgid "Saturation (HSV)" +msgstr "Mättnad (NMI)" + +#: ../app/operations/operations-enums.c:258 +msgctxt "layer-mode" +msgid "Color (HSL)" +msgstr "Färg (HSL)" + +#: ../app/operations/operations-enums.c:259 +msgctxt "layer-mode" +msgid "Value (HSV)" +msgstr "Intensitet (NMI)" + +#: ../app/operations/operations-enums.c:260 +msgctxt "layer-mode" +msgid "Divide" +msgstr "Dividera" + +#: ../app/operations/operations-enums.c:261 +msgctxt "layer-mode" +msgid "Dodge" +msgstr "Skugga" + +#: ../app/operations/operations-enums.c:262 +msgctxt "layer-mode" +msgid "Burn" +msgstr "Efterbelys" + +#: ../app/operations/operations-enums.c:263 +msgctxt "layer-mode" +msgid "Hard light" +msgstr "Hårt ljus" + +#: ../app/operations/operations-enums.c:264 +msgctxt "layer-mode" +msgid "Soft light" +msgstr "Mjukt ljus" + +#: ../app/operations/operations-enums.c:265 +msgctxt "layer-mode" +msgid "Grain extract" +msgstr "Grynextrahering" + +#: ../app/operations/operations-enums.c:266 +msgctxt "layer-mode" +msgid "Grain merge" +msgstr "Grynsammanfogning" + +#: ../app/operations/operations-enums.c:267 +msgctxt "layer-mode" +msgid "Vivid light" +msgstr "Livfullt ljus" + +#: ../app/operations/operations-enums.c:268 +msgctxt "layer-mode" +msgid "Pin light" +msgstr "Nålljus" + +#: ../app/operations/operations-enums.c:269 +msgctxt "layer-mode" +msgid "Linear light" +msgstr "Linjärt ljus" + +#: ../app/operations/operations-enums.c:270 +msgctxt "layer-mode" +msgid "Hard mix" +msgstr "Hård mix" + +#: ../app/operations/operations-enums.c:271 +msgctxt "layer-mode" +msgid "Exclusion" +msgstr "Uteslut" + +#: ../app/operations/operations-enums.c:272 +msgctxt "layer-mode" +msgid "Linear burn" +msgstr "Efterbelys linjärt" + +#: ../app/operations/operations-enums.c:273 +msgctxt "layer-mode" +msgid "Luma/Luminance darken only" +msgstr "Luma/Luminans gör endast mörkare" + +#. Translators: this is an abbreviated version of "Luma/Luminance darken only". +#. Keep it short. +#: ../app/operations/operations-enums.c:276 +msgctxt "layer-mode" +msgid "Luma darken only" +msgstr "Luma, gör endast mörkare" + +#: ../app/operations/operations-enums.c:277 +msgctxt "layer-mode" +msgid "Luma/Luminance lighten only" +msgstr "Luma/Luminans, gör endast ljusare" + +#. Translators: this is an abbreviated version of "Luma/Luminance lighten only". +#. Keep it short. +#: ../app/operations/operations-enums.c:280 +msgctxt "layer-mode" +msgid "Luma lighten only" +msgstr "Luma, gör endast ljusare" + +#: ../app/operations/operations-enums.c:281 +msgctxt "layer-mode" +msgid "Luminance" +msgstr "Luminans" + +#: ../app/operations/operations-enums.c:282 +msgctxt "layer-mode" +msgid "Color erase" +msgstr "Färgsuddning" + +#: ../app/operations/operations-enums.c:283 +msgctxt "layer-mode" +msgid "Erase" +msgstr "Sudda" + +#: ../app/operations/operations-enums.c:284 +msgctxt "layer-mode" +msgid "Merge" +msgstr "Sammanfoga" + +#: ../app/operations/operations-enums.c:285 +msgctxt "layer-mode" +msgid "Split" +msgstr "Dela" + +#: ../app/operations/operations-enums.c:286 +msgctxt "layer-mode" +msgid "Pass through" +msgstr "Passera genom" + +#: ../app/operations/operations-enums.c:287 +msgctxt "layer-mode" +msgid "Replace" +msgstr "Ersätt" + +#: ../app/operations/operations-enums.c:288 +msgctxt "layer-mode" +msgid "Anti erase" +msgstr "Antisudda" + +#: ../app/operations/operations-enums.c:316 +msgctxt "layer-mode-group" +msgid "Default" +msgstr "Standard" + +#: ../app/operations/operations-enums.c:317 +msgctxt "layer-mode-group" +msgid "Legacy" +msgstr "Föråldrad" #: ../app/operations/gimpbrightnesscontrastconfig.c:82 #: ../app/operations/gimpbrightnesscontrastconfig.c:83 -#, fuzzy -#| msgid "_Brightness:" msgid "Brightness" -msgstr "_Ljusstyrka:" +msgstr "Ljusstyrka" #: ../app/operations/gimpbrightnesscontrastconfig.c:88 #: ../app/operations/gimpbrightnesscontrastconfig.c:89 -#, fuzzy -#| msgid "Con_trast:" msgid "Contrast" -msgstr "Kon_trast:" +msgstr "Kontrast" #: ../app/operations/gimpcolorbalanceconfig.c:96 #: ../app/operations/gimphuesaturationconfig.c:94 @@ -14588,130 +18045,139 @@ msgstr "Intervall" #: ../app/operations/gimpcolorbalanceconfig.c:97 #: ../app/operations/gimphuesaturationconfig.c:95 msgid "The affected range" -msgstr "" +msgstr "Det påverkade intervallet" #: ../app/operations/gimpcolorbalanceconfig.c:103 #: ../app/operations/gimpcolorbalanceconfig.c:104 -#, fuzzy -#| msgid "Cyan" msgid "Cyan-Red" -msgstr "Cyan" +msgstr "Cyanröd" #: ../app/operations/gimpcolorbalanceconfig.c:109 #: ../app/operations/gimpcolorbalanceconfig.c:110 -#, fuzzy -#| msgid "Magenta" msgid "Magenta-Green" -msgstr "Magenta" +msgstr "Magentagrön" #: ../app/operations/gimpcolorbalanceconfig.c:115 #: ../app/operations/gimpcolorbalanceconfig.c:116 -#, fuzzy -#| msgid "Yellow" msgid "Yellow-Blue" -msgstr "Gul" +msgstr "Gulblå" #: ../app/operations/gimpcolorbalanceconfig.c:121 #: ../app/operations/gimpcolorbalanceconfig.c:122 -#, fuzzy -#| msgid "Preserve _luminosity" msgid "Preserve Luminosity" -msgstr "Behåll _luminans" - -#: ../app/operations/gimpcolorizeconfig.c:85 -#: ../app/operations/gimpcolorizeconfig.c:86 -#: ../app/operations/gimphuesaturationconfig.c:101 -#: ../app/operations/gimphuesaturationconfig.c:102 -#, fuzzy -#| msgctxt "layer-mode-effects" -#| msgid "Hue" -msgid "Hue" -msgstr "Nyans" - -#: ../app/operations/gimpcolorizeconfig.c:91 -#: ../app/operations/gimpcolorizeconfig.c:92 -#: ../app/operations/gimphuesaturationconfig.c:107 -#: ../app/operations/gimphuesaturationconfig.c:108 -#, fuzzy -#| msgctxt "layer-mode-effects" -#| msgid "Saturation" -msgid "Saturation" -msgstr "Mättnad" - -#: ../app/operations/gimpcolorizeconfig.c:97 -#: ../app/operations/gimpcolorizeconfig.c:98 -#: ../app/operations/gimphuesaturationconfig.c:113 -#: ../app/operations/gimphuesaturationconfig.c:114 -#, fuzzy -#| msgid "_Lightness:" -msgid "Lightness" -msgstr "_Ljusstyrka:" +msgstr "Bevara luminiscens" #: ../app/operations/gimpcurvesconfig.c:105 -#: ../app/operations/gimplevelsconfig.c:106 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Delete channel" -msgid "The affected channel" -msgstr "Ta bort kanal" +#: ../app/operations/gimplevelsconfig.c:108 +#: ../app/widgets/gimphistogrameditor.c:110 +msgid "Linear" +msgstr "Linjär" + +#: ../app/operations/gimpcurvesconfig.c:106 +#: ../app/operations/gimplevelsconfig.c:109 +msgid "Work on linear RGB" +msgstr "Arbeta under linjär RGB" -#: ../app/operations/gimpcurvesconfig.c:111 #: ../app/operations/gimpcurvesconfig.c:112 -#, fuzzy -#| msgid "Curves" -msgid "Curve" -msgstr "Kurvor" +#: ../app/operations/gimplevelsconfig.c:115 +msgid "The affected channel" +msgstr "Den påverkade kanalen" -#: ../app/operations/gimpcurvesconfig.c:526 +#: ../app/operations/gimpcurvesconfig.c:118 +#: ../app/operations/gimpcurvesconfig.c:119 +msgid "Curve" +msgstr "Kurva" + +#: ../app/operations/gimpcurvesconfig.c:548 msgid "not a GIMP Curves file" msgstr "inte en GIMP-kurvfil" -#: ../app/operations/gimpcurvesconfig.c:557 +#: ../app/operations/gimpcurvesconfig.c:579 msgid "Parse error, didn't find 2 integers" -msgstr "" +msgstr "Tolkningsfel, hittade inte två heltal" -#: ../app/operations/gimpcurvesconfig.c:673 +#: ../app/operations/gimpcurvesconfig.c:699 msgid "Writing curves file failed: " -msgstr "" +msgstr "Skrivning av kurvfil misslyckades: " + +#: ../app/operations/gimphuesaturationconfig.c:101 +#: ../app/operations/gimphuesaturationconfig.c:102 +#: ../app/operations/gimpoperationcolorize.c:92 +#: ../app/operations/gimpoperationcolorize.c:93 +msgid "Hue" +msgstr "Nyans" + +#: ../app/operations/gimphuesaturationconfig.c:107 +#: ../app/operations/gimphuesaturationconfig.c:108 +#: ../app/operations/gimpoperationcolorize.c:98 +#: ../app/operations/gimpoperationcolorize.c:99 +msgid "Saturation" +msgstr "Mättnad" + +#: ../app/operations/gimphuesaturationconfig.c:113 +#: ../app/operations/gimphuesaturationconfig.c:114 +#: ../app/operations/gimpoperationcolorize.c:104 +#: ../app/operations/gimpoperationcolorize.c:105 +msgid "Lightness" +msgstr "Ljusstyrka" #: ../app/operations/gimphuesaturationconfig.c:119 #: ../app/operations/gimphuesaturationconfig.c:120 -#, fuzzy -#| msgid "_Overlap:" msgid "Overlap" -msgstr "_Överlappa:" +msgstr "Överlappa" -#: ../app/operations/gimplevelsconfig.c:118 -#: ../app/operations/gimplevelsconfig.c:119 +#: ../app/operations/gimplevelsconfig.c:121 +#: ../app/operations/gimplevelsconfig.c:122 msgid "Low Input" -msgstr "" +msgstr "Låg indata" -#: ../app/operations/gimplevelsconfig.c:124 -#: ../app/operations/gimplevelsconfig.c:125 +#: ../app/operations/gimplevelsconfig.c:127 +#: ../app/operations/gimplevelsconfig.c:128 msgid "High Input" -msgstr "" +msgstr "Hög indata" -#: ../app/operations/gimplevelsconfig.c:130 -#: ../app/operations/gimplevelsconfig.c:131 +#: ../app/operations/gimplevelsconfig.c:133 +msgid "Clamp Input" +msgstr "Begränsa indata" + +#: ../app/operations/gimplevelsconfig.c:134 +msgid "Clamp input values before applying output mapping." +msgstr "Begränsa indatavärden innan utdatamappning tillämpas." + +#: ../app/operations/gimplevelsconfig.c:145 +#: ../app/operations/gimplevelsconfig.c:146 msgid "Low Output" -msgstr "" +msgstr "Låg utdata" -#: ../app/operations/gimplevelsconfig.c:136 -#: ../app/operations/gimplevelsconfig.c:137 +#: ../app/operations/gimplevelsconfig.c:151 +#: ../app/operations/gimplevelsconfig.c:152 msgid "High Output" -msgstr "" +msgstr "Hög utdata" -#: ../app/operations/gimplevelsconfig.c:778 +#: ../app/operations/gimplevelsconfig.c:157 +msgid "Clamp Output" +msgstr "Begränsa utdata" + +#: ../app/operations/gimplevelsconfig.c:158 +msgid "Clamp final output values." +msgstr "Begränsa slutliga utdatavärden." + +#: ../app/operations/gimplevelsconfig.c:842 msgid "not a GIMP Levels file" msgstr "inte en GIMP-nivåfil" -#: ../app/operations/gimplevelsconfig.c:846 +#: ../app/operations/gimplevelsconfig.c:917 msgid "parse error" msgstr "tolkningsfel" -#: ../app/operations/gimplevelsconfig.c:881 +#: ../app/operations/gimplevelsconfig.c:952 msgid "Writing levels file failed: " -msgstr "" +msgstr "Skrivning av nivåfil misslyckades: " + +#: ../app/operations/gimpoperationbrightnesscontrast.c:65 +#: ../app/tools/gimpbrightnesscontrasttool.c:98 +msgid "Adjust brightness and contrast" +msgstr "Justera ljusstyrka och kontrast" #: ../app/operations/gimpoperationcagecoefcalc.c:69 msgid "Compute a set of coefficient buffer for the GIMP cage tool" @@ -14725,85 +18191,131 @@ msgstr "" "Konvertera en uppsättning koefficientbuffertar till en koordinatbuffert för " "GIMP:s burverktyg" -#: ../app/operations/gimpoperationcagetransform.c:127 +#: ../app/operations/gimpoperationcagetransform.c:131 msgid "Fill with plain color" msgstr "Fyll med vanlig färg" -#: ../app/operations/gimpoperationcagetransform.c:128 +#: ../app/operations/gimpoperationcagetransform.c:132 msgid "Fill the original position of the cage with a plain color" msgstr "Fyll burens ursprungliga läge med en vanlig färg" -#: ../app/operations/gimpoperationdesaturate.c:85 -#, fuzzy -#| msgid "Desaturate Tool: Turn colors into shades of gray" -msgid "Turn colors into shades of gray" -msgstr "Avfärgningsverktyg: Gör om färger till gråskalor" +#: ../app/operations/gimpoperationcolorbalance.c:65 +msgid "Adjust color distribution" +msgstr "Justera färgdistributionen" -#: ../app/operations/gimpoperationdesaturate.c:90 -#: ../app/tools/gimppaintoptions-gui.c:113 ../app/widgets/gimpdeviceinfo.c:132 -#: ../app/widgets/gimplayertreeview.c:270 -#, fuzzy -#| msgid "Mode:" -msgid "Mode" -msgstr "Läge:" +#: ../app/operations/gimpoperationcolorize.c:85 +msgid "Colorize the image" +msgstr "Färglägg bilden" + +#: ../app/operations/gimpoperationcolorize.c:114 +#: ../app/operations/gimpoperationcolorize.c:115 +msgid "Color" +msgstr "Färg" + +#: ../app/operations/gimpoperationcurves.c:67 ../app/tools/gimpcurvestool.c:143 +msgid "Adjust color curves" +msgstr "Justera färgkurvor" + +#: ../app/operations/gimpoperationdesaturate.c:85 +msgid "Turn colors into shades of gray" +msgstr "Gör om färger till gråskalor" #: ../app/operations/gimpoperationdesaturate.c:91 -#, fuzzy -#| msgid "Choose shade of gray based on:" msgid "Choose shade of gray based on" -msgstr "Välj gråskala baserad på:" +msgstr "Välj gråskala baserad på" + +#: ../app/operations/gimpoperationhuesaturation.c:65 +msgid "Adjust hue, saturation, and lightness" +msgstr "Justera nyans, mättnad och ljusstyrka" + +#: ../app/operations/gimpoperationlevels.c:64 ../app/tools/gimplevelstool.c:133 +msgid "Adjust color levels" +msgstr "Justera färgnivåer" #: ../app/operations/gimpoperationposterize.c:82 -#, fuzzy -#| msgid "Posterize Tool: Reduce to a limited set of colors" msgid "Reduce to a limited set of colors" -msgstr "Posteriseringsverktyg: Reducera antalet färger" +msgstr "Reducera till ett begränsat antal färger" #: ../app/operations/gimpoperationposterize.c:87 -#, fuzzy -#| msgid "Posterize _levels:" msgid "Posterize levels" -msgstr "Posterisera _nivåer:" +msgstr "Färgreduktionsnivåer" #: ../app/operations/gimpoperationsemiflatten.c:84 msgid "Replace partial transparency with a color" -msgstr "" +msgstr "Ersätt partiell transparens med en färg" -#: ../app/operations/gimpoperationthreshold.c:87 -#, fuzzy -#| msgid "Threshold" +#: ../app/operations/gimpoperationthreshold.c:84 +#: ../app/tools/gimpthresholdtool.c:88 +msgid "Reduce image to two colors using a threshold" +msgstr "Reducera bilden till två färger med ett tröskelvärde" + +#: ../app/operations/gimpoperationthreshold.c:97 msgid "Low threshold" -msgstr "Tröskelvärde" +msgstr "Lågt tröskelvärde" -#: ../app/operations/gimpoperationthreshold.c:94 -#, fuzzy -#| msgid "Threshold" +#: ../app/operations/gimpoperationthreshold.c:104 msgid "High threshold" -msgstr "Tröskelvärde" +msgstr "Högt tröskelvärde" #: ../app/operations/gimpoperationthresholdalpha.c:80 msgid "" "Make transparency all-or-nothing, by thresholding the alpha channel to a " "value" msgstr "" +"Gör transparens till antingen-eller, genom att tröskla alfakanalen med ett " +"värde" #. TRANSLATORS: there is no need to translate this in GIMP. This uses #. * "gtk20" domain as a special trick to determine language direction, #. * but xgettext extracts it anyway mistakenly into GIMP po files. #. * Leave an empty string as translation. It does not matter. #. -#: ../app/gui/gui.c:210 +#: ../app/gui/gui.c:236 msgid "default:LTR" msgstr "default:LTR" +#: ../app/gui/gui.c:326 +#, fuzzy +#| msgctxt "undo-type" +#| msgid "Image precision" +msgid "Image Recovery" +msgstr "Bildprecision" + +#: ../app/gui/gui.c:328 +msgid "_Discard" +msgstr "_Förkasta" + +#: ../app/gui/gui.c:329 +msgid "_Recover" +msgstr "" + +#: ../app/gui/gui.c:340 +msgid "Eeek! It looks like GIMP recovered from a crash!" +msgstr "" + +#. TRANSLATORS: even if English singular form does +#. * not use %d, you can use %d for translation in +#. * any singular/plural form of your language if +#. * suited. It will just work and be replaced by the +#. * number of images as expected. +#. +#: ../app/gui/gui.c:349 +#, c-format +msgid "" +"An image was salvaged from the crash. Do you want to try and recover it?" +msgid_plural "" +"%d images were salvaged from the crash. Do you want to try and recover them?" +msgstr[0] "" +msgstr[1] "" + #. load the recent documents after gimp_real_restore() because we #. * need the mime-types implemented by plug-ins #. -#: ../app/gui/gui.c:503 +#: ../app/gui/gui.c:594 msgid "Documents" msgstr "Dokument" -#: ../app/gui/splash.c:115 +#: ../app/gui/splash.c:128 msgid "GIMP Startup" msgstr "Uppstart av GIMP" @@ -14812,8 +18324,6 @@ msgid "Airbrush" msgstr "Färgspruta" #: ../app/paint/gimpairbrushoptions.c:70 -#, fuzzy -#| msgid "Rate" msgctxt "airbrush-tool" msgid "Rate" msgstr "Hastighet" @@ -14826,11 +18336,11 @@ msgstr "Bara rörelse" msgid "Flow" msgstr "Flöde" -#: ../app/paint/gimpbrushcore.c:405 +#: ../app/paint/gimpbrushcore.c:378 msgid "No brushes available for use with this tool." msgstr "Det finns inga penslar tillgängliga för detta verktyg." -#: ../app/paint/gimpbrushcore.c:412 +#: ../app/paint/gimpbrushcore.c:385 msgid "No paint dynamics available for use with this tool." msgstr "Ingen målningsdynamik tillgänglig för detta verktyg." @@ -14848,30 +18358,24 @@ msgstr "Källa" #: ../app/paint/gimpconvolve.c:79 msgid "Convolve" -msgstr "Konvolvera" +msgstr "Falta" #: ../app/paint/gimpconvolveoptions.c:68 -#, fuzzy -#| msgid "Convolve Type (%s)" msgid "Convolve Type" -msgstr "Konvolveringstyp (%s)" +msgstr "Faltningstyp" #: ../app/paint/gimpconvolveoptions.c:76 -#, fuzzy -#| msgid "Rate" msgctxt "convolve-tool" msgid "Rate" msgstr "Hastighet" #: ../app/paint/gimpdodgeburn.c:67 msgid "Dodge/Burn" -msgstr "Blek/Bränna" +msgstr "Skugga/Efterbelys" #: ../app/paint/gimpdodgeburnoptions.c:70 -#, fuzzy -#| msgid "File Type" msgid "Type" -msgstr "Filtyp" +msgstr "Typ" #: ../app/paint/gimpdodgeburnoptions.c:86 msgid "Exposure" @@ -14879,29 +18383,26 @@ msgstr "Exponering" #: ../app/paint/gimperaser.c:64 ../app/tools/gimperasertool.c:66 msgid "Eraser" -msgstr "Suddare" +msgstr "Suddgummi" #: ../app/paint/gimperaseroptions.c:66 -#, fuzzy -#| msgctxt "layer-mode-effects" -#| msgid "Anti erase" msgid "Anti erase" msgstr "Antisudda" -#: ../app/paint/gimpheal.c:106 ../app/tools/gimphealtool.c:53 +#: ../app/paint/gimpheal.c:115 ../app/tools/gimphealtool.c:53 msgid "Heal" msgstr "Läk" -#: ../app/paint/gimpheal.c:145 +#: ../app/paint/gimpheal.c:155 msgid "Healing does not operate on indexed layers." msgstr "Läkning fungerar inte på indexerade lager." -#: ../app/paint/gimpink.c:104 ../app/tools/gimpinktool.c:61 +#: ../app/paint/gimpink.c:107 ../app/tools/gimpinktool.c:61 msgid "Ink" msgstr "Bläck" #: ../app/paint/gimpinkoptions.c:74 ../app/paint/gimpinkoptions.c:87 -#: ../app/paint/gimppaintoptions.c:190 ../app/tools/gimpwarpoptions.c:91 +#: ../app/paint/gimppaintoptions.c:193 ../app/tools/gimpwarpoptions.c:91 msgid "Size" msgstr "Storlek" @@ -14910,7 +18411,7 @@ msgid "Ink Blob Size" msgstr "Storlek på bläckdroppe" #: ../app/paint/gimpinkoptions.c:80 ../app/paint/gimpinkoptions.c:119 -#: ../app/paint/gimppaintoptions.c:211 ../app/widgets/gimpbrusheditor.c:200 +#: ../app/paint/gimppaintoptions.c:207 ../app/widgets/gimpbrusheditor.c:200 msgid "Angle" msgstr "Vinkel" @@ -14920,8 +18421,8 @@ msgid "Tilt" msgstr "Lutning" #. Blob shape widgets -#: ../app/paint/gimpinkoptions.c:106 ../app/tools/gimpblendoptions.c:85 -#: ../app/tools/gimpblendoptions.c:236 ../app/tools/gimpinkoptions-gui.c:103 +#: ../app/paint/gimpinkoptions.c:106 ../app/tools/gimpblendoptions.c:94 +#: ../app/tools/gimpblendoptions.c:304 ../app/tools/gimpinkoptions-gui.c:103 msgid "Shape" msgstr "Form" @@ -14931,230 +18432,218 @@ msgstr "Bildförhållande" #: ../app/paint/gimpinkoptions.c:114 msgid "Ink Blob Aspect Ratio" -msgstr "Aspektförhållande för bläckdroppe" +msgstr "Bildförhållande för bläckdroppe" #: ../app/paint/gimpinkoptions.c:120 msgid "Ink Blob Angle" msgstr "Vinkel för bläckdroppe" #: ../app/paint/gimpmybrushcore.c:103 -#, fuzzy -#| msgid "Airbrush" msgid "Mybrush" -msgstr "Färgspruta" +msgstr "Min-pensel" #: ../app/paint/gimpmybrushcore.c:160 -#, fuzzy -#| msgid "No brushes available for use with this tool." msgid "No MyPaint brushes available for use with this tool." -msgstr "Det finns inga penslar tillgängliga för detta verktyg." +msgstr "" +"Det finns inga MyPaint-penslar tillgängliga för användning med detta verktyg." -#: ../app/paint/gimpmybrushoptions.c:85 ../app/tools/gimpcoloroptions.c:83 -#: ../app/tools/gimprectangleselectoptions.c:92 +#: ../app/paint/gimpmybrushoptions.c:86 ../app/tools/gimpcoloroptions.c:85 +#: ../app/tools/gimprectangleselectoptions.c:100 #: ../app/tools/gimpselectionoptions.c:94 ../app/widgets/gimpbrusheditor.c:156 msgid "Radius" msgstr "Radie" -#: ../app/paint/gimpmybrushoptions.c:92 -#, fuzzy -#| msgid "Opacity" +#: ../app/paint/gimpmybrushoptions.c:93 msgid "Base Opacity" -msgstr "Opacitet" +msgstr "Grundopacitet" -#: ../app/paint/gimpmybrushoptions.c:99 ../app/paint/gimppaintoptions.c:225 +#: ../app/paint/gimpmybrushoptions.c:100 ../app/paint/gimppaintoptions.c:221 #: ../app/tools/gimpwarpoptions.c:98 ../app/widgets/gimpbrusheditor.c:178 msgid "Hardness" msgstr "Hårdhet" -#: ../app/paint/gimpmybrushoptions.c:106 -#, fuzzy -#| msgctxt "brushes-action" -#| msgid "Edit this brush" +#: ../app/paint/gimpmybrushoptions.c:107 msgid "Erase with this brush" -msgstr "Redigera denna pensel" +msgstr "Sudda med denna pensel" + +#: ../app/paint/gimpmybrushoptions.c:114 +msgid "No erasing effect" +msgstr "Ingen suddningseffekt" + +#: ../app/paint/gimpmybrushoptions.c:115 ../app/paint/gimpsmudgeoptions.c:85 +msgid "Never decrease alpha of existing pixels" +msgstr "Minska inte alfa för existerande bildpunkter" #: ../app/paint/gimppaintbrush.c:68 ../app/tools/gimppaintbrushtool.c:51 msgid "Paintbrush" msgstr "Pensel" -#: ../app/paint/gimppaintcore.c:144 +#: ../app/paint/gimppaintcore.c:147 msgid "Paint" msgstr "Måla" -#: ../app/paint/gimppaintoptions.c:191 +#: ../app/paint/gimppaintoptions.c:194 msgid "Brush Size" msgstr "Penselstorlek" -#: ../app/paint/gimppaintoptions.c:197 -#, fuzzy -#| msgid "Brush Folders" -msgid "Brush Zoom" -msgstr "Penselmappar" - -#: ../app/paint/gimppaintoptions.c:198 -msgid "Link brush size with canvas zoom" -msgstr "" - -#: ../app/paint/gimppaintoptions.c:204 +#: ../app/paint/gimppaintoptions.c:200 msgid "Aspect Ratio" msgstr "Bildförhållande" -#: ../app/paint/gimppaintoptions.c:218 ../app/widgets/gimpbrusheditor.c:211 +#: ../app/paint/gimppaintoptions.c:214 ../app/tools/gimpwarpoptions.c:112 +#: ../app/widgets/gimpbrusheditor.c:211 #: ../app/widgets/gimpbrushfactoryview.c:81 ../app/widgets/gimpgrideditor.c:174 msgid "Spacing" msgstr "Mellanrum" -#: ../app/paint/gimppaintoptions.c:232 -#, fuzzy -#| msgctxt "dynamics-output-type" -#| msgid "Force" +#: ../app/paint/gimppaintoptions.c:228 msgid "Force" msgstr "Kraft" -#: ../app/paint/gimppaintoptions.c:233 -#, fuzzy -#| msgid "Brush Folders" +#: ../app/paint/gimppaintoptions.c:229 msgid "Brush Force" -msgstr "Penselmappar" +msgstr "Penselkraft" -#: ../app/paint/gimppaintoptions.c:239 -#, fuzzy -#| msgid "Print Size" +#: ../app/paint/gimppaintoptions.c:235 msgid "Link Size" -msgstr "Utskriftsstorlek" +msgstr "Länkstorlek" -#: ../app/paint/gimppaintoptions.c:240 -#, fuzzy -#| msgid "Reset size to brush's native size" +#: ../app/paint/gimppaintoptions.c:236 msgid "Link brush size to brush native" -msgstr "Återställ storlek till penselns ursprungsstorlek" +msgstr "Länka penselstorlek till penselns ursprungsstorlek" -#: ../app/paint/gimppaintoptions.c:246 -#, fuzzy -#| msgid "Aspect Ratio" +#: ../app/paint/gimppaintoptions.c:242 msgid "Link Aspect Ratio" -msgstr "Bildförhållande" +msgstr "Länka bildförhållande" -#: ../app/paint/gimppaintoptions.c:247 -#, fuzzy -#| msgid "Reset aspect ratio to brush's native" +#: ../app/paint/gimppaintoptions.c:243 msgid "Link brush aspect ratio to brush native" -msgstr "Återställ penselns ursprungliga aspektförhållande" +msgstr "" +"Länka penselns bildförhållande till penselns ursprungliga bildförhållande" -#: ../app/paint/gimppaintoptions.c:253 -#, fuzzy -#| msgid "Ink Blob Angle" +#: ../app/paint/gimppaintoptions.c:249 msgid "Link Angle" -msgstr "Vinkel för bläckdroppe" +msgstr "Länkvinkel" -#: ../app/paint/gimppaintoptions.c:254 +#: ../app/paint/gimppaintoptions.c:250 msgid "Link brush angle to brush native" -msgstr "" +msgstr "Länka penselvinkel till penselns ursprungliga" -#: ../app/paint/gimppaintoptions.c:260 -#, fuzzy -#| msgctxt "guides-type" -#| msgid "Line spacing" +#: ../app/paint/gimppaintoptions.c:256 msgid "Link Spacing" -msgstr "Radavstånd" +msgstr "Länkmellanrum" -#: ../app/paint/gimppaintoptions.c:261 -#, fuzzy -#| msgid "Reset aspect ratio to brush's native" +#: ../app/paint/gimppaintoptions.c:257 msgid "Link brush spacing to brush native" -msgstr "Återställ penselns ursprungliga aspektförhållande" +msgstr "Återställ penselns ursprungliga bildförhållande" -#: ../app/paint/gimppaintoptions.c:267 -#, fuzzy -#| msgid "Hardness" +#: ../app/paint/gimppaintoptions.c:263 msgid "Link Hardness" -msgstr "Hårdhet" +msgstr "Länkhårdhet" -#: ../app/paint/gimppaintoptions.c:268 +#: ../app/paint/gimppaintoptions.c:264 msgid "Link brush hardness to brush native" -msgstr "" +msgstr "Länka penselhårdhet med penselns ursprungliga" -#: ../app/paint/gimppaintoptions.c:274 +#: ../app/paint/gimppaintoptions.c:270 +msgid "Lock brush to view" +msgstr "Lås pensel till vy" + +#: ../app/paint/gimppaintoptions.c:271 +msgid "Keep brush appearance fixed relative to the view" +msgstr "Behåll pensels utseende fixerat relativt till vyn" + +#: ../app/paint/gimppaintoptions.c:277 msgid "Incremental" msgstr "Inkrementell" -#: ../app/paint/gimppaintoptions.c:275 +#: ../app/paint/gimppaintoptions.c:278 msgid "Every stamp has its own opacity" msgstr "Varje stämpel har en egen opacitet" -#: ../app/paint/gimppaintoptions.c:282 +#: ../app/paint/gimppaintoptions.c:285 msgid "Hard edge" msgstr "Hård kant" -#: ../app/paint/gimppaintoptions.c:283 +#: ../app/paint/gimppaintoptions.c:286 msgid "Ignore fuzziness of the current brush" msgstr "Ignorera luddighet för aktuell pensel" # FIXME: Hitta bättre ord -#: ../app/paint/gimppaintoptions.c:289 +#: ../app/paint/gimppaintoptions.c:292 msgid "Apply Jitter" msgstr "Tillämpa jitter" -#: ../app/paint/gimppaintoptions.c:290 +#: ../app/paint/gimppaintoptions.c:293 msgid "Scatter brush as you paint" msgstr "Sprid ut penseln medan du målar" -#: ../app/paint/gimppaintoptions.c:295 +#: ../app/paint/gimppaintoptions.c:298 msgid "Amount" msgstr "Mängd" -#: ../app/paint/gimppaintoptions.c:296 +#: ../app/paint/gimppaintoptions.c:299 msgid "Distance of scattering" msgstr "Distans för spridning" -#: ../app/paint/gimppaintoptions.c:302 +#: ../app/paint/gimppaintoptions.c:305 msgid "Dynamics Options" msgstr "Dynamikalternativ" -#: ../app/paint/gimppaintoptions.c:309 +#: ../app/paint/gimppaintoptions.c:312 msgid "Fade length" msgstr "Toningslängd" -#: ../app/paint/gimppaintoptions.c:310 +#: ../app/paint/gimppaintoptions.c:313 msgid "Distance over which strokes fade out" msgstr "Sträcka över vilken penseldrag tonar ut" -#: ../app/paint/gimppaintoptions.c:320 ../app/widgets/gimpviewablebox.c:379 +#: ../app/paint/gimppaintoptions.c:323 ../app/widgets/gimpviewablebox.c:385 msgid "Reverse" msgstr "Omvänd" -#: ../app/paint/gimppaintoptions.c:321 +#: ../app/paint/gimppaintoptions.c:324 msgid "Reverse direction of fading" msgstr "Vänd riktning för uttoning" -#: ../app/paint/gimppaintoptions.c:326 ../app/tools/gimpblendoptions.c:92 -#: ../app/tools/gimpblendoptions.c:245 ../app/tools/gimppaintoptions-gui.c:347 -#, fuzzy -#| msgid "Repeat:" +#: ../app/paint/gimppaintoptions.c:329 ../app/tools/gimpblendoptions.c:108 +#: ../app/tools/gimpblendoptions.c:325 ../app/tools/gimppaintoptions-gui.c:356 msgid "Repeat" -msgstr "Upprepa:" +msgstr "Upprepa" -#: ../app/paint/gimppaintoptions.c:327 +#: ../app/paint/gimppaintoptions.c:330 msgid "How fade is repeated as you paint" msgstr "Hur uttoning upprepas medan du målar" -#: ../app/paint/gimppaintoptions.c:396 +#: ../app/paint/gimppaintoptions.c:342 ../app/tools/gimpblendoptions.c:297 +#: ../app/tools/gimppaintoptions-gui.c:392 +#, fuzzy +#| msgctxt "layers-action" +#| msgid "Blend Space" +msgid "Blend Color Space" +msgstr "Toningsrymd" + +#: ../app/paint/gimppaintoptions.c:343 +msgid "Which color space to use when blending RGB gradient segments" +msgstr "" + +#: ../app/paint/gimppaintoptions.c:406 msgid "Smooth stroke" msgstr "Mjukt penseldrag" -#: ../app/paint/gimppaintoptions.c:397 +#: ../app/paint/gimppaintoptions.c:407 msgid "Paint smoother strokes" msgstr "Måla jämnare penseldrag" -#: ../app/paint/gimppaintoptions.c:403 +#: ../app/paint/gimppaintoptions.c:413 msgid "Depth of smoothing" msgstr "Djup för utjämning" -#: ../app/paint/gimppaintoptions.c:408 +#: ../app/paint/gimppaintoptions.c:418 msgid "Weight" msgstr "Vikt" -#: ../app/paint/gimppaintoptions.c:409 +#: ../app/paint/gimppaintoptions.c:419 msgid "Gravity of the pen" msgstr "Pennans gravitation" @@ -15163,33 +18652,47 @@ msgid "Pencil" msgstr "Penna" #: ../app/paint/gimpperspectiveclone.c:91 -#: ../app/tools/gimpperspectiveclonetool.c:133 +#: ../app/tools/gimpperspectiveclonetool.c:142 msgid "Perspective Clone" msgstr "Perspektivkloning" -#: ../app/paint/gimpsmudge.c:85 ../app/tools/gimpsmudgetool.c:54 +#: ../app/paint/gimpsmudge.c:86 ../app/tools/gimpsmudgetool.c:55 msgid "Smudge" msgstr "Smeta" -#: ../app/paint/gimpsmudgeoptions.c:66 -#, fuzzy -#| msgid "Rate" +#: ../app/paint/gimpsmudgeoptions.c:70 msgctxt "smudge-tool" msgid "Rate" msgstr "Hastighet" -#: ../app/paint/gimpsourcecore.c:238 +#: ../app/paint/gimpsmudgeoptions.c:71 +msgid "The strength of smudging" +msgstr "Utsmetningsstyrka" + +#: ../app/paint/gimpsmudgeoptions.c:77 +msgctxt "smudge-tool" +msgid "Flow" +msgstr "Flöde" + +#: ../app/paint/gimpsmudgeoptions.c:78 +msgid "The amount of brush color to blend" +msgstr "Mängden penselfärg som ska tonas" + +#: ../app/paint/gimpsmudgeoptions.c:84 +msgctxt "smudge-tool" +msgid "No erasing effect" +msgstr "Ingen suddningseffekt" + +#: ../app/paint/gimpsourcecore.c:239 msgid "Set a source image first." msgstr "Ställ in en källbild först." #: ../app/paint/gimpsourceoptions.c:63 ../app/tools/gimpcloneoptions-gui.c:102 #: ../app/tools/gimphealtool.c:105 -#, fuzzy -#| msgid "Alignment:" msgid "Alignment" -msgstr "Arrangemang:" +msgstr "Arrangemang" -#: ../app/paint/gimpsourceoptions.c:71 ../app/pdb/gimppdbcontext.c:127 +#: ../app/paint/gimpsourceoptions.c:71 ../app/pdb/gimppdbcontext.c:128 #: ../app/tools/gimpbucketfilloptions.c:117 ../app/tools/gimpcoloroptions.c:69 #: ../app/tools/gimphealtool.c:99 ../app/tools/gimpregionselectoptions.c:97 msgid "Sample merged" @@ -15229,79 +18732,71 @@ msgstr "Fast" msgid "Combine Masks" msgstr "Kombinera masker" -#: ../app/pdb/color-cmds.c:86 ../app/pdb/drawable-color-cmds.c:86 +#: ../app/pdb/color-cmds.c:85 ../app/pdb/drawable-color-cmds.c:85 msgctxt "undo-type" msgid "Brightness-Contrast" msgstr "Ljusstyrka-Kontrast" -#: ../app/pdb/color-cmds.c:147 ../app/pdb/drawable-color-cmds.c:593 -#, fuzzy -#| msgid "Levels" +#: ../app/pdb/color-cmds.c:148 ../app/pdb/drawable-color-cmds.c:610 msgctxt "undo-type" msgid "Levels" msgstr "Nivåer" -#: ../app/pdb/color-cmds.c:246 ../app/pdb/drawable-color-cmds.c:663 -#, fuzzy -#| msgid "Posterize" +#: ../app/pdb/color-cmds.c:247 ../app/pdb/drawable-color-cmds.c:680 msgctxt "undo-type" msgid "Posterize" -msgstr "Posterisering" +msgstr "Färgreduktion" -#: ../app/pdb/color-cmds.c:285 ../app/pdb/color-cmds.c:326 +#: ../app/pdb/color-cmds.c:286 ../app/pdb/color-cmds.c:327 #: ../app/pdb/drawable-color-cmds.c:325 -#, fuzzy -#| msgid "Desaturate" msgctxt "undo-type" msgid "Desaturate" -msgstr "Avfärga" +msgstr "Avmätta" -#: ../app/pdb/color-cmds.c:435 ../app/pdb/color-cmds.c:483 +#: ../app/pdb/color-cmds.c:389 +msgid "Invert" +msgstr "Invertera" + +#: ../app/pdb/color-cmds.c:436 ../app/pdb/color-cmds.c:484 #: ../app/pdb/drawable-color-cmds.c:235 ../app/pdb/drawable-color-cmds.c:283 msgctxt "undo-type" msgid "Curves" msgstr "Kurvor" -#: ../app/pdb/color-cmds.c:537 ../app/pdb/drawable-color-cmds.c:140 +#: ../app/pdb/color-cmds.c:538 ../app/pdb/drawable-color-cmds.c:139 msgctxt "undo-type" msgid "Color Balance" msgstr "Färgbalans" -#: ../app/pdb/color-cmds.c:583 ../app/pdb/drawable-color-cmds.c:186 +#: ../app/pdb/color-cmds.c:586 ../app/pdb/drawable-color-cmds.c:187 msgctxt "undo-type" msgid "Colorize" msgstr "Färglägg" -#: ../app/pdb/color-cmds.c:726 ../app/tools/gimphuesaturationtool.c:96 +#: ../app/pdb/color-cmds.c:738 msgid "Hue-Saturation" msgstr "Nyans-Mättnad" -#: ../app/pdb/color-cmds.c:770 ../app/pdb/drawable-color-cmds.c:706 -#, fuzzy -#| msgid "Threshold" +#: ../app/pdb/color-cmds.c:782 ../app/pdb/drawable-color-cmds.c:726 msgctxt "undo-type" msgid "Threshold" -msgstr "Tröskelvärde" +msgstr "Tröskel" #: ../app/pdb/drawable-cmds.c:524 -msgid "Plug-In" +msgid "Plug-in" msgstr "Insticksmodul" -#: ../app/pdb/drawable-cmds.c:963 ../app/tools/gimpforegroundselecttool.c:998 +#: ../app/pdb/drawable-cmds.c:963 ../app/tools/gimpforegroundselecttool.c:993 msgctxt "command" msgid "Foreground Select" msgstr "Förgrundsmarkering" -#: ../app/pdb/drawable-color-cmds.c:500 -#, fuzzy -#| msgid "Hue-Saturation" +#: ../app/pdb/drawable-color-cmds.c:507 msgctxt "undo-type" msgid "Hue-Saturation" msgstr "Nyans-Mättnad" -#: ../app/pdb/drawable-color-cmds.c:533 -#, fuzzy -#| msgid "Invert" +#: ../app/pdb/drawable-color-cmds.c:542 msgctxt "undo-type" msgid "Invert" msgstr "Invertera" @@ -15309,18 +18804,18 @@ msgstr "Invertera" #: ../app/pdb/drawable-transform-cmds.c:355 #: ../app/pdb/drawable-transform-cmds.c:455 #: ../app/pdb/item-transform-cmds.c:270 ../app/pdb/transform-tools-cmds.c:171 -#: ../app/tools/gimpperspectivetool.c:83 -#: ../app/tools/gimptransformoptions.c:524 -#: ../app/tools/gimptransformoptions.c:533 +#: ../app/tools/gimpperspectivetool.c:85 +#: ../app/tools/gimptransformoptions.c:560 +#: ../app/tools/gimptransformoptions.c:569 msgid "Perspective" msgstr "Perspektiv" #: ../app/pdb/drawable-transform-cmds.c:977 #: ../app/pdb/drawable-transform-cmds.c:1064 #: ../app/pdb/item-transform-cmds.c:621 ../app/pdb/transform-tools-cmds.c:432 -#: ../app/tools/gimpsheartool.c:116 +#: ../app/tools/gimpsheartool.c:119 msgid "Shearing" -msgstr "Lutning" +msgstr "Skevning" #: ../app/pdb/drawable-transform-cmds.c:1161 #: ../app/pdb/item-transform-cmds.c:719 ../app/pdb/transform-tools-cmds.c:523 @@ -15334,10 +18829,6 @@ msgstr "2d-transformera" msgid "2D Transforming" msgstr "2d-transformerar" -#: ../app/pdb/edit-cmds.c:795 -msgid "Blending" -msgstr "Tonar" - #: ../app/pdb/floating-sel-cmds.c:69 msgid "Cannot remove this layer because it is not a floating selection." msgstr "" @@ -15357,16 +18848,15 @@ msgstr "" "markering." #: ../app/pdb/gimppdb-query.c:140 -#, fuzzy, c-format -#| msgid "Opening '%s' failed: %s" +#, c-format msgid "Writing PDB file '%s' failed: %s" -msgstr "Öppnande av \"%s\" misslyckades: %s" +msgstr "Skrivning av PDB-fil ”%s” misslyckades: %s" #: ../app/pdb/gimppdb-query.c:315 ../app/pdb/gimppdb.c:306 #: ../app/pdb/gimppdb.c:377 #, c-format msgid "Procedure '%s' not found" -msgstr "Proceduren \"%s\" hittades inte" +msgstr "Proceduren ”%s” hittades inte" #: ../app/pdb/gimppdb-utils.c:76 msgid "Invalid empty brush name" @@ -15375,228 +18865,243 @@ msgstr "Ogiltigt tomt penselnamn" #: ../app/pdb/gimppdb-utils.c:85 #, c-format msgid "Brush '%s' not found" -msgstr "Penseln \"%s\" hittades inte" +msgstr "Penseln ”%s” hittades inte" -#: ../app/pdb/gimppdb-utils.c:90 +#: ../app/pdb/gimppdb-utils.c:91 #, c-format msgid "Brush '%s' is not editable" -msgstr "Penseln \"%s\" är inte redigerbar" +msgstr "Penseln ”%s” är inte redigerbar" -#: ../app/pdb/gimppdb-utils.c:116 +#: ../app/pdb/gimppdb-utils.c:98 +#, c-format +msgid "Brush '%s' is not renamable" +msgstr "Penseln ”%s” kan inte byta namn" + +#: ../app/pdb/gimppdb-utils.c:124 #, c-format msgid "Brush '%s' is not a generated brush" -msgstr "Penseln \"%s\" är inte en genererad pensel" +msgstr "Penseln ”%s” är inte en genererad pensel" -#: ../app/pdb/gimppdb-utils.c:137 +#: ../app/pdb/gimppdb-utils.c:145 msgid "Invalid empty paint dynamics name" msgstr "Ogiltigt tomt målningsdynamiknamn" -#: ../app/pdb/gimppdb-utils.c:146 +#: ../app/pdb/gimppdb-utils.c:154 #, c-format msgid "Paint dynamics '%s' not found" -msgstr "Målningsdynamik '%s' hittades inte" +msgstr "Målningsdynamik ”%s” hittades inte" -#: ../app/pdb/gimppdb-utils.c:151 +#: ../app/pdb/gimppdb-utils.c:160 #, c-format msgid "Paint dynamics '%s' is not editable" -msgstr "Målningsdynamik '%s' är inte redigerbar" +msgstr "Målningsdynamik ”%s” är inte redigerbar" -#: ../app/pdb/gimppdb-utils.c:172 -#, fuzzy -#| msgid "Invalid empty brush name" +#: ../app/pdb/gimppdb-utils.c:167 +#, c-format +msgid "Paint dynamics '%s' is not renamable" +msgstr "Målningsdynamik ”%s” kan inte byta namn" + +#: ../app/pdb/gimppdb-utils.c:188 msgid "Invalid empty MyPaint brush name" -msgstr "Ogiltigt tomt penselnamn" +msgstr "Ogiltigt tomt MyPaint-penselnamn" -#: ../app/pdb/gimppdb-utils.c:181 -#, fuzzy, c-format -#| msgid "Brush '%s' not found" +#: ../app/pdb/gimppdb-utils.c:197 +#, c-format msgid "MyPaint brush '%s' not found" -msgstr "Penseln \"%s\" hittades inte" +msgstr "MyPaint-penseln ”%s” hittades inte" -#: ../app/pdb/gimppdb-utils.c:186 -#, fuzzy, c-format -#| msgid "Brush '%s' is not editable" +#: ../app/pdb/gimppdb-utils.c:203 +#, c-format msgid "MyPaint brush '%s' is not editable" -msgstr "Penseln \"%s\" är inte redigerbar" +msgstr "MyPaint-penseln ”%s” är inte redigerbar" -#: ../app/pdb/gimppdb-utils.c:206 +#: ../app/pdb/gimppdb-utils.c:210 +#, c-format +msgid "MyPaint brush '%s' is not renamable" +msgstr "MyPaint-penseln ”%s” kan inte byta namn" + +#: ../app/pdb/gimppdb-utils.c:230 msgid "Invalid empty pattern name" msgstr "Ogiltigt tomt mönsternamn" -#: ../app/pdb/gimppdb-utils.c:215 +#: ../app/pdb/gimppdb-utils.c:239 #, c-format msgid "Pattern '%s' not found" -msgstr "Mönstret \"%s\" hittades inte" +msgstr "Mönstret ”%s” hittades inte" -#: ../app/pdb/gimppdb-utils.c:235 +#: ../app/pdb/gimppdb-utils.c:259 msgid "Invalid empty gradient name" msgstr "Ogiltigt tomt gradientnamn" -#: ../app/pdb/gimppdb-utils.c:244 +#: ../app/pdb/gimppdb-utils.c:268 #, c-format msgid "Gradient '%s' not found" -msgstr "Gradienten \"%s\" hittades inte" +msgstr "Gradienten ”%s” hittades inte" -#: ../app/pdb/gimppdb-utils.c:249 +#: ../app/pdb/gimppdb-utils.c:274 #, c-format msgid "Gradient '%s' is not editable" -msgstr "Gradienten \"%s\" är inte redigerbar" +msgstr "Gradienten ”%s” är inte redigerbar" -#: ../app/pdb/gimppdb-utils.c:270 +#: ../app/pdb/gimppdb-utils.c:281 +#, c-format +msgid "Gradient '%s' is not renamable" +msgstr "Gradienten ”%s” kan inte byta namn" + +#: ../app/pdb/gimppdb-utils.c:302 msgid "Invalid empty palette name" msgstr "Ogiltigt tomt palettnamn" -#: ../app/pdb/gimppdb-utils.c:279 +#: ../app/pdb/gimppdb-utils.c:311 #, c-format msgid "Palette '%s' not found" -msgstr "Paletten \"%s\" hittades inte" +msgstr "Paletten ”%s” hittades inte" -#: ../app/pdb/gimppdb-utils.c:284 +#: ../app/pdb/gimppdb-utils.c:317 #, c-format msgid "Palette '%s' is not editable" -msgstr "Paletten \"%s\" är inte redigerbar" +msgstr "Paletten ”%s” är inte redigerbar" -#: ../app/pdb/gimppdb-utils.c:304 +#: ../app/pdb/gimppdb-utils.c:324 +#, c-format +msgid "Palette '%s' is not renamable" +msgstr "Paletten ”%s” kan inte byta namn" + +#: ../app/pdb/gimppdb-utils.c:344 msgid "Invalid empty font name" msgstr "Ogiltigt tomt typsnittsnamn" -#: ../app/pdb/gimppdb-utils.c:314 +#: ../app/pdb/gimppdb-utils.c:354 #, c-format msgid "Font '%s' not found" -msgstr "Typsnittet \"%s\" hittades inte" +msgstr "Typsnittet ”%s” hittades inte" -#: ../app/pdb/gimppdb-utils.c:333 +#: ../app/pdb/gimppdb-utils.c:373 msgid "Invalid empty buffer name" msgstr "Ogiltigt tomt buffertnamn" -#: ../app/pdb/gimppdb-utils.c:343 +#: ../app/pdb/gimppdb-utils.c:383 #, c-format msgid "Named buffer '%s' not found" -msgstr "Namngiven buffert \"%s\" hittades inte" +msgstr "Namngiven buffert ”%s” hittades inte" -#: ../app/pdb/gimppdb-utils.c:362 +#: ../app/pdb/gimppdb-utils.c:402 msgid "Invalid empty paint method name" msgstr "Ogiltigt tomt målarmetodnamn" -#: ../app/pdb/gimppdb-utils.c:372 +#: ../app/pdb/gimppdb-utils.c:412 #, c-format msgid "Paint method '%s' does not exist" -msgstr "Målarmetoden \"%s\" finns inte" +msgstr "Målarmetoden ”%s” finns inte" -#: ../app/pdb/gimppdb-utils.c:391 +#: ../app/pdb/gimppdb-utils.c:431 #, c-format msgid "Item '%s' (%d) cannot be used because it has not been added to an image" msgstr "" -"Objekt '%s' (%d) kan inte användas därför att det inte har lagts till en bild" +"Objekt ”%s” (%d) kan inte användas därför att det inte har lagts till en bild" -#: ../app/pdb/gimppdb-utils.c:401 +#: ../app/pdb/gimppdb-utils.c:441 #, c-format msgid "Item '%s' (%d) cannot be used because it is attached to another image" msgstr "" -"Objekt '%s' (%d) kan inte användas därför att det bifogats till en annan bild" +"Objekt ”%s” (%d) kan inte användas därför att det bifogats till en annan bild" -#: ../app/pdb/gimppdb-utils.c:427 +#: ../app/pdb/gimppdb-utils.c:467 #, c-format msgid "" "Item '%s' (%d) cannot be used because it is not a direct child of an item " "tree" msgstr "" -"Objekt '%s' (%d) kan inte användas därför att det inte är direktbarn av ett " -"objektträd" +"Objekt ”%s” (%d) kan inte användas därför att det inte är direktbarn till " +"ett objektträd" -#: ../app/pdb/gimppdb-utils.c:455 +#: ../app/pdb/gimppdb-utils.c:495 #, c-format msgid "" "Items '%s' (%d) and '%s' (%d) cannot be used because they are not part of " "the same item tree" msgstr "" -"Objekt '%s' (%d) och '%s' (%d) kan inte användas därför att de inte är delar " +"Objekt ”%s” (%d) och ”%s” (%d) kan inte användas därför att de inte är delar " "av samma objektträd" -#: ../app/pdb/gimppdb-utils.c:480 +#: ../app/pdb/gimppdb-utils.c:520 #, c-format msgid "Item '%s' (%d) must not be an ancestor of '%s' (%d)" -msgstr "Objekt '%s' (%d) kan inte vara ursprung för '%s' (%d)" +msgstr "Objekt ”%s” (%d) kan inte vara ursprung för ”%s” (%d)" -#: ../app/pdb/gimppdb-utils.c:504 +#: ../app/pdb/gimppdb-utils.c:544 #, c-format msgid "Item '%s' (%d) has already been added to an image" -msgstr "Objektet \"%s\" (%d) har redan lagts till i en bild" +msgstr "Objektet ”%s” (%d) har redan lagts till i en bild" -#: ../app/pdb/gimppdb-utils.c:512 +#: ../app/pdb/gimppdb-utils.c:552 #, c-format msgid "Trying to add item '%s' (%d) to wrong image" -msgstr "Försöker lägg till objektet \"%s\" (%d) till fel bild" +msgstr "Försöker lägg till objektet ”%s” (%d) till fel bild" -#: ../app/pdb/gimppdb-utils.c:532 +#: ../app/pdb/gimppdb-utils.c:572 #, c-format msgid "Item '%s' (%d) cannot be modified because its contents are locked" -msgstr "Objektet \"%s\" (%d) kan inte ändras därför att dess innehåll är låst" - -#: ../app/pdb/gimppdb-utils.c:542 -#, fuzzy, c-format -#| msgid "Item '%s' (%d) cannot be modified because its contents are locked" -msgid "" -"Item '%s' (%d) cannot be modified because its position and size are locked" -msgstr "Objektet \"%s\" (%d) kan inte ändras därför att dess innehåll är låst" - -#: ../app/pdb/gimppdb-utils.c:562 -#, c-format -msgid "Item '%s' (%d) cannot be used because it is not a group item" -msgstr "" -"Objekt '%s' (%d) kan inte användas därför att det inte är ett gruppobjekt" +msgstr "Objektet ”%s” (%d) kan inte ändras därför att dess innehåll är låst" #: ../app/pdb/gimppdb-utils.c:582 #, c-format -msgid "Item '%s' (%d) cannot be modified because it is a group item" -msgstr "Objektet \"%s\" (%d) kan inte ändras därför att det är ett gruppobjekt" +msgid "" +"Item '%s' (%d) cannot be modified because its position and size are locked" +msgstr "" +"Objektet ”%s” (%d) kan inte ändras därför att dess position och storlek är " +"låst" -#: ../app/pdb/gimppdb-utils.c:603 +#: ../app/pdb/gimppdb-utils.c:602 +#, c-format +msgid "Item '%s' (%d) cannot be used because it is not a group item" +msgstr "" +"Objekt ”%s” (%d) kan inte användas därför att det inte är ett gruppobjekt" + +#: ../app/pdb/gimppdb-utils.c:622 +#, c-format +msgid "Item '%s' (%d) cannot be modified because it is a group item" +msgstr "Objektet ”%s” (%d) kan inte ändras därför att det är ett gruppobjekt" + +#: ../app/pdb/gimppdb-utils.c:643 #, c-format msgid "Layer '%s' (%d) cannot be used because it is not a text layer" -msgstr "Lager '%s' (%d) kan inte användas därför att det inte är ett textlager" +msgstr "Lager ”%s” (%d) kan inte användas därför att det inte är ett textlager" -#: ../app/pdb/gimppdb-utils.c:644 +#: ../app/pdb/gimppdb-utils.c:684 #, c-format msgid "Image '%s' (%d) is of type '%s', but an image of type '%s' is expected" -msgstr "" -"Bilden \"%s\" (%d) är av typen \"%s\" men en bild av typen \"%s\" förväntas" +msgstr "Bilden ”%s” (%d) är av typen ”%s” men en bild av typen ”%s” förväntas" -#: ../app/pdb/gimppdb-utils.c:667 -#, fuzzy, c-format -#| msgid "Image '%s' (%d) is already of type '%s'" +#: ../app/pdb/gimppdb-utils.c:707 +#, c-format msgid "Image '%s' (%d) must not be of type '%s'" -msgstr "Bilden \"%s\" (%d) är redan av typen \"%s\"" +msgstr "Bilden ”%s” (%d) är redan av typen ”%s”" -#: ../app/pdb/gimppdb-utils.c:687 -#, fuzzy, c-format -#| msgid "" -#| "Image '%s' (%d) is of type '%s', but an image of type '%s' is expected" +#: ../app/pdb/gimppdb-utils.c:727 +#, c-format msgid "" "Image '%s' (%d) has precision '%s', but an image of precision '%s' is " "expected" msgstr "" -"Bilden \"%s\" (%d) är av typen \"%s\" men en bild av typen \"%s\" förväntas" +"Bilden ”%s” (%d) är av typen ”%s” men en bild med precision ”%s” förväntas" -#: ../app/pdb/gimppdb-utils.c:710 -#, fuzzy, c-format -#| msgid "Image '%s' (%d) is already of type '%s'" +#: ../app/pdb/gimppdb-utils.c:750 +#, c-format msgid "Image '%s' (%d) must not be of precision '%s'" -msgstr "Bilden \"%s\" (%d) är redan av typen \"%s\"" +msgstr "Bilden ”%s” (%d) har redan precision ”%s”" -#: ../app/pdb/gimppdb-utils.c:734 ../app/pdb/image-guides-cmds.c:179 -#, fuzzy, c-format -#| msgid "Vectors object %d does not contain stroke with ID %d" +#: ../app/pdb/gimppdb-utils.c:774 ../app/pdb/image-guides-cmds.c:179 +#, c-format msgid "Image '%s' (%d) does not contain guide with ID %d" -msgstr "Vektorobjekt %d innehåller inte penseldrag med ID %d" +msgstr "Bilden ”%s” (%d) innehåller inte en guide med ID %d" -#: ../app/pdb/gimppdb-utils.c:757 ../app/pdb/image-sample-points-cmds.c:144 -#, fuzzy, c-format -#| msgid "Vectors object %d does not contain stroke with ID %d" +#: ../app/pdb/gimppdb-utils.c:797 ../app/pdb/image-sample-points-cmds.c:144 +#, c-format msgid "Image '%s' (%d) does not contain sample point with ID %d" -msgstr "Vektorobjekt %d innehåller inte penseldrag med ID %d" +msgstr "Bild ”%s” (%d) innehåller inte en samplingspunkt med ID %d" -#: ../app/pdb/gimppdb-utils.c:785 +#: ../app/pdb/gimppdb-utils.c:825 #, c-format msgid "Vectors object %d does not contain stroke with ID %d" msgstr "Vektorobjekt %d innehåller inte penseldrag med ID %d" @@ -15607,160 +19112,140 @@ msgid "" "Procedure '%s' has been called with a wrong type for argument #%d. Expected " "%s, got %s." msgstr "" -"Proceduren \"%s\" har anropats med en felaktig typ för argument nr %d. " +"Proceduren ”%s” har anropats med en felaktig typ för argument nr %d. " "Förväntade %s, fick %s." -#: ../app/pdb/gimppdbcontext.c:100 ../app/tools/gimpselectionoptions.c:81 +#: ../app/pdb/gimppdbcontext.c:101 ../app/tools/gimpselectionoptions.c:81 msgid "Smooth edges" msgstr "Utjämna kanter" -#: ../app/pdb/gimppdbcontext.c:106 -#, fuzzy -#| msgctxt "select-action" -#| msgid "Fea_ther..." +#: ../app/pdb/gimppdbcontext.c:107 msgid "Feather" -msgstr "Fj_äder..." +msgstr "Fjädra" -#: ../app/pdb/gimppdbcontext.c:113 -#, fuzzy -#| msgid "Feather edges" +#: ../app/pdb/gimppdbcontext.c:114 msgid "Feather radius X" -msgstr "Fjädra kanter" +msgstr "X-fjädringsradie" -#: ../app/pdb/gimppdbcontext.c:120 -#, fuzzy -#| msgid "Feather edges" +#: ../app/pdb/gimppdbcontext.c:121 msgid "Feather radius Y" -msgstr "Fjädra kanter" +msgstr "Y-fjädringsradie" -#: ../app/pdb/gimppdbcontext.c:134 -#, fuzzy -#| msgid "Selection criterion" +#: ../app/pdb/gimppdbcontext.c:135 msgid "Sample criterion" -msgstr "Markeringskriterium" +msgstr "Samplingskriterium" -#: ../app/pdb/gimppdbcontext.c:142 -#, fuzzy -#| msgid "Apply Threshold" +#: ../app/pdb/gimppdbcontext.c:143 msgid "Sample threshold" -msgstr "Tillämpa tröskelvärde" +msgstr "Tröskelvärde för sampling" -#: ../app/pdb/gimppdbcontext.c:149 -#, fuzzy -#| msgid "Make _transparent" +#: ../app/pdb/gimppdbcontext.c:150 msgid "Sample transparent" -msgstr "Gör _transparent" +msgstr "Sampla transparent" -#: ../app/pdb/gimppdbcontext.c:156 ../app/tools/gimpbucketfilloptions.c:124 +#: ../app/pdb/gimppdbcontext.c:157 ../app/tools/gimpbucketfilloptions.c:124 #: ../app/tools/gimpregionselectoptions.c:104 -#, fuzzy -#| msgctxt "guides-type" -#| msgid "Diagonal lines" msgid "Diagonal neighbors" -msgstr "Diagonala linjer" +msgstr "Diagonala grannar" -#: ../app/pdb/gimppdbcontext.c:163 ../app/tools/gimptransformoptions.c:124 -#: ../app/tools/gimptransformoptions.c:441 -#, fuzzy -#| msgid "Interpolation:" +#: ../app/pdb/gimppdbcontext.c:164 ../app/tools/gimptransformoptions.c:124 +#: ../app/tools/gimptransformoptions.c:448 ../app/tools/gimpwarpoptions.c:119 +#: ../app/tools/gimpwarpoptions.c:322 msgid "Interpolation" -msgstr "Interpolation:" +msgstr "Interpolation" -#: ../app/pdb/gimppdbcontext.c:171 -#, fuzzy -#| msgid "Transformation" +#: ../app/pdb/gimppdbcontext.c:172 msgid "Transform direction" -msgstr "Transformation" +msgstr "Transformera riktning" -#: ../app/pdb/gimppdbcontext.c:179 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Transform Items" +#: ../app/pdb/gimppdbcontext.c:180 msgid "Transform resize" -msgstr "Transformera objekt" +msgstr "Transformera storlek" -#: ../app/pdb/gimpprocedure.c:461 ../app/plug-in/gimppluginprocframe.c:213 +#: ../app/pdb/gimppdbcontext.c:195 +msgid "Distance metric" +msgstr "Avståndsmått" + +#: ../app/pdb/gimpprocedure.c:467 ../app/plug-in/gimppluginprocframe.c:191 #, c-format msgid "Procedure '%s' returned no return values" -msgstr "Proceduren \"%s\" returnerade inga returvärden" +msgstr "Proceduren ”%s” returnerade inga returvärden" -#: ../app/pdb/gimpprocedure.c:731 +#: ../app/pdb/gimpprocedure.c:743 #, c-format msgid "" "Procedure '%s' returned a wrong value type for return value '%s' (#%d). " "Expected %s, got %s." msgstr "" -"Proceduren \"%s\" returnerade en felaktig värdestyp för svarsvärdet \"%s" -"\" (nr. %d). Förväntade %s, fick %s." +"Proceduren ”%s” returnerade en felaktig värdetyp för svarsvärdet ”%s” (nr. " +"%d). Förväntade %s, fick %s." -#: ../app/pdb/gimpprocedure.c:743 +#: ../app/pdb/gimpprocedure.c:755 #, c-format msgid "" "Procedure '%s' has been called with a wrong value type for argument '%s' (#" "%d). Expected %s, got %s." msgstr "" -"Proceduren \"%s\" har anropats med en felaktig värdestyp för argumentet \"%s" -"\" (nr. %d). Förväntade %s, fick %s." +"Proceduren ”%s” har anropats med en felaktig värdetyp för argumentet " +"”%s” (nr. %d). Förväntade %s, fick %s." -#: ../app/pdb/gimpprocedure.c:776 +#: ../app/pdb/gimpprocedure.c:788 #, c-format msgid "" "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" "in is trying to work on a layer that doesn't exist any longer." msgstr "" -"Proceduren \"%s\" returnerade ett ogiltigt id för argumentet \"%s\". " -"Antagligen en insticksmodul som försöker att arbeta på ett lager som inte " -"finns längre." +"Proceduren ”%s” returnerade ett ogiltigt ID för argumentet ”%s”. Antagligen " +"en insticksmodul som försöker att arbeta på ett lager som inte finns längre." -#: ../app/pdb/gimpprocedure.c:789 +#: ../app/pdb/gimpprocedure.c:801 #, c-format msgid "" "Procedure '%s' has been called with an invalid ID for argument '%s'. Most " "likely a plug-in is trying to work on a layer that doesn't exist any longer." msgstr "" -"Proceduren \"%s\" har anropats med ett ogiltigt id för argumentet \"%s\". " +"Proceduren ”%s” har anropats med ett ogiltigt ID för argumentet ”%s”. " "Antagligen en insticksmodul som försöker att arbeta på ett lager som inte " "finns längre." -#: ../app/pdb/gimpprocedure.c:806 +#: ../app/pdb/gimpprocedure.c:818 #, c-format msgid "" "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" "in is trying to work on an image that doesn't exist any longer." msgstr "" -"Proceduren \"%s\" returnerade ett ogiltigt id för argumentet \"%s\". " -"Antagligen en insticksmodul som försöker att arbeta på en bild som inte " -"finns längre." +"Proceduren ”%s” returnerade ett ogiltigt ID för argumentet ”%s”. Antagligen " +"en insticksmodul som försöker att arbeta på en bild som inte finns längre." -#: ../app/pdb/gimpprocedure.c:819 +#: ../app/pdb/gimpprocedure.c:831 #, c-format msgid "" "Procedure '%s' has been called with an invalid ID for argument '%s'. Most " "likely a plug-in is trying to work on an image that doesn't exist any longer." msgstr "" -"Proceduren \"%s\" har anropats med ett ogiltigt id för argumentet \"%s\". " +"Proceduren ”%s” har anropats med ett ogiltigt ID för argumentet ”%s”. " "Antagligen en insticksmodul som försöker att arbeta på en bild som inte " "finns längre." -#: ../app/pdb/gimpprocedure.c:840 +#: ../app/pdb/gimpprocedure.c:852 #, c-format msgid "" "Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value " "is out of range." msgstr "" -"Proceduren \"%s\" returnerade \"%s\" som svarsvärde \"%s\" (nr. %d, typ %s). " -"Det här värdet är utanför intervallet." +"Proceduren ”%s” returnerade ”%s” som svarsvärde ”%s” (nr. %d, typ %s). Det " +"här värdet är utanför intervallet." -#: ../app/pdb/gimpprocedure.c:854 +#: ../app/pdb/gimpprocedure.c:866 #, c-format msgid "" "Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type " "%s). This value is out of range." msgstr "" -"Proceduren \"%s\" har anropats med värdet \"%s\" för argumentet \"%s\" (nr. " -"%d, typ %s). Det här värdet är utanför intervallet." +"Proceduren ”%s” har anropats med värdet ”%s” för argumentet ”%s” (nr. %d, " +"typ %s). Det här värdet är utanför intervallet." -#: ../app/pdb/image-cmds.c:2310 +#: ../app/pdb/image-cmds.c:2339 msgid "" "Image resolution is out of bounds, using the default resolution instead." msgstr "" @@ -15768,380 +19253,306 @@ msgstr "" "istället." #: ../app/pdb/image-select-cmds.c:302 ../app/pdb/selection-tools-cmds.c:223 -#: ../app/tools/gimpfreeselecttool.c:196 +#: ../app/tools/gimpfreeselecttool.c:128 msgid "Free Select" msgstr "Fri markering" #: ../app/pdb/plug-in-compat-cmds.c:241 msgctxt "undo-type" msgid "Bump Map" -msgstr "" +msgstr "Bumpmap" #: ../app/pdb/plug-in-compat-cmds.c:313 -#, fuzzy -#| msgid "Display" msgctxt "undo-type" msgid "Displace" -msgstr "Visning" +msgstr "Förskjut" #: ../app/pdb/plug-in-compat-cmds.c:347 msgctxt "undo-type" msgid "Gaussian Blur" -msgstr "" +msgstr "Gaussisk oskärpa" #: ../app/pdb/plug-in-compat-cmds.c:412 msgctxt "undo-type" msgid "Alien Map" -msgstr "" +msgstr "Rymdglöd" #: ../app/pdb/plug-in-compat-cmds.c:449 -#, fuzzy -#| msgid "Antialiasing" msgctxt "undo-type" msgid "Antialias" msgstr "Kantutjämning" #: ../app/pdb/plug-in-compat-cmds.c:492 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Apply layer mask" msgctxt "undo-type" msgid "Apply Canvas" -msgstr "Tillämpa lagermask" +msgstr "Tillämpa duk" #: ../app/pdb/plug-in-compat-cmds.c:552 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Apply Layer Mask" msgctxt "undo-type" msgid "Apply Lens" -msgstr "Tillämpa lagermask" +msgstr "Tillämpa lins" -#: ../app/pdb/plug-in-compat-cmds.c:599 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Crop image" +#: ../app/pdb/plug-in-compat-cmds.c:598 msgid "Autocrop image" -msgstr "Beskär bild" +msgstr "Autobeskär bild" -#: ../app/pdb/plug-in-compat-cmds.c:664 -#, fuzzy -#| msgid "Drop layers" +#: ../app/pdb/plug-in-compat-cmds.c:660 msgid "Autocrop layer" -msgstr "Förkasta lager" +msgstr "Autobeskär lager" -#: ../app/pdb/plug-in-compat-cmds.c:710 +#: ../app/pdb/plug-in-compat-cmds.c:707 msgctxt "undo-type" msgid "Stretch Contrast HSV" -msgstr "" +msgstr "Sträck ut kontrast NMI" -#: ../app/pdb/plug-in-compat-cmds.c:864 -#, fuzzy -#| msgid "Con_trast:" +#: ../app/pdb/plug-in-compat-cmds.c:861 msgctxt "undo-type" msgid "Stretch Contrast" -msgstr "Kon_trast:" +msgstr "Sträck ut kontrast" -#: ../app/pdb/plug-in-compat-cmds.c:943 -#, fuzzy -#| msgctxt "channels-action" -#| msgid "Channels Menu" +#: ../app/pdb/plug-in-compat-cmds.c:940 msgctxt "undo-type" msgid "Channel Mixer" -msgstr "Kanalmeny" +msgstr "Kanalmixer" -#: ../app/pdb/plug-in-compat-cmds.c:987 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Add Color to Colormap" +#: ../app/pdb/plug-in-compat-cmds.c:984 msgctxt "undo-type" msgid "Color to Alpha" -msgstr "Lägg till färg till färgkarta" +msgstr "Färg till alfa" -#: ../app/pdb/plug-in-compat-cmds.c:1033 +#: ../app/pdb/plug-in-compat-cmds.c:1030 #, c-format msgid "Array 'matrix' has only %d members, must have 25" -msgstr "" +msgstr "Vektor för ”matris” har endast %d element, måste ha 25" -#: ../app/pdb/plug-in-compat-cmds.c:1041 +#: ../app/pdb/plug-in-compat-cmds.c:1038 #, c-format msgid "Array 'channels' has only %d members, must have 5" -msgstr "" +msgstr "Vektor för ”kanaler” har endast %d element, måste ha 5" -#: ../app/pdb/plug-in-compat-cmds.c:1113 -#, fuzzy -#| msgid "Transformation Matrix" +#: ../app/pdb/plug-in-compat-cmds.c:1110 msgctxt "undo-type" msgid "Convolution Matrix" -msgstr "Transformationsmatris" +msgstr "Faltningsmatris" -#: ../app/pdb/plug-in-compat-cmds.c:1175 +#: ../app/pdb/plug-in-compat-cmds.c:1172 msgctxt "undo-type" msgid "Cubism" -msgstr "" +msgstr "Kubism" -#: ../app/pdb/plug-in-compat-cmds.c:1220 -#, fuzzy -#| msgid "Interface" +#: ../app/pdb/plug-in-compat-cmds.c:1217 msgctxt "undo-type" msgid "Deinterlace" -msgstr "Gränssnitt" +msgstr "Avflätning" -#: ../app/pdb/plug-in-compat-cmds.c:1299 -#, fuzzy -#| msgctxt "patterns-action" -#| msgid "D_uplicate Pattern" +#: ../app/pdb/plug-in-compat-cmds.c:1296 msgctxt "undo-type" msgid "Diffraction Patterns" -msgstr "_Duplicera mönster" +msgstr "Diffraktionsmönster" -#: ../app/pdb/plug-in-compat-cmds.c:1454 +#: ../app/pdb/plug-in-compat-cmds.c:1455 msgctxt "undo-type" msgid "Edge" -msgstr "" +msgstr "Kant" -#: ../app/pdb/plug-in-compat-cmds.c:1498 +#: ../app/pdb/plug-in-compat-cmds.c:1499 msgctxt "undo-type" msgid "Engrave" -msgstr "" +msgstr "Gravera" -#: ../app/pdb/plug-in-compat-cmds.c:1571 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Color Balance" +#: ../app/pdb/plug-in-compat-cmds.c:1572 msgctxt "undo-type" msgid "Color Exchange" -msgstr "Färgbalans" +msgstr "Färgbyte" -#: ../app/pdb/plug-in-compat-cmds.c:1619 +#: ../app/pdb/plug-in-compat-cmds.c:1620 msgctxt "undo-type" msgid "Lens Flare" -msgstr "" +msgstr "Linsöverstrålning" -#: ../app/pdb/plug-in-compat-cmds.c:1803 +#: ../app/pdb/plug-in-compat-cmds.c:1804 msgctxt "undo-type" msgid "Glass Tile" -msgstr "" +msgstr "Plattglas" -#: ../app/pdb/plug-in-compat-cmds.c:1856 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "_Noise" +#: ../app/pdb/plug-in-compat-cmds.c:1857 msgctxt "undo-type" msgid "Noise HSV" -msgstr "_Brus" +msgstr "Brus NMI" -#: ../app/pdb/plug-in-compat-cmds.c:2120 ../app/pdb/plug-in-compat-cmds.c:2180 -#, fuzzy -#| msgid "Color Profile" +#: ../app/pdb/plug-in-compat-cmds.c:2136 ../app/pdb/plug-in-compat-cmds.c:2191 msgid "Set color profile" -msgstr "Färgprofil" +msgstr "Ställ in färgprofil" -#: ../app/pdb/plug-in-compat-cmds.c:2235 +#: ../app/pdb/plug-in-compat-cmds.c:2246 msgctxt "undo-type" msgid "Illusion" -msgstr "" +msgstr "Illusion" -#: ../app/pdb/plug-in-compat-cmds.c:2272 -#, fuzzy -#| msgctxt "layer-mode-effects" -#| msgid "Replace" +#: ../app/pdb/plug-in-compat-cmds.c:2283 msgctxt "undo-type" msgid "Laplace" -msgstr "Ersätt" +msgstr "Laplace" -#: ../app/pdb/plug-in-compat-cmds.c:2348 +#: ../app/pdb/plug-in-compat-cmds.c:2359 msgctxt "undo-type" msgid "Lens Distortion" -msgstr "" +msgstr "Linsförvrängning" -#: ../app/pdb/plug-in-compat-cmds.c:2388 -#, fuzzy -#| msgid "File Name:" +#: ../app/pdb/plug-in-compat-cmds.c:2399 msgctxt "undo-type" msgid "Tile Seamless" -msgstr "Filnamn:" +msgstr "Plattlägg sömlöst" -#: ../app/pdb/plug-in-compat-cmds.c:2455 +#: ../app/pdb/plug-in-compat-cmds.c:2466 msgctxt "undo-type" msgid "Maze" -msgstr "" +msgstr "Labyrint" -#: ../app/pdb/plug-in-compat-cmds.c:2538 ../app/pdb/plug-in-compat-cmds.c:2622 -#, fuzzy -#| msgid "Motion only" +#: ../app/pdb/plug-in-compat-cmds.c:2549 ../app/pdb/plug-in-compat-cmds.c:2633 msgctxt "undo-type" msgid "Motion Blur" -msgstr "Bara rörelse" +msgstr "Rörelseoskärpa" -#: ../app/pdb/plug-in-compat-cmds.c:2723 +#: ../app/pdb/plug-in-compat-cmds.c:2734 msgctxt "undo-type" msgid "Mosaic" -msgstr "" +msgstr "Mosaik" -#: ../app/pdb/plug-in-compat-cmds.c:2785 +#: ../app/pdb/plug-in-compat-cmds.c:2796 msgctxt "undo-type" msgid "Supernova" -msgstr "" +msgstr "Supernova" -#: ../app/pdb/plug-in-compat-cmds.c:2875 +#: ../app/pdb/plug-in-compat-cmds.c:2886 msgctxt "undo-type" msgid "Paper Tile" -msgstr "" +msgstr "Pappersplatta" -#: ../app/pdb/plug-in-compat-cmds.c:2916 ../app/pdb/plug-in-compat-cmds.c:2959 -#, fuzzy -#| msgctxt "color-frame-mode" -#| msgid "Pixel" +#: ../app/pdb/plug-in-compat-cmds.c:2927 ../app/pdb/plug-in-compat-cmds.c:2970 msgctxt "undo-type" msgid "Pixelize" -msgstr "Bildpunkt" +msgstr "Pixelera" -#: ../app/pdb/plug-in-compat-cmds.c:3010 +#: ../app/pdb/plug-in-compat-cmds.c:3021 msgctxt "undo-type" msgid "Plasma" -msgstr "" +msgstr "Plasma" -#: ../app/pdb/plug-in-compat-cmds.c:3064 +#: ../app/pdb/plug-in-compat-cmds.c:3075 msgctxt "undo-type" msgid "Polar Coordinates" -msgstr "" +msgstr "Polära koordinater" -#: ../app/pdb/plug-in-compat-cmds.c:3104 +#: ../app/pdb/plug-in-compat-cmds.c:3115 msgctxt "undo-type" msgid "Red Eye Removal" -msgstr "" +msgstr "Borttagning av röda ögon" -#: ../app/pdb/plug-in-compat-cmds.c:3157 -#, fuzzy -#| msgid "Random" +#: ../app/pdb/plug-in-compat-cmds.c:3168 msgctxt "undo-type" msgid "Random Hurl" -msgstr "Slumpmässig" +msgstr "Slumpmässigt kast" -#: ../app/pdb/plug-in-compat-cmds.c:3210 -#, fuzzy -#| msgid "Random" +#: ../app/pdb/plug-in-compat-cmds.c:3221 msgctxt "undo-type" msgid "Random Pick" -msgstr "Slumpmässig" +msgstr "Slumpmässig val" -#: ../app/pdb/plug-in-compat-cmds.c:3263 -#, fuzzy -#| msgid "Random" +#: ../app/pdb/plug-in-compat-cmds.c:3274 msgctxt "undo-type" msgid "Random Slur" -msgstr "Slumpmässig" +msgstr "Slumpmässig slamning" -#: ../app/pdb/plug-in-compat-cmds.c:3338 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "_Noise" +#: ../app/pdb/plug-in-compat-cmds.c:3349 msgctxt "undo-type" msgid "RGB Noise" -msgstr "_Brus" +msgstr "RGB-brus" -#: ../app/pdb/plug-in-compat-cmds.c:3461 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "_Noise" +#: ../app/pdb/plug-in-compat-cmds.c:3472 msgctxt "undo-type" msgid "Noisify" -msgstr "_Brus" +msgstr "Brusa" -#: ../app/pdb/plug-in-compat-cmds.c:3505 -#, fuzzy -#| msgid "Select Gradient Folders" +#: ../app/pdb/plug-in-compat-cmds.c:3516 msgctxt "undo-type" msgid "Selective Gaussian Blur" -msgstr "Välj gradientmappar" +msgstr "Selektiv gaussisk oskärpa" -#: ../app/pdb/plug-in-compat-cmds.c:3549 +#: ../app/pdb/plug-in-compat-cmds.c:3560 msgctxt "undo-type" msgid "Semi-Flatten" -msgstr "" +msgstr "Semiutplatta" -#: ../app/pdb/plug-in-compat-cmds.c:3592 +#: ../app/pdb/plug-in-compat-cmds.c:3603 msgctxt "undo-type" msgid "Shift" -msgstr "" +msgstr "Skift" -#: ../app/pdb/plug-in-compat-cmds.c:3695 -#, fuzzy -#| msgctxt "gradient-editor-blending" -#| msgid "_Sinusoidal" +#: ../app/pdb/plug-in-compat-cmds.c:3706 msgctxt "undo-type" msgid "Sinus" -msgstr "_Sinusformad" +msgstr "Sinus" -#: ../app/pdb/plug-in-compat-cmds.c:3743 +#: ../app/pdb/plug-in-compat-cmds.c:3754 msgctxt "undo-type" msgid "Sobel" -msgstr "" +msgstr "Sobel" -#: ../app/pdb/plug-in-compat-cmds.c:3804 -#, fuzzy -#| msgctxt "fill-style" -#| msgid "Solid color" +#: ../app/pdb/plug-in-compat-cmds.c:3815 msgctxt "undo-type" msgid "Solid Noise" -msgstr "Enfärgad" +msgstr "Enfärgat brus" -#: ../app/pdb/plug-in-compat-cmds.c:3848 +#: ../app/pdb/plug-in-compat-cmds.c:3859 msgctxt "undo-type" msgid "Spread" -msgstr "" +msgstr "Sprid" -#: ../app/pdb/plug-in-compat-cmds.c:3889 -#, fuzzy -#| msgid "Threshold" +#: ../app/pdb/plug-in-compat-cmds.c:3900 msgctxt "undo-type" msgid "Threshold Alpha" -msgstr "Tröskelvärde" +msgstr "Tröskelvärde alfa" -#: ../app/pdb/plug-in-compat-cmds.c:3935 +#: ../app/pdb/plug-in-compat-cmds.c:3946 msgctxt "undo-type" msgid "Video" -msgstr "" +msgstr "Video" -#: ../app/pdb/plug-in-compat-cmds.c:3972 -#, fuzzy -#| msgid "Invert" +#: ../app/pdb/plug-in-compat-cmds.c:3983 msgctxt "undo-type" msgid "Value Invert" -msgstr "Invertera" +msgstr "Invertera intensitet" -#: ../app/pdb/plug-in-compat-cmds.c:4076 +#: ../app/pdb/plug-in-compat-cmds.c:4087 msgctxt "undo-type" msgid "Value Propagate" -msgstr "" +msgstr "Värdepropagering" -#: ../app/pdb/plug-in-compat-cmds.c:4123 +#: ../app/pdb/plug-in-compat-cmds.c:4134 msgctxt "undo-type" msgid "Dilate" -msgstr "" +msgstr "Utvidga" -#: ../app/pdb/plug-in-compat-cmds.c:4170 +#: ../app/pdb/plug-in-compat-cmds.c:4181 msgctxt "undo-type" msgid "Erode" -msgstr "" +msgstr "Erodera" -#: ../app/pdb/plug-in-compat-cmds.c:4233 +#: ../app/pdb/plug-in-compat-cmds.c:4244 msgctxt "undo-type" msgid "Waves" -msgstr "" +msgstr "Vågor" -#: ../app/pdb/plug-in-compat-cmds.c:4281 +#: ../app/pdb/plug-in-compat-cmds.c:4292 msgctxt "undo-type" msgid "Whirl and Pinch" -msgstr "" +msgstr "Virvel och knipning" -#: ../app/pdb/plug-in-compat-cmds.c:4333 -#, fuzzy -#| msgid "Windows" +#: ../app/pdb/plug-in-compat-cmds.c:4344 msgctxt "undo-type" msgid "Wind" -msgstr "Fönster" +msgstr "Vind" #: ../app/pdb/text-layer-cmds.c:95 #, c-format @@ -16157,7 +19568,7 @@ msgstr "Misslyckades med att skapa textlager" #: ../app/pdb/text-layer-cmds.c:1076 ../app/pdb/text-layer-cmds.c:1118 #: ../app/pdb/text-layer-cmds.c:1200 msgid "Set text layer attribute" -msgstr "Ange textlagerattribut" +msgstr "Ställ in textlagerattribut" #: ../app/pdb/vectors-cmds.c:328 msgid "Remove path stroke" @@ -16169,7 +19580,7 @@ msgstr "Stäng banstreck" #: ../app/pdb/vectors-cmds.c:410 msgid "Translate path stroke" -msgstr "Översätt banstreck" +msgstr "Förflytta banstreck" #: ../app/pdb/vectors-cmds.c:455 msgid "Scale path stroke" @@ -16211,9 +19622,9 @@ msgstr "Felaktig tolk refererad till i tolkfilen %s: %s" #: ../app/plug-in/gimpinterpreterdb.c:359 #, c-format msgid "Bad binary format string in interpreter file %s" -msgstr "Felaktig binär formatsträng i tolkarfilen %s" +msgstr "Felaktig binär formatsträng i tolkfilen %s" -#: ../app/plug-in/gimpplugin.c:648 +#: ../app/plug-in/gimpplugin.c:622 #, c-format msgid "" "Plug-in crashed: \"%s\"\n" @@ -16222,7 +19633,7 @@ msgid "" "The dying plug-in may have messed up GIMP's internal state. You may want to " "save your images and restart GIMP to be on the safe side." msgstr "" -"Insticksmodulen kraschade: \"%s\"\n" +"Insticksmodulen kraschade: ”%s”\n" "(%s)\n" "\n" "Insticksmodulen som dog kan ha skadat GIMP:s interna tillstånd. Du bör " @@ -16234,7 +19645,7 @@ msgid "" "Calling error for procedure '%s':\n" "%s" msgstr "" -"Anropsfel för proceduren \"%s\":\n" +"Anropsfel för proceduren ”%s”:\n" "%s" #: ../app/plug-in/gimpplugin-message.c:495 @@ -16243,90 +19654,397 @@ msgid "" "Execution error for procedure '%s':\n" "%s" msgstr "" -"Exekveringsfel för proceduren \"%s\":\n" +"Exekveringsfel för proceduren ”%s”:\n" "%s" -#: ../app/plug-in/gimpplugin-progress.c:339 +#: ../app/plug-in/gimpplugin-progress.c:334 msgid "Cancelled" msgstr "Avbruten" -#: ../app/plug-in/gimppluginmanager.c:258 -msgid "Plug-In Interpreters" +#: ../app/plug-in/gimppluginmanager.c:230 +msgid "Plug-in Interpreters" msgstr "Insticksmodultolkar" -#: ../app/plug-in/gimppluginmanager.c:264 -msgid "Plug-In Environment" +#: ../app/plug-in/gimppluginmanager.c:236 +msgid "Plug-in Environment" msgstr "Insticksmodulmiljö" #: ../app/plug-in/gimppluginmanager-call.c:184 #: ../app/plug-in/gimppluginmanager-call.c:235 -#: ../app/plug-in/gimppluginmanager-call.c:333 +#: ../app/plug-in/gimppluginmanager-call.c:331 #, c-format msgid "Failed to run plug-in \"%s\"" -msgstr "Misslyckades med att köra insticksmodulen \"%s\"" +msgstr "Misslyckades med att köra insticksmodulen ”%s”" -#: ../app/plug-in/gimppluginmanager-file-procedure.c:203 +#: ../app/plug-in/gimppluginmanager-file-procedure.c:208 msgid "Unknown file type" msgstr "Okänd filtyp" -#: ../app/plug-in/gimppluginmanager-restore.c:237 -msgid "Searching Plug-Ins" +#: ../app/plug-in/gimppluginmanager-restore.c:230 +msgid "Searching plug-ins" msgstr "Söker efter insticksmoduler" -#: ../app/plug-in/gimppluginmanager-restore.c:334 +#: ../app/plug-in/gimppluginmanager-restore.c:395 msgid "Resource configuration" msgstr "Resurskonfiguration" -#: ../app/plug-in/gimppluginmanager-restore.c:370 +#: ../app/plug-in/gimppluginmanager-restore.c:431 msgid "Querying new Plug-ins" msgstr "Undersöker nya insticksmoduler" -#: ../app/plug-in/gimppluginmanager-restore.c:421 +#: ../app/plug-in/gimppluginmanager-restore.c:482 msgid "Initializing Plug-ins" msgstr "Initierar insticksmoduler" -#: ../app/plug-in/gimppluginmanager-restore.c:494 +#: ../app/plug-in/gimppluginmanager-restore.c:555 msgid "Starting Extensions" msgstr "Startar tillägg" -#: ../app/plug-in/gimppluginprocedure.c:1152 +#: ../app/plug-in/gimppluginprocedure.c:1172 #, c-format msgid "" "Calling error for '%s':\n" "%s" msgstr "" -"Anropsfel för \"%s\":\n" +"Anropsfel för ”%s”:\n" "%s" -#: ../app/plug-in/gimppluginprocedure.c:1164 +#: ../app/plug-in/gimppluginprocedure.c:1184 #, c-format msgid "" "Execution error for '%s':\n" "%s" msgstr "" -"Exekveringsfel för \"%s\":\n" +"Exekveringsfel för ”%s”:\n" "%s" -#: ../app/plug-in/plug-in-rc.c:228 +#: ../app/plug-in/plug-in-rc.c:231 #, c-format msgid "Skipping '%s': wrong GIMP protocol version." -msgstr "Hoppar över \"%s\": fel GIMP-protokollversion." +msgstr "Hoppar över ”%s”: fel GIMP-protokollversion." -#: ../app/plug-in/plug-in-rc.c:235 -#, fuzzy, c-format -#| msgid "Skipping '%s': wrong GIMP protocol version." +#: ../app/plug-in/plug-in-rc.c:238 +#, c-format msgid "Skipping '%s': wrong pluginrc file format version." -msgstr "Hoppar över \"%s\": fel GIMP-protokollversion." +msgstr "Hoppar över ”%s”: fel filformatsversion för pluginrc." -#: ../app/plug-in/plug-in-rc.c:511 +#: ../app/plug-in/plug-in-rc.c:510 #, c-format msgid "invalid value '%s' for icon type" -msgstr "ogiltigt värde \"%s\" för ikontyp" +msgstr "ogiltigt värde ”%s” för ikontyp" -#: ../app/plug-in/plug-in-rc.c:526 +#: ../app/plug-in/plug-in-rc.c:525 #, c-format msgid "invalid value '%ld' for icon type" -msgstr "ogiltigt värde \"%ld\" för ikontyp" +msgstr "ogiltigt värde ”%ld” för ikontyp" + +#: ../app/propgui/gimppropgui-channel-mixer.c:63 +msgid "Red channel" +msgstr "Röd kanal" + +#: ../app/propgui/gimppropgui-channel-mixer.c:87 +msgid "Green channel" +msgstr "Grön kanal" + +#: ../app/propgui/gimppropgui-channel-mixer.c:111 +msgid "Blue channel" +msgstr "Blå kanal" + +#: ../app/propgui/gimppropgui-color-balance.c:98 +msgid "Select Range to Adjust" +msgstr "Välj intervall att justera" + +#: ../app/propgui/gimppropgui-color-balance.c:103 +#: ../app/tools/gimplevelstool.c:247 +msgid "Adjust Color Levels" +msgstr "Justera färgnivåer" + +#: ../app/propgui/gimppropgui-color-balance.c:119 +#: ../app/propgui/gimppropgui-hue-saturation.c:138 +msgid "Cyan" +msgstr "Cyan" + +#: ../app/propgui/gimppropgui-color-balance.c:119 +#: ../app/propgui/gimppropgui-hue-saturation.c:135 +msgid "Red" +msgstr "Röd" + +#: ../app/propgui/gimppropgui-color-balance.c:123 +#: ../app/propgui/gimppropgui-hue-saturation.c:140 +msgid "Magenta" +msgstr "Magenta" + +#: ../app/propgui/gimppropgui-color-balance.c:123 +#: ../app/propgui/gimppropgui-hue-saturation.c:137 +msgid "Green" +msgstr "Grön" + +#: ../app/propgui/gimppropgui-color-balance.c:127 +#: ../app/propgui/gimppropgui-hue-saturation.c:136 +msgid "Yellow" +msgstr "Gul" + +#: ../app/propgui/gimppropgui-color-balance.c:127 +#: ../app/propgui/gimppropgui-hue-saturation.c:139 +msgid "Blue" +msgstr "Blå" + +#: ../app/propgui/gimppropgui-color-balance.c:134 +msgid "R_eset Range" +msgstr "_Återställ intervall" + +#: ../app/propgui/gimppropgui-color-balance.c:144 +msgid "Preserve _luminosity" +msgstr "Bevara _luminiscens" + +#: ../app/propgui/gimppropgui-color-rotate.c:126 +msgid "Clockwise" +msgstr "Medurs" + +#: ../app/propgui/gimppropgui-color-rotate.c:130 +msgid "Invert Range" +msgstr "Invertera intervall" + +#: ../app/propgui/gimppropgui-color-rotate.c:134 +msgid "Select All" +msgstr "Markera allt" + +#: ../app/propgui/gimppropgui-color-rotate.c:214 +msgid "Source Range" +msgstr "Källintervall" + +#: ../app/propgui/gimppropgui-color-rotate.c:225 +msgid "Destination Range" +msgstr "Destinationsintervall" + +#: ../app/propgui/gimppropgui-color-rotate.c:236 +msgid "Gray Handling" +msgstr "Gråhantering" + +#: ../app/propgui/gimppropgui-color-to-alpha.c:109 +msgid "Pick farthest full-transparency color" +msgstr "Välj mest avlägsna fulltransparensfärg" + +#: ../app/propgui/gimppropgui-color-to-alpha.c:131 +msgid "Pick nearest full-opacity color" +msgstr "Välj närmsta fullopacitetsfärg" + +#: ../app/propgui/gimppropgui-convolution-matrix.c:202 +msgid "Rotate matrix 90° counter-clockwise" +msgstr "Rotera matris 90° moturs" + +#: ../app/propgui/gimppropgui-convolution-matrix.c:208 +msgid "Rotate matrix 90° clockwise" +msgstr "Rotera matris 90° medurs" + +#: ../app/propgui/gimppropgui-convolution-matrix.c:214 +msgid "Flip matrix horizontally" +msgstr "Vänd matrisen horisontellt" + +#: ../app/propgui/gimppropgui-convolution-matrix.c:220 +msgid "Flip matrix vertically" +msgstr "Vänd matrisen vertikalt" + +#: ../app/propgui/gimppropgui-diffraction-patterns.c:68 +msgid "Frequencies" +msgstr "Frekvenser" + +#: ../app/propgui/gimppropgui-diffraction-patterns.c:79 +msgid "Contours" +msgstr "Konturer" + +#: ../app/propgui/gimppropgui-diffraction-patterns.c:90 +msgid "Sharp Edges" +msgstr "Skärp kanter" + +#: ../app/propgui/gimppropgui-diffraction-patterns.c:101 +msgid "Other Options" +msgstr "Andra alternativ" + +#: ../app/propgui/gimppropgui-generic.c:185 +msgid "Pick coordinates from the image" +msgstr "Välj koordinater från bilden" + +#: ../app/propgui/gimppropgui-hue-saturation.c:134 +msgid "M_aster" +msgstr "_Huvud" + +#: ../app/propgui/gimppropgui-hue-saturation.c:134 +msgid "Adjust all colors" +msgstr "Justera alla färger" + +#: ../app/propgui/gimppropgui-hue-saturation.c:135 +msgid "_R" +msgstr "_R" + +#: ../app/propgui/gimppropgui-hue-saturation.c:136 +msgid "_Y" +msgstr "_Y" + +#: ../app/propgui/gimppropgui-hue-saturation.c:137 +msgid "_G" +msgstr "_G" + +#: ../app/propgui/gimppropgui-hue-saturation.c:138 +msgid "_C" +msgstr "_C" + +#: ../app/propgui/gimppropgui-hue-saturation.c:139 +msgid "_B" +msgstr "_B" + +#: ../app/propgui/gimppropgui-hue-saturation.c:140 +msgid "_M" +msgstr "_M" + +#: ../app/propgui/gimppropgui-hue-saturation.c:150 +msgid "Select Primary Color to Adjust" +msgstr "Välj primär färg att justera" + +#: ../app/propgui/gimppropgui-hue-saturation.c:236 +msgid "_Overlap" +msgstr "_Överlappa" + +#: ../app/propgui/gimppropgui-hue-saturation.c:241 +msgid "Adjust Selected Color" +msgstr "Justera markerad färg" + +#: ../app/propgui/gimppropgui-hue-saturation.c:251 +msgid "_Hue" +msgstr "_Nyans" + +#: ../app/propgui/gimppropgui-hue-saturation.c:258 +msgid "_Lightness" +msgstr "_Ljusstyrka" + +#: ../app/propgui/gimppropgui-hue-saturation.c:265 +msgid "_Saturation" +msgstr "_Mättnad" + +#: ../app/propgui/gimppropgui-hue-saturation.c:274 +msgid "R_eset Color" +msgstr "_Återställ färg" + +#: ../app/propgui/gimppropgui-panorama-projection.c:125 +msgid "Panorama Projection: " +msgstr "Panoramaprojektion: " + +#: ../app/propgui/gimppropgui-recursive-transform.c:125 +msgid "Recursive Transform: " +msgstr "Rekursiv transform: " + +#: ../app/propgui/gimppropgui-shadows-highlights.c:62 +msgid "Shadows" +msgstr "Skuggor" + +#: ../app/propgui/gimppropgui-shadows-highlights.c:80 +msgid "Highlights" +msgstr "Högdagrar" + +#: ../app/propgui/gimppropgui-shadows-highlights.c:98 +msgid "Common" +msgstr "Gemensam" + +#: ../app/propgui/gimppropgui-spiral.c:220 +msgid "Spiral: " +msgstr "Spiral: " + +#: ../app/propgui/gimppropgui-supernova.c:125 +msgid "Supernova: " +msgstr "Supernova: " + +#: ../app/propgui/gimppropgui-utils.c:70 +msgid "1,700 K – Match flame" +msgstr "1700 K – Tändsticksflamma" + +#: ../app/propgui/gimppropgui-utils.c:71 +msgid "1,850 K – Candle flame, sunset/sunrise" +msgstr "1850 K – Ljusflamma, solnedgång/soluppgång" + +#: ../app/propgui/gimppropgui-utils.c:72 +msgid "2,700 K - Soft (or warm) LED lamps" +msgstr "2700 K – Mjuka (eller varma) LED-lampor" + +#: ../app/propgui/gimppropgui-utils.c:73 +msgid "3,000 K – Soft (or warm) white compact fluorescent lamps" +msgstr "3000 K – Mjukt (eller varmt) vitt kompaktlysrör" + +#: ../app/propgui/gimppropgui-utils.c:74 +msgid "3,200 K – Studio lamps, photofloods, etc." +msgstr "3200 K – Studiolampor, fotoflodljus, etc." + +#: ../app/propgui/gimppropgui-utils.c:75 +msgid "3,300 K – Incandescent lamps" +msgstr "3300 K – Glödlampor" + +# sebras: circularly polarized +#: ../app/propgui/gimppropgui-utils.c:76 +msgid "3,350 K – Studio \"CP\" light" +msgstr "3350 K – Studio ”CP”-ljus" + +#: ../app/propgui/gimppropgui-utils.c:77 +msgid "4,000 K - Cold (daylight) LED lamps" +msgstr "4000 K - Kalla (dagsljus) LED-lampor" + +#: ../app/propgui/gimppropgui-utils.c:78 +msgid "4,100 K – Moonlight" +msgstr "4100 K – Månljus" + +#: ../app/propgui/gimppropgui-utils.c:79 +msgid "5,000 K – D50" +msgstr "5000 K – D50" + +#: ../app/propgui/gimppropgui-utils.c:80 +msgid "5,000 K – Cool white/daylight compact fluorescent lamps" +msgstr "5000 K – Kallt vitt/dagsljus kompaktlysrör" + +#: ../app/propgui/gimppropgui-utils.c:81 +msgid "5,000 K – Horizon daylight" +msgstr "5000 K – Dagsljus horisont" + +#: ../app/propgui/gimppropgui-utils.c:82 +msgid "5,500 K – D55" +msgstr "5500 K – D55" + +#: ../app/propgui/gimppropgui-utils.c:83 +msgid "5,500 K – Vertical daylight, electronic flash" +msgstr "5500 K – Dagsljus vertikalt, elektrisk blixt" + +#: ../app/propgui/gimppropgui-utils.c:84 +msgid "6,200 K – Xenon short-arc lamp" +msgstr "6200 K – Xenonlampa kort båge" + +#: ../app/propgui/gimppropgui-utils.c:85 +msgid "6,500 K – D65" +msgstr "6500 K – D65" + +#: ../app/propgui/gimppropgui-utils.c:86 +msgid "6,500 K – Daylight, overcast" +msgstr "6500 K – Dagsljus mulet" + +#: ../app/propgui/gimppropgui-utils.c:87 +msgid "7,500 K – D75" +msgstr "7500 K – D75" + +#: ../app/propgui/gimppropgui-utils.c:88 +msgid "9,300 K" +msgstr "9300 K" + +#: ../app/propgui/gimppropgui-utils.c:103 +msgid "Choose from a list of common color temperatures" +msgstr "Välj från en lista över vanliga färgtemperaturer" + +#: ../app/propgui/gimppropgui-utils.c:154 +msgid "New Seed" +msgstr "Nytt frö" + +#: ../app/propgui/gimppropgui.c:376 +msgid "Pick color from the image" +msgstr "Välj färg från bilden" + +#: ../app/propgui/gimppropgui.c:520 +msgid "This operation has no editable properties" +msgstr "Denna åtgärd har inga redigerbara egenskaper" #. This is a so-called pangram; it's supposed to #. contain all characters found in the alphabet. @@ -16335,10 +20053,10 @@ msgid "" "Pack my box with\n" "five dozen liquor jugs." msgstr "" -"Flygande bäckasiner söka\n" -"strax hwila på mjuka tuvor." +"Yxmördaren Julia Blomqvist\n" +"på fäktning i Schweiz." -#: ../app/text/gimptext-compat.c:106 ../app/tools/gimptexttool.c:1405 +#: ../app/text/gimptext-compat.c:106 ../app/tools/gimptexttool.c:1472 msgid "Add Text Layer" msgstr "Lägg till textlager" @@ -16374,19 +20092,19 @@ msgstr "Rotera textlager" msgid "Transform Text Layer" msgstr "Transformera textlager" -#: ../app/text/gimptextlayer.c:571 +#: ../app/text/gimptextlayer.c:565 msgid "Discard Text Information" msgstr "Förkasta textinformation" -#: ../app/text/gimptextlayer.c:639 +#: ../app/text/gimptextlayer.c:633 msgid "Due to lack of any fonts, text functionality is not available." msgstr "På grund av brist på typsnitt är textfunktioner inte tillgängliga." -#: ../app/text/gimptextlayer.c:700 +#: ../app/text/gimptextlayer.c:696 msgid "Empty Text Layer" msgstr "Tomt textlager" -#: ../app/text/gimptextlayer.c:753 +#: ../app/text/gimptextlayer.c:749 msgid "" "Your text cannot be rendered. It is likely too big. Please make it shorter " "or use a smaller font." @@ -16394,7 +20112,7 @@ msgstr "" "Din text kan inte visas. Den är sannolikt för stor. Gör den kortare eller " "använd ett mindre teckensnitt." -#: ../app/text/gimptextlayer-xcf.c:77 +#: ../app/text/gimptextlayer-xcf.c:78 #, c-format msgid "" "Problems parsing the text parasite for layer '%s':\n" @@ -16403,13 +20121,13 @@ msgid "" "Some text properties may be wrong. Unless you want to edit the text layer, " "you don't need to worry about this." msgstr "" -"Problem med att tolka textparasiten för lager \"%s\":\n" +"Problem med att tolka textparasiten för lager ”%s”:\n" "%s\n" "\n" "Vissa textegenskaper kan vara felaktiga. Om du inte vill redigera textlagret " "behöver du inte oroa dig för detta." -#: ../app/text/gimptextlayout.c:578 +#: ../app/text/gimptextlayout.c:579 msgid "" "The new text layout cannot be generated. Most likely the font size is too " "big." @@ -16427,7 +20145,7 @@ msgctxt "text-box-mode" msgid "Fixed" msgstr "Fast" -#: ../app/tools/gimp-tools.c:374 +#: ../app/tools/gimp-tools.c:382 msgid "" "This tool has\n" "no options." @@ -16444,14 +20162,12 @@ msgid "_Airbrush" msgstr "_Färgspruta" #: ../app/tools/gimpalignoptions.c:92 ../app/tools/gimpalignoptions.c:291 -#, fuzzy -#| msgid "Relative to:" msgid "Relative to" -msgstr "Relativ till:" +msgstr "Relativ till" #: ../app/tools/gimpalignoptions.c:93 msgid "Reference image object a layer will be aligned on" -msgstr "Referensbildobjekt ett lager kommer att anpassas på" +msgstr "Referensbildsobjekt ett lager kommer att anpassas på" #: ../app/tools/gimpalignoptions.c:101 msgid "Horizontal offset for distribution" @@ -16461,7 +20177,7 @@ msgstr "Horisontell förskjutning för distribution" msgid "Vertical offset for distribution" msgstr "Vertikal förskjutning för distribution" -#: ../app/tools/gimpalignoptions.c:282 ../app/tools/gimpaligntool.c:124 +#: ../app/tools/gimpalignoptions.c:282 ../app/tools/gimpaligntool.c:123 msgid "Align" msgstr "Arrangera" @@ -16507,7 +20223,7 @@ msgstr "Distribuera högerkanter för målen" #: ../app/tools/gimpalignoptions.c:354 msgid "Distribute targets evenly in the horizontal" -msgstr "" +msgstr "Distribuera mål jämnt horisontellt" #: ../app/tools/gimpalignoptions.c:362 msgid "Distribute top edges of targets" @@ -16523,166 +20239,249 @@ msgstr "Distribuera nederkanter för målen" #: ../app/tools/gimpalignoptions.c:374 msgid "Distribute targets evenly in the vertical" -msgstr "" +msgstr "Distribuera mål jämnt vertikalt" -#: ../app/tools/gimpalignoptions.c:380 -#, fuzzy -#| msgid "Offset:" -msgid "Offset X:" -msgstr "Position:" - -#: ../app/tools/gimpalignoptions.c:393 -#, fuzzy -#| msgid "Offset:" -msgid "Offset Y:" -msgstr "Position:" - -#: ../app/tools/gimpaligntool.c:125 +#: ../app/tools/gimpaligntool.c:124 msgid "Alignment Tool: Align or arrange layers and other objects" msgstr "Arrangeringsverktyg: Arrangera lager och andra objekt" -#: ../app/tools/gimpaligntool.c:126 +#: ../app/tools/gimpaligntool.c:125 msgid "_Align" msgstr "_Arrangera" -#: ../app/tools/gimpaligntool.c:551 +#: ../app/tools/gimpaligntool.c:541 msgid "Click on a layer, path or guide, or Click-Drag to pick several layers" msgstr "" "Klicka på ett lager, bana eller hjälplinje, eller klicka och dra för att " "välja flera lager" -#: ../app/tools/gimpaligntool.c:559 +#: ../app/tools/gimpaligntool.c:549 msgid "Click to pick this layer as first item" msgstr "Klicka för att välja detta lager som första objekt" -#: ../app/tools/gimpaligntool.c:566 +#: ../app/tools/gimpaligntool.c:556 msgid "Click to add this layer to the list" msgstr "Klicka för att lägga till detta lager till listan" -#: ../app/tools/gimpaligntool.c:570 +#: ../app/tools/gimpaligntool.c:560 msgid "Click to pick this guide as first item" msgstr "Klicka för att välja denna hjälplinje som första objekt" -#: ../app/tools/gimpaligntool.c:577 +#: ../app/tools/gimpaligntool.c:567 msgid "Click to add this guide to the list" msgstr "Klicka för att lägga till denna hjälplinje till listan" -#: ../app/tools/gimpaligntool.c:581 +#: ../app/tools/gimpaligntool.c:571 msgid "Click to pick this path as first item" msgstr "Klicka för att välja denna bana som första objekt" -#: ../app/tools/gimpaligntool.c:588 +#: ../app/tools/gimpaligntool.c:578 msgid "Click to add this path to the list" msgstr "Klicka för att lägga till denna bana till listan" -#: ../app/tools/gimpblendoptions.c:100 -#, fuzzy -#| msgid "Adaptive supersampling" +#: ../app/tools/gimpblendoptions.c:101 ../app/tools/gimpblendoptions.c:313 +msgid "Metric" +msgstr "Måttenhet" + +#: ../app/tools/gimpblendoptions.c:102 +msgid "Metric to use for the distance calculation" +msgstr "Måttenhet att använda för avståndsberäkning" + +#: ../app/tools/gimpblendoptions.c:116 msgid "Adaptive Supersampling" msgstr "Adaptiv supersampling" -#: ../app/tools/gimpblendoptions.c:106 +#: ../app/tools/gimpblendoptions.c:122 msgid "Max depth" msgstr "Max djup" -#: ../app/tools/gimpblendoptions.c:112 ../app/tools/gimpbucketfilloptions.c:142 +#: ../app/tools/gimpblendoptions.c:128 ../app/tools/gimpbucketfilloptions.c:142 #: ../app/tools/gimpregionselectoptions.c:112 -#: ../app/tools/gimpthresholdtool.c:90 +#: ../app/tools/gimpthresholdtool.c:87 msgid "Threshold" msgstr "Tröskelvärde" -#: ../app/tools/gimpblendoptions.c:230 ../app/tools/gimppaintoptions-gui.c:369 -#, fuzzy -#| msgctxt "gradients-action" -#| msgid "Edit gradient" -msgid "Edit this gradient" -msgstr "Redigera gradient" +#: ../app/tools/gimpblendoptions.c:142 +msgid "Instant mode" +msgstr "Direktläge" -#: ../app/tools/gimpblendtool.c:170 +#: ../app/tools/gimpblendoptions.c:143 +msgid "Commit gradient instantly" +msgstr "Bekräfta gradient omedelbart" + +#: ../app/tools/gimpblendoptions.c:149 +msgid "Modify active gradient" +msgstr "Modifiera aktiv gradient" + +#: ../app/tools/gimpblendoptions.c:150 +msgid "Modify the active gradient in-place" +msgstr "Modifiera den aktiva gradienten på plats" + +#: ../app/tools/gimpblendoptions.c:289 ../app/tools/gimppaintoptions-gui.c:384 +msgid "Edit this gradient" +msgstr "Redigera denna gradient" + +#. the instant toggle +#: ../app/tools/gimpblendoptions.c:366 +#, c-format +msgid "Instant mode (%s)" +msgstr "Direktläge (%s)" + +#: ../app/tools/gimpblendoptions.c:386 +msgid "" +"The active gradient is non-writable and cannot be edited directly. Uncheck " +"this option to edit a copy of it." +msgstr "" +"Den aktiva gradienten är inte skrivbar och kan inte redigeras direkt. Kryssa " +"ur detta alternativ för att redigera en kopia av den." + +#: ../app/tools/gimpblendtool.c:156 msgid "Blend" msgstr "Toning" -#: ../app/tools/gimpblendtool.c:171 +#: ../app/tools/gimpblendtool.c:157 msgid "Blend Tool: Fill selected area with a color gradient" msgstr "Toningsverktyg: Fyll markerat område med en färggradient" -#: ../app/tools/gimpblendtool.c:172 +#: ../app/tools/gimpblendtool.c:158 msgid "Blen_d" msgstr "Färgto_ning" -#: ../app/tools/gimpblendtool.c:259 ../app/tools/gimpbucketfilltool.c:151 -#: ../app/tools/gimpfiltertool.c:315 -#: ../app/tools/gimpforegroundselecttool.c:290 ../app/tools/gimppainttool.c:285 -#: ../app/tools/gimptransformtool.c:1850 ../app/tools/gimpwarptool.c:586 -#, fuzzy -#| msgid "The active layer's pixels are locked." -msgid "The active layer is not visible." -msgstr "Det aktiva lagrets pixlar är låsta." +#: ../app/tools/gimpblendtool.c:213 +msgid "Click-Drag to draw a gradient" +msgstr "Klicka och dra för att rita en gradient" -#: ../app/tools/gimpblendtool.c:266 +#: ../app/tools/gimpblendtool.c:257 ../app/tools/gimpbucketfilltool.c:151 +#: ../app/tools/gimpcagetool.c:234 ../app/tools/gimpfiltertool.c:284 +#: ../app/tools/gimpforegroundselecttool.c:288 ../app/tools/gimppainttool.c:284 +#: ../app/tools/gimptransformtool.c:1457 ../app/tools/gimpwarptool.c:640 +msgid "The active layer is not visible." +msgstr "Det aktiva lagret är inte synligt." + +#: ../app/tools/gimpblendtool.c:264 msgid "No gradient available for use with this tool." msgstr "Ingen gradient tillgänglig för detta verktyg." -#: ../app/tools/gimpblendtool.c:957 ../app/tools/gimppainttool.c:655 -#, c-format -msgid "%s for constrained angles" -msgstr "%s för begränsade vinklar" - -#: ../app/tools/gimpblendtool.c:958 -#, c-format -msgid "%s to move the whole line" -msgstr "%s för att flytta hela linjen" - -#: ../app/tools/gimpblendtool.c:962 +#: ../app/tools/gimpblendtool.c:614 msgid "Blend: " msgstr "Toning: " -#: ../app/tools/gimpbrightnesscontrasttool.c:101 +#: ../app/tools/gimpblendtool.c:1016 +msgctxt "undo-type" +msgid "Blend" +msgstr "Toning" + +#. the position labels +#: ../app/tools/gimpblendtool-editor.c:1283 +msgid "X:" +msgstr "X:" + +#: ../app/tools/gimpblendtool-editor.c:1289 +msgid "Y:" +msgstr "Y:" + +#. the color label +#: ../app/tools/gimpblendtool-editor.c:1342 ../app/tools/gimptextoptions.c:583 +msgid "Color:" +msgstr "Färg:" + +#: ../app/tools/gimpblendtool-editor.c:1350 +msgid "Change Endpoint Color" +msgstr "Ändra ändpunktens färg" + +#. the position label +#: ../app/tools/gimpblendtool-editor.c:1388 +#: ../app/tools/gimpblendtool-editor.c:1508 +#: ../app/tools/gimprectangleoptions.c:1031 +msgid "Position:" +msgstr "Position:" + +#. the color labels +#: ../app/tools/gimpblendtool-editor.c:1413 +msgid "Left color:" +msgstr "Vänsterfärg:" + +#: ../app/tools/gimpblendtool-editor.c:1419 +msgid "Right color:" +msgstr "Högerfärg:" + +#: ../app/tools/gimpblendtool-editor.c:1446 +#: ../app/tools/gimpblendtool-editor.c:1455 +msgid "Change Stop Color" +msgstr "Ändra stegfärg" + +#: ../app/tools/gimpblendtool-editor.c:1477 +msgid "Delete stop" +msgstr "Ta bort steg" + +#. the type label +#: ../app/tools/gimpblendtool-editor.c:1533 +msgid "Blending:" +msgstr "Toning:" + +#. the color label +#: ../app/tools/gimpblendtool-editor.c:1555 +msgid "Coloring:" +msgstr "Färgning:" + +#: ../app/tools/gimpblendtool-editor.c:1589 +msgid "New stop at midpoint" +msgstr "Nytt steg vid mittpunkt" + +#: ../app/tools/gimpblendtool-editor.c:1597 +msgid "Center midpoint" +msgstr "Centrumpunkt" + +#: ../app/tools/gimpblendtool-editor.c:1660 +msgid "Start Endpoint" +msgstr "Startpunkt" + +#: ../app/tools/gimpblendtool-editor.c:1668 +msgid "End Endpoint" +msgstr "Slutpunkt" + +#: ../app/tools/gimpblendtool-editor.c:1721 +#, c-format +msgid "Stop %d" +msgstr "Steg %d" + +#: ../app/tools/gimpblendtool-editor.c:1789 +#, c-format +msgid "Midpoint %d" +msgstr "Mittpunkt %d" + +#: ../app/tools/gimpblendtool-editor.c:2367 +#: ../app/tools/gimpblendtool-editor.c:2376 +msgid "Blend Step" +msgstr "Toningssteg" + +#: ../app/tools/gimpbrightnesscontrasttool.c:97 msgid "Brightness-Contrast" msgstr "Ljusstyrka-Kontrast" -#: ../app/tools/gimpbrightnesscontrasttool.c:102 -msgid "Brightness/Contrast Tool: Adjust brightness and contrast" -msgstr "Ljusstyrka/Kontrast-verktyg: Justera ljusstyrka och kontrast" - -#: ../app/tools/gimpbrightnesscontrasttool.c:103 +#: ../app/tools/gimpbrightnesscontrasttool.c:99 msgid "B_rightness-Contrast..." -msgstr "L_jusstyrka-Kontrast..." +msgstr "L_jusstyrka-Kontrast…" -#: ../app/tools/gimpbrightnesscontrasttool.c:121 -msgid "Import Brightness-Contrast settings" -msgstr "Importera inställningar för ljusstyrka-kontrast" - -#: ../app/tools/gimpbrightnesscontrasttool.c:122 -msgid "Export Brightness-Contrast settings" -msgstr "Exportera inställningar för ljusstyrka-kontrast" - -#: ../app/tools/gimpbrightnesscontrasttool.c:173 +#: ../app/tools/gimpbrightnesscontrasttool.c:161 msgid "Adjust Brightness and Contrast" msgstr "Justera ljusstyrka och kontrast" -#: ../app/tools/gimpbrightnesscontrasttool.c:258 -#, fuzzy -#| msgid "_Brightness:" +#: ../app/tools/gimpbrightnesscontrasttool.c:277 msgid "_Brightness" -msgstr "_Ljusstyrka:" +msgstr "_Ljusstyrka" -#: ../app/tools/gimpbrightnesscontrasttool.c:266 -#, fuzzy -#| msgid "Con_trast:" +#: ../app/tools/gimpbrightnesscontrasttool.c:285 msgid "_Contrast" -msgstr "Kon_trast:" +msgstr "Kon_trast" -#: ../app/tools/gimpbrightnesscontrasttool.c:273 +#: ../app/tools/gimpbrightnesscontrasttool.c:292 msgid "Edit these Settings as Levels" msgstr "Redigera dessa inställningar som nivåer" #: ../app/tools/gimpbucketfilloptions.c:102 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Float selection" msgid "Fill selection" -msgstr "Flytande markering" +msgstr "Fyll markering" #: ../app/tools/gimpbucketfilloptions.c:103 msgid "Which area will be filled" @@ -16703,13 +20502,15 @@ msgstr "Basera fyllda områden på alla synliga lager" #: ../app/tools/gimpbucketfilloptions.c:125 #: ../app/tools/gimpregionselectoptions.c:105 msgid "Treat diagonally neighboring pixels as connected" -msgstr "" +msgstr "Behandla diagonala grannbildpunkter som ihopkopplade" #: ../app/tools/gimpbucketfilloptions.c:133 msgid "" "Base fill opacity on color difference from the clicked pixel (see " "threshold). Disable antialiasing to fill the entire area uniformly." msgstr "" +"Grundfyllnadsopacitet vid färgdifferens från den klickade bildpunkten (se " +"tröskel). Inaktivera kantutjämning för att fylla hela området jämnt." #: ../app/tools/gimpbucketfilloptions.c:143 #: ../app/tools/gimpregionselectoptions.c:113 @@ -16718,10 +20519,8 @@ msgstr "Maximal färgskillnad" #: ../app/tools/gimpbucketfilloptions.c:149 #: ../app/tools/gimpbucketfilloptions.c:353 -#, fuzzy -#| msgid "Fill by:" msgid "Fill by" -msgstr "Fyll med:" +msgstr "Fyll med" #: ../app/tools/gimpbucketfilloptions.c:150 msgid "Criterion used for determining color similarity" @@ -16781,34 +20580,34 @@ msgid "Select by Color" msgstr "Markera efter färg" #: ../app/tools/gimpcageoptions.c:77 -#, fuzzy -#| msgid "Fill the original position of the cage with a plain color" msgid "" "Fill the original position\n" "of the cage with a color" -msgstr "Fyll burens ursprungliga läge med en vanlig färg" +msgstr "" +"Fyll burens ursprungliga\n" +"position med en färg" -#: ../app/tools/gimpcagetool.c:160 ../app/tools/gimpcagetool.c:1198 +#: ../app/tools/gimpcagetool.c:158 ../app/tools/gimpcagetool.c:1223 msgid "Cage Transform" msgstr "Burtransformering" -#: ../app/tools/gimpcagetool.c:161 +#: ../app/tools/gimpcagetool.c:159 msgid "Cage Transform: Deform a selection with a cage" msgstr "Burtransformering: Deformera en markering med en bur" -#: ../app/tools/gimpcagetool.c:162 +#: ../app/tools/gimpcagetool.c:160 msgid "_Cage Transform" msgstr "B_urtransformering" -#: ../app/tools/gimpcagetool.c:317 ../app/tools/gimpwarptool.c:319 +#: ../app/tools/gimpcagetool.c:732 ../app/tools/gimpwarptool.c:329 msgid "Press ENTER to commit the transform" msgstr "Tryck på Enter för att verkställa transformeringen" -#: ../app/tools/gimpcagetool.c:1101 +#: ../app/tools/gimpcagetool.c:1133 msgid "Computing Cage Coefficients" msgstr "Beräkna burkoefficienter" -#: ../app/tools/gimpcagetool.c:1249 +#: ../app/tools/gimpcagetool.c:1266 msgid "Cage transform" msgstr "Burtransformering" @@ -16835,220 +20634,84 @@ msgstr "%s för att ställa in en ny kloningskälla" msgid "Click to set a new clone source" msgstr "Klicka för att ställa in en ny kloningskälla" -#: ../app/tools/gimpcolorbalancetool.c:81 -msgid "Color Balance" -msgstr "Färgbalans" +#: ../app/tools/gimpcoloroptions.c:70 +msgid "Use merged color value from all composited visible layers" +msgstr "Använd sammanfogat färgvärde från alla sammansatta synliga lager" -#: ../app/tools/gimpcolorbalancetool.c:82 -msgid "Color Balance Tool: Adjust color distribution" -msgstr "Färgbalansverktyg: Justera färgdistributionen" - -#: ../app/tools/gimpcolorbalancetool.c:83 -msgid "Color _Balance..." -msgstr "Färg_balans..." - -#: ../app/tools/gimpcolorbalancetool.c:98 -msgid "Import Color Balance Settings" -msgstr "Importera inställningar för färgbalans" - -#: ../app/tools/gimpcolorbalancetool.c:99 -msgid "Export Color Balance Settings" -msgstr "Exportera inställningar för färgbalans" - -#: ../app/tools/gimpcolorbalancetool.c:125 -msgid "Color Balance operates only on RGB color layers." -msgstr "Färgbalans fungerar endast på RGB-färglager." - -#: ../app/tools/gimpcolorbalancetool.c:140 -msgid "Adjust Color Balance" -msgstr "Justera färgbalans" - -#: ../app/tools/gimpcolorbalancetool.c:195 -msgid "Select Range to Adjust" -msgstr "Välj intervall att justera" - -#: ../app/tools/gimpcolorbalancetool.c:200 ../app/tools/gimplevelstool.c:267 -msgid "Adjust Color Levels" -msgstr "Justera färgnivåer" - -#: ../app/tools/gimpcolorbalancetool.c:216 -#: ../app/tools/gimphuesaturationtool.c:209 -msgid "Cyan" -msgstr "Cyan" - -#: ../app/tools/gimpcolorbalancetool.c:216 -#: ../app/tools/gimphuesaturationtool.c:206 -msgid "Red" -msgstr "Röd" - -#: ../app/tools/gimpcolorbalancetool.c:220 -#: ../app/tools/gimphuesaturationtool.c:211 -msgid "Magenta" -msgstr "Magenta" - -#: ../app/tools/gimpcolorbalancetool.c:220 -#: ../app/tools/gimphuesaturationtool.c:208 -msgid "Green" -msgstr "Grön" - -#: ../app/tools/gimpcolorbalancetool.c:224 -#: ../app/tools/gimphuesaturationtool.c:207 -msgid "Yellow" -msgstr "Gul" - -#: ../app/tools/gimpcolorbalancetool.c:224 -#: ../app/tools/gimphuesaturationtool.c:210 -msgid "Blue" -msgstr "Blå" - -#: ../app/tools/gimpcolorbalancetool.c:231 -msgid "R_eset Range" -msgstr "_Återställ intervall" - -#: ../app/tools/gimpcolorbalancetool.c:241 -msgid "Preserve _luminosity" -msgstr "Behåll _luminans" - -#: ../app/tools/gimpcolorizetool.c:82 -msgid "Colorize" -msgstr "Färglägg" - -#: ../app/tools/gimpcolorizetool.c:83 -msgid "Colorize Tool: Colorize the image" -msgstr "Färgläggningsverktyg: Färglägg bilden" - -#: ../app/tools/gimpcolorizetool.c:84 -msgid "Colori_ze..." -msgstr "Färg_lägg..." - -#: ../app/tools/gimpcolorizetool.c:99 -msgid "Import Colorize Settings" -msgstr "Importera färgläggningsinställningar" - -#: ../app/tools/gimpcolorizetool.c:100 -msgid "Export Colorize Settings" -msgstr "Exportera färgläggningsinställningar" - -#: ../app/tools/gimpcolorizetool.c:126 -#, fuzzy -#| msgid "Posterize does not operate on indexed layers." -msgid "Colorize does not operate on grayscale layers." -msgstr "Kan inte använda posterisering på indexerade lager." - -#: ../app/tools/gimpcolorizetool.c:141 -msgid "Colorize the Image" -msgstr "Färglägg bilden" - -#: ../app/tools/gimpcolorizetool.c:164 -msgid "Select Color" -msgstr "Välj färg" - -#: ../app/tools/gimpcolorizetool.c:174 ../app/tools/gimphuesaturationtool.c:312 -#, fuzzy -#| msgid "_Hue:" -msgid "_Hue" -msgstr "_Nyans:" - -#: ../app/tools/gimpcolorizetool.c:181 ../app/tools/gimphuesaturationtool.c:326 -#, fuzzy -#| msgid "_Saturation:" -msgid "_Saturation" -msgstr "_Mättnad:" - -#: ../app/tools/gimpcolorizetool.c:188 ../app/tools/gimphuesaturationtool.c:319 -#, fuzzy -#| msgid "_Lightness:" -msgid "_Lightness" -msgstr "_Ljusstyrka:" - -#: ../app/tools/gimpcolorizetool.c:199 -#, fuzzy -#| msgid "Colorize" -msgid "Colorize Color" -msgstr "Färglägg" - -#: ../app/tools/gimpcolorizetool.c:211 -#, fuzzy -#| msgid "Color Picker Tool: Set colors from image pixels" -msgid "Pick color from image" -msgstr "Färgväljarverktyg: Ställ in färger från bildens bildpunkter" - -#: ../app/tools/gimpcoloroptions.c:76 ../app/tools/gimpcolorpickeroptions.c:69 +#: ../app/tools/gimpcoloroptions.c:77 ../app/tools/gimpcolorpickeroptions.c:71 msgid "Sample average" -msgstr "Sampelmedel" +msgstr "Samplingsmedel" -#: ../app/tools/gimpcoloroptions.c:84 +#: ../app/tools/gimpcoloroptions.c:78 ../app/tools/gimpcolorpickeroptions.c:72 +msgid "Use averaged color value from nearby pixels" +msgstr "Använd medelfärgvärde från närliggande bildpunkter" + +#: ../app/tools/gimpcoloroptions.c:86 msgid "Color Picker Average Radius" msgstr "Genomsnittsradie färgväljare" -#: ../app/tools/gimpcolorpickeroptions.c:70 -msgid "Use accumulated color value from all composited visible layers" -msgstr "Använd ackumulerat färgvärde från alla sammansatta synliga lager" - -#: ../app/tools/gimpcolorpickeroptions.c:77 -#, fuzzy -#| msgid "Pick Mode (%s)" +#: ../app/tools/gimpcolorpickeroptions.c:79 msgid "Pick Mode" -msgstr "Valläge (%s)" +msgstr "Valläge" -#: ../app/tools/gimpcolorpickeroptions.c:78 +#: ../app/tools/gimpcolorpickeroptions.c:80 msgid "Choose what color picker will do" msgstr "Välj vad färgväljaren ska göra" -#: ../app/tools/gimpcolorpickeroptions.c:85 +#: ../app/tools/gimpcolorpickeroptions.c:87 #: ../app/tools/gimpmeasureoptions.c:68 msgid "Use info window" msgstr "Använd informationsfönster" -#: ../app/tools/gimpcolorpickeroptions.c:86 +#: ../app/tools/gimpcolorpickeroptions.c:88 msgid "" "Open a floating dialog to view picked color values in various color models" msgstr "" "Öppna en flytande dialogruta för att se valt färgvärde i olika färgmodeller" #. the pick FG/BG frame -#: ../app/tools/gimpcolorpickeroptions.c:167 +#: ../app/tools/gimpcolorpickeroptions.c:195 #, c-format msgid "Pick Mode (%s)" msgstr "Valläge (%s)" #. the use_info_window toggle button -#: ../app/tools/gimpcolorpickeroptions.c:176 +#: ../app/tools/gimpcolorpickeroptions.c:204 #, c-format msgid "Use info window (%s)" msgstr "Använd infofönster (%s)" -#: ../app/tools/gimpcolorpickertool.c:102 +#: ../app/tools/gimpcolorpickertool.c:108 msgid "Color Picker" -msgstr "Färghämtaren" +msgstr "Färgväljare" -#: ../app/tools/gimpcolorpickertool.c:103 +#: ../app/tools/gimpcolorpickertool.c:109 msgid "Color Picker Tool: Set colors from image pixels" msgstr "Färgväljarverktyg: Ställ in färger från bildens bildpunkter" -#: ../app/tools/gimpcolorpickertool.c:104 +#: ../app/tools/gimpcolorpickertool.c:110 msgid "C_olor Picker" -msgstr "F_ärghämtare" +msgstr "F_ärgväljare" -#: ../app/tools/gimpcolorpickertool.c:252 +#: ../app/tools/gimpcolorpickertool.c:253 msgid "Click in any image to view its color" msgstr "Klicka i en bild för att visa dess färg" -#: ../app/tools/gimpcolorpickertool.c:259 ../app/tools/gimppainttool.c:497 +#: ../app/tools/gimpcolorpickertool.c:260 ../app/tools/gimppainttool.c:412 msgid "Click in any image to pick the foreground color" msgstr "Klicka i en bild för att välja förgrundsfärgen" -#: ../app/tools/gimpcolorpickertool.c:267 ../app/tools/gimppainttool.c:503 +#: ../app/tools/gimpcolorpickertool.c:268 ../app/tools/gimppainttool.c:418 msgid "Click in any image to pick the background color" msgstr "Klicka i en bild för att välja bakgrundsfärgen" -#: ../app/tools/gimpcolorpickertool.c:275 +#: ../app/tools/gimpcolorpickertool.c:276 msgid "Click in any image to add the color to the palette" msgstr "Klicka i en bild för att lägga till färgen till paletten" -#: ../app/tools/gimpcolorpickertool.c:342 +#: ../app/tools/gimpcolorpickertool.c:343 msgid "Color Picker Information" -msgstr "Information om färghämtare" +msgstr "Information om färgväljare" #: ../app/tools/gimpconvolvetool.c:74 msgid "Blur / Sharpen" @@ -17092,204 +20755,221 @@ msgstr "%s för oskärpa" #: ../app/tools/gimpconvolvetool.c:213 #, c-format msgid "Convolve Type (%s)" -msgstr "Konvolveringstyp (%s)" +msgstr "Faltningstyp (%s)" -#: ../app/tools/gimpcropoptions.c:77 +#: ../app/tools/gimpcropoptions.c:78 #: ../app/tools/gimprectangleselectoptions.c:78 -#: ../app/tools/gimptextoptions.c:130 msgid "Highlight" msgstr "Framhäv" -#: ../app/tools/gimpcropoptions.c:78 +#: ../app/tools/gimpcropoptions.c:79 #: ../app/tools/gimprectangleselectoptions.c:79 msgid "Dim everything outside selection" msgstr "Dämpa allt utanför markering" -#: ../app/tools/gimpcropoptions.c:84 +#: ../app/tools/gimpcropoptions.c:86 +#: ../app/tools/gimprectangleselectoptions.c:86 +msgid "Highlight opacity" +msgstr "Högdageropacitet" + +#: ../app/tools/gimpcropoptions.c:87 +#: ../app/tools/gimprectangleselectoptions.c:87 +msgid "How much to dim everything outside selection" +msgstr "Hur mycket allt utanför markering ska dämpas" + +#: ../app/tools/gimpcropoptions.c:93 msgid "Current layer only" msgstr "Endast aktuellt lager" -#: ../app/tools/gimpcropoptions.c:85 +#: ../app/tools/gimpcropoptions.c:94 msgid "Crop only currently selected layer" msgstr "Beskär bara markerat lager" -#: ../app/tools/gimpcropoptions.c:91 +#: ../app/tools/gimpcropoptions.c:100 msgid "Allow growing" -msgstr "Tillåt förstoring" +msgstr "Tillåt växande" -#: ../app/tools/gimpcropoptions.c:92 +#: ../app/tools/gimpcropoptions.c:101 msgid "Allow resizing canvas by dragging cropping frame beyond image boundary" msgstr "" "Tillåt storleksändring av ritytan genom att dra beskärningsramen bortom " "bildgräns" -#: ../app/tools/gimpcroptool.c:117 +#: ../app/tools/gimpcropoptions.c:108 ../app/tools/gimpcropoptions.c:200 +msgid "Fill with" +msgstr "Fyll med" + +#: ../app/tools/gimpcropoptions.c:109 +msgid "How to fill new areas created by 'Allow growing'" +msgstr "Hur man fyller nya områden skapade genom ”Tillåt växande”" + +#: ../app/tools/gimpcroptool.c:118 msgid "Crop" msgstr "Beskär" -#: ../app/tools/gimpcroptool.c:118 -msgid "Crop Tool: Remove edge areas from image or layer" -msgstr "Beskäringsverktyg: Ta bort kantområden från bild eller lager" - #: ../app/tools/gimpcroptool.c:119 +msgid "Crop Tool: Remove edge areas from image or layer" +msgstr "Beskärningsverktyg: Ta bort kantområden från bild eller lager" + +#: ../app/tools/gimpcroptool.c:120 msgid "_Crop" msgstr "_Beskär" -#: ../app/tools/gimpcroptool.c:252 +#: ../app/tools/gimpcroptool.c:158 +msgid "Click-Drag to draw a crop rectangle" +msgstr "Klicka och dra för att rita en beskuren rektangel" + +#: ../app/tools/gimpcroptool.c:278 msgid "Click or press Enter to crop" msgstr "Klicka eller tryck på Enter för att beskära" -#: ../app/tools/gimpcroptool.c:318 +#: ../app/tools/gimpcroptool.c:385 +msgid "Crop to: " +msgstr "Beskär till: " + +#: ../app/tools/gimpcroptool.c:455 msgid "There is no active layer to crop." msgstr "Det finns inget aktivt lager att beskära." -#: ../app/tools/gimpcurvestool.c:147 +#: ../app/tools/gimpcurvestool.c:142 msgid "Curves" msgstr "Kurvor" -#: ../app/tools/gimpcurvestool.c:148 -msgid "Curves Tool: Adjust color curves" -msgstr "Kurvverktyg: Justera färgkurvor" - -#: ../app/tools/gimpcurvestool.c:149 +#: ../app/tools/gimpcurvestool.c:144 msgid "_Curves..." -msgstr "_Kurvor..." +msgstr "_Kurvor…" -#: ../app/tools/gimpcurvestool.c:176 -msgid "Import Curves" -msgstr "Importera kurvor" - -#: ../app/tools/gimpcurvestool.c:177 -msgid "Export Curves" -msgstr "Exportera kurvor" - -#: ../app/tools/gimpcurvestool.c:345 +#: ../app/tools/gimpcurvestool.c:325 msgid "Click to add a control point" msgstr "Klicka för att lägga till en kontrollpunkt" -#: ../app/tools/gimpcurvestool.c:350 +#: ../app/tools/gimpcurvestool.c:330 msgid "Click to add control points to all channels" msgstr "Klicka för att lägga till kontrollpunkter till alla kanaler" -#: ../app/tools/gimpcurvestool.c:355 -#, fuzzy -#| msgid "Click to close the curve" +#: ../app/tools/gimpcurvestool.c:335 msgid "Click to locate on curve" -msgstr "Klicka för att sluta kurvan" +msgstr "Klicka för att söka på kurva" -#: ../app/tools/gimpcurvestool.c:357 -#, fuzzy, c-format -#| msgid "Click to add a control point" +#: ../app/tools/gimpcurvestool.c:337 +#, c-format msgid "%s: add control point" -msgstr "Klicka för att lägga till en kontrollpunkt" +msgstr "%s: lägg till kontrollpunkt" -#: ../app/tools/gimpcurvestool.c:358 -#, fuzzy, c-format -#| msgid "Click to add control points to all channels" +#: ../app/tools/gimpcurvestool.c:338 +#, c-format msgid "%s: add control points to all channels" -msgstr "Klicka för att lägga till kontrollpunkter till alla kanaler" +msgstr "%s: lägga till kontrollpunkter till alla kanaler" -#: ../app/tools/gimpcurvestool.c:411 +#: ../app/tools/gimpcurvestool.c:355 msgid "Adjust Color Curves" msgstr "Justera färgkurvor" -#: ../app/tools/gimpcurvestool.c:456 ../app/tools/gimplevelstool.c:363 +#: ../app/tools/gimpcurvestool.c:400 ../app/tools/gimplevelstool.c:345 +#: ../app/tools/gimpthresholdtool.c:194 msgid "Cha_nnel:" msgstr "Ka_nal:" -#: ../app/tools/gimpcurvestool.c:483 ../app/tools/gimplevelstool.c:388 +#: ../app/tools/gimpcurvestool.c:432 ../app/tools/gimplevelstool.c:375 msgid "R_eset Channel" msgstr "Återstäl_l kanal" -#: ../app/tools/gimpcurvestool.c:580 ../app/widgets/gimpdeviceinfoeditor.c:461 +#: ../app/tools/gimpcurvestool.c:452 +msgid "Adjust curves in linear light" +msgstr "Justera kurvor i linjärt ljus" + +#: ../app/tools/gimpcurvestool.c:453 +msgid "Adjust curves perceptually" +msgstr "Justera kurvor perceptuellt" + +#: ../app/tools/gimpcurvestool.c:543 ../app/widgets/gimpdeviceinfoeditor.c:464 msgid "Curve _type:" msgstr "Kurv_typ:" -#: ../app/tools/gimpcurvestool.c:647 ../app/tools/gimplevelstool.c:664 -#, fuzzy -#| msgid "Could not read header from '%s': %s" +#: ../app/tools/gimpcurvestool.c:661 ../app/tools/gimplevelstool.c:744 msgid "Could not read header: " -msgstr "Kunde inte läsa rubrik från \"%s\": %s" +msgstr "Kunde inte läsa huvud: " -#: ../app/tools/gimpcurvestool.c:688 +#: ../app/tools/gimpcurvestool.c:735 msgid "Use _old curves file format" msgstr "Använd filformat för _gamla kurvor" #: ../app/tools/gimpdodgeburntool.c:74 msgid "Dodge / Burn" -msgstr "Blek / Bränn" +msgstr "Skugga / Efterbelys" #: ../app/tools/gimpdodgeburntool.c:75 msgid "Dodge / Burn Tool: Selectively lighten or darken using a brush" msgstr "" -"Verktyg för blekning / bränning: Gör selektivt ljusare eller mörkare med en " -"pensel" +"Verktyg för skuggning / efterbelysning: Gör selektivt ljusare eller mörkare " +"med en pensel" #: ../app/tools/gimpdodgeburntool.c:76 msgid "Dod_ge / Burn" -msgstr "Ble_k / Bränn" +msgstr "Sku_gga / Efterbelys" #: ../app/tools/gimpdodgeburntool.c:188 msgid "Click to dodge" -msgstr "Klicka för att bleka" +msgstr "Klicka för att skugga" #: ../app/tools/gimpdodgeburntool.c:189 msgid "Click to dodge the line" -msgstr "Klicka för att bleka linjen" +msgstr "Klicka för att skugga linjen" #: ../app/tools/gimpdodgeburntool.c:190 #, c-format msgid "%s to burn" -msgstr "%s för att bränna" +msgstr "%s för att efterbelysa" #: ../app/tools/gimpdodgeburntool.c:194 msgid "Click to burn" -msgstr "Klicka för att bränna" +msgstr "Klicka för att efterbelysa" #: ../app/tools/gimpdodgeburntool.c:195 msgid "Click to burn the line" -msgstr "Klicka för att bränna linjen" +msgstr "Klicka för att efterbelysa linjen" #: ../app/tools/gimpdodgeburntool.c:196 #, c-format msgid "%s to dodge" -msgstr "%s för att bleka" +msgstr "%s för att skugga" #. the type (dodge or burn) #: ../app/tools/gimpdodgeburntool.c:220 #, c-format msgid "Type (%s)" -msgstr "Typ (%s)" +msgstr "Typ (%s)" -#: ../app/tools/gimpeditselectiontool.c:419 -#: ../app/tools/gimpeditselectiontool.c:605 +#: ../app/tools/gimpeditselectiontool.c:449 +#: ../app/tools/gimpeditselectiontool.c:623 msgid "Move: " msgstr "Flytta: " -#: ../app/tools/gimpeditselectiontool.c:849 -#: ../app/tools/gimpeditselectiontool.c:1108 +#: ../app/tools/gimpeditselectiontool.c:879 +#: ../app/tools/gimpeditselectiontool.c:1138 msgid "Move Floating Selection" msgstr "Flytta flytande markering" -#: ../app/tools/gimpellipseselecttool.c:66 +#: ../app/tools/gimpellipseselecttool.c:64 msgid "Ellipse Select" msgstr "Ellipsmarkering" -#: ../app/tools/gimpellipseselecttool.c:67 +#: ../app/tools/gimpellipseselecttool.c:65 msgid "Ellipse Select Tool: Select an elliptical region" msgstr "Elliptiskt markeringsverktyg: Markera en elliptisk region" -#: ../app/tools/gimpellipseselecttool.c:68 +#: ../app/tools/gimpellipseselecttool.c:66 msgid "_Ellipse Select" msgstr "_Ellipsmarkering" #: ../app/tools/gimperasertool.c:67 msgid "Eraser Tool: Erase to background or transparency using a brush" -msgstr "Suddningsverktyg: Sudda mot bakgrunden eller transparens med en pensel" +msgstr "" +"Suddgummiverktyg: Sudda till bakgrunden eller transparens med en pensel" #: ../app/tools/gimperasertool.c:68 msgid "_Eraser" -msgstr "_Suddare" +msgstr "_Suddgummi" #: ../app/tools/gimperasertool.c:97 msgid "Click to erase" @@ -17310,94 +20990,119 @@ msgstr "%s för att välja en bakgrundsfärg" msgid "Anti erase (%s)" msgstr "Antisudda (%s)" -#: ../app/tools/gimpfilteroptions.c:73 +#: ../app/tools/gimpfilteroptions.c:71 msgid "_Preview" msgstr "_Förhandsvisning" -#: ../app/tools/gimpfilteroptions.c:80 -#, fuzzy -#| msgid "Split" -msgid "_Split view" -msgstr "Dela" +#: ../app/tools/gimpfilteroptions.c:78 +msgid "Split _view" +msgstr "Dela _vy" -#: ../app/tools/gimpfiltertool.c:633 -#, fuzzy -#| msgid "Click to pick this guide as first item" +#: ../app/tools/gimpfilteroptions.c:109 +msgid "Color _managed" +msgstr "Färg_hanterad" + +#. The Color Options expander +#: ../app/tools/gimpfiltertool.c:373 +msgid "Advanced Color Options" +msgstr "Avancerade färgalternativ" + +#: ../app/tools/gimpfiltertool.c:392 +msgid "Convert pixels to built-in sRGB to apply filter (slow)" +msgstr "" +"Konvertera bildpunkter till inbyggd sRGB för att tillämpa filter (långsamt)" + +#: ../app/tools/gimpfiltertool.c:393 +msgid "Assume pixels are built-in sRGB (ignore actual image color space)" +msgstr "" +"Antag att bildpunkter följer inbyggd sRGB (ignorera faktisk färgrymd för " +"bilden)" + +#: ../app/tools/gimpfiltertool.c:628 msgid "Click to switch the original and filtered sides" -msgstr "Klicka för att välja denna hjälplinje som första objekt" +msgstr "Klicka för att växla mellan original och filtrerade sidor" -#: ../app/tools/gimpfiltertool.c:637 -#, fuzzy -#| msgid "Click to place vertical and horizontal guides" +#: ../app/tools/gimpfiltertool.c:632 msgid "Click to switch between vertical and horizontal" -msgstr "Klicka för att placera vertikala och horisontella hjälplinjer" +msgstr "Klicka för att växla mellan vertikal och horisontell" -#: ../app/tools/gimpfiltertool.c:641 -#, fuzzy -#| msgid "Click to dodge the line" +#: ../app/tools/gimpfiltertool.c:636 msgid "Click to move the split guide" -msgstr "Klicka för att bleka linjen" +msgstr "Klicka för att flytta delningsguide" -#: ../app/tools/gimpfiltertool.c:643 +#: ../app/tools/gimpfiltertool.c:638 #, c-format msgid "%s: switch original and filtered" -msgstr "" +msgstr "%s: växla original och filtrerad" -#: ../app/tools/gimpfiltertool.c:644 +#: ../app/tools/gimpfiltertool.c:639 #, c-format msgid "%s: switch horizontal and vertical" -msgstr "" +msgstr "%s: växla horisontell och vertikal" -#: ../app/tools/gimpfiltertool-settings.c:81 +#: ../app/tools/gimpfiltertool.c:1300 ../app/tools/gimpfiltertool-settings.c:71 +#, c-format +msgid "Import '%s' Settings" +msgstr "Importera ”%s”-inställningar" + +#: ../app/tools/gimpfiltertool.c:1302 ../app/tools/gimpfiltertool-settings.c:73 +#, c-format +msgid "Export '%s' Settings" +msgstr "Exportera ”%s”-inställningar" + +#: ../app/tools/gimpfiltertool-settings.c:100 msgid "Pre_sets:" -msgstr "För_val:" +msgstr "Förin_ställningar:" -#: ../app/tools/gimpfiltertool-settings.c:242 +#: ../app/tools/gimpfiltertool-settings.c:240 #, c-format msgid "Settings saved to '%s'" -msgstr "Inställningar sparade till \"%s\"" +msgstr "Inställningar sparade till ”%s”" #: ../app/tools/gimpflipoptions.c:67 -#, fuzzy -#| msgid "File Type" msgid "Flip Type" -msgstr "Filtyp" +msgstr "Vändningstyp" #: ../app/tools/gimpflipoptions.c:68 msgid "Direction of flipping" msgstr "Vändriktning" -#: ../app/tools/gimpflipoptions.c:135 ../app/tools/gimptransformoptions.c:426 +#: ../app/tools/gimpflipoptions.c:139 ../app/tools/gimptransformoptions.c:433 msgid "Transform:" msgstr "Transformera:" #. tool toggle -#: ../app/tools/gimpflipoptions.c:144 ../app/tools/gimpmagnifyoptions.c:191 +#: ../app/tools/gimpflipoptions.c:148 ../app/tools/gimpmagnifyoptions.c:191 #, c-format msgid "Direction (%s)" msgstr "Riktning (%s)" -#: ../app/tools/gimpfliptool.c:85 +#: ../app/tools/gimpflipoptions.c:170 ../app/tools/gimptransformoptions.c:132 +#: ../app/tools/gimptransformoptions.c:455 +msgid "Clipping" +msgstr "Klippning" + +#: ../app/tools/gimpfliptool.c:106 msgid "Flip" msgstr "Vänd" -#: ../app/tools/gimpfliptool.c:86 +#: ../app/tools/gimpfliptool.c:107 msgid "" "Flip Tool: Reverse the layer, selection or path horizontally or vertically" msgstr "" "Vändverktyg: Vänd lagret, markeringen eller banan horisontellt eller " "vertikalt" -#: ../app/tools/gimpfliptool.c:88 +#: ../app/tools/gimpfliptool.c:109 ../app/tools/gimpfliptool.c:133 msgid "_Flip" msgstr "_Vänd" -#: ../app/tools/gimpfliptool.c:188 +#: ../app/tools/gimpfliptool.c:298 msgctxt "undo-type" msgid "Flip horizontally" msgstr "Vänd horisontellt" -#: ../app/tools/gimpfliptool.c:191 +#: ../app/tools/gimpfliptool.c:301 msgctxt "undo-type" msgid "Flip vertically" msgstr "Vänd vertikalt" @@ -17405,16 +21110,14 @@ msgstr "Vänd vertikalt" #. probably this is not actually reached today, but #. * could be if someone defined FLIP_DIAGONAL, say... #. -#: ../app/tools/gimpfliptool.c:197 +#: ../app/tools/gimpfliptool.c:307 msgctxt "undo-desc" msgid "Flip" msgstr "Vänd" #: ../app/tools/gimpforegroundselectoptions.c:84 -#, fuzzy -#| msgid "Paint Mode" msgid "Draw Mode" -msgstr "Målningsläge" +msgstr "Ritläge" #: ../app/tools/gimpforegroundselectoptions.c:85 msgid "" @@ -17425,10 +21128,8 @@ msgstr "" "uteslutning från val" #: ../app/tools/gimpforegroundselectoptions.c:93 -#, fuzzy -#| msgid "Stroke Path" msgid "Stroke width" -msgstr "Stryk längs bana" +msgstr "Streckbredd" #: ../app/tools/gimpforegroundselectoptions.c:94 msgid "Size of the brush used for refinements" @@ -17436,10 +21137,8 @@ msgstr "Storlek på penseln som används för förfiningar" #: ../app/tools/gimpforegroundselectoptions.c:100 #: ../app/tools/gimpforegroundselectoptions.c:305 -#, fuzzy -#| msgid "Preview color:" msgid "Preview color" -msgstr "Förhandsgranska färg:" +msgstr "Förhandsgranska färg" #: ../app/tools/gimpforegroundselectoptions.c:101 msgid "Color of selection preview mask" @@ -17448,148 +21147,102 @@ msgstr "Färg på markeringens förhandsvisningsmask" #: ../app/tools/gimpforegroundselectoptions.c:108 #: ../app/tools/gimpforegroundselectoptions.c:316 msgid "Engine" -msgstr "" +msgstr "Motor" #: ../app/tools/gimpforegroundselectoptions.c:109 msgid "Matting engine to use" -msgstr "" +msgstr "Mattningsmotor som ska användas" #: ../app/tools/gimpforegroundselectoptions.c:117 -#, fuzzy -#| msgid "Number of _processors to use:" msgid "Number of downsampled levels to use" -msgstr "Antalet _processorer att använda:" +msgstr "Antalet nedsamplade nivåer att använda" #: ../app/tools/gimpforegroundselectoptions.c:123 -#, fuzzy -#| msgid "Active Filters" msgid "Active levels" -msgstr "Aktiva filter" +msgstr "Aktiva nivåer" #: ../app/tools/gimpforegroundselectoptions.c:124 msgid "Number of levels to perform solving" -msgstr "" +msgstr "Antal nivåer att utföra lösning" #: ../app/tools/gimpforegroundselectoptions.c:130 -#, fuzzy -#| msgid "Interpolation:" msgid "Iterations" -msgstr "Interpolation:" +msgstr "Iterationer" #: ../app/tools/gimpforegroundselectoptions.c:131 -#, fuzzy -#| msgctxt "guides-type" -#| msgid "Number of lines" msgid "Number of iterations to perform" -msgstr "Antal linjer" +msgstr "Antal iterationer att utföra" #: ../app/tools/gimpforegroundselectoptions.c:300 -#, fuzzy -#| msgid "Reset size to brush's native size" msgid "Reset stroke width native size" -msgstr "Återställ storlek till penselns ursprungsstorlek" +msgstr "Återställ streckbredd till ursprungsstorlek" -#: ../app/tools/gimpforegroundselecttool.c:187 +#: ../app/tools/gimpforegroundselecttool.c:189 msgid "Foreground Select" msgstr "Förgrundsmarkering" -#: ../app/tools/gimpforegroundselecttool.c:188 +#: ../app/tools/gimpforegroundselecttool.c:190 msgid "Foreground Select Tool: Select a region containing foreground objects" msgstr "" "Förgrundsmarkeringsverktyg: Markera en region som innehåller förgrundsobjekt" -#: ../app/tools/gimpforegroundselecttool.c:189 +#: ../app/tools/gimpforegroundselecttool.c:191 msgid "F_oreground Select" msgstr "F_örgrundsmarkering" -#: ../app/tools/gimpforegroundselecttool.c:303 -#, fuzzy -#| msgid "Foreground Select" +#: ../app/tools/gimpforegroundselecttool.c:307 msgid "Dialog for foreground select" -msgstr "Förgrundsmarkering" +msgstr "Dialog för förgrundsmarkering" -#: ../app/tools/gimpforegroundselecttool.c:319 -#, fuzzy -#| msgid "_Preview" +#: ../app/tools/gimpforegroundselecttool.c:325 msgid "_Preview mask" -msgstr "_Förhandsvisning" +msgstr "_Förhandsvisa mask" -#: ../app/tools/gimpforegroundselecttool.c:330 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Select foreground" +#: ../app/tools/gimpforegroundselecttool.c:336 msgid "Select foreground pixels" -msgstr "Välj förgrund" +msgstr "Välj förgrundsbildpunkter" -#: ../app/tools/gimpforegroundselecttool.c:598 +#: ../app/tools/gimpforegroundselecttool.c:612 msgid "Roughly outline the object to extract" msgstr "Rita en grov kontur runt objektet att extrahera" -#: ../app/tools/gimpforegroundselecttool.c:619 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Select foreground" +#: ../app/tools/gimpforegroundselecttool.c:633 msgid "Selecting foreground," -msgstr "Välj förgrund" +msgstr "Väljer förgrund," -#: ../app/tools/gimpforegroundselecttool.c:621 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Select foreground" +#: ../app/tools/gimpforegroundselecttool.c:635 msgid "Selecting background," -msgstr "Välj förgrund" +msgstr "Väljer bakgrund," -#: ../app/tools/gimpforegroundselecttool.c:623 -#, fuzzy -#| msgid "Selection" +#: ../app/tools/gimpforegroundselecttool.c:637 msgid "Selecting unknown," -msgstr "Markering" +msgstr "Väljer okänd," -#: ../app/tools/gimpforegroundselecttool.c:626 -#, fuzzy -#| msgid "Click or press Enter to crop" +#: ../app/tools/gimpforegroundselecttool.c:640 msgid "press Enter to preview." -msgstr "Klicka eller tryck på Enter för att beskära" +msgstr "tryck på Retur för att förhandsgranska." -#: ../app/tools/gimpforegroundselecttool.c:628 +#: ../app/tools/gimpforegroundselecttool.c:642 msgid "press Escape to exit preview or Enter to apply." msgstr "" +"tryck på Escape för att avsluta förhandsgranskning eller Retur för att " +"verkställa." -#: ../app/tools/gimpforegroundselecttool.c:1225 -#, fuzzy -#| msgid "Paint Dynamics" +#: ../app/tools/gimpforegroundselecttool.c:1219 msgid "Paint mask" -msgstr "Målningsdynamik" +msgstr "Ritmask" -#: ../app/tools/gimpfreeselecttool.c:197 +#: ../app/tools/gimpfreeselecttool.c:129 msgid "" "Free Select Tool: Select a hand-drawn region with free and polygonal segments" msgstr "" "Fri markering: Markera en handritad region med fria och polygona segment" -#: ../app/tools/gimpfreeselecttool.c:198 +#: ../app/tools/gimpfreeselecttool.c:131 msgid "_Free Select" msgstr "_Fri markering" -#: ../app/tools/gimpfreeselecttool.c:950 -msgid "Click to complete selection" -msgstr "Klicka för att färdigställa markeringen" - -#: ../app/tools/gimpfreeselecttool.c:954 -msgid "Click-Drag to move segment vertex" -msgstr "Klicka och dra för att flytta segmenthörnet" - -#: ../app/tools/gimpfreeselecttool.c:959 -msgid "Return commits, Escape cancels, Backspace removes last segment" -msgstr "Return verkställer, Escape avbryter, Backsteg tar bort sista segmentet" - -#: ../app/tools/gimpfreeselecttool.c:963 -msgid "Click-Drag adds a free segment, Click adds a polygonal segment" -msgstr "" -"Klicka och dra lägger till ett ledigt segment, Klick lägger till ett " -"polygont segment" - -#: ../app/tools/gimpfreeselecttool.c:1515 +#: ../app/tools/gimpfreeselecttool.c:494 msgctxt "command" msgid "Free Select" msgstr "Fri markering" @@ -17612,97 +21265,87 @@ msgctxt "command" msgid "Fuzzy Select" msgstr "Luddig markering" -#: ../app/tools/gimpgegltool.c:72 ../app/tools/gimpgegltool.c:466 -#: ../app/tools/gimpgegltool.c:467 ../app/tools/gimpoperationtool.c:132 +#: ../app/tools/gimpgegltool.c:78 ../app/tools/gimpgegltool.c:539 +#: ../app/tools/gimpgegltool.c:540 ../app/tools/gimpoperationtool.c:134 msgid "GEGL Operation" msgstr "GEGL-operation" -#: ../app/tools/gimpgegltool.c:73 +#: ../app/tools/gimpgegltool.c:79 msgid "GEGL Tool: Use an arbitrary GEGL operation" msgstr "GEGL-verktyg: Använd en godtycklig GEGL-operation" -#: ../app/tools/gimpgegltool.c:74 ../app/tools/gimpoperationtool.c:134 +#: ../app/tools/gimpgegltool.c:80 ../app/tools/gimpoperationtool.c:136 msgid "_GEGL Operation..." -msgstr "_GEGL-operation..." +msgstr "_GEGL-operation…" -#: ../app/tools/gimpgegltool.c:421 +#. The options vbox +#: ../app/tools/gimpgegltool.c:484 msgid "Select an operation from the list above" msgstr "Välj en åtgärd från listan ovan" -#: ../app/tools/gimpguidetool.c:273 +#: ../app/tools/gimpgenerictransformtool.c:83 +msgid "Transform Matrix" +msgstr "Transformationsmatris" + +#: ../app/tools/gimpgenerictransformtool.c:114 +msgid "Invalid transform" +msgstr "Ogiltig transform" + +#: ../app/tools/gimpguidetool.c:274 msgid "Remove Guide" msgstr "Ta bort hjälplinje" -#: ../app/tools/gimpguidetool.c:273 +#: ../app/tools/gimpguidetool.c:274 msgid "Cancel Guide" msgstr "Avbryt hjälplinje" -#: ../app/tools/gimpguidetool.c:279 +#: ../app/tools/gimpguidetool.c:279 ../app/tools/gimpguidetool.c:360 msgid "Move Guide: " msgstr "Flytta hjälplinje: " -#: ../app/tools/gimpguidetool.c:279 ../app/tools/gimpguidetool.c:348 +#: ../app/tools/gimpguidetool.c:288 ../app/tools/gimpguidetool.c:369 msgid "Add Guide: " msgstr "Lägg till hjälplinje: " #: ../app/tools/gimphandletransformoptions.c:73 #: ../app/tools/gimphandletransformoptions.c:74 msgid "Handle mode" -msgstr "" +msgstr "Handtagsläge" #: ../app/tools/gimphandletransformoptions.c:167 msgid "Add handles and transform the image" -msgstr "" +msgstr "Lägga till handtag och transformera bilden" #: ../app/tools/gimphandletransformoptions.c:172 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Transform Channel" msgid "Move transform handles" -msgstr "Transformera kanal" +msgstr "Flytta transformationshandtag" #: ../app/tools/gimphandletransformoptions.c:177 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Remove Parasite from Image" msgid "Remove transform handles" -msgstr "Ta bort parasit från bild" +msgstr "Ta bort transformationshandtag" -#: ../app/tools/gimphandletransformtool.c:164 -#, fuzzy -#| msgid "Cage Transform" +#: ../app/tools/gimphandletransformtool.c:115 msgid "Handle Transform" -msgstr "Burtransformering" +msgstr "Handtagstransformering" -#: ../app/tools/gimphandletransformtool.c:165 -#, fuzzy -#| msgid "Shear Tool: Shear the layer, selection or path" +#: ../app/tools/gimphandletransformtool.c:116 msgid "Handle Transform Tool: Deform the layer, selection or path with handles" -msgstr "Lutningsverktyg: Luta lagret, markeringen eller banan" +msgstr "" +"Handtagstransformeringsverktyg: Deformera lagret, markeringen eller banan " +"med handtag" -#: ../app/tools/gimphandletransformtool.c:167 -#, fuzzy -#| msgid "_Cage Transform" +#: ../app/tools/gimphandletransformtool.c:118 msgid "_Handle Transform" -msgstr "B_urtransformering" +msgstr "_Handtagstransformering" -#: ../app/tools/gimphandletransformtool.c:199 -#, fuzzy -#| msgid "Transformation" +#: ../app/tools/gimphandletransformtool.c:146 msgid "Handle transformation" -msgstr "Transformation" +msgstr "Handtagstransformering" -#: ../app/tools/gimphandletransformtool.c:425 -#: ../app/tools/gimpperspectivetool.c:131 -msgid "Transformation Matrix" -msgstr "Transformationsmatris" - -#: ../app/tools/gimphandletransformtool.c:678 -#, fuzzy -#| msgid "Cage transform" +#: ../app/tools/gimphandletransformtool.c:310 msgctxt "undo-type" msgid "Handle transform" -msgstr "Burtransformering" +msgstr "Handtagstransformering" #: ../app/tools/gimphealtool.c:54 msgid "Healing Tool: Heal image irregularities" @@ -17730,84 +21373,10 @@ msgstr "Klicka för att ställa in en ny läkningskälla" msgid "Histogram Scale" msgstr "Histogramskala" -#: ../app/tools/gimphuesaturationtool.c:97 -msgid "Hue-Saturation Tool: Adjust hue, saturation, and lightness" -msgstr "Nyans-mättnad-verktyg: Justera färgnyans, mättnad och ljusstyrka" - -#: ../app/tools/gimphuesaturationtool.c:98 -msgid "Hue-_Saturation..." -msgstr "Nyans-_Mättnad..." - -#: ../app/tools/gimphuesaturationtool.c:116 -msgid "Import Hue-Saturation Settings" -msgstr "Importera inställningar för nyans-mättnad" - -#: ../app/tools/gimphuesaturationtool.c:117 -msgid "Export Hue-Saturation Settings" -msgstr "Exportera inställningar för nyans-mättnad" - -#: ../app/tools/gimphuesaturationtool.c:153 -msgid "Hue-Saturation operates only on RGB color layers." -msgstr "Nyans-Mättnad fungerar endast på RGB-lager." - -#: ../app/tools/gimphuesaturationtool.c:168 -msgid "Adjust Hue / Lightness / Saturation" -msgstr "Justera nyans / ljushet / mättnad" - -#: ../app/tools/gimphuesaturationtool.c:205 -msgid "M_aster" -msgstr "_Huvud" - -#: ../app/tools/gimphuesaturationtool.c:205 -msgid "Adjust all colors" -msgstr "Justera alla färger" - -#: ../app/tools/gimphuesaturationtool.c:206 -msgid "_R" -msgstr "_R" - -#: ../app/tools/gimphuesaturationtool.c:207 -msgid "_Y" -msgstr "_Y" - -#: ../app/tools/gimphuesaturationtool.c:208 -msgid "_G" -msgstr "_G" - -#: ../app/tools/gimphuesaturationtool.c:209 -msgid "_C" -msgstr "_C" - -#: ../app/tools/gimphuesaturationtool.c:210 -msgid "_B" -msgstr "_B" - -#: ../app/tools/gimphuesaturationtool.c:211 -msgid "_M" -msgstr "_M" - -#: ../app/tools/gimphuesaturationtool.c:216 -msgid "Select Primary Color to Adjust" -msgstr "Välj primär färg att justera" - -#: ../app/tools/gimphuesaturationtool.c:297 -#, fuzzy -#| msgid "_Overlap:" -msgid "_Overlap" -msgstr "_Överlappa:" - -#: ../app/tools/gimphuesaturationtool.c:302 -msgid "Adjust Selected Color" -msgstr "Justera markerad färg" - -#: ../app/tools/gimphuesaturationtool.c:335 -msgid "R_eset Color" -msgstr "_Återställ färg" - #. adjust sliders #: ../app/tools/gimpinkoptions-gui.c:55 msgid "Adjustment" -msgstr "Justering:" +msgstr "Justering" #. sens sliders #: ../app/tools/gimpinkoptions-gui.c:76 @@ -17830,147 +21399,128 @@ msgstr "Interaktiv gräns" msgid "Display future selection segment as you drag a control node" msgstr "Visa kommande markeringssegment medan du drar en kontrollnod" -#: ../app/tools/gimpiscissorstool.c:274 +#: ../app/tools/gimpiscissorstool.c:292 msgid "Scissors" msgstr "Saxar" -#: ../app/tools/gimpiscissorstool.c:275 +#: ../app/tools/gimpiscissorstool.c:293 msgid "Scissors Select Tool: Select shapes using intelligent edge-fitting" msgstr "Saxmarkeringsverktyg: Markerar figurer med intelligent kantpassning" -#: ../app/tools/gimpiscissorstool.c:276 +#: ../app/tools/gimpiscissorstool.c:294 msgid "Intelligent _Scissors" msgstr "_Intelligent sax" -#: ../app/tools/gimpiscissorstool.c:936 -#, fuzzy -#| msgid "Click-Drag to move this point" +#: ../app/tools/gimpiscissorstool.c:905 msgid "Click to remove this point" -msgstr "Klicka och dra för att flytta den här punkten" +msgstr "Klicka för att ta bort denna punkt" -#: ../app/tools/gimpiscissorstool.c:942 ../app/tools/gimpmeasuretool.c:608 -msgid "Click-Drag to move this point" -msgstr "Klicka och dra för att flytta den här punkten" - -#: ../app/tools/gimpiscissorstool.c:944 ../app/tools/gimpiscissorstool.c:1013 +#: ../app/tools/gimpiscissorstool.c:913 ../app/tools/gimpiscissorstool.c:982 #, c-format msgid "%s: disable auto-snap" msgstr "%s: inaktivera automatisk fästning" -#: ../app/tools/gimpiscissorstool.c:945 -#, fuzzy, c-format -#| msgid "Click-Drag to move this point" +#: ../app/tools/gimpiscissorstool.c:914 +#, c-format msgid "%s: remove this point" -msgstr "Klicka och dra för att flytta den här punkten" +msgstr "%s: ta bort denna punkt" -#: ../app/tools/gimpiscissorstool.c:965 +#: ../app/tools/gimpiscissorstool.c:934 msgid "Click to close the curve" msgstr "Klicka för att sluta kurvan" -#: ../app/tools/gimpiscissorstool.c:971 +#: ../app/tools/gimpiscissorstool.c:940 msgid "Click to add a point on this segment" msgstr "Klicka för att lägga till en punkt på det här segmentet" -#: ../app/tools/gimpiscissorstool.c:984 +#: ../app/tools/gimpiscissorstool.c:953 msgid "Click or press Enter to convert to a selection" msgstr "Klicka eller tryck på Enter för att konvertera till en markering" -#: ../app/tools/gimpiscissorstool.c:994 +#: ../app/tools/gimpiscissorstool.c:963 msgid "Press Enter to convert to a selection" msgstr "Tryck på Enter för att konvertera till en markering" -#: ../app/tools/gimpiscissorstool.c:1010 +#: ../app/tools/gimpiscissorstool.c:979 msgid "Click or Click-Drag to add a point" msgstr "Klicka eller klicka och dra för att lägga till en punkt" -#: ../app/tools/gimpiscissorstool.c:1133 ../app/tools/gimpiscissorstool.c:1145 +#: ../app/tools/gimpiscissorstool.c:1117 ../app/tools/gimpiscissorstool.c:1129 msgid "Modify Scissors Curve" -msgstr "" +msgstr "Modifiera saxkurva" -#: ../app/tools/gimplevelstool.c:138 -msgid "Levels Tool: Adjust color levels" -msgstr "Nivåverktyg: Justera färgnivåer" - -#: ../app/tools/gimplevelstool.c:139 +#: ../app/tools/gimplevelstool.c:134 msgid "_Levels..." -msgstr "_Nivåer..." +msgstr "_Nivåer…" -#: ../app/tools/gimplevelstool.c:158 -msgid "Import Levels" -msgstr "Importera nivåer" +#: ../app/tools/gimplevelstool.c:271 +msgid "Pick black point for all channels" +msgstr "Välj svartpunkt för alla kanaler" -#: ../app/tools/gimplevelstool.c:159 -msgid "Export Levels" -msgstr "Exportera nivåer" +#: ../app/tools/gimplevelstool.c:273 +msgid "Pick black point for the selected channel" +msgstr "Välj svartpunkt för den markerade kanalen" + +#: ../app/tools/gimplevelstool.c:280 +msgid "Pick gray point for all channels" +msgstr "Välj gråpunkt för alla kanaler" + +#: ../app/tools/gimplevelstool.c:282 +msgid "Pick gray point for the selected channel" +msgstr "Välj gråpunkt för den markerade kanalen" + +#: ../app/tools/gimplevelstool.c:289 +msgid "Pick white point for all channels" +msgstr "Välj vitpunkt för alla kanaler" #: ../app/tools/gimplevelstool.c:291 -#, fuzzy -#| msgid "Click to add control points to all channels" -msgid "Pick black point for all channels" -msgstr "Klicka för att lägga till kontrollpunkter till alla kanaler" - -#: ../app/tools/gimplevelstool.c:293 -#, fuzzy -#| msgid "Click-Drag to move the selected pixels" -msgid "Pick black point for the selected channel" -msgstr "Klicka och dra för att flytta markerade bildpunkter" - -#: ../app/tools/gimplevelstool.c:300 -#, fuzzy -#| msgid "Click to add control points to all channels" -msgid "Pick gray point for all channels" -msgstr "Klicka för att lägga till kontrollpunkter till alla kanaler" - -#: ../app/tools/gimplevelstool.c:302 -#, fuzzy -#| msgid "Click-Drag to move the selected pixels" -msgid "Pick gray point for the selected channel" -msgstr "Klicka och dra för att flytta markerade bildpunkter" - -#: ../app/tools/gimplevelstool.c:309 -#, fuzzy -#| msgid "Click to add control points to all channels" -msgid "Pick white point for all channels" -msgstr "Klicka för att lägga till kontrollpunkter till alla kanaler" - -#: ../app/tools/gimplevelstool.c:311 -#, fuzzy -#| msgid "Click-Drag to move the selected pixels" msgid "Pick white point for the selected channel" -msgstr "Klicka och dra för att flytta markerade bildpunkter" +msgstr "Välj vitpunkt för den markerade kanalen" + +#: ../app/tools/gimplevelstool.c:395 +msgid "Adjust levels in linear light" +msgstr "Justera nivåer i linjärt ljus" + +#: ../app/tools/gimplevelstool.c:396 +msgid "Adjust levels perceptually" +msgstr "Justera nivåer perceptuellt" #. Input levels frame -#: ../app/tools/gimplevelstool.c:407 +#: ../app/tools/gimplevelstool.c:405 msgid "Input Levels" msgstr "Inmatningsnivåer" +#: ../app/tools/gimplevelstool.c:492 +msgid "Clamp _input" +msgstr "Begränsa _indata" + #. Output levels frame -#: ../app/tools/gimplevelstool.c:523 +#: ../app/tools/gimplevelstool.c:535 msgid "Output Levels" msgstr "Utmatningsnivåer" +#: ../app/tools/gimplevelstool.c:583 +msgid "Clamp outpu_t" +msgstr "Begränsa utda_ta" + #. all channels frame -#: ../app/tools/gimplevelstool.c:581 +#: ../app/tools/gimplevelstool.c:598 msgid "All Channels" msgstr "Alla kanaler" -#: ../app/tools/gimplevelstool.c:593 -#, fuzzy -#| msgid "Input Levels" +#: ../app/tools/gimplevelstool.c:610 msgid "_Auto Input Levels" -msgstr "Inmatningsnivåer" +msgstr "_Automatiska inmatningsnivåer" -#: ../app/tools/gimplevelstool.c:596 -#, fuzzy -#| msgid "Adjust levels automatically" +#: ../app/tools/gimplevelstool.c:613 msgid "Adjust levels for all channels automatically" -msgstr "Justera nivåer automatiskt" +msgstr "Justera nivåer för alla kanaler automatiskt" -#: ../app/tools/gimplevelstool.c:623 +#: ../app/tools/gimplevelstool.c:640 msgid "Edit these Settings as Curves" msgstr "Redigera dessa inställningar som kurvor" -#: ../app/tools/gimplevelstool.c:774 +#: ../app/tools/gimplevelstool.c:860 msgid "Use _old levels file format" msgstr "Använd filformat för _gamla nivåer" @@ -18008,57 +21558,31 @@ msgstr "_Zooma" msgid "Open a floating dialog to view details about measurements" msgstr "Öppna en flytande dialogruta för att se information om mått" -#: ../app/tools/gimpmeasuretool.c:127 +#: ../app/tools/gimpmeasuretool.c:121 msgid "Measure" msgstr "Mät" -#: ../app/tools/gimpmeasuretool.c:128 +#: ../app/tools/gimpmeasuretool.c:122 msgid "Measure Tool: Measure distances and angles" msgstr "Mätningsverktyg: Mät avstånd och vinklar" -#: ../app/tools/gimpmeasuretool.c:129 +#: ../app/tools/gimpmeasuretool.c:123 msgid "_Measure" msgstr "Mät_ning" -#: ../app/tools/gimpmeasuretool.c:251 +#: ../app/tools/gimpmeasuretool.c:156 +msgid "Click-Drag to create a line" +msgstr "Klicka och dra för att skapa en linje" + +#: ../app/tools/gimpmeasuretool.c:334 msgid "Add Guides" msgstr "Lägg till hjälplinjer" -#: ../app/tools/gimpmeasuretool.c:317 -msgid "Drag to create a line" -msgstr "Dra för att skapa en linje" - -#: ../app/tools/gimpmeasuretool.c:563 -msgid "Click to place vertical and horizontal guides" -msgstr "Klicka för att placera vertikala och horisontella hjälplinjer" - -#: ../app/tools/gimpmeasuretool.c:571 -msgid "Click to place a horizontal guide" -msgstr "Klicka för att placera ut en horisontell hjälplinje" - -#: ../app/tools/gimpmeasuretool.c:585 -msgid "Click to place a vertical guide" -msgstr "Klicka för att placera ut en vertikal hjälplinje" - -#: ../app/tools/gimpmeasuretool.c:598 -msgid "Click-Drag to add a new point" -msgstr "Klicka och dra för att lägga till en ny punkt" - -#: ../app/tools/gimpmeasuretool.c:627 -msgid "Click-Drag to move all points" -msgstr "Klicka och dra för att flytta alla punkter" - -#: ../app/tools/gimpmeasuretool.c:943 ../app/tools/gimpmeasuretool.c:1094 -#: ../app/tools/gimpmeasuretool.c:1150 ../app/tools/gimpmeasuretool.c:1178 -#: ../app/tools/gimppainttool.c:664 -msgid "pixels" -msgstr "bildpunkter" - -#: ../app/tools/gimpmeasuretool.c:1058 +#: ../app/tools/gimpmeasuretool.c:645 msgid "Measure Distances and Angles" msgstr "Mät avstånd och vinklar" -#: ../app/tools/gimpmeasuretool.c:1083 +#: ../app/tools/gimpmeasuretool.c:670 msgid "Distance:" msgstr "Avstånd:" @@ -18091,165 +21615,125 @@ msgstr "Flytta:" msgid "Tool Toggle (%s)" msgstr "Verktygsväxel (%s)" -#: ../app/tools/gimpmovetool.c:113 +#: ../app/tools/gimpmovetool.c:112 msgctxt "tool" msgid "Move" msgstr "Flytta" -#: ../app/tools/gimpmovetool.c:114 +#: ../app/tools/gimpmovetool.c:113 msgid "Move Tool: Move layers, selections, and other objects" msgstr "Flyttningsverktyg: Flytta lager, markeringar och andra objekt" -#: ../app/tools/gimpmovetool.c:115 +#: ../app/tools/gimpmovetool.c:114 msgid "_Move" msgstr "_Flytta" -#: ../app/tools/gimpmovetool.c:255 -#, fuzzy -#| msgid "There is no path to transform." +#: ../app/tools/gimpmovetool.c:256 msgid "There is no path to move." -msgstr "Det finns ingen bana att transformera." +msgstr "Det finns ingen bana att flytta." -#: ../app/tools/gimpmovetool.c:256 ../app/tools/gimptransformtool.c:1871 -#, fuzzy -#| msgid "The active path is locked." +#: ../app/tools/gimpmovetool.c:257 ../app/tools/gimptransformtool.c:1484 msgid "The active path's position is locked." -msgstr "Den aktiva banan är låst." +msgstr "Den aktiva banans position är låst." -#: ../app/tools/gimpmovetool.c:287 -#, fuzzy -#| msgid "Feather selection by" +#: ../app/tools/gimpmovetool.c:288 msgid "The selection is empty." -msgstr "Fjädermarkera med" +msgstr "Markeringen är tom." -#: ../app/tools/gimpmovetool.c:295 -#, fuzzy -#| msgid "There is no layer to transform." +#: ../app/tools/gimpmovetool.c:296 msgid "There is no layer to move." -msgstr "Det finns inget lager att transformera." +msgstr "Det finns inget lager att flytta." -#: ../app/tools/gimpmovetool.c:299 ../app/tools/gimpmovetool.c:325 -#, fuzzy -#| msgid "The active layer's pixels are locked." +#: ../app/tools/gimpmovetool.c:300 ../app/tools/gimpmovetool.c:326 msgid "The active layer's position is locked." -msgstr "Det aktiva lagrets pixlar är låsta." +msgstr "Det aktiva lagrets position är låst." -#: ../app/tools/gimpmovetool.c:312 -#, fuzzy -#| msgid "The active path is locked." +#: ../app/tools/gimpmovetool.c:313 msgid "The active channel's position is locked." -msgstr "Den aktiva banan är låst." +msgstr "Den aktiva kanalens position är låst." #: ../app/tools/gimpmybrushtool.c:74 -#, fuzzy -#| msgid "Paintbrush Tool: Paint smooth strokes using a brush" msgid "MyPaint Brush Tool: Use MyPaint brushes in GIMP" -msgstr "Målarpenselverktyg: Måla mjuka penseldrag med en pensel" +msgstr "MyPaint-penselverktyg: Använd MyPaint-penslar i GIMP" #: ../app/tools/gimpmybrushtool.c:75 -#, fuzzy -#| msgid "_Paintbrush" msgid "M_yPaint Brush" -msgstr "_Pensel" +msgstr "_MyPaint-pensel" #: ../app/tools/gimpnpointdeformationoptions.c:77 #: ../app/tools/gimpnpointdeformationoptions.c:78 -#, fuzzy -#| msgid "Sensitivity" msgid "Density" -msgstr "Känslighet" +msgstr "Densitet" #: ../app/tools/gimpnpointdeformationoptions.c:84 #: ../app/tools/gimpnpointdeformationoptions.c:85 msgid "Rigidity" -msgstr "" +msgstr "Stelhet" #: ../app/tools/gimpnpointdeformationoptions.c:91 #: ../app/tools/gimpnpointdeformationoptions.c:92 -#, fuzzy -#| msgid "Desaturate" msgid "Deformation mode" -msgstr "Avfärga" +msgstr "Deformeringsläge" #: ../app/tools/gimpnpointdeformationoptions.c:98 #: ../app/tools/gimpnpointdeformationoptions.c:99 -#, fuzzy -#| msgid "Use editor" msgid "Use weights" -msgstr "Använd redigerare" +msgstr "Använd vikter" #: ../app/tools/gimpnpointdeformationoptions.c:105 msgid "Control points influence" -msgstr "" +msgstr "Kontrollpunkters påverkan" #: ../app/tools/gimpnpointdeformationoptions.c:106 msgid "Amount of control points' influence" -msgstr "" +msgstr "Mängd av kontrollpunkternas påverkan" #: ../app/tools/gimpnpointdeformationoptions.c:112 #: ../app/tools/gimpnpointdeformationoptions.c:113 -#, fuzzy -#| msgid "Show _tooltips" msgid "Show lattice" -msgstr "Visa verktygs_tips" +msgstr "Visa gitter" #: ../app/tools/gimpnpointdeformationoptions.c:230 -#: ../app/tools/gimpscaletool.c:90 ../app/tools/gimptransformoptions.c:518 -#: ../app/tools/gimptransformoptions.c:529 +#: ../app/tools/gimpscaletool.c:90 ../app/tools/gimptransformoptions.c:554 +#: ../app/tools/gimptransformoptions.c:565 msgid "Scale" msgstr "Skala" #: ../app/tools/gimpnpointdeformationoptions.c:231 msgid "Rigid (Rubber)" -msgstr "" +msgstr "Stelhet (gummi)" #: ../app/tools/gimpnpointdeformationtool.c:158 -#: ../app/tools/gimpnpointdeformationtool.c:1014 -#: ../app/tools/gimpnpointdeformationtool.c:1018 -#, fuzzy -#| msgid "Pointer Information" +#: ../app/tools/gimpnpointdeformationtool.c:1000 +#: ../app/tools/gimpnpointdeformationtool.c:1004 msgid "N-Point Deformation" -msgstr "Pekarinformation" +msgstr "N-punktsdeformering" #: ../app/tools/gimpnpointdeformationtool.c:159 msgid "N-Point Deformation Tool: Rubber-like deformation of image using points" msgstr "" +"N-punktsdeformeringsverktyg: Gummibandsliknande deformering av bilden med " +"hjälp av punkter" #: ../app/tools/gimpnpointdeformationtool.c:161 -#, fuzzy -#| msgid "Pointer Information" msgid "_N-Point Deformation" -msgstr "Pekarinformation" +msgstr "_N-punktsdeformering" -#: ../app/tools/gimpoperationtool.c:133 -#, fuzzy -#| msgid "GEGL Tool: Use an arbitrary GEGL operation" +#: ../app/tools/gimpoperationtool.c:135 msgid "Operation Tool: Use an arbitrary GEGL operation" -msgstr "GEGL-verktyg: Använd en godtycklig GEGL-operation" - -#: ../app/tools/gimpoperationtool.c:343 -#, fuzzy, c-format -#| msgid "Import Threshold Settings" -msgid "Import '%s' Settings" -msgstr "Importera tröskelvärdesinställningar" - -#: ../app/tools/gimpoperationtool.c:344 -#, fuzzy, c-format -#| msgid "Export Threshold Settings" -msgid "Export '%s' Settings" -msgstr "Exportera tröskelvärdesinställningar" +msgstr "Åtgärdsverktyg: Använd en godtycklig GEGL-operation" #. don't translate "Aux" -#: ../app/tools/gimpoperationtool.c:695 +#: ../app/tools/gimpoperationtool.c:547 #, c-format msgid "Aux Input" -msgstr "" +msgstr "Aux-ingång" #. don't translate "Aux" -#: ../app/tools/gimpoperationtool.c:701 +#: ../app/tools/gimpoperationtool.c:553 #, c-format msgid "Aux%d Input" -msgstr "" +msgstr "Aux%d-ingång" #: ../app/tools/gimppaintbrushtool.c:52 msgid "Paintbrush Tool: Paint smooth strokes using a brush" @@ -18259,86 +21743,68 @@ msgstr "Målarpenselverktyg: Måla mjuka penseldrag med en pensel" msgid "_Paintbrush" msgstr "_Pensel" -#: ../app/tools/gimppaintoptions-gui.c:158 -#, fuzzy -#| msgctxt "brushes-action" -#| msgid "Edit this brush" +#: ../app/tools/gimppaintoptions-gui.c:165 msgid "Edit this brush" msgstr "Redigera denna pensel" -#: ../app/tools/gimppaintoptions-gui.c:166 +#: ../app/tools/gimppaintoptions-gui.c:173 msgid "Reset size to brush's native size" msgstr "Återställ storlek till penselns ursprungsstorlek" -#: ../app/tools/gimppaintoptions-gui.c:174 -msgid "Reset aspect ratio to brush's native" -msgstr "Återställ penselns ursprungliga aspektförhållande" +#: ../app/tools/gimppaintoptions-gui.c:181 +msgid "Reset aspect ratio to brush's native aspect ratio" +msgstr "Återställ bildförhållande till penselns ursprungliga bildförhållande" -#: ../app/tools/gimppaintoptions-gui.c:182 -msgid "Reset angle to zero" -msgstr "Återställ vinkel till noll" +#: ../app/tools/gimppaintoptions-gui.c:189 +msgid "Reset angle to brush's native angle" +msgstr "Återställ vinkel till penselns ursprungsvinkel" -#: ../app/tools/gimppaintoptions-gui.c:190 -#, fuzzy -#| msgid "Reset size to brush's native size" +#: ../app/tools/gimppaintoptions-gui.c:197 msgid "Reset spacing to brush's native spacing" -msgstr "Återställ storlek till penselns ursprungsstorlek" +msgstr "Återställ mellanrum till penselns ursprungsmellanrum" -#: ../app/tools/gimppaintoptions-gui.c:198 -#, fuzzy -#| msgctxt "tool-options-action" -#| msgid "Reset to default values" -msgid "Reset hardness to default" -msgstr "Återställ till standardvärden" +#: ../app/tools/gimppaintoptions-gui.c:205 +msgid "Reset hardness to brush's native hardness" +msgstr "Återställ hårdhet till penselns ursprungshårdhet" -#: ../app/tools/gimppaintoptions-gui.c:206 -#, fuzzy -#| msgctxt "tool-options-action" -#| msgid "Reset to default values" +#: ../app/tools/gimppaintoptions-gui.c:213 msgid "Reset force to default" -msgstr "Återställ till standardvärden" +msgstr "Återställ kraft till standardvärde" -#: ../app/tools/gimppaintoptions-gui.c:219 -#, fuzzy -#| msgctxt "dynamics-action" -#| msgid "Edit dynamics" +#: ../app/tools/gimppaintoptions-gui.c:229 msgid "Edit this dynamics" -msgstr "Redigera dynamik" +msgstr "Redigera denna dynamik" -#: ../app/tools/gimppaintoptions-gui.c:252 -msgid "Lock brush size to zoom" -msgstr "" - -#: ../app/tools/gimppaintoptions-gui.c:316 +#: ../app/tools/gimppaintoptions-gui.c:325 msgid "Fade Options" msgstr "Toningsalternativ" -#: ../app/tools/gimppaintoptions-gui.c:359 +#: ../app/tools/gimppaintoptions-gui.c:369 msgid "Color Options" msgstr "Färgalternativ" -#: ../app/tools/gimppaintoptions-gui.c:579 +#: ../app/tools/gimppaintoptions-gui.c:636 msgid "Link to brush default" -msgstr "" +msgstr "Länka till penselstandard" -#: ../app/tools/gimppainttool.c:156 +#: ../app/tools/gimppainttool.c:158 msgid "Click to paint" msgstr "Klicka för att måla" -#: ../app/tools/gimppainttool.c:157 +#: ../app/tools/gimppainttool.c:159 msgid "Click to draw the line" msgstr "Klicka för att rita linjen" -#: ../app/tools/gimppainttool.c:158 +#: ../app/tools/gimppainttool.c:160 #, c-format msgid "%s to pick a color" msgstr "%s för att välja en färg" -#: ../app/tools/gimppainttool.c:271 +#: ../app/tools/gimppainttool.c:270 msgid "Cannot paint on layer groups." msgstr "Kan inte måla på lagergrupper." -#: ../app/tools/gimppainttool.c:710 +#: ../app/tools/gimppainttool.c:600 #, c-format msgid "%s for a straight line" msgstr "%s för en rak linje" @@ -18351,7 +21817,7 @@ msgstr "Pennverktyg: Målning med hårda kanter med en pensel" msgid "Pe_ncil" msgstr "Pe_nna" -#: ../app/tools/gimpperspectiveclonetool.c:134 +#: ../app/tools/gimpperspectiveclonetool.c:143 msgid "" "Perspective Clone Tool: Clone from an image source after applying a " "perspective transformation" @@ -18359,153 +21825,146 @@ msgstr "" "Verktyg för perspektivkloning: Klona från en bildkälla efter en " "perspektivtransformering tillämpats" -#: ../app/tools/gimpperspectiveclonetool.c:136 +#: ../app/tools/gimpperspectiveclonetool.c:145 msgid "_Perspective Clone" msgstr "_Perspektivkloning" -#: ../app/tools/gimpperspectiveclonetool.c:675 +#: ../app/tools/gimpperspectiveclonetool.c:556 msgid "Ctrl-Click to set a clone source" msgstr "Ctrl-klicka för att ställa in en kloningskälla" -#: ../app/tools/gimpperspectivetool.c:84 +#: ../app/tools/gimpperspectivetool.c:86 msgid "Perspective Tool: Change perspective of the layer, selection or path" msgstr "" "Perspektivverktyg: Ändra perspektivet på lagret, markeringen eller banan" -#: ../app/tools/gimpperspectivetool.c:86 +#: ../app/tools/gimpperspectivetool.c:88 msgid "_Perspective" msgstr "_Perspektiv" -#: ../app/tools/gimpperspectivetool.c:114 +#: ../app/tools/gimpperspectivetool.c:117 msgid "Perspective transformation" msgstr "Perspektivtransformering" -#: ../app/tools/gimpperspectivetool.c:256 +#: ../app/tools/gimpperspectivetool.c:182 msgctxt "undo-type" msgid "Perspective" msgstr "Perspektiv" -#: ../app/tools/gimprectangleoptions.c:105 +#: ../app/tools/gimprectangleoptions.c:109 msgid "Automatically shrink to the nearest rectangular shape in a layer" msgstr "Krymp automatiskt till närmaste rektangulära form i ett lager" -#: ../app/tools/gimprectangleoptions.c:113 +#: ../app/tools/gimprectangleoptions.c:117 msgid "Shrink merged" msgstr "Krymp sammanfogade" -#: ../app/tools/gimprectangleoptions.c:114 +#: ../app/tools/gimprectangleoptions.c:118 msgid "Use all visible layers when shrinking the selection" msgstr "Använd alla synliga lager vid krympning av markeringen" -#: ../app/tools/gimprectangleoptions.c:123 +#: ../app/tools/gimprectangleoptions.c:127 #: ../app/tools/gimptransformoptions.c:155 msgid "Composition guides such as rule of thirds" msgstr "Kompositionsguider som regeln om tredjedelar" -#: ../app/tools/gimprectangleoptions.c:132 +#: ../app/tools/gimprectangleoptions.c:136 msgid "X coordinate of top left corner" msgstr "X-koordinat för övre vänstra hörnet" -#: ../app/tools/gimprectangleoptions.c:142 +#: ../app/tools/gimprectangleoptions.c:146 msgid "Y coordinate of top left corner" msgstr "Y-koordinat för övre vänstra hörnet" -#: ../app/tools/gimprectangleoptions.c:152 +#: ../app/tools/gimprectangleoptions.c:156 msgid "Width of selection" msgstr "Markeringens bredd" -#: ../app/tools/gimprectangleoptions.c:161 +#: ../app/tools/gimprectangleoptions.c:165 msgid "Height of selection" msgstr "Markeringens höjd" -#: ../app/tools/gimprectangleoptions.c:170 +#: ../app/tools/gimprectangleoptions.c:174 msgid "Unit of top left corner coordinate" msgstr "Enhet för övre vänstra hörnets koordinater" -#: ../app/tools/gimprectangleoptions.c:179 +#: ../app/tools/gimprectangleoptions.c:183 msgid "Unit of selection size" msgstr "Enhet för markeringens storlek" -#: ../app/tools/gimprectangleoptions.c:188 +#: ../app/tools/gimprectangleoptions.c:192 msgid "Enable lock of aspect ratio, width, height or size" -msgstr "Aktivera låsning av aspektförhållande, bredd, höjd eller storlek" +msgstr "Aktivera låsning av bildförhållande, bredd, höjd eller storlek" -#: ../app/tools/gimprectangleoptions.c:197 +#: ../app/tools/gimprectangleoptions.c:201 msgid "Choose what has to be locked" msgstr "Välj vad som måste låsas" -#: ../app/tools/gimprectangleoptions.c:206 +#: ../app/tools/gimprectangleoptions.c:210 msgid "Custom fixed width" msgstr "Anpassad fast bredd" -#: ../app/tools/gimprectangleoptions.c:215 +#: ../app/tools/gimprectangleoptions.c:219 msgid "Custom fixed height" msgstr "Anpassad fast höjd" -#: ../app/tools/gimprectangleoptions.c:309 +#: ../app/tools/gimprectangleoptions.c:313 msgid "Unit of fixed width, height or size" msgstr "Enhet för fast bredd, höjd eller storlek" -#: ../app/tools/gimprectangleoptions.c:317 +#: ../app/tools/gimprectangleoptions.c:321 msgid "Expand from center" msgstr "Expandera från centrum" -#: ../app/tools/gimprectangleoptions.c:318 +#: ../app/tools/gimprectangleoptions.c:322 msgid "Expand selection from center outwards" msgstr "Expandera markering från centrum och utåt" #. Current, as in what is currently in use. -#: ../app/tools/gimprectangleoptions.c:762 +#: ../app/tools/gimprectangleoptions.c:774 msgid "Current" msgstr "Aktuell" -#: ../app/tools/gimprectangleoptions.c:871 -#, fuzzy -#| msgctxt "source-align-mode" -#| msgid "Fixed" +#: ../app/tools/gimprectangleoptions.c:890 msgid "Fixed" msgstr "Fast" -#: ../app/tools/gimprectangleoptions.c:1012 -msgid "Position:" -msgstr "Position:" - -#: ../app/tools/gimprectangleoptions.c:1022 ../app/tools/gimptextoptions.c:563 +#: ../app/tools/gimprectangleoptions.c:1040 ../app/tools/gimptextoptions.c:545 msgid "Size:" msgstr "Storlek:" #. Auto Shrink -#: ../app/tools/gimprectangleoptions.c:1041 +#: ../app/tools/gimprectangleoptions.c:1067 msgid "Auto Shrink" msgstr "Krymp automatiskt" -#: ../app/tools/gimprectangleselectoptions.c:85 +#: ../app/tools/gimprectangleselectoptions.c:93 msgid "Rounded corners" msgstr "Rundade hörn" -#: ../app/tools/gimprectangleselectoptions.c:86 +#: ../app/tools/gimprectangleselectoptions.c:94 msgid "Round corners of selection" msgstr "Runda av markeringens hörn" -#: ../app/tools/gimprectangleselectoptions.c:93 +#: ../app/tools/gimprectangleselectoptions.c:101 msgid "Radius of rounding in pixels" -msgstr "Radie för avrundning i pixlar" +msgstr "Radie för avrundning i bildpunkter" -#: ../app/tools/gimprectangleselecttool.c:166 +#: ../app/tools/gimprectangleselecttool.c:151 msgid "Rectangle Select" msgstr "Rekt. markering" -#: ../app/tools/gimprectangleselecttool.c:167 +#: ../app/tools/gimprectangleselecttool.c:152 msgid "Rectangle Select Tool: Select a rectangular region" msgstr "Rektangelmarkeringsverktyg: Markera en rektangulär region" -#: ../app/tools/gimprectangleselecttool.c:168 +#: ../app/tools/gimprectangleselecttool.c:153 msgid "_Rectangle Select" msgstr "_Rekt. markering" -#: ../app/tools/gimprectangletool.c:1140 ../app/tools/gimprectangletool.c:2009 -msgid "Rectangle: " -msgstr "Rektangel: " +#: ../app/tools/gimprectangleselecttool.c:728 +msgid "Ellipse: " +msgstr "Ellips: " #: ../app/tools/gimpregionselectoptions.c:89 msgid "Select transparent areas" @@ -18521,56 +21980,54 @@ msgstr "Basera markering på alla synliga lager" #: ../app/tools/gimpregionselectoptions.c:119 #: ../app/tools/gimpregionselectoptions.c:281 -#, fuzzy -#| msgid "Select by:" msgid "Select by" -msgstr "Markera med:" +msgstr "Markera med" #: ../app/tools/gimpregionselectoptions.c:120 msgid "Selection criterion" msgstr "Markeringskriterium" #: ../app/tools/gimpregionselectoptions.c:127 -#, fuzzy -#| msgid "_Preview" msgid "Draw mask" -msgstr "_Förhandsvisning" +msgstr "Rita mask" #: ../app/tools/gimpregionselectoptions.c:128 -#, fuzzy -#| msgid "Click-Drag to move the selection mask" msgid "Draw the selected region's mask" -msgstr "Klicka och dra för att flytta markeringsmasken" +msgstr "Rita det valda områdets mask" -#: ../app/tools/gimpregionselecttool.c:162 +#: ../app/tools/gimpregionselecttool.c:154 msgid "Move the mouse to change threshold" msgstr "Flytta musen för att ändra tröskelvärde" -#: ../app/tools/gimprotatetool.c:94 ../app/tools/gimptransformoptions.c:520 +#: ../app/tools/gimprotatetool.c:95 ../app/tools/gimptransformoptions.c:556 msgid "Rotate" msgstr "Rotera" -#: ../app/tools/gimprotatetool.c:95 +#: ../app/tools/gimprotatetool.c:96 msgid "Rotate Tool: Rotate the layer, selection or path" msgstr "Roteringsverktyg: Rotera lagret, markeringen eller banan" -#: ../app/tools/gimprotatetool.c:96 +#: ../app/tools/gimprotatetool.c:97 msgid "_Rotate" msgstr "_Rotera" +#: ../app/tools/gimprotatetool.c:118 +msgid "R_otate" +msgstr "R_otera" + #: ../app/tools/gimprotatetool.c:193 msgid "_Angle:" msgstr "_Vinkel:" #: ../app/tools/gimprotatetool.c:211 msgid "Center _X:" -msgstr "Centrera _X:" +msgstr "_X-center:" #: ../app/tools/gimprotatetool.c:220 msgid "Center _Y:" -msgstr "Centrera _Y:" +msgstr "_Y-center:" -#: ../app/tools/gimprotatetool.c:378 +#: ../app/tools/gimprotatetool.c:348 #, c-format msgctxt "undo-type" msgid "Rotate by %-3.3g° around (%g, %g)" @@ -18578,70 +22035,62 @@ msgstr "Rotera med %-3.3g° runt (%g, %g)" #: ../app/tools/gimpsamplepointtool.c:240 msgid "Remove Sample Point" -msgstr "Ta bort sampelpunkt" +msgstr "Ta bort samplingspunkt" #: ../app/tools/gimpsamplepointtool.c:241 msgid "Cancel Sample Point" -msgstr "Ta bort sampelpunkt" +msgstr "Avbryt samplingspunkt" -#: ../app/tools/gimpsamplepointtool.c:248 -#: ../app/tools/gimpsamplepointtool.c:317 +#: ../app/tools/gimpsamplepointtool.c:247 +#: ../app/tools/gimpsamplepointtool.c:333 msgid "Move Sample Point: " -msgstr "Flytta sampelpunkt: " +msgstr "Flytta samplingspunkt: " -#: ../app/tools/gimpsamplepointtool.c:249 -#: ../app/tools/gimpsamplepointtool.c:318 +#: ../app/tools/gimpsamplepointtool.c:259 +#: ../app/tools/gimpsamplepointtool.c:345 msgid "Add Sample Point: " -msgstr "Lägg till sampelpunkt: " +msgstr "Lägg till samplingspunkt: " #: ../app/tools/gimpscaletool.c:91 msgid "Scale Tool: Scale the layer, selection or path" msgstr "Skalningsverktyg: Skala lagret, markeringen eller banan" -#: ../app/tools/gimpscaletool.c:92 -msgid "_Scale" -msgstr "_Skala" - -#: ../app/tools/gimpscaletool.c:338 +#: ../app/tools/gimpscaletool.c:257 #, c-format msgctxt "undo-type" msgid "Scale to %d x %d" msgstr "Skala till %d x %d" #: ../app/tools/gimpseamlesscloneoptions.c:72 -#, fuzzy -#| msgid "Re-_center Segment's Midpoint" msgid "Refinement scale" -msgstr "_Centrera segmentets mittpunkt" +msgstr "Förfiningsskala" #: ../app/tools/gimpseamlesscloneoptions.c:73 msgid "" "Maximal scale of refinement points to be used for the interpolation mesh" msgstr "" +"Maximal skalning av förfiningspunkter att användas för interpoleringsnätet" #: ../app/tools/gimpseamlessclonetool.c:190 -#: ../app/tools/gimpseamlessclonetool.c:763 +#: ../app/tools/gimpseamlessclonetool.c:751 msgid "Seamless Clone" -msgstr "" +msgstr "Sömlös klon" #: ../app/tools/gimpseamlessclonetool.c:191 msgid "Seamless Clone: Seamlessly paste one image into another" -msgstr "" +msgstr "Sömlös klon: Klistra sömlöst in en bild i en annan" #: ../app/tools/gimpseamlessclonetool.c:192 msgid "_Seamless Clone" -msgstr "" +msgstr "_Sömlös klon" -#: ../app/tools/gimpseamlessclonetool.c:801 -#, fuzzy -#| msgctxt "edit-action" -#| msgid "Fill the selection using the foreground color" +#: ../app/tools/gimpseamlessclonetool.c:789 msgid "Cloning the foreground object" -msgstr "Fyll markeringen med förgrundsfärgen" +msgstr "Klonar förgrundsobjektet" #: ../app/tools/gimpselectionoptions.c:87 msgid "Feather edges" -msgstr "Fjädra kanter" +msgstr "Fjädringskanter" #: ../app/tools/gimpselectionoptions.c:88 msgid "Enable feathering of selection edges" @@ -18651,7 +22100,7 @@ msgstr "Aktivera ludd längs markeringens kanter" msgid "Radius of feathering" msgstr "Radie för ludd" -#: ../app/tools/gimpselectionoptions.c:222 ../app/widgets/gimpbrushselect.c:190 +#: ../app/tools/gimpselectionoptions.c:222 ../app/widgets/gimpbrushselect.c:188 msgid "Mode:" msgstr "Läge:" @@ -18691,140 +22140,126 @@ msgstr "Klicka och dra för att flytta en kopia av de markerade bildpunkterna" msgid "Click to anchor the floating selection" msgstr "Klicka för att förankra den flytande markeringen" -#: ../app/tools/gimpsheartool.c:87 ../app/tools/gimptransformoptions.c:522 -#: ../app/tools/gimptransformoptions.c:531 +#: ../app/tools/gimpsheartool.c:88 ../app/tools/gimptransformoptions.c:558 +#: ../app/tools/gimptransformoptions.c:567 msgid "Shear" -msgstr "Luta" - -#: ../app/tools/gimpsheartool.c:88 -msgid "Shear Tool: Shear the layer, selection or path" -msgstr "Lutningsverktyg: Luta lagret, markeringen eller banan" +msgstr "Skeva" #: ../app/tools/gimpsheartool.c:89 +msgid "Shear Tool: Shear the layer, selection or path" +msgstr "Skevningsverktyg: Skeva lagret, markeringen eller banan" + +#: ../app/tools/gimpsheartool.c:90 msgid "S_hear" -msgstr "_Luta" +msgstr "_Skeva" -#: ../app/tools/gimpsheartool.c:135 -#, fuzzy -#| msgid "Shear magnitude _X:" +#: ../app/tools/gimpsheartool.c:108 +msgid "_Shear" +msgstr "_Skeva" + +#: ../app/tools/gimpsheartool.c:136 msgid "Shear magnitude _X" -msgstr "_X-lutningsmagnitud:" +msgstr "_X-skevningsmagnitud" -#: ../app/tools/gimpsheartool.c:146 -#, fuzzy -#| msgid "Shear magnitude _Y:" +#: ../app/tools/gimpsheartool.c:147 msgid "Shear magnitude _Y" -msgstr "_Y-lutningsmagnitud:" +msgstr "_Y-skevningsmagnitud" -#: ../app/tools/gimpsheartool.c:258 +#: ../app/tools/gimpsheartool.c:251 #, c-format msgctxt "undo-type" msgid "Shear horizontally by %-3.3g" -msgstr "Luta horisontellt med %-3.3g" +msgstr "Skeva horisontellt med %-3.3g" -#: ../app/tools/gimpsheartool.c:262 +#: ../app/tools/gimpsheartool.c:255 #, c-format msgctxt "undo-type" msgid "Shear vertically by %-3.3g" -msgstr "Luta vertikalt med %-3.3g" +msgstr "Skeva vertikalt med %-3.3g" #. e.g. user entered numbers but no notification callback -#: ../app/tools/gimpsheartool.c:267 +#: ../app/tools/gimpsheartool.c:260 #, c-format msgctxt "undo-type" msgid "Shear horizontally by %-3.3g, vertically by %-3.3g" -msgstr "Luta horisontellt med %-3.3g, vertikalt med %-3.3g" +msgstr "Skeva horisontellt med %-3.3g, vertikalt med %-3.3g" -#: ../app/tools/gimpsmudgetool.c:55 +#: ../app/tools/gimpsmudgetool.c:56 msgid "Smudge Tool: Smudge selectively using a brush" msgstr "Smetningsverktyg: Smeta selektivt med en pensel" -#: ../app/tools/gimpsmudgetool.c:56 +#: ../app/tools/gimpsmudgetool.c:57 msgid "_Smudge" msgstr "_Smeta" -#: ../app/tools/gimpsmudgetool.c:75 +#: ../app/tools/gimpsmudgetool.c:79 msgid "Click to smudge" msgstr "Klicka för att smeta" -#: ../app/tools/gimpsmudgetool.c:76 +#: ../app/tools/gimpsmudgetool.c:80 msgid "Click to smudge the line" msgstr "Klicka för att smeta ut linjen" -#: ../app/tools/gimptextoptions.c:138 +#: ../app/tools/gimptextoptions.c:122 msgid "Font size unit" msgstr "Enhet för teckensnittsstorlek" -#: ../app/tools/gimptextoptions.c:143 ../app/tools/gimptextoptions.c:144 +#: ../app/tools/gimptextoptions.c:127 ../app/tools/gimptextoptions.c:128 msgid "Font size" msgstr "Typsnittsstorlek" -#: ../app/tools/gimptextoptions.c:157 -#, fuzzy -#| msgid "Hinting:" +#: ../app/tools/gimptextoptions.c:141 msgid "Hinting" -msgstr "Hintning:" +msgstr "Typsnittsutjämning" -#: ../app/tools/gimptextoptions.c:158 +#: ../app/tools/gimptextoptions.c:142 msgid "" "Hinting alters the font outline to produce a crisp bitmap at small sizes" msgstr "" -"Hintning ändrar typsnittets kontur för att ge en tydlig bitmap för små " -"storlekar" +"Typsnittsutjämning ändrar typsnittets kontur för att ge en tydlig bild vid " +"små storlekar" -#: ../app/tools/gimptextoptions.c:168 +#: ../app/tools/gimptextoptions.c:152 msgid "The text language may have an effect on the way the text is rendered." msgstr "Textspråket kan ha effekt på hur texten återges." -#: ../app/tools/gimptextoptions.c:182 -#, fuzzy -#| msgid "Justify:" +#: ../app/tools/gimptextoptions.c:166 msgid "Justify" -msgstr "Justera:" +msgstr "Justera" -#: ../app/tools/gimptextoptions.c:183 +#: ../app/tools/gimptextoptions.c:167 msgid "Text alignment" msgstr "Textjustering" -#: ../app/tools/gimptextoptions.c:190 -#, fuzzy -#| msgid "Interpolation:" +#: ../app/tools/gimptextoptions.c:174 msgid "Indentation" -msgstr "Interpolation:" +msgstr "Indentering" -#: ../app/tools/gimptextoptions.c:191 +#: ../app/tools/gimptextoptions.c:175 msgid "Indentation of the first line" msgstr "Indragning av första raden" -#: ../app/tools/gimptextoptions.c:198 -#, fuzzy -#| msgctxt "guides-type" -#| msgid "Line spacing" +#: ../app/tools/gimptextoptions.c:182 msgid "Line spacing" msgstr "Radavstånd" -#: ../app/tools/gimptextoptions.c:199 +#: ../app/tools/gimptextoptions.c:183 msgid "Adjust line spacing" msgstr "Justera radavstånd" -#: ../app/tools/gimptextoptions.c:206 -#, fuzzy -#| msgctxt "guides-type" -#| msgid "Line spacing" +#: ../app/tools/gimptextoptions.c:190 msgid "Letter spacing" -msgstr "Radavstånd" +msgstr "Bokstavsavstånd" -#: ../app/tools/gimptextoptions.c:207 +#: ../app/tools/gimptextoptions.c:191 msgid "Adjust letter spacing" msgstr "Justera teckenmellanrum" -#: ../app/tools/gimptextoptions.c:214 -#, fuzzy -#| msgid "Box:" +#: ../app/tools/gimptextoptions.c:198 msgid "Box" -msgstr "Ruta:" +msgstr "Ruta" -#: ../app/tools/gimptextoptions.c:215 +#: ../app/tools/gimptextoptions.c:199 msgid "" "Whether text flows into rectangular shape or moves into a new line when you " "press Enter" @@ -18832,63 +22267,67 @@ msgstr "" "Huruvida text flödar i en rektangulär form eller byter rad då du trycker på " "Enter" -#: ../app/tools/gimptextoptions.c:223 +#: ../app/tools/gimptextoptions.c:207 msgid "Use editor" msgstr "Använd redigerare" -#: ../app/tools/gimptextoptions.c:224 +#: ../app/tools/gimptextoptions.c:208 msgid "Use an external editor window for text entry" msgstr "Använd ett externt redigeringsfönster för textinmatning" -#: ../app/tools/gimptextoptions.c:592 +#: ../app/tools/gimptextoptions.c:574 msgid "Hinting:" -msgstr "Hintning:" +msgstr "Typsnittsutjämning:" -#: ../app/tools/gimptextoptions.c:596 +#: ../app/tools/gimptextoptions.c:578 msgid "Text Color" msgstr "Textfärg" -#: ../app/tools/gimptextoptions.c:601 -msgid "Color:" -msgstr "Färg:" - -#: ../app/tools/gimptextoptions.c:607 +#: ../app/tools/gimptextoptions.c:589 msgid "Justify:" msgstr "Justera:" -#: ../app/tools/gimptextoptions.c:630 +#: ../app/tools/gimptextoptions.c:615 msgid "Box:" msgstr "Ruta:" -#: ../app/tools/gimptextoptions.c:647 +#: ../app/tools/gimptextoptions.c:632 msgid "Language:" msgstr "Språk:" -#: ../app/tools/gimptexttool.c:191 +#: ../app/tools/gimptexttool.c:203 msgid "Text" msgstr "Text" -#: ../app/tools/gimptexttool.c:192 +#: ../app/tools/gimptexttool.c:204 msgid "Text Tool: Create or edit text layers" msgstr "Textverktyg: Skapa eller redigera textlager" -#: ../app/tools/gimptexttool.c:193 +#: ../app/tools/gimptexttool.c:205 msgid "Te_xt" msgstr "Te_xt" -#: ../app/tools/gimptexttool.c:1014 +#: ../app/tools/gimptexttool.c:953 +msgid "Text box: " +msgstr "Textruta: " + +#: ../app/tools/gimptexttool.c:1084 msgid "Reshape Text Layer" msgstr "Omforma textlager" -#: ../app/tools/gimptexttool.c:1516 ../app/tools/gimptexttool.c:1519 +#: ../app/tools/gimptexttool.c:1583 ../app/tools/gimptexttool.c:1586 msgid "Confirm Text Editing" msgstr "Bekräfta textredigering" -#: ../app/tools/gimptexttool.c:1523 +#: ../app/tools/gimptexttool.c:1590 msgid "Create _New Layer" msgstr "Skapa _nytt lager" -#: ../app/tools/gimptexttool.c:1547 +#: ../app/tools/gimptexttool.c:1592 +msgid "_Edit" +msgstr "R_edigera" + +#: ../app/tools/gimptexttool.c:1614 msgid "" "The layer you selected is a text layer but it has been modified using other " "tools. Editing the layer with the text tool will discard these " @@ -18902,40 +22341,27 @@ msgstr "" "\n" "Du kan redigera lagret eller skapa ett nytt textlager från dess textattribut." -#: ../app/tools/gimptexttool-editor.c:1293 +#: ../app/tools/gimptexttool-editor.c:1292 msgid "GIMP Text Editor" msgstr "GIMP-textredigerare" -#: ../app/tools/gimpthresholdtool.c:91 -msgid "Threshold Tool: Reduce image to two colors using a threshold" -msgstr "" -"Tröskelvärdesverktyg: Reducera bilden till två färger med ett tröskelvärde" - -#: ../app/tools/gimpthresholdtool.c:92 +#: ../app/tools/gimpthresholdtool.c:89 msgid "_Threshold..." -msgstr "_Tröskelvärde..." +msgstr "_Tröskelvärde…" -#: ../app/tools/gimpthresholdtool.c:111 -msgid "Import Threshold Settings" -msgstr "Importera tröskelvärdesinställningar" - -#: ../app/tools/gimpthresholdtool.c:112 -msgid "Export Threshold Settings" -msgstr "Exportera tröskelvärdesinställningar" - -#: ../app/tools/gimpthresholdtool.c:177 +#: ../app/tools/gimpthresholdtool.c:156 msgid "Apply Threshold" msgstr "Tillämpa tröskelvärde" -#: ../app/tools/gimpthresholdtool.c:243 +#: ../app/tools/gimpthresholdtool.c:257 msgid "_Auto" msgstr "_Auto" -#: ../app/tools/gimpthresholdtool.c:245 +#: ../app/tools/gimpthresholdtool.c:259 msgid "Automatically adjust to optimal binarization threshold" msgstr "Justera automatiskt till optimalt binäriserat tröskelvärde" -#: ../app/tools/gimptool.c:1035 +#: ../app/tools/gimptool.c:1193 msgid "Can't work on an empty image, add a layer first" msgstr "Kan inte arbeta på en tom bild, lägg till ett lager först" @@ -18943,17 +22369,10 @@ msgstr "Kan inte arbeta på en tom bild, lägg till ett lager först" msgid "Direction of transformation" msgstr "Riktning för transformation" -#: ../app/tools/gimptransformoptions.c:125 +#: ../app/tools/gimptransformoptions.c:125 ../app/tools/gimpwarpoptions.c:120 msgid "Interpolation method" msgstr "Interpolationsmetod" -#: ../app/tools/gimptransformoptions.c:132 -#: ../app/tools/gimptransformoptions.c:448 -#, fuzzy -#| msgid "Clipping:" -msgid "Clipping" -msgstr "Klippning:" - #: ../app/tools/gimptransformoptions.c:133 msgid "How to clip" msgstr "Hur att klippa" @@ -18975,7 +22394,7 @@ msgid "Opacity of the preview image" msgstr "Opacitet på förhandsvisningsbilden" #: ../app/tools/gimptransformoptions.c:154 -#: ../app/tools/gimptransformoptions.c:469 +#: ../app/tools/gimptransformoptions.c:476 msgid "Guides" msgstr "Hjälplinjer" @@ -18983,200 +22402,177 @@ msgstr "Hjälplinjer" msgid "Size of a grid cell for variable number of composition guides" msgstr "Storlek på en rutnätscell för varierande antal sammansättningslinjer" -#: ../app/tools/gimptransformoptions.c:490 -#, fuzzy, c-format -#| msgid "15 degrees (%s)" +#: ../app/tools/gimptransformoptions.c:499 +#, c-format msgid "15 degrees (%s)" msgstr "15° (%s)" -#: ../app/tools/gimptransformoptions.c:491 +#: ../app/tools/gimptransformoptions.c:506 msgid "Limit rotation steps to 15 degrees" msgstr "Begränsa rotationssteg till 15 grader" -#: ../app/tools/gimptransformoptions.c:496 -#, fuzzy, c-format -#| msgid "Keep aspect (%s)" -msgid "Keep aspect (%s)" -msgstr "Behåll aspekt (%s)" - -#: ../app/tools/gimptransformoptions.c:497 -msgid "Keep the original aspect ratio" -msgstr "Behåll ursprungligt aspektförhållande" - -#: ../app/tools/gimptransformoptions.c:515 -#, fuzzy, c-format -#| msgid "Anti erase (%s)" -msgid "Constrain (%s)" -msgstr "Antisudda (%s)" - #: ../app/tools/gimptransformoptions.c:516 -#, fuzzy -#| msgctxt "tool" -#| msgid "Move" -msgid "Move" -msgstr "Flytta" - -#: ../app/tools/gimptransformoptions.c:517 #, c-format -msgid "Constrain movement to 45 degree angles from center (%s)" -msgstr "" - -#: ../app/tools/gimptransformoptions.c:519 -#, c-format -msgid "Maintain aspect ratio when scaling (%s)" -msgstr "" - -#: ../app/tools/gimptransformoptions.c:521 -#, c-format -msgid "Constrain rotation to 15 degree increments (%s)" -msgstr "" +msgid "Keep aspect (%s)" +msgstr "Behåll bildförhållande (%s)" #: ../app/tools/gimptransformoptions.c:523 -#, c-format -msgid "Shear along edge direction only (%s)" -msgstr "" - -#: ../app/tools/gimptransformoptions.c:525 -#, c-format -msgid "Constrain perspective handles to move along edges and diagonal (%s)" -msgstr "" +msgid "Keep the original aspect ratio" +msgstr "Behåll ursprungligt bildförhållande" #: ../app/tools/gimptransformoptions.c:528 #, c-format -msgid "From pivot (%s)" -msgstr "" +msgid "Around center (%s)" +msgstr "Runt centrum (%s)" -#: ../app/tools/gimptransformoptions.c:530 +#: ../app/tools/gimptransformoptions.c:535 +msgid "Scale around the center point" +msgstr "Skala runt centrumpunkten" + +#: ../app/tools/gimptransformoptions.c:551 +#, c-format +msgid "Constrain (%s)" +msgstr "Begränsa (%s)" + +#: ../app/tools/gimptransformoptions.c:552 +msgid "Move" +msgstr "Flytta" + +#: ../app/tools/gimptransformoptions.c:553 +#, c-format +msgid "Constrain movement to 45 degree angles from center (%s)" +msgstr "Begränsa förflyttning till 45-graders vinklar från centrum (%s)" + +#: ../app/tools/gimptransformoptions.c:555 +#, c-format +msgid "Maintain aspect ratio when scaling (%s)" +msgstr "Bibehåll bildförhållande vid skalning (%s)" + +#: ../app/tools/gimptransformoptions.c:557 +#, c-format +msgid "Constrain rotation to 15 degree increments (%s)" +msgstr "Begränsa rotation till 15-graders inkrement (%s)" + +#: ../app/tools/gimptransformoptions.c:559 +#, c-format +msgid "Shear along edge direction only (%s)" +msgstr "Skeva endast längs sidriktning (%s)" + +#: ../app/tools/gimptransformoptions.c:561 +#, c-format +msgid "Constrain perspective handles to move along edges and diagonal (%s)" +msgstr "" +"Begränsa perspektivhandtag till att flytta längs sidor och diagonal (%s)" + +#: ../app/tools/gimptransformoptions.c:564 +#, c-format +msgid "From pivot (%s)" +msgstr "Från pivot (%s)" + +#: ../app/tools/gimptransformoptions.c:566 #, c-format msgid "Scale from pivot point (%s)" -msgstr "" +msgstr "Skala från pivotpunkt (%s)" -#: ../app/tools/gimptransformoptions.c:532 +#: ../app/tools/gimptransformoptions.c:568 #, c-format msgid "Shear opposite edge by same amount (%s)" -msgstr "" +msgstr "Skeva motstående sida lika mycket (%s)" -#: ../app/tools/gimptransformoptions.c:534 +#: ../app/tools/gimptransformoptions.c:570 #, c-format msgid "Maintain position of pivot while changing perspective (%s)" -msgstr "" +msgstr "Behåll position för pivot medan perspektiv ändras (%s)" -#: ../app/tools/gimptransformoptions.c:537 +#: ../app/tools/gimptransformoptions.c:573 msgid "Pivot" -msgstr "" +msgstr "Pivot" -#: ../app/tools/gimptransformoptions.c:538 -#, fuzzy, c-format -#| msgid "Type (%s)" +#: ../app/tools/gimptransformoptions.c:574 +#, c-format msgid "Snap (%s)" -msgstr "Typ (%s)" +msgstr "Fäst (%s)" -#: ../app/tools/gimptransformoptions.c:539 +#: ../app/tools/gimptransformoptions.c:575 #, c-format msgid "Snap pivot to corners and center (%s)" -msgstr "" +msgstr "Fäst pivot mot hörn och centrum (%s)" -#: ../app/tools/gimptransformoptions.c:540 -#, fuzzy -#| msgid "Lock:" +#: ../app/tools/gimptransformoptions.c:576 msgid "Lock" -msgstr "Lås:" +msgstr "Lås" -#: ../app/tools/gimptransformoptions.c:541 -#, fuzzy -#| msgid "Lock alpha channel" +#: ../app/tools/gimptransformoptions.c:577 msgid "Lock pivot position to canvas" -msgstr "Lås alfakanal" +msgstr "Lås pivotposition till rityta" -#: ../app/tools/gimptransformtool.c:241 +#: ../app/tools/gimptransformtool.c:195 +msgid "_Transform" +msgstr "_Transformera" + +#: ../app/tools/gimptransformtool.c:219 msgid "Transforming" msgstr "Transformerar" -#: ../app/tools/gimptransformtool.c:292 -#, fuzzy, c-format -#| msgid "The given file extension does not match the chosen file type." +#: ../app/tools/gimptransformtool.c:259 +#, c-format msgid "The selection does not intersect with the layer." -msgstr "Angiven filändelse matchar inte den valda filtypen." +msgstr "Markeringen skär inte lagret." -#: ../app/tools/gimptransformtool.c:796 ../app/tools/gimptransformtool.c:809 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Transform Items" +#: ../app/tools/gimptransformtool.c:514 ../app/tools/gimptransformtool.c:526 msgid "Transform Step" -msgstr "Transformera objekt" +msgstr "Transformera steg" -#: ../app/tools/gimptransformtool.c:1839 +#: ../app/tools/gimptransformtool.c:996 +msgid "The current transform is invalid" +msgstr "Den aktuella transformen är ogiltig" + +#: ../app/tools/gimptransformtool.c:1444 msgid "There is no layer to transform." msgstr "Det finns inget lager att transformera." -#: ../app/tools/gimptransformtool.c:1844 -#, fuzzy -#| msgid "The active layer's pixels are locked." +#: ../app/tools/gimptransformtool.c:1451 msgid "The active layer's position and size are locked." -msgstr "Det aktiva lagrets pixlar är låsta." +msgstr "Det aktiva lagrets position och storlek är låst." -#: ../app/tools/gimptransformtool.c:1856 -#, fuzzy -#| msgid "There is no selection to stroke." +#: ../app/tools/gimptransformtool.c:1464 msgid "There is no selection to transform." -msgstr "Det finns ingen markering att stryka." +msgstr "Det finns ingen markering att transformera." -#: ../app/tools/gimptransformtool.c:1866 +#: ../app/tools/gimptransformtool.c:1477 msgid "There is no path to transform." msgstr "Det finns ingen bana att transformera." -#: ../app/tools/gimptransformtool.c:1869 +#: ../app/tools/gimptransformtool.c:1482 msgid "The active path's strokes are locked." -msgstr "Den aktiva banans streck är låsta" +msgstr "Den aktiva banans streck är låsta." -#: ../app/tools/gimpunifiedtransformtool.c:104 -#, fuzzy -#| msgid "Cage Transform" +#: ../app/tools/gimptransformtool.c:1486 +msgid "The active path has no strokes." +msgstr "Den aktiva banan har inga streck." + +#: ../app/tools/gimpunifiedtransformtool.c:87 msgid "Unified Transform" -msgstr "Burtransformering" +msgstr "Enhetlig transform" -#: ../app/tools/gimpunifiedtransformtool.c:105 -#, fuzzy -#| msgid "Shear Tool: Shear the layer, selection or path" +#: ../app/tools/gimpunifiedtransformtool.c:88 msgid "Unified Transform Tool: Transform the layer, selection or path" -msgstr "Lutningsverktyg: Luta lagret, markeringen eller banan" +msgstr "" +"Enhetligt transformeringsverktyg: Transformera lagret, markeringen eller " +"banan" -#: ../app/tools/gimpunifiedtransformtool.c:107 -#, fuzzy -#| msgid "_Cage Transform" +#: ../app/tools/gimpunifiedtransformtool.c:90 msgid "_Unified Transform" -msgstr "B_urtransformering" +msgstr "_Enhetlig transform" -#: ../app/tools/gimpunifiedtransformtool.c:134 -#, fuzzy -#| msgid "Cage transform" +#: ../app/tools/gimpunifiedtransformtool.c:115 msgid "Unified transform" -msgstr "Burtransformering" +msgstr "Enhetlig transform" -#: ../app/tools/gimpunifiedtransformtool.c:768 -#, fuzzy -#| msgid "Transformation Matrix" -msgid "Transform Matrix" -msgstr "Transformationsmatris" - -#: ../app/tools/gimpunifiedtransformtool.c:1330 -#, fuzzy -#| msgid "Cage Transform" +#: ../app/tools/gimpunifiedtransformtool.c:190 msgctxt "undo-type" msgid "Unified Transform" -msgstr "Burtransformering" - -#: ../app/tools/gimpvectoroptions.c:71 -msgid "Edit Mode" -msgstr "Redigeringsläge" - -#: ../app/tools/gimpvectoroptions.c:79 -msgid "Polygonal" -msgstr "Polygon" - -#: ../app/tools/gimpvectoroptions.c:80 -msgid "Restrict editing to polygons" -msgstr "Begränsa redigering till polygoner" +msgstr "Enhetlig transform" #: ../app/tools/gimpvectoroptions.c:181 #, c-format @@ -19196,518 +22592,337 @@ msgstr "" msgid "Selection from Path" msgstr "Markering från bana" -#: ../app/tools/gimpvectortool.c:161 +#: ../app/tools/gimpvectortool.c:164 msgid "Paths Tool: Create and edit paths" msgstr "Banverktyg: Skapa och redigera banor" -#: ../app/tools/gimpvectortool.c:162 +#: ../app/tools/gimpvectortool.c:165 msgid "Pat_hs" msgstr "_Banor" -#: ../app/tools/gimpvectortool.c:252 -msgid "The active path is locked." -msgstr "Den aktiva banan är låst." +#: ../app/tools/gimpvectortool.c:733 +msgid "There is no active layer or channel to fill" +msgstr "Det finns inget aktivt lager eller kanal att fylla" -#: ../app/tools/gimpvectortool.c:342 -msgid "Add Stroke" -msgstr "Lägg till penseldrag" - -#: ../app/tools/gimpvectortool.c:367 -msgid "Add Anchor" -msgstr "Lägg till ankare" - -#: ../app/tools/gimpvectortool.c:393 -msgid "Insert Anchor" -msgstr "Lägg in ankare" - -#: ../app/tools/gimpvectortool.c:424 -msgid "Drag Handle" -msgstr "Handtag" - -#: ../app/tools/gimpvectortool.c:455 -msgid "Drag Anchor" -msgstr "Dra ankare" - -#: ../app/tools/gimpvectortool.c:473 -msgid "Drag Anchors" -msgstr "Dra ankare" - -#: ../app/tools/gimpvectortool.c:496 -msgid "Drag Curve" -msgstr "Dra kurva" - -#: ../app/tools/gimpvectortool.c:525 -msgid "Connect Strokes" -msgstr "Koppla ihop penseldrag" - -#: ../app/tools/gimpvectortool.c:557 -msgid "Drag Path" -msgstr "Dra bana" - -#: ../app/tools/gimpvectortool.c:568 -msgid "Convert Edge" -msgstr "Konvertera kant" - -#: ../app/tools/gimpvectortool.c:599 -msgid "Delete Anchor" -msgstr "Ta bort ankare" - -#: ../app/tools/gimpvectortool.c:622 -msgid "Delete Segment" -msgstr "Ta bort segment" - -#: ../app/tools/gimpvectortool.c:844 -msgid "Move Anchors" -msgstr "Flytta ankare" - -#: ../app/tools/gimpvectortool.c:1209 -msgid "Click to pick path to edit" -msgstr "Klicka för att välja bana att redigera" - -#: ../app/tools/gimpvectortool.c:1213 -msgid "Click to create a new path" -msgstr "Klicka för att skapa en ny bana" - -#: ../app/tools/gimpvectortool.c:1217 -msgid "Click to create a new component of the path" -msgstr "Klicka för att skapa ny komponent till banan" - -#: ../app/tools/gimpvectortool.c:1221 -msgid "Click or Click-Drag to create a new anchor" -msgstr "Klicka eller klicka och dra för att skapa ett nytt ankare" - -#: ../app/tools/gimpvectortool.c:1231 ../app/tools/gimpvectortool.c:1238 -msgid "Click-Drag to move the anchor around" -msgstr "Klicka och dra för att flytta runt ankaret" - -#: ../app/tools/gimpvectortool.c:1242 ../app/tools/gimpvectortool.c:1265 -msgid "Click-Drag to move the anchors around" -msgstr "Klicka och dra för att flytta runt ankarna" - -#: ../app/tools/gimpvectortool.c:1248 -msgid "Click-Drag to move the handle around" -msgstr "Klicka och dra för att flytta runt handtaget" - -#: ../app/tools/gimpvectortool.c:1255 -msgid "Click-Drag to move the handles around symmetrically" -msgstr "Klicka och dra för att flytta handtagen symmetriskt" - -#: ../app/tools/gimpvectortool.c:1270 -msgid "Click-Drag to change the shape of the curve" -msgstr "Klicka och dra för att ändra kurvans form" - -#: ../app/tools/gimpvectortool.c:1273 -#, c-format -msgid "%s: symmetrical" -msgstr "%s: symmetrisk" - -#: ../app/tools/gimpvectortool.c:1278 -msgid "Click-Drag to move the component around" -msgstr "Klicka och dra för att flytta runt komponenten" - -#: ../app/tools/gimpvectortool.c:1286 -msgid "Click-Drag to move the path around" -msgstr "Klicka och dra för att flytta runt banan" - -#: ../app/tools/gimpvectortool.c:1290 -msgid "Click-Drag to insert an anchor on the path" -msgstr "Klicka och dra för att infoga ett ankare i banan" - -#: ../app/tools/gimpvectortool.c:1298 -msgid "Click to delete this anchor" -msgstr "Klicka för att ta bort det här ankaret" - -#: ../app/tools/gimpvectortool.c:1302 -msgid "Click to connect this anchor with the selected endpoint" -msgstr "Klicka för att koppla ihop ankaret med den valda ändpunkten" - -#: ../app/tools/gimpvectortool.c:1307 -msgid "Click to open up the path" -msgstr "Klicka för att öppna upp banan" - -#: ../app/tools/gimpvectortool.c:1311 -msgid "Click to make this node angular" -msgstr "Klicka för att göra noden vinkelformad" - -#: ../app/tools/gimpvectortool.c:1812 -msgid "Delete Anchors" -msgstr "Ta bort ankare" - -#: ../app/tools/gimpvectortool.c:1971 +#: ../app/tools/gimpvectortool.c:805 msgid "There is no active layer or channel to stroke to" msgstr "Det finns inget aktivt lager eller kanal att stryka till" -#: ../app/tools/gimpwarpoptions.c:76 ../app/tools/gimpwarpoptions.c:77 -#, fuzzy -#| msgid "Edge Behavior" +#: ../app/tools/gimpwarpoptions.c:83 ../app/tools/gimpwarpoptions.c:84 msgid "Behavior" -msgstr "Kantbeteende" - -#: ../app/tools/gimpwarpoptions.c:84 -msgid "Strength" -msgstr "" - -#: ../app/tools/gimpwarpoptions.c:85 -msgid "Effect Strength" -msgstr "" +msgstr "Beteende" #: ../app/tools/gimpwarpoptions.c:92 msgid "Effect Size" -msgstr "" +msgstr "Effektstorlek" #: ../app/tools/gimpwarpoptions.c:99 -#, fuzzy -#| msgid "Hardness" msgid "Effect Hardness" -msgstr "Hårdhet" +msgstr "Effekthårdhet" #: ../app/tools/gimpwarpoptions.c:105 -msgid "Frames" -msgstr "" +msgid "Strength" +msgstr "Styrka" #: ../app/tools/gimpwarpoptions.c:106 -#, fuzzy -#| msgctxt "guides-type" -#| msgid "Number of lines" +msgid "Effect Strength" +msgstr "Effektstyrka" + +#: ../app/tools/gimpwarpoptions.c:113 +msgid "Stroke Spacing" +msgstr "Streckmellanrum" + +#: ../app/tools/gimpwarpoptions.c:127 ../app/tools/gimpwarpoptions.c:329 +msgid "Abyss policy" +msgstr "Avgrundspolicy" + +#: ../app/tools/gimpwarpoptions.c:128 +msgid "Out-of-bounds sampling behavior" +msgstr "Samplingsbeteende utanför område" + +#: ../app/tools/gimpwarpoptions.c:135 +msgid "High quality preview" +msgstr "Högkvalitativ förhandsgranskning" + +#: ../app/tools/gimpwarpoptions.c:136 +msgid "Use an accurate but slower preview" +msgstr "Använd en mer exakt men långsammare förhandsgranskning" + +#: ../app/tools/gimpwarpoptions.c:142 +msgid "During motion" +msgstr "Under rörelse" + +#: ../app/tools/gimpwarpoptions.c:143 +msgid "Apply effect during motion" +msgstr "Tillämpa effekt under rörelse" + +#: ../app/tools/gimpwarpoptions.c:149 +msgid "Periodically" +msgstr "Periodiskt" + +#: ../app/tools/gimpwarpoptions.c:150 +msgid "Apply effect periodically" +msgstr "Tillämpa effekt periodiskt" + +#: ../app/tools/gimpwarpoptions.c:156 +msgid "Rate" +msgstr "Frekvens" + +#: ../app/tools/gimpwarpoptions.c:157 +msgid "Periodic stroke rate" +msgstr "Periodisk streckhastighet" + +#: ../app/tools/gimpwarpoptions.c:163 +msgid "Frames" +msgstr "Bildrutor" + +#: ../app/tools/gimpwarpoptions.c:164 msgid "Number of animation frames" -msgstr "Antal linjer" +msgstr "Antal bildrutor i animation" + +#. the stroke frame +#: ../app/tools/gimpwarpoptions.c:339 +msgid "Stroke" +msgstr "Streck" #. the animation frame -#: ../app/tools/gimpwarpoptions.c:215 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "An_imation" +#: ../app/tools/gimpwarpoptions.c:361 msgid "Animate" -msgstr "An_imation" +msgstr "Animera" -#: ../app/tools/gimpwarpoptions.c:229 -#, fuzzy -#| msgctxt "plug-in-action" -#| msgid "An_imation" +#: ../app/tools/gimpwarpoptions.c:375 msgid "Create Animation" -msgstr "An_imation" +msgstr "Skapa animation" -#: ../app/tools/gimpwarptool.c:142 -#, fuzzy -#| msgid "Cage Transform" +#: ../app/tools/gimpwarptool.c:155 msgid "Warp Transform" -msgstr "Burtransformering" +msgstr "Vikningstransformation" -#: ../app/tools/gimpwarptool.c:143 +#: ../app/tools/gimpwarptool.c:156 msgid "Warp Transform: Deform with different tools" -msgstr "" +msgstr "Deformeringstransform: Deformera med olika verktyg" -#: ../app/tools/gimpwarptool.c:144 -#, fuzzy -#| msgid "_Cage Transform" +#: ../app/tools/gimpwarptool.c:157 msgid "_Warp Transform" -msgstr "B_urtransformering" +msgstr "_Vikningstransformation" -#: ../app/tools/gimpwarptool.c:464 ../app/tools/gimpwarptool.c:476 +#: ../app/tools/gimpwarptool.c:484 ../app/tools/gimpwarptool.c:496 msgid "Warp Tool Stroke" -msgstr "" +msgstr "Deformeringsstreckverktyg" -#: ../app/tools/gimpwarptool.c:572 -#, fuzzy -#| msgid "Cannot paint on layer groups." +#: ../app/tools/gimpwarptool.c:618 msgid "Cannot warp layer groups." -msgstr "Kan inte måla på lagergrupper." +msgstr "Kan inte vika lagergrupper." -#: ../app/tools/gimpwarptool.c:751 -#, fuzzy -#| msgid "Cage transform" +#: ../app/tools/gimpwarptool.c:652 +msgid "No stroke events selected." +msgstr "Inget banhändelser markerade." + +#: ../app/tools/gimpwarptool.c:863 msgid "Warp transform" -msgstr "Burtransformering" +msgstr "Vikningstransformation" -#: ../app/tools/gimpwarptool.c:888 +#: ../app/tools/gimpwarptool.c:1076 msgid "Please add some warp strokes first." -msgstr "" +msgstr "Lägg till några deformeringsstreck först." -#: ../app/tools/gimpwarptool.c:901 ../app/tools/gimpwarptool.c:937 +#: ../app/tools/gimpwarptool.c:1090 ../app/tools/gimpwarptool.c:1127 #, c-format msgid "Rendering Frame %d" -msgstr "" +msgstr "Renderar bildruta %d" -#: ../app/tools/gimpwarptool.c:916 ../app/tools/gimpwarptool.c:945 +#: ../app/tools/gimpwarptool.c:1105 ../app/tools/gimpwarptool.c:1135 #, c-format msgid "Frame %d" -msgstr "" +msgstr "Bildruta %d" -#: ../app/tools/gimpwarptool.c:954 +#: ../app/tools/gimpwarptool.c:1144 msgid "Frame" -msgstr "" +msgstr "Bildruta" -#: ../app/tools/tools-enums.c:89 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Transform" -msgctxt "transform-handle-mode" -msgid "Add / Transform" -msgstr "Transformera" - -#: ../app/tools/tools-enums.c:90 -#, fuzzy -#| msgctxt "tool" -#| msgid "Move" -msgctxt "transform-handle-mode" -msgid "Move" -msgstr "Flytta" - -#: ../app/tools/tools-enums.c:91 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Remove item" -msgctxt "transform-handle-mode" -msgid "Remove" -msgstr "Ta bort objekt" - -#: ../app/tools/tools-enums.c:181 -msgctxt "rectangle-tool-fixed-rule" -msgid "Aspect ratio" -msgstr "Aspektförhållande" - -#: ../app/tools/tools-enums.c:182 -msgctxt "rectangle-tool-fixed-rule" -msgid "Width" -msgstr "Bredd" - -#: ../app/tools/tools-enums.c:183 -msgctxt "rectangle-tool-fixed-rule" -msgid "Height" -msgstr "Höjd" - -#: ../app/tools/tools-enums.c:184 -msgctxt "rectangle-tool-fixed-rule" -msgid "Size" -msgstr "Storlek" - -#: ../app/tools/tools-enums.c:213 +#: ../app/tools/tools-enums.c:25 msgctxt "rect-select-mode" msgid "Free select" msgstr "Fri markering" -#: ../app/tools/tools-enums.c:214 +#: ../app/tools/tools-enums.c:26 msgctxt "rect-select-mode" msgid "Fixed size" msgstr "Fast storlek" -#: ../app/tools/tools-enums.c:215 +#: ../app/tools/tools-enums.c:27 msgctxt "rect-select-mode" msgid "Fixed aspect ratio" -msgstr "Fast aspektförhållande" +msgstr "Fast bildförhållande" -#: ../app/tools/tools-enums.c:244 +#: ../app/tools/tools-enums.c:56 msgctxt "transform-type" msgid "Layer" msgstr "Lager" -#: ../app/tools/tools-enums.c:245 +#: ../app/tools/tools-enums.c:57 msgctxt "transform-type" msgid "Selection" msgstr "Markering" -#: ../app/tools/tools-enums.c:246 +#: ../app/tools/tools-enums.c:58 msgctxt "transform-type" msgid "Path" msgstr "Bana" -#: ../app/tools/tools-enums.c:275 -msgctxt "vector-mode" -msgid "Design" -msgstr "Design" - -#: ../app/tools/tools-enums.c:276 -msgctxt "vector-mode" -msgid "Edit" -msgstr "Redigera" - -#: ../app/tools/tools-enums.c:277 -msgctxt "vector-mode" -msgid "Move" -msgstr "Flytta" - -#: ../app/tools/tools-enums.c:339 -#, fuzzy -#| msgid "Mark foreground" +#: ../app/tools/tools-enums.c:151 msgctxt "matting-draw-mode" msgid "Draw foreground" -msgstr "Markera förgrund" +msgstr "Rita förgrund" -#: ../app/tools/tools-enums.c:340 -#, fuzzy -#| msgid "Mark background" +#: ../app/tools/tools-enums.c:152 msgctxt "matting-draw-mode" msgid "Draw background" -msgstr "Markera bakgrund" +msgstr "Rita bakgrund" -#: ../app/tools/tools-enums.c:341 -#, fuzzy -#| msgctxt "orientation-type" -#| msgid "Unknown" +#: ../app/tools/tools-enums.c:153 msgctxt "matting-draw-mode" msgid "Draw unknown" -msgstr "Okänd" +msgstr "Rita okänd" -#: ../app/tools/tools-enums.c:374 -#, fuzzy -#| msgid "Lock pixels" +#: ../app/tools/tools-enums.c:186 msgctxt "warp-behavior" msgid "Move pixels" -msgstr "Lås bildpunkter" +msgstr "Flytta bildpunkter" -#: ../app/tools/tools-enums.c:375 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Grow Channel" +#: ../app/tools/tools-enums.c:187 msgctxt "warp-behavior" msgid "Grow area" -msgstr "Öka kanal" +msgstr "Väx område" -#: ../app/tools/tools-enums.c:376 -#, fuzzy -#| msgctxt "view-action" -#| msgid "Shrink _Wrap" +#: ../app/tools/tools-enums.c:188 msgctxt "warp-behavior" msgid "Shrink area" -msgstr "Kr_ymppaketera" +msgstr "Krymp område" -#: ../app/tools/tools-enums.c:377 -#, fuzzy -#| msgctxt "gradient-editor-coloring" -#| msgid "HSV (clockwise _hue)" +#: ../app/tools/tools-enums.c:189 msgctxt "warp-behavior" msgid "Swirl clockwise" -msgstr "NMI (m_edurs-nyans)" +msgstr "Virvla runt medurs" -#: ../app/tools/tools-enums.c:378 -#, fuzzy -#| msgctxt "gradient-editor-coloring" -#| msgid "HSV (_counter-clockwise hue)" +#: ../app/tools/tools-enums.c:190 msgctxt "warp-behavior" msgid "Swirl counter-clockwise" -msgstr "NMI (_moturs nyans)" +msgstr "Virvla runt moturs" -#: ../app/tools/tools-enums.c:379 -#, fuzzy -#| msgid "Eraser" +#: ../app/tools/tools-enums.c:191 msgctxt "warp-behavior" msgid "Erase warping" -msgstr "Suddare" +msgstr "Ta bort vikning" -#: ../app/tools/tools-enums.c:380 -#, fuzzy -#| msgid "Smoothing:" +#: ../app/tools/tools-enums.c:192 msgctxt "warp-behavior" msgid "Smooth warping" -msgstr "Utjämning:" +msgstr "Mjuk vikning" -#: ../app/vectors/gimpvectors.c:223 +#: ../app/vectors/gimpvectors.c:224 msgctxt "undo-type" msgid "Rename Path" msgstr "Byt namn på bana" -#: ../app/vectors/gimpvectors.c:224 +#: ../app/vectors/gimpvectors.c:225 msgctxt "undo-type" msgid "Move Path" msgstr "Flytta bana" -#: ../app/vectors/gimpvectors.c:225 +#: ../app/vectors/gimpvectors.c:226 msgctxt "undo-type" msgid "Scale Path" msgstr "Skala bana" -#: ../app/vectors/gimpvectors.c:226 +#: ../app/vectors/gimpvectors.c:227 msgctxt "undo-type" msgid "Resize Path" msgstr "Ändra storlek på bana" -#: ../app/vectors/gimpvectors.c:227 +#: ../app/vectors/gimpvectors.c:228 msgctxt "undo-type" msgid "Flip Path" msgstr "Vänd bana" -#: ../app/vectors/gimpvectors.c:228 +#: ../app/vectors/gimpvectors.c:229 msgctxt "undo-type" msgid "Rotate Path" msgstr "Rotera bana" -#: ../app/vectors/gimpvectors.c:229 +#: ../app/vectors/gimpvectors.c:230 msgctxt "undo-type" msgid "Transform Path" msgstr "Transformera bana" -#: ../app/vectors/gimpvectors.c:230 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Flip Path" +#: ../app/vectors/gimpvectors.c:231 msgctxt "undo-type" msgid "Fill Path" -msgstr "Vänd bana" +msgstr "Fyll bana" -#: ../app/vectors/gimpvectors.c:231 +#: ../app/vectors/gimpvectors.c:232 msgctxt "undo-type" msgid "Stroke Path" msgstr "Stryk längs bana" -#: ../app/vectors/gimpvectors.c:232 +#: ../app/vectors/gimpvectors.c:233 msgctxt "undo-type" msgid "Path to Selection" msgstr "Bana till markering" -#: ../app/vectors/gimpvectors.c:233 +#: ../app/vectors/gimpvectors.c:234 msgctxt "undo-type" msgid "Reorder Path" msgstr "Ändra ordning på bana" -#: ../app/vectors/gimpvectors.c:234 +#: ../app/vectors/gimpvectors.c:235 msgctxt "undo-type" msgid "Raise Path" msgstr "Höj bana" -#: ../app/vectors/gimpvectors.c:235 +#: ../app/vectors/gimpvectors.c:236 msgctxt "undo-type" msgid "Raise Path to Top" msgstr "Höj banan till överst" -#: ../app/vectors/gimpvectors.c:236 +#: ../app/vectors/gimpvectors.c:237 msgctxt "undo-type" msgid "Lower Path" msgstr "Sänk bana" -#: ../app/vectors/gimpvectors.c:237 +#: ../app/vectors/gimpvectors.c:238 msgctxt "undo-type" msgid "Lower Path to Bottom" msgstr "Sänk banan till underst" -#: ../app/vectors/gimpvectors.c:238 +#: ../app/vectors/gimpvectors.c:239 msgid "Path cannot be raised higher." msgstr "Banan kan inte höjas mer." -#: ../app/vectors/gimpvectors.c:239 +#: ../app/vectors/gimpvectors.c:240 msgid "Path cannot be lowered more." msgstr "Banan kan inte sänkas mer." -#: ../app/vectors/gimpvectors.c:454 +#: ../app/vectors/gimpvectors.c:455 msgid "Move Path" msgstr "Flytta bana" -#: ../app/vectors/gimpvectors.c:553 +#: ../app/vectors/gimpvectors.c:555 msgid "Flip Path" msgstr "Vänd bana" -#: ../app/vectors/gimpvectors.c:584 +#: ../app/vectors/gimpvectors.c:586 msgid "Rotate Path" msgstr "Rotera bana" -#: ../app/vectors/gimpvectors.c:613 +#: ../app/vectors/gimpvectors.c:616 msgid "Transform Path" msgstr "Transformera bana" #: ../app/vectors/gimpvectors-export.c:87 -#, fuzzy, c-format -#| msgid "Opening '%s' failed: %s" +#, c-format msgid "Writing SVG file '%s' failed: %s" -msgstr "Öppnande av \"%s\" misslyckades: %s" +msgstr "Misslyckades med att skriva SVG-fil ”%s”: %s" #: ../app/vectors/gimpvectors-import.c:331 msgid "Import Paths" @@ -19720,7 +22935,7 @@ msgstr "Importerad bana" #: ../app/vectors/gimpvectors-import.c:373 #, c-format msgid "No paths found in '%s'" -msgstr "Inga banor hittades i \"%s\"" +msgstr "Inga banor hittades i ”%s”" #: ../app/vectors/gimpvectors-import.c:377 msgid "No paths found in the buffer" @@ -19729,63 +22944,66 @@ msgstr "Inga banor hittades i bufferten" #: ../app/vectors/gimpvectors-import.c:387 #, c-format msgid "Failed to import paths from '%s': %s" -msgstr "Misslyckades med att importera bana från \"%s\": %s" +msgstr "Misslyckades med att importera banor från ”%s”: %s" #: ../app/widgets/gimpactioneditor.c:70 msgid "_Search:" msgstr "_Sök:" -#: ../app/widgets/gimpactiongroup.c:905 +#: ../app/widgets/gimpactiongroup.c:968 #, c-format msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" msgstr "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" -#: ../app/widgets/gimpactionview.c:337 +#: ../app/widgets/gimpactionview.c:332 #: ../app/widgets/gimpcontrollereditor.c:342 msgid "Action" msgstr "Åtgärd" -#: ../app/widgets/gimpactionview.c:366 +#: ../app/widgets/gimpactionview.c:361 msgid "Shortcut" msgstr "Genväg" -#: ../app/widgets/gimpactionview.c:392 +#: ../app/widgets/gimpactionview.c:387 msgid "Name" msgstr "Namn" -#: ../app/widgets/gimpactionview.c:632 ../app/widgets/gimpactionview.c:861 +#: ../app/widgets/gimpactionview.c:627 ../app/widgets/gimpactionview.c:868 msgid "Changing shortcut failed." msgstr "Ändring av genväg misslyckades." -#: ../app/widgets/gimpactionview.c:669 +#: ../app/widgets/gimpactionview.c:664 msgid "Conflicting Shortcuts" msgstr "Krockande genvägar" -#: ../app/widgets/gimpactionview.c:675 -msgid "_Reassign shortcut" +#: ../app/widgets/gimpactionview.c:670 +msgid "_Reassign Shortcut" msgstr "_Ändra genväg" +#: ../app/widgets/gimpactionview.c:686 +#, c-format +msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group." +msgstr "Genvägen ”%s” är redan tagen av ”%s” från gruppen ”%s”." + #: ../app/widgets/gimpactionview.c:690 #, c-format -msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group." -msgstr "Genvägen \"%s\" är redan tagen av \"%s\" från gruppen \"%s\"." - -#: ../app/widgets/gimpactionview.c:694 -#, c-format msgid "Reassigning the shortcut will cause it to be removed from \"%s\"." -msgstr "Ändring av genvägen kommer ta bort den från \"%s\"." +msgstr "Ändring av genvägen kommer ta bort den från ”%s”." -#: ../app/widgets/gimpactionview.c:789 +#: ../app/widgets/gimpactionview.c:785 msgid "Invalid shortcut." msgstr "Ogiltig genväg." -#: ../app/widgets/gimpactionview.c:796 ../app/widgets/gimpactionview.c:889 -#, fuzzy -#| msgid "Path cannot be lowered more." +#: ../app/widgets/gimpactionview.c:792 ../app/widgets/gimpactionview.c:896 msgid "F1 cannot be remapped." -msgstr "Banan kan inte sänkas mer." +msgstr "F1 kan inte ändras." -#: ../app/widgets/gimpactionview.c:897 +#: ../app/widgets/gimpactionview.c:800 +#, c-format +msgid "Alt+%d is used to switch to display %d and cannot be remapped." +msgstr "Alt+%d används för att växla till skärm %d och kan inte mappas om." + +#: ../app/widgets/gimpactionview.c:904 msgid "Removing shortcut failed." msgstr "Borttagning av genväg misslyckades." @@ -19802,46 +23020,46 @@ msgstr "Spikar" msgid "Percentage of width of brush" msgstr "Procent av penselns bredd" -#: ../app/widgets/gimpbufferview.c:179 ../app/widgets/gimpbufferview.c:264 -#: ../app/widgets/gimpeditor.c:745 +#: ../app/widgets/gimpbufferview.c:189 ../app/widgets/gimpbufferview.c:290 +#: ../app/widgets/gimpeditor.c:759 msgid "(None)" msgstr "(Ingen)" -#: ../app/widgets/gimpcolordialog.c:153 +#: ../app/widgets/gimpclipboard.c:485 +msgid "Clipboard" +msgstr "Urklippshanterare" + +#: ../app/widgets/gimpcolordialog.c:156 msgid "Add the current color to the color history" msgstr "Lägg till aktuell färg till färghistoriken" -#: ../app/widgets/gimpcolordisplayeditor.c:157 +#: ../app/widgets/gimpcolordisplayeditor.c:165 msgid "Available Filters" msgstr "Tillgängliga filter" -#: ../app/widgets/gimpcolordisplayeditor.c:221 +#: ../app/widgets/gimpcolordisplayeditor.c:229 msgid "Move the selected filter up" msgstr "Flytta det markerade filtret uppåt" -#: ../app/widgets/gimpcolordisplayeditor.c:230 +#: ../app/widgets/gimpcolordisplayeditor.c:238 msgid "Move the selected filter down" msgstr "Flytta det markerade filtret ned" -#: ../app/widgets/gimpcolordisplayeditor.c:277 -msgid "Active Filters" -msgstr "Aktiva filter" - -#: ../app/widgets/gimpcolordisplayeditor.c:328 +#: ../app/widgets/gimpcolordisplayeditor.c:336 msgid "Reset the selected filter to default values" msgstr "Återställ det markerade filtret till standardalternativ" -#: ../app/widgets/gimpcolordisplayeditor.c:530 +#: ../app/widgets/gimpcolordisplayeditor.c:527 #, c-format msgid "Add '%s' to the list of active filters" -msgstr "Lägg till \"%s\" till listan med aktiva filter" +msgstr "Lägg till ”%s” till listan med aktiva filter" -#: ../app/widgets/gimpcolordisplayeditor.c:567 +#: ../app/widgets/gimpcolordisplayeditor.c:564 #, c-format msgid "Remove '%s' from the list of active filters" -msgstr "Ta bort \"%s\" från listan med aktiva filter" +msgstr "Ta bort ”%s” från listan med aktiva filter" -#: ../app/widgets/gimpcolordisplayeditor.c:598 +#: ../app/widgets/gimpcolordisplayeditor.c:605 msgid "No filter selected" msgstr "Inget filter markerat" @@ -19853,59 +23071,155 @@ msgstr "" "Hexadecimal färgnotation som används i HTML och CSS. Den här posten " "accepterar även CSS-färgnamn." -#: ../app/widgets/gimpcolorframe.c:576 ../app/widgets/gimpcolorframe.c:645 -msgid "Value:" -msgstr "Värde:" +#. TRANSLATORS: X for the X coordinate. +#: ../app/widgets/gimpcolorframe.c:201 +msgctxt "Coordinates" +msgid "X:" +msgstr "X:" -#: ../app/widgets/gimpcolorframe.c:579 ../app/widgets/gimpcolorframe.c:588 -#: ../app/widgets/gimpcolorframe.c:618 ../app/widgets/gimpcolorframe.c:648 -#: ../app/widgets/gimpcolorframe.c:673 -msgid "Alpha:" -msgstr "Alfa:" +#. TRANSLATORS: Y for the Y coordinate. +#: ../app/widgets/gimpcolorframe.c:215 +msgctxt "Coordinates" +msgid "Y:" +msgstr "Y:" -#: ../app/widgets/gimpcolorframe.c:583 ../app/widgets/gimpcolorframe.c:613 -msgid "Red:" -msgstr "Röd:" +# sebras: blir det bättre med "finns ej"? +#. TRANSLATORS: n/a for Not Available. +#: ../app/widgets/gimpcolorframe.c:674 ../app/widgets/gimpcolorframe.c:676 +#, fuzzy +#| msgid "n/a" +msgctxt "Coordinates" +msgid "n/a" +msgstr "-" -#: ../app/widgets/gimpcolorframe.c:584 ../app/widgets/gimpcolorframe.c:614 -msgid "Green:" -msgstr "Grön:" +#. TRANSLATORS: V for Value (grayscale) +#: ../app/widgets/gimpcolorframe.c:749 +msgctxt "Grayscale" +msgid "V:" +msgstr "I:" -#: ../app/widgets/gimpcolorframe.c:585 ../app/widgets/gimpcolorframe.c:615 -msgid "Blue:" -msgstr "Blå:" +#. TRANSLATORS: A for Alpha (color transparency) +#: ../app/widgets/gimpcolorframe.c:753 ../app/widgets/gimpcolorframe.c:766 +#: ../app/widgets/gimpcolorframe.c:802 ../app/widgets/gimpcolorframe.c:844 +#: ../app/widgets/gimpcolorframe.c:872 ../app/widgets/gimpcolorframe.c:904 +#: ../app/widgets/gimpcolorframe.c:938 +msgctxt "Alpha channel" +msgid "A:" +msgstr "A:" -#: ../app/widgets/gimpcolorframe.c:592 +#. TRANSLATORS: R for Red (RGB) +#: ../app/widgets/gimpcolorframe.c:758 ../app/widgets/gimpcolorframe.c:794 +msgctxt "RGB" +msgid "R:" +msgstr "R:" + +#. TRANSLATORS: G for Green (RGB) +#: ../app/widgets/gimpcolorframe.c:760 ../app/widgets/gimpcolorframe.c:796 +msgctxt "RGB" +msgid "G:" +msgstr "G:" + +#. TRANSLATORS: B for Blue (RGB) +#: ../app/widgets/gimpcolorframe.c:762 ../app/widgets/gimpcolorframe.c:798 +msgctxt "RGB" +msgid "B:" +msgstr "B:" + +#. TRANSLATORS: Index of the color in the palette. +#: ../app/widgets/gimpcolorframe.c:771 +msgctxt "Indexed color" msgid "Index:" msgstr "Index:" -#: ../app/widgets/gimpcolorframe.c:630 +#. TRANSLATORS: Hex for Hexadecimal (representation of a color) +#: ../app/widgets/gimpcolorframe.c:805 +msgctxt "Color representation" msgid "Hex:" msgstr "Hex:" -#: ../app/widgets/gimpcolorframe.c:643 -msgid "Hue:" -msgstr "Nyans:" +#. TRANSLATORS: H for Hue (HSV color space) +#: ../app/widgets/gimpcolorframe.c:836 +msgctxt "HSV color space" +msgid "H:" +msgstr "N:" -#: ../app/widgets/gimpcolorframe.c:644 -msgid "Sat.:" -msgstr "Mättnad:" +#. TRANSLATORS: S for Saturation (HSV color space) +#: ../app/widgets/gimpcolorframe.c:838 +msgctxt "HSV color space" +msgid "S:" +msgstr "M:" -#: ../app/widgets/gimpcolorframe.c:667 -msgid "Cyan:" -msgstr "Cyan:" +#. TRANSLATORS: V for Value (HSV color space) +#: ../app/widgets/gimpcolorframe.c:840 +msgctxt "HSV color space" +msgid "V:" +msgstr "I:" -#: ../app/widgets/gimpcolorframe.c:668 -msgid "Magenta:" -msgstr "Magenta:" +#. TRANSLATORS: L for Lightness (LCH color space) +#: ../app/widgets/gimpcolorframe.c:864 +msgctxt "LCH color space" +msgid "L*:" +msgstr "L*:" -#: ../app/widgets/gimpcolorframe.c:669 -msgid "Yellow:" -msgstr "Gul:" +#. TRANSLATORS: C for Chroma (LCH color space) +#: ../app/widgets/gimpcolorframe.c:866 +msgctxt "LCH color space" +msgid "C*:" +msgstr "C*:" -#: ../app/widgets/gimpcolorframe.c:670 -msgid "Black:" -msgstr "Svart:" +#. TRANSLATORS: H for Hue angle (LCH color space) +#: ../app/widgets/gimpcolorframe.c:868 +msgctxt "LCH color space" +msgid "h°:" +msgstr "h°:" + +#. TRANSLATORS: L* for Lightness (Lab color space) +#: ../app/widgets/gimpcolorframe.c:896 +msgctxt "Lab color space" +msgid "L*:" +msgstr "L*:" + +#. TRANSLATORS: a* color channel in Lab color space +#: ../app/widgets/gimpcolorframe.c:898 +msgctxt "Lab color space" +msgid "a*:" +msgstr "a*:" + +#. TRANSLATORS: b* color channel in Lab color space +#: ../app/widgets/gimpcolorframe.c:900 +msgctxt "Lab color space" +msgid "b*:" +msgstr "b*:" + +#. TRANSLATORS: C for Cyan (CMYK) +#: ../app/widgets/gimpcolorframe.c:928 +msgctxt "CMYK" +msgid "C:" +msgstr "C:" + +#. TRANSLATORS: M for Magenta (CMYK) +#: ../app/widgets/gimpcolorframe.c:930 +msgctxt "CMYK" +msgid "M:" +msgstr "M:" + +#. TRANSLATORS: Y for Yellow (CMYK) +#: ../app/widgets/gimpcolorframe.c:932 +msgctxt "CMYK" +msgid "Y:" +msgstr "Y:" + +#. TRANSLATORS: K for Key/black (CMYK) +#: ../app/widgets/gimpcolorframe.c:934 +msgctxt "CMYK" +msgid "K:" +msgstr "K:" + +# sebras: blir det bättre med "finns ej"? +#: ../app/widgets/gimpcolorframe.c:996 +msgctxt "Color value" +msgid "n/a" +msgstr "-" #: ../app/widgets/gimpcolormapeditor.c:203 msgid "Color index:" @@ -19915,15 +23229,15 @@ msgstr "Färgindex:" msgid "HTML notation:" msgstr "HTML-notation:" -#: ../app/widgets/gimpcolormapeditor.c:485 +#: ../app/widgets/gimpcolormapeditor.c:481 msgid "Only indexed images have a colormap." msgstr "Endast indexerade bilder har en färgkarta." -#: ../app/widgets/gimpcontainerpopup.c:351 +#: ../app/widgets/gimpcontainerpopup.c:333 msgid "Smaller Previews" msgstr "Mindre förhandsvisningar" -#: ../app/widgets/gimpcontainerpopup.c:356 +#: ../app/widgets/gimpcontainerpopup.c:338 msgid "Larger Previews" msgstr "Större förhandsvisningar" @@ -19955,34 +23269,40 @@ msgstr "_Fånga händelse" msgid "Select the next event arriving from the controller" msgstr "Välj nästa händelse som kommer från enheten" -#: ../app/widgets/gimpcontrollereditor.c:526 +#: ../app/widgets/gimpcontrollereditor.c:374 +msgid "_Edit event" +msgstr "R_edigera gradient" + +#: ../app/widgets/gimpcontrollereditor.c:382 +msgid "_Clear event" +msgstr "_Rensa händelse" + +#: ../app/widgets/gimpcontrollereditor.c:521 #, c-format msgid "Remove the action assigned to '%s'" -msgstr "Ta bort åtgärden tilldelad \"%s\"" +msgstr "Ta bort åtgärden tilldelad ”%s”" -#: ../app/widgets/gimpcontrollereditor.c:531 +#: ../app/widgets/gimpcontrollereditor.c:526 #, c-format msgid "Assign an action to '%s'" -msgstr "Ställ in en åtgärd för \"%s\"" +msgstr "Ställ in en åtgärd för ”%s”" -#: ../app/widgets/gimpcontrollereditor.c:652 +#: ../app/widgets/gimpcontrollereditor.c:647 #, c-format msgid "Select Action for Event '%s'" -msgstr "Välj åtgärd för händelsen \"%s\"" +msgstr "Välj åtgärd för händelsen ”%s”" -#: ../app/widgets/gimpcontrollereditor.c:657 +#: ../app/widgets/gimpcontrollereditor.c:652 msgid "Select Controller Event Action" msgstr "Välj händelseåtgärd" #: ../app/widgets/gimpcontrollerinfo.c:112 msgid "Enabled" -msgstr "" +msgstr "Aktiverat" #: ../app/widgets/gimpcontrollerinfo.c:119 -#, fuzzy -#| msgid "_Grab event" msgid "Debug events" -msgstr "_Fånga händelse" +msgstr "Felsök händelser" #: ../app/widgets/gimpcontrollerkeyboard.c:70 #: ../app/widgets/gimpcontrollerkeyboard.c:73 @@ -20037,7 +23357,7 @@ msgid "Keyboard Events" msgstr "Tangentbordshändelser" #: ../app/widgets/gimpcontrollerkeyboard.c:231 -#: ../app/widgets/gimpcontrollermouse.c:245 +#: ../app/widgets/gimpcontrollermouse.c:252 #: ../app/widgets/gimpcontrollerwheel.c:230 msgid "Ready" msgstr "Redo" @@ -20062,17 +23382,17 @@ msgstr "Flytta den markerade enheten uppåt" msgid "Move the selected controller down" msgstr "Flytta den markerade enheten nedåt" -#: ../app/widgets/gimpcontrollerlist.c:429 +#: ../app/widgets/gimpcontrollerlist.c:425 #, c-format msgid "Add '%s' to the list of active controllers" -msgstr "Lägg till \"%s\" till listan över aktiva enheter" +msgstr "Lägg till ”%s” till listan över aktiva enheter" -#: ../app/widgets/gimpcontrollerlist.c:480 +#: ../app/widgets/gimpcontrollerlist.c:476 #, c-format msgid "Remove '%s' from the list of active controllers" -msgstr "Ta bort \"%s\" från listan över aktiva enheter" +msgstr "Ta bort ”%s” från listan över aktiva enheter" -#: ../app/widgets/gimpcontrollerlist.c:514 +#: ../app/widgets/gimpcontrollerlist.c:510 msgid "" "There can only be one active keyboard controller.\n" "\n" @@ -20083,7 +23403,7 @@ msgstr "" "Du har redan en tangentbordsenhet i din lista över aktiva enheter." # Hjul som i mushjul eller ratt? -#: ../app/widgets/gimpcontrollerlist.c:525 +#: ../app/widgets/gimpcontrollerlist.c:521 msgid "" "There can only be one active wheel controller.\n" "\n" @@ -20094,7 +23414,7 @@ msgstr "" "Du har redan en hjulenhet i din lista över aktiva enheter." # Hjul som i mushjul eller ratt? -#: ../app/widgets/gimpcontrollerlist.c:536 +#: ../app/widgets/gimpcontrollerlist.c:532 msgid "" "There can only be one active mouse controller.\n" "\n" @@ -20104,24 +23424,24 @@ msgstr "" "\n" "Du har redan en musenhet i din lista över aktiva styrenheter." -#: ../app/widgets/gimpcontrollerlist.c:562 +#: ../app/widgets/gimpcontrollerlist.c:558 msgid "Remove Controller?" msgstr "Ta bort enheten?" -#: ../app/widgets/gimpcontrollerlist.c:567 -msgid "Disable Controller" -msgstr "Inaktivera enheten" +#: ../app/widgets/gimpcontrollerlist.c:563 +msgid "_Disable Controller" +msgstr "_Inaktivera kontroller" -#: ../app/widgets/gimpcontrollerlist.c:569 -msgid "Remove Controller" -msgstr "Ta bort enheten" +#: ../app/widgets/gimpcontrollerlist.c:565 +msgid "_Remove Controller" +msgstr "_Ta bort kontroller" -#: ../app/widgets/gimpcontrollerlist.c:581 +#: ../app/widgets/gimpcontrollerlist.c:577 #, c-format msgid "Remove Controller '%s'?" -msgstr "Ta bort enheten \"%s\"?" +msgstr "Ta bort enheten ”%s”?" -#: ../app/widgets/gimpcontrollerlist.c:585 +#: ../app/widgets/gimpcontrollerlist.c:581 msgid "" "Removing this controller from the list of active controllers will " "permanently delete all event mappings you have configured.\n" @@ -20132,73 +23452,72 @@ msgstr "" "Borttagning av den här enheten från listan över aktiva enheter kommer " "permanent att ta bort alla händelsemappningar som du har konfigurerat.\n" "\n" -"Välja \"Inaktivera enhet\" kommer att inaktivera enheten utan att ta bort " -"den." +"Välja ”Inaktivera enhet” kommer att inaktivera enheten utan att ta bort den." -#: ../app/widgets/gimpcontrollerlist.c:637 +#: ../app/widgets/gimpcontrollerlist.c:633 msgid "Configure Input Controller" msgstr "Konfigurera inmatningsenhet" -#: ../app/widgets/gimpcontrollermouse.c:71 -#: ../app/widgets/gimpcontrollermouse.c:74 -#: ../app/widgets/gimpcontrollermouse.c:77 -#: ../app/widgets/gimpcontrollermouse.c:80 -#: ../app/widgets/gimpcontrollermouse.c:83 -#: ../app/widgets/gimpcontrollermouse.c:86 -#: ../app/widgets/gimpcontrollermouse.c:89 -#: ../app/widgets/gimpcontrollermouse.c:92 +#: ../app/widgets/gimpcontrollermouse.c:70 +#: ../app/widgets/gimpcontrollermouse.c:73 +#: ../app/widgets/gimpcontrollermouse.c:76 +#: ../app/widgets/gimpcontrollermouse.c:79 +#: ../app/widgets/gimpcontrollermouse.c:82 +#: ../app/widgets/gimpcontrollermouse.c:85 +#: ../app/widgets/gimpcontrollermouse.c:88 +#: ../app/widgets/gimpcontrollermouse.c:91 msgid "Button 8" msgstr "Knapp 8" -#: ../app/widgets/gimpcontrollermouse.c:96 -#: ../app/widgets/gimpcontrollermouse.c:99 -#: ../app/widgets/gimpcontrollermouse.c:102 -#: ../app/widgets/gimpcontrollermouse.c:105 -#: ../app/widgets/gimpcontrollermouse.c:108 -#: ../app/widgets/gimpcontrollermouse.c:111 -#: ../app/widgets/gimpcontrollermouse.c:114 -#: ../app/widgets/gimpcontrollermouse.c:117 +#: ../app/widgets/gimpcontrollermouse.c:95 +#: ../app/widgets/gimpcontrollermouse.c:98 +#: ../app/widgets/gimpcontrollermouse.c:101 +#: ../app/widgets/gimpcontrollermouse.c:104 +#: ../app/widgets/gimpcontrollermouse.c:107 +#: ../app/widgets/gimpcontrollermouse.c:110 +#: ../app/widgets/gimpcontrollermouse.c:113 +#: ../app/widgets/gimpcontrollermouse.c:116 msgid "Button 9" msgstr "Knapp 9" -#: ../app/widgets/gimpcontrollermouse.c:121 -#: ../app/widgets/gimpcontrollermouse.c:124 -#: ../app/widgets/gimpcontrollermouse.c:127 -#: ../app/widgets/gimpcontrollermouse.c:130 -#: ../app/widgets/gimpcontrollermouse.c:133 -#: ../app/widgets/gimpcontrollermouse.c:136 -#: ../app/widgets/gimpcontrollermouse.c:139 -#: ../app/widgets/gimpcontrollermouse.c:142 +#: ../app/widgets/gimpcontrollermouse.c:120 +#: ../app/widgets/gimpcontrollermouse.c:123 +#: ../app/widgets/gimpcontrollermouse.c:126 +#: ../app/widgets/gimpcontrollermouse.c:129 +#: ../app/widgets/gimpcontrollermouse.c:132 +#: ../app/widgets/gimpcontrollermouse.c:135 +#: ../app/widgets/gimpcontrollermouse.c:138 +#: ../app/widgets/gimpcontrollermouse.c:141 msgid "Button 10" msgstr "Knapp 10" -#: ../app/widgets/gimpcontrollermouse.c:146 -#: ../app/widgets/gimpcontrollermouse.c:149 -#: ../app/widgets/gimpcontrollermouse.c:152 -#: ../app/widgets/gimpcontrollermouse.c:155 -#: ../app/widgets/gimpcontrollermouse.c:158 -#: ../app/widgets/gimpcontrollermouse.c:161 -#: ../app/widgets/gimpcontrollermouse.c:164 -#: ../app/widgets/gimpcontrollermouse.c:167 +#: ../app/widgets/gimpcontrollermouse.c:145 +#: ../app/widgets/gimpcontrollermouse.c:148 +#: ../app/widgets/gimpcontrollermouse.c:151 +#: ../app/widgets/gimpcontrollermouse.c:154 +#: ../app/widgets/gimpcontrollermouse.c:157 +#: ../app/widgets/gimpcontrollermouse.c:160 +#: ../app/widgets/gimpcontrollermouse.c:163 +#: ../app/widgets/gimpcontrollermouse.c:166 msgid "Button 11" msgstr "Knapp 11" -#: ../app/widgets/gimpcontrollermouse.c:171 -#: ../app/widgets/gimpcontrollermouse.c:174 -#: ../app/widgets/gimpcontrollermouse.c:177 -#: ../app/widgets/gimpcontrollermouse.c:180 -#: ../app/widgets/gimpcontrollermouse.c:183 -#: ../app/widgets/gimpcontrollermouse.c:186 -#: ../app/widgets/gimpcontrollermouse.c:189 -#: ../app/widgets/gimpcontrollermouse.c:192 +#: ../app/widgets/gimpcontrollermouse.c:170 +#: ../app/widgets/gimpcontrollermouse.c:173 +#: ../app/widgets/gimpcontrollermouse.c:176 +#: ../app/widgets/gimpcontrollermouse.c:179 +#: ../app/widgets/gimpcontrollermouse.c:182 +#: ../app/widgets/gimpcontrollermouse.c:185 +#: ../app/widgets/gimpcontrollermouse.c:188 +#: ../app/widgets/gimpcontrollermouse.c:191 msgid "Button 12" msgstr "Knapp 12" -#: ../app/widgets/gimpcontrollermouse.c:204 +#: ../app/widgets/gimpcontrollermouse.c:203 msgid "Mouse Buttons" msgstr "Musknappar" -#: ../app/widgets/gimpcontrollermouse.c:244 +#: ../app/widgets/gimpcontrollermouse.c:251 msgid "Mouse Button Events" msgstr "Musknappshändelser" @@ -20254,15 +23573,313 @@ msgstr "Mushjul" msgid "Mouse Wheel Events" msgstr "Mushjulshändelser" -#: ../app/widgets/gimpdataeditor.c:215 -msgid "Save" -msgstr "Spara" +#: ../app/widgets/gimpcriticaldialog.c:54 +msgid "Copy Bug Information" +msgstr "Kopiera information om felet" -#: ../app/widgets/gimpdataeditor.c:223 -msgid "Revert" -msgstr "Återgå" +#: ../app/widgets/gimpcriticaldialog.c:55 +msgid "Open Bug Tracker" +msgstr "Öppna felrapporteringssystem" -#: ../app/widgets/gimpdataeditor.c:435 +#: ../app/widgets/gimpcriticaldialog.c:132 +#: ../app/widgets/gimpcriticaldialog.c:443 +msgid "" +"To help us improve GIMP, you can report the bug with these simple steps:" +msgstr "" +"För att hjälpa oss att förbättra GIMP så kan du rapportera felet med " +"följande enkla steg:" + +#: ../app/widgets/gimpcriticaldialog.c:134 +#: ../app/widgets/gimpcriticaldialog.c:445 +msgid "Copy the bug information to the clipboard by clicking: " +msgstr "Kopiera informationen om felet till urklipp genom att klicka: " + +#: ../app/widgets/gimpcriticaldialog.c:136 +#: ../app/widgets/gimpcriticaldialog.c:447 +msgid "Open our bug tracker in the browser by clicking: " +msgstr "Öppna vårt felrapporteringssytem i webbläsaren genom att klicka på: " + +#: ../app/widgets/gimpcriticaldialog.c:138 +#: ../app/widgets/gimpcriticaldialog.c:449 +msgid "Create a login if you don't have one yet." +msgstr "Skapa en inloggning om du inte har en ännu." + +#: ../app/widgets/gimpcriticaldialog.c:139 +#: ../app/widgets/gimpcriticaldialog.c:450 +msgid "Paste the clipboard text in a new bug report." +msgstr "Klistra in urklippstexten i en ny felrapport." + +#: ../app/widgets/gimpcriticaldialog.c:140 +#: ../app/widgets/gimpcriticaldialog.c:451 +msgid "" +"Add relevant information in English in the bug report explaining what you " +"were doing when this error occurred." +msgstr "" +"Lägg till relevant information på engelska i felrapporten som förklarar vad " +"du gjorde då detta fel inträffade." + +#: ../app/widgets/gimpcriticaldialog.c:142 +msgid "" +"This error may have left GIMP in an inconsistent state. It is advised to " +"save your work and restart GIMP." +msgstr "" +"Detta fel kan ha lämnat GIMP i ett inkonsekvent tillstånd. Du rekommenderas " +"att spara ditt arbete och starta om GIMP." + +#: ../app/widgets/gimpcriticaldialog.c:153 +msgid "" +"You can also close the dialog directly but reporting bugs is the best way to " +"make your software awesome." +msgstr "" +"Du kan också stänga dialogen direkt, men att rapportera fel är det bästa " +"sättet att göra din programvara bättre." + +#: ../app/widgets/gimpcriticaldialog.c:226 +msgid "The operating system is out of memory or resources." +msgstr "Operativsystemet har slut på minne eller resurser." + +#: ../app/widgets/gimpcriticaldialog.c:229 +msgid "The specified file was not found." +msgstr "Den angivna filen hittades inte." + +#: ../app/widgets/gimpcriticaldialog.c:232 +msgid "The specified path was not found." +msgstr "Den angivna sökvägen hittades inte." + +#: ../app/widgets/gimpcriticaldialog.c:235 +msgid "" +"The .exe file is invalid (non-Microsoft Win32 .exe or error in .exe image)." +msgstr "" +".exe-filen är ogiltig (inte en Microsoft WIN32 .exe eller fel i .exe-bild)." + +#: ../app/widgets/gimpcriticaldialog.c:238 +msgid "The operating system denied access to the specified file." +msgstr "Operativsystemet spärrade åtkomst till angiven fil." + +#: ../app/widgets/gimpcriticaldialog.c:241 +msgid "The file name association is incomplete or invalid." +msgstr "Filnamnsändelsen är ofullständig eller ogiltig." + +#: ../app/widgets/gimpcriticaldialog.c:244 +msgid "DDE transaction busy" +msgstr "DDE-transaktion upptagen" + +#: ../app/widgets/gimpcriticaldialog.c:247 +msgid "The DDE transaction failed." +msgstr "DDE-transaktionen misslyckades." + +#: ../app/widgets/gimpcriticaldialog.c:250 +msgid "The DDE transaction timed out." +msgstr "DDE-transaktionen avbröts." + +#: ../app/widgets/gimpcriticaldialog.c:253 +msgid "The specified DLL was not found." +msgstr "Angiven DLL hittades inte." + +#: ../app/widgets/gimpcriticaldialog.c:256 +msgid "There is no application associated with the given file name extension." +msgstr "Det finns inget program associerat med det angivna filnamnstillägget." + +#: ../app/widgets/gimpcriticaldialog.c:259 +msgid "There was not enough memory to complete the operation." +msgstr "Det fanns inte tillräckligt minne för att slutföra operationen." + +#: ../app/widgets/gimpcriticaldialog.c:262 +msgid "A sharing violation occurred." +msgstr "Ett delningsfel inträffade." + +#: ../app/widgets/gimpcriticaldialog.c:265 +msgid "Unknown Microsoft Windows error." +msgstr "Okänt fel i Microsoft Windows." + +#: ../app/widgets/gimpcriticaldialog.c:268 +#, c-format +msgid "Failed to open '%s': %s" +msgstr "Misslyckades med att öppna ”%s”: %s" + +#: ../app/widgets/gimpcriticaldialog.c:409 +#, c-format +msgid "GIMP crashed with a fatal error: %s" +msgstr "GIMP kraschade med ett ödesdigert fel: %s" + +#. First error. Let's just display it. +#: ../app/widgets/gimpcriticaldialog.c:416 +#, c-format +msgid "GIMP encountered an error: %s" +msgstr "GIMP stötte på ett fel: %s" + +#. Let's not display all errors. They will be in the bug report +#. * part anyway. +#. +#: ../app/widgets/gimpcriticaldialog.c:424 +#, c-format +msgid "GIMP encountered several critical errors!" +msgstr "GIMP stötte på flera kritiska fel!" + +#: ../app/widgets/gimpcriticaldialog.c:476 +msgid "_Restart GIMP" +msgstr "Sta_rta om GIMP" + +#: ../app/widgets/gimpdashboard.c:346 ../app/widgets/gimpdashboard.c:398 +msgctxt "dashboard-variable" +msgid "Occupied" +msgstr "Upptaget" + +#: ../app/widgets/gimpdashboard.c:347 +msgid "Tile cache occupied size" +msgstr "Använd bildblockscachestorlek" + +#: ../app/widgets/gimpdashboard.c:356 +msgctxt "dashboard-variable" +msgid "Maximum" +msgstr "Maximum" + +#: ../app/widgets/gimpdashboard.c:357 +msgid "Maximal tile cache occupied size" +msgstr "Maximal använd bildblockscachestorlek" + +#: ../app/widgets/gimpdashboard.c:366 ../app/widgets/gimpdashboard.c:418 +msgctxt "dashboard-variable" +msgid "Limit" +msgstr "Gräns" + +#: ../app/widgets/gimpdashboard.c:367 +msgid "Tile cache size limit" +msgstr "Gräns för bildblockscachestorlek" + +#: ../app/widgets/gimpdashboard.c:375 +msgctxt "dashboard-variable" +msgid "Compression" +msgstr "Komprimering" + +#: ../app/widgets/gimpdashboard.c:376 +msgid "Tile cache compression ratio" +msgstr "Komprimeringsförhållande för bildblockscache" + +#: ../app/widgets/gimpdashboard.c:385 +msgctxt "dashboard-variable" +msgid "Hit/Miss" +msgstr "Träff/miss" + +#: ../app/widgets/gimpdashboard.c:386 +msgid "Tile cache hit/miss ratio" +msgstr "Träff/miss-förhållande för bildblockscache" + +#: ../app/widgets/gimpdashboard.c:399 +msgid "Swap file occupied size" +msgstr "Använd växlingsfilsstorlek" + +#: ../app/widgets/gimpdashboard.c:408 +msgctxt "dashboard-variable" +msgid "Size" +msgstr "Storlek" + +#: ../app/widgets/gimpdashboard.c:409 +msgid "Swap file size" +msgstr "Växlingsfilstorlek" + +#: ../app/widgets/gimpdashboard.c:419 +msgid "Swap file size limit" +msgstr "Gräns för växlingsfilstorlek" + +#: ../app/widgets/gimpdashboard.c:426 +msgctxt "dashboard-variable" +msgid "Busy" +msgstr "Upptagen" + +#: ../app/widgets/gimpdashboard.c:427 +msgid "Whether there is work queued for the swap file" +msgstr "Huruvida det finns en arbetskö för växlingsfilen" + +#: ../app/widgets/gimpdashboard.c:440 +msgctxt "dashboard-variable" +msgid "Usage" +msgstr "Användning" + +#: ../app/widgets/gimpdashboard.c:441 +msgid "Total CPU usage" +msgstr "Total CPU-användning" + +#: ../app/widgets/gimpdashboard.c:449 ../app/widgets/gimpdashboard.c:459 +msgctxt "dashboard-variable" +msgid "Active" +msgstr "Aktiv" + +#: ../app/widgets/gimpdashboard.c:450 +msgid "Whether the CPU is active" +msgstr "Huruvida CPU:n är aktiv" + +#: ../app/widgets/gimpdashboard.c:460 +msgid "Total amount of time the CPU has been active" +msgstr "Total mängd tid som CPU:n har varit aktiv" + +#: ../app/widgets/gimpdashboard.c:473 +msgctxt "dashboard-variable" +msgid "Mipmapped" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:474 +msgid "Total size of processed mipmapped data" +msgstr "" + +#: ../app/widgets/gimpdashboard.c:486 +msgctxt "dashboard-group" +msgid "Cache" +msgstr "Cache" + +#: ../app/widgets/gimpdashboard.c:487 +msgid "In-memory tile cache" +msgstr "Bildblockscache i minne" + +#: ../app/widgets/gimpdashboard.c:523 +msgctxt "dashboard-group" +msgid "Swap" +msgstr "Växla" + +#: ../app/widgets/gimpdashboard.c:524 +msgid "On-disk tile swap" +msgstr "Bildblocksväxlingsfil på disk" + +#: ../app/widgets/gimpdashboard.c:553 +msgctxt "dashboard-group" +msgid "CPU" +msgstr "CPU" + +#: ../app/widgets/gimpdashboard.c:554 +msgid "CPU usage" +msgstr "CPU-användning" + +#: ../app/widgets/gimpdashboard.c:583 +msgctxt "dashboard-group" +msgid "Misc" +msgstr "Diverse" + +#: ../app/widgets/gimpdashboard.c:584 +msgid "Miscellaneous information" +msgstr "Diverse information" + +#: ../app/widgets/gimpdashboard.c:744 +msgid "Select fields" +msgstr "Markerad fält" + +# sebras: blir det bättre med "Finns ej"? +#. Tranlators: "N/A" is an abbreviation for "not available" +#: ../app/widgets/gimpdashboard.c:2323 +msgctxt "dashboard-value" +msgid "N/A" +msgstr "-" + +#: ../app/widgets/gimpdashboard.c:2332 +msgctxt "dashboard-value" +msgid "Yes" +msgstr "Ja" + +#: ../app/widgets/gimpdashboard.c:2333 +msgctxt "dashboard-value" +msgid "No" +msgstr "Nej" + +#: ../app/widgets/gimpdataeditor.c:413 #, c-format msgid "%s (read only)" msgstr "%s (skrivskyddad)" @@ -20278,7 +23895,7 @@ msgstr "Ta bort enhetsinställningar" #: ../app/widgets/gimpdeviceeditor.c:523 #, c-format msgid "Delete \"%s\"?" -msgstr "Ta bort \"%s\"?" +msgstr "Ta bort ”%s”?" #: ../app/widgets/gimpdeviceeditor.c:526 msgid "" @@ -20290,10 +23907,8 @@ msgstr "" "användas." #: ../app/widgets/gimpdeviceinfo.c:163 -#, fuzzy -#| msgid "Pressure" msgid "Pressure curve" -msgstr "Tryck" +msgstr "Tryckkurva" #: ../app/widgets/gimpdeviceinfoeditor.c:141 #: ../app/widgets/gimpdynamicseditor.c:161 @@ -20309,56 +23924,58 @@ msgstr "X-lutning" msgid "Y tilt" msgstr "Y-lutning" -#. Wheel as in mouse or input device wheel -#: ../app/widgets/gimpdeviceinfoeditor.c:145 +#. Wheel as in mouse or input device wheel. +#. * Some pens use the same axis for their rotation feature. +#. * See bug 791455. +#. +#: ../app/widgets/gimpdeviceinfoeditor.c:148 #: ../app/widgets/gimpdynamicseditor.c:165 -#: ../app/widgets/gimpdynamicsoutputeditor.c:74 -msgid "Wheel" -msgstr "Mushjul" +msgid "Wheel/Rotation" +msgstr "Hjul/rotation" #. the axes #. The axes of an input device -#: ../app/widgets/gimpdeviceinfoeditor.c:196 +#: ../app/widgets/gimpdeviceinfoeditor.c:199 msgid "Axes" msgstr "Axlar" #. the keys -#: ../app/widgets/gimpdeviceinfoeditor.c:270 +#: ../app/widgets/gimpdeviceinfoeditor.c:273 msgid "Keys" msgstr "Tangenter" -#: ../app/widgets/gimpdeviceinfoeditor.c:366 -#: ../app/widgets/gimpdeviceinfoeditor.c:585 +#: ../app/widgets/gimpdeviceinfoeditor.c:369 +#: ../app/widgets/gimpdeviceinfoeditor.c:584 #, c-format msgid "none" msgstr "ingen" #. e.g. "Pressure Curve" for mapping input device axes -#: ../app/widgets/gimpdeviceinfoeditor.c:415 +#: ../app/widgets/gimpdeviceinfoeditor.c:418 #, c-format msgid "%s Curve" msgstr "%s-Kurva" -#: ../app/widgets/gimpdeviceinfoeditor.c:474 +#: ../app/widgets/gimpdeviceinfoeditor.c:477 #: ../app/widgets/gimpdynamicsoutputeditor.c:209 msgid "_Reset Curve" msgstr "_Återställ kurva" -#: ../app/widgets/gimpdeviceinfoeditor.c:487 +#: ../app/widgets/gimpdeviceinfoeditor.c:490 #, c-format msgid "The axis '%s' has no curve" -msgstr "Axeln \"%s\" har ingen kurva" +msgstr "Axeln ”%s” har ingen kurva" -#: ../app/widgets/gimpdevicestatus.c:139 +#: ../app/widgets/gimpdevicestatus.c:145 msgid "Save device status" msgstr "Spara enhetsstatus" -#: ../app/widgets/gimpdevicestatus.c:434 +#: ../app/widgets/gimpdevicestatus.c:465 #, c-format msgid "Foreground: %d, %d, %d" msgstr "Förgrund: %d, %d, %d" -#: ../app/widgets/gimpdevicestatus.c:439 +#: ../app/widgets/gimpdevicestatus.c:470 #, c-format msgid "Background: %d, %d, %d" msgstr "Bakgrund: %d, %d, %d" @@ -20371,16 +23988,16 @@ msgstr "Det angivna filnamnet har inte en känd filändelse." msgid "File Exists" msgstr "Filen finns redan" -#: ../app/widgets/gimpdnd-xds.c:228 +#: ../app/widgets/gimpdnd-xds.c:229 msgid "_Replace" msgstr "_Ersätt" -#: ../app/widgets/gimpdnd-xds.c:238 +#: ../app/widgets/gimpdnd-xds.c:239 #, c-format msgid "A file named '%s' already exists." -msgstr "En fil med namnet \"%s\" finns redan." +msgstr "En fil med namnet ”%s” finns redan." -#: ../app/widgets/gimpdnd-xds.c:242 +#: ../app/widgets/gimpdnd-xds.c:243 msgid "Do you want to replace it with the image you are saving?" msgstr "Vill du ersätta den med bilden du sparar?" @@ -20406,20 +24023,16 @@ msgctxt "dock" msgid " | " msgstr " | " -#: ../app/widgets/gimpdockbook.c:294 +#: ../app/widgets/gimpdockbook.c:303 msgid "Configure this tab" msgstr "Konfigurera denna flik" #. Auto button -#: ../app/widgets/gimpdockwindow.c:383 +#: ../app/widgets/gimpdockwindow.c:387 msgid "Auto" msgstr "Auto" -#: ../app/widgets/gimpdockwindow.c:394 -#, fuzzy -#| msgid "" -#| "When enabled the dialog automatically follows the image you are working " -#| "on." +#: ../app/widgets/gimpdockwindow.c:398 msgid "" "When enabled, the dialog automatically follows the image you are working on." msgstr "När aktiverat följer dialogen automatiskt bilden du arbetar på." @@ -20430,7 +24043,7 @@ msgstr "Lås bildpunkter" #: ../app/widgets/gimpdrawabletreeview.c:123 msgid "Lock position and size" -msgstr "" +msgstr "Lås position och storlek" #: ../app/widgets/gimpdynamicseditor.c:162 #: ../app/widgets/gimpdynamicsoutputeditor.c:71 @@ -20451,16 +24064,20 @@ msgstr "Tona ut" msgid "Mapping matrix" msgstr "Kartläggningsmatris" -#: ../app/widgets/gimpdynamicseditor.c:319 +#: ../app/widgets/gimpdynamicseditor.c:315 #: ../app/widgets/gimptoolpreseteditor.c:149 msgid "Icon:" msgstr "Ikon:" -#: ../app/widgets/gimperrordialog.c:151 +#: ../app/widgets/gimpdynamicsoutputeditor.c:74 +msgid "Wheel / Rotation" +msgstr "Hjul/rotation" + +#: ../app/widgets/gimperrordialog.c:169 msgid "Too many error messages!" msgstr "För många felmeddelanden!" -#: ../app/widgets/gimperrordialog.c:152 +#: ../app/widgets/gimperrordialog.c:170 msgid "Messages are redirected to stderr." msgstr "Meddelanden omdirigeras till stderr." @@ -20468,7 +24085,7 @@ msgstr "Meddelanden omdirigeras till stderr." #. * like "GIMP Message" or #. * "PNG Message" #. -#: ../app/widgets/gimperrordialog.c:175 +#: ../app/widgets/gimperrordialog.c:196 #, c-format msgid "%s Message" msgstr "%s-meddelande" @@ -20481,7 +24098,7 @@ msgstr "Exportera bild" msgid "_Export" msgstr "_Exportera" -#: ../app/widgets/gimpexportdialog.c:74 ../app/widgets/gimpsavedialog.c:143 +#: ../app/widgets/gimpexportdialog.c:74 ../app/widgets/gimpsavedialog.c:145 msgid "By Extension" msgstr "Via ändelse" @@ -20489,15 +24106,19 @@ msgstr "Via ändelse" msgid "All export images" msgstr "Alla exportbilder" -#: ../app/widgets/gimpfiledialog.c:752 +#: ../app/widgets/gimpfiledialog.c:350 +msgid "_Help" +msgstr "_Hjälp" + +#: ../app/widgets/gimpfiledialog.c:756 msgid "All files" msgstr "Alla filer" -#: ../app/widgets/gimpfiledialog.c:757 +#: ../app/widgets/gimpfiledialog.c:761 msgid "All images" msgstr "Alla bilder" -#: ../app/widgets/gimpfiledialog.c:953 +#: ../app/widgets/gimpfiledialog.c:959 #, c-format msgid "Select File _Type (%s)" msgstr "Välj fil_typ (%s)" @@ -20518,84 +24139,84 @@ msgstr "Fyllnadsfärg" msgid "_Antialiasing" msgstr "_Kantutjämning" -#: ../app/widgets/gimpgradienteditor.c:754 +#: ../app/widgets/gimpgradienteditor.c:756 #, c-format msgid "Zoom factor: %d:1" msgstr "Zoomfaktor: %d:1" -#: ../app/widgets/gimpgradienteditor.c:757 +#: ../app/widgets/gimpgradienteditor.c:759 #, c-format msgid "Displaying [%0.4f, %0.4f]" msgstr "Visar [%0.4f, %0.4f]" -#: ../app/widgets/gimpgradienteditor.c:957 +#: ../app/widgets/gimpgradienteditor.c:959 #, c-format msgid "Position: %0.4f" msgstr "Position: %0.4f" -#: ../app/widgets/gimpgradienteditor.c:958 +#: ../app/widgets/gimpgradienteditor.c:960 #, c-format msgid "RGB (%0.3f, %0.3f, %0.3f)" msgstr "RGB (%0.3f, %0.3f, %0.3f)" -#: ../app/widgets/gimpgradienteditor.c:960 +#: ../app/widgets/gimpgradienteditor.c:962 #, c-format msgid "HSV (%0.1f, %0.1f, %0.1f)" msgstr "NMI (%0.1f, %0.1f, %0.1f)" -#: ../app/widgets/gimpgradienteditor.c:962 +#: ../app/widgets/gimpgradienteditor.c:964 #, c-format msgid "Luminance: %0.1f Opacity: %0.1f" msgstr "Intensitet: %0.1f Opacitet: %0.1f" -#: ../app/widgets/gimpgradienteditor.c:994 +#: ../app/widgets/gimpgradienteditor.c:996 #, c-format msgid "RGB (%d, %d, %d)" msgstr "RGB (%d, %d, %d)" -#: ../app/widgets/gimpgradienteditor.c:1005 +#: ../app/widgets/gimpgradienteditor.c:1007 msgid "Foreground color set to:" msgstr "Förgrundsfärg inställd till:" -#: ../app/widgets/gimpgradienteditor.c:1012 +#: ../app/widgets/gimpgradienteditor.c:1014 msgid "Background color set to:" msgstr "Bakgrundsfärg inställd till:" -#: ../app/widgets/gimpgradienteditor.c:1240 -#: ../app/widgets/gimpgradienteditor.c:1301 +#: ../app/widgets/gimpgradienteditor.c:1242 +#: ../app/widgets/gimpgradienteditor.c:1303 #, c-format msgid "%s-Drag: move & compress" msgstr "%s-dra: flytta och komprimera" -#: ../app/widgets/gimpgradienteditor.c:1245 +#: ../app/widgets/gimpgradienteditor.c:1247 msgid "Drag: move" msgstr "Dra: flytta" -#: ../app/widgets/gimpgradienteditor.c:1252 -#: ../app/widgets/gimpgradienteditor.c:1265 -#: ../app/widgets/gimpgradienteditor.c:1278 -#: ../app/widgets/gimpgradienteditor.c:1299 +#: ../app/widgets/gimpgradienteditor.c:1254 +#: ../app/widgets/gimpgradienteditor.c:1267 +#: ../app/widgets/gimpgradienteditor.c:1280 +#: ../app/widgets/gimpgradienteditor.c:1301 #, c-format msgid "%s-Click: extend selection" msgstr "%s-klicka: utöka markering" -#: ../app/widgets/gimpgradienteditor.c:1257 -#: ../app/widgets/gimpgradienteditor.c:1270 +#: ../app/widgets/gimpgradienteditor.c:1259 +#: ../app/widgets/gimpgradienteditor.c:1272 msgid "Click: select" msgstr "Klicka: markera" -#: ../app/widgets/gimpgradienteditor.c:1283 -#: ../app/widgets/gimpgradienteditor.c:1305 +#: ../app/widgets/gimpgradienteditor.c:1285 +#: ../app/widgets/gimpgradienteditor.c:1307 msgid "Click: select Drag: move" msgstr "Klicka: markera Dra: flytta" -#: ../app/widgets/gimpgradienteditor.c:1520 -#: ../app/widgets/gimpgradienteditor.c:1528 +#: ../app/widgets/gimpgradienteditor.c:1522 +#: ../app/widgets/gimpgradienteditor.c:1530 #, c-format msgid "Handle position: %0.4f" msgstr "Handtagsposition: %0.4f" -#: ../app/widgets/gimpgradienteditor.c:1545 +#: ../app/widgets/gimpgradienteditor.c:1547 #, c-format msgid "Distance: %0.4f" msgstr "Avstånd: %0.4f" @@ -20620,15 +24241,15 @@ msgstr "Ändra rutnätets bakgrundsfärg" msgid "_Background color:" msgstr "_Bakgrundsfärg:" -#: ../app/widgets/gimphelp.c:310 +#: ../app/widgets/gimphelp.c:371 msgid "Help browser is missing" msgstr "Hjälpläsaren saknas" -#: ../app/widgets/gimphelp.c:311 +#: ../app/widgets/gimphelp.c:372 msgid "The GIMP help browser is not available." msgstr "GIMP-hjälpläsaren är inte tillgänglig." -#: ../app/widgets/gimphelp.c:312 +#: ../app/widgets/gimphelp.c:373 msgid "" "The GIMP help browser plug-in appears to be missing from your installation. " "You may instead use the web browser for reading the help pages." @@ -20636,42 +24257,47 @@ msgstr "" "Insticksmodulen för GIMP:s hjälpläsare verkar saknas i din installation. Du " "kan istället använda webbläsaren för att läsa hjälpsidorna." -#: ../app/widgets/gimphelp.c:358 +#: ../app/widgets/gimphelp.c:419 msgid "Help browser doesn't start" -msgstr "Hjälp_läsaren startar inte" +msgstr "Hjälpläsaren startar inte" -#: ../app/widgets/gimphelp.c:359 +#: ../app/widgets/gimphelp.c:420 msgid "Could not start the GIMP help browser plug-in." -msgstr "Kunde inte starta GIMP-hjälpläsarinsticksmodulen." +msgstr "Kunde inte starta insticksmodulen GIMP-hjälpläsare." -#: ../app/widgets/gimphelp.c:361 -#, fuzzy -#| msgid "" -#| "The GIMP help browser plug-in appears to be missing from your " -#| "installation. You may instead use the web browser for reading the help " -#| "pages." +#: ../app/widgets/gimphelp.c:422 msgid "You may instead use the web browser for reading the help pages." -msgstr "" -"Insticksmodulen för GIMP:s hjälpläsare verkar saknas i din installation. Du " -"kan istället använda webbläsaren för att läsa hjälpsidorna." +msgstr "Du kan istället använda webbläsaren för att läsa hjälpsidorna." -#: ../app/widgets/gimphelp.c:387 +#: ../app/widgets/gimphelp.c:448 msgid "Use _Web Browser" msgstr "Använd _webbläsare" -#: ../app/widgets/gimphelp.c:637 +#: ../app/widgets/gimphelp.c:793 msgid "GIMP user manual is missing" msgstr "GIMP:s användarhandbok saknas" -#: ../app/widgets/gimphelp.c:644 -msgid "_Read Online" -msgstr "_Läs på nätet" +#: ../app/widgets/gimphelp.c:809 +msgid "The GIMP user manual is not installed in your language." +msgstr "GIMP:s användarhandbok är inte installerad på ditt språk." -#: ../app/widgets/gimphelp.c:668 -msgid "The GIMP user manual is not installed on your computer." -msgstr "GIMP:s användarhandbok är inte installerad på din dator." +#: ../app/widgets/gimphelp.c:820 +msgid "Read Selected _Language" +msgstr "Läs valt _språk" -#: ../app/widgets/gimphelp.c:671 +#: ../app/widgets/gimphelp.c:824 +msgid "Available manuals..." +msgstr "Tillgängliga handböcker…" + +#: ../app/widgets/gimphelp.c:836 +msgid "" +"You may either select a manual in another language or read the online " +"version." +msgstr "" +"Du kan antingen välja en handbok på ett annat språk eller läsa versionen på " +"nätet." + +#: ../app/widgets/gimphelp.c:842 msgid "" "You may either install the additional help package or change your " "preferences to use the online version." @@ -20679,62 +24305,77 @@ msgstr "" "Du kan antingen installera det extra hjälppaketet eller ändra dina " "inställningar till att använda versionen på nätet." -#: ../app/widgets/gimphistogrameditor.c:98 +#: ../app/widgets/gimphelp.c:847 +msgid "Read _Online" +msgstr "_Läs på nätet" + +#: ../app/widgets/gimphistogrameditor.c:128 msgid "Mean:" msgstr "Medel:" -#: ../app/widgets/gimphistogrameditor.c:99 +#: ../app/widgets/gimphistogrameditor.c:129 msgid "Std dev:" msgstr "Med. avvik:" -#: ../app/widgets/gimphistogrameditor.c:100 +#: ../app/widgets/gimphistogrameditor.c:130 msgid "Median:" msgstr "Median:" -#: ../app/widgets/gimphistogrameditor.c:101 +#: ../app/widgets/gimphistogrameditor.c:131 msgid "Pixels:" msgstr "Bildpunkter:" -#: ../app/widgets/gimphistogrameditor.c:102 +#: ../app/widgets/gimphistogrameditor.c:132 msgid "Count:" msgstr "Antal:" -#: ../app/widgets/gimphistogrameditor.c:103 +#: ../app/widgets/gimphistogrameditor.c:133 msgid "Percentile:" msgstr "Procentuellt:" -#: ../app/widgets/gimphistogrameditor.c:121 -msgid "Channel:" -msgstr "Kanal:" +#: ../app/widgets/gimphistogrameditor.c:160 +msgid "Histogram channel" +msgstr "Histogramkanal" + +#: ../app/widgets/gimphistogrameditor.c:171 +msgid "Show values in linear space" +msgstr "Visa värden i linjär rymd" + +#: ../app/widgets/gimphistogrameditor.c:172 +msgid "Show values in perceptual space" +msgstr "Visa värden i perceptuell rymd" #: ../app/widgets/gimpiconpicker.c:245 msgid "From File..." -msgstr "" +msgstr "Från fil…" #: ../app/widgets/gimpiconpicker.c:254 -#, fuzzy -#| msgctxt "edit-action" -#| msgid "_Copy Named..." msgid "From Named Icons..." -msgstr "Kopie_ra namngiven..." +msgstr "Från namngivna ikoner…" #: ../app/widgets/gimpiconpicker.c:263 -#, fuzzy -#| msgctxt "documents-action" -#| msgid "Copy image location to clipboard" msgid "Copy Icon to Clipboard" -msgstr "Kopiera bildens plats till urklipp" +msgstr "Kopiera ikon till urklipp" #: ../app/widgets/gimpiconpicker.c:272 -#, fuzzy -#| msgctxt "edit-action" -#| msgid "Paste the content of the clipboard" msgid "Paste Icon from Clipboard" -msgstr "Klistra in innehållet i urklipp" +msgstr "Klistra in ikon från urklipp" -#: ../app/widgets/gimpiconpicker.c:512 +#: ../app/widgets/gimpiconpicker.c:484 msgid "Load Icon Image" -msgstr "" +msgstr "Läs in ikonbild" + +#: ../app/widgets/gimpiconsizescale.c:126 +msgid "Guess icon size from resolution" +msgstr "Gissa ikonstorlek utifrån upplösning" + +#: ../app/widgets/gimpiconsizescale.c:127 +msgid "Use icon size from the theme" +msgstr "Använd ikonstorlek från temat" + +#: ../app/widgets/gimpiconsizescale.c:128 +msgid "Custom icon size" +msgstr "Anpassad ikonstorlek" #. Button #: ../app/widgets/gimpimagecommenteditor.c:107 @@ -20766,10 +24407,8 @@ msgid "Color space:" msgstr "Färgrymd:" #: ../app/widgets/gimpimagepropview.c:122 -#, fuzzy -#| msgid "Version:" msgid "Precision:" -msgstr "Version:" +msgstr "Precision:" #: ../app/widgets/gimpimagepropview.c:127 msgid "File Name:" @@ -20811,34 +24450,38 @@ msgstr "Antal kanaler:" msgid "Number of paths:" msgstr "Antal banor:" -#: ../app/widgets/gimpimagepropview.c:454 -#: ../app/widgets/gimptemplateeditor.c:346 +#: ../app/widgets/gimpimagepropview.c:452 +#: ../app/widgets/gimptemplateeditor.c:349 #, c-format msgid "pixels/%s" msgstr "bildpunkter/%s" -#: ../app/widgets/gimpimagepropview.c:456 +#: ../app/widgets/gimpimagepropview.c:454 #, c-format msgid "%g × %g %s" msgstr "%g × %g %s" -#: ../app/widgets/gimpimagepropview.c:477 +#: ../app/widgets/gimpimagepropview.c:475 msgid "colors" msgstr "färger" -#: ../app/widgets/gimpitemtreeview.c:754 +#: ../app/widgets/gimpitemtreeview.c:757 msgid "Lock:" msgstr "Lås:" -#: ../app/widgets/gimplanguagestore-parser.c:252 +#: ../app/widgets/gimplanguagestore-parser.c:253 msgid "System Language" msgstr "Systemspråk" -#: ../app/widgets/gimplayertreeview.c:311 +#: ../app/widgets/gimplayermodebox.c:158 +msgid "Switch to another group of modes" +msgstr "Växla till en annan grupp av lägen" + +#: ../app/widgets/gimplayertreeview.c:319 msgid "Lock alpha channel" msgstr "Lås alfakanal" -#: ../app/widgets/gimpmessagebox.c:442 +#: ../app/widgets/gimpmessagebox.c:395 #, c-format msgid "Message repeated once." msgid_plural "Message repeated %d times." @@ -20851,7 +24494,7 @@ msgstr "Identifiera automatiskt" #: ../app/widgets/gimpoverlaydialog.c:229 msgid "Detach dialog from canvas" -msgstr "" +msgstr "Koppla loss dialog från duk" #: ../app/widgets/gimppaletteeditor.c:243 #: ../app/widgets/gimppaletteeditor.c:720 @@ -20864,268 +24507,116 @@ msgstr "Kolumner:" #: ../app/widgets/gimppanedbox.c:59 msgid "You can drop dockable dialogs here" -msgstr "Du kan släppa dockningbara dialoger här" +msgstr "Du kan släppa dockningsbara dialoger här" #: ../app/widgets/gimppickablepopup.c:206 -#: ../app/widgets/gimppickablepopup.c:432 -#, fuzzy -#| msgid "Select an operation from the list above" +#: ../app/widgets/gimppickablepopup.c:423 msgid "Select an image in the left pane" -msgstr "Välj en åtgärd från listan ovan" +msgstr "Välj en bild i den vänstra panelen" + +#: ../app/widgets/gimppluginview.c:149 +msgid "Plug-In" +msgstr "Insticksmodul" #: ../app/widgets/gimpprogressdialog.c:223 msgid "Progress" msgstr "Förlopp" -#: ../app/widgets/gimppropgui-constructors.c:171 -#, fuzzy -#| msgid "Pick a setting from the list" -msgid "Pick coordinates from the image" -msgstr "Välj en inställning från listan" - -#: ../app/widgets/gimppropgui-constructors.c:330 -msgid "Clockwise" -msgstr "" - -#: ../app/widgets/gimppropgui-constructors.c:334 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Invert Channel" -msgid "Invert Range" -msgstr "Invertera kanal" - -#: ../app/widgets/gimppropgui-constructors.c:338 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "Select All" -msgid "Select All" -msgstr "Markera allt" - -#: ../app/widgets/gimppropgui-constructors.c:417 -#, fuzzy -#| msgid "Source" -msgid "Source Range" -msgstr "Källa" - -#: ../app/widgets/gimppropgui-constructors.c:428 -#, fuzzy -#| msgid "R_eset Range" -msgid "Destination Range" -msgstr "_Återställ intervall" - -#: ../app/widgets/gimppropgui-constructors.c:439 -#, fuzzy -#| msgid "Drag Handle" -msgid "Gray Handling" -msgstr "Handtag" - -#: ../app/widgets/gimppropgui-constructors.c:576 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "New channel" -msgid "Red channel" -msgstr "Ny kanal" - -#: ../app/widgets/gimppropgui-constructors.c:600 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "New channel" -msgid "Green channel" -msgstr "Ny kanal" - -#: ../app/widgets/gimppropgui-constructors.c:624 -#, fuzzy -#| msgctxt "undo-type" -#| msgid "New channel" -msgid "Blue channel" -msgstr "Ny kanal" - -#: ../app/widgets/gimppropgui-constructors.c:682 -msgid "Frequencies" -msgstr "" - -#: ../app/widgets/gimppropgui-constructors.c:691 -#, fuzzy -#| msgid "Contiguous" -msgid "Contours" -msgstr "Sammanhängande" - -#: ../app/widgets/gimppropgui-constructors.c:700 -#, fuzzy -#| msgctxt "convolve-type" -#| msgid "Sharpen" -msgid "Sharp Edges" -msgstr "Skarpare" - -#: ../app/widgets/gimppropgui-constructors.c:709 -#, fuzzy -#| msgid "Fade Options" -msgid "Other Options" -msgstr "Toningsalternativ" - -#: ../app/widgets/gimppropgui.c:119 -#, fuzzy -#| msgid "New Template" -msgid "New Seed" -msgstr "Ny mall" - -#: ../app/widgets/gimppropgui.c:346 -#, fuzzy -#| msgid "Colorize the Image" -msgid "Pick color from the image" -msgstr "Färglägg bilden" - -#: ../app/widgets/gimppropgui.c:457 -msgid "This operation has no editable properties" -msgstr "" - -#: ../app/widgets/gimppropgui.c:527 -msgid "1,700 K – Match flame" -msgstr "" - -#: ../app/widgets/gimppropgui.c:528 -msgid "1,850 K – Candle flame, sunset/sunrise" -msgstr "" - -#: ../app/widgets/gimppropgui.c:529 -msgid "3,000 K – Soft (or warm) white compact fluorescent lamps" -msgstr "" - -#: ../app/widgets/gimppropgui.c:530 -msgid "3,300 K – Incandescent lamps" -msgstr "" - -#: ../app/widgets/gimppropgui.c:531 -msgid "3,200 K – Studio lamps, photofloods, etc." -msgstr "" - -#: ../app/widgets/gimppropgui.c:532 -msgid "3,350 K – Studio \"CP\" light" -msgstr "" - -#: ../app/widgets/gimppropgui.c:533 -msgid "4,100 K – Moonlight" -msgstr "" - -#: ../app/widgets/gimppropgui.c:534 -msgid "5,000 K – D50" -msgstr "" - -#: ../app/widgets/gimppropgui.c:535 -msgid "5,000 K – Cool white/daylight compact fluorescent lamps" -msgstr "" - -#: ../app/widgets/gimppropgui.c:536 -msgid "5,000 K – Horizon daylight" -msgstr "" - -#: ../app/widgets/gimppropgui.c:537 -msgid "5,500 K – D55" -msgstr "" - -#: ../app/widgets/gimppropgui.c:538 -msgid "5,500 K – Vertical daylight, electronic flash" -msgstr "" - -#: ../app/widgets/gimppropgui.c:539 -msgid "6,200 K – Xenon short-arc lamp" -msgstr "" - -#: ../app/widgets/gimppropgui.c:540 -msgid "6,500 K – D65" -msgstr "" - -#: ../app/widgets/gimppropgui.c:541 -msgid "6,500 K – Daylight, overcast" -msgstr "" - -#: ../app/widgets/gimppropgui.c:542 -msgid "7,500 K – D75" -msgstr "" - -#: ../app/widgets/gimppropgui.c:543 -msgid "9,300 K" -msgstr "" - -#: ../app/widgets/gimpsavedialog.c:149 +#: ../app/widgets/gimpsavedialog.c:151 msgid "All XCF images" msgstr "Alla XCF-bilder" -#: ../app/widgets/gimpsavedialog.c:270 +#: ../app/widgets/gimpsavedialog.c:259 #, c-format -msgid "Disables compression to make the XCF file readable by %s and later." +msgid "" +"The image uses features from %s, disabling compression won't make the XCF " +"file readable by older GIMP versions." msgstr "" +"Bilden använder funktioner från %s, att inaktivera komprimering kommer inte " +"att göra XCF-filen läsbar för äldre GIMP-versioner." -#: ../app/widgets/gimpsavedialog.c:278 +#: ../app/widgets/gimpsavedialog.c:266 +#, c-format +msgid "" +"Keep compression disabled to make the XCF file readable by %s and later." +msgstr "" +"Behåll komprimering inaktiverat för att göra XCF-filen läsbar för %s och " +"senare." + +#: ../app/widgets/gimpsavedialog.c:276 msgid "Metadata won't be visible in GIMP older than version 2.10." -msgstr "" +msgstr "Metadata kommer inte att vara synligt i GIMP äldre än version 2.10." -#: ../app/widgets/gimpsavedialog.c:342 -msgid "Save this XCF file with maximum compatibility" -msgstr "" +#: ../app/widgets/gimpsavedialog.c:329 +msgid "Save this XCF file with better but slower compression" +msgstr "Spara denna XCF-fil med bättre men långsammare komprimering" -#: ../app/widgets/gimpselectiondata.c:248 +#: ../app/widgets/gimpselectiondata.c:250 #, c-format msgid "" "The filename '%s' couldn't be converted to a valid URI:\n" "\n" "%s" msgstr "" -"Filnamnet \"%s\" kunde inte konverteras till en korrekt URI:\n" +"Filnamnet ”%s” kunde inte konverteras till en korrekt URI:\n" "\n" "%s" -#: ../app/widgets/gimpselectiondata.c:252 +#: ../app/widgets/gimpselectiondata.c:254 msgid "Invalid UTF-8" msgstr "Ogiltig UTF-8" -#: ../app/widgets/gimpsettingsbox.c:269 -msgid "Pick a setting from the list" -msgstr "Välj en inställning från listan" +#: ../app/widgets/gimpsettingsbox.c:304 +msgid "Pick a preset from the list" +msgstr "Välj en förinställning från listan" -#: ../app/widgets/gimpsettingsbox.c:291 -msgid "Add settings to favorites" -msgstr "Lägg till inställningar som favoriter" +#: ../app/widgets/gimpsettingsbox.c:328 +msgid "Save the current settings as named preset" +msgstr "Spara aktuella inställningar som namngiven förinställning" -#: ../app/widgets/gimpsettingsbox.c:319 -msgid "_Import Settings from File..." -msgstr "_Importera inställningar från fil..." +#: ../app/widgets/gimpsettingsbox.c:346 +msgid "Manage presets" +msgstr "Hantera förinställningar" -#: ../app/widgets/gimpsettingsbox.c:325 -msgid "_Export Settings to File..." -msgstr "_Exportera inställningar till fil..." +#: ../app/widgets/gimpsettingsbox.c:360 +msgid "_Import Current Settings from File..." +msgstr "_Importera aktuella inställningar från fil…" -#: ../app/widgets/gimpsettingsbox.c:332 -msgid "_Manage Settings..." -msgstr "_Hantera inställningar..." +#: ../app/widgets/gimpsettingsbox.c:366 +msgid "_Export Current Settings to File..." +msgstr "_Exportera aktuella inställningar till fil…" -#: ../app/widgets/gimpsettingsbox.c:646 -msgid "Add Settings to Favorites" -msgstr "Lägg till inställningar som favoriter" +#: ../app/widgets/gimpsettingsbox.c:373 +msgid "_Manage Saved Presets..." +msgstr "_Hantera sparade förinställningar…" -#: ../app/widgets/gimpsettingsbox.c:649 -msgid "Enter a name for the settings" -msgstr "Ange ett namn för inställningarna" +#: ../app/widgets/gimpsettingsbox.c:613 +msgid "Save Settings as Named Preset" +msgstr "Spara inställningar som namngiven förinställning" -#: ../app/widgets/gimpsettingsbox.c:650 +#: ../app/widgets/gimpsettingsbox.c:616 +msgid "Enter a name for the preset" +msgstr "Ange ett namn för förinställningen" + +#: ../app/widgets/gimpsettingsbox.c:617 msgid "Saved Settings" msgstr "Sparade inställningar" -#: ../app/widgets/gimpsettingsbox.c:691 -msgid "Manage Saved Settings" -msgstr "Hantera sparade inställningar" +#: ../app/widgets/gimpsettingsbox.c:658 +msgid "Manage Saved Presets" +msgstr "Hantera sparade förinställningar" -#: ../app/widgets/gimpsettingseditor.c:194 -msgid "Import settings from a file" -msgstr "Importera inställningar från en fil" +#: ../app/widgets/gimpsettingseditor.c:195 +msgid "Import presets from a file" +msgstr "Importera förinställningar från en fil" -#: ../app/widgets/gimpsettingseditor.c:203 -msgid "Export the selected settings to a file" -msgstr "Exportera de valda inställningarna till en fil" +#: ../app/widgets/gimpsettingseditor.c:204 +msgid "Export the selected presets to a file" +msgstr "Exportera de valda förinställningarna till en fil" -#: ../app/widgets/gimpsettingseditor.c:212 -msgid "Delete the selected settings" -msgstr "Ta bort de valda inställningarna" +#: ../app/widgets/gimpsettingseditor.c:213 +msgid "Delete the selected preset" +msgstr "Ta bort den markerade förinställningen" #: ../app/widgets/gimpsizebox.c:458 #, c-format @@ -21155,7 +24646,7 @@ msgstr "_Fogstil:" #: ../app/widgets/gimpstrokeeditor.c:171 msgid "_Miter limit:" -msgstr "_Kantgräns:" +msgstr "_Geringsgräns:" #: ../app/widgets/gimpstrokeeditor.c:178 msgid "Dash pattern:" @@ -21173,74 +24664,65 @@ msgstr "filter" msgid "enter tags" msgstr "ange taggar" -#. Seperator for tags +#. Separator for tags #. * IMPORTANT: use only one of Unicode terminal punctuation chars. #. * http://unicode.org/review/pr-23.html #. -#: ../app/widgets/gimptagentry.c:1751 +#: ../app/widgets/gimptagentry.c:1750 msgid "," msgstr "," -#: ../app/widgets/gimptemplateeditor.c:216 +#: ../app/widgets/gimptemplateeditor.c:219 #, c-format msgid "%p" msgstr "%p" -#: ../app/widgets/gimptemplateeditor.c:291 +#: ../app/widgets/gimptemplateeditor.c:294 msgid "_Advanced Options" msgstr "_Avancerade alternativ" -#: ../app/widgets/gimptemplateeditor.c:402 +#: ../app/widgets/gimptemplateeditor.c:407 msgid "Color _space:" msgstr "Färg_rum:" -#: ../app/widgets/gimptemplateeditor.c:408 -#, fuzzy -#| msgid "_X resolution:" +#: ../app/widgets/gimptemplateeditor.c:415 msgid "_Precision:" -msgstr "_X upplösning:" +msgstr "_Precision:" -#: ../app/widgets/gimptemplateeditor.c:413 -#, fuzzy -#| msgctxt "file-action" -#| msgid "Save this image" -msgid "Color manage this image" -msgstr "Spara denna bild" +#: ../app/widgets/gimptemplateeditor.c:427 +msgid "_Gamma:" +msgstr "_Gamma:" -#: ../app/widgets/gimptemplateeditor.c:422 -#, fuzzy -#| msgid "Color Profile" -msgid "Choose A Color Profile" -msgstr "Färgprofil" - -#: ../app/widgets/gimptemplateeditor.c:424 -#, fuzzy -#| msgid "Color Profile" -msgid "Color _profile:" -msgstr "Färgprofil" - -#: ../app/widgets/gimptemplateeditor.c:431 -msgid "_Fill with:" -msgstr "_Fyll med:" +#: ../app/widgets/gimptemplateeditor.c:432 +msgid "Color _manage this image" +msgstr "Färg_hantera denna bild" #: ../app/widgets/gimptemplateeditor.c:441 +msgid "Choose A Color Profile" +msgstr "Välj en färgprofil" + +#: ../app/widgets/gimptemplateeditor.c:445 +msgid "Co_lor profile:" +msgstr "Färgprofi_l:" + +#: ../app/widgets/gimptemplateeditor.c:462 msgid "Comme_nt:" msgstr "Komme_ntar:" -#: ../app/widgets/gimptemplateeditor.c:558 +#: ../app/widgets/gimptemplateeditor.c:577 msgid "_Name:" msgstr "_Namn:" -#: ../app/widgets/gimptemplateeditor.c:564 +#: ../app/widgets/gimptemplateeditor.c:583 msgid "_Icon:" msgstr "_Ikon:" -#: ../app/widgets/gimptemplateeditor.c:744 +#: ../app/widgets/gimptemplateeditor.c:802 #, c-format msgid "%d × %d ppi, %s" msgstr "%d × %d punkter/tum, %s" -#: ../app/widgets/gimptemplateeditor.c:746 +#: ../app/widgets/gimptemplateeditor.c:804 #, c-format msgid "%d ppi, %s" msgstr "%d punkter/tum, %s" @@ -21248,42 +24730,34 @@ msgstr "%d punkter/tum, %s" #: ../app/widgets/gimptextbuffer-serialize.c:276 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" -msgstr "Attribut \"%s\" är ogiltigt på <%s> element i detta sammanhang" +msgstr "Attribut ”%s” är ogiltigt på <%s> element i detta sammanhang" #: ../app/widgets/gimptextbuffer-serialize.c:348 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "Yttersta elementet i text måste vara inte <%s>" -#: ../app/widgets/gimptextbuffer.c:1684 -#, fuzzy, c-format -#| msgid "Fatal parse error in pattern file '%s': File appears truncated." +#: ../app/widgets/gimptextbuffer.c:1711 +#, c-format msgid "Input file '%s' appears truncated: %s" -msgstr "Ödesdigert tolkningsfel i mönsterfilen \"%s\": Filen verkar avkapad." +msgstr "Indatafil ”%s” verkar avhuggen: %s" -#: ../app/widgets/gimptextbuffer.c:1702 +#: ../app/widgets/gimptextbuffer.c:1729 #, c-format msgid "Invalid UTF-8 data in file '%s'." -msgstr "Ogiltig UTF-8-data i filen \"%s\"." +msgstr "Ogiltig UTF-8-data i filen ”%s”." -#: ../app/widgets/gimptextbuffer.c:1751 -#, fuzzy, c-format -#| msgid "" -#| "Reverting to '%s' failed:\n" -#| "\n" -#| "%s" -msgid "Writing palette file '%s' failed: %s" -msgstr "" -"Återgång till \"%s\" misslyckades:\n" -"\n" -"%s" +#: ../app/widgets/gimptextbuffer.c:1778 +#, c-format +msgid "Writing text file '%s' failed: %s" +msgstr "Misslyckades med att skriva textfilen ”%s”: %s" -#: ../app/widgets/gimptexteditor.c:223 +#: ../app/widgets/gimptexteditor.c:220 msgid "_Use selected font" msgstr "_Använd valt typsnitt" #: ../app/widgets/gimptextstyleeditor.c:207 -#: ../app/widgets/gimptextstyleeditor.c:1317 +#: ../app/widgets/gimptextstyleeditor.c:1298 msgid "Change font of selected text" msgstr "Ändra teckensnitt på markerad text" @@ -21324,12 +24798,12 @@ msgstr "Understruken" msgid "Strikethrough" msgstr "Genomstruken" -#: ../app/widgets/gimptextstyleeditor.c:1309 +#: ../app/widgets/gimptextstyleeditor.c:1290 #, c-format msgid "Font \"%s\" unavailable on this system" -msgstr "" +msgstr "Typsnittet ”%s” finns inte på detta system" -#: ../app/widgets/gimpthumbbox.c:328 +#: ../app/widgets/gimpthumbbox.c:324 #, c-format msgid "" "Click to update preview\n" @@ -21338,22 +24812,22 @@ msgstr "" "Klicka för att uppdatera förhandsvisning\n" "%s-klicka för att tvinga uppdatering även om förhandsvisningen är aktuell" -#: ../app/widgets/gimpthumbbox.c:345 +#: ../app/widgets/gimpthumbbox.c:341 msgid "Pr_eview" msgstr "Förhan_dsvisning" -#: ../app/widgets/gimpthumbbox.c:402 ../app/widgets/gimpthumbbox.c:465 +#: ../app/widgets/gimpthumbbox.c:398 ../app/widgets/gimpthumbbox.c:461 msgid "No selection" msgstr "Ingen markering" -#: ../app/widgets/gimpthumbbox.c:609 ../app/widgets/gimpthumbbox.c:630 +#: ../app/widgets/gimpthumbbox.c:605 ../app/widgets/gimpthumbbox.c:626 #, c-format msgid "Thumbnail %d of %d" msgstr "Miniatyrbild %d av %d" -#: ../app/widgets/gimpthumbbox.c:738 ../app/widgets/gimpthumbbox.c:748 +#: ../app/widgets/gimpthumbbox.c:734 ../app/widgets/gimpthumbbox.c:744 msgid "Creating preview..." -msgstr "Skapar förhandsvisning..." +msgstr "Skapar förhandsvisning…" #: ../app/widgets/gimptoolbox-color-area.c:88 msgid "" @@ -21432,32 +24906,32 @@ msgstr "Sänk detta verktyg till nederst" msgid "Reset tool order and visibility" msgstr "Återställ verktygsordning och synlighet" -#: ../app/widgets/gimptooloptionseditor.c:202 +#: ../app/widgets/gimptooloptionseditor.c:203 msgid "Save Tool Preset..." -msgstr "Spara verktygsförval..." +msgstr "Spara verktygsförinställning…" -#: ../app/widgets/gimptooloptionseditor.c:210 +#: ../app/widgets/gimptooloptionseditor.c:212 msgid "Restore Tool Preset..." -msgstr "Återställ Verktygsförval..." +msgstr "Återställ verktygsförinställning…" -#: ../app/widgets/gimptooloptionseditor.c:218 +#: ../app/widgets/gimptooloptionseditor.c:221 msgid "Delete Tool Preset..." -msgstr "Ta bort verktygsförval..." +msgstr "Ta bort verktygsförinställning…" -#: ../app/widgets/gimptoolpreseteditor.c:291 +#: ../app/widgets/gimptoolpreseteditor.c:295 #, c-format msgid "%s Preset" -msgstr "%s-Förval" +msgstr "%s-förinställning" -#: ../app/widgets/gimpuimanager.c:741 +#: ../app/widgets/gimpuimanager.c:760 msgid "Your GIMP installation is incomplete:" msgstr "Din GIMP-installation är klar:" -#: ../app/widgets/gimpuimanager.c:743 +#: ../app/widgets/gimpuimanager.c:762 msgid "Please make sure the menu XML files are correctly installed." msgstr "Försäkra dig om att XML-filerna för menyer är korrekt installerade." -#: ../app/widgets/gimpuimanager.c:749 +#: ../app/widgets/gimpuimanager.c:768 #, c-format msgid "There was an error parsing the menu definition from %s: %s" msgstr "Det inträffade ett fel vid tolkning av menydefinitionen från %s: %s" @@ -21466,43 +24940,39 @@ msgstr "Det inträffade ett fel vid tolkning av menydefinitionen från %s: %s" msgid "[ Base Image ]" msgstr "[ Grundbild ]" -#: ../app/widgets/gimpvectorstreeview.c:112 +#: ../app/widgets/gimpvectorstreeview.c:111 msgid "Lock path strokes" msgstr "Lås banstreck" -#: ../app/widgets/gimpvectorstreeview.c:115 -#, fuzzy -#| msgid "Lock path strokes" +#: ../app/widgets/gimpvectorstreeview.c:114 msgid "Lock path position" -msgstr "Lås banstreck" +msgstr "Lås banposition" -#: ../app/widgets/gimpviewablebox.c:91 +#: ../app/widgets/gimpviewablebox.c:94 msgid "Open the brush selection dialog" msgstr "Öppna penselvalsdialogen" -#: ../app/widgets/gimpviewablebox.c:158 +#: ../app/widgets/gimpviewablebox.c:162 msgid "Open the dynamics selection dialog" msgstr "Öppna dialogrutan för dynamikval" -#: ../app/widgets/gimpviewablebox.c:224 -#, fuzzy -#| msgid "Open the brush selection dialog" +#: ../app/widgets/gimpviewablebox.c:229 msgid "Open the MyPaint brush selection dialog" -msgstr "Öppna penselvalsdialogen" +msgstr "Öppna valdialogen för MyPaint-pensel" -#: ../app/widgets/gimpviewablebox.c:287 +#: ../app/widgets/gimpviewablebox.c:292 msgid "Open the pattern selection dialog" msgstr "Öppna mönstervalsdialogen" -#: ../app/widgets/gimpviewablebox.c:356 +#: ../app/widgets/gimpviewablebox.c:362 msgid "Open the gradient selection dialog" msgstr "Öppna dialogrutan för val av gradient" -#: ../app/widgets/gimpviewablebox.c:474 +#: ../app/widgets/gimpviewablebox.c:501 msgid "Open the palette selection dialog" msgstr "Öppna palettvalsdialogen" -#: ../app/widgets/gimpviewablebox.c:540 +#: ../app/widgets/gimpviewablebox.c:567 msgid "Open the font selection dialog" msgstr "Öppna typsnittsvalsdialogen" @@ -21526,27 +24996,25 @@ msgstr "%s (prova %s, %s)" msgid "%s (try %s, %s, %s)" msgstr "%s (prova %s, %s, %s)" -#: ../app/widgets/gimpwidgets-utils.c:1451 -#, fuzzy, c-format -#| msgid "Anti erase (%s)" +#: ../app/widgets/gimpwidgets-utils.c:1658 +#, c-format msgid "Built-in grayscale (%s)" -msgstr "Antisudda (%s)" +msgstr "Inbyggd gråskala (%s)" -#: ../app/widgets/gimpwidgets-utils.c:1458 -#, fuzzy, c-format -#| msgid "Direction (%s)" +#: ../app/widgets/gimpwidgets-utils.c:1665 +#, c-format msgid "Built-in RGB (%s)" -msgstr "Riktning (%s)" +msgstr "Inbyggd RGB (%s)" -#: ../app/widgets/gimpwidgets-utils.c:1475 +#: ../app/widgets/gimpwidgets-utils.c:1682 #, c-format msgid "Preferred grayscale (%s)" -msgstr "" +msgstr "Föredragen gråskala (%s)" -#: ../app/widgets/gimpwidgets-utils.c:1482 +#: ../app/widgets/gimpwidgets-utils.c:1689 #, c-format msgid "Preferred RGB (%s)" -msgstr "" +msgstr "Föredragen RGB (%s)" #: ../app/widgets/widgets-enums.c:23 msgctxt "active-color" @@ -21561,173 +25029,188 @@ msgstr "Bakgrund" #: ../app/widgets/widgets-enums.c:52 msgctxt "circle-background" msgid "Plain" -msgstr "" +msgstr "Vanlig" #: ../app/widgets/widgets-enums.c:53 -#, fuzzy -#| msgctxt "color-frame-mode" -#| msgid "HSV" msgctxt "circle-background" msgid "HSV" msgstr "NMI" -#: ../app/widgets/widgets-enums.c:114 -msgctxt "color-frame-mode" -msgid "Pixel" -msgstr "Bildpunkt" - -#: ../app/widgets/widgets-enums.c:115 -msgctxt "color-frame-mode" -msgid "RGB" -msgstr "RGB" - -#: ../app/widgets/widgets-enums.c:116 -msgctxt "color-frame-mode" -msgid "HSV" -msgstr "NMI" - #: ../app/widgets/widgets-enums.c:117 msgctxt "color-frame-mode" +msgid "Pixel" +msgstr "Bildpunkt" + +#: ../app/widgets/widgets-enums.c:118 +msgctxt "color-frame-mode" +msgid "RGB (%)" +msgstr "RGB (%)" + +#: ../app/widgets/widgets-enums.c:119 +msgctxt "color-frame-mode" +msgid "RGB (0..255)" +msgstr "RGB (0..255)" + +#: ../app/widgets/widgets-enums.c:120 +msgctxt "color-frame-mode" +msgid "HSV" +msgstr "NMI" + +#: ../app/widgets/widgets-enums.c:121 +msgctxt "color-frame-mode" +msgid "CIE LCH" +msgstr "CIE LCH" + +#: ../app/widgets/widgets-enums.c:122 +msgctxt "color-frame-mode" +msgid "CIE LAB" +msgstr "CIE LAB" + +#: ../app/widgets/widgets-enums.c:123 +msgctxt "color-frame-mode" msgid "CMYK" msgstr "CMYK" -#: ../app/widgets/widgets-enums.c:147 +#: ../app/widgets/widgets-enums.c:153 msgctxt "color-pick-mode" msgid "Pick only" msgstr "Endast val" -#: ../app/widgets/widgets-enums.c:148 +#: ../app/widgets/widgets-enums.c:154 msgctxt "color-pick-mode" msgid "Set foreground color" -msgstr "Ange förgrundsfärg" +msgstr "Ställ in förgrundsfärg" -#: ../app/widgets/widgets-enums.c:149 +#: ../app/widgets/widgets-enums.c:155 msgctxt "color-pick-mode" msgid "Set background color" -msgstr "Ange bakgrundsfärg" +msgstr "Ställ in bakgrundsfärg" -#: ../app/widgets/widgets-enums.c:150 +#: ../app/widgets/widgets-enums.c:156 msgctxt "color-pick-mode" msgid "Add to palette" msgstr "Lägg till i palett" -#: ../app/widgets/widgets-enums.c:209 +#: ../app/widgets/widgets-enums.c:215 msgctxt "histogram-scale" msgid "Linear histogram" msgstr "Linjärt histogram" -#: ../app/widgets/widgets-enums.c:210 +#: ../app/widgets/widgets-enums.c:216 msgctxt "histogram-scale" msgid "Logarithmic histogram" msgstr "Logaritmiskt histogram" -#: ../app/widgets/widgets-enums.c:246 +#: ../app/widgets/widgets-enums.c:252 msgctxt "tab-style" msgid "Icon" msgstr "Ikon" -#: ../app/widgets/widgets-enums.c:247 +#: ../app/widgets/widgets-enums.c:253 msgctxt "tab-style" msgid "Current status" msgstr "Aktuell status" -#: ../app/widgets/widgets-enums.c:248 +#: ../app/widgets/widgets-enums.c:254 msgctxt "tab-style" msgid "Text" msgstr "Text" -#: ../app/widgets/widgets-enums.c:249 +#: ../app/widgets/widgets-enums.c:255 msgctxt "tab-style" msgid "Description" msgstr "Beskrivning" -#: ../app/widgets/widgets-enums.c:250 +#: ../app/widgets/widgets-enums.c:256 msgctxt "tab-style" msgid "Icon & text" msgstr "Ikon och text" -#: ../app/widgets/widgets-enums.c:251 +#: ../app/widgets/widgets-enums.c:257 msgctxt "tab-style" msgid "Icon & desc" msgstr "Ikon och besk." -#: ../app/widgets/widgets-enums.c:252 +#: ../app/widgets/widgets-enums.c:258 msgctxt "tab-style" msgid "Status & text" msgstr "Status och text" -#: ../app/widgets/widgets-enums.c:253 +#: ../app/widgets/widgets-enums.c:259 msgctxt "tab-style" msgid "Status & desc" msgstr "Status och besk." -#: ../app/widgets/widgets-enums.c:254 +#: ../app/widgets/widgets-enums.c:260 msgctxt "tab-style" msgid "Undefined" msgstr "Odefinierad" -#: ../app/xcf/xcf.c:110 ../app/xcf/xcf.c:181 +#: ../app/xcf/xcf.c:114 ../app/xcf/xcf.c:185 msgid "GIMP XCF image" msgstr "GIMP XCF-bild" -#: ../app/xcf/xcf.c:268 ../app/xcf/xcf.c:351 +#: ../app/xcf/xcf.c:272 ../app/xcf/xcf.c:360 msgid "Memory Stream" -msgstr "" +msgstr "Minnesström" -#: ../app/xcf/xcf.c:278 +#: ../app/xcf/xcf.c:283 #, c-format msgid "Opening '%s'" -msgstr "Öppnar \"%s\"" +msgstr "Öppnar ”%s”" -#: ../app/xcf/xcf.c:316 +#: ../app/xcf/xcf.c:325 #, c-format msgid "XCF error: unsupported XCF file version %d encountered" -msgstr "XCF-fel: XCF-filversion %d som inte stöds påträffad" +msgstr "XCF-fel: anträffad version %d av XCF-fil stöds inte" -#: ../app/xcf/xcf.c:370 +#: ../app/xcf/xcf.c:383 #, c-format msgid "Saving '%s'" -msgstr "Sparar \"%s\"" +msgstr "Sparar ”%s”" -#: ../app/xcf/xcf.c:377 -#, fuzzy, c-format -#| msgid "Close %s" +#: ../app/xcf/xcf.c:390 +#, c-format msgid "Closing '%s'" -msgstr "Stäng %s" +msgstr "Stänger ”%s”" -#: ../app/xcf/xcf.c:384 -#, fuzzy, c-format -#| msgid "Error writing '%s': %s" +#: ../app/xcf/xcf.c:397 +#, c-format msgid "Error writing '%s': " -msgstr "Fel vid skrivning av \"%s\": %s" +msgstr "Fel vid skrivning ”%s”: " -#: ../app/xcf/xcf.c:478 -#, fuzzy, c-format -#| msgid "Error reading '%s': %s" +#: ../app/xcf/xcf.c:491 +#, c-format msgid "Error creating '%s': " -msgstr "Fel vid läsning av \"%s\": %s" +msgstr "Fel vid skapande ”%s”: " -#: ../app/xcf/xcf-load.c:302 +#: ../app/xcf/xcf-load.c:342 #, c-format msgid "" "Corrupt 'exif-data' parasite discovered.\n" "Exif data could not be migrated: %s" msgstr "" +"Skadad ”exif-data”-parasit upptäckt.\n" +"Exif-data kunde inte migreras: %s" -#: ../app/xcf/xcf-load.c:339 +#: ../app/xcf/xcf-load.c:379 msgid "" "Corrupt 'gimp-metadata' parasite discovered.\n" "XMP data could not be migrated." msgstr "" +"Skadad ”gimp-metadata”-parasit upptäckt.\n" +"XMP-data kunde inte migreras." -#: ../app/xcf/xcf-load.c:359 +#: ../app/xcf/xcf-load.c:399 #, c-format msgid "" "Corrupt 'gimp-metadata' parasite discovered.\n" "XMP data could not be migrated: %s" msgstr "" +"Skadad ”gimp-metadata”-parasit upptäckt.\n" +"XMP-data kunde inte migreras: %s" -#: ../app/xcf/xcf-load.c:546 +#: ../app/xcf/xcf-load.c:586 msgid "" "This XCF file is corrupt! I have loaded as much of it as I can, but it is " "incomplete." @@ -21735,7 +25218,7 @@ msgstr "" "Den här XCF-filen är skadad! Jag har läst in så mycket jag kan av den men " "den är ofullständig." -#: ../app/xcf/xcf-load.c:557 +#: ../app/xcf/xcf-load.c:597 msgid "" "This XCF file is corrupt! I could not even salvage any partial image data " "from it." @@ -21743,7 +25226,7 @@ msgstr "" "Den här XCF-filen är skadad! Jag kunde inte ens rädda någon del av dess " "bilddata." -#: ../app/xcf/xcf-load.c:649 +#: ../app/xcf/xcf-load.c:689 msgid "" "XCF warning: version 0 of XCF file format\n" "did not save indexed colormaps correctly.\n" @@ -21753,21 +25236,27 @@ msgstr "" "sparade inte indexerade färgkartor rätt.\n" "Byter ut gråskalekartan." -#: ../app/xcf/xcf-read.c:105 +#: ../app/xcf/xcf-read.c:189 msgid "Invalid UTF-8 string in XCF file" msgstr "Ogiltig UTF-8-sträng i XCF-fil" #: ../app/xcf/xcf-seek.c:45 -#, fuzzy -#| msgid "Could not seek in XCF file: %s" msgid "Could not seek in XCF file: " -msgstr "Kunde inte söka i XCF-fil: %s" +msgstr "Kunde inte söka i XCF-fil: " -#: ../app/xcf/xcf-write.c:99 -#, fuzzy -#| msgid "Error writing XCF: %s" +#: ../app/xcf/xcf-write.c:45 msgid "Error writing XCF: " -msgstr "Fel vid skrivande av XCF: %s" +msgstr "Fel vid skrivande av XCF: " + +#: ../app/xcf/xcf-write.c:273 +#, c-format +msgid "Error writing XCF: unsupported BPC when writing pixel: %d" +msgstr "" +"Fel vid skrivning av XCF: BPC stöds inte vid skrivning av bildpunkt: %d" + +#: ../app-tools/gimp-debug-tool.c:78 +msgid "GIMP Crash Debug" +msgstr "GIMP-kraschfelsökning" #: ../data/tags/gimp-tags-default.xml.in.h:1 msgid "round" @@ -21778,6 +25267,293 @@ msgstr "rund" msgid "fuzzy" msgstr "luddig" +#~ msgid "Try generating debug data for bug reporting when appropriate" +#~ msgstr "Försök generera felsökningsdata för felrapportering när lämpligt" + +#~ msgid "Blending" +#~ msgstr "Tonar" + +#~ msgctxt "layers-action" +#~ msgid "Source Over" +#~ msgstr "Källa över" + +#~ msgctxt "layers-action" +#~ msgid "Source Atop" +#~ msgstr "Källa längst upp" + +#~ msgctxt "layers-action" +#~ msgid "Source In" +#~ msgstr "Källa in" + +#~ msgctxt "layers-action" +#~ msgid "Destination Atop" +#~ msgstr "Destination längst upp" + +#~ msgctxt "layer-composite-mode" +#~ msgid "Source over" +#~ msgstr "Källa över" + +#~ msgctxt "layer-composite-mode" +#~ msgid "Source atop" +#~ msgstr "Källa längst upp" + +#~ msgctxt "layer-composite-mode" +#~ msgid "Destination atop" +#~ msgstr "Destination längst upp" + +#~ msgctxt "layer-composite-mode" +#~ msgid "Source in" +#~ msgstr "Källa in" + +#~ msgid "Transformation Matrix" +#~ msgstr "Transformationsmatris" + +#~ msgid "Image Import" +#~ msgstr "Bildimportering" + +#~ msgid "Brightness/Contrast Tool: Adjust brightness and contrast" +#~ msgstr "Ljusstyrka/Kontrast-verktyg: Justera ljusstyrka och kontrast" + +#~ msgid "Curves Tool: Adjust color curves" +#~ msgstr "Kurvverktyg: Justera färgkurvor" + +#~ msgid "Levels Tool: Adjust color levels" +#~ msgstr "Nivåverktyg: Justera färgnivåer" + +#~ msgid "X,Y:" +#~ msgstr "X,Y:" + +#~ msgid "Value:" +#~ msgstr "Intensitet:" + +#~ msgid "Alpha:" +#~ msgstr "Alfa:" + +#~ msgid "Green:" +#~ msgstr "Grön:" + +#~ msgid "Blue:" +#~ msgstr "Blå:" + +#~ msgid "Hue:" +#~ msgstr "Nyans:" + +#~ msgid "Sat.:" +#~ msgstr "Mättnad:" + +#~ msgid "Light.:" +#~ msgstr "Ljus.:" + +#~ msgid "Chr.:" +#~ msgstr "Krm.:" + +#~ msgid "Lab_a*:" +#~ msgstr "Lab_a*:" + +#~ msgid "Lab_b*:" +#~ msgstr "Lab_b*:" + +#~ msgid "Cyan:" +#~ msgstr "Cyan:" + +#~ msgid "Magenta:" +#~ msgstr "Magenta:" + +#~ msgid "Yellow:" +#~ msgstr "Gul:" + +#~ msgid "Black:" +#~ msgstr "Svart:" + +#~ msgid "Brush Zoom" +#~ msgstr "Penselzoom" + +#~ msgid "Link brush size with canvas zoom" +#~ msgstr "Länka penselstorlek med dukzoom" + +#~ msgid "Screenshot showing channel mixing and layer editor" +#~ msgstr "Skärmdump som visar kanalmixning och lagerredigeraren" + +#~ msgctxt "drawable-action" +#~ msgid "Invert the colors" +#~ msgstr "Invertera färgerna" + +#~ msgctxt "drawable-action" +#~ msgid "Invert the brightness of each pixel" +#~ msgstr "Invertera ljusheten för varje bildpunkt" + +#~ msgctxt "drawable-action" +#~ msgid "E_rode" +#~ msgstr "E_rodera" + +#~ msgctxt "drawable-action" +#~ msgid "_Visible" +#~ msgstr "_Synlig" + +#~ msgctxt "drawable-action" +#~ msgid "_Linked" +#~ msgstr "_Länkad" + +#~ msgctxt "drawable-action" +#~ msgid "Flip horizontally" +#~ msgstr "Vänd horisontellt" + +#~ msgctxt "drawable-action" +#~ msgid "Flip vertically" +#~ msgstr "Vänd vertikalt" + +#~ msgid "Dilate" +#~ msgstr "Utvidga" + +#~ msgctxt "layers-action" +#~ msgid "Te_xt Tool" +#~ msgstr "Te_xtverktyg" + +#~ msgctxt "vectors-action" +#~ msgid "Path _Tool" +#~ msgstr "_Banverktyg" + +#~ msgctxt "vectors-action" +#~ msgid "_Visible" +#~ msgstr "_Synlig" + +#~ msgctxt "vectors-action" +#~ msgid "_Linked" +#~ msgstr "_Länkad" + +#~ msgctxt "layer-mode-effects" +#~ msgid "Anti erase" +#~ msgstr "Antisudda" + +#~ msgid "" +#~ "Indexed color layers are always scaled without interpolation. The chosen " +#~ "interpolation type will affect channels and layer masks only." +#~ msgstr "" +#~ "Lager med indexerade färger skalas alltid utan interpolation. Den valda " +#~ "interpoleringstypen kommer endast att påverka kanaler och lagermasker." + +#~ msgid "Import Brightness-Contrast settings" +#~ msgstr "Importera inställningar för ljusstyrka-kontrast" + +#~ msgid "Export Brightness-Contrast settings" +#~ msgstr "Exportera inställningar för ljusstyrka-kontrast" + +#~ msgid "Color Balance" +#~ msgstr "Färgbalans" + +#~ msgid "Import Color Balance Settings" +#~ msgstr "Importera inställningar för färgbalans" + +#~ msgid "Export Color Balance Settings" +#~ msgstr "Exportera inställningar för färgbalans" + +#~ msgid "Color Balance operates only on RGB color layers." +#~ msgstr "Färgbalans fungerar endast på RGB-färglager." + +#~ msgid "Adjust Color Balance" +#~ msgstr "Justera färgbalans" + +#~ msgid "Colorize" +#~ msgstr "Färglägg" + +#~ msgid "Colorize Tool: Colorize the image" +#~ msgstr "Färgläggningsverktyg: Färglägg bilden" + +#~ msgid "Import Colorize Settings" +#~ msgstr "Importera färgläggningsinställningar" + +#~ msgid "Export Colorize Settings" +#~ msgstr "Exportera färgläggningsinställningar" + +#~ msgid "Select Color" +#~ msgstr "Välj färg" + +#~ msgid "Import Curves" +#~ msgstr "Importera kurvor" + +#~ msgid "Export Curves" +#~ msgstr "Exportera kurvor" + +#~ msgid "Click to complete selection" +#~ msgstr "Klicka för att färdigställa markeringen" + +#~ msgid "Import Hue-Saturation Settings" +#~ msgstr "Importera inställningar för nyans-mättnad" + +#~ msgid "Export Hue-Saturation Settings" +#~ msgstr "Exportera inställningar för nyans-mättnad" + +#~ msgid "Hue-Saturation operates only on RGB color layers." +#~ msgstr "Nyans-Mättnad fungerar endast på RGB-lager." + +#~ msgid "Adjust Hue / Lightness / Saturation" +#~ msgstr "Justera nyans / ljushet / mättnad" + +#~ msgid "Import Levels" +#~ msgstr "Importera nivåer" + +#~ msgid "Export Levels" +#~ msgstr "Exportera nivåer" + +#~ msgid "Import Threshold Settings" +#~ msgstr "Importera tröskelvärdesinställningar" + +#~ msgid "Export Threshold Settings" +#~ msgstr "Exportera tröskelvärdesinställningar" + +#~ msgctxt "rectangle-tool-fixed-rule" +#~ msgid "Aspect ratio" +#~ msgstr "Aspektförhållande" + +#~ msgctxt "rectangle-tool-fixed-rule" +#~ msgid "Width" +#~ msgstr "Bredd" + +#~ msgctxt "rectangle-tool-fixed-rule" +#~ msgid "Height" +#~ msgstr "Höjd" + +#~ msgctxt "rectangle-tool-fixed-rule" +#~ msgid "Size" +#~ msgstr "Storlek" + +#~ msgid "Wheel" +#~ msgstr "Mushjul" + +#~ msgid "Add settings to favorites" +#~ msgstr "Lägg till inställningar som favoriter" + +#~ msgid "_Manage Settings..." +#~ msgstr "_Hantera inställningar..." + +#~ msgid "Add Settings to Favorites" +#~ msgstr "Lägg till inställningar som favoriter" + +#~ msgctxt "color-frame-mode" +#~ msgid "RGB" +#~ msgstr "RGB" + +#~ msgid "New Channel Options" +#~ msgstr "Alternativ för nya kanaler" + +#~ msgid "New Path Options" +#~ msgstr "Alternativ för ny bana" + +#~ msgid "Expanded as necessary" +#~ msgstr "Expanderad om så behövs" + +#~ msgid "Clipped to image" +#~ msgstr "Klippt efter bilden" + +#~ msgid "Layer Fill Type" +#~ msgstr "Lagrets fyllnadstyp" + +#~ msgid "Reset angle to zero" +#~ msgstr "Återställ vinkel till noll" + +#~ msgid "Channel:" +#~ msgstr "Kanal:" + #~ msgctxt "file-action" #~ msgid "Export" #~ msgstr "Exportera" @@ -21785,48 +25561,6 @@ msgstr "luddig" #~ msgid "Export" #~ msgstr "Exportera" -#, fuzzy -#~| msgctxt "image-convert-action" -#~| msgid "Convert the image to indexed colors" -#~ msgctxt "image-convert-action" -#~ msgid "Convert the image to 8 bit gamma-corrected integer" -#~ msgstr "Konvertera bilden till indexerade färger" - -#, fuzzy -#~| msgctxt "image-convert-action" -#~| msgid "Convert the image to indexed colors" -#~ msgctxt "image-convert-action" -#~ msgid "Convert the image to 16 bit gamma-corrected integer" -#~ msgstr "Konvertera bilden till indexerade färger" - -#, fuzzy -#~| msgctxt "image-convert-action" -#~| msgid "Convert the image to indexed colors" -#~ msgctxt "image-convert-action" -#~ msgid "Convert the image to 32 bit gamma-corrected integer" -#~ msgstr "Konvertera bilden till indexerade färger" - -#, fuzzy -#~| msgctxt "image-convert-action" -#~| msgid "Convert the image to indexed colors" -#~ msgctxt "image-convert-action" -#~ msgid "Convert the image to 16 bit gamma-corrected floating point" -#~ msgstr "Konvertera bilden till indexerade färger" - -#, fuzzy -#~| msgctxt "image-convert-action" -#~| msgid "Convert the image to indexed colors" -#~ msgctxt "image-convert-action" -#~ msgid "Convert the image to 32 bit gamma-corrected floating point" -#~ msgstr "Konvertera bilden till indexerade färger" - -#, fuzzy -#~| msgctxt "image-convert-action" -#~| msgid "Convert the image to indexed colors" -#~ msgctxt "image-convert-action" -#~ msgid "Convert the image to 64 bit gamma-corrected floating point" -#~ msgstr "Konvertera bilden till indexerade färger" - #~ msgctxt "plug-in-action" #~ msgid "_Map" #~ msgstr "_Mappa" @@ -22063,10 +25797,6 @@ msgstr "luddig" #~ msgid "Vertical" #~ msgstr "Vertikal" -#~ msgctxt "select-criterion" -#~ msgid "Composite" -#~ msgstr "Komposit" - #~ msgctxt "select-criterion" #~ msgid "Red" #~ msgstr "Röd" @@ -22124,9 +25854,6 @@ msgstr "luddig" #~ msgid "Could not delete '%s': %s" #~ msgstr "Kunde inte ta bort \"%s\": %s" -#~ msgid "Foreground Extraction" -#~ msgstr "Förgrundsextrahering" - #~ msgid "Hue_Saturation" #~ msgstr "Nyans_Mättnad" diff --git a/po/zh_CN.po b/po/zh_CN.po index 446c4e4cab..94dea4845e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,38 +1,324 @@ -# zh_CN translation of gimp. -# Copyright (C) 2001-2009 Free Software Foundation, Inc. -# Yuheng Xie , 2001-2004. -# Funda Wang , 2003. -# Cai Qian , 2005. -# Shawn Syu , 2008. -# Aron Xu　, 2008-2009. -# 神州散人 , 2008-2009. +# GIMP 的简体中文翻译。 +# Copyright (C) 2001-2018 The GIMP Project +# This file is distributed under the same license as the gimp package. # +# Translators: +# Yuheng Xie , 2001-2004 +# Funda Wang , 2003 +# Cai Qian , 2005 +# Shawn Syu , 2008 +# 神州散人 , 2008-2009 +# James Chai , 2015 +# liushuyu011 , 2015 +# Mingye Wang , 2015 +# Tong Hui , 2015 +# Tony Chyi , 2015 +# Jeff Bai , 2015 +# lumingzh , 2016-2018 +# Boyuan Yang <073plan@gmail.com>, 2018 +# Aron Xu , 2008-2009, 2018 # msgid "" msgstr "" -"Project-Id-Version: gimp HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-06 03:29+0200\n" -"PO-Revision-Date: 2010-09-02 16:04+0800\n" -"Last-Translator: 神州散人 \n" -"Language-Team: Chinese/Simplified \n" +"Project-Id-Version: GIMP-master\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" +"product=gimp&keywords=I18N+L10N&component=Internationalisation\n" +"POT-Creation-Date: 2018-04-11 00:13+0000\n" +"PO-Revision-Date: 2018-04-12 22:20+0800\n" +"Last-Translator: Aron Xu \n" +"Language-Team: Chinese (China) \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:1 #: ../desktop/gimp.desktop.in.in.h:1 ../app/about.h:26 msgid "GNU Image Manipulation Program" msgstr "GNU 图像处理程序" +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:2 +#: ../desktop/gimp.desktop.in.in.h:3 +msgid "Create images and edit photographs" +msgstr "创建图像或编辑照片" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:3 +msgid "" +"GIMP is an acronym for GNU Image Manipulation Program. It is a freely " +"distributed program for such tasks as photo retouching, image composition " +"and image authoring." +msgstr "" +"GIMP 是 GNU 图像处理程序(GNU Image Manipulation Program)的缩写。GIMP 是一个" +"可自由分发的程序，可用于照片的后期处理、图像合成处理和图像出版。" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:4 +msgid "" +"It has many capabilities. It can be used as a simple paint program, an " +"expert quality photo retouching program, an online batch processing system, " +"a mass production image renderer, an image format converter, etc." +msgstr "" +"GIMP 功能强大。它可以作为简单的画图程序、专家级的照片后期程序、在线批处理程序、" +"大批量图像渲染器或者图片格式转化器等。" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:5 +msgid "" +"GIMP is expandable and extensible. It is designed to be augmented with plug-" +"ins and extensions to do just about anything. The advanced scripting " +"interface allows everything from the simplest task to the most complex image " +"manipulation procedures to be easily scripted. GIMP is available for Linux, " +"Microsoft Windows and OS X." +msgstr "" +"GIMP 可扩张亦可拓展。全功能的插件和扩展使其用途广泛。无论" +"是最简单的任务还是最复杂的图像处理过程，GIMP 的先进脚本接口都允许你将它们轻松" +"写成脚本。GIMP 可用于 Linux、Microsoft Windows 和 OS X。" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:6 +msgid "Painting in GIMP" +msgstr "在 GIMP 中绘画" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:7 +msgid "Photo editing in GIMP" +msgstr "在 GIMP 中编辑照片" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:8 +msgid "" +"First release of the 2.10 series which prominently features the port to a " +"new image processing engine, GEGL. The most outstanding changes are:" +msgstr "" +"2.10 系列的第一个发布版本的重要特性为移植到新的图像处理引擎 GEGL 。最显著" +"的改变有：" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:9 +msgid "High bit depth color processing (16/32-bit per color channel)" +msgstr "高位深色彩处理(16/32 位每色彩通道)" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:10 +msgid "" +"Color management is a core feature now, most widgets and preview areas are " +"color-managed" +msgstr "色彩管理现在是一项核心特性，大部分组件和预览区域已获得色彩管理" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:11 +msgid "" +"On-canvas effect preview, with split view for before/after processing pixels" +msgstr "画布上的效果预览，包含对像素处理前/后的分割视图" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:12 +msgid "" +"Multi-threaded and hardware-accelerated rendering, processing and painting" +msgstr "多线程和硬件加速渲染、处理及绘画" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:13 +msgid "Most tools improved, several new transformation tools" +msgstr "大部分工具得到改进，并添加了一些新的变换工具" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:14 +msgid "" +"Improved support for many image formats, in particular better PSD importing" +msgstr "对许多图像格式支持的提升，特别是更好的 PSD 导入支持" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:15 +msgid "Newly supported image formats: OpenEXR, RGBE, WebP, HGT…" +msgstr "新支持的图像格式：OpenEXR、RGBE、WebP、HGT……" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:16 +msgid "" +"Improved digital painting: canvas rotation and flipping, symmetry painting, " +"MyPaint brushes…" +msgstr "数字绘画的提升：画布旋转和翻转、对称绘画、MyPaint 笔刷……" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:17 +msgid "Metadata viewing and editing for Exif, XMP, IPTC, and DICOM" +msgstr "对 Exif、XMP、IPTC 和 DICOM 等元数据的查看和编辑" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:18 +msgid "Basic HiDPI support: automatically or user-selected icon size" +msgstr "基本的高分屏支持：自动或用户选择的图标大小" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:19 +msgid "New themes for GIMP: Light, Gray, Dark, and System" +msgstr "GIMP 的新主题：亮、灰、暗和系统" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:20 +msgid "And much, much more…" +msgstr "还有很多很多……" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:21 +msgid "" +"In this second release candidate before GIMP 2.10.0, while debugging is " +"still a prime target, a new focus has been put on speed and optimization in " +"order to provide a smoother painting experience. Bigger changes are:" +msgstr "" +"在 2.10.0 正式版之前的第二个候选版中，虽然调试仍然是主要目标，但有侧重地" +"进行了流畅度优化，以提供顺滑的绘画体验。较大的改动有：" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:22 +msgid "" +"Major core optimizations for painting and display, including parallelized " +"painting code." +msgstr "对绘画和显示的核心优化，包括并行绘画代码。" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:23 +msgid "Symmetries are now preserved in XCF files (saved as image parasites)." +msgstr "对称绘画可被保存在 XCF 文件中(作为图像内嵌信息)。" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:24 +msgid "" +"\"Light\" and \"Dark\" themes rewritten from scratch to get rid of various " +"usability issues. \"Lighter\" and \"Darker\" themes removed." +msgstr "" +"从零重写“亮”和“暗”主题以避免一些可用性问题。删除了“更亮”和“更暗”主题。" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:25 +msgid "" +"New GimpToolGyroscope on-canvas control, currently used for the Panorama " +"Projection filter. The widget provides on-canvas interaction for 3D rotation " +"(yaw, pitch, roll)." +msgstr "" +"用于全景设计滤镜的全新 GimpToolGyroscope 画布上控制。该组件为 3D 旋转" +"(偏离、前冲、转动)提供了画布上的交互。" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:26 +msgid "" +"Plug-in debugging improved to output stack traces from plug-ins with --stack-" +"trace-mode command line option not only on receiving signals but also on " +"warnings and critical errors when \"fatal-warnings\" debug key is set." +msgstr "" +"对当“fatal-warnings”键值被设置时，不仅在接受信号上而且在警告和严重错误上，从" +"带有 --stack-trace-mode 命令行选项插件的输出堆栈追溯的插件调试提升。" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:27 +msgid "" +"For more information, see https://www.gimp.org/news/2018/04/14/gimp-2-10-rc2-" +"released/" +msgstr "" +"更多信息，请参阅 https://www.gimp.org/news/2018/04/14/gimp-2-10-rc2-released/" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:28 +msgid "" +"GIMP 2.10.0-RC1 is the first release candidate before GIMP 2.10.0 stable " +"release, with a focus on debugging and stability. Other than the many bug " +"fixes, most notable improvements are:" +msgstr "" +"GIMP 2.10-RC1 是 GIMP 2.10 稳定版发布之前的第一个候选版本，重点关注调试和稳" +"定性。除了非常多的缺陷修复，最引人注目的提升有：" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:29 +msgid "New dashboard dockable to monitor GIMP resource usage" +msgstr "新的仪表盘停靠栏用以监控 GIMP 的资源占用" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:30 +msgid "" +"New debug dialog to produce back traces and other debug data, encouraging to " +"report bugs" +msgstr "新的调试对话框用以生成追溯和其他调试数据，并鼓励用户报告缺陷" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:31 +msgid "Unsaved images can now be recovered after a crash" +msgstr "未保存的图像现在可以在崩溃后恢复" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:32 +msgid "Layer masks on layer groups" +msgstr "图层组上的图层蒙板" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:33 +msgid "JPEG 2000 support improved for high bit depth and various color spaces" +msgstr "对 JPEG 2000 高位深和多种色彩空间支持的改进" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:34 +msgid "Screenshot and color picking improved on various platforms" +msgstr "截图和颜色拾取在多种平台上的提升" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:35 +msgid "Metadata defaults preferences now available" +msgstr "增加元数据默认配置" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:36 +msgid "Various GUI polishing" +msgstr "多处用户界面优化" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:37 +msgid "" +"For more information, see https://www.gimp.org/news/2018/03/23/gimp-2-10-rc1-" +"released/" +msgstr "" +"更多信息，请参阅 https://www.gimp.org/news/2018/03/23/gimp-2-10-rc1-released/" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:38 +msgid "" +"GIMP 2.9.8 introduces on-canvas gradient editing and various enhancements " +"while focusing on bugfixing and stability." +msgstr "" +"GIMP 2.9.8 在聚焦缺陷修复和稳定性的同时引入了画布上渐变编辑和多处增强。" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:39 +msgid "On-canvas gradient editing" +msgstr "画布上渐变编辑" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:40 +msgid "Notification when an image is over/underexposed" +msgstr "当图像过曝/欠曝时提醒" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:41 +msgid "Better and faster color management" +msgstr "更好且更快的色彩管理" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:42 +msgid "Support for color picker and screenshots in Wayland on KDE Plasma" +msgstr "支持在 KDE Plasma 的 Wayland 环境中的颜色拾取器和截图" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:43 +msgid "Paste in place feature" +msgstr "粘贴至原位特性" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:44 +msgid "Many usability improvements" +msgstr "很多可用性提升" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:45 +msgid "Manual can be displayed in the user's preferred language" +msgstr "手册可以用户的偏好语言显示" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:46 +msgid "Improvements for the Wavelet Decompose filter" +msgstr "对小波分解滤镜的改进" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:47 +msgid "Improved compatibility with Photoshop .psd files" +msgstr "改进与 Photoshop .psd 文件的兼容性" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:48 +msgid "New support for password-protected PDF" +msgstr "新增密码保护 PDF 支持" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:49 +msgid "New support for HGT format (Digital Elevation Model data)" +msgstr "新增 HGT 格式(数字高程模型数据)支持" + +#: ../desktop/org.gimp.GIMP.appdata.xml.in.in.h:50 +msgid "" +"For more information, see https://www.gimp.org/news/2017/12/12/gimp-2-9-8-" +"released/" +msgstr "" +"更多信息，请参阅 https://www.gimp.org/news/2017/12/12/gimp-2-9-8-released/" + +#: ../desktop/gimp-data-extras.metainfo.xml.in.h:1 +msgid "Extra files for GIMP" +msgstr "GIMP 的额外文件" + +#: ../desktop/gimp-data-extras.metainfo.xml.in.h:2 +msgid "Patterns, gradients, and other extra files for GIMP" +msgstr "GIMP 的图案、渐变和其他额外文件" + #: ../desktop/gimp.desktop.in.in.h:2 msgid "Image Editor" msgstr "图像编辑器" -#: ../desktop/gimp.desktop.in.in.h:3 -msgid "Create images and edit photographs" -msgstr "创建图像或编辑照片" +#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../desktop/gimp.desktop.in.in.h:5 +msgid "GIMP;graphic;design;illustration;painting;" +msgstr "GIMP;图形;设计;绘画;graphic;design;illustration;painting;" #: ../app/about.h:23 msgid "GIMP" @@ -45,10 +331,15 @@ msgid "" "Copyright © 1995-%s\n" "Spencer Kimball, Peter Mattis and the GIMP Development Team" msgstr "" -"版权所有 (C) 1995-%s\n" +"Copyright © 1995-%s\n" "Spencer Kimball，Peter Mattis 和 GIMP 开发小组" -#: ../app/about.h:34 +#. TRANSLATORS: do not end the license URL with a dot, because it would +#. * be in the link. Because of technical limitations, make sure the URL +#. * ends with a space, a newline or is end of text. +#. * Cf. bug 762282. +#. +#: ../app/about.h:39 msgid "" "GIMP is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -61,165 +352,160 @@ msgid "" "details.\n" "\n" "You should have received a copy of the GNU General Public License along with " -"GIMP. If not, see http://www.gnu.org/licenses/." +"GIMP. If not, see: http://www.gnu.org/licenses/" msgstr "" -"GIMP 是一个自由软件；您可以在遵守由自由软件基金会发布的 GNU 通用公共许可协议" -"的情况下重新分发并且(或者)修改软件；或第三版许可协议，或(根据您的选择)任何更" +"GIMP 是自由软件；您可以在遵守由自由软件基金会发布的 GNU 通用公共许可协议的情" +"况下重新分发并且(或者)修改软件；或第三版许可协议，或(根据您的选择)任何更" "新版本。\n" "\n" -"GIMP 本着可应用的意愿分发，但不做任何保证；甚至没有商业性的或对特定目的适用性" -"的暗指。更多细节请参看 GNU 通用公共许可协议。\n" +"GIMP 本着可用的意愿分发，但不作任何担保；甚至没有商业性的或对特定目的适用性的" +"暗指。更多细节请参看 GNU 通用公共许可协议。\n" "\n" -"您应该已经随 GIMP 收到一份 GNU 通用公共许可协议；如果没有，见 。" +"您应该随 GIMP 收到一份 GNU 通用公共许可协议。否则请参阅：http://www.gnu.org/" +"licenses/" -#: ../app/app.c:224 +#: ../app/gimp-version.c:66 ../app/gimp-version.c:164 #, c-format -msgid "" -"Unable to open a test swap file.\n" -"\n" -"To avoid data loss, please check the location and permissions of the swap " -"directory defined in your Preferences (currently \"%s\")." -msgstr "" -"无法打开测试交换文件。\n" -"\n" -"为了避免数据丢失，请检查您在首选项中定义的交换目录的位置以及权限(当前" -"为“%s”)。" +msgid "using %s version %s (compiled against version %s)" +msgstr "使用 %s 版本 %s (针对版本 %s 编译)" -#: ../app/batch.c:77 +#: ../app/gimp-version.c:192 #, c-format -msgid "No batch interpreter specified, using the default '%s'.\n" -msgstr "没有指定批处理解释器，使用默认的“%s”。\n" +msgid "%s version %s" +msgstr "%s 版本 %s" -#: ../app/batch.c:95 ../app/batch.c:113 -#, c-format -msgid "The batch interpreter '%s' is not available. Batch mode disabled." -msgstr "批处理解析程序“%s”不可用。批处理模式已被禁用。" - -#: ../app/main.c:148 +#: ../app/main.c:157 msgid "Show version information and exit" msgstr "显示版本信息并退出" -#: ../app/main.c:153 +#: ../app/main.c:162 msgid "Show license information and exit" msgstr "显示许可信息并退出" -#: ../app/main.c:158 +#: ../app/main.c:167 msgid "Be more verbose" -msgstr "更详细" +msgstr "输出更详细信息" -#: ../app/main.c:163 +#: ../app/main.c:172 msgid "Start a new GIMP instance" msgstr "启动一个新的 GIMP 实例" -#: ../app/main.c:168 +#: ../app/main.c:177 msgid "Open images as new" -msgstr "作为新建图像打开" +msgstr "作为新图像打开" -#: ../app/main.c:173 +#: ../app/main.c:182 msgid "Run without a user interface" -msgstr "运行时不提供用户界面" +msgstr "不以图形界面运行" -#: ../app/main.c:178 +#: ../app/main.c:187 msgid "Do not load brushes, gradients, patterns, ..." -msgstr "不加载画笔、渐变、图案等" +msgstr "不加载笔刷、渐变、图案……" -#: ../app/main.c:183 +#: ../app/main.c:192 msgid "Do not load any fonts" -msgstr "不装入任何字体" +msgstr "不加载任何字体" -#: ../app/main.c:188 +#: ../app/main.c:197 msgid "Do not show a splash screen" -msgstr "不显示溅射窗口" +msgstr "不显示启动画面" -#: ../app/main.c:193 -msgid "Do not use shared memory between GIMP and plugins" +#: ../app/main.c:202 +msgid "Do not use shared memory between GIMP and plug-ins" msgstr "不在 GIMP 和插件之间使用共享内存" -#: ../app/main.c:198 +#: ../app/main.c:207 msgid "Do not use special CPU acceleration functions" -msgstr "不使用特定 CPU 加速" +msgstr "不使用特殊 CPU 加速功能" -#: ../app/main.c:203 +#: ../app/main.c:212 msgid "Use an alternate sessionrc file" -msgstr "使用别的 sessionrc 文件" +msgstr "使用代替的 sessionrc 文件" -#: ../app/main.c:208 +#: ../app/main.c:217 msgid "Use an alternate user gimprc file" -msgstr "使用别的用户 gimprc 文件" +msgstr "使用代替的用户 gimprc 文件" -#: ../app/main.c:213 +#: ../app/main.c:222 msgid "Use an alternate system gimprc file" -msgstr "使用别的系统 gimprc 文件" +msgstr "使用代替的系统 gimprc 文件" -#: ../app/main.c:218 +#: ../app/main.c:227 msgid "Batch command to run (can be used multiple times)" msgstr "要运行的批处理命令(可以使用多次)" -#: ../app/main.c:223 +#: ../app/main.c:232 msgid "The procedure to process batch commands with" msgstr "处理批处理命令的过程" -#: ../app/main.c:228 +#: ../app/main.c:237 msgid "Send messages to console instead of using a dialog" msgstr "在控制台而不是对话框中显示警告信息" #. don't translate the mode names (off|on|warn) -#: ../app/main.c:234 +#: ../app/main.c:243 msgid "PDB compatibility mode (off|on|warn)" msgstr "PDB 兼容模式(off|on|warn)" #. don't translate the mode names (never|query|always) -#: ../app/main.c:240 +#: ../app/main.c:249 msgid "Debug in case of a crash (never|query|always)" msgstr "崩溃时调试(never|query|always)" -#: ../app/main.c:245 +#: ../app/main.c:254 msgid "Enable non-fatal debugging signal handlers" msgstr "启用非致命调试信号处理程序" -#: ../app/main.c:250 +#: ../app/main.c:259 msgid "Make all warnings fatal" msgstr "将所有警告作为致命的" -#: ../app/main.c:255 +#: ../app/main.c:264 msgid "Output a gimprc file with default settings" msgstr "输出默认设置的 gimprc 文件" -#: ../app/main.c:271 +#: ../app/main.c:280 msgid "Output a sorted list of deprecated procedures in the PDB" -msgstr "" +msgstr "排序列出 PDB 中的已弃用过程" -#: ../app/main.c:387 +#: ../app/main.c:285 +msgid "Show a preferences page with experimental features" +msgstr "显示带有实验性特性的首选项页面" + +#: ../app/main.c:290 +msgid "Show an image submenu with debug actions" +msgstr "显示带有调试动作的图像子菜单" + +#: ../app/main.c:466 msgid "[FILE|URI...]" -msgstr "[文件|URI...]" +msgstr "[文件|URI…]" -#: ../app/main.c:405 +#: ../app/main.c:484 msgid "" "GIMP could not initialize the graphical user interface.\n" "Make sure a proper setup for your display environment exists." msgstr "" "GIMP 无法初始化图形用户界面。\n" -"请确定您的显示环境已经正确安装。" +"请确定您已正确安装和配置显示环境。" -#: ../app/main.c:424 +#: ../app/main.c:503 msgid "Another GIMP instance is already running." -msgstr "另一个 GIMP 实例已在运行中。" +msgstr "另一个 GIMP 实例已在运行。" -#: ../app/main.c:494 +#: ../app/main.c:594 msgid "GIMP output. Type any character to close this window." -msgstr "GIMP 输出。键入任意字符关闭此窗口。" +msgstr "GIMP 输出。键入任意字符以关闭此窗口。" -#: ../app/main.c:495 +#: ../app/main.c:595 #, c-format msgid "(Type any character to close this window)\n" msgstr "(键入任意字符关闭本窗口)\n" -#: ../app/main.c:512 +#: ../app/main.c:612 msgid "GIMP output. You can minimize this window, but don't close it." -msgstr "GIMP 输出。您可以最小化此窗口，但不要关闭它。" +msgstr "GIMP 输出。您可以最小化该窗口，但请不要关闭窗口。" -#: ../app/sanity.c:433 +#: ../app/sanity.c:562 #, c-format msgid "" "The configured filename encoding cannot be converted to UTF-8: %s\n" @@ -230,7 +516,7 @@ msgstr "" "\n" "请检查环境变量 G_FILENAME_ENCODING 的值。" -#: ../app/sanity.c:452 +#: ../app/sanity.c:581 #, c-format msgid "" "The name of the directory holding the GIMP user configuration cannot be " @@ -242,320 +528,324 @@ msgid "" msgstr "" "保存有 GIMP 用户配置的目录的名字无法转换到 UTF-8：%s\n" "\n" -"多数可能是您的文件系统储存文件所用的编码不是 UTF-8 而您却没有告知 GLib 这一" -"点。请设置环境变量 G_FILENAME_ENCODING。" +"多数可能是您的文件系统储存文件所用的编码不是 UTF-8 但 GLib 对此不知情。" +"请设置环境变量 G_FILENAME_ENCODING。" -#. show versions of libraries used by GIMP -#: ../app/version.c:63 ../app/version.c:130 -#, c-format -msgid "using %s version %s (compiled against version %s)" -msgstr "使用%s版本 %s (以%s为基础编译)" - -#: ../app/version.c:138 -#, c-format -msgid "%s version %s" -msgstr "%s 版本 %s" - -#: ../app/actions/actions.c:110 ../app/dialogs/dialogs.c:390 +#: ../app/actions/actions.c:111 ../app/dialogs/dialogs.c:420 #: ../app/widgets/gimpbrusheditor.c:89 msgid "Brush Editor" -msgstr "画笔编辑器" +msgstr "笔刷编辑器" #. initialize the list of gimp brushes -#: ../app/actions/actions.c:113 ../app/core/gimp.c:951 -#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2740 +#: ../app/actions/actions.c:114 ../app/core/gimp-data-factories.c:317 +#: ../app/dialogs/dialogs.c:335 ../app/dialogs/preferences-dialog.c:3092 msgid "Brushes" -msgstr "画笔" +msgstr "笔刷" -#: ../app/actions/actions.c:116 ../app/dialogs/dialogs.c:329 +#: ../app/actions/actions.c:117 ../app/dialogs/dialogs.c:356 msgid "Buffers" msgstr "缓冲区" -#: ../app/actions/actions.c:119 ../app/dialogs/dialogs.c:348 +#: ../app/actions/actions.c:120 ../app/dialogs/dialogs.c:374 +#: ../app/widgets/gimppickablepopup.c:249 msgid "Channels" msgstr "通道" -#: ../app/actions/actions.c:122 ../app/dialogs/convert-dialog.c:174 -#: ../app/dialogs/dialogs.c:356 +#: ../app/actions/actions.c:123 ../app/dialogs/convert-indexed-dialog.c:174 +#: ../app/dialogs/dialogs.c:382 msgid "Colormap" msgstr "颜色表" -#: ../app/actions/actions.c:125 -msgid "Configuration" -msgstr "配置" - -#: ../app/actions/actions.c:128 +#: ../app/actions/actions.c:126 msgid "Context" msgstr "环境" -#: ../app/actions/actions.c:131 ../app/dialogs/dialogs.c:312 +#: ../app/actions/actions.c:129 ../app/dialogs/dialogs.c:322 msgid "Pointer Information" msgstr "指针信息" -#: ../app/actions/actions.c:134 +#: ../app/actions/actions.c:132 ../app/dialogs/dialogs.c:326 +msgid "Dashboard" +msgstr "仪表盘" + +#: ../app/actions/actions.c:135 msgid "Debug" msgstr "调试" -#: ../app/actions/actions.c:137 +#: ../app/actions/actions.c:138 msgid "Dialogs" msgstr "对话框" -#: ../app/actions/actions.c:140 +#: ../app/actions/actions.c:141 msgid "Dock" -msgstr "停靠" +msgstr "Dock" -#: ../app/actions/actions.c:143 +#: ../app/actions/actions.c:144 msgid "Dockable" msgstr "可停靠" #. Document History -#: ../app/actions/actions.c:146 ../app/dialogs/dialogs.c:331 -#: ../app/dialogs/preferences-dialog.c:1574 +#: ../app/actions/actions.c:147 ../app/dialogs/dialogs.c:362 +#: ../app/dialogs/preferences-dialog.c:1201 msgid "Document History" msgstr "文档历史" -#: ../app/actions/actions.c:149 +#: ../app/actions/actions.c:150 msgid "Drawable" msgstr "可绘对象" -#. Some things do not have grids, so just list -#: ../app/actions/actions.c:152 ../app/dialogs/dialogs.c:337 +#: ../app/actions/actions.c:153 ../app/dialogs/dialogs.c:338 msgid "Paint Dynamics" msgstr "动态绘图" -#: ../app/actions/actions.c:155 ../app/dialogs/dialogs.c:394 -#: ../app/widgets/gimpdynamicseditor.c:93 +#: ../app/actions/actions.c:156 ../app/dialogs/dialogs.c:424 +#: ../app/widgets/gimpdynamicseditor.c:97 msgid "Paint Dynamics Editor" msgstr "动态绘图编辑器" -#: ../app/actions/actions.c:158 +#: ../app/actions/actions.c:159 msgid "Edit" msgstr "编辑" -#: ../app/actions/actions.c:161 ../app/dialogs/dialogs.c:308 +#: ../app/actions/actions.c:162 ../app/dialogs/dialogs.c:318 msgid "Error Console" msgstr "错误控制台" -#: ../app/actions/actions.c:164 +#: ../app/actions/actions.c:165 msgid "File" msgstr "文件" -#: ../app/actions/actions.c:167 -#, fuzzy +#: ../app/actions/actions.c:168 msgid "Filters" -msgstr "滤镜(_R)" +msgstr "滤镜" -#: ../app/actions/actions.c:170 ../app/dialogs/dialogs.c:327 -#: ../app/dialogs/preferences-dialog.c:2760 +#: ../app/actions/actions.c:171 ../app/dialogs/dialogs.c:353 +#: ../app/dialogs/preferences-dialog.c:3112 msgid "Fonts" msgstr "字体" -#: ../app/actions/actions.c:173 ../app/dialogs/dialogs.c:398 -#: ../app/widgets/gimpgradienteditor.c:270 +#: ../app/actions/actions.c:174 ../app/dialogs/dialogs.c:428 +#: ../app/widgets/gimpgradienteditor.c:271 msgid "Gradient Editor" msgstr "渐变编辑器" #. initialize the list of gimp gradients -#: ../app/actions/actions.c:176 ../app/core/gimp.c:971 -#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2756 +#: ../app/actions/actions.c:177 ../app/core/gimp-data-factories.c:342 +#: ../app/dialogs/dialogs.c:347 ../app/dialogs/preferences-dialog.c:3108 msgid "Gradients" msgstr "渐变" -#: ../app/actions/actions.c:179 ../app/core/gimp.c:983 -#: ../app/dialogs/dialogs.c:339 ../app/dialogs/preferences-dialog.c:2764 +#: ../app/actions/actions.c:180 ../app/core/gimp-data-factories.c:353 +#: ../app/dialogs/dialogs.c:359 ../app/dialogs/preferences-dialog.c:3116 msgid "Tool Presets" -msgstr "工具预设值" +msgstr "工具预设" -#: ../app/actions/actions.c:182 ../app/dialogs/dialogs.c:406 -#: ../app/widgets/gimptoolpreseteditor.c:93 +#: ../app/actions/actions.c:183 ../app/dialogs/dialogs.c:436 +#: ../app/widgets/gimptoolpreseteditor.c:94 msgid "Tool Preset Editor" -msgstr "工具预设值编辑器" +msgstr "工具预设编辑器" -#: ../app/actions/actions.c:185 +#: ../app/actions/actions.c:186 msgid "Help" msgstr "帮助" -#: ../app/actions/actions.c:188 +#: ../app/actions/actions.c:189 msgid "Image" msgstr "图像" -#. list & grid views -#: ../app/actions/actions.c:191 ../app/dialogs/dialogs.c:317 +#: ../app/actions/actions.c:192 ../app/dialogs/dialogs.c:332 +#: ../app/widgets/gimppickablepopup.c:179 msgid "Images" msgstr "图像" -#: ../app/actions/actions.c:194 ../app/dialogs/dialogs.c:344 -#: ../app/dialogs/resize-dialog.c:287 +#: ../app/actions/actions.c:195 ../app/dialogs/dialogs.c:370 +#: ../app/dialogs/resize-dialog.c:144 ../app/widgets/gimppickablepopup.c:230 msgid "Layers" msgstr "图层" -#: ../app/actions/actions.c:197 ../app/dialogs/dialogs.c:402 -#: ../app/widgets/gimppaletteeditor.c:144 +#. initialize the list of mypaint brushes +#: ../app/actions/actions.c:198 ../app/core/gimp-data-factories.c:327 +#: ../app/dialogs/dialogs.c:341 ../app/dialogs/preferences-dialog.c:3120 +msgid "MyPaint Brushes" +msgstr "MyPaint 笔刷" + +#: ../app/actions/actions.c:201 ../app/dialogs/dialogs.c:432 +#: ../app/widgets/gimppaletteeditor.c:149 msgid "Palette Editor" msgstr "色板编辑器" #. initialize the list of gimp palettes -#: ../app/actions/actions.c:200 ../app/core/gimp.c:966 -#: ../app/dialogs/dialogs.c:325 ../app/dialogs/preferences-dialog.c:2752 +#: ../app/actions/actions.c:204 ../app/core/gimp-data-factories.c:337 +#: ../app/dialogs/dialogs.c:350 ../app/dialogs/preferences-dialog.c:3104 msgid "Palettes" msgstr "色板" #. initialize the list of gimp patterns -#: ../app/actions/actions.c:203 ../app/core/gimp.c:961 -#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2748 +#: ../app/actions/actions.c:207 ../app/core/gimp-data-factories.c:332 +#: ../app/dialogs/dialogs.c:344 ../app/dialogs/preferences-dialog.c:3100 msgid "Patterns" msgstr "图案" -#: ../app/actions/actions.c:206 ../app/dialogs/preferences-dialog.c:2768 -msgid "Plug-Ins" +#: ../app/actions/actions.c:210 ../app/dialogs/preferences-dialog.c:3124 +msgid "Plug-ins" msgstr "插件" #. Quick Mask Color -#: ../app/actions/actions.c:209 ../app/core/gimpchannel.c:385 -#: ../app/dialogs/preferences-dialog.c:2026 +#: ../app/actions/actions.c:213 ../app/core/gimpchannel.c:383 +#: ../app/dialogs/preferences-dialog.c:1684 msgid "Quick Mask" msgstr "快速蒙板" -#: ../app/actions/actions.c:212 ../app/dialogs/dialogs.c:372 +#: ../app/actions/actions.c:216 ../app/dialogs/dialogs.c:402 msgid "Sample Points" msgstr "采样点" -#: ../app/actions/actions.c:215 +#: ../app/actions/actions.c:219 msgid "Select" msgstr "选择" #. initialize the template list -#: ../app/actions/actions.c:218 ../app/core/gimp.c:989 -#: ../app/dialogs/dialogs.c:333 +#: ../app/actions/actions.c:222 ../app/core/gimp.c:797 +#: ../app/dialogs/dialogs.c:365 msgid "Templates" msgstr "模板" -#: ../app/actions/actions.c:221 +#: ../app/actions/actions.c:225 msgid "Text Tool" msgstr "文字工具" -#: ../app/actions/actions.c:224 +#: ../app/actions/actions.c:228 msgid "Text Editor" -msgstr "文本编辑器" +msgstr "文字编辑器" -#: ../app/actions/actions.c:227 ../app/dialogs/dialogs.c:300 -#: ../app/dialogs/preferences-dialog.c:1855 ../app/gui/gui.c:424 +#: ../app/actions/actions.c:231 ../app/dialogs/dialogs.c:310 +#: ../app/gui/gui.c:550 msgid "Tool Options" msgstr "工具选项" -#: ../app/actions/actions.c:230 ../app/widgets/gimptoolpalette.c:389 +#: ../app/actions/actions.c:234 ../app/widgets/gimptoolpalette.c:329 msgid "Tools" msgstr "工具" -#: ../app/actions/actions.c:233 ../app/dialogs/dialogs.c:352 -#: ../app/tools/gimpvectortool.c:160 +#: ../app/actions/actions.c:237 ../app/dialogs/dialogs.c:378 +#: ../app/tools/gimpvectortool.c:163 msgid "Paths" msgstr "路径" -#: ../app/actions/actions.c:236 +#: ../app/actions/actions.c:240 msgid "View" msgstr "查看" -#: ../app/actions/actions.c:239 +#: ../app/actions/actions.c:243 msgid "Windows" msgstr "窗口" #. value description and new value shown in the status bar -#: ../app/actions/actions.c:588 +#: ../app/actions/actions.c:593 #, c-format msgid "%s: %.2f" msgstr "%s: %.2f" #. value description and new value shown in the status bar -#: ../app/actions/actions.c:614 +#: ../app/actions/actions.c:619 #, c-format msgid "%s: %d" -msgstr "%s：%d" +msgstr "%s: %d" #: ../app/actions/brush-editor-actions.c:43 msgctxt "brush-editor-action" msgid "Brush Editor Menu" -msgstr "画笔编辑器菜单" +msgstr "笔刷编辑器菜单" #: ../app/actions/brush-editor-actions.c:50 msgctxt "brush-editor-action" msgid "Edit Active Brush" -msgstr "编辑活动画笔" +msgstr "编辑活动笔刷" #: ../app/actions/brushes-actions.c:43 msgctxt "brushes-action" msgid "Brushes Menu" -msgstr "画笔菜单" +msgstr "笔刷菜单" #: ../app/actions/brushes-actions.c:47 msgctxt "brushes-action" msgid "_Open Brush as Image" -msgstr "作为图像打开画笔(_O)" +msgstr "将笔刷作为图像打开(_O)" #: ../app/actions/brushes-actions.c:48 msgctxt "brushes-action" msgid "Open brush as image" -msgstr "作为图像打开画笔" +msgstr "将笔刷作为图像打开" #: ../app/actions/brushes-actions.c:53 msgctxt "brushes-action" msgid "_New Brush" -msgstr "新建画笔(_N)" +msgstr "新建笔刷(_N)" #: ../app/actions/brushes-actions.c:54 msgctxt "brushes-action" msgid "Create a new brush" -msgstr "创建新画笔" +msgstr "创建新笔刷" #: ../app/actions/brushes-actions.c:59 msgctxt "brushes-action" msgid "D_uplicate Brush" -msgstr "复制画笔(_U)" +msgstr "复制笔刷(_U)" #: ../app/actions/brushes-actions.c:60 msgctxt "brushes-action" msgid "Duplicate this brush" -msgstr "复制此画笔" +msgstr "复制此笔刷" #: ../app/actions/brushes-actions.c:65 msgctxt "brushes-action" msgid "Copy Brush _Location" -msgstr "复制画笔位置(_L)" +msgstr "复制笔刷位置(_L)" #: ../app/actions/brushes-actions.c:66 msgctxt "brushes-action" msgid "Copy brush file location to clipboard" -msgstr "将画笔文件位置复制到剪贴板" +msgstr "将笔刷文件位置复制到剪贴板" #: ../app/actions/brushes-actions.c:71 msgctxt "brushes-action" -msgid "_Delete Brush" -msgstr "删除画笔(_D)" +msgid "Show in _File Manager" +msgstr "在文件管理器中显示(_F)" #: ../app/actions/brushes-actions.c:72 msgctxt "brushes-action" -msgid "Delete this brush" -msgstr "删除此画笔" +msgid "Show brush file location in the file manager" +msgstr "在文件管理器中显示笔刷文件的位置" #: ../app/actions/brushes-actions.c:77 msgctxt "brushes-action" -msgid "_Refresh Brushes" -msgstr "刷新画笔(_R)" +msgid "_Delete Brush" +msgstr "删除笔刷(_D)" #: ../app/actions/brushes-actions.c:78 msgctxt "brushes-action" -msgid "Refresh brushes" -msgstr "刷新画笔" +msgid "Delete this brush" +msgstr "删除此笔刷" -#: ../app/actions/brushes-actions.c:86 +#: ../app/actions/brushes-actions.c:83 +msgctxt "brushes-action" +msgid "_Refresh Brushes" +msgstr "刷新笔刷(_R)" + +#: ../app/actions/brushes-actions.c:84 +msgctxt "brushes-action" +msgid "Refresh brushes" +msgstr "刷新笔刷" + +#: ../app/actions/brushes-actions.c:92 msgctxt "brushes-action" msgid "_Edit Brush..." -msgstr "编辑画笔(_E)..." +msgstr "编辑笔刷(_E)…" -#: ../app/actions/brushes-actions.c:87 +#: ../app/actions/brushes-actions.c:93 msgctxt "brushes-action" msgid "Edit this brush" -msgstr "编辑此画笔" +msgstr "编辑此笔刷" #: ../app/actions/buffers-actions.c:42 msgctxt "buffers-action" @@ -564,278 +854,498 @@ msgstr "缓冲区菜单" #: ../app/actions/buffers-actions.c:46 msgctxt "buffers-action" -msgid "_Paste Buffer" -msgstr "粘贴缓冲区(_P)" - -#: ../app/actions/buffers-actions.c:47 -msgctxt "buffers-action" -msgid "Paste the selected buffer" -msgstr "粘贴选中的缓冲区" - -#: ../app/actions/buffers-actions.c:52 -msgctxt "buffers-action" -msgid "Paste Buffer _Into" -msgstr "粘贴缓冲区进入(_I)" - -#: ../app/actions/buffers-actions.c:53 -msgctxt "buffers-action" -msgid "Paste the selected buffer into the selection" -msgstr "将选中的缓冲区粘贴到选区中" - -#: ../app/actions/buffers-actions.c:58 -msgctxt "buffers-action" -msgid "Paste Buffer as _New" +msgid "Paste Buffer as _New Image" msgstr "粘贴缓冲区为新图像(_N)" -#: ../app/actions/buffers-actions.c:59 +#: ../app/actions/buffers-actions.c:47 msgctxt "buffers-action" msgid "Paste the selected buffer as a new image" msgstr "将选中的缓冲区粘贴为新图像" -#: ../app/actions/buffers-actions.c:64 +#: ../app/actions/buffers-actions.c:52 msgctxt "buffers-action" msgid "_Delete Buffer" msgstr "删除缓冲区(_D)" -#: ../app/actions/buffers-actions.c:65 +#: ../app/actions/buffers-actions.c:53 msgctxt "buffers-action" msgid "Delete the selected buffer" msgstr "删除选中的缓冲区" -#: ../app/actions/channels-actions.c:44 +#: ../app/actions/buffers-actions.c:61 +msgctxt "buffers-action" +msgid "_Paste Buffer" +msgstr "粘贴缓冲区(_P)" + +#: ../app/actions/buffers-actions.c:62 +msgctxt "buffers-action" +msgid "Paste the selected buffer" +msgstr "粘贴选中的缓冲区" + +#: ../app/actions/buffers-actions.c:67 +msgctxt "buffers-action" +msgid "Paste Buffer In Pl_ace" +msgstr "粘贴缓冲区至原位(_A)" + +#: ../app/actions/buffers-actions.c:68 +msgctxt "buffers-action" +msgid "Paste the selected buffer at its original position" +msgstr "将选中的缓冲区粘贴到其原位" + +#: ../app/actions/buffers-actions.c:73 +msgctxt "buffers-action" +msgid "Paste Buffer _Into The Selection" +msgstr "粘贴缓冲区至选区(_I)" + +#: ../app/actions/buffers-actions.c:74 +msgctxt "buffers-action" +msgid "Paste the selected buffer into the selection" +msgstr "将选中的缓冲区粘贴到选区中" + +#: ../app/actions/buffers-actions.c:79 +msgctxt "buffers-action" +msgid "Paste Buffer Into The Selection In Place" +msgstr "在原位粘贴缓冲区至选区" + +#: ../app/actions/buffers-actions.c:81 +msgctxt "buffers-action" +msgid "Paste the selected buffer into the selection at its original position" +msgstr "将选中的缓冲区在其原位粘贴到选区中" + +#: ../app/actions/buffers-actions.c:86 +msgctxt "buffers-action" +msgid "Paste Buffer as New _Layer" +msgstr "粘贴缓冲区为新图层(_L)" + +#: ../app/actions/buffers-actions.c:87 +msgctxt "buffers-action" +msgid "Paste the selected buffer as a new layer" +msgstr "将选中的缓冲区粘贴为新图层" + +#: ../app/actions/buffers-actions.c:92 +msgctxt "buffers-action" +msgid "Paste Buffer as New Layer in Place" +msgstr "在原位粘贴缓冲区为新图层" + +#: ../app/actions/buffers-actions.c:94 +msgctxt "buffers-action" +msgid "Paste the selected buffer as a new layer at its original position" +msgstr "将选中的缓冲区在其原位粘贴为新图层" + +#: ../app/actions/channels-actions.c:45 msgctxt "channels-action" msgid "Channels Menu" msgstr "通道菜单" -#: ../app/actions/channels-actions.c:48 -msgctxt "channels-action" -msgid "_Edit Channel Attributes..." -msgstr "编辑通道属性(_E)..." - #: ../app/actions/channels-actions.c:49 msgctxt "channels-action" -msgid "Edit the channel's name, color and opacity" -msgstr "编辑通道名称、颜色和不透明度" +msgid "Color Tag" +msgstr "颜色标签" + +#: ../app/actions/channels-actions.c:53 +msgctxt "channels-action" +msgid "_Edit Channel Attributes..." +msgstr "编辑通道属性(_E)…" #: ../app/actions/channels-actions.c:54 msgctxt "channels-action" -msgid "_New Channel..." -msgstr "新建通道(_N)..." +msgid "Edit the channel's name, color and opacity" +msgstr "编辑通道名字、颜色和不透明度" -#: ../app/actions/channels-actions.c:55 +#: ../app/actions/channels-actions.c:59 +msgctxt "channels-action" +msgid "_New Channel..." +msgstr "新建通道(_N)…" + +#: ../app/actions/channels-actions.c:60 msgctxt "channels-action" msgid "Create a new channel" msgstr "创建新通道" -#: ../app/actions/channels-actions.c:60 +#: ../app/actions/channels-actions.c:65 msgctxt "channels-action" msgid "_New Channel" msgstr "新建通道(_N)" -#: ../app/actions/channels-actions.c:61 +#: ../app/actions/channels-actions.c:66 msgctxt "channels-action" msgid "Create a new channel with last used values" msgstr "按上次使用的值新建通道" -#: ../app/actions/channels-actions.c:66 +#: ../app/actions/channels-actions.c:71 msgctxt "channels-action" msgid "D_uplicate Channel" msgstr "复制通道(_U)" -#: ../app/actions/channels-actions.c:68 +#: ../app/actions/channels-actions.c:73 msgctxt "channels-action" msgid "Create a duplicate of this channel and add it to the image" -msgstr "创建此通道的复本并添加到图像" +msgstr "创建此通道的副本并添加到图像" -#: ../app/actions/channels-actions.c:73 +#: ../app/actions/channels-actions.c:78 msgctxt "channels-action" msgid "_Delete Channel" msgstr "删除通道(_D)" -#: ../app/actions/channels-actions.c:74 +#: ../app/actions/channels-actions.c:79 msgctxt "channels-action" msgid "Delete this channel" msgstr "删除此通道" -#: ../app/actions/channels-actions.c:79 +#: ../app/actions/channels-actions.c:84 msgctxt "channels-action" msgid "_Raise Channel" -msgstr "升高通道(_R)" - -#: ../app/actions/channels-actions.c:80 -msgctxt "channels-action" -msgid "Raise this channel one step in the channel stack" -msgstr "在通道栈中使此通道升高一步" +msgstr "上移通道(_R)" #: ../app/actions/channels-actions.c:85 msgctxt "channels-action" -msgid "Raise Channel to _Top" -msgstr "通道升至顶端(_T)" +msgid "Raise this channel one step in the channel stack" +msgstr "在通道栈中使此通道上移一步" -#: ../app/actions/channels-actions.c:87 +#: ../app/actions/channels-actions.c:90 msgctxt "channels-action" -msgid "Raise this channel to the top of the channel stack" -msgstr "升高此通道至通道栈的顶端" +msgid "Raise Channel to _Top" +msgstr "通道移至顶部(_T)" #: ../app/actions/channels-actions.c:92 msgctxt "channels-action" -msgid "_Lower Channel" -msgstr "降低通道(_L)" +msgid "Raise this channel to the top of the channel stack" +msgstr "上移此通道至通道栈的顶部" -#: ../app/actions/channels-actions.c:93 +#: ../app/actions/channels-actions.c:97 msgctxt "channels-action" -msgid "Lower this channel one step in the channel stack" -msgstr "在通道栈中使此通道降低一步" +msgid "_Lower Channel" +msgstr "下移通道(_L)" #: ../app/actions/channels-actions.c:98 msgctxt "channels-action" -msgid "Lower Channel to _Bottom" -msgstr "通道降至底端(_B)" +msgid "Lower this channel one step in the channel stack" +msgstr "在通道栈中使此通道下移一步" -#: ../app/actions/channels-actions.c:100 +#: ../app/actions/channels-actions.c:103 +msgctxt "channels-action" +msgid "Lower Channel to _Bottom" +msgstr "通道移至底部(_B)" + +#: ../app/actions/channels-actions.c:105 msgctxt "channels-action" msgid "Lower this channel to the bottom of the channel stack" -msgstr "降低此通道至通道栈底端" +msgstr "下移此通道至通道栈底部" -#: ../app/actions/channels-actions.c:108 +#: ../app/actions/channels-actions.c:113 +msgctxt "channels-action" +msgid "Toggle Channel _Visibility" +msgstr "切换通道可见性(_V)" + +#: ../app/actions/channels-actions.c:119 +msgctxt "channels-action" +msgid "Toggle Channel _Linked State" +msgstr "切换通道链接状态(_L)" + +#. GIMP_ICON_LOCK +#: ../app/actions/channels-actions.c:125 +msgctxt "channels-action" +msgid "L_ock Pixels of Channel" +msgstr "锁定通道像素(_O)" + +#: ../app/actions/channels-actions.c:131 +msgctxt "channels-action" +msgid "L_ock Position of Channel" +msgstr "锁定通道位置(_O)" + +#: ../app/actions/channels-actions.c:140 +msgctxt "channels-action" +msgid "None" +msgstr "无" + +#: ../app/actions/channels-actions.c:141 +msgctxt "channels-action" +msgid "Channel Color Tag: Clear" +msgstr "通道颜色标签：清空" + +#: ../app/actions/channels-actions.c:146 +msgctxt "channels-action" +msgid "Blue" +msgstr "蓝色" + +#: ../app/actions/channels-actions.c:147 +msgctxt "channels-action" +msgid "Channel Color Tag: Set to Blue" +msgstr "通道颜色标签：设为蓝色" + +#: ../app/actions/channels-actions.c:152 +msgctxt "channels-action" +msgid "Green" +msgstr "绿色" + +#: ../app/actions/channels-actions.c:153 +msgctxt "channels-action" +msgid "Channel Color Tag: Set to Green" +msgstr "通道颜色标签：设为绿色" + +#: ../app/actions/channels-actions.c:158 +msgctxt "channels-action" +msgid "Yellow" +msgstr "黄色" + +#: ../app/actions/channels-actions.c:159 +msgctxt "channels-action" +msgid "Channel Color Tag: Set to Yellow" +msgstr "通道颜色标签：设为黄色" + +#: ../app/actions/channels-actions.c:164 +msgctxt "channels-action" +msgid "Orange" +msgstr "橙色" + +#: ../app/actions/channels-actions.c:165 +msgctxt "channels-action" +msgid "Channel Color Tag: Set to Orange" +msgstr "通道颜色标签：设为橙色" + +#: ../app/actions/channels-actions.c:170 +msgctxt "channels-action" +msgid "Brown" +msgstr "棕色" + +#: ../app/actions/channels-actions.c:171 +msgctxt "channels-action" +msgid "Channel Color Tag: Set to Brown" +msgstr "通道颜色标签：设为棕色" + +#: ../app/actions/channels-actions.c:176 +msgctxt "channels-action" +msgid "Red" +msgstr "红色" + +#: ../app/actions/channels-actions.c:177 +msgctxt "channels-action" +msgid "Channel Color Tag: Set to Red" +msgstr "通道颜色标签：设为红色" + +#: ../app/actions/channels-actions.c:182 +msgctxt "channels-action" +msgid "Violet" +msgstr "紫色" + +#: ../app/actions/channels-actions.c:183 +msgctxt "channels-action" +msgid "Channel Color Tag: Set to Violet" +msgstr "通道颜色标签：设为紫色" + +#: ../app/actions/channels-actions.c:188 +msgctxt "channels-action" +msgid "Gray" +msgstr "灰色" + +#: ../app/actions/channels-actions.c:189 +msgctxt "channels-action" +msgid "Channel Color Tag: Set to Gray" +msgstr "通道颜色标签：设为灰色" + +#: ../app/actions/channels-actions.c:197 msgctxt "channels-action" msgid "Channel to Sele_ction" msgstr "通道到选区(_C)" -#: ../app/actions/channels-actions.c:109 +#: ../app/actions/channels-actions.c:198 msgctxt "channels-action" msgid "Replace the selection with this channel" msgstr "用此通道替换选区" -#: ../app/actions/channels-actions.c:114 +#: ../app/actions/channels-actions.c:203 msgctxt "channels-action" msgid "_Add to Selection" msgstr "添加到选区(_A)" -#: ../app/actions/channels-actions.c:115 +#: ../app/actions/channels-actions.c:204 msgctxt "channels-action" msgid "Add this channel to the current selection" msgstr "将此通道添加到当前选区" -#: ../app/actions/channels-actions.c:120 +#: ../app/actions/channels-actions.c:209 msgctxt "channels-action" msgid "_Subtract from Selection" msgstr "从选区中减去(_S)" -#: ../app/actions/channels-actions.c:121 +#: ../app/actions/channels-actions.c:210 msgctxt "channels-action" msgid "Subtract this channel from the current selection" msgstr "从当前选区中减去此通道" -#: ../app/actions/channels-actions.c:126 +#: ../app/actions/channels-actions.c:215 msgctxt "channels-action" msgid "_Intersect with Selection" msgstr "与选区相交(_I)" -#: ../app/actions/channels-actions.c:127 +#: ../app/actions/channels-actions.c:216 msgctxt "channels-action" msgid "Intersect this channel with the current selection" msgstr "将此通道与当前选区相交" -#: ../app/actions/channels-commands.c:85 -#: ../app/actions/channels-commands.c:402 +#: ../app/actions/channels-actions.c:224 +msgctxt "channels-action" +msgid "Select _Top Channel" +msgstr "选择顶端通道(_T)" + +#: ../app/actions/channels-actions.c:225 +msgctxt "channels-action" +msgid "Select the topmost channel" +msgstr "选择最顶端通道" + +#: ../app/actions/channels-actions.c:230 +msgctxt "channels-action" +msgid "Select _Bottom Channel" +msgstr "选择底端通道(_B)" + +#: ../app/actions/channels-actions.c:231 +msgctxt "channels-action" +msgid "Select the bottommost channel" +msgstr "选择最底端通道" + +#: ../app/actions/channels-actions.c:236 +msgctxt "channels-action" +msgid "Select _Previous Channel" +msgstr "选择前一通道(_P)" + +#: ../app/actions/channels-actions.c:237 +msgctxt "channels-action" +msgid "Select the channel above the current channel" +msgstr "选择当前通道上方的通道" + +#: ../app/actions/channels-actions.c:242 +msgctxt "channels-action" +msgid "Select _Next Channel" +msgstr "选择后一通道(_N)" + +#: ../app/actions/channels-actions.c:243 +msgctxt "channels-action" +msgid "Select the channel below the current channel" +msgstr "选择当前通道下方的通道" + +#: ../app/actions/channels-commands.c:111 +#: ../app/actions/channels-commands.c:517 msgid "Channel Attributes" msgstr "通道属性" -#: ../app/actions/channels-commands.c:88 +#: ../app/actions/channels-commands.c:114 msgid "Edit Channel Attributes" msgstr "编辑通道属性" -#: ../app/actions/channels-commands.c:90 +#: ../app/actions/channels-commands.c:116 msgid "Edit Channel Color" msgstr "编辑通道颜色" -#: ../app/actions/channels-commands.c:91 -#: ../app/actions/channels-commands.c:123 +#: ../app/actions/channels-commands.c:117 +#: ../app/actions/channels-commands.c:162 msgid "_Fill opacity:" msgstr "填充不透明度(_F)：" -#: ../app/actions/channels-commands.c:116 ../app/core/gimpchannel.c:270 -#: ../app/widgets/gimpchanneltreeview.c:331 -msgid "Channel" -msgstr "通道" - -#: ../app/actions/channels-commands.c:117 -#: ../app/actions/channels-commands.c:159 -#: ../app/widgets/gimpchanneltreeview.c:326 +#: ../app/actions/channels-commands.c:156 +#: ../app/widgets/gimpchanneltreeview.c:327 msgid "New Channel" msgstr "新建通道" -#: ../app/actions/channels-commands.c:120 -msgid "New Channel Options" -msgstr "新建通道选项" +#: ../app/actions/channels-commands.c:159 +msgid "Create a New Channel" +msgstr "创建一个新通道" -#: ../app/actions/channels-commands.c:122 +#: ../app/actions/channels-commands.c:161 msgid "New Channel Color" msgstr "新建通道颜色" -#: ../app/actions/channels-commands.c:244 ../app/core/gimpimage-new.c:256 -#: ../app/display/gimpdisplayshell-dnd.c:628 +#: ../app/actions/channels-commands.c:274 ../app/core/gimpimage-new.c:278 +#: ../app/display/gimpdisplayshell-dnd.c:670 #: ../app/widgets/gimpchanneltreeview.c:258 -#: ../app/widgets/gimplayertreeview.c:776 +#: ../app/widgets/gimplayertreeview.c:805 #, c-format msgid "%s Channel Copy" msgstr "%s 通道副本" -#: ../app/actions/colormap-actions.c:44 +#: ../app/actions/colormap-actions.c:45 msgctxt "colormap-action" msgid "Colormap Menu" msgstr "颜色表菜单" -#: ../app/actions/colormap-actions.c:48 +#: ../app/actions/colormap-actions.c:49 msgctxt "colormap-action" msgid "_Edit Color..." -msgstr "编辑颜色(_E)..." +msgstr "编辑颜色(_E)…" -#: ../app/actions/colormap-actions.c:49 +#: ../app/actions/colormap-actions.c:50 msgctxt "colormap-action" msgid "Edit this color" msgstr "编辑此颜色" -#: ../app/actions/colormap-actions.c:57 +#: ../app/actions/colormap-actions.c:58 msgctxt "colormap-action" msgid "_Add Color from FG" msgstr "添加前景色(_A)" -#: ../app/actions/colormap-actions.c:58 +#: ../app/actions/colormap-actions.c:59 msgctxt "colormap-action" msgid "Add current foreground color" msgstr "添加当前前景色" -#: ../app/actions/colormap-actions.c:63 +#: ../app/actions/colormap-actions.c:64 msgctxt "colormap-action" msgid "_Add Color from BG" msgstr "添加背景色(_A)" -#: ../app/actions/colormap-actions.c:64 +#: ../app/actions/colormap-actions.c:65 msgctxt "colormap-action" msgid "Add current background color" msgstr "添加当前背景色" -#: ../app/actions/colormap-commands.c:73 +#: ../app/actions/colormap-actions.c:73 +msgctxt "colormap-action" +msgid "_Select this Color" +msgstr "选择此颜色(_S)" + +#: ../app/actions/colormap-actions.c:74 +msgctxt "colormap-action" +msgid "Select all pixels with this color" +msgstr "选中所有此颜色的像素点" + +#: ../app/actions/colormap-actions.c:79 +msgctxt "colormap-action" +msgid "_Add to Selection" +msgstr "添加到选区(_A)" + +#: ../app/actions/colormap-actions.c:80 +msgctxt "colormap-action" +msgid "Add all pixels with this color to the current selection" +msgstr "将所有此颜色的像素添加到选区" + +#: ../app/actions/colormap-actions.c:85 +msgctxt "colormap-action" +msgid "_Subtract from Selection" +msgstr "从选区中减去(_S)" + +#: ../app/actions/colormap-actions.c:86 +msgctxt "colormap-action" +msgid "Subtract all pixels with this color from the current selection" +msgstr "从当前选区去除所有此颜色的像素" + +#: ../app/actions/colormap-actions.c:91 +msgctxt "colormap-action" +msgid "_Intersect with Selection" +msgstr "与选区相交(_I)" + +#: ../app/actions/colormap-actions.c:92 +msgctxt "colormap-action" +msgid "Intersect all pixels with this color with the current selection" +msgstr "将所有此颜色的像素与当前选区相交" + +#: ../app/actions/colormap-commands.c:74 #, c-format msgid "Edit colormap entry #%d" msgstr "编辑颜色表项 #%d" -#: ../app/actions/colormap-commands.c:80 +#: ../app/actions/colormap-commands.c:81 msgid "Edit Colormap Entry" msgstr "编辑颜色表项" -#: ../app/actions/config-actions.c:38 -msgctxt "config-action" -msgid "Use _GEGL" -msgstr "使用 _GEGL" - -#: ../app/actions/config-actions.c:39 -msgctxt "config-action" -msgid "If possible, use GEGL for image processing" -msgstr "尽可能的使用 GEGL 处理图像" - #: ../app/actions/context-actions.c:47 msgctxt "context-action" msgid "_Context" @@ -854,7 +1364,7 @@ msgstr "不透明度(_O)" #: ../app/actions/context-actions.c:53 msgctxt "context-action" msgid "Paint _Mode" -msgstr "涂画模式(_M)" +msgstr "绘画模式(_M)" #: ../app/actions/context-actions.c:55 msgctxt "context-action" @@ -864,7 +1374,7 @@ msgstr "工具(_T)" #: ../app/actions/context-actions.c:57 msgctxt "context-action" msgid "_Brush" -msgstr "画笔(_B)" +msgstr "笔刷(_B)" #: ../app/actions/context-actions.c:59 msgctxt "context-action" @@ -899,7 +1409,7 @@ msgstr "半径(_R)" #: ../app/actions/context-actions.c:72 msgctxt "context-action" msgid "S_pikes" -msgstr "穗数(_P)" +msgstr "尖数(_P)" #: ../app/actions/context-actions.c:74 msgctxt "context-action" @@ -936,48 +1446,1218 @@ msgctxt "context-action" msgid "Exchange foreground and background colors" msgstr "交换前景色和背景色" -#: ../app/actions/context-commands.c:427 +#: ../app/actions/context-actions.c:97 +msgctxt "context-action" +msgid "Foreground: Set Color From Palette" +msgstr "前景：从色板设置颜色" + +#: ../app/actions/context-actions.c:101 +msgctxt "context-action" +msgid "Foreground: Use First Palette Color" +msgstr "前景：使用色板第一个颜色" + +#: ../app/actions/context-actions.c:105 +msgctxt "context-action" +msgid "Foreground: Use Last Palette Color" +msgstr "前景：使用色板最后一个颜色" + +#: ../app/actions/context-actions.c:109 +msgctxt "context-action" +msgid "Foreground: Use Previous Palette Color" +msgstr "前景：使用色板前一个颜色" + +#: ../app/actions/context-actions.c:113 +msgctxt "context-action" +msgid "Foreground: Use Next Palette Color" +msgstr "前景：使用色板下一个颜色" + +#: ../app/actions/context-actions.c:117 +msgctxt "context-action" +msgid "Foreground: Skip Back Palette Color" +msgstr "前景：后跳色板颜色" + +#: ../app/actions/context-actions.c:121 +msgctxt "context-action" +msgid "Foreground: Skip Forward Palette Color" +msgstr "前景：前跳色板颜色" + +#: ../app/actions/context-actions.c:129 +msgctxt "context-action" +msgid "Background: Set Color From Palette" +msgstr "背景：从色板设置颜色" + +#: ../app/actions/context-actions.c:133 +msgctxt "context-action" +msgid "Background: Use First Palette Color" +msgstr "背景：使用色板第一个颜色" + +#: ../app/actions/context-actions.c:137 +msgctxt "context-action" +msgid "Background: Use Last Palette Color" +msgstr "背景：使用色板最后一个颜色" + +#: ../app/actions/context-actions.c:141 +msgctxt "context-action" +msgid "Background: Use Previous Palette Color" +msgstr "背景：使用色板前一个颜色" + +#: ../app/actions/context-actions.c:145 +msgctxt "context-action" +msgid "Background: Use Next Palette Color" +msgstr "背景：使用色板下一个颜色" + +#: ../app/actions/context-actions.c:149 +msgctxt "context-action" +msgid "Background: Skip Back Palette Color" +msgstr "背景：后跳色板颜色" + +#: ../app/actions/context-actions.c:153 +msgctxt "context-action" +msgid "Background: Skip Forward Palette Color" +msgstr "背景：前跳色板颜色" + +#: ../app/actions/context-actions.c:161 +msgctxt "context-action" +msgid "Foreground: Set Color From Colormap" +msgstr "前景：从颜色表设置颜色" + +#: ../app/actions/context-actions.c:165 +msgctxt "context-action" +msgid "Foreground: Use First Color From Colormap" +msgstr "前景：使用颜色表第一个颜色" + +#: ../app/actions/context-actions.c:169 +msgctxt "context-action" +msgid "Foreground: Use Last Color From Colormap" +msgstr "前景：使用颜色表最后一个颜色" + +#: ../app/actions/context-actions.c:173 +msgctxt "context-action" +msgid "Foreground: Use Previous Color From Colormap" +msgstr "前景：使用颜色表前一个颜色" + +#: ../app/actions/context-actions.c:177 +msgctxt "context-action" +msgid "Foreground: Use Next Color From Colormap" +msgstr "前景：使用颜色表下一个颜色" + +#: ../app/actions/context-actions.c:181 +msgctxt "context-action" +msgid "Foreground: Skip Back Color From Colormap" +msgstr "前景：后跳颜色表颜色" + +#: ../app/actions/context-actions.c:185 +msgctxt "context-action" +msgid "Foreground: Skip Forward Color From Colormap" +msgstr "前景：前跳颜色表颜色" + +#: ../app/actions/context-actions.c:193 +msgctxt "context-action" +msgid "Background: Set Color From Colormap" +msgstr "背景：从颜色表设置颜色" + +#: ../app/actions/context-actions.c:197 +msgctxt "context-action" +msgid "Background: Use First Color From Colormap" +msgstr "背景：使用颜色表第一个颜色" + +#: ../app/actions/context-actions.c:201 +msgctxt "context-action" +msgid "Background: Use Last Color From Colormap" +msgstr "背景：使用颜色表最后一个颜色" + +#: ../app/actions/context-actions.c:205 +msgctxt "context-action" +msgid "Background: Use Previous Color From Colormap" +msgstr "背景：使用颜色表前一个颜色" + +#: ../app/actions/context-actions.c:209 +msgctxt "context-action" +msgid "Background: Use Next Color From Colormap" +msgstr "背景：使用颜色表下一个颜色" + +#: ../app/actions/context-actions.c:213 +msgctxt "context-action" +msgid "Background: Skip Back Color From Colormap" +msgstr "背景：后跳颜色表颜色" + +#: ../app/actions/context-actions.c:217 +msgctxt "context-action" +msgid "Background: Skip Forward Color From Colormap" +msgstr "背景：前跳颜色表颜色" + +#: ../app/actions/context-actions.c:225 +msgctxt "context-action" +msgid "Foreground: Set Color From Swatch" +msgstr "前景：从样本设置颜色" + +#: ../app/actions/context-actions.c:229 +msgctxt "context-action" +msgid "Foreground: Use First Color From Swatch" +msgstr "前景：使用样本第一个颜色" + +#: ../app/actions/context-actions.c:233 +msgctxt "context-action" +msgid "Foreground: Use Last Color From Swatch" +msgstr "前景：使用样本最后一个颜色" + +#: ../app/actions/context-actions.c:237 +msgctxt "context-action" +msgid "Foreground: Use Previous Color From Swatch" +msgstr "前景：使用样本前一个颜色" + +#: ../app/actions/context-actions.c:241 +msgctxt "context-action" +msgid "Foreground: Use Next Color From Swatch" +msgstr "前景：使用样本下一个颜色" + +#: ../app/actions/context-actions.c:245 +msgctxt "context-action" +msgid "Foreground: Skip Back Color From Swatch" +msgstr "前景：后跳样本颜色" + +#: ../app/actions/context-actions.c:249 +msgctxt "context-action" +msgid "Foreground: Skip Forward Color From Swatch" +msgstr "前景：前跳样本颜色" + +#: ../app/actions/context-actions.c:257 +msgctxt "context-action" +msgid "Background: Set Color From Swatch" +msgstr "背景：从样本设置颜色" + +#: ../app/actions/context-actions.c:261 +msgctxt "context-action" +msgid "Background: Use First Color From Swatch" +msgstr "背景：使用样本第一个颜色" + +#: ../app/actions/context-actions.c:265 +msgctxt "context-action" +msgid "Background: Use Last Color From Swatch" +msgstr "背景：使用样本最后一个颜色" + +#: ../app/actions/context-actions.c:269 +msgctxt "context-action" +msgid "Background: Use Previous Color From Swatch" +msgstr "背景：使用样本前一个颜色" + +#: ../app/actions/context-actions.c:273 +msgctxt "context-action" +msgid "Background: Use Next Color From Swatch" +msgstr "背景：使用样本下一个颜色" + +#: ../app/actions/context-actions.c:277 +msgctxt "context-action" +msgid "Background: Skip Color Back From Swatch" +msgstr "背景：后跳样本颜色" + +#: ../app/actions/context-actions.c:281 +msgctxt "context-action" +msgid "Background: Skip Color Forward From Swatch" +msgstr "背景：前跳样本颜色" + +#: ../app/actions/context-actions.c:289 +msgctxt "context-action" +msgid "Foreground Red: Set" +msgstr "前景红色：设置" + +#: ../app/actions/context-actions.c:293 +msgctxt "context-action" +msgid "Foreground Red: Set to Minimum" +msgstr "前景红色：设为最小值" + +#: ../app/actions/context-actions.c:297 +msgctxt "context-action" +msgid "Foreground Red: Set to Maximum" +msgstr "前景红色：设为最大值" + +#: ../app/actions/context-actions.c:301 +msgctxt "context-action" +msgid "Foreground Red: Decrease by 1%" +msgstr "前景红色：减少 1%" + +#: ../app/actions/context-actions.c:305 +msgctxt "context-action" +msgid "Foreground Red: Increase by 1%" +msgstr "前景红色：增加 1%" + +#: ../app/actions/context-actions.c:309 +msgctxt "context-action" +msgid "Foreground Red: Decrease by 10%" +msgstr "前景红色：减少 10%" + +#: ../app/actions/context-actions.c:313 +msgctxt "context-action" +msgid "Foreground Red: Increase by 10%" +msgstr "前景红色：增加 10%" + +#: ../app/actions/context-actions.c:321 +msgctxt "context-action" +msgid "Foreground Green: Set" +msgstr "前景绿色：设置" + +#: ../app/actions/context-actions.c:325 +msgctxt "context-action" +msgid "Foreground Green: Set to Minimum" +msgstr "前景绿色：设为最小值" + +#: ../app/actions/context-actions.c:329 +msgctxt "context-action" +msgid "Foreground Green: Set to Maximum" +msgstr "前景绿色：设为最大值" + +#: ../app/actions/context-actions.c:333 +msgctxt "context-action" +msgid "Foreground Green: Decrease by 1%" +msgstr "前景绿色：减少 1%" + +#: ../app/actions/context-actions.c:337 +msgctxt "context-action" +msgid "Foreground Green: Increase by 1%" +msgstr "前景绿色：增加 1%" + +#: ../app/actions/context-actions.c:341 +msgctxt "context-action" +msgid "Foreground Green: Decrease by 10%" +msgstr "前景绿色：减少 10%" + +#: ../app/actions/context-actions.c:345 +msgctxt "context-action" +msgid "Foreground Green: Increase by 10%" +msgstr "前景绿色：增加 10%" + +#: ../app/actions/context-actions.c:353 +msgctxt "context-action" +msgid "Foreground Blue: Set" +msgstr "前景蓝色：设置" + +#: ../app/actions/context-actions.c:357 +msgctxt "context-action" +msgid "Foreground Blue: Set to Minimum" +msgstr "前景蓝色：设为最小值" + +#: ../app/actions/context-actions.c:361 +msgctxt "context-action" +msgid "Foreground Blue: Set to Maximum" +msgstr "前景蓝色：设为最大值" + +#: ../app/actions/context-actions.c:365 +msgctxt "context-action" +msgid "Foreground Blue: Decrease by 1%" +msgstr "前景蓝色：减少 1%" + +#: ../app/actions/context-actions.c:369 +msgctxt "context-action" +msgid "Foreground Blue: Increase by 1%" +msgstr "前景蓝色：增加 1%" + +#: ../app/actions/context-actions.c:373 +msgctxt "context-action" +msgid "Foreground Blue: Decrease by 10%" +msgstr "前景蓝色：减少 10%" + +#: ../app/actions/context-actions.c:377 +msgctxt "context-action" +msgid "Foreground Blue: Increase by 10%" +msgstr "前景蓝色：增加 10%" + +#: ../app/actions/context-actions.c:385 +msgctxt "context-action" +msgid "Background Red: Set" +msgstr "背景红色：设置" + +#: ../app/actions/context-actions.c:389 +msgctxt "context-action" +msgid "Background Red: Set to Minimum" +msgstr "背景红色：设为最小值" + +#: ../app/actions/context-actions.c:393 +msgctxt "context-action" +msgid "Background Red: Set to Maximum" +msgstr "背景红色：设为最大值" + +#: ../app/actions/context-actions.c:397 +msgctxt "context-action" +msgid "Background Red: Decrease by 1%" +msgstr "背景红色：减少 1%" + +#: ../app/actions/context-actions.c:401 +msgctxt "context-action" +msgid "Background Red: Increase by 1%" +msgstr "背景红色：增加 1%" + +#: ../app/actions/context-actions.c:405 +msgctxt "context-action" +msgid "Background Red: Decrease by 10%" +msgstr "背景红色：减少 10%" + +#: ../app/actions/context-actions.c:409 +msgctxt "context-action" +msgid "Background Red: Increase by 10%" +msgstr "背景红色：增加 10%" + +#: ../app/actions/context-actions.c:417 +msgctxt "context-action" +msgid "Background Green: Set" +msgstr "背景绿色：设置" + +#: ../app/actions/context-actions.c:421 +msgctxt "context-action" +msgid "Background Green: Set to Minimum" +msgstr "背景绿色：设为最小值" + +#: ../app/actions/context-actions.c:425 +msgctxt "context-action" +msgid "Background Green: Set to Maximum" +msgstr "背景绿色：设为最大值" + +#: ../app/actions/context-actions.c:429 +msgctxt "context-action" +msgid "Background Green: Decrease by 1%" +msgstr "背景绿色：减少 1%" + +#: ../app/actions/context-actions.c:433 +msgctxt "context-action" +msgid "Background Green: Increase by 1%" +msgstr "背景绿色：增加 1%" + +#: ../app/actions/context-actions.c:437 +msgctxt "context-action" +msgid "Background Green: Decrease by 10%" +msgstr "背景绿色：减少 10%" + +#: ../app/actions/context-actions.c:441 +msgctxt "context-action" +msgid "Background Green: Increase by 10%" +msgstr "背景绿色：增加 10%" + +#: ../app/actions/context-actions.c:449 +msgctxt "context-action" +msgid "Background Blue: Set" +msgstr "背景蓝色：设置" + +#: ../app/actions/context-actions.c:453 +msgctxt "context-action" +msgid "Background Blue: Set to Minimum" +msgstr "背景蓝色：设为最小值" + +#: ../app/actions/context-actions.c:457 +msgctxt "context-action" +msgid "Background Blue: Set to Maximum" +msgstr "背景蓝色：设为最大值" + +#: ../app/actions/context-actions.c:461 +msgctxt "context-action" +msgid "Background Blue: Decrease by 1%" +msgstr "背景蓝色：减少 1%" + +#: ../app/actions/context-actions.c:465 +msgctxt "context-action" +msgid "Background Blue: Increase by 1%" +msgstr "背景蓝色：增加 1%" + +#: ../app/actions/context-actions.c:469 +msgctxt "context-action" +msgid "Background Blue: Decrease by 10%" +msgstr "背景蓝色：减少 10%" + +#: ../app/actions/context-actions.c:473 +msgctxt "context-action" +msgid "Background Blue: Increase by 10%" +msgstr "背景蓝色：增加 10%" + +#: ../app/actions/context-actions.c:481 +msgctxt "context-action" +msgid "Foreground Hue: Set" +msgstr "前景色相：设置" + +#: ../app/actions/context-actions.c:485 +msgctxt "context-action" +msgid "Foreground Hue: Set to Minimum" +msgstr "前景色相：设为最小值" + +#: ../app/actions/context-actions.c:489 +msgctxt "context-action" +msgid "Foreground Hue: Set to Maximum" +msgstr "前景色相：设为最大值" + +#: ../app/actions/context-actions.c:493 +msgctxt "context-action" +msgid "Foreground Hue: Decrease by 1%" +msgstr "前景色相：减少 1%" + +#: ../app/actions/context-actions.c:497 +msgctxt "context-action" +msgid "Foreground Hue: Increase by 1%" +msgstr "前景色相：增加 1%" + +#: ../app/actions/context-actions.c:501 +msgctxt "context-action" +msgid "Foreground Hue: Decrease by 10%" +msgstr "前景色相：减少 10%" + +#: ../app/actions/context-actions.c:505 +msgctxt "context-action" +msgid "Foreground Hue: Increase by 10%" +msgstr "前景色相：增加 10%" + +#: ../app/actions/context-actions.c:513 +msgctxt "context-action" +msgid "Foreground Saturation: Set" +msgstr "前景饱和度：设置" + +#: ../app/actions/context-actions.c:517 +msgctxt "context-action" +msgid "Foreground Saturation: Set to Minimum" +msgstr "前景饱和度：设为最小值" + +#: ../app/actions/context-actions.c:521 +msgctxt "context-action" +msgid "Foreground Saturation: Set to Maximum" +msgstr "前景饱和度：设为最大值" + +#: ../app/actions/context-actions.c:525 +msgctxt "context-action" +msgid "Foreground Saturation: Decrease by 1%" +msgstr "前景饱和度：减少 1%" + +#: ../app/actions/context-actions.c:529 +msgctxt "context-action" +msgid "Foreground Saturation: Increase by 1%" +msgstr "前景饱和度：增加 1%" + +#: ../app/actions/context-actions.c:533 +msgctxt "context-action" +msgid "Foreground Saturation: Decrease by 10%" +msgstr "前景饱和度：减少 10%" + +#: ../app/actions/context-actions.c:537 +msgctxt "context-action" +msgid "Foreground Saturation: Increase by 10%" +msgstr "前景饱和度：增加 10%" + +#: ../app/actions/context-actions.c:545 +msgctxt "context-action" +msgid "Foreground Value: Set" +msgstr "前景明度：设置" + +#: ../app/actions/context-actions.c:549 +msgctxt "context-action" +msgid "Foreground Value: Set to Minimum" +msgstr "前景明度：设为最小值" + +#: ../app/actions/context-actions.c:553 +msgctxt "context-action" +msgid "Foreground Value: Set to Maximum" +msgstr "前景明度：设为最大值" + +#: ../app/actions/context-actions.c:557 +msgctxt "context-action" +msgid "Foreground Value: Decrease by 1%" +msgstr "前景明度：减少 1%" + +#: ../app/actions/context-actions.c:561 +msgctxt "context-action" +msgid "Foreground Value: Increase by 1%" +msgstr "前景明度：增加 1%" + +#: ../app/actions/context-actions.c:565 +msgctxt "context-action" +msgid "Foreground Value: Decrease by 10%" +msgstr "前景明度：减少 10%" + +#: ../app/actions/context-actions.c:569 +msgctxt "context-action" +msgid "Foreground Value: Increase by 10%" +msgstr "前景明度：增加 10%" + +#: ../app/actions/context-actions.c:577 +msgctxt "context-action" +msgid "Background Hue: Set" +msgstr "背景色相：设置" + +#: ../app/actions/context-actions.c:581 +msgctxt "context-action" +msgid "Background Hue: Set to Minimum" +msgstr "背景色相：设为最小值" + +#: ../app/actions/context-actions.c:585 +msgctxt "context-action" +msgid "Background Hue: Set to Maximum" +msgstr "背景色相：设为最大值" + +#: ../app/actions/context-actions.c:589 +msgctxt "context-action" +msgid "Background Hue: Decrease by 1%" +msgstr "背景色相：减少 1%" + +#: ../app/actions/context-actions.c:593 +msgctxt "context-action" +msgid "Background Hue: Increase by 1%" +msgstr "背景色相：增加 1%" + +#: ../app/actions/context-actions.c:597 +msgctxt "context-action" +msgid "Background Hue: Decrease by 10%" +msgstr "背景色相：减少 10%" + +#: ../app/actions/context-actions.c:601 +msgctxt "context-action" +msgid "Background Hue: Increase by 10%" +msgstr "背景色相：增加 10%" + +#: ../app/actions/context-actions.c:609 +msgctxt "context-action" +msgid "Background Saturation: Set" +msgstr "背景饱和度：设置" + +#: ../app/actions/context-actions.c:613 +msgctxt "context-action" +msgid "Background Saturation: Set to Minimum" +msgstr "背景饱和度：设为最小值" + +#: ../app/actions/context-actions.c:617 +msgctxt "context-action" +msgid "Background Saturation: Set to Maximum" +msgstr "背景饱和度：设为最大值" + +#: ../app/actions/context-actions.c:621 +msgctxt "context-action" +msgid "Background Saturation: Decrease by 1%" +msgstr "背景饱和度：减少 1%" + +#: ../app/actions/context-actions.c:625 +msgctxt "context-action" +msgid "Background Saturation: Increase by 1%" +msgstr "背景饱和度：增加 1%" + +#: ../app/actions/context-actions.c:629 +msgctxt "context-action" +msgid "Background Saturation: Decrease by 10%" +msgstr "背景饱和度：减少 10%" + +#: ../app/actions/context-actions.c:633 +msgctxt "context-action" +msgid "Background Saturation: Increase by 10%" +msgstr "背景饱和度：增加 10%" + +#: ../app/actions/context-actions.c:641 +msgctxt "context-action" +msgid "Background Value: Set" +msgstr "背景明度：设置" + +#: ../app/actions/context-actions.c:645 +msgctxt "context-action" +msgid "Background Value: Set to Minimum" +msgstr "背景明度：设为最小值" + +#: ../app/actions/context-actions.c:649 +msgctxt "context-action" +msgid "Background Value: Set to Maximum" +msgstr "背景明度：设为最大值" + +#: ../app/actions/context-actions.c:653 +msgctxt "context-action" +msgid "Background Value: Decrease by 1%" +msgstr "背景明度：减少 1%" + +#: ../app/actions/context-actions.c:657 +msgctxt "context-action" +msgid "Background Value: Increase by 1%" +msgstr "背景明度：增加 1%" + +#: ../app/actions/context-actions.c:661 +msgctxt "context-action" +msgid "Background Value: Decrease by 10%" +msgstr "背景明度：减少 10%" + +#: ../app/actions/context-actions.c:665 +msgctxt "context-action" +msgid "Background Value: Increase by 10%" +msgstr "背景明度：增加 10%" + +#: ../app/actions/context-actions.c:673 +msgctxt "context-action" +msgid "Tool Opacity: Set Transparency" +msgstr "工具不透明度：设置透明" + +#: ../app/actions/context-actions.c:677 +msgctxt "context-action" +msgid "Tool Opacity: Make Completely Transparent" +msgstr "工具不透明度：完全透明" + +#: ../app/actions/context-actions.c:681 +msgctxt "context-action" +msgid "Tool Opacity: Make Completely Opaque" +msgstr "工具不透明度：完全不透明" + +#: ../app/actions/context-actions.c:685 +msgctxt "context-action" +msgid "Tool Opacity: Make 1% More Transparent" +msgstr "工具不透明度：增加 1% 透明" + +#: ../app/actions/context-actions.c:689 +msgctxt "context-action" +msgid "Tool Opacity: Make 1% More Opaque" +msgstr "工具不透明度：减少 1% 透明" + +#: ../app/actions/context-actions.c:693 +msgctxt "context-action" +msgid "Tool Opacity: Make 10% More Transparent" +msgstr "工具不透明度：增加 10% 透明" + +#: ../app/actions/context-actions.c:697 +msgctxt "context-action" +msgid "Tool Opacity: Make 10% More Opaque" +msgstr "工具不透明度：减少 10% 透明" + +#: ../app/actions/context-actions.c:705 +msgctxt "context-action" +msgid "Tool Paint Mode: Select First" +msgstr "工具绘画模式：选择第一个" + +#: ../app/actions/context-actions.c:709 +msgctxt "context-action" +msgid "Tool Paint Mode: Select Last" +msgstr "工具绘画模式：选择最后一个" + +#: ../app/actions/context-actions.c:713 +msgctxt "context-action" +msgid "Tool Paint Mode: Select Previous" +msgstr "工具绘画模式：选择前一个" + +#: ../app/actions/context-actions.c:717 +msgctxt "context-action" +msgid "Tool Paint Mode: Select Next" +msgstr "工具绘画模式：选择下一个" + +#: ../app/actions/context-actions.c:725 +msgctxt "context-action" +msgid "Tool Selection: Choose by Index" +msgstr "工具选择：通过索引选择" + +#: ../app/actions/context-actions.c:729 +msgctxt "context-action" +msgid "Tool Selection: Switch to First" +msgstr "工具选择：切换到第一个" + +#: ../app/actions/context-actions.c:733 +msgctxt "context-action" +msgid "Tool Selection: Switch to Last" +msgstr "工具选择：切换到最后一个" + +#: ../app/actions/context-actions.c:737 +msgctxt "context-action" +msgid "Tool Selection: Switch to Previous" +msgstr "工具选择：切换到前一个" + +#: ../app/actions/context-actions.c:741 +msgctxt "context-action" +msgid "Tool Selection: Switch to Next" +msgstr "工具选择：切换到下一个" + +#: ../app/actions/context-actions.c:749 +msgctxt "context-action" +msgid "Brush Selection: Select by Index" +msgstr "笔刷选择：通过索引选择" + +#: ../app/actions/context-actions.c:753 +msgctxt "context-action" +msgid "Brush Selection: Switch to First" +msgstr "笔刷选择：切换到第一个" + +#: ../app/actions/context-actions.c:757 +msgctxt "context-action" +msgid "Brush Selection: Switch to Last" +msgstr "笔刷选择：切换到最后一个" + +#: ../app/actions/context-actions.c:761 +msgctxt "context-action" +msgid "Brush Selection: Switch to Previous" +msgstr "笔刷选择：切换到前一个" + +#: ../app/actions/context-actions.c:765 +msgctxt "context-action" +msgid "Brush Selection: Switch to Next" +msgstr "笔刷选择：切换到下一个" + +#: ../app/actions/context-actions.c:773 +msgctxt "context-action" +msgid "Pattern Selection: Select by Index" +msgstr "图案选择：通过索引选择" + +#: ../app/actions/context-actions.c:777 +msgctxt "context-action" +msgid "Pattern Selection: Switch to First" +msgstr "图案选择：切换到第一个" + +#: ../app/actions/context-actions.c:781 +msgctxt "context-action" +msgid "Pattern Selection: Switch to Last" +msgstr "图案选择：切换到最后一个" + +#: ../app/actions/context-actions.c:785 +msgctxt "context-action" +msgid "Pattern Selection: Switch to Previous" +msgstr "图案选择：切换到前一个" + +#: ../app/actions/context-actions.c:789 +msgctxt "context-action" +msgid "Pattern Selection: Switch to Next" +msgstr "图案选择：切换到下一个" + +#: ../app/actions/context-actions.c:797 +msgctxt "context-action" +msgid "Palette Selection: Select by Index" +msgstr "色板选择：通过索引选择" + +#: ../app/actions/context-actions.c:801 +msgctxt "context-action" +msgid "Palette Selection: Switch to First" +msgstr "色板选择：切换到第一个" + +#: ../app/actions/context-actions.c:805 +msgctxt "context-action" +msgid "Palette Selection: Switch to Last" +msgstr "色板选择：切换到最后一个" + +#: ../app/actions/context-actions.c:809 +msgctxt "context-action" +msgid "Palette Selection: Switch to Previous" +msgstr "色板选择：切换到前一个" + +#: ../app/actions/context-actions.c:813 +msgctxt "context-action" +msgid "Palette Selection: Switch to Next" +msgstr "色板选择：切换到下一个" + +#: ../app/actions/context-actions.c:821 +msgctxt "context-action" +msgid "Gradient Selection: Select by Index" +msgstr "渐变选择：通过索引选择" + +#: ../app/actions/context-actions.c:825 +msgctxt "context-action" +msgid "Gradient Selection: Switch to First" +msgstr "渐变选择：切换到第一个" + +#: ../app/actions/context-actions.c:829 +msgctxt "context-action" +msgid "Gradient Selection: Switch to Last" +msgstr "渐变选择：切换到最后一个" + +#: ../app/actions/context-actions.c:833 +msgctxt "context-action" +msgid "Gradient Selection: Switch to Previous" +msgstr "渐变选择：切换到前一个" + +#: ../app/actions/context-actions.c:837 +msgctxt "context-action" +msgid "Gradient Selection: Switch to Next" +msgstr "渐变选择：切换到下一个" + +#: ../app/actions/context-actions.c:845 +msgctxt "context-action" +msgid "Font Selection: Select by Index" +msgstr "字体选择：通过索引选择" + +#: ../app/actions/context-actions.c:849 +msgctxt "context-action" +msgid "Font Selection: Switch to First" +msgstr "字体选择：切换到第一个" + +#: ../app/actions/context-actions.c:853 +msgctxt "context-action" +msgid "Font Selection: Switch to Last" +msgstr "字体选择：切换到最后一个" + +#: ../app/actions/context-actions.c:857 +msgctxt "context-action" +msgid "Font Selection: Switch to Previous" +msgstr "字体选择：切换到前一个" + +#: ../app/actions/context-actions.c:861 +msgctxt "context-action" +msgid "Font Selection: Switch to Next" +msgstr "字体选择：切换到下一个" + +#: ../app/actions/context-actions.c:869 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Set" +msgstr "笔刷间距(编辑器)：设置" + +#: ../app/actions/context-actions.c:873 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Set to Minimum" +msgstr "笔刷间距(编辑器)：设为最小值" + +#: ../app/actions/context-actions.c:877 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Set to Maximum" +msgstr "笔刷间距(编辑器)：设为最大值" + +#: ../app/actions/context-actions.c:881 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Decrease by 1" +msgstr "笔刷间距(编辑器)：减小 1" + +#: ../app/actions/context-actions.c:885 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Increase by 1" +msgstr "笔刷间距(编辑器)：增大 1" + +#: ../app/actions/context-actions.c:889 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Decrease by 10" +msgstr "笔刷间距(编辑器)：减小 10" + +#: ../app/actions/context-actions.c:893 +msgctxt "context-action" +msgid "Brush Spacing (Editor): Increase by 10" +msgstr "笔刷间距(编辑器)：增大 10" + +#: ../app/actions/context-actions.c:901 +msgctxt "context-action" +msgid "Brush Shape (Editor): Use Circular" +msgstr "笔刷形状(编辑器)：使用圆形" + +#: ../app/actions/context-actions.c:905 +msgctxt "context-action" +msgid "Brush Shape (Editor): Use Square" +msgstr "笔刷形状(编辑器)：使用方形" + +#: ../app/actions/context-actions.c:909 +msgctxt "context-action" +msgid "Brush Shape (Editor): Use Diamond" +msgstr "笔刷形状(编辑器)：使用菱形" + +#: ../app/actions/context-actions.c:917 +msgctxt "context-action" +msgid "Brush Radius (Editor): Set" +msgstr "笔刷半径(编辑器)：设置" + +#: ../app/actions/context-actions.c:921 +msgctxt "context-action" +msgid "Brush Radius (Editor): Set to Minimum" +msgstr "笔刷半径(编辑器)：设为最小值" + +#: ../app/actions/context-actions.c:925 +msgctxt "context-action" +msgid "Brush Radius (Editor): Set to Maximum" +msgstr "笔刷半径(编辑器)：设为最大值" + +#: ../app/actions/context-actions.c:929 +msgctxt "context-action" +msgid "Brush Radius (Editor): Decrease by 0.1" +msgstr "笔刷半径(编辑器)：减小 0.1" + +#: ../app/actions/context-actions.c:933 +msgctxt "context-action" +msgid "Brush Radius (Editor): Increase by 0.1" +msgstr "笔刷半径(编辑器)：增大 0.1" + +#: ../app/actions/context-actions.c:937 +msgctxt "context-action" +msgid "Brush Radius (Editor): Decrease by 1" +msgstr "笔刷半径(编辑器)：减小 1" + +#: ../app/actions/context-actions.c:941 +msgctxt "context-action" +msgid "Brush Radius (Editor): Increase by 1" +msgstr "笔刷半径(编辑器)：增大 1" + +#: ../app/actions/context-actions.c:945 +msgctxt "context-action" +msgid "Brush Radius (Editor): Decrease by 10" +msgstr "笔刷半径(编辑器)：减小 10" + +#: ../app/actions/context-actions.c:949 +msgctxt "context-action" +msgid "Brush Radius (Editor): Increase by 10" +msgstr "笔刷半径(编辑器)：增大 10" + +#: ../app/actions/context-actions.c:953 +msgctxt "context-action" +msgid "Brush Radius (Editor): Decrease Relative" +msgstr "笔刷半径(编辑器)：相对减小" + +#: ../app/actions/context-actions.c:957 +msgctxt "context-action" +msgid "Brush Radius (Editor): Increase Relative" +msgstr "笔刷半径(编辑器)：相对增大" + +#: ../app/actions/context-actions.c:965 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Set" +msgstr "笔刷尖数(编辑器)：设置" + +#: ../app/actions/context-actions.c:969 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Set to Minimum" +msgstr "笔刷尖数(编辑器)：设为最小值" + +#: ../app/actions/context-actions.c:973 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Set to Maximum" +msgstr "笔刷尖数(编辑器)：设为最大值" + +#: ../app/actions/context-actions.c:977 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Decrease by 1" +msgstr "笔刷尖数(编辑器)：减小 1" + +#: ../app/actions/context-actions.c:981 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Increase by 1" +msgstr "笔刷尖数(编辑器)：增大 1" + +#: ../app/actions/context-actions.c:985 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Decrease by 4" +msgstr "笔刷尖数(编辑器)：减小 4" + +#: ../app/actions/context-actions.c:989 +msgctxt "context-action" +msgid "Brush Spikes (Editor): Increase by 4" +msgstr "笔刷尖数(编辑器)：增大 4" + +#: ../app/actions/context-actions.c:997 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Set" +msgstr "笔刷硬度(编辑器)：设置" + +#: ../app/actions/context-actions.c:1001 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Set to Minimum" +msgstr "笔刷硬度(编辑器)：设为最小值" + +#: ../app/actions/context-actions.c:1005 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Set to Maximum" +msgstr "笔刷硬度(编辑器)：设为最大值" + +#: ../app/actions/context-actions.c:1009 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Decrease by 0.01" +msgstr "笔刷硬度(编辑器)：减小 0.01" + +#: ../app/actions/context-actions.c:1013 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Increase by 0.01" +msgstr "笔刷硬度(编辑器)：增大 0.01" + +#: ../app/actions/context-actions.c:1017 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Decrease by 0.1" +msgstr "笔刷硬度(编辑器)：减小 0.1" + +#: ../app/actions/context-actions.c:1021 +msgctxt "context-action" +msgid "Brush Hardness (Editor): Increase by 0.1" +msgstr "笔刷硬度(编辑器)：增大 0.1" + +#: ../app/actions/context-actions.c:1029 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Set" +msgstr "笔刷宽高比(编辑器)：设置" + +#: ../app/actions/context-actions.c:1033 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Set to Minimum" +msgstr "笔刷宽高比(编辑器)：设为最小值" + +#: ../app/actions/context-actions.c:1037 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Set to Maximum" +msgstr "笔刷宽高比(编辑器)：设为最大值" + +#: ../app/actions/context-actions.c:1041 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Decrease by 0.1" +msgstr "笔刷宽高比(编辑器)：减小 0.1" + +#: ../app/actions/context-actions.c:1045 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Increase by 0.1" +msgstr "笔刷宽高比(编辑器)：增大 0.1" + +#: ../app/actions/context-actions.c:1049 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Decrease by 1" +msgstr "笔刷宽高比(编辑器)：减小 1" + +#: ../app/actions/context-actions.c:1053 +msgctxt "context-action" +msgid "Brush Aspect Ratio (Editor): Increase by 1" +msgstr "笔刷宽高比(编辑器)：增大 1" + +#: ../app/actions/context-actions.c:1061 +msgctxt "context-action" +msgid "Brush Angle (Editor): Set" +msgstr "笔刷角度(编辑器)：设置" + +#: ../app/actions/context-actions.c:1065 +msgctxt "context-action" +msgid "Brush Angle (Editor): Make Horizontal" +msgstr "笔刷角度(编辑器)：水平" + +#: ../app/actions/context-actions.c:1069 +msgctxt "context-action" +msgid "Brush Angle (Editor): Make Vertical" +msgstr "笔刷角度(编辑器)：竖直" + +#: ../app/actions/context-actions.c:1073 +msgctxt "context-action" +msgid "Brush Angle (Editor): Rotate Right by 1°" +msgstr "笔刷角度(编辑器)：向右旋转 1°" + +#: ../app/actions/context-actions.c:1077 +msgctxt "context-action" +msgid "Brush Angle (Editor): Rotate Left by 1°" +msgstr "笔刷角度(编辑器)：向左旋转 1°" + +#: ../app/actions/context-actions.c:1081 +msgctxt "context-action" +msgid "Brush Angle (Editor): Rotate Right by 15°" +msgstr "笔刷角度(编辑器)：向右旋转 15°" + +#: ../app/actions/context-actions.c:1085 +msgctxt "context-action" +msgid "Brush Angle (Editor): Rotate Left by 15°" +msgstr "笔刷角度(编辑器)：向左旋转 15°" + +#: ../app/actions/context-commands.c:411 #, c-format msgid "Paint Mode: %s" -msgstr "涂画模式：%s" +msgstr "绘画模式：%s" -#: ../app/actions/context-commands.c:553 +#: ../app/actions/context-commands.c:537 #, c-format msgid "Brush Shape: %s" -msgstr "画笔形状：%s" +msgstr "笔刷形状：%s" -#: ../app/actions/context-commands.c:613 +#: ../app/actions/context-commands.c:597 #, c-format msgid "Brush Radius: %2.2f" -msgstr "画笔半径：%2.2f" +msgstr "笔刷半径：%2.2f" -#: ../app/actions/context-commands.c:721 +#: ../app/actions/context-commands.c:705 #, c-format msgid "Brush Angle: %2.2f" -msgstr "画笔角度：%2.2f" +msgstr "笔刷角度：%2.2f" -#: ../app/actions/cursor-info-actions.c:40 +#: ../app/actions/cursor-info-actions.c:41 msgctxt "cursor-info-action" msgid "Pointer Information Menu" msgstr "指针信息菜单" -#: ../app/actions/cursor-info-actions.c:47 +#: ../app/actions/cursor-info-actions.c:48 msgctxt "cursor-info-action" msgid "_Sample Merged" msgstr "位样合并(_S)" -#: ../app/actions/cursor-info-actions.c:48 +#: ../app/actions/cursor-info-actions.c:49 msgctxt "cursor-info-action" msgid "Use the composite color of all visible layers" msgstr "使用所有可见图层的混合颜色" -#: ../app/actions/data-commands.c:90 ../app/actions/documents-commands.c:345 -#: ../app/actions/file-commands.c:194 ../app/dialogs/file-open-dialog.c:232 -#: ../app/dialogs/file-open-dialog.c:277 -#: ../app/dialogs/file-open-location-dialog.c:214 -#: ../app/dialogs/file-open-location-dialog.c:226 -#: ../app/display/gimpdisplayshell-dnd.c:574 -#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox.c:834 +#: ../app/actions/dashboard-actions.c:40 +msgctxt "dashboard-action" +msgid "Dashboard Menu" +msgstr "仪表盘菜单" + +#: ../app/actions/dashboard-actions.c:44 +msgctxt "dashboard-action" +msgid "Groups" +msgstr "群组" + +#: ../app/actions/dashboard-actions.c:46 +msgctxt "dashboard-action" +msgid "Update Interval" +msgstr "更新间隔" + +#: ../app/actions/dashboard-actions.c:48 +msgctxt "dashboard-action" +msgid "History Duration" +msgstr "历史持续" + +#: ../app/actions/dashboard-actions.c:51 +msgctxt "dashboard-action" +msgid "Reset" +msgstr "重置" + +#: ../app/actions/dashboard-actions.c:52 +msgctxt "dashboard-action" +msgid "Reset cumulative data" +msgstr "重置累积的数据" + +#: ../app/actions/dashboard-actions.c:60 +msgctxt "dashboard-action" +msgid "Low Swap Space Warning" +msgstr "低交换空间警告" + +#: ../app/actions/dashboard-actions.c:61 +msgctxt "dashboard-action" +msgid "Raise the dashboard when the swap size approaches its limit" +msgstr "在交换空间占用接近限制大小时升起仪表盘" + +#: ../app/actions/dashboard-actions.c:71 +msgctxt "dashboard-update-interval" +msgid "0.25 Seconds" +msgstr "0.25 秒" + +#: ../app/actions/dashboard-actions.c:76 +msgctxt "dashboard-update-interval" +msgid "0.5 Seconds" +msgstr "0.5 秒" + +#: ../app/actions/dashboard-actions.c:81 +msgctxt "dashboard-update-interval" +msgid "1 Second" +msgstr "1 秒" + +#: ../app/actions/dashboard-actions.c:86 +msgctxt "dashboard-update-interval" +msgid "2 Seconds" +msgstr "2 秒" + +#: ../app/actions/dashboard-actions.c:91 +msgctxt "dashboard-update-interval" +msgid "4 Seconds" +msgstr "4 秒" + +#: ../app/actions/dashboard-actions.c:99 +msgctxt "dashboard-history-duration" +msgid "15 Seconds" +msgstr "15 秒" + +#: ../app/actions/dashboard-actions.c:104 +msgctxt "dashboard-history-duration" +msgid "30 Seconds" +msgstr "30 秒" + +#: ../app/actions/dashboard-actions.c:109 +msgctxt "dashboard-history-duration" +msgid "60 Seconds" +msgstr "60 秒" + +#: ../app/actions/dashboard-actions.c:114 +msgctxt "dashboard-history-duration" +msgid "120 Seconds" +msgstr "120 秒" + +#: ../app/actions/dashboard-actions.c:119 +msgctxt "dashboard-history-duration" +msgid "240 Seconds" +msgstr "240 秒" + +#: ../app/actions/data-commands.c:90 ../app/actions/documents-commands.c:383 +#: ../app/actions/file-commands.c:205 ../app/dialogs/file-open-dialog.c:212 +#: ../app/dialogs/file-open-dialog.c:253 +#: ../app/dialogs/file-open-location-dialog.c:223 +#: ../app/dialogs/file-open-location-dialog.c:239 +#: ../app/display/gimpdisplayshell-dnd.c:614 +#: ../app/widgets/gimplayertreeview.c:765 ../app/widgets/gimptoolbox.c:805 #: ../app/widgets/gimptoolbox-dnd.c:170 #, c-format msgid "" @@ -989,547 +2669,598 @@ msgstr "" "\n" "%s" -#: ../app/actions/data-commands.c:119 -#: ../app/actions/tool-options-commands.c:73 -#: ../app/core/gimpbrushgenerated-load.c:123 ../app/core/gimpimage.c:1642 -#: ../app/core/gimppalette.c:399 ../app/core/gimppalette-import.c:210 -#: ../app/core/gimppalette-load.c:225 -#: ../app/dialogs/palette-import-dialog.c:771 ../app/widgets/gimpdnd-xds.c:94 +#: ../app/actions/data-commands.c:114 ../app/actions/tool-options-commands.c:74 +#: ../app/core/gimpbrushgenerated-load.c:120 ../app/core/gimpimage.c:1971 +#: ../app/core/gimppalette.c:461 ../app/core/gimppalette-import.c:211 +#: ../app/core/gimppalette-load.c:186 +#: ../app/dialogs/palette-import-dialog.c:778 ../app/widgets/gimpdnd-xds.c:89 msgid "Untitled" msgstr "无标题" -#: ../app/actions/dialogs-actions.c:49 +#: ../app/actions/data-commands.c:212 ../app/actions/documents-commands.c:189 +#: ../app/actions/file-commands.c:519 +#, c-format +msgid "Can't show file in file manager: %s" +msgstr "无法在文件管理器中显示文件：%s" + +#: ../app/actions/dialogs-actions.c:47 msgctxt "windows-action" msgid "Tool_box" msgstr "工具箱(_B)" -#: ../app/actions/dialogs-actions.c:55 +#: ../app/actions/dialogs-actions.c:53 msgctxt "dialogs-action" msgid "Tool _Options" msgstr "工具选项(_O)" -#: ../app/actions/dialogs-actions.c:56 +#: ../app/actions/dialogs-actions.c:54 msgctxt "dialogs-action" msgid "Open the tool options dialog" msgstr "打开工具选项对话框" -#: ../app/actions/dialogs-actions.c:61 +#: ../app/actions/dialogs-actions.c:59 msgctxt "dialogs-action" msgid "_Device Status" msgstr "设备状态(_D)" -#: ../app/actions/dialogs-actions.c:62 +#: ../app/actions/dialogs-actions.c:60 msgctxt "dialogs-action" msgid "Open the device status dialog" msgstr "打开设备状态对话框" -#: ../app/actions/dialogs-actions.c:67 +#: ../app/actions/dialogs-actions.c:65 +msgctxt "dialogs-action" +msgid "_Symmetry Painting" +msgstr "对称绘画(_S)" + +#: ../app/actions/dialogs-actions.c:66 +msgctxt "dialogs-action" +msgid "Open the symmetry dialog" +msgstr "打开对称绘画对话框" + +#: ../app/actions/dialogs-actions.c:71 msgctxt "dialogs-action" msgid "_Layers" msgstr "图层(_L)" -#: ../app/actions/dialogs-actions.c:68 +#: ../app/actions/dialogs-actions.c:72 msgctxt "dialogs-action" msgid "Open the layers dialog" msgstr "打开图层对话框" -#: ../app/actions/dialogs-actions.c:73 +#: ../app/actions/dialogs-actions.c:77 msgctxt "dialogs-action" msgid "_Channels" msgstr "通道(_C)" -#: ../app/actions/dialogs-actions.c:74 +#: ../app/actions/dialogs-actions.c:78 msgctxt "dialogs-action" msgid "Open the channels dialog" msgstr "打开通道对话框" -#: ../app/actions/dialogs-actions.c:79 +#: ../app/actions/dialogs-actions.c:83 msgctxt "dialogs-action" msgid "_Paths" msgstr "路径(_P)" -#: ../app/actions/dialogs-actions.c:80 +#: ../app/actions/dialogs-actions.c:84 msgctxt "dialogs-action" msgid "Open the paths dialog" msgstr "打开路径对话框" -#: ../app/actions/dialogs-actions.c:85 +#: ../app/actions/dialogs-actions.c:89 msgctxt "dialogs-action" msgid "Color_map" msgstr "颜色表(_M)" -#: ../app/actions/dialogs-actions.c:86 +#: ../app/actions/dialogs-actions.c:90 msgctxt "dialogs-action" msgid "Open the colormap dialog" msgstr "打开颜色表对话框" -#: ../app/actions/dialogs-actions.c:91 +#: ../app/actions/dialogs-actions.c:95 msgctxt "dialogs-action" msgid "Histogra_m" msgstr "直方图(_M)" -#: ../app/actions/dialogs-actions.c:92 +#: ../app/actions/dialogs-actions.c:96 msgctxt "dialogs-action" msgid "Open the histogram dialog" msgstr "打开直方图对话框" -#: ../app/actions/dialogs-actions.c:97 +#: ../app/actions/dialogs-actions.c:101 msgctxt "dialogs-action" msgid "_Selection Editor" msgstr "选区编辑器(_S)" -#: ../app/actions/dialogs-actions.c:98 +#: ../app/actions/dialogs-actions.c:102 msgctxt "dialogs-action" msgid "Open the selection editor" -msgstr "打开选择编辑器" +msgstr "打开选区编辑器" -#: ../app/actions/dialogs-actions.c:103 +#: ../app/actions/dialogs-actions.c:107 msgctxt "dialogs-action" msgid "Na_vigation" -msgstr "导航(_V)" +msgstr "导览(_V)" -#: ../app/actions/dialogs-actions.c:104 +#: ../app/actions/dialogs-actions.c:108 msgctxt "dialogs-action" msgid "Open the display navigation dialog" -msgstr "打开显示导航对话框" +msgstr "打开显示导览对话框" -#: ../app/actions/dialogs-actions.c:109 +#: ../app/actions/dialogs-actions.c:113 msgctxt "dialogs-action" msgid "Undo _History" msgstr "撤消历史(_H)" -#: ../app/actions/dialogs-actions.c:110 +#: ../app/actions/dialogs-actions.c:114 msgctxt "dialogs-action" msgid "Open the undo history dialog" msgstr "打开撤消历史对话框" -#: ../app/actions/dialogs-actions.c:115 +#: ../app/actions/dialogs-actions.c:119 msgctxt "dialogs-action" msgid "Pointer" msgstr "指针" -#: ../app/actions/dialogs-actions.c:116 +#: ../app/actions/dialogs-actions.c:120 msgctxt "dialogs-action" msgid "Open the pointer information dialog" msgstr "打开指针信息对话框" -#: ../app/actions/dialogs-actions.c:121 +#: ../app/actions/dialogs-actions.c:125 msgctxt "dialogs-action" msgid "_Sample Points" msgstr "采样点(_S)" -#: ../app/actions/dialogs-actions.c:122 +#: ../app/actions/dialogs-actions.c:126 msgctxt "dialogs-action" msgid "Open the sample points dialog" msgstr "打开采样点对话框" -#: ../app/actions/dialogs-actions.c:127 +#: ../app/actions/dialogs-actions.c:131 msgctxt "dialogs-action" msgid "Colo_rs" msgstr "颜色(_R)" -#: ../app/actions/dialogs-actions.c:128 +#: ../app/actions/dialogs-actions.c:132 msgctxt "dialogs-action" msgid "Open the FG/BG color dialog" msgstr "打开前景/背景色对话框" -#: ../app/actions/dialogs-actions.c:133 +#: ../app/actions/dialogs-actions.c:137 msgctxt "dialogs-action" msgid "_Brushes" -msgstr "画笔(_B)" +msgstr "笔刷(_B)" -#: ../app/actions/dialogs-actions.c:134 +#: ../app/actions/dialogs-actions.c:138 msgctxt "dialogs-action" msgid "Open the brushes dialog" -msgstr "打开画笔对话框" +msgstr "打开笔刷对话框" -#: ../app/actions/dialogs-actions.c:139 +#: ../app/actions/dialogs-actions.c:143 msgctxt "dialogs-action" msgid "Brush Editor" -msgstr "画笔编辑器" +msgstr "笔刷编辑器" -#: ../app/actions/dialogs-actions.c:140 +#: ../app/actions/dialogs-actions.c:144 msgctxt "dialogs-action" msgid "Open the brush editor" -msgstr "打开画笔编辑器" +msgstr "打开笔刷编辑器" -#: ../app/actions/dialogs-actions.c:145 +#: ../app/actions/dialogs-actions.c:149 msgctxt "dialogs-action" msgid "Paint Dynamics" -msgstr "动态绘图" +msgstr "动态绘画" -#: ../app/actions/dialogs-actions.c:146 +#: ../app/actions/dialogs-actions.c:150 msgctxt "dialogs-action" msgid "Open paint dynamics dialog" -msgstr "打开动态绘图对话框" +msgstr "打开动态绘画对话框" -#: ../app/actions/dialogs-actions.c:151 +#: ../app/actions/dialogs-actions.c:155 msgctxt "dialogs-action" msgid "Paint Dynamics Editor" -msgstr "动态绘图编辑器" +msgstr "动态绘画编辑器" -#: ../app/actions/dialogs-actions.c:152 +#: ../app/actions/dialogs-actions.c:156 msgctxt "dialogs-action" msgid "Open the paint dynamics editor" -msgstr "打开动态绘图编辑器" +msgstr "打开动态绘画编辑器" -#: ../app/actions/dialogs-actions.c:157 +#: ../app/actions/dialogs-actions.c:161 +msgctxt "dialogs-action" +msgid "_MyPaint Brushes" +msgstr "_MyPaint 笔刷" + +#: ../app/actions/dialogs-actions.c:162 +msgctxt "dialogs-action" +msgid "Open the mypaint brushes dialog" +msgstr "打开 mypaint 笔刷对话框" + +#: ../app/actions/dialogs-actions.c:167 msgctxt "dialogs-action" msgid "P_atterns" msgstr "图案(_A)" -#: ../app/actions/dialogs-actions.c:158 +#: ../app/actions/dialogs-actions.c:168 msgctxt "dialogs-action" msgid "Open the patterns dialog" msgstr "打开图案对话框" -#: ../app/actions/dialogs-actions.c:163 +#: ../app/actions/dialogs-actions.c:173 msgctxt "dialogs-action" msgid "_Gradients" msgstr "渐变(_G)" -#: ../app/actions/dialogs-actions.c:164 +#: ../app/actions/dialogs-actions.c:174 msgctxt "dialogs-action" msgid "Open the gradients dialog" msgstr "打开渐变对话框" -#: ../app/actions/dialogs-actions.c:169 +#: ../app/actions/dialogs-actions.c:179 msgctxt "dialogs-action" msgid "Gradient Editor" msgstr "渐变编辑器" -#: ../app/actions/dialogs-actions.c:170 +#: ../app/actions/dialogs-actions.c:180 msgctxt "dialogs-action" msgid "Open the gradient editor" msgstr "打开渐变编辑器" -#: ../app/actions/dialogs-actions.c:175 +#: ../app/actions/dialogs-actions.c:185 msgctxt "dialogs-action" msgid "Pal_ettes" msgstr "色板(_E)" -#: ../app/actions/dialogs-actions.c:176 +#: ../app/actions/dialogs-actions.c:186 msgctxt "dialogs-action" msgid "Open the palettes dialog" msgstr "打开色板对话框" -#: ../app/actions/dialogs-actions.c:181 +#: ../app/actions/dialogs-actions.c:191 msgctxt "dialogs-action" msgid "Palette Editor" msgstr "色板编辑器" -#: ../app/actions/dialogs-actions.c:182 +#: ../app/actions/dialogs-actions.c:192 msgctxt "dialogs-action" msgid "Open the palette editor" msgstr "打开色板编辑器" -#: ../app/actions/dialogs-actions.c:187 +#: ../app/actions/dialogs-actions.c:197 msgctxt "dialogs-action" msgid "Tool presets" -msgstr "工具预设值" +msgstr "工具预设" -#: ../app/actions/dialogs-actions.c:188 +#: ../app/actions/dialogs-actions.c:198 msgctxt "dialogs-action" msgid "Open tool presets dialog" -msgstr "打开工具预设值对话框" +msgstr "打开工具预设对话框" -#: ../app/actions/dialogs-actions.c:193 +#: ../app/actions/dialogs-actions.c:203 msgctxt "dialogs-action" msgid "_Fonts" msgstr "字体(_F)" -#: ../app/actions/dialogs-actions.c:194 +#: ../app/actions/dialogs-actions.c:204 msgctxt "dialogs-action" msgid "Open the fonts dialog" msgstr "打开字体对话框" -#: ../app/actions/dialogs-actions.c:199 +#: ../app/actions/dialogs-actions.c:209 msgctxt "dialogs-action" msgid "B_uffers" msgstr "缓冲区(_U)" -#: ../app/actions/dialogs-actions.c:200 +#: ../app/actions/dialogs-actions.c:210 msgctxt "dialogs-action" msgid "Open the named buffers dialog" -msgstr "打开命名缓冲区对话框" +msgstr "打开已命名缓冲区对话框" -#: ../app/actions/dialogs-actions.c:205 +#: ../app/actions/dialogs-actions.c:215 msgctxt "dialogs-action" msgid "_Images" msgstr "图像(_I)" -#: ../app/actions/dialogs-actions.c:206 +#: ../app/actions/dialogs-actions.c:216 msgctxt "dialogs-action" msgid "Open the images dialog" msgstr "打开图像对话框" -#: ../app/actions/dialogs-actions.c:211 +#: ../app/actions/dialogs-actions.c:221 msgctxt "dialogs-action" msgid "Document Histor_y" msgstr "文档历史(_Y)" -#: ../app/actions/dialogs-actions.c:212 +#: ../app/actions/dialogs-actions.c:222 msgctxt "dialogs-action" msgid "Open the document history dialog" msgstr "打开文档历史对话框" -#: ../app/actions/dialogs-actions.c:217 +#: ../app/actions/dialogs-actions.c:227 msgctxt "dialogs-action" msgid "_Templates" msgstr "模板(_T)" -#: ../app/actions/dialogs-actions.c:218 +#: ../app/actions/dialogs-actions.c:228 msgctxt "dialogs-action" msgid "Open the image templates dialog" msgstr "打开图像模版对话框" -#: ../app/actions/dialogs-actions.c:223 +#: ../app/actions/dialogs-actions.c:233 msgctxt "dialogs-action" msgid "Error Co_nsole" msgstr "错误控制台(_N)" -#: ../app/actions/dialogs-actions.c:224 +#: ../app/actions/dialogs-actions.c:234 msgctxt "dialogs-action" msgid "Open the error console" msgstr "打开错误控制台" -#: ../app/actions/dialogs-actions.c:234 +#: ../app/actions/dialogs-actions.c:239 +msgctxt "dialogs-action" +msgid "_Dashboard" +msgstr "仪表盘(_D)" + +#: ../app/actions/dialogs-actions.c:240 +msgctxt "dialogs-action" +msgid "Open the dashboard" +msgstr "打开仪表盘" + +#: ../app/actions/dialogs-actions.c:250 msgctxt "dialogs-action" msgid "_Preferences" msgstr "首选项(_P)" -#: ../app/actions/dialogs-actions.c:235 +#: ../app/actions/dialogs-actions.c:251 msgctxt "dialogs-action" msgid "Open the preferences dialog" msgstr "打开首选项对话框" -#: ../app/actions/dialogs-actions.c:240 +#: ../app/actions/dialogs-actions.c:256 msgctxt "dialogs-action" msgid "_Input Devices" msgstr "输入设备(_I)" -#: ../app/actions/dialogs-actions.c:241 +#: ../app/actions/dialogs-actions.c:257 msgctxt "dialogs-action" msgid "Open the input devices editor" msgstr "打开输入设备编辑器" -#: ../app/actions/dialogs-actions.c:246 +#: ../app/actions/dialogs-actions.c:262 msgctxt "dialogs-action" msgid "_Keyboard Shortcuts" msgstr "快捷键(_K)" -#: ../app/actions/dialogs-actions.c:247 +#: ../app/actions/dialogs-actions.c:263 msgctxt "dialogs-action" msgid "Open the keyboard shortcuts editor" msgstr "打开快捷键编辑器" -#: ../app/actions/dialogs-actions.c:252 +#: ../app/actions/dialogs-actions.c:268 msgctxt "dialogs-action" msgid "_Modules" msgstr "模块(_M)" -#: ../app/actions/dialogs-actions.c:253 +#: ../app/actions/dialogs-actions.c:269 msgctxt "dialogs-action" msgid "Open the module manager dialog" msgstr "打开模块管理器对话框" -#: ../app/actions/dialogs-actions.c:258 +#: ../app/actions/dialogs-actions.c:274 msgctxt "dialogs-action" msgid "_Tip of the Day" msgstr "日积月累(_T)" -#: ../app/actions/dialogs-actions.c:259 +#: ../app/actions/dialogs-actions.c:275 msgctxt "dialogs-action" msgid "Show some helpful tips on using GIMP" -msgstr "显示一些关于 GIMP 的小贴士" +msgstr "显示一些关于 GIMP 的小窍门" -#: ../app/actions/dialogs-actions.c:264 -msgctxt "dialogs-action" -msgid "_About" -msgstr "关于(_A)" - -#: ../app/actions/dialogs-actions.c:265 +#: ../app/actions/dialogs-actions.c:281 ../app/actions/dialogs-actions.c:288 msgctxt "dialogs-action" msgid "About GIMP" msgstr "关于 GIMP" -#: ../app/actions/dialogs-actions.c:328 -#: ../app/dialogs/preferences-dialog.c:1945 ../app/widgets/gimptoolbox.c:556 +#: ../app/actions/dialogs-actions.c:283 +msgctxt "dialogs-action" +msgid "About" +msgstr "关于" + +#: ../app/actions/dialogs-actions.c:285 +msgctxt "dialogs-action" +msgid "_About" +msgstr "关于(_A)" + +#: ../app/actions/dialogs-actions.c:293 +msgctxt "dialogs-action" +msgid "_Search and Run a Command" +msgstr "搜索并运行一个命令(_S)" + +#: ../app/actions/dialogs-actions.c:294 +msgctxt "dialogs-action" +msgid "Search commands by keyword, and run them" +msgstr "使用关键字搜索命令，然后运行它们" + +#: ../app/actions/dialogs-actions.c:357 +#: ../app/dialogs/preferences-dialog.c:2022 +#: ../app/dialogs/preferences-dialog.c:2023 ../app/widgets/gimptoolbox.c:529 msgid "Toolbox" msgstr "工具箱" -#: ../app/actions/dialogs-actions.c:329 +#: ../app/actions/dialogs-actions.c:358 msgid "Raise the toolbox" msgstr "提升工具箱" -#: ../app/actions/dialogs-actions.c:333 +#: ../app/actions/dialogs-actions.c:362 msgid "New Toolbox" msgstr "新建工具箱" -#: ../app/actions/dialogs-actions.c:334 +#: ../app/actions/dialogs-actions.c:363 msgid "Create a new toolbox" msgstr "创建新工具箱" -#: ../app/actions/dockable-actions.c:48 -msgctxt "dockable-action" -msgid "Dialogs Menu" -msgstr "对话框菜单" - -#: ../app/actions/dockable-actions.c:53 -msgctxt "dockable-action" -msgid "_Add Tab" -msgstr "添加页签(_A)" - -#: ../app/actions/dockable-actions.c:55 -msgctxt "dockable-action" -msgid "_Preview Size" -msgstr "预览大小(_P)" - -#: ../app/actions/dockable-actions.c:57 -msgctxt "dockable-action" -msgid "_Tab Style" -msgstr "页签风格(_T)" - -#: ../app/actions/dockable-actions.c:60 -msgctxt "dockable-action" -msgid "_Close Tab" -msgstr "关闭页签(_C)" - -#: ../app/actions/dockable-actions.c:65 -msgctxt "dockable-action" -msgid "_Detach Tab" -msgstr "漂移页签(_D)" - -#: ../app/actions/dockable-actions.c:84 -msgctxt "preview-size" -msgid "_Tiny" -msgstr "细小(_T)" - -#: ../app/actions/dockable-actions.c:86 -msgctxt "preview-size" -msgid "E_xtra Small" -msgstr "加小(_X)" - -#: ../app/actions/dockable-actions.c:88 -msgctxt "preview-size" -msgid "_Small" -msgstr "小(_S)" - -#: ../app/actions/dockable-actions.c:90 -msgctxt "preview-size" -msgid "_Medium" -msgstr "中(_M)" - -#: ../app/actions/dockable-actions.c:92 -msgctxt "preview-size" -msgid "_Large" -msgstr "大(_L)" - -#: ../app/actions/dockable-actions.c:94 -msgctxt "preview-size" -msgid "Ex_tra Large" -msgstr "加大(_T)" - -#: ../app/actions/dockable-actions.c:96 -msgctxt "preview-size" -msgid "_Huge" -msgstr "庞大(_H)" - -#: ../app/actions/dockable-actions.c:98 -msgctxt "preview-size" -msgid "_Enormous" -msgstr "巨大(_E)" - -#: ../app/actions/dockable-actions.c:100 -msgctxt "preview-size" -msgid "_Gigantic" -msgstr "极大(_G)" - -#: ../app/actions/dockable-actions.c:106 -msgctxt "tab-style" -msgid "_Icon" -msgstr "图标(_I)" - -#: ../app/actions/dockable-actions.c:108 -msgctxt "tab-style" -msgid "Current _Status" -msgstr "当前状态(_S)" - -#: ../app/actions/dockable-actions.c:110 -msgctxt "tab-style" -msgid "_Text" -msgstr "文字(_T)" - -#: ../app/actions/dockable-actions.c:112 -msgctxt "tab-style" -msgid "I_con & Text" -msgstr "图标和文字(_C)" - -#: ../app/actions/dockable-actions.c:114 -msgctxt "tab-style" -msgid "St_atus & Text" -msgstr "状态和文字(_A)" - -#: ../app/actions/dockable-actions.c:116 ../app/widgets/widgets-enums.c:224 -msgctxt "tab-style" -msgid "Automatic" -msgstr "自动" - -#: ../app/actions/dockable-actions.c:126 -msgctxt "dockable-action" -msgid "Loc_k Tab to Dock" -msgstr "将页签锁定到停靠(_k)" - -#: ../app/actions/dockable-actions.c:128 -msgctxt "dockable-action" -msgid "Protect this tab from being dragged with the mouse pointer" -msgstr "保护此页签不被鼠标指针拖拽" - -#: ../app/actions/dockable-actions.c:134 -msgctxt "dockable-action" -msgid "Show _Button Bar" -msgstr "显示按钮栏(_B)" - -#: ../app/actions/dockable-actions.c:143 -msgctxt "dockable-action" -msgid "View as _List" -msgstr "以列表方式查看(_L)" - -#: ../app/actions/dockable-actions.c:148 -msgctxt "dockable-action" -msgid "View as _Grid" -msgstr "以阵列方式查看(_G)" - -#: ../app/actions/dock-actions.c:45 +#: ../app/actions/dock-actions.c:46 msgctxt "dock-action" msgid "M_ove to Screen" msgstr "移动至屏幕(_O)" -#: ../app/actions/dock-actions.c:49 +#: ../app/actions/dock-actions.c:50 msgctxt "dock-action" msgid "Close Dock" -msgstr "关闭停靠" - -#: ../app/actions/dock-actions.c:54 -msgctxt "dock-action" -msgid "_Open Display..." -msgstr "打开显示(_O)..." +msgstr "关闭 Dock" #: ../app/actions/dock-actions.c:55 msgctxt "dock-action" +msgid "_Open Display..." +msgstr "打开显示(_O)…" + +#: ../app/actions/dock-actions.c:56 +msgctxt "dock-action" msgid "Connect to another display" msgstr "连接到另一个显示" -#: ../app/actions/dock-actions.c:63 +#: ../app/actions/dock-actions.c:64 msgctxt "dock-action" msgid "_Show Image Selection" msgstr "显示图像选区(_S)" -#: ../app/actions/dock-actions.c:69 +#: ../app/actions/dock-actions.c:70 msgctxt "dock-action" msgid "Auto _Follow Active Image" msgstr "自动跟随活动图像(_F)" +#: ../app/actions/dockable-actions.c:49 +msgctxt "dockable-action" +msgid "Dialogs Menu" +msgstr "对话框菜单" + +#: ../app/actions/dockable-actions.c:54 +msgctxt "dockable-action" +msgid "_Add Tab" +msgstr "新建标签页(_A)" + +#: ../app/actions/dockable-actions.c:56 +msgctxt "dockable-action" +msgid "_Preview Size" +msgstr "预览大小(_P)" + +#: ../app/actions/dockable-actions.c:58 +msgctxt "dockable-action" +msgid "_Tab Style" +msgstr "标签页样式(_T)" + +#: ../app/actions/dockable-actions.c:61 +msgctxt "dockable-action" +msgid "_Close Tab" +msgstr "关闭标签页(_C)" + +#: ../app/actions/dockable-actions.c:66 +msgctxt "dockable-action" +msgid "_Detach Tab" +msgstr "分离标签页(_D)" + +#: ../app/actions/dockable-actions.c:85 +msgctxt "preview-size" +msgid "_Tiny" +msgstr "微小(_T)" + +#: ../app/actions/dockable-actions.c:87 +msgctxt "preview-size" +msgid "E_xtra Small" +msgstr "更小(_X)" + +#: ../app/actions/dockable-actions.c:89 +msgctxt "preview-size" +msgid "_Small" +msgstr "较小(_S)" + +#: ../app/actions/dockable-actions.c:91 +msgctxt "preview-size" +msgid "_Medium" +msgstr "正常(_M)" + +#: ../app/actions/dockable-actions.c:93 +msgctxt "preview-size" +msgid "_Large" +msgstr "较大(_L)" + +#: ../app/actions/dockable-actions.c:95 +msgctxt "preview-size" +msgid "Ex_tra Large" +msgstr "更大(_T)" + +#: ../app/actions/dockable-actions.c:97 +msgctxt "preview-size" +msgid "_Huge" +msgstr "庞大(_H)" + +#: ../app/actions/dockable-actions.c:99 +msgctxt "preview-size" +msgid "_Enormous" +msgstr "巨大(_E)" + +#: ../app/actions/dockable-actions.c:101 +msgctxt "preview-size" +msgid "_Gigantic" +msgstr "极大(_G)" + +#: ../app/actions/dockable-actions.c:107 +msgctxt "tab-style" +msgid "_Icon" +msgstr "图标(_I)" + +#: ../app/actions/dockable-actions.c:109 +msgctxt "tab-style" +msgid "Current _Status" +msgstr "当前状态(_S)" + +#: ../app/actions/dockable-actions.c:111 +msgctxt "tab-style" +msgid "_Text" +msgstr "文字(_T)" + +#: ../app/actions/dockable-actions.c:113 +msgctxt "tab-style" +msgid "I_con & Text" +msgstr "图标和文字(_C)" + +#: ../app/actions/dockable-actions.c:115 +msgctxt "tab-style" +msgid "St_atus & Text" +msgstr "状态和文字(_A)" + +#: ../app/actions/dockable-actions.c:117 ../app/widgets/widgets-enums.c:261 +msgctxt "tab-style" +msgid "Automatic" +msgstr "自动" + +#: ../app/actions/dockable-actions.c:127 +msgctxt "dockable-action" +msgid "Loc_k Tab to Dock" +msgstr "将标签页锁定到Dock(_K)" + +#: ../app/actions/dockable-actions.c:129 +msgctxt "dockable-action" +msgid "Protect this tab from being dragged with the mouse pointer" +msgstr "保护此标签页不被鼠标指针拖拽" + +#: ../app/actions/dockable-actions.c:135 +msgctxt "dockable-action" +msgid "Show _Button Bar" +msgstr "显示按钮栏(_B)" + +#: ../app/actions/dockable-actions.c:144 +msgctxt "dockable-action" +msgid "View as _List" +msgstr "以列表方式查看(_L)" + +#: ../app/actions/dockable-actions.c:149 +msgctxt "dockable-action" +msgid "View as _Grid" +msgstr "以网格方式查看(_G)" + #: ../app/actions/documents-actions.c:42 msgctxt "documents-action" msgid "Documents Menu" @@ -1577,213 +3308,258 @@ msgstr "将图像位置复制到剪贴板" #: ../app/actions/documents-actions.c:70 msgctxt "documents-action" +msgid "Show in _File Manager" +msgstr "在文件管理器中显示(_F)" + +#: ../app/actions/documents-actions.c:71 +msgctxt "documents-action" +msgid "Show image location in the file manager" +msgstr "在文件管理器中显示图像的位置" + +#: ../app/actions/documents-actions.c:76 +msgctxt "documents-action" msgid "Remove _Entry" msgstr "删除项目(_E)" -#: ../app/actions/documents-actions.c:71 +#: ../app/actions/documents-actions.c:77 msgctxt "documents-action" msgid "Remove the selected entry" msgstr "删除选中的项" -#: ../app/actions/documents-actions.c:76 +#: ../app/actions/documents-actions.c:82 msgctxt "documents-action" msgid "_Clear History" msgstr "清除历史(_C)" -#: ../app/actions/documents-actions.c:77 +#: ../app/actions/documents-actions.c:83 msgctxt "documents-action" msgid "Clear the entire document history" msgstr "清除整个文档历史" -#: ../app/actions/documents-actions.c:82 +#: ../app/actions/documents-actions.c:88 msgctxt "documents-action" msgid "Recreate _Preview" -msgstr "重新生成预览(_P)" +msgstr "重建预览(_P)" -#: ../app/actions/documents-actions.c:83 +#: ../app/actions/documents-actions.c:89 msgctxt "documents-action" msgid "Recreate preview" msgstr "重新生成预览" -#: ../app/actions/documents-actions.c:88 +#: ../app/actions/documents-actions.c:94 msgctxt "documents-action" msgid "Reload _all Previews" msgstr "重新加载所有预览(_A)" -#: ../app/actions/documents-actions.c:89 +#: ../app/actions/documents-actions.c:95 msgctxt "documents-action" msgid "Reload all previews" msgstr "重新加载所有预览" -#: ../app/actions/documents-actions.c:94 +#: ../app/actions/documents-actions.c:100 msgctxt "documents-action" msgid "Remove Dangling E_ntries" msgstr "删除已不存在的项目(_N)" -#: ../app/actions/documents-actions.c:96 +#: ../app/actions/documents-actions.c:102 msgctxt "documents-action" msgid "Remove entries for which the corresponding file is not available" -msgstr "将不可用的文件的相关项移除" +msgstr "将不可用的相关文件项目删除" -#: ../app/actions/documents-commands.c:193 +#: ../app/actions/documents-commands.c:223 msgid "Clear Document History" msgstr "清除文档历史" -#: ../app/actions/documents-commands.c:216 -msgid "Clear the Recent Documents list?" -msgstr "清除文档历史？" +#: ../app/actions/documents-commands.c:230 ../app/actions/edit-commands.c:160 +#: ../app/actions/error-console-commands.c:96 +#: ../app/actions/file-commands.c:416 +#: ../app/actions/gradient-editor-commands.c:478 +#: ../app/actions/gradient-editor-commands.c:580 +#: ../app/actions/gradients-commands.c:78 ../app/actions/plug-in-commands.c:180 +#: ../app/actions/templates-commands.c:244 +#: ../app/actions/text-editor-commands.c:64 +#: ../app/actions/text-tool-commands.c:118 +#: ../app/actions/tool-options-commands.c:195 +#: ../app/actions/window-commands.c:75 +#: ../app/dialogs/color-profile-dialog.c:136 +#: ../app/dialogs/color-profile-dialog.c:154 +#: ../app/dialogs/color-profile-dialog.c:172 +#: ../app/dialogs/color-profile-dialog.c:190 +#: ../app/dialogs/color-profile-dialog.c:208 +#: ../app/dialogs/convert-indexed-dialog.c:138 +#: ../app/dialogs/convert-precision-dialog.c:165 +#: ../app/dialogs/data-delete-dialog.c:86 ../app/dialogs/fade-dialog.c:120 +#: ../app/dialogs/file-open-location-dialog.c:80 +#: ../app/dialogs/file-save-dialog.c:714 ../app/dialogs/fill-dialog.c:115 +#: ../app/dialogs/grid-dialog.c:102 +#: ../app/dialogs/image-merge-layers-dialog.c:100 +#: ../app/dialogs/image-new-dialog.c:106 ../app/dialogs/image-new-dialog.c:325 +#: ../app/dialogs/image-scale-dialog.c:210 +#: ../app/dialogs/item-options-dialog.c:145 +#: ../app/dialogs/layer-add-mask-dialog.c:110 +#: ../app/dialogs/offset-dialog.c:136 +#: ../app/dialogs/palette-import-dialog.c:162 +#: ../app/dialogs/preferences-dialog.c:287 +#: ../app/dialogs/preferences-dialog.c:637 +#: ../app/dialogs/preferences-dialog.c:1100 +#: ../app/dialogs/print-size-dialog.c:124 ../app/dialogs/quit-dialog.c:171 +#: ../app/dialogs/resize-dialog.c:186 +#: ../app/dialogs/resolution-calibrate-dialog.c:76 +#: ../app/dialogs/scale-dialog.c:137 ../app/dialogs/stroke-dialog.c:128 +#: ../app/dialogs/template-options-dialog.c:118 +#: ../app/dialogs/vectors-export-dialog.c:83 +#: ../app/dialogs/vectors-import-dialog.c:88 +#: ../app/display/gimpdisplayshell-close.c:179 +#: ../app/display/gimpdisplayshell-filter-dialog.c:87 +#: ../app/display/gimpdisplayshell-rotate-dialog.c:122 +#: ../app/display/gimpdisplayshell-scale-dialog.c:122 +#: ../app/tools/gimpfiltertool.c:323 +#: ../app/tools/gimpforegroundselecttool.c:313 ../app/tools/gimptexttool.c:1591 +#: ../app/tools/gimptransformtool.c:1201 ../app/widgets/gimpactionview.c:669 +#: ../app/widgets/gimpcolordialog.c:110 +#: ../app/widgets/gimpcontrollereditor.c:660 +#: ../app/widgets/gimpcontrollerlist.c:564 +#: ../app/widgets/gimpdeviceeditor.c:508 ../app/widgets/gimpdnd-xds.c:228 +#: ../app/widgets/gimpfiledialog.c:324 ../app/widgets/gimphelp.c:447 +#: ../app/widgets/gimphelp.c:796 ../app/widgets/gimpiconpicker.c:488 +#: ../app/widgets/gimpprogressdialog.c:91 ../app/widgets/gimpsettingsbox.c:734 +msgid "_Cancel" +msgstr "取消(_C)" -#: ../app/actions/documents-commands.c:219 +#: ../app/actions/documents-commands.c:231 ../app/actions/edit-commands.c:161 +#: ../app/dialogs/preferences-dialog.c:638 +msgid "Cl_ear" +msgstr "清除(_E)" + +#: ../app/actions/documents-commands.c:246 +msgid "Clear the Recent Documents list?" +msgstr "清除最近文档的列表？" + +#: ../app/actions/documents-commands.c:249 msgid "" "Clearing the document history will permanently remove all images from the " "recent documents list." -msgstr "清除文档历史将从最近文档列表中永久移除所有图像。" +msgstr "清除文档历史将从最近文档列表中永久删除所有图像。" #: ../app/actions/drawable-actions.c:45 msgctxt "drawable-action" msgid "_Equalize" -msgstr "色调均化(_E)" +msgstr "色相均化(_E)" #: ../app/actions/drawable-actions.c:46 msgctxt "drawable-action" msgid "Automatic contrast enhancement" -msgstr "自动对比度增强" +msgstr "自动增强对比度" #: ../app/actions/drawable-actions.c:51 msgctxt "drawable-action" -msgid "In_vert" -msgstr "反相(_V)" - -#: ../app/actions/drawable-actions.c:52 -msgctxt "drawable-action" -msgid "Invert the colors" -msgstr "反转颜色" - -#: ../app/actions/drawable-actions.c:57 -#, fuzzy -msgctxt "drawable-action" -msgid "_Value Invert" -msgstr "反转(_I)" - -#: ../app/actions/drawable-actions.c:58 -msgctxt "drawable-action" -msgid "Invert the brightness of each pixel" -msgstr "" - -#: ../app/actions/drawable-actions.c:63 -msgctxt "drawable-action" msgid "_White Balance" msgstr "白平衡(_W)" -#: ../app/actions/drawable-actions.c:64 +#: ../app/actions/drawable-actions.c:52 msgctxt "drawable-action" msgid "Automatic white balance correction" msgstr "自动校正白平衡" -#: ../app/actions/drawable-actions.c:69 +#: ../app/actions/drawable-actions.c:57 msgctxt "drawable-action" msgid "_Offset..." -msgstr "位移(_O)..." +msgstr "位移(_O)…" -#: ../app/actions/drawable-actions.c:71 +#: ../app/actions/drawable-actions.c:59 msgctxt "drawable-action" msgid "Shift the pixels, optionally wrapping them at the borders" msgstr "偏移像素，可选择在边界处回卷像素" +#: ../app/actions/drawable-actions.c:67 +msgctxt "drawable-action" +msgid "Toggle Drawable _Visibility" +msgstr "切换可绘制的可见性(_V)" + +#: ../app/actions/drawable-actions.c:73 +msgctxt "drawable-action" +msgid "Toggle Drawable _Linked State" +msgstr "切换可绘制的链接状态(_L)" + +#. GIMP_ICON_LOCK #: ../app/actions/drawable-actions.c:79 msgctxt "drawable-action" -msgid "_Visible" -msgstr "可见(_V)" +msgid "L_ock Pixels of Drawable" +msgstr "锁定可绘制的像素(_O)" -#: ../app/actions/drawable-actions.c:80 -msgctxt "drawable-action" -msgid "Toggle visibility" -msgstr "切换可见性" - -#: ../app/actions/drawable-actions.c:86 -msgctxt "drawable-action" -msgid "_Linked" -msgstr "链接(_L)" - -#: ../app/actions/drawable-actions.c:87 -msgctxt "drawable-action" -msgid "Toggle the linked state" -msgstr "切换链接状态" - -#. GIMP_STOCK_LOCK -#: ../app/actions/drawable-actions.c:93 -msgctxt "drawable-action" -msgid "L_ock pixels" -msgstr "锁定像素(_O)" - -#: ../app/actions/drawable-actions.c:95 +#: ../app/actions/drawable-actions.c:81 msgctxt "drawable-action" msgid "Keep the pixels on this drawable from being modified" msgstr "保持此可绘制对象上的像素不被修改" -#: ../app/actions/drawable-actions.c:104 +#: ../app/actions/drawable-actions.c:87 +msgctxt "drawable-action" +msgid "L_ock Position of Drawable" +msgstr "锁定可绘制的位置(_O)" + +#: ../app/actions/drawable-actions.c:89 +msgctxt "drawable-action" +msgid "Keep the position on this drawable from being modified" +msgstr "保持此可绘制对象上的位置不被修改" + +#: ../app/actions/drawable-actions.c:98 msgctxt "drawable-action" msgid "Flip _Horizontally" msgstr "水平翻转(_H)" -#: ../app/actions/drawable-actions.c:105 +#: ../app/actions/drawable-actions.c:99 msgctxt "drawable-action" -msgid "Flip horizontally" -msgstr "水平翻转" +msgid "Flip drawable horizontally" +msgstr "水平翻转图像" -#: ../app/actions/drawable-actions.c:110 +#: ../app/actions/drawable-actions.c:104 msgctxt "drawable-action" msgid "Flip _Vertically" -msgstr "垂直翻转(_V)" +msgstr "竖直翻转(_V)" -#: ../app/actions/drawable-actions.c:111 +#: ../app/actions/drawable-actions.c:105 msgctxt "drawable-action" -msgid "Flip vertically" -msgstr "垂直翻转" +msgid "Flip drawable vertically" +msgstr "竖直翻转图像" -#: ../app/actions/drawable-actions.c:119 +#: ../app/actions/drawable-actions.c:113 msgctxt "drawable-action" msgid "Rotate 90° _clockwise" msgstr "顺时针旋转 90 度(_C)" -#: ../app/actions/drawable-actions.c:120 +#: ../app/actions/drawable-actions.c:114 msgctxt "drawable-action" -msgid "Rotate 90 degrees to the right" -msgstr "顺时针旋转 90 度" +msgid "Rotate drawable 90 degrees to the right" +msgstr "向右旋转图像 90 度" -#: ../app/actions/drawable-actions.c:125 +#: ../app/actions/drawable-actions.c:119 msgctxt "drawable-action" msgid "Rotate _180°" -msgstr "旋转 180 度(_1)" +msgstr "旋转 _180 度" -#: ../app/actions/drawable-actions.c:126 +#: ../app/actions/drawable-actions.c:120 msgctxt "drawable-action" -msgid "Turn upside-down" -msgstr "上下颠倒" +msgid "Turn drawable upside-down" +msgstr "上下颠倒图像" -#: ../app/actions/drawable-actions.c:131 +#: ../app/actions/drawable-actions.c:125 msgctxt "drawable-action" msgid "Rotate 90° counter-clock_wise" msgstr "逆时针旋转 90 度(_W)" -#: ../app/actions/drawable-actions.c:132 +#: ../app/actions/drawable-actions.c:126 msgctxt "drawable-action" -msgid "Rotate 90 degrees to the left" -msgstr "逆时针旋转 90 度" +msgid "Rotate drawable 90 degrees to the left" +msgstr "向左旋转图像 90 度" -#: ../app/actions/drawable-commands.c:71 ../app/actions/drawable-commands.c:87 -#: ../app/pdb/color-cmds.c:373 -msgid "Invert" -msgstr "反转" - -#: ../app/actions/drawable-commands.c:108 +#: ../app/actions/drawable-commands.c:89 msgid "White Balance operates only on RGB color layers." -msgstr "只能对 RGB 颜色的图层进行白平衡操作。" +msgstr "仅对使用 RGB 颜色的图层进行白平衡操作。" #: ../app/actions/dynamics-actions.c:43 msgctxt "dynamics-action" msgid "Paint Dynamics Menu" -msgstr "动态绘图菜单" +msgstr "动态绘画菜单" #: ../app/actions/dynamics-actions.c:47 msgctxt "dynamics-action" @@ -1817,430 +3593,528 @@ msgstr "将动态文件位置复制到剪贴板" #: ../app/actions/dynamics-actions.c:65 msgctxt "dynamics-action" -msgid "_Delete Dynamics" -msgstr "删除动态" +msgid "Show in _File Manager" +msgstr "在文件管理器中显示(_F)" #: ../app/actions/dynamics-actions.c:66 msgctxt "dynamics-action" +msgid "Show dynamics file location in the file manager" +msgstr "在文件管理器中显示动态文件的位置" + +#: ../app/actions/dynamics-actions.c:71 +msgctxt "dynamics-action" +msgid "_Delete Dynamics" +msgstr "删除动态(_D)" + +#: ../app/actions/dynamics-actions.c:72 +msgctxt "dynamics-action" msgid "Delete this dynamics" msgstr "删除此动态" -#: ../app/actions/dynamics-actions.c:71 -#, fuzzy +#: ../app/actions/dynamics-actions.c:77 msgctxt "dynamics-action" msgid "_Refresh Dynamics" msgstr "刷新动态(_R)" -#: ../app/actions/dynamics-actions.c:72 +#: ../app/actions/dynamics-actions.c:78 msgctxt "dynamics-action" msgid "Refresh dynamics" msgstr "刷新动态" -#: ../app/actions/dynamics-actions.c:80 +#: ../app/actions/dynamics-actions.c:86 msgctxt "dynamics-action" msgid "_Edit Dynamics..." -msgstr "编辑动态(_E)..." +msgstr "编辑动态(_E)…" -#: ../app/actions/dynamics-actions.c:81 +#: ../app/actions/dynamics-actions.c:87 msgctxt "dynamics-action" -msgid "Edit dynamics" -msgstr "编辑动态" +msgid "Edit this dynamics" +msgstr "编辑该动态" #: ../app/actions/dynamics-editor-actions.c:43 msgctxt "dynamics-editor-action" msgid "Paint Dynamics Editor Menu" -msgstr "动态绘图编辑菜单" +msgstr "动态绘画编辑器菜单" #: ../app/actions/dynamics-editor-actions.c:51 msgctxt "dynamics-editor-action" msgid "Edit Active Dynamics" msgstr "编辑活动动态" -#: ../app/actions/edit-actions.c:63 +#: ../app/actions/edit-actions.c:65 msgctxt "edit-action" msgid "_Edit" msgstr "编辑(_E)" -#: ../app/actions/edit-actions.c:64 +#: ../app/actions/edit-actions.c:66 msgctxt "edit-action" msgid "Paste _as" msgstr "粘贴为(_A)" -#: ../app/actions/edit-actions.c:65 +#: ../app/actions/edit-actions.c:67 msgctxt "edit-action" msgid "_Buffer" msgstr "缓冲区(_B)" -#: ../app/actions/edit-actions.c:68 +#: ../app/actions/edit-actions.c:70 msgctxt "edit-action" msgid "Undo History Menu" msgstr "撤消历史菜单" -#: ../app/actions/edit-actions.c:72 +#: ../app/actions/edit-actions.c:74 msgctxt "edit-action" msgid "_Undo" msgstr "撤消(_U)" -#: ../app/actions/edit-actions.c:73 +#: ../app/actions/edit-actions.c:75 msgctxt "edit-action" msgid "Undo the last operation" msgstr "撤消上次操作" -#: ../app/actions/edit-actions.c:78 +#: ../app/actions/edit-actions.c:80 msgctxt "edit-action" msgid "_Redo" msgstr "重做(_R)" -#: ../app/actions/edit-actions.c:79 +#: ../app/actions/edit-actions.c:81 msgctxt "edit-action" msgid "Redo the last operation that was undone" msgstr "重做上次撤消的操作" -#: ../app/actions/edit-actions.c:84 +#: ../app/actions/edit-actions.c:86 msgctxt "edit-action" msgid "Strong Undo" msgstr "强力撤消" -#: ../app/actions/edit-actions.c:85 +#: ../app/actions/edit-actions.c:87 msgctxt "edit-action" msgid "Undo the last operation, skipping visibility changes" msgstr "撤消上次操作，略过可视状态的改变" -#: ../app/actions/edit-actions.c:90 +#: ../app/actions/edit-actions.c:92 msgctxt "edit-action" msgid "Strong Redo" msgstr "强力重做" -#: ../app/actions/edit-actions.c:92 +#: ../app/actions/edit-actions.c:94 msgctxt "edit-action" msgid "Redo the last operation that was undone, skipping visibility changes" -msgstr "重做上次撤消的操作，略过可视状态的改变" +msgstr "重做上次撤消的操作，但忽略可视状态更改" -#: ../app/actions/edit-actions.c:97 +#: ../app/actions/edit-actions.c:99 msgctxt "edit-action" msgid "_Clear Undo History" msgstr "清除撤消历史(_C)" -#: ../app/actions/edit-actions.c:98 +#: ../app/actions/edit-actions.c:100 msgctxt "edit-action" msgid "Remove all operations from the undo history" -msgstr "从撤消历史中移除全部操作" - -#: ../app/actions/edit-actions.c:103 -msgctxt "edit-action" -msgid "_Fade..." -msgstr "淡出(_F)..." +msgstr "从撤消历史中删除全部操作" #: ../app/actions/edit-actions.c:105 msgctxt "edit-action" -msgid "Modify paint mode and opacity of the last pixel manipulation" -msgstr "修改最后一次像素处理的绘图模式和透明度" +msgid "_Fade..." +msgstr "淡出(_F)…" -#: ../app/actions/edit-actions.c:110 +#: ../app/actions/edit-actions.c:107 +msgctxt "edit-action" +msgid "Modify paint mode and opacity of the last pixel manipulation" +msgstr "修改最后一次像素处理的绘画模式和透明度" + +#: ../app/actions/edit-actions.c:112 msgctxt "edit-action" msgid "Cu_t" msgstr "剪切(_T)" -#: ../app/actions/edit-actions.c:111 +#: ../app/actions/edit-actions.c:113 msgctxt "edit-action" msgid "Move the selected pixels to the clipboard" msgstr "将选中的像素移动到剪贴板" -#: ../app/actions/edit-actions.c:116 +#: ../app/actions/edit-actions.c:118 msgctxt "edit-action" msgid "_Copy" msgstr "复制(_C)" -#: ../app/actions/edit-actions.c:117 +#: ../app/actions/edit-actions.c:119 msgctxt "edit-action" msgid "Copy the selected pixels to the clipboard" msgstr "将选中的像素复制到剪贴板" -#. GIMP_STOCK_COPY_VISIBLE, -#: ../app/actions/edit-actions.c:122 +#. GIMP_ICON_COPY_VISIBLE, +#: ../app/actions/edit-actions.c:124 msgctxt "edit-action" msgid "Copy _Visible" msgstr "复制可见(_V)" -#: ../app/actions/edit-actions.c:123 +#: ../app/actions/edit-actions.c:125 msgctxt "edit-action" msgid "Copy what is visible in the selected region" msgstr "无法浮动选区，因为选择区域为空" -#: ../app/actions/edit-actions.c:128 -msgctxt "edit-action" -msgid "_Paste" -msgstr "粘贴(_P)" - -#: ../app/actions/edit-actions.c:129 -msgctxt "edit-action" -msgid "Paste the content of the clipboard" -msgstr "将内容粘贴到剪贴板" - -#: ../app/actions/edit-actions.c:134 -msgctxt "edit-action" -msgid "Paste _Into" -msgstr "粘贴进入(_I)" - -#: ../app/actions/edit-actions.c:136 -msgctxt "edit-action" -msgid "Paste the content of the clipboard into the current selection" -msgstr "将剪贴板中的内容粘贴到当前选区" - -#: ../app/actions/edit-actions.c:141 +#: ../app/actions/edit-actions.c:130 msgctxt "edit-action" msgid "From _Clipboard" msgstr "从剪贴板(_C)" -#: ../app/actions/edit-actions.c:142 ../app/actions/edit-actions.c:148 +#: ../app/actions/edit-actions.c:131 ../app/actions/edit-actions.c:137 msgctxt "edit-action" msgid "Create a new image from the content of the clipboard" msgstr "从剪贴板中的内容创建新图像" -#: ../app/actions/edit-actions.c:147 +#: ../app/actions/edit-actions.c:136 msgctxt "edit-action" msgid "_New Image" msgstr "新建图像(_N)" -#: ../app/actions/edit-actions.c:153 -msgctxt "edit-action" -msgid "New _Layer" -msgstr "新建图层(_L)" - -#: ../app/actions/edit-actions.c:154 -msgctxt "edit-action" -msgid "Create a new layer from the content of the clipboard" -msgstr "从剪贴板中的内容创建新图层" - -#: ../app/actions/edit-actions.c:159 +#: ../app/actions/edit-actions.c:142 msgctxt "edit-action" msgid "Cu_t Named..." -msgstr "命名剪切(_T)..." +msgstr "剪切命名(_T)…" -#: ../app/actions/edit-actions.c:160 +#: ../app/actions/edit-actions.c:143 msgctxt "edit-action" msgid "Move the selected pixels to a named buffer" -msgstr "将选中的像素移动到命名缓冲区" +msgstr "将选中的像素移动到命名的缓冲区" -#: ../app/actions/edit-actions.c:165 +#: ../app/actions/edit-actions.c:148 msgctxt "edit-action" msgid "_Copy Named..." -msgstr "命名复制(_C)..." +msgstr "复制命名(_C)…" -#: ../app/actions/edit-actions.c:166 +#: ../app/actions/edit-actions.c:149 msgctxt "edit-action" msgid "Copy the selected pixels to a named buffer" -msgstr "将选中的像素复制到命名缓冲区" +msgstr "将选中的像素复制到命名的缓冲区" -#. GIMP_STOCK_COPY_VISIBLE, -#: ../app/actions/edit-actions.c:171 +#. GIMP_ICON_COPY_VISIBLE, +#: ../app/actions/edit-actions.c:154 msgctxt "edit-action" msgid "Copy _Visible Named..." -msgstr "命名复制可见(_V)..." +msgstr "复制可见命名(_V)…" -#: ../app/actions/edit-actions.c:173 +#: ../app/actions/edit-actions.c:156 msgctxt "edit-action" msgid "Copy what is visible in the selected region to a named buffer" -msgstr "将选择区域的可见内容复制到命名缓冲区" +msgstr "将选择区域的可见内容复制到命名的缓冲区" -#: ../app/actions/edit-actions.c:178 +#: ../app/actions/edit-actions.c:161 msgctxt "edit-action" msgid "_Paste Named..." -msgstr "命名粘贴(_P)..." +msgstr "粘贴命名(_P)…" -#: ../app/actions/edit-actions.c:179 +#: ../app/actions/edit-actions.c:162 msgctxt "edit-action" msgid "Paste the content of a named buffer" -msgstr "粘贴命名缓冲区中的内容" +msgstr "粘贴命名的缓冲区中的内容" -#: ../app/actions/edit-actions.c:184 +#: ../app/actions/edit-actions.c:167 msgctxt "edit-action" msgid "Cl_ear" msgstr "清除(_E)" -#: ../app/actions/edit-actions.c:185 +#: ../app/actions/edit-actions.c:168 msgctxt "edit-action" msgid "Clear the selected pixels" msgstr "清除选中的像素" -#: ../app/actions/edit-actions.c:193 +#: ../app/actions/edit-actions.c:176 +msgctxt "edit-action" +msgid "_Paste" +msgstr "粘贴(_P)" + +#: ../app/actions/edit-actions.c:177 +msgctxt "edit-action" +msgid "Paste the content of the clipboard" +msgstr "粘贴剪贴板内容" + +#: ../app/actions/edit-actions.c:182 +msgctxt "edit-action" +msgid "Paste In Place" +msgstr "粘贴至原位" + +#: ../app/actions/edit-actions.c:184 +msgctxt "edit-action" +msgid "Paste the content of the clipboard at its original position" +msgstr "将剪贴板中的内容粘贴到其原位" + +#: ../app/actions/edit-actions.c:189 +msgctxt "edit-action" +msgid "Paste _Into Selection" +msgstr "粘贴到选区(_I)" + +#: ../app/actions/edit-actions.c:191 +msgctxt "edit-action" +msgid "Paste the content of the clipboard into the current selection" +msgstr "将剪贴板中的内容粘贴到当前选区" + +#: ../app/actions/edit-actions.c:196 +msgctxt "edit-action" +msgid "Paste Into Selection In Place" +msgstr "在原位粘贴到选区" + +#: ../app/actions/edit-actions.c:198 +msgctxt "edit-action" +msgid "" +"Paste the content of the clipboard into the current selection at its " +"original position" +msgstr "将剪贴板中的内容在其原位粘贴到当前选区" + +#: ../app/actions/edit-actions.c:204 +msgctxt "edit-action" +msgid "New _Layer" +msgstr "新建图层(_L)" + +#: ../app/actions/edit-actions.c:205 +msgctxt "edit-action" +msgid "Create a new layer from the content of the clipboard" +msgstr "从剪贴板中的内容创建新图层" + +#: ../app/actions/edit-actions.c:210 +msgctxt "edit-action" +msgid "New Layer In _Place" +msgstr "在原位新建图层(_P)" + +#: ../app/actions/edit-actions.c:212 +msgctxt "edit-action" +msgid "" +"Create a new layer from the content of the clipboard and place it at its " +"original position" +msgstr "用剪贴板中的内容在其原位创建新图层" + +#: ../app/actions/edit-actions.c:221 msgctxt "edit-action" msgid "Fill with _FG Color" msgstr "以前景色填充(_F)" -#: ../app/actions/edit-actions.c:194 +#: ../app/actions/edit-actions.c:222 msgctxt "edit-action" msgid "Fill the selection using the foreground color" -msgstr "使用前景颜色填入选中区域" +msgstr "使用前景颜色填充选中区域" -#: ../app/actions/edit-actions.c:199 +#: ../app/actions/edit-actions.c:227 msgctxt "edit-action" msgid "Fill with B_G Color" msgstr "以背景色填充(_G)" -#: ../app/actions/edit-actions.c:200 +#: ../app/actions/edit-actions.c:228 msgctxt "edit-action" msgid "Fill the selection using the background color" -msgstr "使用背景颜色填入选中区域" +msgstr "使用背景颜色填充选中区域" -#: ../app/actions/edit-actions.c:205 +#: ../app/actions/edit-actions.c:233 msgctxt "edit-action" msgid "Fill _with Pattern" msgstr "以图案填充(_W)" -#: ../app/actions/edit-actions.c:206 +#: ../app/actions/edit-actions.c:234 msgctxt "edit-action" msgid "Fill the selection using the active pattern" -msgstr "使用当前图案填入选中区域" +msgstr "使用当前图案填充选中区域" -#: ../app/actions/edit-actions.c:304 +#: ../app/actions/edit-actions.c:344 ../app/actions/edit-actions.c:346 #, c-format msgid "_Undo %s" -msgstr "撤消 %s(_U)" +msgstr "撤消(_U) %s" -#: ../app/actions/edit-actions.c:311 +#: ../app/actions/edit-actions.c:350 ../app/actions/edit-actions.c:352 #, c-format msgid "_Redo %s" -msgstr "重做 %s(_R)" +msgstr "重做(_R) %s" -#: ../app/actions/edit-actions.c:326 +#: ../app/actions/edit-actions.c:366 #, c-format msgid "_Fade %s..." -msgstr "淡出(_F) %s..." +msgstr "淡出(_F) %s…" -#: ../app/actions/edit-actions.c:338 +#: ../app/actions/edit-actions.c:378 msgid "_Undo" msgstr "撤消(_U)" -#: ../app/actions/edit-actions.c:339 +#: ../app/actions/edit-actions.c:379 msgid "_Redo" msgstr "重做(_R)" -#: ../app/actions/edit-actions.c:340 +#: ../app/actions/edit-actions.c:380 msgid "_Fade..." -msgstr "淡出(_F)..." +msgstr "淡出(_F)…" -#: ../app/actions/edit-commands.c:137 +#: ../app/actions/edit-commands.c:152 msgid "Clear Undo History" msgstr "清除撤消历史" -#: ../app/actions/edit-commands.c:163 +#: ../app/actions/edit-commands.c:179 msgid "Really clear image's undo history?" msgstr "真的要清除图像的撤消历史吗？" -#: ../app/actions/edit-commands.c:176 +#: ../app/actions/edit-commands.c:192 #, c-format msgid "Clearing the undo history of this image will gain %s of memory." msgstr "清除此图像的撤消历史可释放 %s 的内存。" -#: ../app/actions/edit-commands.c:206 -msgid "Cut pixels to the clipboard" -msgstr "将像素复制到剪贴板" +#: ../app/actions/edit-commands.c:248 +msgid "Cut layer to the clipboard." +msgstr "将图层剪切到剪贴板。" -#: ../app/actions/edit-commands.c:236 ../app/actions/edit-commands.c:265 -msgid "Copied pixels to the clipboard" -msgstr "将像素复制到剪贴板" +#: ../app/actions/edit-commands.c:249 +msgid "Cut pixels to the clipboard." +msgstr "将像素剪切到剪贴板。" -#: ../app/actions/edit-commands.c:325 ../app/actions/edit-commands.c:361 -#: ../app/actions/edit-commands.c:544 +#: ../app/actions/edit-commands.c:284 +msgid "Copied layer to the clipboard." +msgstr "将图层复制到剪贴板。" + +#: ../app/actions/edit-commands.c:285 ../app/actions/edit-commands.c:314 +msgid "Copied pixels to the clipboard." +msgstr "将像素复制到剪贴板。" + +#: ../app/actions/edit-commands.c:393 ../app/actions/edit-commands.c:599 +#: ../app/tools/gimpseamlessclonetool.c:295 msgid "There is no image data in the clipboard to paste." msgstr "剪贴板中没有可粘贴的图像数据。" -#: ../app/actions/edit-commands.c:349 ../app/core/gimpbrushclipboard.c:169 -#: ../app/core/gimppatternclipboard.c:170 ../app/widgets/gimpclipboard.c:346 -msgid "Clipboard" -msgstr "剪贴板" - -#: ../app/actions/edit-commands.c:375 +#: ../app/actions/edit-commands.c:408 msgid "Cut Named" -msgstr "命名剪切" +msgstr "剪切命名" -#: ../app/actions/edit-commands.c:378 ../app/actions/edit-commands.c:419 -#: ../app/actions/edit-commands.c:439 +#: ../app/actions/edit-commands.c:411 ../app/actions/edit-commands.c:431 +#: ../app/actions/edit-commands.c:451 msgid "Enter a name for this buffer" msgstr "为这个缓冲区输入一个名字" -#: ../app/actions/edit-commands.c:416 +#: ../app/actions/edit-commands.c:428 msgid "Copy Named" -msgstr "命名复制" +msgstr "复制命名" -#: ../app/actions/edit-commands.c:436 +#: ../app/actions/edit-commands.c:448 msgid "Copy Visible Named " -msgstr "命名复制可见" +msgstr "复制可见命名 " -#: ../app/actions/edit-commands.c:561 +#: ../app/actions/edit-commands.c:571 ../app/display/gimpdisplayshell-dnd.c:479 +msgid "Pasted as new layer because the target is a layer group." +msgstr "粘贴为新图层，因为目标为图层组。" + +#: ../app/actions/edit-commands.c:578 ../app/display/gimpdisplayshell-dnd.c:488 +msgid "Pasted as new layer because the target's pixels are locked." +msgstr "粘贴为新图层，因为目标像素被锁定。" + +#: ../app/actions/edit-commands.c:616 msgid "There is no active layer or channel to cut from." msgstr "没有活动图层或通道可以剪切。" -#: ../app/actions/edit-commands.c:566 ../app/actions/edit-commands.c:598 -#: ../app/actions/edit-commands.c:622 +#: ../app/actions/edit-commands.c:621 ../app/actions/edit-commands.c:653 +#: ../app/actions/edit-commands.c:677 msgid "(Unnamed Buffer)" msgstr "(未命名缓冲区)" -#: ../app/actions/edit-commands.c:593 +#: ../app/actions/edit-commands.c:648 msgid "There is no active layer or channel to copy from." msgstr "没有活动图层或通道可以复制。" -#: ../app/actions/error-console-actions.c:39 +#: ../app/actions/error-console-actions.c:40 msgctxt "error-console-action" msgid "Error Console Menu" msgstr "错误控制台菜单" -#: ../app/actions/error-console-actions.c:43 +#: ../app/actions/error-console-actions.c:44 msgctxt "error-console-action" msgid "_Clear" msgstr "清除(_C)" -#: ../app/actions/error-console-actions.c:44 +#: ../app/actions/error-console-actions.c:45 msgctxt "error-console-action" msgid "Clear error console" msgstr "清空错误控制台" -#: ../app/actions/error-console-actions.c:49 +#: ../app/actions/error-console-actions.c:50 msgctxt "error-console-action" msgid "Select _All" msgstr "全部选中(_A)" -#: ../app/actions/error-console-actions.c:50 +#: ../app/actions/error-console-actions.c:51 msgctxt "error-console-action" msgid "Select all error messages" msgstr "选择所有错误信息" -#: ../app/actions/error-console-actions.c:58 +#: ../app/actions/error-console-actions.c:56 +msgctxt "error-console-action" +msgid "_Highlight" +msgstr "高亮(_H)" + +#: ../app/actions/error-console-actions.c:63 msgctxt "error-console-action" msgid "_Save Error Log to File..." -msgstr "将出错记录保存到文件(_S)..." +msgstr "将出错日志保存到文件(_S)…" -#: ../app/actions/error-console-actions.c:59 +#: ../app/actions/error-console-actions.c:64 msgctxt "error-console-action" msgid "Write all error messages to a file" msgstr "将所有错误信息写入到文件" -#: ../app/actions/error-console-actions.c:64 +#: ../app/actions/error-console-actions.c:69 msgctxt "error-console-action" msgid "Save S_election to File..." -msgstr "将选区保存到文件(_E)..." +msgstr "将选区保存到文件(_E)…" -#: ../app/actions/error-console-actions.c:65 +#: ../app/actions/error-console-actions.c:70 msgctxt "error-console-action" msgid "Write the selected error messages to a file" msgstr "将选中的错误信息写入到文件" +#: ../app/actions/error-console-actions.c:78 +msgctxt "error-console-action" +msgid "_Errors" +msgstr "错误(_E)" + +#: ../app/actions/error-console-actions.c:79 +msgctxt "error-console-action" +msgid "Highlight error console on errors" +msgstr "出现错误时高亮显示错误控制台" + +#: ../app/actions/error-console-actions.c:85 +msgctxt "error-console-action" +msgid "_Warnings" +msgstr "警告(_W)" + +#: ../app/actions/error-console-actions.c:86 +msgctxt "error-console-action" +msgid "Highlight error console on warnings" +msgstr "出现警告时高亮显示错误控制台" + +#: ../app/actions/error-console-actions.c:92 +msgctxt "error-console-action" +msgid "_Messages" +msgstr "消息(_M)" + +#: ../app/actions/error-console-actions.c:93 +msgctxt "error-console-action" +msgid "Highlight error console on messages" +msgstr "出现消息时高亮显示错误控制台" + #: ../app/actions/error-console-commands.c:84 msgid "Cannot save. Nothing is selected." msgstr "无法保存。没有选中任何内容。" -#: ../app/actions/error-console-commands.c:95 +#: ../app/actions/error-console-commands.c:93 msgid "Save Error Log to File" -msgstr "将出错记录保存到文件" +msgstr "将出错日志保存到文件" -#: ../app/actions/error-console-commands.c:157 +#: ../app/actions/error-console-commands.c:97 +#: ../app/actions/gradients-commands.c:79 ../app/dialogs/file-save-dialog.c:715 +#: ../app/dialogs/input-devices-dialog.c:63 +#: ../app/dialogs/vectors-export-dialog.c:84 +#: ../app/display/gimpdisplayshell-close.c:177 +#: ../app/widgets/gimpsavedialog.c:143 ../app/widgets/gimpsettingsbox.c:736 +msgid "_Save" +msgstr "保存(_S)" + +#: ../app/actions/error-console-commands.c:188 #, c-format msgid "" "Error writing file '%s':\n" "%s" msgstr "" -"写文件“%s”时出错：\n" +"写入文件“%s”时出错：\n" "%s" #: ../app/actions/file-actions.c:71 @@ -2251,7 +4125,7 @@ msgstr "文件(_F)" #: ../app/actions/file-actions.c:72 msgctxt "file-action" msgid "Crea_te" -msgstr "创建(_T)" +msgstr "新建(_T)" #: ../app/actions/file-actions.c:73 msgctxt "file-action" @@ -2261,7 +4135,7 @@ msgstr "最近打开(_R)" #: ../app/actions/file-actions.c:76 msgctxt "file-action" msgid "_Open..." -msgstr "打开(_O)..." +msgstr "打开(_O)…" #: ../app/actions/file-actions.c:77 msgctxt "file-action" @@ -2271,17 +4145,17 @@ msgstr "打开图像文件" #: ../app/actions/file-actions.c:82 msgctxt "file-action" msgid "Op_en as Layers..." -msgstr "作为图层打开(_E)..." +msgstr "作为图层打开(_E)…" #: ../app/actions/file-actions.c:83 msgctxt "file-action" msgid "Open an image file as layers" -msgstr "作为图层打开图像文件" +msgstr "将图像文件作为图层打开" #: ../app/actions/file-actions.c:88 msgctxt "file-action" msgid "Open _Location..." -msgstr "打开位置(_L)..." +msgstr "打开位置(_L)…" #: ../app/actions/file-actions.c:89 msgctxt "file-action" @@ -2291,7 +4165,7 @@ msgstr "从指定的位置打开图像文件" #: ../app/actions/file-actions.c:94 msgctxt "file-action" msgid "Create Template..." -msgstr "创建模板..." +msgstr "新建模板…" #: ../app/actions/file-actions.c:95 msgctxt "file-action" @@ -2306,7 +4180,7 @@ msgstr "恢复(_V)" #: ../app/actions/file-actions.c:101 msgctxt "file-action" msgid "Reload the image file from disk" -msgstr "从磁盘重新装入图像文件" +msgstr "从磁盘重新加载图像文件" #: ../app/actions/file-actions.c:106 msgctxt "file-action" @@ -2320,242 +4194,912 @@ msgstr "关闭全部打开的图像" #: ../app/actions/file-actions.c:112 msgctxt "file-action" +msgid "Copy _Image Location" +msgstr "复制图像位置(_I)" + +#: ../app/actions/file-actions.c:113 +msgctxt "file-action" +msgid "Copy image file location to clipboard" +msgstr "将图像文件位置复制到剪贴板" + +#: ../app/actions/file-actions.c:118 +msgctxt "file-action" +msgid "Show in _File Manager" +msgstr "在文件管理器中显示(_F)" + +#: ../app/actions/file-actions.c:119 +msgctxt "file-action" +msgid "Show image file location in the file manager" +msgstr "在文件管理器中显示图像文件的位置" + +#: ../app/actions/file-actions.c:124 +msgctxt "file-action" msgid "_Quit" msgstr "退出(_Q)" -#: ../app/actions/file-actions.c:113 +#: ../app/actions/file-actions.c:125 msgctxt "file-action" msgid "Quit the GNU Image Manipulation Program" msgstr "退出 GNU 图像处理程序" -#: ../app/actions/file-actions.c:121 +#: ../app/actions/file-actions.c:133 ../app/actions/file-actions.c:308 msgctxt "file-action" msgid "_Save" msgstr "保存(_S)" -#: ../app/actions/file-actions.c:122 +#: ../app/actions/file-actions.c:134 msgctxt "file-action" msgid "Save this image" msgstr "保存此图像" -#: ../app/actions/file-actions.c:127 +#: ../app/actions/file-actions.c:139 msgctxt "file-action" msgid "Save _As..." -msgstr "另存为(_A)..." +msgstr "另存为(_A)…" -#: ../app/actions/file-actions.c:128 +#: ../app/actions/file-actions.c:140 msgctxt "file-action" msgid "Save this image with a different name" msgstr "用不同的名字保存此图像" -#: ../app/actions/file-actions.c:133 +#: ../app/actions/file-actions.c:145 msgctxt "file-action" msgid "Save a Cop_y..." -msgstr "保存副本(_Y)..." +msgstr "保存副本(_Y)…" -#: ../app/actions/file-actions.c:135 +#: ../app/actions/file-actions.c:147 msgctxt "file-action" msgid "" "Save a copy of this image, without affecting the source file (if any) or the " "current state of the image" -msgstr "保存此图像的一份复本，不影响源文件(若存在)或此图像的当前状态" - -#: ../app/actions/file-actions.c:140 -msgctxt "file-action" -msgid "Save and Close..." -msgstr "保存并关闭..." - -#: ../app/actions/file-actions.c:141 -msgctxt "file-action" -msgid "Save this image and close its window" -msgstr "保存此图像并关闭它的窗口" - -#: ../app/actions/file-actions.c:146 -msgctxt "file-action" -msgid "Export to" -msgstr "导出到" - -#: ../app/actions/file-actions.c:147 -msgctxt "file-action" -msgid "Export the image again" -msgstr "再次导出图像" - -#: ../app/actions/file-actions.c:152 -#, fuzzy -msgctxt "file-action" -msgid "Over_write" -msgstr "覆盖" +msgstr "保存此图像的一份副本，不影响源文件(若存在)或此图像的当前状态" #: ../app/actions/file-actions.c:153 msgctxt "file-action" -msgid "Export the image back to the imported file in the import format" -msgstr "将图像以被导入的格式反向导出到导入文件" +msgid "Save and Close..." +msgstr "保存并关闭…" -#: ../app/actions/file-actions.c:158 +#: ../app/actions/file-actions.c:154 +msgctxt "file-action" +msgid "Save this image and close its window" +msgstr "保存此图像并关闭窗口" + +#: ../app/actions/file-actions.c:159 ../app/actions/file-actions.c:333 msgctxt "file-action" msgid "Export..." -msgstr "导出..." +msgstr "导出…" -#: ../app/actions/file-actions.c:159 +#: ../app/actions/file-actions.c:160 +msgctxt "file-action" +msgid "Export the image" +msgstr "导出该图像" + +#: ../app/actions/file-actions.c:165 +msgctxt "file-action" +msgid "Over_write" +msgstr "覆盖(_W)" + +#: ../app/actions/file-actions.c:166 +msgctxt "file-action" +msgid "Export the image back to the imported file in the import format" +msgstr "将图像以导入文件的格式导出到源文件" + +#: ../app/actions/file-actions.c:171 +msgctxt "file-action" +msgid "Export As..." +msgstr "导出为…" + +#: ../app/actions/file-actions.c:172 msgctxt "file-action" msgid "Export the image to various file formats such as PNG or JPEG" msgstr "将图像导出到如 PNG 或 JPEG 的多种文件格式" -#: ../app/actions/file-actions.c:292 +#: ../app/actions/file-actions.c:314 +msgctxt "file-action" +msgid "_Save..." +msgstr "保存(_S)…" + +#: ../app/actions/file-actions.c:319 #, c-format msgid "Export to %s" msgstr "导出到 %s" -#: ../app/actions/file-actions.c:298 -#, fuzzy, c-format +#: ../app/actions/file-actions.c:325 +#, c-format msgid "Over_write %s" -msgstr "覆盖 %s" +msgstr "覆盖(_W) %s" -#: ../app/actions/file-actions.c:306 -msgid "Export to" -msgstr "导出到" - -#: ../app/actions/file-commands.c:112 ../app/actions/file-commands.c:492 -#: ../app/dialogs/file-open-dialog.c:77 +#: ../app/actions/file-commands.c:118 ../app/actions/file-commands.c:542 +#: ../app/widgets/gimpopendialog.c:66 msgid "Open Image" msgstr "打开图像" -#: ../app/actions/file-commands.c:133 +#: ../app/actions/file-commands.c:139 msgid "Open Image as Layers" msgstr "作为图层打开图像" -#: ../app/actions/file-commands.c:265 +#: ../app/actions/file-commands.c:277 msgid "No changes need to be saved" msgstr "没有需要保存的修改" -#: ../app/actions/file-commands.c:272 ../app/dialogs/file-save-dialog.c:95 +#: ../app/actions/file-commands.c:284 ../app/actions/file-commands.c:751 +#: ../app/widgets/gimpsavedialog.c:140 msgid "Save Image" msgstr "保存图像" -#: ../app/actions/file-commands.c:278 +#: ../app/actions/file-commands.c:290 msgid "Save a Copy of the Image" msgstr "保存图像的副本" -#: ../app/actions/file-commands.c:356 +#: ../app/actions/file-commands.c:367 msgid "Create New Template" -msgstr "创建新的模板" +msgstr "新建模板" -#: ../app/actions/file-commands.c:360 +#: ../app/actions/file-commands.c:371 msgid "Enter a name for this template" msgstr "给这个模板输入一个名字" -#: ../app/actions/file-commands.c:394 +#: ../app/actions/file-commands.c:399 msgid "Revert failed. No file name associated with this image." -msgstr "恢复失败。没有文件名与此图像相关联。" +msgstr "恢复失败。没有名字与此图像相关的文件。" -#: ../app/actions/file-commands.c:407 +#: ../app/actions/file-commands.c:411 msgid "Revert Image" msgstr "恢复图像" -#: ../app/actions/file-commands.c:438 +#: ../app/actions/file-commands.c:417 +msgid "_Revert" +msgstr "恢复(_R)" + +#: ../app/actions/file-commands.c:435 #, c-format msgid "Revert '%s' to '%s'?" msgstr "将“%s”恢复到“%s”？" -#: ../app/actions/file-commands.c:444 +#: ../app/actions/file-commands.c:440 msgid "" "By reverting the image to the state saved on disk, you will lose all " "changes, including all undo information." msgstr "" "如果将图像恢复到磁盘上保存的状态，您将会丢失所有的改变，包括所有的撤消信息。" -#: ../app/actions/file-commands.c:655 +#: ../app/actions/file-commands.c:773 msgid "(Unnamed Template)" msgstr "(未命名模板)" -#: ../app/actions/file-commands.c:706 +#: ../app/actions/file-commands.c:820 #, c-format msgid "" "Reverting to '%s' failed:\n" "\n" "%s" msgstr "" -"恢复到“%s”失败：\n" +"恢复到“%s”时失败：\n" "\n" "%s" -#: ../app/actions/filters-actions.c:43 -#, fuzzy +#: ../app/actions/filters-actions.c:58 msgctxt "filters-action" -msgid "Color T_emperature..." -msgstr "创建模板..." +msgid "Filte_rs" +msgstr "滤镜(_R)" -#: ../app/actions/filters-actions.c:44 -#, fuzzy +#: ../app/actions/filters-actions.c:60 msgctxt "filters-action" -msgid "Change the color temperature of the image" -msgstr "更改图像内容的大小" - -#: ../app/actions/filters-actions.c:49 -#, fuzzy -msgctxt "filters-action" -msgid "Color to _Alpha..." -msgstr "色彩平衡(_B)..." - -#: ../app/actions/filters-actions.c:50 -msgctxt "filters-action" -msgid "Convert a specified color to transparency" -msgstr "" - -#: ../app/actions/filters-actions.c:55 -msgctxt "filters-action" -msgid "_Gaussian Blur..." -msgstr "" - -#: ../app/actions/filters-actions.c:56 -msgctxt "filters-action" -msgid "Apply a gaussian blur" -msgstr "" - -#: ../app/actions/filters-actions.c:61 -#, fuzzy -msgctxt "filters-action" -msgid "_Pixelize..." -msgstr "色调分离(_P)..." +msgid "Recently Used" +msgstr "最近使用" #: ../app/actions/filters-actions.c:62 msgctxt "filters-action" -msgid "Simplify image into an array of solid-colored squares" -msgstr "" +msgid "_Blur" +msgstr "模糊(_B)" -#: ../app/actions/filters-actions.c:67 +#: ../app/actions/filters-actions.c:64 msgctxt "filters-action" -msgid "P_olar Coordinates..." -msgstr "" +msgid "_Noise" +msgstr "噪点(_N)" + +#: ../app/actions/filters-actions.c:66 +msgctxt "filters-action" +msgid "Edge-De_tect" +msgstr "边缘检测(_T)" #: ../app/actions/filters-actions.c:68 -#, fuzzy msgctxt "filters-action" -msgid "Convert image to or from polar coordinates" -msgstr "将图像转换为灰度" +msgid "En_hance" +msgstr "增强(_H)" -#: ../app/actions/filters-actions.c:73 -#, fuzzy +#: ../app/actions/filters-actions.c:70 msgctxt "filters-action" -msgid "_Semi-Flatten..." -msgstr "编辑图案(_E)..." +msgid "C_ombine" +msgstr "合成(_O)" + +#: ../app/actions/filters-actions.c:72 +msgctxt "filters-action" +msgid "_Generic" +msgstr "常规(_G)" #: ../app/actions/filters-actions.c:74 msgctxt "filters-action" -msgid "Replace partial transparency with a color" -msgstr "" +msgid "_Light and Shadow" +msgstr "光线和阴影(_L)" -#: ../app/actions/filters-actions.c:79 -#, fuzzy +#: ../app/actions/filters-actions.c:76 msgctxt "filters-action" -msgid "_Threshold Alpha..." -msgstr "阈值(_T)..." +msgid "_Distorts" +msgstr "扭曲(_D)" + +#: ../app/actions/filters-actions.c:78 +msgctxt "filters-action" +msgid "_Artistic" +msgstr "艺术(_A)" #: ../app/actions/filters-actions.c:80 -#, fuzzy msgctxt "filters-action" -msgid "Make transparency all-or-nothing" -msgstr "透明(_T)" +msgid "_Decor" +msgstr "装饰(_D)" + +#: ../app/actions/filters-actions.c:82 +msgctxt "filters-action" +msgid "_Map" +msgstr "映射(_M)" + +#: ../app/actions/filters-actions.c:84 +msgctxt "filters-action" +msgid "_Render" +msgstr "渲染(_R)" + +#: ../app/actions/filters-actions.c:86 +msgctxt "filters-action" +msgid "_Clouds" +msgstr "云彩(_C)" + +#: ../app/actions/filters-actions.c:88 +msgctxt "filters-action" +msgid "_Fractals" +msgstr "碎片(_F)" + +#: ../app/actions/filters-actions.c:90 +msgctxt "filters-action" +msgid "_Nature" +msgstr "自然(_N)" + +#: ../app/actions/filters-actions.c:92 +msgctxt "filters-action" +msgid "N_oise" +msgstr "噪点(_O)" + +#: ../app/actions/filters-actions.c:94 +msgctxt "filters-action" +msgid "_Pattern" +msgstr "图案(_P)" + +#: ../app/actions/filters-actions.c:96 +msgctxt "filters-action" +msgid "_Web" +msgstr "网络(_W)" + +#: ../app/actions/filters-actions.c:98 +msgctxt "filters-action" +msgid "An_imation" +msgstr "动画(_I)" + +#: ../app/actions/filters-actions.c:104 +msgctxt "filters-action" +msgid "_Antialias" +msgstr "抗锯齿(_A)" + +#: ../app/actions/filters-actions.c:109 +msgctxt "filters-action" +msgid "_Color Enhance" +msgstr "色彩增强(_C)" + +#: ../app/actions/filters-actions.c:114 +msgctxt "filters-action" +msgid "_Linear Invert" +msgstr "线性反转(_L)" + +#: ../app/actions/filters-actions.c:119 +msgctxt "filters-action" +msgid "In_vert" +msgstr "反相(_V)" + +#: ../app/actions/filters-actions.c:124 +msgctxt "filters-action" +msgid "_Value Invert" +msgstr "明度反转(_V)" + +#: ../app/actions/filters-actions.c:129 +msgctxt "filters-action" +msgid "_Stretch Contrast HSV" +msgstr "拉伸对比度 HSV (_S)" + +#: ../app/actions/filters-actions.c:137 +msgctxt "filters-action" +msgid "_Dilate" +msgstr "膨胀(_D)" + +#: ../app/actions/filters-actions.c:138 +msgctxt "drawable-action" +msgid "Grow lighter areas of the image" +msgstr "增长图像的较亮区域" + +#: ../app/actions/filters-actions.c:153 +msgctxt "filters-action" +msgid "_Erode" +msgstr "腐蚀(_E)" + +#: ../app/actions/filters-actions.c:154 +msgctxt "drawable-action" +msgid "Grow darker areas of the image" +msgstr "增长图像的较暗区域" + +#: ../app/actions/filters-actions.c:172 +msgctxt "filters-action" +msgid "_Alien Map..." +msgstr "相异映射(_A)…" + +#: ../app/actions/filters-actions.c:177 +msgctxt "filters-action" +msgid "_Apply Canvas..." +msgstr "应用画布(_A)…" + +#: ../app/actions/filters-actions.c:182 +msgctxt "filters-action" +msgid "Apply _Lens..." +msgstr "应用镜头(_L)…" + +#: ../app/actions/filters-actions.c:187 +msgctxt "filters-action" +msgid "B_rightness-Contrast..." +msgstr "亮度-对比度(_R)…" + +#: ../app/actions/filters-actions.c:192 +msgctxt "filters-action" +msgid "_Bump Map..." +msgstr "凹凸映射(_B)…" + +#: ../app/actions/filters-actions.c:197 +msgctxt "filters-action" +msgid "_Color to Gray..." +msgstr "彩色到灰度(_C)…" + +#: ../app/actions/filters-actions.c:202 +msgctxt "filters-action" +msgid "Ca_rtoon..." +msgstr "卡通(_R)…" + +#: ../app/actions/filters-actions.c:207 +msgctxt "filters-action" +msgid "_Channel Mixer..." +msgstr "通道混合器(_C)…" + +#: ../app/actions/filters-actions.c:212 +msgctxt "filters-action" +msgid "_Checkerboard..." +msgstr "棋盘(_C)…" + +#: ../app/actions/filters-actions.c:217 +msgctxt "filters-action" +msgid "Color _Balance..." +msgstr "色彩平衡(_B)…" + +#: ../app/actions/filters-actions.c:222 +msgctxt "filters-action" +msgid "_Color Exchange..." +msgstr "颜色交换(_C)…" + +#: ../app/actions/filters-actions.c:227 +msgctxt "filters-action" +msgid "Colori_ze..." +msgstr "单色化(_Z)…" + +#: ../app/actions/filters-actions.c:232 +msgctxt "filters-action" +msgid "Dithe_r..." +msgstr "递色(_R)…" + +#: ../app/actions/filters-actions.c:237 +msgctxt "filters-action" +msgid "_Rotate Colors..." +msgstr "旋转颜色(_R)…" + +#: ../app/actions/filters-actions.c:242 +msgctxt "filters-action" +msgid "Color T_emperature..." +msgstr "色温(_E)…" + +#: ../app/actions/filters-actions.c:247 +msgctxt "filters-action" +msgid "Color to _Alpha..." +msgstr "颜色到透明(_A)…" + +#: ../app/actions/filters-actions.c:252 +msgctxt "filters-action" +msgid "_Extract Component..." +msgstr "提取成分(_E)" + +#: ../app/actions/filters-actions.c:257 +msgctxt "filters-action" +msgid "_Convolution Matrix..." +msgstr "卷积矩阵(_C)…" + +#: ../app/actions/filters-actions.c:262 +msgctxt "filters-action" +msgid "_Cubism..." +msgstr "立体主义(_C)…" + +#: ../app/actions/filters-actions.c:267 +msgctxt "filters-action" +msgid "_Curves..." +msgstr "曲线(_C)…" + +#: ../app/actions/filters-actions.c:272 +msgctxt "filters-action" +msgid "_Deinterlace..." +msgstr "隔行扫描(_D)…" + +#: ../app/actions/filters-actions.c:277 +msgctxt "filters-action" +msgid "_Desaturate..." +msgstr "去色(_D)…" + +#: ../app/actions/filters-actions.c:282 +msgctxt "filters-action" +msgid "Difference of Gaussians..." +msgstr "高斯差分…" + +#: ../app/actions/filters-actions.c:287 +msgctxt "filters-action" +msgid "Diffraction Patterns..." +msgstr "衍射图案…" + +#: ../app/actions/filters-actions.c:292 +msgctxt "filters-action" +msgid "Displace..." +msgstr "移位…" + +#: ../app/actions/filters-actions.c:297 +msgctxt "filters-action" +msgid "Distance Map..." +msgstr "距离映射…" + +#: ../app/actions/filters-actions.c:302 +msgctxt "filters-action" +msgid "_Drop Shadow..." +msgstr "投影(_D)…" + +#: ../app/actions/filters-actions.c:307 +msgctxt "filters-action" +msgid "_Edge..." +msgstr "边缘(_E)…" + +#: ../app/actions/filters-actions.c:312 +msgctxt "filters-action" +msgid "_Laplace" +msgstr "拉普拉斯(_L)" + +#: ../app/actions/filters-actions.c:317 +msgctxt "filters-action" +msgid "_Neon..." +msgstr "霓虹(_N)…" + +#: ../app/actions/filters-actions.c:322 +msgctxt "filters-action" +msgid "_Sobel..." +msgstr "索贝尔(_S)…" + +#: ../app/actions/filters-actions.c:327 +msgctxt "filters-action" +msgid "_Emboss..." +msgstr "浮雕(_E)…" + +#: ../app/actions/filters-actions.c:332 +msgctxt "filters-action" +msgid "En_grave..." +msgstr "雕刻(_G)…" + +#: ../app/actions/filters-actions.c:337 +msgctxt "filters-action" +msgid "E_xposure..." +msgstr "曝光(_X)…" + +#: ../app/actions/filters-actions.c:342 +msgctxt "filters-action" +msgid "_Fattal et al. 2002..." +msgstr "_Fattal et al. 2002..." + +#: ../app/actions/filters-actions.c:347 +msgctxt "filters-action" +msgid "_Fractal Trace..." +msgstr "碎片追踪(_F)…" + +#: ../app/actions/filters-actions.c:352 +msgctxt "filters-action" +msgid "_Gaussian Blur..." +msgstr "高斯模糊(_G)…" + +#: ../app/actions/filters-actions.c:357 +msgctxt "filters-action" +msgid "_Selective Gaussian Blur..." +msgstr "选择性高斯模糊(_S)…" + +#: ../app/actions/filters-actions.c:362 +msgctxt "filters-action" +msgid "_GEGL graph..." +msgstr "_GEGL 图表…" + +#: ../app/actions/filters-actions.c:367 +msgctxt "filters-action" +msgid "_Grid..." +msgstr "网格(_G)…" + +#: ../app/actions/filters-actions.c:372 +msgctxt "filters-action" +msgid "_High Pass..." +msgstr "高通滤波(_H)…" + +#: ../app/actions/filters-actions.c:377 +msgctxt "filters-action" +msgid "Hue-_Chroma..." +msgstr "色相-色度(_C)…" + +#: ../app/actions/filters-actions.c:382 +msgctxt "filters-action" +msgid "Hue-_Saturation..." +msgstr "色相-饱和度(_S)…" + +#: ../app/actions/filters-actions.c:387 +msgctxt "filters-action" +msgid "_Illusion..." +msgstr "幻想(_I)…" + +#: ../app/actions/filters-actions.c:392 +msgctxt "filters-action" +msgid "_Image Gradient..." +msgstr "图像渐变(_I)…" + +#: ../app/actions/filters-actions.c:397 +msgctxt "filters-action" +msgid "_Kaleidoscope..." +msgstr "万花筒(_K)…" + +#: ../app/actions/filters-actions.c:402 +msgctxt "filters-action" +msgid "Lens Distortion..." +msgstr "镜头扭曲…" + +#: ../app/actions/filters-actions.c:407 +msgctxt "filters-action" +msgid "Lens Flare..." +msgstr "镜头光晕…" + +#: ../app/actions/filters-actions.c:412 +msgctxt "filters-action" +msgid "_Levels..." +msgstr "色阶(_L)…" + +#: ../app/actions/filters-actions.c:417 +msgctxt "filters-action" +msgid "_Mantiuk 2006..." +msgstr "_Mantiuk 2006..." + +#: ../app/actions/filters-actions.c:422 +msgctxt "filters-action" +msgid "_Maze..." +msgstr "迷宫(_M)…" + +#: ../app/actions/filters-actions.c:427 +msgctxt "filters-action" +msgid "_Median Blur..." +msgstr "中值模糊(_M)…" + +#: ../app/actions/filters-actions.c:432 +msgctxt "filters-action" +msgid "_Mono Mixer..." +msgstr "单色混合器(_M)…" + +#: ../app/actions/filters-actions.c:437 +msgctxt "filters-action" +msgid "_Mosaic..." +msgstr "马赛克(_M)…" + +#: ../app/actions/filters-actions.c:442 +msgctxt "filters-action" +msgid "_Circular Motion Blur..." +msgstr "圆周运动模糊(_C)…" + +#: ../app/actions/filters-actions.c:447 +msgctxt "filters-action" +msgid "_Linear Motion Blur..." +msgstr "线性运动模糊(_L)…" + +#: ../app/actions/filters-actions.c:452 +msgctxt "filters-action" +msgid "_Zoom Motion Blur..." +msgstr "缩放运动模糊(_Z)…" + +#: ../app/actions/filters-actions.c:457 +msgctxt "filters-action" +msgid "_Cell Noise..." +msgstr "单元噪点(_C)…" + +#: ../app/actions/filters-actions.c:462 +msgctxt "filters-action" +msgid "CIE lch Noise..." +msgstr "CIE LCH 噪点…" + +#: ../app/actions/filters-actions.c:467 +msgctxt "filters-action" +msgid "HSV Noise..." +msgstr "HSV 噪点…" + +#: ../app/actions/filters-actions.c:472 +msgctxt "filters-action" +msgid "_Hurl..." +msgstr "投掷(_H)…" + +#: ../app/actions/filters-actions.c:477 +msgctxt "filters-action" +msgid "_Perlin Noise..." +msgstr "柏林噪点(_P)…" + +#: ../app/actions/filters-actions.c:482 +msgctxt "filters-action" +msgid "_Pick..." +msgstr "拾取(_P)…" + +#: ../app/actions/filters-actions.c:487 +msgctxt "filters-action" +msgid "_RGB Noise..." +msgstr "_RGB 噪点…" + +#: ../app/actions/filters-actions.c:492 +msgctxt "filters-action" +msgid "Noise R_eduction..." +msgstr "降噪(_E)…" + +#: ../app/actions/filters-actions.c:497 +msgctxt "filters-action" +msgid "_Simplex Noise..." +msgstr "单一噪点(_S)…" + +#: ../app/actions/filters-actions.c:502 +msgctxt "filters-action" +msgid "_Slur..." +msgstr "模糊(_S)…" + +#: ../app/actions/filters-actions.c:507 +msgctxt "filters-action" +msgid "_Solid Noise..." +msgstr "固态噪点(_S)…" + +#: ../app/actions/filters-actions.c:512 +msgctxt "filters-action" +msgid "Sp_read..." +msgstr "散布(_R)…" + +#: ../app/actions/filters-actions.c:517 +msgctxt "filters-action" +msgid "Oili_fy..." +msgstr "光滑(_F)…" + +#: ../app/actions/filters-actions.c:522 +msgctxt "filters-action" +msgid "_Panorama Projection..." +msgstr "全景映射(_P)…" + +#: ../app/actions/filters-actions.c:527 +msgctxt "filters-action" +msgid "_Photocopy..." +msgstr "影印(_P)…" + +#: ../app/actions/filters-actions.c:532 +msgctxt "filters-action" +msgid "_Pixelize..." +msgstr "像素化(_P)…" + +#: ../app/actions/filters-actions.c:537 +msgctxt "filters-action" +msgid "_Plasma..." +msgstr "等离子(_P)…" + +#: ../app/actions/filters-actions.c:542 +msgctxt "filters-action" +msgid "P_olar Coordinates..." +msgstr "极坐标(_O)…" + +#: ../app/actions/filters-actions.c:547 +msgctxt "filters-action" +msgid "_Posterize..." +msgstr "色相分离(_P)…" + +#: ../app/actions/filters-actions.c:552 +msgctxt "filters-action" +msgid "_Red Eye Removal..." +msgstr "去除红眼(_R)…" + +#: ../app/actions/filters-actions.c:557 +msgctxt "filters-action" +msgid "_Reinhard 2005..." +msgstr "_Reinhard 2005..." + +#: ../app/actions/filters-actions.c:562 +msgctxt "filters-action" +msgid "RGB _Clip..." +msgstr "RGB 片段(_C)…" + +#: ../app/actions/filters-actions.c:567 +msgctxt "filters-action" +msgid "_Ripple..." +msgstr "波纹(_R)…" + +#: ../app/actions/filters-actions.c:572 +msgctxt "filters-action" +msgid "Sat_uration..." +msgstr "饱和度(_U)…" + +#: ../app/actions/filters-actions.c:577 +msgctxt "filters-action" +msgid "_Semi-Flatten..." +msgstr "半平整(_S)…" + +#: ../app/actions/filters-actions.c:582 +msgctxt "filters-action" +msgid "_Sepia..." +msgstr "乌贼墨(_S)…" + +#: ../app/actions/filters-actions.c:587 +msgctxt "filters-action" +msgid "S_hadows-Highlights..." +msgstr "阴影-高光(_H)…" + +#: ../app/actions/filters-actions.c:592 +msgctxt "filters-action" +msgid "_Shift..." +msgstr "偏移(_S)…" + +#: ../app/actions/filters-actions.c:597 +msgctxt "filters-action" +msgid "_Sinus..." +msgstr "弯曲(_S)…" + +#: ../app/actions/filters-actions.c:602 +msgctxt "filters-action" +msgid "_Simple Linear Iterative Clustering..." +msgstr "简单线性迭代聚集(_S)…" + +#: ../app/actions/filters-actions.c:607 +msgctxt "filters-action" +msgid "_Symmetric Nearest Neighbor..." +msgstr "对称的最近相邻(_S)…" + +#: ../app/actions/filters-actions.c:612 +msgctxt "filters-action" +msgid "_Softglow..." +msgstr "柔光(_S)…" + +#: ../app/actions/filters-actions.c:617 +msgctxt "filters-action" +msgid "S_piral..." +msgstr "螺旋(_P)…" + +#: ../app/actions/filters-actions.c:622 +msgctxt "filters-action" +msgid "_Stretch Contrast..." +msgstr "拉伸对比度(_S)…" + +#: ../app/actions/filters-actions.c:627 +msgctxt "filters-action" +msgid "_Stress..." +msgstr "压力(_S)…" + +#: ../app/actions/filters-actions.c:632 +msgctxt "filters-action" +msgid "Super_nova..." +msgstr "超新星(_N)…" + +#: ../app/actions/filters-actions.c:637 +msgctxt "filters-action" +msgid "_Threshold..." +msgstr "阈值(_T)…" + +#: ../app/actions/filters-actions.c:642 +msgctxt "filters-action" +msgid "_Threshold Alpha..." +msgstr "临界透明(_T)…" + +#: ../app/actions/filters-actions.c:647 +msgctxt "filters-action" +msgid "_Glass Tile..." +msgstr "玻璃瓷片(_G)…" + +#: ../app/actions/filters-actions.c:652 +msgctxt "filters-action" +msgid "_Paper Tile..." +msgstr "纸质瓷片(_P)…" + +#: ../app/actions/filters-actions.c:657 +msgctxt "filters-action" +msgid "_Tile Seamless..." +msgstr "无缝瓷片(_T)…" + +#: ../app/actions/filters-actions.c:662 +msgctxt "filters-action" +msgid "_Unsharp Mask..." +msgstr "虚光蒙板(_U)…" + +#: ../app/actions/filters-actions.c:667 +msgctxt "filters-action" +msgid "_Value Propagate..." +msgstr "明度增殖(_V)…" + +#: ../app/actions/filters-actions.c:672 +msgctxt "filters-action" +msgid "Vi_deo Degradation..." +msgstr "降低视频质量(_D)…" + +#: ../app/actions/filters-actions.c:677 +msgctxt "filters-action" +msgid "_Vignette..." +msgstr "装饰(_V)…" + +#: ../app/actions/filters-actions.c:682 +msgctxt "filters-action" +msgid "_Waterpixels..." +msgstr "水像素(_W)…" + +#: ../app/actions/filters-actions.c:687 +msgctxt "filters-action" +msgid "_Waves..." +msgstr "水波(_W)…" + +#: ../app/actions/filters-actions.c:692 +msgctxt "filters-action" +msgid "W_hirl and Pinch..." +msgstr "旋转和挤压(_H)…" + +#: ../app/actions/filters-actions.c:697 +msgctxt "filters-action" +msgid "W_ind..." +msgstr "风(_I)…" + +#: ../app/actions/filters-actions.c:705 +msgctxt "filters-action" +msgid "Re_peat Last" +msgstr "重复上次操作(_P)" + +#: ../app/actions/filters-actions.c:707 +msgctxt "filters-action" +msgid "Rerun the last used filter using the same settings" +msgstr "用同样的设置重新运行上次使用的滤镜" + +#: ../app/actions/filters-actions.c:712 +msgctxt "filters-action" +msgid "R_e-Show Last" +msgstr "显示上次操作(_E)" + +#: ../app/actions/filters-actions.c:713 +msgctxt "filters-action" +msgid "Show the last used filter dialog again" +msgstr "再次显示上次使用的滤镜对话框" + +#: ../app/actions/filters-actions.c:1037 +#, c-format +msgid "Re_peat \"%s\"" +msgstr "重复(_P)“%s”" + +#: ../app/actions/filters-actions.c:1038 +#, c-format +msgid "R_e-Show \"%s\"" +msgstr "重新显示(_E)“%s”" + +#: ../app/actions/filters-actions.c:1076 +msgid "Repeat Last" +msgstr "重复上次操作" + +#: ../app/actions/filters-actions.c:1078 +msgid "Re-Show Last" +msgstr "显示上次操作" #: ../app/actions/fonts-actions.c:44 msgctxt "fonts-action" @@ -2565,13 +5109,18 @@ msgstr "字体菜单" #: ../app/actions/fonts-actions.c:48 msgctxt "fonts-action" msgid "_Rescan Font List" -msgstr "重新扫描字体列表(_R)" +msgstr "刷新字体列表(_R)" #: ../app/actions/fonts-actions.c:49 msgctxt "fonts-action" msgid "Rescan the installed fonts" msgstr "重新扫描已安装的字体" +#: ../app/actions/gimpgeglprocedure.c:323 +#, c-format +msgid "There are no last settings for '%s', showing the filter dialog instead." +msgstr "没有使用“%s”的设置，显示该滤镜对话框以代替。" + #: ../app/actions/gradient-editor-actions.c:46 msgctxt "gradient-editor-action" msgid "Gradient Editor Menu" @@ -2610,22 +5159,22 @@ msgstr "保存右端颜色到(_V)" #: ../app/actions/gradient-editor-actions.c:67 msgctxt "gradient-editor-action" msgid "L_eft Endpoint's Color..." -msgstr "左端点的颜色(_E)..." +msgstr "左端点的颜色(_E)…" #: ../app/actions/gradient-editor-actions.c:72 msgctxt "gradient-editor-action" msgid "R_ight Endpoint's Color..." -msgstr "右端点的颜色(_I)..." +msgstr "右端点的颜色(_I)…" #: ../app/actions/gradient-editor-actions.c:112 msgctxt "gradient-editor-action" msgid "Ble_nd Endpoints' Colors" -msgstr "混和端点的颜色(_N)" +msgstr "混和点的颜色(_N)" #: ../app/actions/gradient-editor-actions.c:117 msgctxt "gradient-editor-action" msgid "Blend Endpoints' Opacit_y" -msgstr "混和端点的不透明度(_Y)" +msgstr "混和点的不透明度(_Y)" #: ../app/actions/gradient-editor-actions.c:125 msgctxt "gradient-editor-action" @@ -2712,17 +5261,17 @@ msgstr "正弦(_S)" #: ../app/actions/gradient-editor-actions.c:333 msgctxt "gradient-editor-blending" msgid "Spherical (i_ncreasing)" -msgstr "球状(上升)(_N)" +msgstr "球面(增大)(_N)" #: ../app/actions/gradient-editor-actions.c:338 msgctxt "gradient-editor-blending" msgid "Spherical (_decreasing)" -msgstr "球状(下降)(_D)" +msgstr "球面(减小)(_D)" #: ../app/actions/gradient-editor-actions.c:343 msgctxt "gradient-editor-blending" msgid "(Varies)" -msgstr "(多种)" +msgstr "(变化)" #: ../app/actions/gradient-editor-actions.c:351 msgctxt "gradient-editor-coloring" @@ -2732,17 +5281,17 @@ msgstr "_RGB" #: ../app/actions/gradient-editor-actions.c:356 msgctxt "gradient-editor-coloring" msgid "HSV (_counter-clockwise hue)" -msgstr "HSV (逆时针色调)(_C)" +msgstr "HSV(逆时针色相)(_C)" #: ../app/actions/gradient-editor-actions.c:361 msgctxt "gradient-editor-coloring" msgid "HSV (clockwise _hue)" -msgstr "HSV (顺时针色调)(_H)" +msgstr "HSV(顺时针色相)(_H)" #: ../app/actions/gradient-editor-actions.c:366 msgctxt "gradient-editor-coloring" msgid "(Varies)" -msgstr "(多种)" +msgstr "(变化)" #: ../app/actions/gradient-editor-actions.c:374 msgid "Zoom In" @@ -2764,84 +5313,84 @@ msgstr "缩小" #: ../app/actions/gradient-editor-actions.c:386 msgid "Zoom All" -msgstr "完整显示" +msgstr "缩放全部" #: ../app/actions/gradient-editor-actions.c:387 #: ../app/actions/palette-editor-actions.c:102 msgid "Zoom all" -msgstr "完整显示" - -#: ../app/actions/gradient-editor-actions.c:777 -msgid "_Blending Function for Segment" -msgstr "段混和函数(_B)" +msgstr "缩放全部" #: ../app/actions/gradient-editor-actions.c:779 -msgid "Coloring _Type for Segment" -msgstr "段着色类型(_T)" +msgid "_Blending Function for Segment" +msgstr "片段混和功能(_B)" -#: ../app/actions/gradient-editor-actions.c:782 -msgid "_Flip Segment" -msgstr "翻转段(_F)" +#: ../app/actions/gradient-editor-actions.c:781 +msgid "Coloring _Type for Segment" +msgstr "片段着色类型(_T)" #: ../app/actions/gradient-editor-actions.c:784 -msgid "_Replicate Segment..." -msgstr "复制段(_R)..." +msgid "_Flip Segment" +msgstr "翻转片段(_F)" #: ../app/actions/gradient-editor-actions.c:786 -msgid "Split Segment at _Midpoint" -msgstr "在中点处分割段(_M)" +msgid "_Replicate Segment..." +msgstr "复制片段(_R)…" #: ../app/actions/gradient-editor-actions.c:788 -msgid "Split Segment _Uniformly..." -msgstr "等分切割段(_U)..." +msgid "Split Segment at _Midpoint" +msgstr "在中点分割片段(_M)" #: ../app/actions/gradient-editor-actions.c:790 -msgid "_Delete Segment" -msgstr "删除段(_D)" +msgid "Split Segment _Uniformly..." +msgstr "平均分割片段(_U)…" #: ../app/actions/gradient-editor-actions.c:792 -msgid "Re-_center Segment's Midpoint" -msgstr "重置段中点(_C)" +msgid "_Delete Segment" +msgstr "删除片段(_D)" #: ../app/actions/gradient-editor-actions.c:794 -msgid "Re-distribute _Handles in Segment" -msgstr "重置段支点(_H)" +msgid "Re-_center Segment's Midpoint" +msgstr "重置片段中点(_C)" -#: ../app/actions/gradient-editor-actions.c:799 -msgid "_Blending Function for Selection" -msgstr "选区的混和函数(_B)" +#: ../app/actions/gradient-editor-actions.c:796 +msgid "Re-distribute _Handles in Segment" +msgstr "重置片段操作点(_H)" #: ../app/actions/gradient-editor-actions.c:801 -msgid "Coloring _Type for Selection" -msgstr "选区的着色类型(_T)" +msgid "_Blending Function for Selection" +msgstr "选区混和功能(_B)" -#: ../app/actions/gradient-editor-actions.c:804 +#: ../app/actions/gradient-editor-actions.c:803 +msgid "Coloring _Type for Selection" +msgstr "选区着色类型(_T)" + +#: ../app/actions/gradient-editor-actions.c:806 msgid "_Flip Selection" msgstr "翻转选区(_F)" -#: ../app/actions/gradient-editor-actions.c:806 -msgid "_Replicate Selection..." -msgstr "复制选区(_R)..." - #: ../app/actions/gradient-editor-actions.c:808 -msgid "Split Segments at _Midpoints" -msgstr "在中点处分割段(_M)" +msgid "_Replicate Selection..." +msgstr "复制选区(_R)…" #: ../app/actions/gradient-editor-actions.c:810 -msgid "Split Segments _Uniformly..." -msgstr "等分切割段(_U)..." +msgid "Split Segments at _Midpoints" +msgstr "在中点分割片段(_M)" #: ../app/actions/gradient-editor-actions.c:812 -msgid "_Delete Selection" -msgstr "删除选中区域(_D)" +msgid "Split Segments _Uniformly..." +msgstr "平均分割片段(_U)…" #: ../app/actions/gradient-editor-actions.c:814 -msgid "Re-_center Midpoints in Selection" -msgstr "重置选中区域的中点(_C)" +msgid "_Delete Selection" +msgstr "删除选区(_D)" #: ../app/actions/gradient-editor-actions.c:816 +msgid "Re-_center Midpoints in Selection" +msgstr "重置选区中点(_C)" + +#: ../app/actions/gradient-editor-actions.c:818 msgid "Re-distribute _Handles in Selection" -msgstr "重置选中区域的支点(_H)" +msgstr "重置选区操作点(_H)" #: ../app/actions/gradient-editor-commands.c:85 msgid "Left Endpoint Color" @@ -2849,77 +5398,75 @@ msgstr "左端点的颜色" #: ../app/actions/gradient-editor-commands.c:87 msgid "Gradient Segment's Left Endpoint Color" -msgstr "渐变段的左端点的颜色" +msgstr "渐变片段左端点的颜色" -#: ../app/actions/gradient-editor-commands.c:236 +#: ../app/actions/gradient-editor-commands.c:237 msgid "Right Endpoint Color" msgstr "右端点的颜色" -#: ../app/actions/gradient-editor-commands.c:238 +#: ../app/actions/gradient-editor-commands.c:239 msgid "Gradient Segment's Right Endpoint Color" -msgstr "渐变段的右端点的颜色" +msgstr "渐变片段右端点的颜色" -#: ../app/actions/gradient-editor-commands.c:452 +#: ../app/actions/gradient-editor-commands.c:460 msgid "Replicate Segment" -msgstr "复制段" +msgstr "复制片段" -#: ../app/actions/gradient-editor-commands.c:453 +#: ../app/actions/gradient-editor-commands.c:461 msgid "Replicate Gradient Segment" -msgstr "复制渐变段" +msgstr "复制渐变片段" -#: ../app/actions/gradient-editor-commands.c:457 +#: ../app/actions/gradient-editor-commands.c:465 msgid "Replicate Selection" -msgstr "复制选中区域" +msgstr "复制选区" -#: ../app/actions/gradient-editor-commands.c:458 +#: ../app/actions/gradient-editor-commands.c:466 msgid "Replicate Gradient Selection" -msgstr "复制渐变的选中区域" +msgstr "复制渐变选区" -#: ../app/actions/gradient-editor-commands.c:471 -msgid "Replicate" -msgstr "复制" +#: ../app/actions/gradient-editor-commands.c:479 +msgid "_Replicate" +msgstr "复制(_R)" -#: ../app/actions/gradient-editor-commands.c:492 +#: ../app/actions/gradient-editor-commands.c:500 msgid "" "Select the number of times\n" "to replicate the selected segment." -msgstr "选择复制选中的段的次数。" +msgstr "选择复制选中片段的次数。" -#: ../app/actions/gradient-editor-commands.c:495 +#: ../app/actions/gradient-editor-commands.c:503 msgid "" "Select the number of times\n" "to replicate the selection." -msgstr "" -"选择复制所有选中的\n" -"段的次数。" +msgstr "选择复制选区的次数。" -#: ../app/actions/gradient-editor-commands.c:554 +#: ../app/actions/gradient-editor-commands.c:562 msgid "Split Segment Uniformly" -msgstr "等分切割段" +msgstr "平均分割片段" -#: ../app/actions/gradient-editor-commands.c:555 +#: ../app/actions/gradient-editor-commands.c:563 msgid "Split Gradient Segment Uniformly" -msgstr "等分切割渐变段" +msgstr "平均分割渐变片段" -#: ../app/actions/gradient-editor-commands.c:559 +#: ../app/actions/gradient-editor-commands.c:567 msgid "Split Segments Uniformly" -msgstr "等分切割段" +msgstr "平均分割片段" -#: ../app/actions/gradient-editor-commands.c:560 +#: ../app/actions/gradient-editor-commands.c:568 msgid "Split Gradient Segments Uniformly" -msgstr "等分切割渐变段" +msgstr "平均分割渐变片段" -#: ../app/actions/gradient-editor-commands.c:573 -msgid "Split" -msgstr "分割" +#: ../app/actions/gradient-editor-commands.c:581 +msgid "_Split" +msgstr "分割(_S)" -#: ../app/actions/gradient-editor-commands.c:595 +#: ../app/actions/gradient-editor-commands.c:603 msgid "" "Select the number of uniform parts\n" "in which to split the selected segment." -msgstr "选择等分切割选中的段的份数。" +msgstr "选择平均分割选中片段的份数。" -#: ../app/actions/gradient-editor-commands.c:598 +#: ../app/actions/gradient-editor-commands.c:606 msgid "" "Select the number of uniform parts\n" "in which to split the segments in the selection." @@ -2962,428 +5509,603 @@ msgstr "将渐变文件位置复制到剪贴板" #: ../app/actions/gradients-actions.c:66 msgctxt "gradients-action" -msgid "Save as _POV-Ray..." -msgstr "保存为 ＿POV-Ray..." +msgid "Show in _File Manager" +msgstr "在文件管理器中显示(_F)" #: ../app/actions/gradients-actions.c:67 msgctxt "gradients-action" +msgid "Show gradient file location in the file manager" +msgstr "在文件管理器中显示渐变文件的位置" + +#: ../app/actions/gradients-actions.c:72 +msgctxt "gradients-action" +msgid "Save as _POV-Ray..." +msgstr "保存为 _POV-Ray…" + +#: ../app/actions/gradients-actions.c:73 +msgctxt "gradients-action" msgid "Save gradient as POV-Ray" msgstr "将渐变保存为 POV-Ray" -#: ../app/actions/gradients-actions.c:72 +#: ../app/actions/gradients-actions.c:78 msgctxt "gradients-action" msgid "_Delete Gradient" msgstr "删除渐变(_D)" -#: ../app/actions/gradients-actions.c:73 +#: ../app/actions/gradients-actions.c:79 msgctxt "gradients-action" msgid "Delete this gradient" msgstr "删除此渐变" -#: ../app/actions/gradients-actions.c:78 +#: ../app/actions/gradients-actions.c:84 msgctxt "gradients-action" msgid "_Refresh Gradients" msgstr "刷新渐变(_R)" -#: ../app/actions/gradients-actions.c:79 +#: ../app/actions/gradients-actions.c:85 msgctxt "gradients-action" msgid "Refresh gradients" msgstr "刷新渐变" -#: ../app/actions/gradients-actions.c:87 +#: ../app/actions/gradients-actions.c:93 msgctxt "gradients-action" msgid "_Edit Gradient..." -msgstr "编辑渐变(_E)..." +msgstr "编辑渐变(_E)…" -#: ../app/actions/gradients-actions.c:88 +#: ../app/actions/gradients-actions.c:94 msgctxt "gradients-action" -msgid "Edit gradient" -msgstr "编辑渐变" +msgid "Edit this gradient" +msgstr "编辑该渐变" -#: ../app/actions/gradients-commands.c:66 +#: ../app/actions/gradients-commands.c:72 #, c-format msgid "Save '%s' as POV-Ray" msgstr "将“%s”保存为 POV-Ray" -#: ../app/actions/help-actions.c:37 ../app/actions/help-actions.c:40 +#: ../app/actions/help-actions.c:38 ../app/actions/help-actions.c:41 msgctxt "help-action" msgid "_Help" msgstr "帮助(_H)" -#: ../app/actions/help-actions.c:41 +#: ../app/actions/help-actions.c:42 msgctxt "help-action" msgid "Open the GIMP user manual" msgstr "打开 GIMP 用户手册" -#: ../app/actions/help-actions.c:46 +#: ../app/actions/help-actions.c:47 msgctxt "help-action" msgid "_Context Help" msgstr "环境帮助(_C)" -#: ../app/actions/help-actions.c:47 +#: ../app/actions/help-actions.c:48 msgctxt "help-action" msgid "Show the help for a specific user interface item" -msgstr "为指定用户界面项显示帮助" +msgstr "为指定的用户界面项目显示帮助" -#: ../app/actions/image-actions.c:48 ../app/actions/image-actions.c:52 +#: ../app/actions/image-actions.c:51 ../app/actions/image-actions.c:55 msgctxt "image-action" msgid "Image Menu" msgstr "图像菜单" -#: ../app/actions/image-actions.c:55 +#: ../app/actions/image-actions.c:58 msgctxt "image-action" msgid "_Image" msgstr "图像(_I)" -#: ../app/actions/image-actions.c:56 +#: ../app/actions/image-actions.c:59 msgctxt "image-action" msgid "_Mode" msgstr "模式(_M)" -#: ../app/actions/image-actions.c:57 -#, fuzzy +#: ../app/actions/image-actions.c:60 msgctxt "image-action" -msgid "_Precision" -msgstr "前一条提示(_P)" +msgid "Pr_ecision" +msgstr "精度(_E)" -#: ../app/actions/image-actions.c:58 +#: ../app/actions/image-actions.c:62 +msgctxt "image-action" +msgid "Color Ma_nagement" +msgstr "色彩管理(_N)" + +#: ../app/actions/image-actions.c:63 msgctxt "image-action" msgid "_Transform" msgstr "变换(_T)" -#: ../app/actions/image-actions.c:59 +#: ../app/actions/image-actions.c:64 msgctxt "image-action" msgid "_Guides" msgstr "参考线(_G)" -#: ../app/actions/image-actions.c:61 +#: ../app/actions/image-actions.c:65 +msgctxt "image-action" +msgid "Meta_data" +msgstr "元数据(_D)" + +#: ../app/actions/image-actions.c:67 msgctxt "image-action" msgid "_Colors" msgstr "颜色(_C)" -#: ../app/actions/image-actions.c:62 +#: ../app/actions/image-actions.c:68 msgctxt "image-action" msgid "I_nfo" msgstr "信息(_N)" -#: ../app/actions/image-actions.c:63 +#: ../app/actions/image-actions.c:69 msgctxt "image-action" msgid "_Auto" msgstr "自动(_A)" -#: ../app/actions/image-actions.c:64 +#: ../app/actions/image-actions.c:70 msgctxt "image-action" msgid "_Map" msgstr "映射(_M)" -#: ../app/actions/image-actions.c:65 +#: ../app/actions/image-actions.c:71 +msgctxt "image-action" +msgid "_Tone Mapping" +msgstr "色彩映射(_T)" + +#: ../app/actions/image-actions.c:72 msgctxt "image-action" msgid "C_omponents" msgstr "分量(_O)" -#: ../app/actions/image-actions.c:68 +#: ../app/actions/image-actions.c:73 +msgctxt "image-action" +msgid "D_esaturate" +msgstr "去色(_E)" + +#: ../app/actions/image-actions.c:76 msgctxt "image-action" msgid "_New..." -msgstr "新建(_N)..." +msgstr "新建(_N)…" -#: ../app/actions/image-actions.c:69 +#: ../app/actions/image-actions.c:77 msgctxt "image-action" msgid "Create a new image" msgstr "创建新的图像" -#: ../app/actions/image-actions.c:74 -msgctxt "image-action" -msgid "Can_vas Size..." -msgstr "画布大小(_V)..." - -#: ../app/actions/image-actions.c:75 -msgctxt "image-action" -msgid "Adjust the image dimensions" -msgstr "调整图像尺寸" - -#: ../app/actions/image-actions.c:80 -msgctxt "image-action" -msgid "Fit Canvas to L_ayers" -msgstr "画布适配图层(_A)" - -#: ../app/actions/image-actions.c:81 -msgctxt "image-action" -msgid "Resize the image to enclose all layers" -msgstr "重置图像大小以容纳所有图层" - -#: ../app/actions/image-actions.c:86 -msgctxt "image-action" -msgid "F_it Canvas to Selection" -msgstr "使画布适合选区(_I)" - -#: ../app/actions/image-actions.c:87 -msgctxt "image-action" -msgid "Resize the image to the extents of the selection" -msgstr "改变图像尺寸到选区的范围" - -#: ../app/actions/image-actions.c:92 -msgctxt "image-action" -msgid "_Print Size..." -msgstr "打印大小(_P)..." - -#: ../app/actions/image-actions.c:93 -msgctxt "image-action" -msgid "Adjust the print resolution" -msgstr "调整打印分辨率" - -#: ../app/actions/image-actions.c:98 -msgctxt "image-action" -msgid "_Scale Image..." -msgstr "缩放图像(_S)..." - -#: ../app/actions/image-actions.c:99 -msgctxt "image-action" -msgid "Change the size of the image content" -msgstr "更改图像内容的大小" - -#: ../app/actions/image-actions.c:104 -msgctxt "image-action" -msgid "_Crop to Selection" -msgstr "剪裁到选区(_C)" - -#: ../app/actions/image-actions.c:105 -msgctxt "image-action" -msgid "Crop the image to the extents of the selection" -msgstr "剪裁图像到选区的范围" - -#: ../app/actions/image-actions.c:110 +#: ../app/actions/image-actions.c:82 msgctxt "image-action" msgid "_Duplicate" msgstr "复制(_D)" -#: ../app/actions/image-actions.c:111 +#: ../app/actions/image-actions.c:83 msgctxt "image-action" msgid "Create a duplicate of this image" -msgstr "创建此图像的复本" +msgstr "创建此图像的副本" -#: ../app/actions/image-actions.c:116 +#: ../app/actions/image-actions.c:88 +msgctxt "image-action" +msgid "_Assign Color Profile..." +msgstr "指定色彩配置文件(_A)…" + +#: ../app/actions/image-actions.c:89 +msgctxt "image-action" +msgid "Set a color profile on the image" +msgstr "设置图像使用的色彩配置文件" + +#: ../app/actions/image-actions.c:94 +msgctxt "image-action" +msgid "_Convert to Color Profile..." +msgstr "转换到色彩配置文件(_C)…" + +#: ../app/actions/image-actions.c:95 +msgctxt "image-action" +msgid "Apply a color profile to the image" +msgstr "为图像应用一个颜色配置文件" + +#: ../app/actions/image-actions.c:100 +msgctxt "image-action" +msgid "_Discard Color Profile" +msgstr "丢弃色彩配置文件(_D)" + +#: ../app/actions/image-actions.c:101 +msgctxt "image-action" +msgid "Remove the image's color profile" +msgstr "删除图像的色彩配置文件" + +#: ../app/actions/image-actions.c:106 +msgctxt "image-action" +msgid "_Save Color Profile to File..." +msgstr "将色彩配置文件保存到文件(_S)…" + +#: ../app/actions/image-actions.c:107 +msgctxt "image-action" +msgid "Save the image's color profile to an ICC file" +msgstr "将图像的色彩配置文件保存到一个 ICC 文件" + +#: ../app/actions/image-actions.c:112 +msgctxt "image-action" +msgid "Can_vas Size..." +msgstr "画布大小(_V)…" + +#: ../app/actions/image-actions.c:113 +msgctxt "image-action" +msgid "Adjust the image dimensions" +msgstr "调整图像尺寸" + +#: ../app/actions/image-actions.c:118 +msgctxt "image-action" +msgid "Fit Canvas to L_ayers" +msgstr "画布适配图层(_A)" + +#: ../app/actions/image-actions.c:119 +msgctxt "image-action" +msgid "Resize the image to enclose all layers" +msgstr "调整图像大小以容纳所有图层" + +#: ../app/actions/image-actions.c:124 +msgctxt "image-action" +msgid "F_it Canvas to Selection" +msgstr "画布适配选区(_I)" + +#: ../app/actions/image-actions.c:125 +msgctxt "image-action" +msgid "Resize the image to the extents of the selection" +msgstr "改变图像尺寸到选区的范围" + +#: ../app/actions/image-actions.c:130 +msgctxt "image-action" +msgid "_Print Size..." +msgstr "打印大小(_P)…" + +#: ../app/actions/image-actions.c:131 +msgctxt "image-action" +msgid "Adjust the print resolution" +msgstr "调整打印分辨率" + +#: ../app/actions/image-actions.c:136 +msgctxt "image-action" +msgid "_Scale Image..." +msgstr "缩放图像(_S)…" + +#: ../app/actions/image-actions.c:137 +msgctxt "image-action" +msgid "Change the size of the image content" +msgstr "更改图像内容的大小" + +#: ../app/actions/image-actions.c:142 +msgctxt "image-action" +msgid "_Crop to Selection" +msgstr "剪裁到选区(_C)" + +#: ../app/actions/image-actions.c:143 +msgctxt "image-action" +msgid "Crop the image to the extents of the selection" +msgstr "剪裁图像到选区的范围" + +#: ../app/actions/image-actions.c:148 +msgctxt "image-action" +msgid "Crop to C_ontent" +msgstr "剪裁到内容(_O)" + +#: ../app/actions/image-actions.c:149 +msgctxt "image-action" +msgid "" +"Crop the image to the extents of its content (remove empty borders from the " +"image)" +msgstr "把图像剪裁到内容的范围(从图像中删除空白处)" + +#: ../app/actions/image-actions.c:154 msgctxt "image-action" msgid "Merge Visible _Layers..." -msgstr "合并可见图层(_L)..." +msgstr "合并可见图层(_L)…" -#: ../app/actions/image-actions.c:117 +#: ../app/actions/image-actions.c:155 msgctxt "image-action" msgid "Merge all visible layers into one layer" msgstr "将所有的可见图层合并为一个图层" -#: ../app/actions/image-actions.c:122 +#: ../app/actions/image-actions.c:160 msgctxt "image-action" msgid "_Flatten Image" msgstr "平整图像(_F)" -#: ../app/actions/image-actions.c:123 +#: ../app/actions/image-actions.c:161 msgctxt "image-action" msgid "Merge all layers into one and remove transparency" -msgstr "将所有的图层合并为一个并移除透明" +msgstr "将所有的图层合并为一个并删除透明" -#: ../app/actions/image-actions.c:128 +#: ../app/actions/image-actions.c:166 msgctxt "image-action" msgid "Configure G_rid..." -msgstr "配置网格(_R)..." +msgstr "配置网格(_R)…" -#: ../app/actions/image-actions.c:129 +#: ../app/actions/image-actions.c:167 msgctxt "image-action" msgid "Configure the grid for this image" msgstr "配置图像的网格" -#: ../app/actions/image-actions.c:134 +#: ../app/actions/image-actions.c:172 msgctxt "image-action" msgid "Image Pr_operties" msgstr "图像属性(_O)" -#: ../app/actions/image-actions.c:135 +#: ../app/actions/image-actions.c:173 msgctxt "image-action" msgid "Display information about this image" msgstr "显示关于此图像的信息" -#: ../app/actions/image-actions.c:143 +#: ../app/actions/image-actions.c:181 +msgctxt "image-action" +msgid "_Enable Color Management" +msgstr "启用色彩管理(_E)" + +#: ../app/actions/image-actions.c:182 +msgctxt "image-action" +msgid "" +"Whether the image is color managed. Disabling color management is equivalent " +"to assigning a built-in sRGB color profile. Better leave color management " +"enabled." +msgstr "" +"是否对图像启用色彩管理。禁用色彩管理相当于指定一份内置的 sRGB 颜色配置文件。" +"最好保留色彩管理为启用状态。" + +#: ../app/actions/image-actions.c:193 ../app/actions/image-actions.c:444 msgctxt "image-convert-action" msgid "_RGB" msgstr "_RGB" -#: ../app/actions/image-actions.c:144 +#: ../app/actions/image-actions.c:194 msgctxt "image-convert-action" msgid "Convert the image to the RGB colorspace" msgstr "将图像转换到 RGB 色彩空间" -#: ../app/actions/image-actions.c:148 +#: ../app/actions/image-actions.c:198 ../app/actions/image-actions.c:446 msgctxt "image-convert-action" msgid "_Grayscale" msgstr "灰度(_G)" -#: ../app/actions/image-actions.c:149 +#: ../app/actions/image-actions.c:199 msgctxt "image-convert-action" msgid "Convert the image to grayscale" msgstr "将图像转换为灰度" -#: ../app/actions/image-actions.c:153 +#: ../app/actions/image-actions.c:203 msgctxt "image-convert-action" msgid "_Indexed..." -msgstr "索引(_I)..." +msgstr "索引(_I)…" -#: ../app/actions/image-actions.c:154 +#: ../app/actions/image-actions.c:204 msgctxt "image-convert-action" msgid "Convert the image to indexed colors" msgstr "将图像转换为索引颜色" -#: ../app/actions/image-actions.c:161 +#: ../app/actions/image-actions.c:211 msgctxt "image-convert-action" msgid "8 bit integer" -msgstr "" +msgstr "8 位" -#: ../app/actions/image-actions.c:162 -#, fuzzy +#: ../app/actions/image-actions.c:213 msgctxt "image-convert-action" msgid "Convert the image to 8 bit integer" -msgstr "将图像转换为索引颜色" +msgstr "将图像转换为 8 位颜色深度" -#: ../app/actions/image-actions.c:166 +#: ../app/actions/image-actions.c:217 msgctxt "image-convert-action" msgid "16 bit integer" -msgstr "" +msgstr "16 位" -#: ../app/actions/image-actions.c:167 -#, fuzzy +#: ../app/actions/image-actions.c:219 msgctxt "image-convert-action" msgid "Convert the image to 16 bit integer" -msgstr "将图像转换为索引颜色" +msgstr "将图像转换为 16 位颜色深度" -#: ../app/actions/image-actions.c:171 +#: ../app/actions/image-actions.c:223 msgctxt "image-convert-action" msgid "32 bit integer" -msgstr "" +msgstr "32 位" -#: ../app/actions/image-actions.c:172 -#, fuzzy +#: ../app/actions/image-actions.c:225 msgctxt "image-convert-action" msgid "Convert the image to 32 bit integer" -msgstr "将图像转换为索引颜色" +msgstr "将图像转换为 32 位颜色深度" -#: ../app/actions/image-actions.c:176 +#: ../app/actions/image-actions.c:229 msgctxt "image-convert-action" msgid "16 bit floating point" -msgstr "" +msgstr "16 位浮点" -#: ../app/actions/image-actions.c:177 -#, fuzzy +#: ../app/actions/image-actions.c:231 msgctxt "image-convert-action" msgid "Convert the image to 16 bit floating point" -msgstr "将图像转换为索引颜色" +msgstr "将图像转换为 16 位浮点颜色深度" -#: ../app/actions/image-actions.c:181 +#: ../app/actions/image-actions.c:235 msgctxt "image-convert-action" msgid "32 bit floating point" -msgstr "" +msgstr "32 位浮点" -#: ../app/actions/image-actions.c:182 -#, fuzzy +#: ../app/actions/image-actions.c:237 msgctxt "image-convert-action" msgid "Convert the image to 32 bit floating point" -msgstr "将图像转换为索引颜色" +msgstr "将图像转换为 32 位浮点颜色深度" -#: ../app/actions/image-actions.c:189 +#: ../app/actions/image-actions.c:241 +msgctxt "image-convert-action" +msgid "64 bit floating point" +msgstr "64 位浮点" + +#: ../app/actions/image-actions.c:243 +msgctxt "image-convert-action" +msgid "Convert the image to 64 bit floating point" +msgstr "将图像转换为 64 位浮点颜色深度" + +#: ../app/actions/image-actions.c:250 +msgctxt "image-convert-action" +msgid "Perceptual gamma (sRGB)" +msgstr "感官性伽马(sRGB)" + +#: ../app/actions/image-actions.c:252 +msgctxt "image-convert-action" +msgid "Convert the image to perceptual (sRGB) gamma" +msgstr "将图像转换为感官性(sRGB)伽马" + +#: ../app/actions/image-actions.c:256 +msgctxt "image-convert-action" +msgid "Linear light" +msgstr "线性光" + +#: ../app/actions/image-actions.c:258 +msgctxt "image-convert-action" +msgid "Convert the image to linear light" +msgstr "将图像转换为线性光" + +#: ../app/actions/image-actions.c:265 msgctxt "image-action" msgid "Flip _Horizontally" msgstr "水平翻转(_H)" -#: ../app/actions/image-actions.c:190 +#: ../app/actions/image-actions.c:266 msgctxt "image-action" msgid "Flip image horizontally" -msgstr "水平翻转" +msgstr "水平翻转图像" -#: ../app/actions/image-actions.c:195 +#: ../app/actions/image-actions.c:271 msgctxt "image-action" msgid "Flip _Vertically" -msgstr "垂直翻转(_V)" +msgstr "竖直翻转(_V)" -#: ../app/actions/image-actions.c:196 +#: ../app/actions/image-actions.c:272 msgctxt "image-action" msgid "Flip image vertically" -msgstr "垂直翻转" +msgstr "竖直翻转图像" -#: ../app/actions/image-actions.c:204 +#: ../app/actions/image-actions.c:280 msgctxt "image-action" msgid "Rotate 90° _clockwise" msgstr "顺时针旋转 90 度(_C)" -#: ../app/actions/image-actions.c:205 +#: ../app/actions/image-actions.c:281 msgctxt "image-action" msgid "Rotate the image 90 degrees to the right" msgstr "将图像向右旋转 90 度" -#: ../app/actions/image-actions.c:210 +#: ../app/actions/image-actions.c:286 msgctxt "image-action" msgid "Rotate _180°" msgstr "旋转 _180 度" -#: ../app/actions/image-actions.c:211 +#: ../app/actions/image-actions.c:287 msgctxt "image-action" msgid "Turn the image upside-down" msgstr "使图像上下颠倒" -#: ../app/actions/image-actions.c:216 +#: ../app/actions/image-actions.c:292 msgctxt "image-action" msgid "Rotate 90° counter-clock_wise" msgstr "逆时针旋转 90 度(_W)" -#: ../app/actions/image-actions.c:217 +#: ../app/actions/image-actions.c:293 msgctxt "image-action" msgid "Rotate the image 90 degrees to the left" msgstr "将图像向左旋转 90 度" -#: ../app/actions/image-commands.c:258 +#: ../app/actions/image-actions.c:437 +msgctxt "image-convert-action" +msgid "_RGB..." +msgstr "_RGB…" + +#: ../app/actions/image-actions.c:439 +msgctxt "image-convert-action" +msgid "_Grayscale..." +msgstr "灰度(_G)…" + +#: ../app/actions/image-commands.c:559 +#, c-format +msgid "Saving color profile failed: %s" +msgstr "保存色彩配置文件失败：%s" + +#: ../app/actions/image-commands.c:598 +msgid "Save Color Profile" +msgstr "保存色彩配置文件" + +#: ../app/actions/image-commands.c:646 msgid "Set Image Canvas Size" msgstr "设置图像画布大小" -#: ../app/actions/image-commands.c:287 ../app/actions/image-commands.c:311 -#: ../app/actions/image-commands.c:604 +#: ../app/actions/image-commands.c:676 ../app/actions/image-commands.c:700 +#: ../app/actions/image-commands.c:1358 msgid "Resizing" msgstr "改变大小" -#: ../app/actions/image-commands.c:338 +#: ../app/actions/image-commands.c:733 msgid "Set Image Print Resolution" msgstr "设置图像打印分辨率" -#: ../app/actions/image-commands.c:400 -#: ../app/pdb/drawable-transform-cmds.c:163 -#: ../app/pdb/drawable-transform-cmds.c:251 -#: ../app/pdb/item-transform-cmds.c:166 +#: ../app/actions/image-commands.c:799 ../app/pdb/drawable-transform-cmds.c:166 +#: ../app/pdb/drawable-transform-cmds.c:256 +#: ../app/pdb/item-transform-cmds.c:170 msgid "Flipping" msgstr "翻转" -#: ../app/actions/image-commands.c:424 -#: ../app/pdb/drawable-transform-cmds.c:606 -#: ../app/pdb/drawable-transform-cmds.c:698 ../app/pdb/image-cmds.c:618 -#: ../app/pdb/item-transform-cmds.c:437 ../app/pdb/transform-tools-cmds.c:249 -#: ../app/tools/gimprotatetool.c:125 +#: ../app/actions/image-commands.c:823 ../app/pdb/drawable-transform-cmds.c:617 +#: ../app/pdb/drawable-transform-cmds.c:711 +#: ../app/pdb/image-transform-cmds.c:250 ../app/pdb/item-transform-cmds.c:443 +#: ../app/pdb/transform-tools-cmds.c:255 ../app/tools/gimprotatetool.c:129 msgid "Rotating" msgstr "旋转" -#: ../app/actions/image-commands.c:450 ../app/actions/layers-commands.c:691 +#: ../app/actions/image-commands.c:850 ../app/actions/layers-commands.c:779 msgid "Cannot crop because the current selection is empty." msgstr "无法剪裁，因为当前选区为空。" -#: ../app/actions/image-commands.c:651 +#: ../app/actions/image-commands.c:888 +msgid "Cannot crop because the image has no content." +msgstr "无法裁剪图像，因为图像中没有内容。" + +#: ../app/actions/image-commands.c:894 +msgid "Cannot crop because the image is already cropped to its content." +msgstr "无法裁剪，因为图像已裁剪到其内容。" + +#: ../app/actions/image-commands.c:1029 +#, c-format +msgid "Converting to RGB (%s)" +msgstr "转换为 RGB (%s)" + +#: ../app/actions/image-commands.c:1067 +#, c-format +msgid "Converting to grayscale (%s)" +msgstr "将图像转换为灰度(%s)" + +#: ../app/actions/image-commands.c:1129 +msgid "Converting to indexed colors" +msgstr "转换为索引颜色" + +#: ../app/actions/image-commands.c:1217 +#, c-format +msgid "Converting image to %s" +msgstr "正在将图像转换为 %s" + +#: ../app/actions/image-commands.c:1248 +msgid "Assign color profile" +msgstr "指定色彩配置文件" + +#: ../app/actions/image-commands.c:1294 +#, c-format +msgid "Converting to '%s'" +msgstr "转换为“%s”" + +#: ../app/actions/image-commands.c:1400 msgid "Change Print Size" msgstr "改变打印大小" -#: ../app/actions/image-commands.c:692 +#: ../app/actions/image-commands.c:1444 msgid "Scale Image" msgstr "缩放图像" #. Scaling -#: ../app/actions/image-commands.c:703 ../app/actions/layers-commands.c:1145 -#: ../app/dialogs/preferences-dialog.c:1900 -#: ../app/pdb/drawable-transform-cmds.c:787 -#: ../app/pdb/drawable-transform-cmds.c:876 ../app/pdb/image-cmds.c:490 -#: ../app/pdb/image-cmds.c:526 ../app/pdb/item-transform-cmds.c:528 -#: ../app/pdb/layer-cmds.c:343 ../app/pdb/layer-cmds.c:388 -#: ../app/pdb/transform-tools-cmds.c:338 ../app/tools/gimpscaletool.c:118 +#: ../app/actions/image-commands.c:1453 ../app/actions/layers-commands.c:1569 +#: ../app/dialogs/preferences-dialog.c:1606 +#: ../app/pdb/drawable-transform-cmds.c:800 +#: ../app/pdb/drawable-transform-cmds.c:891 +#: ../app/pdb/image-transform-cmds.c:122 ../app/pdb/image-transform-cmds.c:158 +#: ../app/pdb/item-transform-cmds.c:534 ../app/pdb/layer-cmds.c:401 +#: ../app/pdb/layer-cmds.c:448 ../app/pdb/transform-tools-cmds.c:346 +#: ../app/tools/gimpscaletool.c:121 msgid "Scaling" msgstr "缩放" @@ -3422,551 +6144,942 @@ msgctxt "images-action" msgid "Delete this image" msgstr "删除此图像" -#: ../app/actions/layers-actions.c:49 +#: ../app/actions/items-commands.c:208 ../app/actions/items-commands.c:253 +msgid "There is no active layer or channel to fill." +msgstr "没有活动图层或通道可以填充。" + +#: ../app/actions/items-commands.c:293 ../app/actions/items-commands.c:338 +msgid "There is no active layer or channel to stroke to." +msgstr "没有活动图层或通道可以勾画。" + +#: ../app/actions/layers-actions.c:52 msgctxt "layers-action" msgid "Layers Menu" msgstr "图层菜单" -#: ../app/actions/layers-actions.c:53 +#: ../app/actions/layers-actions.c:56 +msgctxt "layers-action" +msgid "Blend Space" +msgstr "混合空间" + +#: ../app/actions/layers-actions.c:60 +msgctxt "layers-action" +msgid "Composite Space" +msgstr "合成空间" + +#: ../app/actions/layers-actions.c:64 +msgctxt "layers-action" +msgid "Composite Mode" +msgstr "合成模式" + +#: ../app/actions/layers-actions.c:68 +msgctxt "layers-action" +msgid "Color Tag" +msgstr "颜色标签" + +#: ../app/actions/layers-actions.c:72 msgctxt "layers-action" msgid "_Layer" msgstr "图层(_L)" -#: ../app/actions/layers-actions.c:55 +#: ../app/actions/layers-actions.c:74 msgctxt "layers-action" msgid "Stac_k" msgstr "堆栈(_K)" -#: ../app/actions/layers-actions.c:57 +#: ../app/actions/layers-actions.c:76 msgctxt "layers-action" msgid "_Mask" msgstr "蒙板(_M)" -#: ../app/actions/layers-actions.c:59 +#: ../app/actions/layers-actions.c:78 msgctxt "layers-action" msgid "Tr_ansparency" msgstr "透明(_A)" -#: ../app/actions/layers-actions.c:61 +#: ../app/actions/layers-actions.c:80 msgctxt "layers-action" msgid "_Transform" msgstr "变换(_T)" -#: ../app/actions/layers-actions.c:63 +#: ../app/actions/layers-actions.c:82 msgctxt "layers-action" msgid "_Properties" msgstr "属性(_P)" -#: ../app/actions/layers-actions.c:65 +#: ../app/actions/layers-actions.c:84 msgctxt "layers-action" msgid "_Opacity" msgstr "不透明度(_O)" -#: ../app/actions/layers-actions.c:67 +#: ../app/actions/layers-actions.c:86 msgctxt "layers-action" msgid "Layer _Mode" msgstr "图层模式(_M)" -#: ../app/actions/layers-actions.c:70 +#: ../app/actions/layers-actions.c:89 msgctxt "layers-action" -msgid "Te_xt Tool" -msgstr "文字工具(_X)" +msgid "Default Edit Action" +msgstr "默认编辑动作" -#: ../app/actions/layers-actions.c:71 +#: ../app/actions/layers-actions.c:90 msgctxt "layers-action" -msgid "Activate the text tool on this text layer" -msgstr "在此文字层上激活文本工具" +msgid "Activate the default edit action for this type of layer" +msgstr "为该类型图层激活默认编辑动作" -#: ../app/actions/layers-actions.c:76 +#: ../app/actions/layers-actions.c:95 +msgctxt "layers-action" +msgid "Edit Te_xt on canvas" +msgstr "在画布上编辑文字(_X)" + +#: ../app/actions/layers-actions.c:96 +msgctxt "layers-action" +msgid "Edit this text layer content on canvas" +msgstr "在画布上编辑该文字图层内容" + +#: ../app/actions/layers-actions.c:101 msgctxt "layers-action" msgid "_Edit Layer Attributes..." -msgstr "编辑图层属性(_E)..." +msgstr "编辑图层属性(_E)…" -#: ../app/actions/layers-actions.c:77 +#: ../app/actions/layers-actions.c:102 msgctxt "layers-action" msgid "Edit the layer's name" -msgstr "编辑图层名称" +msgstr "编辑图层的名字" -#: ../app/actions/layers-actions.c:82 ../app/actions/layers-actions.c:610 +#: ../app/actions/layers-actions.c:107 ../app/actions/layers-actions.c:914 msgctxt "layers-action" msgid "_New Layer..." -msgstr "新建图层(_N)..." +msgstr "新建图层(_N)…" -#: ../app/actions/layers-actions.c:83 +#: ../app/actions/layers-actions.c:108 msgctxt "layers-action" msgid "Create a new layer and add it to the image" msgstr "创建新图层并将其添加到图像" -#: ../app/actions/layers-actions.c:88 ../app/actions/layers-actions.c:611 +#: ../app/actions/layers-actions.c:113 ../app/actions/layers-actions.c:915 msgctxt "layers-action" msgid "_New Layer" msgstr "新建图层(_N)" -#: ../app/actions/layers-actions.c:89 +#: ../app/actions/layers-actions.c:114 msgctxt "layers-action" msgid "Create a new layer with last used values" msgstr "按上次使用的值新建图层" -#: ../app/actions/layers-actions.c:94 +#: ../app/actions/layers-actions.c:119 msgctxt "layers-action" msgid "New from _Visible" -msgstr "从可见项创建(_V)" +msgstr "从可见项新建(_V)" -#: ../app/actions/layers-actions.c:96 +#: ../app/actions/layers-actions.c:121 msgctxt "layers-action" msgid "Create a new layer from what is visible in this image" msgstr "从此图像中的可见内容创建新图层" -#: ../app/actions/layers-actions.c:101 +#: ../app/actions/layers-actions.c:126 msgctxt "layers-action" -msgid "New Layer _Group..." -msgstr "新建图层群组(_G)..." +msgid "New Layer _Group" +msgstr "新建图层组(_G)" -#: ../app/actions/layers-actions.c:102 +#: ../app/actions/layers-actions.c:127 msgctxt "layers-action" msgid "Create a new layer group and add it to the image" msgstr "创建新图层群组并将其添加到图像" -#: ../app/actions/layers-actions.c:107 +#: ../app/actions/layers-actions.c:132 msgctxt "layers-action" msgid "D_uplicate Layer" msgstr "复制图层(_U)" -#: ../app/actions/layers-actions.c:109 +#: ../app/actions/layers-actions.c:134 msgctxt "layers-action" msgid "Create a duplicate of the layer and add it to the image" msgstr "创建图层的副本，并将其添加到图像" -#: ../app/actions/layers-actions.c:114 +#: ../app/actions/layers-actions.c:139 msgctxt "layers-action" msgid "_Delete Layer" msgstr "删除图层(_D)" -#: ../app/actions/layers-actions.c:115 +#: ../app/actions/layers-actions.c:140 msgctxt "layers-action" msgid "Delete this layer" msgstr "删除此图层" -#: ../app/actions/layers-actions.c:120 +#: ../app/actions/layers-actions.c:145 msgctxt "layers-action" msgid "_Raise Layer" -msgstr "升高图层(_R)" +msgstr "上移图层(_R)" -#: ../app/actions/layers-actions.c:121 +#: ../app/actions/layers-actions.c:146 msgctxt "layers-action" msgid "Raise this layer one step in the layer stack" msgstr "在图层栈中使此图层升高一步" -#: ../app/actions/layers-actions.c:126 +#: ../app/actions/layers-actions.c:151 msgctxt "layers-action" msgid "Layer to _Top" -msgstr "图层升至顶端(_T)" +msgstr "上移图层至顶部(_T)" -#: ../app/actions/layers-actions.c:127 +#: ../app/actions/layers-actions.c:152 msgctxt "layers-action" msgid "Move this layer to the top of the layer stack" msgstr "将此图层移动至图层栈的顶端" -#: ../app/actions/layers-actions.c:132 +#: ../app/actions/layers-actions.c:157 msgctxt "layers-action" msgid "_Lower Layer" -msgstr "降低图层(_L)" +msgstr "下移图层(_L)" -#: ../app/actions/layers-actions.c:133 +#: ../app/actions/layers-actions.c:158 msgctxt "layers-action" msgid "Lower this layer one step in the layer stack" msgstr "在图层栈中使此图层降低一步" -#: ../app/actions/layers-actions.c:138 +#: ../app/actions/layers-actions.c:163 msgctxt "layers-action" msgid "Layer to _Bottom" -msgstr "图层降至底端(_B)" +msgstr "下移图层至底部(_B)" -#: ../app/actions/layers-actions.c:139 +#: ../app/actions/layers-actions.c:164 msgctxt "layers-action" msgid "Move this layer to the bottom of the layer stack" msgstr "将此图层移动至图层栈的底端" -#: ../app/actions/layers-actions.c:144 +#: ../app/actions/layers-actions.c:169 msgctxt "layers-action" msgid "_Anchor Layer" msgstr "固定图层(_A)" -#: ../app/actions/layers-actions.c:145 +#: ../app/actions/layers-actions.c:170 msgctxt "layers-action" msgid "Anchor the floating layer" msgstr "固定浮动图层" -#: ../app/actions/layers-actions.c:150 +#: ../app/actions/layers-actions.c:175 msgctxt "layers-action" msgid "Merge Do_wn" msgstr "向下合并(_W)" -#: ../app/actions/layers-actions.c:151 +#: ../app/actions/layers-actions.c:176 msgctxt "layers-action" msgid "Merge this layer with the first visible layer below it" msgstr "将此图层与其下第一个可见层合并" -#: ../app/actions/layers-actions.c:156 +#: ../app/actions/layers-actions.c:181 msgctxt "layers-action" msgid "Merge Layer Group" -msgstr "合并图层群组" +msgstr "合并图层组" -#: ../app/actions/layers-actions.c:157 +#: ../app/actions/layers-actions.c:182 msgctxt "layers-action" msgid "Merge the layer group's layers into one normal layer" msgstr "将图层群组中的图层合并至一个普通图层" -#: ../app/actions/layers-actions.c:162 +#: ../app/actions/layers-actions.c:187 msgctxt "layers-action" msgid "Merge _Visible Layers..." -msgstr "合并可见图层(_V)..." +msgstr "合并可见图层(_V)…" -#: ../app/actions/layers-actions.c:163 +#: ../app/actions/layers-actions.c:188 msgctxt "layers-action" msgid "Merge all visible layers into one layer" msgstr "将所有的可见图层合并为一个图层" -#: ../app/actions/layers-actions.c:168 +#: ../app/actions/layers-actions.c:193 msgctxt "layers-action" msgid "_Flatten Image" msgstr "平整图像(_F)" -#: ../app/actions/layers-actions.c:169 +#: ../app/actions/layers-actions.c:194 msgctxt "layers-action" msgid "Merge all layers into one and remove transparency" -msgstr "将所有的图层合并为一个并移除透明" +msgstr "将所有的图层合并为一个并删除透明" -#: ../app/actions/layers-actions.c:174 +#: ../app/actions/layers-actions.c:199 msgctxt "layers-action" msgid "_Discard Text Information" msgstr "放弃文字信息(_D)" -#: ../app/actions/layers-actions.c:175 +#: ../app/actions/layers-actions.c:200 msgctxt "layers-action" msgid "Turn this text layer into a normal layer" msgstr "将此文字图层转换为普通图层" -#: ../app/actions/layers-actions.c:180 +#: ../app/actions/layers-actions.c:205 msgctxt "layers-action" msgid "Text to _Path" msgstr "文字到路径(_P)" -#: ../app/actions/layers-actions.c:181 +#: ../app/actions/layers-actions.c:206 msgctxt "layers-action" msgid "Create a path from this text layer" msgstr "根据此文字图层创建路径" -#: ../app/actions/layers-actions.c:186 +#: ../app/actions/layers-actions.c:211 msgctxt "layers-action" msgid "Text alon_g Path" msgstr "文字对齐路径(_G)" -#: ../app/actions/layers-actions.c:187 +#: ../app/actions/layers-actions.c:212 msgctxt "layers-action" msgid "Warp this layer's text along the current path" -msgstr "沿活动路径环绕此层的文字" +msgstr "沿当前路径对齐该图层的文字" -#: ../app/actions/layers-actions.c:192 +#: ../app/actions/layers-actions.c:217 msgctxt "layers-action" msgid "Layer B_oundary Size..." -msgstr "图层边界大小(_O)..." +msgstr "图层边界大小(_O)…" -#: ../app/actions/layers-actions.c:193 +#: ../app/actions/layers-actions.c:218 msgctxt "layers-action" msgid "Adjust the layer dimensions" msgstr "调整图层尺寸" -#: ../app/actions/layers-actions.c:198 +#: ../app/actions/layers-actions.c:223 msgctxt "layers-action" msgid "Layer to _Image Size" msgstr "图层到图像大小(_I)" -#: ../app/actions/layers-actions.c:199 +#: ../app/actions/layers-actions.c:224 msgctxt "layers-action" msgid "Resize the layer to the size of the image" msgstr "将图层的大小重设为图像的尺寸" -#: ../app/actions/layers-actions.c:204 +#: ../app/actions/layers-actions.c:229 msgctxt "layers-action" msgid "_Scale Layer..." -msgstr "缩放图层(_S)..." +msgstr "缩放图层(_S)…" -#: ../app/actions/layers-actions.c:205 +#: ../app/actions/layers-actions.c:230 msgctxt "layers-action" msgid "Change the size of the layer content" msgstr "改变此图层内容的大小" -#: ../app/actions/layers-actions.c:210 +#: ../app/actions/layers-actions.c:235 msgctxt "layers-action" msgid "_Crop to Selection" msgstr "剪裁到选区(_C)" -#: ../app/actions/layers-actions.c:211 +#: ../app/actions/layers-actions.c:236 msgctxt "layers-action" msgid "Crop the layer to the extents of the selection" msgstr "剪裁图层到选区的范围" -#: ../app/actions/layers-actions.c:216 +#: ../app/actions/layers-actions.c:241 +msgctxt "layers-action" +msgid "Crop to C_ontent" +msgstr "裁剪到内容(_O)" + +#: ../app/actions/layers-actions.c:242 +msgctxt "layers-action" +msgid "" +"Crop the layer to the extents of its content (remove empty borders from the " +"layer)" +msgstr "把图层剪裁到内容的范围(从图层中删除空白处)" + +#: ../app/actions/layers-actions.c:247 ../app/actions/layers-actions.c:257 msgctxt "layers-action" msgid "Add La_yer Mask..." -msgstr "添加图层蒙板(_Y)..." +msgstr "添加图层蒙板(_Y)…" -#: ../app/actions/layers-actions.c:218 +#: ../app/actions/layers-actions.c:249 ../app/actions/layers-actions.c:259 msgctxt "layers-action" msgid "Add a mask that allows non-destructive editing of transparency" msgstr "添加蒙版以允许对透明度的非破坏性编辑" -#: ../app/actions/layers-actions.c:223 +#: ../app/actions/layers-actions.c:264 +msgctxt "layers-action" +msgid "Add La_yer Mask" +msgstr "添加图层蒙板(_Y)" + +#: ../app/actions/layers-actions.c:266 +msgctxt "layers-action" +msgid "Add a mask with last used values" +msgstr "按上次使用的值添加蒙板" + +#: ../app/actions/layers-actions.c:271 msgctxt "layers-action" msgid "Add Alpha C_hannel" -msgstr "添加 Alpha 通道(_H)" +msgstr "添加透明通道(_H)" -#: ../app/actions/layers-actions.c:224 +#: ../app/actions/layers-actions.c:272 msgctxt "layers-action" msgid "Add transparency information to the layer" msgstr "添加透明度信息到图层" -#: ../app/actions/layers-actions.c:229 +#: ../app/actions/layers-actions.c:277 msgctxt "layers-action" msgid "_Remove Alpha Channel" -msgstr "移除 Alpha 通道(_R)" +msgstr "删除透明通道(_R)" -#: ../app/actions/layers-actions.c:230 +#: ../app/actions/layers-actions.c:278 msgctxt "layers-action" msgid "Remove transparency information from the layer" -msgstr "移除图层的透明度信息" +msgstr "删除图层的透明度信息" -#: ../app/actions/layers-actions.c:238 -msgctxt "layers-action" -msgid "Lock Alph_a Channel" -msgstr "锁定 Alph_a 通道" - -#: ../app/actions/layers-actions.c:240 -msgctxt "layers-action" -msgid "Keep transparency information on this layer from being modified" -msgstr "在图像上更改时保留透明度信息" - -#: ../app/actions/layers-actions.c:246 +#: ../app/actions/layers-actions.c:286 msgctxt "layers-action" msgid "_Edit Layer Mask" msgstr "编辑图层蒙板(_E)" -#: ../app/actions/layers-actions.c:247 +#: ../app/actions/layers-actions.c:287 msgctxt "layers-action" msgid "Work on the layer mask" msgstr "在图层蒙板上工作" -#: ../app/actions/layers-actions.c:253 +#: ../app/actions/layers-actions.c:293 msgctxt "layers-action" msgid "S_how Layer Mask" msgstr "显示图层蒙板(_H)" -#: ../app/actions/layers-actions.c:259 +#: ../app/actions/layers-actions.c:299 msgctxt "layers-action" msgid "_Disable Layer Mask" msgstr "禁用图层蒙板(_D)" -#: ../app/actions/layers-actions.c:260 +#: ../app/actions/layers-actions.c:300 msgctxt "layers-action" msgid "Dismiss the effect of the layer mask" msgstr "摒弃图层蒙板效果" -#: ../app/actions/layers-actions.c:269 +#: ../app/actions/layers-actions.c:306 +msgctxt "layers-action" +msgid "Toggle Layer _Visibility" +msgstr "切换图层可见性(_V)" + +#: ../app/actions/layers-actions.c:312 +msgctxt "layers-action" +msgid "Toggle Layer _Linked State" +msgstr "切换图层链接状态(_L)" + +#. GIMP_ICON_LOCK +#: ../app/actions/layers-actions.c:318 +msgctxt "layers-action" +msgid "L_ock Pixels of Layer" +msgstr "锁定图层像素(_O)" + +#: ../app/actions/layers-actions.c:324 +msgctxt "layers-action" +msgid "L_ock Position of Layer" +msgstr "锁定图层位置(_O)" + +#: ../app/actions/layers-actions.c:330 +msgctxt "layers-action" +msgid "Lock Alph_a Channel" +msgstr "锁定透明通道(_A)" + +#: ../app/actions/layers-actions.c:332 +msgctxt "layers-action" +msgid "Keep transparency information on this layer from being modified" +msgstr "在图像上更改时保留透明度信息" + +#: ../app/actions/layers-actions.c:341 ../app/actions/layers-actions.c:362 +#: ../app/actions/layers-actions.c:383 +msgctxt "layers-action" +msgid "Auto" +msgstr "自动" + +#: ../app/actions/layers-actions.c:342 +msgctxt "layers-action" +msgid "Layer Blend Space: Auto" +msgstr "图层混合空间：自动" + +#: ../app/actions/layers-actions.c:347 ../app/actions/layers-actions.c:368 +msgctxt "layers-action" +msgid "RGB (linear)" +msgstr "RGB(线性)" + +#: ../app/actions/layers-actions.c:348 +msgctxt "layers-action" +msgid "Layer Blend Space: RGB (linear)" +msgstr "图层混合空间：RGB(线性)" + +#: ../app/actions/layers-actions.c:353 ../app/actions/layers-actions.c:374 +msgctxt "layers-action" +msgid "RGB (perceptual)" +msgstr "RGB(感官)" + +#: ../app/actions/layers-actions.c:354 +msgctxt "layers-action" +msgid "Layer Blend Space: RGB (perceptual)" +msgstr "图层混合空间：RGB(感官)" + +#: ../app/actions/layers-actions.c:363 +msgctxt "layers-action" +msgid "Layer Composite Space: Auto" +msgstr "图层合成空间：自动" + +#: ../app/actions/layers-actions.c:369 +msgctxt "layers-action" +msgid "Layer Composite Space: RGB (linear)" +msgstr "图层合成空间：RGB(线性)" + +#: ../app/actions/layers-actions.c:375 +msgctxt "layers-action" +msgid "Layer Composite Space: RGB (perceptual)" +msgstr "图层合成空间：RGB(感官)" + +#: ../app/actions/layers-actions.c:384 +msgctxt "layers-action" +msgid "Layer Composite Mode: Auto" +msgstr "图层合成模式：自动" + +#: ../app/actions/layers-actions.c:389 +msgctxt "layers-action" +msgid "Union" +msgstr "联合" + +#: ../app/actions/layers-actions.c:390 +msgctxt "layers-action" +msgid "Layer Composite Mode: Union" +msgstr "图层合成模式：联合" + +#: ../app/actions/layers-actions.c:395 +msgctxt "layers-action" +msgid "Clip to Backdrop" +msgstr "剪辑至背景" + +#: ../app/actions/layers-actions.c:396 +msgctxt "layers-action" +msgid "Layer Composite Mode: Clip to Backdrop" +msgstr "图层合成模式：剪辑至背景" + +#: ../app/actions/layers-actions.c:401 +msgctxt "layers-action" +msgid "Clip to Layer" +msgstr "剪辑至图层" + +#: ../app/actions/layers-actions.c:402 +msgctxt "layers-action" +msgid "Layer Composite Mode: Clip to Layer" +msgstr "图层合成模式：剪辑至图层" + +#: ../app/actions/layers-actions.c:407 +msgctxt "layers-action" +msgid "Intersection" +msgstr "交集" + +#: ../app/actions/layers-actions.c:408 +msgctxt "layers-action" +msgid "Layer Composite Mode: Intersection" +msgstr "图层合成模式：交集" + +#: ../app/actions/layers-actions.c:416 +msgctxt "layers-action" +msgid "None" +msgstr "无" + +#: ../app/actions/layers-actions.c:417 +msgctxt "layers-action" +msgid "Layer Color Tag: Clear" +msgstr "图层颜色标签：清空" + +#: ../app/actions/layers-actions.c:422 +msgctxt "layers-action" +msgid "Blue" +msgstr "蓝色" + +#: ../app/actions/layers-actions.c:423 +msgctxt "layers-action" +msgid "Layer Color Tag: Set to Blue" +msgstr "图层颜色标签：设为蓝色" + +#: ../app/actions/layers-actions.c:428 +msgctxt "layers-action" +msgid "Green" +msgstr "绿色" + +#: ../app/actions/layers-actions.c:429 +msgctxt "layers-action" +msgid "Layer Color Tag: Set to Green" +msgstr "图层颜色标签：设为绿色" + +#: ../app/actions/layers-actions.c:434 +msgctxt "layers-action" +msgid "Yellow" +msgstr "黄色" + +#: ../app/actions/layers-actions.c:435 +msgctxt "layers-action" +msgid "Layer Color Tag: Set to Yellow" +msgstr "图层颜色标签：设为黄色" + +#: ../app/actions/layers-actions.c:440 +msgctxt "layers-action" +msgid "Orange" +msgstr "橙色" + +#: ../app/actions/layers-actions.c:441 +msgctxt "layers-action" +msgid "Layer Color Tag: Set to Orange" +msgstr "图层颜色标签：设为橙色" + +#: ../app/actions/layers-actions.c:446 +msgctxt "layers-action" +msgid "Brown" +msgstr "棕色" + +#: ../app/actions/layers-actions.c:447 +msgctxt "layers-action" +msgid "Layer Color Tag: Set to Brown" +msgstr "图层颜色标签：设为棕色" + +#: ../app/actions/layers-actions.c:452 +msgctxt "layers-action" +msgid "Red" +msgstr "红色" + +#: ../app/actions/layers-actions.c:453 +msgctxt "layers-action" +msgid "Layer Color Tag: Set to Red" +msgstr "图层颜色标签：设为红色" + +#: ../app/actions/layers-actions.c:458 +msgctxt "layers-action" +msgid "Violet" +msgstr "紫色" + +#: ../app/actions/layers-actions.c:459 +msgctxt "layers-action" +msgid "Layer Color Tag: Set to Violet" +msgstr "图层颜色标签：设为紫色" + +#: ../app/actions/layers-actions.c:464 +msgctxt "layers-action" +msgid "Gray" +msgstr "灰色" + +#: ../app/actions/layers-actions.c:465 +msgctxt "layers-action" +msgid "Layer Color Tag: Set to Gray" +msgstr "图层颜色标签：设为灰色" + +#: ../app/actions/layers-actions.c:473 msgctxt "layers-action" msgid "Apply Layer _Mask" msgstr "应用图层蒙板(_M)" -#: ../app/actions/layers-actions.c:270 +#: ../app/actions/layers-actions.c:474 msgctxt "layers-action" msgid "Apply the effect of the layer mask and remove it" -msgstr "应用图层蒙板效果并移除它" +msgstr "应用图层蒙板效果并删除它" -#: ../app/actions/layers-actions.c:275 +#: ../app/actions/layers-actions.c:479 msgctxt "layers-action" msgid "Delete Layer Mas_k" msgstr "删除图层蒙板(_K)" -#: ../app/actions/layers-actions.c:276 +#: ../app/actions/layers-actions.c:480 msgctxt "layers-action" msgid "Remove the layer mask and its effect" -msgstr "移删图层蒙板和其效果" +msgstr "删除图层蒙板和其效果" -#: ../app/actions/layers-actions.c:284 +#: ../app/actions/layers-actions.c:488 msgctxt "layers-action" msgid "_Mask to Selection" msgstr "蒙板到选区(_M)" -#: ../app/actions/layers-actions.c:285 +#: ../app/actions/layers-actions.c:489 msgctxt "layers-action" msgid "Replace the selection with the layer mask" msgstr "用图层蒙板替代选区" -#: ../app/actions/layers-actions.c:290 +#: ../app/actions/layers-actions.c:494 msgctxt "layers-action" msgid "_Add to Selection" msgstr "添加到选区(_A)" -#: ../app/actions/layers-actions.c:291 +#: ../app/actions/layers-actions.c:495 msgctxt "layers-action" msgid "Add the layer mask to the current selection" msgstr "将图层蒙板添加到当前选区" -#: ../app/actions/layers-actions.c:296 ../app/actions/layers-actions.c:325 +#: ../app/actions/layers-actions.c:500 ../app/actions/layers-actions.c:529 msgctxt "layers-action" msgid "_Subtract from Selection" msgstr "从选区中减去(_S)" -#: ../app/actions/layers-actions.c:297 +#: ../app/actions/layers-actions.c:501 msgctxt "layers-action" msgid "Subtract the layer mask from the current selection" msgstr "从当前选区减去图层蒙版" -#: ../app/actions/layers-actions.c:302 ../app/actions/layers-actions.c:332 +#: ../app/actions/layers-actions.c:506 ../app/actions/layers-actions.c:536 msgctxt "layers-action" msgid "_Intersect with Selection" msgstr "与选区相交(_I)" -#: ../app/actions/layers-actions.c:303 +#: ../app/actions/layers-actions.c:507 msgctxt "layers-action" msgid "Intersect the layer mask with the current selection" msgstr "交叉图层蒙版和当前选区" -#: ../app/actions/layers-actions.c:311 +#: ../app/actions/layers-actions.c:515 msgctxt "layers-action" msgid "Al_pha to Selection" -msgstr "Al_pha 到选区" +msgstr "透明通道到选区(_P)" -#: ../app/actions/layers-actions.c:313 +#: ../app/actions/layers-actions.c:517 msgctxt "layers-action" msgid "Replace the selection with the layer's alpha channel" -msgstr "用图层的 Alpha 通道替换选区" +msgstr "用图层的透明通道替换选区" -#: ../app/actions/layers-actions.c:318 +#: ../app/actions/layers-actions.c:522 msgctxt "layers-action" msgid "A_dd to Selection" msgstr "添加到选区(_D)" -#: ../app/actions/layers-actions.c:320 +#: ../app/actions/layers-actions.c:524 msgctxt "layers-action" msgid "Add the layer's alpha channel to the current selection" -msgstr "将图层的 Alpha 通道添加到当前选区" +msgstr "将图层的透明通道添加到当前选区" -#: ../app/actions/layers-actions.c:327 +#: ../app/actions/layers-actions.c:531 msgctxt "layers-action" msgid "Subtract the layer's alpha channel from the current selection" -msgstr "从当前选区减去图层的 Alpha 通道" +msgstr "从当前选区减去图层的透明通道" -#: ../app/actions/layers-actions.c:334 +#: ../app/actions/layers-actions.c:538 msgctxt "layers-action" msgid "Intersect the layer's alpha channel with the current selection" -msgstr "交叉图层的 Alpha 通道和当前选区" +msgstr "交叉图层的透明通道和当前选区" -#: ../app/actions/layers-actions.c:342 +#: ../app/actions/layers-actions.c:546 msgctxt "layers-action" msgid "Select _Top Layer" msgstr "选择顶端图层(_T)" -#: ../app/actions/layers-actions.c:343 +#: ../app/actions/layers-actions.c:547 msgctxt "layers-action" msgid "Select the topmost layer" msgstr "选择最顶端图层" -#: ../app/actions/layers-actions.c:348 +#: ../app/actions/layers-actions.c:552 msgctxt "layers-action" msgid "Select _Bottom Layer" msgstr "选择底端图层(_B)" -#: ../app/actions/layers-actions.c:349 +#: ../app/actions/layers-actions.c:553 msgctxt "layers-action" msgid "Select the bottommost layer" msgstr "选择最底端图层" -#: ../app/actions/layers-actions.c:354 +#: ../app/actions/layers-actions.c:558 msgctxt "layers-action" msgid "Select _Previous Layer" msgstr "选择前一图层(_P)" -#: ../app/actions/layers-actions.c:355 +#: ../app/actions/layers-actions.c:559 msgctxt "layers-action" msgid "Select the layer above the current layer" -msgstr "选择活动图层上方的图层" +msgstr "选择当前图层上方的图层" -#: ../app/actions/layers-actions.c:360 +#: ../app/actions/layers-actions.c:564 msgctxt "layers-action" msgid "Select _Next Layer" msgstr "选择后一图层(_N)" -#: ../app/actions/layers-actions.c:361 +#: ../app/actions/layers-actions.c:565 msgctxt "layers-action" msgid "Select the layer below the current layer" -msgstr "选择活动图层下方的图层" +msgstr "选择当前图层下方的图层" + +#: ../app/actions/layers-actions.c:573 +msgctxt "layers-action" +msgid "Layer Opacity: Set" +msgstr "图层不透明度：设置" + +#: ../app/actions/layers-actions.c:577 +msgctxt "layers-action" +msgid "Layer Opacity: Make Completely Transparent" +msgstr "图层不透明度：完全透明" + +#: ../app/actions/layers-actions.c:581 +msgctxt "layers-action" +msgid "Layer Opacity: Make Completely Opaque" +msgstr "图层不透明度：完全不透明" + +#: ../app/actions/layers-actions.c:585 +msgctxt "layers-action" +msgid "Layer Opacity: Make More Transparent" +msgstr "图层不透明度：更加透明" + +#: ../app/actions/layers-actions.c:589 +msgctxt "layers-action" +msgid "Layer Opacity: Make More Opaque" +msgstr "图层不透明度：更加不透明" + +#: ../app/actions/layers-actions.c:593 +msgctxt "layers-action" +msgid "Layer Opacity: Make 10% More Transparent" +msgstr "图层不透明度：增大 10% 透明" + +#: ../app/actions/layers-actions.c:597 +msgctxt "layers-action" +msgid "Layer Opacity: Make 10% More Opaque" +msgstr "图层不透明度：增大 10% 不透明" + +#: ../app/actions/layers-actions.c:605 +msgctxt "layers-action" +msgid "Layer Mode: Select First" +msgstr "图层模式：选择第一个" + +#: ../app/actions/layers-actions.c:609 +msgctxt "layers-action" +msgid "Layer Mode: Select Last" +msgstr "图层模式：选择最后一个" + +#: ../app/actions/layers-actions.c:613 +msgctxt "layers-action" +msgid "Layer Mode: Select Previous" +msgstr "图层模式：选择上一个" + +#: ../app/actions/layers-actions.c:617 +msgctxt "layers-action" +msgid "Layer Mode: Select Next" +msgstr "图层模式：选择下一个" #. Will be followed with e.g. "Shift-Click #. on thumbnail" #. -#: ../app/actions/layers-actions.c:442 +#: ../app/actions/layers-actions.c:646 msgid "Shortcut: " -msgstr "快捷键：" +msgstr "快捷键： " #. Will be prepended with a modifier key #. string, e.g. "Shift" #. -#: ../app/actions/layers-actions.c:447 +#: ../app/actions/layers-actions.c:651 msgid "-Click on thumbnail in Layers dockable" -msgstr "-点击图层停靠中的缩略图" +msgstr "-单击图层停靠中的缩略图" -#: ../app/actions/layers-actions.c:605 ../app/actions/layers-actions.c:606 +#: ../app/actions/layers-actions.c:909 ../app/actions/layers-actions.c:910 msgctxt "layers-action" msgid "To _New Layer" msgstr "到新图层(_N)" -#: ../app/actions/layers-commands.c:203 +#: ../app/actions/layers-commands.c:259 ../app/actions/layers-commands.c:1418 msgid "Layer Attributes" msgstr "图层属性" -#: ../app/actions/layers-commands.c:206 +#: ../app/actions/layers-commands.c:262 msgid "Edit Layer Attributes" msgstr "编辑图层属性" -#: ../app/actions/layers-commands.c:250 ../app/core/gimplayer.c:290 -msgid "Layer" -msgstr "图层" - -#: ../app/actions/layers-commands.c:252 ../app/actions/layers-commands.c:320 -#: ../app/widgets/gimpdrawabletreeview.c:318 -#: ../app/widgets/gimplayertreeview.c:837 +#: ../app/actions/layers-commands.c:328 +#: ../app/widgets/gimpdrawabletreeview.c:331 +#: ../app/widgets/gimplayertreeview.c:882 msgid "New Layer" msgstr "新建图层" -#: ../app/actions/layers-commands.c:255 +#: ../app/actions/layers-commands.c:331 msgid "Create a New Layer" msgstr "创建新图层" -#: ../app/actions/layers-commands.c:356 +#: ../app/actions/layers-commands.c:420 ../app/core/gimptoolinfo.c:82 msgid "Visible" msgstr "可见" -#: ../app/actions/layers-commands.c:618 +#: ../app/actions/layers-commands.c:685 msgid "Set Layer Boundary Size" msgstr "设置图层边界大小" -#: ../app/actions/layers-commands.c:663 +#: ../app/actions/layers-commands.c:747 msgid "Scale Layer" msgstr "缩放图层" -#: ../app/actions/layers-commands.c:701 -msgid "Crop Layer" -msgstr "剪裁图层" +#: ../app/actions/layers-commands.c:789 +msgid "Crop Layer to Selection" +msgstr "剪裁图层到选区" -#: ../app/actions/layers-commands.c:1080 -msgid "Please select a channel first" -msgstr "请先选择通道" +#: ../app/actions/layers-commands.c:819 +msgid "Crop Layer to Content" +msgstr "剪裁图层到内容" -#: ../app/actions/layers-commands.c:1088 -#: ../app/dialogs/layer-add-mask-dialog.c:82 -msgid "Add Layer Mask" -msgstr "添加图层蒙板" +#: ../app/actions/layers-commands.c:832 +msgid "Cannot crop because the active layer has no content." +msgstr "无法剪裁，因为使用中的图层没有内容。" + +#: ../app/actions/layers-commands.c:839 +msgid "Cannot crop because the active layer is already cropped to its content." +msgstr "无法剪裁，因为使用中的图层已剪裁到其内容。" + +#: ../app/actions/mypaint-brushes-actions.c:43 +msgctxt "mypaint-brushes-action" +msgid "MyPaint Brushes Menu" +msgstr "MyPaint 笔刷菜单" + +#: ../app/actions/mypaint-brushes-actions.c:47 +msgctxt "mypaint-brushes-action" +msgid "_New MyPaint Brush" +msgstr "新建 MyPaint 笔刷(_N)" + +#: ../app/actions/mypaint-brushes-actions.c:48 +msgctxt "mypaint-brushes-action" +msgid "Create a new MyPaint brush" +msgstr "创建新 MyPaint 笔刷" + +#: ../app/actions/mypaint-brushes-actions.c:53 +msgctxt "mypaint-brushes-action" +msgid "D_uplicate MyPaint Brush" +msgstr "复制 MyPaint 笔刷(_U)" + +#: ../app/actions/mypaint-brushes-actions.c:54 +msgctxt "mypaint-brushes-action" +msgid "Duplicate this MyPaint brush" +msgstr "复制该 MyPaint 笔刷" + +#: ../app/actions/mypaint-brushes-actions.c:59 +msgctxt "mypaint-brushes-action" +msgid "Copy MyPaint Brush _Location" +msgstr "复制 MyPaint 笔刷位置(_L)" + +#: ../app/actions/mypaint-brushes-actions.c:60 +msgctxt "mypaint-brushes-action" +msgid "Copy MyPaint brush file location to clipboard" +msgstr "将 MyPaint 笔刷文件位置复制到剪贴板" + +#: ../app/actions/mypaint-brushes-actions.c:65 +msgctxt "mypaint-brushes-action" +msgid "Show in _File Manager" +msgstr "在文件管理器中显示(_F)" + +#: ../app/actions/mypaint-brushes-actions.c:66 +msgctxt "mypaint-brushes-action" +msgid "Show MyPaint brush file location in the file manager" +msgstr "在文件管理器中显示 MyPaint 笔刷文件的位置" + +#: ../app/actions/mypaint-brushes-actions.c:71 +msgctxt "mypaint-brushes-action" +msgid "_Delete MyPaint Brush" +msgstr "删除 MyPaint 笔刷(_D)" + +#: ../app/actions/mypaint-brushes-actions.c:72 +msgctxt "mypaint-brushes-action" +msgid "Delete this MyPaint brush" +msgstr "删除该 MyPaint 笔刷" + +#: ../app/actions/mypaint-brushes-actions.c:77 +msgctxt "mypaint-brushes-action" +msgid "_Refresh MyPaint Brushes" +msgstr "刷新 MyPaint 笔刷(_R)" + +#: ../app/actions/mypaint-brushes-actions.c:78 +msgctxt "mypaint-brushes-action" +msgid "Refresh MyPaint brushes" +msgstr "刷新 MyPaint 笔刷" + +#: ../app/actions/mypaint-brushes-actions.c:86 +msgctxt "mypaint-brushes-action" +msgid "_Edit MyPaint Brush..." +msgstr "编辑 MyPaint 笔刷(_E)…" + +#: ../app/actions/mypaint-brushes-actions.c:87 +msgctxt "mypaint-brushes-action" +msgid "Edit MyPaint brush" +msgstr "编辑 MyPaint 笔刷" #: ../app/actions/palette-editor-actions.c:44 msgctxt "palette-editor-action" @@ -3976,7 +7089,7 @@ msgstr "色板编辑器菜单" #: ../app/actions/palette-editor-actions.c:48 msgctxt "palette-editor-action" msgid "_Edit Color..." -msgstr "编辑颜色(_E)..." +msgstr "编辑颜色(_E)…" #: ../app/actions/palette-editor-actions.c:49 msgctxt "palette-editor-action" @@ -4028,15 +7141,15 @@ msgstr "缩小(_O)" #: ../app/actions/palette-editor-actions.c:101 msgid "Zoom _All" -msgstr "完整显示(_A)" +msgstr "缩放全部(_A)" -#: ../app/actions/palette-editor-commands.c:69 +#: ../app/actions/palette-editor-commands.c:70 msgid "Edit Palette Color" msgstr "编辑色板颜色" -#: ../app/actions/palette-editor-commands.c:71 +#: ../app/actions/palette-editor-commands.c:72 msgid "Edit Color Palette Entry" -msgstr "编辑色板颜色" +msgstr "编辑色板颜色项" #: ../app/actions/palettes-actions.c:44 msgctxt "palettes-action" @@ -4051,12 +7164,12 @@ msgstr "新建色板(_N)" #: ../app/actions/palettes-actions.c:49 msgctxt "palettes-action" msgid "Create a new palette" -msgstr "创建新的模板" +msgstr "创建新的色板" #: ../app/actions/palettes-actions.c:54 msgctxt "palettes-action" msgid "_Import Palette..." -msgstr "导入色板(_I)..." +msgstr "导入色板(_I)…" #: ../app/actions/palettes-actions.c:55 msgctxt "palettes-action" @@ -4076,7 +7189,7 @@ msgstr "复制色板" #: ../app/actions/palettes-actions.c:66 msgctxt "palettes-action" msgid "_Merge Palettes..." -msgstr "合并色板(_M)..." +msgstr "合并色板(_M)…" #: ../app/actions/palettes-actions.c:67 msgctxt "palettes-action" @@ -4095,41 +7208,55 @@ msgstr "将色板文件位置复制到剪贴板" #: ../app/actions/palettes-actions.c:78 msgctxt "palettes-action" +msgid "Show in _File Manager" +msgstr "在文件管理器中显示(_F)" + +#: ../app/actions/palettes-actions.c:79 +msgctxt "palettes-action" +msgid "Show palette file location in the file manager" +msgstr "在文件管理器中显示色板文件的位置" + +#: ../app/actions/palettes-actions.c:84 +msgctxt "palettes-action" msgid "_Delete Palette" msgstr "删除色板(_D)" -#: ../app/actions/palettes-actions.c:79 +#: ../app/actions/palettes-actions.c:85 msgctxt "palettes-action" msgid "Delete this palette" msgstr "删除此色板" -#: ../app/actions/palettes-actions.c:84 +#: ../app/actions/palettes-actions.c:90 msgctxt "palettes-action" msgid "_Refresh Palettes" msgstr "刷新色板(_R)" -#: ../app/actions/palettes-actions.c:85 +#: ../app/actions/palettes-actions.c:91 msgctxt "palettes-action" msgid "Refresh palettes" msgstr "刷新色板" -#: ../app/actions/palettes-actions.c:93 +#: ../app/actions/palettes-actions.c:99 msgctxt "palettes-action" msgid "_Edit Palette..." -msgstr "编辑色板(_E)..." +msgstr "编辑色板(_E)…" -#: ../app/actions/palettes-actions.c:94 +#: ../app/actions/palettes-actions.c:100 msgctxt "palettes-action" -msgid "Edit palette" -msgstr "编辑色板" +msgid "Edit this palette" +msgstr "编辑该色板" -#: ../app/actions/palettes-commands.c:73 -msgid "Merge Palette" +#: ../app/actions/palettes-commands.c:83 +msgid "Merge Palettes" msgstr "合并色板" -#: ../app/actions/palettes-commands.c:77 +#: ../app/actions/palettes-commands.c:87 msgid "Enter a name for the merged palette" -msgstr "给已合并的色板输入一个名字" +msgstr "给已合并色板输入一个名字" + +#: ../app/actions/palettes-commands.c:123 +msgid "There must be at least two palettes selected to merge." +msgstr "必须选择至少两个色板以合并。" #: ../app/actions/patterns-actions.c:43 msgctxt "patterns-action" @@ -4139,12 +7266,12 @@ msgstr "图案菜单" #: ../app/actions/patterns-actions.c:47 msgctxt "patterns-action" msgid "_Open Pattern as Image" -msgstr "作为图像打开图案(_O)" +msgstr "将图案作为图像打开(_O)" #: ../app/actions/patterns-actions.c:48 msgctxt "patterns-action" msgid "Open this pattern as an image" -msgstr "作为图像打开图案" +msgstr "将此图案作为图像打开" #: ../app/actions/patterns-actions.c:53 msgctxt "patterns-action" @@ -4178,182 +7305,72 @@ msgstr "将图案文件位置复制到剪贴板" #: ../app/actions/patterns-actions.c:71 msgctxt "patterns-action" +msgid "Show in _File Manager" +msgstr "在文件管理器中显示(_F)" + +#: ../app/actions/patterns-actions.c:72 +msgctxt "patterns-action" +msgid "Show pattern file location in the file manager" +msgstr "在文件管理器中显示图案文件的位置" + +#: ../app/actions/patterns-actions.c:77 +msgctxt "patterns-action" msgid "_Delete Pattern" msgstr "删除图案(_D)" -#: ../app/actions/patterns-actions.c:72 +#: ../app/actions/patterns-actions.c:78 msgctxt "patterns-action" msgid "Delete this pattern" msgstr "删除此图案" -#: ../app/actions/patterns-actions.c:77 +#: ../app/actions/patterns-actions.c:83 msgctxt "patterns-action" msgid "_Refresh Patterns" msgstr "刷新图案(_R)" -#: ../app/actions/patterns-actions.c:78 +#: ../app/actions/patterns-actions.c:84 msgctxt "patterns-action" msgid "Refresh patterns" msgstr "刷新图案" -#: ../app/actions/patterns-actions.c:86 +#: ../app/actions/patterns-actions.c:92 msgctxt "patterns-action" msgid "_Edit Pattern..." -msgstr "编辑图案(_E)..." +msgstr "编辑图案(_E)…" -#: ../app/actions/patterns-actions.c:87 +#: ../app/actions/patterns-actions.c:93 msgctxt "patterns-action" msgid "Edit pattern" msgstr "编辑图案" -#: ../app/actions/plug-in-actions.c:85 -msgctxt "plug-in-action" -msgid "Filte_rs" -msgstr "滤镜(_R)" - -#: ../app/actions/plug-in-actions.c:87 -msgctxt "plug-in-action" -msgid "Recently Used" -msgstr "最近使用的" - -#: ../app/actions/plug-in-actions.c:89 -msgctxt "plug-in-action" -msgid "_Blur" -msgstr "模糊(_B)" - -#: ../app/actions/plug-in-actions.c:91 -msgctxt "plug-in-action" -msgid "_Noise" -msgstr "噪音(_N)" - -#: ../app/actions/plug-in-actions.c:93 -msgctxt "plug-in-action" -msgid "Edge-De_tect" -msgstr "边缘检测(_T)" - -#: ../app/actions/plug-in-actions.c:95 -msgctxt "plug-in-action" -msgid "En_hance" -msgstr "增强(_H)" - -#: ../app/actions/plug-in-actions.c:97 -msgctxt "plug-in-action" -msgid "C_ombine" -msgstr "组合(_O)" - -#: ../app/actions/plug-in-actions.c:99 -msgctxt "plug-in-action" -msgid "_Generic" -msgstr "常规(_G)" - -#: ../app/actions/plug-in-actions.c:101 -msgctxt "plug-in-action" -msgid "_Light and Shadow" -msgstr "光源和阴影(_L)" - -#: ../app/actions/plug-in-actions.c:103 -msgctxt "plug-in-action" -msgid "_Distorts" -msgstr "扭曲(_D)" - -#: ../app/actions/plug-in-actions.c:105 -msgctxt "plug-in-action" -msgid "_Artistic" -msgstr "艺术(_A)" - -#: ../app/actions/plug-in-actions.c:107 -msgctxt "plug-in-action" -msgid "_Decor" -msgstr "装饰" - -#: ../app/actions/plug-in-actions.c:109 -msgctxt "plug-in-action" -msgid "_Map" -msgstr "映射(_M)" - -#: ../app/actions/plug-in-actions.c:111 -msgctxt "plug-in-action" -msgid "_Render" -msgstr "绘制(_R)" - -#: ../app/actions/plug-in-actions.c:113 -msgctxt "plug-in-action" -msgid "_Clouds" -msgstr "云彩(_C)" - -#: ../app/actions/plug-in-actions.c:115 -msgctxt "plug-in-action" -msgid "_Nature" -msgstr "自然(_N)" - -#: ../app/actions/plug-in-actions.c:117 -msgctxt "plug-in-action" -msgid "_Pattern" -msgstr "图案(_P)" - -#: ../app/actions/plug-in-actions.c:119 -msgctxt "plug-in-action" -msgid "_Web" -msgstr "网页(_W)" - -#: ../app/actions/plug-in-actions.c:121 -msgctxt "plug-in-action" -msgid "An_imation" -msgstr "动画(_I)" - -#: ../app/actions/plug-in-actions.c:124 +#: ../app/actions/plug-in-actions.c:82 msgctxt "plug-in-action" msgid "Reset all _Filters" msgstr "重置所有滤镜(_F)" -#: ../app/actions/plug-in-actions.c:125 +#: ../app/actions/plug-in-actions.c:83 msgctxt "plug-in-action" msgid "Reset all plug-ins to their default settings" msgstr "将全部插件重置为其默认设置" -#: ../app/actions/plug-in-actions.c:133 -msgctxt "plug-in-action" -msgid "Re_peat Last" -msgstr "重复上次(_P)" - -#: ../app/actions/plug-in-actions.c:135 -msgctxt "plug-in-action" -msgid "Rerun the last used plug-in using the same settings" -msgstr "用同样的设置重新运行上次使用的插件" - -#: ../app/actions/plug-in-actions.c:140 -msgctxt "plug-in-action" -msgid "R_e-Show Last" -msgstr "调出上次(_E)" - -#: ../app/actions/plug-in-actions.c:141 -msgctxt "plug-in-action" -msgid "Show the last used plug-in dialog again" -msgstr "再次显示上次使用的插件对话框" - -#: ../app/actions/plug-in-actions.c:551 -#, c-format -msgid "Re_peat \"%s\"" -msgstr "重复“%s”(_P)" - -#: ../app/actions/plug-in-actions.c:552 -#, c-format -msgid "R_e-Show \"%s\"" -msgstr "重新显示“%s”(_E)" - -#: ../app/actions/plug-in-actions.c:568 -msgid "Repeat Last" -msgstr "重复上次" - -#: ../app/actions/plug-in-actions.c:570 -msgid "Re-Show Last" -msgstr "调出上次" - -#: ../app/actions/plug-in-commands.c:264 +#: ../app/actions/plug-in-commands.c:175 msgid "Reset all Filters" msgstr "重置所有滤镜" -#: ../app/actions/plug-in-commands.c:283 +#: ../app/actions/plug-in-commands.c:181 +#: ../app/actions/tool-options-commands.c:196 ../app/dialogs/fill-dialog.c:114 +#: ../app/dialogs/grid-dialog.c:101 ../app/dialogs/image-new-dialog.c:105 +#: ../app/dialogs/preferences-dialog.c:288 +#: ../app/dialogs/preferences-dialog.c:1099 +#: ../app/dialogs/print-size-dialog.c:123 ../app/dialogs/scale-dialog.c:136 +#: ../app/dialogs/stroke-dialog.c:127 +#: ../app/display/gimpdisplayshell-rotate-dialog.c:121 +#: ../app/tools/gimpfiltertool.c:322 ../app/tools/gimptransformtool.c:1200 +#: ../app/widgets/gimpcolordialog.c:109 +msgid "_Reset" +msgstr "重置(_R)" + +#: ../app/actions/plug-in-commands.c:195 msgid "Do you really want to reset all filters to default values?" msgstr "您真的要将所有滤镜重置到默认值吗？" @@ -4365,7 +7382,7 @@ msgstr "快速蒙板菜单" #: ../app/actions/quick-mask-actions.c:47 msgctxt "quick-mask-action" msgid "_Configure Color and Opacity..." -msgstr "配置颜色和不透明度(_C)..." +msgstr "配置颜色和不透明度(_C)…" #: ../app/actions/quick-mask-actions.c:55 msgctxt "quick-mask-action" @@ -4387,33 +7404,33 @@ msgctxt "quick-mask-action" msgid "Mask _Unselected Areas" msgstr "掩蔽非选中区域(_U)" -#: ../app/actions/quick-mask-commands.c:105 +#: ../app/actions/quick-mask-commands.c:122 msgid "Quick Mask Attributes" msgstr "快速蒙板属性" -#: ../app/actions/quick-mask-commands.c:108 +#: ../app/actions/quick-mask-commands.c:125 msgid "Edit Quick Mask Attributes" msgstr "编辑快速蒙板属性" -#: ../app/actions/quick-mask-commands.c:110 +#: ../app/actions/quick-mask-commands.c:127 msgid "Edit Quick Mask Color" msgstr "编辑快速蒙板颜色" -#: ../app/actions/quick-mask-commands.c:111 +#: ../app/actions/quick-mask-commands.c:128 msgid "_Mask opacity:" msgstr "蒙板不透明度(_M)：" -#: ../app/actions/sample-points-actions.c:39 +#: ../app/actions/sample-points-actions.c:40 msgctxt "sample-points-action" msgid "Sample Point Menu" msgstr "采样点菜单" -#: ../app/actions/sample-points-actions.c:46 +#: ../app/actions/sample-points-actions.c:47 msgctxt "sample-points-action" msgid "_Sample Merged" msgstr "位样合并(_S)" -#: ../app/actions/sample-points-actions.c:48 +#: ../app/actions/sample-points-actions.c:49 msgctxt "sample-points-action" msgid "Use the composite color of all visible layers" msgstr "使用所有可见图层的混合颜色" @@ -4471,7 +7488,7 @@ msgstr "创建浮动选区" #: ../app/actions/select-actions.c:74 msgctxt "select-action" msgid "Fea_ther..." -msgstr "羽化(_T)..." +msgstr "羽化(_T)…" #: ../app/actions/select-actions.c:76 msgctxt "select-action" @@ -4484,15 +7501,14 @@ msgid "_Sharpen" msgstr "锐化(_S)" #: ../app/actions/select-actions.c:82 -#, fuzzy msgctxt "select-action" msgid "Remove fuzziness from the selection" -msgstr "移除选区中的模糊" +msgstr "删除选区羽化" #: ../app/actions/select-actions.c:87 msgctxt "select-action" msgid "S_hrink..." -msgstr "收缩(_H)..." +msgstr "收缩(_H)…" #: ../app/actions/select-actions.c:88 msgctxt "select-action" @@ -4502,7 +7518,7 @@ msgstr "收缩选区" #: ../app/actions/select-actions.c:93 msgctxt "select-action" msgid "_Grow..." -msgstr "增长(_G)..." +msgstr "扩大(_G)…" #: ../app/actions/select-actions.c:94 msgctxt "select-action" @@ -4512,39 +7528,69 @@ msgstr "扩大选区" #: ../app/actions/select-actions.c:99 msgctxt "select-action" msgid "Bo_rder..." -msgstr "边界(_R)..." +msgstr "边界(_R)…" #: ../app/actions/select-actions.c:100 msgctxt "select-action" msgid "Replace the selection by its border" -msgstr "用选区的边界替换选区" +msgstr "用边界替换选区" #: ../app/actions/select-actions.c:105 msgctxt "select-action" +msgid "Re_move Holes" +msgstr "删除孔洞" + +#: ../app/actions/select-actions.c:106 +msgctxt "select-action" +msgid "Remove holes from the selection" +msgstr "删除选区内的小孔洞" + +#: ../app/actions/select-actions.c:111 +msgctxt "select-action" msgid "Save to _Channel" msgstr "保存到通道(_C)" -#: ../app/actions/select-actions.c:106 +#: ../app/actions/select-actions.c:112 msgctxt "select-action" msgid "Save the selection to a channel" msgstr "将选区保存到通道" -#: ../app/actions/select-actions.c:111 +#: ../app/actions/select-actions.c:117 +msgctxt "select-action" +msgid "_Fill Selection Outline..." +msgstr "填充选区轮廓(_F)…" + +#: ../app/actions/select-actions.c:118 +msgctxt "select-action" +msgid "Fill the selection outline" +msgstr "填充选区的轮廓" + +#: ../app/actions/select-actions.c:123 +msgctxt "select-action" +msgid "_Fill Selection Outline" +msgstr "填充选区轮廓(_F)" + +#: ../app/actions/select-actions.c:124 +msgctxt "select-action" +msgid "Fill the selection outline with last used values" +msgstr "按上次使用的值填充选区" + +#: ../app/actions/select-actions.c:129 msgctxt "select-action" msgid "_Stroke Selection..." -msgstr "勾画选区(_S)..." +msgstr "勾画选区(_S)…" -#: ../app/actions/select-actions.c:112 +#: ../app/actions/select-actions.c:130 msgctxt "select-action" msgid "Paint along the selection outline" msgstr "沿选区的轮廓涂画" -#: ../app/actions/select-actions.c:117 +#: ../app/actions/select-actions.c:135 msgctxt "select-action" msgid "_Stroke Selection" msgstr "勾画选区(_S)" -#: ../app/actions/select-actions.c:118 +#: ../app/actions/select-actions.c:136 msgctxt "select-action" msgid "Stroke the selection with last used values" msgstr "按上次使用的值勾画选区" @@ -4557,51 +7603,52 @@ msgstr "羽化选区" msgid "Feather selection by" msgstr "羽化半径" -#: ../app/actions/select-commands.c:197 +#: ../app/actions/select-commands.c:216 msgid "Shrink Selection" -msgstr "选区收缩" +msgstr "收缩选区" -#: ../app/actions/select-commands.c:201 +#: ../app/actions/select-commands.c:220 msgid "Shrink selection by" msgstr "收缩距离" -#: ../app/actions/select-commands.c:209 -msgid "_Shrink from image border" -msgstr "从图像边界收缩(_S)" - -#: ../app/actions/select-commands.c:237 -msgid "Grow Selection" -msgstr "选区增长" - -#: ../app/actions/select-commands.c:241 -msgid "Grow selection by" -msgstr "增长距离" - -#: ../app/actions/select-commands.c:267 -msgid "Border Selection" -msgstr "取选区边界" - -#: ../app/actions/select-commands.c:271 -msgid "Border selection by" -msgstr "边界半径" - -#. Feather button -#: ../app/actions/select-commands.c:280 -msgid "_Feather border" -msgstr "羽化边界(_F)" - #. Edge lock button -#: ../app/actions/select-commands.c:293 -msgid "_Lock selection to image edges" -msgstr "锁定选区到图像边缘" +#: ../app/actions/select-commands.c:230 ../app/actions/select-commands.c:356 +msgid "_Selected areas continue outside the image" +msgstr "选中区域超出图像(_S)" -#: ../app/actions/select-commands.c:345 ../app/actions/select-commands.c:378 -#: ../app/actions/vectors-commands.c:389 ../app/actions/vectors-commands.c:423 -#: ../app/dialogs/stroke-dialog.c:281 -msgid "There is no active layer or channel to stroke to." -msgstr "没有活动图层或通道可以勾画。" +#: ../app/actions/select-commands.c:233 +msgid "When shrinking, act as if selected areas continued outside the image." +msgstr "决定选中区域是否在收缩时超出图像。" -#: ../app/actions/select-commands.c:351 +#: ../app/actions/select-commands.c:278 +msgid "Grow Selection" +msgstr "扩大选区" + +#: ../app/actions/select-commands.c:282 +msgid "Grow selection by" +msgstr "扩大距离" + +#: ../app/actions/select-commands.c:329 +msgid "Border Selection" +msgstr "加边选区" + +#: ../app/actions/select-commands.c:333 +msgid "Border selection by" +msgstr "加边半径" + +#: ../app/actions/select-commands.c:345 +msgid "Border style" +msgstr "加边样式" + +#: ../app/actions/select-commands.c:359 +msgid "When bordering, act as if selected areas continued outside the image." +msgstr "决定选中区域是否在加边时超出图像。" + +#: ../app/actions/select-commands.c:423 +msgid "Fill Selection Outline" +msgstr "填充选区轮廓" + +#: ../app/actions/select-commands.c:452 msgid "Stroke Selection" msgstr "勾画选区" @@ -4613,7 +7660,7 @@ msgstr "模板菜单" #: ../app/actions/templates-actions.c:46 msgctxt "templates-action" msgid "_Create Image from Template" -msgstr "从模板创建图像(_C)" +msgstr "从模板新建图像(_C)" #: ../app/actions/templates-actions.c:47 msgctxt "templates-action" @@ -4623,7 +7670,7 @@ msgstr "从选中的模板创建新的图像" #: ../app/actions/templates-actions.c:52 msgctxt "templates-action" msgid "_New Template..." -msgstr "新建模板(_N)..." +msgstr "新建模板(_N)…" #: ../app/actions/templates-actions.c:53 msgctxt "templates-action" @@ -4633,7 +7680,7 @@ msgstr "创建新的模板" #: ../app/actions/templates-actions.c:58 msgctxt "templates-action" msgid "D_uplicate Template..." -msgstr "复制模板(_U)..." +msgstr "复制模板(_U)…" #: ../app/actions/templates-actions.c:59 msgctxt "templates-action" @@ -4643,7 +7690,7 @@ msgstr "复制选中的模板" #: ../app/actions/templates-actions.c:64 msgctxt "templates-action" msgid "_Edit Template..." -msgstr "编辑模板(_E)..." +msgstr "编辑模板(_E)…" #: ../app/actions/templates-actions.c:65 msgctxt "templates-action" @@ -4660,84 +7707,94 @@ msgctxt "templates-action" msgid "Delete this template" msgstr "删除此模板" -#: ../app/actions/templates-commands.c:111 +#: ../app/actions/templates-commands.c:131 msgid "New Template" msgstr "新建模板" -#: ../app/actions/templates-commands.c:114 +#: ../app/actions/templates-commands.c:134 msgid "Create a New Template" msgstr "创建新的模板" -#: ../app/actions/templates-commands.c:174 -#: ../app/actions/templates-commands.c:177 +#: ../app/actions/templates-commands.c:201 +#: ../app/actions/templates-commands.c:204 msgid "Edit Template" msgstr "编辑模板" -#: ../app/actions/templates-commands.c:212 +#: ../app/actions/templates-commands.c:240 msgid "Delete Template" msgstr "删除模板" -#: ../app/actions/templates-commands.c:238 +#: ../app/actions/templates-commands.c:245 +#: ../app/dialogs/data-delete-dialog.c:87 ../app/widgets/gimpdeviceeditor.c:509 +msgid "_Delete" +msgstr "删除(_D)" + +#: ../app/actions/templates-commands.c:266 #, c-format msgid "" "Are you sure you want to delete template '%s' from the list and from disk?" -msgstr "您确认要从列表以及磁盘中删除“%s”模板吗？" +msgstr "您确认要从列表以及磁盘中删除模板“%s”吗？" -#: ../app/actions/text-editor-actions.c:43 +#: ../app/actions/text-editor-actions.c:44 msgctxt "text-editor-action" msgid "Open" msgstr "打开" -#: ../app/actions/text-editor-actions.c:44 +#: ../app/actions/text-editor-actions.c:45 msgctxt "text-editor-action" msgid "Load text from file" -msgstr "从文件中加载文本" - -#: ../app/actions/text-editor-actions.c:49 -msgctxt "text-editor-action" -msgid "Clear" -msgstr "清除" +msgstr "从文件中加载文字" #: ../app/actions/text-editor-actions.c:50 msgctxt "text-editor-action" -msgid "Clear all text" -msgstr "清除所有文本" +msgid "Clear" +msgstr "清空" -#: ../app/actions/text-editor-actions.c:58 +#: ../app/actions/text-editor-actions.c:51 +msgctxt "text-editor-action" +msgid "Clear all text" +msgstr "清空所有文字" + +#: ../app/actions/text-editor-actions.c:59 msgctxt "text-editor-action" msgid "LTR" msgstr "左至右" -#: ../app/actions/text-editor-actions.c:59 +#: ../app/actions/text-editor-actions.c:60 msgctxt "text-editor-action" msgid "From left to right" -msgstr "从左到右" +msgstr "从左到右的文字排列" -#: ../app/actions/text-editor-actions.c:64 +#: ../app/actions/text-editor-actions.c:65 msgctxt "text-editor-action" msgid "RTL" msgstr "右至左" -#: ../app/actions/text-editor-actions.c:65 +#: ../app/actions/text-editor-actions.c:66 msgctxt "text-editor-action" msgid "From right to left" -msgstr "从右到左" +msgstr "从右到左的文字排列" -#: ../app/actions/text-editor-commands.c:62 -#: ../app/actions/text-tool-commands.c:118 +#: ../app/actions/text-editor-commands.c:60 +#: ../app/actions/text-tool-commands.c:114 msgid "Open Text File (UTF-8)" msgstr "打开文本文件(UTF-8)" -#: ../app/actions/text-editor-commands.c:143 -#: ../app/actions/text-tool-commands.c:227 ../app/config/gimpconfig-file.c:58 -#: ../app/core/gimpbrushgenerated-load.c:71 ../app/core/gimpbrush-load.c:139 -#: ../app/core/gimpbrush-load.c:424 ../app/core/gimpbrushpipe-load.c:79 -#: ../app/core/gimpcurve-load.c:54 ../app/core/gimpgradient-load.c:64 -#: ../app/core/gimppalette-load.c:78 ../app/core/gimppalette-load.c:275 -#: ../app/core/gimppalette-load.c:321 ../app/core/gimppalette-load.c:378 -#: ../app/core/gimppalette-load.c:468 ../app/core/gimppalette-load.c:635 -#: ../app/core/gimppattern-load.c:81 ../app/tools/gimpcurvestool.c:600 -#: ../app/tools/gimplevelstool.c:670 ../app/xcf/xcf.c:330 +#: ../app/actions/text-editor-commands.c:65 +#: ../app/actions/text-tool-commands.c:119 +#: ../app/dialogs/file-open-location-dialog.c:81 +#: ../app/dialogs/vectors-import-dialog.c:89 +#: ../app/widgets/gimpiconpicker.c:489 ../app/widgets/gimpopendialog.c:69 +#: ../app/widgets/gimpsettingsbox.c:736 +msgid "_Open" +msgstr "打开(_O)" + +#: ../app/actions/text-editor-commands.c:139 +#: ../app/actions/text-tool-commands.c:209 ../app/config/gimpconfig-file.c:71 +#: ../app/core/gimppalette-import.c:510 ../app/plug-in/gimpenvirontable.c:289 +#: ../app/plug-in/gimpinterpreterdb.c:233 +#: ../app/tools/gimpfiltertool-settings.c:170 +#: ../app/widgets/gimptextbuffer.c:1674 #, c-format msgid "Could not open '%s' for reading: %s" msgstr "无法打开“%s”并读取：%s" @@ -4775,17 +7832,17 @@ msgstr "删除(_D)" #: ../app/actions/text-tool-actions.c:78 msgctxt "text-tool-action" msgid "_Open text file..." -msgstr "打开文本文件(_O)..." +msgstr "打开文本文件(_O)…" #: ../app/actions/text-tool-actions.c:83 msgctxt "text-tool-action" msgid "Cl_ear" -msgstr "清除(_E)" +msgstr "清空(_E)" #: ../app/actions/text-tool-actions.c:84 msgctxt "text-tool-action" msgid "Clear all text" -msgstr "清除所有文本" +msgstr "清空所有文字" #: ../app/actions/text-tool-actions.c:89 msgctxt "text-tool-action" @@ -4795,7 +7852,7 @@ msgstr "从文字创建路径(_P)" #: ../app/actions/text-tool-actions.c:91 msgctxt "text-tool-action" msgid "Create a path from the outlines of the current text" -msgstr "双当前文字的轮廓创建路径" +msgstr "以当前文字的轮廓创建路径" #: ../app/actions/text-tool-actions.c:96 msgctxt "text-tool-action" @@ -4805,7 +7862,7 @@ msgstr "文字对齐路径(_A)" #: ../app/actions/text-tool-actions.c:98 msgctxt "text-tool-action" msgid "Bend the text along the currently active path" -msgstr "沿当前的活动路径弯曲文字" +msgstr "沿当前的活动路径排列文字" #: ../app/actions/text-tool-actions.c:106 msgctxt "text-tool-action" @@ -4823,34 +7880,29 @@ msgid "Tool Options Menu" msgstr "工具选项菜单" #: ../app/actions/tool-options-actions.c:61 -#, fuzzy msgctxt "tool-options-action" msgid "_Save Tool Preset" -msgstr "新建工具预设值(_N)" +msgstr "保存工具预设(_S)" #: ../app/actions/tool-options-actions.c:65 -#, fuzzy msgctxt "tool-options-action" msgid "_Restore Tool Preset" -msgstr "刷新工具预设值(_R)" +msgstr "恢复工具预设(_R)" #: ../app/actions/tool-options-actions.c:69 -#, fuzzy msgctxt "tool-options-action" msgid "E_dit Tool Preset" -msgstr "编辑工具预设值(_E)..." +msgstr "编辑工具预设(_D)" #: ../app/actions/tool-options-actions.c:73 -#, fuzzy msgctxt "tool-options-action" msgid "_Delete Tool Preset" -msgstr "删除工具预设值(_D)" +msgstr "删除工具预设(_D)" #: ../app/actions/tool-options-actions.c:77 -#, fuzzy msgctxt "tool-options-action" msgid "_New Tool Preset..." -msgstr "新建工具预设值(_N)" +msgstr "新建工具预设(_N)…" #: ../app/actions/tool-options-actions.c:82 msgctxt "tool-options-action" @@ -4872,101 +7924,144 @@ msgctxt "tool-options-action" msgid "Reset all tool options" msgstr "重置所有工具选项" -#: ../app/actions/tool-options-commands.c:187 +#: ../app/actions/tool-options-commands.c:188 msgid "Reset All Tool Options" msgstr "重置所有工具选项" -#: ../app/actions/tool-options-commands.c:210 +#: ../app/actions/tool-options-commands.c:212 msgid "Do you really want to reset all tool options to default values?" msgstr "您真的要将所有工具选项重置到默认值吗？" -#: ../app/actions/tool-preset-editor-actions.c:43 +#: ../app/actions/tool-preset-editor-actions.c:44 msgctxt "tool-preset-editor-action" msgid "Tool Preset Editor Menu" -msgstr "工具预设值编辑器菜单" +msgstr "工具预设编辑器菜单" -#: ../app/actions/tool-preset-editor-actions.c:51 +#: ../app/actions/tool-preset-editor-actions.c:48 +msgctxt "tool-preset-editor-action" +msgid "_Save Tool Options to Preset" +msgstr "保存工具选项为预设(_S)" + +#: ../app/actions/tool-preset-editor-actions.c:49 +msgctxt "tool-preset-editor-action" +msgid "Save the active tool options to this tool preset" +msgstr "将活动工具的选项保存为该工具的预设" + +#: ../app/actions/tool-preset-editor-actions.c:55 +msgctxt "tool-preset-editor-action" +msgid "_Restore Tool Preset" +msgstr "恢复工具预设(_R)" + +#: ../app/actions/tool-preset-editor-actions.c:56 +msgctxt "tool-preset-editor-action" +msgid "Restore this tool preset" +msgstr "恢复该工具预设" + +#: ../app/actions/tool-preset-editor-actions.c:65 msgctxt "tool-preset-editor-action" msgid "Edit Active Tool Preset" -msgstr "编辑活动工具预设值" +msgstr "编辑活动工具预设" -#: ../app/actions/tool-presets-actions.c:45 -#, fuzzy +#: ../app/actions/tool-preset-editor-commands.c:64 +#: ../app/actions/tool-presets-commands.c:67 +#, c-format +msgid "Can't save '%s' tool options to an existing '%s' tool preset." +msgstr "无法保存 '%s' 工具选项至一个已存在的 '%s' 工具预设。" + +#: ../app/actions/tool-presets-actions.c:46 msgctxt "tool-presets-action" msgid "Tool Presets Menu" -msgstr "工具预设值菜单" - -#: ../app/actions/tool-presets-actions.c:49 -#, fuzzy -msgctxt "tool-presets-action" -msgid "_New Tool Preset" -msgstr "新建工具预设值(_N)" +msgstr "工具预设菜单" #: ../app/actions/tool-presets-actions.c:50 -#, fuzzy +msgctxt "tool-presets-action" +msgid "_New Tool Preset" +msgstr "新建工具预设(_N)" + +#: ../app/actions/tool-presets-actions.c:51 msgctxt "tool-presets-action" msgid "Create a new tool preset" -msgstr "创建新的工具预设值" - -#: ../app/actions/tool-presets-actions.c:55 -#, fuzzy -msgctxt "tool-presets-action" -msgid "D_uplicate Tool Preset" -msgstr "复制工具预设值(_U)" +msgstr "创建新的工具预设" #: ../app/actions/tool-presets-actions.c:56 -#, fuzzy +msgctxt "tool-presets-action" +msgid "D_uplicate Tool Preset" +msgstr "复制工具预设(_U)" + +#: ../app/actions/tool-presets-actions.c:57 msgctxt "tool-presets-action" msgid "Duplicate this tool preset" -msgstr "复制此工具预设值" - -#: ../app/actions/tool-presets-actions.c:61 -#, fuzzy -msgctxt "tool-presets-action" -msgid "Copy Tool Preset _Location" -msgstr "复制工具预设值位置(_L)" +msgstr "复制此工具预设" #: ../app/actions/tool-presets-actions.c:62 -#, fuzzy +msgctxt "tool-presets-action" +msgid "Copy Tool Preset _Location" +msgstr "复制工具预设位置(_L)" + +#: ../app/actions/tool-presets-actions.c:63 msgctxt "tool-presets-action" msgid "Copy tool preset file location to clipboard" -msgstr "将工具预设值文件位置复制到剪贴板" - -#: ../app/actions/tool-presets-actions.c:67 -#, fuzzy -msgctxt "tool-presets-action" -msgid "_Delete Tool Preset" -msgstr "删除工具预设值(_D)" +msgstr "将工具预设文件的位置复制到剪贴板" #: ../app/actions/tool-presets-actions.c:68 -#, fuzzy msgctxt "tool-presets-action" -msgid "Delete this tool preset" -msgstr "删除此工具预设值" +msgid "Show in _File Manager" +msgstr "在文件管理器中显示(_F)" -#: ../app/actions/tool-presets-actions.c:73 -#, fuzzy +#: ../app/actions/tool-presets-actions.c:69 msgctxt "tool-presets-action" -msgid "_Refresh Tool Presets" -msgstr "刷新工具预设值(_R)" +msgid "Show tool preset file location in the file manager" +msgstr "在文件管理器中显示工具预设文件的位置" #: ../app/actions/tool-presets-actions.c:74 -#, fuzzy msgctxt "tool-presets-action" -msgid "Refresh tool presets" -msgstr "刷新工具预设值" +msgid "_Save Tool Options to Preset" +msgstr "保存工具选项为预设(_S)" + +#: ../app/actions/tool-presets-actions.c:75 +msgctxt "tool-presets-action" +msgid "Save the active tool options to this tool preset" +msgstr "将活动工具的选项保存为该工具的预设" + +#: ../app/actions/tool-presets-actions.c:81 +msgctxt "tool-presets-action" +msgid "_Restore Tool Preset" +msgstr "恢复工具预设(_R)" #: ../app/actions/tool-presets-actions.c:82 -#, fuzzy +msgctxt "tool-presets-action" +msgid "Restore this tool preset" +msgstr "恢复此工具预设" + +#: ../app/actions/tool-presets-actions.c:87 +msgctxt "tool-presets-action" +msgid "_Delete Tool Preset" +msgstr "删除工具预设(_D)" + +#: ../app/actions/tool-presets-actions.c:88 +msgctxt "tool-presets-action" +msgid "Delete this tool preset" +msgstr "删除此工具预设" + +#: ../app/actions/tool-presets-actions.c:93 +msgctxt "tool-presets-action" +msgid "_Refresh Tool Presets" +msgstr "刷新工具预设(_R)" + +#: ../app/actions/tool-presets-actions.c:94 +msgctxt "tool-presets-action" +msgid "Refresh tool presets" +msgstr "刷新工具预设" + +#: ../app/actions/tool-presets-actions.c:102 msgctxt "tool-presets-action" msgid "_Edit Tool Preset..." -msgstr "编辑工具预设值(_E)..." +msgstr "编辑工具预设(_E)…" -#: ../app/actions/tool-presets-actions.c:83 -#, fuzzy +#: ../app/actions/tool-presets-actions.c:103 msgctxt "tool-presets-action" msgid "Edit this tool preset" -msgstr "编辑此工具预设值" +msgstr "编辑此工具的预设" #: ../app/actions/tools-actions.c:46 msgctxt "tools-action" @@ -4981,7 +8076,7 @@ msgstr "选择工具(_S)" #: ../app/actions/tools-actions.c:48 msgctxt "tools-action" msgid "_Paint Tools" -msgstr "涂画工具(_P)" +msgstr "绘画工具(_P)" #: ../app/actions/tools-actions.c:49 msgctxt "tools-action" @@ -5006,752 +8101,1686 @@ msgstr "按相似的颜色选择区域" #: ../app/actions/tools-actions.c:62 msgctxt "tools-action" msgid "_Arbitrary Rotation..." -msgstr "任意旋转(_A)..." +msgstr "任意旋转(_A)…" #: ../app/actions/tools-actions.c:63 msgctxt "tools-action" msgid "Rotate by an arbitrary angle" msgstr "任意角度旋转" -#: ../app/actions/vectors-actions.c:44 +#: ../app/actions/tools-actions.c:151 +msgctxt "tools-action" +msgid "Airbrush Rate: Set" +msgstr "喷枪比率：设置" + +#: ../app/actions/tools-actions.c:155 +msgctxt "tools-action" +msgid "Airbrush Rate: Set to Minimum" +msgstr "喷枪比率：设为最小值" + +#: ../app/actions/tools-actions.c:159 +msgctxt "tools-action" +msgid "Airbrush Rate: Set to Maximum" +msgstr "喷枪比率：设为最大值" + +#: ../app/actions/tools-actions.c:163 +msgctxt "tools-action" +msgid "Airbrush Rate: Decrease by 1" +msgstr "喷枪比率：减小 1" + +#: ../app/actions/tools-actions.c:167 +msgctxt "tools-action" +msgid "Airbrush Rate: Increase by 1" +msgstr "喷枪比率：增大 1" + +#: ../app/actions/tools-actions.c:171 +msgctxt "tools-action" +msgid "Airbrush Rate: Decrease by 10" +msgstr "喷枪比率：减小 10" + +#: ../app/actions/tools-actions.c:175 +msgctxt "tools-action" +msgid "Airbrush Rate: Increase by 10" +msgstr "喷枪比率：增大 10" + +#: ../app/actions/tools-actions.c:183 +msgctxt "tools-action" +msgid "Airbrush Flow: Set" +msgstr "喷枪流量：设置" + +#: ../app/actions/tools-actions.c:187 +msgctxt "tools-action" +msgid "Airbrush Flow: Set to Minimum" +msgstr "喷枪流量：设为最小值" + +#: ../app/actions/tools-actions.c:191 +msgctxt "tools-action" +msgid "Airbrush Flow: Set to Maximum" +msgstr "喷枪流量：设为最大值" + +#: ../app/actions/tools-actions.c:195 +msgctxt "tools-action" +msgid "Airbrush Flow: Decrease by 1" +msgstr "喷枪流量：减小 1" + +#: ../app/actions/tools-actions.c:199 +msgctxt "tools-action" +msgid "Airbrush Flow: Increase by 1" +msgstr "喷枪流量：增大 1" + +#: ../app/actions/tools-actions.c:203 +msgctxt "tools-action" +msgid "Airbrush Flow: Decrease by 10" +msgstr "喷枪流量：减小 10" + +#: ../app/actions/tools-actions.c:207 +msgctxt "tools-action" +msgid "Airbrush Flow: Increase by 10" +msgstr "喷枪流量：增大 10" + +#: ../app/actions/tools-actions.c:264 +msgctxt "tools-action" +msgid "Tool's Opacity: Set" +msgstr "工具的不透明度：设置" + +#: ../app/actions/tools-actions.c:268 +msgctxt "tools-action" +msgid "Tool's Opacity: Set to Default Value" +msgstr "工具的不透明度：设为默认值" + +#: ../app/actions/tools-actions.c:272 +msgctxt "tools-action" +msgid "Tool's Opacity: Minimize" +msgstr "工具的不透明度：最小值" + +#: ../app/actions/tools-actions.c:276 +msgctxt "tools-action" +msgid "Tool's Opacity: Maximize" +msgstr "工具的不透明度：最大值" + +#: ../app/actions/tools-actions.c:280 +msgctxt "tools-action" +msgid "Tool's Opacity: Decrease by 1" +msgstr "工具的不透明度：减小 1" + +#: ../app/actions/tools-actions.c:284 +msgctxt "tools-action" +msgid "Tool's Opacity: Increase by 1" +msgstr "工具的不透明度：增大 1" + +#: ../app/actions/tools-actions.c:288 +msgctxt "tools-action" +msgid "Tool's Opacity: Decrease by 10" +msgstr "工具的不透明度：减小 10" + +#: ../app/actions/tools-actions.c:292 +msgctxt "tools-action" +msgid "Tool's Opacity: Increase by 10" +msgstr "工具的不透明度：增大 10" + +#: ../app/actions/tools-actions.c:296 +msgctxt "tools-action" +msgid "Tool's Opacity: Decrease Relative" +msgstr "工具的不透明度：相对减小" + +#: ../app/actions/tools-actions.c:300 +msgctxt "tools-action" +msgid "Tool's Opacity: Increase Relative" +msgstr "工具的不透明度：相对增大" + +#: ../app/actions/tools-actions.c:308 +msgctxt "tools-action" +msgid "Tool's Size: Set" +msgstr "工具的大小：设置" + +#: ../app/actions/tools-actions.c:312 +msgctxt "tools-action" +msgid "Tool's Size: Set to Default Value" +msgstr "工具的大小：设为默认值" + +#: ../app/actions/tools-actions.c:316 +msgctxt "tools-action" +msgid "Tool's Size: Minimize" +msgstr "工具的大小：最小值" + +#: ../app/actions/tools-actions.c:320 +msgctxt "tools-action" +msgid "Tool's Size: Maximize" +msgstr "工具的大小：最大值" + +#: ../app/actions/tools-actions.c:324 +msgctxt "tools-action" +msgid "Tool's Size: Decrease by 1" +msgstr "工具的大小：减小 1" + +#: ../app/actions/tools-actions.c:328 +msgctxt "tools-action" +msgid "Tool's Size: Increase by 1" +msgstr "工具的大小：增大 1" + +#: ../app/actions/tools-actions.c:332 +msgctxt "tools-action" +msgid "Tool's Size: Decrease by 10" +msgstr "工具的大小：减小 10" + +#: ../app/actions/tools-actions.c:336 +msgctxt "tools-action" +msgid "Tool's Size: Increase by 10" +msgstr "工具的大小：增大 10" + +#: ../app/actions/tools-actions.c:340 +msgctxt "tools-action" +msgid "Tool's Size: Decrease Relative" +msgstr "工具的大小：相对减小" + +#: ../app/actions/tools-actions.c:344 +msgctxt "tools-action" +msgid "Tool's Size: Increase Relative" +msgstr "工具的大小：相对增大" + +#: ../app/actions/tools-actions.c:352 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Set" +msgstr "工具的宽高比：设置" + +#: ../app/actions/tools-actions.c:356 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Set To Default Value" +msgstr "工具的宽高比：设为默认值" + +#: ../app/actions/tools-actions.c:360 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Minimize" +msgstr "工具的宽高比：最小值" + +#: ../app/actions/tools-actions.c:364 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Maximize" +msgstr "工具的宽高比：最大值" + +#: ../app/actions/tools-actions.c:368 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Decrease by 0.1" +msgstr "工具的宽高比：减小 0.1" + +#: ../app/actions/tools-actions.c:372 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Increase by 0.1" +msgstr "工具的宽高比：增大 0.1" + +#: ../app/actions/tools-actions.c:376 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Decrease by 1" +msgstr "工具的宽高比：减小 1" + +#: ../app/actions/tools-actions.c:380 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Increase by 1" +msgstr "工具的宽高比：增大 1" + +#: ../app/actions/tools-actions.c:384 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Decrease Relative" +msgstr "工具的宽高比：相对减小" + +#: ../app/actions/tools-actions.c:388 +msgctxt "tools-action" +msgid "Tool's Aspect Ratio: Increase Relative" +msgstr "工具的宽高比：相对增大" + +#: ../app/actions/tools-actions.c:396 +msgctxt "tools-action" +msgid "Tool's Angle: Set" +msgstr "工具的角度：设置" + +#: ../app/actions/tools-actions.c:400 +msgctxt "tools-action" +msgid "Tool's Angle: Set Angle To Default Value" +msgstr "工具的角度：设为默认值" + +#: ../app/actions/tools-actions.c:404 +msgctxt "tools-action" +msgid "Tool's Angle: Minimize" +msgstr "工具的角度：最小值" + +#: ../app/actions/tools-actions.c:408 +msgctxt "tools-action" +msgid "Tool's Angle: Maximize" +msgstr "工具的角度：最大值" + +#: ../app/actions/tools-actions.c:412 +msgctxt "tools-action" +msgid "Tool's Angle: Decrease by 1°" +msgstr "工具的角度：减小 1°" + +#: ../app/actions/tools-actions.c:416 +msgctxt "tools-action" +msgid "Tool's Angle: Increase by 1°" +msgstr "工具的角度：增大 1°" + +#: ../app/actions/tools-actions.c:420 +msgctxt "tools-action" +msgid "Tool's Angle: Decrease by 15°" +msgstr "工具的角度：减小 15°" + +#: ../app/actions/tools-actions.c:424 +msgctxt "tools-action" +msgid "Tool's Angle: Increase by 15°" +msgstr "工具的角度：增大 15°" + +#: ../app/actions/tools-actions.c:428 +msgctxt "tools-action" +msgid "Tool's Angle: Decrease Relative" +msgstr "工具的角度：相对减小" + +#: ../app/actions/tools-actions.c:432 +msgctxt "tools-action" +msgid "Tool's Angle: Increase Relative" +msgstr "工具的角度：相对增大" + +#: ../app/actions/tools-actions.c:440 +msgctxt "tools-action" +msgid "Tool's Spacing: Set" +msgstr "工具的间距：设置" + +#: ../app/actions/tools-actions.c:444 +msgctxt "tools-action" +msgid "Tool's Spacing: Set To Default Value" +msgstr "工具的间距：设为默认值" + +#: ../app/actions/tools-actions.c:448 +msgctxt "tools-action" +msgid "Tool's Spacing: Minimize" +msgstr "工具的间距：最小值" + +#: ../app/actions/tools-actions.c:452 +msgctxt "tools-action" +msgid "Tool's Spacing: Maximize" +msgstr "工具的间距：最大值" + +#: ../app/actions/tools-actions.c:456 +msgctxt "tools-action" +msgid "Tool's Spacing: Decrease by 1" +msgstr "工具的间距：减小 1" + +#: ../app/actions/tools-actions.c:460 +msgctxt "tools-action" +msgid "Tool's Spacing: Increase by 1" +msgstr "工具的间距：增大 1" + +#: ../app/actions/tools-actions.c:464 +msgctxt "tools-action" +msgid "Tool's Spacing: Decrease by 10" +msgstr "工具的间距：减小 10" + +#: ../app/actions/tools-actions.c:468 +msgctxt "tools-action" +msgid "Tool's Spacing: Increase by 10" +msgstr "工具的间距：增大 10" + +#: ../app/actions/tools-actions.c:472 +msgctxt "tools-action" +msgid "Tool's Spacing: Decrease Relative" +msgstr "工具的间距：相对减小" + +#: ../app/actions/tools-actions.c:476 +msgctxt "tools-action" +msgid "Tool's Spacing: Increase Relative" +msgstr "工具的间距：相对增大" + +#: ../app/actions/tools-actions.c:484 +msgctxt "tools-action" +msgid "Tool's Hardness: Set" +msgstr "工具的硬度：设置" + +#: ../app/actions/tools-actions.c:488 +msgctxt "tools-action" +msgid "Tool's Hardness: Set to Default Value" +msgstr "工具的硬度：设为默认值" + +#: ../app/actions/tools-actions.c:492 +msgctxt "tools-action" +msgid "Tool's Hardness: Minimize" +msgstr "工具的硬度：最小值" + +#: ../app/actions/tools-actions.c:496 +msgctxt "tools-action" +msgid "Tool's Hardness: Maximize" +msgstr "工具的硬度：最大值" + +#: ../app/actions/tools-actions.c:500 +msgctxt "tools-action" +msgid "Tool's Hardness: Decrease by 1" +msgstr "工具的硬度：减小 1" + +#: ../app/actions/tools-actions.c:504 +msgctxt "tools-action" +msgid "Tool's Hardness: Increase by 1" +msgstr "工具的硬度：增大 1" + +#: ../app/actions/tools-actions.c:508 +msgctxt "tools-action" +msgid "Tool's Hardness: Decrease by 10" +msgstr "工具的硬度：减小 10" + +#: ../app/actions/tools-actions.c:512 +msgctxt "tools-action" +msgid "Tool's Hardness: Increase by 10" +msgstr "工具的硬度：增大 10" + +#: ../app/actions/tools-actions.c:516 +msgctxt "tools-action" +msgid "Tool's Hardness: Decrease Relative" +msgstr "工具的硬度：相对减小" + +#: ../app/actions/tools-actions.c:520 +msgctxt "tools-action" +msgid "Tool's Hardness: Increase Relative" +msgstr "工具的硬度：相对增大" + +#: ../app/actions/tools-actions.c:528 +msgctxt "tools-action" +msgid "Tool's Force: Set" +msgstr "工具的力度：设置" + +#: ../app/actions/tools-actions.c:532 +msgctxt "tools-action" +msgid "Tool's Force: Set to Default Value" +msgstr "工具的力度：设为默认值" + +#: ../app/actions/tools-actions.c:536 +msgctxt "tools-action" +msgid "Tool's Force: Minimize" +msgstr "工具的力度：最小值" + +#: ../app/actions/tools-actions.c:540 +msgctxt "tools-action" +msgid "Tool's Force: Maximize" +msgstr "工具的力度：最大值" + +#: ../app/actions/tools-actions.c:544 +msgctxt "tools-action" +msgid "Tool's Force: Decrease by 1" +msgstr "工具的力度：减小 1" + +#: ../app/actions/tools-actions.c:548 +msgctxt "tools-action" +msgid "Tool's Force: Increase by 1" +msgstr "工具的力度：增大 1" + +#: ../app/actions/tools-actions.c:552 +msgctxt "tools-action" +msgid "Tool's Force: Decrease by 10" +msgstr "工具的力度：减小 10" + +#: ../app/actions/tools-actions.c:556 +msgctxt "tools-action" +msgid "Tool's Force: Increase by 10" +msgstr "工具的力度：增大 10" + +#: ../app/actions/tools-actions.c:560 +msgctxt "tools-action" +msgid "Tool's Force: Decrease Relative" +msgstr "工具的力度：相对减小" + +#: ../app/actions/tools-actions.c:564 +msgctxt "tools-action" +msgid "Tool's Force: Increase Relative" +msgstr "工具的力度：相对增大" + +#: ../app/actions/vectors-actions.c:46 msgctxt "vectors-action" msgid "Paths Menu" msgstr "路径菜单" -#: ../app/actions/vectors-actions.c:48 +#: ../app/actions/vectors-actions.c:50 msgctxt "vectors-action" -msgid "Path _Tool" -msgstr "路径工具(_T)" - -#: ../app/actions/vectors-actions.c:53 -msgctxt "vectors-action" -msgid "_Edit Path Attributes..." -msgstr "编辑路径属性(_E)..." +msgid "Color Tag" +msgstr "颜色标签" #: ../app/actions/vectors-actions.c:54 msgctxt "vectors-action" +msgid "Edit Pa_th" +msgstr "编辑路径(_T)" + +#: ../app/actions/vectors-actions.c:55 +msgctxt "vectors-action" +msgid "Edit the active path" +msgstr "编辑活动路径" + +#: ../app/actions/vectors-actions.c:60 +msgctxt "vectors-action" +msgid "_Edit Path Attributes..." +msgstr "编辑路径属性(_E)…" + +#: ../app/actions/vectors-actions.c:61 +msgctxt "vectors-action" msgid "Edit path attributes" msgstr "编辑路径属性" -#: ../app/actions/vectors-actions.c:59 +#: ../app/actions/vectors-actions.c:66 msgctxt "vectors-action" msgid "_New Path..." -msgstr "新建路径(_N)..." +msgstr "新建路径(_N)…" -#: ../app/actions/vectors-actions.c:60 +#: ../app/actions/vectors-actions.c:67 msgctxt "vectors-action" msgid "Create a new path..." -msgstr "创建新的路径..." +msgstr "创建新的路径…" -#: ../app/actions/vectors-actions.c:65 +#: ../app/actions/vectors-actions.c:72 msgctxt "vectors-action" msgid "_New Path with last values" msgstr "按上次的值新建路径(_N)" -#: ../app/actions/vectors-actions.c:66 +#: ../app/actions/vectors-actions.c:73 msgctxt "vectors-action" msgid "Create a new path with last used values" msgstr "按上次使用的值新建路径" -#: ../app/actions/vectors-actions.c:71 +#: ../app/actions/vectors-actions.c:78 msgctxt "vectors-action" msgid "D_uplicate Path" msgstr "复制路径(_U)" -#: ../app/actions/vectors-actions.c:72 +#: ../app/actions/vectors-actions.c:79 msgctxt "vectors-action" msgid "Duplicate this path" msgstr "复制此路径" -#: ../app/actions/vectors-actions.c:77 +#: ../app/actions/vectors-actions.c:84 msgctxt "vectors-action" msgid "_Delete Path" msgstr "删除路径(_D)" -#: ../app/actions/vectors-actions.c:78 +#: ../app/actions/vectors-actions.c:85 msgctxt "vectors-action" msgid "Delete this path" msgstr "删除此路径" -#: ../app/actions/vectors-actions.c:83 +#: ../app/actions/vectors-actions.c:90 msgctxt "vectors-action" msgid "Merge _Visible Paths" msgstr "合并可见路径(_V)" -#: ../app/actions/vectors-actions.c:88 -msgctxt "vectors-action" -msgid "_Raise Path" -msgstr "升高路径(_R)" - -#: ../app/actions/vectors-actions.c:89 -msgctxt "vectors-action" -msgid "Raise this path" -msgstr "升高此路径" - -#: ../app/actions/vectors-actions.c:94 -msgctxt "vectors-action" -msgid "Raise Path to _Top" -msgstr "路径升至顶端(_T)" - #: ../app/actions/vectors-actions.c:95 msgctxt "vectors-action" -msgid "Raise this path to the top" -msgstr "提升此路径至顶端" +msgid "_Raise Path" +msgstr "上移路径(_R)" -#: ../app/actions/vectors-actions.c:100 +#: ../app/actions/vectors-actions.c:96 msgctxt "vectors-action" -msgid "_Lower Path" -msgstr "降低路径(_L)" +msgid "Raise this path" +msgstr "上移此路径" #: ../app/actions/vectors-actions.c:101 msgctxt "vectors-action" -msgid "Lower this path" -msgstr "降低此路径" +msgid "Raise Path to _Top" +msgstr "上移路径到顶端(_T)" -#: ../app/actions/vectors-actions.c:106 +#: ../app/actions/vectors-actions.c:102 msgctxt "vectors-action" -msgid "Lower Path to _Bottom" -msgstr "路径降至底端(_B)" +msgid "Raise this path to the top" +msgstr "上移此路径至顶端" #: ../app/actions/vectors-actions.c:107 msgctxt "vectors-action" -msgid "Lower this path to the bottom" -msgstr "降低此路径至底端" +msgid "_Lower Path" +msgstr "下移路径(_L)" -#: ../app/actions/vectors-actions.c:112 +#: ../app/actions/vectors-actions.c:108 msgctxt "vectors-action" -msgid "Stro_ke Path..." -msgstr "勾画路径(_K)..." +msgid "Lower this path" +msgstr "下移此路径" #: ../app/actions/vectors-actions.c:113 msgctxt "vectors-action" -msgid "Paint along the path" -msgstr "沿路径涂画" +msgid "Lower Path to _Bottom" +msgstr "下移路径至底端(_B)" -#: ../app/actions/vectors-actions.c:118 +#: ../app/actions/vectors-actions.c:114 +msgctxt "vectors-action" +msgid "Lower this path to the bottom" +msgstr "下移此路径至底端" + +#: ../app/actions/vectors-actions.c:119 +msgctxt "vectors-action" +msgid "Fill Path..." +msgstr "填充路径…" + +#: ../app/actions/vectors-actions.c:120 +msgctxt "vectors-action" +msgid "Fill the path" +msgstr "填充该路径" + +#: ../app/actions/vectors-actions.c:125 +msgctxt "vectors-action" +msgid "Fill Path" +msgstr "填充路径" + +#: ../app/actions/vectors-actions.c:126 +msgctxt "vectors-action" +msgid "Fill the path with last values" +msgstr "按上次使用的值填充路径" + +#: ../app/actions/vectors-actions.c:131 +msgctxt "vectors-action" +msgid "Stro_ke Path..." +msgstr "勾画路径(_K)…" + +#: ../app/actions/vectors-actions.c:132 +msgctxt "vectors-action" +msgid "Paint along the path" +msgstr "沿路径勾画轮廓" + +#: ../app/actions/vectors-actions.c:137 msgctxt "vectors-action" msgid "Stro_ke Path" msgstr "勾画路径(_K)" -#: ../app/actions/vectors-actions.c:119 +#: ../app/actions/vectors-actions.c:138 msgctxt "vectors-action" msgid "Paint along the path with last values" msgstr "按上次使用的值勾画路径" -#: ../app/actions/vectors-actions.c:124 +#: ../app/actions/vectors-actions.c:143 msgctxt "vectors-action" msgid "Co_py Path" msgstr "复制路径(_P)" -#: ../app/actions/vectors-actions.c:129 +#: ../app/actions/vectors-actions.c:148 msgctxt "vectors-action" msgid "Paste Pat_h" msgstr "粘贴路径(_H)" -#: ../app/actions/vectors-actions.c:134 -msgctxt "vectors-action" -msgid "E_xport Path..." -msgstr "导出路径(_X)..." - -#: ../app/actions/vectors-actions.c:139 -msgctxt "vectors-action" -msgid "I_mport Path..." -msgstr "导入路径(_M)..." - -#: ../app/actions/vectors-actions.c:147 -msgctxt "vectors-action" -msgid "_Visible" -msgstr "可见(_V)" - #: ../app/actions/vectors-actions.c:153 msgctxt "vectors-action" -msgid "_Linked" -msgstr "链接(_L)" +msgid "E_xport Path..." +msgstr "导出路径(_X)…" -#. GIMP_STOCK_LOCK -#: ../app/actions/vectors-actions.c:159 +#: ../app/actions/vectors-actions.c:158 msgctxt "vectors-action" -msgid "L_ock strokes" -msgstr "锁定笔划(_O)" +msgid "I_mport Path..." +msgstr "导入路径(_M)…" -#: ../app/actions/vectors-actions.c:168 +#: ../app/actions/vectors-actions.c:166 +msgctxt "vectors-action" +msgid "Toggle Path _Visibility" +msgstr "切换路径可见性(_V)" + +#: ../app/actions/vectors-actions.c:172 +msgctxt "vectors-action" +msgid "Toggle Path _Linked State" +msgstr "切换路径链接状态(_L)" + +#. GIMP_ICON_LOCK +#: ../app/actions/vectors-actions.c:178 +msgctxt "vectors-action" +msgid "L_ock Strokes of Path" +msgstr "锁定路径笔廓(_O)" + +#: ../app/actions/vectors-actions.c:184 +msgctxt "vectors-action" +msgid "L_ock Position of Path" +msgstr "锁定路径位置(_O)" + +#: ../app/actions/vectors-actions.c:193 +msgctxt "vectors-action" +msgid "None" +msgstr "无" + +#: ../app/actions/vectors-actions.c:194 +msgctxt "vectors-action" +msgid "Path Color Tag: Clear" +msgstr "路径颜色标签：清空" + +#: ../app/actions/vectors-actions.c:199 +msgctxt "vectors-action" +msgid "Blue" +msgstr "蓝色" + +#: ../app/actions/vectors-actions.c:200 +msgctxt "vectors-action" +msgid "Path Color Tag: Set to Blue" +msgstr "路径颜色标签：设为蓝色" + +#: ../app/actions/vectors-actions.c:205 +msgctxt "vectors-action" +msgid "Green" +msgstr "绿色" + +#: ../app/actions/vectors-actions.c:206 +msgctxt "vectors-action" +msgid "Path Color Tag: Set to Green" +msgstr "路径颜色标签：设为绿色" + +#: ../app/actions/vectors-actions.c:211 +msgctxt "vectors-action" +msgid "Yellow" +msgstr "黄色" + +#: ../app/actions/vectors-actions.c:212 +msgctxt "vectors-action" +msgid "Path Color Tag: Set to Yellow" +msgstr "路径颜色标签：设为黄色" + +#: ../app/actions/vectors-actions.c:217 +msgctxt "vectors-action" +msgid "Orange" +msgstr "橙色" + +#: ../app/actions/vectors-actions.c:218 +msgctxt "vectors-action" +msgid "Path Color Tag: Set to Orange" +msgstr "路径颜色标签：设为橙色" + +#: ../app/actions/vectors-actions.c:223 +msgctxt "vectors-action" +msgid "Brown" +msgstr "棕色" + +#: ../app/actions/vectors-actions.c:224 +msgctxt "vectors-action" +msgid "Path Color Tag: Set to Brown" +msgstr "路径颜色标签：设为棕色" + +#: ../app/actions/vectors-actions.c:229 +msgctxt "vectors-action" +msgid "Red" +msgstr "红色" + +#: ../app/actions/vectors-actions.c:230 +msgctxt "vectors-action" +msgid "Path Color Tag: Set to Red" +msgstr "路径颜色标签：设为红色" + +#: ../app/actions/vectors-actions.c:235 +msgctxt "vectors-action" +msgid "Violet" +msgstr "紫色" + +#: ../app/actions/vectors-actions.c:236 +msgctxt "vectors-action" +msgid "Path Color Tag: Set to Violet" +msgstr "路径颜色标签：设为紫色" + +#: ../app/actions/vectors-actions.c:241 +msgctxt "vectors-action" +msgid "Gray" +msgstr "灰色" + +#: ../app/actions/vectors-actions.c:242 +msgctxt "vectors-action" +msgid "Path Color Tag: Set to Gray" +msgstr "路径颜色标签：设为灰色" + +#: ../app/actions/vectors-actions.c:250 msgctxt "vectors-action" msgid "Path to Sele_ction" msgstr "路径到选区(_C)" -#: ../app/actions/vectors-actions.c:169 +#: ../app/actions/vectors-actions.c:251 msgctxt "vectors-action" msgid "Path to selection" -msgstr "路径到选区" +msgstr "将路径转换为选区" -#: ../app/actions/vectors-actions.c:174 +#: ../app/actions/vectors-actions.c:256 msgctxt "vectors-action" msgid "Fr_om Path" msgstr "从路径(_O)" -#: ../app/actions/vectors-actions.c:175 +#: ../app/actions/vectors-actions.c:257 msgctxt "vectors-action" msgid "Replace selection with path" -msgstr "用此路径替换选区" +msgstr "将此路径转换为选区" -#: ../app/actions/vectors-actions.c:180 +#: ../app/actions/vectors-actions.c:262 msgctxt "vectors-action" msgid "_Add to Selection" msgstr "添加到选区(_A)" -#: ../app/actions/vectors-actions.c:181 +#: ../app/actions/vectors-actions.c:263 msgctxt "vectors-action" msgid "Add path to selection" msgstr "将路径添加到选区" -#: ../app/actions/vectors-actions.c:186 +#: ../app/actions/vectors-actions.c:268 msgctxt "vectors-action" msgid "_Subtract from Selection" msgstr "从选区中减去(_S)" -#: ../app/actions/vectors-actions.c:187 +#: ../app/actions/vectors-actions.c:269 msgctxt "vectors-action" msgid "Subtract path from selection" msgstr "从选区中减去路径" -#: ../app/actions/vectors-actions.c:192 +#: ../app/actions/vectors-actions.c:274 msgctxt "vectors-action" msgid "_Intersect with Selection" msgstr "与选区相交(_I)" -#: ../app/actions/vectors-actions.c:193 +#: ../app/actions/vectors-actions.c:275 msgctxt "vectors-action" msgid "Intersect path with selection" msgstr "将路径与选区相交" -#: ../app/actions/vectors-actions.c:201 +#: ../app/actions/vectors-actions.c:283 msgctxt "vectors-action" msgid "Selecti_on to Path" msgstr "选区到路径(_O)" -#: ../app/actions/vectors-actions.c:202 ../app/actions/vectors-actions.c:208 +#: ../app/actions/vectors-actions.c:284 ../app/actions/vectors-actions.c:290 msgctxt "vectors-action" msgid "Selection to path" -msgstr "选区到路径" +msgstr "将选区转换为路径" -#: ../app/actions/vectors-actions.c:207 +#: ../app/actions/vectors-actions.c:289 msgctxt "vectors-action" msgid "To _Path" msgstr "到路径(_P)" -#: ../app/actions/vectors-actions.c:213 +#: ../app/actions/vectors-actions.c:295 msgctxt "vectors-action" msgid "Selection to Path (_Advanced)" msgstr "选区到路径(高级)(_A)" -#: ../app/actions/vectors-actions.c:214 +#: ../app/actions/vectors-actions.c:296 msgctxt "vectors-action" msgid "Advanced options" msgstr "高级选项" -#: ../app/actions/vectors-commands.c:138 +#: ../app/actions/vectors-actions.c:304 +msgctxt "vectors-action" +msgid "Select _Top Path" +msgstr "选择顶端路径(_T)" + +#: ../app/actions/vectors-actions.c:305 +msgctxt "vectors-action" +msgid "Select the topmost path" +msgstr "选择最顶端路径" + +#: ../app/actions/vectors-actions.c:310 +msgctxt "vectors-action" +msgid "Select _Bottom Path" +msgstr "选择底端路径(_B)" + +#: ../app/actions/vectors-actions.c:311 +msgctxt "vectors-action" +msgid "Select the bottommost path" +msgstr "选择最底端路径" + +#: ../app/actions/vectors-actions.c:316 +msgctxt "vectors-action" +msgid "Select _Previous Path" +msgstr "选择前一路径(_P)" + +#: ../app/actions/vectors-actions.c:317 +msgctxt "vectors-action" +msgid "Select the path above the current path" +msgstr "选择当前路径上方的路径" + +#: ../app/actions/vectors-actions.c:322 +msgctxt "vectors-action" +msgid "Select _Next Path" +msgstr "选择后一路径(_N)" + +#: ../app/actions/vectors-actions.c:323 +msgctxt "vectors-action" +msgid "Select the vector below the current path" +msgstr "选择当前路径下方的路径" + +#: ../app/actions/vectors-commands.c:162 ../app/actions/vectors-commands.c:719 msgid "Path Attributes" msgstr "路径属性" -#: ../app/actions/vectors-commands.c:141 +#: ../app/actions/vectors-commands.c:165 msgid "Edit Path Attributes" msgstr "编辑路径属性" -#: ../app/actions/vectors-commands.c:165 ../app/vectors/gimpvectors.c:208 -#: ../app/widgets/gimpvectorstreeview.c:250 -msgid "Path" -msgstr "路径" - -#: ../app/actions/vectors-commands.c:166 +#: ../app/actions/vectors-commands.c:203 msgid "New Path" msgstr "新建路径" -#: ../app/actions/vectors-commands.c:169 -msgid "New Path Options" -msgstr "新建路径选项" +#: ../app/actions/vectors-commands.c:206 +msgid "Create a New Path" +msgstr "创建一个新的路径" -#: ../app/actions/vectors-commands.c:395 ../app/tools/gimpvectoroptions.c:200 -#: ../app/tools/gimpvectortool.c:1975 +#: ../app/actions/vectors-commands.c:425 ../app/tools/gimpvectoroptions.c:202 +#: ../app/tools/gimpvectortool.c:740 +msgid "Fill Path" +msgstr "填充路径" + +#: ../app/actions/vectors-commands.c:455 ../app/tools/gimpvectoroptions.c:210 +#: ../app/tools/gimpvectortool.c:812 msgid "Stroke Path" msgstr "勾画路径" -#: ../app/actions/view-actions.c:68 +#: ../app/actions/view-actions.c:70 msgctxt "view-action" msgid "_View" -msgstr "查看(_V)" +msgstr "视图(_V)" -#: ../app/actions/view-actions.c:69 +#: ../app/actions/view-actions.c:71 msgctxt "view-action" msgid "_Zoom" msgstr "缩放(_Z)" -#: ../app/actions/view-actions.c:70 +#: ../app/actions/view-actions.c:72 +msgctxt "view-action" +msgid "_Flip & Rotate" +msgstr "翻转和旋转(_F)" + +#: ../app/actions/view-actions.c:73 msgctxt "view-action" msgid "_Padding Color" msgstr "衬垫颜色(_P)" -#: ../app/actions/view-actions.c:72 +#: ../app/actions/view-actions.c:76 +msgctxt "view-action" +msgid "_Color Management" +msgstr "色彩管理(_C)" + +#: ../app/actions/view-actions.c:79 +msgctxt "view-action" +msgid "Display _Rendering Intent" +msgstr "显示渲染效果(_R)" + +#: ../app/actions/view-actions.c:82 +msgctxt "view-action" +msgid "Soft-Proofing Re_ndering Intent" +msgstr "软件校对渲染效果(_N)" + +#: ../app/actions/view-actions.c:85 msgctxt "view-action" msgid "Move to Screen" msgstr "移动至屏幕" -#: ../app/actions/view-actions.c:76 +#: ../app/actions/view-actions.c:89 msgctxt "view-action" msgid "_New View" msgstr "新建视图(_N)" -#: ../app/actions/view-actions.c:77 +#: ../app/actions/view-actions.c:90 msgctxt "view-action" msgid "Create another view on this image" msgstr "在此图像上创建另一个显示" -#: ../app/actions/view-actions.c:82 +#: ../app/actions/view-actions.c:95 msgctxt "view-action" -msgid "_Close" -msgstr "关闭(_C)" +msgid "_Close View" +msgstr "关闭视图(_C)" -#: ../app/actions/view-actions.c:83 +#: ../app/actions/view-actions.c:96 msgctxt "view-action" -msgid "Close this image window" -msgstr "关闭此图像窗口" +msgid "Close the active image view" +msgstr "关闭激活的图像视图" -#: ../app/actions/view-actions.c:88 +#: ../app/actions/view-actions.c:101 msgctxt "view-action" msgid "_Fit Image in Window" -msgstr "图像适配于窗口(_F)" +msgstr "图像适配窗口(_F)" -#: ../app/actions/view-actions.c:89 +#: ../app/actions/view-actions.c:102 msgctxt "view-action" msgid "Adjust the zoom ratio so that the image becomes fully visible" msgstr "调整缩放比率以使图像完整显示" -#: ../app/actions/view-actions.c:94 +#: ../app/actions/view-actions.c:107 msgctxt "view-action" msgid "Fi_ll Window" -msgstr "适合窗口(_I)" +msgstr "填充窗口(_I)" -#: ../app/actions/view-actions.c:95 +#: ../app/actions/view-actions.c:108 msgctxt "view-action" msgid "Adjust the zoom ratio so that the entire window is used" msgstr "调整缩放比率以使窗口最佳化使用" -#: ../app/actions/view-actions.c:100 +#: ../app/actions/view-actions.c:113 +msgctxt "view-action" +msgid "Zoom to _Selection" +msgstr "缩放到选区(_S)" + +#: ../app/actions/view-actions.c:114 +msgctxt "view-action" +msgid "Adjust the zoom ratio so that the selection fills the window" +msgstr "调整缩放比率以让选区填满窗口" + +#: ../app/actions/view-actions.c:119 msgctxt "view-action" msgid "Re_vert Zoom" msgstr "恢复缩放(_V)" -#: ../app/actions/view-actions.c:101 +#: ../app/actions/view-actions.c:120 msgctxt "view-action" msgid "Restore the previous zoom level" msgstr "恢复到上一次的缩放级别" -#: ../app/actions/view-actions.c:106 +#: ../app/actions/view-actions.c:125 +msgctxt "view-action" +msgid "Othe_r rotation angle..." +msgstr "其他旋转角度(_R)…" + +#: ../app/actions/view-actions.c:126 +msgctxt "view-action" +msgid "Set a custom rotation angle" +msgstr "设置自定义的旋转角度" + +#: ../app/actions/view-actions.c:131 msgctxt "view-action" msgid "Na_vigation Window" -msgstr "导航窗口(_V)" +msgstr "导览窗口(_V)" -#: ../app/actions/view-actions.c:107 +#: ../app/actions/view-actions.c:132 msgctxt "view-action" msgid "Show an overview window for this image" msgstr "为此图像显示概览窗口" -#: ../app/actions/view-actions.c:112 +#: ../app/actions/view-actions.c:137 msgctxt "view-action" msgid "Display _Filters..." -msgstr "显示滤镜(_F)..." +msgstr "显示滤镜(_F)…" -#: ../app/actions/view-actions.c:113 +#: ../app/actions/view-actions.c:138 msgctxt "view-action" msgid "Configure filters applied to this view" -msgstr "配置应用到此显示的滤镜" +msgstr "配置应用到此视图的滤镜" -#: ../app/actions/view-actions.c:118 +#: ../app/actions/view-actions.c:143 +msgctxt "view-action" +msgid "As in _Preferences" +msgstr "按首选项设定(_P)" + +#: ../app/actions/view-actions.c:145 +msgctxt "view-action" +msgid "Reset color management to what's configured in preferences" +msgstr "将色彩管理重置为在首选项中的配置" + +#: ../app/actions/view-actions.c:150 +msgctxt "view-action" +msgid "Soft-_Proofing Profile..." +msgstr "软件校对配置文件(_P)…" + +#: ../app/actions/view-actions.c:151 +msgctxt "view-action" +msgid "Set the soft-proofing profile" +msgstr "设置软件校对配置文件" + +#: ../app/actions/view-actions.c:156 msgctxt "view-action" msgid "Shrink _Wrap" msgstr "紧贴(_W)" -#: ../app/actions/view-actions.c:119 +#: ../app/actions/view-actions.c:157 msgctxt "view-action" msgid "Reduce the image window to the size of the image display" msgstr "缩小图像窗口到图像显示的尺寸" -#: ../app/actions/view-actions.c:124 +#: ../app/actions/view-actions.c:162 msgctxt "view-action" msgid "_Open Display..." -msgstr "打开显示(_O)..." +msgstr "打开显示(_O)…" -#: ../app/actions/view-actions.c:125 +#: ../app/actions/view-actions.c:163 msgctxt "view-action" msgid "Connect to another display" msgstr "连接到另一个显示" -#: ../app/actions/view-actions.c:133 +#: ../app/actions/view-actions.c:171 msgctxt "view-action" msgid "_Dot for Dot" msgstr "点对点(_D)" -#: ../app/actions/view-actions.c:134 +#: ../app/actions/view-actions.c:172 msgctxt "view-action" msgid "A pixel on the screen represents an image pixel" -msgstr "一个屏幕上的像素代表一个图像像素" +msgstr "屏幕上的一个像素显示一个图像像素" -#: ../app/actions/view-actions.c:140 +#: ../app/actions/view-actions.c:178 +msgctxt "view-action" +msgid "_Color-Manage this View" +msgstr "色彩管理此视图(_C)" + +#: ../app/actions/view-actions.c:179 +msgctxt "view-action" +msgid "Use color management for this view" +msgstr "对该视图使用色彩管理" + +#: ../app/actions/view-actions.c:185 +msgctxt "view-action" +msgid "_Proof Colors" +msgstr "校对颜色(_P)" + +#: ../app/actions/view-actions.c:186 +msgctxt "view-action" +msgid "Use this view for soft-proofing" +msgstr "使用该视图进行软件校对" + +#: ../app/actions/view-actions.c:192 ../app/actions/view-actions.c:199 +msgctxt "view-action" +msgid "_Black Point Compensation" +msgstr "黑点补偿(_B)" + +#: ../app/actions/view-actions.c:193 +msgctxt "view-action" +msgid "Use black point compensation for image display" +msgstr "为图像显示使用黑点补偿" + +#: ../app/actions/view-actions.c:200 +msgctxt "view-action" +msgid "Use black point compensation for soft-proofing" +msgstr "为软件校对使用黑点补偿" + +#: ../app/actions/view-actions.c:206 +msgctxt "view-action" +msgid "_Mark Out Of Gamut Colors" +msgstr "标记出超出全彩范围的(_M)" + +#: ../app/actions/view-actions.c:207 +msgctxt "view-action" +msgid "" +"When soft-proofing, mark colors which cannot be represented in the target " +"color space" +msgstr "软件校对时标记出无法在目标色彩空间内展现的色彩" + +#: ../app/actions/view-actions.c:214 msgctxt "view-action" msgid "Show _Selection" msgstr "显示选区(_S)" -#: ../app/actions/view-actions.c:141 +#: ../app/actions/view-actions.c:215 msgctxt "view-action" msgid "Display the selection outline" msgstr "显示选区的轮廓" -#: ../app/actions/view-actions.c:147 +#: ../app/actions/view-actions.c:221 msgctxt "view-action" msgid "Show _Layer Boundary" msgstr "显示图层边界(_L)" -#: ../app/actions/view-actions.c:148 +#: ../app/actions/view-actions.c:222 msgctxt "view-action" msgid "Draw a border around the active layer" -msgstr "在活动图层周围绘制边框" +msgstr "在活动图层周围显示其边界线" -#: ../app/actions/view-actions.c:154 +#: ../app/actions/view-actions.c:228 msgctxt "view-action" msgid "Show _Guides" msgstr "显示参考线(_G)" -#: ../app/actions/view-actions.c:155 +#: ../app/actions/view-actions.c:229 msgctxt "view-action" msgid "Display the image's guides" msgstr "显示图像的参考线" -#: ../app/actions/view-actions.c:161 +#: ../app/actions/view-actions.c:235 msgctxt "view-action" msgid "S_how Grid" msgstr "显示网格(_H)" -#: ../app/actions/view-actions.c:162 +#: ../app/actions/view-actions.c:236 msgctxt "view-action" msgid "Display the image's grid" msgstr "显示图像的网格" -#: ../app/actions/view-actions.c:168 +#: ../app/actions/view-actions.c:242 msgctxt "view-action" msgid "Show Sample Points" msgstr "显示采样点" -#: ../app/actions/view-actions.c:169 +#: ../app/actions/view-actions.c:243 msgctxt "view-action" msgid "Display the image's color sample points" msgstr "显示图像的颜色采样点" -#: ../app/actions/view-actions.c:175 +#: ../app/actions/view-actions.c:249 msgctxt "view-action" msgid "Sn_ap to Guides" msgstr "吸附到参考线(_A)" -#: ../app/actions/view-actions.c:176 +#: ../app/actions/view-actions.c:250 msgctxt "view-action" msgid "Tool operations snap to guides" msgstr "工具操作吸附到参考线" -#: ../app/actions/view-actions.c:182 +#: ../app/actions/view-actions.c:256 msgctxt "view-action" msgid "Sna_p to Grid" msgstr "吸附到网格(_P)" -#: ../app/actions/view-actions.c:183 +#: ../app/actions/view-actions.c:257 msgctxt "view-action" msgid "Tool operations snap to the grid" msgstr "工具操作吸附到网格" -#: ../app/actions/view-actions.c:189 +#: ../app/actions/view-actions.c:263 msgctxt "view-action" msgid "Snap to _Canvas Edges" msgstr "吸附到画布边缘(_C)" -#: ../app/actions/view-actions.c:190 +#: ../app/actions/view-actions.c:264 msgctxt "view-action" msgid "Tool operations snap to the canvas edges" msgstr "工具操作吸附到画布边缘" -#: ../app/actions/view-actions.c:196 +#: ../app/actions/view-actions.c:270 msgctxt "view-action" msgid "Snap t_o Active Path" msgstr "吸附到活动路径(_O)" -#: ../app/actions/view-actions.c:197 +#: ../app/actions/view-actions.c:271 msgctxt "view-action" msgid "Tool operations snap to the active path" msgstr "工具操作吸附到活动路径" -#: ../app/actions/view-actions.c:203 +#: ../app/actions/view-actions.c:277 msgctxt "view-action" msgid "Show _Menubar" msgstr "显示菜单栏(_M)" -#: ../app/actions/view-actions.c:204 +#: ../app/actions/view-actions.c:278 msgctxt "view-action" msgid "Show this window's menubar" msgstr "显示此窗口的菜单栏" -#: ../app/actions/view-actions.c:210 +#: ../app/actions/view-actions.c:284 msgctxt "view-action" msgid "Show R_ulers" msgstr "显示标尺(_U)" -#: ../app/actions/view-actions.c:211 +#: ../app/actions/view-actions.c:285 msgctxt "view-action" msgid "Show this window's rulers" msgstr "显示此窗口的标尺" -#: ../app/actions/view-actions.c:217 +#: ../app/actions/view-actions.c:291 msgctxt "view-action" msgid "Show Scroll_bars" msgstr "显示滚动条(_B)" -#: ../app/actions/view-actions.c:218 +#: ../app/actions/view-actions.c:292 msgctxt "view-action" msgid "Show this window's scrollbars" msgstr "显示此窗口的滚动条" -#: ../app/actions/view-actions.c:224 +#: ../app/actions/view-actions.c:298 msgctxt "view-action" msgid "Show S_tatusbar" msgstr "显示状态栏(_T)" -#: ../app/actions/view-actions.c:225 +#: ../app/actions/view-actions.c:299 msgctxt "view-action" msgid "Show this window's statusbar" msgstr "显示此窗口的状态栏" -#: ../app/actions/view-actions.c:231 +#: ../app/actions/view-actions.c:305 msgctxt "view-action" msgid "Fullscr_een" msgstr "全屏(_E)" -#: ../app/actions/view-actions.c:232 +#: ../app/actions/view-actions.c:306 msgctxt "view-action" msgid "Toggle fullscreen view" -msgstr "切换全屏显示" +msgstr "切换全屏视图" -#: ../app/actions/view-actions.c:238 -#, fuzzy +#: ../app/actions/view-actions.c:315 msgctxt "view-action" -msgid "Use GEGL" -msgstr "使用 _GEGL" +msgid "Set zoom factor" +msgstr "设置缩放比例" -#: ../app/actions/view-actions.c:239 +#: ../app/actions/view-actions.c:320 msgctxt "view-action" -msgid "Use GEGL to create this window's projection" -msgstr "" +msgid "Zoom out as far as possible" +msgstr "尽可能缩小" -#: ../app/actions/view-actions.c:263 +#: ../app/actions/view-actions.c:325 +msgctxt "view-action" +msgid "Zoom in as far as possible" +msgstr "尽可能放大" + +#: ../app/actions/view-actions.c:330 msgctxt "view-zoom-action" msgid "Zoom _Out" msgstr "缩小(_O)" -#: ../app/actions/view-actions.c:264 ../app/actions/view-actions.c:276 -#, fuzzy +#: ../app/actions/view-actions.c:331 ../app/actions/view-actions.c:343 msgctxt "view-zoom-action" msgid "Zoom out" msgstr "缩小" -#: ../app/actions/view-actions.c:269 +#: ../app/actions/view-actions.c:336 msgctxt "view-zoom-action" msgid "Zoom _In" msgstr "放大(_I)" -#: ../app/actions/view-actions.c:270 ../app/actions/view-actions.c:282 -#, fuzzy +#: ../app/actions/view-actions.c:337 ../app/actions/view-actions.c:349 msgctxt "view-zoom-action" msgid "Zoom in" msgstr "放大" -#: ../app/actions/view-actions.c:275 +#: ../app/actions/view-actions.c:342 msgctxt "view-zoom-action" msgid "Zoom Out" msgstr "缩小" -#: ../app/actions/view-actions.c:281 +#: ../app/actions/view-actions.c:348 msgctxt "view-zoom-action" msgid "Zoom In" msgstr "放大" -#: ../app/actions/view-actions.c:300 ../app/actions/view-actions.c:306 +#: ../app/actions/view-actions.c:354 +msgctxt "view-action" +msgid "Zoom out a lot" +msgstr "缩小很多" + +#: ../app/actions/view-actions.c:359 +msgctxt "view-action" +msgid "Zoom in a lot" +msgstr "放大很多" + +#: ../app/actions/view-actions.c:367 ../app/actions/view-actions.c:373 msgctxt "view-zoom-action" msgid "1_6:1 (1600%)" -msgstr "1_6:1 (1600%)" +msgstr "1_6:1 (1600%)" -#: ../app/actions/view-actions.c:301 ../app/actions/view-actions.c:307 +#: ../app/actions/view-actions.c:368 ../app/actions/view-actions.c:374 msgctxt "view-zoom-action" msgid "Zoom 16:1" msgstr "缩放 16:1" -#: ../app/actions/view-actions.c:312 ../app/actions/view-actions.c:318 +#: ../app/actions/view-actions.c:379 ../app/actions/view-actions.c:385 msgctxt "view-zoom-action" msgid "_8:1 (800%)" -msgstr "_8:1 (800%)" +msgstr "_8:1 (800%)" -#: ../app/actions/view-actions.c:313 ../app/actions/view-actions.c:319 +#: ../app/actions/view-actions.c:380 ../app/actions/view-actions.c:386 msgctxt "view-zoom-action" msgid "Zoom 8:1" msgstr "缩放 8:1" -#: ../app/actions/view-actions.c:324 ../app/actions/view-actions.c:330 +#: ../app/actions/view-actions.c:391 ../app/actions/view-actions.c:397 msgctxt "view-zoom-action" msgid "_4:1 (400%)" -msgstr "_4:1 (400%)" +msgstr "_4:1 (400%)" -#: ../app/actions/view-actions.c:325 ../app/actions/view-actions.c:331 +#: ../app/actions/view-actions.c:392 ../app/actions/view-actions.c:398 msgctxt "view-zoom-action" msgid "Zoom 4:1" msgstr "缩放 4:1" -#: ../app/actions/view-actions.c:336 ../app/actions/view-actions.c:342 +#: ../app/actions/view-actions.c:403 ../app/actions/view-actions.c:409 msgctxt "view-zoom-action" msgid "_2:1 (200%)" -msgstr "_2:1 (200%)" +msgstr "_2:1 (200%)" -#: ../app/actions/view-actions.c:337 ../app/actions/view-actions.c:343 +#: ../app/actions/view-actions.c:404 ../app/actions/view-actions.c:410 msgctxt "view-zoom-action" msgid "Zoom 2:1" msgstr "缩放 2:1" -#: ../app/actions/view-actions.c:348 ../app/actions/view-actions.c:354 +#: ../app/actions/view-actions.c:415 ../app/actions/view-actions.c:421 msgctxt "view-zoom-action" msgid "_1:1 (100%)" -msgstr "_1:1 (100%)" +msgstr "_1:1 (100%)" -#: ../app/actions/view-actions.c:349 ../app/actions/view-actions.c:355 +#: ../app/actions/view-actions.c:416 ../app/actions/view-actions.c:422 msgctxt "view-zoom-action" msgid "Zoom 1:1" msgstr "缩放 1:1" -#: ../app/actions/view-actions.c:360 +#: ../app/actions/view-actions.c:427 msgctxt "view-zoom-action" msgid "1:_2 (50%)" -msgstr "1:_2 (50%)" +msgstr "1:_2 (50%)" -#: ../app/actions/view-actions.c:361 +#: ../app/actions/view-actions.c:428 msgctxt "view-zoom-action" msgid "Zoom 1:2" msgstr "缩放 1:2" -#: ../app/actions/view-actions.c:366 +#: ../app/actions/view-actions.c:433 msgctxt "view-zoom-action" msgid "1:_4 (25%)" -msgstr "1:_4 (25%)" +msgstr "1:_4 (25%)" -#: ../app/actions/view-actions.c:367 +#: ../app/actions/view-actions.c:434 msgctxt "view-zoom-action" msgid "Zoom 1:4" msgstr "缩放 1:4" -#: ../app/actions/view-actions.c:372 +#: ../app/actions/view-actions.c:439 msgctxt "view-zoom-action" msgid "1:_8 (12.5%)" -msgstr "1:_8 (12.5%)" +msgstr "1:_8 (12.5%)" -#: ../app/actions/view-actions.c:373 +#: ../app/actions/view-actions.c:440 msgctxt "view-zoom-action" msgid "Zoom 1:8" msgstr "缩放 1:8" -#: ../app/actions/view-actions.c:378 +#: ../app/actions/view-actions.c:445 msgctxt "view-zoom-action" msgid "1:1_6 (6.25%)" -msgstr "1:1_6 (6.25%)" +msgstr "1:1_6 (6.25%)" -#: ../app/actions/view-actions.c:379 +#: ../app/actions/view-actions.c:446 msgctxt "view-zoom-action" msgid "Zoom 1:16" msgstr "缩放 1:16" -#: ../app/actions/view-actions.c:384 +#: ../app/actions/view-actions.c:451 msgctxt "view-zoom-action" -msgid "Othe_r..." -msgstr "其它(_R)..." +msgid "Othe_r zoom factor..." +msgstr "其他缩放比例(_R)…" -#: ../app/actions/view-actions.c:385 +#: ../app/actions/view-actions.c:452 msgctxt "view-zoom-action" msgid "Set a custom zoom factor" -msgstr "设置自定义缩放因子" +msgstr "设置自定义缩放比例" -#: ../app/actions/view-actions.c:393 +#: ../app/actions/view-actions.c:460 +msgctxt "view-action" +msgid "Flip Horizontally" +msgstr "水平翻转" + +#: ../app/actions/view-actions.c:461 +msgctxt "view-action" +msgid "Flip the view horizontally" +msgstr "水平翻转视图" + +#: ../app/actions/view-actions.c:467 +msgctxt "view-action" +msgid "Flip Vertically" +msgstr "竖直翻转" + +#: ../app/actions/view-actions.c:468 +msgctxt "view-action" +msgid "Flip the view vertically" +msgstr "竖直翻转视图" + +#: ../app/actions/view-actions.c:482 +msgctxt "view-action" +msgid "_Reset Flip & Rotate" +msgstr "重置翻转和旋转(_R)" + +#: ../app/actions/view-actions.c:484 +msgctxt "view-action" +msgid "Reset flipping to unflipped and the angle of rotation to 0°" +msgstr "重置翻转和旋转到未翻转和旋转角度为 0 的状态" + +#: ../app/actions/view-actions.c:492 +msgctxt "view-action" +msgid "Rotate 15° _clockwise" +msgstr "顺时钟旋转 15° (_C)" + +#: ../app/actions/view-actions.c:493 +msgctxt "view-action" +msgid "Rotate the view 15 degrees to the right" +msgstr "将视图向右旋转 15 度" + +#: ../app/actions/view-actions.c:498 +msgctxt "view-action" +msgid "Rotate 90° _clockwise" +msgstr "顺时针旋转 90° (_C)" + +#: ../app/actions/view-actions.c:499 +msgctxt "view-action" +msgid "Rotate the view 90 degrees to the right" +msgstr "将视图向右旋转 90 度" + +#: ../app/actions/view-actions.c:504 +msgctxt "view-action" +msgid "Rotate _180°" +msgstr "旋转 _180°" + +#: ../app/actions/view-actions.c:505 +msgctxt "view-action" +msgid "Turn the view upside-down" +msgstr "使视图上下颠倒" + +#: ../app/actions/view-actions.c:510 +msgctxt "view-action" +msgid "Rotate 90° counter-clock_wise" +msgstr "逆时针旋转 90° (_W)" + +#: ../app/actions/view-actions.c:511 +msgctxt "view-action" +msgid "Rotate the view 90 degrees to the left" +msgstr "将视图向左旋转 90 度" + +#: ../app/actions/view-actions.c:516 +msgctxt "view-action" +msgid "Rotate 15° counter-clock_wise" +msgstr "逆时针旋转 15° (_W)" + +#: ../app/actions/view-actions.c:517 +msgctxt "view-action" +msgid "Rotate the view 15 degrees to the left" +msgstr "将视图向左旋转 15 度" + +#: ../app/actions/view-actions.c:525 ../app/actions/view-actions.c:552 +msgctxt "view-action" +msgid "_Perceptual" +msgstr "感知(_P)" + +#: ../app/actions/view-actions.c:526 +msgctxt "view-action" +msgid "Display rendering intent is perceptual" +msgstr "显示渲染效果是可感知的" + +#: ../app/actions/view-actions.c:531 ../app/actions/view-actions.c:558 +msgctxt "view-action" +msgid "_Relative Colorimetric" +msgstr "相关色度(_R)" + +#: ../app/actions/view-actions.c:532 +msgctxt "view-action" +msgid "Display rendering intent is relative colorimetric" +msgstr "显示渲染效果是相关色度的" + +#: ../app/actions/view-actions.c:537 ../app/actions/view-actions.c:564 +msgctxt "view-action" +msgid "_Saturation" +msgstr "饱和度(_S)" + +#: ../app/actions/view-actions.c:538 +msgctxt "view-action" +msgid "Display rendering intent is saturation" +msgstr "显示渲染效果是色饱和的" + +#: ../app/actions/view-actions.c:543 ../app/actions/view-actions.c:570 +msgctxt "view-action" +msgid "_Absolute Colorimetric" +msgstr "绝对色度(_A)" + +#: ../app/actions/view-actions.c:544 +msgctxt "view-action" +msgid "Display rendering intent is absolute colorimetric" +msgstr "显示渲染效果是绝对色度的" + +#: ../app/actions/view-actions.c:553 +msgctxt "view-action" +msgid "Soft-proofing rendering intent is perceptual" +msgstr "软件校对渲染效果是可感知的" + +#: ../app/actions/view-actions.c:559 +msgctxt "view-action" +msgid "Soft-proofing rendering intent is relative colorimetric" +msgstr "软件校对渲染效果是相关色度的" + +#: ../app/actions/view-actions.c:565 +msgctxt "view-action" +msgid "Soft-proofing rendering intent is saturation" +msgstr "软件校对渲染效果是色饱和的" + +#: ../app/actions/view-actions.c:571 +msgctxt "view-action" +msgid "Soft-proofing rendering intent is absolute colorimetric" +msgstr "软件校对渲染效果是绝对色度的" + +#: ../app/actions/view-actions.c:579 msgctxt "view-padding-color" msgid "From _Theme" -msgstr "取自主题(_T)" +msgstr "来自主题(_T)" -#: ../app/actions/view-actions.c:394 +#: ../app/actions/view-actions.c:580 msgctxt "view-padding-color" msgid "Use the current theme's background color" msgstr "使用当前主题的背景色" -#: ../app/actions/view-actions.c:399 +#: ../app/actions/view-actions.c:585 msgctxt "view-padding-color" msgid "_Light Check Color" msgstr "浅色方格的颜色(_L)" -#: ../app/actions/view-actions.c:400 +#: ../app/actions/view-actions.c:586 msgctxt "view-padding-color" msgid "Use the light check color" msgstr "使用浅色方格的颜色" -#: ../app/actions/view-actions.c:405 +#: ../app/actions/view-actions.c:591 msgctxt "view-padding-color" msgid "_Dark Check Color" msgstr "深色方格的颜色(_D)" -#: ../app/actions/view-actions.c:406 +#: ../app/actions/view-actions.c:592 msgctxt "view-padding-color" msgid "Use the dark check color" msgstr "使用深色方格的颜色" -#: ../app/actions/view-actions.c:411 +#: ../app/actions/view-actions.c:597 msgctxt "view-padding-color" -msgid "Select _Custom Color..." -msgstr "选择自定义颜色(_C)..." +msgid "_Custom Color..." +msgstr "自定义颜色(_C)…" -#: ../app/actions/view-actions.c:412 +#: ../app/actions/view-actions.c:598 msgctxt "view-padding-color" msgid "Use an arbitrary color" msgstr "使用任意颜色" -#: ../app/actions/view-actions.c:417 +#: ../app/actions/view-actions.c:603 msgctxt "view-padding-color" msgid "As in _Preferences" -msgstr "按首选项中设定(_P)" +msgstr "按首选项设定(_P)" -#: ../app/actions/view-actions.c:419 +#: ../app/actions/view-actions.c:605 msgctxt "view-padding-color" msgid "Reset padding color to what's configured in preferences" msgstr "将填充颜色重置为在首选项中的配置" +#: ../app/actions/view-actions.c:613 +msgctxt "view-action" +msgid "Set horizontal scroll offset" +msgstr "设置水平滚动位移" + #: ../app/actions/view-actions.c:618 +msgctxt "view-action" +msgid "Scroll to left border" +msgstr "滚动到左边界" + +#: ../app/actions/view-actions.c:623 +msgctxt "view-action" +msgid "Scroll to right border" +msgstr "滚动到右边界" + +#: ../app/actions/view-actions.c:628 +msgctxt "view-action" +msgid "Scroll left" +msgstr "左滚" + +#: ../app/actions/view-actions.c:633 +msgctxt "view-action" +msgid "Scroll right" +msgstr "右滚" + +#: ../app/actions/view-actions.c:638 +msgctxt "view-action" +msgid "Scroll page left" +msgstr "页面向左滚动" + +#: ../app/actions/view-actions.c:643 +msgctxt "view-action" +msgid "Scroll page right" +msgstr "页面向右滚动" + +#: ../app/actions/view-actions.c:651 +msgctxt "view-action" +msgid "Set vertical scroll offset" +msgstr "设置竖直滚动位移" + +#: ../app/actions/view-actions.c:656 +msgctxt "view-action" +msgid "Scroll to top border" +msgstr "滚动到上边界" + +#: ../app/actions/view-actions.c:661 +msgctxt "view-action" +msgid "Scroll to bottom border" +msgstr "滚动到下边界" + +#: ../app/actions/view-actions.c:666 +msgctxt "view-action" +msgid "Scroll up" +msgstr "上滚" + +#: ../app/actions/view-actions.c:671 +msgctxt "view-action" +msgid "Scroll down" +msgstr "下滚" + +#: ../app/actions/view-actions.c:676 +msgctxt "view-action" +msgid "Scroll page up" +msgstr "页面向上滚动" + +#: ../app/actions/view-actions.c:681 +msgctxt "view-action" +msgid "Scroll page down" +msgstr "页面向下滚动" + +#: ../app/actions/view-actions.c:903 #, c-format msgid "Re_vert Zoom (%d%%)" -msgstr "恢复缩放(_V)(%d%%)" +msgstr "恢复缩放(_V) (%d%%)" -#: ../app/actions/view-actions.c:626 +#: ../app/actions/view-actions.c:911 msgid "Re_vert Zoom" msgstr "恢复缩放(_V)" -#: ../app/actions/view-actions.c:761 +#: ../app/actions/view-actions.c:1098 #, c-format msgid "Othe_r (%s)..." -msgstr "其它(_R)(%s)..." +msgstr "其他(_R)(%s)…" -#: ../app/actions/view-actions.c:770 +#: ../app/actions/view-actions.c:1107 #, c-format msgid "_Zoom (%s)" msgstr "缩放(_Z)(%s)" -#: ../app/actions/view-commands.c:585 +#. please preserve the trailing space +#: ../app/actions/view-actions.c:1128 +msgid "(H+V) " +msgstr "(H+V) " + +#. please preserve the trailing space +#: ../app/actions/view-actions.c:1133 +msgid "(H) " +msgstr "(H+V) " + +#. please preserve the trailing space +#: ../app/actions/view-actions.c:1138 +msgid "(V) " +msgstr "(V) " + +#: ../app/actions/view-actions.c:1145 +#, c-format +msgid "_Flip %s& Rotate (%d°)" +msgstr "翻转(_F) %s 并旋转 (%d°)" + +#: ../app/actions/view-commands.c:1005 msgid "Set Canvas Padding Color" msgstr "设置画布衬垫的颜色" -#: ../app/actions/view-commands.c:587 +#: ../app/actions/view-commands.c:1007 msgid "Set Custom Canvas Padding Color" msgstr "设置自定义画布衬垫的颜色" @@ -5765,215 +9794,333 @@ msgstr "屏幕 %s" msgid "Move this window to screen %s" msgstr "移动此窗口至屏幕 %s" -#: ../app/actions/windows-actions.c:95 +#: ../app/actions/window-commands.c:76 ../app/dialogs/file-save-dialog.c:638 +#: ../app/dialogs/grid-dialog.c:103 ../app/dialogs/image-new-dialog.c:107 +#: ../app/dialogs/image-new-dialog.c:326 +#: ../app/dialogs/item-options-dialog.c:146 +#: ../app/dialogs/preferences-dialog.c:1101 +#: ../app/dialogs/print-size-dialog.c:125 +#: ../app/dialogs/resolution-calibrate-dialog.c:77 +#: ../app/dialogs/template-options-dialog.c:119 +#: ../app/display/gimpdisplayshell-filter-dialog.c:88 +#: ../app/display/gimpdisplayshell-rotate-dialog.c:123 +#: ../app/display/gimpdisplayshell-scale-dialog.c:123 ../app/gui/gui.c:193 +#: ../app/tools/gimpfiltertool.c:324 ../app/widgets/gimpcolordialog.c:111 +#: ../app/widgets/gimpcontrollereditor.c:661 +#: ../app/widgets/gimperrordialog.c:76 ../app/widgets/gimpfiledialog.c:188 +msgid "_OK" +msgstr "确定(_O)" + +#: ../app/actions/windows-actions.c:98 msgctxt "windows-action" msgid "_Windows" msgstr "窗口(_W)" -#: ../app/actions/windows-actions.c:97 +#: ../app/actions/windows-actions.c:100 msgctxt "windows-action" msgid "_Recently Closed Docks" -msgstr "最近关闭的停靠(_R)" - -#: ../app/actions/windows-actions.c:99 -msgctxt "windows-action" -msgid "_Dockable Dialogs" -msgstr "可停靠对话框" +msgstr "最近关闭的 Dock (_R)" #: ../app/actions/windows-actions.c:102 -#, fuzzy +msgctxt "windows-action" +msgid "_Dockable Dialogs" +msgstr "可停靠对话框(_D)" + +#: ../app/actions/windows-actions.c:105 msgctxt "windows-action" msgid "Next Image" -msgstr "新建图像(_N)" +msgstr "下一个图像" -#: ../app/actions/windows-actions.c:103 -#, fuzzy +#: ../app/actions/windows-actions.c:106 msgctxt "windows-action" msgid "Switch to the next image" -msgstr "切换到移动工具" +msgstr "切换到下一个图像" -#: ../app/actions/windows-actions.c:108 -#, fuzzy +#: ../app/actions/windows-actions.c:111 msgctxt "windows-action" msgid "Previous Image" -msgstr "前一条提示(_P)" +msgstr "上一个图像" -#: ../app/actions/windows-actions.c:109 -#, fuzzy +#: ../app/actions/windows-actions.c:112 msgctxt "windows-action" msgid "Switch to the previous image" -msgstr "恢复到上一次的缩放级别" +msgstr "切换到上一个图像" #: ../app/actions/windows-actions.c:117 msgctxt "windows-action" +msgid "_Tabs Position" +msgstr "标签页位置(_T)" + +#: ../app/actions/windows-actions.c:123 +msgctxt "windows-action" msgid "Hide Docks" msgstr "隐藏停靠" -#: ../app/actions/windows-actions.c:118 +#: ../app/actions/windows-actions.c:124 msgctxt "windows-action" msgid "" -"When enabled docks and other dialogs are hidden, leaving only image windows." -msgstr "如果启用，停靠和其他对话框会被隐藏，仅留下图像窗口。" +"When enabled, docks and other dialogs are hidden, leaving only image windows." +msgstr "当启用时仅显示图像窗口，隐藏所有停靠和其他对话框。" -#: ../app/actions/windows-actions.c:124 +#: ../app/actions/windows-actions.c:130 msgctxt "windows-action" msgid "Single-Window Mode" msgstr "单窗口模式" -#: ../app/actions/windows-actions.c:125 -#, fuzzy +#: ../app/actions/windows-actions.c:131 msgctxt "windows-action" -msgid "When enabled GIMP is in a single-window mode." -msgstr "在单窗口模式中使用 GIMP。" +msgid "When enabled, GIMP is in a single-window mode." +msgstr "当启用时，GIMP 处于单窗口模式。" -#: ../app/base/tile-swap.c:711 +#: ../app/actions/windows-actions.c:140 +msgctxt "windows-tabs-position-action" +msgid "_Top" +msgstr "顶部(_T)" + +#: ../app/actions/windows-actions.c:141 +msgctxt "windows-tabs-position-action" +msgid "Position the tabs on the top" +msgstr "将标签页放置于顶部" + +#: ../app/actions/windows-actions.c:145 +msgctxt "windows-tabs-position-action" +msgid "_Bottom" +msgstr "底部(_B)" + +#: ../app/actions/windows-actions.c:146 +msgctxt "windows-tabs-position-action" +msgid "Position the tabs on the bottom" +msgstr "将标签页放置于底部" + +#: ../app/actions/windows-actions.c:150 +msgctxt "windows-tabs-position-action" +msgid "_Left" +msgstr "左侧(_L)" + +#: ../app/actions/windows-actions.c:151 +msgctxt "windows-tabs-position-action" +msgid "Position the tabs on the left" +msgstr "将标签页放置于左侧" + +#: ../app/actions/windows-actions.c:155 +msgctxt "windows-tabs-position-action" +msgid "_Right" +msgstr "右侧(_R)" + +#: ../app/actions/windows-actions.c:156 +msgctxt "windows-tabs-position-action" +msgid "Position the tabs on the right" +msgstr "将标签页放置于右侧" + +#: ../app/actions/windows-commands.c:183 msgid "" -"Unable to open swap file. GIMP has run out of memory and cannot use the swap " -"file. Some parts of your images may be corrupted. Try to save your work " -"using different filenames, restart GIMP and check the location of the swap " -"directory in your Preferences." -msgstr "" -"无法打开交换文件。GIMP 已经用尽内存并且无法使用交换文件。您的图像的某些部分可" -"能会被损坏。请尝试使用不同的文件名保存您的工作，重新启动 GIMP 并检查您的首选" -"项中交换目录的位置。" - -#: ../app/base/tile-swap.c:726 -#, c-format -msgid "Failed to resize swap file: %s" -msgstr "调整交换文件大小失败：%s" - -#: ../app/config/config-enums.c:24 -msgctxt "cursor-mode" -msgid "Tool icon" -msgstr "工具图标" +"The chosen recent dock contains a toolbox. Please close the currently open " +"toolbox and try again." +msgstr "选中的最近停靠包含有工具箱。请关闭当前打开的工具箱并重试。" #: ../app/config/config-enums.c:25 -msgctxt "cursor-mode" -msgid "Tool icon with crosshair" -msgstr "带交叉线的工具图标" - -#: ../app/config/config-enums.c:26 -msgctxt "cursor-mode" -msgid "Crosshair only" -msgstr "仅交叉线" - -#: ../app/config/config-enums.c:56 msgctxt "canvas-padding-mode" msgid "From theme" msgstr "取自主题" -#: ../app/config/config-enums.c:57 +#: ../app/config/config-enums.c:26 msgctxt "canvas-padding-mode" msgid "Light check color" msgstr "浅色方格的颜色" -#: ../app/config/config-enums.c:58 +#: ../app/config/config-enums.c:27 msgctxt "canvas-padding-mode" msgid "Dark check color" msgstr "深色方格的颜色" -#: ../app/config/config-enums.c:59 +#: ../app/config/config-enums.c:28 msgctxt "canvas-padding-mode" msgid "Custom color" msgstr "自定义颜色" -#: ../app/config/config-enums.c:88 -msgctxt "space-bar-action" -msgid "No action" -msgstr "无动作" - -#: ../app/config/config-enums.c:89 -msgctxt "space-bar-action" -msgid "Pan view" -msgstr "平移视图" - -#: ../app/config/config-enums.c:90 -msgctxt "space-bar-action" -msgid "Switch to Move tool" -msgstr "切换到移动工具" - -#: ../app/config/config-enums.c:118 -msgctxt "zoom-quality" -msgid "Low" -msgstr "低" - -#: ../app/config/config-enums.c:119 -msgctxt "zoom-quality" -msgid "High" -msgstr "高" - -#: ../app/config/config-enums.c:147 -msgctxt "help-browser-type" -msgid "GIMP help browser" -msgstr "GIMP 帮助浏览器" - -#: ../app/config/config-enums.c:148 -msgctxt "help-browser-type" -msgid "Web browser" -msgstr "Web 浏览器" - -#: ../app/config/config-enums.c:177 -msgctxt "window-hint" -msgid "Normal window" -msgstr "普通窗口" - -#: ../app/config/config-enums.c:178 -msgctxt "window-hint" -msgid "Utility window" -msgstr "工具窗口" - -#: ../app/config/config-enums.c:179 -msgctxt "window-hint" -msgid "Keep above" -msgstr "保持在上方" - -#: ../app/config/config-enums.c:207 +#: ../app/config/config-enums.c:56 msgctxt "cursor-format" msgid "Black & white" msgstr "黑白" -#: ../app/config/config-enums.c:208 +#: ../app/config/config-enums.c:57 msgctxt "cursor-format" msgid "Fancy" msgstr "漂亮" -#: ../app/config/config-enums.c:236 +#: ../app/config/config-enums.c:86 +msgctxt "cursor-mode" +msgid "Tool icon" +msgstr "工具图标" + +#: ../app/config/config-enums.c:87 +msgctxt "cursor-mode" +msgid "Tool icon with crosshair" +msgstr "带交叉线的工具图标" + +#: ../app/config/config-enums.c:88 +msgctxt "cursor-mode" +msgid "Crosshair only" +msgstr "仅交叉线" + +#: ../app/config/config-enums.c:116 msgctxt "handedness" msgid "Left-handed" -msgstr "" +msgstr "左利手" -#: ../app/config/config-enums.c:237 +#: ../app/config/config-enums.c:117 msgctxt "handedness" msgid "Right-handed" -msgstr "" +msgstr "右利手" -#: ../app/config/gimpconfig-file.c:67 ../app/core/gimpbrushgenerated-save.c:60 -#: ../app/core/gimpcurve-save.c:52 ../app/core/gimpgradient-save.c:50 -#: ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:57 -#: ../app/gui/themes.c:243 ../app/tools/gimpcurvestool.c:653 -#: ../app/tools/gimplevelstool.c:723 ../app/vectors/gimpvectors-export.c:81 -#: ../app/xcf/xcf.c:423 +#: ../app/config/config-enums.c:145 +msgctxt "help-browser-type" +msgid "GIMP help browser" +msgstr "GIMP 帮助浏览器" + +#: ../app/config/config-enums.c:146 +msgctxt "help-browser-type" +msgid "Web browser" +msgstr "网络浏览器" + +#: ../app/config/config-enums.c:178 +msgctxt "icon-size" +msgid "Guess ideal size" +msgstr "智能大小" + +#: ../app/config/config-enums.c:179 +msgctxt "icon-size" +msgid "Theme-set size" +msgstr "主题设置大小" + +#: ../app/config/config-enums.c:180 +msgctxt "icon-size" +msgid "Small size" +msgstr "小" + +#: ../app/config/config-enums.c:181 +msgctxt "icon-size" +msgid "Medium size" +msgstr "中" + +#: ../app/config/config-enums.c:182 +msgctxt "icon-size" +msgid "Large size" +msgstr "大" + +#: ../app/config/config-enums.c:183 +msgctxt "icon-size" +msgid "Huge size" +msgstr "巨大" + +#: ../app/config/config-enums.c:213 +msgctxt "position" +msgid "Top" +msgstr "顶层" + +#: ../app/config/config-enums.c:214 +msgctxt "position" +msgid "Bottom" +msgstr "底层" + +#: ../app/config/config-enums.c:215 +msgctxt "position" +msgid "Left" +msgstr "左" + +#: ../app/config/config-enums.c:216 +msgctxt "position" +msgid "Right" +msgstr "右" + +#: ../app/config/config-enums.c:245 +msgctxt "space-bar-action" +msgid "No action" +msgstr "无动作" + +#: ../app/config/config-enums.c:246 +msgctxt "space-bar-action" +msgid "Pan view" +msgstr "平移视图" + +#: ../app/config/config-enums.c:247 +msgctxt "space-bar-action" +msgid "Switch to Move tool" +msgstr "切换到移动工具" + +#: ../app/config/config-enums.c:276 +msgctxt "window-hint" +msgid "Normal window" +msgstr "普通窗口" + +#: ../app/config/config-enums.c:277 +msgctxt "window-hint" +msgid "Utility window" +msgstr "多用途窗口" + +#: ../app/config/config-enums.c:278 +msgctxt "window-hint" +msgid "Keep above" +msgstr "保持在上方" + +#: ../app/config/config-enums.c:306 +msgctxt "zoom-quality" +msgid "Low" +msgstr "低" + +#: ../app/config/config-enums.c:307 +msgctxt "zoom-quality" +msgid "High" +msgstr "高" + +#: ../app/config/gimpconfig-file.c:82 #, c-format msgid "Could not open '%s' for writing: %s" msgstr "无法打开“%s”并写入：%s" -#: ../app/config/gimpconfig-file.c:78 ../app/config/gimpconfig-file.c:101 +#: ../app/config/gimpconfig-file.c:116 +#, c-format +msgid "Error parsing '%%s': line longer than %s characters." +msgstr "解析“%%s”时出错：线段长度长于 %s 个字符。" + +#: ../app/config/gimpconfig-file.c:152 ../app/config/gimpconfig-file.c:196 +#: ../app/core/gimp-tags.c:144 ../app/gui/themes.c:344 +#: ../app/tools/gimpfiltertool-settings.c:227 #, c-format msgid "Error writing '%s': %s" -msgstr "写入“%s”出错：%s" +msgstr "写入“%s”时出错：%s" -#: ../app/config/gimpconfig-file.c:89 +#: ../app/config/gimpconfig-file.c:182 ../app/plug-in/gimpenvirontable.c:369 +#: ../app/plug-in/gimpinterpreterdb.c:267 +#: ../app/tools/gimpfiltertool-settings.c:182 #, c-format msgid "Error reading '%s': %s" msgstr "读取“%s”时出错：%s" -#: ../app/config/gimpconfig-file.c:131 +#: ../app/config/gimpconfig-file.c:232 #, c-format msgid "" "There was an error parsing your '%s' file. Default values will be used. A " "backup of your configuration has been created at '%s'." msgstr "解析您的“%s”文件时出错。默认值将被使用。您的配置文件已被备份在“%s”。" +#: ../app/config/gimpdialogconfig.c:307 ../app/core/gimplayer.c:440 +msgid "Layer" +msgstr "图层" + +#: ../app/config/gimpdialogconfig.c:407 ../app/core/gimpchannel.c:269 +#: ../app/operations/gimpcurvesconfig.c:111 +#: ../app/operations/gimplevelsconfig.c:114 +#: ../app/operations/gimpoperationthreshold.c:89 +#: ../app/widgets/gimpchanneltreeview.c:332 +msgid "Channel" +msgstr "通道" + +#: ../app/config/gimpdialogconfig.c:422 ../app/vectors/gimpvectors.c:223 +#: ../app/widgets/gimpvectorstreeview.c:250 +msgid "Path" +msgstr "路径" + #. Not all strings defined here are used in the user interface #. * (the preferences dialog mainly) and only those that are should #. * be marked for translation. @@ -5984,12 +10131,12 @@ msgid "" "receives the focus. This is useful for window managers using \"click to focus" "\"." msgstr "" -"如果启用，当对应的图像窗口获得焦点时，图像将成为活动图像。这对使用“点击获取焦" +"当启用时，当对应的图像窗口获得焦点时，图像将成为活动图像。这对使用“单击获取焦" "点”的窗口管理器有用。" #: ../app/config/gimprc-blurbs.h:23 ../app/config/gimprc-blurbs.h:28 msgid "Sets the dynamics search path." -msgstr "设置动态的搜索路径" +msgstr "设置动态搜索路径。" #: ../app/config/gimprc-blurbs.h:33 msgid "" @@ -5999,41 +10146,37 @@ msgstr "设置画布使用的衬垫颜色，如果衬垫模式设为自定义颜 #: ../app/config/gimprc-blurbs.h:37 msgid "Specifies how the area around the image should be drawn." -msgstr "指定如何去画图像四周的区域。" +msgstr "指定显示图像四周的区域的方式。" #: ../app/config/gimprc-blurbs.h:43 msgid "How to handle embedded color profiles when opening a file." msgstr "在打开文件时如何处理内嵌的色彩配置文件。" #: ../app/config/gimprc-blurbs.h:46 -msgid "Ask for confirmation before closing an image without saving." -msgstr "关闭未保存的图像前先进行确认。" +msgid "Sets the default folder path for all color profile file dialogs." +msgstr "为所有色彩配置文件对话框设置默认文件夹路径。" #: ../app/config/gimprc-blurbs.h:49 -msgid "Sets the pixel format to use for mouse pointers." -msgstr "设定鼠标指针所使用的像素格式。" - -#: ../app/config/gimprc-blurbs.h:52 msgid "Sets the type of mouse pointers to use." msgstr "设定所使用的鼠标指针类型。" -#: ../app/config/gimprc-blurbs.h:55 +#: ../app/config/gimprc-blurbs.h:52 msgid "Sets the handedness for cursor positioning." -msgstr "" +msgstr "设定使用右手或左手鼠标指针。" -#: ../app/config/gimprc-blurbs.h:58 +#: ../app/config/gimprc-blurbs.h:55 msgid "" "Context-dependent mouse pointers are helpful. They are enabled by default. " "However, they require overhead that you may want to do without." msgstr "" -"环境相关的鼠标指针很有用。它们默认是启用的。但是，它们也需要一定的负荷，这点" -"可能您并不想要。" +"环境相关的鼠标指针很有用。它们默认是启用的。但是它们也需要一定的系统负荷，这" +"点可能您并不想要。" -#: ../app/config/gimprc-blurbs.h:74 +#: ../app/config/gimprc-blurbs.h:71 msgid "" "When enabled, this will ensure that each pixel of an image gets mapped to a " "pixel on the screen." -msgstr "如果启用，将确保图像的每个点都对应屏幕上的一个像素。" +msgstr "当启用时，将确保图像的每个点都对应屏幕上的一个像素。" #: ../app/config/gimprc-blurbs.h:96 msgid "This is the distance in pixels where Guide and Grid snapping activates." @@ -6057,269 +10200,341 @@ msgid "" "This may affect the way your window manager decorates and handles these " "windows." msgstr "" -"停靠式窗口以及工具窗口的窗口类型提示设置。这将影响您的窗口管理器装饰和处理停" -"靠式窗口的行为。" +"停靠式窗口以及工具窗口的窗口类型提示设置。这可能会影响您的窗口管理器装饰和处" +"理这些窗口的方式。" + +#: ../app/config/gimprc-blurbs.h:145 +msgid "When enabled, the selected brush will be used for all tools." +msgstr "当启用时，所有的工具都将使用选中的笔刷。" + +#: ../app/config/gimprc-blurbs.h:148 +msgid "When enabled, the selected dynamics will be used for all tools." +msgstr "当启用时，所有的工具都将使用选中的动态。" + +#: ../app/config/gimprc-blurbs.h:154 +msgid "When enabled, the selected gradient will be used for all tools." +msgstr "当启用时，所有的工具都将使用选中的渐变。" #: ../app/config/gimprc-blurbs.h:157 -msgid "When enabled, the selected brush will be used for all tools." -msgstr "如果启用，所有的工具都将使用选中的画笔。" - -#: ../app/config/gimprc-blurbs.h:160 -msgid "When enabled, the selected dynamics will be used for all tools." -msgstr "如果启用，所有的工具都将使用选中的动态。" - -#: ../app/config/gimprc-blurbs.h:166 -msgid "When enabled, the selected gradient will be used for all tools." -msgstr "如果启用，所有的工具都将使用选中的渐变。" - -#: ../app/config/gimprc-blurbs.h:169 msgid "When enabled, the selected pattern will be used for all tools." -msgstr "如果启用，所有的工具都将使用选中的图案。" +msgstr "当启用时，所有的工具都将使用选中的图案。" -#: ../app/config/gimprc-blurbs.h:183 +#: ../app/config/gimprc-blurbs.h:171 msgid "Sets the browser used by the help system." -msgstr "设置帮助系统所使用的浏览器。" +msgstr "设置帮助系统使用的浏览器。" + +#: ../app/config/gimprc-blurbs.h:179 +msgid "How many recent settings to keep around in filter tools." +msgstr "在滤镜工具中保留多少最近设置。" + +#: ../app/config/gimprc-blurbs.h:182 +msgid "Default to the last used settings in filter tools." +msgstr "在滤镜工具中默认为上次使用的设置。" + +#: ../app/config/gimprc-blurbs.h:185 +msgid "Show advanced color options in filter tools." +msgstr "在滤镜工具中显示高级色彩选项。" + +#: ../app/config/gimprc-blurbs.h:188 +msgid "Sets the text to appear in image window status bars." +msgstr "设置图像窗口状态栏显示的文字。" + +#: ../app/config/gimprc-blurbs.h:191 +msgid "Sets the text to appear in image window titles." +msgstr "设置图像窗口标题栏显示的文字。" #: ../app/config/gimprc-blurbs.h:194 -msgid "Sets the text to appear in image window status bars." -msgstr "设置图像窗口状态栏所显示的文字。" +msgid "" +"Promote imported images to floating point precision. Does not apply to " +"indexed images." +msgstr "将导入的图像提升为浮点精度。不能应用于索引图像。" -#: ../app/config/gimprc-blurbs.h:197 -msgid "Sets the text to appear in image window titles." -msgstr "设置图像窗口标题所显示的文字。" +#: ../app/config/gimprc-blurbs.h:198 +msgid "" +"When promoting imported images to floating point precision, also add minimal " +"noise in order to distribute color values a bit." +msgstr "" +"将导入的图像提升为浮点精度时，为了使色彩数值分散一点同时添加最少量的噪点。" -#: ../app/config/gimprc-blurbs.h:200 +#: ../app/config/gimprc-blurbs.h:202 +msgid "Add an alpha channel to all layers of imported images." +msgstr "为导入图像的所有图层添加一个透明通道。" + +#: ../app/config/gimprc-blurbs.h:205 +msgid "Which plug-in to use for importing raw digital camera files." +msgstr "使用哪个插件导入 raw 数码相机文件。" + +#: ../app/config/gimprc-blurbs.h:208 +msgid "Export Exif metadata by default." +msgstr "默认导出 Exif 元数据。" + +#: ../app/config/gimprc-blurbs.h:211 +msgid "Export XMP metadata by default." +msgstr "默认导出 XMP 元数据。" + +#: ../app/config/gimprc-blurbs.h:214 +msgid "Export IPTC metadata by default." +msgstr "默认导出 IPTC 元数据。" + +#: ../app/config/gimprc-blurbs.h:217 +msgid "Try generating debug data for bug reporting when appropriate." +msgstr "合适时尝试为缺陷报告生成调试数据。" + +#: ../app/config/gimprc-blurbs.h:220 msgid "" "When enabled, this will ensure that the full image is visible after a file " "is opened, otherwise it will be displayed with a scale of 1:1." -msgstr "如果启用，将确保打开文件以后图像完整可见，否则将按 1:1 的比例来显示。" +msgstr "当启用时，将确保打开文件以后图像完整可见，否则将按 1:1 的比例来显示。" -#: ../app/config/gimprc-blurbs.h:204 +#: ../app/config/gimprc-blurbs.h:224 msgid "" "Sets the level of interpolation used for scaling and other transformations." -msgstr "设置插值计算的等级，用于缩放和其它变换操作。" +msgstr "设置用于缩放和其他变换操作的插值计算的等级。" -#: ../app/config/gimprc-blurbs.h:211 +#: ../app/config/gimprc-blurbs.h:231 msgid "Specifies the language to use for the user interface." -msgstr "为用户界面指定使用的语言。" +msgstr "指定用户界面使用的语言。" -#: ../app/config/gimprc-blurbs.h:214 +#: ../app/config/gimprc-blurbs.h:234 msgid "How many recently opened image filenames to keep on the File menu." -msgstr "在文件菜单中保留多少个最近打开图像的文件名。" +msgstr "在文件菜单中保留的最近打开图像的文件数。" -#: ../app/config/gimprc-blurbs.h:217 +#: ../app/config/gimprc-blurbs.h:237 msgid "" "Speed of marching ants in the selection outline. This value is in " "milliseconds (less time indicates faster marching)." -msgstr "选区轮廓蚂蚁线的速度。该值以毫秒(时间越短速度越快)为单位。" +msgstr "选区轮廓蚂蚁线的循环速度。该值以毫秒(时间越短速度越快)为单位。" -#: ../app/config/gimprc-blurbs.h:221 +#: ../app/config/gimprc-blurbs.h:241 msgid "" "GIMP will warn the user if an attempt is made to create an image that would " "take more memory than the size specified here." msgstr "" -"如果试图创建一幅所需内存比此处指定的大小还要大的图像，GIMP 将警告用户。" +"如果试图创建一幅所需内存比此处指定的数值还要大的图像，GIMP 将警告用户。" -#: ../app/config/gimprc-blurbs.h:231 +#: ../app/config/gimprc-blurbs.h:251 msgid "" "Sets the monitor's horizontal resolution, in dots per inch. If set to 0, " "forces the X server to be queried for both horizontal and vertical " "resolution information." msgstr "" -"设置监视器的水平分辨率，以每英寸的点数为单位。如果设置为 0 则强制向 X 服务器" -"查询水平和垂直分辨率信息。" +"设置显示器的水平分辨率，以每英寸的点数为单位。如果设为 0 则强制向 X 服务器" +"查询水平和竖直分辨率信息。" -#: ../app/config/gimprc-blurbs.h:236 +#: ../app/config/gimprc-blurbs.h:256 msgid "" "Sets the monitor's vertical resolution, in dots per inch. If set to 0, " "forces the X server to be queried for both horizontal and vertical " "resolution information." msgstr "" -"设置监视器的垂直分辨率，以每英寸的点数为单位。如果设置为 0 则强制向 X 服务器" -"查询水平和垂直分辨率信息。" +"设置显示器的竖直分辨率，以每英寸的点数为单位。如果设为 0 则强制向 X 服务器" +"查询水平和竖直分辨率信息。" -#: ../app/config/gimprc-blurbs.h:241 +#: ../app/config/gimprc-blurbs.h:261 msgid "" "If enabled, the move tool sets the edited layer or path as active. This " "used to be the default behaviour in older versions." msgstr "" -"如果启用，移动工具会将被编辑的图层或路径设置为活动的。在旧的版本中，这是默认" -"的行为。" +"当启用时，移动工具会将被编辑的图层或路径设为活动的。在旧版本中这曾是默认行" +"为。" -#: ../app/config/gimprc-blurbs.h:245 +#: ../app/config/gimprc-blurbs.h:270 msgid "" "Sets the size of the navigation preview available in the lower right corner " "of the image window." msgstr "设置图像窗口右下角的导航预览的大小。" -#: ../app/config/gimprc-blurbs.h:249 -msgid "Sets how many processors GIMP should try to use simultaneously." -msgstr "设置 GIMP 将试图同时使用多少个处理器。" +#: ../app/config/gimprc-blurbs.h:274 +msgid "Sets how many threads GIMP should use for operations that support it." +msgstr "对支持多线程的操作设置 GIMP 应该使用多少个线程。" -#: ../app/config/gimprc-blurbs.h:262 -msgid "" -"When enabled, the X server is queried for the mouse's current position on " -"each motion event, rather than relying on the position hint. This means " -"painting with large brushes should be more accurate, but it may be slower. " -"Conversely, on some X servers enabling this option results in faster " -"painting." -msgstr "" -"如果启用，每次移动鼠标的时候都将向 X 服务器查询当前的鼠标位置，而不是依赖于位" -"置提示。这意味着用大的画笔涂画的时候将更加精确，不过可能也更慢。与此相反，在" -"某些 X 服务器上启用该选项将会加快涂画速度。" - -#: ../app/config/gimprc-blurbs.h:278 +#: ../app/config/gimprc-blurbs.h:296 msgid "" "Sets whether GIMP should create previews of layers and channels. Previews in " "the layers and channels dialog are nice to have but they can slow things " "down when working with large images." msgstr "" -"指定 GIMP 是否应该创建图层和通道的预览。在图层和通道对话框中显示预览是不错" -"的，但是当图像很大的时候将会使速度变慢。" - -#: ../app/config/gimprc-blurbs.h:283 -msgid "" -"Sets the preview size used for layers and channel previews in newly created " -"dialogs." -msgstr "设置新创建的对话框中图层和通道的预览大小。" - -#: ../app/config/gimprc-blurbs.h:287 -msgid "Sets the default quick mask color." -msgstr "" - -#: ../app/config/gimprc-blurbs.h:290 -msgid "" -"When enabled, the image window will automatically resize itself whenever the " -"physical image size changes." -msgstr "如果启用，当图像实际大小发生变化时，图像窗口大小将自动重置。" - -#: ../app/config/gimprc-blurbs.h:294 -msgid "" -"When enabled, the image window will automatically resize itself when zooming " -"into and out of images." -msgstr "如果启用，当放大或缩小查看图像时，图像窗口大小将自动重置。" - -#: ../app/config/gimprc-blurbs.h:298 -msgid "Let GIMP try to restore your last saved session on each startup." -msgstr "每次启动时让 GIMP 尝试恢复您上次保存的会话。" +"指定 GIMP 是否应该创建图层和通道的预览。在图层和通道对话框中显示预览有利于工" +"作效率，但图像很大时将会降低性能。" #: ../app/config/gimprc-blurbs.h:301 msgid "" -"Remember the current tool, pattern, color, and brush across GIMP sessions." -msgstr "在多个 GIMP 会话间记住当前的工具、图案、颜色和画笔。" +"Sets the preview size used for layers and channel previews in newly created " +"dialogs." +msgstr "设置新建对话框中图层和通道的预览大小。" #: ../app/config/gimprc-blurbs.h:305 +msgid "Sets the default quick mask color." +msgstr "设置默认的快速蒙板颜色。" + +#: ../app/config/gimprc-blurbs.h:308 +msgid "" +"When enabled, the image window will automatically resize itself whenever the " +"physical image size changes. This setting only takes effect in multi-window " +"mode." +msgstr "" +"当启用时，每次图像实际大小发生变化时，图像窗口大小都将自动改变(仅多窗口模式" +"有效)。" + +#: ../app/config/gimprc-blurbs.h:313 +msgid "" +"When enabled, the image window will automatically resize itself when zooming " +"into and out of images. This setting only takes effect in multi-window mode." +msgstr "" +"当启用时，每次缩放图像时，图像窗口大小都将自动改变(仅多窗口模式有效)。" + +#: ../app/config/gimprc-blurbs.h:318 +msgid "Let GIMP try to restore your last saved session on each startup." +msgstr "每次启动时让 GIMP 尝试恢复您上次保存的会话。" + +#: ../app/config/gimprc-blurbs.h:321 +msgid "" +"When enabled, GIMP will try to restore windows on the monitor they were open " +"before. When disabled, windows will appear on the currently used monitor." +msgstr "" +"当启用时，GIMP 将尝试在各个显示器上恢复之前打开的窗口。当禁用时，这些窗口将恢" +"复到当前使用的显示器上。" + +#: ../app/config/gimprc-blurbs.h:326 +msgid "" +"Remember the current tool, pattern, color, and brush across GIMP sessions." +msgstr "在多个 GIMP 会话间共享当前的工具、图案、颜色和笔刷设置。" + +#: ../app/config/gimprc-blurbs.h:330 +msgid "" +"When enabled, the same tool and tool options will be used for all input " +"devices. No tool switching will occur when the input device changes." +msgstr "" +"启用时，所有输入设备将使用同样的工具和工具选项。当输入设备改变时不会发生工具" +"切换。" + +#: ../app/config/gimprc-blurbs.h:335 msgid "" "Keep a permanent record of all opened and saved files in the Recent " "Documents list." -msgstr "将全部打开和保存的文件添加到磁盘上的文档历史记录。" +msgstr "为最近文档列表中的全部打开和保存过的文件保存一份永久记录。" -#: ../app/config/gimprc-blurbs.h:309 +#: ../app/config/gimprc-blurbs.h:339 msgid "Save the positions and sizes of the main dialogs when GIMP exits." -msgstr "GIMP 退出时保存主要的对话框的位置和大小。" +msgstr "GIMP 退出时保存主要对话框的位置和大小。" -#: ../app/config/gimprc-blurbs.h:312 +#: ../app/config/gimprc-blurbs.h:342 msgid "Save the tool options when GIMP exits." msgstr "GIMP 退出时保存工具选项。" -#: ../app/config/gimprc-blurbs.h:318 +#: ../app/config/gimprc-blurbs.h:348 msgid "" "When enabled, all paint tools will show a preview of the current brush's " "outline." -msgstr "如果启用，所有涂画工具都将显示当前画笔的轮廓预览。" +msgstr "当启用时，所有绘画工具都将显示当前笔刷的轮廓预览。" -#: ../app/config/gimprc-blurbs.h:322 +#: ../app/config/gimprc-blurbs.h:352 msgid "" "When enabled, dialogs will show a help button that gives access to the " "related help page. Without this button, the help page can still be reached " "by pressing F1." msgstr "" -"如果启用，对话框中将显示一个到达相关帮助页面的按钮。如果没有这个按钮，仍然可" -"以按 F1 打开帮助页面。" +"当启用时，对话框中将显示一个可以访问相关帮助的帮助按钮。如果没有这个按钮，仍" +"然可以按 F1 打开帮助页面。" -#: ../app/config/gimprc-blurbs.h:327 +#: ../app/config/gimprc-blurbs.h:357 msgid "" "When enabled, the mouse pointer will be shown over the image while using a " "paint tool." -msgstr "如果启用，当使用涂画工具时，鼠标指针将显示在图像上方。" +msgstr "当启用时，使用绘画工具时，鼠标指针将显示在图像上方。" -#: ../app/config/gimprc-blurbs.h:331 +#: ../app/config/gimprc-blurbs.h:361 msgid "" "When enabled, the menubar is visible by default. This can also be toggled " "with the \"View->Show Menubar\" command." -msgstr "" -"如果启用，菜单栏将默认可见。这也可以通过“查看->显示菜单栏”命令进行切换。" +msgstr "当启用时，菜单栏将默认可见。这也可以通过“视图->显示菜单栏”命令切换。" -#: ../app/config/gimprc-blurbs.h:335 +#: ../app/config/gimprc-blurbs.h:365 msgid "" "When enabled, the rulers are visible by default. This can also be toggled " "with the \"View->Show Rulers\" command." -msgstr "如果启用，标尺将默认可见。这也可以通过“查看->显示标尺”命令进行切换。" +msgstr "当启用时，标尺将默认可见。这也可以通过“视图->显示标尺”命令切换。" -#: ../app/config/gimprc-blurbs.h:339 +#: ../app/config/gimprc-blurbs.h:369 msgid "" "When enabled, the scrollbars are visible by default. This can also be " "toggled with the \"View->Show Scrollbars\" command." -msgstr "" -"如果启用，滚动条将默认可见。这也可以通过“查看->显示滚动条”命令进行切换。" +msgstr "当启用时，滚动条将默认可见。这也可以通过“视图->显示滚动条”命令切换。" -#: ../app/config/gimprc-blurbs.h:343 +#: ../app/config/gimprc-blurbs.h:373 msgid "" "When enabled, the statusbar is visible by default. This can also be toggled " "with the \"View->Show Statusbar\" command." -msgstr "" -"如果启用，状态栏将默认可见。这也可以通过“查看->显示状态栏”命令进行切换。" +msgstr "当启用时，状态栏将默认可见。这也可以通过“视图->显示状态栏”命令切换。" -#: ../app/config/gimprc-blurbs.h:347 +#: ../app/config/gimprc-blurbs.h:377 msgid "" "When enabled, the selection is visible by default. This can also be toggled " "with the \"View->Show Selection\" command." -msgstr "如果启用，选区将默认可见。这也可以通过“查看->显示选区”命令进行切换。" +msgstr "当启用时，选区将默认可见。这也可以通过“视图->显示选区”命令切换。" -#: ../app/config/gimprc-blurbs.h:351 +#: ../app/config/gimprc-blurbs.h:381 msgid "" "When enabled, the layer boundary is visible by default. This can also be " "toggled with the \"View->Show Layer Boundary\" command." msgstr "" -"如果启用，图层边界将默认可见。这也可以通过“查看->显示图层边界”命令进行切换。" +"当启用时，图层边界将默认可见。这也可以通过“视图->显示图层边界”命令切换。" -#: ../app/config/gimprc-blurbs.h:355 +#: ../app/config/gimprc-blurbs.h:385 msgid "" "When enabled, the guides are visible by default. This can also be toggled " "with the \"View->Show Guides\" command." -msgstr "" -"如果启用，参考线将默认可见。这也可以通过“查看->显示参考线”命令进行切换。" +msgstr "当启用时，参考线将默认可见。这也可以通过“视图->显示参考线”命令切换。" -#: ../app/config/gimprc-blurbs.h:359 +#: ../app/config/gimprc-blurbs.h:389 msgid "" "When enabled, the grid is visible by default. This can also be toggled with " "the \"View->Show Grid\" command." -msgstr "如果启用，网格将默认可见。这也可以通过“查看->显示网格”命令进行切换。" +msgstr "当启用时，网格将默认可见。这也可以通过“视图->显示网格”命令切换。" -#: ../app/config/gimprc-blurbs.h:363 +#: ../app/config/gimprc-blurbs.h:393 msgid "" "When enabled, the sample points are visible by default. This can also be " "toggled with the \"View->Show Sample Points\" command." -msgstr "" -"如果启用，采样点将默认可见。这也可以通过“查看->显示采样点”命令进行切换。" +msgstr "当启用时，采样点将默认可见。这也可以通过“视图->显示采样点”命令切换。" -#: ../app/config/gimprc-blurbs.h:367 +#: ../app/config/gimprc-blurbs.h:397 msgid "Show a tooltip when the pointer hovers over an item." msgstr "当指针悬停在项目上时显示工具提示。" -#: ../app/config/gimprc-blurbs.h:370 +#: ../app/config/gimprc-blurbs.h:400 msgid "Use GIMP in a single-window mode." -msgstr "在单窗口模式中使用 GIMP。" +msgstr "以单窗口模式使用 GIMP。" -#: ../app/config/gimprc-blurbs.h:373 +#: ../app/config/gimprc-blurbs.h:403 msgid "Hide docks and other windows, leaving only image windows." msgstr "隐藏停靠和其他窗口，仅留下图像窗口。" -#: ../app/config/gimprc-blurbs.h:376 +#: ../app/config/gimprc-blurbs.h:406 +msgid "Enable the N-Point Deformation tool." +msgstr "启用 N 点变换工具。" + +#: ../app/config/gimprc-blurbs.h:409 +msgid "Enable the Handle Transform tool." +msgstr "启用控制柄变换工具。" + +#: ../app/config/gimprc-blurbs.h:412 +msgid "Enable symmetry on painting." +msgstr "启用对称绘画。" + +#: ../app/config/gimprc-blurbs.h:415 +msgid "Enable the MyPaint Brush tool." +msgstr "启用 MyPaint 笔刷工具。" + +#: ../app/config/gimprc-blurbs.h:418 +msgid "Enable the Seamless Clone tool." +msgstr "启用无缝克隆工具。" + +#: ../app/config/gimprc-blurbs.h:421 msgid "What to do when the space bar is pressed in the image window." msgstr "当在图像窗口中空格键按下时的行为。" -#: ../app/config/gimprc-blurbs.h:379 +#: ../app/config/gimprc-blurbs.h:424 msgid "" "Sets the swap file location. GIMP uses a tile based memory allocation " "scheme. The swap file is used to quickly and easily swap tiles out to disk " @@ -6328,30 +10543,30 @@ msgid "" "file is created on a folder that is mounted over NFS. For these reasons, it " "may be desirable to put your swap file in \"/tmp\"." msgstr "" -"设置交换文件的位置。GIMP 使用基于平铺的内存分配机制。交换文件使得以平铺方式换" -"出换入磁盘非常方便快捷。需要注意的是，当 GIMP 处理大图像时，交换文件很快就能" -"变得很大。另外，如果交换文件所在目录是通过 NFS 加载的话，程序变得极为缓慢。由" -"于这些原因，最好是将您的交换文件放到“/tmp”目录。" +"设置交换文件的位置。GIMP 使用基于平铺的内存分配机制。交换文件用于快速方便地与" +"磁盘交换数据。需要注意的是，当 GIMP 处理大图像时，交换文件会很容易变得很大。" +"另外，如果交换文件所在目录通过 NFS 挂载，程序会变得极为缓慢。因此最好将交换文" +"件放在“/tmp”目录。" -#: ../app/config/gimprc-blurbs.h:388 +#: ../app/config/gimprc-blurbs.h:433 msgid "When enabled, menus can be torn off." -msgstr "如果启用，菜单可被撕下。" +msgstr "当启用时，菜单可被撕下。" -#: ../app/config/gimprc-blurbs.h:391 +#: ../app/config/gimprc-blurbs.h:436 msgid "" "When enabled, you can change keyboard shortcuts for menu items by hitting a " "key combination while the menu item is highlighted." -msgstr "如果启用，您只要按一个键盘组合就可以即时改变突出显示的菜单项的快捷键。" +msgstr "当启用时，您只要按一个按键组合就可以改变突出显示的菜单项的快捷键。" -#: ../app/config/gimprc-blurbs.h:395 +#: ../app/config/gimprc-blurbs.h:440 msgid "Save changed keyboard shortcuts when GIMP exits." msgstr "GIMP 退出时保存已改变的快捷键。" -#: ../app/config/gimprc-blurbs.h:398 +#: ../app/config/gimprc-blurbs.h:443 msgid "Restore saved keyboard shortcuts on each GIMP startup." msgstr "GIMP 启动时恢复已保存的快捷键。" -#: ../app/config/gimprc-blurbs.h:401 +#: ../app/config/gimprc-blurbs.h:446 msgid "" "Sets the folder for temporary storage. Files will appear here during the " "course of running GIMP. Most files will disappear when GIMP exits, but some " @@ -6362,81 +10577,278 @@ msgstr "" "出以后将消失，但是个别文件可能会留下来，因此最好不要把这个目录与别的用户共" "享。" -#: ../app/config/gimprc-blurbs.h:413 -msgid "Sets the size of the thumbnail shown in the Open dialog." -msgstr "设置打开对话框中缩略图的尺寸。" +#: ../app/config/gimprc-blurbs.h:467 +msgid "" +"Sets the default rendering intent for the 'Convert to Color Profile' dialog." +msgstr "为“转换到色彩配置文件”对话框设置默认渲染效果。" -#: ../app/config/gimprc-blurbs.h:416 +#: ../app/config/gimprc-blurbs.h:470 +msgid "" +"Sets the default 'Black Point Compensation' state for the 'Convert to Color " +"Profile' dialog." +msgstr "为“转换到色彩配置文件”对话框设置默认“黑点补偿”状态。" + +#: ../app/config/gimprc-blurbs.h:474 +msgid "" +"Sets the default layer dithering method for the 'Convert Precision' dialog." +msgstr "为“转换精度”对话框设置默认图层递色方式。" + +#: ../app/config/gimprc-blurbs.h:477 +msgid "" +"Sets the default text layer dithering method for the 'Convert Precision' " +"dialog." +msgstr "为“转换精度”对话框设置默认文字图层递色方式。" + +#: ../app/config/gimprc-blurbs.h:480 +msgid "" +"Sets the default channel dithering method for the 'Convert Precision' dialog." +msgstr "为“转换精度”对话框设置默认通道递色方式。" + +#: ../app/config/gimprc-blurbs.h:483 +msgid "Sets the default palette type for the 'Convert to Indexed' dialog." +msgstr "为“转换到索引”对话框设置默认色板类型。" + +#: ../app/config/gimprc-blurbs.h:486 +msgid "" +"Sets the default maximum number of colors for the 'Convert to Indexed' " +"dialog." +msgstr "为“转换到索引”对话框设置默认最大颜色数量。" + +#: ../app/config/gimprc-blurbs.h:489 +msgid "" +"Sets the default 'Remove duplicate colors' state for the 'Convert to " +"Indexed' dialog." +msgstr "为“转换到索引”对话框设置默认“移除重复颜色”状态。" + +#: ../app/config/gimprc-blurbs.h:492 +msgid "Sets the default dithering type for the 'Convert to Indexed' dialog." +msgstr "为“转换到索引”对话框设置默认递色类型。" + +#: ../app/config/gimprc-blurbs.h:495 +msgid "" +"Sets the default 'Dither alpha' state for the 'Convert to Indexed' dialog." +msgstr "为“转换到索引”对话框设置默认“递色透明”状态。" + +#: ../app/config/gimprc-blurbs.h:498 +msgid "" +"Sets the default 'Dither text layers' state for the 'Convert to Indexed' " +"dialog." +msgstr "为“转换到索引”对话框设置默认“递色文字图层”状态。" + +#: ../app/config/gimprc-blurbs.h:501 +msgid "Sets the default fill type for the 'Canvas Size' dialog." +msgstr "为“画布大小”对话框设置默认填充类型。" + +#: ../app/config/gimprc-blurbs.h:504 +msgid "Sets the default set of layers to resize for the 'Canvas Size' dialog." +msgstr "为“画布大小”对话框设置默认的图层缩放设定。" + +#: ../app/config/gimprc-blurbs.h:507 +msgid "" +"Sets the default 'Resize text layers' state for the 'Canvas Size' dialog." +msgstr "为“画布大小”对话框设置默认“缩放文字图层”状态。" + +#: ../app/config/gimprc-blurbs.h:510 +msgid "Sets the default layer name for the 'New Layer' dialog." +msgstr "为“新建图层”对话框设置默认图层名称。" + +#: ../app/config/gimprc-blurbs.h:513 +msgid "Sets the default mode for the 'New Layer' dialog." +msgstr "为“新建图层”对话框设置默认模式。" + +#: ../app/config/gimprc-blurbs.h:516 +msgid "Sets the default blend space for the 'New Layer' dialog." +msgstr "为“新建图层”对话框设置默认混合空间。" + +#: ../app/config/gimprc-blurbs.h:519 +msgid "Sets the default composite space for the 'New Layer' dialog." +msgstr "为“新建图层”对话框设置默认合成空间。" + +#: ../app/config/gimprc-blurbs.h:522 +msgid "Sets the default composite mode for the 'New Layer' dialog." +msgstr "为“新建图层”对话框设置默认合成模式。" + +#: ../app/config/gimprc-blurbs.h:525 +msgid "Sets the default opacity for the 'New Layer' dialog." +msgstr "为“新建图层”对话框设置默认不透明度。" + +#: ../app/config/gimprc-blurbs.h:528 +msgid "Sets the default fill type for the 'New Layer' dialog." +msgstr "为“新建图层”对话框设置默认填充类型。" + +#: ../app/config/gimprc-blurbs.h:531 +msgid "Sets the default fill type for the 'Layer Boundary Size' dialog." +msgstr "为“图层边界大小”对话框设置默认填充类型。" + +#: ../app/config/gimprc-blurbs.h:534 +msgid "Sets the default mask for the 'Add Layer Mask' dialog." +msgstr "为“添加图层蒙板”对话框设置默认蒙板。" + +#: ../app/config/gimprc-blurbs.h:537 +msgid "Sets the default 'invert mask' state for the 'Add Layer Mask' dialog." +msgstr "为“添加图层蒙板”对话框设置默认“反转蒙板”状态。" + +#: ../app/config/gimprc-blurbs.h:540 +msgid "Sets the default merge type for the 'Merge Visible Layers' dialog." +msgstr "为“合并可见图层”对话框设置默认合并类型。" + +#: ../app/config/gimprc-blurbs.h:543 +msgid "" +"Sets the default 'Active group only' for the 'Merge Visible Layers' dialog." +msgstr "为“合并可见图层”对话框设置默认“仅活动图层组”。" + +#: ../app/config/gimprc-blurbs.h:546 +msgid "" +"Sets the default 'Discard invisible' for the 'Merge Visible Layers' dialog." +msgstr "为“合并可见图层”对话框设置默认“丢弃不可见图层”。" + +#: ../app/config/gimprc-blurbs.h:549 +msgid "Sets the default channel name for the 'New Channel' dialog." +msgstr "为“新建通道”对话框设置默认通道名称。" + +#: ../app/config/gimprc-blurbs.h:552 +msgid "Sets the default color and opacity for the 'New Channel' dialog." +msgstr "为“新建通道”对话框设置默认颜色和不透明度。" + +#: ../app/config/gimprc-blurbs.h:555 +msgid "Sets the default path name for the 'New Path' dialog." +msgstr "为“新路径”对话框设置默认路径名称。" + +#: ../app/config/gimprc-blurbs.h:558 +msgid "Sets the default folder path for the 'Export Path' dialog." +msgstr "为“导出路径”对话框设置默认文件夹路径。" + +#: ../app/config/gimprc-blurbs.h:561 +msgid "" +"Sets the default 'Export the active path' state for the 'Export Path' dialog." +msgstr "为“导出路径”对话框设置默认“导出活动路径”状态。" + +#: ../app/config/gimprc-blurbs.h:564 +msgid "Sets the default folder path for the 'Import Path' dialog." +msgstr "为“导入路径”对话框设置默认文件夹路径。" + +#: ../app/config/gimprc-blurbs.h:567 +msgid "" +"Sets the default 'Merge imported paths' state for the 'Import Path' dialog." +msgstr "为“导入路径”对话框设置默认“合并导入的路径”状态。" + +#: ../app/config/gimprc-blurbs.h:570 +msgid "" +"Sets the default 'Scale imported paths to fit size' state for the 'Import " +"Path' dialog." +msgstr "为“导入路径”对话框设置默认“缩放导入的路径到适应大小”状态。" + +#: ../app/config/gimprc-blurbs.h:573 +msgid "Sets the default feather radius for the 'Feather Selection' dialog." +msgstr "为“羽化选区“对话框设置默认羽化半径。" + +#: ../app/config/gimprc-blurbs.h:576 +msgid "Sets the default grow radius for the 'Grow Selection' dialog." +msgstr "为”增大选区“对话框设置默认增大半径。" + +#: ../app/config/gimprc-blurbs.h:579 +msgid "Sets the default shrink radius for the 'Shrink Selection' dialog." +msgstr "为”收缩选区“对话框设置默认收缩半径。" + +#: ../app/config/gimprc-blurbs.h:582 +msgid "" +"Sets the default 'Selected areas continue outside the image' setting for the " +"'Shrink Selection' dialog." +msgstr "为“收缩选区”对话框设置默认“选中区域超出图像”配置。" + +#: ../app/config/gimprc-blurbs.h:586 +msgid "Sets the default border radius for the 'Border Selection' dialog." +msgstr "为“加边选区”对话框设置默认加边半径。" + +#: ../app/config/gimprc-blurbs.h:589 +msgid "" +"Sets the default 'Selected areas continue outside the image' setting for the " +"'Border Selection' dialog." +msgstr "为“加边选区”对话框设置默认“选中区域超出图像”配置。" + +#: ../app/config/gimprc-blurbs.h:593 +msgid "Sets the default border style for the 'Border Selection' dialog." +msgstr "为“加边选区”对话框设置默认加边样式。" + +#: ../app/config/gimprc-blurbs.h:602 +msgid "Sets the size of the thumbnail shown in the Open dialog." +msgstr "设置打开文件对话框中缩略图的大小。" + +#: ../app/config/gimprc-blurbs.h:605 msgid "" "The thumbnail in the Open dialog will be automatically updated if the file " "being previewed is smaller than the size set here." msgstr "如果预览的文件小于这里设置的大小，打开对话框中的缩略图将会自动更新。" -#: ../app/config/gimprc-blurbs.h:420 +#: ../app/config/gimprc-blurbs.h:609 msgid "" "When the amount of pixel data exceeds this limit, GIMP will start to swap " "tiles to disk. This is a lot slower but it makes it possible to work on " "images that wouldn't fit into memory otherwise. If you have a lot of RAM, " "you may want to set this to a higher value." msgstr "" -"当像素数据量超过限制时，GIMP 将开始交换数据到磁盘。这将使速度极大减慢但它却使" -"得处理无法装入内存的图像成为可能。如果您的内存很多，您可能希望设置一个更大的" -"值。" +"当像素数据量超过限制时，GIMP 将开始交换数据到磁盘。这将使速度极大减慢但却使处" +"理无法载入计算机内存(RAM)的超大图像成为可能。如果您的计算机内存(RAM)很" +"大，您可能希望设置一个更大的数值。" -#: ../app/config/gimprc-blurbs.h:426 +#: ../app/config/gimprc-blurbs.h:615 msgid "Show the current foreground and background colors in the toolbox." -msgstr "在工具箱中显示当前的前景色和背景色" +msgstr "在工具箱中显示当前的前景色和背景色。" -#: ../app/config/gimprc-blurbs.h:429 +#: ../app/config/gimprc-blurbs.h:618 msgid "Show the currently selected brush, pattern and gradient in the toolbox." -msgstr "在工具箱中显示活动画笔、图案和渐变" +msgstr "在工具箱中显示活动笔刷、图案和渐变。" -#: ../app/config/gimprc-blurbs.h:432 +#: ../app/config/gimprc-blurbs.h:621 msgid "Show the currently active image in the toolbox." -msgstr "在工具箱中显示当前活动的图像" +msgstr "在工具箱中显示当前活动的图像。" -#: ../app/config/gimprc-blurbs.h:438 +#: ../app/config/gimprc-blurbs.h:627 msgid "Sets the manner in which transparency is displayed in images." msgstr "设置图像中透明部分的显示方式。" -#: ../app/config/gimprc-blurbs.h:441 +#: ../app/config/gimprc-blurbs.h:630 msgid "Sets the size of the checkerboard used to display transparency." msgstr "设置用于表示透明的棋盘格子的大小。" -#: ../app/config/gimprc-blurbs.h:444 +#: ../app/config/gimprc-blurbs.h:633 msgid "" "When enabled, GIMP will not save an image if it has not been changed since " "it was opened." -msgstr "如果启用，如果图像自打开以来没有被修改，GIMP 将不会保存。" +msgstr "当启用时，如果图像自打开以来没有被修改，GIMP 将不会保存。" -#: ../app/config/gimprc-blurbs.h:448 +#: ../app/config/gimprc-blurbs.h:637 msgid "" "Sets the minimal number of operations that can be undone. More undo levels " "are kept available until the undo-size limit is reached." msgstr "" -"设置允许撤消的操作的最小数目。只要还没有达到撤消大小的限制，就可已保存更多的" -"撤消操作。" +"设置允许撤消操作的最小次数。只要还没有达到撤消次数的限制，就可以保存更多的撤" +"消操作。" -#: ../app/config/gimprc-blurbs.h:452 +#: ../app/config/gimprc-blurbs.h:641 msgid "" "Sets an upper limit to the memory that is used per image to keep operations " "on the undo stack. Regardless of this setting, at least as many undo-levels " "as configured can be undone." msgstr "" -"设置每幅图像用于保存撤消堆栈中的操作的内存上限。与此设置无关，撤消操作至少可" -"以达到指定的撤消次数。" +"设置每幅图像撤销历史中用于保存撤消操作的内存上限。与此设置无关，撤消操作至少" +"可以达到指定的撤消次数。" -#: ../app/config/gimprc-blurbs.h:457 +#: ../app/config/gimprc-blurbs.h:646 msgid "Sets the size of the previews in the Undo History." -msgstr "设置撤消历史的预览大小。" +msgstr "设置撤销历史的预览大小。" -#: ../app/config/gimprc-blurbs.h:460 +#: ../app/config/gimprc-blurbs.h:649 msgid "When enabled, pressing F1 will open the help browser." -msgstr "如果启用，按 F1 将打开帮助浏览器。" +msgstr "当启用时，按 F1 将打开帮助浏览器。" -#: ../app/config/gimprc-deserialize.c:136 ../app/core/gimp-modules.c:133 -#: ../app/core/gimp-units.c:167 ../app/gui/session.c:286 -#: ../app/plug-in/plug-in-rc.c:212 +#: ../app/config/gimprc-blurbs.h:652 +msgid "When enabled, uses OpenCL for some operations." +msgstr "当启用时，将在某些操作时使用 OpenCL。" + +#: ../app/config/gimprc-deserialize.c:136 ../app/core/gimp-modules.c:131 +#: ../app/core/gimp-units.c:278 ../app/gui/session.c:293 +#: ../app/plug-in/plug-in-rc.c:245 msgid "fatal parse error" msgstr "严重解析错误" @@ -6453,1191 +10865,1252 @@ msgstr "无" #: ../app/core/core-enums.c:90 msgctxt "convert-dither-type" msgid "Floyd-Steinberg (normal)" -msgstr "Floyd-Steinberg (普通)" +msgstr "弗洛伊德-斯坦伯格算法(正常)" #: ../app/core/core-enums.c:91 msgctxt "convert-dither-type" msgid "Floyd-Steinberg (reduced color bleeding)" -msgstr "Floyd-Steinberg (减少颜色损失)" +msgstr "弗洛伊德-斯坦伯格算法(减少渗色)" #: ../app/core/core-enums.c:92 msgctxt "convert-dither-type" msgid "Positioned" msgstr "定位" -#: ../app/core/core-enums.c:122 -msgctxt "convert-palette-type" -msgid "Generate optimum palette" -msgstr "生成优化色板" - -#: ../app/core/core-enums.c:123 -msgctxt "convert-palette-type" -msgid "Use web-optimized palette" -msgstr "使用网页优化色板" - -#: ../app/core/core-enums.c:124 -msgctxt "convert-palette-type" -msgid "Use black and white (1-bit) palette" -msgstr "使用黑白(1 位)色板" - -#: ../app/core/core-enums.c:125 -msgctxt "convert-palette-type" -msgid "Use custom palette" -msgstr "使用自定义色板" - -#: ../app/core/core-enums.c:184 +#: ../app/core/core-enums.c:151 msgctxt "curve-type" msgid "Smooth" msgstr "光滑" -#: ../app/core/core-enums.c:185 +#: ../app/core/core-enums.c:152 msgctxt "curve-type" msgid "Freehand" -msgstr "手画" +msgstr "手绘" -#: ../app/core/core-enums.c:262 +#: ../app/core/core-enums.c:265 msgctxt "histogram-channel" msgid "Value" msgstr "明度" -#: ../app/core/core-enums.c:263 +#: ../app/core/core-enums.c:266 msgctxt "histogram-channel" msgid "Red" msgstr "红色" -#: ../app/core/core-enums.c:264 +#: ../app/core/core-enums.c:267 msgctxt "histogram-channel" msgid "Green" msgstr "绿色" -#: ../app/core/core-enums.c:265 +#: ../app/core/core-enums.c:268 msgctxt "histogram-channel" msgid "Blue" msgstr "蓝色" -#: ../app/core/core-enums.c:266 +#: ../app/core/core-enums.c:269 msgctxt "histogram-channel" msgid "Alpha" -msgstr "Alpha" +msgstr "透明" -#: ../app/core/core-enums.c:267 +#: ../app/core/core-enums.c:270 +msgctxt "histogram-channel" +msgid "Luminance" +msgstr "亮度" + +#: ../app/core/core-enums.c:271 msgctxt "histogram-channel" msgid "RGB" msgstr "RGB" -#: ../app/core/core-enums.c:358 -msgctxt "layer-mode-effects" -msgid "Normal" -msgstr "正常" +#: ../app/core/core-enums.c:299 +msgctxt "matting-engine" +msgid "Matting Global" +msgstr "全局抠图" -#: ../app/core/core-enums.c:359 -msgctxt "layer-mode-effects" -msgid "Dissolve" -msgstr "融化" +#: ../app/core/core-enums.c:300 +msgctxt "matting-engine" +msgid "Matting Levin" +msgstr "莱文抠图" -#: ../app/core/core-enums.c:360 -msgctxt "layer-mode-effects" -msgid "Behind" -msgstr "背后" - -#: ../app/core/core-enums.c:361 -msgctxt "layer-mode-effects" -msgid "Multiply" -msgstr "相乘" - -#: ../app/core/core-enums.c:362 -msgctxt "layer-mode-effects" -msgid "Screen" -msgstr "掩蔽" - -#: ../app/core/core-enums.c:363 -msgctxt "layer-mode-effects" -msgid "Overlay" -msgstr "覆盖" - -#: ../app/core/core-enums.c:364 -msgctxt "layer-mode-effects" -msgid "Difference" -msgstr "差值" - -#: ../app/core/core-enums.c:365 -msgctxt "layer-mode-effects" -msgid "Addition" -msgstr "相加" - -#: ../app/core/core-enums.c:366 -msgctxt "layer-mode-effects" -msgid "Subtract" -msgstr "减去" - -#: ../app/core/core-enums.c:367 -msgctxt "layer-mode-effects" -msgid "Darken only" -msgstr "仅变暗" - -#: ../app/core/core-enums.c:368 -msgctxt "layer-mode-effects" -msgid "Lighten only" -msgstr "仅变亮" - -#: ../app/core/core-enums.c:369 -msgctxt "layer-mode-effects" -msgid "Hue" -msgstr "色调" - -#: ../app/core/core-enums.c:370 -msgctxt "layer-mode-effects" -msgid "Saturation" -msgstr "饱和度" - -#: ../app/core/core-enums.c:371 -msgctxt "layer-mode-effects" -msgid "Color" -msgstr "颜色" - -#: ../app/core/core-enums.c:372 -msgctxt "layer-mode-effects" -msgid "Value" -msgstr "明度" - -#: ../app/core/core-enums.c:373 -msgctxt "layer-mode-effects" -msgid "Divide" -msgstr "相除" - -#: ../app/core/core-enums.c:374 -msgctxt "layer-mode-effects" -msgid "Dodge" -msgstr "减淡" - -#: ../app/core/core-enums.c:375 -msgctxt "layer-mode-effects" -msgid "Burn" -msgstr "加深" - -#: ../app/core/core-enums.c:376 -msgctxt "layer-mode-effects" -msgid "Hard light" -msgstr "硬光" - -#: ../app/core/core-enums.c:377 -msgctxt "layer-mode-effects" -msgid "Soft light" -msgstr "柔光" - -#: ../app/core/core-enums.c:378 -msgctxt "layer-mode-effects" -msgid "Grain extract" -msgstr "增益提取" - -#: ../app/core/core-enums.c:379 -msgctxt "layer-mode-effects" -msgid "Grain merge" -msgstr "增益合并" - -#: ../app/core/core-enums.c:380 -msgctxt "layer-mode-effects" -msgid "Color erase" -msgstr "颜色擦除" - -#: ../app/core/core-enums.c:381 -msgctxt "layer-mode-effects" -msgid "Erase" -msgstr "擦除" - -#: ../app/core/core-enums.c:382 -msgctxt "layer-mode-effects" -msgid "Replace" -msgstr "替换" - -#: ../app/core/core-enums.c:383 -msgctxt "layer-mode-effects" -msgid "Anti erase" -msgstr "反擦除" - -#: ../app/core/core-enums.c:464 +#: ../app/core/core-enums.c:422 msgctxt "align-reference-type" msgid "First item" msgstr "第一项" -#: ../app/core/core-enums.c:465 +#: ../app/core/core-enums.c:423 msgctxt "align-reference-type" msgid "Image" msgstr "图像" -#: ../app/core/core-enums.c:466 +#: ../app/core/core-enums.c:424 msgctxt "align-reference-type" msgid "Selection" msgstr "选区" -#: ../app/core/core-enums.c:467 +#: ../app/core/core-enums.c:425 msgctxt "align-reference-type" msgid "Active layer" msgstr "活动图层" -#: ../app/core/core-enums.c:468 +#: ../app/core/core-enums.c:426 msgctxt "align-reference-type" msgid "Active channel" msgstr "活动通道" -#: ../app/core/core-enums.c:469 +#: ../app/core/core-enums.c:427 msgctxt "align-reference-type" msgid "Active path" msgstr "活动路径" -#: ../app/core/core-enums.c:501 -msgctxt "fill-type" -msgid "Foreground color" -msgstr "前景色" - -#: ../app/core/core-enums.c:502 -msgctxt "fill-type" -msgid "Background color" -msgstr "背景色" - -#: ../app/core/core-enums.c:503 -msgctxt "fill-type" -msgid "White" -msgstr "白色" - -#: ../app/core/core-enums.c:504 -msgctxt "fill-type" -msgid "Transparency" -msgstr "透明" - -#: ../app/core/core-enums.c:505 -msgctxt "fill-type" -msgid "Pattern" -msgstr "图案" - -#: ../app/core/core-enums.c:506 -msgctxt "fill-type" -msgid "None" -msgstr "无" - -#: ../app/core/core-enums.c:534 +#: ../app/core/core-enums.c:455 msgctxt "fill-style" msgid "Solid color" msgstr "纯色" -#: ../app/core/core-enums.c:535 +#: ../app/core/core-enums.c:456 msgctxt "fill-style" msgid "Pattern" msgstr "图案" -#: ../app/core/core-enums.c:563 -msgctxt "stroke-method" -msgid "Stroke line" -msgstr "勾画线条" - -#: ../app/core/core-enums.c:564 -msgctxt "stroke-method" -msgid "Stroke with a paint tool" -msgstr "使用涂画工具进行勾画" - -#: ../app/core/core-enums.c:593 -msgctxt "join-style" -msgid "Miter" -msgstr "斜接" - -#: ../app/core/core-enums.c:594 -msgctxt "join-style" -msgid "Round" -msgstr "圆角" - -#: ../app/core/core-enums.c:595 -msgctxt "join-style" -msgid "Bevel" -msgstr "斜面" - -#: ../app/core/core-enums.c:624 -msgctxt "cap-style" -msgid "Butt" -msgstr "对接" - -#: ../app/core/core-enums.c:625 -msgctxt "cap-style" -msgid "Round" -msgstr "圆角" - -#: ../app/core/core-enums.c:626 -msgctxt "cap-style" -msgid "Square" -msgstr "正方" - -#: ../app/core/core-enums.c:663 +#: ../app/core/core-enums.c:493 msgctxt "dash-preset" msgid "Custom" msgstr "自定义" -#: ../app/core/core-enums.c:664 +#: ../app/core/core-enums.c:494 msgctxt "dash-preset" msgid "Line" -msgstr "线" +msgstr "直线" -#: ../app/core/core-enums.c:665 +#: ../app/core/core-enums.c:495 msgctxt "dash-preset" msgid "Long dashes" -msgstr "长划" +msgstr "长划线" -#: ../app/core/core-enums.c:666 +#: ../app/core/core-enums.c:496 msgctxt "dash-preset" msgid "Medium dashes" -msgstr "中划" +msgstr "中划线" -#: ../app/core/core-enums.c:667 +#: ../app/core/core-enums.c:497 msgctxt "dash-preset" msgid "Short dashes" -msgstr "短划" +msgstr "短划线" -#: ../app/core/core-enums.c:668 +#: ../app/core/core-enums.c:498 msgctxt "dash-preset" msgid "Sparse dots" -msgstr "稀疏点" +msgstr "稀疏虚线" -#: ../app/core/core-enums.c:669 +#: ../app/core/core-enums.c:499 msgctxt "dash-preset" msgid "Normal dots" -msgstr "正常点" +msgstr "正常虚线" -#: ../app/core/core-enums.c:670 +#: ../app/core/core-enums.c:500 msgctxt "dash-preset" msgid "Dense dots" -msgstr "密集点" +msgstr "密集虚线" -#: ../app/core/core-enums.c:671 +#: ../app/core/core-enums.c:501 msgctxt "dash-preset" msgid "Stipples" -msgstr "点刻" +msgstr "细点线" -#: ../app/core/core-enums.c:672 +#: ../app/core/core-enums.c:502 msgctxt "dash-preset" msgid "Dash, dot" -msgstr "划点" +msgstr "划-点线" -#: ../app/core/core-enums.c:673 +#: ../app/core/core-enums.c:503 msgctxt "dash-preset" msgid "Dash, dot, dot" -msgstr "划点点" +msgstr "划-点-点线" -#: ../app/core/core-enums.c:702 -msgctxt "brush-generated-shape" -msgid "Circle" -msgstr "圆" - -#: ../app/core/core-enums.c:703 -msgctxt "brush-generated-shape" -msgid "Square" -msgstr "正方" - -#: ../app/core/core-enums.c:704 -msgctxt "brush-generated-shape" -msgid "Diamond" -msgstr "菱形" - -#: ../app/core/core-enums.c:733 -msgctxt "orientation-type" -msgid "Horizontal" -msgstr "水平" - -#: ../app/core/core-enums.c:734 -msgctxt "orientation-type" -msgid "Vertical" -msgstr "垂直" - -#: ../app/core/core-enums.c:735 -msgctxt "orientation-type" -msgid "Unknown" -msgstr "未知" - -#: ../app/core/core-enums.c:766 -msgctxt "precision" -msgid "8-bit integer" -msgstr "" - -#: ../app/core/core-enums.c:767 -msgctxt "precision" -msgid "16-bit integer" -msgstr "" - -#: ../app/core/core-enums.c:768 -msgctxt "precision" -msgid "32-bit integer" -msgstr "" - -#: ../app/core/core-enums.c:769 -msgctxt "precision" -msgid "16-bit floating point" -msgstr "" - -#: ../app/core/core-enums.c:770 -msgctxt "precision" -msgid "32-bit floating point" -msgstr "" - -#: ../app/core/core-enums.c:801 +#: ../app/core/core-enums.c:534 msgctxt "item-set" msgid "None" msgstr "无" -#: ../app/core/core-enums.c:802 +#: ../app/core/core-enums.c:535 msgctxt "item-set" msgid "All layers" msgstr "全部图层" -#: ../app/core/core-enums.c:803 +#: ../app/core/core-enums.c:536 msgctxt "item-set" msgid "Image-sized layers" -msgstr "图像大小的图层" +msgstr "有尺寸的图像的图层" -#: ../app/core/core-enums.c:804 +#: ../app/core/core-enums.c:537 msgctxt "item-set" msgid "All visible layers" msgstr "全部可见图层" -#: ../app/core/core-enums.c:805 +#: ../app/core/core-enums.c:538 msgctxt "item-set" msgid "All linked layers" msgstr "全部链接图层" -#: ../app/core/core-enums.c:871 +#: ../app/core/core-enums.c:573 msgctxt "view-size" msgid "Tiny" msgstr "细小" -#: ../app/core/core-enums.c:872 +#: ../app/core/core-enums.c:574 msgctxt "view-size" msgid "Very small" msgstr "很小" -#: ../app/core/core-enums.c:873 +#: ../app/core/core-enums.c:575 msgctxt "view-size" msgid "Small" msgstr "小" -#: ../app/core/core-enums.c:874 +#: ../app/core/core-enums.c:576 msgctxt "view-size" msgid "Medium" -msgstr "中" +msgstr "正常" -#: ../app/core/core-enums.c:875 +#: ../app/core/core-enums.c:577 msgctxt "view-size" msgid "Large" msgstr "大" -#: ../app/core/core-enums.c:876 +#: ../app/core/core-enums.c:578 msgctxt "view-size" msgid "Very large" msgstr "很大" -#: ../app/core/core-enums.c:877 +#: ../app/core/core-enums.c:579 msgctxt "view-size" msgid "Huge" msgstr "庞大" -#: ../app/core/core-enums.c:878 +#: ../app/core/core-enums.c:580 msgctxt "view-size" msgid "Enormous" msgstr "巨大" -#: ../app/core/core-enums.c:879 +#: ../app/core/core-enums.c:581 msgctxt "view-size" msgid "Gigantic" msgstr "极大" -#: ../app/core/core-enums.c:907 +#: ../app/core/core-enums.c:609 msgctxt "view-type" msgid "View as list" msgstr "以列表方式查看" -#: ../app/core/core-enums.c:908 +#: ../app/core/core-enums.c:610 msgctxt "view-type" msgid "View as grid" msgstr "以阵列方式查看" -#: ../app/core/core-enums.c:937 +#: ../app/core/core-enums.c:639 msgctxt "thumbnail-size" msgid "No thumbnails" msgstr "无缩略图" -#: ../app/core/core-enums.c:938 +#: ../app/core/core-enums.c:640 msgctxt "thumbnail-size" msgid "Normal (128x128)" msgstr "普通(128x128)" -#: ../app/core/core-enums.c:939 +#: ../app/core/core-enums.c:641 msgctxt "thumbnail-size" msgid "Large (256x256)" msgstr "大(256x256)" -#: ../app/core/core-enums.c:1117 +#: ../app/core/core-enums.c:671 +msgctxt "debug-policy" +msgid "Debug warnings, critical errors and crashes" +msgstr "调试警告，严重错误和崩溃" + +#: ../app/core/core-enums.c:672 +msgctxt "debug-policy" +msgid "Debug critical errors and crashes" +msgstr "调试严重错误和崩溃" + +#: ../app/core/core-enums.c:673 +msgctxt "debug-policy" +msgid "Debug crashes only" +msgstr "仅调试崩溃" + +#: ../app/core/core-enums.c:674 +msgctxt "debug-policy" +msgid "Never debug GIMP" +msgstr "从不调试 GIMP" + +#: ../app/core/core-enums.c:862 msgctxt "undo-type" msgid "<>" -msgstr "<< 无效 >>" +msgstr "<<无效>>" -#: ../app/core/core-enums.c:1118 +#: ../app/core/core-enums.c:863 msgctxt "undo-type" msgid "Scale image" msgstr "缩放图像" -#: ../app/core/core-enums.c:1119 +#: ../app/core/core-enums.c:864 msgctxt "undo-type" msgid "Resize image" -msgstr "图像改变大小" +msgstr "改变图像大小" -#: ../app/core/core-enums.c:1120 +#: ../app/core/core-enums.c:865 msgctxt "undo-type" msgid "Flip image" msgstr "翻转图像" -#: ../app/core/core-enums.c:1121 +#: ../app/core/core-enums.c:866 msgctxt "undo-type" msgid "Rotate image" msgstr "旋转图像" -#: ../app/core/core-enums.c:1122 +#: ../app/core/core-enums.c:867 msgctxt "undo-type" msgid "Crop image" msgstr "剪裁图像" -#: ../app/core/core-enums.c:1123 +#: ../app/core/core-enums.c:868 msgctxt "undo-type" msgid "Convert image" msgstr "转换图像" -#: ../app/core/core-enums.c:1124 +#: ../app/core/core-enums.c:869 msgctxt "undo-type" msgid "Remove item" -msgstr "移除项目" +msgstr "删除项目" -#: ../app/core/core-enums.c:1125 +#: ../app/core/core-enums.c:870 msgctxt "undo-type" msgid "Merge layers" msgstr "合并图层" -#: ../app/core/core-enums.c:1126 +#: ../app/core/core-enums.c:871 msgctxt "undo-type" msgid "Merge paths" msgstr "合并路径" -#: ../app/core/core-enums.c:1127 +#: ../app/core/core-enums.c:872 msgctxt "undo-type" msgid "Quick Mask" msgstr "快速蒙板" -#: ../app/core/core-enums.c:1128 ../app/core/core-enums.c:1159 -#: ../app/core/gimpimage-grid.c:63 +#: ../app/core/core-enums.c:873 ../app/core/core-enums.c:904 +#: ../app/core/gimpimage-grid.c:64 msgctxt "undo-type" msgid "Grid" msgstr "网格" -#: ../app/core/core-enums.c:1129 ../app/core/core-enums.c:1161 +#: ../app/core/core-enums.c:874 ../app/core/core-enums.c:908 msgctxt "undo-type" msgid "Guide" msgstr "参考线" -#: ../app/core/core-enums.c:1130 ../app/core/core-enums.c:1162 +#: ../app/core/core-enums.c:875 ../app/core/core-enums.c:909 msgctxt "undo-type" msgid "Sample Point" msgstr "采样点" -#: ../app/core/core-enums.c:1131 ../app/core/core-enums.c:1163 +#: ../app/core/core-enums.c:876 ../app/core/core-enums.c:910 msgctxt "undo-type" msgid "Layer/Channel" msgstr "图层/通道" -#: ../app/core/core-enums.c:1132 ../app/core/core-enums.c:1164 +#: ../app/core/core-enums.c:877 ../app/core/core-enums.c:911 msgctxt "undo-type" msgid "Layer/Channel modification" msgstr "图层/通道修改" -#: ../app/core/core-enums.c:1133 ../app/core/core-enums.c:1165 +#: ../app/core/core-enums.c:878 ../app/core/core-enums.c:912 msgctxt "undo-type" msgid "Selection mask" msgstr "选区蒙板" -#: ../app/core/core-enums.c:1134 ../app/core/core-enums.c:1169 +#: ../app/core/core-enums.c:879 ../app/core/core-enums.c:916 msgctxt "undo-type" msgid "Item visibility" msgstr "项目可见性" -#: ../app/core/core-enums.c:1135 ../app/core/core-enums.c:1170 +#: ../app/core/core-enums.c:880 ../app/core/core-enums.c:917 msgctxt "undo-type" msgid "Link/Unlink item" msgstr "链接/取消链接项目" -#: ../app/core/core-enums.c:1136 +#: ../app/core/core-enums.c:881 msgctxt "undo-type" msgid "Item properties" msgstr "项目属性" -#: ../app/core/core-enums.c:1137 ../app/core/core-enums.c:1168 +#: ../app/core/core-enums.c:882 ../app/core/core-enums.c:915 msgctxt "undo-type" msgid "Move item" msgstr "移动项目" -#: ../app/core/core-enums.c:1138 +#: ../app/core/core-enums.c:883 msgctxt "undo-type" msgid "Scale item" msgstr "缩放项目" -#: ../app/core/core-enums.c:1139 +#: ../app/core/core-enums.c:884 msgctxt "undo-type" msgid "Resize item" msgstr "更改项目大小" -#: ../app/core/core-enums.c:1140 +#: ../app/core/core-enums.c:885 msgctxt "undo-type" msgid "Add layer" msgstr "添加图层" -#: ../app/core/core-enums.c:1141 ../app/core/core-enums.c:1181 +#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:936 msgctxt "undo-type" msgid "Add layer mask" msgstr "添加图层蒙板" -#: ../app/core/core-enums.c:1142 ../app/core/core-enums.c:1183 +#: ../app/core/core-enums.c:887 ../app/core/core-enums.c:938 msgctxt "undo-type" msgid "Apply layer mask" msgstr "应用图层蒙板" -#: ../app/core/core-enums.c:1143 ../app/core/core-enums.c:1191 +#: ../app/core/core-enums.c:888 ../app/core/core-enums.c:946 msgctxt "undo-type" msgid "Floating selection to layer" msgstr "浮动选区到图层" -#: ../app/core/core-enums.c:1144 +#: ../app/core/core-enums.c:889 msgctxt "undo-type" msgid "Float selection" msgstr "浮动选区" -#: ../app/core/core-enums.c:1145 +#: ../app/core/core-enums.c:890 msgctxt "undo-type" msgid "Anchor floating selection" msgstr "固定浮动选区" -#: ../app/core/core-enums.c:1146 ../app/core/gimp-edit.c:256 +#: ../app/core/core-enums.c:891 ../app/core/gimp-edit.c:501 msgctxt "undo-type" msgid "Paste" msgstr "粘贴" -#: ../app/core/core-enums.c:1147 ../app/core/gimp-edit.c:572 +#: ../app/core/core-enums.c:892 ../app/core/gimp-edit.c:829 msgctxt "undo-type" msgid "Cut" msgstr "剪切" -#: ../app/core/core-enums.c:1148 +#: ../app/core/core-enums.c:893 msgctxt "undo-type" msgid "Text" msgstr "文字" -#: ../app/core/core-enums.c:1149 ../app/core/core-enums.c:1192 -#: ../app/core/gimpdrawable-transform.c:658 +#: ../app/core/core-enums.c:894 ../app/core/core-enums.c:947 +#: ../app/core/gimpdrawable-transform.c:692 msgctxt "undo-type" msgid "Transform" msgstr "变换" -#: ../app/core/core-enums.c:1150 ../app/core/core-enums.c:1193 +#: ../app/core/core-enums.c:895 ../app/core/core-enums.c:948 msgctxt "undo-type" msgid "Paint" -msgstr "涂画" +msgstr "绘画" -#: ../app/core/core-enums.c:1151 ../app/core/core-enums.c:1196 +#: ../app/core/core-enums.c:896 ../app/core/core-enums.c:951 msgctxt "undo-type" msgid "Attach parasite" -msgstr "添加寄生物" +msgstr "添加内嵌信息" -#: ../app/core/core-enums.c:1152 ../app/core/core-enums.c:1197 +#: ../app/core/core-enums.c:897 ../app/core/core-enums.c:952 msgctxt "undo-type" msgid "Remove parasite" -msgstr "删除寄生物" +msgstr "删除内嵌信息" -#: ../app/core/core-enums.c:1153 +#: ../app/core/core-enums.c:898 msgctxt "undo-type" msgid "Import paths" msgstr "导入路径" -#: ../app/core/core-enums.c:1154 +#: ../app/core/core-enums.c:899 msgctxt "undo-type" msgid "Plug-In" msgstr "插件" -#: ../app/core/core-enums.c:1155 +#: ../app/core/core-enums.c:900 msgctxt "undo-type" msgid "Image type" msgstr "图像类型" -#: ../app/core/core-enums.c:1156 -#, fuzzy +#: ../app/core/core-enums.c:901 msgctxt "undo-type" msgid "Image precision" -msgstr "图像属性" +msgstr "图像精度" -#: ../app/core/core-enums.c:1157 +#: ../app/core/core-enums.c:902 msgctxt "undo-type" msgid "Image size" msgstr "图像大小" -#: ../app/core/core-enums.c:1158 +#: ../app/core/core-enums.c:903 msgctxt "undo-type" msgid "Image resolution change" msgstr "图像分辨率更改" -#: ../app/core/core-enums.c:1160 +#: ../app/core/core-enums.c:905 +msgctxt "undo-type" +msgid "Change metadata" +msgstr "更改元数据" + +#: ../app/core/core-enums.c:906 msgctxt "undo-type" msgid "Change indexed palette" msgstr "更改索引色板" -#: ../app/core/core-enums.c:1166 +#: ../app/core/core-enums.c:907 +msgctxt "undo-type" +msgid "Change color managed state" +msgstr "改变色彩管理状态" + +#: ../app/core/core-enums.c:913 msgctxt "undo-type" msgid "Reorder item" msgstr "重新排列项目" -#: ../app/core/core-enums.c:1167 +#: ../app/core/core-enums.c:914 msgctxt "undo-type" msgid "Rename item" msgstr "重命名项目" -#: ../app/core/core-enums.c:1171 +#: ../app/core/core-enums.c:918 +msgctxt "undo-type" +msgid "Item color tag" +msgstr "项目颜色标签" + +#: ../app/core/core-enums.c:919 +msgctxt "undo-type" +msgid "Lock/Unlock content" +msgstr "锁定/解锁内容" + +#: ../app/core/core-enums.c:920 +msgctxt "undo-type" +msgid "Lock/Unlock position" +msgstr "锁定/解锁位置" + +#: ../app/core/core-enums.c:921 msgctxt "undo-type" msgid "New layer" msgstr "新建图层" -#: ../app/core/core-enums.c:1172 +#: ../app/core/core-enums.c:922 msgctxt "undo-type" msgid "Delete layer" msgstr "删除图层" -#: ../app/core/core-enums.c:1173 +#: ../app/core/core-enums.c:923 msgctxt "undo-type" msgid "Set layer mode" msgstr "设置图层模式" -#: ../app/core/core-enums.c:1174 +#: ../app/core/core-enums.c:924 msgctxt "undo-type" msgid "Set layer opacity" msgstr "设置图层不透明度" -#: ../app/core/core-enums.c:1175 +#: ../app/core/core-enums.c:925 msgctxt "undo-type" msgid "Lock/Unlock alpha channel" -msgstr "锁定/取消锁定 Alpha 通道" +msgstr "锁定/解锁透明通道" -#: ../app/core/core-enums.c:1176 +#: ../app/core/core-enums.c:926 msgctxt "undo-type" msgid "Suspend group layer resize" msgstr "暂停改变群组图层大小" -#: ../app/core/core-enums.c:1177 +#: ../app/core/core-enums.c:927 msgctxt "undo-type" msgid "Resume group layer resize" msgstr "恢复改变群组图层大小" -#: ../app/core/core-enums.c:1178 +#: ../app/core/core-enums.c:928 +msgctxt "undo-type" +msgid "Suspend group layer mask" +msgstr "停用群组图层蒙板" + +#: ../app/core/core-enums.c:929 +msgctxt "undo-type" +msgid "Resume group layer mask" +msgstr "恢复群组图层蒙板" + +#: ../app/core/core-enums.c:930 +msgctxt "undo-type" +msgid "Start moving group layer" +msgstr "开始移动群组图层" + +#: ../app/core/core-enums.c:931 +msgctxt "undo-type" +msgid "End moving group layer" +msgstr "结束移动群组图层" + +#: ../app/core/core-enums.c:932 msgctxt "undo-type" msgid "Convert group layer" msgstr "转换群组图层" -#: ../app/core/core-enums.c:1179 +#: ../app/core/core-enums.c:933 msgctxt "undo-type" msgid "Text layer" msgstr "文字图层" -#: ../app/core/core-enums.c:1180 +#: ../app/core/core-enums.c:934 msgctxt "undo-type" msgid "Text layer modification" msgstr "文字图层修改" -#: ../app/core/core-enums.c:1182 +#: ../app/core/core-enums.c:935 +msgctxt "undo-type" +msgid "Convert text layer" +msgstr "转换文字图层" + +#: ../app/core/core-enums.c:937 msgctxt "undo-type" msgid "Delete layer mask" msgstr "删除图层蒙板" -#: ../app/core/core-enums.c:1184 +#: ../app/core/core-enums.c:939 msgctxt "undo-type" msgid "Show layer mask" msgstr "显示图层蒙板" -#: ../app/core/core-enums.c:1185 +#: ../app/core/core-enums.c:940 msgctxt "undo-type" msgid "New channel" msgstr "新建通道" -#: ../app/core/core-enums.c:1186 +#: ../app/core/core-enums.c:941 msgctxt "undo-type" msgid "Delete channel" msgstr "删除通道" -#: ../app/core/core-enums.c:1187 +#: ../app/core/core-enums.c:942 msgctxt "undo-type" msgid "Channel color" msgstr "通道颜色" -#: ../app/core/core-enums.c:1188 +#: ../app/core/core-enums.c:943 msgctxt "undo-type" msgid "New path" msgstr "新建路径" -#: ../app/core/core-enums.c:1189 +#: ../app/core/core-enums.c:944 msgctxt "undo-type" msgid "Delete path" msgstr "删除路径" -#: ../app/core/core-enums.c:1190 +#: ../app/core/core-enums.c:945 msgctxt "undo-type" msgid "Path modification" msgstr "路径修改" -#: ../app/core/core-enums.c:1194 +#: ../app/core/core-enums.c:949 msgctxt "undo-type" msgid "Ink" msgstr "墨水" -#: ../app/core/core-enums.c:1195 +#: ../app/core/core-enums.c:950 msgctxt "undo-type" msgid "Select foreground" msgstr "选择前景" -#: ../app/core/core-enums.c:1198 +#: ../app/core/core-enums.c:953 msgctxt "undo-type" msgid "Not undoable" msgstr "不可撤消" -#: ../app/core/core-enums.c:1470 -msgctxt "select-criterion" -msgid "Composite" -msgstr "合成" +#: ../app/core/core-enums.c:1033 +msgctxt "gradient-color" +msgid "Fixed" +msgstr "固定" -#: ../app/core/core-enums.c:1471 -msgctxt "select-criterion" -msgid "Red" -msgstr "红色" +#: ../app/core/core-enums.c:1034 +msgctxt "gradient-color" +msgid "Foreground color" +msgstr "前景色" -#: ../app/core/core-enums.c:1472 -msgctxt "select-criterion" -msgid "Green" -msgstr "绿色" +#. Translators: this is an abbreviated version of "Foreground color". +#. Keep it short. +#: ../app/core/core-enums.c:1037 +msgctxt "gradient-color" +msgid "FG" +msgstr "前景" -#: ../app/core/core-enums.c:1473 -msgctxt "select-criterion" -msgid "Blue" -msgstr "蓝色" +#: ../app/core/core-enums.c:1038 +msgctxt "gradient-color" +msgid "Foreground color (transparent)" +msgstr "前景色(透明)" -#: ../app/core/core-enums.c:1474 -msgctxt "select-criterion" -msgid "Hue" -msgstr "色调" +#. Translators: this is an abbreviated version of "Foreground color (transparent)". +#. Keep it short. +#: ../app/core/core-enums.c:1041 +msgctxt "gradient-color" +msgid "FG (t)" +msgstr "前景(t)" -#: ../app/core/core-enums.c:1475 -msgctxt "select-criterion" -msgid "Saturation" -msgstr "饱和度" +#: ../app/core/core-enums.c:1042 +msgctxt "gradient-color" +msgid "Background color" +msgstr "背景色" -#: ../app/core/core-enums.c:1476 -msgctxt "select-criterion" -msgid "Value" -msgstr "明度" +#. Translators: this is an abbreviated version of "Background color". +#. Keep it short. +#: ../app/core/core-enums.c:1045 +msgctxt "gradient-color" +msgid "BG" +msgstr "背景" -#: ../app/core/core-enums.c:1505 +#: ../app/core/core-enums.c:1046 +msgctxt "gradient-color" +msgid "Background color (transparent)" +msgstr "前景色(透明)" + +#. Translators: this is an abbreviated version of "Background color (transparent)". +#. Keep it short. +#: ../app/core/core-enums.c:1049 +msgctxt "gradient-color" +msgid "BG (t)" +msgstr "背景(t)" + +#: ../app/core/core-enums.c:1080 msgctxt "message-severity" msgid "Message" msgstr "消息" -#: ../app/core/core-enums.c:1506 +#: ../app/core/core-enums.c:1081 msgctxt "message-severity" msgid "Warning" msgstr "警告" -#: ../app/core/core-enums.c:1507 +#: ../app/core/core-enums.c:1082 msgctxt "message-severity" msgid "Error" msgstr "错误" -#: ../app/core/core-enums.c:1536 +#: ../app/core/core-enums.c:1083 +msgctxt "message-severity" +msgid "WARNING" +msgstr "警告" + +#: ../app/core/core-enums.c:1084 +msgctxt "message-severity" +msgid "CRITICAL" +msgstr "严重" + +#: ../app/core/core-enums.c:1113 msgctxt "color-profile-policy" msgid "Ask what to do" -msgstr "询问怎么做" +msgstr "询问做什么" -#: ../app/core/core-enums.c:1537 +#: ../app/core/core-enums.c:1114 msgctxt "color-profile-policy" msgid "Keep embedded profile" msgstr "保持内嵌的配置文件" -#: ../app/core/core-enums.c:1538 +#: ../app/core/core-enums.c:1115 msgctxt "color-profile-policy" -msgid "Convert to RGB workspace" -msgstr "转换为 RGB 工作空间" +msgid "Convert to preferred RGB color profile" +msgstr "转换为首选的 RGB 色彩配置文件" -#: ../app/core/core-enums.c:1575 +#: ../app/core/core-enums.c:1152 msgctxt "dynamics-output-type" msgid "Opacity" msgstr "不透明度" -#: ../app/core/core-enums.c:1576 +#: ../app/core/core-enums.c:1153 msgctxt "dynamics-output-type" msgid "Size" msgstr "大小" -#: ../app/core/core-enums.c:1577 +#: ../app/core/core-enums.c:1154 msgctxt "dynamics-output-type" msgid "Angle" msgstr "角度" -#: ../app/core/core-enums.c:1578 +#: ../app/core/core-enums.c:1155 msgctxt "dynamics-output-type" msgid "Color" msgstr "颜色" -#: ../app/core/core-enums.c:1579 +#: ../app/core/core-enums.c:1156 msgctxt "dynamics-output-type" msgid "Hardness" msgstr "硬度" -#: ../app/core/core-enums.c:1580 +#: ../app/core/core-enums.c:1157 msgctxt "dynamics-output-type" msgid "Force" msgstr "力度" -#: ../app/core/core-enums.c:1581 +#: ../app/core/core-enums.c:1158 msgctxt "dynamics-output-type" msgid "Aspect ratio" msgstr "宽高比" -#: ../app/core/core-enums.c:1582 +#: ../app/core/core-enums.c:1159 msgctxt "dynamics-output-type" msgid "Spacing" msgstr "间距" -#: ../app/core/core-enums.c:1583 +#: ../app/core/core-enums.c:1160 msgctxt "dynamics-output-type" msgid "Rate" msgstr "比率" -#: ../app/core/core-enums.c:1584 +#: ../app/core/core-enums.c:1161 msgctxt "dynamics-output-type" msgid "Flow" msgstr "流量" -#: ../app/core/core-enums.c:1585 +#: ../app/core/core-enums.c:1162 msgctxt "dynamics-output-type" msgid "Jitter" msgstr "抖动" -#: ../app/core/gimpbrush.c:147 -msgid "Brush Spacing" -msgstr "画笔间距" +#: ../app/core/core-enums.c:1190 +msgctxt "filter-region" +msgid "Use the selection as input" +msgstr "将选区用作输入" -#: ../app/core/gimpbrushgenerated.c:128 -msgid "Brush Shape" -msgstr "画笔形状" +#: ../app/core/core-enums.c:1191 +msgctxt "filter-region" +msgid "Use the entire layer as input" +msgstr "将整个图层用作输入" -#: ../app/core/gimpbrushgenerated.c:136 -msgid "Brush Radius" -msgstr "画笔半径" +#: ../app/core/core-enums.c:1220 +msgctxt "channel-border-style" +msgid "Hard" +msgstr "硬边" -#: ../app/core/gimpbrushgenerated.c:143 -msgid "Brush Spikes" -msgstr "画笔穗数" +#: ../app/core/core-enums.c:1221 +msgctxt "channel-border-style" +msgid "Smooth" +msgstr "平滑" -#: ../app/core/gimpbrushgenerated.c:150 -msgid "Brush Hardness" -msgstr "画笔硬度" +#: ../app/core/core-enums.c:1222 +msgctxt "channel-border-style" +msgid "Feathered" +msgstr "羽化" -#: ../app/core/gimpbrushgenerated.c:158 ../app/paint/gimppaintoptions.c:150 -msgid "Brush Aspect Ratio" -msgstr "画笔宽高比" - -#: ../app/core/gimpbrushgenerated.c:165 ../app/paint/gimppaintoptions.c:154 -msgid "Brush Angle" -msgstr "画笔角度" - -#: ../app/core/gimpbrushgenerated-load.c:85 -#, c-format -msgid "Fatal parse error in brush file '%s': Not a GIMP brush file." -msgstr "画笔文件“%s”出现严重解析错误：不是 GIMP 画笔文件。" - -#: ../app/core/gimpbrushgenerated-load.c:102 -#, c-format -msgid "" -"Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d." -msgstr "画笔文件“%s”出现严重解析错误：第 %d 行未知 GIMP 画笔版本。" - -#: ../app/core/gimpbrushgenerated-load.c:126 ../app/core/gimpbrush-load.c:278 -#: ../app/core/gimpbrushpipe-load.c:95 -#, c-format -msgid "Invalid UTF-8 string in brush file '%s'." -msgstr "画笔文件“%s”中含有无效的 UTF-8 字符串。" - -#: ../app/core/gimpbrushgenerated-load.c:148 -#, c-format -msgid "" -"Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d." -msgstr "画笔文件“%s”出现严重解析错误：第 %d 行未知 GIMP 画笔形状。" - -#: ../app/core/gimpbrushgenerated-load.c:224 -#, c-format -msgid "Line %d: %s" -msgstr "第 %d 行：%s" - -#: ../app/core/gimpbrushgenerated-load.c:226 -#, c-format -msgid "File is truncated in line %d" -msgstr "文件在第 %d 行被截断" - -#: ../app/core/gimpbrushgenerated-load.c:229 -#, c-format -msgid "Error while reading brush file '%s': %s" -msgstr "读取画笔文件“%s”时出错：%s" - -#: ../app/core/gimpbrush-load.c:177 -#, fuzzy, c-format -msgid "Could not read %d byte from '%s': %s" -msgid_plural "Could not read %d bytes from '%s': %s" -msgstr[0] "无法从“%2$s”中读取 %1$d 字节：%3$s" - -#: ../app/core/gimpbrush-load.c:199 -#, c-format -msgid "Fatal parse error in brush file '%s': Width = 0." -msgstr "画笔文件“%s”出现严重解析错误：宽度 = 0。" - -#: ../app/core/gimpbrush-load.c:208 -#, c-format -msgid "Fatal parse error in brush file '%s': Height = 0." -msgstr "画笔文件“%s”出现严重解析错误：高度 = 0。" - -#: ../app/core/gimpbrush-load.c:217 -#, c-format -msgid "Fatal parse error in brush file '%s': Bytes = 0." -msgstr "画笔文件“%s”出现严重解析错误：字节数 = 0。" - -#: ../app/core/gimpbrush-load.c:241 -#, c-format -msgid "Fatal parse error in brush file '%s': Unknown depth %d." -msgstr "画笔文件“%s”出现严重解析错误：未知色深 %d。" - -#: ../app/core/gimpbrush-load.c:254 -#, c-format -msgid "Fatal parse error in brush file '%s': Unknown version %d." -msgstr "画笔文件“%s”出现严重解析错误：未知版本 %d。" - -#: ../app/core/gimpbrush-load.c:270 ../app/core/gimpbrush-load.c:391 -#: ../app/core/gimpbrush-load.c:726 -#, c-format -msgid "Fatal parse error in brush file '%s': File appears truncated." -msgstr "画笔文件“%s”出现严重解析错误：文件看来已被截断。" - -#: ../app/core/gimpbrush-load.c:285 ../app/core/gimppattern-load.c:151 -#: ../app/dialogs/template-options-dialog.c:84 -#: ../app/tools/gimpvectortool.c:317 -msgid "Unnamed" -msgstr "未命名" - -#: ../app/core/gimpbrush-load.c:380 -#, c-format -msgid "" -"Fatal parse error in brush file '%s': Unsupported brush depth %d\n" -"GIMP brushes must be GRAY or RGBA." -msgstr "" -"画笔文件“%s”出现严重解析错误：不支持的画笔色深 %d\n" -"GIMP 画笔必须为灰度或 RGBA。" - -#: ../app/core/gimpbrush-load.c:452 -#, c-format -msgid "" -"Fatal parse error in brush file '%s': unable to decode abr format version %d." -msgstr "画笔文件“%s”出现严重解析错误：无法解码 abr 格式版本 %d。" - -#: ../app/core/gimpbrush-load.c:619 -#, c-format -msgid "Fatal parse error in brush file '%s': Wide brushes are not supported." -msgstr "画笔文件“%s”出现严重解析错误：不支持宽画笔。" - -#: ../app/core/gimpbrushpipe-load.c:111 ../app/core/gimpbrushpipe-load.c:131 -#: ../app/core/gimpbrushpipe-load.c:222 -#, c-format -msgid "Fatal parse error in brush file '%s': File is corrupt." -msgstr "画笔文件“%s”出现严重解析错误：文件已损坏。" - -#: ../app/core/gimp.c:595 +#. initialize babl fishes +#: ../app/core/gimp.c:508 ../app/core/gimp.c:540 msgid "Initialization" msgstr "初始化" #. register all internal procedures -#: ../app/core/gimp.c:696 +#: ../app/core/gimp.c:520 msgid "Internal Procedures" -msgstr "内部过程" +msgstr "内部程序" #. initialize the global parasite table -#: ../app/core/gimp.c:947 +#: ../app/core/gimp.c:783 msgid "Looking for data files" msgstr "正在查找数据文件" -#: ../app/core/gimp.c:947 +#: ../app/core/gimp.c:783 msgid "Parasites" -msgstr "寄生物" +msgstr "内嵌信息" -#. initialize the list of gimp dynamics -#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2744 -#: ../app/tools/gimppaintoptions-gui.c:204 -msgid "Dynamics" -msgstr "动态" - -#. initialize the list of fonts -#: ../app/core/gimp.c:976 +#: ../app/core/gimp.c:792 msgid "Fonts (this may take a while)" msgstr "字体(这将耗费一些时间)" #. initialize the module list -#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2776 +#: ../app/core/gimp.c:801 ../app/dialogs/preferences-dialog.c:3132 msgid "Modules" msgstr "模块" +#: ../app/core/gimp-batch.c:75 +#, c-format +msgid "No batch interpreter specified, using the default '%s'.\n" +msgstr "没有指定批处理解释器，使用默认的“%s”。\n" + +#: ../app/core/gimp-batch.c:93 ../app/core/gimp-batch.c:111 +#, c-format +msgid "The batch interpreter '%s' is not available. Batch mode disabled." +msgstr "批处理解析程序“%s”不可用。批处理模式已禁用。" + +#: ../app/core/gimp-contexts.c:153 ../app/core/gimp-internal-data.c:304 +#: ../app/core/gimptooloptions.c:348 ../app/gui/session.c:428 +#: ../app/menus/menus.c:476 ../app/widgets/gimpdevices.c:207 +#, c-format +msgid "Deleting \"%s\" failed: %s" +msgstr "删除“%s”失败：%s" + +#. initialize the list of gimp dynamics +#: ../app/core/gimp-data-factories.c:322 ../app/core/gimpcontext.c:711 +#: ../app/dialogs/preferences-dialog.c:3096 +#: ../app/tools/gimppaintoptions-gui.c:225 +msgid "Dynamics" +msgstr "动态" + +#. initialize the color history +#: ../app/core/gimp-data-factories.c:347 ../app/core/gimp-palettes.c:60 +msgid "Color History" +msgstr "颜色历史" + #. update tag cache -#: ../app/core/gimp.c:997 +#: ../app/core/gimp-data-factories.c:359 msgid "Updating tag cache" msgstr "正在更新标签缓存" -#: ../app/core/gimpchannel.c:271 +#: ../app/core/gimp-edit.c:97 +msgctxt "undo-type" +msgid "Cut Layer" +msgstr "剪切图层" + +#: ../app/core/gimp-edit.c:313 ../app/core/gimpimage-new.c:325 +msgid "Pasted Layer" +msgstr "被粘贴的图层" + +#: ../app/core/gimp-edit.c:724 +msgctxt "undo-type" +msgid "Clear" +msgstr "清空" + +#: ../app/core/gimp-edit.c:846 +msgid "Global Buffer" +msgstr "全局缓冲区" + +#: ../app/core/gimp-gradients.c:64 +msgid "Custom" +msgstr "自定义" + +#: ../app/core/gimp-gradients.c:74 +msgid "FG to BG (RGB)" +msgstr "前景到背景(RGB)" + +#: ../app/core/gimp-gradients.c:82 +msgid "FG to BG (Hardedge)" +msgstr "前景到背景(硬边)" + +#: ../app/core/gimp-gradients.c:99 +msgid "FG to BG (HSV counter-clockwise)" +msgstr "前景到背景(HSV 逆时针色相)" + +#: ../app/core/gimp-gradients.c:107 +msgid "FG to BG (HSV clockwise hue)" +msgstr "前景到背景(HSV 顺时针色相)" + +#: ../app/core/gimp-gradients.c:115 +msgid "FG to Transparent" +msgstr "前景到透明" + +#: ../app/core/gimp-spawn.c:186 +#, c-format +msgid "Failed to fork (%s)" +msgstr "创建进程失败(%s)" + +#: ../app/core/gimp-spawn.c:223 +#, c-format +msgid "Failed to execute child process “%s” (%s)" +msgstr "无法执行子进程“%s” (%s)" + +#. This is a special string to specify the language identifier to +#. * look for in the gimp-tags-default.xml file. Please translate the +#. * C in it according to the name of the po file used for +#. * gimp-tags-default.xml. E.g. lithuanian for the translation, +#. * that would be "tags-locale:lt". +#. +#: ../app/core/gimp-tags.c:87 +msgid "tags-locale:C" +msgstr "tags-locale:zh_CN" + +#: ../app/core/gimp-user-install.c:216 +#, c-format +msgid "" +"It seems you have used GIMP %s before. GIMP will now migrate your user " +"settings to '%s'." +msgstr "看来您曾经使用过 GIMP %s。GIMP 现在将要把您的用户配置迁移到“%s”。" + +#: ../app/core/gimp-user-install.c:221 +#, c-format +msgid "" +"It appears that you are using GIMP for the first time. GIMP will now create " +"a folder named '%s' and copy some files to it." +msgstr "" +"看来您是第一次使用 GIMP。GIMP 现在将创建名为“%s”的文件夹并复制一些文件到其" +"中。" + +#: ../app/core/gimp-user-install.c:420 +#, c-format +msgid "Copying file '%s' from '%s'..." +msgstr "正在从“%2$s”复制文件“%1$s”…" + +#: ../app/core/gimp-user-install.c:435 ../app/core/gimp-user-install.c:461 +#, c-format +msgid "Creating folder '%s'..." +msgstr "正在创建文件夹“%s”…" + +#: ../app/core/gimp-user-install.c:446 ../app/core/gimp-user-install.c:472 +#, c-format +msgid "Cannot create folder '%s': %s" +msgstr "无法创建“%s”文件夹：%s" + +#: ../app/core/gimp-utils.c:569 ../app/core/gimpfilloptions.c:330 +msgid "No patterns available for this operation." +msgstr "没有可供此操作使用的图案。" + +#: ../app/core/gimpbrush-load.c:174 +#, c-format +msgid "Fatal parse error in brush file: Width = 0." +msgstr "笔刷文件中出现致命解析错误：宽度 = 0。" + +#: ../app/core/gimpbrush-load.c:181 +#, c-format +msgid "Fatal parse error in brush file: Height = 0." +msgstr "笔刷文件中出现致命解析错误：高度 = 0。" + +#: ../app/core/gimpbrush-load.c:188 +#, c-format +msgid "Fatal parse error in brush file: Bytes = 0." +msgstr "笔刷文件中出现致命解析错误：字节 = 0。" + +#: ../app/core/gimpbrush-load.c:213 +#, c-format +msgid "Fatal parse error in brush file: Unknown depth %d." +msgstr "笔刷文件中出现致命解析错误：未知深度 %d。" + +#: ../app/core/gimpbrush-load.c:225 +#, c-format +msgid "Fatal parse error in brush file: Unknown version %d." +msgstr "笔刷文件中出现致命解析错误：未知版本 %d。" + +#: ../app/core/gimpbrush-load.c:233 +#, c-format +msgid "Unsupported brush format" +msgstr "不支持的笔刷格式" + +#: ../app/core/gimpbrush-load.c:253 ../app/core/gimpbrushgenerated-load.c:125 +#: ../app/core/gimpbrushpipe-load.c:75 +#, c-format +msgid "Invalid UTF-8 string in brush file '%s'." +msgstr "笔刷文件“%s”中含有无效的 UTF-8 字符串。" + +#: ../app/core/gimpbrush-load.c:260 ../app/core/gimppattern-load.c:130 +#: ../app/dialogs/template-options-dialog.c:110 +#: ../app/display/gimptoolpath.c:554 +msgid "Unnamed" +msgstr "未命名" + +#: ../app/core/gimpbrush-load.c:331 +#, c-format +msgid "" +"Fatal parse error in brush file:\n" +"Unsupported brush depth %d\n" +"GIMP brushes must be GRAY or RGBA.\n" +"This might be an obsolete GIMP brush file, try loading it as image and save " +"it again." +msgstr "" +"笔刷文件中出现致命解析错误：\n" +"不支持的笔刷深度 %d\n" +"GIMP 笔刷必须是灰度或者 RGBA。\n" +"这可能是过时的笔刷文件，请尝试作为图像加载它并重新保存。" + +#: ../app/core/gimpbrush-load.c:378 +#, c-format +msgid "" +"Fatal parse error in brush file:\n" +"Unsupported brush depth %d\n" +"GIMP brushes must be GRAY or RGBA." +msgstr "" +"笔刷文件中出现致命解析错误：\n" +"不支持的笔刷深度 %d\n" +"GIMP 笔刷必须是灰度或者 RGBA。" + +#: ../app/core/gimpbrush-load.c:454 +#, c-format +msgid "Unable to decode abr format version %d." +msgstr "无法解码 abr 格式版本 %d。" + +#: ../app/core/gimpbrush-load.c:572 ../app/core/gimpbrush-load.c:791 +#, c-format +msgid "Fatal parse error in brush file: Brush size value corrupt." +msgstr "笔刷文件中出现致命解析错误：笔刷尺寸值损坏。" + +#: ../app/core/gimpbrush-load.c:659 ../app/core/gimpbrush-load.c:849 +#, c-format +msgid "Fatal parse error in brush file: Brush dimensions out of range." +msgstr "笔刷文件中出现致命解析错误：笔刷尺寸超出范围。" + +#: ../app/core/gimpbrush-load.c:671 +#, c-format +msgid "Fatal parse error in brush file: Wide brushes are not supported." +msgstr "笔刷文件中出现致命解析错误：宽笔刷不受支持。" + +#: ../app/core/gimpbrush-load.c:820 +msgid "Fatal parse error in brush file: File appears truncated: " +msgstr "笔刷文件中出现致命解析错误：文件看起来被截断： " + +#: ../app/core/gimpbrush-load.c:857 +#, c-format +msgid "Fatal parse error in brush file: Unknown compression method." +msgstr "笔刷文件中出现致命解析错误：未知压缩方式。" + +#: ../app/core/gimpbrush-load.c:993 +#, c-format +msgid "" +"Fatal parse error in brush file: Unable to decode abr format version %d." +msgstr "笔刷文件中出现致命解析错误：无法解码 abr 格式版本 %d。" + +#: ../app/core/gimpbrush-load.c:1114 ../app/core/gimpbrush-load.c:1132 +#, c-format +msgid "Fatal parse error in brush file: RLE compressed brush data corrupt." +msgstr "笔刷文件中出现致命解析错误：RLE 压缩笔刷数据损坏。" + +#: ../app/core/gimpbrush.c:150 ../app/paint/gimppaintoptions.c:213 +msgid "Brush Spacing" +msgstr "笔刷间距" + +#: ../app/core/gimpbrushclipboard.c:190 +msgid "Clipboard Mask" +msgstr "剪贴板蒙板" + +#: ../app/core/gimpbrushclipboard.c:192 ../app/core/gimppatternclipboard.c:169 +msgid "Clipboard Image" +msgstr "剪贴板图像" + +#: ../app/core/gimpbrushgenerated-load.c:75 +#, c-format +msgid "Not a GIMP brush file." +msgstr "不是 GIMP 笔刷文件。" + +#: ../app/core/gimpbrushgenerated-load.c:95 +#, c-format +msgid "Unknown GIMP brush version." +msgstr "未知 GIMP 笔刷版本。" + +#: ../app/core/gimpbrushgenerated-load.c:152 +#, c-format +msgid "Unknown GIMP brush shape." +msgstr "未知 GIMP 笔刷形状." + +#: ../app/core/gimpbrushgenerated-load.c:242 +#, c-format +msgid "In line %d of brush file: " +msgstr "笔刷文件的第 %d 行： " + +#: ../app/core/gimpbrushgenerated.c:135 +msgid "Brush Shape" +msgstr "笔刷形状" + +#: ../app/core/gimpbrushgenerated.c:143 +msgid "Brush Radius" +msgstr "笔刷半径" + +#: ../app/core/gimpbrushgenerated.c:150 +msgid "Brush Spikes" +msgstr "笔刷尖数" + +#: ../app/core/gimpbrushgenerated.c:157 ../app/paint/gimppaintoptions.c:220 +msgid "Brush Hardness" +msgstr "笔刷硬度" + +#: ../app/core/gimpbrushgenerated.c:165 ../app/paint/gimppaintoptions.c:199 +msgid "Brush Aspect Ratio" +msgstr "笔刷宽高比" + +#: ../app/core/gimpbrushgenerated.c:172 ../app/paint/gimppaintoptions.c:206 +msgid "Brush Angle" +msgstr "笔刷角度" + +#: ../app/core/gimpbrushpipe-load.c:91 ../app/core/gimpbrushpipe-load.c:115 +#, c-format +msgid "Fatal parse error in brush file '%s': File is corrupt." +msgstr "笔刷文件“%s”出现严重解析错误：文件已损坏。" + +#: ../app/core/gimpchannel-select.c:66 +msgctxt "undo-type" +msgid "Rectangle Select" +msgstr "矩形选择" + +#: ../app/core/gimpchannel-select.c:118 +msgctxt "undo-type" +msgid "Ellipse Select" +msgstr "椭圆选择" + +#: ../app/core/gimpchannel-select.c:173 +msgctxt "undo-type" +msgid "Rounded Rectangle Select" +msgstr "圆角矩形选择" + +#: ../app/core/gimpchannel-select.c:440 ../app/core/gimplayer.c:448 +msgctxt "undo-type" +msgid "Alpha to Selection" +msgstr "透明到选区" + +#: ../app/core/gimpchannel-select.c:478 +#, c-format +msgctxt "undo-type" +msgid "%s Channel to Selection" +msgstr "%s 通道到选区" + +#: ../app/core/gimpchannel-select.c:529 +msgctxt "undo-type" +msgid "Fuzzy Select" +msgstr "模糊选择" + +#: ../app/core/gimpchannel-select.c:577 +msgctxt "undo-type" +msgid "Select by Color" +msgstr "按颜色选择" + +#: ../app/core/gimpchannel-select.c:616 +msgctxt "undo-type" +msgid "Select by Indexed Color" +msgstr "按索引颜色选择" + +#: ../app/core/gimpchannel.c:270 msgctxt "undo-type" msgid "Rename Channel" msgstr "重命名通道" -#: ../app/core/gimpchannel.c:272 +#: ../app/core/gimpchannel.c:271 msgctxt "undo-type" msgid "Move Channel" msgstr "移动通道" -#: ../app/core/gimpchannel.c:273 +#: ../app/core/gimpchannel.c:272 msgctxt "undo-type" msgid "Scale Channel" msgstr "缩放通道" -#: ../app/core/gimpchannel.c:274 +#: ../app/core/gimpchannel.c:273 msgctxt "undo-type" msgid "Resize Channel" msgstr "改变通道大小" -#: ../app/core/gimpchannel.c:275 +#: ../app/core/gimpchannel.c:274 msgctxt "undo-type" msgid "Flip Channel" msgstr "翻转通道" -#: ../app/core/gimpchannel.c:276 +#: ../app/core/gimpchannel.c:275 msgctxt "undo-type" msgid "Rotate Channel" msgstr "旋转通道" -#: ../app/core/gimpchannel.c:277 ../app/core/gimpdrawable-transform.c:976 +#: ../app/core/gimpchannel.c:276 ../app/core/gimpdrawable-transform.c:1013 msgctxt "undo-type" msgid "Transform Channel" msgstr "变换通道" +#: ../app/core/gimpchannel.c:277 ../app/core/gimpchannel.c:309 +msgctxt "undo-type" +msgid "Fill Channel" +msgstr "填充通道" + #: ../app/core/gimpchannel.c:278 msgctxt "undo-type" msgid "Stroke Channel" msgstr "勾画通道" -#: ../app/core/gimpchannel.c:279 ../app/core/gimpselection.c:579 +#: ../app/core/gimpchannel.c:279 msgctxt "undo-type" msgid "Channel to Selection" msgstr "通道到选区" @@ -7675,123 +12148,144 @@ msgstr "通道无法再升高。" msgid "Channel cannot be lowered more." msgstr "通道无法再降低。" -#: ../app/core/gimpchannel.c:309 +#: ../app/core/gimpchannel.c:306 msgctxt "undo-type" msgid "Feather Channel" msgstr "羽化通道" -#: ../app/core/gimpchannel.c:310 +#: ../app/core/gimpchannel.c:307 msgctxt "undo-type" msgid "Sharpen Channel" msgstr "锐化通道" -#: ../app/core/gimpchannel.c:311 +#: ../app/core/gimpchannel.c:308 msgctxt "undo-type" msgid "Clear Channel" -msgstr "清除通道" +msgstr "清空通道" -#: ../app/core/gimpchannel.c:312 -msgctxt "undo-type" -msgid "Fill Channel" -msgstr "填充通道" - -#: ../app/core/gimpchannel.c:313 +#: ../app/core/gimpchannel.c:310 msgctxt "undo-type" msgid "Invert Channel" msgstr "反转通道" -#: ../app/core/gimpchannel.c:314 +#: ../app/core/gimpchannel.c:311 msgctxt "undo-type" msgid "Border Channel" -msgstr "取通道边界" +msgstr "通道加边" -#: ../app/core/gimpchannel.c:315 +#: ../app/core/gimpchannel.c:312 msgctxt "undo-type" msgid "Grow Channel" msgstr "增长通道" -#: ../app/core/gimpchannel.c:316 +#: ../app/core/gimpchannel.c:313 msgctxt "undo-type" msgid "Shrink Channel" msgstr "收缩通道" -#: ../app/core/gimpchannel.c:724 +#: ../app/core/gimpchannel.c:314 +msgctxt "undo-type" +msgid "Flood Channel" +msgstr "溢出通道" + +#: ../app/core/gimpchannel.c:850 +msgid "Cannot fill empty channel." +msgstr "无法填充空通道。" + +#: ../app/core/gimpchannel.c:886 msgid "Cannot stroke empty channel." msgstr "无法勾画空通道。" -#: ../app/core/gimpchannel.c:1759 +#: ../app/core/gimpchannel.c:1709 msgctxt "undo-type" msgid "Set Channel Color" msgstr "设置通道颜色" -#: ../app/core/gimpchannel.c:1818 +#: ../app/core/gimpchannel.c:1760 msgctxt "undo-type" msgid "Set Channel Opacity" msgstr "设置通道不透明度" -#: ../app/core/gimpchannel.c:1920 ../app/core/gimpselection.c:153 +#: ../app/core/gimpchannel.c:1849 ../app/core/gimpselection.c:168 msgid "Selection Mask" msgstr "选区蒙板" -#: ../app/core/gimpchannel-select.c:60 -msgctxt "undo-type" -msgid "Rectangle Select" -msgstr "矩形选择" +#: ../app/core/gimpcontext.c:673 +msgid "Foreground" +msgstr "前景" -#: ../app/core/gimpchannel-select.c:111 -msgctxt "undo-type" -msgid "Ellipse Select" -msgstr "椭圆选择" +#: ../app/core/gimpcontext.c:674 ../app/core/gimpgrid.c:94 +msgid "Foreground color" +msgstr "前景色" -#: ../app/core/gimpchannel-select.c:165 -msgctxt "undo-type" -msgid "Rounded Rectangle Select" -msgstr "圆角矩形选择" +#: ../app/core/gimpcontext.c:680 ../app/core/gimpimage-new.c:150 +msgid "Background" +msgstr "背景" -#: ../app/core/gimpchannel-select.c:408 ../app/core/gimplayer.c:298 -msgctxt "undo-type" -msgid "Alpha to Selection" -msgstr "Alpha 到选区" +#: ../app/core/gimpcontext.c:681 ../app/core/gimpgrid.c:101 +msgid "Background color" +msgstr "背景色" -#: ../app/core/gimpchannel-select.c:446 -#, c-format -msgctxt "undo-type" -msgid "%s Channel to Selection" -msgstr "%s 通道到选区" - -#: ../app/core/gimpchannel-select.c:494 -msgctxt "undo-type" -msgid "Fuzzy Select" -msgstr "模糊选择" - -#: ../app/core/gimpchannel-select.c:541 -msgctxt "undo-type" -msgid "Select by Color" -msgstr "按颜色选择" - -#: ../app/core/gimpcontext.c:640 ../app/tools/gimppaintoptions-gui.c:111 -#: ../app/widgets/gimpbrushselect.c:178 ../app/widgets/gimplayertreeview.c:284 +#: ../app/core/gimpcontext.c:687 ../app/core/gimpcontext.c:688 +#: ../app/dialogs/fade-dialog.c:158 ../app/widgets/gimpbrushselect.c:175 +#: ../app/widgets/gimplayertreeview.c:295 msgid "Opacity" msgstr "不透明度" -#: ../app/core/gimpcontext.c:648 +#: ../app/core/gimpcontext.c:696 ../app/core/gimpcontext.c:697 msgid "Paint Mode" -msgstr "涂画模式" +msgstr "绘画模式" -#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:375 -#: ../app/gui/session.c:399 ../app/menus/menus.c:468 -#: ../app/widgets/gimpdevices.c:207 +#: ../app/core/gimpcontext.c:704 ../app/core/gimpcontext.c:705 +#: ../app/tools/gimpmybrushoptions-gui.c:54 +#: ../app/tools/gimppaintoptions-gui.c:162 +msgid "Brush" +msgstr "笔刷" + +#: ../app/core/gimpcontext.c:712 +msgid "Paint dynamics" +msgstr "动态绘画" + +#: ../app/core/gimpcontext.c:718 ../app/core/gimpcontext.c:719 +#: ../app/tools/gimpmybrushtool.c:73 +msgid "MyPaint Brush" +msgstr "MyPaint 笔刷" + +#: ../app/core/gimpcontext.c:725 ../app/core/gimpcontext.c:726 +msgid "Pattern" +msgstr "图案" + +#: ../app/core/gimpcontext.c:732 ../app/core/gimpcontext.c:733 +#: ../app/tools/gimpblendoptions.c:283 ../app/tools/gimppaintoptions-gui.c:374 +msgid "Gradient" +msgstr "渐变" + +#: ../app/core/gimpcontext.c:739 ../app/core/gimpcontext.c:740 +#: ../app/widgets/gimpcolorselectorpalette.c:59 +msgid "Palette" +msgstr "色板" + +#: ../app/core/gimpcontext.c:746 ../app/core/gimpcontext.c:747 +msgid "Tool Preset" +msgstr "工具预设" + +#: ../app/core/gimpcontext.c:753 ../app/core/gimpcontext.c:754 +#: ../app/tools/gimptextoptions.c:530 +msgid "Font" +msgstr "字体" + +#: ../app/core/gimpdata.c:582 ../app/core/gimpdata.c:590 #, c-format -msgid "Deleting \"%s\" failed: %s" -msgstr "删除“%s”失败：%s" +msgid "Error saving '%s': " +msgstr "保存“%s”时出错： " -#: ../app/core/gimpdata.c:670 +#: ../app/core/gimpdata.c:596 #, c-format -msgid "Could not delete '%s': %s" -msgstr "无法删除“%s”：%s" +msgid "Error saving '%s'" +msgstr "保存“%s”时出错" -#: ../app/core/gimpdatafactory.c:428 ../app/core/gimpdatafactory.c:457 -#: ../app/core/gimpdatafactory.c:623 ../app/core/gimpdatafactory.c:645 +#: ../app/core/gimpdatafactory.c:433 ../app/core/gimpdatafactory.c:458 +#: ../app/core/gimpdatafactory.c:625 ../app/core/gimpdatafactory.c:647 #, c-format msgid "" "Failed to save data:\n" @@ -7802,710 +12296,860 @@ msgstr "" "\n" "%s" -#: ../app/core/gimpdatafactory.c:537 ../app/core/gimpdatafactory.c:540 -#: ../app/core/gimpitem.c:493 ../app/core/gimpitem.c:496 +#: ../app/core/gimpdatafactory.c:539 ../app/core/gimpdatafactory.c:542 +#: ../app/core/gimpitem.c:540 ../app/core/gimpitem.c:543 msgid "copy" msgstr "副本" -#: ../app/core/gimpdatafactory.c:549 ../app/core/gimpitem.c:505 +#: ../app/core/gimpdatafactory.c:551 ../app/core/gimpitem.c:551 #, c-format msgid "%s copy" -msgstr "%s副本" +msgstr "%s 副本" #: ../app/core/gimpdatafactory.c:742 #, c-format msgid "" "You have a writable data folder configured (%s), but this folder does not " -"exist. Please create the folder or fix your configuation in the Preferences " +"exist. Please create the folder or fix your configuration in the Preferences " "dialog's 'Folders' section." msgstr "" -"您设置了可写入的数据文件夹(%s)，但该文件夹不存在。请创建该文件夹或在首选项对" -"话框的“文件夹”项中修正您的设置。" +"您配置了一个可写数据文件夹 (%s)，但该文件夹不存在。请创建该文件夹或修正首选项" +"对话框中“文件夹”项的设置。" -#: ../app/core/gimpdatafactory.c:763 +#: ../app/core/gimpdatafactory.c:761 #, c-format msgid "" "You have a writable data folder configured, but this folder is not part of " "your data search path. You probably edited the gimprc file manually, please " "fix it in the Preferences dialog's 'Folders' section." msgstr "" -"您设置了可写入的数据文件夹，但该文件夹不是您数据搜索路径的一部分。您可能手动" -"编辑过 gimprc 文件，请在首选项对话框的“文件夹”项中修正您的设置。" +"您配置了一个可写数据文件夹，但该文件夹不是您数据搜索路径的一部分。您可能手动" +"编辑过 gimprc 文件，请在首选项对话框中的“文件夹”项中修正您的设置。" -#: ../app/core/gimpdatafactory.c:773 +#: ../app/core/gimpdatafactory.c:771 #, c-format msgid "You don't have any writable data folder configured." -msgstr "您没有配置任何可写入的数据文件夹。" +msgstr "您没有配置任何可写数据文件夹。" -#: ../app/core/gimpdatafactory.c:937 +#: ../app/core/gimpdatafactory.c:904 +#, c-format +msgid "Error loading '%s': " +msgstr "载入“%s”时出错： " + +#: ../app/core/gimpdatafactory.c:910 +#, c-format +msgid "Error loading '%s'" +msgstr "载入“%s”时出错" + +#: ../app/core/gimpdatafactory.c:920 ../app/xcf/xcf.c:439 +#, c-format +msgid "Could not open '%s' for reading: " +msgstr "无法打开“%s”以读取： " + +#: ../app/core/gimpdatafactory.c:979 #, c-format msgid "" "Failed to load data:\n" "\n" "%s" msgstr "" -"装入数据失败：\n" +"载入数据失败：\n" "\n" "%s" -#: ../app/core/gimpdrawable-blend.c:208 -msgctxt "undo-type" -msgid "Blend" -msgstr "混合" - -#: ../app/core/gimpdrawable-blend.c:539 -msgid "Calculating distance map" -msgstr "" - -#: ../app/core/gimpdrawable-blend.c:907 ../app/pdb/edit-cmds.c:758 -#: ../app/tools/gimpblendtool.c:242 -msgid "Blending" -msgstr "混合" - -#: ../app/core/gimpdrawable-bucket-fill.c:101 -msgid "No patterns available for this operation." -msgstr "没有可供此操作使用的图案。" - -#: ../app/core/gimpdrawable-bucket-fill.c:264 -msgctxt "undo-type" -msgid "Bucket Fill" -msgstr "油漆桶填充" - -#: ../app/core/gimpdrawable.c:456 +#: ../app/core/gimpdrawable.c:480 msgctxt "undo-type" msgid "Scale" msgstr "缩放" -#: ../app/core/gimpdrawable-equalize.c:52 +#: ../app/core/gimpdrawable-blend.c:125 ../app/tools/gimpblendtool.c:1015 +msgctxt "undo-type" +msgid "Blend" +msgstr "混合" + +#: ../app/core/gimpdrawable-blend.c:213 +msgid "Calculating distance map" +msgstr "正在计算距离映射" + +#: ../app/core/gimpdrawable-bucket-fill.c:180 +msgctxt "undo-type" +msgid "Bucket Fill" +msgstr "油漆桶填充" + +#: ../app/core/gimpdrawable-equalize.c:63 msgctxt "undo-type" msgid "Equalize" msgstr "均化" -#: ../app/core/gimpdrawable-foreground-extract.c:132 -msgid "Foreground Extraction" -msgstr "前景提取" +#: ../app/core/gimpdrawable-floating-selection.c:191 +msgid "Floating Selection" +msgstr "浮动选区" -#: ../app/core/gimpdrawable-levels.c:71 ../app/tools/gimplevelstool.c:141 +#: ../app/core/gimpdrawable-foreground-extract.c:66 +msgid "Computing alpha of unknown pixels" +msgstr "正在计算未知像素的透明度" + +#: ../app/core/gimpdrawable-fill.c:202 ../app/vectors/gimpvectors.c:668 +msgid "Not enough points to fill" +msgstr "没有足够的点来填充" + +#: ../app/core/gimpdrawable-fill.c:256 +msgctxt "undo-type" +msgid "Render Stroke" +msgstr "渲染笔廓" + +#: ../app/core/gimpdrawable-levels.c:72 +#: ../app/tools/gimpforegroundselectoptions.c:116 +#: ../app/tools/gimplevelstool.c:132 msgid "Levels" msgstr "色阶" -#: ../app/core/gimpdrawable-offset.c:242 +#: ../app/core/gimpdrawable-offset.c:249 msgctxt "undo-type" msgid "Offset Drawable" -msgstr "位移可绘" +msgstr "偏移可绘" -#: ../app/core/gimpdrawable-stroke.c:272 -#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:557 +#: ../app/core/gimpdrawable-stroke.c:111 +#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:690 msgid "Not enough points to stroke" -msgstr "不足够的笔画点" +msgstr "没有足够的点勾画笔廓" -#: ../app/core/gimpdrawable-stroke.c:273 -#, fuzzy -msgid "Not enough points to fill" -msgstr "不足够的笔画点" - -#: ../app/core/gimpdrawable-stroke.c:395 -msgctxt "undo-type" -msgid "Render Stroke" -msgstr "渲染勾画" - -#: ../app/core/gimpdrawable-transform.c:747 +#: ../app/core/gimpdrawable-transform.c:781 msgctxt "undo-type" msgid "Flip" msgstr "翻转" -#: ../app/core/gimpdrawable-transform.c:833 +#: ../app/core/gimpdrawable-transform.c:866 msgctxt "undo-type" msgid "Rotate" msgstr "旋转" -#: ../app/core/gimpdrawable-transform.c:974 ../app/core/gimplayer.c:297 +#: ../app/core/gimpdrawable-transform.c:1011 ../app/core/gimplayer.c:447 msgctxt "undo-type" msgid "Transform Layer" msgstr "变换图层" -#: ../app/core/gimpdrawable-transform.c:987 +#: ../app/core/gimpdrawable-transform.c:1024 msgid "Transformation" msgstr "变换" -#: ../app/core/gimpdynamicsoutput.c:135 +#: ../app/core/gimpdynamicsoutput.c:136 msgid "Output type" msgstr "输出类型" -#: ../app/core/gimp-edit.c:184 ../app/core/gimpimage-new.c:305 -msgid "Pasted Layer" -msgstr "被粘贴的图层" +#: ../app/core/gimpfilloptions.c:103 +msgid "Style" +msgstr "样式" -#: ../app/core/gimp-edit.c:387 -msgctxt "undo-type" -msgid "Clear" -msgstr "清除" +#: ../app/core/gimpfilloptions.c:111 ../app/pdb/gimppdbcontext.c:100 +#: ../app/tools/gimpbucketfilloptions.c:132 +#: ../app/tools/gimpselectionoptions.c:80 ../app/tools/gimptextoptions.c:134 +msgid "Antialiasing" +msgstr "抗锯齿" -#: ../app/core/gimp-edit.c:411 +#: ../app/core/gimpfilloptions.c:303 msgctxt "undo-type" msgid "Fill with Foreground Color" msgstr "以前景色填充" -#: ../app/core/gimp-edit.c:416 +#: ../app/core/gimpfilloptions.c:308 msgctxt "undo-type" msgid "Fill with Background Color" msgstr "以背景色填充" -#: ../app/core/gimp-edit.c:421 +#: ../app/core/gimpfilloptions.c:313 msgctxt "undo-type" msgid "Fill with White" msgstr "以白色填充" -#: ../app/core/gimp-edit.c:426 +#: ../app/core/gimpfilloptions.c:320 msgctxt "undo-type" msgid "Fill with Transparency" msgstr "以透明填充" -#: ../app/core/gimp-edit.c:431 +#: ../app/core/gimpfilloptions.c:336 ../app/core/gimpfilloptions.c:404 msgctxt "undo-type" msgid "Fill with Pattern" msgstr "以图案填充" -#: ../app/core/gimp-edit.c:585 -msgid "Global Buffer" -msgstr "全局缓冲区" +#: ../app/core/gimpfilloptions.c:401 +msgctxt "undo-type" +msgid "Fill with Solid Color" +msgstr "使用纯色填充" -#: ../app/core/gimpgradient-load.c:73 ../app/core/gimpgradient-load.c:98 -#: ../app/core/gimpgradient-load.c:119 ../app/core/gimpgradient-load.c:170 +#: ../app/core/gimpgradient-load.c:72 #, c-format -msgid "Fatal parse error in gradient file '%s': Read error in line %d." -msgstr "渐变文件“%s”出现严重解析错误：第 %d 行读入出错。" +msgid "Not a GIMP gradient file." +msgstr "不是 GIMP 渐变文件。" -#: ../app/core/gimpgradient-load.c:83 -#, c-format -msgid "Fatal parse error in gradient file '%s': Not a GIMP gradient file." -msgstr "渐变文件“%s”出现严重解析错误：不是 GIMP 渐变文件。" - -#: ../app/core/gimpgradient-load.c:111 +#: ../app/core/gimpgradient-load.c:95 #, c-format msgid "Invalid UTF-8 string in gradient file '%s'." msgstr "渐变文件“%s”中含有无效的 UTF-8 字符串。" -#: ../app/core/gimpgradient-load.c:138 +#: ../app/core/gimpgradient-load.c:121 #, c-format -msgid "Fatal parse error in gradient file '%s': File is corrupt in line %d." -msgstr "渐变文件“%s”出现严重解析错误：文件在第 %d 行已损坏。" +msgid "File is corrupt." +msgstr "文件已损坏。" -#: ../app/core/gimpgradient-load.c:220 ../app/core/gimpgradient-load.c:231 +#: ../app/core/gimpgradient-load.c:189 ../app/core/gimpgradient-load.c:199 +#: ../app/core/gimpgradient-load.c:211 ../app/core/gimpgradient-load.c:221 +#: ../app/core/gimpgradient-load.c:229 ../app/core/gimpgradient-load.c:237 #, c-format -msgid "Fatal parse error in gradient file '%s': Corrupt segment %d in line %d." -msgstr "渐变文件“%s”出现严重解析错误：第 %d 段在第 %d 行已损坏。" +msgid "Corrupt segment %d." +msgstr "已损坏的片段 %d。" -#: ../app/core/gimpgradient-load.c:243 ../app/core/gimpgradient-load.c:257 +#: ../app/core/gimpgradient-load.c:248 ../app/core/gimpgradient-load.c:258 #, c-format -msgid "Gradient file '%s' is corrupt: Segments do not span the range 0-1." -msgstr "渐变文件“%s”损坏：段的范围不在 0-1 间。" +msgid "Segments do not span the range 0-1." +msgstr "片段没有跨越范围 0-1。" -#: ../app/core/gimpgradient-load.c:337 +#: ../app/core/gimpgradient-load.c:273 #, c-format -msgid "No linear gradients found in '%s'" -msgstr "“%s”中未找到线性渐变" +msgid "In line %d of gradient file: " +msgstr "渐变文件中的第 %d 行： " -#: ../app/core/gimpgradient-load.c:347 +#: ../app/core/gimpgradient-load.c:349 #, c-format -msgid "Failed to import gradients from '%s': %s" -msgstr "无法从“%s”导入渐变：%s" +msgid "No linear gradients found." +msgstr "未找到线性渐变。" -#: ../app/core/gimp-gradients.c:62 -msgid "FG to BG (RGB)" -msgstr "前景到背景(RGB)" +#: ../app/core/gimpgradient-save.c:211 +#, c-format +msgid "Writing POV file '%s' failed: %s" +msgstr "写入 POV 文件“%s”失败：%s" -#: ../app/core/gimp-gradients.c:70 -msgid "FG to BG (Hardedge)" -msgstr "前景到背景(硬边)" +#: ../app/core/gimpgrid.c:86 +msgid "Line style" +msgstr "线条样式" -#: ../app/core/gimp-gradients.c:87 -msgid "FG to BG (HSV counter-clockwise)" -msgstr "前景到背景(HSV 逆时针色调)" - -#: ../app/core/gimp-gradients.c:95 -msgid "FG to BG (HSV clockwise hue)" -msgstr "前景到背景(HSV 顺时针色调)" - -#: ../app/core/gimp-gradients.c:103 -msgid "FG to Transparent" -msgstr "前景到透明" - -#: ../app/core/gimpgrid.c:85 +#: ../app/core/gimpgrid.c:87 msgid "Line style used for the grid." msgstr "网格使用的线型。" -#: ../app/core/gimpgrid.c:91 +#: ../app/core/gimpgrid.c:95 msgid "The foreground color of the grid." msgstr "网格的前景色。" -#: ../app/core/gimpgrid.c:96 +#: ../app/core/gimpgrid.c:102 msgid "" "The background color of the grid; only used in double dashed line style." -msgstr "网格的背景色；只用于双虚线线型。" +msgstr "网格的背景色；只用于双划线线型。" -#: ../app/core/gimpgrid.c:102 +#: ../app/core/gimpgrid.c:109 +msgid "Spacing X" +msgstr "间距 X" + +#: ../app/core/gimpgrid.c:110 msgid "Horizontal spacing of grid lines." -msgstr "网格的水平间距。" - -#: ../app/core/gimpgrid.c:107 -msgid "Vertical spacing of grid lines." -msgstr "网格的垂直间距。" +msgstr "网格线的水平间距。" #: ../app/core/gimpgrid.c:116 +msgid "Spacing Y" +msgstr "间距 Y" + +#: ../app/core/gimpgrid.c:117 +msgid "Vertical spacing of grid lines." +msgstr "网格线的竖直间距。" + +#: ../app/core/gimpgrid.c:123 +msgid "Spacing unit" +msgstr "间距单位" + +#: ../app/core/gimpgrid.c:130 +msgid "Offset X" +msgstr "位移 X" + +#: ../app/core/gimpgrid.c:131 msgid "" "Horizontal offset of the first grid line; this may be a negative number." msgstr "第一条网格线的水平位移；可以是负数。" -#: ../app/core/gimpgrid.c:123 +#: ../app/core/gimpgrid.c:139 +msgid "Offset Y" +msgstr "位移 Y" + +#: ../app/core/gimpgrid.c:140 msgid "Vertical offset of the first grid line; this may be a negative number." -msgstr "第一条网格线的垂直位移；可以是负数。" +msgstr "第一条网格线的竖直位移；可以是负数。" -#: ../app/core/gimpgrouplayer.c:220 +#: ../app/core/gimpgrid.c:148 +msgid "Offset unit" +msgstr "位移单位" + +#: ../app/core/gimpgrouplayer.c:277 msgid "Layer Group" -msgstr "图层群组" +msgstr "图层组" -#: ../app/core/gimpgrouplayer.c:221 +#: ../app/core/gimpgrouplayer.c:278 msgctxt "undo-type" msgid "Rename Layer Group" -msgstr "重命名图层群组" +msgstr "重命名图层组" -#: ../app/core/gimpgrouplayer.c:222 +#: ../app/core/gimpgrouplayer.c:279 msgctxt "undo-type" msgid "Move Layer Group" -msgstr "移动图层群组" +msgstr "移动图层组" -#: ../app/core/gimpgrouplayer.c:223 +#: ../app/core/gimpgrouplayer.c:280 msgctxt "undo-type" msgid "Scale Layer Group" -msgstr "缩放图层群组" +msgstr "缩放图层组" -#: ../app/core/gimpgrouplayer.c:224 +#: ../app/core/gimpgrouplayer.c:281 msgctxt "undo-type" msgid "Resize Layer Group" -msgstr "改变图层群组的大小" +msgstr "改变图层组大小" -#: ../app/core/gimpgrouplayer.c:225 +#: ../app/core/gimpgrouplayer.c:282 msgctxt "undo-type" msgid "Flip Layer Group" -msgstr "翻转图层群组" +msgstr "翻转图层组" -#: ../app/core/gimpgrouplayer.c:226 +#: ../app/core/gimpgrouplayer.c:283 msgctxt "undo-type" msgid "Rotate Layer Group" -msgstr "旋转图层群组" +msgstr "旋转图层组" -#: ../app/core/gimpgrouplayer.c:227 +#: ../app/core/gimpgrouplayer.c:284 msgctxt "undo-type" msgid "Transform Layer Group" -msgstr "变换图层群组" +msgstr "变换图层组" -#: ../app/core/gimpimage-arrange.c:142 -msgctxt "undo-type" -msgid "Arrange Objects" -msgstr "整理对象" +#: ../app/core/gimpimage.c:645 ../app/widgets/gimpsymmetryeditor.c:179 +msgid "Symmetry" +msgstr "对称" -#: ../app/core/gimpimage.c:1927 +#: ../app/core/gimpimage.c:2223 +msgid " (exported)" +msgstr " (已导出)" + +#: ../app/core/gimpimage.c:2227 +msgid " (overwritten)" +msgstr " (已覆盖)" + +#: ../app/core/gimpimage.c:2236 +msgid " (imported)" +msgstr " (已导入)" + +#: ../app/core/gimpimage.c:2564 msgctxt "undo-type" msgid "Change Image Resolution" msgstr "改变图像分辨率" -#: ../app/core/gimpimage.c:1979 +#: ../app/core/gimpimage.c:2616 msgctxt "undo-type" msgid "Change Image Unit" msgstr "改变图像单位" -#: ../app/core/gimpimage.c:2792 +#: ../app/core/gimpimage.c:3500 +#, c-format +msgid "" +"'gimp-comment' parasite validation failed: comment contains invalid UTF-8" +msgstr "“GIMP 注释”内嵌信息校验失败：注释包含无效的 UTF-8" + +#: ../app/core/gimpimage.c:3552 msgctxt "undo-type" msgid "Attach Parasite to Image" -msgstr "添加寄生物到图像" +msgstr "添加内嵌信息到图像" -#: ../app/core/gimpimage.c:2833 +#: ../app/core/gimpimage.c:3593 msgctxt "undo-type" msgid "Remove Parasite from Image" -msgstr "从图像删除寄生物" +msgstr "从图像删除内嵌信息" -#: ../app/core/gimpimage.c:3542 +#: ../app/core/gimpimage.c:4304 msgctxt "undo-type" msgid "Add Layer" msgstr "添加图层" -#: ../app/core/gimpimage.c:3592 ../app/core/gimpimage.c:3612 +#: ../app/core/gimpimage.c:4346 ../app/core/gimpimage.c:4377 msgctxt "undo-type" msgid "Remove Layer" msgstr "删除图层" -#: ../app/core/gimpimage.c:3606 +#: ../app/core/gimpimage.c:4371 msgctxt "undo-type" msgid "Remove Floating Selection" msgstr "删除浮动选区" -#: ../app/core/gimpimage.c:3774 +#: ../app/core/gimpimage.c:4538 msgctxt "undo-type" msgid "Add Channel" msgstr "添加通道" -#: ../app/core/gimpimage.c:3812 ../app/core/gimpimage.c:3825 +#: ../app/core/gimpimage.c:4566 ../app/core/gimpimage.c:4590 msgctxt "undo-type" msgid "Remove Channel" msgstr "删除通道" -#: ../app/core/gimpimage.c:3879 +#: ../app/core/gimpimage.c:4646 msgctxt "undo-type" msgid "Add Path" msgstr "添加路径" -#: ../app/core/gimpimage.c:3910 +#: ../app/core/gimpimage.c:4676 ../app/core/gimpimage.c:4683 msgctxt "undo-type" msgid "Remove Path" msgstr "删除路径" +#: ../app/core/gimpimage-arrange.c:173 +msgctxt "undo-type" +msgid "Arrange Objects" +msgstr "整理对象" + +#: ../app/core/gimpimage-color-profile.c:122 +msgid "ICC profile validation failed: Parasite's name is not 'icc-profile'" +msgstr "ICC 配置文件验证失败：内嵌信息的名字不是“icc-profile”" + +#: ../app/core/gimpimage-color-profile.c:131 +msgid "" +"ICC profile validation failed: Parasite's flags are not (PERSISTENT | " +"UNDOABLE)" +msgstr "ICC 配置文件验证失败：内嵌信息的标志不是(PERSISTENT | UNDOABLE)" + +#: ../app/core/gimpimage-color-profile.c:188 +msgid "ICC profile validation failed: " +msgstr "ICC 配置文件验证失败： " + +#: ../app/core/gimpimage-color-profile.c:332 +msgid "" +"ICC profile validation failed: Color profile is not for grayscale color space" +msgstr "ICC 配置文件验证失败：色彩配置文件不可用于灰度色彩空间" + +#: ../app/core/gimpimage-color-profile.c:342 +msgid "ICC profile validation failed: Color profile is not for RGB color space" +msgstr "ICC 配置文件验证失败：色彩配置文件不可用于 RGB 色彩空间" + +#: ../app/core/gimpimage-color-profile.c:397 +#, c-format +msgid "Converting from '%s' to '%s'" +msgstr "从“%s”转换为“%s”" + +#: ../app/core/gimpimage-color-profile.c:402 +msgid "Color profile conversion" +msgstr "色彩配置文件转换" + #: ../app/core/gimpimage-colormap.c:65 #, c-format msgid "Colormap of Image #%d (%s)" -msgstr "图像 #%d 的颜色表 (%s)" +msgstr "图像 #%d 的颜色表(%s)" -#: ../app/core/gimpimage-colormap.c:196 +#: ../app/core/gimpimage-colormap.c:193 msgctxt "undo-type" msgid "Set Colormap" msgstr "设置颜色表" -#: ../app/core/gimpimage-colormap.c:277 +#: ../app/core/gimpimage-colormap.c:241 +msgctxt "undo-type" +msgid "Unset Colormap" +msgstr "重置颜色表" + +#: ../app/core/gimpimage-colormap.c:294 msgctxt "undo-type" msgid "Change Colormap entry" msgstr "改变颜色表项" -#: ../app/core/gimpimage-colormap.c:305 +#: ../app/core/gimpimage-colormap.c:322 msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "添加颜色到颜色表" -#: ../app/core/gimpimage-convert.c:773 +#: ../app/core/gimpimage-convert-indexed.c:786 msgid "Cannot convert image: palette is empty." msgstr "无法转换图像：色板为空。" -#: ../app/core/gimpimage-convert.c:789 -msgctxt "undo-type" -msgid "Convert Image to RGB" -msgstr "将图像转换为 RGB" - -#: ../app/core/gimpimage-convert.c:793 -msgctxt "undo-type" -msgid "Convert Image to Grayscale" -msgstr "将图像转换为灰度" - -#: ../app/core/gimpimage-convert.c:797 +#: ../app/core/gimpimage-convert-indexed.c:798 msgctxt "undo-type" msgid "Convert Image to Indexed" msgstr "将图像转换为索引颜色" -#: ../app/core/gimpimage-convert.c:878 +#: ../app/core/gimpimage-convert-indexed.c:890 msgid "Converting to indexed colors (stage 2)" msgstr "正在转换为索引颜色(第 2 阶段)" -#: ../app/core/gimpimage-convert.c:923 +#: ../app/core/gimpimage-convert-indexed.c:939 msgid "Converting to indexed colors (stage 3)" msgstr "正在转换为索引颜色(第 3 阶段)" -#: ../app/core/gimpimage-convert-precision.c:63 -#, fuzzy +#: ../app/core/gimpimage-convert-precision.c:76 msgctxt "undo-type" -msgid "Convert Image to 8 bit integer" -msgstr "将图像转换为索引颜色" - -#: ../app/core/gimpimage-convert-precision.c:67 -#, fuzzy -msgctxt "undo-type" -msgid "Convert Image to 16 bit integer" -msgstr "将图像转换为索引颜色" - -#: ../app/core/gimpimage-convert-precision.c:71 -#, fuzzy -msgctxt "undo-type" -msgid "Convert Image to 32 bit integer" -msgstr "将图像转换为索引颜色" - -#: ../app/core/gimpimage-convert-precision.c:75 -msgctxt "undo-type" -msgid "Convert Image to 16 bit floating point" -msgstr "" +msgid "Convert Image to 8 bit linear integer" +msgstr "将图像转换为 8 位线性颜色深度" #: ../app/core/gimpimage-convert-precision.c:79 msgctxt "undo-type" -msgid "Convert Image to 32 bit floating point" -msgstr "" +msgid "Convert Image to 8 bit gamma integer" +msgstr "将图像转换为 8 位伽马颜色深度" -#: ../app/core/gimpimage-crop.c:122 +#: ../app/core/gimpimage-convert-precision.c:82 +msgctxt "undo-type" +msgid "Convert Image to 16 bit linear integer" +msgstr "将图像转换为 16 位线性颜色深度" + +#: ../app/core/gimpimage-convert-precision.c:85 +msgctxt "undo-type" +msgid "Convert Image to 16 bit gamma integer" +msgstr "将图像转换为 16 位伽马颜色深度" + +#: ../app/core/gimpimage-convert-precision.c:88 +msgctxt "undo-type" +msgid "Convert Image to 32 bit linear integer" +msgstr "将图像转换为 32 位线性颜色深度" + +#: ../app/core/gimpimage-convert-precision.c:91 +msgctxt "undo-type" +msgid "Convert Image to 32 bit gamma integer" +msgstr "将图像转换为 32 位伽马颜色深度" + +#: ../app/core/gimpimage-convert-precision.c:94 +msgctxt "undo-type" +msgid "Convert Image to 16 bit linear floating point" +msgstr "将图像转换为 16 位线性浮点颜色深度" + +#: ../app/core/gimpimage-convert-precision.c:97 +msgctxt "undo-type" +msgid "Convert Image to 16 bit gamma floating point" +msgstr "将图像转换为 16 位伽马浮点颜色深度" + +#: ../app/core/gimpimage-convert-precision.c:100 +msgctxt "undo-type" +msgid "Convert Image to 32 bit linear floating point" +msgstr "将图像转换为 32 位线性浮点颜色深度" + +#: ../app/core/gimpimage-convert-precision.c:103 +msgctxt "undo-type" +msgid "Convert Image to 32 bit gamma floating point" +msgstr "将图像转换为 32 位伽马浮点颜色深度" + +#: ../app/core/gimpimage-convert-precision.c:106 +msgctxt "undo-type" +msgid "Convert Image to 64 bit linear floating point" +msgstr "将图像转换为 64 位线性浮点颜色深度" + +#: ../app/core/gimpimage-convert-precision.c:109 +msgctxt "undo-type" +msgid "Convert Image to 64 bit gamma floating point" +msgstr "将图像转换为 64 位伽马浮点颜色深度" + +#. dithering +#: ../app/core/gimpimage-convert-precision.c:267 +#: ../app/core/gimpimage-convert-precision.c:288 +#: ../app/dialogs/convert-indexed-dialog.c:236 +#: ../app/dialogs/convert-precision-dialog.c:221 +#: ../app/tools/gimpblendoptions.c:135 +msgid "Dithering" +msgstr "递色" + +#: ../app/core/gimpimage-convert-type.c:81 +msgctxt "undo-type" +msgid "Convert Image to RGB" +msgstr "将图像转换为 RGB" + +#: ../app/core/gimpimage-convert-type.c:85 +msgctxt "undo-type" +msgid "Convert Image to Grayscale" +msgstr "将图像转换为灰度" + +#: ../app/core/gimpimage-crop.c:72 msgctxt "undo-type" msgid "Crop Image" msgstr "剪裁图像" -#: ../app/core/gimpimage-crop.c:125 ../app/core/gimpimage-resize.c:86 +#: ../app/core/gimpimage-crop.c:75 ../app/core/gimpimage-resize.c:91 msgctxt "undo-type" msgid "Resize Image" -msgstr "图像改变大小" +msgstr "改变图像大小" -#: ../app/core/gimpimagefile.c:700 ../app/dialogs/preferences-dialog.c:1712 +#: ../app/core/gimpimage-guides.c:53 +msgctxt "undo-type" +msgid "Add Horizontal Guide" +msgstr "添加水平参考线" + +#: ../app/core/gimpimage-guides.c:77 +msgctxt "undo-type" +msgid "Add Vertical Guide" +msgstr "添加竖直参考线" + +#: ../app/core/gimpimage-guides.c:121 +msgctxt "undo-type" +msgid "Remove Guide" +msgstr "删除参考线" + +#: ../app/core/gimpimage-guides.c:151 +msgctxt "undo-type" +msgid "Move Guide" +msgstr "移动参考线" + +#: ../app/core/gimpimage-item-list.c:117 +msgctxt "undo-type" +msgid "Translate Items" +msgstr "转化项目" + +#: ../app/core/gimpimage-item-list.c:157 +msgctxt "undo-type" +msgid "Flip Items" +msgstr "翻转项目" + +#: ../app/core/gimpimage-item-list.c:196 ../app/core/gimpitem-linked.c:164 +msgctxt "undo-type" +msgid "Rotate Items" +msgstr "旋转项目" + +#: ../app/core/gimpimage-item-list.c:246 +msgctxt "undo-type" +msgid "Transform Items" +msgstr "变换项目" + +#: ../app/core/gimpimage-merge.c:135 +msgctxt "undo-type" +msgid "Merge Visible Layers" +msgstr "合并可见图层" + +#: ../app/core/gimpimage-merge.c:198 +msgctxt "undo-type" +msgid "Flatten Image" +msgstr "平整图像" + +#: ../app/core/gimpimage-merge.c:220 +msgid "Cannot flatten an image without any visible layer." +msgstr "无法在无可见图层时平整图像。" + +#: ../app/core/gimpimage-merge.c:245 +msgid "Cannot merge down a floating selection." +msgstr "无法向下合并浮动选区。" + +#: ../app/core/gimpimage-merge.c:252 +msgid "Cannot merge down an invisible layer." +msgstr "无法向下合并不可见图层。" + +#: ../app/core/gimpimage-merge.c:277 +msgid "Cannot merge down to a layer group." +msgstr "无法向下合并到图层组。" + +#: ../app/core/gimpimage-merge.c:284 +msgid "The layer to merge down to is locked." +msgstr "要向下合并的目标图层被锁定。" + +#: ../app/core/gimpimage-merge.c:296 +msgid "There is no visible layer to merge down to." +msgstr "没有可见图层可以向下合并。" + +#: ../app/core/gimpimage-merge.c:306 +msgctxt "undo-type" +msgid "Merge Down" +msgstr "向下合并" + +#: ../app/core/gimpimage-merge.c:334 +msgctxt "undo-type" +msgid "Merge Layer Group" +msgstr "合并图层组" + +#: ../app/core/gimpimage-merge.c:387 +msgctxt "undo-type" +msgid "Merge Visible Paths" +msgstr "合并可见路径" + +#: ../app/core/gimpimage-merge.c:423 +msgid "Not enough visible paths for a merge. There must be at least two." +msgstr "没有足够多的可见路径可合并。至少需要两个。" + +#: ../app/core/gimpimage-quick-mask.c:88 +msgctxt "undo-type" +msgid "Enable Quick Mask" +msgstr "启用快速蒙板" + +#: ../app/core/gimpimage-quick-mask.c:120 +msgctxt "undo-type" +msgid "Disable Quick Mask" +msgstr "禁用快速蒙板" + +#: ../app/core/gimpimage-sample-points.c:52 +msgctxt "undo-type" +msgid "Add Sample Point" +msgstr "添加采样点" + +#: ../app/core/gimpimage-sample-points.c:96 +msgctxt "undo-type" +msgid "Remove Sample Point" +msgstr "删除采样点" + +#: ../app/core/gimpimage-sample-points.c:123 +msgctxt "undo-type" +msgid "Move Sample Point" +msgstr "移动采样点" + +#: ../app/core/gimpimage-scale.c:79 +msgctxt "undo-type" +msgid "Scale Image" +msgstr "缩放图像" + +#: ../app/core/gimpimage-undo-push.c:1028 +#, c-format +msgid "Can't undo %s" +msgstr "无法撤消 %s" + +#: ../app/core/gimpimagefile.c:750 ../app/dialogs/preferences-dialog.c:1842 +#: ../app/dialogs/preferences-dialog.c:1948 msgid "Folder" msgstr "文件夹" -#: ../app/core/gimpimagefile.c:705 +#: ../app/core/gimpimagefile.c:755 msgid "Special File" msgstr "特殊文件" -#: ../app/core/gimpimagefile.c:721 +#: ../app/core/gimpimagefile.c:771 msgid "Remote File" msgstr "远程文件" -#: ../app/core/gimpimagefile.c:740 +#: ../app/core/gimpimagefile.c:790 msgid "Click to create preview" -msgstr "点击生成预览" +msgstr "单击生成预览" -#: ../app/core/gimpimagefile.c:746 +#: ../app/core/gimpimagefile.c:796 msgid "Loading preview..." -msgstr "正在加载预览 ..." +msgstr "正在加载预览…" -#: ../app/core/gimpimagefile.c:752 +#: ../app/core/gimpimagefile.c:802 msgid "Preview is out of date" msgstr "预览已经过时" -#: ../app/core/gimpimagefile.c:758 +#: ../app/core/gimpimagefile.c:808 msgid "Cannot create preview" msgstr "无法生成预览" -#: ../app/core/gimpimagefile.c:768 +#: ../app/core/gimpimagefile.c:818 msgid "(Preview may be out of date)" msgstr "(预览可能已经过时)" #. pixel size -#: ../app/core/gimpimagefile.c:777 ../app/widgets/gimpimagepropview.c:445 -#: ../app/widgets/gimpsizebox.c:427 ../app/widgets/gimptemplateeditor.c:572 +#: ../app/core/gimpimagefile.c:827 ../app/widgets/gimpimagepropview.c:429 +#: ../app/widgets/gimpsizebox.c:432 ../app/widgets/gimptemplateeditor.c:684 #, c-format msgid "%d × %d pixel" msgid_plural "%d × %d pixels" msgstr[0] "%d x %d 像素" -#: ../app/core/gimpimagefile.c:800 ../app/display/gimpdisplayshell-title.c:340 +#: ../app/core/gimpimagefile.c:850 ../app/display/gimpdisplayshell-title.c:325 #, c-format msgid "%d layer" msgid_plural "%d layers" msgstr[0] "%d 个图层" -#: ../app/core/gimpimagefile.c:848 +#: ../app/core/gimpimagefile.c:898 #, c-format msgid "Could not open thumbnail '%s': %s" -msgstr "无法打开缩略图文件“%s”：%s" +msgstr "无法打开缩略图“%s”：%s" -#: ../app/core/gimpimage-guides.c:52 -msgctxt "undo-type" -msgid "Add Horizontal Guide" -msgstr "添加水平参考线" - -#: ../app/core/gimpimage-guides.c:76 -msgctxt "undo-type" -msgid "Add Vertical Guide" -msgstr "添加垂直参考线" - -#: ../app/core/gimpimage-guides.c:117 -msgctxt "undo-type" -msgid "Remove Guide" -msgstr "删除参考线" - -#: ../app/core/gimpimage-guides.c:144 -msgctxt "undo-type" -msgid "Move Guide" -msgstr "移动参考线" - -#: ../app/core/gimpimage-item-list.c:51 -msgctxt "undo-type" -msgid "Translate Items" -msgstr "转换项目" - -#: ../app/core/gimpimage-item-list.c:78 -msgctxt "undo-type" -msgid "Flip Items" -msgstr "翻转项目" - -#: ../app/core/gimpimage-item-list.c:105 -msgctxt "undo-type" -msgid "Rotate Items" -msgstr "旋转项目" - -#: ../app/core/gimpimage-item-list.c:135 -msgctxt "undo-type" -msgid "Transform Items" -msgstr "变换项目" - -#: ../app/core/gimpimage-merge.c:136 -msgctxt "undo-type" -msgid "Merge Visible Layers" -msgstr "合并可见图层" - -#: ../app/core/gimpimage-merge.c:182 -msgctxt "undo-type" -msgid "Flatten Image" -msgstr "平整图像" - -#: ../app/core/gimpimage-merge.c:252 -msgid "Cannot merge down to a layer group." -msgstr "不能向下合并到图层群组。" - -#: ../app/core/gimpimage-merge.c:259 -msgid "The layer to merge down to is locked." -msgstr "要向下合并的目标图层被锁定。" - -#: ../app/core/gimpimage-merge.c:271 -msgid "There is no visible layer to merge down to." -msgstr "没有可见图层可以向下合并。" - -#: ../app/core/gimpimage-merge.c:281 -msgctxt "undo-type" -msgid "Merge Down" -msgstr "向下合并" - -#: ../app/core/gimpimage-merge.c:309 -msgctxt "undo-type" -msgid "Merge Layer Group" -msgstr "合并图层群组" - -#: ../app/core/gimpimage-merge.c:362 -msgctxt "undo-type" -msgid "Merge Visible Paths" -msgstr "合并可见路径" - -#: ../app/core/gimpimage-merge.c:398 -msgid "Not enough visible paths for a merge. There must be at least two." -msgstr "没有足够多的可见路径可合并。至少需要两个。" - -#: ../app/core/gimpimage-new.c:135 -msgid "Background" -msgstr "背景" - -#: ../app/core/gimpimage-quick-mask.c:87 -msgctxt "undo-type" -msgid "Enable Quick Mask" -msgstr "启用快速蒙板" - -#: ../app/core/gimpimage-quick-mask.c:137 -msgctxt "undo-type" -msgid "Disable Quick Mask" -msgstr "禁用快速蒙板" - -#: ../app/core/gimpimage-sample-points.c:53 -msgctxt "undo-type" -msgid "Add Sample Point" -msgstr "添加采样点" - -#: ../app/core/gimpimage-sample-points.c:98 -msgctxt "undo-type" -msgid "Remove Sample Point" -msgstr "删除采样点" - -#: ../app/core/gimpimage-sample-points.c:126 -msgctxt "undo-type" -msgid "Move Sample Point" -msgstr "移动采样点" - -#: ../app/core/gimpimage-scale.c:85 -msgctxt "undo-type" -msgid "Scale Image" -msgstr "缩放图像" - -#: ../app/core/gimpimage-undo-push.c:875 -#, c-format -msgid "Can't undo %s" -msgstr "无法撤消 %s" - -#: ../app/core/gimpitem.c:1815 +#: ../app/core/gimpitem.c:2075 msgctxt "undo-type" msgid "Attach Parasite" -msgstr "添加寄生物" +msgstr "添加内嵌信息" -#: ../app/core/gimpitem.c:1825 +#: ../app/core/gimpitem.c:2085 msgctxt "undo-type" msgid "Attach Parasite to Item" -msgstr "添加寄生物到项目" +msgstr "添加内嵌信息到项目" -#: ../app/core/gimpitem.c:1876 ../app/core/gimpitem.c:1883 +#: ../app/core/gimpitem.c:2136 ../app/core/gimpitem.c:2143 msgctxt "undo-type" msgid "Remove Parasite from Item" -msgstr "从项目删除寄生物" +msgstr "从项目删除内嵌信息" -#: ../app/core/gimpitem-exclusive.c:81 +#: ../app/core/gimpitem-exclusive.c:82 msgid "Set Item Exclusive Visible" msgstr "设置项目唯一可见" -#: ../app/core/gimplayer.c:291 +#: ../app/core/gimpitem-exclusive.c:173 +msgid "Set Item Exclusive Linked" +msgstr "设置项目唯一链接" + +#: ../app/core/gimplayer-floating-selection.c:118 +msgctxt "undo-type" +msgid "Anchor Floating Selection" +msgstr "固定浮动选区" + +#: ../app/core/gimplayer-floating-selection.c:175 ../app/core/gimplayer.c:1037 +msgid "" +"Cannot create a new layer from the floating selection because it belongs to " +"a layer mask or channel." +msgstr "无法从浮动选区新建图层，因为它属于一个图层蒙板或通道。" + +#: ../app/core/gimplayer-floating-selection.c:182 +msgctxt "undo-type" +msgid "Floating Selection to Layer" +msgstr "浮动选区到图层" + +#: ../app/core/gimplayer.c:441 msgctxt "undo-type" msgid "Rename Layer" msgstr "重命名图层" -#: ../app/core/gimplayer.c:292 +#: ../app/core/gimplayer.c:442 msgctxt "undo-type" msgid "Move Layer" msgstr "移动图层" -#: ../app/core/gimplayer.c:293 +#: ../app/core/gimplayer.c:443 msgctxt "undo-type" msgid "Scale Layer" msgstr "缩放图层" -#: ../app/core/gimplayer.c:294 +#: ../app/core/gimplayer.c:444 msgctxt "undo-type" msgid "Resize Layer" msgstr "改变图层大小" -#: ../app/core/gimplayer.c:295 +#: ../app/core/gimplayer.c:445 msgctxt "undo-type" msgid "Flip Layer" msgstr "翻转图层" -#: ../app/core/gimplayer.c:296 +#: ../app/core/gimplayer.c:446 msgctxt "undo-type" msgid "Rotate Layer" msgstr "旋转图层" -#: ../app/core/gimplayer.c:299 +#: ../app/core/gimplayer.c:449 msgctxt "undo-type" msgid "Reorder Layer" msgstr "重排图层" -#: ../app/core/gimplayer.c:300 +#: ../app/core/gimplayer.c:450 msgctxt "undo-type" msgid "Raise Layer" msgstr "升高图层" -#: ../app/core/gimplayer.c:301 +#: ../app/core/gimplayer.c:451 msgctxt "undo-type" msgid "Raise Layer to Top" msgstr "图层移至顶端" -#: ../app/core/gimplayer.c:302 +#: ../app/core/gimplayer.c:452 msgctxt "undo-type" msgid "Lower Layer" msgstr "降低图层" -#: ../app/core/gimplayer.c:303 +#: ../app/core/gimplayer.c:453 msgctxt "undo-type" msgid "Lower Layer to Bottom" msgstr "图层移至底端" -# Do not translate because most file systems doesn't support chinese! -#: ../app/core/gimplayer.c:304 +#: ../app/core/gimplayer.c:454 msgid "Layer cannot be raised higher." msgstr "图层无法再升高。" -#: ../app/core/gimplayer.c:305 +#: ../app/core/gimplayer.c:455 msgid "Layer cannot be lowered more." msgstr "图层无法再降低。" -#: ../app/core/gimplayer.c:480 ../app/core/gimplayer.c:1316 -#: ../app/core/gimplayermask.c:183 +#: ../app/core/gimplayer.c:744 ../app/core/gimplayer.c:1905 +#: ../app/core/gimplayermask.c:257 #, c-format msgid "%s mask" -msgstr "%s蒙板" +msgstr "%s 蒙板" -#: ../app/core/gimplayer.c:519 +#: ../app/core/gimplayer.c:783 #, c-format msgid "" "Floating Selection\n" @@ -8514,268 +13158,323 @@ msgstr "" "浮动选区\n" "(%s)" -#: ../app/core/gimplayer.c:664 ../app/core/gimplayer-floating-sel.c:126 -msgid "" -"Cannot create a new layer from the floating selection because it belongs to " -"a layer mask or channel." -msgstr "无法从浮动选区创建新图层，因为它属于一个图层蒙板或通道。" - -#: ../app/core/gimplayer.c:1227 +#: ../app/core/gimplayer.c:1811 msgid "Unable to add a layer mask since the layer already has one." msgstr "无法添加图层蒙板，因为已有一个。" -#: ../app/core/gimplayer.c:1238 +#: ../app/core/gimplayer.c:1822 msgid "Cannot add layer mask of different dimensions than specified layer." msgstr "无法添加跟指定图层尺寸不同的图层蒙板。" -#: ../app/core/gimplayer.c:1244 +#: ../app/core/gimplayer.c:1828 msgctxt "undo-type" msgid "Add Layer Mask" msgstr "添加图层蒙板" -#: ../app/core/gimplayer.c:1368 +#: ../app/core/gimplayer.c:1956 msgctxt "undo-type" msgid "Transfer Alpha to Mask" -msgstr "转移 Alpha 到蒙板" +msgstr "将透明度转移到蒙板" -#: ../app/core/gimplayer.c:1527 +#: ../app/core/gimplayer.c:2112 msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "应用图层蒙板" -#: ../app/core/gimplayer.c:1528 +#: ../app/core/gimplayer.c:2113 msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "删除图层蒙板" -#: ../app/core/gimplayer.c:1636 -#, fuzzy +#: ../app/core/gimplayer.c:2215 msgctxt "undo-type" msgid "Enable Layer Mask" -msgstr "禁用图层蒙板(_D)" +msgstr "启用图层蒙板" -#: ../app/core/gimplayer.c:1637 -#, fuzzy +#: ../app/core/gimplayer.c:2216 msgctxt "undo-type" msgid "Disable Layer Mask" -msgstr "禁用图层蒙板(_D)" +msgstr "禁用图层蒙板" -#: ../app/core/gimplayer.c:1715 +#: ../app/core/gimplayer.c:2292 msgctxt "undo-type" msgid "Show Layer Mask" msgstr "显示图层蒙板" -#: ../app/core/gimplayer.c:1794 +#: ../app/core/gimplayer.c:2365 msgctxt "undo-type" msgid "Add Alpha Channel" -msgstr "添加 Alpha 通道" +msgstr "添加透明通道" -#: ../app/core/gimplayer.c:1829 +#: ../app/core/gimplayer.c:2400 msgctxt "undo-type" msgid "Remove Alpha Channel" -msgstr "删除 Alpha 通道" +msgstr "删除透明通道" -#: ../app/core/gimplayer.c:1849 +#: ../app/core/gimplayer.c:2421 msgctxt "undo-type" msgid "Layer to Image Size" msgstr "图层到图像大小" -#: ../app/core/gimplayer-floating-sel.c:95 -msgctxt "undo-type" -msgid "Anchor Floating Selection" -msgstr "固定浮动选区" - -#: ../app/core/gimplayer-floating-sel.c:133 -msgctxt "undo-type" -msgid "Floating Selection to Layer" -msgstr "浮动选区到图层" - -#: ../app/core/gimplayermask.c:67 +#: ../app/core/gimplayermask.c:82 msgctxt "undo-type" msgid "Move Layer Mask" msgstr "移动图层蒙板" -#: ../app/core/gimplayermask.c:68 +#: ../app/core/gimplayermask.c:83 msgctxt "undo-type" msgid "Layer Mask to Selection" msgstr "图层蒙板到选区" -#: ../app/core/gimplayermask.c:129 +#: ../app/core/gimplayermask.c:158 #, c-format msgid "Cannot rename layer masks." -msgstr "无法重命名图层蒙版" +msgstr "无法重命名图层蒙版。" -#: ../app/core/gimppalette-import.c:426 +#: ../app/core/gimpmybrush-load.c:75 +#, c-format +msgid "MyPaint brush file is unreasonably large, skipping." +msgstr "MyPaint 笔刷文件过大，略过。" + +#: ../app/core/gimpmybrush-load.c:93 +#, c-format +msgid "Failed to deserialize MyPaint brush." +msgstr "并行转化 MyPaint 笔刷失败。" + +#. TRANSLATORS: the "%s" is an item title and "%u" is the number of +#. occurrences for this item. +#: ../app/core/gimppalette-import.c:210 +#, c-format +msgid "%s (occurs %u)" +msgstr "%s(发生 %u)" + +#: ../app/core/gimppalette-import.c:423 #, c-format msgid "Index %d" msgstr "索引 %d" -#: ../app/core/gimppalette-import.c:536 +#: ../app/core/gimppalette-import.c:545 #, c-format msgid "Unknown type of palette file: %s" msgstr "未知类型的色板文件：%s" -#: ../app/core/gimppalette-load.c:87 ../app/core/gimppalette-load.c:113 -#: ../app/core/gimppalette-load.c:134 ../app/core/gimppalette-load.c:163 -#: ../app/core/gimppalette-load.c:239 +#: ../app/core/gimppalette-load.c:70 #, c-format -msgid "Fatal parse error in palette file '%s': Read error in line %d." -msgstr "色板文件“%s”出现严重解析错误：第 %d 行读入出错。" +msgid "Missing magic header." +msgstr "缺少魔数。" -#: ../app/core/gimppalette-load.c:97 -#, c-format -msgid "Fatal parse error in palette file '%s': Missing magic header." -msgstr "色板文件“%s”出现严重解析错误：缺少 magic 头。" - -#: ../app/core/gimppalette-load.c:126 +#: ../app/core/gimppalette-load.c:93 #, c-format msgid "Invalid UTF-8 string in palette file '%s'" -msgstr "色板文件“%s”中含有无效的 UTF-8 字符串。" +msgstr "色板文件“%s”中含有无效的 UTF-8 字符串" -#: ../app/core/gimppalette-load.c:150 +#: ../app/core/gimppalette-load.c:113 #, c-format msgid "" "Reading palette file '%s': Invalid number of columns in line %d. Using " "default value." msgstr "读取色板文件“%s”：第 %d 行中列数目无效。使用默认值。" -#: ../app/core/gimppalette-load.c:186 +#: ../app/core/gimppalette-load.c:147 #, c-format msgid "Reading palette file '%s': Missing RED component in line %d." -msgstr "读取色板文件“%s”：第 %d 行缺少 RED 分量。" +msgstr "读取色板文件“%s”：第 %d 行缺少红色分量。" -#: ../app/core/gimppalette-load.c:194 +#: ../app/core/gimppalette-load.c:155 #, c-format msgid "Reading palette file '%s': Missing GREEN component in line %d." -msgstr "读取色板文件“%s”：第 %d 行缺少 GREEN 分量。" +msgstr "读取色板文件“%s”：第 %d 行缺少绿色分量。" -#: ../app/core/gimppalette-load.c:202 +#: ../app/core/gimppalette-load.c:163 #, c-format msgid "Reading palette file '%s': Missing BLUE component in line %d." -msgstr "读取色板文件“%s”：第 %d 行缺少 BLUE 分量。" +msgstr "读取色板文件“%s”：第 %d 行缺少蓝色分量。" -#: ../app/core/gimppalette-load.c:212 +#: ../app/core/gimppalette-load.c:173 #, c-format msgid "Reading palette file '%s': RGB value out of range in line %d." msgstr "读取色板文件“%s”：第 %d 行 RGB 取值超出范围。" -#: ../app/core/gimppalette-load.c:479 +#: ../app/core/gimppalette-load.c:209 ../app/core/gimppalette-load.c:456 #, c-format -msgid "Could not read header from palette file '%s'" -msgstr "无法从色板文件“%s”中读取头信息" +msgid "Reading palette file '%s': Read %d colors from truncated file: %s" +msgstr "读取色板文件“%s”：从被截断的文件中读取了 %d 个颜色：%s" -#: ../app/core/gimppalette-load.c:502 ../app/core/gimppalette-load.c:590 +#: ../app/core/gimppalette-load.c:233 #, c-format -msgid "Fatal parse error in palette file '%s'" -msgstr "色板文件“%s”出现严重解析错误" +msgid "In line %d of palette file: " +msgstr "色板文件的第 %d 行： " -#: ../app/core/gimppattern-load.c:90 ../app/core/gimppattern-load.c:136 -#: ../app/core/gimppattern-load.c:175 +#: ../app/core/gimppalette-load.c:429 #, c-format -msgid "Fatal parse error in pattern file '%s': File appears truncated." -msgstr "图案文件“%s”出现严重解析错误：文件看来已被截断。" +msgid "Could not read header from palette file '%s': " +msgstr "无法从色板文件“%s”中读取文件头： " -#: ../app/core/gimppattern-load.c:109 +#: ../app/core/gimppalette-load.c:461 +msgid "Premature end of file." +msgstr "过早的文件结尾。" + +#: ../app/core/gimppalettemru.c:120 ../app/core/gimppalettemru.c:254 +msgid "History Color" +msgstr "历史颜色" + +#: ../app/core/gimppattern-load.c:60 +msgid "File appears truncated: " +msgstr "文件似乎被截断： " + +#: ../app/core/gimppattern-load.c:77 +#, c-format +msgid "Unknown pattern format version %d." +msgstr "未知图案格式版本 %d。" + +#: ../app/core/gimppattern-load.c:86 #, c-format msgid "" -"Fatal parse error in pattern file '%s': Unknown pattern format version %d." -msgstr "图案文件“%s”出现严重解析错误：未知图案格式版本 %d。" - -#: ../app/core/gimppattern-load.c:119 -#, c-format -msgid "" -"Fatal parse error in pattern file '%s: Unsupported pattern depth %d.\n" +"Unsupported pattern depth %d.\n" "GIMP Patterns must be GRAY or RGB." msgstr "" -"图案文件“%s”出现严重解析错误：不支持的图案色深 %d。\n" +"不支持的图案色深 %d。\n" "GIMP 图案必须为灰度或 RGB。" -#: ../app/core/gimppattern-load.c:144 +#: ../app/core/gimppattern-load.c:98 +#, c-format +msgid "Invalid header data in '%s': width=%lu, height=%lu, bytes=%lu" +msgstr "“%s”中存在无效头数据：宽度=%lu，高度=%lu，大小=%lu" + +#: ../app/core/gimppattern-load.c:117 ../app/core/gimppattern-load.c:155 +msgid "File appears truncated." +msgstr "文件似乎被截断。" + +#: ../app/core/gimppattern-load.c:123 #, c-format msgid "Invalid UTF-8 string in pattern file '%s'." msgstr "图案文件“%s”中含有无效的 UTF-8 字符串。" -#: ../app/core/gimppdbprogress.c:282 ../app/widgets/gimppdbdialog.c:334 +#: ../app/core/gimppattern-load.c:166 +msgid "Fatal parse error in pattern file: " +msgstr "图案文件中出现致命解析错误： " + +#: ../app/core/gimppdbprogress.c:268 ../app/widgets/gimppdbdialog.c:310 #, c-format msgid "Unable to run %s callback. The corresponding plug-in may have crashed." -msgstr "无法执行%s回调。相应的插件可能已崩溃。" +msgstr "无法执行 %s 回调。相应的插件可能已崩溃。" -#: ../app/core/gimpprogress.c:106 ../app/core/gimpprogress.c:153 -msgid "Please wait" -msgstr "请稍候" - -#: ../app/core/gimpselection.c:154 +#: ../app/core/gimpselection.c:169 msgctxt "undo-type" msgid "Move Selection" msgstr "移动选区" -#: ../app/core/gimpselection.c:155 +#: ../app/core/gimpselection.c:170 +msgctxt "undo-type" +msgid "Fill Selection" +msgstr "填充选区" + +#: ../app/core/gimpselection.c:171 msgctxt "undo-type" msgid "Stroke Selection" msgstr "勾画选区" -#: ../app/core/gimpselection.c:171 +#: ../app/core/gimpselection.c:188 msgctxt "undo-type" msgid "Feather Selection" msgstr "羽化选区" -#: ../app/core/gimpselection.c:172 +#: ../app/core/gimpselection.c:189 msgctxt "undo-type" msgid "Sharpen Selection" msgstr "锐化选区" -#: ../app/core/gimpselection.c:173 +#: ../app/core/gimpselection.c:190 msgctxt "undo-type" msgid "Select None" -msgstr "全部不选" +msgstr "无" -#: ../app/core/gimpselection.c:174 +#: ../app/core/gimpselection.c:191 msgctxt "undo-type" msgid "Select All" msgstr "全部选中" -#: ../app/core/gimpselection.c:175 +#: ../app/core/gimpselection.c:192 msgctxt "undo-type" msgid "Invert Selection" msgstr "反转选区" -#: ../app/core/gimpselection.c:176 +#: ../app/core/gimpselection.c:193 msgctxt "undo-type" msgid "Border Selection" -msgstr "取选区边界" +msgstr "选区加边" -#: ../app/core/gimpselection.c:177 +#: ../app/core/gimpselection.c:194 msgctxt "undo-type" msgid "Grow Selection" msgstr "选区增长" -#: ../app/core/gimpselection.c:178 +#: ../app/core/gimpselection.c:195 msgctxt "undo-type" msgid "Shrink Selection" msgstr "选区收缩" -#: ../app/core/gimpselection.c:285 +#: ../app/core/gimpselection.c:196 +msgctxt "undo-type" +msgid "Remove Holes" +msgstr "删除孔洞" + +#: ../app/core/gimpselection.c:304 +msgid "There is no selection to fill." +msgstr "没有可填充的选区。" + +#: ../app/core/gimpselection.c:340 msgid "There is no selection to stroke." msgstr "没有可勾画的选区。" -#: ../app/core/gimpselection.c:660 +#: ../app/core/gimpselection.c:696 msgid "Unable to cut or copy because the selected region is empty." msgstr "无法剪切或复制，因为选择区域为空。" -#: ../app/core/gimpselection.c:793 +#: ../app/core/gimpselection.c:814 msgid "Cannot float selection because the selected region is empty." msgstr "无法浮动选区，因为选择区域为空。" -#: ../app/core/gimpselection.c:800 +#: ../app/core/gimpselection.c:821 msgctxt "undo-type" msgid "Float Selection" msgstr "浮动选区" -#: ../app/core/gimpselection.c:816 +#: ../app/core/gimpselection.c:839 msgid "Floated Layer" msgstr "浮动的图层" -#: ../app/core/gimpstrokeoptions.c:182 +#: ../app/core/gimpsettings.c:151 +#, c-format +msgid "Last used: %s" +msgstr "上次使用：%s" + +#: ../app/core/gimpstrokeoptions.c:156 +msgid "Method" +msgstr "方法" + +#: ../app/core/gimpstrokeoptions.c:164 +msgid "Line width" +msgstr "线宽" + +#: ../app/core/gimpstrokeoptions.c:171 ../app/core/gimptemplate.c:151 +#: ../app/tools/gimptextoptions.c:121 +msgid "Unit" +msgstr "单位" + +#: ../app/core/gimpstrokeoptions.c:178 +msgid "Cap style" +msgstr "帽盖样式" + +#: ../app/core/gimpstrokeoptions.c:185 +msgid "Join style" +msgstr "接合样式" + +#: ../app/core/gimpstrokeoptions.c:192 +msgid "Miter limit" +msgstr "斜接限制" + +#: ../app/core/gimpstrokeoptions.c:193 msgid "" "Convert a mitered join to a bevelled join if the miter would extend to a " "distance of more than miter-limit * line-width from the actual join point." @@ -8783,27 +13482,248 @@ msgstr "" "如果斜接可以从实标连接点开始延伸到大于斜接限制 * 线宽的距离，将斜角连接转换为" "斜面连接。" -#. This is a special string to specify the language identifier to -#. * look for in the gimp-tags-default.xml file. Please translate the -#. * C in it according to the name of the po file used for -#. * gimp-tags-default.xml. E.g. lithuanian for the translation, -#. * that would be "tags-locale:lt". -#. -#: ../app/core/gimp-tags.c:88 -msgid "tags-locale:C" -msgstr "tags-locale:zh_CN" +#: ../app/core/gimpstrokeoptions.c:202 +msgid "Dash offset" +msgstr "破折偏移" -#: ../app/core/gimptemplate.c:132 +#: ../app/core/gimpstrokeoptions.c:224 +msgid "Emulate brush dynamics" +msgstr "模拟动态笔刷" + +#. no undo (or redo) steps available +#: ../app/core/gimpsymmetry.c:134 ../app/widgets/gimpimagepropview.c:399 +#: ../app/widgets/gimpsymmetryeditor.c:169 +msgid "None" +msgstr "无" + +#: ../app/core/gimpsymmetry.c:148 +msgid "Active" +msgstr "活动" + +#: ../app/core/gimpsymmetry.c:149 +msgid "Activate symmetry painting" +msgstr "激活对称绘画" + +#: ../app/core/gimpsymmetry-mandala.c:113 +msgid "Mandala" +msgstr "曼陀罗" + +#: ../app/core/gimpsymmetry-mandala.c:120 +msgid "Center abscissa" +msgstr "中心横坐标" + +#: ../app/core/gimpsymmetry-mandala.c:132 +msgid "Center ordinate" +msgstr "中心纵坐标" + +#: ../app/core/gimpsymmetry-mandala.c:144 +msgid "Number of points" +msgstr "点的数量" + +#: ../app/core/gimpsymmetry-mandala.c:152 ../app/core/gimpsymmetry-mirror.c:154 +msgid "Disable brush transform" +msgstr "禁用笔刷变换" + +#: ../app/core/gimpsymmetry-mandala.c:153 +msgid "Disable brush rotation" +msgstr "禁用笔刷旋转" + +#: ../app/core/gimpsymmetry-mirror.c:123 +msgid "Mirror" +msgstr "镜面" + +#: ../app/core/gimpsymmetry-mirror.c:130 +msgid "Horizontal Symmetry" +msgstr "水平对称" + +#: ../app/core/gimpsymmetry-mirror.c:131 +msgid "Reflect the initial stroke across a horizontal axis" +msgstr "横跨水平轴反映初始笔廓" + +#: ../app/core/gimpsymmetry-mirror.c:138 +msgid "Vertical Symmetry" +msgstr "竖直对称" + +#: ../app/core/gimpsymmetry-mirror.c:139 +msgid "Reflect the initial stroke across a vertical axis" +msgstr "横跨竖直轴反映初始笔廓" + +#: ../app/core/gimpsymmetry-mirror.c:146 +msgid "Central Symmetry" +msgstr "中心对称" + +#: ../app/core/gimpsymmetry-mirror.c:147 +msgid "Invert the initial stroke through a point" +msgstr "通过一个点反转初始笔廓" + +#: ../app/core/gimpsymmetry-mirror.c:155 +msgid "Disable brush reflection" +msgstr "禁用笔刷映像" + +#: ../app/core/gimpsymmetry-mirror.c:162 +msgid "Vertical axis position" +msgstr "竖直轴线位置" + +#: ../app/core/gimpsymmetry-mirror.c:174 +msgid "Horizontal axis position" +msgstr "水平轴线位置" + +#: ../app/core/gimpsymmetry-tiling.c:102 +msgid "Tiling" +msgstr "贴片" + +#: ../app/core/gimpsymmetry-tiling.c:108 +msgid "Interval X" +msgstr "间隔 X" + +#: ../app/core/gimpsymmetry-tiling.c:109 +msgid "Interval on the X axis (pixels)" +msgstr "在 X 轴上的间隔(像素)" + +#: ../app/core/gimpsymmetry-tiling.c:120 +msgid "Interval Y" +msgstr "间隔 Y" + +#: ../app/core/gimpsymmetry-tiling.c:121 +msgid "Interval on the Y axis (pixels)" +msgstr "在 Y 轴上的间隔(像素)" + +#: ../app/core/gimpsymmetry-tiling.c:132 +msgid "Shift" +msgstr "偏移" + +#: ../app/core/gimpsymmetry-tiling.c:133 +msgid "X-shift between lines (pixels)" +msgstr "线条之间的 X-偏移(像素)" + +#: ../app/core/gimpsymmetry-tiling.c:144 +msgid "Max strokes X" +msgstr "最大笔廓 X" + +#: ../app/core/gimpsymmetry-tiling.c:145 +msgid "Maximum number of strokes on the X axis" +msgstr "X 轴上的最大笔廓数量" + +#: ../app/core/gimpsymmetry-tiling.c:152 +msgid "Max strokes Y" +msgstr "最大笔廓 Y" + +#: ../app/core/gimpsymmetry-tiling.c:153 +msgid "Maximum number of strokes on the Y axis" +msgstr "Y 轴上的最大笔廓数量" + +#: ../app/core/gimptagcache.c:442 +#, c-format +msgid "Error writing '%s': %s\n" +msgstr "写入“%s”出错：%s\n" + +#: ../app/core/gimptemplate.c:135 +msgid "Width" +msgstr "宽度" + +#: ../app/core/gimptemplate.c:143 +msgid "Height" +msgstr "高度" + +#: ../app/core/gimptemplate.c:152 msgid "The unit used for coordinate display when not in dot-for-dot mode." msgstr "非点对点模式下坐标显示使用的单位。" -#: ../app/core/gimptemplate.c:139 -msgid "The horizontal image resolution." -msgstr "水平图像分辨率。" +#: ../app/core/gimptemplate.c:159 ../app/core/gimptemplate.c:167 +msgid "Resolution X" +msgstr "分辨率 X" -#: ../app/core/gimptemplate.c:145 +#: ../app/core/gimptemplate.c:160 +msgid "The horizontal image resolution." +msgstr "图像水平分辨率。" + +#: ../app/core/gimptemplate.c:168 msgid "The vertical image resolution." -msgstr "垂直图像分辨率。" +msgstr "图像竖直分辨率。" + +#: ../app/core/gimptemplate.c:175 +msgid "Resolution unit" +msgstr "分辨率单位" + +#. serialized name +#: ../app/core/gimptemplate.c:182 +msgid "Image type" +msgstr "图像类型" + +#: ../app/core/gimptemplate.c:189 ../app/core/gimptemplate.c:196 +msgid "Precision" +msgstr "精度" + +#. gamma +#: ../app/core/gimptemplate.c:205 ../app/dialogs/convert-precision-dialog.c:195 +#: ../app/operations/gimplevelsconfig.c:139 +#: ../app/operations/gimplevelsconfig.c:140 ../app/tools/gimplevelstool.c:500 +msgid "Gamma" +msgstr "伽马值" + +#: ../app/core/gimptemplate.c:213 +msgid "Color managed" +msgstr "色彩管理" + +#: ../app/core/gimptemplate.c:214 +msgid "" +"Whether the image is color managed. Disabling color management is equivalent " +"to choosing a built-in sRGB profile. Better leave color management enabled." +msgstr "" +"是否对图像启用色彩管理。禁用色彩管理相当于指定一份内置的 sRGB 颜色配置文件。" +"最好保留色彩管理为启用状态。" + +#: ../app/core/gimptemplate.c:223 +msgid "Color profile" +msgstr "色彩配置文件" + +#: ../app/core/gimptemplate.c:230 ../app/tools/gimpbucketfilloptions.c:94 +msgid "Fill type" +msgstr "填充类型" + +#: ../app/core/gimptemplate.c:237 ../app/dialogs/image-properties-dialog.c:94 +msgid "Comment" +msgstr "注释" + +#: ../app/core/gimptemplate.c:244 +msgid "Filename" +msgstr "文件名" + +#: ../app/core/gimptoolpreset.c:147 +msgid "Apply stored FG/BG" +msgstr "应用存储的前景色/背景色" + +#: ../app/core/gimptoolpreset.c:154 +msgid "Apply stored brush" +msgstr "应用存储的笔刷" + +#: ../app/core/gimptoolpreset.c:161 +msgid "Apply stored dynamics" +msgstr "应用存储的动态" + +#: ../app/core/gimptoolpreset.c:168 +msgid "Apply stored MyPaint brush" +msgstr "应用存储的 MyPaint 笔刷" + +#: ../app/core/gimptoolpreset.c:175 +msgid "Apply stored pattern" +msgstr "应用存储的图案" + +#: ../app/core/gimptoolpreset.c:182 +msgid "Apply stored palette" +msgstr "应用存储的调色板" + +#: ../app/core/gimptoolpreset.c:189 +msgid "Apply stored gradient" +msgstr "应用存储的渐变" + +#: ../app/core/gimptoolpreset.c:196 +msgid "Apply stored font" +msgstr "应用存储的字体" + +#: ../app/core/gimptoolpreset-load.c:64 +msgid "Tool preset file is corrupt." +msgstr "工具预设文件已损坏。" #: ../app/core/gimpunit.c:60 msgctxt "unit-singular" @@ -8858,45 +13778,14 @@ msgstr "派卡" #: ../app/core/gimpunit.c:82 msgctxt "singular" msgid "percent" -msgstr "百分点" +msgstr "百分比" #: ../app/core/gimpunit.c:82 msgctxt "plural" msgid "percent" -msgstr "百分点" +msgstr "百分比" -#: ../app/core/gimp-user-install.c:160 -#, c-format -msgid "" -"It seems you have used GIMP %s before. GIMP will now migrate your user " -"settings to '%s'." -msgstr "您看来曾经使用过 GIMP %s。GIMP 现在将要把您的用户配置迁移到“%s”。" - -#: ../app/core/gimp-user-install.c:165 -#, c-format -msgid "" -"It appears that you are using GIMP for the first time. GIMP will now create " -"a folder named '%s' and copy some files to it." -msgstr "" -"您看来是第一次使用 GIMP。GIMP 现在将创建名为“%s”的文件夹并复制一些文件到其" -"中。" - -#: ../app/core/gimp-user-install.c:317 -#, c-format -msgid "Copying file '%s' from '%s'..." -msgstr "正在从“%2$s”复制文件“%1$s”..." - -#: ../app/core/gimp-user-install.c:332 ../app/core/gimp-user-install.c:358 -#, c-format -msgid "Creating folder '%s'..." -msgstr "正在创建“%s”文件夹..." - -#: ../app/core/gimp-user-install.c:343 ../app/core/gimp-user-install.c:369 -#, c-format -msgid "Cannot create folder '%s': %s" -msgstr "无法创建“%s”文件夹：%s" - -#: ../app/dialogs/about-dialog.c:115 ../app/gui/gui.c:493 +#: ../app/dialogs/about-dialog.c:115 msgid "About GIMP" msgstr "关于 GIMP" @@ -8909,68 +13798,259 @@ msgstr "访问 GIMP 网站" #: ../app/dialogs/about-dialog.c:130 msgid "translator-credits" msgstr "" -"Yuheng Xie\n" -"Funda Wang\n" -"Cai Qian\n" -"神州散人" +"Yuheng Xie , 2001-2004.\n" +"Funda Wang , 2003.\n" +"Cai Qian , 2005.\n" +"Shawn Syu , 2008.\n" +"Aron Xu　, 2008-2009.\n" +"神州散人 , 2008-2009.\n" +"James Chai , 2015.\n" +"liushuyu011 , 2015.\n" +"Mingye Wang , 2015.\n" +"Tong Hui , 2015.\n" +"Tony Chyi , 2015.\n" +"Jeff Bai , 2015.\n" +"lumingzh , 2016-2018." -#: ../app/dialogs/about-dialog.c:522 +#: ../app/dialogs/about-dialog.c:529 msgid "GIMP is brought to you by" -msgstr "GIMP 作者群" +msgstr "GIMP 的提供者为" -#: ../app/dialogs/about-dialog.c:597 -msgid "This is an unstable development release." -msgstr "这是一个不稳定的开发版本。" +#: ../app/dialogs/about-dialog.c:605 +#, c-format +msgid "" +"This is an unstable development release\n" +"commit %s" +msgstr "" +"这是一个不稳定的开发版本\n" +"提交编号 %s" -#: ../app/dialogs/channel-options-dialog.c:146 +#: ../app/dialogs/action-search-dialog.c:67 +msgid "Search Actions" +msgstr "搜索操作" + +#: ../app/dialogs/channel-options-dialog.c:126 msgid "Channel _name:" -msgstr "通道名字(_N)：" +msgstr "通道名称(_N)：" -#: ../app/dialogs/channel-options-dialog.c:175 +#: ../app/dialogs/channel-options-dialog.c:128 +#: ../app/dialogs/layer-options-dialog.c:168 +msgid "Lock _pixels" +msgstr "锁定像素(_P)" + +#: ../app/dialogs/channel-options-dialog.c:129 +#: ../app/dialogs/layer-options-dialog.c:169 +msgid "Lock position and _size" +msgstr "锁定位置和大小(_S)" + +#: ../app/dialogs/channel-options-dialog.c:171 msgid "Initialize from _selection" -msgstr "从选择区初始化(_S)" +msgstr "从选区初始化(_S)" -#: ../app/dialogs/convert-dialog.c:125 -msgid "Indexed Color Conversion" -msgstr "索引颜色转换" +#: ../app/dialogs/color-profile-dialog.c:128 +msgid "Assign ICC Color Profile" +msgstr "指定 ICC 色彩配置文件" -#: ../app/dialogs/convert-dialog.c:128 -msgid "Convert Image to Indexed Colors" -msgstr "将图像转换为索引颜色" +#: ../app/dialogs/color-profile-dialog.c:131 +msgid "Assign a color profile to the image" +msgstr "为图像指定色彩配置文件" -#: ../app/dialogs/convert-dialog.c:138 +#: ../app/dialogs/color-profile-dialog.c:137 +msgid "_Assign" +msgstr "指定(_A)" + +#: ../app/dialogs/color-profile-dialog.c:140 +msgid "Assign" +msgstr "指定" + +#: ../app/dialogs/color-profile-dialog.c:146 +msgid "Convert to ICC Color Profile" +msgstr "转换为 ICC 色彩配置文件" + +#: ../app/dialogs/color-profile-dialog.c:149 +msgid "Convert the image to a color profile" +msgstr "转换图像为色彩配置文件" + +#: ../app/dialogs/color-profile-dialog.c:155 +#: ../app/dialogs/color-profile-dialog.c:173 +#: ../app/dialogs/color-profile-dialog.c:191 +#: ../app/dialogs/color-profile-import-dialog.c:105 +#: ../app/dialogs/convert-indexed-dialog.c:139 +#: ../app/dialogs/convert-precision-dialog.c:166 msgid "C_onvert" msgstr "转换(_O)" -#: ../app/dialogs/convert-dialog.c:190 +#: ../app/dialogs/color-profile-dialog.c:158 +#: ../app/dialogs/color-profile-dialog.c:176 +#: ../app/dialogs/color-profile-dialog.c:194 +msgid "Convert to" +msgstr "转换为" + +#: ../app/dialogs/color-profile-dialog.c:164 +msgid "RGB Conversion" +msgstr "RGB 转换" + +#: ../app/dialogs/color-profile-dialog.c:167 +msgid "Convert Image to RGB" +msgstr "将图像转换为 RGB" + +#: ../app/dialogs/color-profile-dialog.c:182 +msgid "Grayscale Conversion" +msgstr "灰度转换" + +#: ../app/dialogs/color-profile-dialog.c:185 +msgid "Convert Image to Grayscale" +msgstr "将图像转换为灰度" + +#: ../app/dialogs/color-profile-dialog.c:200 +msgid "Soft-Proof Profile" +msgstr "软件校对配置文件" + +#: ../app/dialogs/color-profile-dialog.c:203 +msgid "Select Soft-Proof Profile" +msgstr "选择软件校对配置文件" + +#: ../app/dialogs/color-profile-dialog.c:209 +#: ../app/tools/gimpforegroundselecttool.c:314 +msgid "_Select" +msgstr "选择(_S)" + +#: ../app/dialogs/color-profile-dialog.c:212 +msgid "New Color Profile" +msgstr "新建色彩配置文件" + +#: ../app/dialogs/color-profile-dialog.c:241 +msgid "Current Color Profile" +msgstr "当前色彩配置文件" + +#: ../app/dialogs/color-profile-dialog.c:261 +msgid "Profile _details" +msgstr "配置文件详情(_D)" + +#: ../app/dialogs/color-profile-dialog.c:290 +#: ../app/dialogs/color-profile-import-dialog.c:160 +msgid "_Rendering Intent:" +msgstr "渲染效果(_R)：" + +#: ../app/dialogs/color-profile-dialog.c:306 +#: ../app/dialogs/color-profile-import-dialog.c:176 +msgid "_Black Point Compensation" +msgstr "黑点补偿(_B)" + +#: ../app/dialogs/color-profile-dialog.c:386 +msgid "Select Destination Profile" +msgstr "选择目标配置文件" + +#: ../app/dialogs/color-profile-dialog.c:485 +#: ../app/widgets/gimpwidgets-constructors.c:86 +#: ../app/widgets/gimpwidgets-constructors.c:97 +msgctxt "profile" +msgid "None" +msgstr "无" + +#: ../app/dialogs/color-profile-import-dialog.c:85 +msgid "Convert to Grayscale Working Space?" +msgstr "是否转换为灰度工作空间？" + +#: ../app/dialogs/color-profile-import-dialog.c:86 +msgid "Convert the image to the grayscale working space?" +msgstr "要将图像转换为灰度色彩空间吗？" + +#: ../app/dialogs/color-profile-import-dialog.c:90 +msgid "Convert to RGB Working Space?" +msgstr "是否转换为 RGB 工作空间？" + +#: ../app/dialogs/color-profile-import-dialog.c:91 +msgid "Convert the image to the RGB working space?" +msgstr "要将图像转换为 RGB 色彩空间吗？" + +#: ../app/dialogs/color-profile-import-dialog.c:99 +msgid "Import the image from a color profile" +msgstr "从色彩配置文件中导入图像" + +#: ../app/dialogs/color-profile-import-dialog.c:104 +msgid "_Keep" +msgstr "保持(_K)" + +#: ../app/dialogs/color-profile-import-dialog.c:122 +#, c-format +msgid "The image '%s' has an embedded color profile" +msgstr "图像“%s”带有嵌入的色彩配置文件" + +#: ../app/dialogs/color-profile-import-dialog.c:185 +msgid "_Don't ask me again" +msgstr "不再询问(_D)" + +#: ../app/dialogs/convert-indexed-dialog.c:130 +msgid "Indexed Color Conversion" +msgstr "索引颜色转换" + +#: ../app/dialogs/convert-indexed-dialog.c:133 +msgid "Convert Image to Indexed Colors" +msgstr "将图像转换为索引颜色" + +#: ../app/dialogs/convert-indexed-dialog.c:190 msgid "_Maximum number of colors:" msgstr "最大颜色数量(_M)：" -#: ../app/dialogs/convert-dialog.c:217 -msgid "_Remove unused colors from colormap" -msgstr "从颜色表中删除没有被使用的颜色(_R)" +#: ../app/dialogs/convert-indexed-dialog.c:219 +msgid "_Remove unused and duplicate colors from colormap" +msgstr "从颜色表中移除无用和重复的颜色(_R)" -#. dithering -#: ../app/dialogs/convert-dialog.c:234 ../app/tools/gimpblendoptions.c:255 -msgid "Dithering" -msgstr "抖动" - -#: ../app/dialogs/convert-dialog.c:246 +#: ../app/dialogs/convert-indexed-dialog.c:248 msgid "Color _dithering:" -msgstr "颜色抖动(_D)：" +msgstr "颜色递色(_D)：" -#: ../app/dialogs/convert-dialog.c:261 +#: ../app/dialogs/convert-indexed-dialog.c:263 msgid "Enable dithering of _transparency" -msgstr "启用透明度抖动(_T)" +msgstr "启用透明递色(_T)" -#: ../app/dialogs/convert-dialog.c:288 -msgid "Converting to indexed colors" -msgstr "转换为索引颜色" +#: ../app/dialogs/convert-indexed-dialog.c:275 +#: ../app/dialogs/preferences-dialog.c:2167 +msgid "Enable dithering of text layers" +msgstr "启用对文字图层的递色" -#: ../app/dialogs/convert-dialog.c:416 ../app/pdb/convert-cmds.c:162 +#: ../app/dialogs/convert-indexed-dialog.c:286 +#: ../app/dialogs/convert-precision-dialog.c:276 +msgid "Dithering text layers will make them uneditable" +msgstr "递色文字图层将使它们不可编辑" + +#: ../app/dialogs/convert-indexed-dialog.c:410 +#: ../app/pdb/image-convert-cmds.c:159 msgid "Cannot convert to a palette with more than 256 colors." msgstr "无法转换到多于 256 种颜色的色板。" +#: ../app/dialogs/convert-precision-dialog.c:154 +#, c-format +msgid "Convert Image to %s" +msgstr "将图像转换为 %s" + +#: ../app/dialogs/convert-precision-dialog.c:157 +msgid "Precision Conversion" +msgstr "精度转换" + +#: ../app/dialogs/convert-precision-dialog.c:204 +#: ../app/widgets/gimptemplateeditor.c:425 +msgid "Perceptual gamma (sRGB)" +msgstr "感官性伽马(sRGB)" + +#: ../app/dialogs/convert-precision-dialog.c:205 +#: ../app/widgets/gimptemplateeditor.c:424 +msgid "Linear light" +msgstr "线性光" + +#: ../app/dialogs/convert-precision-dialog.c:237 +msgid "_Layers:" +msgstr "图层(_L)：" + +#: ../app/dialogs/convert-precision-dialog.c:259 +msgid "_Text Layers:" +msgstr "文字图层(_T)：" + +#: ../app/dialogs/convert-precision-dialog.c:286 +msgid "_Channels and Masks:" +msgstr "通道和蒙板(_C)：" + #: ../app/dialogs/data-delete-dialog.c:82 msgid "Delete Object" msgstr "删除对象" @@ -8984,74 +14064,82 @@ msgstr "删除“%s”？" #, c-format msgid "" "Are you sure you want to remove '%s' from the list and delete it on disk?" -msgstr "您确认要从列表移除“%s”并在磁盘上删除它吗？" +msgstr "您确认要从列表删除“%s”并在磁盘上删除它吗？" -#: ../app/dialogs/dialogs.c:304 -msgid "Devices" -msgstr "设备" - -#: ../app/dialogs/dialogs.c:304 -msgid "Device Status" -msgstr "设备状态" - -#: ../app/dialogs/dialogs.c:308 -msgid "Errors" -msgstr "错误" - -#: ../app/dialogs/dialogs.c:312 -msgid "Pointer" -msgstr "指针" - -#: ../app/dialogs/dialogs.c:331 -msgid "History" -msgstr "历史" - -#: ../app/dialogs/dialogs.c:333 -msgid "Image Templates" -msgstr "图像模板" - -#: ../app/dialogs/dialogs.c:360 -msgid "Histogram" -msgstr "直方图" - -#: ../app/dialogs/dialogs.c:364 -msgid "Selection" -msgstr "选区" - -#: ../app/dialogs/dialogs.c:364 -msgid "Selection Editor" -msgstr "选区编辑器" - -#: ../app/dialogs/dialogs.c:368 -msgid "Undo" -msgstr "撤消" - -#: ../app/dialogs/dialogs.c:368 -msgid "Undo History" -msgstr "撤消历史" - -#: ../app/dialogs/dialogs.c:378 -msgid "Navigation" -msgstr "导航" - -#: ../app/dialogs/dialogs.c:378 -msgid "Display Navigation" -msgstr "显示导航" - -#: ../app/dialogs/dialogs.c:384 -msgid "FG/BG" -msgstr "前景/背景" - -#: ../app/dialogs/dialogs.c:384 -msgid "FG/BG Color" -msgstr "前景/背景颜色" - -#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:161 -#: ../app/gui/gui-message.c:149 +#: ../app/dialogs/dialogs-constructors.c:216 ../app/gui/gui.c:190 +#: ../app/gui/gui-message.c:268 msgid "GIMP Message" msgstr "GIMP 消息" -#: ../app/dialogs/fade-dialog.c:109 +#: ../app/dialogs/dialogs-constructors.c:225 +msgid "GIMP Debug" +msgstr "GIMP 调试" + +#: ../app/dialogs/dialogs.c:314 +msgid "Devices" +msgstr "设备" + +#: ../app/dialogs/dialogs.c:314 +msgid "Device Status" +msgstr "设备状态" + +#: ../app/dialogs/dialogs.c:318 +msgid "Errors" +msgstr "错误" + +#: ../app/dialogs/dialogs.c:322 +msgid "Pointer" +msgstr "指针" + +#: ../app/dialogs/dialogs.c:362 +msgid "History" +msgstr "历史" + +#: ../app/dialogs/dialogs.c:365 +msgid "Image Templates" +msgstr "图像模板" + +#: ../app/dialogs/dialogs.c:386 +msgid "Histogram" +msgstr "直方图" + +#: ../app/dialogs/dialogs.c:390 +msgid "Selection" +msgstr "选区" + +#: ../app/dialogs/dialogs.c:390 +msgid "Selection Editor" +msgstr "选区编辑器" + +#: ../app/dialogs/dialogs.c:394 +msgid "Symmetry Painting" +msgstr "对称绘画" + +#: ../app/dialogs/dialogs.c:398 +msgid "Undo" +msgstr "撤消" + +#: ../app/dialogs/dialogs.c:398 +msgid "Undo History" +msgstr "撤消历史" + +#: ../app/dialogs/dialogs.c:408 +msgid "Navigation" +msgstr "导览" + +#: ../app/dialogs/dialogs.c:408 +msgid "Display Navigation" +msgstr "显示导览" + +#: ../app/dialogs/dialogs.c:414 +msgid "FG/BG" +msgstr "前景/背景" + +#: ../app/dialogs/dialogs.c:414 +msgid "FG/BG Color" +msgstr "前景/背景颜色" + +#: ../app/dialogs/fade-dialog.c:110 #, c-format msgid "Fade %s" msgstr "淡出 %s" @@ -9060,35 +14148,26 @@ msgstr "淡出 %s" msgid "_Fade" msgstr "淡出(_F)" -#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:345 -msgid "_Mode:" -msgstr "模式(_M)：" +#: ../app/dialogs/fade-dialog.c:151 +#: ../app/operations/gimpoperationdesaturate.c:90 +#: ../app/tools/gimppaintoptions-gui.c:119 ../app/widgets/gimpdeviceinfo.c:132 +#: ../app/widgets/gimplayertreeview.c:279 +msgid "Mode" +msgstr "模式" -#: ../app/dialogs/fade-dialog.c:162 -msgid "_Opacity:" -msgstr "不透明度(_O)：" - -#: ../app/dialogs/file-open-dialog.c:266 +#: ../app/dialogs/file-open-dialog.c:244 msgid "Open layers" msgstr "打开图层" -#: ../app/dialogs/file-open-location-dialog.c:72 +#: ../app/dialogs/file-open-location-dialog.c:74 msgid "Open Location" msgstr "打开位置" -#: ../app/dialogs/file-open-location-dialog.c:110 +#: ../app/dialogs/file-open-location-dialog.c:112 msgid "Enter location (URI):" msgstr "输入位置(URI)：" -#: ../app/dialogs/file-save-dialog.c:105 -msgid "Export Image" -msgstr "导出图像" - -#: ../app/dialogs/file-save-dialog.c:106 -msgid "_Export" -msgstr "导出(_E)" - -#: ../app/dialogs/file-save-dialog.c:431 +#: ../app/dialogs/file-save-dialog.c:458 msgid "" "Saving remote files needs to determine the file format from the file " "extension. Please enter a file extension that matches the selected file " @@ -9097,7 +14176,11 @@ msgstr "" "保存远程文件需要依具文件扩展名确定文件格式。请输入和选中文件匹配的文件扩展名" "或根本不输入文件扩展名。" -#: ../app/dialogs/file-save-dialog.c:558 +#: ../app/dialogs/file-save-dialog.c:618 +msgid "The given filename cannot be used for exporting" +msgstr "给定的文件名不能用于导出" + +#: ../app/dialogs/file-save-dialog.c:619 msgid "" "You can use this dialog to export to various file formats. If you want to " "save the image to the GIMP XCF format, use File→Save instead." @@ -9105,14 +14188,30 @@ msgstr "" "您可以用此对话框导出多种文件格式。如果您想将图像保存为 GIMP XCF 格式，请改用" "文件→保存。" -#: ../app/dialogs/file-save-dialog.c:565 +#: ../app/dialogs/file-save-dialog.c:622 +msgid "Take me to the Save dialog" +msgstr "带我到保存对话框" + +#: ../app/dialogs/file-save-dialog.c:626 +msgid "The given filename cannot be used for saving" +msgstr "给定的文件名不能用于保存" + +#: ../app/dialogs/file-save-dialog.c:627 msgid "" "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." msgstr "" "您可以用此对话框保存到 GIMP XCF 格式。使用文件→导出以导出到其他文件格式。" -#: ../app/dialogs/file-save-dialog.c:571 +#: ../app/dialogs/file-save-dialog.c:629 +msgid "Take me to the Export dialog" +msgstr "带我到导出对话框" + +#: ../app/dialogs/file-save-dialog.c:632 ../app/dialogs/file-save-dialog.c:709 +msgid "Extension Mismatch" +msgstr "扩展名不匹配" + +#: ../app/dialogs/file-save-dialog.c:693 msgid "" "The given filename does not have any known file extension. Please enter a " "known file extension or select a file format from the file format list." @@ -9120,23 +14219,19 @@ msgstr "" "给出的文件名没有已知的扩展名。请输入已知的文件扩展名或从文件格式列表中选择文" "件格式。" -#: ../app/dialogs/file-save-dialog.c:585 -msgid "Extension Mismatch" -msgstr "扩展名不匹配" - -#: ../app/dialogs/file-save-dialog.c:601 +#: ../app/dialogs/file-save-dialog.c:725 msgid "The given file extension does not match the chosen file type." msgstr "给定的文件扩展名与所选的文件类型不符。" -#: ../app/dialogs/file-save-dialog.c:605 +#: ../app/dialogs/file-save-dialog.c:729 msgid "Do you want to save the image using this name anyway?" -msgstr "您真的要使用此名称保存图像吗？" +msgstr "您真的要使用此名字保存图像吗？" -#: ../app/dialogs/file-save-dialog.c:660 +#: ../app/dialogs/file-save-dialog.c:794 msgid "Saving canceled" msgstr "已取消保存" -#: ../app/dialogs/file-save-dialog.c:668 ../app/widgets/gimpdnd-xds.c:185 +#: ../app/dialogs/file-save-dialog.c:800 ../app/widgets/gimpdnd-xds.c:190 #, c-format msgid "" "Saving '%s' failed:\n" @@ -9147,74 +14242,70 @@ msgstr "" "\n" "%s" -#: ../app/dialogs/grid-dialog.c:85 +#: ../app/dialogs/fill-dialog.c:109 +msgid "Choose Fill Style" +msgstr "选择填充类型" + +#: ../app/dialogs/fill-dialog.c:116 +msgid "_Fill" +msgstr "填充(_F)" + +#: ../app/dialogs/grid-dialog.c:95 msgid "Configure Grid" msgstr "配置网格" -#: ../app/dialogs/grid-dialog.c:86 +#: ../app/dialogs/grid-dialog.c:96 msgid "Configure Image Grid" msgstr "配置图像网格" -#: ../app/dialogs/grid-dialog.c:152 +#: ../app/dialogs/grid-dialog.c:161 msgid "Grid" msgstr "网格" -#: ../app/dialogs/image-merge-layers-dialog.c:68 +#: ../app/dialogs/image-merge-layers-dialog.c:93 msgid "Merge Layers" msgstr "合并图层" -#: ../app/dialogs/image-merge-layers-dialog.c:70 +#: ../app/dialogs/image-merge-layers-dialog.c:95 msgid "Layers Merge Options" msgstr "图层合并选项" -#: ../app/dialogs/image-merge-layers-dialog.c:76 +#: ../app/dialogs/image-merge-layers-dialog.c:101 msgid "_Merge" msgstr "合并(_M)" -#: ../app/dialogs/image-merge-layers-dialog.c:96 +#: ../app/dialogs/image-merge-layers-dialog.c:129 msgid "Final, Merged Layer should be:" msgstr "最后，合并的图层应该是：" -#: ../app/dialogs/image-merge-layers-dialog.c:100 -msgid "Expanded as necessary" -msgstr "必要时扩展" - -#: ../app/dialogs/image-merge-layers-dialog.c:103 -msgid "Clipped to image" -msgstr "剪贴板到图像" - -#: ../app/dialogs/image-merge-layers-dialog.c:106 -msgid "Clipped to bottom layer" -msgstr "剪贴板到底端图层" - -#: ../app/dialogs/image-merge-layers-dialog.c:114 +#: ../app/dialogs/image-merge-layers-dialog.c:138 msgid "Merge within active _group only" -msgstr "" +msgstr "仅合并于活动组内(_G)" -#: ../app/dialogs/image-merge-layers-dialog.c:127 +#: ../app/dialogs/image-merge-layers-dialog.c:151 msgid "_Discard invisible layers" msgstr "丢弃不可见图层(_D)" -#: ../app/dialogs/image-new-dialog.c:97 +#: ../app/dialogs/image-new-dialog.c:100 msgid "Create a New Image" -msgstr "创建新的图像" +msgstr "新建图像" -#: ../app/dialogs/image-new-dialog.c:135 -#: ../app/dialogs/preferences-dialog.c:2010 +#: ../app/dialogs/image-new-dialog.c:138 +#: ../app/dialogs/preferences-dialog.c:1668 msgid "_Template:" msgstr "模板(_T)：" -#: ../app/dialogs/image-new-dialog.c:308 +#: ../app/dialogs/image-new-dialog.c:319 msgid "Confirm Image Size" msgstr "确认图像大小" -#: ../app/dialogs/image-new-dialog.c:330 -#: ../app/dialogs/image-scale-dialog.c:239 +#: ../app/dialogs/image-new-dialog.c:341 +#: ../app/dialogs/image-scale-dialog.c:237 #, c-format msgid "You are trying to create an image with a size of %s." msgstr "您正试图创建一幅大小为 %s 的图像。" -#: ../app/dialogs/image-new-dialog.c:337 +#: ../app/dialogs/image-new-dialog.c:348 #, c-format msgid "" "An image of the chosen size will use more memory than what is configured as " @@ -9228,6 +14319,17 @@ msgstr "" msgid "Image Properties" msgstr "图像属性" +#: ../app/dialogs/image-properties-dialog.c:68 +#: ../app/dialogs/input-devices-dialog.c:62 +#: ../app/dialogs/keyboard-shortcuts-dialog.c:55 +#: ../app/dialogs/module-dialog.c:134 ../app/tools/gimpblendtool-editor.c:1851 +#: ../app/tools/gimpcolorpickertool.c:349 ../app/tools/gimpmeasuretool.c:651 +#: ../app/widgets/gimpcontrollerlist.c:640 +#: ../app/widgets/gimpcriticaldialog.c:97 ../app/widgets/gimppdbdialog.c:175 +#: ../app/widgets/gimpsettingsbox.c:663 ../app/widgets/gimptexteditor.c:162 +msgid "_Close" +msgstr "关闭(_C)" + #: ../app/dialogs/image-properties-dialog.c:84 msgid "Properties" msgstr "属性" @@ -9236,20 +14338,21 @@ msgstr "属性" msgid "Color Profile" msgstr "色彩配置文件" -#: ../app/dialogs/image-properties-dialog.c:94 -msgid "Comment" -msgstr "注释" - -#: ../app/dialogs/image-scale-dialog.c:111 +#: ../app/dialogs/image-scale-dialog.c:115 msgctxt "dialog-title" msgid "Scale Image" msgstr "缩放图像" -#: ../app/dialogs/image-scale-dialog.c:205 +#: ../app/dialogs/image-scale-dialog.c:203 msgid "Confirm Scaling" msgstr "确认缩放" -#: ../app/dialogs/image-scale-dialog.c:245 +#: ../app/dialogs/image-scale-dialog.c:211 ../app/dialogs/scale-dialog.c:138 +#: ../app/tools/gimpscaletool.c:92 ../app/tools/gimpscaletool.c:110 +msgid "_Scale" +msgstr "缩放(_S)" + +#: ../app/dialogs/image-scale-dialog.c:243 #, c-format msgid "" "Scaling the image to the chosen size will make it use more memory than what " @@ -9259,1237 +14362,1958 @@ msgstr "" "将图像缩放到所选的大小将使它占用比首选项对话框中“最大图像大小”所配置的更多内" "存(当前为 %s)。" -#: ../app/dialogs/image-scale-dialog.c:260 +#: ../app/dialogs/image-scale-dialog.c:258 msgid "" "Scaling the image to the chosen size will shrink some layers completely away." msgstr "将图像缩放至您选择的大小会使一些图层收缩至完全消失。" -#: ../app/dialogs/image-scale-dialog.c:264 +#: ../app/dialogs/image-scale-dialog.c:262 msgid "Is this what you want to do?" msgstr "这是您所希望的吗？" -#: ../app/dialogs/input-devices-dialog.c:55 +#: ../app/dialogs/input-devices-dialog.c:56 msgid "Configure Input Devices" msgstr "配置输入设备" -#: ../app/dialogs/keyboard-shortcuts-dialog.c:48 +#: ../app/dialogs/item-options-dialog.c:198 +msgid "Color tag:" +msgstr "颜色标签：" + +#. The switches frame & vbox +#: ../app/dialogs/item-options-dialog.c:259 +msgid "Switches" +msgstr "交换" + +#: ../app/dialogs/item-options-dialog.c:268 +msgid "_Visible" +msgstr "可见(_V)" + +#: ../app/dialogs/item-options-dialog.c:277 +msgid "_Linked" +msgstr "已链接(_L)" + +#: ../app/dialogs/keyboard-shortcuts-dialog.c:49 msgid "Configure Keyboard Shortcuts" msgstr "配置快捷键" -#: ../app/dialogs/keyboard-shortcuts-dialog.c:73 +#: ../app/dialogs/keyboard-shortcuts-dialog.c:74 msgid "" "To edit a shortcut key, click on the corresponding row and type a new " "accelerator, or press backspace to clear." -msgstr "要编辑快捷键，请在相应行按新的加速键，或按 Backspace 清除" +msgstr "要编辑快捷键，请在相应行按新的快捷键，或按退格键清除。" -#: ../app/dialogs/keyboard-shortcuts-dialog.c:81 +#: ../app/dialogs/keyboard-shortcuts-dialog.c:82 msgid "S_ave keyboard shortcuts on exit" msgstr "退出时保存快捷键(_A)" -#: ../app/dialogs/layer-add-mask-dialog.c:84 +#: ../app/dialogs/layer-add-mask-dialog.c:103 +msgid "Add Layer Mask" +msgstr "添加图层蒙板" + +#: ../app/dialogs/layer-add-mask-dialog.c:105 msgid "Add a Mask to the Layer" msgstr "添加蒙板到图层" -#: ../app/dialogs/layer-add-mask-dialog.c:112 +#: ../app/dialogs/layer-add-mask-dialog.c:111 +msgid "_Add" +msgstr "添加(_A)" + +#: ../app/dialogs/layer-add-mask-dialog.c:137 msgid "Initialize Layer Mask to:" msgstr "初始化图层蒙板为：" -#: ../app/dialogs/layer-add-mask-dialog.c:143 +#: ../app/dialogs/layer-add-mask-dialog.c:168 msgid "In_vert mask" msgstr "反转蒙板(_V)" -#: ../app/dialogs/layer-options-dialog.c:125 +#: ../app/dialogs/layer-add-mask-dialog.c:203 +msgid "Please select a channel first" +msgstr "请先选择通道" + +#: ../app/dialogs/layer-options-dialog.c:166 msgid "Layer _name:" msgstr "图层名字(_N)：" +#: ../app/dialogs/layer-options-dialog.c:188 +#: ../app/widgets/gimpdeviceinfoeditor.c:349 +msgid "_Mode:" +msgstr "模式(_M)：" + +#: ../app/dialogs/layer-options-dialog.c:203 +msgid "Blend space:" +msgstr "混合空间：" + +#: ../app/dialogs/layer-options-dialog.c:213 +msgid "Composite space:" +msgstr "合成空间：" + +#: ../app/dialogs/layer-options-dialog.c:225 +msgid "Composite mode:" +msgstr "合成模式：" + +#: ../app/dialogs/layer-options-dialog.c:239 +msgid "_Opacity:" +msgstr "不透明度(_O)：" + #. The size labels -#: ../app/dialogs/layer-options-dialog.c:139 -#: ../app/tools/gimpmeasuretool.c:1129 +#: ../app/dialogs/layer-options-dialog.c:252 ../app/tools/gimpmeasuretool.c:726 msgid "Width:" msgstr "宽度：" -#: ../app/dialogs/layer-options-dialog.c:145 -#: ../app/tools/gimpmeasuretool.c:1157 +#: ../app/dialogs/layer-options-dialog.c:258 ../app/tools/gimpmeasuretool.c:754 msgid "Height:" msgstr "高度：" -#: ../app/dialogs/layer-options-dialog.c:202 -msgid "Layer Fill Type" -msgstr "图层填充类型" +#. The offset labels +#: ../app/dialogs/layer-options-dialog.c:316 +#: ../app/tools/gimpalignoptions.c:380 +msgid "Offset X:" +msgstr "位移 X：" -#: ../app/dialogs/layer-options-dialog.c:217 +#: ../app/dialogs/layer-options-dialog.c:322 +#: ../app/tools/gimpalignoptions.c:393 +msgid "Offset Y:" +msgstr "位移 Y：" + +#: ../app/dialogs/layer-options-dialog.c:396 ../app/dialogs/resize-dialog.c:369 +#: ../app/widgets/gimptemplateeditor.c:452 +msgid "_Fill with:" +msgstr "填充(_F)：" + +#: ../app/dialogs/layer-options-dialog.c:411 +#: ../app/widgets/gimpcolordisplayeditor.c:285 +msgid "Active Filters" +msgstr "活动滤镜" + +#: ../app/dialogs/layer-options-dialog.c:438 +msgid "Lock _alpha" +msgstr "锁定透明(_A)" + +#: ../app/dialogs/layer-options-dialog.c:450 msgid "Set name from _text" -msgstr "以文字设定名称(_T)" +msgstr "以文字设定名字(_T)" -#: ../app/dialogs/lebl-dialog.c:123 +#: ../app/dialogs/lebl-dialog.c:122 #, c-format msgid "GAME OVER at level %d!" -msgstr "" +msgstr "在第 %d 关游戏结束！" #. Translators: the first and third strings are similar to a #. * title, and the second string is a small information text. #. * The spaces are there only to separate all the strings, so #. try to keep them as is. -#: ../app/dialogs/lebl-dialog.c:130 +#: ../app/dialogs/lebl-dialog.c:129 #, c-format msgid "%1$s %2$s %3$s" -msgstr "" +msgstr "%1$s %2$s %3$s" -#: ../app/dialogs/lebl-dialog.c:131 +#: ../app/dialogs/lebl-dialog.c:130 msgid "Press 'q' to quit" -msgstr "" +msgstr "按“q”键以退出" -#: ../app/dialogs/lebl-dialog.c:136 +#: ../app/dialogs/lebl-dialog.c:135 msgid "Paused" -msgstr "" +msgstr "已暂停" #. Translators: the first string is a title and the second #. * string is a small information text. -#: ../app/dialogs/lebl-dialog.c:139 ../app/dialogs/lebl-dialog.c:150 +#: ../app/dialogs/lebl-dialog.c:138 ../app/dialogs/lebl-dialog.c:149 #, c-format msgid "%1$s\t%2$s" -msgstr "" +msgstr "%1$s\t%2$s" -#: ../app/dialogs/lebl-dialog.c:140 +#: ../app/dialogs/lebl-dialog.c:139 msgid "Press 'p' to unpause" -msgstr "" +msgstr "按“p”键以继续" -#: ../app/dialogs/lebl-dialog.c:146 +#: ../app/dialogs/lebl-dialog.c:145 #, c-format msgid "Level: %s, Lives: %s" -msgstr "" +msgstr "关卡：%s，命数：%s" -#: ../app/dialogs/lebl-dialog.c:151 +#: ../app/dialogs/lebl-dialog.c:150 msgid "Left/Right to move, Space to fire, 'p' to pause, 'q' to quit" -msgstr "" +msgstr "左/右方向键移动，空格键开火，“p”键暂停，“q”键退出" -#: ../app/dialogs/lebl-dialog.c:800 +#: ../app/dialogs/lebl-dialog.c:804 msgid "Killer GEGLs from Outer Space" -msgstr "" +msgstr "来自外太空的杀手，人称 GEGLs" -#: ../app/dialogs/module-dialog.c:126 +#: ../app/dialogs/module-dialog.c:129 msgid "Module Manager" msgstr "模块管理器" -#: ../app/dialogs/module-dialog.c:150 -msgid "You will have to restart GIMP for the changes to take effect." -msgstr "您需要重新启动 GIMP 以使改变生效。" +#: ../app/dialogs/module-dialog.c:133 +msgid "_Refresh" +msgstr "刷新(_R)" -#: ../app/dialogs/module-dialog.c:191 +#: ../app/dialogs/module-dialog.c:153 +msgid "You will have to restart GIMP for the changes to take effect." +msgstr "您需要重启 GIMP 以使改变生效。" + +#: ../app/dialogs/module-dialog.c:194 msgid "Module" msgstr "模块" -#: ../app/dialogs/module-dialog.c:465 +#: ../app/dialogs/module-dialog.c:472 msgid "Only in memory" msgstr "仅在内存" -#: ../app/dialogs/module-dialog.c:470 +#: ../app/dialogs/module-dialog.c:477 msgid "No longer available" -msgstr "已经不可用" +msgstr "不再可用" -#: ../app/dialogs/module-dialog.c:495 +#: ../app/dialogs/module-dialog.c:502 msgid "Author:" msgstr "作者：" -#: ../app/dialogs/module-dialog.c:496 +#: ../app/dialogs/module-dialog.c:503 msgid "Version:" msgstr "版本：" -#: ../app/dialogs/module-dialog.c:497 +#: ../app/dialogs/module-dialog.c:504 msgid "Date:" msgstr "日期：" -#: ../app/dialogs/module-dialog.c:498 +#: ../app/dialogs/module-dialog.c:505 msgid "Copyright:" msgstr "版权：" -#: ../app/dialogs/module-dialog.c:499 +#: ../app/dialogs/module-dialog.c:506 msgid "Location:" msgstr "位置：" -#: ../app/dialogs/offset-dialog.c:108 +#: ../app/dialogs/offset-dialog.c:120 msgid "Offset Layer" msgstr "图层位移" -#: ../app/dialogs/offset-dialog.c:110 +#: ../app/dialogs/offset-dialog.c:122 msgid "Offset Layer Mask" msgstr "图层蒙板位移" -#: ../app/dialogs/offset-dialog.c:112 +#: ../app/dialogs/offset-dialog.c:124 msgid "Offset Channel" msgstr "通道位移" #. The offset frame -#: ../app/dialogs/offset-dialog.c:118 ../app/dialogs/offset-dialog.c:152 -#: ../app/dialogs/resize-dialog.c:198 ../app/tools/gimpblendoptions.c:248 -#: ../app/widgets/gimpgrideditor.c:207 +#: ../app/dialogs/offset-dialog.c:129 ../app/dialogs/offset-dialog.c:163 +#: ../app/dialogs/resize-dialog.c:230 ../app/tools/gimpalignoptions.c:100 +#: ../app/tools/gimpalignoptions.c:107 ../app/tools/gimpblendoptions.c:88 +#: ../app/widgets/gimpgrideditor.c:209 msgid "Offset" msgstr "位移" #. offset, used as a verb -#: ../app/dialogs/offset-dialog.c:127 +#: ../app/dialogs/offset-dialog.c:138 msgid "_Offset" msgstr "位移(_O)" -#: ../app/dialogs/offset-dialog.c:184 ../app/dialogs/resize-dialog.c:227 +#: ../app/dialogs/offset-dialog.c:192 ../app/dialogs/resize-dialog.c:259 msgid "_X:" -msgstr "_X：" +msgstr "_X:" -#: ../app/dialogs/offset-dialog.c:186 ../app/dialogs/resize-dialog.c:228 +#: ../app/dialogs/offset-dialog.c:194 ../app/dialogs/resize-dialog.c:260 msgid "_Y:" -msgstr "_Y：" +msgstr "_Y:" -#: ../app/dialogs/offset-dialog.c:213 -msgid "Offset by x/_2, y/2" -msgstr "位移 x/2,y/2(_2)" +#: ../app/dialogs/offset-dialog.c:221 +msgid "By width/_2, height/2" +msgstr "按宽/_2，高/2" #. The edge behavior frame -#: ../app/dialogs/offset-dialog.c:222 +#: ../app/dialogs/offset-dialog.c:250 msgid "Edge Behavior" msgstr "边缘行为" -#: ../app/dialogs/offset-dialog.c:226 -msgid "_Wrap around" -msgstr "环绕(_W)" +#: ../app/dialogs/offset-dialog.c:254 +msgid "W_rap around" +msgstr "环绕周围(_R)" -#: ../app/dialogs/offset-dialog.c:229 +#: ../app/dialogs/offset-dialog.c:257 msgid "Fill with _background color" msgstr "以背景色填充(_B)" -#: ../app/dialogs/offset-dialog.c:232 +#: ../app/dialogs/offset-dialog.c:260 msgid "Make _transparent" msgstr "透明(_T)" -#: ../app/dialogs/palette-import-dialog.c:154 +#: ../app/dialogs/palette-import-dialog.c:157 msgid "Import a New Palette" msgstr "导入新的色板" -#: ../app/dialogs/palette-import-dialog.c:164 +#: ../app/dialogs/palette-import-dialog.c:163 msgid "_Import" msgstr "导入(_I)" #. The "Source" frame -#: ../app/dialogs/palette-import-dialog.c:203 +#: ../app/dialogs/palette-import-dialog.c:201 msgid "Select Source" msgstr "选择来源" -#: ../app/dialogs/palette-import-dialog.c:214 -#: ../app/dialogs/preferences-dialog.c:1924 +#: ../app/dialogs/palette-import-dialog.c:212 +#: ../app/dialogs/preferences-dialog.c:1630 msgid "_Gradient" msgstr "渐变(_G)" -#: ../app/dialogs/palette-import-dialog.c:225 +#: ../app/dialogs/palette-import-dialog.c:223 msgid "I_mage" msgstr "图像(_M)" -#: ../app/dialogs/palette-import-dialog.c:239 +#: ../app/dialogs/palette-import-dialog.c:237 msgid "Sample _Merged" msgstr "位样合并(_M)" -#: ../app/dialogs/palette-import-dialog.c:251 +#: ../app/dialogs/palette-import-dialog.c:249 msgid "_Selected Pixels only" msgstr "仅选中的像素(_S)" -#: ../app/dialogs/palette-import-dialog.c:263 +#: ../app/dialogs/palette-import-dialog.c:261 msgid "Palette _file" msgstr "色板文件(_F)" #. Palette file name entry -#: ../app/dialogs/palette-import-dialog.c:292 +#: ../app/dialogs/palette-import-dialog.c:290 msgid "Select Palette File" msgstr "选择色板文件" #. The "Import" frame -#: ../app/dialogs/palette-import-dialog.c:303 +#: ../app/dialogs/palette-import-dialog.c:301 msgid "Import Options" msgstr "导入选项" -#: ../app/dialogs/palette-import-dialog.c:317 +#: ../app/dialogs/palette-import-dialog.c:315 msgid "New import" msgstr "新建导入" -#: ../app/dialogs/palette-import-dialog.c:319 +#: ../app/dialogs/palette-import-dialog.c:317 msgid "Palette _name:" -msgstr "色板名称(_N)：" +msgstr "色板名字(_N)：" -#: ../app/dialogs/palette-import-dialog.c:325 +#: ../app/dialogs/palette-import-dialog.c:323 msgid "N_umber of colors:" msgstr "颜色数量(_U)：" -#: ../app/dialogs/palette-import-dialog.c:338 +#: ../app/dialogs/palette-import-dialog.c:337 msgid "C_olumns:" msgstr "列数(_O)：" -#: ../app/dialogs/palette-import-dialog.c:350 +#: ../app/dialogs/palette-import-dialog.c:349 msgid "I_nterval:" msgstr "间隔(_N)：" #. The "Preview" frame -#: ../app/dialogs/palette-import-dialog.c:361 +#: ../app/dialogs/palette-import-dialog.c:360 +#: ../app/tools/gimpforegroundselecttool.c:1223 msgid "Preview" msgstr "预览" -#: ../app/dialogs/palette-import-dialog.c:382 +#: ../app/dialogs/palette-import-dialog.c:381 msgid "The selected source contains no colors." msgstr "选中的源不包含颜色。" -#: ../app/dialogs/preferences-dialog.c:267 +#: ../app/dialogs/palette-import-dialog.c:466 +msgid "There is no palette to import." +msgstr "没有色板可导入。" + +#: ../app/dialogs/preferences-dialog.c:280 msgid "Reset All Preferences" msgstr "重置所有首选项" -#: ../app/dialogs/preferences-dialog.c:285 +#: ../app/dialogs/preferences-dialog.c:298 msgid "Do you really want to reset all preferences to default values?" msgstr "您真的要将所有首选项重置到默认值吗？" -#: ../app/dialogs/preferences-dialog.c:355 +#: ../app/dialogs/preferences-dialog.c:377 msgid "You will have to restart GIMP for the following changes to take effect:" -msgstr "您需要重新启动 GIMP 以使下列改变生效：" +msgstr "您需要重启 GIMP 以使下列改变生效：" -#: ../app/dialogs/preferences-dialog.c:537 +#: ../app/dialogs/preferences-dialog.c:619 msgid "" "Your keyboard shortcuts will be reset to default values the next time you " "start GIMP." msgstr "您的快捷键将在下次您启动 GIMP 的时候重置到默认值。" -#: ../app/dialogs/preferences-dialog.c:548 +#: ../app/dialogs/preferences-dialog.c:630 msgid "Remove all Keyboard Shortcuts" -msgstr "移除所有的快捷键" +msgstr "删除所有的快捷键" -#: ../app/dialogs/preferences-dialog.c:570 +#: ../app/dialogs/preferences-dialog.c:652 msgid "Do you really want to remove all keyboard shortcuts from all menus?" -msgstr "您真的要从所有菜单中移除所有的快捷键吗？" +msgstr "您真的要从所有菜单中删除所有的快捷键吗？" -#: ../app/dialogs/preferences-dialog.c:611 +#: ../app/dialogs/preferences-dialog.c:693 msgid "" "Your window setup will be reset to default values the next time you start " "GIMP." msgstr "您的窗口设置将在下次您启动 GIMP 的时候重置到默认值。" -#: ../app/dialogs/preferences-dialog.c:646 +#: ../app/dialogs/preferences-dialog.c:728 msgid "" "Your input device settings will be reset to default values the next time you " "start GIMP." msgstr "您的输入设备设置将在下次您启动 GIMP 的时候重置到默认值。" -#: ../app/dialogs/preferences-dialog.c:681 +#: ../app/dialogs/preferences-dialog.c:770 msgid "" "Your tool options will be reset to default values the next time you start " "GIMP." msgstr "您的工具选项将在您下次启动 GIMP 时重置到默认值。" -#: ../app/dialogs/preferences-dialog.c:1267 +#: ../app/dialogs/preferences-dialog.c:822 +#: ../app/dialogs/preferences-dialog.c:2456 +msgid "There's a local installation of the user manual." +msgstr "已安装用户指南的本地版本。" + +#: ../app/dialogs/preferences-dialog.c:827 +#: ../app/dialogs/preferences-dialog.c:2462 +msgid "The user manual is not installed locally." +msgstr "用户指南未在本地安装。" + +#: ../app/dialogs/preferences-dialog.c:934 msgid "Show _menubar" msgstr "显示菜单栏(_M)" -#: ../app/dialogs/preferences-dialog.c:1271 +#: ../app/dialogs/preferences-dialog.c:938 msgid "Show _rulers" msgstr "显示标尺(_R)" -#: ../app/dialogs/preferences-dialog.c:1274 +#: ../app/dialogs/preferences-dialog.c:941 msgid "Show scroll_bars" msgstr "显示滚动条(_B)" -#: ../app/dialogs/preferences-dialog.c:1277 +#: ../app/dialogs/preferences-dialog.c:944 msgid "Show s_tatusbar" msgstr "显示状态栏(_T)" -#: ../app/dialogs/preferences-dialog.c:1285 +#: ../app/dialogs/preferences-dialog.c:952 msgid "Show s_election" msgstr "显示选区(_E)" -#: ../app/dialogs/preferences-dialog.c:1288 +#: ../app/dialogs/preferences-dialog.c:955 msgid "Show _layer boundary" msgstr "显示图层边界(_L)" -#: ../app/dialogs/preferences-dialog.c:1291 +#: ../app/dialogs/preferences-dialog.c:958 msgid "Show _guides" msgstr "显示参考线(_G)" -#: ../app/dialogs/preferences-dialog.c:1294 +#: ../app/dialogs/preferences-dialog.c:961 msgid "Show gri_d" msgstr "显示网格(_D)" -#: ../app/dialogs/preferences-dialog.c:1300 +#: ../app/dialogs/preferences-dialog.c:967 msgid "Canvas _padding mode:" msgstr "画布衬垫模式(_P)：" -#: ../app/dialogs/preferences-dialog.c:1305 +#: ../app/dialogs/preferences-dialog.c:972 msgid "Custom p_adding color:" -msgstr "自定义画布衬垫颜色(_A)：" +msgstr "自定义画布填充颜色(_A)：" -#: ../app/dialogs/preferences-dialog.c:1306 +#: ../app/dialogs/preferences-dialog.c:973 msgid "Select Custom Canvas Padding Color" msgstr "设置自定义画布衬垫的颜色" -#: ../app/dialogs/preferences-dialog.c:1395 +#: ../app/dialogs/preferences-dialog.c:1003 +msgid "Snap to Guides" +msgstr "吸附到参考线" + +#: ../app/dialogs/preferences-dialog.c:1006 +msgid "Snap to Grid" +msgstr "吸附到网格" + +#: ../app/dialogs/preferences-dialog.c:1014 +msgid "Snap to Canvas Edges" +msgstr "吸附到画布边缘" + +#: ../app/dialogs/preferences-dialog.c:1017 +msgid "Snap to Active Path" +msgstr "吸附到活动路径" + +#: ../app/dialogs/preferences-dialog.c:1094 msgid "Preferences" msgstr "首选项" -#: ../app/dialogs/preferences-dialog.c:1508 -#: ../app/dialogs/preferences-dialog.c:2784 -msgid "Environment" -msgstr "环境" +#: ../app/dialogs/preferences-dialog.c:1130 +#: ../app/dialogs/preferences-dialog.c:1131 +msgid "System Resources" +msgstr "系统资源" -#: ../app/dialogs/preferences-dialog.c:1522 +#: ../app/dialogs/preferences-dialog.c:1138 msgid "Resource Consumption" msgstr "资源消耗" -#: ../app/dialogs/preferences-dialog.c:1532 +#: ../app/dialogs/preferences-dialog.c:1148 msgid "Minimal number of _undo levels:" -msgstr "最小撤消次数(_U)：" +msgstr "最小撤消级别(_U)：" -#: ../app/dialogs/preferences-dialog.c:1535 +#: ../app/dialogs/preferences-dialog.c:1151 msgid "Maximum undo _memory:" msgstr "最大撤消内存(_M)：" -#: ../app/dialogs/preferences-dialog.c:1538 +#: ../app/dialogs/preferences-dialog.c:1154 msgid "Tile cache _size:" msgstr "平铺缓存大小(_S)：" -#: ../app/dialogs/preferences-dialog.c:1541 +#: ../app/dialogs/preferences-dialog.c:1157 msgid "Maximum _new image size:" msgstr "最大新建图像大小(_N)：" -#: ../app/dialogs/preferences-dialog.c:1546 -msgid "Number of _processors to use:" -msgstr "处理器使用数量(_P)：" +#: ../app/dialogs/preferences-dialog.c:1162 +msgid "Number of _threads to use:" +msgstr "线程使用数量(_T)：" + +#: ../app/dialogs/preferences-dialog.c:1167 +msgid "" +"Threading support is not yet stable.\n" +"Setting this to greater than one might\n" +"result in image errors or crashes." +msgstr "" +"多线程支持还不稳定。\n" +"设为大于 1 可能会导致\n" +"图像错误或崩溃的结果。" + +#. Hardware Acceleration +#: ../app/dialogs/preferences-dialog.c:1177 +msgid "Hardware Acceleration" +msgstr "硬件加速" + +#: ../app/dialogs/preferences-dialog.c:1181 +msgid "Use OpenCL" +msgstr "使用 OpenCL" #. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1551 +#: ../app/dialogs/preferences-dialog.c:1185 msgid "Image Thumbnails" msgstr "图像缩略图" -#: ../app/dialogs/preferences-dialog.c:1556 +#: ../app/dialogs/preferences-dialog.c:1190 msgid "Size of _thumbnails:" msgstr "缩略图大小(_T)：" -#: ../app/dialogs/preferences-dialog.c:1560 +#: ../app/dialogs/preferences-dialog.c:1194 msgid "Maximum _filesize for thumbnailing:" msgstr "缩略图最大文件大小(_F)：" -#. File Saving -#: ../app/dialogs/preferences-dialog.c:1564 -msgid "Saving Images" -msgstr "保存图像" - -#: ../app/dialogs/preferences-dialog.c:1567 -msgid "Confirm closing of unsa_ved images" -msgstr "关闭未保存的图像时需要确认(_V)" - -#: ../app/dialogs/preferences-dialog.c:1577 +#: ../app/dialogs/preferences-dialog.c:1204 msgid "Keep record of used files in the Recent Documents list" -msgstr "显示最近使用的文档" +msgstr "保持最近文档列表中使用过文件的记录" -#: ../app/dialogs/preferences-dialog.c:1586 -msgid "User Interface" -msgstr "用户界面" +#. TODO: icon needed. +#: ../app/dialogs/preferences-dialog.c:1219 +#: ../app/dialogs/preferences-dialog.c:1220 +msgid "Debugging" +msgstr "调试" -#: ../app/dialogs/preferences-dialog.c:1589 -msgid "Interface" -msgstr "界面" +#: ../app/dialogs/preferences-dialog.c:1227 +msgid "" +"We hope you will never need these settings, but as all software, GIMP has " +"bugs, and crashes can occur. If it happens, you can help us by reporting " +"bugs." +msgstr "" +"我们希望您永远不需要这些设置，但和所有软件一样，GIMP 有缺陷，且可能发生崩溃。" +"如果发生了，您可以通过报告缺陷帮助我们。" -#: ../app/dialogs/preferences-dialog.c:1599 -msgid "Language" -msgstr "语言" +#: ../app/dialogs/preferences-dialog.c:1236 +msgid "Bug Reporting" +msgstr "缺陷报告" -#. Previews -#: ../app/dialogs/preferences-dialog.c:1605 -msgid "Previews" -msgstr "预览" +#: ../app/dialogs/preferences-dialog.c:1243 +msgid "Debug _policy:" +msgstr "调试策略(_P)：" -#: ../app/dialogs/preferences-dialog.c:1608 -msgid "_Enable layer & channel previews" -msgstr "启用图层和通道预览(_E)" +#: ../app/dialogs/preferences-dialog.c:1255 +msgid "This feature requires \"gdb\" or \"lldb\" installed on your system." +msgstr "该特性需要您的系统上安装有“gdb”或“lldb”。" -#: ../app/dialogs/preferences-dialog.c:1614 -msgid "_Default layer & channel preview size:" -msgstr "默认图层和通道预览大小(_D)：" +#: ../app/dialogs/preferences-dialog.c:1259 +msgid "" +"This feature is more efficient with \"gdb\" or \"lldb\" installed on your " +"system." +msgstr "您的系统上安装有“gdb”或“lldb”时该特性更有效率。" -#: ../app/dialogs/preferences-dialog.c:1617 -msgid "Na_vigation preview size:" -msgstr "导航预览大小(_V)：" +#: ../app/dialogs/preferences-dialog.c:1272 +#: ../app/dialogs/preferences-dialog.c:1273 +msgid "Color Management" +msgstr "色彩管理" -#. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1621 -msgid "Keyboard Shortcuts" -msgstr "快捷键" +#: ../app/dialogs/preferences-dialog.c:1282 +msgid "Reset Color Management" +msgstr "重置色彩管理" -#: ../app/dialogs/preferences-dialog.c:1625 -msgid "_Use dynamic keyboard shortcuts" -msgstr "使用动态快捷键(_U)" +#: ../app/dialogs/preferences-dialog.c:1305 +msgid "Image display _mode:" +msgstr "图像显示模式(_M)：" -#: ../app/dialogs/preferences-dialog.c:1629 -msgid "Configure _Keyboard Shortcuts..." -msgstr "配置快捷键(_K)..." +#. Color Managed Display +#: ../app/dialogs/preferences-dialog.c:1309 +msgid "Color Managed Display" +msgstr "色彩管理显示" -#: ../app/dialogs/preferences-dialog.c:1636 -msgid "_Save keyboard shortcuts on exit" -msgstr "退出时保存快捷键(_S)" +#: ../app/dialogs/preferences-dialog.c:1318 +msgid "Select Monitor Color Profile" +msgstr "选择显示器色彩配置文件" -#: ../app/dialogs/preferences-dialog.c:1640 -msgid "Save Keyboard Shortcuts _Now" -msgstr "立即保存快捷键(_N)" +#: ../app/dialogs/preferences-dialog.c:1319 +msgid "_Monitor profile:" +msgstr "显示器配置文件(_M)：" -#: ../app/dialogs/preferences-dialog.c:1647 -msgid "_Reset Keyboard Shortcuts to Default Values" -msgstr "重置快捷键到默认置(_R)" +#: ../app/dialogs/preferences-dialog.c:1325 +msgid "_Try to use the system monitor profile" +msgstr "尝试使用系统显示器配置文件(_T)" -#: ../app/dialogs/preferences-dialog.c:1656 -msgid "Remove _All Keyboard Shortcuts" -msgstr "移除所有快捷键(_A)" +#: ../app/dialogs/preferences-dialog.c:1334 +msgid "_Rendering intent:" +msgstr "渲染效果(_R)：" -#: ../app/dialogs/preferences-dialog.c:1668 -#: ../app/dialogs/preferences-dialog.c:1707 -msgid "Theme" -msgstr "主题" +#: ../app/dialogs/preferences-dialog.c:1339 +msgid "Use _black point compensation" +msgstr "使用黑点补偿(_B)" -#: ../app/dialogs/preferences-dialog.c:1677 -msgid "Select Theme" -msgstr "选择主题" +#: ../app/dialogs/preferences-dialog.c:1347 +#: ../app/dialogs/preferences-dialog.c:1383 ../app/paint/gimpinkoptions.c:93 +msgid "Speed" +msgstr "速度" -#: ../app/dialogs/preferences-dialog.c:1759 -msgid "Reload C_urrent Theme" -msgstr "重新加载当前主题(_U)" +#: ../app/dialogs/preferences-dialog.c:1348 +#: ../app/dialogs/preferences-dialog.c:1384 +msgid "Precision / Color Fidelity" +msgstr "精度/颜色保真度" -#: ../app/dialogs/preferences-dialog.c:1771 -msgid "Help System" -msgstr "帮助系统" +#: ../app/dialogs/preferences-dialog.c:1349 +msgid "_Optimize image display for:" +msgstr "优化图像显示(_O)：" + +#. Print Simulation (Soft-proofing) +#: ../app/dialogs/preferences-dialog.c:1353 +msgid "Soft-Proofing" +msgstr "软件校对" + +#: ../app/dialogs/preferences-dialog.c:1363 +msgid "Select Soft-Proofing Color Profile" +msgstr "选择软件校对色彩配置文件" + +#: ../app/dialogs/preferences-dialog.c:1364 +msgid "_Soft-proofing profile:" +msgstr "软件校对配置文件(_S)：" + +#: ../app/dialogs/preferences-dialog.c:1370 +msgid "Re_ndering intent:" +msgstr "渲染效果(_N)：" + +#: ../app/dialogs/preferences-dialog.c:1375 +msgid "Use black _point compensation" +msgstr "使用黑点补偿(_P)" + +#: ../app/dialogs/preferences-dialog.c:1385 +msgid "O_ptimize soft-proofing for:" +msgstr "优化软件校对(_P)：" + +#: ../app/dialogs/preferences-dialog.c:1394 +msgid "Mark out of gamut colors" +msgstr "标记出超出全彩范围的" + +#: ../app/dialogs/preferences-dialog.c:1399 +msgid "Select Warning Color" +msgstr "选择警告颜色" + +#. Preferred profiles +#: ../app/dialogs/preferences-dialog.c:1410 +msgid "Preferred Profiles" +msgstr "首选配置文件" + +#: ../app/dialogs/preferences-dialog.c:1419 +msgid "Select Preferred RGB Color Profile" +msgstr "选择首选的 RGB 色彩配置文件" + +#: ../app/dialogs/preferences-dialog.c:1420 +msgid "_RGB profile:" +msgstr "_RGB 配置文件：" + +#: ../app/dialogs/preferences-dialog.c:1427 +msgid "Select Preferred Grayscale Color Profile" +msgstr "选择首选的灰度色彩配置文件" + +#: ../app/dialogs/preferences-dialog.c:1428 +msgid "_Grayscale profile:" +msgstr "灰度配置文件(_G)：" + +#: ../app/dialogs/preferences-dialog.c:1435 +msgid "Select CMYK Color Profile" +msgstr "选择 CMYK 色彩配置文件" + +#: ../app/dialogs/preferences-dialog.c:1436 +msgid "_CMYK profile:" +msgstr "_CMYK 配置文件：" + +#. Policies +#: ../app/dialogs/preferences-dialog.c:1441 +msgid "Policies" +msgstr "方案" + +#: ../app/dialogs/preferences-dialog.c:1446 +msgid "File Open behaviour:" +msgstr "文件打开行为：" + +#. Filter Dialogs +#: ../app/dialogs/preferences-dialog.c:1450 +#: ../app/dialogs/preferences-dialog.c:2171 +msgid "Filter Dialogs" +msgstr "滤镜对话框" + +#: ../app/dialogs/preferences-dialog.c:1454 +#: ../app/dialogs/preferences-dialog.c:2183 +msgid "Show advanced color options" +msgstr "显示高级色彩选项" + +#: ../app/dialogs/preferences-dialog.c:1468 +#: ../app/dialogs/preferences-dialog.c:1469 +msgid "Image Import & Export" +msgstr "图像导入和导出" + +#. Import Policies +#: ../app/dialogs/preferences-dialog.c:1475 +msgid "Import Policies" +msgstr "导入方案" + +#: ../app/dialogs/preferences-dialog.c:1479 +msgid "Promote imported images to _floating point precision" +msgstr "将导入的图像提升为浮点精度(_F)" + +#: ../app/dialogs/preferences-dialog.c:1485 +msgid "Dither images when promoting to floating point" +msgstr "提升为浮点时对图像递色" + +#: ../app/dialogs/preferences-dialog.c:1490 +msgid "Add an alpha channel to imported images" +msgstr "为导入的图像添加一个透明通道" + +#: ../app/dialogs/preferences-dialog.c:1495 +#: ../app/dialogs/preferences-dialog.c:2094 +msgid "Color profile policy:" +msgstr "色彩配置文件方案：" + +#. Export Policies +#: ../app/dialogs/preferences-dialog.c:1499 +msgid "Export Policies" +msgstr "导出方案" + +#: ../app/dialogs/preferences-dialog.c:1503 +msgid "Export Exif metadata by default when available" +msgstr "当可用时默认导出 Exif 元数据" + +#: ../app/dialogs/preferences-dialog.c:1506 +msgid "Export XMP metadata by default when available" +msgstr "当可用时默认导出 XMP 元数据" + +#: ../app/dialogs/preferences-dialog.c:1509 +msgid "Export IPTC metadata by default when available" +msgstr "当可用时默认导出 IPTC 元数据" + +#: ../app/dialogs/preferences-dialog.c:1512 +msgid "Metadata can contain sensitive information." +msgstr "元数据可能包含敏感信息。" + +#. Raw Image Importer +#: ../app/dialogs/preferences-dialog.c:1517 +msgid "Raw Image Importer" +msgstr "Raw 图像导入" + +#: ../app/dialogs/preferences-dialog.c:1550 +msgid "Experimental Playground" +msgstr "实验性特性试验场" + +#: ../app/dialogs/preferences-dialog.c:1551 +msgid "Playground" +msgstr "试验场" + +#: ../app/dialogs/preferences-dialog.c:1556 +msgid "Insane Options" +msgstr "疯狂选项" + +#: ../app/dialogs/preferences-dialog.c:1560 +msgid "_N-Point Deformation tool" +msgstr "N 点变换工具(_N)" + +#: ../app/dialogs/preferences-dialog.c:1563 +msgid "_Seamless Clone tool" +msgstr "无缝克隆工具(_S)" + +#: ../app/dialogs/preferences-dialog.c:1573 +#: ../app/dialogs/preferences-dialog.c:1574 +msgctxt "preferences" +msgid "Tool Options" +msgstr "工具选项" #. General -#: ../app/dialogs/preferences-dialog.c:1783 -#: ../app/dialogs/preferences-dialog.c:1867 -#: ../app/dialogs/preferences-dialog.c:2080 +#. Snapping Distance +#: ../app/dialogs/preferences-dialog.c:1582 +#: ../app/dialogs/preferences-dialog.c:2400 +#: ../app/dialogs/preferences-dialog.c:2728 +#: ../app/dialogs/preferences-dialog.c:2959 #: ../app/widgets/gimpcontrollereditor.c:186 msgid "General" msgstr "常规" -#: ../app/dialogs/preferences-dialog.c:1786 -msgid "Show _tooltips" -msgstr "显示工具提示(_T)" - -#: ../app/dialogs/preferences-dialog.c:1789 -msgid "Show help _buttons" -msgstr "显示帮助按钮(_B)" - -#: ../app/dialogs/preferences-dialog.c:1802 -msgid "Use the online version" -msgstr "使用在线版本" - -#: ../app/dialogs/preferences-dialog.c:1803 -msgid "Use a locally installed copy" -msgstr "使用本地已安装版本" - -#: ../app/dialogs/preferences-dialog.c:1804 -msgid "User manual:" -msgstr "用户指南" - -#: ../app/dialogs/preferences-dialog.c:1811 -msgid "There's a local installation of the user manual." -msgstr "已安装用户指南的本地版本" - -#: ../app/dialogs/preferences-dialog.c:1816 -msgid "The user manual is not installed locally." -msgstr "用户指南未在本地安装" - -#. Help Browser -#: ../app/dialogs/preferences-dialog.c:1839 -msgid "Help Browser" -msgstr "帮助浏览器" - -#: ../app/dialogs/preferences-dialog.c:1843 -msgid "H_elp browser to use:" -msgstr "要使用的帮助浏览器(_E)：" - -#: ../app/dialogs/preferences-dialog.c:1870 +#: ../app/dialogs/preferences-dialog.c:1585 msgid "_Save tool options on exit" msgstr "退出时保存工具选项(_S)" -#: ../app/dialogs/preferences-dialog.c:1874 +#: ../app/dialogs/preferences-dialog.c:1589 msgid "Save Tool Options _Now" msgstr "立即保存工具选项(_N)" -#: ../app/dialogs/preferences-dialog.c:1881 +#: ../app/dialogs/preferences-dialog.c:1596 msgid "_Reset Saved Tool Options to Default Values" msgstr "将工具选项重置为默认值(_R)" -#. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1891 -msgid "Guide & Grid Snapping" -msgstr "参考线和网格吸附" - -#: ../app/dialogs/preferences-dialog.c:1896 -msgid "_Snap distance:" -msgstr "吸附距离(_S)：" - -#: ../app/dialogs/preferences-dialog.c:1904 +#: ../app/dialogs/preferences-dialog.c:1610 msgid "Default _interpolation:" msgstr "默认插值(_I)：" #. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1911 +#: ../app/dialogs/preferences-dialog.c:1617 msgid "Paint Options Shared Between Tools" -msgstr "工具之间共享的涂画选项" +msgstr "工具之间共享的绘画选项" -#: ../app/dialogs/preferences-dialog.c:1915 +#: ../app/dialogs/preferences-dialog.c:1621 msgid "_Brush" -msgstr "画笔(_B)" +msgstr "笔刷(_B)" -#: ../app/dialogs/preferences-dialog.c:1918 +#: ../app/dialogs/preferences-dialog.c:1624 msgid "_Dynamics" msgstr "动态(_D)" -#: ../app/dialogs/preferences-dialog.c:1921 +#: ../app/dialogs/preferences-dialog.c:1627 msgid "_Pattern" msgstr "图案(_P)" #. Move Tool -#: ../app/dialogs/preferences-dialog.c:1928 +#: ../app/dialogs/preferences-dialog.c:1634 msgid "Move Tool" msgstr "移动工具" -#: ../app/dialogs/preferences-dialog.c:1932 +#: ../app/dialogs/preferences-dialog.c:1638 msgid "Set layer or path as active" -msgstr "将图层或路径设置为活动的" +msgstr "将图层或路径设为活动的" + +#: ../app/dialogs/preferences-dialog.c:1651 +msgid "Default New Image" +msgstr "默认新图像" + +#: ../app/dialogs/preferences-dialog.c:1652 +msgid "Default Image" +msgstr "默认图像" + +#: ../app/dialogs/preferences-dialog.c:1688 +msgid "Quick Mask color:" +msgstr "快速蒙板颜色：" + +#: ../app/dialogs/preferences-dialog.c:1689 +msgid "Set the default Quick Mask color" +msgstr "设置默认的快速蒙版颜色" + +#: ../app/dialogs/preferences-dialog.c:1699 +msgid "Default Image Grid" +msgstr "默认图像网格" + +#: ../app/dialogs/preferences-dialog.c:1700 +msgid "Default Grid" +msgstr "默认网格" + +#: ../app/dialogs/preferences-dialog.c:1719 +msgid "User Interface" +msgstr "用户界面" + +#: ../app/dialogs/preferences-dialog.c:1720 +msgid "Interface" +msgstr "界面" + +#: ../app/dialogs/preferences-dialog.c:1729 ../app/tools/gimptextoptions.c:151 +msgid "Language" +msgstr "语言" + +#. Previews +#: ../app/dialogs/preferences-dialog.c:1735 +msgid "Previews" +msgstr "预览" + +#: ../app/dialogs/preferences-dialog.c:1738 +msgid "_Enable layer & channel previews" +msgstr "启用图层和通道预览(_E)" + +#: ../app/dialogs/preferences-dialog.c:1744 +msgid "_Default layer & channel preview size:" +msgstr "默认图层和通道预览大小(_D)：" + +#: ../app/dialogs/preferences-dialog.c:1747 +msgid "_Undo preview size:" +msgstr "撤销预览大小(_U)：" + +#: ../app/dialogs/preferences-dialog.c:1750 +msgid "Na_vigation preview size:" +msgstr "导航预览大小(_V)：" + +#. Keyboard Shortcuts +#: ../app/dialogs/preferences-dialog.c:1754 +msgid "Keyboard Shortcuts" +msgstr "快捷键" + +#: ../app/dialogs/preferences-dialog.c:1758 +msgid "_Use dynamic keyboard shortcuts" +msgstr "使用动态快捷键(_U)" + +#: ../app/dialogs/preferences-dialog.c:1762 +msgid "Configure _Keyboard Shortcuts..." +msgstr "配置快捷键(_K)…" + +#: ../app/dialogs/preferences-dialog.c:1769 +msgid "_Save keyboard shortcuts on exit" +msgstr "退出时保存快捷键(_S)" + +#: ../app/dialogs/preferences-dialog.c:1773 +msgid "Save Keyboard Shortcuts _Now" +msgstr "立即保存快捷键(_N)" + +#: ../app/dialogs/preferences-dialog.c:1780 +msgid "_Reset Keyboard Shortcuts to Default Values" +msgstr "重置快捷键为默认值(_R)" + +#: ../app/dialogs/preferences-dialog.c:1789 +msgid "Remove _All Keyboard Shortcuts" +msgstr "删除所有快捷键(_A)" + +#: ../app/dialogs/preferences-dialog.c:1801 +#: ../app/dialogs/preferences-dialog.c:1802 +#: ../app/dialogs/preferences-dialog.c:1837 +msgid "Theme" +msgstr "主题" + +#: ../app/dialogs/preferences-dialog.c:1807 +msgid "Select Theme" +msgstr "选择主题" + +#: ../app/dialogs/preferences-dialog.c:1889 +msgid "Reload C_urrent Theme" +msgstr "重新加载当前主题(_U)" + +#: ../app/dialogs/preferences-dialog.c:1901 +#: ../app/dialogs/preferences-dialog.c:1902 +#: ../app/dialogs/preferences-dialog.c:1943 +msgid "Icon Theme" +msgstr "图标主题" + +#: ../app/dialogs/preferences-dialog.c:1907 +msgid "Select an Icon Theme" +msgstr "选择图标主题" #. Appearance -#: ../app/dialogs/preferences-dialog.c:1957 -#: ../app/dialogs/preferences-dialog.c:2156 -#: ../app/widgets/gimpgrideditor.c:135 +#: ../app/dialogs/preferences-dialog.c:2031 +#: ../app/dialogs/preferences-dialog.c:2799 ../app/widgets/gimpgrideditor.c:134 msgid "Appearance" msgstr "外观" -#: ../app/dialogs/preferences-dialog.c:1961 +#: ../app/dialogs/preferences-dialog.c:2035 +msgid "Show GIMP _logo (drag-and-drop target)" +msgstr "显示 GIMP 标志(拖放目标)" + +#: ../app/dialogs/preferences-dialog.c:2039 msgid "Show _foreground & background color" msgstr "显示前景色和背景色(_F)" -#: ../app/dialogs/preferences-dialog.c:1965 +#: ../app/dialogs/preferences-dialog.c:2043 msgid "Show active _brush, pattern & gradient" -msgstr "显示活动画笔、图案和渐变(_B)" +msgstr "显示活动笔刷、图案和渐变(_B)" -#: ../app/dialogs/preferences-dialog.c:1969 +#: ../app/dialogs/preferences-dialog.c:2047 msgid "Show active _image" msgstr "显示活动图像(_I)" #. Tool Editor -#: ../app/dialogs/preferences-dialog.c:1977 -msgid "Tools configuration" +#: ../app/dialogs/preferences-dialog.c:2055 +msgid "Tools Configuration" msgstr "工具配置" -#: ../app/dialogs/preferences-dialog.c:1992 -msgid "Default New Image" -msgstr "默认新图像" +#: ../app/dialogs/preferences-dialog.c:2071 +#: ../app/dialogs/preferences-dialog.c:2072 +msgid "Dialog Defaults" +msgstr "对话框默认值" -#: ../app/dialogs/preferences-dialog.c:1995 -msgid "Default Image" -msgstr "默认图像" - -#: ../app/dialogs/preferences-dialog.c:2029 -#, fuzzy -msgid "Set the default Quick Mask color" -msgstr "编辑快速蒙板颜色" - -#: ../app/dialogs/preferences-dialog.c:2035 -#, fuzzy -msgid "Quick Mask color:" -msgstr "编辑快速蒙板颜色" - -#: ../app/dialogs/preferences-dialog.c:2045 -msgid "Default Image Grid" -msgstr "默认图像网格" - -#: ../app/dialogs/preferences-dialog.c:2048 -msgid "Default Grid" -msgstr "默认网格" - -#: ../app/dialogs/preferences-dialog.c:2068 -msgid "Image Windows" -msgstr "图像窗口" - -#: ../app/dialogs/preferences-dialog.c:2083 -msgid "Use \"_Dot for dot\" by default" -msgstr "默认使用“点对点”(_D)" +#: ../app/dialogs/preferences-dialog.c:2081 +msgid "Reset Dialog Defaults" +msgstr "重置对话框默认值" +#. Color profile import dialog #: ../app/dialogs/preferences-dialog.c:2089 -msgid "Marching _ants speed:" -msgstr "蚂蚁线速度(_A)：" +msgid "Color Profile Import Dialog" +msgstr "色彩配置文件导入对话框" -#. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2093 -msgid "Zoom & Resize Behavior" -msgstr "缩放和改变大小行为" +#. All color profile chooser dialogs +#: ../app/dialogs/preferences-dialog.c:2098 +msgid "Color Profile File Dialogs" +msgstr "色彩配置文件对话框" -#: ../app/dialogs/preferences-dialog.c:2097 -msgid "Resize window on _zoom" -msgstr "缩放时调整窗口大小(_Z)" +#: ../app/dialogs/preferences-dialog.c:2103 +msgid "Profile folder:" +msgstr "配置文件夹：" -#: ../app/dialogs/preferences-dialog.c:2100 -msgid "Resize window on image _size change" -msgstr "图像大小改变时调整窗口大小(_S)" - -#: ../app/dialogs/preferences-dialog.c:2106 -msgid "Fit to window" -msgstr "适合窗口" +#: ../app/dialogs/preferences-dialog.c:2104 +msgid "Select Default Folder for Color Profiles" +msgstr "为色彩配置文件选择默认文件夹" +#. Convert to Color Profile Dialog #: ../app/dialogs/preferences-dialog.c:2108 -msgid "Initial zoom _ratio:" -msgstr "初始缩放比率(_R)：" +msgid "Convert to Color Profile Dialog" +msgstr "转换到色彩配置文件对话框" -#. Space Bar -#: ../app/dialogs/preferences-dialog.c:2112 -msgid "Space Bar" -msgstr "空格键" +#: ../app/dialogs/preferences-dialog.c:2113 +msgid "Rendering intent:" +msgstr "渲染效果：" -#: ../app/dialogs/preferences-dialog.c:2118 -msgid "_While space bar is pressed:" -msgstr "当空格键被按下时(_W)：" +#: ../app/dialogs/preferences-dialog.c:2117 +msgid "Black point compensation" +msgstr "黑点补偿" -#. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2122 -msgid "Mouse Pointers" -msgstr "鼠标指针" +#. Convert Precision Dialog +#: ../app/dialogs/preferences-dialog.c:2121 +msgid "Precision Conversion Dialog" +msgstr "精度转换对话框" -#: ../app/dialogs/preferences-dialog.c:2126 -msgid "Show _brush outline" -msgstr "显示画笔轮廓(_B)" +#: ../app/dialogs/preferences-dialog.c:2128 +msgid "Dither layers:" +msgstr "递色图层：" -#: ../app/dialogs/preferences-dialog.c:2129 -msgid "Show pointer for paint _tools" -msgstr "显示涂画工具鼠标指针(_T)" - -#: ../app/dialogs/preferences-dialog.c:2135 -msgid "Pointer _mode:" -msgstr "指针模式(_M)：" +#: ../app/dialogs/preferences-dialog.c:2133 +msgid "Dither text layers:" +msgstr "递色文字图层：" #: ../app/dialogs/preferences-dialog.c:2138 -msgid "Pointer re_ndering:" -msgstr "指针渲染(_N)：" +msgid "Dither channels/masks:" +msgstr "递色通道/蒙板：" -#: ../app/dialogs/preferences-dialog.c:2141 -#, fuzzy -msgid "Pointer _handedness:" -msgstr "指针渲染(_N)：" +#. Convert Indexed Dialog +#: ../app/dialogs/preferences-dialog.c:2142 +msgid "Indexed Conversion Dialog" +msgstr "索引转换对话框" -#: ../app/dialogs/preferences-dialog.c:2153 -msgid "Image Window Appearance" -msgstr "图像窗口外观" +#: ../app/dialogs/preferences-dialog.c:2147 +msgid "Colormap:" +msgstr "颜色表：" + +#: ../app/dialogs/preferences-dialog.c:2150 +msgid "Maximum number of colors:" +msgstr "最大颜色数量：" + +#: ../app/dialogs/preferences-dialog.c:2154 +msgid "Remove unused and duplicate colors from colormap" +msgstr "从颜色表中移除无用和重复的颜色" + +#: ../app/dialogs/preferences-dialog.c:2160 +msgid "Color dithering:" +msgstr "颜色递色：" #: ../app/dialogs/preferences-dialog.c:2164 -msgid "Default Appearance in Normal Mode" -msgstr "普通模式下的默认外观" +msgid "Enable dithering of transparency" +msgstr "启用透明递色" -#: ../app/dialogs/preferences-dialog.c:2169 -msgid "Default Appearance in Fullscreen Mode" -msgstr "全屏模式下的默认外观" +#: ../app/dialogs/preferences-dialog.c:2176 +msgid "Keep recent settings:" +msgstr "保留最近设置：" -#: ../app/dialogs/preferences-dialog.c:2178 -msgid "Image Title & Statusbar Format" -msgstr "图像标题和状态栏格式" +#: ../app/dialogs/preferences-dialog.c:2180 +msgid "Default to the last used settings" +msgstr "默认为上次使用的设置" -#: ../app/dialogs/preferences-dialog.c:2181 -msgid "Title & Status" -msgstr "标题和状态" +#. Canvas Size Dialog +#: ../app/dialogs/preferences-dialog.c:2187 +msgid "Canvas Size Dialog" +msgstr "画布大小对话框" + +#: ../app/dialogs/preferences-dialog.c:2192 +#: ../app/dialogs/preferences-dialog.c:2221 +msgid "Fill with:" +msgstr "填充：" + +#: ../app/dialogs/preferences-dialog.c:2195 +msgid "Resize layers:" +msgstr "改变图层大小：" #: ../app/dialogs/preferences-dialog.c:2199 -msgid "Current format" -msgstr "当前格式" - -#: ../app/dialogs/preferences-dialog.c:2200 -msgid "Default format" -msgstr "默认格式" - -#: ../app/dialogs/preferences-dialog.c:2201 -msgid "Show zoom percentage" -msgstr "显示缩放百分比" - -#: ../app/dialogs/preferences-dialog.c:2202 -msgid "Show zoom ratio" -msgstr "显示缩放比率" +msgid "Resize text layers" +msgstr "改变文字图层大小" +#. New Layer Dialog #: ../app/dialogs/preferences-dialog.c:2203 -msgid "Show image size" -msgstr "显示图像大小" +msgid "New Layer Dialog" +msgstr "新建图层对话框" +#: ../app/dialogs/preferences-dialog.c:2208 +msgid "Layer name:" +msgstr "图层名字：" + +#: ../app/dialogs/preferences-dialog.c:2212 +msgid "Fill type:" +msgstr "填充类型：" + +#. Layer Boundary Size Dialog #: ../app/dialogs/preferences-dialog.c:2216 -msgid "Image Title Format" -msgstr "图像标题格式" +msgid "Layer Boundary Size Dialog" +msgstr "图层边界大小对话框" -#: ../app/dialogs/preferences-dialog.c:2218 -msgid "Image Statusbar Format" -msgstr "图像状态栏格式" +#. Add Layer Mask Dialog +#: ../app/dialogs/preferences-dialog.c:2225 +msgid "Add Layer Mask Dialog" +msgstr "添加图层蒙板对话框" -#: ../app/dialogs/preferences-dialog.c:2303 +#: ../app/dialogs/preferences-dialog.c:2230 +msgid "Layer mask type:" +msgstr "图层蒙板类型：" + +#: ../app/dialogs/preferences-dialog.c:2234 +msgid "Invert mask" +msgstr "反转蒙板" + +#. Merge Layers Dialog +#: ../app/dialogs/preferences-dialog.c:2238 +msgid "Merge Layers Dialog" +msgstr "合并图层对话框" + +#: ../app/dialogs/preferences-dialog.c:2245 +msgid "Merged layer size:" +msgstr "合并图层大小：" + +#: ../app/dialogs/preferences-dialog.c:2249 +msgid "Merge within active group only" +msgstr "仅合并位于活动组内的图层" + +#: ../app/dialogs/preferences-dialog.c:2252 +msgid "Discard invisible layers" +msgstr "丢弃不可见图层" + +#. New Channel Dialog +#: ../app/dialogs/preferences-dialog.c:2256 +msgid "New Channel Dialog" +msgstr "新建通道对话框" + +#: ../app/dialogs/preferences-dialog.c:2261 +msgid "Channel name:" +msgstr "通道名字：" + +#: ../app/dialogs/preferences-dialog.c:2265 +msgid "Color and opacity:" +msgstr "颜色和不透明度：" + +#: ../app/dialogs/preferences-dialog.c:2266 +msgid "Default New Channel Color and Opacity" +msgstr "默认的新建通道颜色和不透明度" + +#. New Path Dialog +#: ../app/dialogs/preferences-dialog.c:2271 +msgid "New Path Dialog" +msgstr "新建路径对话框" + +#: ../app/dialogs/preferences-dialog.c:2276 +msgid "Path name:" +msgstr "路径名字：" + +#. Export Path Dialog +#: ../app/dialogs/preferences-dialog.c:2280 +msgid "Export Paths Dialog" +msgstr "导出路径对话框" + +#: ../app/dialogs/preferences-dialog.c:2285 +msgid "Export folder:" +msgstr "导出文件夹：" + +#: ../app/dialogs/preferences-dialog.c:2286 +msgid "Select Default Folder for Exporting Paths" +msgstr "为导出路径选择默认文件夹" + +#: ../app/dialogs/preferences-dialog.c:2290 +msgid "Export the active path only" +msgstr "仅导出活动路径" + +#. Import Path Dialog +#: ../app/dialogs/preferences-dialog.c:2294 +msgid "Import Paths Dialog" +msgstr "导入路径对话框" + +#: ../app/dialogs/preferences-dialog.c:2299 +msgid "Import folder:" +msgstr "导入文件夹：" + +#: ../app/dialogs/preferences-dialog.c:2300 +msgid "Select Default Folder for Importing Paths" +msgstr "为导入路径选择默认文件夹" + +#: ../app/dialogs/preferences-dialog.c:2304 +msgid "Merge imported paths" +msgstr "合并导入的路径" + +#: ../app/dialogs/preferences-dialog.c:2307 +msgid "Scale imported paths" +msgstr "缩放导入的路径" + +#. Feather Selection Dialog +#: ../app/dialogs/preferences-dialog.c:2311 +msgid "Feather Selection Dialog" +msgstr "羽化选区对话框" + +#: ../app/dialogs/preferences-dialog.c:2316 +msgid "Feather radius:" +msgstr "羽化半径：" + +#. Grow Selection Dialog +#: ../app/dialogs/preferences-dialog.c:2320 +msgid "Grow Selection Dialog" +msgstr "增大选区对话框" + +#: ../app/dialogs/preferences-dialog.c:2325 +msgid "Grow radius:" +msgstr "增大半径：" + +#. Shrink Selection Dialog +#: ../app/dialogs/preferences-dialog.c:2329 +msgid "Shrink Selection Dialog" +msgstr "收缩选区对话框" + +#: ../app/dialogs/preferences-dialog.c:2334 +msgid "Shrink radius:" +msgstr "收缩半径：" + +#: ../app/dialogs/preferences-dialog.c:2338 +#: ../app/dialogs/preferences-dialog.c:2355 +msgid "Selected areas continue outside the image" +msgstr "选中区域超出图像" + +#. Border Selection Dialog +#: ../app/dialogs/preferences-dialog.c:2342 +msgid "Border Selection Dialog" +msgstr "加边选区对话框" + +#: ../app/dialogs/preferences-dialog.c:2347 +msgid "Border radius:" +msgstr "加边半径：" + +#: ../app/dialogs/preferences-dialog.c:2351 +msgid "Border style:" +msgstr "加边样式：" + +#. Fill Options Dialog +#: ../app/dialogs/preferences-dialog.c:2359 +msgid "Fill Selection Outline & Fill Path Dialogs" +msgstr "填充选区轮廓和填充路径对话框" + +#. Stroke Options Dialog +#: ../app/dialogs/preferences-dialog.c:2368 +msgid "Stroke Selection & Stroke Path Dialogs" +msgstr "勾画选区和勾画路径对话框" + +#: ../app/dialogs/preferences-dialog.c:2391 +#: ../app/dialogs/preferences-dialog.c:2392 +msgid "Help System" +msgstr "帮助系统" + +#: ../app/dialogs/preferences-dialog.c:2403 +msgid "Show _tooltips" +msgstr "显示工具提示(_T)" + +#: ../app/dialogs/preferences-dialog.c:2406 +msgid "Show help _buttons" +msgstr "显示帮助按钮(_B)" + +#: ../app/dialogs/preferences-dialog.c:2411 +msgid "Use the online version" +msgstr "使用在线版本" + +#: ../app/dialogs/preferences-dialog.c:2412 +msgid "Use a locally installed copy" +msgstr "使用本地已安装版本" + +#: ../app/dialogs/preferences-dialog.c:2413 +msgid "User manual:" +msgstr "用户指南：" + +#: ../app/dialogs/preferences-dialog.c:2424 +msgid "User interface language" +msgstr "用户界面语言" + +#. If there is no webkit available, assume we are on a platform +#. * that doesn't use the help browser, so don't bother showing +#. * the combo. +#. +#: ../app/dialogs/preferences-dialog.c:2483 +msgid "Help Browser" +msgstr "帮助浏览器" + +#: ../app/dialogs/preferences-dialog.c:2490 +msgid "H_elp browser to use:" +msgstr "要使用的帮助浏览器(_E)：" + +#: ../app/dialogs/preferences-dialog.c:2496 +msgid "" +"The GIMP help browser doesn't seem to be installed. Using the web browser " +"instead." +msgstr "未安装 GIMP 帮助浏览器。使用网络浏览器作为替代。" + +#. Action Search +#: ../app/dialogs/preferences-dialog.c:2513 +msgid "Action Search" +msgstr "动作搜索" + +#: ../app/dialogs/preferences-dialog.c:2517 +msgid "Show _unavailable actions" +msgstr "显示不可用的动作(_U)" + +#: ../app/dialogs/preferences-dialog.c:2520 +msgid "Maximum History Size:" +msgstr "最大历史记录：" + +#: ../app/dialogs/preferences-dialog.c:2524 +msgid "Clear Action History" +msgstr "清空动作历史" + +#: ../app/dialogs/preferences-dialog.c:2539 +#: ../app/dialogs/preferences-dialog.c:2540 msgid "Display" msgstr "显示" #. Transparency -#: ../app/dialogs/preferences-dialog.c:2315 +#: ../app/dialogs/preferences-dialog.c:2548 msgid "Transparency" msgstr "透明" -#: ../app/dialogs/preferences-dialog.c:2319 +#: ../app/dialogs/preferences-dialog.c:2552 msgid "_Check style:" msgstr "十字线样式(_C)：" -#: ../app/dialogs/preferences-dialog.c:2322 +#: ../app/dialogs/preferences-dialog.c:2555 msgid "Check _size:" msgstr "十字线大小(_S)：" -#: ../app/dialogs/preferences-dialog.c:2325 +#: ../app/dialogs/preferences-dialog.c:2558 msgid "Monitor Resolution" msgstr "监视器分辨率" #. Pixels -#: ../app/dialogs/preferences-dialog.c:2329 -#: ../app/display/gimpcursorview.c:206 ../app/widgets/gimpgrideditor.c:200 -#: ../app/widgets/gimpgrideditor.c:232 +#: ../app/dialogs/preferences-dialog.c:2562 ../app/display/gimpcursorview.c:215 +#: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:234 msgid "Pixels" msgstr "像素" -#: ../app/dialogs/preferences-dialog.c:2347 +#: ../app/dialogs/preferences-dialog.c:2580 ../app/widgets/gimpgrideditor.c:195 +#: ../app/widgets/gimpgrideditor.c:230 msgid "Horizontal" msgstr "水平" -#: ../app/dialogs/preferences-dialog.c:2349 +#: ../app/dialogs/preferences-dialog.c:2582 ../app/widgets/gimpgrideditor.c:197 +#: ../app/widgets/gimpgrideditor.c:232 msgid "Vertical" -msgstr "垂直" +msgstr "竖直" -#: ../app/dialogs/preferences-dialog.c:2351 -#: ../app/widgets/gimpimagepropview.c:474 +#: ../app/dialogs/preferences-dialog.c:2584 +#: ../app/widgets/gimpimagepropview.c:457 msgid "ppi" msgstr "ppi" -#: ../app/dialogs/preferences-dialog.c:2367 +#: ../app/dialogs/preferences-dialog.c:2603 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "自动检测(当前为 %d x %d ppi)(_D)" -#: ../app/dialogs/preferences-dialog.c:2385 +#: ../app/dialogs/preferences-dialog.c:2621 msgid "_Enter manually" -msgstr "手工输入(_E)" +msgstr "手动输入(_E)" -#: ../app/dialogs/preferences-dialog.c:2400 +#: ../app/dialogs/preferences-dialog.c:2636 msgid "C_alibrate..." -msgstr "测定(_A)..." +msgstr "校准(_A)…" -#: ../app/dialogs/preferences-dialog.c:2428 -msgid "Color Management" -msgstr "色彩管理" - -#: ../app/dialogs/preferences-dialog.c:2448 -msgid "_RGB profile:" -msgstr "_RGB 配置文件：" - -#: ../app/dialogs/preferences-dialog.c:2449 -msgid "Select RGB Color Profile" -msgstr "选择 RGB 色彩配置文件" - -#: ../app/dialogs/preferences-dialog.c:2450 -msgid "_CMYK profile:" -msgstr "_CMYK 配置文件：" - -#: ../app/dialogs/preferences-dialog.c:2451 -msgid "Select CMYK Color Profile" -msgstr "选择 CMYK 色彩配置文件" - -#: ../app/dialogs/preferences-dialog.c:2452 -msgid "_Monitor profile:" -msgstr "显示器配置文件(_M)：" - -#: ../app/dialogs/preferences-dialog.c:2453 -msgid "Select Monitor Color Profile" -msgstr "选择显示器色彩配置文件" - -#: ../app/dialogs/preferences-dialog.c:2454 -msgid "_Print simulation profile:" -msgstr "打印机模拟配置文件(_P)：" - -#: ../app/dialogs/preferences-dialog.c:2455 -msgid "Select Printer Color Profile" -msgstr "选择打印机色彩配置文件" - -#: ../app/dialogs/preferences-dialog.c:2466 -msgid "_Mode of operation:" -msgstr "操作模式(_M)：" - -#: ../app/dialogs/preferences-dialog.c:2496 -msgid "_Try to use the system monitor profile" -msgstr "试图使用系统显示器配置文件(_T)" - -#: ../app/dialogs/preferences-dialog.c:2506 -msgid "_Display rendering intent:" -msgstr "显示渲染缩进(_D)：" - -#: ../app/dialogs/preferences-dialog.c:2515 -msgid "_Softproof rendering intent:" -msgstr "软打样渲染缩进(_S)：" - -#: ../app/dialogs/preferences-dialog.c:2528 -msgid "Mark out of gamut colors" -msgstr "标记出超出全色彩范围的" - -#: ../app/dialogs/preferences-dialog.c:2533 -msgid "Select Warning Color" -msgstr "选择警告颜色" - -#: ../app/dialogs/preferences-dialog.c:2546 -msgid "File Open behaviour:" -msgstr "文件打开行为：" - -#: ../app/dialogs/preferences-dialog.c:2558 -msgid "Input Devices" -msgstr "输入设备" - -#. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2568 -msgid "Extended Input Devices" -msgstr "扩展输入设备" - -#: ../app/dialogs/preferences-dialog.c:2572 -msgid "Configure E_xtended Input Devices..." -msgstr "配置扩展输入设备(_X)..." - -#: ../app/dialogs/preferences-dialog.c:2579 -msgid "_Save input device settings on exit" -msgstr "退出时保存输入设备设置(_S)" - -#: ../app/dialogs/preferences-dialog.c:2583 -msgid "Save Input Device Settings _Now" -msgstr "立即保存输入设备设置(_N)" - -#: ../app/dialogs/preferences-dialog.c:2590 -msgid "_Reset Saved Input Device Settings to Default Values" -msgstr "重置已保存的输入设备设置到默认值(_R)" - -#: ../app/dialogs/preferences-dialog.c:2605 -msgid "Additional Input Controllers" -msgstr "附加输入控制器" - -#: ../app/dialogs/preferences-dialog.c:2608 -msgid "Input Controllers" -msgstr "输入控制器" - -#: ../app/dialogs/preferences-dialog.c:2624 +#: ../app/dialogs/preferences-dialog.c:2664 +#: ../app/dialogs/preferences-dialog.c:2665 msgid "Window Management" msgstr "窗口管理" -#: ../app/dialogs/preferences-dialog.c:2633 +#: ../app/dialogs/preferences-dialog.c:2670 msgid "Window Manager Hints" msgstr "窗口管理器提示" -#: ../app/dialogs/preferences-dialog.c:2639 +#: ../app/dialogs/preferences-dialog.c:2676 msgid "Hint for _docks and toolbox:" -msgstr "停靠窗和工具箱的窗口类型提示(_D)：" +msgstr "停靠和工具箱的窗口提示(_D)：" -#: ../app/dialogs/preferences-dialog.c:2642 +#: ../app/dialogs/preferences-dialog.c:2679 msgid "Focus" msgstr "焦点" -#: ../app/dialogs/preferences-dialog.c:2646 +#: ../app/dialogs/preferences-dialog.c:2683 msgid "Activate the _focused image" msgstr "激活获得焦点的图像(_F)" #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2650 +#: ../app/dialogs/preferences-dialog.c:2687 msgid "Window Positions" msgstr "窗口位置" -#: ../app/dialogs/preferences-dialog.c:2653 +#: ../app/dialogs/preferences-dialog.c:2690 msgid "_Save window positions on exit" msgstr "退出时保存窗口位置(_S)" -#: ../app/dialogs/preferences-dialog.c:2657 +#: ../app/dialogs/preferences-dialog.c:2693 +msgid "Open windows on the same _monitor they were open before" +msgstr "在之前打开过窗口的显示器上打开窗口(_M)" + +#: ../app/dialogs/preferences-dialog.c:2697 msgid "Save Window Positions _Now" msgstr "立即保存窗口位置(_N)" -#: ../app/dialogs/preferences-dialog.c:2664 +#: ../app/dialogs/preferences-dialog.c:2704 msgid "_Reset Saved Window Positions to Default Values" -msgstr "重置已保存的窗口位置到默认值(_R)" +msgstr "将已保存的窗口位置重置为默认值(_R)" -#: ../app/dialogs/preferences-dialog.c:2679 +#: ../app/dialogs/preferences-dialog.c:2719 +#: ../app/dialogs/preferences-dialog.c:2720 +msgid "Image Windows" +msgstr "图像窗口" + +#: ../app/dialogs/preferences-dialog.c:2731 +msgid "Use \"_Dot for dot\" by default" +msgstr "默认使用“点对点”(_D)" + +#: ../app/dialogs/preferences-dialog.c:2737 +msgid "Marching _ants speed:" +msgstr "蚂蚁线速度(_A)：" + +#. Zoom & Resize Behavior +#: ../app/dialogs/preferences-dialog.c:2741 +msgid "Zoom & Resize Behavior" +msgstr "缩放和改变大小行为" + +#: ../app/dialogs/preferences-dialog.c:2745 +msgid "Resize window on _zoom" +msgstr "缩放时调整窗口大小(_Z)" + +#: ../app/dialogs/preferences-dialog.c:2748 +msgid "Resize window on image _size change" +msgstr "图像大小改变时调整窗口大小(_S)" + +#: ../app/dialogs/preferences-dialog.c:2754 +msgid "Show entire image" +msgstr "显示整张图像" + +#: ../app/dialogs/preferences-dialog.c:2756 +msgid "Initial zoom _ratio:" +msgstr "初始缩放比率(_R)：" + +#. Space Bar +#: ../app/dialogs/preferences-dialog.c:2760 +msgid "Space Bar" +msgstr "空格键" + +#: ../app/dialogs/preferences-dialog.c:2766 +msgid "_While space bar is pressed:" +msgstr "当空格键被按下时(_W)：" + +#. Mouse Pointers +#: ../app/dialogs/preferences-dialog.c:2770 +msgid "Mouse Pointers" +msgstr "鼠标指针" + +#: ../app/dialogs/preferences-dialog.c:2774 +msgid "Show _brush outline" +msgstr "显示笔刷轮廓(_B)" + +#: ../app/dialogs/preferences-dialog.c:2777 +msgid "Show pointer for paint _tools" +msgstr "为绘画工具显示鼠标指针(_T)" + +#: ../app/dialogs/preferences-dialog.c:2783 +msgid "Pointer _mode:" +msgstr "指针模式(_M)：" + +#: ../app/dialogs/preferences-dialog.c:2786 +msgid "Pointer _handedness:" +msgstr "指针利手(_N)：" + +#: ../app/dialogs/preferences-dialog.c:2798 +msgid "Image Window Appearance" +msgstr "图像窗口外观" + +#: ../app/dialogs/preferences-dialog.c:2806 +msgid "Default Appearance in Normal Mode" +msgstr "普通模式下的默认外观" + +#: ../app/dialogs/preferences-dialog.c:2811 +msgid "Default Appearance in Fullscreen Mode" +msgstr "全屏模式下的默认外观" + +#: ../app/dialogs/preferences-dialog.c:2820 +msgid "Image Title & Statusbar Format" +msgstr "图像标题和状态栏格式" + +#: ../app/dialogs/preferences-dialog.c:2821 +msgid "Title & Status" +msgstr "标题和状态" + +#: ../app/dialogs/preferences-dialog.c:2839 +msgid "Current format" +msgstr "当前格式" + +#: ../app/dialogs/preferences-dialog.c:2840 +msgid "Default format" +msgstr "默认格式" + +#: ../app/dialogs/preferences-dialog.c:2841 +msgid "Show zoom percentage" +msgstr "显示缩放百分比" + +#: ../app/dialogs/preferences-dialog.c:2842 +msgid "Show zoom ratio" +msgstr "显示缩放比率" + +#: ../app/dialogs/preferences-dialog.c:2843 +msgid "Show image size" +msgstr "显示图像大小" + +#: ../app/dialogs/preferences-dialog.c:2844 +msgid "Show drawable size" +msgstr "显示可绘画大小" + +#: ../app/dialogs/preferences-dialog.c:2857 +msgid "Image Title Format" +msgstr "图像标题格式" + +#: ../app/dialogs/preferences-dialog.c:2859 +msgid "Image Statusbar Format" +msgstr "图像状态栏格式" + +#: ../app/dialogs/preferences-dialog.c:2943 +msgid "Image Window Snapping Behavior" +msgstr "图像窗口吸附行为" + +#: ../app/dialogs/preferences-dialog.c:2944 +msgid "Snapping" +msgstr "吸附" + +#: ../app/dialogs/preferences-dialog.c:2951 +msgid "Default Behavior in Normal Mode" +msgstr "普通模式下的默认行为" + +#: ../app/dialogs/preferences-dialog.c:2955 +msgid "Default Behavior in Fullscreen Mode" +msgstr "全屏模式下的默认行为" + +#: ../app/dialogs/preferences-dialog.c:2964 +msgid "_Snapping distance:" +msgstr "吸附距离(_S)：" + +#: ../app/dialogs/preferences-dialog.c:2973 +#: ../app/dialogs/preferences-dialog.c:2974 +msgid "Input Devices" +msgstr "输入设备" + +#. Extended Input Devices +#: ../app/dialogs/preferences-dialog.c:2980 +msgid "Extended Input Devices" +msgstr "扩展输入设备" + +#: ../app/dialogs/preferences-dialog.c:2984 +msgid "S_hare tool and tool options between input devices" +msgstr "在输入设备间共享工具和工具选项(_H)" + +#: ../app/dialogs/preferences-dialog.c:2988 +msgid "Configure E_xtended Input Devices..." +msgstr "配置扩展输入设备(_X)…" + +#: ../app/dialogs/preferences-dialog.c:2995 +msgid "_Save input device settings on exit" +msgstr "退出时保存输入设备设置(_S)" + +#: ../app/dialogs/preferences-dialog.c:2999 +msgid "Save Input Device Settings _Now" +msgstr "立即保存输入设备设置(_N)" + +#: ../app/dialogs/preferences-dialog.c:3006 +msgid "_Reset Saved Input Device Settings to Default Values" +msgstr "将已保存的输入设备设置重置为默认值(_R)" + +#: ../app/dialogs/preferences-dialog.c:3021 +msgid "Additional Input Controllers" +msgstr "附加输入控制器" + +#: ../app/dialogs/preferences-dialog.c:3022 +msgid "Input Controllers" +msgstr "输入控制器" + +#: ../app/dialogs/preferences-dialog.c:3037 +#: ../app/dialogs/preferences-dialog.c:3038 msgid "Folders" msgstr "文件夹" -#: ../app/dialogs/preferences-dialog.c:2699 +#: ../app/dialogs/preferences-dialog.c:3054 msgid "Temporary folder:" msgstr "临时文件夹：" -#: ../app/dialogs/preferences-dialog.c:2700 +#: ../app/dialogs/preferences-dialog.c:3055 msgid "Select Folder for Temporary Files" msgstr "为临时文件选择文件夹" -#: ../app/dialogs/preferences-dialog.c:2704 +#: ../app/dialogs/preferences-dialog.c:3059 msgid "Swap folder:" msgstr "交换文件夹：" -#: ../app/dialogs/preferences-dialog.c:2705 +#: ../app/dialogs/preferences-dialog.c:3060 msgid "Select Swap Folder" msgstr "选择交换文件夹" -#: ../app/dialogs/preferences-dialog.c:2740 +#: ../app/dialogs/preferences-dialog.c:3092 msgid "Brush Folders" -msgstr "画笔文件夹" +msgstr "笔刷文件夹" -#: ../app/dialogs/preferences-dialog.c:2742 +#: ../app/dialogs/preferences-dialog.c:3094 msgid "Select Brush Folders" -msgstr "选择画笔文件夹" +msgstr "选择笔刷文件夹" -#: ../app/dialogs/preferences-dialog.c:2744 +#: ../app/dialogs/preferences-dialog.c:3096 msgid "Dynamics Folders" msgstr "动态文件夹" -#: ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/preferences-dialog.c:3098 msgid "Select Dynamics Folders" msgstr "选择动态文件夹" -#: ../app/dialogs/preferences-dialog.c:2748 +#: ../app/dialogs/preferences-dialog.c:3100 msgid "Pattern Folders" msgstr "图案文件夹" -#: ../app/dialogs/preferences-dialog.c:2750 +#: ../app/dialogs/preferences-dialog.c:3102 msgid "Select Pattern Folders" msgstr "选择图案文件夹" -#: ../app/dialogs/preferences-dialog.c:2752 +#: ../app/dialogs/preferences-dialog.c:3104 msgid "Palette Folders" msgstr "色板文件夹" -#: ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/preferences-dialog.c:3106 msgid "Select Palette Folders" msgstr "选择色板文件夹" -#: ../app/dialogs/preferences-dialog.c:2756 +#: ../app/dialogs/preferences-dialog.c:3108 msgid "Gradient Folders" msgstr "渐变文件夹" -#: ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/preferences-dialog.c:3110 msgid "Select Gradient Folders" msgstr "选择渐变文件夹" -#: ../app/dialogs/preferences-dialog.c:2760 +#: ../app/dialogs/preferences-dialog.c:3112 msgid "Font Folders" msgstr "字体文件夹" -#: ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/preferences-dialog.c:3114 msgid "Select Font Folders" msgstr "选择字体文件夹" -#: ../app/dialogs/preferences-dialog.c:2764 -#, fuzzy +#: ../app/dialogs/preferences-dialog.c:3116 msgid "Tool Preset Folders" -msgstr "工具预设值" +msgstr "工具预设文件夹" -#: ../app/dialogs/preferences-dialog.c:2766 -#, fuzzy +#: ../app/dialogs/preferences-dialog.c:3118 msgid "Select Tool Preset Folders" -msgstr "选择主题文件夹" +msgstr "选择工具预设文件夹" -#: ../app/dialogs/preferences-dialog.c:2768 -msgid "Plug-In Folders" +#: ../app/dialogs/preferences-dialog.c:3120 +msgid "MyPaint Brush Folders" +msgstr "MyPaint 笔刷文件夹" + +#: ../app/dialogs/preferences-dialog.c:3122 +msgid "Select MyPaint Brush Folders" +msgstr "选择 MyPaint 笔刷文件夹" + +#: ../app/dialogs/preferences-dialog.c:3124 +msgid "Plug-in Folders" msgstr "插件文件夹" -#: ../app/dialogs/preferences-dialog.c:2770 -msgid "Select Plug-In Folders" +#: ../app/dialogs/preferences-dialog.c:3126 +msgid "Select plug-in Folders" msgstr "选择插件文件夹" -#: ../app/dialogs/preferences-dialog.c:2772 +#: ../app/dialogs/preferences-dialog.c:3128 msgid "Scripts" msgstr "脚本" -#: ../app/dialogs/preferences-dialog.c:2772 +#: ../app/dialogs/preferences-dialog.c:3128 msgid "Script-Fu Folders" msgstr "脚本文件夹" -#: ../app/dialogs/preferences-dialog.c:2774 +#: ../app/dialogs/preferences-dialog.c:3130 msgid "Select Script-Fu Folders" msgstr "选择脚本文件夹" -#: ../app/dialogs/preferences-dialog.c:2776 +#: ../app/dialogs/preferences-dialog.c:3132 msgid "Module Folders" msgstr "模块文件夹" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:3134 msgid "Select Module Folders" msgstr "选择模块文件夹" -#: ../app/dialogs/preferences-dialog.c:2780 +#: ../app/dialogs/preferences-dialog.c:3136 msgid "Interpreters" msgstr "解释器" -#: ../app/dialogs/preferences-dialog.c:2780 +#: ../app/dialogs/preferences-dialog.c:3136 msgid "Interpreter Folders" msgstr "解释器文件夹" -#: ../app/dialogs/preferences-dialog.c:2782 +#: ../app/dialogs/preferences-dialog.c:3138 msgid "Select Interpreter Folders" msgstr "选择解释器文件夹" -#: ../app/dialogs/preferences-dialog.c:2784 +#: ../app/dialogs/preferences-dialog.c:3140 +msgid "Environment" +msgstr "环境" + +#: ../app/dialogs/preferences-dialog.c:3140 msgid "Environment Folders" msgstr "环境文件夹" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:3142 msgid "Select Environment Folders" msgstr "选择环境文件夹" -#: ../app/dialogs/preferences-dialog.c:2788 +#: ../app/dialogs/preferences-dialog.c:3144 msgid "Themes" msgstr "主题" -#: ../app/dialogs/preferences-dialog.c:2788 +#: ../app/dialogs/preferences-dialog.c:3144 msgid "Theme Folders" msgstr "主题文件夹" -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:3146 msgid "Select Theme Folders" msgstr "选择主题文件夹" -#: ../app/dialogs/print-size-dialog.c:138 +#: ../app/dialogs/preferences-dialog.c:3148 +msgid "Icon Themes" +msgstr "图标主题" + +#: ../app/dialogs/preferences-dialog.c:3148 +msgid "Icon Theme Folders" +msgstr "图标主题文件夹" + +#: ../app/dialogs/preferences-dialog.c:3150 +msgid "Select Icon Theme Folders" +msgstr "选择图标主题文件夹" + +#: ../app/dialogs/print-size-dialog.c:144 msgid "Print Size" msgstr "打印大小" #. the image size labels -#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:193 -#: ../app/widgets/gimptemplateeditor.c:181 +#: ../app/dialogs/print-size-dialog.c:175 ../app/widgets/gimpsizebox.c:193 +#: ../app/widgets/gimptemplateeditor.c:198 msgid "_Width:" msgstr "宽度(_W)：" -#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:197 -#: ../app/widgets/gimptemplateeditor.c:188 +#: ../app/dialogs/print-size-dialog.c:182 ../app/widgets/gimpsizebox.c:197 +#: ../app/widgets/gimptemplateeditor.c:205 msgid "H_eight:" msgstr "高度(_E)：" #. the resolution labels -#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:255 -#: ../app/widgets/gimptemplateeditor.c:310 +#: ../app/dialogs/print-size-dialog.c:236 ../app/widgets/gimpsizebox.c:260 +#: ../app/widgets/gimptemplateeditor.c:327 msgid "_X resolution:" -msgstr "_X 分辨率：" +msgstr "X 分辨率(_X)：" -#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:258 -#: ../app/widgets/gimptemplateeditor.c:317 +#: ../app/dialogs/print-size-dialog.c:243 ../app/widgets/gimpsizebox.c:263 +#: ../app/widgets/gimptemplateeditor.c:334 msgid "_Y resolution:" -msgstr "_Y 分辨率：" +msgstr "Y 分辨率(_Y)：" -#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:251 +#: ../app/dialogs/print-size-dialog.c:254 ../app/widgets/gimpsizebox.c:256 #, c-format msgid "pixels/%a" msgstr "像素/%a" -#: ../app/dialogs/quit-dialog.c:105 +#: ../app/dialogs/quit-dialog.c:164 msgid "Quit GIMP" msgstr "退出 GIMP" -#: ../app/dialogs/quit-dialog.c:105 +#: ../app/dialogs/quit-dialog.c:164 msgid "Close All Images" msgstr "关闭全部图像" -#: ../app/dialogs/quit-dialog.c:164 +#: ../app/dialogs/quit-dialog.c:256 msgid "If you quit GIMP now, these changes will be lost." msgstr "如果您现在退出 GIMP，这些更改将会丢失。" -#: ../app/dialogs/quit-dialog.c:167 +#: ../app/dialogs/quit-dialog.c:259 msgid "If you close these images now, changes will be lost." msgstr "如果您现在关闭这些图像，更改将会丢失。" -#: ../app/dialogs/quit-dialog.c:214 +#. TRANSLATORS: unless your language +#. msgstr[0] applies to 1 only (as +#. in English), replace "one" with %d. +#: ../app/dialogs/quit-dialog.c:346 #, c-format msgid "There is one image with unsaved changes:" msgid_plural "There are %d images with unsaved changes:" msgstr[0] "有 %d 幅修改后还没保存的图像：" -#: ../app/dialogs/quit-dialog.c:236 +#: ../app/dialogs/quit-dialog.c:357 +#, c-format +msgid "Press %s to quit." +msgstr "按 %s 键以退出。" + +#: ../app/dialogs/quit-dialog.c:360 +#, c-format +msgid "Press %s to close all images." +msgstr "按 %s 键以关闭所有图像。" + +#: ../app/dialogs/quit-dialog.c:364 ../app/dialogs/user-install-dialog.c:89 +msgid "_Quit" +msgstr "退出(_Q)" + +#: ../app/dialogs/quit-dialog.c:364 +msgid "Cl_ose" +msgstr "关闭(_O)" + +#: ../app/dialogs/quit-dialog.c:388 +#, c-format +msgid "Press %s to discard all changes and quit." +msgstr "按 %s 键以放弃所有更改并退出。" + +#: ../app/dialogs/quit-dialog.c:391 +#, c-format +msgid "Press %s to discard all changes and close all images." +msgstr "按 %s 键以放弃所有更改并关闭所有图像。" + +#: ../app/dialogs/quit-dialog.c:399 ../app/display/gimpdisplayshell-close.c:180 msgid "_Discard Changes" msgstr "放弃修改(_D)" -#: ../app/dialogs/resize-dialog.c:119 +#: ../app/dialogs/quit-dialog.c:486 +#, c-format +msgid "Exported to %s" +msgstr "已导出至 %s" + +#: ../app/dialogs/quit-dialog.c:589 +msgid "Save this image" +msgstr "保存此图像" + +#: ../app/dialogs/quit-dialog.c:591 +msgid "Save as" +msgstr "另存为" + +#: ../app/dialogs/resize-dialog.c:143 msgid "Canvas Size" msgstr "画布大小" -#: ../app/dialogs/resize-dialog.c:130 ../app/dialogs/scale-dialog.c:109 +#: ../app/dialogs/resize-dialog.c:155 ../app/dialogs/scale-dialog.c:114 msgid "Layer Size" msgstr "图层大小" -#: ../app/dialogs/resize-dialog.c:295 +#: ../app/dialogs/resize-dialog.c:156 +msgid "Fill With" +msgstr "填充" + +#: ../app/dialogs/resize-dialog.c:185 +msgid "Re_set" +msgstr "重置(_S)" + +#: ../app/dialogs/resize-dialog.c:187 +msgid "_Resize" +msgstr "改变大小(_R)" + +#: ../app/dialogs/resize-dialog.c:331 msgid "Resize _layers:" -msgstr "更改图层大小(_L)：" +msgstr "改变图层大小(_L)：" -#: ../app/dialogs/resolution-calibrate-dialog.c:69 +#: ../app/dialogs/resize-dialog.c:379 +msgid "Resize _text layers" +msgstr "改变文字图层大小(_T)" + +#: ../app/dialogs/resize-dialog.c:390 +msgid "Resizing text layers will make them uneditable" +msgstr "改变文字图层大小将使它们不可编辑" + +#: ../app/dialogs/resolution-calibrate-dialog.c:70 msgid "Calibrate Monitor Resolution" -msgstr "监视器分辨率测定" +msgstr "显示器分辨率测定" -#: ../app/dialogs/resolution-calibrate-dialog.c:128 +#: ../app/dialogs/resolution-calibrate-dialog.c:129 msgid "Measure the rulers and enter their lengths:" -msgstr "测量尺子并输入它们的长度：" +msgstr "测量标尺并输入它们的长度：" -#: ../app/dialogs/resolution-calibrate-dialog.c:153 +#: ../app/dialogs/resolution-calibrate-dialog.c:154 msgid "_Horizontal:" msgstr "水平(_H)：" -#: ../app/dialogs/resolution-calibrate-dialog.c:158 +#: ../app/dialogs/resolution-calibrate-dialog.c:159 msgid "_Vertical:" -msgstr "垂直(_V)：" +msgstr "竖直(_V)：" #. Image size frame -#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:159 +#: ../app/dialogs/scale-dialog.c:103 ../app/widgets/gimptemplateeditor.c:176 msgid "Image Size" msgstr "图像大小" -#: ../app/dialogs/scale-dialog.c:176 ../app/tools/gimppaintoptions-gui.c:394 +#: ../app/dialogs/scale-dialog.c:181 ../app/paint/gimppaintoptions.c:403 msgid "Quality" msgstr "质量" -#: ../app/dialogs/scale-dialog.c:188 +#: ../app/dialogs/scale-dialog.c:193 msgid "I_nterpolation:" msgstr "插值(_N)：" -#: ../app/dialogs/scale-dialog.c:207 -msgid "" -"Indexed color layers are always scaled without interpolation. The chosen " -"interpolation type will affect channels and layer masks only." -msgstr "索引颜色图层缩放时总不插值。所选的插值类型将只影响通道和蒙板。" - -#: ../app/dialogs/stroke-dialog.c:97 +#: ../app/dialogs/stroke-dialog.c:122 msgid "Choose Stroke Style" msgstr "选择勾画类型" -#: ../app/dialogs/stroke-dialog.c:214 +#: ../app/dialogs/stroke-dialog.c:129 +msgid "_Stroke" +msgstr "笔廓(_S)" + +#: ../app/dialogs/stroke-dialog.c:238 msgid "Paint tool:" -msgstr "涂画工具：" +msgstr "绘画工具：" -#: ../app/dialogs/stroke-dialog.c:228 +#: ../app/dialogs/stroke-dialog.c:252 msgid "_Emulate brush dynamics" -msgstr "模拟动态画笔(_E)" +msgstr "模拟动态笔刷(_E)" -#: ../app/dialogs/tips-dialog.c:88 +#: ../app/dialogs/tips-dialog.c:99 msgid "The GIMP tips file is empty!" msgstr "GIMP 提示文件为空！" -#: ../app/dialogs/tips-dialog.c:92 +#: ../app/dialogs/tips-dialog.c:103 msgid "The GIMP tips file appears to be missing!" msgstr "您的 GIMP 提示文件似乎丢了！" -#: ../app/dialogs/tips-dialog.c:94 +#: ../app/dialogs/tips-dialog.c:105 #, c-format msgid "There should be a file called '%s'. Please check your installation." msgstr "应该存在一个叫“%s”的文件。请检查您的安装。" -#: ../app/dialogs/tips-dialog.c:100 +#: ../app/dialogs/tips-dialog.c:111 msgid "The GIMP tips file could not be parsed!" msgstr "无法解析 GIMP 提示文件！" -#: ../app/dialogs/tips-dialog.c:128 +#: ../app/dialogs/tips-dialog.c:139 msgid "GIMP Tip of the Day" msgstr "GIMP 日积月累" -#: ../app/dialogs/tips-dialog.c:134 +#: ../app/dialogs/tips-dialog.c:145 msgid "_Previous Tip" msgstr "前一条提示(_P)" -#: ../app/dialogs/tips-dialog.c:140 +#: ../app/dialogs/tips-dialog.c:151 msgid "_Next Tip" msgstr "后一条提示(_N)" #. a link to the related section in the user manual -#: ../app/dialogs/tips-dialog.c:193 +#: ../app/dialogs/tips-dialog.c:205 msgid "Learn more" msgstr "了解更多" @@ -10502,199 +16326,268 @@ msgstr "了解更多" msgid "tips-locale:C" msgstr "tips-locale:zh_CN" -#: ../app/dialogs/user-install-dialog.c:84 +#: ../app/dialogs/user-install-dialog.c:85 msgid "GIMP User Installation" msgstr "GIMP 用户安装" -#: ../app/dialogs/user-install-dialog.c:93 +#: ../app/dialogs/user-install-dialog.c:94 msgid "User installation failed!" msgstr "用户安装失败！" -#: ../app/dialogs/user-install-dialog.c:95 +#: ../app/dialogs/user-install-dialog.c:96 msgid "The GIMP user installation failed; see the log for details." -msgstr "GIMP 用户安装失败；细节请查看日志。" +msgstr "GIMP 用户安装失败；请参见日志以获取更多信息。" -#: ../app/dialogs/user-install-dialog.c:98 +#: ../app/dialogs/user-install-dialog.c:99 msgid "Installation Log" msgstr "安装日志" -#: ../app/dialogs/vectors-export-dialog.c:55 +#: ../app/dialogs/vectors-export-dialog.c:80 msgid "Export Path to SVG" msgstr "将路径导出为 SVG" -#: ../app/dialogs/vectors-export-dialog.c:90 +#: ../app/dialogs/vectors-export-dialog.c:121 msgid "Export the active path" msgstr "导出活动路径" -#: ../app/dialogs/vectors-export-dialog.c:91 +#: ../app/dialogs/vectors-export-dialog.c:122 msgid "Export all paths from this image" msgstr "导出此图像的所有路径" -#: ../app/dialogs/vectors-import-dialog.c:58 +#: ../app/dialogs/vectors-import-dialog.c:85 msgid "Import Paths from SVG" msgstr "从 SVG 导入路径" -#: ../app/dialogs/vectors-import-dialog.c:92 -#: ../app/widgets/gimpprofilechooserdialog.c:122 +#: ../app/dialogs/vectors-import-dialog.c:124 msgid "All files (*.*)" msgstr "所有文件(*.*)" -#: ../app/dialogs/vectors-import-dialog.c:97 +#: ../app/dialogs/vectors-import-dialog.c:129 msgid "Scalable SVG image (*.svg)" msgstr "可缩放 SVG 图像(*.svg)" -#: ../app/dialogs/vectors-import-dialog.c:108 +#: ../app/dialogs/vectors-import-dialog.c:140 msgid "_Merge imported paths" msgstr "合并导入的路径(_M)" -#: ../app/dialogs/vectors-import-dialog.c:118 +#: ../app/dialogs/vectors-import-dialog.c:150 msgid "_Scale imported paths to fit image" -msgstr "缩放导入的路径使之与图像匹配(_S)" +msgstr "缩放导入的路径适配图像(_S)" -#: ../app/dialogs/vectors-options-dialog.c:122 -msgid "Path name:" -msgstr "路径名字：" +#: ../app/dialogs/vectors-options-dialog.c:106 +msgid "Path _name:" +msgstr "路径名字(_N)：" -#: ../app/display/display-enums.c:60 -#, fuzzy +#: ../app/dialogs/vectors-options-dialog.c:108 +msgid "Lock path _strokes" +msgstr "锁定路径笔廓(_S)" + +#: ../app/dialogs/vectors-options-dialog.c:109 +msgid "Lock path _position" +msgstr "锁定路径位置(_P)" + +#: ../app/display/display-enums.c:124 msgctxt "guides-type" msgid "No guides" msgstr "无参考线" -#: ../app/display/display-enums.c:61 -#, fuzzy +#: ../app/display/display-enums.c:125 msgctxt "guides-type" msgid "Center lines" -msgstr "中线" +msgstr "中间线" -#: ../app/display/display-enums.c:62 -#, fuzzy +#: ../app/display/display-enums.c:126 msgctxt "guides-type" msgid "Rule of thirds" msgstr "三分构图法" -#: ../app/display/display-enums.c:63 -#, fuzzy +#: ../app/display/display-enums.c:127 msgctxt "guides-type" msgid "Rule of fifths" msgstr "五分构图法" -#: ../app/display/display-enums.c:64 -#, fuzzy +#: ../app/display/display-enums.c:128 msgctxt "guides-type" msgid "Golden sections" msgstr "黄金分割" -#: ../app/display/display-enums.c:65 -#, fuzzy +#: ../app/display/display-enums.c:129 msgctxt "guides-type" msgid "Diagonal lines" msgstr "对角线" -#: ../app/display/display-enums.c:66 -#, fuzzy +#: ../app/display/display-enums.c:130 msgctxt "guides-type" msgid "Number of lines" -msgstr "网格线数量" +msgstr "线的数量" -#: ../app/display/display-enums.c:67 -#, fuzzy +#: ../app/display/display-enums.c:131 msgctxt "guides-type" msgid "Line spacing" -msgstr "网格线间距" +msgstr "线的间距" -#: ../app/display/gimpcursorview.c:216 ../app/display/gimpcursorview.c:222 -#: ../app/display/gimpcursorview.c:241 ../app/display/gimpcursorview.c:247 -#: ../app/display/gimpcursorview.c:266 ../app/display/gimpcursorview.c:272 -#: ../app/display/gimpcursorview.c:288 ../app/display/gimpcursorview.c:295 -#: ../app/display/gimpcursorview.c:672 ../app/display/gimpcursorview.c:673 -#: ../app/display/gimpcursorview.c:674 ../app/display/gimpcursorview.c:675 -#: ../app/display/gimpcursorview.c:788 ../app/display/gimpcursorview.c:789 -#: ../app/display/gimpcursorview.c:790 ../app/display/gimpcursorview.c:791 -#: ../app/widgets/gimpcolorframe.c:633 +#: ../app/display/display-enums.c:313 +msgctxt "rectangle-fixed-rule" +msgid "Aspect ratio" +msgstr "宽高比" + +#: ../app/display/display-enums.c:314 +msgctxt "rectangle-fixed-rule" +msgid "Width" +msgstr "宽度" + +#: ../app/display/display-enums.c:315 +msgctxt "rectangle-fixed-rule" +msgid "Height" +msgstr "高度" + +#: ../app/display/display-enums.c:316 +msgctxt "rectangle-fixed-rule" +msgid "Size" +msgstr "大小" + +#: ../app/display/display-enums.c:409 +msgctxt "transform-handle-mode" +msgid "Add / Transform" +msgstr "添加/变换" + +#: ../app/display/display-enums.c:410 +msgctxt "transform-handle-mode" +msgid "Move" +msgstr "移动" + +#: ../app/display/display-enums.c:411 +msgctxt "transform-handle-mode" +msgid "Remove" +msgstr "删除" + +#: ../app/display/display-enums.c:440 +msgctxt "vector-mode" +msgid "Design" +msgstr "设计" + +#: ../app/display/display-enums.c:441 +msgctxt "vector-mode" +msgid "Edit" +msgstr "编辑" + +#: ../app/display/display-enums.c:442 +msgctxt "vector-mode" +msgid "Move" +msgstr "移动" + +#: ../app/display/gimpcursorview.c:225 ../app/display/gimpcursorview.c:231 +#: ../app/display/gimpcursorview.c:250 ../app/display/gimpcursorview.c:256 +#: ../app/display/gimpcursorview.c:275 ../app/display/gimpcursorview.c:281 +#: ../app/display/gimpcursorview.c:297 ../app/display/gimpcursorview.c:304 +#: ../app/display/gimpcursorview.c:708 ../app/display/gimpcursorview.c:710 +#: ../app/display/gimpcursorview.c:712 ../app/display/gimpcursorview.c:714 +#: ../app/display/gimpcursorview.c:793 ../app/display/gimpcursorview.c:794 +#: ../app/display/gimpcursorview.c:795 ../app/display/gimpcursorview.c:796 msgid "n/a" msgstr "n/a" -#: ../app/display/gimpcursorview.c:219 ../app/display/gimpcursorview.c:244 -#: ../app/display/gimpcursorview.c:269 +#: ../app/display/gimpcursorview.c:228 ../app/display/gimpcursorview.c:253 +#: ../app/display/gimpcursorview.c:278 #: ../app/widgets/gimpdeviceinfoeditor.c:139 msgid "X" msgstr "X" -#: ../app/display/gimpcursorview.c:225 ../app/display/gimpcursorview.c:250 -#: ../app/display/gimpcursorview.c:275 +#: ../app/display/gimpcursorview.c:234 ../app/display/gimpcursorview.c:259 +#: ../app/display/gimpcursorview.c:284 #: ../app/widgets/gimpdeviceinfoeditor.c:140 msgid "Y" msgstr "Y" #. Units -#: ../app/display/gimpcursorview.c:231 +#: ../app/display/gimpcursorview.c:240 msgid "Units" msgstr "单位" #. Selection Bounding Box -#: ../app/display/gimpcursorview.c:256 +#: ../app/display/gimpcursorview.c:265 msgid "Selection Bounding Box" msgstr "选区包围框" #. Width -#: ../app/display/gimpcursorview.c:292 +#: ../app/display/gimpcursorview.c:301 msgid "W" msgstr "宽" #. Height -#: ../app/display/gimpcursorview.c:299 +#: ../app/display/gimpcursorview.c:308 msgid "H" msgstr "高" -#: ../app/display/gimpcursorview.c:328 +#: ../app/display/gimpcursorview.c:339 msgid "_Sample Merged" msgstr "位样合并(_S)" -#: ../app/display/gimpdisplayshell.c:508 +#: ../app/display/gimpdisplayshell.c:552 msgid "Access the image menu" -msgstr "操作图像菜单" +msgstr "获取图像菜单" -#: ../app/display/gimpdisplayshell.c:622 +#: ../app/display/gimpdisplayshell.c:670 msgid "Zoom image when window size changes" msgstr "当窗口大小改变时缩放图像" -#: ../app/display/gimpdisplayshell.c:651 +#: ../app/display/gimpdisplayshell.c:699 msgid "Toggle Quick Mask" msgstr "切换快速蒙板" -#: ../app/display/gimpdisplayshell.c:674 +#: ../app/display/gimpdisplayshell.c:722 msgid "Navigate the image display" msgstr "导航图像显示" -#: ../app/display/gimpdisplayshell.c:742 -#: ../app/display/gimpdisplayshell.c:1320 ../app/widgets/gimptoolbox.c:257 +#: ../app/display/gimpdisplayshell.c:792 ../app/display/gimpdisplayshell.c:1448 +#: ../app/widgets/gimptoolbox.c:251 msgid "Drop image files here to open them" msgstr "拖动图像到此处以打开" -#: ../app/display/gimpdisplayshell-close.c:153 -#: ../app/display/gimpdisplayshell-close.c:223 +#: ../app/display/gimpdisplayshell-callbacks.c:565 +#, c-format +msgid "" +"Unstable Development Version\n" +"\n" +"commit %s\n" +"\n" +"Please test bugs against latest git master branch\n" +"before reporting them." +msgstr "" +"不稳定的开发版本\n" +"\n" +"Git 提交 %s\n" +"\n" +"请在报告问题前使用最新的 Git master 分支进行测试。" + +#: ../app/display/gimpdisplayshell-close.c:168 +#: ../app/display/gimpdisplayshell-close.c:266 #, c-format msgid "Close %s" msgstr "关闭 %s" -#: ../app/display/gimpdisplayshell-close.c:164 -msgid "Close _without Saving" -msgstr "关闭而不保存(_W)" +#: ../app/display/gimpdisplayshell-close.c:178 +msgid "Save _As" +msgstr "另存为(_A)" -#: ../app/display/gimpdisplayshell-close.c:231 +#: ../app/display/gimpdisplayshell-close.c:214 +#, c-format +msgid "Press %s to discard all changes and close the image." +msgstr "按 %s 键以放弃所有更改并关闭所有图像。" + +#: ../app/display/gimpdisplayshell-close.c:274 #, c-format msgid "Save the changes to image '%s' before closing?" msgstr "关闭图像“%s”前保存修改吗？" -#: ../app/display/gimpdisplayshell-close.c:254 +#: ../app/display/gimpdisplayshell-close.c:307 #, c-format msgid "If you don't save the image, changes from the last hour will be lost." msgid_plural "" "If you don't save the image, changes from the last %d hours will be lost." msgstr[0] "如果您不保存图像，最近 %d 小时内的更改将会丢失。" -#: ../app/display/gimpdisplayshell-close.c:264 +#: ../app/display/gimpdisplayshell-close.c:318 #, c-format msgid "" "If you don't save the image, changes from the last hour and %d minute will " @@ -10702,88 +16595,108 @@ msgid "" msgid_plural "" "If you don't save the image, changes from the last hour and %d minutes will " "be lost." -msgstr[0] "如果您不保存图像，最近 1 小时零 %d 分钟内的修改将会丢失。" +msgstr[0] "如果您不保存图像，最近 1 小时 %d 分钟内的修改将会丢失。" -#: ../app/display/gimpdisplayshell-close.c:275 +#: ../app/display/gimpdisplayshell-close.c:330 #, c-format msgid "If you don't save the image, changes from the last minute will be lost." msgid_plural "" "If you don't save the image, changes from the last %d minutes will be lost." msgstr[0] "如果您不保存图像，最近 %d 分钟内的更改将会丢失。" -#: ../app/display/gimpdisplayshell-dnd.c:231 -#: ../app/display/gimpdisplayshell-dnd.c:631 -#: ../app/display/gimpdisplayshell-dnd.c:688 +#: ../app/display/gimpdisplayshell-close.c:348 +#, c-format +msgid "The image has been exported to '%s'." +msgstr "图像已导出到“%s”。" + +#: ../app/display/gimpdisplayshell-dnd.c:246 +#: ../app/display/gimpdisplayshell-dnd.c:673 +#: ../app/display/gimpdisplayshell-dnd.c:733 msgid "Drop New Layer" -msgstr "拖放入新图层" +msgstr "拖放新图层" -#: ../app/display/gimpdisplayshell-dnd.c:274 +#: ../app/display/gimpdisplayshell-dnd.c:289 msgid "Drop New Path" -msgstr "拖放入新路径" +msgstr "拖放新路径" -#: ../app/display/gimpdisplayshell-dnd.c:346 -#: ../app/display/gimpdisplayshell-dnd.c:445 ../app/tools/gimpblendtool.c:166 -#: ../app/tools/gimpbucketfilltool.c:137 ../app/tools/gimpimagemaptool.c:289 +#: ../app/display/gimpdisplayshell-dnd.c:360 ../app/tools/gimpblendtool.c:243 +#: ../app/tools/gimpbucketfilltool.c:137 ../app/tools/gimpcagetool.c:220 +#: ../app/tools/gimpfiltertool.c:270 ../app/tools/gimpselectiontool.c:427 msgid "Cannot modify the pixels of layer groups." -msgstr "不能修改图层群组的像素。" +msgstr "不能修改图层组的像素。" -#: ../app/display/gimpdisplayshell-dnd.c:354 -#: ../app/display/gimpdisplayshell-dnd.c:453 ../app/tools/gimpblendtool.c:173 -#: ../app/tools/gimpbucketfilltool.c:144 ../app/tools/gimpcroptool.c:325 -#: ../app/tools/gimpimagemaptool.c:296 ../app/tools/gimppainttool.c:266 -#: ../app/tools/gimptransformtool.c:244 ../app/tools/gimptransformtool.c:1064 +#: ../app/display/gimpdisplayshell-dnd.c:368 ../app/tools/gimpblendtool.c:250 +#: ../app/tools/gimpbucketfilltool.c:144 ../app/tools/gimpcagetool.c:227 +#: ../app/tools/gimpcroptool.c:462 ../app/tools/gimpfiltertool.c:277 +#: ../app/tools/gimppainttool.c:277 ../app/tools/gimpselectiontool.c:432 +#: ../app/tools/gimptransformtool.c:1435 ../app/tools/gimpwarptool.c:629 msgid "The active layer's pixels are locked." msgstr "活动图层的像素被锁定。" -#: ../app/display/gimpdisplayshell-dnd.c:373 -#: ../app/widgets/gimpdrawabletreeview.c:241 -#: ../app/widgets/gimpdrawabletreeview.c:329 -#, fuzzy +#: ../app/display/gimpdisplayshell-dnd.c:411 +#: ../app/widgets/gimpdrawabletreeview.c:247 +#: ../app/widgets/gimpdrawabletreeview.c:358 msgctxt "undo-type" msgid "Drop pattern to layer" -msgstr "拖放入新图层" +msgstr "将图案放置到图层" -#: ../app/display/gimpdisplayshell-dnd.c:374 -#: ../app/widgets/gimpdrawabletreeview.c:265 -#: ../app/widgets/gimpdrawabletreeview.c:330 -#, fuzzy +#: ../app/display/gimpdisplayshell-dnd.c:433 +#: ../app/widgets/gimpdrawabletreeview.c:277 +#: ../app/widgets/gimpdrawabletreeview.c:378 msgctxt "undo-type" msgid "Drop color to layer" -msgstr "拖放入图层" +msgstr "将颜色放置到图层" -#: ../app/display/gimpdisplayshell-dnd.c:531 -#: ../app/widgets/gimplayertreeview.c:725 +#: ../app/display/gimpdisplayshell-dnd.c:569 +#: ../app/widgets/gimplayertreeview.c:756 msgid "Drop layers" -msgstr "拖放入图层" +msgstr "拖放图层" -#: ../app/display/gimpdisplayshell-dnd.c:664 -#: ../app/display/gimpdisplayshell-dnd.c:680 -#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:266 +#: ../app/display/gimpdisplayshell-dnd.c:706 +#: ../app/display/gimpdisplayshell-dnd.c:724 +#: ../app/widgets/gimplayertreeview.c:831 ../app/widgets/gimptoolbox-dnd.c:272 msgid "Dropped Buffer" msgstr "删除缓冲区" -#: ../app/display/gimpdisplayshell-filter-dialog.c:78 +#: ../app/display/gimpdisplayshell-filter-dialog.c:79 msgid "Color Display Filters" msgstr "颜色显示滤镜" -#: ../app/display/gimpdisplayshell-filter-dialog.c:81 +#: ../app/display/gimpdisplayshell-filter-dialog.c:82 msgid "Configure Color Display Filters" msgstr "配置颜色显示滤镜" -#: ../app/display/gimpdisplayshell-handlers.c:796 +#: ../app/display/gimpdisplayshell-handlers.c:871 #, c-format msgid "Image saved to '%s'" msgstr "图像已保存到“%s”" -#: ../app/display/gimpdisplayshell-handlers.c:810 +#: ../app/display/gimpdisplayshell-handlers.c:884 #, c-format msgid "Image exported to '%s'" msgstr "图像已导出到“%s”" -#: ../app/display/gimpdisplayshell-layer-select.c:122 +#: ../app/display/gimpdisplayshell-layer-select.c:128 msgid "Layer Select" msgstr "图层选择" +#: ../app/display/gimpdisplayshell-rotate-dialog.c:114 +msgid "Rotate View" +msgstr "旋转视图" + +#: ../app/display/gimpdisplayshell-rotate-dialog.c:116 +msgid "Select Rotation Angle" +msgstr "选择旋转角度" + +#: ../app/display/gimpdisplayshell-rotate-dialog.c:154 +#: ../app/tools/gimpmeasuretool.c:698 +msgid "Angle:" +msgstr "角度：" + +#: ../app/display/gimpdisplayshell-rotate-dialog.c:167 +msgid "degrees" +msgstr "度" + #: ../app/display/gimpdisplayshell-scale-dialog.c:115 msgid "Zoom Ratio" msgstr "缩放比率" @@ -10796,331 +16709,1724 @@ msgstr "选择缩放比率" msgid "Zoom ratio:" msgstr "缩放比率：" -#: ../app/display/gimpdisplayshell-scale-dialog.c:187 +#: ../app/display/gimpdisplayshell-scale-dialog.c:189 msgid "Zoom:" msgstr "缩放：" -#: ../app/display/gimpdisplayshell-title.c:305 +#: ../app/display/gimpdisplayshell-title.c:290 msgid "(modified)" msgstr "(已修改)" -#: ../app/display/gimpdisplayshell-title.c:310 +#: ../app/display/gimpdisplayshell-title.c:295 msgid "(clean)" msgstr "(干净)" -#: ../app/display/gimpdisplayshell-title.c:361 -#: ../app/display/gimpdisplayshell-title.c:374 -#: ../app/widgets/gimpactiongroup.c:861 +#: ../app/display/gimpdisplayshell-title.c:341 +#: ../app/display/gimpdisplayshell-title.c:350 +#: ../app/widgets/gimpactiongroup.c:971 +#: ../app/widgets/gimpbuffersourcebox.c:171 +#: ../app/widgets/gimpbuffersourcebox.c:295 msgid "(none)" msgstr "(无)" -#: ../app/display/gimpdisplayshell-title.c:503 -msgid " (exported)" -msgstr " (已导出)" +#: ../app/display/gimpdisplayshell-title.c:473 +msgid "not color managed" +msgstr "无色彩管理" -#: ../app/display/gimpdisplayshell-title.c:505 -msgid " (overwritten)" -msgstr " (已覆盖)" +#: ../app/display/gimpdisplayshell-utils.c:149 +#: ../app/tools/gimpmeasuretool.c:528 ../app/tools/gimpmeasuretool.c:681 +#: ../app/tools/gimpmeasuretool.c:737 ../app/tools/gimpmeasuretool.c:765 +msgid "pixels" +msgstr "像素" -#: ../app/display/gimpdisplayshell-title.c:511 -msgid " (imported)" -msgstr " (已导入)" - -#: ../app/display/gimpstatusbar.c:356 +#: ../app/display/gimpstatusbar.c:460 #, c-format msgid "Cancel %s" msgstr "取消 %s" -#: ../app/file/file-open.c:138 ../app/file/file-save.c:114 +#: ../app/display/gimptoolcompass.c:811 +msgid "Click to place vertical and horizontal guides" +msgstr "单击以放置竖直和水平参考线" + +#: ../app/display/gimptoolcompass.c:819 +msgid "Click to place a horizontal guide" +msgstr "单击以放置水平参考线" + +#: ../app/display/gimptoolcompass.c:832 +msgid "Click to place a vertical guide" +msgstr "单击以放置竖直参考线" + +#: ../app/display/gimptoolcompass.c:844 +msgid "Click-Drag to add a new point" +msgstr "单击并拖动以添加新的点" + +#: ../app/display/gimptoolcompass.c:854 ../app/tools/gimpiscissorstool.c:911 +msgid "Click-Drag to move this point" +msgstr "单击并拖动以移动此点" + +#: ../app/display/gimptoolcompass.c:873 +msgid "Click-Drag to move all points" +msgstr "单击并拖动以移动所有点" + +#: ../app/display/gimptoolgyroscope.c:691 +msgid "Click-Drag to zoom" +msgstr "单击并拖动以缩放" + +#: ../app/display/gimptoolgyroscope.c:695 +#, c-format +msgid "%s for constrained steps" +msgstr "%s 可限定级别" + +#: ../app/display/gimptoolgyroscope.c:702 +#: ../app/display/gimptooltransformgrid.c:1782 +msgid "Click-Drag to rotate" +msgstr "单击并拖动以旋转" + +#: ../app/display/gimptoolgyroscope.c:706 ../app/display/gimptoolline.c:1490 +#: ../app/tools/gimppainttool.c:569 +#, c-format +msgid "%s for constrained angles" +msgstr "%s 可限定角度" + +#: ../app/display/gimptoolgyroscope.c:711 +msgid "Click-Drag to pan" +msgstr "单击并拖动以平移" + +#: ../app/display/gimptoolgyroscope.c:717 +#, c-format +msgid "%s to rotate" +msgstr "%s 以旋转" + +#: ../app/display/gimptoolgyroscope.c:718 +#, c-format +msgid "%s for a constrained axis" +msgstr "%s 可限定轴线" + +#: ../app/display/gimptoolgyroscope.c:719 +#, c-format +msgid "%s to zoom" +msgstr "%s 以缩放" + +#: ../app/display/gimptoolhandlegrid.c:837 +#: ../app/display/gimptooltransformgrid.c:1773 +msgid "Click-Drag to move" +msgstr "单击并拖动以移动" + +#: ../app/display/gimptoolhandlegrid.c:840 +msgid "Click-Drag to rotate and scale" +msgstr "单击并拖动以旋转和缩放" + +#: ../app/display/gimptoolhandlegrid.c:843 +msgid "Click-Drag to shear and scale" +msgstr "单击并拖动以切变和缩放" + +#: ../app/display/gimptoolhandlegrid.c:846 +#: ../app/display/gimptooltransformgrid.c:1761 +msgid "Click-Drag to change perspective" +msgstr "单击并拖动以改变透视" + +#: ../app/display/gimptoolhandlegrid.c:857 +msgid "Click to add a handle" +msgstr "单击以添加一个控制柄" + +#: ../app/display/gimptoolhandlegrid.c:863 +msgid "Click-Drag to move this handle" +msgstr "单击并拖动以移动此控制柄" + +#: ../app/display/gimptoolhandlegrid.c:868 +msgid "Click-Drag to remove this handle" +msgstr "单击并拖动以移除此控制柄" + +#: ../app/display/gimptoolline.c:335 ../app/display/gimptoolline.c:498 +msgid "Line: " +msgstr "直线： " + +#: ../app/display/gimptoolline.c:1484 +msgid "Click-Drag to move the endpoint" +msgstr "单击并拖动以移动该端点" + +#: ../app/display/gimptoolline.c:1497 +msgid "Release to remove the slider" +msgstr "释放以移除该滑块" + +#: ../app/display/gimptoolline.c:1501 +#, c-format +msgid "%s for constrained values" +msgstr "%s 可限定值" + +#: ../app/display/gimptoolline.c:1511 +msgid "Click-Drag to move the slider; drag away to remove the slider" +msgstr "单击并拖动以移动该滑块；拖走以移除该滑块" + +#: ../app/display/gimptoolline.c:1516 +msgid "Click-Drag to move or remove the slider" +msgstr "单击并拖动以移动或移除该滑块" + +#: ../app/display/gimptoolline.c:1521 +msgid "Click-Drag to move the slider" +msgstr "单击并拖动以移动该滑块" + +#: ../app/display/gimptoolline.c:1532 +msgid "Click-Drag away to remove the slider" +msgstr "单击并拖走以移除该滑块" + +#: ../app/display/gimptoolline.c:1536 +msgid "Click-Drag to remove the slider" +msgstr "单击并拖动以移除该滑块" + +#: ../app/display/gimptoolline.c:1547 +msgid "Click or Click-Drag to add a new slider" +msgstr "单击或单击拖动以添加新滑块" + +#: ../app/display/gimptoolline.c:1553 +msgid "Click-Drag to move the line" +msgstr "单击并拖动以移动该线" + +#: ../app/display/gimptoolline.c:1565 +#, c-format +msgid "%s to move the whole line" +msgstr "%s 移动整条线" + +#: ../app/display/gimptoolpath.c:256 ../app/tools/gimpvectoroptions.c:71 +msgid "Edit Mode" +msgstr "编辑模式" + +#: ../app/display/gimptoolpath.c:265 ../app/tools/gimpvectoroptions.c:79 +msgid "Polygonal" +msgstr "多边形" + +#: ../app/display/gimptoolpath.c:266 ../app/tools/gimpvectoroptions.c:80 +msgid "Restrict editing to polygons" +msgstr "编辑限于多边形" + +#: ../app/display/gimptoolpath.c:492 +msgid "The active path is locked." +msgstr "活动路径已锁定。" + +#: ../app/display/gimptoolpath.c:576 +msgid "Add Stroke" +msgstr "添加笔廓" + +#: ../app/display/gimptoolpath.c:600 +msgid "Add Anchor" +msgstr "添加锚点" + +#: ../app/display/gimptoolpath.c:624 +msgid "Insert Anchor" +msgstr "插入锚点" + +#: ../app/display/gimptoolpath.c:653 +msgid "Drag Handle" +msgstr "拖动控制柄" + +#: ../app/display/gimptoolpath.c:684 +msgid "Drag Anchor" +msgstr "拖动锚点" + +#: ../app/display/gimptoolpath.c:702 +msgid "Drag Anchors" +msgstr "拖动多个锚点" + +#: ../app/display/gimptoolpath.c:724 +msgid "Drag Curve" +msgstr "拖动曲线" + +#: ../app/display/gimptoolpath.c:753 +msgid "Connect Strokes" +msgstr "连接笔廓" + +#: ../app/display/gimptoolpath.c:785 +msgid "Drag Path" +msgstr "拖动路径" + +#: ../app/display/gimptoolpath.c:796 +msgid "Convert Edge" +msgstr "转换边缘" + +#: ../app/display/gimptoolpath.c:827 +msgid "Delete Anchor" +msgstr "删除锚点" + +#: ../app/display/gimptoolpath.c:850 +msgid "Delete Segment" +msgstr "删除线段" + +#: ../app/display/gimptoolpath.c:1293 +msgid "Move Anchors" +msgstr "移动多个锚点" + +#: ../app/display/gimptoolpath.c:1440 +msgid "Click to pick path to edit" +msgstr "单击可拾取路径并编辑" + +#: ../app/display/gimptoolpath.c:1444 +msgid "Click to create a new path" +msgstr "单击可创建新的路径" + +#: ../app/display/gimptoolpath.c:1448 +msgid "Click to create a new component of the path" +msgstr "单击可创建新的路径组件" + +#: ../app/display/gimptoolpath.c:1452 +msgid "Click or Click-Drag to create a new anchor" +msgstr "单击或单击拖动可创建新的锚点" + +#: ../app/display/gimptoolpath.c:1462 ../app/display/gimptoolpath.c:1469 +msgid "Click-Drag to move the anchor around" +msgstr "单击并拖动可移动锚点" + +#: ../app/display/gimptoolpath.c:1473 ../app/display/gimptoolpath.c:1496 +msgid "Click-Drag to move the anchors around" +msgstr "单击并拖动可移动多个锚点" + +#: ../app/display/gimptoolpath.c:1479 +msgid "Click-Drag to move the handle around" +msgstr "单击并拖动可移动控制柄" + +#: ../app/display/gimptoolpath.c:1486 +msgid "Click-Drag to move the handles around symmetrically" +msgstr "单击并拖动可对称地移动控制柄" + +#: ../app/display/gimptoolpath.c:1501 +msgid "Click-Drag to change the shape of the curve" +msgstr "单击并拖动可改变曲线的形状" + +#: ../app/display/gimptoolpath.c:1504 +#, c-format +msgid "%s: symmetrical" +msgstr "%s：对称" + +#: ../app/display/gimptoolpath.c:1509 +msgid "Click-Drag to move the component around" +msgstr "单击并拖动可移动组件" + +#: ../app/display/gimptoolpath.c:1517 +msgid "Click-Drag to move the path around" +msgstr "单击并拖动可移动路径" + +#: ../app/display/gimptoolpath.c:1521 +msgid "Click-Drag to insert an anchor on the path" +msgstr "单击并拖动可在路径中插入新的锚点" + +#: ../app/display/gimptoolpath.c:1529 +msgid "Click to delete this anchor" +msgstr "单击可删除此锚点" + +#: ../app/display/gimptoolpath.c:1533 +msgid "Click to connect this anchor with the selected endpoint" +msgstr "单击可连接此锚点与选中的端点" + +#: ../app/display/gimptoolpath.c:1538 +msgid "Click to open up the path" +msgstr "单击可断开路径" + +#: ../app/display/gimptoolpath.c:1542 +msgid "Click to make this node angular" +msgstr "单击可使此节点获得角度" + +#: ../app/display/gimptoolpath.c:1546 +msgid "Clicking here does nothing, try clicking on path elements." +msgstr "点击这里无用，请尝试点击路径元素。" + +#: ../app/display/gimptoolpath.c:1754 +msgid "Delete Anchors" +msgstr "删除多个锚点" + +#: ../app/display/gimptoolpolygon.c:866 +msgid "Click to close shape" +msgstr "单击以闭合形状" + +#: ../app/display/gimptoolpolygon.c:870 +msgid "Click-Drag to move segment vertex" +msgstr "单击并拖动以移动线段顶点" + +#: ../app/display/gimptoolpolygon.c:875 +msgid "Return commits, Escape cancels, Backspace re-opens shape" +msgstr "回车以确定，Esc 以取消，Backspace 以重新打开形状" + +#: ../app/display/gimptoolpolygon.c:879 +msgid "Return commits, Escape cancels, Backspace removes last segment" +msgstr "回车以确认，Esc 以取消，Backspace 以删除最后线段" + +#: ../app/display/gimptoolpolygon.c:883 +msgid "Click-Drag adds a free segment, Click adds a polygonal segment" +msgstr "单击并拖动以添加自由线段，单击以添加多边形线段" + +#: ../app/display/gimptoolrectangle.c:555 +#: ../app/display/gimptoolrectangle.c:875 +#: ../app/tools/gimprectangleselecttool.c:728 +msgid "Rectangle: " +msgstr "矩形： " + +#: ../app/display/gimptoolrectangle.c:2151 +msgid "Position: " +msgstr "位置： " + +#: ../app/display/gimptooltransformgrid.c:1766 +#: ../app/display/gimptooltransformgrid.c:1771 +msgid "Click-Drag to scale" +msgstr "单击并拖动以缩放" + +#: ../app/display/gimptooltransformgrid.c:1775 +msgid "Click-Drag to move the pivot point" +msgstr "单击并拖动以移动此中心点" + +#: ../app/display/gimptooltransformgrid.c:1780 +msgid "Click-Drag to shear" +msgstr "单击并拖动以切变" + +#: ../app/file/file-open.c:116 ../app/file/file-save.c:114 msgid "Not a regular file" msgstr "不是普通文件" -#: ../app/file/file-open.c:191 +#: ../app/file/file-open.c:125 ../app/file/file-save.c:123 +msgid "Permission denied" +msgstr "访问被拒绝" + +#: ../app/file/file-open.c:257 #, c-format msgid "%s plug-in returned SUCCESS but did not return an image" msgstr "%s 插件成功返回(SUCCESS)但没有返回图像" -#: ../app/file/file-open.c:202 +#: ../app/file/file-open.c:268 #, c-format msgid "%s plug-In could not open image" msgstr "%s 插件无法打开图像" -#: ../app/file/file-open.c:567 +#: ../app/file/file-open.c:658 msgid "Image doesn't contain any layers" msgstr "图像没有包含任何图层" -#: ../app/file/file-open.c:620 +#: ../app/file/file-open.c:717 #, c-format msgid "Opening '%s' failed: %s" msgstr "打开“%s”失败：%s" -#: ../app/file/file-open.c:727 -msgid "" -"Color management has been disabled. It can be enabled again in the " -"Preferences dialog." -msgstr "色彩管理已被禁用。它可以在首选项对话框是被再次启用。" +#: ../app/file/file-remote.c:113 +msgid "Mounting remote volume" +msgstr "正在挂载远程卷" -#: ../app/file/file-procedure.c:195 -msgid "Unknown file type" -msgstr "未知文件类型" +#: ../app/file/file-remote.c:289 +msgid "Opening remote file" +msgstr "正在打开远程文件" -#: ../app/file/file-save.c:210 +#: ../app/file/file-remote.c:357 +#, c-format +msgid "Downloading image (%s of %s)" +msgstr "正在下载图像(%s/%s)" + +#: ../app/file/file-remote.c:361 +#, c-format +msgid "Uploading image (%s of %s)" +msgstr "正在上传图像(%s/%s)" + +#: ../app/file/file-remote.c:384 +#, c-format +msgid "Downloaded %s of image data" +msgstr "下载了大小为 %s 的图像数据" + +#: ../app/file/file-remote.c:388 +#, c-format +msgid "Uploaded %s of image data" +msgstr "上传了大小为 %s 的图像数据" + +#: ../app/file/file-save.c:278 #, c-format msgid "%s plug-in could not save image" msgstr "%s 插件无法保存图像" -#: ../app/file/file-utils.c:74 +#: ../app/file/file-utils.c:65 #, c-format msgid "'%s:' is not a valid URI scheme" msgstr "“%s:”不是合法的 URI 格式" -#: ../app/file/file-utils.c:90 ../app/file/file-utils.c:126 +#: ../app/file/file-utils.c:81 ../app/file/file-utils.c:120 msgid "Invalid character sequence in URI" msgstr "URI 中有无效的字符序列" -#: ../app/gegl/gimp-babl.c:154 ../app/gegl/gimp-babl.c:155 -#: ../app/gegl/gimp-babl.c:156 ../app/gegl/gimp-babl.c:157 -#: ../app/gegl/gimp-babl.c:158 -#, fuzzy +#: ../app/gegl/gimp-babl.c:316 ../app/gegl/gimp-babl.c:317 +#: ../app/gegl/gimp-babl.c:318 ../app/gegl/gimp-babl.c:319 +#: ../app/gegl/gimp-babl.c:320 ../app/gegl/gimp-babl.c:321 +#: ../app/gegl/gimp-babl.c:322 ../app/gegl/gimp-babl.c:323 +#: ../app/gegl/gimp-babl.c:324 ../app/gegl/gimp-babl.c:325 +#: ../app/gegl/gimp-babl.c:326 ../app/gegl/gimp-babl.c:327 msgid "RGB" msgstr "RGB" -#: ../app/gegl/gimp-babl.c:160 ../app/gegl/gimp-babl.c:161 -#: ../app/gegl/gimp-babl.c:162 ../app/gegl/gimp-babl.c:163 -#: ../app/gegl/gimp-babl.c:164 +#: ../app/gegl/gimp-babl.c:329 ../app/gegl/gimp-babl.c:330 +#: ../app/gegl/gimp-babl.c:331 ../app/gegl/gimp-babl.c:332 +#: ../app/gegl/gimp-babl.c:333 ../app/gegl/gimp-babl.c:334 +#: ../app/gegl/gimp-babl.c:335 ../app/gegl/gimp-babl.c:336 +#: ../app/gegl/gimp-babl.c:337 ../app/gegl/gimp-babl.c:338 +#: ../app/gegl/gimp-babl.c:339 ../app/gegl/gimp-babl.c:340 msgid "RGB-alpha" -msgstr "" +msgstr "RGB-透明" -#: ../app/gegl/gimp-babl.c:166 ../app/gegl/gimp-babl.c:167 -#: ../app/gegl/gimp-babl.c:168 ../app/gegl/gimp-babl.c:169 -#: ../app/gegl/gimp-babl.c:170 ../app/gegl/gimp-babl.c:171 -#, fuzzy +#: ../app/gegl/gimp-babl.c:342 ../app/gegl/gimp-babl.c:343 +#: ../app/gegl/gimp-babl.c:344 ../app/gegl/gimp-babl.c:345 +#: ../app/gegl/gimp-babl.c:346 ../app/gegl/gimp-babl.c:347 +#: ../app/gegl/gimp-babl.c:348 ../app/gegl/gimp-babl.c:349 +#: ../app/gegl/gimp-babl.c:350 ../app/gegl/gimp-babl.c:351 +#: ../app/gegl/gimp-babl.c:352 ../app/gegl/gimp-babl.c:353 msgid "Grayscale" -msgstr "灰度(_G)" +msgstr "灰度" -#: ../app/gegl/gimp-babl.c:173 ../app/gegl/gimp-babl.c:174 -#: ../app/gegl/gimp-babl.c:175 ../app/gegl/gimp-babl.c:176 -#: ../app/gegl/gimp-babl.c:177 -#, fuzzy +#: ../app/gegl/gimp-babl.c:355 ../app/gegl/gimp-babl.c:356 +#: ../app/gegl/gimp-babl.c:357 ../app/gegl/gimp-babl.c:358 +#: ../app/gegl/gimp-babl.c:359 ../app/gegl/gimp-babl.c:360 +#: ../app/gegl/gimp-babl.c:361 ../app/gegl/gimp-babl.c:362 +#: ../app/gegl/gimp-babl.c:363 ../app/gegl/gimp-babl.c:364 +#: ../app/gegl/gimp-babl.c:365 ../app/gegl/gimp-babl.c:366 msgid "Grayscale-alpha" -msgstr "灰度(_G)" +msgstr "灰度-透明" -#: ../app/gegl/gimp-babl.c:179 ../app/gegl/gimp-babl.c:180 -#: ../app/gegl/gimp-babl.c:181 ../app/gegl/gimp-babl.c:182 -#: ../app/gegl/gimp-babl.c:183 -#, fuzzy +#: ../app/gegl/gimp-babl.c:368 ../app/gegl/gimp-babl.c:369 +#: ../app/gegl/gimp-babl.c:370 ../app/gegl/gimp-babl.c:371 +#: ../app/gegl/gimp-babl.c:372 ../app/gegl/gimp-babl.c:373 +#: ../app/gegl/gimp-babl.c:374 ../app/gegl/gimp-babl.c:375 +#: ../app/gegl/gimp-babl.c:376 ../app/gegl/gimp-babl.c:377 +#: ../app/gegl/gimp-babl.c:378 ../app/gegl/gimp-babl.c:379 msgid "Red component" -msgstr "分量(_O)" +msgstr "红色分量" -#: ../app/gegl/gimp-babl.c:185 ../app/gegl/gimp-babl.c:186 -#: ../app/gegl/gimp-babl.c:187 ../app/gegl/gimp-babl.c:188 -#: ../app/gegl/gimp-babl.c:189 -#, fuzzy +#: ../app/gegl/gimp-babl.c:381 ../app/gegl/gimp-babl.c:382 +#: ../app/gegl/gimp-babl.c:383 ../app/gegl/gimp-babl.c:384 +#: ../app/gegl/gimp-babl.c:385 ../app/gegl/gimp-babl.c:386 +#: ../app/gegl/gimp-babl.c:387 ../app/gegl/gimp-babl.c:388 +#: ../app/gegl/gimp-babl.c:389 ../app/gegl/gimp-babl.c:390 +#: ../app/gegl/gimp-babl.c:391 ../app/gegl/gimp-babl.c:392 msgid "Green component" -msgstr "分量(_O)" +msgstr "绿色分量" -#: ../app/gegl/gimp-babl.c:191 ../app/gegl/gimp-babl.c:192 -#: ../app/gegl/gimp-babl.c:193 ../app/gegl/gimp-babl.c:194 -#: ../app/gegl/gimp-babl.c:195 -#, fuzzy +#: ../app/gegl/gimp-babl.c:394 ../app/gegl/gimp-babl.c:395 +#: ../app/gegl/gimp-babl.c:396 ../app/gegl/gimp-babl.c:397 +#: ../app/gegl/gimp-babl.c:398 ../app/gegl/gimp-babl.c:399 +#: ../app/gegl/gimp-babl.c:400 ../app/gegl/gimp-babl.c:401 +#: ../app/gegl/gimp-babl.c:402 ../app/gegl/gimp-babl.c:403 +#: ../app/gegl/gimp-babl.c:404 ../app/gegl/gimp-babl.c:405 msgid "Blue component" -msgstr "分量(_O)" +msgstr "蓝色分量" -#: ../app/gegl/gimp-babl.c:197 ../app/gegl/gimp-babl.c:198 -#: ../app/gegl/gimp-babl.c:199 ../app/gegl/gimp-babl.c:200 -#: ../app/gegl/gimp-babl.c:201 ../app/gegl/gimp-babl.c:202 -#, fuzzy +#: ../app/gegl/gimp-babl.c:407 ../app/gegl/gimp-babl.c:408 +#: ../app/gegl/gimp-babl.c:409 ../app/gegl/gimp-babl.c:410 +#: ../app/gegl/gimp-babl.c:411 ../app/gegl/gimp-babl.c:412 msgid "Alpha component" -msgstr "分量(_O)" +msgstr "透明度分量" -#: ../app/gegl/gimp-babl.c:230 +#: ../app/gegl/gimp-babl.c:440 msgid "Indexed-alpha" -msgstr "" +msgstr "索引色-透明" -#: ../app/gegl/gimp-babl.c:232 -#, fuzzy +#: ../app/gegl/gimp-babl.c:442 msgid "Indexed" -msgstr "索引 %d" +msgstr "索引" -#: ../app/gegl/gimpcurvesconfig.c:449 +#: ../app/gegl/gimp-gegl-enums.c:24 +msgctxt "cage-mode" +msgid "Create or adjust the cage" +msgstr "创建或调整框架" + +#: ../app/gegl/gimp-gegl-enums.c:25 +msgctxt "cage-mode" +msgid "" +"Deform the cage\n" +"to deform the image" +msgstr "" +"变换框架\n" +"以变换图像" + +#: ../app/operations/operations-enums.c:25 +msgctxt "layer-color-space" +msgid "Auto" +msgstr "自动" + +#: ../app/operations/operations-enums.c:26 +msgctxt "layer-color-space" +msgid "RGB (linear)" +msgstr "RGB(线性)" + +#: ../app/operations/operations-enums.c:27 +msgctxt "layer-color-space" +msgid "RGB (perceptual)" +msgstr "RGB(感官)" + +#: ../app/operations/operations-enums.c:28 +msgctxt "layer-color-space" +msgid "LAB" +msgstr "LAB" + +#: ../app/operations/operations-enums.c:59 +msgctxt "layer-composite-mode" +msgid "Auto" +msgstr "自动" + +#: ../app/operations/operations-enums.c:60 +msgctxt "layer-composite-mode" +msgid "Union" +msgstr "联合" + +#: ../app/operations/operations-enums.c:61 +msgctxt "layer-composite-mode" +msgid "Clip to backdrop" +msgstr "剪辑至背景" + +#: ../app/operations/operations-enums.c:62 +msgctxt "layer-composite-mode" +msgid "Clip to layer" +msgstr "剪辑至图层" + +#: ../app/operations/operations-enums.c:63 +msgctxt "layer-composite-mode" +msgid "Intersection" +msgstr "交集" + +#: ../app/operations/operations-enums.c:153 +msgctxt "layer-mode" +msgid "Normal (legacy)" +msgstr "正常(过时)" + +#. Translators: this is an abbreviated version of "Normal (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:156 +msgctxt "layer-mode" +msgid "Normal (l)" +msgstr "正常(l)" + +#: ../app/operations/operations-enums.c:157 +msgctxt "layer-mode" +msgid "Dissolve" +msgstr "融化" + +#: ../app/operations/operations-enums.c:158 +msgctxt "layer-mode" +msgid "Behind (legacy)" +msgstr "背后(过时)" + +#. Translators: this is an abbreviated version of "Behind (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:161 +msgctxt "layer-mode" +msgid "Behind (l)" +msgstr "背后(l)" + +#: ../app/operations/operations-enums.c:162 +msgctxt "layer-mode" +msgid "Multiply (legacy)" +msgstr "相乘(过时)" + +#. Translators: this is an abbreviated version of "Multiply (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:165 +msgctxt "layer-mode" +msgid "Multiply (l)" +msgstr "相乘(l)" + +#: ../app/operations/operations-enums.c:166 +msgctxt "layer-mode" +msgid "Screen (legacy)" +msgstr "掩蔽(过时)" + +#. Translators: this is an abbreviated version of "Screen (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:169 +msgctxt "layer-mode" +msgid "Screen (l)" +msgstr "掩蔽(l)" + +#: ../app/operations/operations-enums.c:170 +msgctxt "layer-mode" +msgid "Old broken Overlay" +msgstr "旧的损坏叠加" + +#. Translators: this is an abbreviated version of "Old broken Overlay". +#. Keep it short. +#: ../app/operations/operations-enums.c:173 +msgctxt "layer-mode" +msgid "Old Overlay" +msgstr "旧叠加" + +#: ../app/operations/operations-enums.c:174 +msgctxt "layer-mode" +msgid "Difference (legacy)" +msgstr "差值(过时)" + +#. Translators: this is an abbreviated version of "Difference (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:177 +msgctxt "layer-mode" +msgid "Difference (l)" +msgstr "差值(l)" + +#: ../app/operations/operations-enums.c:178 +msgctxt "layer-mode" +msgid "Addition (legacy)" +msgstr "相加(过时)" + +#. Translators: this is an abbreviated version of "Addition (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:181 +msgctxt "layer-mode" +msgid "Addition (l)" +msgstr "相加(l)" + +#: ../app/operations/operations-enums.c:182 +msgctxt "layer-mode" +msgid "Subtract (legacy)" +msgstr "减去(过时)" + +#. Translators: this is an abbreviated version of "Subtract (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:185 +msgctxt "layer-mode" +msgid "Subtract (l)" +msgstr "减去(l)" + +#: ../app/operations/operations-enums.c:186 +msgctxt "layer-mode" +msgid "Darken only (legacy)" +msgstr "仅变暗(过时)" + +#. Translators: this is an abbreviated version of "Darken only (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:189 +msgctxt "layer-mode" +msgid "Darken only (l)" +msgstr "仅变暗(l)" + +#: ../app/operations/operations-enums.c:190 +msgctxt "layer-mode" +msgid "Lighten only (legacy)" +msgstr "仅变亮(过时)" + +#. Translators: this is an abbreviated version of "Lighten only (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:193 +msgctxt "layer-mode" +msgid "Lighten only (l)" +msgstr "仅变亮(l)" + +#: ../app/operations/operations-enums.c:194 +msgctxt "layer-mode" +msgid "Hue (HSV) (legacy)" +msgstr "色相(HSV)(过时)" + +#. Translators: this is an abbreviated version of "Hue (HSV) (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:197 +msgctxt "layer-mode" +msgid "Hue (HSV) (l)" +msgstr "色相(HSV) (l)" + +#: ../app/operations/operations-enums.c:198 +msgctxt "layer-mode" +msgid "Saturation (HSV) (legacy)" +msgstr "饱和度(HSV)(过时)" + +#. Translators: this is an abbreviated version of "Saturation (HSV) (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:201 +msgctxt "layer-mode" +msgid "Saturation (HSV) (l)" +msgstr "饱和度(HSV) (l)" + +#: ../app/operations/operations-enums.c:202 +msgctxt "layer-mode" +msgid "Color (HSL) (legacy)" +msgstr "颜色(HSL)(过时)" + +#. Translators: this is an abbreviated version of "Color (HSL) (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:205 +msgctxt "layer-mode" +msgid "Color (HSL) (l)" +msgstr "颜色(HSL) (l)" + +#: ../app/operations/operations-enums.c:206 +msgctxt "layer-mode" +msgid "Value (HSV) (legacy)" +msgstr "明度(HSV)(过时)" + +#. Translators: this is an abbreviated version of "Value (HSV) (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:209 +msgctxt "layer-mode" +msgid "Value (HSV) (l)" +msgstr "明度(HSV) (l)" + +#: ../app/operations/operations-enums.c:210 +msgctxt "layer-mode" +msgid "Divide (legacy)" +msgstr "相除(过时)" + +#. Translators: this is an abbreviated version of "Divide (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:213 +msgctxt "layer-mode" +msgid "Divide (l)" +msgstr "相除(l)" + +#: ../app/operations/operations-enums.c:214 +msgctxt "layer-mode" +msgid "Dodge (legacy)" +msgstr "减淡(过时)" + +#. Translators: this is an abbreviated version of "Dodge (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:217 +msgctxt "layer-mode" +msgid "Dodge (l)" +msgstr "减淡(l)" + +#: ../app/operations/operations-enums.c:218 +msgctxt "layer-mode" +msgid "Burn (legacy)" +msgstr "加深(过时)" + +#. Translators: this is an abbreviated version of "Burn (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:221 +msgctxt "layer-mode" +msgid "Burn (l)" +msgstr "加深(l)" + +#: ../app/operations/operations-enums.c:222 +msgctxt "layer-mode" +msgid "Hard light (legacy)" +msgstr "强光(过时)" + +#. Translators: this is an abbreviated version of "Hard light (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:225 +msgctxt "layer-mode" +msgid "Hard light (l)" +msgstr "强光(l)" + +#: ../app/operations/operations-enums.c:226 +msgctxt "layer-mode" +msgid "Soft light (legacy)" +msgstr "柔光(过时)" + +#. Translators: this is an abbreviated version of "Soft light (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:229 +msgctxt "layer-mode" +msgid "Soft light (l)" +msgstr "柔光(l)" + +#: ../app/operations/operations-enums.c:230 +msgctxt "layer-mode" +msgid "Grain extract (legacy)" +msgstr "增益提取(过时)" + +#. Translators: this is an abbreviated version of "Grain extract (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:233 +msgctxt "layer-mode" +msgid "Grain extract (l)" +msgstr "增益提取(l)" + +#: ../app/operations/operations-enums.c:234 +msgctxt "layer-mode" +msgid "Grain merge (legacy)" +msgstr "增益合并(过时)" + +#. Translators: this is an abbreviated version of "Grain merge (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:237 +msgctxt "layer-mode" +msgid "Grain merge (l)" +msgstr "增益合并(l)" + +#: ../app/operations/operations-enums.c:238 +msgctxt "layer-mode" +msgid "Color erase (legacy)" +msgstr "颜色擦除(过时)" + +#. Translators: this is an abbreviated version of "Color erase (legacy)". +#. Keep it short. +#: ../app/operations/operations-enums.c:241 +msgctxt "layer-mode" +msgid "Color erase (l)" +msgstr "颜色擦除(l)" + +#: ../app/operations/operations-enums.c:242 +msgctxt "layer-mode" +msgid "Overlay" +msgstr "叠加" + +#: ../app/operations/operations-enums.c:243 +msgctxt "layer-mode" +msgid "Hue (LCH)" +msgstr "色相(LCH)" + +#: ../app/operations/operations-enums.c:244 +msgctxt "layer-mode" +msgid "Chroma (LCH)" +msgstr "浓度(LCH)" + +#: ../app/operations/operations-enums.c:245 +msgctxt "layer-mode" +msgid "Color (LCH)" +msgstr "颜色(LCH)" + +#: ../app/operations/operations-enums.c:246 +msgctxt "layer-mode" +msgid "Lightness (LCH)" +msgstr "亮度(LCH)" + +#: ../app/operations/operations-enums.c:247 +msgctxt "layer-mode" +msgid "Normal" +msgstr "正常" + +#: ../app/operations/operations-enums.c:248 +msgctxt "layer-mode" +msgid "Behind" +msgstr "背后" + +#: ../app/operations/operations-enums.c:249 +msgctxt "layer-mode" +msgid "Multiply" +msgstr "相乘" + +#: ../app/operations/operations-enums.c:250 +msgctxt "layer-mode" +msgid "Screen" +msgstr "掩蔽" + +#: ../app/operations/operations-enums.c:251 +msgctxt "layer-mode" +msgid "Difference" +msgstr "差值" + +#: ../app/operations/operations-enums.c:252 +msgctxt "layer-mode" +msgid "Addition" +msgstr "相加" + +#: ../app/operations/operations-enums.c:253 +msgctxt "layer-mode" +msgid "Subtract" +msgstr "减去" + +#: ../app/operations/operations-enums.c:254 +msgctxt "layer-mode" +msgid "Darken only" +msgstr "仅变暗" + +#: ../app/operations/operations-enums.c:255 +msgctxt "layer-mode" +msgid "Lighten only" +msgstr "仅变亮" + +#: ../app/operations/operations-enums.c:256 +msgctxt "layer-mode" +msgid "Hue (HSV)" +msgstr "色相(HSV)" + +#: ../app/operations/operations-enums.c:257 +msgctxt "layer-mode" +msgid "Saturation (HSV)" +msgstr "饱和度(HSV)" + +#: ../app/operations/operations-enums.c:258 +msgctxt "layer-mode" +msgid "Color (HSL)" +msgstr "颜色(HSV)" + +#: ../app/operations/operations-enums.c:259 +msgctxt "layer-mode" +msgid "Value (HSV)" +msgstr "明度(HSV)" + +#: ../app/operations/operations-enums.c:260 +msgctxt "layer-mode" +msgid "Divide" +msgstr "相除" + +#: ../app/operations/operations-enums.c:261 +msgctxt "layer-mode" +msgid "Dodge" +msgstr "减淡" + +#: ../app/operations/operations-enums.c:262 +msgctxt "layer-mode" +msgid "Burn" +msgstr "加深" + +#: ../app/operations/operations-enums.c:263 +msgctxt "layer-mode" +msgid "Hard light" +msgstr "强光" + +#: ../app/operations/operations-enums.c:264 +msgctxt "layer-mode" +msgid "Soft light" +msgstr "柔光" + +#: ../app/operations/operations-enums.c:265 +msgctxt "layer-mode" +msgid "Grain extract" +msgstr "增益提取" + +#: ../app/operations/operations-enums.c:266 +msgctxt "layer-mode" +msgid "Grain merge" +msgstr "增益合并" + +#: ../app/operations/operations-enums.c:267 +msgctxt "layer-mode" +msgid "Vivid light" +msgstr "亮光" + +#: ../app/operations/operations-enums.c:268 +msgctxt "layer-mode" +msgid "Pin light" +msgstr "点光" + +#: ../app/operations/operations-enums.c:269 +msgctxt "layer-mode" +msgid "Linear light" +msgstr "线性光" + +#: ../app/operations/operations-enums.c:270 +msgctxt "layer-mode" +msgid "Hard mix" +msgstr "实色混合" + +#: ../app/operations/operations-enums.c:271 +msgctxt "layer-mode" +msgid "Exclusion" +msgstr "排除" + +#: ../app/operations/operations-enums.c:272 +msgctxt "layer-mode" +msgid "Linear burn" +msgstr "线性加深" + +#: ../app/operations/operations-enums.c:273 +msgctxt "layer-mode" +msgid "Luma/Luminance darken only" +msgstr "仅亮度变暗" + +#. Translators: this is an abbreviated version of "Luma/Luminance darken only". +#. Keep it short. +#: ../app/operations/operations-enums.c:276 +msgctxt "layer-mode" +msgid "Luma darken only" +msgstr "仅亮度变暗" + +#: ../app/operations/operations-enums.c:277 +msgctxt "layer-mode" +msgid "Luma/Luminance lighten only" +msgstr "仅亮度变亮" + +#. Translators: this is an abbreviated version of "Luma/Luminance lighten only". +#. Keep it short. +#: ../app/operations/operations-enums.c:280 +msgctxt "layer-mode" +msgid "Luma lighten only" +msgstr "仅亮度变亮" + +#: ../app/operations/operations-enums.c:281 +msgctxt "layer-mode" +msgid "Luminance" +msgstr "亮度" + +#: ../app/operations/operations-enums.c:282 +msgctxt "layer-mode" +msgid "Color erase" +msgstr "颜色擦除" + +#: ../app/operations/operations-enums.c:283 +msgctxt "layer-mode" +msgid "Erase" +msgstr "擦除" + +#: ../app/operations/operations-enums.c:284 +msgctxt "layer-mode" +msgid "Merge" +msgstr "合并" + +#: ../app/operations/operations-enums.c:285 +msgctxt "layer-mode" +msgid "Split" +msgstr "分割" + +#: ../app/operations/operations-enums.c:286 +msgctxt "layer-mode" +msgid "Pass through" +msgstr "通过" + +#: ../app/operations/operations-enums.c:287 +msgctxt "layer-mode" +msgid "Replace" +msgstr "替换" + +#: ../app/operations/operations-enums.c:288 +msgctxt "layer-mode" +msgid "Anti erase" +msgstr "反擦除" + +#: ../app/operations/operations-enums.c:316 +msgctxt "layer-mode-group" +msgid "Default" +msgstr "默认" + +#: ../app/operations/operations-enums.c:317 +msgctxt "layer-mode-group" +msgid "Legacy" +msgstr "过时" + +#: ../app/operations/gimpbrightnesscontrastconfig.c:82 +#: ../app/operations/gimpbrightnesscontrastconfig.c:83 +msgid "Brightness" +msgstr "亮度" + +#: ../app/operations/gimpbrightnesscontrastconfig.c:88 +#: ../app/operations/gimpbrightnesscontrastconfig.c:89 +msgid "Contrast" +msgstr "对比度" + +#: ../app/operations/gimpcolorbalanceconfig.c:96 +#: ../app/operations/gimphuesaturationconfig.c:94 +#: ../app/paint/gimpdodgeburnoptions.c:78 +msgid "Range" +msgstr "范围" + +#: ../app/operations/gimpcolorbalanceconfig.c:97 +#: ../app/operations/gimphuesaturationconfig.c:95 +msgid "The affected range" +msgstr "受影响的范围" + +#: ../app/operations/gimpcolorbalanceconfig.c:103 +#: ../app/operations/gimpcolorbalanceconfig.c:104 +msgid "Cyan-Red" +msgstr "青色-红色" + +#: ../app/operations/gimpcolorbalanceconfig.c:109 +#: ../app/operations/gimpcolorbalanceconfig.c:110 +msgid "Magenta-Green" +msgstr "品红-绿色" + +#: ../app/operations/gimpcolorbalanceconfig.c:115 +#: ../app/operations/gimpcolorbalanceconfig.c:116 +msgid "Yellow-Blue" +msgstr "黄色-蓝色" + +#: ../app/operations/gimpcolorbalanceconfig.c:121 +#: ../app/operations/gimpcolorbalanceconfig.c:122 +msgid "Preserve Luminosity" +msgstr "保持明度" + +#: ../app/operations/gimpcurvesconfig.c:105 +#: ../app/operations/gimplevelsconfig.c:108 +#: ../app/widgets/gimphistogrameditor.c:110 +msgid "Linear" +msgstr "线性" + +#: ../app/operations/gimpcurvesconfig.c:106 +#: ../app/operations/gimplevelsconfig.c:109 +msgid "Work on linear RGB" +msgstr "以线性 RGB 工作" + +#: ../app/operations/gimpcurvesconfig.c:112 +#: ../app/operations/gimplevelsconfig.c:115 +msgid "The affected channel" +msgstr "受影响的通道" + +#: ../app/operations/gimpcurvesconfig.c:118 +#: ../app/operations/gimpcurvesconfig.c:119 +msgid "Curve" +msgstr "曲线" + +#: ../app/operations/gimpcurvesconfig.c:548 msgid "not a GIMP Curves file" msgstr "不是 GIMP 曲线文件" -#: ../app/gegl/gimpcurvesconfig.c:464 ../app/gegl/gimplevelsconfig.c:786 -msgid "parse error" -msgstr "解析错误" +#: ../app/operations/gimpcurvesconfig.c:579 +msgid "Parse error, didn't find 2 integers" +msgstr "解析错误，未找到 2 个整数" -#: ../app/gegl/gimp-gegl-enums.c:24 -#, fuzzy -msgctxt "cage-mode" -msgid "Create or adjust the cage" -msgstr "创建新的图像" +#: ../app/operations/gimpcurvesconfig.c:699 +msgid "Writing curves file failed: " +msgstr "写入曲线文件失败： " -#: ../app/gegl/gimp-gegl-enums.c:25 -#, fuzzy -msgctxt "cage-mode" -msgid "Deform the cage to deform the image" -msgstr "将图层的大小重设为图像的尺寸" +#: ../app/operations/gimphuesaturationconfig.c:101 +#: ../app/operations/gimphuesaturationconfig.c:102 +#: ../app/operations/gimpoperationcolorize.c:92 +#: ../app/operations/gimpoperationcolorize.c:93 +msgid "Hue" +msgstr "色相" -#: ../app/gegl/gimplevelsconfig.c:739 +#: ../app/operations/gimphuesaturationconfig.c:107 +#: ../app/operations/gimphuesaturationconfig.c:108 +#: ../app/operations/gimpoperationcolorize.c:98 +#: ../app/operations/gimpoperationcolorize.c:99 +msgid "Saturation" +msgstr "饱和度" + +#: ../app/operations/gimphuesaturationconfig.c:113 +#: ../app/operations/gimphuesaturationconfig.c:114 +#: ../app/operations/gimpoperationcolorize.c:104 +#: ../app/operations/gimpoperationcolorize.c:105 +msgid "Lightness" +msgstr "亮度" + +#: ../app/operations/gimphuesaturationconfig.c:119 +#: ../app/operations/gimphuesaturationconfig.c:120 +msgid "Overlap" +msgstr "叠加" + +#: ../app/operations/gimplevelsconfig.c:121 +#: ../app/operations/gimplevelsconfig.c:122 +msgid "Low Input" +msgstr "低输入" + +#: ../app/operations/gimplevelsconfig.c:127 +#: ../app/operations/gimplevelsconfig.c:128 +msgid "High Input" +msgstr "高输入" + +#: ../app/operations/gimplevelsconfig.c:133 +msgid "Clamp Input" +msgstr "固定输入" + +#: ../app/operations/gimplevelsconfig.c:134 +msgid "Clamp input values before applying output mapping." +msgstr "在应用输出映射前固定输入数值。" + +#: ../app/operations/gimplevelsconfig.c:145 +#: ../app/operations/gimplevelsconfig.c:146 +msgid "Low Output" +msgstr "低输出" + +#: ../app/operations/gimplevelsconfig.c:151 +#: ../app/operations/gimplevelsconfig.c:152 +msgid "High Output" +msgstr "高输出" + +#: ../app/operations/gimplevelsconfig.c:157 +msgid "Clamp Output" +msgstr "固定输出" + +#: ../app/operations/gimplevelsconfig.c:158 +msgid "Clamp final output values." +msgstr "固定最终输出数值。" + +#: ../app/operations/gimplevelsconfig.c:842 msgid "not a GIMP Levels file" msgstr "不是 GIMP 色阶文件" -#: ../app/gegl/gimpoperationcagecoefcalc.c:68 -msgid "Compute a set of coefficient buffer for the GIMP cage tool" -msgstr "" +#: ../app/operations/gimplevelsconfig.c:917 +msgid "parse error" +msgstr "解析错误" -#: ../app/gegl/gimpoperationcagetransform.c:106 +#: ../app/operations/gimplevelsconfig.c:952 +msgid "Writing levels file failed: " +msgstr "写入色阶文件失败： " + +#: ../app/operations/gimpoperationbrightnesscontrast.c:65 +#: ../app/tools/gimpbrightnesscontrasttool.c:98 +msgid "Adjust brightness and contrast" +msgstr "调整亮度和对比度" + +#: ../app/operations/gimpoperationcagecoefcalc.c:69 +msgid "Compute a set of coefficient buffer for the GIMP cage tool" +msgstr "计算一套 GIMP 框架工具的协作缓冲区" + +#: ../app/operations/gimpoperationcagetransform.c:105 msgid "" "Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage " "tool" -msgstr "" +msgstr "将一套 GIMP 框架工具的协作缓冲区转化为整合缓冲区" -#: ../app/gegl/gimpoperationcagetransform.c:128 -#, fuzzy +#: ../app/operations/gimpoperationcagetransform.c:131 msgid "Fill with plain color" -msgstr "以背景色填充(_B)" +msgstr "使用纯色填充" -#: ../app/gegl/gimpoperationcagetransform.c:129 -#: ../app/tools/gimpcageoptions.c:144 +#: ../app/operations/gimpoperationcagetransform.c:132 msgid "Fill the original position of the cage with a plain color" -msgstr "" +msgstr "使用纯色填充框架的原始位置" -#. initialize the document history -#: ../app/gui/gui.c:421 +#: ../app/operations/gimpoperationcolorbalance.c:65 +msgid "Adjust color distribution" +msgstr "调整色彩分布" + +#: ../app/operations/gimpoperationcolorize.c:85 +msgid "Colorize the image" +msgstr "单色化该图像" + +#: ../app/operations/gimpoperationcolorize.c:114 +#: ../app/operations/gimpoperationcolorize.c:115 +msgid "Color" +msgstr "颜色" + +#: ../app/operations/gimpoperationcurves.c:67 ../app/tools/gimpcurvestool.c:143 +msgid "Adjust color curves" +msgstr "调整颜色曲线" + +#: ../app/operations/gimpoperationdesaturate.c:85 +msgid "Turn colors into shades of gray" +msgstr "将颜色转换为灰阶" + +#: ../app/operations/gimpoperationdesaturate.c:91 +msgid "Choose shade of gray based on" +msgstr "选择灰色梯度基于" + +#: ../app/operations/gimpoperationhuesaturation.c:65 +msgid "Adjust hue, saturation, and lightness" +msgstr "调整色相、饱和度以及亮度" + +#: ../app/operations/gimpoperationlevels.c:64 ../app/tools/gimplevelstool.c:133 +msgid "Adjust color levels" +msgstr "调整颜色色阶" + +#: ../app/operations/gimpoperationposterize.c:82 +msgid "Reduce to a limited set of colors" +msgstr "减少到一套有限的颜色" + +#: ../app/operations/gimpoperationposterize.c:87 +msgid "Posterize levels" +msgstr "色相分离级别" + +#: ../app/operations/gimpoperationsemiflatten.c:84 +msgid "Replace partial transparency with a color" +msgstr "使用颜色替换半透明部分" + +#: ../app/operations/gimpoperationthreshold.c:84 +#: ../app/tools/gimpthresholdtool.c:88 +msgid "Reduce image to two colors using a threshold" +msgstr "以指定阈值将图像减至两色" + +#: ../app/operations/gimpoperationthreshold.c:97 +msgid "Low threshold" +msgstr "低阈值" + +#: ../app/operations/gimpoperationthreshold.c:104 +msgid "High threshold" +msgstr "高阈值" + +#: ../app/operations/gimpoperationthresholdalpha.c:80 +msgid "" +"Make transparency all-or-nothing, by thresholding the alpha channel to a " +"value" +msgstr "通过为透明通道设定阈值使全透明或不透明" + +#. TRANSLATORS: there is no need to translate this in GIMP. This uses +#. * "gtk20" domain as a special trick to determine language direction, +#. * but xgettext extracts it anyway mistakenly into GIMP po files. +#. * Leave an empty string as translation. It does not matter. +#. +#: ../app/gui/gui.c:236 +msgid "default:LTR" +msgstr "默认：左至右" + +#: ../app/gui/gui.c:326 +msgid "Image Recovery" +msgstr "图像恢复" + +#: ../app/gui/gui.c:328 +msgid "_Discard" +msgstr "放弃(_D)" + +#: ../app/gui/gui.c:329 +msgid "_Recover" +msgstr "恢复(_R)" + +#: ../app/gui/gui.c:340 +msgid "Eeek! It looks like GIMP recovered from a crash!" +msgstr "哈！貌似 GIMP 从崩溃中恢复了！" + +#. TRANSLATORS: even if English singular form does +#. * not use %d, you can use %d for translation in +#. * any singular/plural form of your language if +#. * suited. It will just work and be replaced by the +#. * number of images as expected. +#. +#: ../app/gui/gui.c:349 +#, c-format +msgid "" +"An image was salvaged from the crash. Do you want to try and recover it?" +msgid_plural "" +"%d images were salvaged from the crash. Do you want to try and recover them?" +msgstr[0] "从崩溃中抢救了 %d 张图像。您想要尝试并恢复它们吗？" + +#. load the recent documents after gimp_real_restore() because we +#. * need the mime-types implemented by plug-ins +#. +#: ../app/gui/gui.c:594 msgid "Documents" msgstr "文档" -#: ../app/gui/splash.c:116 +#: ../app/gui/splash.c:128 msgid "GIMP Startup" msgstr "GIMP 启动" -#: ../app/paint/gimpairbrush.c:65 ../app/tools/gimpairbrushtool.c:55 +#: ../app/paint/gimpairbrush.c:68 ../app/tools/gimpairbrushtool.c:55 msgid "Airbrush" msgstr "喷枪" -#: ../app/paint/gimpbrushcore.c:385 -msgid "No brushes available for use with this tool." -msgstr "没有可供此工具使用的画笔。" +#: ../app/paint/gimpairbrushoptions.c:70 +msgctxt "airbrush-tool" +msgid "Rate" +msgstr "比率" -#: ../app/paint/gimpbrushcore.c:392 +#: ../app/paint/gimpairbrushoptions.c:78 +msgid "Motion only" +msgstr "仅运动" + +#: ../app/paint/gimpairbrushoptions.c:85 +msgid "Flow" +msgstr "流量" + +#: ../app/paint/gimpbrushcore.c:378 +msgid "No brushes available for use with this tool." +msgstr "没有可供此工具使用的笔刷。" + +#: ../app/paint/gimpbrushcore.c:385 msgid "No paint dynamics available for use with this tool." msgstr "没有可供此工具使用的动态。" -#: ../app/paint/gimpclone.c:83 ../app/tools/gimpclonetool.c:61 +#: ../app/paint/gimpclone.c:87 ../app/tools/gimpclonetool.c:56 msgid "Clone" msgstr "克隆" -#: ../app/paint/gimpclone.c:124 +#: ../app/paint/gimpclone.c:129 msgid "No patterns available for use with this tool." msgstr "没有可供此工具使用的图案。" -#: ../app/paint/gimpconvolve.c:78 +#: ../app/paint/gimpcloneoptions.c:66 ../app/tools/gimpcloneoptions-gui.c:70 +msgid "Source" +msgstr "源" + +#: ../app/paint/gimpconvolve.c:79 msgid "Convolve" msgstr "卷积" -#: ../app/paint/gimpdodgeburn.c:66 +#: ../app/paint/gimpconvolveoptions.c:68 +msgid "Convolve Type" +msgstr "卷积类型" + +#: ../app/paint/gimpconvolveoptions.c:76 +msgctxt "convolve-tool" +msgid "Rate" +msgstr "比率" + +#: ../app/paint/gimpdodgeburn.c:67 msgid "Dodge/Burn" msgstr "减淡/加深" -#: ../app/paint/gimperaser.c:60 ../app/tools/gimperasertool.c:66 +#: ../app/paint/gimpdodgeburnoptions.c:70 +msgid "Type" +msgstr "类型" + +#: ../app/paint/gimpdodgeburnoptions.c:86 +msgid "Exposure" +msgstr "曝光" + +#: ../app/paint/gimperaser.c:64 ../app/tools/gimperasertool.c:66 msgid "Eraser" msgstr "橡皮" -#: ../app/paint/gimpheal.c:102 ../app/tools/gimphealtool.c:53 +#: ../app/paint/gimperaseroptions.c:66 +msgid "Anti erase" +msgstr "反擦除" + +#: ../app/paint/gimpheal.c:115 ../app/tools/gimphealtool.c:53 msgid "Heal" msgstr "复原" -#: ../app/paint/gimpheal.c:141 +#: ../app/paint/gimpheal.c:155 msgid "Healing does not operate on indexed layers." msgstr "不能对索引图层进行复原操作。" -#: ../app/paint/gimpink.c:98 ../app/tools/gimpinktool.c:55 +#: ../app/paint/gimpink.c:107 ../app/tools/gimpinktool.c:61 msgid "Ink" msgstr "墨水" -#: ../app/paint/gimpinkoptions.c:72 +#: ../app/paint/gimpinkoptions.c:74 ../app/paint/gimpinkoptions.c:87 +#: ../app/paint/gimppaintoptions.c:191 ../app/tools/gimpwarpoptions.c:91 +msgid "Size" +msgstr "大小" + +#: ../app/paint/gimpinkoptions.c:75 msgid "Ink Blob Size" msgstr "墨斑大小" -#: ../app/paint/gimpinkoptions.c:99 +#: ../app/paint/gimpinkoptions.c:80 ../app/paint/gimpinkoptions.c:119 +#: ../app/paint/gimppaintoptions.c:205 ../app/widgets/gimpbrusheditor.c:200 +msgid "Angle" +msgstr "角度" + +#: ../app/paint/gimpinkoptions.c:99 ../app/widgets/gimpdynamicseditor.c:164 +#: ../app/widgets/gimpdynamicsoutputeditor.c:73 +msgid "Tilt" +msgstr "倾斜" + +#. Blob shape widgets +#: ../app/paint/gimpinkoptions.c:106 ../app/tools/gimpblendoptions.c:94 +#: ../app/tools/gimpblendoptions.c:294 ../app/tools/gimpinkoptions-gui.c:103 +msgid "Shape" +msgstr "形状" + +#: ../app/paint/gimpinkoptions.c:113 ../app/widgets/gimpbrusheditor.c:189 +msgid "Aspect ratio" +msgstr "宽高比" + +#: ../app/paint/gimpinkoptions.c:114 msgid "Ink Blob Aspect Ratio" msgstr "墨斑宽高比" -#: ../app/paint/gimpinkoptions.c:103 +#: ../app/paint/gimpinkoptions.c:120 msgid "Ink Blob Angle" msgstr "墨斑角度" -#: ../app/paint/gimppaintbrush.c:65 ../app/tools/gimppaintbrushtool.c:51 +#: ../app/paint/gimpmybrushcore.c:103 +msgid "Mybrush" +msgstr "Mybrush" + +#: ../app/paint/gimpmybrushcore.c:160 +msgid "No MyPaint brushes available for use with this tool." +msgstr "没有可供此工具使用的 MyPaint 笔刷。" + +#: ../app/paint/gimpmybrushoptions.c:86 ../app/tools/gimpcoloroptions.c:85 +#: ../app/tools/gimprectangleselectoptions.c:100 +#: ../app/tools/gimpselectionoptions.c:94 ../app/widgets/gimpbrusheditor.c:156 +msgid "Radius" +msgstr "半径" + +#: ../app/paint/gimpmybrushoptions.c:93 +msgid "Base Opacity" +msgstr "基础不透明度" + +#: ../app/paint/gimpmybrushoptions.c:100 ../app/paint/gimppaintoptions.c:219 +#: ../app/tools/gimpwarpoptions.c:98 ../app/widgets/gimpbrusheditor.c:178 +msgid "Hardness" +msgstr "硬度" + +#: ../app/paint/gimpmybrushoptions.c:107 +msgid "Erase with this brush" +msgstr "使用此笔刷擦除" + +#: ../app/paint/gimpmybrushoptions.c:114 +msgid "No erasing effect" +msgstr "没有擦除效果" + +#: ../app/paint/gimpmybrushoptions.c:115 ../app/paint/gimpsmudgeoptions.c:85 +msgid "Never decrease alpha of existing pixels" +msgstr "永不减小现存像素的透明度" + +#: ../app/paint/gimppaintbrush.c:68 ../app/tools/gimppaintbrushtool.c:51 msgid "Paintbrush" -msgstr "画笔" +msgstr "绘画笔刷" -#: ../app/paint/gimppaintcore.c:135 +#: ../app/paint/gimppaintcore.c:147 msgid "Paint" -msgstr "涂画" - -#: ../app/paint/gimppaintoptions.c:145 -msgid "Brush Size" -msgstr "画笔大小" - -#: ../app/paint/gimppaintoptions.c:159 -msgid "Every stamp has its own opacity" -msgstr "" - -#: ../app/paint/gimppaintoptions.c:165 -msgid "Ignore fuzziness of the current brush" -msgstr "" - -#: ../app/paint/gimppaintoptions.c:170 -msgid "Scatter brush as you paint" -msgstr "" - -#: ../app/paint/gimppaintoptions.c:174 -msgid "Distance of scattering" -msgstr "" - -#: ../app/paint/gimppaintoptions.c:184 -msgid "Distance over which strokes fade out" -msgstr "" +msgstr "绘画" #: ../app/paint/gimppaintoptions.c:192 -msgid "Reverse direction of fading" -msgstr "" +msgid "Brush Size" +msgstr "笔刷大小" -#: ../app/paint/gimppaintoptions.c:196 -msgid "How fade is repeated as you paint" -msgstr "" +#: ../app/paint/gimppaintoptions.c:198 +msgid "Aspect Ratio" +msgstr "宽高比" + +#: ../app/paint/gimppaintoptions.c:212 ../app/tools/gimpwarpoptions.c:112 +#: ../app/widgets/gimpbrusheditor.c:211 +#: ../app/widgets/gimpbrushfactoryview.c:81 ../app/widgets/gimpgrideditor.c:174 +msgid "Spacing" +msgstr "间距" + +#: ../app/paint/gimppaintoptions.c:226 +msgid "Force" +msgstr "力度" + +#: ../app/paint/gimppaintoptions.c:227 +msgid "Brush Force" +msgstr "笔刷力度" + +#: ../app/paint/gimppaintoptions.c:233 +msgid "Link Size" +msgstr "链接大小" + +#: ../app/paint/gimppaintoptions.c:234 +msgid "Link brush size to brush native" +msgstr "将笔刷大小链接到原始笔刷" + +#: ../app/paint/gimppaintoptions.c:240 +msgid "Link Aspect Ratio" +msgstr "链接宽高比" + +#: ../app/paint/gimppaintoptions.c:241 +msgid "Link brush aspect ratio to brush native" +msgstr "将笔刷宽高比链接到原始笔刷" + +#: ../app/paint/gimppaintoptions.c:247 +msgid "Link Angle" +msgstr "链接角度" + +#: ../app/paint/gimppaintoptions.c:248 +msgid "Link brush angle to brush native" +msgstr "将笔刷角度链接到原始笔刷" + +#: ../app/paint/gimppaintoptions.c:254 +msgid "Link Spacing" +msgstr "链接行距" #: ../app/paint/gimppaintoptions.c:255 -#, fuzzy +msgid "Link brush spacing to brush native" +msgstr "将笔刷间距链接到原始笔刷" + +#: ../app/paint/gimppaintoptions.c:261 +msgid "Link Hardness" +msgstr "链接硬度" + +#: ../app/paint/gimppaintoptions.c:262 +msgid "Link brush hardness to brush native" +msgstr "将笔刷硬度链接到原始笔刷" + +#: ../app/paint/gimppaintoptions.c:268 +msgid "Lock brush to view" +msgstr "笔刷锁定到视图" + +#: ../app/paint/gimppaintoptions.c:269 +msgid "Keep brush appearance fixed relative to the view" +msgstr "根据视图保持笔刷的固定外观" + +#: ../app/paint/gimppaintoptions.c:275 +msgid "Incremental" +msgstr "增值" + +#: ../app/paint/gimppaintoptions.c:276 +msgid "Every stamp has its own opacity" +msgstr "每个印记拥有自己的不透明度" + +#: ../app/paint/gimppaintoptions.c:283 +msgid "Hard edge" +msgstr "硬质边界" + +#: ../app/paint/gimppaintoptions.c:284 +msgid "Ignore fuzziness of the current brush" +msgstr "忽略当前笔刷的模糊" + +#: ../app/paint/gimppaintoptions.c:290 +msgid "Apply Jitter" +msgstr "应用抖动" + +#: ../app/paint/gimppaintoptions.c:291 +msgid "Scatter brush as you paint" +msgstr "在绘画时散开笔刷" + +#: ../app/paint/gimppaintoptions.c:296 +msgid "Amount" +msgstr "计数" + +#: ../app/paint/gimppaintoptions.c:297 +msgid "Distance of scattering" +msgstr "散开距离" + +#: ../app/paint/gimppaintoptions.c:303 +msgid "Dynamics Options" +msgstr "动态选项" + +#: ../app/paint/gimppaintoptions.c:310 +msgid "Fade length" +msgstr "淡出长度" + +#: ../app/paint/gimppaintoptions.c:311 +msgid "Distance over which strokes fade out" +msgstr "笔画淡出前的距离" + +#: ../app/paint/gimppaintoptions.c:321 ../app/widgets/gimpviewablebox.c:381 +msgid "Reverse" +msgstr "反向" + +#: ../app/paint/gimppaintoptions.c:322 +msgid "Reverse direction of fading" +msgstr "颠倒淡出的方向" + +#: ../app/paint/gimppaintoptions.c:327 ../app/tools/gimpblendoptions.c:108 +#: ../app/tools/gimpblendoptions.c:315 ../app/tools/gimppaintoptions-gui.c:356 +msgid "Repeat" +msgstr "重复" + +#: ../app/paint/gimppaintoptions.c:328 +msgid "How fade is repeated as you paint" +msgstr "绘画淡出的重复方式" + +#: ../app/paint/gimppaintoptions.c:397 +msgid "Smooth stroke" +msgstr "平滑笔廓" + +#: ../app/paint/gimppaintoptions.c:398 msgid "Paint smoother strokes" -msgstr "转换路径笔划" +msgstr "绘制平滑笔廓" -#: ../app/paint/gimppaintoptions.c:259 +#: ../app/paint/gimppaintoptions.c:404 msgid "Depth of smoothing" -msgstr "" +msgstr "平滑深度" -#: ../app/paint/gimppaintoptions.c:263 +#: ../app/paint/gimppaintoptions.c:409 +msgid "Weight" +msgstr "权重" + +#: ../app/paint/gimppaintoptions.c:410 msgid "Gravity of the pen" -msgstr "" +msgstr "笔刷的重量" -#: ../app/paint/gimppencil.c:41 ../app/tools/gimppenciltool.c:51 +#: ../app/paint/gimppencil.c:42 ../app/tools/gimppenciltool.c:51 msgid "Pencil" msgstr "铅笔" -#: ../app/paint/gimpperspectiveclone.c:87 -#: ../app/tools/gimpperspectiveclonetool.c:133 +#: ../app/paint/gimpperspectiveclone.c:91 +#: ../app/tools/gimpperspectiveclonetool.c:142 msgid "Perspective Clone" msgstr "透视克隆" -#: ../app/paint/gimpsmudge.c:81 ../app/tools/gimpsmudgetool.c:54 +#: ../app/paint/gimpsmudge.c:86 ../app/tools/gimpsmudgetool.c:55 msgid "Smudge" msgstr "涂抹" -#: ../app/paint/gimpsourcecore.c:232 +#: ../app/paint/gimpsmudgeoptions.c:70 +msgctxt "smudge-tool" +msgid "Rate" +msgstr "比率" + +#: ../app/paint/gimpsmudgeoptions.c:71 +msgid "The strength of smudging" +msgstr "涂抹的强度" + +#: ../app/paint/gimpsmudgeoptions.c:77 +msgctxt "smudge-tool" +msgid "Flow" +msgstr "流量" + +#: ../app/paint/gimpsmudgeoptions.c:78 +msgid "The amount of brush color to blend" +msgstr "笔刷颜色混合的数量" + +#: ../app/paint/gimpsmudgeoptions.c:84 +msgctxt "smudge-tool" +msgid "No erasing effect" +msgstr "没有擦除效果" + +#: ../app/paint/gimpsourcecore.c:239 msgid "Set a source image first." msgstr "先设置源图像。" +#: ../app/paint/gimpsourceoptions.c:63 ../app/tools/gimpcloneoptions-gui.c:102 +#: ../app/tools/gimphealtool.c:105 +msgid "Alignment" +msgstr "对齐方式" + +#: ../app/paint/gimpsourceoptions.c:71 ../app/pdb/gimppdbcontext.c:128 +#: ../app/tools/gimpbucketfilloptions.c:117 ../app/tools/gimpcoloroptions.c:69 +#: ../app/tools/gimphealtool.c:99 ../app/tools/gimpregionselectoptions.c:97 +msgid "Sample merged" +msgstr "位样合并" + #: ../app/paint/paint-enums.c:52 msgctxt "perspective-clone-mode" msgid "Modify Perspective" @@ -11149,119 +18455,116 @@ msgstr "已记录" #: ../app/paint/paint-enums.c:86 msgctxt "source-align-mode" msgid "Fixed" -msgstr "固定" +msgstr "已固定" -#: ../app/paint/paint-enums.c:114 -msgctxt "convolve-type" -msgid "Blur" -msgstr "模糊" - -#: ../app/paint/paint-enums.c:115 -msgctxt "convolve-type" -msgid "Sharpen" -msgstr "锐化" - -#: ../app/paint/paint-enums.c:144 -#, fuzzy -msgctxt "ink-blob-type" -msgid "Circle" -msgstr "圆" - -#: ../app/paint/paint-enums.c:145 -#, fuzzy -msgctxt "ink-blob-type" -msgid "Square" -msgstr "正方" - -#: ../app/paint/paint-enums.c:146 -#, fuzzy -msgctxt "ink-blob-type" -msgid "Diamond" -msgstr "菱形" - -#: ../app/pdb/channel-cmds.c:188 +#: ../app/pdb/channel-cmds.c:198 msgid "Combine Masks" msgstr "组合蒙版" -#: ../app/pdb/color-cmds.c:83 +#: ../app/pdb/color-cmds.c:85 ../app/pdb/drawable-color-cmds.c:85 msgctxt "undo-type" msgid "Brightness-Contrast" msgstr "亮度-对比度" -#: ../app/pdb/color-cmds.c:142 -#, fuzzy +#: ../app/pdb/color-cmds.c:148 ../app/pdb/drawable-color-cmds.c:610 msgctxt "undo-type" msgid "Levels" msgstr "色阶" -#: ../app/pdb/color-cmds.c:236 ../app/tools/gimpposterizetool.c:78 +#: ../app/pdb/color-cmds.c:247 ../app/pdb/drawable-color-cmds.c:680 +msgctxt "undo-type" msgid "Posterize" -msgstr "色调分离" +msgstr "色相分离" -#: ../app/pdb/color-cmds.c:273 ../app/pdb/color-cmds.c:312 -#: ../app/tools/gimpdesaturatetool.c:74 +#: ../app/pdb/color-cmds.c:286 ../app/pdb/color-cmds.c:327 +#: ../app/pdb/drawable-color-cmds.c:325 +msgctxt "undo-type" msgid "Desaturate" msgstr "去色" -#: ../app/pdb/color-cmds.c:418 ../app/pdb/color-cmds.c:464 +#: ../app/pdb/color-cmds.c:389 +msgid "Invert" +msgstr "反转" + +#: ../app/pdb/color-cmds.c:436 ../app/pdb/color-cmds.c:484 +#: ../app/pdb/drawable-color-cmds.c:235 ../app/pdb/drawable-color-cmds.c:283 msgctxt "undo-type" msgid "Curves" msgstr "曲线" -#: ../app/pdb/color-cmds.c:517 +#: ../app/pdb/color-cmds.c:538 ../app/pdb/drawable-color-cmds.c:139 msgctxt "undo-type" msgid "Color Balance" msgstr "色彩平衡" -#: ../app/pdb/color-cmds.c:562 +#: ../app/pdb/color-cmds.c:586 ../app/pdb/drawable-color-cmds.c:187 msgctxt "undo-type" msgid "Colorize" msgstr "单色化" -#: ../app/pdb/color-cmds.c:685 ../app/tools/gimphuesaturationtool.c:97 +#: ../app/pdb/color-cmds.c:738 msgid "Hue-Saturation" -msgstr "色调-饱和度" +msgstr "色相-饱和度" -#: ../app/pdb/color-cmds.c:726 ../app/tools/gimpblendoptions.c:276 -#: ../app/tools/gimpbucketfilloptions.c:286 -#: ../app/tools/gimpregionselectoptions.c:217 -#: ../app/tools/gimpthresholdtool.c:87 +#: ../app/pdb/color-cmds.c:782 ../app/pdb/drawable-color-cmds.c:726 +msgctxt "undo-type" msgid "Threshold" -msgstr "阈值" +msgstr "阀值" -#: ../app/pdb/drawable-cmds.c:520 -msgid "Plug-In" +#: ../app/pdb/drawable-cmds.c:524 +msgid "Plug-in" msgstr "插件" -#: ../app/pdb/drawable-transform-cmds.c:349 -#: ../app/pdb/drawable-transform-cmds.c:447 -#: ../app/pdb/item-transform-cmds.c:266 ../app/pdb/transform-tools-cmds.c:167 -#: ../app/tools/gimpperspectivetool.c:82 +#: ../app/pdb/drawable-cmds.c:963 ../app/tools/gimpforegroundselecttool.c:993 +msgctxt "command" +msgid "Foreground Select" +msgstr "前景选择" + +#: ../app/pdb/drawable-color-cmds.c:507 +msgctxt "undo-type" +msgid "Hue-Saturation" +msgstr "色相-饱和度" + +#: ../app/pdb/drawable-color-cmds.c:542 +msgctxt "undo-type" +msgid "Invert" +msgstr "反相" + +#: ../app/pdb/drawable-transform-cmds.c:355 +#: ../app/pdb/drawable-transform-cmds.c:455 +#: ../app/pdb/item-transform-cmds.c:270 ../app/pdb/transform-tools-cmds.c:171 +#: ../app/tools/gimpperspectivetool.c:85 +#: ../app/tools/gimptransformoptions.c:552 +#: ../app/tools/gimptransformoptions.c:561 msgid "Perspective" msgstr "透视" -#: ../app/pdb/drawable-transform-cmds.c:961 -#: ../app/pdb/drawable-transform-cmds.c:1046 -#: ../app/pdb/item-transform-cmds.c:615 ../app/pdb/transform-tools-cmds.c:422 -#: ../app/tools/gimpsheartool.c:113 +#: ../app/pdb/drawable-transform-cmds.c:977 +#: ../app/pdb/drawable-transform-cmds.c:1064 +#: ../app/pdb/item-transform-cmds.c:621 ../app/pdb/transform-tools-cmds.c:432 +#: ../app/tools/gimpsheartool.c:119 msgid "Shearing" msgstr "切变" -#: ../app/pdb/drawable-transform-cmds.c:1142 -#: ../app/pdb/item-transform-cmds.c:713 ../app/pdb/transform-tools-cmds.c:511 +#: ../app/pdb/drawable-transform-cmds.c:1161 +#: ../app/pdb/item-transform-cmds.c:719 ../app/pdb/transform-tools-cmds.c:523 msgid "2D Transform" msgstr "2D 变换" -#: ../app/pdb/drawable-transform-cmds.c:1238 -#: ../app/pdb/drawable-transform-cmds.c:1342 -#: ../app/pdb/drawable-transform-cmds.c:1446 -#: ../app/pdb/item-transform-cmds.c:819 +#: ../app/pdb/drawable-transform-cmds.c:1259 +#: ../app/pdb/drawable-transform-cmds.c:1364 +#: ../app/pdb/drawable-transform-cmds.c:1470 +#: ../app/pdb/item-transform-cmds.c:825 msgid "2D Transforming" msgstr "2D 变换" +#: ../app/pdb/edit-cmds.c:797 +msgid "Blending" +msgstr "混合" + #: ../app/pdb/floating-sel-cmds.c:69 msgid "Cannot remove this layer because it is not a floating selection." -msgstr "无法固定此图层，因为它不是一个浮动选区。" +msgstr "无法移动此图层，因为它不是一个浮动选区。" #: ../app/pdb/floating-sel-cmds.c:102 msgid "Cannot anchor this layer because it is not a floating selection." @@ -11271,231 +18574,336 @@ msgstr "无法固定此图层，因为它不是一个浮动选区。" msgid "" "Cannot convert this layer to a normal layer because it is not a floating " "selection." -msgstr "无法固定此图层，因为它不是一个浮动选区。" +msgstr "无法转化此图层为普通图层，因为它不是一个浮动选区。" -#: ../app/pdb/gimppdb.c:305 ../app/pdb/gimppdb.c:376 -#: ../app/pdb/gimppdb-query.c:299 +#: ../app/pdb/gimppdb-query.c:140 +#, c-format +msgid "Writing PDB file '%s' failed: %s" +msgstr "写入 PDB 文件“%s”失败：%s" + +#: ../app/pdb/gimppdb-query.c:315 ../app/pdb/gimppdb.c:306 +#: ../app/pdb/gimppdb.c:377 #, c-format msgid "Procedure '%s' not found" msgstr "“%s”过程未找到" -#: ../app/pdb/gimppdb.c:411 -#, c-format -msgid "" -"Procedure '%s' has been called with a wrong type for argument #%d. Expected " -"%s, got %s." -msgstr "调用“%s”过程使用了错误的值类型用于参数 #%d。需要 %s，但获得 %s。" - -#: ../app/pdb/gimppdbcontext.c:89 -#: ../app/tools/gimpforegroundselectoptions.c:80 -#: ../app/tools/gimpselectionoptions.c:79 -msgid "Smooth edges" -msgstr "边缘平滑" - -#: ../app/pdb/gimppdb-utils.c:73 +#: ../app/pdb/gimppdb-utils.c:76 msgid "Invalid empty brush name" -msgstr "无效的画笔名称" +msgstr "无效的空笔刷名字" -#: ../app/pdb/gimppdb-utils.c:82 +#: ../app/pdb/gimppdb-utils.c:85 #, c-format msgid "Brush '%s' not found" -msgstr "“%s”画笔未找到" +msgstr "“%s”笔刷未找到" -#: ../app/pdb/gimppdb-utils.c:87 +#: ../app/pdb/gimppdb-utils.c:91 #, c-format msgid "Brush '%s' is not editable" -msgstr "“%s”画笔不可编辑" +msgstr "“%s”笔刷不可编辑" -#: ../app/pdb/gimppdb-utils.c:113 +#: ../app/pdb/gimppdb-utils.c:98 +#, c-format +msgid "Brush '%s' is not renamable" +msgstr "“%s”笔刷不可重命名" + +#: ../app/pdb/gimppdb-utils.c:124 #, c-format msgid "Brush '%s' is not a generated brush" -msgstr "“%s”不是一个被生成的画笔" +msgstr "“%s”不是一个被生成的笔刷" -#: ../app/pdb/gimppdb-utils.c:134 -#, fuzzy +#: ../app/pdb/gimppdb-utils.c:145 msgid "Invalid empty paint dynamics name" -msgstr "无效的绘图方式" +msgstr "无效的空动态绘画名字" -#: ../app/pdb/gimppdb-utils.c:143 -#, fuzzy, c-format +#: ../app/pdb/gimppdb-utils.c:154 +#, c-format msgid "Paint dynamics '%s' not found" -msgstr "“%s”图案未找到" +msgstr "动态绘画“%s”未找到" -#: ../app/pdb/gimppdb-utils.c:148 -#, fuzzy, c-format +#: ../app/pdb/gimppdb-utils.c:160 +#, c-format msgid "Paint dynamics '%s' is not editable" -msgstr "“%s”渐变不可编辑" +msgstr "动态绘画“%s”不可编辑" -#: ../app/pdb/gimppdb-utils.c:168 +#: ../app/pdb/gimppdb-utils.c:167 +#, c-format +msgid "Paint dynamics '%s' is not renamable" +msgstr "动态绘画“%s”不可重命名" + +#: ../app/pdb/gimppdb-utils.c:188 +msgid "Invalid empty MyPaint brush name" +msgstr "无效的空 MyPaint 笔刷名字" + +#: ../app/pdb/gimppdb-utils.c:197 +#, c-format +msgid "MyPaint brush '%s' not found" +msgstr "“%s” MyPaint 笔刷未找到" + +#: ../app/pdb/gimppdb-utils.c:203 +#, c-format +msgid "MyPaint brush '%s' is not editable" +msgstr "“%s” MyPaint 笔刷不可编辑" + +#: ../app/pdb/gimppdb-utils.c:210 +#, c-format +msgid "MyPaint brush '%s' is not renamable" +msgstr "“%s” MyPaint 笔刷不可重命名" + +#: ../app/pdb/gimppdb-utils.c:230 msgid "Invalid empty pattern name" -msgstr "无效的纹理名称" +msgstr "无效的空图案名字" -#: ../app/pdb/gimppdb-utils.c:177 +#: ../app/pdb/gimppdb-utils.c:239 #, c-format msgid "Pattern '%s' not found" msgstr "“%s”图案未找到" -#: ../app/pdb/gimppdb-utils.c:197 +#: ../app/pdb/gimppdb-utils.c:259 msgid "Invalid empty gradient name" -msgstr "无效的空渐变名称" +msgstr "无效的空渐变名字" -#: ../app/pdb/gimppdb-utils.c:206 +#: ../app/pdb/gimppdb-utils.c:268 #, c-format msgid "Gradient '%s' not found" msgstr "“%s”渐变未找到" -#: ../app/pdb/gimppdb-utils.c:211 +#: ../app/pdb/gimppdb-utils.c:274 #, c-format msgid "Gradient '%s' is not editable" msgstr "“%s”渐变不可编辑" -#: ../app/pdb/gimppdb-utils.c:232 -msgid "Invalid empty palette name" -msgstr "无效的空色版名称" +#: ../app/pdb/gimppdb-utils.c:281 +#, c-format +msgid "Gradient '%s' is not renamable" +msgstr "“%s”渐变不可重命名" -#: ../app/pdb/gimppdb-utils.c:241 +#: ../app/pdb/gimppdb-utils.c:302 +msgid "Invalid empty palette name" +msgstr "无效的空色版名字" + +#: ../app/pdb/gimppdb-utils.c:311 #, c-format msgid "Palette '%s' not found" msgstr "“%s”色板未找到" -#: ../app/pdb/gimppdb-utils.c:246 +#: ../app/pdb/gimppdb-utils.c:317 #, c-format msgid "Palette '%s' is not editable" msgstr "“%s”色板不可编辑" -#: ../app/pdb/gimppdb-utils.c:266 -msgid "Invalid empty font name" -msgstr "无效的字体名称" +#: ../app/pdb/gimppdb-utils.c:324 +#, c-format +msgid "Palette '%s' is not renamable" +msgstr "“%s”色板不可重命名" -#: ../app/pdb/gimppdb-utils.c:276 +#: ../app/pdb/gimppdb-utils.c:344 +msgid "Invalid empty font name" +msgstr "无效的空字体名字" + +#: ../app/pdb/gimppdb-utils.c:354 #, c-format msgid "Font '%s' not found" msgstr "“%s”字体未找到" -#: ../app/pdb/gimppdb-utils.c:295 +#: ../app/pdb/gimppdb-utils.c:373 msgid "Invalid empty buffer name" -msgstr "无效的缓存库名称" +msgstr "无效的空缓冲区名字" -#: ../app/pdb/gimppdb-utils.c:305 +#: ../app/pdb/gimppdb-utils.c:383 #, c-format msgid "Named buffer '%s' not found" -msgstr "“%s”缓存库没找到" +msgstr "“%s”缓冲区未找到" -#: ../app/pdb/gimppdb-utils.c:324 +#: ../app/pdb/gimppdb-utils.c:402 msgid "Invalid empty paint method name" -msgstr "无效的绘图方式" +msgstr "无效的空绘图方式名字" -#: ../app/pdb/gimppdb-utils.c:334 +#: ../app/pdb/gimppdb-utils.c:412 #, c-format msgid "Paint method '%s' does not exist" msgstr "“%s”绘图方式不存在" -#: ../app/pdb/gimppdb-utils.c:353 +#: ../app/pdb/gimppdb-utils.c:431 #, c-format msgid "Item '%s' (%d) cannot be used because it has not been added to an image" -msgstr "“%s”(%d)项不可用，因为它未被添加至图像" +msgstr "“%s” (%d) 项不可用，因为它未被添加至图像" -#: ../app/pdb/gimppdb-utils.c:363 +#: ../app/pdb/gimppdb-utils.c:441 #, c-format msgid "Item '%s' (%d) cannot be used because it is attached to another image" -msgstr "“%s”(%d)项不可用，因为它被关联至另一图像" +msgstr "“%s” (%d) 项不可用，因为它被关联至另一图像" -#: ../app/pdb/gimppdb-utils.c:392 +#: ../app/pdb/gimppdb-utils.c:467 #, c-format msgid "" "Item '%s' (%d) cannot be used because it is not a direct child of an item " "tree" -msgstr "“%s”(%d)项不可用，因为它不是项目树的直接子项" +msgstr "“%s” (%d) 项不可用，因为它不是项目树的直接子项" -#: ../app/pdb/gimppdb-utils.c:420 +#: ../app/pdb/gimppdb-utils.c:495 #, c-format msgid "" "Items '%s' (%d) and '%s' (%d) cannot be used because they are not part of " "the same item tree" -msgstr "“%s”(%d)和“%s”(%d)项不可用，因为它们不属于相同的项目树" +msgstr "“%s” (%d) 和“%s” (%d) 项不可用，因为它们不属于相同的项目树" -#: ../app/pdb/gimppdb-utils.c:445 +#: ../app/pdb/gimppdb-utils.c:520 #, c-format msgid "Item '%s' (%d) must not be an ancestor of '%s' (%d)" -msgstr "“%s”(%d)项不能是“%s”(%d)的祖先" +msgstr "“%s” (%d) 项不能是“%s” (%d) 的祖先" -#: ../app/pdb/gimppdb-utils.c:469 +#: ../app/pdb/gimppdb-utils.c:544 #, c-format msgid "Item '%s' (%d) has already been added to an image" -msgstr "“%s”(%d)已被添加至图像" +msgstr "“%s” (%d) 已被添加至图像" -#: ../app/pdb/gimppdb-utils.c:477 +#: ../app/pdb/gimppdb-utils.c:552 #, c-format msgid "Trying to add item '%s' (%d) to wrong image" -msgstr "试图添加“%s”(%d)到错误的图像" +msgstr "试图添加“%s” (%d) 到错误的图像" -#: ../app/pdb/gimppdb-utils.c:496 +#: ../app/pdb/gimppdb-utils.c:572 #, c-format msgid "Item '%s' (%d) cannot be modified because its contents are locked" -msgstr "“%s”(%d)不能被修改，因为它的内容被锁定" +msgstr "“%s” (%d) 不能被修改，因为它的内容被锁定" -#: ../app/pdb/gimppdb-utils.c:516 +#: ../app/pdb/gimppdb-utils.c:582 +#, c-format +msgid "" +"Item '%s' (%d) cannot be modified because its position and size are locked" +msgstr "“%s” (%d) 不能被修改，因为它的位置和大小被锁定" + +#: ../app/pdb/gimppdb-utils.c:602 #, c-format msgid "Item '%s' (%d) cannot be used because it is not a group item" -msgstr "“%s”(%d)项不能被使用，因为它不是群组项目" +msgstr "“%s” (%d) 项不能被使用，因为它不是群组项目" -#: ../app/pdb/gimppdb-utils.c:536 +#: ../app/pdb/gimppdb-utils.c:622 #, c-format msgid "Item '%s' (%d) cannot be modified because it is a group item" -msgstr "“%s”(%d)项不能被修改，因为它是群组项目" +msgstr "“%s” (%d) 项不能被修改，因为它是群组项目" -#: ../app/pdb/gimppdb-utils.c:557 +#: ../app/pdb/gimppdb-utils.c:643 #, c-format msgid "Layer '%s' (%d) cannot be used because it is not a text layer" -msgstr "“%s”(%d)图层不能被使用，因为它不是一个文字图层" +msgstr "“%s” (%d) 图层不能被使用，因为它不是一个文字图层" -#: ../app/pdb/gimppdb-utils.c:598 +#: ../app/pdb/gimppdb-utils.c:684 #, c-format msgid "Image '%s' (%d) is of type '%s', but an image of type '%s' is expected" -msgstr "“%s”(%d)图像是“%s”类，并非预计的“%s”类" +msgstr "“%s” (%d) 图像是“%s”类，并非预计的“%s”类" -#: ../app/pdb/gimppdb-utils.c:621 -#, fuzzy, c-format +#: ../app/pdb/gimppdb-utils.c:707 +#, c-format msgid "Image '%s' (%d) must not be of type '%s'" -msgstr "“%s”(%d)图像已经是“%s”类" +msgstr "“%s”(%d) 图像必须是“%s”类" -#: ../app/pdb/gimppdb-utils.c:641 -#, fuzzy, c-format +#: ../app/pdb/gimppdb-utils.c:727 +#, c-format msgid "" "Image '%s' (%d) has precision '%s', but an image of precision '%s' is " "expected" -msgstr "“%s”(%d)图像是“%s”类，并非预计的“%s”类" +msgstr "“%s”(%d) 图像拥有精度“%s”而不是预计的精度“%s”" -#: ../app/pdb/gimppdb-utils.c:664 -#, fuzzy, c-format +#: ../app/pdb/gimppdb-utils.c:750 +#, c-format msgid "Image '%s' (%d) must not be of precision '%s'" -msgstr "“%s”(%d)图像已经是“%s”类" +msgstr "“%s” (%d) 图像必须拥有精度“%s”" -#: ../app/pdb/gimppdb-utils.c:692 +#: ../app/pdb/gimppdb-utils.c:774 ../app/pdb/image-guides-cmds.c:179 +#, c-format +msgid "Image '%s' (%d) does not contain guide with ID %d" +msgstr "“%s” (%d) 图像没有包含 ID 为 %d 的参考线" + +#: ../app/pdb/gimppdb-utils.c:797 ../app/pdb/image-sample-points-cmds.c:144 +#, c-format +msgid "Image '%s' (%d) does not contain sample point with ID %d" +msgstr "“%s” (%d) 图像没有包含 ID 为 %d 的采样点" + +#: ../app/pdb/gimppdb-utils.c:825 #, c-format msgid "Vectors object %d does not contain stroke with ID %d" -msgstr "矢量对象“%d”不包括ID为“%d”的笔画" +msgstr "矢量对象 %d 不包括 ID 为 %d 的笔廓" -#: ../app/pdb/gimpprocedure.c:375 ../app/plug-in/gimppluginprocframe.c:212 +#: ../app/pdb/gimppdb.c:412 +#, c-format +msgid "" +"Procedure '%s' has been called with a wrong type for argument #%d. Expected " +"%s, got %s." +msgstr "调用“%s”过程使用了错误类型的参数 #%d。需要 %s，但获得了 %s。" + +#: ../app/pdb/gimppdbcontext.c:101 ../app/tools/gimpselectionoptions.c:81 +msgid "Smooth edges" +msgstr "平滑边缘" + +#: ../app/pdb/gimppdbcontext.c:107 +msgid "Feather" +msgstr "羽化" + +#: ../app/pdb/gimppdbcontext.c:114 +msgid "Feather radius X" +msgstr "羽化半径 X" + +#: ../app/pdb/gimppdbcontext.c:121 +msgid "Feather radius Y" +msgstr "羽化半径 Y" + +#: ../app/pdb/gimppdbcontext.c:135 +msgid "Sample criterion" +msgstr "采样标准" + +#: ../app/pdb/gimppdbcontext.c:143 +msgid "Sample threshold" +msgstr "采样阈值" + +#: ../app/pdb/gimppdbcontext.c:150 +msgid "Sample transparent" +msgstr "采样透明" + +#: ../app/pdb/gimppdbcontext.c:157 ../app/tools/gimpbucketfilloptions.c:124 +#: ../app/tools/gimpregionselectoptions.c:104 +msgid "Diagonal neighbors" +msgstr "对角邻居" + +#: ../app/pdb/gimppdbcontext.c:164 ../app/tools/gimptransformoptions.c:124 +#: ../app/tools/gimptransformoptions.c:440 ../app/tools/gimpwarpoptions.c:119 +#: ../app/tools/gimpwarpoptions.c:322 +msgid "Interpolation" +msgstr "插值" + +#: ../app/pdb/gimppdbcontext.c:172 +msgid "Transform direction" +msgstr "变换方向" + +#: ../app/pdb/gimppdbcontext.c:180 +msgid "Transform resize" +msgstr "变换大小" + +#: ../app/pdb/gimppdbcontext.c:195 +msgid "Distance metric" +msgstr "距离单位" + +#: ../app/pdb/gimpprocedure.c:467 ../app/plug-in/gimppluginprocframe.c:191 #, c-format msgid "Procedure '%s' returned no return values" msgstr "“%s”过程无返回值" -#: ../app/pdb/gimpprocedure.c:645 +#: ../app/pdb/gimpprocedure.c:743 #, c-format msgid "" "Procedure '%s' returned a wrong value type for return value '%s' (#%d). " "Expected %s, got %s." -msgstr "“%s”过程返回了错误的值类型用于返回值“%s”(#%d)。需要 %s，但获得 %s。" +msgstr "“%s”过程返回了错误的值类型用于返回值“%s” (#%d) 。需要 %s，但获得 %s。" -#: ../app/pdb/gimpprocedure.c:657 +#: ../app/pdb/gimpprocedure.c:755 #, c-format msgid "" "Procedure '%s' has been called with a wrong value type for argument '%s' (#" "%d). Expected %s, got %s." -msgstr "调用“%s”过程使用了错误的值类型用于参数“%s”(#%d)。需要 %s，但获得 %s。" +msgstr "" +"调用“%s”过程使用了错误的值类型用于参数“%s” (#%d) 。需要 %s，但获得 %s。" -#: ../app/pdb/gimpprocedure.c:690 +#: ../app/pdb/gimpprocedure.c:788 #, c-format msgid "" "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" @@ -11504,7 +18912,7 @@ msgstr "" "“%s”过程对于“%s”参数返回了无效的 ID。很有可能是插件正在试图操作一个已不再存在" "的图层。" -#: ../app/pdb/gimpprocedure.c:703 +#: ../app/pdb/gimpprocedure.c:801 #, c-format msgid "" "Procedure '%s' has been called with an invalid ID for argument '%s'. Most " @@ -11513,7 +18921,7 @@ msgstr "" "调用“%s”过程使用了无效的 ID 用于“%s”参数。很有可能是插件正在试图操作一个已不" "再存在的图层。" -#: ../app/pdb/gimpprocedure.c:720 +#: ../app/pdb/gimpprocedure.c:818 #, c-format msgid "" "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" @@ -11522,7 +18930,7 @@ msgstr "" "“%s”过程返回了无效的 ID 用于“%s”参数。很有可能是插件正在试图操作一个已不再存" "在的图像。" -#: ../app/pdb/gimpprocedure.c:733 +#: ../app/pdb/gimpprocedure.c:831 #, c-format msgid "" "Procedure '%s' has been called with an invalid ID for argument '%s'. Most " @@ -11531,67 +18939,326 @@ msgstr "" "调用“%s”过程使用了无效的 ID 用于“%s”参数。很有可能是插件正在试图操作一个已不" "再存在的图像。" -#: ../app/pdb/gimpprocedure.c:754 +#: ../app/pdb/gimpprocedure.c:852 #, c-format msgid "" "Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value " "is out of range." msgstr "“%s”过程返回了“%s”作为返回值“%s”(#%d，%s 类型)。此值超出范围。" -#: ../app/pdb/gimpprocedure.c:768 +#: ../app/pdb/gimpprocedure.c:866 #, c-format msgid "" "Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type " "%s). This value is out of range." msgstr "“%s”过程使用了“%s”值用于“%s”参数(#%d，%s 类型)。此值超出范围。" -#: ../app/pdb/image-cmds.c:2445 +#: ../app/pdb/image-cmds.c:2339 msgid "" "Image resolution is out of bounds, using the default resolution instead." msgstr "图像分辨率超出范围，使用默认的分辨率替代。" -#: ../app/pdb/image-select-cmds.c:301 ../app/pdb/selection-tools-cmds.c:223 -#: ../app/tools/gimpfreeselecttool.c:196 +#: ../app/pdb/image-select-cmds.c:302 ../app/pdb/selection-tools-cmds.c:223 +#: ../app/tools/gimpfreeselecttool.c:128 msgid "Free Select" msgstr "自由选择" -#: ../app/pdb/layer-cmds.c:488 ../app/pdb/layer-cmds.c:526 -msgid "Move Layer" -msgstr "移动图层" +#: ../app/pdb/plug-in-compat-cmds.c:241 +msgctxt "undo-type" +msgid "Bump Map" +msgstr "凹凸贴图" -#: ../app/pdb/plug-in-compat-cmds.c:80 -#, fuzzy +#: ../app/pdb/plug-in-compat-cmds.c:313 +msgctxt "undo-type" +msgid "Displace" +msgstr "位移" + +#: ../app/pdb/plug-in-compat-cmds.c:347 +msgctxt "undo-type" +msgid "Gaussian Blur" +msgstr "高斯模糊" + +#: ../app/pdb/plug-in-compat-cmds.c:412 +msgctxt "undo-type" +msgid "Alien Map" +msgstr "奇异映射" + +#: ../app/pdb/plug-in-compat-cmds.c:449 +msgctxt "undo-type" +msgid "Antialias" +msgstr "抗锯齿" + +#: ../app/pdb/plug-in-compat-cmds.c:492 +msgctxt "undo-type" +msgid "Apply Canvas" +msgstr "应用画布" + +#: ../app/pdb/plug-in-compat-cmds.c:552 +msgctxt "undo-type" +msgid "Apply Lens" +msgstr "应用镜头" + +#: ../app/pdb/plug-in-compat-cmds.c:598 +msgid "Autocrop image" +msgstr "自动剪裁图像" + +#: ../app/pdb/plug-in-compat-cmds.c:660 +msgid "Autocrop layer" +msgstr "自动裁剪图层" + +#: ../app/pdb/plug-in-compat-cmds.c:707 +msgctxt "undo-type" +msgid "Stretch Contrast HSV" +msgstr "拉伸对比度 HSV" + +#: ../app/pdb/plug-in-compat-cmds.c:861 +msgctxt "undo-type" +msgid "Stretch Contrast" +msgstr "拉伸对比度" + +#: ../app/pdb/plug-in-compat-cmds.c:940 +msgctxt "undo-type" +msgid "Channel Mixer" +msgstr "通道混合器" + +#: ../app/pdb/plug-in-compat-cmds.c:984 msgctxt "undo-type" msgid "Color to Alpha" -msgstr "添加颜色到颜色表" +msgstr "色彩转到透明度" -#: ../app/pdb/plug-in-compat-cmds.c:121 ../app/pdb/plug-in-compat-cmds.c:164 -#, fuzzy +#: ../app/pdb/plug-in-compat-cmds.c:1030 +#, c-format +msgid "Array 'matrix' has only %d members, must have 25" +msgstr "数组“矩阵”仅拥有 %d 个成员，必须有 25 个" + +#: ../app/pdb/plug-in-compat-cmds.c:1038 +#, c-format +msgid "Array 'channels' has only %d members, must have 5" +msgstr "数组“通道”仅拥有 %d 个成员，必须有 5 个" + +#: ../app/pdb/plug-in-compat-cmds.c:1110 +msgctxt "undo-type" +msgid "Convolution Matrix" +msgstr "卷积矩阵" + +#: ../app/pdb/plug-in-compat-cmds.c:1172 +msgctxt "undo-type" +msgid "Cubism" +msgstr "立体主义" + +#: ../app/pdb/plug-in-compat-cmds.c:1217 +msgctxt "undo-type" +msgid "Deinterlace" +msgstr "取消隔行扫描" + +#: ../app/pdb/plug-in-compat-cmds.c:1296 +msgctxt "undo-type" +msgid "Diffraction Patterns" +msgstr "衍射图案" + +#: ../app/pdb/plug-in-compat-cmds.c:1455 +msgctxt "undo-type" +msgid "Edge" +msgstr "描边" + +#: ../app/pdb/plug-in-compat-cmds.c:1499 +msgctxt "undo-type" +msgid "Engrave" +msgstr "雕刻" + +#: ../app/pdb/plug-in-compat-cmds.c:1572 +msgctxt "undo-type" +msgid "Color Exchange" +msgstr "颜色交换" + +#: ../app/pdb/plug-in-compat-cmds.c:1620 +msgctxt "undo-type" +msgid "Lens Flare" +msgstr "镜头光晕" + +#: ../app/pdb/plug-in-compat-cmds.c:1804 +msgctxt "undo-type" +msgid "Glass Tile" +msgstr "玻璃瓷片" + +#: ../app/pdb/plug-in-compat-cmds.c:1857 +msgctxt "undo-type" +msgid "Noise HSV" +msgstr "噪点 HSV" + +#: ../app/pdb/plug-in-compat-cmds.c:2136 ../app/pdb/plug-in-compat-cmds.c:2191 +msgid "Set color profile" +msgstr "设置色彩配置文件" + +#: ../app/pdb/plug-in-compat-cmds.c:2246 +msgctxt "undo-type" +msgid "Illusion" +msgstr "幻想" + +#: ../app/pdb/plug-in-compat-cmds.c:2283 +msgctxt "undo-type" +msgid "Laplace" +msgstr "拉普拉斯" + +#: ../app/pdb/plug-in-compat-cmds.c:2359 +msgctxt "undo-type" +msgid "Lens Distortion" +msgstr "镜头变形" + +#: ../app/pdb/plug-in-compat-cmds.c:2399 +msgctxt "undo-type" +msgid "Tile Seamless" +msgstr "无缝瓷片" + +#: ../app/pdb/plug-in-compat-cmds.c:2466 +msgctxt "undo-type" +msgid "Maze" +msgstr "迷宫" + +#: ../app/pdb/plug-in-compat-cmds.c:2549 ../app/pdb/plug-in-compat-cmds.c:2633 +msgctxt "undo-type" +msgid "Motion Blur" +msgstr "运动模糊" + +#: ../app/pdb/plug-in-compat-cmds.c:2734 +msgctxt "undo-type" +msgid "Mosaic" +msgstr "马赛克" + +#: ../app/pdb/plug-in-compat-cmds.c:2796 +msgctxt "undo-type" +msgid "Supernova" +msgstr "超新星" + +#: ../app/pdb/plug-in-compat-cmds.c:2886 +msgctxt "undo-type" +msgid "Paper Tile" +msgstr "纸质瓷片" + +#: ../app/pdb/plug-in-compat-cmds.c:2927 ../app/pdb/plug-in-compat-cmds.c:2970 msgctxt "undo-type" msgid "Pixelize" -msgstr "像素" +msgstr "像素化" -#: ../app/pdb/plug-in-compat-cmds.c:216 +#: ../app/pdb/plug-in-compat-cmds.c:3021 +msgctxt "undo-type" +msgid "Plasma" +msgstr "等离子" + +#: ../app/pdb/plug-in-compat-cmds.c:3075 msgctxt "undo-type" msgid "Polar Coordinates" -msgstr "" +msgstr "极坐标" -#: ../app/pdb/plug-in-compat-cmds.c:260 +#: ../app/pdb/plug-in-compat-cmds.c:3115 +msgctxt "undo-type" +msgid "Red Eye Removal" +msgstr "去除红眼" + +#: ../app/pdb/plug-in-compat-cmds.c:3168 +msgctxt "undo-type" +msgid "Random Hurl" +msgstr "随机投掷" + +#: ../app/pdb/plug-in-compat-cmds.c:3221 +msgctxt "undo-type" +msgid "Random Pick" +msgstr "随机拾取" + +#: ../app/pdb/plug-in-compat-cmds.c:3274 +msgctxt "undo-type" +msgid "Random Slur" +msgstr "随机模糊" + +#: ../app/pdb/plug-in-compat-cmds.c:3349 +msgctxt "undo-type" +msgid "RGB Noise" +msgstr "RGB 噪点" + +#: ../app/pdb/plug-in-compat-cmds.c:3472 +msgctxt "undo-type" +msgid "Noisify" +msgstr "噪点化" + +#: ../app/pdb/plug-in-compat-cmds.c:3516 +msgctxt "undo-type" +msgid "Selective Gaussian Blur" +msgstr "选择性高斯模糊" + +#: ../app/pdb/plug-in-compat-cmds.c:3560 msgctxt "undo-type" msgid "Semi-Flatten" -msgstr "" +msgstr "半平整" -#: ../app/pdb/plug-in-compat-cmds.c:301 -#, fuzzy +#: ../app/pdb/plug-in-compat-cmds.c:3603 +msgctxt "undo-type" +msgid "Shift" +msgstr "偏移" + +#: ../app/pdb/plug-in-compat-cmds.c:3706 +msgctxt "undo-type" +msgid "Sinus" +msgstr "正弦" + +#: ../app/pdb/plug-in-compat-cmds.c:3754 +msgctxt "undo-type" +msgid "Sobel" +msgstr "索贝尔" + +#: ../app/pdb/plug-in-compat-cmds.c:3815 +msgctxt "undo-type" +msgid "Solid Noise" +msgstr "固态噪点" + +#: ../app/pdb/plug-in-compat-cmds.c:3859 +msgctxt "undo-type" +msgid "Spread" +msgstr "扩散" + +#: ../app/pdb/plug-in-compat-cmds.c:3900 msgctxt "undo-type" msgid "Threshold Alpha" -msgstr "阈值" +msgstr "临界透明" -#: ../app/pdb/plug-in-compat-cmds.c:338 -#, fuzzy +#: ../app/pdb/plug-in-compat-cmds.c:3946 +msgctxt "undo-type" +msgid "Video" +msgstr "视频" + +#: ../app/pdb/plug-in-compat-cmds.c:3983 msgctxt "undo-type" msgid "Value Invert" -msgstr "反转" +msgstr "值反转" + +#: ../app/pdb/plug-in-compat-cmds.c:4087 +msgctxt "undo-type" +msgid "Value Propagate" +msgstr "值增殖" + +#: ../app/pdb/plug-in-compat-cmds.c:4134 +msgctxt "undo-type" +msgid "Dilate" +msgstr "膨胀" + +#: ../app/pdb/plug-in-compat-cmds.c:4181 +msgctxt "undo-type" +msgid "Erode" +msgstr "腐蚀" + +#: ../app/pdb/plug-in-compat-cmds.c:4244 +msgctxt "undo-type" +msgid "Waves" +msgstr "水波" + +#: ../app/pdb/plug-in-compat-cmds.c:4292 +msgctxt "undo-type" +msgid "Whirl and Pinch" +msgstr "旋转和挤压" + +#: ../app/pdb/plug-in-compat-cmds.c:4344 +msgctxt "undo-type" +msgid "Wind" +msgstr "风" #: ../app/pdb/text-layer-cmds.c:95 #, c-format @@ -11609,61 +19276,61 @@ msgstr "创建文字图层失败" msgid "Set text layer attribute" msgstr "设定文字图层属性" -#: ../app/pdb/vectors-cmds.c:327 +#: ../app/pdb/vectors-cmds.c:328 msgid "Remove path stroke" -msgstr "删除路径笔划" +msgstr "删除路径笔廓" -#: ../app/pdb/vectors-cmds.c:363 +#: ../app/pdb/vectors-cmds.c:365 msgid "Close path stroke" -msgstr "闭合路径笔划" +msgstr "闭合路径笔廓" -#: ../app/pdb/vectors-cmds.c:403 +#: ../app/pdb/vectors-cmds.c:410 msgid "Translate path stroke" -msgstr "转换路径笔划" +msgstr "转换路径笔廓" -#: ../app/pdb/vectors-cmds.c:443 +#: ../app/pdb/vectors-cmds.c:455 msgid "Scale path stroke" -msgstr "缩放路径笔划" +msgstr "缩放路径笔廓" -#: ../app/pdb/vectors-cmds.c:485 +#: ../app/pdb/vectors-cmds.c:502 msgid "Rotate path stroke" -msgstr "旋转路径笔划" +msgstr "旋转路径笔廓" -#: ../app/pdb/vectors-cmds.c:525 ../app/pdb/vectors-cmds.c:569 +#: ../app/pdb/vectors-cmds.c:547 ../app/pdb/vectors-cmds.c:596 msgid "Flip path stroke" -msgstr "翻转路径笔划" +msgstr "翻转路径笔廓" -#: ../app/pdb/vectors-cmds.c:698 ../app/pdb/vectors-cmds.c:821 -#: ../app/pdb/vectors-cmds.c:1041 +#: ../app/pdb/vectors-cmds.c:727 ../app/pdb/vectors-cmds.c:851 +#: ../app/pdb/vectors-cmds.c:1081 msgid "Add path stroke" -msgstr "添加路径笔划" +msgstr "添加路径笔廓" -#: ../app/pdb/vectors-cmds.c:874 ../app/pdb/vectors-cmds.c:927 -#: ../app/pdb/vectors-cmds.c:988 +#: ../app/pdb/vectors-cmds.c:905 ../app/pdb/vectors-cmds.c:961 +#: ../app/pdb/vectors-cmds.c:1025 msgid "Extend path stroke" -msgstr "延伸路径笔划" +msgstr "扩展路径笔廓" -#: ../app/plug-in/gimpenvirontable.c:281 +#: ../app/plug-in/gimpenvirontable.c:329 #, c-format msgid "Empty variable name in environment file %s" msgstr "环境文件 %s 中含有空变量名" -#: ../app/plug-in/gimpenvirontable.c:299 +#: ../app/plug-in/gimpenvirontable.c:348 #, c-format msgid "Illegal variable name in environment file %s: %s" msgstr "环境文件 %s 中含有非法变量名：%s" -#: ../app/plug-in/gimpinterpreterdb.c:263 +#: ../app/plug-in/gimpinterpreterdb.c:296 #, c-format msgid "Bad interpreter referenced in interpreter file %s: %s" msgstr "解释器文件 %s 中引用的错误的解释器：%s" -#: ../app/plug-in/gimpinterpreterdb.c:322 +#: ../app/plug-in/gimpinterpreterdb.c:359 #, c-format msgid "Bad binary format string in interpreter file %s" msgstr "解释器文件 %s 中的错误的二进制格式串" -#: ../app/plug-in/gimpplugin.c:639 +#: ../app/plug-in/gimpplugin.c:622 #, c-format msgid "" "Plug-in crashed: \"%s\"\n" @@ -11678,42 +19345,7 @@ msgstr "" "已崩溃的插件可能破坏了 GIMP 的内部状态。您可能需要保存您的图片然后重新启动 " "GIMP 以确保稳妥。" -#: ../app/plug-in/gimppluginmanager.c:296 -msgid "Plug-In Interpreters" -msgstr "插件解释器" - -#: ../app/plug-in/gimppluginmanager.c:303 -msgid "Plug-In Environment" -msgstr "插件环境" - -#: ../app/plug-in/gimppluginmanager-call.c:171 -#: ../app/plug-in/gimppluginmanager-call.c:221 -#: ../app/plug-in/gimppluginmanager-call.c:319 -#, c-format -msgid "Failed to run plug-in \"%s\"" -msgstr "“%s”插件启用失败" - -#: ../app/plug-in/gimppluginmanager-restore.c:229 -msgid "Searching Plug-Ins" -msgstr "正在搜索插件" - -#: ../app/plug-in/gimppluginmanager-restore.c:284 -msgid "Resource configuration" -msgstr "资源配置" - -#: ../app/plug-in/gimppluginmanager-restore.c:320 -msgid "Querying new Plug-ins" -msgstr "正在查询新的插件" - -#: ../app/plug-in/gimppluginmanager-restore.c:370 -msgid "Initializing Plug-ins" -msgstr "正在初始化插件" - -#: ../app/plug-in/gimppluginmanager-restore.c:442 -msgid "Starting Extensions" -msgstr "正在启动扩展" - -#: ../app/plug-in/gimpplugin-message.c:485 +#: ../app/plug-in/gimpplugin-message.c:486 #, c-format msgid "" "Calling error for procedure '%s':\n" @@ -11722,7 +19354,7 @@ msgstr "" "“%s”过程调用错误：\n" "%s" -#: ../app/plug-in/gimpplugin-message.c:494 +#: ../app/plug-in/gimpplugin-message.c:495 #, c-format msgid "" "Execution error for procedure '%s':\n" @@ -11731,60 +19363,397 @@ msgstr "" "“%s”过程执行错误：\n" "%s" -#: ../app/plug-in/gimppluginprocedure.c:987 +#: ../app/plug-in/gimpplugin-progress.c:334 +msgid "Cancelled" +msgstr "已取消" + +#: ../app/plug-in/gimppluginmanager.c:230 +msgid "Plug-in Interpreters" +msgstr "插件解释器" + +#: ../app/plug-in/gimppluginmanager.c:236 +msgid "Plug-in Environment" +msgstr "插件环境" + +#: ../app/plug-in/gimppluginmanager-call.c:184 +#: ../app/plug-in/gimppluginmanager-call.c:235 +#: ../app/plug-in/gimppluginmanager-call.c:331 +#, c-format +msgid "Failed to run plug-in \"%s\"" +msgstr "“%s”插件启用失败" + +#: ../app/plug-in/gimppluginmanager-file-procedure.c:208 +msgid "Unknown file type" +msgstr "未知文件类型" + +#: ../app/plug-in/gimppluginmanager-restore.c:230 +msgid "Searching plug-ins" +msgstr "正在搜索插件" + +#: ../app/plug-in/gimppluginmanager-restore.c:395 +msgid "Resource configuration" +msgstr "资源配置" + +#: ../app/plug-in/gimppluginmanager-restore.c:431 +msgid "Querying new Plug-ins" +msgstr "正在查询新的插件" + +#: ../app/plug-in/gimppluginmanager-restore.c:482 +msgid "Initializing Plug-ins" +msgstr "正在初始化插件" + +#: ../app/plug-in/gimppluginmanager-restore.c:555 +msgid "Starting Extensions" +msgstr "正在启动扩展" + +#: ../app/plug-in/gimppluginprocedure.c:1172 #, c-format msgid "" "Calling error for '%s':\n" "%s" msgstr "" -"错误: '%s':\n" +"“%s”调用错误：\n" "%s" -#: ../app/plug-in/gimppluginprocedure.c:999 +#: ../app/plug-in/gimppluginprocedure.c:1184 #, c-format msgid "" "Execution error for '%s':\n" "%s" msgstr "" -"执行“%s”出错：\n" +"“%s”执行错误：\n" "%s" -#: ../app/plug-in/gimpplugin-progress.c:331 -msgid "Cancelled" -msgstr "已取消" - -#: ../app/plug-in/plug-in-icc-profile.c:114 -#: ../app/plug-in/plug-in-icc-profile.c:189 -#: ../app/plug-in/plug-in-icc-profile.c:248 -#, c-format -msgid "Error running '%s'" -msgstr "运行“%s”时出错" - -#: ../app/plug-in/plug-in-icc-profile.c:138 -#: ../app/plug-in/plug-in-icc-profile.c:199 -#: ../app/plug-in/plug-in-icc-profile.c:258 -#, c-format -msgid "Plug-In missing (%s)" -msgstr "插件缺失(%s)" - -#: ../app/plug-in/plug-in-rc.c:205 +#: ../app/plug-in/plug-in-rc.c:231 #, c-format msgid "Skipping '%s': wrong GIMP protocol version." msgstr "跳过“%s”：错误的 GIMP 协议版本。" -#: ../app/plug-in/plug-in-rc.c:477 +#: ../app/plug-in/plug-in-rc.c:238 +#, c-format +msgid "Skipping '%s': wrong pluginrc file format version." +msgstr "跳过“%s”：pluginrc 文件格式版本错误。" + +#: ../app/plug-in/plug-in-rc.c:510 #, c-format msgid "invalid value '%s' for icon type" msgstr "图标类型“%s”无效" -#: ../app/plug-in/plug-in-rc.c:492 +#: ../app/plug-in/plug-in-rc.c:525 #, c-format msgid "invalid value '%ld' for icon type" msgstr "图标类型“%ld”无效" +#: ../app/propgui/gimppropgui-channel-mixer.c:63 +msgid "Red channel" +msgstr "红色通道" + +#: ../app/propgui/gimppropgui-channel-mixer.c:87 +msgid "Green channel" +msgstr "绿色通道" + +#: ../app/propgui/gimppropgui-channel-mixer.c:111 +msgid "Blue channel" +msgstr "蓝色通道" + +#: ../app/propgui/gimppropgui-color-balance.c:98 +msgid "Select Range to Adjust" +msgstr "选择要调整的范围" + +#: ../app/propgui/gimppropgui-color-balance.c:103 +#: ../app/tools/gimplevelstool.c:247 +msgid "Adjust Color Levels" +msgstr "调整颜色色阶" + +#: ../app/propgui/gimppropgui-color-balance.c:119 +#: ../app/propgui/gimppropgui-hue-saturation.c:138 +msgid "Cyan" +msgstr "青色" + +#: ../app/propgui/gimppropgui-color-balance.c:119 +#: ../app/propgui/gimppropgui-hue-saturation.c:135 +msgid "Red" +msgstr "红色" + +#: ../app/propgui/gimppropgui-color-balance.c:123 +#: ../app/propgui/gimppropgui-hue-saturation.c:140 +msgid "Magenta" +msgstr "品红" + +#: ../app/propgui/gimppropgui-color-balance.c:123 +#: ../app/propgui/gimppropgui-hue-saturation.c:137 +msgid "Green" +msgstr "绿色" + +#: ../app/propgui/gimppropgui-color-balance.c:127 +#: ../app/propgui/gimppropgui-hue-saturation.c:136 +msgid "Yellow" +msgstr "黄色" + +#: ../app/propgui/gimppropgui-color-balance.c:127 +#: ../app/propgui/gimppropgui-hue-saturation.c:139 +msgid "Blue" +msgstr "蓝色" + +#: ../app/propgui/gimppropgui-color-balance.c:134 +msgid "R_eset Range" +msgstr "重置范围(_E)" + +#: ../app/propgui/gimppropgui-color-balance.c:144 +msgid "Preserve _luminosity" +msgstr "保持明度(_L)" + +#: ../app/propgui/gimppropgui-color-rotate.c:126 +msgid "Clockwise" +msgstr "顺时针" + +#: ../app/propgui/gimppropgui-color-rotate.c:130 +msgid "Invert Range" +msgstr "反转范围" + +#: ../app/propgui/gimppropgui-color-rotate.c:134 +msgid "Select All" +msgstr "全选" + +#: ../app/propgui/gimppropgui-color-rotate.c:214 +msgid "Source Range" +msgstr "源范围" + +#: ../app/propgui/gimppropgui-color-rotate.c:225 +msgid "Destination Range" +msgstr "目标范围" + +#: ../app/propgui/gimppropgui-color-rotate.c:236 +msgid "Gray Handling" +msgstr "灰色处理" + +#: ../app/propgui/gimppropgui-color-to-alpha.c:109 +msgid "Pick farthest full-transparency color" +msgstr "拾取最远的全透明颜色" + +#: ../app/propgui/gimppropgui-color-to-alpha.c:131 +msgid "Pick nearest full-opacity color" +msgstr "拾取最近的全不透明颜色" + +#: ../app/propgui/gimppropgui-convolution-matrix.c:202 +msgid "Rotate matrix 90° counter-clockwise" +msgstr "将矩阵逆时针旋转 90 度" + +#: ../app/propgui/gimppropgui-convolution-matrix.c:208 +msgid "Rotate matrix 90° clockwise" +msgstr "将矩阵顺时针旋转 90 度" + +#: ../app/propgui/gimppropgui-convolution-matrix.c:214 +msgid "Flip matrix horizontally" +msgstr "水平翻转矩阵" + +#: ../app/propgui/gimppropgui-convolution-matrix.c:220 +msgid "Flip matrix vertically" +msgstr "竖直翻转矩阵" + +#: ../app/propgui/gimppropgui-diffraction-patterns.c:68 +msgid "Frequencies" +msgstr "频率" + +#: ../app/propgui/gimppropgui-diffraction-patterns.c:79 +msgid "Contours" +msgstr "轮廓" + +#: ../app/propgui/gimppropgui-diffraction-patterns.c:90 +msgid "Sharp Edges" +msgstr "锐化边缘" + +#: ../app/propgui/gimppropgui-diffraction-patterns.c:101 +msgid "Other Options" +msgstr "其他选项" + +#: ../app/propgui/gimppropgui-generic.c:185 +msgid "Pick coordinates from the image" +msgstr "从图像中选取坐标" + +#: ../app/propgui/gimppropgui-hue-saturation.c:134 +msgid "M_aster" +msgstr "总值(_A)" + +#: ../app/propgui/gimppropgui-hue-saturation.c:134 +msgid "Adjust all colors" +msgstr "调整全部颜色" + +#: ../app/propgui/gimppropgui-hue-saturation.c:135 +msgid "_R" +msgstr "红色(_R)" + +#: ../app/propgui/gimppropgui-hue-saturation.c:136 +msgid "_Y" +msgstr "黄色(_Y)" + +#: ../app/propgui/gimppropgui-hue-saturation.c:137 +msgid "_G" +msgstr "绿色(_G)" + +#: ../app/propgui/gimppropgui-hue-saturation.c:138 +msgid "_C" +msgstr "青色(_C)" + +#: ../app/propgui/gimppropgui-hue-saturation.c:139 +msgid "_B" +msgstr "蓝色(_B)" + +#: ../app/propgui/gimppropgui-hue-saturation.c:140 +msgid "_M" +msgstr "品红(_M)" + +#: ../app/propgui/gimppropgui-hue-saturation.c:150 +msgid "Select Primary Color to Adjust" +msgstr "选择要调整的主颜色" + +#: ../app/propgui/gimppropgui-hue-saturation.c:236 +msgid "_Overlap" +msgstr "叠加(_O)" + +#: ../app/propgui/gimppropgui-hue-saturation.c:241 +msgid "Adjust Selected Color" +msgstr "调整选中的颜色" + +#: ../app/propgui/gimppropgui-hue-saturation.c:251 +msgid "_Hue" +msgstr "色相(_H)" + +#: ../app/propgui/gimppropgui-hue-saturation.c:258 +msgid "_Lightness" +msgstr "亮度(_L)" + +#: ../app/propgui/gimppropgui-hue-saturation.c:265 +msgid "_Saturation" +msgstr "饱和度(_S)" + +#: ../app/propgui/gimppropgui-hue-saturation.c:274 +msgid "R_eset Color" +msgstr "重置颜色(_E)" + +#: ../app/propgui/gimppropgui-panorama-projection.c:125 +msgid "Panorama Projection: " +msgstr "全景设计： " + +#: ../app/propgui/gimppropgui-recursive-transform.c:125 +msgid "Recursive Transform: " +msgstr "递归变换： " + +#: ../app/propgui/gimppropgui-shadows-highlights.c:62 +msgid "Shadows" +msgstr "阴影" + +#: ../app/propgui/gimppropgui-shadows-highlights.c:80 +msgid "Highlights" +msgstr "高光" + +#: ../app/propgui/gimppropgui-shadows-highlights.c:98 +msgid "Common" +msgstr "普通" + +#: ../app/propgui/gimppropgui-spiral.c:220 +msgid "Spiral: " +msgstr "螺旋： " + +#: ../app/propgui/gimppropgui-supernova.c:125 +msgid "Supernova: " +msgstr "超新星： " + +#: ../app/propgui/gimppropgui-utils.c:70 +msgid "1,700 K – Match flame" +msgstr "1,700 K – 火柴火焰" + +#: ../app/propgui/gimppropgui-utils.c:71 +msgid "1,850 K – Candle flame, sunset/sunrise" +msgstr "1,850 K – 蜡烛火焰，日落/日出" + +#: ../app/propgui/gimppropgui-utils.c:72 +msgid "2,700 K - Soft (or warm) LED lamps" +msgstr "2,700 K – 软(或暖)LED 灯" + +#: ../app/propgui/gimppropgui-utils.c:73 +msgid "3,000 K – Soft (or warm) white compact fluorescent lamps" +msgstr "3,000 K – 小型软(或暖)白色荧光灯" + +#: ../app/propgui/gimppropgui-utils.c:74 +msgid "3,200 K – Studio lamps, photofloods, etc." +msgstr "3,200 K – 工作室灯光，强溢光灯等" + +#: ../app/propgui/gimppropgui-utils.c:75 +msgid "3,300 K – Incandescent lamps" +msgstr "3,300 K – 白炽灯" + +#: ../app/propgui/gimppropgui-utils.c:76 +msgid "3,350 K – Studio \"CP\" light" +msgstr "3,350 K – 工作室“CP”灯光" + +#: ../app/propgui/gimppropgui-utils.c:77 +msgid "4,000 K - Cold (daylight) LED lamps" +msgstr "4,000 K - 冷(日光)LED 灯" + +#: ../app/propgui/gimppropgui-utils.c:78 +msgid "4,100 K – Moonlight" +msgstr "4,100 K – 月光" + +#: ../app/propgui/gimppropgui-utils.c:79 +msgid "5,000 K – D50" +msgstr "5,000 K – D50" + +#: ../app/propgui/gimppropgui-utils.c:80 +msgid "5,000 K – Cool white/daylight compact fluorescent lamps" +msgstr "5,000 K – 偏冷色的小型白色/日光荧光灯" + +#: ../app/propgui/gimppropgui-utils.c:81 +msgid "5,000 K – Horizon daylight" +msgstr "5,000 K – 地平线日光" + +#: ../app/propgui/gimppropgui-utils.c:82 +msgid "5,500 K – D55" +msgstr "5,500 K – D55" + +#: ../app/propgui/gimppropgui-utils.c:83 +msgid "5,500 K – Vertical daylight, electronic flash" +msgstr "5,500 K – 午间日光，电子闪光灯" + +#: ../app/propgui/gimppropgui-utils.c:84 +msgid "6,200 K – Xenon short-arc lamp" +msgstr "6,200 K - 氙短弧灯" + +#: ../app/propgui/gimppropgui-utils.c:85 +msgid "6,500 K – D65" +msgstr "6,500 K – D65" + +#: ../app/propgui/gimppropgui-utils.c:86 +msgid "6,500 K – Daylight, overcast" +msgstr "6,500 K – 日间，阴天" + +#: ../app/propgui/gimppropgui-utils.c:87 +msgid "7,500 K – D75" +msgstr "7,500 K – D75" + +#: ../app/propgui/gimppropgui-utils.c:88 +msgid "9,300 K" +msgstr "9,300 K" + +#: ../app/propgui/gimppropgui-utils.c:103 +msgid "Choose from a list of common color temperatures" +msgstr "从一个通用色温列表中选择" + +#: ../app/propgui/gimppropgui-utils.c:154 +msgid "New Seed" +msgstr "新的种子" + +#: ../app/propgui/gimppropgui.c:376 +msgid "Pick color from the image" +msgstr "从图像选取颜色" + +#: ../app/propgui/gimppropgui.c:520 +msgid "This operation has no editable properties" +msgstr "此操作没有可编辑的属性" + #. This is a so-called pangram; it's supposed to #. contain all characters found in the alphabet. -#: ../app/text/gimpfont.c:43 +#: ../app/text/gimpfont.c:50 msgid "" "Pack my box with\n" "five dozen liquor jugs." @@ -11792,55 +19761,61 @@ msgstr "" "Pack my box with\n" "five dozen liquor jugs." -#: ../app/text/gimptext-compat.c:106 ../app/tools/gimptexttool.c:1401 +#: ../app/text/gimptext-compat.c:106 ../app/tools/gimptexttool.c:1472 msgid "Add Text Layer" msgstr "添加文字图层" -#: ../app/text/gimptextlayer.c:138 +#: ../app/text/gimptextlayer.c:150 msgid "Text Layer" msgstr "文字图层" -#: ../app/text/gimptextlayer.c:139 +#: ../app/text/gimptextlayer.c:151 msgid "Rename Text Layer" msgstr "重命名文字图层" -#: ../app/text/gimptextlayer.c:140 +#: ../app/text/gimptextlayer.c:152 msgid "Move Text Layer" msgstr "移动文字图层" -#: ../app/text/gimptextlayer.c:141 +#: ../app/text/gimptextlayer.c:153 msgid "Scale Text Layer" msgstr "缩放文字图层" -#: ../app/text/gimptextlayer.c:142 +#: ../app/text/gimptextlayer.c:154 msgid "Resize Text Layer" msgstr "改变文字图层大小" -#: ../app/text/gimptextlayer.c:143 +#: ../app/text/gimptextlayer.c:155 msgid "Flip Text Layer" msgstr "翻转文字图层" -#: ../app/text/gimptextlayer.c:144 +#: ../app/text/gimptextlayer.c:156 msgid "Rotate Text Layer" msgstr "旋转文字图层" -#: ../app/text/gimptextlayer.c:145 +#: ../app/text/gimptextlayer.c:157 msgid "Transform Text Layer" msgstr "变换文字图层" -#: ../app/text/gimptextlayer.c:515 +#: ../app/text/gimptextlayer.c:565 msgid "Discard Text Information" msgstr "放弃文字信息" -#: ../app/text/gimptextlayer.c:573 +#: ../app/text/gimptextlayer.c:633 msgid "Due to lack of any fonts, text functionality is not available." msgstr "由于缺少字体，文字功能不可用。" -#: ../app/text/gimptextlayer.c:625 +#: ../app/text/gimptextlayer.c:696 msgid "Empty Text Layer" msgstr "空白文字图层" -#: ../app/text/gimptextlayer-xcf.c:76 +#: ../app/text/gimptextlayer.c:749 +msgid "" +"Your text cannot be rendered. It is likely too big. Please make it shorter " +"or use a smaller font." +msgstr "你的文字无法被渲染。可能是太大了。请缩短文字或使用小一些的字体。" + +#: ../app/text/gimptextlayer-xcf.c:78 #, c-format msgid "" "Problems parsing the text parasite for layer '%s':\n" @@ -11849,11 +19824,17 @@ msgid "" "Some text properties may be wrong. Unless you want to edit the text layer, " "you don't need to worry about this." msgstr "" -"解析“%s”图层的文字寄生物时遇到问题：\n" +"解析“%s”图层的文字内嵌信息时遇到问题：\n" "%s\n" "\n" "某些文字属性可能有错。除非您要编辑的是文字图层，否则不必担心。" +#: ../app/text/gimptextlayout.c:579 +msgid "" +"The new text layout cannot be generated. Most likely the font size is too " +"big." +msgstr "新建文字图层不能被生成。可能是字体字号太大。" + #: ../app/text/text-enums.c:23 msgctxt "text-box-mode" msgid "Dynamic" @@ -11864,294 +19845,409 @@ msgctxt "text-box-mode" msgid "Fixed" msgstr "固定" +#: ../app/tools/gimp-tools.c:382 +msgid "" +"This tool has\n" +"no options." +msgstr "" +"这个工具\n" +"没有选项。" + #: ../app/tools/gimpairbrushtool.c:56 msgid "Airbrush Tool: Paint using a brush, with variable pressure" -msgstr "喷枪工具：使用带有可变压力的画笔绘图" +msgstr "喷枪工具：使用带有可变压力的笔刷绘图" #: ../app/tools/gimpairbrushtool.c:57 msgid "_Airbrush" msgstr "喷枪(_A)" -#: ../app/tools/gimpairbrushtool.c:87 -msgid "Motion only" -msgstr "仅动画" +#: ../app/tools/gimpalignoptions.c:92 ../app/tools/gimpalignoptions.c:291 +msgid "Relative to" +msgstr "相对于" -#: ../app/tools/gimpairbrushtool.c:92 ../app/tools/gimpconvolvetool.c:229 -#: ../app/tools/gimpsmudgetool.c:92 -msgid "Rate" -msgstr "比率" - -#: ../app/tools/gimpairbrushtool.c:98 -msgid "Flow" -msgstr "流量" - -#: ../app/tools/gimpalignoptions.c:92 +#: ../app/tools/gimpalignoptions.c:93 msgid "Reference image object a layer will be aligned on" -msgstr "" +msgstr "为图像对象指定一个可在上面对齐的图层" -#: ../app/tools/gimpalignoptions.c:99 -#, fuzzy +#: ../app/tools/gimpalignoptions.c:101 msgid "Horizontal offset for distribution" -msgstr "色彩平衡工具：调整色彩分布" +msgstr "分布水平位移" -#: ../app/tools/gimpalignoptions.c:105 +#: ../app/tools/gimpalignoptions.c:108 msgid "Vertical offset for distribution" -msgstr "" +msgstr "分布竖直位移" -#: ../app/tools/gimpalignoptions.c:273 ../app/tools/gimpaligntool.c:124 +#: ../app/tools/gimpalignoptions.c:282 ../app/tools/gimpaligntool.c:123 msgid "Align" msgstr "对齐" -#: ../app/tools/gimpalignoptions.c:285 -msgid "Relative to:" -msgstr "相对于：" - -#: ../app/tools/gimpalignoptions.c:299 +#: ../app/tools/gimpalignoptions.c:302 msgid "Align left edge of target" msgstr "对齐目标的左边缘" -#: ../app/tools/gimpalignoptions.c:303 +#: ../app/tools/gimpalignoptions.c:306 msgid "Align center of target" -msgstr "对齐目标的中央" +msgstr "对齐目标的中心" -#: ../app/tools/gimpalignoptions.c:307 +#: ../app/tools/gimpalignoptions.c:310 msgid "Align right edge of target" msgstr "对齐目标的右边缘" -#: ../app/tools/gimpalignoptions.c:315 +#: ../app/tools/gimpalignoptions.c:318 msgid "Align top edge of target" msgstr "对齐目标的上边缘" -#: ../app/tools/gimpalignoptions.c:319 +#: ../app/tools/gimpalignoptions.c:322 msgid "Align middle of target" msgstr "对齐目标的中部" -#: ../app/tools/gimpalignoptions.c:323 +#: ../app/tools/gimpalignoptions.c:326 msgid "Align bottom of target" -msgstr "对齐目标的底边缘" +msgstr "对齐目标的下边缘" -#: ../app/tools/gimpalignoptions.c:325 +#: ../app/tools/gimpalignoptions.c:328 msgid "Distribute" msgstr "分布" -#: ../app/tools/gimpalignoptions.c:339 +#: ../app/tools/gimpalignoptions.c:342 msgid "Distribute left edges of targets" -msgstr "分布目标的左边缘" +msgstr "按目标的左边缘分布" -#: ../app/tools/gimpalignoptions.c:343 +#: ../app/tools/gimpalignoptions.c:346 msgid "Distribute horizontal centers of targets" -msgstr "分布目标的水平中心" +msgstr "按目标的水平中心分布" -#: ../app/tools/gimpalignoptions.c:347 +#: ../app/tools/gimpalignoptions.c:350 msgid "Distribute right edges of targets" -msgstr "分布目标的右边缘" +msgstr "按目标的右边缘分布" -#: ../app/tools/gimpalignoptions.c:355 +#: ../app/tools/gimpalignoptions.c:354 +msgid "Distribute targets evenly in the horizontal" +msgstr "水平平均分布目标" + +#: ../app/tools/gimpalignoptions.c:362 msgid "Distribute top edges of targets" -msgstr "分布目标的上边缘" +msgstr "按目标的上边缘分布" -#: ../app/tools/gimpalignoptions.c:359 +#: ../app/tools/gimpalignoptions.c:366 msgid "Distribute vertical centers of targets" -msgstr "分布目标的垂直中心" +msgstr "按目标的竖直中心分布" -#: ../app/tools/gimpalignoptions.c:363 +#: ../app/tools/gimpalignoptions.c:370 msgid "Distribute bottoms of targets" -msgstr "分布目标的底部" +msgstr "按目标的下边缘分布" -#: ../app/tools/gimpalignoptions.c:369 -msgid "Offset:" -msgstr "位移：" +#: ../app/tools/gimpalignoptions.c:374 +msgid "Distribute targets evenly in the vertical" +msgstr "竖直平均分布目标" + +#: ../app/tools/gimpaligntool.c:124 +msgid "Alignment Tool: Align or arrange layers and other objects" +msgstr "对齐工具：对齐或整理图层和其他对象" #: ../app/tools/gimpaligntool.c:125 -msgid "Alignment Tool: Align or arrange layers and other objects" -msgstr "对齐工具：对齐或整理图层或其他对象" - -#: ../app/tools/gimpaligntool.c:126 msgid "_Align" msgstr "对齐(_A)" -#: ../app/tools/gimpaligntool.c:549 +#: ../app/tools/gimpaligntool.c:541 msgid "Click on a layer, path or guide, or Click-Drag to pick several layers" -msgstr "在图层，路径或参考线上点击，或点击并拖动以拾取多个图层" +msgstr "在图层，路径或参考线上单击，或单击并拖动以拾取多个图层" -#: ../app/tools/gimpaligntool.c:557 +#: ../app/tools/gimpaligntool.c:549 msgid "Click to pick this layer as first item" -msgstr "点击可拾取此图层作为第一项" +msgstr "单击以拾取此图层作为第一项" -#: ../app/tools/gimpaligntool.c:564 +#: ../app/tools/gimpaligntool.c:556 msgid "Click to add this layer to the list" -msgstr "点击可将此图层添加到列表" +msgstr "单击以将此图层添加到列表" -#: ../app/tools/gimpaligntool.c:568 +#: ../app/tools/gimpaligntool.c:560 msgid "Click to pick this guide as first item" -msgstr "点击可拾取此参考线作为第一项" +msgstr "单击以拾取此参考线作为第一项" -#: ../app/tools/gimpaligntool.c:575 +#: ../app/tools/gimpaligntool.c:567 msgid "Click to add this guide to the list" -msgstr "点击可将此参考线添加到列表" +msgstr "单击以将此参考线添加到列表" -#: ../app/tools/gimpaligntool.c:579 +#: ../app/tools/gimpaligntool.c:571 msgid "Click to pick this path as first item" -msgstr "点击可拾取此路径作为第一项" +msgstr "单击以拾取此路径作为第一项" -#: ../app/tools/gimpaligntool.c:586 +#: ../app/tools/gimpaligntool.c:578 msgid "Click to add this path to the list" -msgstr "点击可将此路径添加到列表" +msgstr "单击以将此路径添加到列表" -#: ../app/tools/gimpblendoptions.c:212 ../app/tools/gimppaintoptions-gui.c:347 -msgid "Gradient" -msgstr "渐变" +#: ../app/tools/gimpblendoptions.c:101 ../app/tools/gimpblendoptions.c:303 +msgid "Metric" +msgstr "单位" -#: ../app/tools/gimpblendoptions.c:232 ../app/widgets/gimpbrusheditor.c:140 -msgid "Shape:" -msgstr "形状：" +#: ../app/tools/gimpblendoptions.c:102 +msgid "Metric to use for the distance calculation" +msgstr "用于距离计算的度量标准" -#: ../app/tools/gimpblendoptions.c:239 ../app/tools/gimppaintoptions-gui.c:326 -msgid "Repeat:" -msgstr "重复：" - -#: ../app/tools/gimpblendoptions.c:262 -msgid "Adaptive supersampling" +#: ../app/tools/gimpblendoptions.c:116 +msgid "Adaptive Supersampling" msgstr "自适应超级采样" -#: ../app/tools/gimpblendoptions.c:269 +#: ../app/tools/gimpblendoptions.c:122 msgid "Max depth" msgstr "最大深度" -#: ../app/tools/gimpblendtool.c:109 -msgid "Blend" -msgstr "混合填充" +#: ../app/tools/gimpblendoptions.c:128 ../app/tools/gimpbucketfilloptions.c:142 +#: ../app/tools/gimpregionselectoptions.c:112 +#: ../app/tools/gimpthresholdtool.c:87 +msgid "Threshold" +msgstr "阈值" -#: ../app/tools/gimpblendtool.c:110 +#: ../app/tools/gimpblendoptions.c:142 +msgid "Instant mode" +msgstr "即时模式" + +#: ../app/tools/gimpblendoptions.c:143 +msgid "Commit gradient instantly" +msgstr "立即使渐变生效" + +#: ../app/tools/gimpblendoptions.c:149 +msgid "Modify active gradient" +msgstr "修改活动渐变" + +#: ../app/tools/gimpblendoptions.c:150 +msgid "Modify the active gradient in-place" +msgstr "就地修改活动渐变" + +#: ../app/tools/gimpblendoptions.c:288 ../app/tools/gimppaintoptions-gui.c:379 +msgid "Edit this gradient" +msgstr "编辑该渐变" + +#. the instant toggle +#: ../app/tools/gimpblendoptions.c:356 +#, c-format +msgid "Instant mode (%s)" +msgstr "即时模式(%s)" + +#: ../app/tools/gimpblendoptions.c:376 +msgid "" +"The active gradient is non-writable and cannot be edited directly. Uncheck " +"this option to edit a copy of it." +msgstr "活动渐变不可写入和直接编辑。取消该选项以编辑它的副本。" + +#: ../app/tools/gimpblendtool.c:156 +msgid "Blend" +msgstr "混合" + +#: ../app/tools/gimpblendtool.c:157 msgid "Blend Tool: Fill selected area with a color gradient" msgstr "混合工具：用颜色渐变填充选中的区域" -#: ../app/tools/gimpblendtool.c:111 +#: ../app/tools/gimpblendtool.c:158 msgid "Blen_d" -msgstr "混合填充(_D)" +msgstr "混合(_D)" -#: ../app/tools/gimpblendtool.c:180 -#, fuzzy +#: ../app/tools/gimpblendtool.c:213 +msgid "Click-Drag to draw a gradient" +msgstr "单击并拖动以绘制一个渐变" + +#: ../app/tools/gimpblendtool.c:257 ../app/tools/gimpbucketfilltool.c:151 +#: ../app/tools/gimpcagetool.c:234 ../app/tools/gimpfiltertool.c:284 +#: ../app/tools/gimpforegroundselecttool.c:288 ../app/tools/gimppainttool.c:284 +#: ../app/tools/gimptransformtool.c:1443 ../app/tools/gimpwarptool.c:640 +msgid "The active layer is not visible." +msgstr "当前激活的图层不可见。" + +#: ../app/tools/gimpblendtool.c:264 msgid "No gradient available for use with this tool." -msgstr "没有可供此工具使用的图案。" +msgstr "没有可供该工具使用的渐变。" -#: ../app/tools/gimpblendtool.c:444 ../app/tools/gimppainttool.c:623 -#, c-format -msgid "%s for constrained angles" -msgstr "%s 可限定角度" - -#: ../app/tools/gimpblendtool.c:445 -#, c-format -msgid "%s to move the whole line" -msgstr "%s 可移动整条线" - -#: ../app/tools/gimpblendtool.c:449 +#: ../app/tools/gimpblendtool.c:614 msgid "Blend: " -msgstr "混合填充：" +msgstr "混合： " -#: ../app/tools/gimpbrightnesscontrasttool.c:105 +#. the position labels +#: ../app/tools/gimpblendtool-editor.c:1280 +msgid "X:" +msgstr "X:" + +#: ../app/tools/gimpblendtool-editor.c:1286 +msgid "Y:" +msgstr "Y:" + +#. the color label +#: ../app/tools/gimpblendtool-editor.c:1339 ../app/tools/gimptextoptions.c:583 +msgid "Color:" +msgstr "颜色：" + +#: ../app/tools/gimpblendtool-editor.c:1347 +msgid "Change Endpoint Color" +msgstr "改变端点颜色" + +#. the position label +#: ../app/tools/gimpblendtool-editor.c:1385 +#: ../app/tools/gimpblendtool-editor.c:1505 +#: ../app/tools/gimprectangleoptions.c:1031 +msgid "Position:" +msgstr "位置：" + +#. the color labels +#: ../app/tools/gimpblendtool-editor.c:1410 +msgid "Left color:" +msgstr "左端颜色：" + +#: ../app/tools/gimpblendtool-editor.c:1416 +msgid "Right color:" +msgstr "右端颜色：" + +#: ../app/tools/gimpblendtool-editor.c:1443 +#: ../app/tools/gimpblendtool-editor.c:1452 +msgid "Change Stop Color" +msgstr "改变过渡点颜色" + +#: ../app/tools/gimpblendtool-editor.c:1474 +msgid "Delete stop" +msgstr "删除过渡点" + +#. the type label +#: ../app/tools/gimpblendtool-editor.c:1530 +msgid "Blending:" +msgstr "混合：" + +#. the color label +#: ../app/tools/gimpblendtool-editor.c:1552 +msgid "Coloring:" +msgstr "颜色：" + +#: ../app/tools/gimpblendtool-editor.c:1586 +msgid "New stop at midpoint" +msgstr "在中点新建过渡点" + +#: ../app/tools/gimpblendtool-editor.c:1594 +msgid "Center midpoint" +msgstr "中心中点" + +#: ../app/tools/gimpblendtool-editor.c:1657 +msgid "Start Endpoint" +msgstr "起始端点" + +#: ../app/tools/gimpblendtool-editor.c:1665 +msgid "End Endpoint" +msgstr "结束端点" + +#: ../app/tools/gimpblendtool-editor.c:1718 +#, c-format +msgid "Stop %d" +msgstr "过渡点 %d" + +#: ../app/tools/gimpblendtool-editor.c:1786 +#, c-format +msgid "Midpoint %d" +msgstr "中点 %d" + +#: ../app/tools/gimpblendtool-editor.c:2364 +#: ../app/tools/gimpblendtool-editor.c:2373 +msgid "Blend Step" +msgstr "混合阶段" + +#: ../app/tools/gimpbrightnesscontrasttool.c:97 msgid "Brightness-Contrast" msgstr "亮度-对比度" -#: ../app/tools/gimpbrightnesscontrasttool.c:106 -msgid "Brightness/Contrast Tool: Adjust brightness and contrast" -msgstr "亮度和对比度工具：调整亮度和对比度" - -#: ../app/tools/gimpbrightnesscontrasttool.c:107 +#: ../app/tools/gimpbrightnesscontrasttool.c:99 msgid "B_rightness-Contrast..." -msgstr "亮度-对比度(_R)..." +msgstr "亮度-对比度(_R)…" -#: ../app/tools/gimpbrightnesscontrasttool.c:124 +#: ../app/tools/gimpbrightnesscontrasttool.c:161 msgid "Adjust Brightness and Contrast" msgstr "调整亮度和对比度" -#: ../app/tools/gimpbrightnesscontrasttool.c:126 -msgid "Import Brightness-Contrast settings" -msgstr "导入亮度-对比度设置" +#: ../app/tools/gimpbrightnesscontrasttool.c:277 +msgid "_Brightness" +msgstr "亮度(_B)" -#: ../app/tools/gimpbrightnesscontrasttool.c:127 -msgid "Export Brightness-Contrast settings" -msgstr "导出亮度-对比度设置" +#: ../app/tools/gimpbrightnesscontrasttool.c:285 +msgid "_Contrast" +msgstr "对比度(_C)" -#: ../app/tools/gimpbrightnesscontrasttool.c:269 -msgid "_Brightness:" -msgstr "亮度(_B)：" - -#: ../app/tools/gimpbrightnesscontrasttool.c:282 -msgid "Con_trast:" -msgstr "对比度(_T)：" - -#: ../app/tools/gimpbrightnesscontrasttool.c:294 +#: ../app/tools/gimpbrightnesscontrasttool.c:292 msgid "Edit these Settings as Levels" msgstr "将此设置作为色阶编辑" -#: ../app/tools/gimpbucketfilloptions.c:94 -msgid "Which area will be filled" -msgstr "" +#: ../app/tools/gimpbucketfilloptions.c:102 +msgid "Fill selection" +msgstr "填充选区" -#: ../app/tools/gimpbucketfilloptions.c:99 +#: ../app/tools/gimpbucketfilloptions.c:103 +msgid "Which area will be filled" +msgstr "要填充的区域" + +#: ../app/tools/gimpbucketfilloptions.c:109 +msgid "Fill transparent areas" +msgstr "填充透明区域" + +#: ../app/tools/gimpbucketfilloptions.c:110 msgid "Allow completely transparent regions to be filled" msgstr "允许填充完全透明的区域" -#: ../app/tools/gimpbucketfilloptions.c:105 +#: ../app/tools/gimpbucketfilloptions.c:118 msgid "Base filled area on all visible layers" msgstr "填充区域以所有可见图层为准" -#: ../app/tools/gimpbucketfilloptions.c:111 -#: ../app/tools/gimpregionselectoptions.c:96 +#: ../app/tools/gimpbucketfilloptions.c:125 +#: ../app/tools/gimpregionselectoptions.c:105 +msgid "Treat diagonally neighboring pixels as connected" +msgstr "将对角相邻像素视为相连的" + +#: ../app/tools/gimpbucketfilloptions.c:133 +msgid "" +"Base fill opacity on color difference from the clicked pixel (see " +"threshold). Disable antialiasing to fill the entire area uniformly." +msgstr "" +"基于与点击像素的透明度的差异(参见阈值)来填充。禁用抗锯齿以均匀地填充整个区" +"域。" + +#: ../app/tools/gimpbucketfilloptions.c:143 +#: ../app/tools/gimpregionselectoptions.c:113 msgid "Maximum color difference" msgstr "最大颜色差异" -#: ../app/tools/gimpbucketfilloptions.c:116 +#: ../app/tools/gimpbucketfilloptions.c:149 +#: ../app/tools/gimpbucketfilloptions.c:353 +msgid "Fill by" +msgstr "填充使用" + +#: ../app/tools/gimpbucketfilloptions.c:150 msgid "Criterion used for determining color similarity" -msgstr "" +msgstr "决定颜色相似程度的标准" #. fill type -#: ../app/tools/gimpbucketfilloptions.c:230 +#: ../app/tools/gimpbucketfilloptions.c:283 #, c-format msgid "Fill Type (%s)" msgstr "填充类型(%s)" #. fill selection -#: ../app/tools/gimpbucketfilloptions.c:245 +#: ../app/tools/gimpbucketfilloptions.c:298 #, c-format msgid "Affected Area (%s)" msgstr "影响区域(%s)" -#: ../app/tools/gimpbucketfilloptions.c:249 +#: ../app/tools/gimpbucketfilloptions.c:302 msgid "Fill whole selection" msgstr "填充整个选区" -#: ../app/tools/gimpbucketfilloptions.c:250 +#: ../app/tools/gimpbucketfilloptions.c:303 msgid "Fill similar colors" msgstr "填充相近的颜色" -#: ../app/tools/gimpbucketfilloptions.c:259 +#: ../app/tools/gimpbucketfilloptions.c:312 msgid "Finding Similar Colors" msgstr "寻找相近的颜色" -#: ../app/tools/gimpbucketfilloptions.c:274 -msgid "Fill transparent areas" -msgstr "填充透明区域" - -#: ../app/tools/gimpbucketfilloptions.c:280 ../app/tools/gimpclonetool.c:115 -#: ../app/tools/gimpcolorpickeroptions.c:159 ../app/tools/gimphealtool.c:101 -#: ../app/tools/gimpperspectiveclonetool.c:904 -#: ../app/tools/gimpregionselectoptions.c:211 -msgid "Sample merged" -msgstr "位样合并" - -#: ../app/tools/gimpbucketfilloptions.c:299 -msgid "Fill by:" -msgstr "填充于：" - #: ../app/tools/gimpbucketfilltool.c:87 msgid "Bucket Fill" msgstr "油漆桶填充" #: ../app/tools/gimpbucketfilltool.c:88 msgid "Bucket Fill Tool: Fill selected area with a color or pattern" -msgstr "油漆桶填充工具：用一种颜色或图案填充选中的区域" +msgstr "油漆桶填充工具：用一种颜色或图案填充选中区域" #: ../app/tools/gimpbucketfilltool.c:89 msgid "_Bucket Fill" @@ -12174,456 +20270,324 @@ msgctxt "command" msgid "Select by Color" msgstr "按颜色选择" -#: ../app/tools/gimpcagetool.c:151 ../app/tools/gimpcagetool.c:1191 -#, fuzzy +#: ../app/tools/gimpcageoptions.c:77 +msgid "" +"Fill the original position\n" +"of the cage with a color" +msgstr "" +"用一种颜色填充\n" +"框架的原始位置" + +#: ../app/tools/gimpcagetool.c:158 ../app/tools/gimpcagetool.c:1223 msgid "Cage Transform" -msgstr "变换" +msgstr "框架变换" -#: ../app/tools/gimpcagetool.c:152 +#: ../app/tools/gimpcagetool.c:159 msgid "Cage Transform: Deform a selection with a cage" -msgstr "" +msgstr "框架变换：用一个框架变换选区" -#: ../app/tools/gimpcagetool.c:153 -#, fuzzy +#: ../app/tools/gimpcagetool.c:160 msgid "_Cage Transform" -msgstr "变换(_T)" +msgstr "框架变换(_C)" -#: ../app/tools/gimpcagetool.c:350 +#: ../app/tools/gimpcagetool.c:732 ../app/tools/gimpwarptool.c:329 msgid "Press ENTER to commit the transform" -msgstr "" +msgstr "按 ENTER 键以确认变换" -#: ../app/tools/gimpcagetool.c:1094 +#: ../app/tools/gimpcagetool.c:1133 msgid "Computing Cage Coefficients" -msgstr "" +msgstr "计算框架系数" -#: ../app/tools/gimpcagetool.c:1242 -#, fuzzy +#: ../app/tools/gimpcagetool.c:1266 msgid "Cage transform" -msgstr "变换" +msgstr "框架变换" -#: ../app/tools/gimpclonetool.c:62 +#: ../app/tools/gimpclonetool.c:57 msgid "Clone Tool: Selectively copy from an image or pattern, using a brush" -msgstr "克隆工具：用画笔可选性地从图像或图案复制" +msgstr "克隆工具：用笔刷选择性地从图像或图案复制" -#: ../app/tools/gimpclonetool.c:63 +#: ../app/tools/gimpclonetool.c:58 msgid "_Clone" msgstr "克隆(_C)" -#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:89 +#: ../app/tools/gimpclonetool.c:81 ../app/tools/gimpclonetool.c:84 msgid "Click to clone" -msgstr "点击以克隆" +msgstr "单击以克隆" -#: ../app/tools/gimpclonetool.c:87 ../app/tools/gimpclonetool.c:92 +#: ../app/tools/gimpclonetool.c:82 ../app/tools/gimpclonetool.c:87 #, c-format msgid "%s to set a new clone source" -msgstr "%s 可设定新的克隆源" +msgstr "%s 以设定新的克隆源" #. Translators: the translation of "Click" must be the first word -#: ../app/tools/gimpclonetool.c:91 +#: ../app/tools/gimpclonetool.c:86 msgid "Click to set a new clone source" -msgstr "单击可设定新的克隆源" +msgstr "单击以设定新的克隆源" -#: ../app/tools/gimpclonetool.c:110 -#: ../app/tools/gimpperspectiveclonetool.c:899 -msgid "Source" -msgstr "源" +#: ../app/tools/gimpcoloroptions.c:70 +msgid "Use merged color value from all composited visible layers" +msgstr "使用从所有合成的可见图层上合并的颜色值" -#: ../app/tools/gimpclonetool.c:129 ../app/tools/gimphealtool.c:110 -#: ../app/tools/gimpperspectiveclonetool.c:918 -msgid "Alignment:" -msgstr "对齐：" - -#: ../app/tools/gimpcolorbalancetool.c:89 -msgid "Color Balance" -msgstr "色彩平衡" - -#: ../app/tools/gimpcolorbalancetool.c:90 -msgid "Color Balance Tool: Adjust color distribution" -msgstr "色彩平衡工具：调整色彩分布" - -#: ../app/tools/gimpcolorbalancetool.c:91 -msgid "Color _Balance..." -msgstr "色彩平衡(_B)..." - -#: ../app/tools/gimpcolorbalancetool.c:105 -msgid "Adjust Color Balance" -msgstr "调整色彩平衡" - -#: ../app/tools/gimpcolorbalancetool.c:107 -msgid "Import Color Balance Settings" -msgstr "导入色彩平衡设置" - -#: ../app/tools/gimpcolorbalancetool.c:108 -msgid "Export Color Balance Settings" -msgstr "导出色彩平衡设置" - -#: ../app/tools/gimpcolorbalancetool.c:135 -msgid "Color Balance operates only on RGB color layers." -msgstr "色彩平衡操作只能在 RGB 颜色的图层上进行。" - -#: ../app/tools/gimpcolorbalancetool.c:231 -msgid "Select Range to Adjust" -msgstr "选择要调整的范围" - -#: ../app/tools/gimpcolorbalancetool.c:240 ../app/tools/gimplevelstool.c:160 -msgid "Adjust Color Levels" -msgstr "调整颜色色阶" - -#: ../app/tools/gimpcolorbalancetool.c:257 -#: ../app/tools/gimphuesaturationtool.c:216 -msgid "Cyan" -msgstr "青色" - -#: ../app/tools/gimpcolorbalancetool.c:257 -#: ../app/tools/gimphuesaturationtool.c:213 -msgid "Red" -msgstr "红色" - -#: ../app/tools/gimpcolorbalancetool.c:266 -#: ../app/tools/gimphuesaturationtool.c:218 -msgid "Magenta" -msgstr "品红" - -#: ../app/tools/gimpcolorbalancetool.c:266 -#: ../app/tools/gimphuesaturationtool.c:215 -msgid "Green" -msgstr "绿色" - -#: ../app/tools/gimpcolorbalancetool.c:275 -#: ../app/tools/gimphuesaturationtool.c:214 -msgid "Yellow" -msgstr "黄色" - -#: ../app/tools/gimpcolorbalancetool.c:275 -#: ../app/tools/gimphuesaturationtool.c:217 -msgid "Blue" -msgstr "蓝色" - -#: ../app/tools/gimpcolorbalancetool.c:286 -msgid "R_eset Range" -msgstr "重置范围(_E)" - -#: ../app/tools/gimpcolorbalancetool.c:295 -msgid "Preserve _luminosity" -msgstr "保持亮度(_L)" - -#: ../app/tools/gimpcolorizetool.c:93 -msgid "Colorize" -msgstr "单色化" - -#: ../app/tools/gimpcolorizetool.c:94 -msgid "Colorize Tool: Colorize the image" -msgstr "单色化工具：图像单色化" - -#: ../app/tools/gimpcolorizetool.c:95 -msgid "Colori_ze..." -msgstr "单色化(_Z)..." - -#: ../app/tools/gimpcolorizetool.c:109 -msgid "Colorize the Image" -msgstr "图像单色化" - -#: ../app/tools/gimpcolorizetool.c:111 -msgid "Import Colorize Settings" -msgstr "导入色彩化设置" - -#: ../app/tools/gimpcolorizetool.c:112 -msgid "Export Colorize Settings" -msgstr "导出色彩化设置" - -#: ../app/tools/gimpcolorizetool.c:139 -#, fuzzy -msgid "Colorize does not operate on grayscale layers." -msgstr "不能对索引图层进行色调分离操作。" - -#: ../app/tools/gimpcolorizetool.c:201 -msgid "Select Color" -msgstr "选择颜色" - -#: ../app/tools/gimpcolorizetool.c:218 -#: ../app/tools/gimphuesaturationtool.c:346 -msgid "_Hue:" -msgstr "色调(_H)：" - -#: ../app/tools/gimpcolorizetool.c:231 -#: ../app/tools/gimphuesaturationtool.c:378 -msgid "_Saturation:" -msgstr "饱和度(_S)：" - -#: ../app/tools/gimpcolorizetool.c:244 -#: ../app/tools/gimphuesaturationtool.c:362 -msgid "_Lightness:" -msgstr "亮度(_L)：" - -#: ../app/tools/gimpcolorizetool.c:262 -#, fuzzy -msgid "Colorize Color" -msgstr "单色化" - -#: ../app/tools/gimpcolorizetool.c:280 ../app/widgets/gimppropwidgets.c:1528 -#, fuzzy -msgid "Pick color from image" -msgstr "使用渐变中的颜色" - -#: ../app/tools/gimpcoloroptions.c:78 -msgid "Color Picker Average Radius" -msgstr "颜色拾取平均半径" - -#: ../app/tools/gimpcoloroptions.c:158 -#: ../app/tools/gimprectangleselectoptions.c:164 -#: ../app/tools/gimpselectionoptions.c:278 -#: ../app/widgets/gimpbrusheditor.c:156 -msgid "Radius" -msgstr "半径" - -#: ../app/tools/gimpcoloroptions.c:164 +#: ../app/tools/gimpcoloroptions.c:77 ../app/tools/gimpcolorpickeroptions.c:71 msgid "Sample average" msgstr "位样平均" -#: ../app/tools/gimpcolorpickeroptions.c:69 -#, fuzzy -msgid "Use accumulated color value from all composited visible layers" -msgstr "使用所有可见图层的混合颜色" +#: ../app/tools/gimpcoloroptions.c:78 ../app/tools/gimpcolorpickeroptions.c:72 +msgid "Use averaged color value from nearby pixels" +msgstr "使用从附近像素取得的平均颜色值" -#: ../app/tools/gimpcolorpickeroptions.c:75 +#: ../app/tools/gimpcoloroptions.c:86 +msgid "Color Picker Average Radius" +msgstr "颜色拾取平均半径" + +#: ../app/tools/gimpcolorpickeroptions.c:79 +msgid "Pick Mode" +msgstr "拾取模式" + +#: ../app/tools/gimpcolorpickeroptions.c:80 msgid "Choose what color picker will do" -msgstr "" +msgstr "选择颜色拾取工具的拾取方式" -#: ../app/tools/gimpcolorpickeroptions.c:81 +#: ../app/tools/gimpcolorpickeroptions.c:87 +#: ../app/tools/gimpmeasureoptions.c:68 +msgid "Use info window" +msgstr "使用信息窗口" + +#: ../app/tools/gimpcolorpickeroptions.c:88 msgid "" "Open a floating dialog to view picked color values in various color models" -msgstr "" +msgstr "打开一个浮动对话框以查看拾取的颜色在各种颜色模型中的值" #. the pick FG/BG frame -#: ../app/tools/gimpcolorpickeroptions.c:164 +#: ../app/tools/gimpcolorpickeroptions.c:195 #, c-format msgid "Pick Mode (%s)" -msgstr "拾取模式 (%s)" +msgstr "拾取模式 (%s)" #. the use_info_window toggle button -#: ../app/tools/gimpcolorpickeroptions.c:173 +#: ../app/tools/gimpcolorpickeroptions.c:204 #, c-format msgid "Use info window (%s)" -msgstr "使用信息窗口 (%s)" +msgstr "使用信息窗口 (%s)" -#: ../app/tools/gimpcolorpickertool.c:93 +#: ../app/tools/gimpcolorpickertool.c:108 msgid "Color Picker" msgstr "颜色拾取" -#: ../app/tools/gimpcolorpickertool.c:94 +#: ../app/tools/gimpcolorpickertool.c:109 msgid "Color Picker Tool: Set colors from image pixels" -msgstr "颜色拾取工具：从图像中拾取颜色" +msgstr "颜色拾取工具：从图像像素中设定颜色" -#: ../app/tools/gimpcolorpickertool.c:95 +#: ../app/tools/gimpcolorpickertool.c:110 msgid "C_olor Picker" msgstr "颜色拾取(_O)" -#: ../app/tools/gimpcolorpickertool.c:231 +#: ../app/tools/gimpcolorpickertool.c:253 msgid "Click in any image to view its color" -msgstr "在图像中任意点击可查看其颜色" +msgstr "在图像中任意单击以查看其颜色" -#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:477 +#: ../app/tools/gimpcolorpickertool.c:260 ../app/tools/gimppainttool.c:412 msgid "Click in any image to pick the foreground color" -msgstr "在图像中任意点击可拾取前景色" +msgstr "在图像中任意单击以拾取前景色" -#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:483 +#: ../app/tools/gimpcolorpickertool.c:268 ../app/tools/gimppainttool.c:418 msgid "Click in any image to pick the background color" -msgstr "在图像中任意点击可拾取背景色" +msgstr "在图像中任意单击可拾取背景色" -#: ../app/tools/gimpcolorpickertool.c:254 +#: ../app/tools/gimpcolorpickertool.c:276 msgid "Click in any image to add the color to the palette" -msgstr "在图像中任意点击可将颜色添加到调色板" +msgstr "在图像中任意单击可将颜色添加到调色板" -#: ../app/tools/gimpcolorpickertool.c:309 +#: ../app/tools/gimpcolorpickertool.c:343 msgid "Color Picker Information" msgstr "颜色拾取信息" -#: ../app/tools/gimpcolortool.c:230 ../app/tools/gimpcolortool.c:403 -msgid "Move Sample Point: " -msgstr "移动采样点：" - -#: ../app/tools/gimpcolortool.c:395 -msgid "Remove Sample Point" -msgstr "删除采样点" - -#: ../app/tools/gimpcolortool.c:396 -msgid "Cancel Sample Point" -msgstr "取消采样点" - -#: ../app/tools/gimpcolortool.c:404 -msgid "Add Sample Point: " -msgstr "添加采样点：" - #: ../app/tools/gimpconvolvetool.c:74 msgid "Blur / Sharpen" -msgstr "模糊 / 锐化" +msgstr "模糊/锐化" #: ../app/tools/gimpconvolvetool.c:75 msgid "Blur / Sharpen Tool: Selective blurring or unblurring using a brush" -msgstr "模糊 / 锐化工具：使用画笔选择性地模糊或者去模糊" +msgstr "模糊/锐化工具：使用笔刷选择性地模糊或者去模糊" #: ../app/tools/gimpconvolvetool.c:76 msgid "Bl_ur / Sharpen" -msgstr "模糊 / 锐化(_U)" +msgstr "模糊/锐化(_U)" -#: ../app/tools/gimpconvolvetool.c:185 +#: ../app/tools/gimpconvolvetool.c:181 msgid "Click to blur" -msgstr "点击以模糊" +msgstr "单击以模糊" -#: ../app/tools/gimpconvolvetool.c:186 +#: ../app/tools/gimpconvolvetool.c:182 msgid "Click to blur the line" -msgstr "点击可糊模线段" +msgstr "单击以糊模线段" -#: ../app/tools/gimpconvolvetool.c:187 +#: ../app/tools/gimpconvolvetool.c:183 #, c-format msgid "%s to sharpen" msgstr "%s 以锐化" -#: ../app/tools/gimpconvolvetool.c:191 +#: ../app/tools/gimpconvolvetool.c:187 msgid "Click to sharpen" -msgstr "点击以锐化" +msgstr "单击以锐化" -#: ../app/tools/gimpconvolvetool.c:192 +#: ../app/tools/gimpconvolvetool.c:188 msgid "Click to sharpen the line" -msgstr "点击可锐化线段" +msgstr "单击以锐化线段" -#: ../app/tools/gimpconvolvetool.c:193 +#: ../app/tools/gimpconvolvetool.c:189 #, c-format msgid "%s to blur" msgstr "%s 以模糊" #. the type radio box -#: ../app/tools/gimpconvolvetool.c:217 +#: ../app/tools/gimpconvolvetool.c:213 #, c-format msgid "Convolve Type (%s)" -msgstr "卷积类型(%s)" +msgstr "卷积类型 (%s)" -#: ../app/tools/gimpcropoptions.c:77 +#: ../app/tools/gimpcropoptions.c:78 #: ../app/tools/gimprectangleselectoptions.c:78 -#, fuzzy +msgid "Highlight" +msgstr "高亮" + +#: ../app/tools/gimpcropoptions.c:79 +#: ../app/tools/gimprectangleselectoptions.c:79 msgid "Dim everything outside selection" -msgstr "反转选区" +msgstr "使选区外的所有东西变暗" -#: ../app/tools/gimpcropoptions.c:83 -msgid "Crop only currently selected layer" -msgstr "" +#: ../app/tools/gimpcropoptions.c:86 +#: ../app/tools/gimprectangleselectoptions.c:86 +msgid "Highlight opacity" +msgstr "高亮不透明度" -#: ../app/tools/gimpcropoptions.c:89 -msgid "Allow resizing canvas by dragging cropping frame beyond image boundary" -msgstr "" +#: ../app/tools/gimpcropoptions.c:87 +#: ../app/tools/gimprectangleselectoptions.c:87 +msgid "How much to dim everything outside selection" +msgstr "使选区外的所有东西变暗的程度" -#: ../app/tools/gimpcropoptions.c:165 +#: ../app/tools/gimpcropoptions.c:93 msgid "Current layer only" msgstr "仅对当前图层" -#: ../app/tools/gimpcropoptions.c:171 +#: ../app/tools/gimpcropoptions.c:94 +msgid "Crop only currently selected layer" +msgstr "仅剪裁当前选中的图层" + +#: ../app/tools/gimpcropoptions.c:100 msgid "Allow growing" msgstr "允许增长" -#: ../app/tools/gimpcroptool.c:117 +#: ../app/tools/gimpcropoptions.c:101 +msgid "Allow resizing canvas by dragging cropping frame beyond image boundary" +msgstr "允许通过拖拽剪裁框到图像边界外来改变画布大小" + +#: ../app/tools/gimpcropoptions.c:108 ../app/tools/gimpcropoptions.c:200 +msgid "Fill with" +msgstr "填充" + +#: ../app/tools/gimpcropoptions.c:109 +msgid "How to fill new areas created by 'Allow growing'" +msgstr "如何填充通过“允许增长”创建的新区域" + +#: ../app/tools/gimpcroptool.c:118 msgid "Crop" msgstr "剪裁" -#: ../app/tools/gimpcroptool.c:118 -msgid "Crop Tool: Remove edge areas from image or layer" -msgstr "剪裁工具：移除图像或图层的边缘区域" - #: ../app/tools/gimpcroptool.c:119 +msgid "Crop Tool: Remove edge areas from image or layer" +msgstr "剪裁工具：删除图像或图层的边缘区域" + +#: ../app/tools/gimpcroptool.c:120 msgid "_Crop" msgstr "剪裁(_C)" -#: ../app/tools/gimpcroptool.c:253 +#: ../app/tools/gimpcroptool.c:158 +msgid "Click-Drag to draw a crop rectangle" +msgstr "单击并拖动以绘制一个剪裁矩形" + +#: ../app/tools/gimpcroptool.c:278 msgid "Click or press Enter to crop" -msgstr "点击或按 Enter 可剪裁" +msgstr "单击或按 Enter 键剪裁" -#: ../app/tools/gimpcroptool.c:318 +#: ../app/tools/gimpcroptool.c:385 +msgid "Crop to: " +msgstr "剪裁到： " + +#: ../app/tools/gimpcroptool.c:455 msgid "There is no active layer to crop." -msgstr "没有活动图层可以裁切。" +msgstr "没有活动图层可以剪裁。" -#: ../app/tools/gimpcurvestool.c:144 +#: ../app/tools/gimpcurvestool.c:142 msgid "Curves" msgstr "曲线" -#: ../app/tools/gimpcurvestool.c:145 -msgid "Curves Tool: Adjust color curves" -msgstr "曲线工具：调整颜色曲线" - -#: ../app/tools/gimpcurvestool.c:146 +#: ../app/tools/gimpcurvestool.c:144 msgid "_Curves..." -msgstr "曲线(_C)..." +msgstr "曲线(_C)…" -#: ../app/tools/gimpcurvestool.c:169 +#: ../app/tools/gimpcurvestool.c:325 +msgid "Click to add a control point" +msgstr "单击以添加控制点" + +#: ../app/tools/gimpcurvestool.c:330 +msgid "Click to add control points to all channels" +msgstr "单击以在全部通道中添加控制点" + +#: ../app/tools/gimpcurvestool.c:335 +msgid "Click to locate on curve" +msgstr "单击以在曲线上定位" + +#: ../app/tools/gimpcurvestool.c:337 +#, c-format +msgid "%s: add control point" +msgstr "%s: 添加控制点" + +#: ../app/tools/gimpcurvestool.c:338 +#, c-format +msgid "%s: add control points to all channels" +msgstr "%s: 在全部通道中添加控制点" + +#: ../app/tools/gimpcurvestool.c:355 msgid "Adjust Color Curves" msgstr "调整颜色曲线" -#: ../app/tools/gimpcurvestool.c:171 -msgid "Import Curves" -msgstr "载入曲线" - -#: ../app/tools/gimpcurvestool.c:172 -msgid "Export Curves" -msgstr "载入曲线" - -#: ../app/tools/gimpcurvestool.c:307 -msgid "Click to add a control point" -msgstr "点击可添加控制点" - -#: ../app/tools/gimpcurvestool.c:312 -msgid "Click to add control points to all channels" -msgstr "单击可在全部通道中添加控制点" - -#: ../app/tools/gimpcurvestool.c:317 -msgid "Click to locate on curve (try Shift, Ctrl)" -msgstr "在曲线上点击以定位(试试 Shift, Ctrl)" - -#: ../app/tools/gimpcurvestool.c:414 ../app/tools/gimplevelstool.c:320 +#: ../app/tools/gimpcurvestool.c:400 ../app/tools/gimplevelstool.c:345 +#: ../app/tools/gimpthresholdtool.c:194 msgid "Cha_nnel:" msgstr "通道(_N)：" -#: ../app/tools/gimpcurvestool.c:440 ../app/tools/gimplevelstool.c:344 +#: ../app/tools/gimpcurvestool.c:432 ../app/tools/gimplevelstool.c:375 msgid "R_eset Channel" msgstr "重置通道(_E)" -#: ../app/tools/gimpcurvestool.c:534 ../app/widgets/gimpdeviceinfoeditor.c:459 +#: ../app/tools/gimpcurvestool.c:452 +msgid "Adjust curves in linear light" +msgstr "根据线性光调整曲线" + +#: ../app/tools/gimpcurvestool.c:453 +msgid "Adjust curves perceptually" +msgstr "根据感官调整曲线" + +#: ../app/tools/gimpcurvestool.c:543 ../app/widgets/gimpdeviceinfoeditor.c:464 msgid "Curve _type:" msgstr "曲线类型(_T)" -#: ../app/tools/gimpcurvestool.c:609 ../app/tools/gimplevelstool.c:679 -#, c-format -msgid "Could not read header from '%s': %s" -msgstr "无法从“%s”中读取头：%s" +#: ../app/tools/gimpcurvestool.c:661 ../app/tools/gimplevelstool.c:744 +msgid "Could not read header: " +msgstr "无法读取文件头: " -#: ../app/tools/gimpcurvestool.c:682 +#: ../app/tools/gimpcurvestool.c:735 msgid "Use _old curves file format" msgstr "使用旧曲线文件格式(_O)" -#: ../app/tools/gimpdesaturatetool.c:75 -msgid "Desaturate Tool: Turn colors into shades of gray" -msgstr "灰度工具：将颜色转化为灰阶" - -#: ../app/tools/gimpdesaturatetool.c:76 -msgid "_Desaturate..." -msgstr "去色(_D)..." - -#: ../app/tools/gimpdesaturatetool.c:90 -msgid "Desaturate (Remove Colors)" -msgstr "灰度(删除颜色)" - -#: ../app/tools/gimpdesaturatetool.c:116 -msgid "Desaturate only operates on RGB layers." -msgstr "去色只能在 RGB 图层上操作。" - -#: ../app/tools/gimpdesaturatetool.c:177 -msgid "Choose shade of gray based on:" -msgstr "选择灰色梯度基于：" - #: ../app/tools/gimpdodgeburntool.c:74 msgid "Dodge / Burn" -msgstr "减淡 / 加深" +msgstr "减淡/加深" #: ../app/tools/gimpdodgeburntool.c:75 msgid "Dodge / Burn Tool: Selectively lighten or darken using a brush" -msgstr "减淡 / 加深工具：使用画笔选择性地加亮或加深" +msgstr "减淡/加深工具：使用笔刷选择性地变亮或变暗" #: ../app/tools/gimpdodgeburntool.c:76 msgid "Dod_ge / Burn" @@ -12631,11 +20595,11 @@ msgstr "减淡/加深(_G)" #: ../app/tools/gimpdodgeburntool.c:188 msgid "Click to dodge" -msgstr "点击以减淡" +msgstr "单击以减淡" #: ../app/tools/gimpdodgeburntool.c:189 msgid "Click to dodge the line" -msgstr "点击可减淡线段" +msgstr "单击以减淡线段" #: ../app/tools/gimpdodgeburntool.c:190 #, c-format @@ -12644,11 +20608,11 @@ msgstr "%s 以加深" #: ../app/tools/gimpdodgeburntool.c:194 msgid "Click to burn" -msgstr "点击以加深" +msgstr "单击以加深" #: ../app/tools/gimpdodgeburntool.c:195 msgid "Click to burn the line" -msgstr "点击可加深线段" +msgstr "单击以加深线段" #: ../app/tools/gimpdodgeburntool.c:196 #, c-format @@ -12659,46 +20623,33 @@ msgstr "%s 以减淡" #: ../app/tools/gimpdodgeburntool.c:220 #, c-format msgid "Type (%s)" -msgstr "类型 (%s)" +msgstr "类型 (%s)" -#. mode (highlights, midtones, or shadows) -#: ../app/tools/gimpdodgeburntool.c:231 -msgid "Range" -msgstr "比率" +#: ../app/tools/gimpeditselectiontool.c:449 +#: ../app/tools/gimpeditselectiontool.c:623 +msgid "Move: " +msgstr "移动： " -#: ../app/tools/gimpdodgeburntool.c:237 -msgid "Exposure" -msgstr "曝光量" - -#: ../app/tools/gimpeditselectiontool.c:241 -msgid "Move Selection" -msgstr "移动选区" - -#: ../app/tools/gimpeditselectiontool.c:245 -#: ../app/tools/gimpeditselectiontool.c:1240 +#: ../app/tools/gimpeditselectiontool.c:879 +#: ../app/tools/gimpeditselectiontool.c:1138 msgid "Move Floating Selection" msgstr "移动浮动选区" -#: ../app/tools/gimpeditselectiontool.c:454 -#: ../app/tools/gimpeditselectiontool.c:731 -msgid "Move: " -msgstr "移动：" - -#: ../app/tools/gimpellipseselecttool.c:66 +#: ../app/tools/gimpellipseselecttool.c:64 msgid "Ellipse Select" msgstr "椭圆选择" -#: ../app/tools/gimpellipseselecttool.c:67 +#: ../app/tools/gimpellipseselecttool.c:65 msgid "Ellipse Select Tool: Select an elliptical region" msgstr "椭圆选择工具：选择椭圆区域" -#: ../app/tools/gimpellipseselecttool.c:68 +#: ../app/tools/gimpellipseselecttool.c:66 msgid "_Ellipse Select" msgstr "椭圆选择(_E)" #: ../app/tools/gimperasertool.c:67 msgid "Eraser Tool: Erase to background or transparency using a brush" -msgstr "橡皮工具：使用画笔擦除至背景或透明" +msgstr "橡皮工具：使用笔刷擦除至背景或透明" #: ../app/tools/gimperasertool.c:68 msgid "_Eraser" @@ -12706,1252 +20657,1337 @@ msgstr "橡皮(_E)" #: ../app/tools/gimperasertool.c:97 msgid "Click to erase" -msgstr "点击以擦除" +msgstr "单击以擦除" #: ../app/tools/gimperasertool.c:98 msgid "Click to erase the line" -msgstr "点击可擦除线段" +msgstr "单击可擦除线段" #: ../app/tools/gimperasertool.c:99 #, c-format msgid "%s to pick a background color" -msgstr "%s 可拾取背景色" +msgstr "%s 以拾取背景色" #. the anti_erase toggle #: ../app/tools/gimperasertool.c:146 #, c-format msgid "Anti erase (%s)" -msgstr "反擦除(%s)" +msgstr "反擦除 (%s)" + +#: ../app/tools/gimpfilteroptions.c:71 +msgid "_Preview" +msgstr "预览(_P)" + +#: ../app/tools/gimpfilteroptions.c:78 +msgid "Split _view" +msgstr "分割视图(_V)" + +#: ../app/tools/gimpfilteroptions.c:109 +msgid "Color _managed" +msgstr "色彩管理(_M)" + +#. The Color Options expander +#: ../app/tools/gimpfiltertool.c:373 +msgid "Advanced Color Options" +msgstr "高级色彩选项" + +#: ../app/tools/gimpfiltertool.c:392 +msgid "Convert pixels to built-in sRGB to apply filter (slow)" +msgstr "将像素转换为内置 sRGB 以应用滤镜(慢)" + +#: ../app/tools/gimpfiltertool.c:393 +msgid "Assume pixels are built-in sRGB (ignore actual image color space)" +msgstr "假设像素为内置 sRGB(忽略实际的图像色彩空间)" + +#: ../app/tools/gimpfiltertool.c:628 +msgid "Click to switch the original and filtered sides" +msgstr "单击以在原始图片和应用滤镜图片之间切换" + +#: ../app/tools/gimpfiltertool.c:632 +msgid "Click to switch between vertical and horizontal" +msgstr "单击以在竖直视图和水平视图之间切换" + +#: ../app/tools/gimpfiltertool.c:636 +msgid "Click to move the split guide" +msgstr "单击以移动分割参考线" + +#: ../app/tools/gimpfiltertool.c:638 +#, c-format +msgid "%s: switch original and filtered" +msgstr "%s: 切换原始图片和应用滤镜图片" + +#: ../app/tools/gimpfiltertool.c:639 +#, c-format +msgid "%s: switch horizontal and vertical" +msgstr "%s: 切换水平视图和竖直视图" + +#: ../app/tools/gimpfiltertool.c:1300 ../app/tools/gimpfiltertool-settings.c:71 +#, c-format +msgid "Import '%s' Settings" +msgstr "导入“%s”设置" + +#: ../app/tools/gimpfiltertool.c:1302 ../app/tools/gimpfiltertool-settings.c:73 +#, c-format +msgid "Export '%s' Settings" +msgstr "导出“%s”设置" + +#: ../app/tools/gimpfiltertool-settings.c:100 +msgid "Pre_sets:" +msgstr "预设(_S):" + +#: ../app/tools/gimpfiltertool-settings.c:240 +#, c-format +msgid "Settings saved to '%s'" +msgstr "设置已保存到“%s”" #: ../app/tools/gimpflipoptions.c:67 -#, fuzzy -msgid "Direction of flipping" -msgstr "方向" +msgid "Flip Type" +msgstr "翻转类型" -#: ../app/tools/gimpflipoptions.c:134 -msgid "Affect:" -msgstr "影响：" +#: ../app/tools/gimpflipoptions.c:68 +msgid "Direction of flipping" +msgstr "翻转方向" + +#: ../app/tools/gimpflipoptions.c:139 ../app/tools/gimptransformoptions.c:425 +msgid "Transform:" +msgstr "变换：" #. tool toggle -#: ../app/tools/gimpflipoptions.c:143 +#: ../app/tools/gimpflipoptions.c:148 ../app/tools/gimpmagnifyoptions.c:191 #, c-format -msgid "Flip Type (%s)" -msgstr "翻转类型(%s)" +msgid "Direction (%s)" +msgstr "方向 (%s)" -#: ../app/tools/gimpfliptool.c:84 +#: ../app/tools/gimpflipoptions.c:170 ../app/tools/gimptransformoptions.c:132 +#: ../app/tools/gimptransformoptions.c:447 +msgid "Clipping" +msgstr "剪裁" + +#: ../app/tools/gimpfliptool.c:106 msgid "Flip" msgstr "翻转" -#: ../app/tools/gimpfliptool.c:85 +#: ../app/tools/gimpfliptool.c:107 msgid "" "Flip Tool: Reverse the layer, selection or path horizontally or vertically" -msgstr "翻转工具：水平或垂直反相图层、选区或路径" +msgstr "翻转工具：水平或竖直翻转图层、选区或路径" -#: ../app/tools/gimpfliptool.c:87 +#: ../app/tools/gimpfliptool.c:109 ../app/tools/gimpfliptool.c:133 msgid "_Flip" msgstr "翻转(_F)" -#: ../app/tools/gimpfliptool.c:187 -#, fuzzy +#: ../app/tools/gimpfliptool.c:298 msgctxt "undo-type" msgid "Flip horizontally" msgstr "水平翻转" -#: ../app/tools/gimpfliptool.c:190 -#, fuzzy +#: ../app/tools/gimpfliptool.c:301 msgctxt "undo-type" msgid "Flip vertically" -msgstr "垂直翻转" +msgstr "竖直翻转" #. probably this is not actually reached today, but #. * could be if someone defined FLIP_DIAGONAL, say... #. -#: ../app/tools/gimpfliptool.c:196 -#, fuzzy +#: ../app/tools/gimpfliptool.c:307 msgctxt "undo-desc" msgid "Flip" msgstr "翻转" -#: ../app/tools/gimpforegroundselectoptions.c:86 -msgid "Select a single contiguous area" -msgstr "选择单个邻近的区域" +#: ../app/tools/gimpforegroundselectoptions.c:84 +msgid "Draw Mode" +msgstr "绘画模式" -#: ../app/tools/gimpforegroundselectoptions.c:92 +#: ../app/tools/gimpforegroundselectoptions.c:85 msgid "" "Paint over areas to mark color values for inclusion or exclusion from " "selection" -msgstr "" +msgstr "在某些区域上绘画以标记选区将要包含或排除的颜色值" -#: ../app/tools/gimpforegroundselectoptions.c:99 +#: ../app/tools/gimpforegroundselectoptions.c:93 +msgid "Stroke width" +msgstr "笔廓宽度" + +#: ../app/tools/gimpforegroundselectoptions.c:94 msgid "Size of the brush used for refinements" -msgstr "用于提炼的画笔的大小" +msgstr "用于精修的笔刷的大小" -#: ../app/tools/gimpforegroundselectoptions.c:105 -msgid "" -"Smaller values give a more accurate selection border but may introduce holes " -"in the selection" -msgstr "更小的值可以获得更精确的选区但可能在选区中产生孔洞" +#: ../app/tools/gimpforegroundselectoptions.c:100 +#: ../app/tools/gimpforegroundselectoptions.c:305 +msgid "Preview color" +msgstr "预览颜色" -#: ../app/tools/gimpforegroundselectoptions.c:113 +#: ../app/tools/gimpforegroundselectoptions.c:101 msgid "Color of selection preview mask" -msgstr "" +msgstr "选区预览蒙板的颜色" -#: ../app/tools/gimpforegroundselectoptions.c:125 -msgid "Sensitivity for brightness component" -msgstr "亮度分量的灵敏度" +#: ../app/tools/gimpforegroundselectoptions.c:108 +#: ../app/tools/gimpforegroundselectoptions.c:316 +msgid "Engine" +msgstr "引擎" + +#: ../app/tools/gimpforegroundselectoptions.c:109 +msgid "Matting engine to use" +msgstr "要使用的抠图引擎" + +#: ../app/tools/gimpforegroundselectoptions.c:117 +msgid "Number of downsampled levels to use" +msgstr "降采样的的级别数" + +#: ../app/tools/gimpforegroundselectoptions.c:123 +msgid "Active levels" +msgstr "激活级别" + +#: ../app/tools/gimpforegroundselectoptions.c:124 +msgid "Number of levels to perform solving" +msgstr "执行解算的级别数" + +#: ../app/tools/gimpforegroundselectoptions.c:130 +msgid "Iterations" +msgstr "迭代次数" #: ../app/tools/gimpforegroundselectoptions.c:131 -msgid "Sensitivity for red/green component" -msgstr "红/绿分量的灵敏度" +msgid "Number of iterations to perform" +msgstr "要执行的迭代次数" -#: ../app/tools/gimpforegroundselectoptions.c:137 -msgid "Sensitivity for yellow/blue component" -msgstr "黄/蓝分量的灵敏度" +#: ../app/tools/gimpforegroundselectoptions.c:300 +msgid "Reset stroke width native size" +msgstr "重值笔廓宽度原始大小" -#. single / multiple objects -#: ../app/tools/gimpforegroundselectoptions.c:282 -msgid "Contiguous" -msgstr "连续" - -#. foreground / background -#: ../app/tools/gimpforegroundselectoptions.c:287 -#, c-format -msgid "Interactive refinement (%s)" -msgstr "交互式提炼(%s)" - -#: ../app/tools/gimpforegroundselectoptions.c:291 -msgid "Mark background" -msgstr "标记背景" - -#: ../app/tools/gimpforegroundselectoptions.c:292 -msgid "Mark foreground" -msgstr "标记前景" - -#: ../app/tools/gimpforegroundselectoptions.c:308 -msgid "Small brush" -msgstr "小画笔" - -#: ../app/tools/gimpforegroundselectoptions.c:316 -msgid "Large brush" -msgstr "大画笔" - -#: ../app/tools/gimpforegroundselectoptions.c:339 -msgid "Smoothing:" -msgstr "光滑：" - -#: ../app/tools/gimpforegroundselectoptions.c:345 -msgid "Preview color:" -msgstr "预览颜色：" - -#. granularity -#: ../app/tools/gimpforegroundselectoptions.c:348 -msgid "Color Sensitivity" -msgstr "颜色灵敏度" - -#: ../app/tools/gimpforegroundselecttool.c:144 +#: ../app/tools/gimpforegroundselecttool.c:189 msgid "Foreground Select" msgstr "前景选择" -#: ../app/tools/gimpforegroundselecttool.c:145 +#: ../app/tools/gimpforegroundselecttool.c:190 msgid "Foreground Select Tool: Select a region containing foreground objects" msgstr "前景选择工具：选择包含前景对象的区域" -#: ../app/tools/gimpforegroundselecttool.c:146 +#: ../app/tools/gimpforegroundselecttool.c:191 msgid "F_oreground Select" msgstr "前景选择(_O)" -#: ../app/tools/gimpforegroundselecttool.c:302 -msgid "Add more strokes or press Enter to accept the selection" -msgstr "添加更多笔划或按 Enter 键以确认选区" +#: ../app/tools/gimpforegroundselecttool.c:307 +msgid "Dialog for foreground select" +msgstr "前景选择对话框" -#: ../app/tools/gimpforegroundselecttool.c:304 -msgid "Mark foreground by painting on the object to extract" -msgstr "在对象上涂画标记出前景以提取" +#: ../app/tools/gimpforegroundselecttool.c:325 +msgid "_Preview mask" +msgstr "预览蒙板" -#: ../app/tools/gimpforegroundselecttool.c:309 +#: ../app/tools/gimpforegroundselecttool.c:336 +msgid "Select foreground pixels" +msgstr "选择前景像素" + +#: ../app/tools/gimpforegroundselecttool.c:612 msgid "Roughly outline the object to extract" msgstr "为对象画一个粗略的轮廓以便提取" -#: ../app/tools/gimpforegroundselecttool.c:751 -msgctxt "command" -msgid "Foreground Select" -msgstr "前景选择" +#: ../app/tools/gimpforegroundselecttool.c:633 +msgid "Selecting foreground," +msgstr "正在选择前景，" -#: ../app/tools/gimpfreeselecttool.c:197 +#: ../app/tools/gimpforegroundselecttool.c:635 +msgid "Selecting background," +msgstr "正在选择背景，" + +#: ../app/tools/gimpforegroundselecttool.c:637 +msgid "Selecting unknown," +msgstr "正在选择未知，" + +#: ../app/tools/gimpforegroundselecttool.c:640 +msgid "press Enter to preview." +msgstr "按 Enter 以预览。" + +#: ../app/tools/gimpforegroundselecttool.c:642 +msgid "press Escape to exit preview or Enter to apply." +msgstr "按 Esc 以退出预览或按 Enter 以应用。" + +#: ../app/tools/gimpforegroundselecttool.c:1219 +msgid "Paint mask" +msgstr "绘画蒙板" + +#: ../app/tools/gimpfreeselecttool.c:129 msgid "" "Free Select Tool: Select a hand-drawn region with free and polygonal segments" -msgstr "自由选择工具：选择手绘区域" +msgstr "自由选区工具：使用自由线条或多边形线段选择手绘区域" -#: ../app/tools/gimpfreeselecttool.c:198 +#: ../app/tools/gimpfreeselecttool.c:131 msgid "_Free Select" msgstr "自由选择(_F)" -#: ../app/tools/gimpfreeselecttool.c:1030 -msgid "Click to complete selection" -msgstr "点击并拖动可创建新的选区" - -#: ../app/tools/gimpfreeselecttool.c:1034 -msgid "Click-Drag to move segment vertex" -msgstr "点击并拖动可移动组件" - -#: ../app/tools/gimpfreeselecttool.c:1039 -msgid "Return commits, Escape cancels, Backspace removes last segment" -msgstr "回车键以确认，Esc 键以取消，回退键以移除最后片段" - -#: ../app/tools/gimpfreeselecttool.c:1043 -msgid "Click-Drag adds a free segment, Click adds a polygonal segment" -msgstr "点击并拖动以添加自由选区，点击以添加多边形选区" - -#: ../app/tools/gimpfreeselecttool.c:1562 +#: ../app/tools/gimpfreeselecttool.c:494 msgctxt "command" msgid "Free Select" msgstr "自由选择" -#: ../app/tools/gimpfuzzyselecttool.c:65 +#: ../app/tools/gimpfuzzyselecttool.c:66 msgid "Fuzzy Select" msgstr "模糊选择" -#: ../app/tools/gimpfuzzyselecttool.c:66 +#: ../app/tools/gimpfuzzyselecttool.c:67 msgid "Fuzzy Select Tool: Select a contiguous region on the basis of color" msgstr "模糊选择工具：根据颜色选择连续的区域" -#: ../app/tools/gimpfuzzyselecttool.c:67 +#: ../app/tools/gimpfuzzyselecttool.c:68 msgid "Fu_zzy Select" msgstr "模糊选择(_Z)" -#: ../app/tools/gimpfuzzyselecttool.c:80 +#: ../app/tools/gimpfuzzyselecttool.c:81 msgctxt "command" msgid "Fuzzy Select" msgstr "模糊选择" -#: ../app/tools/gimpgegltool.c:72 ../app/tools/gimpgegltool.c:85 -#: ../app/tools/gimpoperationtool.c:100 ../app/tools/gimpoperationtool.c:119 +#: ../app/tools/gimpgegltool.c:78 ../app/tools/gimpgegltool.c:539 +#: ../app/tools/gimpgegltool.c:540 ../app/tools/gimpoperationtool.c:134 msgid "GEGL Operation" msgstr "GEGL 操作" -#: ../app/tools/gimpgegltool.c:73 +#: ../app/tools/gimpgegltool.c:79 msgid "GEGL Tool: Use an arbitrary GEGL operation" msgstr "GEGL 工具：使用无基准的 GEGL 操作" -#: ../app/tools/gimpgegltool.c:74 ../app/tools/gimpoperationtool.c:102 +#: ../app/tools/gimpgegltool.c:80 ../app/tools/gimpoperationtool.c:136 msgid "_GEGL Operation..." -msgstr "GEGL 操作(_G)..." +msgstr "_GEGL 操作…" -#: ../app/tools/gimpgegltool.c:319 +#. The options vbox +#: ../app/tools/gimpgegltool.c:484 msgid "Select an operation from the list above" msgstr "从以上列表中选择一项操作" +#: ../app/tools/gimpgenerictransformtool.c:83 +msgid "Transform Matrix" +msgstr "变换矩阵" + +#: ../app/tools/gimpgenerictransformtool.c:114 +msgid "Invalid transform" +msgstr "无效变换" + +#: ../app/tools/gimpguidetool.c:274 +msgid "Remove Guide" +msgstr "删除参考线" + +#: ../app/tools/gimpguidetool.c:274 +msgid "Cancel Guide" +msgstr "取消参考线" + +#: ../app/tools/gimpguidetool.c:279 ../app/tools/gimpguidetool.c:360 +msgid "Move Guide: " +msgstr "移动参考线： " + +#: ../app/tools/gimpguidetool.c:288 ../app/tools/gimpguidetool.c:369 +msgid "Add Guide: " +msgstr "添加参考线： " + +#: ../app/tools/gimphandletransformoptions.c:73 +#: ../app/tools/gimphandletransformoptions.c:74 +msgid "Handle mode" +msgstr "控制柄模式" + +#: ../app/tools/gimphandletransformoptions.c:167 +msgid "Add handles and transform the image" +msgstr "添加控制柄并变换图像" + +#: ../app/tools/gimphandletransformoptions.c:172 +msgid "Move transform handles" +msgstr "移动变换控制柄" + +#: ../app/tools/gimphandletransformoptions.c:177 +msgid "Remove transform handles" +msgstr "删除变换控制柄" + +#: ../app/tools/gimphandletransformtool.c:115 +msgid "Handle Transform" +msgstr "控制柄变换" + +#: ../app/tools/gimphandletransformtool.c:116 +msgid "Handle Transform Tool: Deform the layer, selection or path with handles" +msgstr "控制柄变换工具：使用控制柄变换图层，选区或路径" + +#: ../app/tools/gimphandletransformtool.c:118 +msgid "_Handle Transform" +msgstr "控制柄变换(_H)" + +#: ../app/tools/gimphandletransformtool.c:146 +msgid "Handle transformation" +msgstr "控制柄变换" + +#: ../app/tools/gimphandletransformtool.c:310 +msgctxt "undo-type" +msgid "Handle transform" +msgstr "控制柄变换" + #: ../app/tools/gimphealtool.c:54 msgid "Healing Tool: Heal image irregularities" -msgstr "复原工具：复原图像的不规则" +msgstr "修复工具：修复图像的不规则" #: ../app/tools/gimphealtool.c:55 msgid "_Heal" -msgstr "复原(_H)" +msgstr "修复(_H)" #: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:80 msgid "Click to heal" -msgstr "点击以复原" +msgstr "单击以修复" #: ../app/tools/gimphealtool.c:78 ../app/tools/gimphealtool.c:83 #, c-format msgid "%s to set a new heal source" -msgstr "%s 可设定新的复原源" +msgstr "%s 可设定新的修复源" #. Translators: the translation of "Click" must be the first word #: ../app/tools/gimphealtool.c:82 msgid "Click to set a new heal source" -msgstr "单击可设定新的复原源" +msgstr "单击可设定新的修复源" -#: ../app/tools/gimphistogramoptions.c:127 +#: ../app/tools/gimphistogramoptions.c:63 msgid "Histogram Scale" -msgstr "直方图尺度" - -#: ../app/tools/gimphuesaturationtool.c:98 -msgid "Hue-Saturation Tool: Adjust hue, saturation, and lightness" -msgstr "色调-饱和度工具：调整色调，饱和度，以及亮度" - -#: ../app/tools/gimphuesaturationtool.c:99 -msgid "Hue-_Saturation..." -msgstr "色调-饱和度(_S)..." - -#: ../app/tools/gimphuesaturationtool.c:113 -msgid "Adjust Hue / Lightness / Saturation" -msgstr "调整色调 / 亮度 / 饱和度" - -#: ../app/tools/gimphuesaturationtool.c:115 -msgid "Import Hue-Saturation Settings" -msgstr "导入色调-饱和度选项" - -#: ../app/tools/gimphuesaturationtool.c:116 -msgid "Export Hue-Saturation Settings" -msgstr "导出色调-饱和度选项" - -#: ../app/tools/gimphuesaturationtool.c:143 -msgid "Hue-Saturation operates only on RGB color layers." -msgstr "只有 RGB 颜色的图层可以进行色调-饱和度操作。" - -#: ../app/tools/gimphuesaturationtool.c:212 -msgid "M_aster" -msgstr "主值(_A)" - -#: ../app/tools/gimphuesaturationtool.c:212 -msgid "Adjust all colors" -msgstr "调整全部颜色" - -#: ../app/tools/gimphuesaturationtool.c:213 -msgid "_R" -msgstr "红(_R)" - -#: ../app/tools/gimphuesaturationtool.c:214 -msgid "_Y" -msgstr "黄(_Y)" - -#: ../app/tools/gimphuesaturationtool.c:215 -msgid "_G" -msgstr "绿(_G)" - -#: ../app/tools/gimphuesaturationtool.c:216 -msgid "_C" -msgstr "青(_C)" - -#: ../app/tools/gimphuesaturationtool.c:217 -msgid "_B" -msgstr "蓝(_B)" - -#: ../app/tools/gimphuesaturationtool.c:218 -msgid "_M" -msgstr "品(_M)" - -#: ../app/tools/gimphuesaturationtool.c:223 -msgid "Select Primary Color to Adjust" -msgstr "按选择要修改的色系" - -#: ../app/tools/gimphuesaturationtool.c:313 -msgid "_Overlap:" -msgstr "覆盖(_O)：" - -#: ../app/tools/gimphuesaturationtool.c:329 -msgid "Adjust Selected Color" -msgstr "修改选中的颜色" - -#: ../app/tools/gimphuesaturationtool.c:396 -msgid "R_eset Color" -msgstr "重置颜色(_E)" - -#: ../app/tools/gimpimagemaptool.c:403 -msgid "_Preview" -msgstr "预览(_P)" - -#: ../app/tools/gimpimagemaptool-settings.c:83 -msgid "Pre_sets:" -msgstr "预设(_S):" - -#: ../app/tools/gimpimagemaptool-settings.c:215 -#, c-format -msgid "Settings saved to '%s'" -msgstr "设置已保存到“%s”" +msgstr "直方图缩放" #. adjust sliders #: ../app/tools/gimpinkoptions-gui.c:55 msgid "Adjustment" msgstr "调整" -#: ../app/tools/gimpinkoptions-gui.c:65 ../app/tools/gimpinkoptions-gui.c:88 -#: ../app/tools/gimppaintoptions-gui.c:134 -msgid "Size" -msgstr "大小" - -#: ../app/tools/gimpinkoptions-gui.c:72 -#: ../app/tools/gimppaintoptions-gui.c:184 -#: ../app/widgets/gimpbrusheditor.c:200 -msgid "Angle" -msgstr "角度" - #. sens sliders -#: ../app/tools/gimpinkoptions-gui.c:78 +#: ../app/tools/gimpinkoptions-gui.c:76 msgid "Sensitivity" msgstr "灵敏度" -#: ../app/tools/gimpinkoptions-gui.c:95 -#: ../app/widgets/gimpdynamicseditor.c:145 -#: ../app/widgets/gimpdynamicsoutputeditor.c:73 -msgid "Tilt" -msgstr "倾斜" - -#: ../app/tools/gimpinkoptions-gui.c:102 -msgid "Speed" -msgstr "速度" - -#. Blob shape widgets -#: ../app/tools/gimpinkoptions-gui.c:108 -msgid "Shape" -msgstr "形状" - -#: ../app/tools/gimpinktool.c:56 +#: ../app/tools/gimpinktool.c:62 msgid "Ink Tool: Calligraphy-style painting" msgstr "墨水工具：书法风格的绘制" -#: ../app/tools/gimpinktool.c:57 +#: ../app/tools/gimpinktool.c:63 msgid "In_k" msgstr "墨水(_K)" #: ../app/tools/gimpiscissorsoptions.c:69 -#, fuzzy -msgid "Display future selection segment as you drag a control node" -msgstr "显示选区的轮廓" - -#: ../app/tools/gimpiscissorsoptions.c:128 msgid "Interactive boundary" msgstr "互动边界" -#: ../app/tools/gimpiscissorstool.c:275 +#: ../app/tools/gimpiscissorsoptions.c:70 +msgid "Display future selection segment as you drag a control node" +msgstr "随着您拖动控制节点显示将生成的选区片段" + +#: ../app/tools/gimpiscissorstool.c:292 msgid "Scissors" msgstr "剪刀" -#: ../app/tools/gimpiscissorstool.c:276 +#: ../app/tools/gimpiscissorstool.c:293 msgid "Scissors Select Tool: Select shapes using intelligent edge-fitting" msgstr "剪刀选择工具：用智能边缘适配选取形状" -#: ../app/tools/gimpiscissorstool.c:277 +#: ../app/tools/gimpiscissorstool.c:294 msgid "Intelligent _Scissors" msgstr "智能剪刀(_S)" -#: ../app/tools/gimpiscissorstool.c:900 ../app/tools/gimpmeasuretool.c:605 -msgid "Click-Drag to move this point" -msgstr "点击并拖动可移动此点" +#: ../app/tools/gimpiscissorstool.c:905 +msgid "Click to remove this point" +msgstr "单击以删除该点" -#: ../app/tools/gimpiscissorstool.c:902 ../app/tools/gimpiscissorstool.c:967 +#: ../app/tools/gimpiscissorstool.c:913 ../app/tools/gimpiscissorstool.c:982 #, c-format msgid "%s: disable auto-snap" msgstr "%s：禁用自动吸附" -#: ../app/tools/gimpiscissorstool.c:919 +#: ../app/tools/gimpiscissorstool.c:914 +#, c-format +msgid "%s: remove this point" +msgstr "%s：删除该点" + +#: ../app/tools/gimpiscissorstool.c:934 msgid "Click to close the curve" -msgstr "点击可闭合曲线" +msgstr "单击以闭合曲线" -#: ../app/tools/gimpiscissorstool.c:925 +#: ../app/tools/gimpiscissorstool.c:940 msgid "Click to add a point on this segment" -msgstr "点击可在此节上添加点" +msgstr "单击以在该线段上添加点" -#: ../app/tools/gimpiscissorstool.c:939 +#: ../app/tools/gimpiscissorstool.c:953 msgid "Click or press Enter to convert to a selection" -msgstr "点击或按 Enter 可转换到选区" +msgstr "单击或按 Enter 以转换为选区" -#: ../app/tools/gimpiscissorstool.c:949 +#: ../app/tools/gimpiscissorstool.c:963 msgid "Press Enter to convert to a selection" -msgstr "按 Enter 键可转换为选区" +msgstr "按 Enter 键以转换为选区" -#: ../app/tools/gimpiscissorstool.c:964 +#: ../app/tools/gimpiscissorstool.c:979 msgid "Click or Click-Drag to add a point" -msgstr "点击或点击拖动可添加点" +msgstr "单击或单击拖动以添加点" -#: ../app/tools/gimplevelstool.c:142 -msgid "Levels Tool: Adjust color levels" -msgstr "色阶工具：调整颜色色阶" +#: ../app/tools/gimpiscissorstool.c:1117 ../app/tools/gimpiscissorstool.c:1129 +msgid "Modify Scissors Curve" +msgstr "修改剪刀曲线" -#: ../app/tools/gimplevelstool.c:143 +#: ../app/tools/gimplevelstool.c:134 msgid "_Levels..." -msgstr "色阶(_L)..." +msgstr "色阶(_L)…" -#: ../app/tools/gimplevelstool.c:162 -msgid "Import Levels" -msgstr "导入色阶" +#: ../app/tools/gimplevelstool.c:271 +msgid "Pick black point for all channels" +msgstr "为所有通道拾取黑点" -#: ../app/tools/gimplevelstool.c:163 -msgid "Export Levels" -msgstr "导出色阶" +#: ../app/tools/gimplevelstool.c:273 +msgid "Pick black point for the selected channel" +msgstr "为选中通道拾取黑点" -#: ../app/tools/gimplevelstool.c:264 -msgid "Pick black point" -msgstr "拾取黑点" +#: ../app/tools/gimplevelstool.c:280 +msgid "Pick gray point for all channels" +msgstr "为所有通道拾取灰点" -#: ../app/tools/gimplevelstool.c:268 -msgid "Pick gray point" -msgstr "拾取灰点" +#: ../app/tools/gimplevelstool.c:282 +msgid "Pick gray point for the selected channel" +msgstr "为选中通道拾取灰点" -#: ../app/tools/gimplevelstool.c:272 -msgid "Pick white point" -msgstr "拾取白点" +#: ../app/tools/gimplevelstool.c:289 +msgid "Pick white point for all channels" +msgstr "为所有通道拾取白点" + +#: ../app/tools/gimplevelstool.c:291 +msgid "Pick white point for the selected channel" +msgstr "为选中通道拾取白点" + +#: ../app/tools/gimplevelstool.c:395 +msgid "Adjust levels in linear light" +msgstr "根据线性光调整色阶" + +#: ../app/tools/gimplevelstool.c:396 +msgid "Adjust levels perceptually" +msgstr "根据感官调整色阶" #. Input levels frame -#: ../app/tools/gimplevelstool.c:359 +#: ../app/tools/gimplevelstool.c:405 msgid "Input Levels" msgstr "输入色阶" -#: ../app/tools/gimplevelstool.c:462 -msgid "Gamma" -msgstr "Gamma" +#: ../app/tools/gimplevelstool.c:492 +msgid "Clamp _input" +msgstr "固定输入(_I)" #. Output levels frame -#: ../app/tools/gimplevelstool.c:504 +#: ../app/tools/gimplevelstool.c:535 msgid "Output Levels" msgstr "输出色阶" +#: ../app/tools/gimplevelstool.c:583 +msgid "Clamp outpu_t" +msgstr "固定输出(_T)" + #. all channels frame -#: ../app/tools/gimplevelstool.c:581 +#: ../app/tools/gimplevelstool.c:598 msgid "All Channels" msgstr "所有通道" -#: ../app/tools/gimplevelstool.c:593 ../app/tools/gimpthresholdtool.c:239 -msgid "_Auto" -msgstr "自动(_A)" +#: ../app/tools/gimplevelstool.c:610 +msgid "_Auto Input Levels" +msgstr "自动输入色阶(_A)" -#: ../app/tools/gimplevelstool.c:595 -msgid "Adjust levels automatically" -msgstr "自动调整色阶" +#: ../app/tools/gimplevelstool.c:613 +msgid "Adjust levels for all channels automatically" +msgstr "自动为所有通道调整色阶" -#: ../app/tools/gimplevelstool.c:618 +#: ../app/tools/gimplevelstool.c:640 msgid "Edit these Settings as Curves" msgstr "将此设置作为曲线编辑" -#: ../app/tools/gimplevelstool.c:752 +#: ../app/tools/gimplevelstool.c:860 msgid "Use _old levels file format" msgstr "使用旧色阶文件格式(_O)" -#: ../app/tools/gimpmagnifyoptions.c:80 -msgid "Resize image window to accommodate new zoom level" -msgstr "" - -#: ../app/tools/gimpmagnifyoptions.c:87 -msgid "Direction of magnification" -msgstr "" - -#: ../app/tools/gimpmagnifyoptions.c:173 +#: ../app/tools/gimpmagnifyoptions.c:83 msgid "Auto-resize window" msgstr "自动改变窗口大小" -#. tool toggle -#: ../app/tools/gimpmagnifyoptions.c:178 -#, fuzzy, c-format -msgid "Direction (%s)" +#: ../app/tools/gimpmagnifyoptions.c:84 +msgid "Resize image window to accommodate new zoom level" +msgstr "改变图像窗口大小以适应新的缩放级别" + +#: ../app/tools/gimpmagnifyoptions.c:91 ../app/tools/gimptransformoptions.c:116 +#: ../app/widgets/gimpdynamicseditor.c:163 +#: ../app/widgets/gimpdynamicsoutputeditor.c:72 +msgid "Direction" msgstr "方向" -#: ../app/tools/gimpmagnifytool.c:91 +#: ../app/tools/gimpmagnifyoptions.c:92 +msgid "Direction of magnification" +msgstr "放大方向" + +#: ../app/tools/gimpmagnifytool.c:93 msgid "Zoom" msgstr "缩放" -#: ../app/tools/gimpmagnifytool.c:92 +#: ../app/tools/gimpmagnifytool.c:94 msgid "Zoom Tool: Adjust the zoom level" msgstr "缩放工具：调整缩放级别" -#: ../app/tools/gimpmagnifytool.c:93 -#, fuzzy +#: ../app/tools/gimpmagnifytool.c:95 msgid "_Zoom" msgstr "缩放(_Z)" -#: ../app/tools/gimpmeasureoptions.c:68 +#: ../app/tools/gimpmeasureoptions.c:69 msgid "Open a floating dialog to view details about measurements" -msgstr "" +msgstr "打开一个浮动对话框以查看测量详情" -#: ../app/tools/gimpmeasureoptions.c:126 -msgid "Use info window" -msgstr "使用信息窗口" - -#: ../app/tools/gimpmeasuretool.c:127 +#: ../app/tools/gimpmeasuretool.c:121 msgid "Measure" msgstr "测量" -#: ../app/tools/gimpmeasuretool.c:128 +#: ../app/tools/gimpmeasuretool.c:122 msgid "Measure Tool: Measure distances and angles" msgstr "测量工具：测量距离和角度" -#: ../app/tools/gimpmeasuretool.c:129 +#: ../app/tools/gimpmeasuretool.c:123 msgid "_Measure" msgstr "测量(_M)" -#: ../app/tools/gimpmeasuretool.c:247 +#: ../app/tools/gimpmeasuretool.c:156 +msgid "Click-Drag to create a line" +msgstr "单击并拖动以创建一条直线" + +#: ../app/tools/gimpmeasuretool.c:334 msgid "Add Guides" msgstr "添加参考线" -#: ../app/tools/gimpmeasuretool.c:313 -#, fuzzy -msgid "Drag to create a line" -msgstr "点击并拖动可创建新的选区" - -#: ../app/tools/gimpmeasuretool.c:560 -msgid "Click to place vertical and horizontal guides" -msgstr "点击可放置垂直和水平参考线" - -#: ../app/tools/gimpmeasuretool.c:568 -msgid "Click to place a horizontal guide" -msgstr "点击可放置水平参考线" - -#: ../app/tools/gimpmeasuretool.c:582 -msgid "Click to place a vertical guide" -msgstr "点击可放置垂直参考线" - -#: ../app/tools/gimpmeasuretool.c:595 -msgid "Click-Drag to add a new point" -msgstr "点击并拖动可添加新的点" - -#: ../app/tools/gimpmeasuretool.c:624 -msgid "Click-Drag to move all points" -msgstr "点击并拖动可移动所有点" - -#: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 -#: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 -#: ../app/tools/gimppainttool.c:632 -msgid "pixels" -msgstr "像素" - -#: ../app/tools/gimpmeasuretool.c:1052 +#: ../app/tools/gimpmeasuretool.c:645 msgid "Measure Distances and Angles" msgstr "测量距离和角度" -#: ../app/tools/gimpmeasuretool.c:1073 +#: ../app/tools/gimpmeasuretool.c:670 msgid "Distance:" msgstr "距离：" -#: ../app/tools/gimpmeasuretool.c:1101 -msgid "Angle:" -msgstr "角度：" - -#: ../app/tools/gimpmoveoptions.c:140 +#: ../app/tools/gimpmoveoptions.c:143 msgid "Pick a layer or guide" msgstr "拾取图层或参考线" -#: ../app/tools/gimpmoveoptions.c:141 +#: ../app/tools/gimpmoveoptions.c:144 msgid "Move the active layer" msgstr "移动活动图层" -#: ../app/tools/gimpmoveoptions.c:145 +#: ../app/tools/gimpmoveoptions.c:148 msgid "Move selection" msgstr "移动选区" -#: ../app/tools/gimpmoveoptions.c:149 +#: ../app/tools/gimpmoveoptions.c:152 msgid "Pick a path" msgstr "拾取路径" -#: ../app/tools/gimpmoveoptions.c:150 +#: ../app/tools/gimpmoveoptions.c:153 msgid "Move the active path" msgstr "移动活动路径" -#: ../app/tools/gimpmoveoptions.c:179 +#: ../app/tools/gimpmoveoptions.c:182 msgid "Move:" msgstr "移动：" -#. tool toggle -#: ../app/tools/gimpmoveoptions.c:188 +#: ../app/tools/gimpmoveoptions.c:192 #, c-format msgid "Tool Toggle (%s)" -msgstr "工具切换(%s)" +msgstr "工具切换 (%s)" -#: ../app/tools/gimpmovetool.c:127 +#: ../app/tools/gimpmovetool.c:112 msgctxt "tool" msgid "Move" msgstr "移动" -#: ../app/tools/gimpmovetool.c:128 +#: ../app/tools/gimpmovetool.c:113 msgid "Move Tool: Move layers, selections, and other objects" -msgstr "移动工具：移动图层、选区、以及其他对象" +msgstr "移动工具：移动图层，选区，和其他对象" -#: ../app/tools/gimpmovetool.c:129 +#: ../app/tools/gimpmovetool.c:114 msgid "_Move" msgstr "移动(_M)" -#: ../app/tools/gimpmovetool.c:249 ../app/tools/gimpmovetool.c:554 -msgid "Move Guide: " -msgstr "移动参考线：" +#: ../app/tools/gimpmovetool.c:256 +msgid "There is no path to move." +msgstr "没有路径可移动。" -#: ../app/tools/gimpmovetool.c:548 -msgid "Remove Guide" -msgstr "删除参考线" +#: ../app/tools/gimpmovetool.c:257 ../app/tools/gimptransformtool.c:1470 +msgid "The active path's position is locked." +msgstr "活动路径的位置已锁定。" -#: ../app/tools/gimpmovetool.c:548 -msgid "Cancel Guide" -msgstr "取消参考线" +#: ../app/tools/gimpmovetool.c:288 +msgid "The selection is empty." +msgstr "选区为空。" -#: ../app/tools/gimpmovetool.c:554 -msgid "Add Guide: " -msgstr "添加参考线：" +#: ../app/tools/gimpmovetool.c:296 +msgid "There is no layer to move." +msgstr "没有图层可移动。" -#: ../app/tools/gimpoperationtool.c:101 -#, fuzzy +#: ../app/tools/gimpmovetool.c:300 ../app/tools/gimpmovetool.c:326 +msgid "The active layer's position is locked." +msgstr "活动图层的位置已锁定。" + +#: ../app/tools/gimpmovetool.c:313 +msgid "The active channel's position is locked." +msgstr "活动通道的位置已锁定。" + +#: ../app/tools/gimpmybrushtool.c:74 +msgid "MyPaint Brush Tool: Use MyPaint brushes in GIMP" +msgstr "MyPaint 笔刷工具：在 GIMP 中使用 MyPaint 笔刷" + +#: ../app/tools/gimpmybrushtool.c:75 +msgid "M_yPaint Brush" +msgstr "MyPaint 笔刷(_Y)" + +#: ../app/tools/gimpnpointdeformationoptions.c:77 +#: ../app/tools/gimpnpointdeformationoptions.c:78 +msgid "Density" +msgstr "密度" + +#: ../app/tools/gimpnpointdeformationoptions.c:84 +#: ../app/tools/gimpnpointdeformationoptions.c:85 +msgid "Rigidity" +msgstr "硬度" + +#: ../app/tools/gimpnpointdeformationoptions.c:91 +#: ../app/tools/gimpnpointdeformationoptions.c:92 +msgid "Deformation mode" +msgstr "变形模式" + +#: ../app/tools/gimpnpointdeformationoptions.c:98 +#: ../app/tools/gimpnpointdeformationoptions.c:99 +msgid "Use weights" +msgstr "使用重量" + +#: ../app/tools/gimpnpointdeformationoptions.c:105 +msgid "Control points influence" +msgstr "控制点影响" + +#: ../app/tools/gimpnpointdeformationoptions.c:106 +msgid "Amount of control points' influence" +msgstr "控制点的影响数量" + +#: ../app/tools/gimpnpointdeformationoptions.c:112 +#: ../app/tools/gimpnpointdeformationoptions.c:113 +msgid "Show lattice" +msgstr "显示网格" + +#: ../app/tools/gimpnpointdeformationoptions.c:230 +#: ../app/tools/gimpscaletool.c:90 ../app/tools/gimptransformoptions.c:546 +#: ../app/tools/gimptransformoptions.c:557 +msgid "Scale" +msgstr "缩放" + +#: ../app/tools/gimpnpointdeformationoptions.c:231 +msgid "Rigid (Rubber)" +msgstr "硬度(橡胶)" + +#: ../app/tools/gimpnpointdeformationtool.c:158 +#: ../app/tools/gimpnpointdeformationtool.c:1000 +#: ../app/tools/gimpnpointdeformationtool.c:1004 +msgid "N-Point Deformation" +msgstr "N 点变形" + +#: ../app/tools/gimpnpointdeformationtool.c:159 +msgid "N-Point Deformation Tool: Rubber-like deformation of image using points" +msgstr "N 点变形工具：使用点对图像进行类似橡胶的变形" + +#: ../app/tools/gimpnpointdeformationtool.c:161 +msgid "_N-Point Deformation" +msgstr "_N 点变形" + +#: ../app/tools/gimpoperationtool.c:135 msgid "Operation Tool: Use an arbitrary GEGL operation" -msgstr "GEGL 工具：使用无基准的 GEGL 操作" +msgstr "操作工具：使用无基准的 GEGL 操作" + +#. don't translate "Aux" +#: ../app/tools/gimpoperationtool.c:547 +#, c-format +msgid "Aux Input" +msgstr "Aux 输入" + +#. don't translate "Aux" +#: ../app/tools/gimpoperationtool.c:553 +#, c-format +msgid "Aux%d Input" +msgstr "Aux%d 输入" #: ../app/tools/gimppaintbrushtool.c:52 msgid "Paintbrush Tool: Paint smooth strokes using a brush" -msgstr "画笔工具：使用画笔平滑绘画" +msgstr "画笔工具：使用笔刷平滑绘画" #: ../app/tools/gimppaintbrushtool.c:53 msgid "_Paintbrush" msgstr "画笔(_P)" -#: ../app/tools/gimppaintoptions-gui.c:92 -#: ../app/tools/gimpselectionoptions.c:218 -#: ../app/widgets/gimpbrushselect.c:191 ../app/widgets/gimplayertreeview.c:268 -msgid "Mode:" -msgstr "模式：" +#: ../app/tools/gimppaintoptions-gui.c:165 +msgid "Edit this brush" +msgstr "编辑该笔刷" -#: ../app/tools/gimppaintoptions-gui.c:123 -msgid "Brush" -msgstr "画笔" - -#: ../app/tools/gimppaintoptions-gui.c:153 +#: ../app/tools/gimppaintoptions-gui.c:173 msgid "Reset size to brush's native size" -msgstr "" +msgstr "重置为笔刷的原始大小" -#: ../app/tools/gimppaintoptions-gui.c:160 -msgid "Aspect Ratio" -msgstr "宽高比" +#: ../app/tools/gimppaintoptions-gui.c:181 +msgid "Reset aspect ratio to brush's native aspect ratio" +msgstr "重置为笔刷的原始宽高比" -#: ../app/tools/gimppaintoptions-gui.c:177 -msgid "Reset aspect ratio to brush's native" -msgstr "" +#: ../app/tools/gimppaintoptions-gui.c:189 +msgid "Reset angle to brush's native angle" +msgstr "重置为笔刷的原始角度" -#: ../app/tools/gimppaintoptions-gui.c:201 -#, fuzzy -msgid "Reset angle to zero" -msgstr "重置所有滤镜" +#: ../app/tools/gimppaintoptions-gui.c:197 +msgid "Reset spacing to brush's native spacing" +msgstr "重置为笔刷的原始间距" -#: ../app/tools/gimppaintoptions-gui.c:239 -msgid "Incremental" -msgstr "增值" +#: ../app/tools/gimppaintoptions-gui.c:205 +msgid "Reset hardness to brush's native hardness" +msgstr "重置为笔刷的原始硬度" -#: ../app/tools/gimppaintoptions-gui.c:257 -msgid "Hard edge" -msgstr "硬质边界" +#: ../app/tools/gimppaintoptions-gui.c:213 +msgid "Reset force to default" +msgstr "重置力度为默认值" -#: ../app/tools/gimppaintoptions-gui.c:286 -#, fuzzy -msgid "Dynamics Options" -msgstr "动态文件夹" +#: ../app/tools/gimppaintoptions-gui.c:229 +msgid "Edit this dynamics" +msgstr "编辑该动态" -#: ../app/tools/gimppaintoptions-gui.c:292 -#, fuzzy +#: ../app/tools/gimppaintoptions-gui.c:325 msgid "Fade Options" -msgstr "已保存的选项" +msgstr "淡出选项" -#: ../app/tools/gimppaintoptions-gui.c:306 -#, fuzzy -msgid "Fade length" -msgstr "淡出" - -#: ../app/tools/gimppaintoptions-gui.c:335 -#: ../app/widgets/gimpviewablebox.c:312 -msgid "Reverse" -msgstr "反向" - -#: ../app/tools/gimppaintoptions-gui.c:342 -#, fuzzy +#: ../app/tools/gimppaintoptions-gui.c:369 msgid "Color Options" -msgstr "工具选项" +msgstr "颜色选项" -#: ../app/tools/gimppaintoptions-gui.c:368 -msgid "Amount" -msgstr "计数" +#: ../app/tools/gimppaintoptions-gui.c:622 +msgid "Link to brush default" +msgstr "默认链接到笔刷" -#: ../app/tools/gimppaintoptions-gui.c:372 -msgid "Apply Jitter" -msgstr "应用抖动" - -#: ../app/tools/gimppaintoptions-gui.c:390 -#, fuzzy -msgid "Smooth stroke" -msgstr "删除路径笔划" - -#: ../app/tools/gimppaintoptions-gui.c:400 -#, fuzzy -msgid "Weight" -msgstr "高度" - -#: ../app/tools/gimppainttool.c:138 +#: ../app/tools/gimppainttool.c:158 msgid "Click to paint" -msgstr "点击以涂画" +msgstr "单击以绘画" -#: ../app/tools/gimppainttool.c:139 +#: ../app/tools/gimppainttool.c:159 msgid "Click to draw the line" -msgstr "点击可绘制线段" +msgstr "单击以绘制线段" -#: ../app/tools/gimppainttool.c:140 +#: ../app/tools/gimppainttool.c:160 #, c-format msgid "%s to pick a color" -msgstr "%s 可拾取颜色" +msgstr "%s 以拾取颜色" -#: ../app/tools/gimppainttool.c:259 +#: ../app/tools/gimppainttool.c:270 msgid "Cannot paint on layer groups." -msgstr "不能在图层群组上绘画" +msgstr "不能在图层组上绘画。" -#: ../app/tools/gimppainttool.c:678 +#: ../app/tools/gimppainttool.c:600 #, c-format msgid "%s for a straight line" msgstr "%s 可画出直线" #: ../app/tools/gimppenciltool.c:52 msgid "Pencil Tool: Hard edge painting using a brush" -msgstr "铅笔工具：使用画笔做硬边缘的绘画" +msgstr "铅笔工具：使用笔刷做硬边缘的绘画" #: ../app/tools/gimppenciltool.c:53 msgid "Pe_ncil" msgstr "铅笔(_N)" -#: ../app/tools/gimpperspectiveclonetool.c:134 +#: ../app/tools/gimpperspectiveclonetool.c:143 msgid "" "Perspective Clone Tool: Clone from an image source after applying a " "perspective transformation" msgstr "透视克隆工具：从应用透视变换之后的图像源克隆" -#: ../app/tools/gimpperspectiveclonetool.c:136 +#: ../app/tools/gimpperspectiveclonetool.c:145 msgid "_Perspective Clone" msgstr "透视克隆(_P)" -#: ../app/tools/gimpperspectiveclonetool.c:675 +#: ../app/tools/gimpperspectiveclonetool.c:556 msgid "Ctrl-Click to set a clone source" -msgstr "Ctrl+单击可设定克隆源" +msgstr "Ctrl+单击以设定克隆源" -#: ../app/tools/gimpperspectivetool.c:83 +#: ../app/tools/gimpperspectivetool.c:86 msgid "Perspective Tool: Change perspective of the layer, selection or path" msgstr "透视工具：改变图层，选区或路径的透视" -#: ../app/tools/gimpperspectivetool.c:85 +#: ../app/tools/gimpperspectivetool.c:88 msgid "_Perspective" msgstr "透视(_P)" -#: ../app/tools/gimpperspectivetool.c:113 +#: ../app/tools/gimpperspectivetool.c:117 msgid "Perspective transformation" msgstr "透视变换" -#: ../app/tools/gimpperspectivetool.c:131 -msgid "Transformation Matrix" -msgstr "变换矩阵" - -#: ../app/tools/gimpperspectivetool.c:256 -#, fuzzy +#: ../app/tools/gimpperspectivetool.c:182 msgctxt "undo-type" msgid "Perspective" msgstr "透视" -#: ../app/tools/gimpposterizetool.c:79 -msgid "Posterize Tool: Reduce to a limited set of colors" -msgstr "色调分离工具：减少颜色到限定的集合" - -#: ../app/tools/gimpposterizetool.c:80 -msgid "_Posterize..." -msgstr "色调分离(_P)..." - -#: ../app/tools/gimpposterizetool.c:94 -msgid "Posterize (Reduce Number of Colors)" -msgstr "色调分离(减少颜色的数量)" - -#: ../app/tools/gimpposterizetool.c:182 -msgid "Posterize _levels:" -msgstr "色调分离级数(_L)：" - -#: ../app/tools/gimprectangleoptions.c:105 +#: ../app/tools/gimprectangleoptions.c:109 msgid "Automatically shrink to the nearest rectangular shape in a layer" -msgstr "" +msgstr "自动收缩至图层内最近的矩形形状" -#: ../app/tools/gimprectangleoptions.c:114 -msgid "Use all visible layers when shrinking the selection" -msgstr "收缩选区时使用所有的可见图层" - -#: ../app/tools/gimprectangleoptions.c:123 -#: ../app/tools/gimptransformoptions.c:128 -msgid "Composition guides such as rule of thirds" -msgstr "" - -#: ../app/tools/gimprectangleoptions.c:132 -msgid "X coordinate of top left corner" -msgstr "" - -#: ../app/tools/gimprectangleoptions.c:142 -msgid "Y coordinate of top left corner" -msgstr "" - -#: ../app/tools/gimprectangleoptions.c:152 -#, fuzzy -msgid "Width of selection" -msgstr "路径到选区" - -#: ../app/tools/gimprectangleoptions.c:161 -#, fuzzy -msgid "Height of selection" -msgstr "路径到选区" - -#: ../app/tools/gimprectangleoptions.c:170 -msgid "Unit of top left corner coordinate" -msgstr "" - -#: ../app/tools/gimprectangleoptions.c:179 -#, fuzzy -msgid "Unit of selection size" -msgstr "路径到选区" - -#: ../app/tools/gimprectangleoptions.c:188 -msgid "Enable lock of aspect ratio, width, height or size" -msgstr "" - -#: ../app/tools/gimprectangleoptions.c:197 -#, fuzzy -msgid "Choose what has to be locked" -msgstr "活动路径的笔划被锁定。" - -#: ../app/tools/gimprectangleoptions.c:206 -msgid "Custom fixed width" -msgstr "" - -#: ../app/tools/gimprectangleoptions.c:215 -msgid "Custom fixed height" -msgstr "" - -#: ../app/tools/gimprectangleoptions.c:309 -msgid "Unit of fixed width, height or size" -msgstr "" - -#: ../app/tools/gimprectangleoptions.c:318 -#, fuzzy -msgid "Expand selection from center outwards" -msgstr "从中心扩展" - -#. Current, as in what is currently in use. -#: ../app/tools/gimprectangleoptions.c:762 -msgid "Current" -msgstr "当前" - -#: ../app/tools/gimprectangleoptions.c:840 -msgid "Expand from center" -msgstr "从中心扩展" - -#: ../app/tools/gimprectangleoptions.c:863 -msgid "Fixed:" -msgstr "固定：" - -#: ../app/tools/gimprectangleoptions.c:1011 -msgid "Position:" -msgstr "位置：" - -#: ../app/tools/gimprectangleoptions.c:1021 ../app/tools/gimptextoptions.c:526 -msgid "Size:" -msgstr "大小：" - -#: ../app/tools/gimprectangleoptions.c:1029 -msgid "Highlight" -msgstr "高亮" - -#. Auto Shrink -#: ../app/tools/gimprectangleoptions.c:1041 -msgid "Auto Shrink" -msgstr "自动收缩" - -#: ../app/tools/gimprectangleoptions.c:1051 +#: ../app/tools/gimprectangleoptions.c:117 msgid "Shrink merged" msgstr "收缩合并" -#: ../app/tools/gimprectangleselectoptions.c:84 -#, fuzzy -msgid "Round corners of selection" -msgstr "圆角" +#: ../app/tools/gimprectangleoptions.c:118 +msgid "Use all visible layers when shrinking the selection" +msgstr "收缩选区时使用所有的可见图层" -#: ../app/tools/gimprectangleselectoptions.c:90 -msgid "Radius of rounding in pixels" -msgstr "" +#: ../app/tools/gimprectangleoptions.c:127 +#: ../app/tools/gimptransformoptions.c:155 +msgid "Composition guides such as rule of thirds" +msgstr "合并参考线如三分法" -#: ../app/tools/gimprectangleselectoptions.c:168 +#: ../app/tools/gimprectangleoptions.c:136 +msgid "X coordinate of top left corner" +msgstr "左上角的 X 坐标" + +#: ../app/tools/gimprectangleoptions.c:146 +msgid "Y coordinate of top left corner" +msgstr "左上角的 Y 坐标" + +#: ../app/tools/gimprectangleoptions.c:156 +msgid "Width of selection" +msgstr "选区宽度" + +#: ../app/tools/gimprectangleoptions.c:165 +msgid "Height of selection" +msgstr "选区高度" + +#: ../app/tools/gimprectangleoptions.c:174 +msgid "Unit of top left corner coordinate" +msgstr "左上角座标单位" + +#: ../app/tools/gimprectangleoptions.c:183 +msgid "Unit of selection size" +msgstr "选区大小单位" + +#: ../app/tools/gimprectangleoptions.c:192 +msgid "Enable lock of aspect ratio, width, height or size" +msgstr "开启宽高比、宽度、高度或大小锁定" + +#: ../app/tools/gimprectangleoptions.c:201 +msgid "Choose what has to be locked" +msgstr "选择要锁定的项目" + +#: ../app/tools/gimprectangleoptions.c:210 +msgid "Custom fixed width" +msgstr "自定义固定宽度" + +#: ../app/tools/gimprectangleoptions.c:219 +msgid "Custom fixed height" +msgstr "自定义固定高度" + +#: ../app/tools/gimprectangleoptions.c:313 +msgid "Unit of fixed width, height or size" +msgstr "固定宽度、高度或大小的单位" + +#: ../app/tools/gimprectangleoptions.c:321 +msgid "Expand from center" +msgstr "从中心扩展" + +#: ../app/tools/gimprectangleoptions.c:322 +msgid "Expand selection from center outwards" +msgstr "从中心向外扩展选区" + +#. Current, as in what is currently in use. +#: ../app/tools/gimprectangleoptions.c:774 +msgid "Current" +msgstr "当前" + +#: ../app/tools/gimprectangleoptions.c:890 +msgid "Fixed" +msgstr "固定" + +#: ../app/tools/gimprectangleoptions.c:1040 ../app/tools/gimptextoptions.c:545 +msgid "Size:" +msgstr "大小：" + +#. Auto Shrink +#: ../app/tools/gimprectangleoptions.c:1067 +msgid "Auto Shrink" +msgstr "自动收缩" + +#: ../app/tools/gimprectangleselectoptions.c:93 msgid "Rounded corners" msgstr "圆角" -#: ../app/tools/gimprectangleselecttool.c:166 +#: ../app/tools/gimprectangleselectoptions.c:94 +msgid "Round corners of selection" +msgstr "选区圆角" + +#: ../app/tools/gimprectangleselectoptions.c:101 +msgid "Radius of rounding in pixels" +msgstr "圆角半径(像素)" + +#: ../app/tools/gimprectangleselecttool.c:151 msgid "Rectangle Select" msgstr "矩形选择" -#: ../app/tools/gimprectangleselecttool.c:167 +#: ../app/tools/gimprectangleselecttool.c:152 msgid "Rectangle Select Tool: Select a rectangular region" msgstr "矩形选择工具：选择矩形区域" -#: ../app/tools/gimprectangleselecttool.c:168 +#: ../app/tools/gimprectangleselecttool.c:153 msgid "_Rectangle Select" msgstr "矩形选择(_R)" -#: ../app/tools/gimprectangletool.c:1146 ../app/tools/gimprectangletool.c:2016 -msgid "Rectangle: " -msgstr "矩形：" +#: ../app/tools/gimprectangleselecttool.c:728 +msgid "Ellipse: " +msgstr "椭圆： " -#: ../app/tools/gimpregionselectoptions.c:83 -msgid "Allow completely transparent regions to be selected" -msgstr "允许选中完全透明的区域" - -#: ../app/tools/gimpregionselectoptions.c:90 -msgid "Base selection on all visible layers" -msgstr "选取以所有可见图层为准" - -#: ../app/tools/gimpregionselectoptions.c:102 -#, fuzzy -msgid "Selection criterion" -msgstr "选区编辑器" - -#: ../app/tools/gimpregionselectoptions.c:205 +#: ../app/tools/gimpregionselectoptions.c:89 msgid "Select transparent areas" msgstr "选择透明区域" -#: ../app/tools/gimpregionselectoptions.c:227 -msgid "Select by:" -msgstr "选择于：" +#: ../app/tools/gimpregionselectoptions.c:90 +msgid "Allow completely transparent regions to be selected" +msgstr "允许选中完全透明的区域" -#: ../app/tools/gimpregionselecttool.c:163 +#: ../app/tools/gimpregionselectoptions.c:98 +msgid "Base selection on all visible layers" +msgstr "选区基于所有可见图层" + +#: ../app/tools/gimpregionselectoptions.c:119 +#: ../app/tools/gimpregionselectoptions.c:281 +msgid "Select by" +msgstr "选择通过" + +#: ../app/tools/gimpregionselectoptions.c:120 +msgid "Selection criterion" +msgstr "选区标准" + +#: ../app/tools/gimpregionselectoptions.c:127 +msgid "Draw mask" +msgstr "绘制蒙板" + +#: ../app/tools/gimpregionselectoptions.c:128 +msgid "Draw the selected region's mask" +msgstr "绘制选中区域的蒙板" + +#: ../app/tools/gimpregionselecttool.c:154 msgid "Move the mouse to change threshold" -msgstr "移动鼠标可更改阈值" +msgstr "移动鼠标以更改阈值" -#: ../app/tools/gimprotatetool.c:93 +#: ../app/tools/gimprotatetool.c:95 ../app/tools/gimptransformoptions.c:548 msgid "Rotate" msgstr "旋转" -#: ../app/tools/gimprotatetool.c:94 +#: ../app/tools/gimprotatetool.c:96 msgid "Rotate Tool: Rotate the layer, selection or path" msgstr "旋转工具：旋转图层，选区或路径" -#: ../app/tools/gimprotatetool.c:95 +#: ../app/tools/gimprotatetool.c:97 msgid "_Rotate" msgstr "旋转(_R)" -#: ../app/tools/gimprotatetool.c:191 +#: ../app/tools/gimprotatetool.c:118 +msgid "R_otate" +msgstr "旋转(_O)" + +#: ../app/tools/gimprotatetool.c:193 msgid "_Angle:" msgstr "角度(_A)：" -#: ../app/tools/gimprotatetool.c:207 +#: ../app/tools/gimprotatetool.c:211 msgid "Center _X:" -msgstr "中心 _X：" +msgstr "中心 _X 坐标：" -#: ../app/tools/gimprotatetool.c:216 +#: ../app/tools/gimprotatetool.c:220 msgid "Center _Y:" -msgstr "中心 _Y：" +msgstr "中心 _Y 坐标：" -#: ../app/tools/gimprotatetool.c:373 +#: ../app/tools/gimprotatetool.c:348 #, c-format msgctxt "undo-type" msgid "Rotate by %-3.3g° around (%g, %g)" -msgstr "" +msgstr "旋转 %-3.3g° 绕 (%g, %g)" -#: ../app/tools/gimpscaletool.c:89 -msgid "Scale" -msgstr "缩放" +#: ../app/tools/gimpsamplepointtool.c:240 +msgid "Remove Sample Point" +msgstr "删除采样点" -#: ../app/tools/gimpscaletool.c:90 -msgid "Scale Tool: Scale the layer, selection or path" -msgstr "缩放工具：缩放图层，选区或路径" +#: ../app/tools/gimpsamplepointtool.c:241 +msgid "Cancel Sample Point" +msgstr "取消采样点" + +#: ../app/tools/gimpsamplepointtool.c:247 +#: ../app/tools/gimpsamplepointtool.c:333 +msgid "Move Sample Point: " +msgstr "移动采样点： " + +#: ../app/tools/gimpsamplepointtool.c:259 +#: ../app/tools/gimpsamplepointtool.c:345 +msgid "Add Sample Point: " +msgstr "添加采样点： " #: ../app/tools/gimpscaletool.c:91 -msgid "_Scale" -msgstr "缩放(_S)" +msgid "Scale Tool: Scale the layer, selection or path" +msgstr "缩放工具：缩放图层、选区或路径" -#: ../app/tools/gimpscaletool.c:338 +#: ../app/tools/gimpscaletool.c:257 #, c-format msgctxt "undo-type" msgid "Scale to %d x %d" -msgstr "" +msgstr "缩放至 %d x %d" -#: ../app/tools/gimpselectionoptions.c:85 -#, fuzzy -msgid "Enable feathering of selection edges" -msgstr "扩大选区" +#: ../app/tools/gimpseamlesscloneoptions.c:72 +msgid "Refinement scale" +msgstr "精细缩放" -#: ../app/tools/gimpselectionoptions.c:91 -msgid "Radius of feathering" -msgstr "" +#: ../app/tools/gimpseamlesscloneoptions.c:73 +msgid "" +"Maximal scale of refinement points to be used for the interpolation mesh" +msgstr "用于插入多边形网格的精细点的最大缩放" -#: ../app/tools/gimpselectionoptions.c:265 ../app/tools/gimptextoptions.c:539 -msgid "Antialiasing" -msgstr "边缘平滑" +#: ../app/tools/gimpseamlessclonetool.c:190 +#: ../app/tools/gimpseamlessclonetool.c:751 +msgid "Seamless Clone" +msgstr "无缝克隆" -#: ../app/tools/gimpselectionoptions.c:282 +#: ../app/tools/gimpseamlessclonetool.c:191 +msgid "Seamless Clone: Seamlessly paste one image into another" +msgstr "无缝克隆：将一个图像无缝克隆到另一个图像中" + +#: ../app/tools/gimpseamlessclonetool.c:192 +msgid "_Seamless Clone" +msgstr "无缝克隆(_S)" + +#: ../app/tools/gimpseamlessclonetool.c:789 +msgid "Cloning the foreground object" +msgstr "正在克隆前景对象" + +#: ../app/tools/gimpselectionoptions.c:87 msgid "Feather edges" -msgstr "边缘羽化" +msgstr "羽化边缘" -#: ../app/tools/gimpselectiontool.c:250 +#: ../app/tools/gimpselectionoptions.c:88 +msgid "Enable feathering of selection edges" +msgstr "开启选区边缘羽化" + +#: ../app/tools/gimpselectionoptions.c:95 +msgid "Radius of feathering" +msgstr "羽化半径" + +#: ../app/tools/gimpselectionoptions.c:222 ../app/widgets/gimpbrushselect.c:188 +msgid "Mode:" +msgstr "模式：" + +#: ../app/tools/gimpselectiontool.c:255 msgid "Click-Drag to replace the current selection" -msgstr "点击并拖动或替换当前选区" - -#: ../app/tools/gimpselectiontool.c:258 -msgid "Click-Drag to create a new selection" -msgstr "点击并拖动可创建新的选区" +msgstr "单击并拖动以替换当前选区" #: ../app/tools/gimpselectiontool.c:263 +msgid "Click-Drag to create a new selection" +msgstr "单击并拖动以创建新的选区" + +#: ../app/tools/gimpselectiontool.c:268 msgid "Click-Drag to add to the current selection" -msgstr "点击并拖动可添加到当前选区" +msgstr "单击并拖动以添加到当前选区" -#: ../app/tools/gimpselectiontool.c:272 +#: ../app/tools/gimpselectiontool.c:277 msgid "Click-Drag to subtract from the current selection" -msgstr "点击并拖动可从选区中减去" +msgstr "单击并拖动以从当前选区中减去" -#: ../app/tools/gimpselectiontool.c:281 +#: ../app/tools/gimpselectiontool.c:286 msgid "Click-Drag to intersect with the current selection" -msgstr "点击并拖动可与当前选区相交" +msgstr "单击并拖动以与当前选区相交" -#: ../app/tools/gimpselectiontool.c:291 +#: ../app/tools/gimpselectiontool.c:296 msgid "Click-Drag to move the selection mask" -msgstr "点击并拖动可移动选区蒙板" +msgstr "单击并拖动以移动选区蒙板" -#: ../app/tools/gimpselectiontool.c:299 +#: ../app/tools/gimpselectiontool.c:304 msgid "Click-Drag to move the selected pixels" -msgstr "点击并拖动可移动选中的像素" +msgstr "单击并拖动可移动选中像素" -#: ../app/tools/gimpselectiontool.c:303 +#: ../app/tools/gimpselectiontool.c:308 msgid "Click-Drag to move a copy of the selected pixels" -msgstr "点击并拖动可移动选中像素的副本" +msgstr "单击并拖动以移动选中像素的副本" -#: ../app/tools/gimpselectiontool.c:307 +#: ../app/tools/gimpselectiontool.c:312 msgid "Click to anchor the floating selection" -msgstr "点击可固定浮动选区" +msgstr "单击以固定浮动选区" -#: ../app/tools/gimpsheartool.c:84 +#: ../app/tools/gimpsheartool.c:88 ../app/tools/gimptransformoptions.c:550 +#: ../app/tools/gimptransformoptions.c:559 msgid "Shear" msgstr "切变" -#: ../app/tools/gimpsheartool.c:85 +#: ../app/tools/gimpsheartool.c:89 msgid "Shear Tool: Shear the layer, selection or path" msgstr "切变工具：切变图层，选区或路径" -#: ../app/tools/gimpsheartool.c:86 +#: ../app/tools/gimpsheartool.c:90 msgid "S_hear" msgstr "切变(_H)" +#: ../app/tools/gimpsheartool.c:108 +msgid "_Shear" +msgstr "切变(_S)" + #: ../app/tools/gimpsheartool.c:136 -msgid "Shear magnitude _X:" -msgstr "切变量 _X：" +msgid "Shear magnitude _X" +msgstr "切变量级 _X" -#: ../app/tools/gimpsheartool.c:146 -msgid "Shear magnitude _Y:" -msgstr "切变量 _Y：" +#: ../app/tools/gimpsheartool.c:147 +msgid "Shear magnitude _Y" +msgstr "切变量级 _Y" -#: ../app/tools/gimpsheartool.c:256 +#: ../app/tools/gimpsheartool.c:251 #, c-format msgctxt "undo-type" msgid "Shear horizontally by %-3.3g" -msgstr "" +msgstr "水平切变 %-3.3g" -#: ../app/tools/gimpsheartool.c:260 +#: ../app/tools/gimpsheartool.c:255 #, c-format msgctxt "undo-type" msgid "Shear vertically by %-3.3g" -msgstr "" +msgstr "竖直切变 %-3.3g" #. e.g. user entered numbers but no notification callback -#: ../app/tools/gimpsheartool.c:265 +#: ../app/tools/gimpsheartool.c:260 #, c-format msgctxt "undo-type" msgid "Shear horizontally by %-3.3g, vertically by %-3.3g" -msgstr "" - -#: ../app/tools/gimpsmudgetool.c:55 -msgid "Smudge Tool: Smudge selectively using a brush" -msgstr "涂抹工具：使用画笔选择性地涂抹" +msgstr "水平切变 %-3.3g，竖直切变 %-3.3g" #: ../app/tools/gimpsmudgetool.c:56 +msgid "Smudge Tool: Smudge selectively using a brush" +msgstr "涂抹工具：使用笔刷选择性地涂抹" + +#: ../app/tools/gimpsmudgetool.c:57 msgid "_Smudge" msgstr "涂抹(_S)" -#: ../app/tools/gimpsmudgetool.c:75 +#: ../app/tools/gimpsmudgetool.c:79 msgid "Click to smudge" -msgstr "点击以涂抹" +msgstr "单击以涂抹" -#: ../app/tools/gimpsmudgetool.c:76 +#: ../app/tools/gimpsmudgetool.c:80 msgid "Click to smudge the line" -msgstr "点击可涂抹线段" +msgstr "单击以涂抹线段" -#: ../app/tools/gimptextoptions.c:132 +#: ../app/tools/gimptextoptions.c:122 msgid "Font size unit" -msgstr "" +msgstr "字体大小单位" -#: ../app/tools/gimptextoptions.c:137 -#, fuzzy +#: ../app/tools/gimptextoptions.c:127 ../app/tools/gimptextoptions.c:128 msgid "Font size" -msgstr "字体" +msgstr "字体大小" -#: ../app/tools/gimptextoptions.c:146 +#: ../app/tools/gimptextoptions.c:141 +msgid "Hinting" +msgstr "微调" + +#: ../app/tools/gimptextoptions.c:142 msgid "" "Hinting alters the font outline to produce a crisp bitmap at small sizes" -msgstr "微调将修改字体的轮廓，使之产生清晰的小尺寸位图" +msgstr "微调将改变字体轮廓以产生清晰的小尺寸位图" -#: ../app/tools/gimptextoptions.c:154 +#: ../app/tools/gimptextoptions.c:152 msgid "The text language may have an effect on the way the text is rendered." msgstr "文本语言将影响到文字的渲染方式。" -#: ../app/tools/gimptextoptions.c:165 -#, fuzzy -msgid "Text alignment" -msgstr "对齐：" +#: ../app/tools/gimptextoptions.c:166 +msgid "Justify" +msgstr "对齐" -#: ../app/tools/gimptextoptions.c:171 +#: ../app/tools/gimptextoptions.c:167 +msgid "Text alignment" +msgstr "文字对齐" + +#: ../app/tools/gimptextoptions.c:174 +msgid "Indentation" +msgstr "缩进" + +#: ../app/tools/gimptextoptions.c:175 msgid "Indentation of the first line" msgstr "第一行的缩进深度" -#: ../app/tools/gimptextoptions.c:177 -msgid "Adjust line spacing" -msgstr "调整线间距" +#: ../app/tools/gimptextoptions.c:182 +msgid "Line spacing" +msgstr "行距" #: ../app/tools/gimptextoptions.c:183 -msgid "Adjust letter spacing" -msgstr "调整字母符距" +msgid "Adjust line spacing" +msgstr "调整行距" -#: ../app/tools/gimptextoptions.c:189 +#: ../app/tools/gimptextoptions.c:190 +msgid "Letter spacing" +msgstr "字符间距" + +#: ../app/tools/gimptextoptions.c:191 +msgid "Adjust letter spacing" +msgstr "调整字符符距" + +#: ../app/tools/gimptextoptions.c:198 +msgid "Box" +msgstr "文字框" + +#: ../app/tools/gimptextoptions.c:199 msgid "" "Whether text flows into rectangular shape or moves into a new line when you " "press Enter" -msgstr "" +msgstr "当您按 Enter 时文字是进入矩形形状还是进入新行" -#: ../app/tools/gimptextoptions.c:197 -#, fuzzy -msgid "Use an external editor window for text entry" -msgstr "文字输入使用外部编辑器窗口，而不是在画布上直接编辑" - -#: ../app/tools/gimptextoptions.c:511 -msgid "Font" -msgstr "字体" - -#: ../app/tools/gimptextoptions.c:535 +#: ../app/tools/gimptextoptions.c:207 msgid "Use editor" msgstr "使用编辑器" -#: ../app/tools/gimptextoptions.c:555 +#: ../app/tools/gimptextoptions.c:208 +msgid "Use an external editor window for text entry" +msgstr "为文字输入使用外置编辑器窗口" + +#: ../app/tools/gimptextoptions.c:574 msgid "Hinting:" msgstr "微调：" -#: ../app/tools/gimptextoptions.c:559 +#: ../app/tools/gimptextoptions.c:578 msgid "Text Color" msgstr "文字颜色" -#: ../app/tools/gimptextoptions.c:564 -msgid "Color:" -msgstr "颜色：" - -#: ../app/tools/gimptextoptions.c:570 +#: ../app/tools/gimptextoptions.c:589 msgid "Justify:" msgstr "对齐：" -#: ../app/tools/gimptextoptions.c:593 +#: ../app/tools/gimptextoptions.c:615 msgid "Box:" msgstr "文字框：" -#: ../app/tools/gimptextoptions.c:610 +#: ../app/tools/gimptextoptions.c:632 msgid "Language:" msgstr "语言：" -#: ../app/tools/gimptexttool.c:191 +#: ../app/tools/gimptexttool.c:203 msgid "Text" msgstr "文字" -#: ../app/tools/gimptexttool.c:192 +#: ../app/tools/gimptexttool.c:204 msgid "Text Tool: Create or edit text layers" msgstr "文字工具：创建或编辑文字图层" -#: ../app/tools/gimptexttool.c:193 +#: ../app/tools/gimptexttool.c:205 msgid "Te_xt" msgstr "文字(_X)" -#: ../app/tools/gimptexttool.c:958 +#: ../app/tools/gimptexttool.c:953 +msgid "Text box: " +msgstr "文字框： " + +#: ../app/tools/gimptexttool.c:1084 msgid "Reshape Text Layer" msgstr "反栅格化文字图层" -#: ../app/tools/gimptexttool.c:1512 ../app/tools/gimptexttool.c:1515 +#: ../app/tools/gimptexttool.c:1583 ../app/tools/gimptexttool.c:1586 msgid "Confirm Text Editing" msgstr "确认编辑文字" -#: ../app/tools/gimptexttool.c:1519 +#: ../app/tools/gimptexttool.c:1590 msgid "Create _New Layer" -msgstr "创建新图层(_N)" +msgstr "新建图层(_N)" -#: ../app/tools/gimptexttool.c:1543 +#: ../app/tools/gimptexttool.c:1592 +msgid "_Edit" +msgstr "编辑(_E)" + +#: ../app/tools/gimptexttool.c:1614 msgid "" "The layer you selected is a text layer but it has been modified using other " "tools. Editing the layer with the text tool will discard these " @@ -13959,161 +21995,242 @@ msgid "" "\n" "You can edit the layer or create a new text layer from its text attributes." msgstr "" -"您所选的图层是一个文字图层，但是它已被其它工具修改过。使用文字工具编辑此图层" +"您所选的图层是一个文字图层，但是它已被其他工具修改过。使用文字工具编辑此图层" "将放弃这些修改。\n" "\n" "您可以编辑此图层或者从它的文字属性创建新的文字图层。" -#: ../app/tools/gimptexttool-editor.c:1172 +#: ../app/tools/gimptexttool-editor.c:1292 msgid "GIMP Text Editor" -msgstr "GIMP 文本编辑器" - -#: ../app/tools/gimpthresholdtool.c:88 -msgid "Threshold Tool: Reduce image to two colors using a threshold" -msgstr "阈值工具：以指定阈值将图像减至两色" +msgstr "GIMP 文字编辑器" #: ../app/tools/gimpthresholdtool.c:89 msgid "_Threshold..." -msgstr "阈值(_T)..." +msgstr "阈值(_T)…" -#: ../app/tools/gimpthresholdtool.c:106 +#: ../app/tools/gimpthresholdtool.c:156 msgid "Apply Threshold" -msgstr "阈值处理" +msgstr "应用阈值" -#: ../app/tools/gimpthresholdtool.c:108 -msgid "Import Threshold Settings" -msgstr "导入阈值设置" +#: ../app/tools/gimpthresholdtool.c:257 +msgid "_Auto" +msgstr "自动(_A)" -#: ../app/tools/gimpthresholdtool.c:109 -msgid "Export Threshold Settings" -msgstr "导出阈值设置" - -#: ../app/tools/gimpthresholdtool.c:241 +#: ../app/tools/gimpthresholdtool.c:259 msgid "Automatically adjust to optimal binarization threshold" msgstr "自动调整到最佳二值化阈值" -#: ../app/tools/gimptool.c:978 +#: ../app/tools/gimptool.c:1193 msgid "Can't work on an empty image, add a layer first" msgstr "不能在空的图像上操作，先添加图层" -#: ../app/tools/gimp-tools.c:353 -msgid "" -"This tool has\n" -"no options." -msgstr "" -"这个工具\n" -"没有选项。" - -#: ../app/tools/gimptransformoptions.c:100 -#, fuzzy +#: ../app/tools/gimptransformoptions.c:117 msgid "Direction of transformation" -msgstr "透视变换" +msgstr "变换方向" -#: ../app/tools/gimptransformoptions.c:106 -#, fuzzy +#: ../app/tools/gimptransformoptions.c:125 ../app/tools/gimpwarpoptions.c:120 msgid "Interpolation method" -msgstr "插值：" +msgstr "插值方法" -#: ../app/tools/gimptransformoptions.c:112 +#: ../app/tools/gimptransformoptions.c:133 msgid "How to clip" -msgstr "" +msgstr "剪裁方式" -#: ../app/tools/gimptransformoptions.c:118 -#, fuzzy -msgid "Show a preview of the transformed image" -msgstr "为此图像显示概览窗口" - -#: ../app/tools/gimptransformoptions.c:123 -msgid "Opacity of the preview image" -msgstr "" - -#: ../app/tools/gimptransformoptions.c:134 -msgid "Size of a grid cell for variable number of composition guides" -msgstr "" - -#: ../app/tools/gimptransformoptions.c:278 -msgid "Transform:" -msgstr "变换：" - -#: ../app/tools/gimptransformoptions.c:287 -#: ../app/widgets/gimpdynamicseditor.c:144 -#: ../app/widgets/gimpdynamicsoutputeditor.c:72 -msgid "Direction" -msgstr "方向" - -#. the interpolation menu -#: ../app/tools/gimptransformoptions.c:292 -msgid "Interpolation:" -msgstr "插值：" - -#. the clipping menu -#: ../app/tools/gimptransformoptions.c:301 -msgid "Clipping:" -msgstr "翻转：" - -#: ../app/tools/gimptransformoptions.c:311 -#, fuzzy -msgid "Image opacity" -msgstr "图像类型" - -#: ../app/tools/gimptransformoptions.c:313 -#, fuzzy +#: ../app/tools/gimptransformoptions.c:140 msgid "Show image preview" -msgstr "显示图像大小" +msgstr "显示图像预览" -#. the guides frame -#: ../app/tools/gimptransformoptions.c:319 -#, fuzzy +#: ../app/tools/gimptransformoptions.c:141 +msgid "Show a preview of the transformed image" +msgstr "显示变换后图像的预览" + +#: ../app/tools/gimptransformoptions.c:147 +msgid "Image opacity" +msgstr "图像不透明度" + +#: ../app/tools/gimptransformoptions.c:148 +msgid "Opacity of the preview image" +msgstr "预览图像的不透明度" + +#: ../app/tools/gimptransformoptions.c:154 +#: ../app/tools/gimptransformoptions.c:468 msgid "Guides" -msgstr "参考线(_G)" +msgstr "参考线" -#: ../app/tools/gimptransformoptions.c:347 +#: ../app/tools/gimptransformoptions.c:163 +msgid "Size of a grid cell for variable number of composition guides" +msgstr "不同数量的组合参考线网格单元的大小" + +#: ../app/tools/gimptransformoptions.c:491 #, c-format -msgid "15 degrees (%s)" +msgid "15 degrees (%s)" msgstr "15 度(%s)" -#: ../app/tools/gimptransformoptions.c:348 +#: ../app/tools/gimptransformoptions.c:498 msgid "Limit rotation steps to 15 degrees" -msgstr "" +msgstr "限制每次旋转角度为 15 度" -#: ../app/tools/gimptransformoptions.c:352 +#: ../app/tools/gimptransformoptions.c:508 #, c-format -msgid "Keep aspect (%s)" +msgid "Keep aspect (%s)" msgstr "保持宽高比(%s)" -#: ../app/tools/gimptransformoptions.c:353 +#: ../app/tools/gimptransformoptions.c:515 msgid "Keep the original aspect ratio" -msgstr "" +msgstr "保持原始宽高比" -#: ../app/tools/gimptransformtool.c:210 +#: ../app/tools/gimptransformoptions.c:520 +#, c-format +msgid "Around center (%s)" +msgstr "中心周围(%s)" + +#: ../app/tools/gimptransformoptions.c:527 +msgid "Scale around the center point" +msgstr "围绕中心点缩放" + +#: ../app/tools/gimptransformoptions.c:543 +#, c-format +msgid "Constrain (%s)" +msgstr "限制(%s)" + +#: ../app/tools/gimptransformoptions.c:544 +msgid "Move" +msgstr "移动" + +#: ../app/tools/gimptransformoptions.c:545 +#, c-format +msgid "Constrain movement to 45 degree angles from center (%s)" +msgstr "从中心限制移动为 45 度(%s)" + +#: ../app/tools/gimptransformoptions.c:547 +#, c-format +msgid "Maintain aspect ratio when scaling (%s)" +msgstr "缩放时保持宽高比(%s)" + +#: ../app/tools/gimptransformoptions.c:549 +#, c-format +msgid "Constrain rotation to 15 degree increments (%s)" +msgstr "限制旋转增量为 15 度(%s)" + +#: ../app/tools/gimptransformoptions.c:551 +#, c-format +msgid "Shear along edge direction only (%s)" +msgstr "仅沿边缘方向切变(%s)" + +#: ../app/tools/gimptransformoptions.c:553 +#, c-format +msgid "Constrain perspective handles to move along edges and diagonal (%s)" +msgstr "限制透视控制柄沿边缘和对角线移动(%s)" + +#: ../app/tools/gimptransformoptions.c:556 +#, c-format +msgid "From pivot (%s)" +msgstr "从轴心 (%s)" + +#: ../app/tools/gimptransformoptions.c:558 +#, c-format +msgid "Scale from pivot point (%s)" +msgstr "从轴心点缩放(%s)" + +#: ../app/tools/gimptransformoptions.c:560 +#, c-format +msgid "Shear opposite edge by same amount (%s)" +msgstr "以相同的量切变对边(%s)" + +#: ../app/tools/gimptransformoptions.c:562 +#, c-format +msgid "Maintain position of pivot while changing perspective (%s)" +msgstr "改变透视时保持轴心位置(%s)" + +#: ../app/tools/gimptransformoptions.c:565 +msgid "Pivot" +msgstr "轴心" + +#: ../app/tools/gimptransformoptions.c:566 +#, c-format +msgid "Snap (%s)" +msgstr "吸附(%s)" + +#: ../app/tools/gimptransformoptions.c:567 +#, c-format +msgid "Snap pivot to corners and center (%s)" +msgstr "将轴心吸附到角落和中心(%s)" + +#: ../app/tools/gimptransformoptions.c:568 +msgid "Lock" +msgstr "锁定" + +#: ../app/tools/gimptransformoptions.c:569 +msgid "Lock pivot position to canvas" +msgstr "锁定轴心位置到画布" + +#: ../app/tools/gimptransformtool.c:195 +msgid "_Transform" +msgstr "变换(_T)" + +#: ../app/tools/gimptransformtool.c:219 msgid "Transforming" msgstr "正在变换" -#: ../app/tools/gimptransformtool.c:1063 +#: ../app/tools/gimptransformtool.c:259 +#, c-format +msgid "The selection does not intersect with the layer." +msgstr "选区没有与图层相交。" + +#: ../app/tools/gimptransformtool.c:514 ../app/tools/gimptransformtool.c:526 +msgid "Transform Step" +msgstr "变换步骤" + +#: ../app/tools/gimptransformtool.c:982 +msgid "The current transform is invalid" +msgstr "当前变换是无效的" + +#: ../app/tools/gimptransformtool.c:1430 msgid "There is no layer to transform." msgstr "没有图层可以变换。" -#: ../app/tools/gimptransformtool.c:1076 +#: ../app/tools/gimptransformtool.c:1437 +msgid "The active layer's position and size are locked." +msgstr "活动图层的位置和大小已锁定。" + +#: ../app/tools/gimptransformtool.c:1450 +msgid "There is no selection to transform." +msgstr "没有选区可以变换。" + +#: ../app/tools/gimptransformtool.c:1463 msgid "There is no path to transform." msgstr "没有路径可以变换。" -#: ../app/tools/gimptransformtool.c:1077 +#: ../app/tools/gimptransformtool.c:1468 msgid "The active path's strokes are locked." -msgstr "活动路径的笔划被锁定。" +msgstr "活动路径的笔廓已锁定。" -#: ../app/tools/gimpvectoroptions.c:77 -msgid "Restrict editing to polygons" -msgstr "编辑限于多边形" +#: ../app/tools/gimptransformtool.c:1472 +msgid "The active path has no strokes." +msgstr "活动路径没有笔廓。" -#: ../app/tools/gimpvectoroptions.c:156 -msgid "Edit Mode" -msgstr "编辑模式" +#: ../app/tools/gimpunifiedtransformtool.c:87 +msgid "Unified Transform" +msgstr "统一变换" -#: ../app/tools/gimpvectoroptions.c:175 -msgid "Polygonal" -msgstr "多边形" +#: ../app/tools/gimpunifiedtransformtool.c:88 +msgid "Unified Transform Tool: Transform the layer, selection or path" +msgstr "统一变换工具：变换图层，选区或路径" -#: ../app/tools/gimpvectoroptions.c:179 +#: ../app/tools/gimpunifiedtransformtool.c:90 +msgid "_Unified Transform" +msgstr "统一变换(_U)" + +#: ../app/tools/gimpunifiedtransformtool.c:115 +msgid "Unified transform" +msgstr "统一变换" + +#: ../app/tools/gimpunifiedtransformtool.c:190 +msgctxt "undo-type" +msgid "Unified Transform" +msgstr "统一变换" + +#: ../app/tools/gimpvectoroptions.c:181 #, c-format msgid "" "Path to Selection\n" @@ -14127,543 +22244,656 @@ msgstr "" "%s 相交" #. Create a selection from the current path -#: ../app/tools/gimpvectoroptions.c:190 +#: ../app/tools/gimpvectoroptions.c:192 msgid "Selection from Path" msgstr "从路径创建选区" -#: ../app/tools/gimpvectortool.c:161 +#: ../app/tools/gimpvectortool.c:164 msgid "Paths Tool: Create and edit paths" msgstr "路径工具：创建并编辑路径" -#: ../app/tools/gimpvectortool.c:162 +#: ../app/tools/gimpvectortool.c:165 msgid "Pat_hs" msgstr "路径(_H)" -#: ../app/tools/gimpvectortool.c:250 -msgid "The active path is locked." -msgstr "活动路径被锁定。" +#: ../app/tools/gimpvectortool.c:733 +msgid "There is no active layer or channel to fill" +msgstr "没有活动图层或通道可以填充" -#: ../app/tools/gimpvectortool.c:340 -msgid "Add Stroke" -msgstr "添加笔划" - -#: ../app/tools/gimpvectortool.c:365 -msgid "Add Anchor" -msgstr "添加锚点" - -#: ../app/tools/gimpvectortool.c:391 -msgid "Insert Anchor" -msgstr "插入锚点" - -#: ../app/tools/gimpvectortool.c:422 -msgid "Drag Handle" -msgstr "拖动臂点" - -#: ../app/tools/gimpvectortool.c:453 -msgid "Drag Anchor" -msgstr "拖动锚点" - -#: ../app/tools/gimpvectortool.c:471 -msgid "Drag Anchors" -msgstr "拖动多个锚点" - -#: ../app/tools/gimpvectortool.c:494 -msgid "Drag Curve" -msgstr "拖动曲线" - -#: ../app/tools/gimpvectortool.c:523 -msgid "Connect Strokes" -msgstr "连接笔划" - -#: ../app/tools/gimpvectortool.c:555 -msgid "Drag Path" -msgstr "拖动路径" - -#: ../app/tools/gimpvectortool.c:566 -msgid "Convert Edge" -msgstr "转换边缘" - -#: ../app/tools/gimpvectortool.c:597 -msgid "Delete Anchor" -msgstr "删除锚点" - -#: ../app/tools/gimpvectortool.c:620 -msgid "Delete Segment" -msgstr "删除段" - -#: ../app/tools/gimpvectortool.c:842 -msgid "Move Anchors" -msgstr "移动多个锚点" - -#: ../app/tools/gimpvectortool.c:1205 -msgid "Click to pick path to edit" -msgstr "点击可拾取路径并编辑" - -#: ../app/tools/gimpvectortool.c:1209 -msgid "Click to create a new path" -msgstr "点击可创建新的路径" - -#: ../app/tools/gimpvectortool.c:1213 -msgid "Click to create a new component of the path" -msgstr "点击可创建新的路径组件" - -#: ../app/tools/gimpvectortool.c:1217 -msgid "Click or Click-Drag to create a new anchor" -msgstr "点击或点击拖动可创建新的锚点" - -#: ../app/tools/gimpvectortool.c:1229 ../app/tools/gimpvectortool.c:1236 -msgid "Click-Drag to move the anchor around" -msgstr "点击并拖动可移动锚点" - -#: ../app/tools/gimpvectortool.c:1240 ../app/tools/gimpvectortool.c:1263 -msgid "Click-Drag to move the anchors around" -msgstr "点击并拖动可移动多个锚点" - -#: ../app/tools/gimpvectortool.c:1246 -msgid "Click-Drag to move the handle around" -msgstr "点击并拖动可移动臂点" - -#: ../app/tools/gimpvectortool.c:1253 -msgid "Click-Drag to move the handles around symmetrically" -msgstr "点击并拖动可对称地移动臂点" - -#: ../app/tools/gimpvectortool.c:1268 -msgid "Click-Drag to change the shape of the curve" -msgstr "点击并拖动可改变曲线的形状" - -#: ../app/tools/gimpvectortool.c:1271 -#, c-format -msgid "%s: symmetrical" -msgstr "%s：对称" - -#: ../app/tools/gimpvectortool.c:1276 -msgid "Click-Drag to move the component around" -msgstr "点击并拖动可移动组件" - -#: ../app/tools/gimpvectortool.c:1284 -msgid "Click-Drag to move the path around" -msgstr "点击并拖动可移动路径" - -#: ../app/tools/gimpvectortool.c:1288 -msgid "Click-Drag to insert an anchor on the path" -msgstr "点击可在路径中插入新的锚点" - -#: ../app/tools/gimpvectortool.c:1296 -msgid "Click to delete this anchor" -msgstr "点击可删除此锚点" - -#: ../app/tools/gimpvectortool.c:1300 -msgid "Click to connect this anchor with the selected endpoint" -msgstr "点击可连接此锚点与选中的端点" - -#: ../app/tools/gimpvectortool.c:1305 -msgid "Click to open up the path" -msgstr "点击可断开路径" - -#: ../app/tools/gimpvectortool.c:1309 -msgid "Click to make this node angular" -msgstr "点击可使此节点成为角点" - -#: ../app/tools/gimpvectortool.c:1810 -msgid "Delete Anchors" -msgstr "删除锚点" - -#: ../app/tools/gimpvectortool.c:1969 +#: ../app/tools/gimpvectortool.c:805 msgid "There is no active layer or channel to stroke to" msgstr "没有活动图层或通道可以勾画" -#: ../app/tools/tools-enums.c:150 -msgctxt "rectangle-tool-fixed-rule" -msgid "Aspect ratio" -msgstr "宽高比" +#: ../app/tools/gimpwarpoptions.c:83 ../app/tools/gimpwarpoptions.c:84 +msgid "Behavior" +msgstr "行为" -#: ../app/tools/tools-enums.c:151 -msgctxt "rectangle-tool-fixed-rule" -msgid "Width" -msgstr "宽度" +#: ../app/tools/gimpwarpoptions.c:92 +msgid "Effect Size" +msgstr "效果大小" -#: ../app/tools/tools-enums.c:152 -msgctxt "rectangle-tool-fixed-rule" -msgid "Height" -msgstr "高度" +#: ../app/tools/gimpwarpoptions.c:99 +msgid "Effect Hardness" +msgstr "效果硬度" -#: ../app/tools/tools-enums.c:153 -msgctxt "rectangle-tool-fixed-rule" -msgid "Size" -msgstr "大小" +#: ../app/tools/gimpwarpoptions.c:105 +msgid "Strength" +msgstr "强度" -#: ../app/tools/tools-enums.c:182 +#: ../app/tools/gimpwarpoptions.c:106 +msgid "Effect Strength" +msgstr "效果强度" + +#: ../app/tools/gimpwarpoptions.c:113 +msgid "Stroke Spacing" +msgstr "笔廓间距" + +#: ../app/tools/gimpwarpoptions.c:127 ../app/tools/gimpwarpoptions.c:329 +msgid "Abyss policy" +msgstr "扭曲方案" + +#: ../app/tools/gimpwarpoptions.c:128 +msgid "Out-of-bounds sampling behavior" +msgstr "超范围采样行为" + +#: ../app/tools/gimpwarpoptions.c:135 +msgid "High quality preview" +msgstr "高质量预览" + +#: ../app/tools/gimpwarpoptions.c:136 +msgid "Use an accurate but slower preview" +msgstr "使用精确但更慢的预览" + +#: ../app/tools/gimpwarpoptions.c:142 +msgid "During motion" +msgstr "移动中" + +#: ../app/tools/gimpwarpoptions.c:143 +msgid "Apply effect during motion" +msgstr "在移动中应用效果" + +#: ../app/tools/gimpwarpoptions.c:149 +msgid "Periodically" +msgstr "间歇中" + +#: ../app/tools/gimpwarpoptions.c:150 +msgid "Apply effect periodically" +msgstr "间歇性的应用效果" + +#: ../app/tools/gimpwarpoptions.c:156 +msgid "Rate" +msgstr "比率" + +#: ../app/tools/gimpwarpoptions.c:157 +msgid "Periodic stroke rate" +msgstr "周期的笔廓比率" + +#: ../app/tools/gimpwarpoptions.c:163 +msgid "Frames" +msgstr "帧" + +#: ../app/tools/gimpwarpoptions.c:164 +msgid "Number of animation frames" +msgstr "动画帧数" + +#. the stroke frame +#: ../app/tools/gimpwarpoptions.c:339 +msgid "Stroke" +msgstr "笔廓" + +#. the animation frame +#: ../app/tools/gimpwarpoptions.c:361 +msgid "Animate" +msgstr "动画" + +#: ../app/tools/gimpwarpoptions.c:375 +msgid "Create Animation" +msgstr "创建动画" + +#: ../app/tools/gimpwarptool.c:155 +msgid "Warp Transform" +msgstr "扭曲变换" + +#: ../app/tools/gimpwarptool.c:156 +msgid "Warp Transform: Deform with different tools" +msgstr "扭曲变换：使用不同的工具变形" + +#: ../app/tools/gimpwarptool.c:157 +msgid "_Warp Transform" +msgstr "扭曲变换(_W)" + +#: ../app/tools/gimpwarptool.c:484 ../app/tools/gimpwarptool.c:496 +msgid "Warp Tool Stroke" +msgstr "扭曲工具笔廓" + +#: ../app/tools/gimpwarptool.c:618 +msgid "Cannot warp layer groups." +msgstr "不能扭曲图层组。" + +#: ../app/tools/gimpwarptool.c:652 +msgid "No stroke events selected." +msgstr "未选择笔廓项目。" + +#: ../app/tools/gimpwarptool.c:863 +msgid "Warp transform" +msgstr "扭曲变换" + +#: ../app/tools/gimpwarptool.c:1076 +msgid "Please add some warp strokes first." +msgstr "请先添加一些扭曲笔廓。" + +#: ../app/tools/gimpwarptool.c:1090 ../app/tools/gimpwarptool.c:1127 +#, c-format +msgid "Rendering Frame %d" +msgstr "正在渲染第 %d 帧" + +#: ../app/tools/gimpwarptool.c:1105 ../app/tools/gimpwarptool.c:1135 +#, c-format +msgid "Frame %d" +msgstr "第 %d 帧" + +#: ../app/tools/gimpwarptool.c:1144 +msgid "Frame" +msgstr "帧" + +#: ../app/tools/tools-enums.c:25 msgctxt "rect-select-mode" msgid "Free select" msgstr "自由选择" -#: ../app/tools/tools-enums.c:183 +#: ../app/tools/tools-enums.c:26 msgctxt "rect-select-mode" msgid "Fixed size" msgstr "固定大小" -#: ../app/tools/tools-enums.c:184 +#: ../app/tools/tools-enums.c:27 msgctxt "rect-select-mode" msgid "Fixed aspect ratio" msgstr "固定宽高比" -#: ../app/tools/tools-enums.c:213 +#: ../app/tools/tools-enums.c:56 msgctxt "transform-type" msgid "Layer" msgstr "图层" -#: ../app/tools/tools-enums.c:214 +#: ../app/tools/tools-enums.c:57 msgctxt "transform-type" msgid "Selection" msgstr "选区" -#: ../app/tools/tools-enums.c:215 +#: ../app/tools/tools-enums.c:58 msgctxt "transform-type" msgid "Path" msgstr "路径" -#: ../app/tools/tools-enums.c:244 -msgctxt "vector-mode" -msgid "Design" -msgstr "设计" +#: ../app/tools/tools-enums.c:151 +msgctxt "matting-draw-mode" +msgid "Draw foreground" +msgstr "绘制前景" -#: ../app/tools/tools-enums.c:245 -msgctxt "vector-mode" -msgid "Edit" -msgstr "编辑" +#: ../app/tools/tools-enums.c:152 +msgctxt "matting-draw-mode" +msgid "Draw background" +msgstr "绘制背景" -#: ../app/tools/tools-enums.c:246 -msgctxt "vector-mode" -msgid "Move" -msgstr "移动" +#: ../app/tools/tools-enums.c:153 +msgctxt "matting-draw-mode" +msgid "Draw unknown" +msgstr "绘制未知" -#: ../app/vectors/gimpvectors.c:209 +#: ../app/tools/tools-enums.c:186 +msgctxt "warp-behavior" +msgid "Move pixels" +msgstr "移动像素" + +#: ../app/tools/tools-enums.c:187 +msgctxt "warp-behavior" +msgid "Grow area" +msgstr "增大区域" + +#: ../app/tools/tools-enums.c:188 +msgctxt "warp-behavior" +msgid "Shrink area" +msgstr "收缩区域" + +#: ../app/tools/tools-enums.c:189 +msgctxt "warp-behavior" +msgid "Swirl clockwise" +msgstr "顺时针漩涡" + +#: ../app/tools/tools-enums.c:190 +msgctxt "warp-behavior" +msgid "Swirl counter-clockwise" +msgstr "逆时针漩涡" + +#: ../app/tools/tools-enums.c:191 +msgctxt "warp-behavior" +msgid "Erase warping" +msgstr "擦除扭曲" + +#: ../app/tools/tools-enums.c:192 +msgctxt "warp-behavior" +msgid "Smooth warping" +msgstr "平滑扭曲" + +#: ../app/vectors/gimpvectors.c:224 msgctxt "undo-type" msgid "Rename Path" msgstr "重命名路径" -#: ../app/vectors/gimpvectors.c:210 +#: ../app/vectors/gimpvectors.c:225 msgctxt "undo-type" msgid "Move Path" msgstr "移动路径" -#: ../app/vectors/gimpvectors.c:211 +#: ../app/vectors/gimpvectors.c:226 msgctxt "undo-type" msgid "Scale Path" msgstr "缩放路径" -#: ../app/vectors/gimpvectors.c:212 +#: ../app/vectors/gimpvectors.c:227 msgctxt "undo-type" msgid "Resize Path" msgstr "改变路径大小" -#: ../app/vectors/gimpvectors.c:213 +#: ../app/vectors/gimpvectors.c:228 msgctxt "undo-type" msgid "Flip Path" msgstr "翻转路径" -#: ../app/vectors/gimpvectors.c:214 +#: ../app/vectors/gimpvectors.c:229 msgctxt "undo-type" msgid "Rotate Path" msgstr "旋转路径" -#: ../app/vectors/gimpvectors.c:215 +#: ../app/vectors/gimpvectors.c:230 msgctxt "undo-type" msgid "Transform Path" msgstr "变换路径" -#: ../app/vectors/gimpvectors.c:216 +#: ../app/vectors/gimpvectors.c:231 +msgctxt "undo-type" +msgid "Fill Path" +msgstr "填充路径" + +#: ../app/vectors/gimpvectors.c:232 msgctxt "undo-type" msgid "Stroke Path" msgstr "勾画路径" -#: ../app/vectors/gimpvectors.c:217 +#: ../app/vectors/gimpvectors.c:233 msgctxt "undo-type" msgid "Path to Selection" msgstr "路径到选区" -#: ../app/vectors/gimpvectors.c:218 +#: ../app/vectors/gimpvectors.c:234 msgctxt "undo-type" msgid "Reorder Path" msgstr "重排路径" -#: ../app/vectors/gimpvectors.c:219 +#: ../app/vectors/gimpvectors.c:235 msgctxt "undo-type" msgid "Raise Path" msgstr "升高路径" -#: ../app/vectors/gimpvectors.c:220 +#: ../app/vectors/gimpvectors.c:236 msgctxt "undo-type" msgid "Raise Path to Top" msgstr "路径移至顶端" -#: ../app/vectors/gimpvectors.c:221 +#: ../app/vectors/gimpvectors.c:237 msgctxt "undo-type" msgid "Lower Path" msgstr "降低路径" -#: ../app/vectors/gimpvectors.c:222 +#: ../app/vectors/gimpvectors.c:238 msgctxt "undo-type" msgid "Lower Path to Bottom" msgstr "路径移至底端" -#: ../app/vectors/gimpvectors.c:223 +#: ../app/vectors/gimpvectors.c:239 msgid "Path cannot be raised higher." msgstr "路径无法再升高。" -#: ../app/vectors/gimpvectors.c:224 +#: ../app/vectors/gimpvectors.c:240 msgid "Path cannot be lowered more." msgstr "路径无法再降低。" -#: ../app/vectors/gimpvectors.c:365 +#: ../app/vectors/gimpvectors.c:455 msgid "Move Path" msgstr "移动路径" -#: ../app/vectors/gimpvectors.c:464 +#: ../app/vectors/gimpvectors.c:555 msgid "Flip Path" msgstr "翻转路径" -#: ../app/vectors/gimpvectors.c:495 +#: ../app/vectors/gimpvectors.c:586 msgid "Rotate Path" msgstr "旋转路径" -#: ../app/vectors/gimpvectors.c:525 +#: ../app/vectors/gimpvectors.c:616 msgid "Transform Path" msgstr "变换路径" -#: ../app/vectors/gimpvectors-export.c:95 +#: ../app/vectors/gimpvectors-export.c:87 #, c-format -msgid "Error while writing '%s': %s" -msgstr "写入“%s”时出错：%s" +msgid "Writing SVG file '%s' failed: %s" +msgstr "写入 SVG 文件“%s” 失败：%s" -#: ../app/vectors/gimpvectors-import.c:330 +#: ../app/vectors/gimpvectors-import.c:331 msgid "Import Paths" msgstr "导入路径" -#: ../app/vectors/gimpvectors-import.c:341 +#: ../app/vectors/gimpvectors-import.c:342 msgid "Imported Path" msgstr "导入的路径" -#: ../app/vectors/gimpvectors-import.c:372 +#: ../app/vectors/gimpvectors-import.c:373 #, c-format msgid "No paths found in '%s'" msgstr "“%s”中未找到路径" -#: ../app/vectors/gimpvectors-import.c:376 +#: ../app/vectors/gimpvectors-import.c:377 msgid "No paths found in the buffer" msgstr "缓冲区中未找到路径" -#: ../app/vectors/gimpvectors-import.c:386 +#: ../app/vectors/gimpvectors-import.c:387 #, c-format msgid "Failed to import paths from '%s': %s" msgstr "无法从“%s”导入路径：%s" -#: ../app/widgets/gimpactioneditor.c:69 +#: ../app/widgets/gimpactioneditor.c:70 msgid "_Search:" msgstr "搜索(_S)" -#: ../app/widgets/gimpactiongroup.c:858 +#: ../app/widgets/gimpactiongroup.c:968 #, c-format msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" msgstr "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" -#: ../app/widgets/gimpactionview.c:337 +#: ../app/widgets/gimpactionview.c:332 #: ../app/widgets/gimpcontrollereditor.c:342 msgid "Action" msgstr "动作" -#: ../app/widgets/gimpactionview.c:366 +#: ../app/widgets/gimpactionview.c:361 msgid "Shortcut" msgstr "快捷键" -#: ../app/widgets/gimpactionview.c:392 +#: ../app/widgets/gimpactionview.c:387 msgid "Name" msgstr "名字" -#: ../app/widgets/gimpactionview.c:632 ../app/widgets/gimpactionview.c:832 +#: ../app/widgets/gimpactionview.c:627 ../app/widgets/gimpactionview.c:868 msgid "Changing shortcut failed." msgstr "改变快捷键失败。" -#: ../app/widgets/gimpactionview.c:669 +#: ../app/widgets/gimpactionview.c:664 msgid "Conflicting Shortcuts" msgstr "快捷键冲突" -#: ../app/widgets/gimpactionview.c:675 -msgid "_Reassign shortcut" +#: ../app/widgets/gimpactionview.c:670 +msgid "_Reassign Shortcut" msgstr "重新分配快捷键(_R)" -#: ../app/widgets/gimpactionview.c:690 +#: ../app/widgets/gimpactionview.c:686 #, c-format msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group." -msgstr "快捷键“%1$s”已被“%3$s”群组的“%2$s”占用。" +msgstr "快捷键“%1$s”已被“%3$s”组的“%2$s”占用。" -#: ../app/widgets/gimpactionview.c:694 +#: ../app/widgets/gimpactionview.c:690 #, c-format msgid "Reassigning the shortcut will cause it to be removed from \"%s\"." msgstr "重新分配快捷键将导致它从“%s”中被去掉。" -#: ../app/widgets/gimpactionview.c:767 +#: ../app/widgets/gimpactionview.c:785 msgid "Invalid shortcut." msgstr "无效的快捷键。" -#: ../app/widgets/gimpactionview.c:856 +#: ../app/widgets/gimpactionview.c:792 ../app/widgets/gimpactionview.c:896 +msgid "F1 cannot be remapped." +msgstr "无法重新映射 F1。" + +#: ../app/widgets/gimpactionview.c:800 +#, c-format +msgid "Alt+%d is used to switch to display %d and cannot be remapped." +msgstr "Alt+%d 被用于切换到显示 %d 且不能被重新映射。" + +#: ../app/widgets/gimpactionview.c:904 msgid "Removing shortcut failed." msgstr "删除快捷键失败。" +#: ../app/widgets/gimpbrusheditor.c:140 +msgid "Shape:" +msgstr "形状：" + #: ../app/widgets/gimpbrusheditor.c:167 -#, fuzzy msgid "Spikes" -msgstr "穗数：" - -#: ../app/widgets/gimpbrusheditor.c:178 -#, fuzzy -msgid "Hardness" -msgstr "硬度" - -#: ../app/widgets/gimpbrusheditor.c:189 -#, fuzzy -msgid "Aspect ratio" -msgstr "宽高比" - -#: ../app/widgets/gimpbrusheditor.c:211 -#: ../app/widgets/gimpbrushfactoryview.c:81 -#: ../app/widgets/gimpgrideditor.c:175 -msgid "Spacing" -msgstr "间距" +msgstr "尖" #: ../app/widgets/gimpbrusheditor.c:216 #: ../app/widgets/gimpbrushfactoryview.c:85 msgid "Percentage of width of brush" -msgstr "画笔宽度的百分比" +msgstr "笔刷宽度的百分比" -#: ../app/widgets/gimpbufferview.c:179 ../app/widgets/gimpbufferview.c:264 -#: ../app/widgets/gimpeditor.c:748 +#: ../app/widgets/gimpbufferview.c:189 ../app/widgets/gimpbufferview.c:290 +#: ../app/widgets/gimpeditor.c:759 msgid "(None)" msgstr "(无)" -#: ../app/widgets/gimpcolordialog.c:150 +#: ../app/widgets/gimpclipboard.c:485 +msgid "Clipboard" +msgstr "剪贴板" + +#: ../app/widgets/gimpcolordialog.c:156 msgid "Add the current color to the color history" msgstr "将当前颜色添加到颜色历史" -#: ../app/widgets/gimpcolordisplayeditor.c:154 +#: ../app/widgets/gimpcolordisplayeditor.c:165 msgid "Available Filters" -msgstr "可用的滤镜" +msgstr "可用滤镜" -#: ../app/widgets/gimpcolordisplayeditor.c:216 +#: ../app/widgets/gimpcolordisplayeditor.c:229 msgid "Move the selected filter up" -msgstr "选中的滤镜上移" +msgstr "上移选中滤镜" -#: ../app/widgets/gimpcolordisplayeditor.c:225 +#: ../app/widgets/gimpcolordisplayeditor.c:238 msgid "Move the selected filter down" -msgstr "选中的滤镜下移" +msgstr "下移选中滤镜" -#: ../app/widgets/gimpcolordisplayeditor.c:271 -msgid "Active Filters" -msgstr "活动滤镜" - -#: ../app/widgets/gimpcolordisplayeditor.c:322 +#: ../app/widgets/gimpcolordisplayeditor.c:336 msgid "Reset the selected filter to default values" msgstr "将选中的滤镜重置到默认值" -#: ../app/widgets/gimpcolordisplayeditor.c:496 +#: ../app/widgets/gimpcolordisplayeditor.c:527 #, c-format msgid "Add '%s' to the list of active filters" msgstr "将“%s”添加到活动滤镜列表" -#: ../app/widgets/gimpcolordisplayeditor.c:533 +#: ../app/widgets/gimpcolordisplayeditor.c:564 #, c-format msgid "Remove '%s' from the list of active filters" msgstr "从活动滤镜列表中删除“%s”" -#: ../app/widgets/gimpcolordisplayeditor.c:564 +#: ../app/widgets/gimpcolordisplayeditor.c:605 msgid "No filter selected" msgstr "未选择滤镜" -#: ../app/widgets/gimpcoloreditor.c:261 +#: ../app/widgets/gimpcoloreditor.c:268 msgid "" "Hexadecimal color notation as used in HTML and CSS. This entry also accepts " "CSS color names." -msgstr "在 HTML 和 CSS 中使用的十六进制颜色格式。此处也允许使用 CSS 色彩名。" +msgstr "在 HTML 和 CSS 中使用的十六进制颜色标记。此处也允许使用 CSS 颜色名。" -#: ../app/widgets/gimpcolorframe.c:511 ../app/widgets/gimpcolorframe.c:572 -msgid "Value:" -msgstr "亮度：" +#. TRANSLATORS: X for the X coordinate. +#: ../app/widgets/gimpcolorframe.c:201 +msgctxt "Coordinates" +msgid "X:" +msgstr "X:" -#: ../app/widgets/gimpcolorframe.c:520 ../app/widgets/gimpcolorframe.c:550 -msgid "Red:" -msgstr "红色：" +#. TRANSLATORS: Y for the Y coordinate. +#: ../app/widgets/gimpcolorframe.c:215 +msgctxt "Coordinates" +msgid "Y:" +msgstr "Y:" -#: ../app/widgets/gimpcolorframe.c:521 ../app/widgets/gimpcolorframe.c:551 -msgid "Green:" -msgstr "绿色：" +#. TRANSLATORS: n/a for Not Available. +#: ../app/widgets/gimpcolorframe.c:674 ../app/widgets/gimpcolorframe.c:676 +msgctxt "Coordinates" +msgid "n/a" +msgstr "n/a" -#: ../app/widgets/gimpcolorframe.c:522 ../app/widgets/gimpcolorframe.c:552 -msgid "Blue:" -msgstr "蓝色：" +#. TRANSLATORS: V for Value (grayscale) +#: ../app/widgets/gimpcolorframe.c:749 +msgctxt "Grayscale" +msgid "V:" +msgstr "V:" -#: ../app/widgets/gimpcolorframe.c:535 +#. TRANSLATORS: A for Alpha (color transparency) +#: ../app/widgets/gimpcolorframe.c:753 ../app/widgets/gimpcolorframe.c:766 +#: ../app/widgets/gimpcolorframe.c:802 ../app/widgets/gimpcolorframe.c:844 +#: ../app/widgets/gimpcolorframe.c:872 ../app/widgets/gimpcolorframe.c:904 +#: ../app/widgets/gimpcolorframe.c:938 +msgctxt "Alpha channel" +msgid "A:" +msgstr "A:" + +#. TRANSLATORS: R for Red (RGB) +#: ../app/widgets/gimpcolorframe.c:758 ../app/widgets/gimpcolorframe.c:794 +msgctxt "RGB" +msgid "R:" +msgstr "R:" + +#. TRANSLATORS: G for Green (RGB) +#: ../app/widgets/gimpcolorframe.c:760 ../app/widgets/gimpcolorframe.c:796 +msgctxt "RGB" +msgid "G:" +msgstr "G:" + +#. TRANSLATORS: B for Blue (RGB) +#: ../app/widgets/gimpcolorframe.c:762 ../app/widgets/gimpcolorframe.c:798 +msgctxt "RGB" +msgid "B:" +msgstr "B:" + +#. TRANSLATORS: Index of the color in the palette. +#: ../app/widgets/gimpcolorframe.c:771 +msgctxt "Indexed color" msgid "Index:" msgstr "索引：" -#: ../app/widgets/gimpcolorframe.c:563 +#. TRANSLATORS: Hex for Hexadecimal (representation of a color) +#: ../app/widgets/gimpcolorframe.c:805 +msgctxt "Color representation" msgid "Hex:" -msgstr "十六进制：" +msgstr "Hex:" -#: ../app/widgets/gimpcolorframe.c:570 -msgid "Hue:" -msgstr "色调：" +#. TRANSLATORS: H for Hue (HSV color space) +#: ../app/widgets/gimpcolorframe.c:836 +msgctxt "HSV color space" +msgid "H:" +msgstr "H:" -#: ../app/widgets/gimpcolorframe.c:571 -msgid "Sat.:" -msgstr "饱和度：" +#. TRANSLATORS: S for Saturation (HSV color space) +#: ../app/widgets/gimpcolorframe.c:838 +msgctxt "HSV color space" +msgid "S:" +msgstr "S:" -#: ../app/widgets/gimpcolorframe.c:589 -msgid "Cyan:" -msgstr "青色：" +#. TRANSLATORS: V for Value (HSV color space) +#: ../app/widgets/gimpcolorframe.c:840 +msgctxt "HSV color space" +msgid "V:" +msgstr "V:" -#: ../app/widgets/gimpcolorframe.c:590 -msgid "Magenta:" -msgstr "品红：" +#. TRANSLATORS: L for Lightness (LCH color space) +#: ../app/widgets/gimpcolorframe.c:864 +msgctxt "LCH color space" +msgid "L*:" +msgstr "L*:" -#: ../app/widgets/gimpcolorframe.c:591 -msgid "Yellow:" -msgstr "黄色：" +#. TRANSLATORS: C for Chroma (LCH color space) +#: ../app/widgets/gimpcolorframe.c:866 +msgctxt "LCH color space" +msgid "C*:" +msgstr "C*:" -#: ../app/widgets/gimpcolorframe.c:592 -msgid "Black:" -msgstr "黑色：" +#. TRANSLATORS: H for Hue angle (LCH color space) +#: ../app/widgets/gimpcolorframe.c:868 +msgctxt "LCH color space" +msgid "h°:" +msgstr "h°:" -#: ../app/widgets/gimpcolorframe.c:612 -msgid "Alpha:" -msgstr "Alpha：" +#. TRANSLATORS: L* for Lightness (Lab color space) +#: ../app/widgets/gimpcolorframe.c:896 +msgctxt "Lab color space" +msgid "L*:" +msgstr "L*:" -#: ../app/widgets/gimpcolormapeditor.c:200 +#. TRANSLATORS: a* color channel in Lab color space +#: ../app/widgets/gimpcolorframe.c:898 +msgctxt "Lab color space" +msgid "a*:" +msgstr "a*:" + +#. TRANSLATORS: b* color channel in Lab color space +#: ../app/widgets/gimpcolorframe.c:900 +msgctxt "Lab color space" +msgid "b*:" +msgstr "b*:" + +#. TRANSLATORS: C for Cyan (CMYK) +#: ../app/widgets/gimpcolorframe.c:928 +msgctxt "CMYK" +msgid "C:" +msgstr "C:" + +#. TRANSLATORS: M for Magenta (CMYK) +#: ../app/widgets/gimpcolorframe.c:930 +msgctxt "CMYK" +msgid "M:" +msgstr "M:" + +#. TRANSLATORS: Y for Yellow (CMYK) +#: ../app/widgets/gimpcolorframe.c:932 +msgctxt "CMYK" +msgid "Y:" +msgstr "Y:" + +#. TRANSLATORS: K for Key/black (CMYK) +#: ../app/widgets/gimpcolorframe.c:934 +msgctxt "CMYK" +msgid "K:" +msgstr "K:" + +#: ../app/widgets/gimpcolorframe.c:996 +msgctxt "Color value" +msgid "n/a" +msgstr "n/a" + +#: ../app/widgets/gimpcolormapeditor.c:203 msgid "Color index:" msgstr "颜色索引：" -#: ../app/widgets/gimpcolormapeditor.c:210 +#: ../app/widgets/gimpcolormapeditor.c:213 msgid "HTML notation:" -msgstr "HTML 格式：" +msgstr "HTML 标记：" -#: ../app/widgets/gimpcolormapeditor.c:466 +#: ../app/widgets/gimpcolormapeditor.c:481 msgid "Only indexed images have a colormap." -msgstr "只有索引图像具有颜色表" +msgstr "只有索引图像带有颜色表。" -#: ../app/widgets/gimpcolorselectorpalette.c:59 -msgid "Palette" -msgstr "色板" - -#: ../app/widgets/gimpcontainerpopup.c:592 +#: ../app/widgets/gimpcontainerpopup.c:333 msgid "Smaller Previews" msgstr "减小预览" -#: ../app/widgets/gimpcontainerpopup.c:597 +#: ../app/widgets/gimpcontainerpopup.c:338 msgid "Larger Previews" msgstr "增大预览" #: ../app/widgets/gimpcontrollereditor.c:199 msgid "_Dump events from this controller" -msgstr "转储此控制器事件(_D)" +msgstr "转储来自此控制器的事件(_D)" #: ../app/widgets/gimpcontrollereditor.c:204 msgid "_Enable this controller" @@ -14671,7 +22901,7 @@ msgstr "启用此控制器(_E)" #: ../app/widgets/gimpcontrollereditor.c:225 msgid "Name:" -msgstr "名称：" +msgstr "名字：" #: ../app/widgets/gimpcontrollereditor.c:231 msgid "State:" @@ -14689,26 +22919,41 @@ msgstr "抓取事件(_G)" msgid "Select the next event arriving from the controller" msgstr "选择控制器带来的下个事件" -#: ../app/widgets/gimpcontrollereditor.c:526 +#: ../app/widgets/gimpcontrollereditor.c:374 +msgid "_Edit event" +msgstr "编辑事件(_E)" + +#: ../app/widgets/gimpcontrollereditor.c:382 +msgid "_Clear event" +msgstr "清空事件(_C)" + +#: ../app/widgets/gimpcontrollereditor.c:521 #, c-format msgid "Remove the action assigned to '%s'" msgstr "删除指派给“%s”的动作" -#: ../app/widgets/gimpcontrollereditor.c:531 +#: ../app/widgets/gimpcontrollereditor.c:526 #, c-format msgid "Assign an action to '%s'" msgstr "为“%s”指派动作" -#: ../app/widgets/gimpcontrollereditor.c:652 +#: ../app/widgets/gimpcontrollereditor.c:647 #, c-format msgid "Select Action for Event '%s'" msgstr "选择事件“%s”的动作" -#: ../app/widgets/gimpcontrollereditor.c:657 +#: ../app/widgets/gimpcontrollereditor.c:652 msgid "Select Controller Event Action" msgstr "选择控制器事件动作" -#: ../app/widgets/gimpcontrollerkeyboard.c:67 +#: ../app/widgets/gimpcontrollerinfo.c:112 +msgid "Enabled" +msgstr "已启用" + +#: ../app/widgets/gimpcontrollerinfo.c:119 +msgid "Debug events" +msgstr "调试事件" + #: ../app/widgets/gimpcontrollerkeyboard.c:70 #: ../app/widgets/gimpcontrollerkeyboard.c:73 #: ../app/widgets/gimpcontrollerkeyboard.c:76 @@ -14716,10 +22961,10 @@ msgstr "选择控制器事件动作" #: ../app/widgets/gimpcontrollerkeyboard.c:82 #: ../app/widgets/gimpcontrollerkeyboard.c:85 #: ../app/widgets/gimpcontrollerkeyboard.c:88 +#: ../app/widgets/gimpcontrollerkeyboard.c:91 msgid "Cursor Up" msgstr "光标上移" -#: ../app/widgets/gimpcontrollerkeyboard.c:92 #: ../app/widgets/gimpcontrollerkeyboard.c:95 #: ../app/widgets/gimpcontrollerkeyboard.c:98 #: ../app/widgets/gimpcontrollerkeyboard.c:101 @@ -14727,10 +22972,10 @@ msgstr "光标上移" #: ../app/widgets/gimpcontrollerkeyboard.c:107 #: ../app/widgets/gimpcontrollerkeyboard.c:110 #: ../app/widgets/gimpcontrollerkeyboard.c:113 +#: ../app/widgets/gimpcontrollerkeyboard.c:116 msgid "Cursor Down" msgstr "光标下移" -#: ../app/widgets/gimpcontrollerkeyboard.c:117 #: ../app/widgets/gimpcontrollerkeyboard.c:120 #: ../app/widgets/gimpcontrollerkeyboard.c:123 #: ../app/widgets/gimpcontrollerkeyboard.c:126 @@ -14738,10 +22983,10 @@ msgstr "光标下移" #: ../app/widgets/gimpcontrollerkeyboard.c:132 #: ../app/widgets/gimpcontrollerkeyboard.c:135 #: ../app/widgets/gimpcontrollerkeyboard.c:138 +#: ../app/widgets/gimpcontrollerkeyboard.c:141 msgid "Cursor Left" msgstr "光标左移" -#: ../app/widgets/gimpcontrollerkeyboard.c:142 #: ../app/widgets/gimpcontrollerkeyboard.c:145 #: ../app/widgets/gimpcontrollerkeyboard.c:148 #: ../app/widgets/gimpcontrollerkeyboard.c:151 @@ -14749,54 +22994,55 @@ msgstr "光标左移" #: ../app/widgets/gimpcontrollerkeyboard.c:157 #: ../app/widgets/gimpcontrollerkeyboard.c:160 #: ../app/widgets/gimpcontrollerkeyboard.c:163 +#: ../app/widgets/gimpcontrollerkeyboard.c:166 msgid "Cursor Right" msgstr "光标右移" -#: ../app/widgets/gimpcontrollerkeyboard.c:175 +#: ../app/widgets/gimpcontrollerkeyboard.c:178 msgid "Keyboard" msgstr "键盘" -#: ../app/widgets/gimpcontrollerkeyboard.c:216 +#: ../app/widgets/gimpcontrollerkeyboard.c:230 msgid "Keyboard Events" -msgstr "键盘消息" +msgstr "键盘事件" -#: ../app/widgets/gimpcontrollerkeyboard.c:217 -#: ../app/widgets/gimpcontrollermouse.c:245 -#: ../app/widgets/gimpcontrollerwheel.c:219 +#: ../app/widgets/gimpcontrollerkeyboard.c:231 +#: ../app/widgets/gimpcontrollermouse.c:252 +#: ../app/widgets/gimpcontrollerwheel.c:230 msgid "Ready" msgstr "就绪" #: ../app/widgets/gimpcontrollerlist.c:183 msgid "Available Controllers" -msgstr "可用的控制器" +msgstr "可用控制器" -#: ../app/widgets/gimpcontrollerlist.c:278 +#: ../app/widgets/gimpcontrollerlist.c:280 msgid "Active Controllers" -msgstr "活动的控制器" +msgstr "活动控制器" -#: ../app/widgets/gimpcontrollerlist.c:294 +#: ../app/widgets/gimpcontrollerlist.c:296 msgid "Configure the selected controller" -msgstr "配置选中的控制器" +msgstr "配置选中控制器" -#: ../app/widgets/gimpcontrollerlist.c:302 +#: ../app/widgets/gimpcontrollerlist.c:304 msgid "Move the selected controller up" -msgstr "选中的控制器上移" +msgstr "上移选中控制器" -#: ../app/widgets/gimpcontrollerlist.c:310 +#: ../app/widgets/gimpcontrollerlist.c:312 msgid "Move the selected controller down" -msgstr "选中的控制器下移" +msgstr "下移选中控制器" -#: ../app/widgets/gimpcontrollerlist.c:428 +#: ../app/widgets/gimpcontrollerlist.c:425 #, c-format msgid "Add '%s' to the list of active controllers" msgstr "将“%s”添加到活动控制器列表" -#: ../app/widgets/gimpcontrollerlist.c:479 +#: ../app/widgets/gimpcontrollerlist.c:476 #, c-format msgid "Remove '%s' from the list of active controllers" msgstr "从活动控制器列表中删除“%s”" -#: ../app/widgets/gimpcontrollerlist.c:513 +#: ../app/widgets/gimpcontrollerlist.c:510 msgid "" "There can only be one active keyboard controller.\n" "\n" @@ -14806,7 +23052,7 @@ msgstr "" "\n" "在您的活动控制器列表中已经有一个键盘控制器。" -#: ../app/widgets/gimpcontrollerlist.c:524 +#: ../app/widgets/gimpcontrollerlist.c:521 msgid "" "There can only be one active wheel controller.\n" "\n" @@ -14816,35 +23062,34 @@ msgstr "" "\n" "在您的活动控制器列表中已经有一个滚轮控制器。" -#: ../app/widgets/gimpcontrollerlist.c:535 -#, fuzzy +#: ../app/widgets/gimpcontrollerlist.c:532 msgid "" "There can only be one active mouse controller.\n" "\n" "You already have a mouse controller in your list of active controllers." msgstr "" -"只能有一个活动的滚轮控制器。\n" +"只能有一个活动的鼠标控制器。\n" "\n" -"在您的活动控制器列表中已经有一个滚轮控制器。" +"在您的活动控制器列表中已经有一个鼠标控制器。" -#: ../app/widgets/gimpcontrollerlist.c:561 +#: ../app/widgets/gimpcontrollerlist.c:558 msgid "Remove Controller?" -msgstr "删除控制器吗？" +msgstr "移除控制器吗？" -#: ../app/widgets/gimpcontrollerlist.c:566 -msgid "Disable Controller" -msgstr "禁用控制器" +#: ../app/widgets/gimpcontrollerlist.c:563 +msgid "_Disable Controller" +msgstr "禁用控制器(_D)" -#: ../app/widgets/gimpcontrollerlist.c:568 -msgid "Remove Controller" -msgstr "删除控制器" +#: ../app/widgets/gimpcontrollerlist.c:565 +msgid "_Remove Controller" +msgstr "移除控制器(_R)" -#: ../app/widgets/gimpcontrollerlist.c:580 +#: ../app/widgets/gimpcontrollerlist.c:577 #, c-format msgid "Remove Controller '%s'?" -msgstr "删除“%s”控制器吗？" +msgstr "移除“%s”控制器吗？" -#: ../app/widgets/gimpcontrollerlist.c:584 +#: ../app/widgets/gimpcontrollerlist.c:581 msgid "" "Removing this controller from the list of active controllers will " "permanently delete all event mappings you have configured.\n" @@ -14852,11 +23097,11 @@ msgid "" "Selecting \"Disable Controller\" will disable the controller without " "removing it." msgstr "" -"从活动控制器列表中移删此控制器将久永性地删除所有您配置的事件映射。\n" +"从活动控制器列表中移除此控制器将久永性地删除所有您配置的事件映射。\n" "\n" -"选择“禁用控制器”可以禁用控制器而非移除它。" +"选择“禁用控制器”可以禁用控制器而非删除它。" -#: ../app/widgets/gimpcontrollerlist.c:636 +#: ../app/widgets/gimpcontrollerlist.c:633 msgid "Configure Input Controller" msgstr "配置输入控制器" @@ -14868,9 +23113,8 @@ msgstr "配置输入控制器" #: ../app/widgets/gimpcontrollermouse.c:85 #: ../app/widgets/gimpcontrollermouse.c:88 #: ../app/widgets/gimpcontrollermouse.c:91 -#, fuzzy msgid "Button 8" -msgstr "对接" +msgstr "按钮 8" #: ../app/widgets/gimpcontrollermouse.c:95 #: ../app/widgets/gimpcontrollermouse.c:98 @@ -14880,9 +23124,8 @@ msgstr "对接" #: ../app/widgets/gimpcontrollermouse.c:110 #: ../app/widgets/gimpcontrollermouse.c:113 #: ../app/widgets/gimpcontrollermouse.c:116 -#, fuzzy msgid "Button 9" -msgstr "对接" +msgstr "按钮 9" #: ../app/widgets/gimpcontrollermouse.c:120 #: ../app/widgets/gimpcontrollermouse.c:123 @@ -14892,9 +23135,8 @@ msgstr "对接" #: ../app/widgets/gimpcontrollermouse.c:135 #: ../app/widgets/gimpcontrollermouse.c:138 #: ../app/widgets/gimpcontrollermouse.c:141 -#, fuzzy msgid "Button 10" -msgstr "对接" +msgstr "按钮 10" #: ../app/widgets/gimpcontrollermouse.c:145 #: ../app/widgets/gimpcontrollermouse.c:148 @@ -14904,9 +23146,8 @@ msgstr "对接" #: ../app/widgets/gimpcontrollermouse.c:160 #: ../app/widgets/gimpcontrollermouse.c:163 #: ../app/widgets/gimpcontrollermouse.c:166 -#, fuzzy msgid "Button 11" -msgstr "对接" +msgstr "按钮 11" #: ../app/widgets/gimpcontrollermouse.c:170 #: ../app/widgets/gimpcontrollermouse.c:173 @@ -14916,19 +23157,16 @@ msgstr "对接" #: ../app/widgets/gimpcontrollermouse.c:185 #: ../app/widgets/gimpcontrollermouse.c:188 #: ../app/widgets/gimpcontrollermouse.c:191 -#, fuzzy msgid "Button 12" -msgstr "对接" +msgstr "按钮 12" #: ../app/widgets/gimpcontrollermouse.c:203 -#, fuzzy msgid "Mouse Buttons" -msgstr "鼠标指针" +msgstr "鼠标按键" -#: ../app/widgets/gimpcontrollermouse.c:244 -#, fuzzy +#: ../app/widgets/gimpcontrollermouse.c:251 msgid "Mouse Button Events" -msgstr "鼠标滚轮事件" +msgstr "鼠标按键事件" #: ../app/widgets/gimpcontrollerwheel.c:69 #: ../app/widgets/gimpcontrollerwheel.c:72 @@ -14939,7 +23177,7 @@ msgstr "鼠标滚轮事件" #: ../app/widgets/gimpcontrollerwheel.c:87 #: ../app/widgets/gimpcontrollerwheel.c:90 msgid "Scroll Up" -msgstr "上卷" +msgstr "上滚" #: ../app/widgets/gimpcontrollerwheel.c:94 #: ../app/widgets/gimpcontrollerwheel.c:97 @@ -14950,7 +23188,7 @@ msgstr "上卷" #: ../app/widgets/gimpcontrollerwheel.c:112 #: ../app/widgets/gimpcontrollerwheel.c:115 msgid "Scroll Down" -msgstr "下卷" +msgstr "下滚" #: ../app/widgets/gimpcontrollerwheel.c:119 #: ../app/widgets/gimpcontrollerwheel.c:122 @@ -14961,7 +23199,7 @@ msgstr "下卷" #: ../app/widgets/gimpcontrollerwheel.c:137 #: ../app/widgets/gimpcontrollerwheel.c:140 msgid "Scroll Left" -msgstr "左卷" +msgstr "左滚" #: ../app/widgets/gimpcontrollerwheel.c:144 #: ../app/widgets/gimpcontrollerwheel.c:147 @@ -14972,43 +23210,331 @@ msgstr "左卷" #: ../app/widgets/gimpcontrollerwheel.c:162 #: ../app/widgets/gimpcontrollerwheel.c:165 msgid "Scroll Right" -msgstr "右卷" +msgstr "右滚" #: ../app/widgets/gimpcontrollerwheel.c:177 msgid "Mouse Wheel" msgstr "鼠标滚轮" -#: ../app/widgets/gimpcontrollerwheel.c:218 +#: ../app/widgets/gimpcontrollerwheel.c:229 msgid "Mouse Wheel Events" msgstr "鼠标滚轮事件" -#: ../app/widgets/gimpdataeditor.c:216 -msgid "Save" -msgstr "保存" +#: ../app/widgets/gimpcriticaldialog.c:54 +msgid "Copy Bug Information" +msgstr "复制缺陷信息" -#: ../app/widgets/gimpdataeditor.c:224 -msgid "Revert" -msgstr "恢复" +#: ../app/widgets/gimpcriticaldialog.c:55 +msgid "Open Bug Tracker" +msgstr "打开缺陷追踪器" -#: ../app/widgets/gimpdataeditor.c:436 +#: ../app/widgets/gimpcriticaldialog.c:132 +#: ../app/widgets/gimpcriticaldialog.c:443 +msgid "" +"To help us improve GIMP, you can report the bug with these simple steps:" +msgstr "为了帮助我们改进 GIMP，您可以通过这些简单步骤报告缺陷：" + +#: ../app/widgets/gimpcriticaldialog.c:134 +#: ../app/widgets/gimpcriticaldialog.c:445 +msgid "Copy the bug information to the clipboard by clicking: " +msgstr "通过点击将缺陷信息复制到剪贴板： " + +#: ../app/widgets/gimpcriticaldialog.c:136 +#: ../app/widgets/gimpcriticaldialog.c:447 +msgid "Open our bug tracker in the browser by clicking: " +msgstr "通过点击在浏览器中打开我们的缺陷追踪器： " + +#: ../app/widgets/gimpcriticaldialog.c:138 +#: ../app/widgets/gimpcriticaldialog.c:449 +msgid "Create a login if you don't have one yet." +msgstr "如果您还没有的话创建一个帐号。" + +#: ../app/widgets/gimpcriticaldialog.c:139 +#: ../app/widgets/gimpcriticaldialog.c:450 +msgid "Paste the clipboard text in a new bug report." +msgstr "在一个新缺陷报告中粘贴剪贴板文字。" + +#: ../app/widgets/gimpcriticaldialog.c:140 +#: ../app/widgets/gimpcriticaldialog.c:451 +msgid "" +"Add relevant information in English in the bug report explaining what you " +"were doing when this error occurred." +msgstr "在缺陷报告中用英语添加相关信息解释当错误发生时您在做什么。" + +#: ../app/widgets/gimpcriticaldialog.c:142 +msgid "" +"This error may have left GIMP in an inconsistent state. It is advised to " +"save your work and restart GIMP." +msgstr "该错误可能会使 GIMP 处于一种不一致状态。建议保存您的工作并重启 GIMP。" + +#: ../app/widgets/gimpcriticaldialog.c:153 +msgid "" +"You can also close the dialog directly but reporting bugs is the best way to " +"make your software awesome." +msgstr "您也可以直接关闭该对话框但报告缺陷是使您的软件更棒的最好方式。" + +#: ../app/widgets/gimpcriticaldialog.c:226 +msgid "The operating system is out of memory or resources." +msgstr "该操作系统已耗尽内存或资源。" + +#: ../app/widgets/gimpcriticaldialog.c:229 +msgid "The specified file was not found." +msgstr "指定文件未找到。" + +#: ../app/widgets/gimpcriticaldialog.c:232 +msgid "The specified path was not found." +msgstr "指定路径未找到。" + +#: ../app/widgets/gimpcriticaldialog.c:235 +msgid "" +"The .exe file is invalid (non-Microsoft Win32 .exe or error in .exe image)." +msgstr "该 .exe 文件是无效的(非微软 Win32 .exe 或 .exe 镜像存在错误)。" + +#: ../app/widgets/gimpcriticaldialog.c:238 +msgid "The operating system denied access to the specified file." +msgstr "该操作系统拒绝了对指定文件的访问。" + +#: ../app/widgets/gimpcriticaldialog.c:241 +msgid "The file name association is incomplete or invalid." +msgstr "该文件名称绑定不完整或无效。" + +#: ../app/widgets/gimpcriticaldialog.c:244 +msgid "DDE transaction busy" +msgstr "DDE 处理忙碌" + +#: ../app/widgets/gimpcriticaldialog.c:247 +msgid "The DDE transaction failed." +msgstr "该 DDE 处理失败。" + +#: ../app/widgets/gimpcriticaldialog.c:250 +msgid "The DDE transaction timed out." +msgstr "该 DDE 处理超时。" + +#: ../app/widgets/gimpcriticaldialog.c:253 +msgid "The specified DLL was not found." +msgstr "指定 DLL 未找到。" + +#: ../app/widgets/gimpcriticaldialog.c:256 +msgid "There is no application associated with the given file name extension." +msgstr "没有应用程序与给定的文件名称扩展绑定。" + +#: ../app/widgets/gimpcriticaldialog.c:259 +msgid "There was not enough memory to complete the operation." +msgstr "没有足够内存完成该操作。" + +#: ../app/widgets/gimpcriticaldialog.c:262 +msgid "A sharing violation occurred." +msgstr "发生了一个共享冲突。" + +#: ../app/widgets/gimpcriticaldialog.c:265 +msgid "Unknown Microsoft Windows error." +msgstr "未知微软 Windows 错误。" + +#: ../app/widgets/gimpcriticaldialog.c:268 +#, c-format +msgid "Failed to open '%s': %s" +msgstr "打开“%s”失败：%s" + +#: ../app/widgets/gimpcriticaldialog.c:409 +#, c-format +msgid "GIMP crashed with a fatal error: %s" +msgstr "GIMP 因一个致命错误崩溃：%s" + +#. First error. Let's just display it. +#: ../app/widgets/gimpcriticaldialog.c:416 +#, c-format +msgid "GIMP encountered an error: %s" +msgstr "GIMP 遇到一个错误：%s" + +#. Let's not display all errors. They will be in the bug report +#. * part anyway. +#. +#: ../app/widgets/gimpcriticaldialog.c:424 +#, c-format +msgid "GIMP encountered several critical errors!" +msgstr "GIMP 遇到几个严重错误！" + +#: ../app/widgets/gimpcriticaldialog.c:476 +msgid "_Restart GIMP" +msgstr "重启 GIMP(_R)" + +#: ../app/widgets/gimpdashboard.c:346 ../app/widgets/gimpdashboard.c:398 +msgctxt "dashboard-variable" +msgid "Occupied" +msgstr "占用" + +#: ../app/widgets/gimpdashboard.c:347 +msgid "Tile cache occupied size" +msgstr "平铺缓存已占用大小" + +#: ../app/widgets/gimpdashboard.c:356 +msgctxt "dashboard-variable" +msgid "Maximum" +msgstr "最大" + +#: ../app/widgets/gimpdashboard.c:357 +msgid "Maximal tile cache occupied size" +msgstr "平铺缓存占用大小的最大值" + +#: ../app/widgets/gimpdashboard.c:366 ../app/widgets/gimpdashboard.c:418 +msgctxt "dashboard-variable" +msgid "Limit" +msgstr "限制" + +#: ../app/widgets/gimpdashboard.c:367 +msgid "Tile cache size limit" +msgstr "平铺缓存大小限制" + +#: ../app/widgets/gimpdashboard.c:375 +msgctxt "dashboard-variable" +msgid "Compression" +msgstr "压缩" + +#: ../app/widgets/gimpdashboard.c:376 +msgid "Tile cache compression ratio" +msgstr "平铺缓存压缩比率" + +#: ../app/widgets/gimpdashboard.c:385 +msgctxt "dashboard-variable" +msgid "Hit/Miss" +msgstr "命中/未中" + +#: ../app/widgets/gimpdashboard.c:386 +msgid "Tile cache hit/miss ratio" +msgstr "平铺缓存击中/未中比率" + +#: ../app/widgets/gimpdashboard.c:399 +msgid "Swap file occupied size" +msgstr "交换文件占用大小" + +#: ../app/widgets/gimpdashboard.c:408 +msgctxt "dashboard-variable" +msgid "Size" +msgstr "大小" + +#: ../app/widgets/gimpdashboard.c:409 +msgid "Swap file size" +msgstr "交换文件大小" + +#: ../app/widgets/gimpdashboard.c:419 +msgid "Swap file size limit" +msgstr "交换文件大小限制" + +#: ../app/widgets/gimpdashboard.c:426 +msgctxt "dashboard-variable" +msgid "Busy" +msgstr "忙碌" + +#: ../app/widgets/gimpdashboard.c:427 +msgid "Whether there is work queued for the swap file" +msgstr "是否存在任务在排队等候交换文件" + +#: ../app/widgets/gimpdashboard.c:440 +msgctxt "dashboard-variable" +msgid "Usage" +msgstr "占用" + +#: ../app/widgets/gimpdashboard.c:441 +msgid "Total CPU usage" +msgstr "全部处理器占用" + +#: ../app/widgets/gimpdashboard.c:449 ../app/widgets/gimpdashboard.c:459 +msgctxt "dashboard-variable" +msgid "Active" +msgstr "活动" + +#: ../app/widgets/gimpdashboard.c:450 +msgid "Whether the CPU is active" +msgstr "处理器是否处于活动状态" + +#: ../app/widgets/gimpdashboard.c:460 +msgid "Total amount of time the CPU has been active" +msgstr "处理器处于活动状态的全部时间" + +#: ../app/widgets/gimpdashboard.c:473 +msgctxt "dashboard-variable" +msgid "Mipmapped" +msgstr "纹理" + +#: ../app/widgets/gimpdashboard.c:474 +msgid "Total size of processed mipmapped data" +msgstr "已处理渐进纹理数据的全部大小" + +#: ../app/widgets/gimpdashboard.c:486 +msgctxt "dashboard-group" +msgid "Cache" +msgstr "缓存" + +#: ../app/widgets/gimpdashboard.c:487 +msgid "In-memory tile cache" +msgstr "内存中的平铺缓存" + +#: ../app/widgets/gimpdashboard.c:523 +msgctxt "dashboard-group" +msgid "Swap" +msgstr "交换" + +#: ../app/widgets/gimpdashboard.c:524 +msgid "On-disk tile swap" +msgstr "硬盘中的平铺交换" + +#: ../app/widgets/gimpdashboard.c:553 +msgctxt "dashboard-group" +msgid "CPU" +msgstr "处理器" + +#: ../app/widgets/gimpdashboard.c:554 +msgid "CPU usage" +msgstr "处理器占用" + +#: ../app/widgets/gimpdashboard.c:583 +msgctxt "dashboard-group" +msgid "Misc" +msgstr "杂项" + +#: ../app/widgets/gimpdashboard.c:584 +msgid "Miscellaneous information" +msgstr "其他杂项信息" + +#: ../app/widgets/gimpdashboard.c:744 +msgid "Select fields" +msgstr "选择区域" + +#. Tranlators: "N/A" is an abbreviation for "not available" +#: ../app/widgets/gimpdashboard.c:2323 +msgctxt "dashboard-value" +msgid "N/A" +msgstr "N/A" + +#: ../app/widgets/gimpdashboard.c:2332 +msgctxt "dashboard-value" +msgid "Yes" +msgstr "是" + +#: ../app/widgets/gimpdashboard.c:2333 +msgctxt "dashboard-value" +msgid "No" +msgstr "否" + +#: ../app/widgets/gimpdataeditor.c:413 #, c-format msgid "%s (read only)" msgstr "%s (只读)" #: ../app/widgets/gimpdeviceeditor.c:166 msgid "Delete the selected device" -msgstr "删除选中的设备" +msgstr "删除选中设备" -#: ../app/widgets/gimpdeviceeditor.c:503 +#: ../app/widgets/gimpdeviceeditor.c:502 msgid "Delete Device Settings" msgstr "删除设备设置" -#: ../app/widgets/gimpdeviceeditor.c:524 +#: ../app/widgets/gimpdeviceeditor.c:523 #, c-format msgid "Delete \"%s\"?" -msgstr "删除“%s”？" +msgstr "删除“%s”吗？" -#: ../app/widgets/gimpdeviceeditor.c:527 +#: ../app/widgets/gimpdeviceeditor.c:526 msgid "" "You are about to delete this device's stored settings.\n" "The next time this device is plugged, default settings will be used." @@ -15016,8 +23542,12 @@ msgstr "" "您正试图删除此设备已存储的设置。\n" "下次此设备被插入时，将应用默认设置。" +#: ../app/widgets/gimpdeviceinfo.c:163 +msgid "Pressure curve" +msgstr "压力曲线" + #: ../app/widgets/gimpdeviceinfoeditor.c:141 -#: ../app/widgets/gimpdynamicseditor.c:142 +#: ../app/widgets/gimpdynamicseditor.c:161 #: ../app/widgets/gimpdynamicsoutputeditor.c:70 msgid "Pressure" msgstr "压力" @@ -15030,82 +23560,83 @@ msgstr "X 倾斜" msgid "Y tilt" msgstr "X 倾斜" -#: ../app/widgets/gimpdeviceinfoeditor.c:144 -#: ../app/widgets/gimpdynamicseditor.c:146 -#: ../app/widgets/gimpdynamicsoutputeditor.c:74 -msgid "Wheel" -msgstr "滚轮" +#. Wheel as in mouse or input device wheel. +#. * Some pens use the same axis for their rotation feature. +#. * See bug 791455. +#. +#: ../app/widgets/gimpdeviceinfoeditor.c:148 +#: ../app/widgets/gimpdynamicseditor.c:165 +msgid "Wheel/Rotation" +msgstr "滚轮/旋转" #. the axes -#: ../app/widgets/gimpdeviceinfoeditor.c:194 +#. The axes of an input device +#: ../app/widgets/gimpdeviceinfoeditor.c:199 msgid "Axes" msgstr "轴线" #. the keys -#: ../app/widgets/gimpdeviceinfoeditor.c:268 +#: ../app/widgets/gimpdeviceinfoeditor.c:273 msgid "Keys" msgstr "按键" -#: ../app/widgets/gimpdeviceinfoeditor.c:365 -#: ../app/widgets/gimpdeviceinfoeditor.c:583 +#: ../app/widgets/gimpdeviceinfoeditor.c:369 +#: ../app/widgets/gimpdeviceinfoeditor.c:584 #, c-format msgid "none" msgstr "无" -#: ../app/widgets/gimpdeviceinfoeditor.c:413 +#. e.g. "Pressure Curve" for mapping input device axes +#: ../app/widgets/gimpdeviceinfoeditor.c:418 #, c-format msgid "%s Curve" msgstr "%s 曲线" -#: ../app/widgets/gimpdeviceinfoeditor.c:472 -#: ../app/widgets/gimpdynamicsoutputeditor.c:210 +#: ../app/widgets/gimpdeviceinfoeditor.c:477 +#: ../app/widgets/gimpdynamicsoutputeditor.c:209 msgid "_Reset Curve" msgstr "重置曲线(_R)" -#: ../app/widgets/gimpdeviceinfoeditor.c:485 +#: ../app/widgets/gimpdeviceinfoeditor.c:490 #, c-format msgid "The axis '%s' has no curve" -msgstr "轴“%s”没有曲线" +msgstr "轴“%s”上没有曲线" -#: ../app/widgets/gimpdevicestatus.c:138 +#: ../app/widgets/gimpdevicestatus.c:145 msgid "Save device status" msgstr "保存设备状态" -#: ../app/widgets/gimpdevicestatus.c:434 +#: ../app/widgets/gimpdevicestatus.c:465 #, c-format msgid "Foreground: %d, %d, %d" msgstr "前景：%d, %d, %d" -#: ../app/widgets/gimpdevicestatus.c:439 +#: ../app/widgets/gimpdevicestatus.c:470 #, c-format msgid "Background: %d, %d, %d" msgstr "背景：%d, %d, %d" -#: ../app/widgets/gimpdnd-xds.c:203 +#: ../app/widgets/gimpdnd-xds.c:205 msgid "The given filename does not have any known file extension." msgstr "给定的文件名不包含任何已知的文件扩展名。" -#: ../app/widgets/gimpdnd-xds.c:221 +#: ../app/widgets/gimpdnd-xds.c:223 msgid "File Exists" msgstr "文件已存在" -#: ../app/widgets/gimpdnd-xds.c:226 +#: ../app/widgets/gimpdnd-xds.c:229 msgid "_Replace" msgstr "替换(_R)" -#: ../app/widgets/gimpdnd-xds.c:237 +#: ../app/widgets/gimpdnd-xds.c:239 #, c-format msgid "A file named '%s' already exists." msgstr "已存在一个叫“%s”的文件。" -#: ../app/widgets/gimpdnd-xds.c:242 +#: ../app/widgets/gimpdnd-xds.c:243 msgid "Do you want to replace it with the image you are saving?" msgstr "您真的要将它替换为您正在保存的图像吗？" -#: ../app/widgets/gimpdockbook.c:292 -msgid "Configure this tab" -msgstr "配置此页签" - #. String used to separate dockables, e.g. "Tool Options, Layers" #: ../app/widgets/gimpdock.h:34 msgctxt "dock" @@ -15128,208 +23659,233 @@ msgctxt "dock" msgid " | " msgstr " | " +#: ../app/widgets/gimpdockbook.c:303 +msgid "Configure this tab" +msgstr "配置此标签页" + #. Auto button -#: ../app/widgets/gimpdockwindow.c:382 +#: ../app/widgets/gimpdockwindow.c:387 msgid "Auto" msgstr "自动" -#: ../app/widgets/gimpdockwindow.c:393 +#: ../app/widgets/gimpdockwindow.c:398 msgid "" -"When enabled the dialog automatically follows the image you are working on." -msgstr "如果启用，对话框将自动跟随您工作的图像。" +"When enabled, the dialog automatically follows the image you are working on." +msgstr "当启用时，对话框将自动跟随你正在编辑的图片。" #: ../app/widgets/gimpdrawabletreeview.c:121 msgid "Lock pixels" msgstr "锁定像素" -#: ../app/widgets/gimpdynamicseditor.c:136 -msgid "Mapping matrix" -msgstr "映射矩阵" +#: ../app/widgets/gimpdrawabletreeview.c:123 +msgid "Lock position and size" +msgstr "锁定位置和大小" -#: ../app/widgets/gimpdynamicseditor.c:143 +#: ../app/widgets/gimpdynamicseditor.c:162 #: ../app/widgets/gimpdynamicsoutputeditor.c:71 msgid "Velocity" msgstr "速率" -#: ../app/widgets/gimpdynamicseditor.c:147 +#: ../app/widgets/gimpdynamicseditor.c:166 #: ../app/widgets/gimpdynamicsoutputeditor.c:75 msgid "Random" msgstr "随机" -#: ../app/widgets/gimpdynamicseditor.c:148 +#: ../app/widgets/gimpdynamicseditor.c:167 #: ../app/widgets/gimpdynamicsoutputeditor.c:76 msgid "Fade" msgstr "淡出" -#: ../app/widgets/gimperrordialog.c:150 +#: ../app/widgets/gimpdynamicseditor.c:182 +msgid "Mapping matrix" +msgstr "映射矩阵" + +#: ../app/widgets/gimpdynamicseditor.c:315 +#: ../app/widgets/gimptoolpreseteditor.c:149 +msgid "Icon:" +msgstr "图标：" + +#: ../app/widgets/gimpdynamicsoutputeditor.c:74 +msgid "Wheel / Rotation" +msgstr "滚轮/旋转" + +#: ../app/widgets/gimperrordialog.c:169 msgid "Too many error messages!" msgstr "太多错误消息！" -#: ../app/widgets/gimperrordialog.c:151 +#: ../app/widgets/gimperrordialog.c:170 msgid "Messages are redirected to stderr." msgstr "消息已被重定向到 stderr。" -#: ../app/widgets/gimperrordialog.c:170 +#. %s is a message domain, +#. * like "GIMP Message" or +#. * "PNG Message" +#. +#: ../app/widgets/gimperrordialog.c:196 #, c-format msgid "%s Message" msgstr "%s 消息" -#: ../app/widgets/gimpfiledialog.c:327 -msgid "Automatically Detected" -msgstr "自动检测" +#: ../app/widgets/gimpexportdialog.c:69 +msgid "Export Image" +msgstr "导出图像" -#: ../app/widgets/gimpfiledialog.c:344 +#: ../app/widgets/gimpexportdialog.c:72 +msgid "_Export" +msgstr "导出(_E)" + +#: ../app/widgets/gimpexportdialog.c:74 ../app/widgets/gimpsavedialog.c:145 msgid "By Extension" msgstr "按扩展名" -#: ../app/widgets/gimpfiledialog.c:793 +#: ../app/widgets/gimpexportdialog.c:80 +msgid "All export images" +msgstr "全部导出图像" + +#: ../app/widgets/gimpfiledialog.c:350 +msgid "_Help" +msgstr "帮助(_H)" + +#: ../app/widgets/gimpfiledialog.c:756 msgid "All files" msgstr "全部文件" -#: ../app/widgets/gimpfiledialog.c:798 +#: ../app/widgets/gimpfiledialog.c:761 msgid "All images" msgstr "全部图像" -#: ../app/widgets/gimpfiledialog.c:974 +#: ../app/widgets/gimpfiledialog.c:959 #, c-format msgid "Select File _Type (%s)" -msgstr "选择文件类型(%s)(_T)" +msgstr "选择文件类型(%s) (_T)" -#: ../app/widgets/gimpfileprocview.c:185 +#: ../app/widgets/gimpfileprocview.c:184 msgid "File Type" msgstr "文件类型" -#: ../app/widgets/gimpfileprocview.c:197 +#: ../app/widgets/gimpfileprocview.c:196 msgid "Extensions" msgstr "扩展名" -#: ../app/widgets/gimpfilleditor.c:125 +#: ../app/widgets/gimpfilleditor.c:124 msgid "Fill Color" msgstr "填充颜色" -#: ../app/widgets/gimpfilleditor.c:144 +#: ../app/widgets/gimpfilleditor.c:143 msgid "_Antialiasing" -msgstr "反锯齿(_A)" +msgstr "抗锯齿(_A)" #: ../app/widgets/gimpgradienteditor.c:754 #, c-format msgid "Zoom factor: %d:1" -msgstr "缩放因子：%d:1" +msgstr "缩放因数：%d:1" #: ../app/widgets/gimpgradienteditor.c:757 #, c-format msgid "Displaying [%0.4f, %0.4f]" msgstr "显示 [%0.4f, %0.4f]" -#: ../app/widgets/gimpgradienteditor.c:954 +#: ../app/widgets/gimpgradienteditor.c:957 #, c-format msgid "Position: %0.4f" msgstr "位置：%0.4f" -#: ../app/widgets/gimpgradienteditor.c:955 +#: ../app/widgets/gimpgradienteditor.c:958 #, c-format msgid "RGB (%0.3f, %0.3f, %0.3f)" msgstr "RGB (%0.3f, %0.3f, %0.3f)" -#: ../app/widgets/gimpgradienteditor.c:957 +#: ../app/widgets/gimpgradienteditor.c:960 #, c-format msgid "HSV (%0.1f, %0.1f, %0.1f)" msgstr "HSV (%0.1f, %0.1f, %0.1f)" -#: ../app/widgets/gimpgradienteditor.c:959 +#: ../app/widgets/gimpgradienteditor.c:962 #, c-format msgid "Luminance: %0.1f Opacity: %0.1f" -msgstr "强度：%0.1f 不透明度：%0.1f" +msgstr "亮度：%0.1f 不透明度：%0.1f" -#: ../app/widgets/gimpgradienteditor.c:990 +#: ../app/widgets/gimpgradienteditor.c:994 #, c-format msgid "RGB (%d, %d, %d)" msgstr "RGB (%d, %d, %d)" -#: ../app/widgets/gimpgradienteditor.c:1001 +#: ../app/widgets/gimpgradienteditor.c:1005 msgid "Foreground color set to:" msgstr "前景色设为：" -#: ../app/widgets/gimpgradienteditor.c:1008 +#: ../app/widgets/gimpgradienteditor.c:1012 msgid "Background color set to:" msgstr "背景色设为：" -#: ../app/widgets/gimpgradienteditor.c:1236 -#: ../app/widgets/gimpgradienteditor.c:1297 -#, fuzzy, c-format +#: ../app/widgets/gimpgradienteditor.c:1240 +#: ../app/widgets/gimpgradienteditor.c:1301 +#, c-format msgid "%s-Drag: move & compress" -msgstr "%s%s拖动：移动并压缩" +msgstr "%s-拖动：移动并压缩" -#: ../app/widgets/gimpgradienteditor.c:1241 +#: ../app/widgets/gimpgradienteditor.c:1245 msgid "Drag: move" msgstr "拖动：移动" -#: ../app/widgets/gimpgradienteditor.c:1248 -#: ../app/widgets/gimpgradienteditor.c:1261 -#: ../app/widgets/gimpgradienteditor.c:1274 -#: ../app/widgets/gimpgradienteditor.c:1295 -#, fuzzy, c-format +#: ../app/widgets/gimpgradienteditor.c:1252 +#: ../app/widgets/gimpgradienteditor.c:1265 +#: ../app/widgets/gimpgradienteditor.c:1278 +#: ../app/widgets/gimpgradienteditor.c:1299 +#, c-format msgid "%s-Click: extend selection" -msgstr "%s%s点击：扩展选择" +msgstr "%s-单击：扩展选区" -#: ../app/widgets/gimpgradienteditor.c:1253 -#: ../app/widgets/gimpgradienteditor.c:1266 +#: ../app/widgets/gimpgradienteditor.c:1257 +#: ../app/widgets/gimpgradienteditor.c:1270 msgid "Click: select" -msgstr "点击：选择" +msgstr "单击：选择" -#: ../app/widgets/gimpgradienteditor.c:1279 -#: ../app/widgets/gimpgradienteditor.c:1301 +#: ../app/widgets/gimpgradienteditor.c:1283 +#: ../app/widgets/gimpgradienteditor.c:1305 msgid "Click: select Drag: move" -msgstr "点击：选择 拖动：移动" +msgstr "单击：选择 拖动：移动" -#: ../app/widgets/gimpgradienteditor.c:1516 -#: ../app/widgets/gimpgradienteditor.c:1524 +#: ../app/widgets/gimpgradienteditor.c:1520 +#: ../app/widgets/gimpgradienteditor.c:1528 #, c-format msgid "Handle position: %0.4f" -msgstr "支点位置：%0.4f" +msgstr "控制柄位置：%0.4f" -#: ../app/widgets/gimpgradienteditor.c:1541 +#: ../app/widgets/gimpgradienteditor.c:1545 #, c-format msgid "Distance: %0.4f" msgstr "距离：%0.4f" -#: ../app/widgets/gimpgrideditor.c:148 +#: ../app/widgets/gimpgrideditor.c:147 msgid "Line _style:" msgstr "线条样式(_S)：" -#: ../app/widgets/gimpgrideditor.c:152 +#: ../app/widgets/gimpgrideditor.c:151 msgid "Change grid foreground color" msgstr "改变网格前景色" -#: ../app/widgets/gimpgrideditor.c:159 +#: ../app/widgets/gimpgrideditor.c:158 msgid "_Foreground color:" msgstr "前景色(_F)：" -#: ../app/widgets/gimpgrideditor.c:163 +#: ../app/widgets/gimpgrideditor.c:162 msgid "Change grid background color" msgstr "改变网格背景色" -#: ../app/widgets/gimpgrideditor.c:170 +#: ../app/widgets/gimpgrideditor.c:169 msgid "_Background color:" msgstr "背景色(_B)：" -#: ../app/widgets/gimpgrideditor.c:196 ../app/widgets/gimpgrideditor.c:228 -msgid "Width" -msgstr "宽度" - -#: ../app/widgets/gimpgrideditor.c:198 ../app/widgets/gimpgrideditor.c:230 -msgid "Height" -msgstr "高度" - -#: ../app/widgets/gimphelp.c:294 +#: ../app/widgets/gimphelp.c:371 msgid "Help browser is missing" -msgstr "帮助文件浏览器缺失" +msgstr "帮助浏览器缺失" -#: ../app/widgets/gimphelp.c:295 +#: ../app/widgets/gimphelp.c:372 msgid "The GIMP help browser is not available." msgstr "GIMP 帮助浏览器不可用。" -#: ../app/widgets/gimphelp.c:296 +#: ../app/widgets/gimphelp.c:373 msgid "" "The GIMP help browser plug-in appears to be missing from your installation. " "You may instead use the web browser for reading the help pages." @@ -15337,63 +23893,121 @@ msgstr "" "您似乎没有安装 GIMP 帮助浏览器插件。您可以使用网页浏览器以浏览 GIMP 帮助文" "件。" -#: ../app/widgets/gimphelp.c:342 +#: ../app/widgets/gimphelp.c:419 msgid "Help browser doesn't start" msgstr "帮助浏览器没有启动" -#: ../app/widgets/gimphelp.c:343 +#: ../app/widgets/gimphelp.c:420 msgid "Could not start the GIMP help browser plug-in." msgstr "无法启动 GIMP 帮助浏览器插件。" -#: ../app/widgets/gimphelp.c:370 -msgid "Use _Web Browser" -msgstr "使用 _Web 浏览器" +#: ../app/widgets/gimphelp.c:422 +msgid "You may instead use the web browser for reading the help pages." +msgstr "作为替代您可以使用网络浏览器阅读帮助页面。" -#: ../app/widgets/gimphelp.c:620 +#: ../app/widgets/gimphelp.c:448 +msgid "Use _Web Browser" +msgstr "使用网页浏览器(_W)" + +#: ../app/widgets/gimphelp.c:793 msgid "GIMP user manual is missing" msgstr "GIMP 用户手册缺失" -#: ../app/widgets/gimphelp.c:627 -msgid "_Read Online" -msgstr "在线阅读(_R)" +#: ../app/widgets/gimphelp.c:809 +msgid "The GIMP user manual is not installed in your language." +msgstr "GIMP 用户指南未安装您的语言版本。" -#: ../app/widgets/gimphelp.c:651 -msgid "The GIMP user manual is not installed on your computer." -msgstr "GIMP 用户指南未在您的计算机上安装。" +#: ../app/widgets/gimphelp.c:820 +msgid "Read Selected _Language" +msgstr "阅读选择的语言(_L)" -#: ../app/widgets/gimphelp.c:654 +#: ../app/widgets/gimphelp.c:824 +msgid "Available manuals..." +msgstr "可用手册…" + +#: ../app/widgets/gimphelp.c:836 +msgid "" +"You may either select a manual in another language or read the online " +"version." +msgstr "您可以选择其他语言的手册或阅读在线版本。" + +#: ../app/widgets/gimphelp.c:842 msgid "" "You may either install the additional help package or change your " "preferences to use the online version." msgstr "您可以选择安装额外的帮助包，或修改首选项以使用在线版本。" -#: ../app/widgets/gimphistogrameditor.c:98 +#: ../app/widgets/gimphelp.c:847 +msgid "Read _Online" +msgstr "在线阅读(_O)" + +#: ../app/widgets/gimphistogrameditor.c:128 msgid "Mean:" msgstr "平均值：" -#: ../app/widgets/gimphistogrameditor.c:99 +#: ../app/widgets/gimphistogrameditor.c:129 msgid "Std dev:" msgstr "标准偏差：" -#: ../app/widgets/gimphistogrameditor.c:100 +#: ../app/widgets/gimphistogrameditor.c:130 msgid "Median:" -msgstr "中值：" +msgstr "中位数：" -#: ../app/widgets/gimphistogrameditor.c:101 +#: ../app/widgets/gimphistogrameditor.c:131 msgid "Pixels:" msgstr "像素：" -#: ../app/widgets/gimphistogrameditor.c:102 +#: ../app/widgets/gimphistogrameditor.c:132 msgid "Count:" msgstr "计数：" -#: ../app/widgets/gimphistogrameditor.c:103 +#: ../app/widgets/gimphistogrameditor.c:133 msgid "Percentile:" msgstr "百分比：" -#: ../app/widgets/gimphistogrameditor.c:121 -msgid "Channel:" -msgstr "通道：" +#: ../app/widgets/gimphistogrameditor.c:160 +msgid "Histogram channel" +msgstr "直方图通道" + +#: ../app/widgets/gimphistogrameditor.c:171 +msgid "Show values in linear space" +msgstr "根据线性空间显示数值" + +#: ../app/widgets/gimphistogrameditor.c:172 +msgid "Show values in perceptual space" +msgstr "根据感官空间显示数值" + +#: ../app/widgets/gimpiconpicker.c:245 +msgid "From File..." +msgstr "从文件…" + +#: ../app/widgets/gimpiconpicker.c:254 +msgid "From Named Icons..." +msgstr "从已命名图标…" + +#: ../app/widgets/gimpiconpicker.c:263 +msgid "Copy Icon to Clipboard" +msgstr "将图标复制到剪贴板" + +#: ../app/widgets/gimpiconpicker.c:272 +msgid "Paste Icon from Clipboard" +msgstr "从剪贴板粘贴图标" + +#: ../app/widgets/gimpiconpicker.c:484 +msgid "Load Icon Image" +msgstr "载入图标图像" + +#: ../app/widgets/gimpiconsizescale.c:126 +msgid "Guess icon size from resolution" +msgstr "通过分辨率猜测图标大小" + +#: ../app/widgets/gimpiconsizescale.c:127 +msgid "Use icon size from the theme" +msgstr "使用主题设定的图标大小" + +#: ../app/widgets/gimpiconsizescale.c:128 +msgid "Custom icon size" +msgstr "自定义图标大小" #. Button #: ../app/widgets/gimpimagecommenteditor.c:107 @@ -15406,224 +24020,265 @@ msgid "" "Edit→Preferences→Default Image." msgstr "用在编辑→首选项→默认图像中设置的默认注释替换当前图像注释。" -#: ../app/widgets/gimpimageprofileview.c:200 -msgid "Querying..." -msgstr "正在查询..." - -#: ../app/widgets/gimpimagepropview.c:120 +#: ../app/widgets/gimpimagepropview.c:110 msgid "Size in pixels:" -msgstr "尺寸按像素：" +msgstr "大小(像素)：" -#: ../app/widgets/gimpimagepropview.c:123 +#: ../app/widgets/gimpimagepropview.c:113 msgid "Print size:" msgstr "打印大小：" -#: ../app/widgets/gimpimagepropview.c:126 +#: ../app/widgets/gimpimagepropview.c:116 msgid "Resolution:" msgstr "分辨率：" -#: ../app/widgets/gimpimagepropview.c:129 +#: ../app/widgets/gimpimagepropview.c:119 msgid "Color space:" msgstr "色彩空间：" -#: ../app/widgets/gimpimagepropview.c:132 -#, fuzzy +#: ../app/widgets/gimpimagepropview.c:122 msgid "Precision:" -msgstr "版本：" +msgstr "精度：" -#: ../app/widgets/gimpimagepropview.c:137 +#: ../app/widgets/gimpimagepropview.c:127 msgid "File Name:" msgstr "文件名：" -#: ../app/widgets/gimpimagepropview.c:143 +#: ../app/widgets/gimpimagepropview.c:133 msgid "File Size:" msgstr "文件大小：" -#: ../app/widgets/gimpimagepropview.c:146 +#: ../app/widgets/gimpimagepropview.c:136 msgid "File Type:" msgstr "文件类型：" -#: ../app/widgets/gimpimagepropview.c:151 +#: ../app/widgets/gimpimagepropview.c:141 msgid "Size in memory:" msgstr "占用内存大小：" -#: ../app/widgets/gimpimagepropview.c:154 +#: ../app/widgets/gimpimagepropview.c:144 msgid "Undo steps:" msgstr "撤消步数：" -#: ../app/widgets/gimpimagepropview.c:157 +#: ../app/widgets/gimpimagepropview.c:147 msgid "Redo steps:" msgstr "重做步数：" -#: ../app/widgets/gimpimagepropview.c:162 +#: ../app/widgets/gimpimagepropview.c:152 msgid "Number of pixels:" msgstr "像素数量：" -#: ../app/widgets/gimpimagepropview.c:165 +#: ../app/widgets/gimpimagepropview.c:155 msgid "Number of layers:" msgstr "图层数量：" -#: ../app/widgets/gimpimagepropview.c:168 +#: ../app/widgets/gimpimagepropview.c:158 msgid "Number of channels:" msgstr "通道数量：" -#: ../app/widgets/gimpimagepropview.c:171 +#: ../app/widgets/gimpimagepropview.c:161 msgid "Number of paths:" msgstr "路径数量：" -#. no undo (or redo) steps available -#: ../app/widgets/gimpimagepropview.c:414 -msgid "None" -msgstr "无" - -#: ../app/widgets/gimpimagepropview.c:469 -#: ../app/widgets/gimptemplateeditor.c:332 +#: ../app/widgets/gimpimagepropview.c:452 +#: ../app/widgets/gimptemplateeditor.c:349 #, c-format msgid "pixels/%s" msgstr "像素/%s" -#: ../app/widgets/gimpimagepropview.c:471 +#: ../app/widgets/gimpimagepropview.c:454 #, c-format msgid "%g × %g %s" -msgstr "%g x %g %s" +msgstr "%g × %g %s" -#: ../app/widgets/gimpimagepropview.c:492 +#: ../app/widgets/gimpimagepropview.c:475 msgid "colors" -msgstr "色" +msgstr "颜色" -#: ../app/widgets/gimpitemtreeview.c:716 +#: ../app/widgets/gimpitemtreeview.c:757 msgid "Lock:" msgstr "锁定：" -#: ../app/widgets/gimplayertreeview.c:307 -msgid "Lock alpha channel" -msgstr "锁定 Alpha 通道" +#: ../app/widgets/gimplanguagestore-parser.c:253 +msgid "System Language" +msgstr "系统语言" -#: ../app/widgets/gimpmessagebox.c:433 -#, fuzzy, c-format +#: ../app/widgets/gimplayermodebox.c:158 +msgid "Switch to another group of modes" +msgstr "切换到另一组模式" + +#: ../app/widgets/gimplayertreeview.c:319 +msgid "Lock alpha channel" +msgstr "锁定透明通道" + +#: ../app/widgets/gimpmessagebox.c:395 +#, c-format msgid "Message repeated once." msgid_plural "Message repeated %d times." -msgstr[0] "消息重复了一次。" +msgstr[0] "消息重复显示了 %d 次。" -#: ../app/widgets/gimppaletteeditor.c:227 -#: ../app/widgets/gimppaletteeditor.c:683 +#: ../app/widgets/gimpopendialog.c:71 +msgid "Automatically Detected" +msgstr "自动检测" + +#: ../app/widgets/gimpoverlaydialog.c:229 +msgid "Detach dialog from canvas" +msgstr "从画布分离对话框" + +#: ../app/widgets/gimppaletteeditor.c:243 +#: ../app/widgets/gimppaletteeditor.c:720 msgid "Undefined" msgstr "未定义" -#: ../app/widgets/gimppaletteeditor.c:235 +#: ../app/widgets/gimppaletteeditor.c:251 msgid "Columns:" msgstr "列数：" #: ../app/widgets/gimppanedbox.c:59 msgid "You can drop dockable dialogs here" -msgstr "您可以将可停靠的对话框放在这里" +msgstr "您可以将可停靠对话框放在这里" -#: ../app/widgets/gimpprofilechooserdialog.c:127 -msgid "ICC color profile (*.icc, *.icm)" -msgstr "ICC 色彩配置文件(*.icc, *.icm)" +#: ../app/widgets/gimppickablepopup.c:206 +#: ../app/widgets/gimppickablepopup.c:423 +msgid "Select an image in the left pane" +msgstr "在左侧面板中选择图像" -#: ../app/widgets/gimpprogressdialog.c:221 +#: ../app/widgets/gimppluginview.c:149 +msgid "Plug-In" +msgstr "插件" + +#: ../app/widgets/gimpprogressdialog.c:223 msgid "Progress" msgstr "进度" -#: ../app/widgets/gimpselectiondata.c:248 +#: ../app/widgets/gimpsavedialog.c:151 +msgid "All XCF images" +msgstr "全部 XCF 图像" + +#: ../app/widgets/gimpsavedialog.c:259 +#, c-format +msgid "" +"The image uses features from %s, disabling compression won't make the XCF " +"file readable by older GIMP versions." +msgstr "" +"该图像使用了来自 %s 的特性，禁用压缩将不能使 XCF 文件被旧版本 GIMP 读取。" + +#: ../app/widgets/gimpsavedialog.c:266 +#, c-format +msgid "" +"Keep compression disabled to make the XCF file readable by %s and later." +msgstr "保持禁用压缩以使 XCF 文件可以被 %s 或更新版本读取。" + +#: ../app/widgets/gimpsavedialog.c:276 +msgid "Metadata won't be visible in GIMP older than version 2.10." +msgstr "元数据在早于 2.10 版本的 GIMP 中不可见。" + +#: ../app/widgets/gimpsavedialog.c:329 +msgid "Save this XCF file with better but slower compression" +msgstr "使用更好但更慢的压缩方式保存此 XCF 文件" + +#: ../app/widgets/gimpselectiondata.c:250 #, c-format msgid "" "The filename '%s' couldn't be converted to a valid URI:\n" "\n" "%s" msgstr "" -"文件名“%s”无法转换为合法的 URI：\n" +"文件名“%s”无法转换为有效的 URI：\n" "\n" "%s" -#: ../app/widgets/gimpselectiondata.c:252 +#: ../app/widgets/gimpselectiondata.c:254 msgid "Invalid UTF-8" msgstr "无效的 UTF-8" -#: ../app/widgets/gimpsettingsbox.c:269 -msgid "Pick a setting from the list" -msgstr "从列表中选择设置" +#: ../app/widgets/gimpsettingsbox.c:304 +msgid "Pick a preset from the list" +msgstr "从列表中选择一个预设" -#: ../app/widgets/gimpsettingsbox.c:291 -msgid "Add settings to favorites" -msgstr "将设置添加到收藏" +#: ../app/widgets/gimpsettingsbox.c:328 +msgid "Save the current settings as named preset" +msgstr "将当前设置保存为已命名的预设" -#: ../app/widgets/gimpsettingsbox.c:319 -msgid "_Import Settings from File..." -msgstr "从文件导入设置(_I)..." +#: ../app/widgets/gimpsettingsbox.c:346 +msgid "Manage presets" +msgstr "管理预设" -#: ../app/widgets/gimpsettingsbox.c:325 -msgid "_Export Settings to File..." -msgstr "将设置导出到文件(_E)..." +#: ../app/widgets/gimpsettingsbox.c:360 +msgid "_Import Current Settings from File..." +msgstr "从文件导入当前设置(_I)…" -#: ../app/widgets/gimpsettingsbox.c:332 -msgid "_Manage Settings..." -msgstr "管理设置(_M)" +#: ../app/widgets/gimpsettingsbox.c:366 +msgid "_Export Current Settings to File..." +msgstr "将当前设置导出到文件(_E)…" -#: ../app/widgets/gimpsettingsbox.c:636 -msgid "Add Settings to Favorites" -msgstr "添加选项到收藏夹" +#: ../app/widgets/gimpsettingsbox.c:373 +msgid "_Manage Saved Presets..." +msgstr "管理保存的预设(_M)…" -#: ../app/widgets/gimpsettingsbox.c:639 -msgid "Enter a name for the settings" -msgstr "为设置命名" +#: ../app/widgets/gimpsettingsbox.c:613 +msgid "Save Settings as Named Preset" +msgstr "保存设为已命名的预设" -#: ../app/widgets/gimpsettingsbox.c:640 +#: ../app/widgets/gimpsettingsbox.c:616 +msgid "Enter a name for the preset" +msgstr "为该预设输入一个名字" + +#: ../app/widgets/gimpsettingsbox.c:617 msgid "Saved Settings" -msgstr "已保存的选项" +msgstr "已保存设置" -#: ../app/widgets/gimpsettingsbox.c:681 -msgid "Manage Saved Settings" -msgstr "管理已保存设置" +#: ../app/widgets/gimpsettingsbox.c:658 +msgid "Manage Saved Presets" +msgstr "管理保存的预设" #: ../app/widgets/gimpsettingseditor.c:195 -msgid "Import settings from a file" -msgstr "从文件导入设置" +msgid "Import presets from a file" +msgstr "从一个文件导入预设" #: ../app/widgets/gimpsettingseditor.c:204 -msgid "Export the selected settings to a file" -msgstr "导出设置到文件" +msgid "Export the selected presets to a file" +msgstr "导出选中的预设到一个文件" #: ../app/widgets/gimpsettingseditor.c:213 -msgid "Delete the selected settings" -msgstr "删除选中的设置" +msgid "Delete the selected preset" +msgstr "删除选中的预设" -#: ../app/widgets/gimpsizebox.c:453 +#: ../app/widgets/gimpsizebox.c:458 #, c-format msgid "%d × %d ppi" -msgstr "%d x %d ppi" +msgstr "%d × %d ppi" -#: ../app/widgets/gimpsizebox.c:455 +#: ../app/widgets/gimpsizebox.c:460 #, c-format msgid "%d ppi" msgstr "%d ppi" -#: ../app/widgets/gimpstrokeeditor.c:130 +#: ../app/widgets/gimpstrokeeditor.c:129 msgid "Line width:" msgstr "线宽：" -#: ../app/widgets/gimpstrokeeditor.c:142 +#: ../app/widgets/gimpstrokeeditor.c:141 msgid "_Line Style" -msgstr "线风格(_L)" +msgstr "线条样式(_L)" -#: ../app/widgets/gimpstrokeeditor.c:161 +#: ../app/widgets/gimpstrokeeditor.c:160 msgid "_Cap style:" -msgstr "帽盖风格(_C)：" +msgstr "帽盖样式(_C)：" -#: ../app/widgets/gimpstrokeeditor.c:167 +#: ../app/widgets/gimpstrokeeditor.c:166 msgid "_Join style:" -msgstr "接合风格(_J)：" +msgstr "接合样式(_J)：" -#: ../app/widgets/gimpstrokeeditor.c:172 +#: ../app/widgets/gimpstrokeeditor.c:171 msgid "_Miter limit:" msgstr "斜接限制(_M)：" -#: ../app/widgets/gimpstrokeeditor.c:179 +#: ../app/widgets/gimpstrokeeditor.c:178 msgid "Dash pattern:" msgstr "虚线模式：" -#: ../app/widgets/gimpstrokeeditor.c:242 +#: ../app/widgets/gimpstrokeeditor.c:241 msgid "Dash _preset:" msgstr "虚线预设(_P)：" @@ -15635,147 +24290,172 @@ msgstr "过滤" msgid "enter tags" msgstr "输入标签" -#. Seperator for tags +#. Separator for tags #. * IMPORTANT: use only one of Unicode terminal punctuation chars. #. * http://unicode.org/review/pr-23.html #. -#: ../app/widgets/gimptagentry.c:1733 +#: ../app/widgets/gimptagentry.c:1750 msgid "," msgstr "，" -#: ../app/widgets/gimptemplateeditor.c:202 +#: ../app/widgets/gimptemplateeditor.c:219 #, c-format msgid "%p" msgstr "%p" -#: ../app/widgets/gimptemplateeditor.c:277 +#: ../app/widgets/gimptemplateeditor.c:294 msgid "_Advanced Options" msgstr "高级选项(_A)" -#: ../app/widgets/gimptemplateeditor.c:388 +#: ../app/widgets/gimptemplateeditor.c:407 msgid "Color _space:" msgstr "色彩空间(_S)：" -#: ../app/widgets/gimptemplateeditor.c:394 -#, fuzzy +#: ../app/widgets/gimptemplateeditor.c:415 msgid "_Precision:" -msgstr "_X 分辨率：" +msgstr "精度(_P)：" -#: ../app/widgets/gimptemplateeditor.c:402 -msgid "_Fill with:" -msgstr "填充(_F)：" +#: ../app/widgets/gimptemplateeditor.c:427 +msgid "_Gamma:" +msgstr "伽马值(_G)：" -#: ../app/widgets/gimptemplateeditor.c:412 +#: ../app/widgets/gimptemplateeditor.c:432 +msgid "Color _manage this image" +msgstr "色彩管理该图像(_M)" + +#: ../app/widgets/gimptemplateeditor.c:441 +msgid "Choose A Color Profile" +msgstr "选择一份色彩配置文件" + +#: ../app/widgets/gimptemplateeditor.c:445 +msgid "Co_lor profile:" +msgstr "色彩配置文件(_L)：" + +#: ../app/widgets/gimptemplateeditor.c:462 msgid "Comme_nt:" msgstr "注释(_N)：" -#: ../app/widgets/gimptemplateeditor.c:519 +#: ../app/widgets/gimptemplateeditor.c:577 msgid "_Name:" -msgstr "名字(_N)：" +msgstr "名称(_N)：" -#: ../app/widgets/gimptemplateeditor.c:526 +#: ../app/widgets/gimptemplateeditor.c:583 msgid "_Icon:" msgstr "图标(_I)：" -#: ../app/widgets/gimptemplateeditor.c:690 +#: ../app/widgets/gimptemplateeditor.c:802 #, c-format msgid "%d × %d ppi, %s" -msgstr "%d x %d ppi，%s" +msgstr "%d × %d ppi，%s" -#: ../app/widgets/gimptemplateeditor.c:692 +#: ../app/widgets/gimptemplateeditor.c:804 #, c-format msgid "%d ppi, %s" msgstr "%d ppi，%s" -#: ../app/widgets/gimptextbuffer.c:1454 +#: ../app/widgets/gimptextbuffer-serialize.c:276 +#, c-format +msgid "Attribute \"%s\" is invalid on <%s> element in this context" +msgstr "此上下文中的“%s”属性对 <%s> 元素无效" + +#: ../app/widgets/gimptextbuffer-serialize.c:348 +#, c-format +msgid "Outermost element in text must be not <%s>" +msgstr "文字中最外层的元素应该是 而非 <%s>" + +#: ../app/widgets/gimptextbuffer.c:1711 +#, c-format +msgid "Input file '%s' appears truncated: %s" +msgstr "输入文件“%s”似乎已截断：%s" + +#: ../app/widgets/gimptextbuffer.c:1729 #, c-format msgid "Invalid UTF-8 data in file '%s'." msgstr "“%s”文件中含有无效的 UTF-8 数据。" -#: ../app/widgets/gimptextbuffer-serialize.c:340 +#: ../app/widgets/gimptextbuffer.c:1778 #, c-format -msgid "Attribute \"%s\" is invalid on <%s> element in this context" -msgstr "此上下文中的“%s”属性在<%s>元素上无效" +msgid "Writing text file '%s' failed: %s" +msgstr "写入文本文件“%s”失败：%s" -#: ../app/widgets/gimptextbuffer-serialize.c:412 -#, c-format -msgid "Outermost element in text must be not <%s>" -msgstr "文本中最外层的元素应该是而非<%s>" - -#: ../app/widgets/gimptexteditor.c:222 +#: ../app/widgets/gimptexteditor.c:220 msgid "_Use selected font" -msgstr "使用选中的字体(_U)" +msgstr "使用选中字体(_U)" -#: ../app/widgets/gimptextstyleeditor.c:206 -#, fuzzy +#: ../app/widgets/gimptextstyleeditor.c:207 +#: ../app/widgets/gimptextstyleeditor.c:1298 msgid "Change font of selected text" -msgstr "改变选中文字的颜色" +msgstr "改变选中文字的字体" -#: ../app/widgets/gimptextstyleeditor.c:217 +#: ../app/widgets/gimptextstyleeditor.c:218 msgid "Change size of selected text" msgstr "改变选中文字的大小" -#: ../app/widgets/gimptextstyleeditor.c:236 +#: ../app/widgets/gimptextstyleeditor.c:237 msgid "Clear style of selected text" -msgstr "清除选中文字的风格" +msgstr "清除选中文字的样式" -#: ../app/widgets/gimptextstyleeditor.c:247 -#: ../app/widgets/gimptextstyleeditor.c:256 +#: ../app/widgets/gimptextstyleeditor.c:248 +#: ../app/widgets/gimptextstyleeditor.c:258 msgid "Change color of selected text" msgstr "改变选中文字的颜色" -#: ../app/widgets/gimptextstyleeditor.c:272 +#: ../app/widgets/gimptextstyleeditor.c:274 msgid "Change kerning of selected text" msgstr "改变选中文字的字距" -#: ../app/widgets/gimptextstyleeditor.c:288 +#: ../app/widgets/gimptextstyleeditor.c:290 msgid "Change baseline of selected text" msgstr "改变选中文字的基线" -#: ../app/widgets/gimptextstyleeditor.c:328 +#: ../app/widgets/gimptextstyleeditor.c:329 msgid "Bold" -msgstr "" +msgstr "粗体" -#: ../app/widgets/gimptextstyleeditor.c:331 +#: ../app/widgets/gimptextstyleeditor.c:332 msgid "Italic" -msgstr "" +msgstr "斜体" -#: ../app/widgets/gimptextstyleeditor.c:334 -#, fuzzy +#: ../app/widgets/gimptextstyleeditor.c:335 msgid "Underline" -msgstr "未定义" +msgstr "下划线" -#: ../app/widgets/gimptextstyleeditor.c:337 +#: ../app/widgets/gimptextstyleeditor.c:338 msgid "Strikethrough" -msgstr "" +msgstr "删除线" -#: ../app/widgets/gimpthumbbox.c:331 -#, fuzzy, c-format +#: ../app/widgets/gimptextstyleeditor.c:1290 +#, c-format +msgid "Font \"%s\" unavailable on this system" +msgstr "字体“%s”在此系统上不可用" + +#: ../app/widgets/gimpthumbbox.c:324 +#, c-format msgid "" "Click to update preview\n" "%s-Click to force update even if preview is up-to-date" msgstr "" -"点击更新预览\n" -"%s%s点击强制更新预览，即使预览已更新" +"单击以更新预览\n" +"%s-单击以强制更新预览，即使预览已最新" -#: ../app/widgets/gimpthumbbox.c:348 +#: ../app/widgets/gimpthumbbox.c:341 msgid "Pr_eview" msgstr "预览(_E)" -#: ../app/widgets/gimpthumbbox.c:405 ../app/widgets/gimpthumbbox.c:469 +#: ../app/widgets/gimpthumbbox.c:398 ../app/widgets/gimpthumbbox.c:461 msgid "No selection" -msgstr "未选择" +msgstr "无选择" -#: ../app/widgets/gimpthumbbox.c:597 ../app/widgets/gimpthumbbox.c:618 +#: ../app/widgets/gimpthumbbox.c:605 ../app/widgets/gimpthumbbox.c:626 #, c-format msgid "Thumbnail %d of %d" -msgstr "缩略图 %d / %d" +msgstr "%2$d 个缩略图中的第 %1$d 个" -#: ../app/widgets/gimpthumbbox.c:731 ../app/widgets/gimpthumbbox.c:741 +#: ../app/widgets/gimpthumbbox.c:734 ../app/widgets/gimpthumbbox.c:744 msgid "Creating preview..." -msgstr "正在创建预览..." +msgstr "正在创建预览…" -#: ../app/widgets/gimptoolbox-color-area.c:80 +#: ../app/widgets/gimptoolbox-color-area.c:88 msgid "" "Foreground & background colors.\n" "The black and white squares reset colors.\n" @@ -15783,54 +24463,54 @@ msgid "" "Click to open the color selection dialog." msgstr "" "前景色和背景色。\n" -"黑白小方格可以重置颜色。\n" -"箭头可以交换颜色。\n" +"使用黑白小方格重置颜色。\n" +"使用箭头交换颜色。\n" "单击以打开颜色选择对话框。" -#: ../app/widgets/gimptoolbox-color-area.c:141 +#: ../app/widgets/gimptoolbox-color-area.c:211 msgid "Change Foreground Color" msgstr "改变前景色" -#: ../app/widgets/gimptoolbox-color-area.c:146 +#: ../app/widgets/gimptoolbox-color-area.c:216 msgid "Change Background Color" msgstr "改变背景色" -#: ../app/widgets/gimptoolbox-image-area.c:118 -#: ../app/widgets/gimptoolbox-image-area.c:123 +#: ../app/widgets/gimptoolbox-image-area.c:119 +#: ../app/widgets/gimptoolbox-image-area.c:124 msgid "" "The active image.\n" "Click to open the Image Dialog." msgstr "" -"活动图像。\n" -"点击打开图像对话框。" +"正在使用的图像。\n" +"单击打开图像对话框。" -#: ../app/widgets/gimptoolbox-image-area.c:120 +#: ../app/widgets/gimptoolbox-image-area.c:121 msgid "Drag to an XDS enabled file-manager to save the image." -msgstr "拖拽到能够使用 XDS 的文件管理器以保存图像。" +msgstr "拖拽到支持 XDS 的文件管理器以保存此图像。" -#: ../app/widgets/gimptoolbox-indicator-area.c:164 +#: ../app/widgets/gimptoolbox-indicator-area.c:167 msgid "" "The active brush.\n" "Click to open the Brush Dialog." msgstr "" -"活动画笔。\n" -"点击打开画笔对话框。" +"正在使用的笔刷。\n" +"单击打开笔刷对话框。" -#: ../app/widgets/gimptoolbox-indicator-area.c:196 +#: ../app/widgets/gimptoolbox-indicator-area.c:199 msgid "" "The active pattern.\n" "Click to open the Pattern Dialog." msgstr "" -"活动图案。\n" -"点击打开图案对话框。" +"正在使用的图案。\n" +"单击打开图案对话框。" -#: ../app/widgets/gimptoolbox-indicator-area.c:228 +#: ../app/widgets/gimptoolbox-indicator-area.c:231 msgid "" "The active gradient.\n" "Click to open the Gradient Dialog." msgstr "" -"活动渐变。\n" -"点击打开渐变对话框。" +"正在使用的渐变。\n" +"单击打开渐变对话框。" #: ../app/widgets/gimptooleditor.c:295 msgid "Raise this tool" @@ -15850,134 +24530,117 @@ msgstr "降低此工具至底端" #: ../app/widgets/gimptooleditor.c:311 msgid "Reset tool order and visibility" -msgstr "重置工具的顺序及可见属性" +msgstr "重置工具的顺序和可见性" #: ../app/widgets/gimptooloptionseditor.c:203 -#, fuzzy msgid "Save Tool Preset..." -msgstr "编辑工具预设值(_E)..." +msgstr "保存工具预设…" -#: ../app/widgets/gimptooloptionseditor.c:211 -#, fuzzy +#: ../app/widgets/gimptooloptionseditor.c:212 msgid "Restore Tool Preset..." -msgstr "编辑工具预设值(_E)..." +msgstr "恢复工具预设…" -#: ../app/widgets/gimptooloptionseditor.c:219 -#, fuzzy +#: ../app/widgets/gimptooloptionseditor.c:221 msgid "Delete Tool Preset..." -msgstr "删除工具预设值(_D)" +msgstr "删除工具预设…" -#: ../app/widgets/gimptoolpreseteditor.c:149 -#, fuzzy -msgid "Icon:" -msgstr "图标(_I)：" - -#: ../app/widgets/gimptoolpreseteditor.c:160 -msgid "Apply stored FG/BG" -msgstr "应用存储的前景/背景" - -#: ../app/widgets/gimptoolpreseteditor.c:166 -msgid "Apply stored brush" -msgstr "应用存储的画笔" - -#: ../app/widgets/gimptoolpreseteditor.c:172 -msgid "Apply stored dynamics" -msgstr "应用存储的动态" - -#: ../app/widgets/gimptoolpreseteditor.c:178 -msgid "Apply stored gradient" -msgstr "应用存储的渐变" - -#: ../app/widgets/gimptoolpreseteditor.c:184 -msgid "Apply stored pattern" -msgstr "应用存储的图案" - -#: ../app/widgets/gimptoolpreseteditor.c:190 -#, fuzzy -msgid "Apply stored palette" -msgstr "应用存储的色板" - -#: ../app/widgets/gimptoolpreseteditor.c:196 -msgid "Apply stored font" -msgstr "应用存储的字体" - -#: ../app/widgets/gimptoolpreseteditor.c:293 -#, fuzzy, c-format +#: ../app/widgets/gimptoolpreseteditor.c:295 +#, c-format msgid "%s Preset" -msgstr "工具预设值" +msgstr "%s 预设" -#: ../app/widgets/gimptranslationstore.c:100 -msgid "System Language" -msgstr "系统语言" - -#: ../app/widgets/gimptranslationstore.c:102 -msgid "English" -msgstr "英语" - -#: ../app/widgets/gimpuimanager.c:742 +#: ../app/widgets/gimpuimanager.c:760 msgid "Your GIMP installation is incomplete:" msgstr "您的 GIMP 安装不完整：" -#: ../app/widgets/gimpuimanager.c:744 +#: ../app/widgets/gimpuimanager.c:762 msgid "Please make sure the menu XML files are correctly installed." msgstr "请确认菜单 XML 文件已正确安装。" -#: ../app/widgets/gimpuimanager.c:750 +#: ../app/widgets/gimpuimanager.c:768 #, c-format msgid "There was an error parsing the menu definition from %s: %s" -msgstr "从 %s 处理菜单定义时出错：%s" +msgstr "从 %s 解析菜单定义时出错：%s" -#: ../app/widgets/gimpundoeditor.c:262 +#: ../app/widgets/gimpundoeditor.c:261 msgid "[ Base Image ]" msgstr "[ 原始图像 ]" #: ../app/widgets/gimpvectorstreeview.c:111 msgid "Lock path strokes" -msgstr "锁定路径笔划" +msgstr "锁定路径笔廓" -#: ../app/widgets/gimpviewablebox.c:88 +#: ../app/widgets/gimpvectorstreeview.c:114 +msgid "Lock path position" +msgstr "锁定路径位置" + +#: ../app/widgets/gimpviewablebox.c:91 msgid "Open the brush selection dialog" -msgstr "打开画笔选择对话框" +msgstr "打开笔刷选择对话框" -#: ../app/widgets/gimpviewablebox.c:152 +#: ../app/widgets/gimpviewablebox.c:159 msgid "Open the dynamics selection dialog" msgstr "打开动态选择对话框" -#: ../app/widgets/gimpviewablebox.c:217 +#: ../app/widgets/gimpviewablebox.c:226 +msgid "Open the MyPaint brush selection dialog" +msgstr "打开 MyPaint 笔刷选择对话框" + +#: ../app/widgets/gimpviewablebox.c:289 msgid "Open the pattern selection dialog" msgstr "打开图案选择对话框" -#: ../app/widgets/gimpviewablebox.c:285 +#: ../app/widgets/gimpviewablebox.c:358 msgid "Open the gradient selection dialog" msgstr "打开渐变选择对话框" -#: ../app/widgets/gimpviewablebox.c:402 +#: ../app/widgets/gimpviewablebox.c:476 msgid "Open the palette selection dialog" -msgstr "打开色板选择对话框" +msgstr "打开调色板选择对话框" -#: ../app/widgets/gimpviewablebox.c:467 +#: ../app/widgets/gimpviewablebox.c:542 msgid "Open the font selection dialog" msgstr "打开字体选择对话框" -#: ../app/widgets/gimpwidgets-utils.c:596 +#: ../app/widgets/gimpwidgets-utils.c:648 #, c-format msgid "%s (try %s)" -msgstr "%s (尝试 %s)" +msgstr "%s(尝试 %s)" -#: ../app/widgets/gimpwidgets-utils.c:596 +#: ../app/widgets/gimpwidgets-utils.c:648 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../app/widgets/gimpwidgets-utils.c:600 +#: ../app/widgets/gimpwidgets-utils.c:652 #, c-format msgid "%s (try %s, %s)" -msgstr "%s (尝试 %s, %s)" +msgstr "%s(尝试 %s, %s)" -#: ../app/widgets/gimpwidgets-utils.c:604 +#: ../app/widgets/gimpwidgets-utils.c:656 #, c-format msgid "%s (try %s, %s, %s)" -msgstr "%s (尝试 %s, %s, %s)" +msgstr "%s(尝试 %s, %s, %s)" + +#: ../app/widgets/gimpwidgets-utils.c:1658 +#, c-format +msgid "Built-in grayscale (%s)" +msgstr "内置灰度(%s)" + +#: ../app/widgets/gimpwidgets-utils.c:1665 +#, c-format +msgid "Built-in RGB (%s)" +msgstr "内置 RGB (%s)" + +#: ../app/widgets/gimpwidgets-utils.c:1682 +#, c-format +msgid "Preferred grayscale (%s)" +msgstr "首选灰度(%s)" + +#: ../app/widgets/gimpwidgets-utils.c:1689 +#, c-format +msgid "Preferred RGB (%s)" +msgstr "首选 RGB (%s)" #: ../app/widgets/widgets-enums.c:23 msgctxt "active-color" @@ -15989,160 +24652,232 @@ msgctxt "active-color" msgid "Background" msgstr "背景" -#: ../app/widgets/widgets-enums.c:85 +#: ../app/widgets/widgets-enums.c:52 +msgctxt "circle-background" +msgid "Plain" +msgstr "纯色" + +#: ../app/widgets/widgets-enums.c:53 +msgctxt "circle-background" +msgid "HSV" +msgstr "HSV" + +#: ../app/widgets/widgets-enums.c:117 msgctxt "color-frame-mode" msgid "Pixel" msgstr "像素" -#: ../app/widgets/widgets-enums.c:86 +#: ../app/widgets/widgets-enums.c:118 msgctxt "color-frame-mode" -msgid "RGB" -msgstr "RGB" +msgid "RGB (%)" +msgstr "RGB (%)" -#: ../app/widgets/widgets-enums.c:87 +#: ../app/widgets/widgets-enums.c:119 +msgctxt "color-frame-mode" +msgid "RGB (0..255)" +msgstr "RGB (0..255)" + +#: ../app/widgets/widgets-enums.c:120 msgctxt "color-frame-mode" msgid "HSV" msgstr "HSV" -#: ../app/widgets/widgets-enums.c:88 +#: ../app/widgets/widgets-enums.c:121 +msgctxt "color-frame-mode" +msgid "CIE LCH" +msgstr "CIE LCH" + +#: ../app/widgets/widgets-enums.c:122 +msgctxt "color-frame-mode" +msgid "CIE LAB" +msgstr "CIE LAB" + +#: ../app/widgets/widgets-enums.c:123 msgctxt "color-frame-mode" msgid "CMYK" msgstr "CMYK" -#: ../app/widgets/widgets-enums.c:118 +#: ../app/widgets/widgets-enums.c:153 msgctxt "color-pick-mode" msgid "Pick only" msgstr "仅拾取" -#: ../app/widgets/widgets-enums.c:119 +#: ../app/widgets/widgets-enums.c:154 msgctxt "color-pick-mode" msgid "Set foreground color" msgstr "设置前景色" -#: ../app/widgets/widgets-enums.c:120 +#: ../app/widgets/widgets-enums.c:155 msgctxt "color-pick-mode" msgid "Set background color" msgstr "设置背景色" -#: ../app/widgets/widgets-enums.c:121 +#: ../app/widgets/widgets-enums.c:156 msgctxt "color-pick-mode" msgid "Add to palette" -msgstr "添加到色板" +msgstr "添加到调色板" -#: ../app/widgets/widgets-enums.c:178 +#: ../app/widgets/widgets-enums.c:215 msgctxt "histogram-scale" msgid "Linear histogram" msgstr "线性直方图" -#: ../app/widgets/widgets-enums.c:179 +#: ../app/widgets/widgets-enums.c:216 msgctxt "histogram-scale" msgid "Logarithmic histogram" msgstr "对数直方图" -#: ../app/widgets/widgets-enums.c:215 +#: ../app/widgets/widgets-enums.c:252 msgctxt "tab-style" msgid "Icon" msgstr "图标" -#: ../app/widgets/widgets-enums.c:216 +#: ../app/widgets/widgets-enums.c:253 msgctxt "tab-style" msgid "Current status" msgstr "当前状态" -#: ../app/widgets/widgets-enums.c:217 +#: ../app/widgets/widgets-enums.c:254 msgctxt "tab-style" msgid "Text" msgstr "文字" -#: ../app/widgets/widgets-enums.c:218 +#: ../app/widgets/widgets-enums.c:255 msgctxt "tab-style" msgid "Description" msgstr "描述" -#: ../app/widgets/widgets-enums.c:219 +#: ../app/widgets/widgets-enums.c:256 msgctxt "tab-style" msgid "Icon & text" msgstr "图标和文字" -#: ../app/widgets/widgets-enums.c:220 +#: ../app/widgets/widgets-enums.c:257 msgctxt "tab-style" msgid "Icon & desc" msgstr "图标和描述" -#: ../app/widgets/widgets-enums.c:221 +#: ../app/widgets/widgets-enums.c:258 msgctxt "tab-style" msgid "Status & text" msgstr "状态和文字" -#: ../app/widgets/widgets-enums.c:222 +#: ../app/widgets/widgets-enums.c:259 msgctxt "tab-style" msgid "Status & desc" msgstr "状态和描述" -#: ../app/widgets/widgets-enums.c:223 +#: ../app/widgets/widgets-enums.c:260 msgctxt "tab-style" msgid "Undefined" msgstr "未定义" -#: ../app/xcf/xcf.c:100 ../app/xcf/xcf.c:168 +#: ../app/xcf/xcf.c:114 ../app/xcf/xcf.c:185 msgid "GIMP XCF image" msgstr "GIMP XCF 图像" -#: ../app/xcf/xcf.c:272 +#: ../app/xcf/xcf.c:272 ../app/xcf/xcf.c:360 +msgid "Memory Stream" +msgstr "内存流" + +#: ../app/xcf/xcf.c:283 #, c-format msgid "Opening '%s'" msgstr "正在打开“%s”" -#: ../app/xcf/xcf.c:314 +#: ../app/xcf/xcf.c:325 #, c-format msgid "XCF error: unsupported XCF file version %d encountered" -msgstr "XCF 错误：遇到不支持的 XCF 文件版本 %d" +msgstr "XCF 错误：不支持的 XCF 文件版本 %d" -#: ../app/xcf/xcf.c:384 +#: ../app/xcf/xcf.c:383 #, c-format msgid "Saving '%s'" msgstr "正在保存“%s”" -#: ../app/xcf/xcf.c:404 +#: ../app/xcf/xcf.c:390 #, c-format -msgid "Error saving XCF file: %s" -msgstr "保存 XCF 文件时出错：%s" +msgid "Closing '%s'" +msgstr "正在关闭“%s”" -#: ../app/xcf/xcf-load.c:344 +#: ../app/xcf/xcf.c:397 +#, c-format +msgid "Error writing '%s': " +msgstr "写入“%s”时出错： " + +#: ../app/xcf/xcf.c:491 +#, c-format +msgid "Error creating '%s': " +msgstr "创建“%s”时出错： " + +#: ../app/xcf/xcf-load.c:342 +#, c-format +msgid "" +"Corrupt 'exif-data' parasite discovered.\n" +"Exif data could not be migrated: %s" +msgstr "" +"发现内嵌“exif-数据”已损坏。\n" +"Exif 数据无法被迁移：%s" + +#: ../app/xcf/xcf-load.c:379 +msgid "" +"Corrupt 'gimp-metadata' parasite discovered.\n" +"XMP data could not be migrated." +msgstr "" +"发现内嵌“gimp-元数据”已损坏。\n" +"XMP 数据无法被迁移。" + +#: ../app/xcf/xcf-load.c:399 +#, c-format +msgid "" +"Corrupt 'gimp-metadata' parasite discovered.\n" +"XMP data could not be migrated: %s" +msgstr "" +"发现内嵌“gimp-元数据”已损坏。\n" +"XMP 数据无法被迁移：%s" + +#: ../app/xcf/xcf-load.c:586 msgid "" "This XCF file is corrupt! I have loaded as much of it as I can, but it is " "incomplete." -msgstr "此 XCF 文件已损坏！我已经尽可能多的读取，但它不完整。" +msgstr "此 XCF 文件已损坏！已尽可能抢救图像数据，但抢救得到的部分不完整。" -#: ../app/xcf/xcf-load.c:355 +#: ../app/xcf/xcf-load.c:597 msgid "" "This XCF file is corrupt! I could not even salvage any partial image data " "from it." -msgstr "此 XCF 文件已损坏！我甚至无法部分抢救出任何图像数据。" +msgstr "此 XCF 文件已损坏！未能抢救任何图像数据。" -#: ../app/xcf/xcf-load.c:446 +#: ../app/xcf/xcf-load.c:689 msgid "" "XCF warning: version 0 of XCF file format\n" "did not save indexed colormaps correctly.\n" "Substituting grayscale map." msgstr "" "XCF 警告：版本 0 的 XCF 文件格式\n" -"不能正确的保存索引颜色表。\n" -"用灰度颜色表取代。" +"未能正确地保存索引颜色表。\n" +"将使用灰度颜色表取代原颜色表。" -#: ../app/xcf/xcf-read.c:115 +#: ../app/xcf/xcf-read.c:189 msgid "Invalid UTF-8 string in XCF file" msgstr "XCF 文件中含有无效的 UTF-8 字符串" -#: ../app/xcf/xcf-seek.c:43 ../app/xcf/xcf-seek.c:60 ../app/xcf/xcf-seek.c:71 -#, c-format -msgid "Could not seek in XCF file: %s" -msgstr "无法在 XCF 文件中搜索：%s" +#: ../app/xcf/xcf-seek.c:45 +msgid "Could not seek in XCF file: " +msgstr "无法在 XCF 文件中搜索： " -#: ../app/xcf/xcf-write.c:86 +#: ../app/xcf/xcf-write.c:45 +msgid "Error writing XCF: " +msgstr "写入 XCF 时出错： " + +#: ../app/xcf/xcf-write.c:273 #, c-format -msgid "Error writing XCF: %s" -msgstr "写 XCF 时出错：%s" +msgid "Error writing XCF: unsupported BPC when writing pixel: %d" +msgstr "写入 XCF 时出错：写入像素：%d 时不支持 BPC" + +#: ../app-tools/gimp-debug-tool.c:78 +msgid "GIMP Crash Debug" +msgstr "GIMP 崩溃调试" #: ../data/tags/gimp-tags-default.xml.in.h:1 msgid "round" @@ -16153,316 +24888,510 @@ msgstr "圆" msgid "fuzzy" msgstr "模糊" -#~ msgid "Equalize does not operate on indexed layers." -#~ msgstr "不能对索引图层进行色调均化操作。" +#~ msgid "Try generating debug data for bug reporting when appropriate" +#~ msgstr "合适时尝试为缺陷报告生成调试数据" -#~ msgid "Invert does not operate on indexed layers." -#~ msgstr "不能对索引图层进行反相操作。" +#~ msgctxt "layers-action" +#~ msgid "Source Over" +#~ msgstr "源覆盖" -#~ msgctxt "tool-options-action" -#~ msgid "_Save Options To" -#~ msgstr "选项保存到(_S)" +#~ msgctxt "layers-action" +#~ msgid "Layer Composite Mode: Source Over" +#~ msgstr "图层合成模式：源覆盖" -#~ msgctxt "tool-options-action" -#~ msgid "_Restore Options From" -#~ msgstr "选项恢复自(_R)" +#~ msgctxt "layers-action" +#~ msgid "Source Atop" +#~ msgstr "源置顶" -#~ msgctxt "tool-options-action" -#~ msgid "Re_name Saved Options" -#~ msgstr "重命名已保存的选项(_N)" +#~ msgctxt "layers-action" +#~ msgid "Layer Composite Mode: Source Atop" +#~ msgstr "图层合成模式：源置顶" -#~ msgctxt "tool-options-action" -#~ msgid "_Delete Saved Options" -#~ msgstr "删除已保存的选项(_D)" +#~ msgctxt "layers-action" +#~ msgid "Source In" +#~ msgstr "源内置" -#~ msgctxt "tool-options-action" -#~ msgid "_New Entry..." -#~ msgstr "新建项(_N)..." +#~ msgctxt "layers-action" +#~ msgid "Layer Composite Mode: Source In" +#~ msgstr "图层合成模式：源内置" -#~ msgid "Save Tool Options" -#~ msgstr "保存工具选项" +#~ msgctxt "layers-action" +#~ msgid "Destination Atop" +#~ msgstr "目标置顶" -#~ msgid "Enter a name for the saved options" -#~ msgstr "给已保存的选项输入一个名字" +#~ msgctxt "layers-action" +#~ msgid "Layer Composite Mode: Destination Atop" +#~ msgstr "图层合成模式：目标置顶" -#~ msgid "Saved Options" -#~ msgstr "已保存的选项" +#~ msgctxt "layer-composite-mode" +#~ msgid "Source over" +#~ msgstr "源覆盖" -#~ msgid "Rename Saved Tool Options" -#~ msgstr "重命名已保存的工具选项" +#~ msgctxt "layer-composite-mode" +#~ msgid "Source atop" +#~ msgstr "源置顶" -#~ msgid "Enter a new name for the saved options" -#~ msgstr "给已保存的选项输入一个新名字" +#~ msgctxt "layer-composite-mode" +#~ msgid "Destination atop" +#~ msgstr "目标置顶" + +#~ msgctxt "layer-composite-mode" +#~ msgid "Source in" +#~ msgstr "源内置" + +#~ msgid "Transformation Matrix" +#~ msgstr "变换矩阵" + +#~ msgid "Image Import" +#~ msgstr "图像导入" + +#~ msgid "Brightness/Contrast Tool: Adjust brightness and contrast" +#~ msgstr "亮度/对比度工具：调整亮度和对比度" + +#~ msgid "Curves Tool: Adjust color curves" +#~ msgstr "曲线工具：调整颜色曲线" + +#~ msgid "Levels Tool: Adjust color levels" +#~ msgstr "色阶工具：调整颜色色阶" + +#~ msgid "X,Y:" +#~ msgstr "X,Y:" + +#~ msgid "Value:" +#~ msgstr "明度：" + +#~ msgid "Alpha:" +#~ msgstr "透明：" + +#~ msgid "Green:" +#~ msgstr "绿色：" + +#~ msgid "Blue:" +#~ msgstr "蓝色：" + +#~ msgid "Hue:" +#~ msgstr "色相：" + +#~ msgid "Sat.:" +#~ msgstr "饱和度：" + +#~ msgid "Light.:" +#~ msgstr "亮度：" + +#~ msgid "Chr.:" +#~ msgstr "浓度：" + +#~ msgid "Lab_a*:" +#~ msgstr "Lab_a*:" + +#~ msgid "Lab_b*:" +#~ msgstr "Lab_b*:" + +#~ msgid "Cyan:" +#~ msgstr "青色：" + +#~ msgid "Magenta:" +#~ msgstr "品红：" + +#~ msgid "Yellow:" +#~ msgstr "黄色：" + +#~ msgid "Black:" +#~ msgstr "黑色：" + +#~ msgid "Brush Zoom" +#~ msgstr "笔刷缩放" + +#~ msgid "Link brush size with canvas zoom" +#~ msgstr "跟随画布缩放改变笔刷大小" + +#~ msgid "Wheel" +#~ msgstr "滚轮" + +#~ msgctxt "channels-action" +#~ msgid "_Visible" +#~ msgstr "可见(_V)" + +#~ msgctxt "channels-action" +#~ msgid "_Linked" +#~ msgstr "已链接(_L)" + +#~ msgctxt "channels-action" +#~ msgid "L_ock pixels" +#~ msgstr "锁定像素(_O)" + +#~ msgctxt "channels-action" +#~ msgid "L_ock position" +#~ msgstr "锁定位置(_O)" + +#~ msgctxt "channels-action" +#~ msgid "Color Tag: Set to Red" +#~ msgstr "颜色标签：设为红色" + +#~ msgctxt "drawable-action" +#~ msgid "_Visible" +#~ msgstr "可见(_V)" + +#~ msgctxt "drawable-action" +#~ msgid "_Linked" +#~ msgstr "链接(_L)" + +#~ msgctxt "layers-action" +#~ msgid "_Visible" +#~ msgstr "可见(_V)" + +#~ msgctxt "layers-action" +#~ msgid "_Linked" +#~ msgstr "已链接(_L)" + +#~ msgctxt "layers-action" +#~ msgid "L_ock position" +#~ msgstr "锁定位置(_O)" + +#~ msgctxt "layers-action" +#~ msgid "Color Tag: Set to red" +#~ msgstr "颜色标签：设为红色" + +#~ msgctxt "layers-action" +#~ msgid "Color Tag: Set to violet" +#~ msgstr "颜色标签：设为紫色" + +#~ msgctxt "layers-action" +#~ msgid "Color Tag: Set to gray" +#~ msgstr "颜色标签：设为灰色" + +#~ msgctxt "vectors-action" +#~ msgid "_Visible" +#~ msgstr "可见(_V)" + +#~ msgctxt "vectors-action" +#~ msgid "_Linked" +#~ msgstr "链接(_L)" + +#~ msgctxt "vectors-action" +#~ msgid "L_ock position" +#~ msgstr "锁定位置(_O)" + +#~ msgctxt "vectors-action" +#~ msgid "Color Tag: Set to gray" +#~ msgstr "颜色标签：设为灰色" #~ msgctxt "view-action" -#~ msgid "Zoom out" -#~ msgstr "缩小" +#~ msgid "Othe_r..." +#~ msgstr "其他(_R)..." + +#~ msgctxt "view-zoom-action" +#~ msgid "Othe_r..." +#~ msgstr "其他(_R)..." + +#~ msgid "Screenshot showing channel mixing and layer editor" +#~ msgstr "截屏展示通道混合和图层编辑器" + +#~ msgctxt "channels-action" +#~ msgid "Clear color tag" +#~ msgstr "清空颜色标签" + +#~ msgctxt "channels-action" +#~ msgid "Set color tag to gray" +#~ msgstr "设置颜色标签为灰色" + +#~ msgctxt "drawable-action" +#~ msgid "Invert the colors" +#~ msgstr "反转颜色" + +#~ msgctxt "drawable-action" +#~ msgid "Invert the brightness of each pixel" +#~ msgstr "反转每个像素的亮度" + +#~ msgctxt "drawable-action" +#~ msgid "E_rode" +#~ msgstr "腐蚀(_R)" + +#~ msgctxt "drawable-action" +#~ msgid "Flip horizontally" +#~ msgstr "水平翻转" + +#~ msgctxt "drawable-action" +#~ msgid "Flip vertically" +#~ msgstr "垂直翻转" + +#~ msgid "Dilate" +#~ msgstr "膨胀" + +#~ msgctxt "filters-action" +#~ msgid "_Antialias..." +#~ msgstr "抗锯齿(_A)..." + +#~ msgctxt "filters-action" +#~ msgid "_Stretch Contrast HSV..." +#~ msgstr "拉伸对比度 HSV (_S)..." + +#~ msgctxt "layers-action" +#~ msgid "Te_xt Tool" +#~ msgstr "文字工具(_X)" + +#~ msgctxt "layers-action" +#~ msgid "Clear color tag" +#~ msgstr "清空颜色标签" + +#~ msgctxt "vectors-action" +#~ msgid "Path _Tool" +#~ msgstr "路径工具(_T)" + +#~ msgctxt "vectors-action" +#~ msgid "Clear color tag" +#~ msgstr "清空颜色标签" #~ msgctxt "view-action" -#~ msgid "Zoom in" -#~ msgstr "放大" +#~ msgid "Rotate 15 degrees to the right" +#~ msgstr "向右旋转 15 度" -#~ msgctxt "windows-action" -#~ msgid "" -#~ "When enabled GIMP is in a single-window mode. Far from completely " -#~ "implemented!" -#~ msgstr "如果启用，GIMP 将使用单窗口模式。还远未完全实现！" +#~ msgctxt "view-action" +#~ msgid "Rotate 90 degrees to the right" +#~ msgstr "顺时针旋转 90 度" -#~ msgctxt "undo-type" -#~ msgid "Brightness_Contrast" -#~ msgstr "亮度-对比度(_C)" +#~ msgctxt "view-action" +#~ msgid "Turn upside-down" +#~ msgstr "上下颠倒" -#~ msgid "Hue_Saturation" -#~ msgstr "色调-饱和度(_S)" +#~ msgctxt "view-action" +#~ msgid "Rotate 90 degrees to the left" +#~ msgstr "逆时针旋转 90 度" -#~ msgid "Perspective Clone does not operate on indexed layers." -#~ msgstr "不能对索引图层进行透视克隆操作。" +#~ msgctxt "view-action" +#~ msgid "Rotate 15 degrees to the left" +#~ msgstr "向左旋转 15 度" -#~ msgid "Blend does not operate on indexed layers." -#~ msgstr "不能对索引图层进行混合操作。" +#~ msgctxt "layer-mode-effects" +#~ msgid "Anti erase" +#~ msgstr "反擦除" -#~ msgid "Brightness-Contrast does not operate on indexed layers." -#~ msgstr "不能对索引图层进行亮度-对比度操作。" +#~ msgid "Convert" +#~ msgstr "转换" -#~ msgid "Colorize operates only on RGB color layers." -#~ msgstr "只能对 RGB 颜色的图层进行单色化操作。" - -#~ msgid "Curves does not operate on indexed layers." -#~ msgstr "不能对索引图层进行曲线操作。" - -#~ msgctxt "command" -#~ msgid "Flip" -#~ msgstr "翻转" - -#~ msgid "GEGL operations do not operate on indexed layers." -#~ msgstr "不能对索引图层进行 GEGL 操作。" - -#~ msgid "_Operation:" -#~ msgstr "操作(_O)：" - -#~ msgid "Operation Settings" -#~ msgstr "操作选项" - -#~ msgid "Levels does not operate on indexed layers." -#~ msgstr "不能对索引图层进行色阶操作。" - -#~ msgctxt "tool" -#~ msgid "_Zoom" -#~ msgstr "缩放(_Z)" - -#~ msgctxt "command" -#~ msgid "Perspective" -#~ msgstr "透视" - -#~ msgctxt "command" -#~ msgid "Rotate" -#~ msgstr "旋转" - -#~ msgctxt "command" -#~ msgid "Scale" -#~ msgstr "缩放" - -#~ msgctxt "command" -#~ msgid "Shear" -#~ msgstr "切变" - -#~ msgid "Text box resize mode" -#~ msgstr "文字框调整大小模式" - -#~ msgid "Threshold does not operate on indexed layers." -#~ msgstr "索引图层不能进行阈值操作。" - -#~ msgid "Preview:" -#~ msgstr "预览：" - -#~ msgctxt "transform-preview-type" -#~ msgid "Outline" -#~ msgstr "轮廓" - -#~ msgctxt "transform-preview-type" -#~ msgid "Grid" -#~ msgstr "网格" - -#~ msgctxt "transform-preview-type" -#~ msgid "Image" -#~ msgstr "图像" - -#~ msgctxt "transform-preview-type" -#~ msgid "Image + Grid" -#~ msgstr "图像 + 网格" - -#~ msgid "Radius:" -#~ msgstr "半径：" - -#~ msgid "Hardness:" -#~ msgstr "硬度：" - -#~ msgid "Aspect ratio:" -#~ msgstr "宽高比：" - -#~ msgid "Spacing:" -#~ msgstr "间距：" - -#~ msgid "Opacity:" -#~ msgstr "不透明度：" - -#~ msgid "Instant update" -#~ msgstr "立即更新" - -#~ msgid "Set Item Exclusive Linked" -#~ msgstr "设置项目唯一链接" - -#~ msgid "Message repeated %d times." -#~ msgstr "消息重复了 %d 次。" - -#~ msgid "Save options to..." -#~ msgstr "选项保存到..." - -#~ msgid "Restore options from..." -#~ msgstr "选项恢复自..." - -#~ msgid "Delete saved options..." -#~ msgstr "删除已保存的选项..." - -#~ msgid "Error saving tool options presets: %s" -#~ msgstr "保存预设工具选项时出错：%s" - -#~ msgid "Use a running GIMP only, never start a new one" -#~ msgstr "只使用运行中的 GIMP 实例，从不启动新实例" - -#~ msgid "Only check if GIMP is running, then quit" -#~ msgstr "只检查 GIMP 是否在运行，然后退出" - -#~ msgid "Print X window ID of GIMP toolbox window, then quit" -#~ msgstr "打印 GIMP 工具箱窗口的 X window ID，然后退出。" - -#~ msgid "Start GIMP without showing the startup window" -#~ msgstr "启动 GIMP 而不显示启动窗口" - -#~ msgid "Could not connect to GIMP." -#~ msgstr "无法连接到 GIMP。" - -#~ msgid "Make sure that the Toolbox is visible!" -#~ msgstr "确定工具箱可见！" - -#~ msgid "Couldn't start '%s': %s" -#~ msgstr "无法启动“%s”：%s" - -#~ msgid "Length" -#~ msgstr "长度" +#~ msgid "_Handle Transform tool" +#~ msgstr "控制柄变换工具(_H)" #~ msgid "" -#~ "Install a private colormap; might be useful on 8-bit (256 colors) " -#~ "displays." -#~ msgstr "安装私用颜色表；对 8 位(256 色)显示可能有用。" +#~ "Indexed color layers are always scaled without interpolation. The chosen " +#~ "interpolation type will affect channels and layer masks only." +#~ msgstr "索引颜色图层缩放时总不插值。所选的插值类型将只影响通道和蒙板。" + +#~ msgid "Import Brightness-Contrast settings" +#~ msgstr "导入亮度-对比度设置" + +#~ msgid "Export Brightness-Contrast settings" +#~ msgstr "导出亮度-对比度设置" + +#~ msgid "Color Balance" +#~ msgstr "色彩平衡" + +#~ msgid "Import Color Balance Settings" +#~ msgstr "导入色彩平衡设置" + +#~ msgid "Export Color Balance Settings" +#~ msgstr "导出色彩平衡设置" + +#~ msgid "Color Balance operates only on RGB color layers." +#~ msgstr "色彩平衡操作只能在 RGB 颜色的图层上进行。" + +#~ msgid "Adjust Color Balance" +#~ msgstr "调整色彩平衡" + +#~ msgid "Colorize" +#~ msgstr "单色化" + +#~ msgid "Colorize Tool: Colorize the image" +#~ msgstr "单色化工具：图像单色化" + +#~ msgid "Import Colorize Settings" +#~ msgstr "导入单色化设置" + +#~ msgid "Export Colorize Settings" +#~ msgstr "导出单色化设置" + +#~ msgid "Colorize does not operate on grayscale layers." +#~ msgstr "无法在灰度图层上进行单色化" + +#~ msgid "Select Color" +#~ msgstr "选择颜色" + +#~ msgid "Colorize Color" +#~ msgstr "单色化颜色" + +#~ msgid "Pick color from image" +#~ msgstr "从图像中拾取颜色" + +#~ msgid "Import Curves" +#~ msgstr "导入曲线" + +#~ msgid "Export Curves" +#~ msgstr "导出曲线" + +#~ msgid "Apply filter in color managed space (slow)" +#~ msgstr "在色彩管理的空间中应用滤镜 (慢)" + +#~ msgid "Apply filter to the layer's raw pixels" +#~ msgstr "对图层的原始像素应用滤镜" + +#~ msgid "Click to complete selection" +#~ msgstr "单击以完成选区" + +#~ msgid "Import Hue-Saturation Settings" +#~ msgstr "导入色相-饱和度选项" + +#~ msgid "Export Hue-Saturation Settings" +#~ msgstr "导出色相-饱和度选项" + +#~ msgid "Hue-Saturation operates only on RGB color layers." +#~ msgstr "只有使用 RGB 颜色的图层可以进行色相-饱和度操作。" + +#~ msgid "Adjust Hue / Lightness / Saturation" +#~ msgstr "调整色相/亮度/饱和度" + +#~ msgid "Import Levels" +#~ msgstr "导入色阶" + +#~ msgid "Export Levels" +#~ msgstr "导出色阶" + +#~ msgid "Import Threshold Settings" +#~ msgstr "导入阈值设置" + +#~ msgid "Export Threshold Settings" +#~ msgstr "导出阈值设置" + +#~ msgctxt "rectangle-tool-fixed-rule" +#~ msgid "Aspect ratio" +#~ msgstr "宽高比" + +#~ msgctxt "rectangle-tool-fixed-rule" +#~ msgid "Width" +#~ msgstr "宽度" + +#~ msgctxt "rectangle-tool-fixed-rule" +#~ msgid "Height" +#~ msgstr "高度" + +#~ msgctxt "rectangle-tool-fixed-rule" +#~ msgid "Size" +#~ msgstr "大小" + +#~ msgid "Channel:" +#~ msgstr "通道：" + +#~ msgid "Add settings to favorites" +#~ msgstr "将设置添加到收藏" + +#~ msgid "_Manage Settings..." +#~ msgstr "管理设置(_M)..." + +#~ msgid "Add Settings to Favorites" +#~ msgstr "添加选项到收藏" + +#~ msgctxt "color-frame-mode" +#~ msgid "RGB" +#~ msgstr "RGB" + +#~ msgid "New Channel Options" +#~ msgstr "新建通道选项" + +#~ msgctxt "filters-action" +#~ msgid "Color _Reduction..." +#~ msgstr "色彩减弱(_R)..." + +#~ msgid "New Path Options" +#~ msgstr "新建路径选项" + +#~ msgid "Layer Fill Type" +#~ msgstr "图层填充类型" + +#~ msgid "Reset angle to zero" +#~ msgstr "重置角度为 0" + +#~ msgid "Reset hardness to default" +#~ msgstr "重置硬度为默认值" + +#~ msgid "Save" +#~ msgstr "保存" + +#~ msgid "Expanded as necessary" +#~ msgstr "必要时扩展" + +#~ msgid "Clipped to image" +#~ msgstr "剪贴板到图像" + +#~ msgid "Disable brush transformation (faster)" +#~ msgstr "禁用笔刷变换(快速)" + +#~ msgid "Horizontal Mirror" +#~ msgstr "水平镜面" + +#~ msgid "Vertical Mirror" +#~ msgstr "竖直镜面" + +#~ msgctxt "view-action" +#~ msgid "_Print Simulation" +#~ msgstr "模拟打印(_P)" + +#~ msgctxt "color-profile-policy" +#~ msgid "Convert to RGB workspace" +#~ msgstr "转换为 RGB 工作空间" + +#~ msgid "Print Simulation (Softproofing)" +#~ msgstr "模拟打印(软件打印)：" + +#~ msgid "_Print simulation profile:" +#~ msgstr "模拟打印配置文件(_P)：" + +#~ msgid "Offset:" +#~ msgstr "位移：" + +#~ msgid "_Feather border" +#~ msgstr "羽化边界(_F)" + +#~ msgid "_Mode of operation:" +#~ msgstr "操作模式(_M)：" + +#~ msgid "Sets the pixel format to use for mouse pointers." +#~ msgstr "设定鼠标指针所使用的像素格式。" #~ msgid "" -#~ "Generally only a concern for 8-bit displays, this sets the minimum number " -#~ "of system colors allocated for GIMP." -#~ msgstr "通常只对 8 位显示，此处设置分配给 GIMP 的系统颜色的最小数量。" +#~ "When enabled, the X server is queried for the mouse's current position on " +#~ "each motion event, rather than relying on the position hint. This means " +#~ "painting with large brushes should be more accurate, but it may be " +#~ "slower. Conversely, on some X servers enabling this option results in " +#~ "faster painting." +#~ msgstr "" +#~ "当启用时，每次移动鼠标的时候都将向 X 服务器查询当前的鼠标位置，而不是依赖" +#~ "于位置提示。这意味着用大的笔刷涂画的时候将更加精确，不过可能也更慢。与此相" +#~ "反，在某些 X 服务器上启用该选项将会加快涂画速度。" -#~ msgid "Brush Scale" -#~ msgstr "画笔缩放" - -#~ msgid "Rate:" -#~ msgstr "比率：" - -#~ msgid "Flow:" -#~ msgstr "流量：" - -#~ msgid "Gradient:" -#~ msgstr "渐变：" - -#~ msgid "Threshold:" -#~ msgstr "阈值：" - -#~ msgid "Tilt:" -#~ msgstr "倾斜：" - -#~ msgid "Type" -#~ msgstr "类型" - -#~ msgid "Brush:" -#~ msgstr "画笔：" - -#~ msgid "Scale:" -#~ msgstr "缩放：" - -#~ msgid "Font:" -#~ msgstr "字体：" +#~ msgid "" +#~ "ICC profile validation failed: Color profile is not for GRAY color space" +#~ msgstr "ICC 配置文件验证失败：色彩配置文件不可用于灰度颜色空间" #~ msgctxt "file-action" -#~ msgid "Save this image with a different name, but keep its current name" -#~ msgstr "用不同的名字保存此图像，但保持它当前的名字" +#~ msgid "Export" +#~ msgstr "导出" -#~ msgctxt "layers-action" -#~ msgid "Te_xt to Selection" -#~ msgstr "文字到选区(_X)" +#~ msgid "Export" +#~ msgstr "导出" -#~ msgctxt "layers-action" -#~ msgid "_Text to Selection" -#~ msgstr "文字到选区(_T)" +#~ msgctxt "select-action" +#~ msgid "F_lood" +#~ msgstr "溢出(_L)" -#~ msgctxt "layers-action" -#~ msgid "Replace the selection with the text layer's outline" -#~ msgstr "用文字图层的轮廓替换选区" - -#~ msgctxt "layers-action" -#~ msgid "Add the text layer's outline to the current selection" -#~ msgstr "将文字图层的轮廓添加到当前选区" - -#~ msgctxt "layers-action" -#~ msgid "Subtract the text layer's outline from the current selection" -#~ msgstr "从当前选区减去文字图层的轮廓" - -#~ msgctxt "layers-action" -#~ msgid "Intersect the text layer's outline with the current selection" -#~ msgstr "交叉文字图层的轮廓和当前选区" - -#~ msgid "Reset Tool Options" -#~ msgstr "重置工具选项" - -#~ msgid "Paste" -#~ msgstr "粘贴" - -#~ msgid "Cut" -#~ msgstr "剪切" - -#~ msgctxt "command" -#~ msgid "Rectangle Select" -#~ msgstr "矩形选择" - -#~ msgctxt "command" -#~ msgid "Ellipse Select" -#~ msgstr "椭圆选择" - -#~ msgctxt "command" -#~ msgid "Bucket Fill" -#~ msgstr "油漆桶填充" +#~ msgctxt "select-action" +#~ msgid "Level the selection's interior" +#~ msgstr "平整选区内部" #~ msgctxt "undo-type" -#~ msgid "Reorder layer" -#~ msgstr "重排图层" +#~ msgid "Flood Selection" +#~ msgstr "选区溢出" -#~ msgctxt "undo-type" -#~ msgid "Reorder channel" -#~ msgstr "重排通道" +#~ msgid "Affect:" +#~ msgstr "影响：" -#~ msgctxt "undo-type" -#~ msgid "Reorder path" -#~ msgstr "重排路径" - -#~ msgid "Pressure:" -#~ msgstr "压力：" - -#~ msgid "Empty Channel" -#~ msgstr "空白通道" - -#~ msgid "Pixel dimensions:" -#~ msgstr "像素尺寸：" - -#~ msgid "Empty Layer" -#~ msgstr "空白图层" - -#~ msgid "Empty Path" -#~ msgstr "空白路径" +#~ msgid "Flip Type (%s)" +#~ msgstr "翻转类型(%s)" diff --git a/themes/Dark/Makefile.am b/themes/Dark/Makefile.am index 512f261609..7278546cea 100644 --- a/themes/Dark/Makefile.am +++ b/themes/Dark/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in -themedatadir = $(gimpdatadir)/themes/03-Dark -themeuidir = $(gimpdatadir)/themes/03-Dark/ui +themedatadir = $(gimpdatadir)/themes/Dark +themeuidir = $(gimpdatadir)/themes/Dark/ui themedata_DATA = gtkrc diff --git a/themes/Dark/Makefile.in b/themes/Dark/Makefile.in index 6ec185baaf..81d6585864 100644 --- a/themes/Dark/Makefile.in +++ b/themes/Dark/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -244,7 +245,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -317,6 +318,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -545,6 +547,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -563,8 +566,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -themedatadir = $(gimpdatadir)/themes/03-Dark -themeuidir = $(gimpdatadir)/themes/03-Dark/ui +themedatadir = $(gimpdatadir)/themes/Dark +themeuidir = $(gimpdatadir)/themes/Dark/ui themedata_DATA = gtkrc themeui_DATA = \ ui/arrow-down-insens.png \ diff --git a/themes/Dark/gtkrc b/themes/Dark/gtkrc index cb2ccabc63..c615dda01e 100644 --- a/themes/Dark/gtkrc +++ b/themes/Dark/gtkrc @@ -2,7 +2,7 @@ # # Dark GIMP Theme # -# Version 0.1.6 +# Version 0.2 # # Copyright 2015-2016, Benoit Touchette # @@ -67,7 +67,7 @@ style "gimp-dark-default-style" { # font_name = "Sans 11" - color["clr1"] = "#EEEEEE" + color["clr1"] = "#DDDDDD" color["clr2"] = "#FFFFFF" color["clr3"] = "#C1C1C1" color["clr4"] = "#383838" @@ -75,7 +75,8 @@ style "gimp-dark-default-style" color["clr6"] = "#828282" color["clr7"] = "#3B3B3B" color["clr8"] = "#383838" - color["clr9"] = "#4D4D4D" + color["clr9"] = "#454545" + color["clrA"] = "#303030" fg[NORMAL] = @clr1 fg[PRELIGHT] = @clr2 @@ -83,22 +84,22 @@ style "gimp-dark-default-style" fg[SELECTED] = @clr1 fg[INSENSITIVE] = @clr3 - bg[NORMAL] = @clr4 - bg[PRELIGHT] = @clr4 + bg[NORMAL] = @clr9 + bg[PRELIGHT] = @clr7 bg[ACTIVE] = @clr4 bg[SELECTED] = @clr5 bg[INSENSITIVE] = @clr5 - base[NORMAL] = @clr6 + base[NORMAL] = @clrA base[PRELIGHT] = @clr7 base[ACTIVE] = @clr7 - base[SELECTED] = @clr7 + base[SELECTED] = @clr1 base[INSENSITIVE] = @clr8 text[NORMAL] = @clr1 text[PRELIGHT] = @clr1 text[ACTIVE] = @clr1 - text[SELECTED] = @clr1 + text[SELECTED] = @clr7 text[INSENSITIVE] = @clr9 GtkOptionMenu::indicator-size = { 5, 11 } @@ -436,91 +437,20 @@ style "gimp-dark-tooltips-style" = "gimp-dark-default-style" bg[NORMAL] = "#383838" bg[SELECTED] = "#828282" - fg[NORMAL] = "#CBCBCB" + fg[NORMAL] = @clr1 } widget "gtk-tooltip*" style "gimp-dark-tooltips-style" ########################################################### -style "gimp-dark-treeview" = "gimp-dark-default-style" -{ - xthickness = 2 - ythickness = 0 - - GtkTreeView::odd_row_color = "#828282" - GtkTreeView::even_row_color = "#828282" - - # - # set custom text color here - # - - #text[NORMAL] = "#0F0" - #text[PRELIGHT] = "#0F0" - #text[SELECTED] = "#0F0" - #text[INSENSITIVE] = "#0F0" - #text[ACTIVE] = "#0F0" - - engine "pixmap" - { - image - { - function = FLAT_BOX - state = ACTIVE - file = "ui/null.png" - border = {1,1,1,1} - stretch = TRUE - } - - image - { - function = FLAT_BOX - state = PRELIGHT - file = "ui/null.png" - border = {1,1,1,1} - stretch = TRUE - } - - image - { - function = FLAT_BOX - state = NORMAL - file = "ui/null.png" - border = {1,1,1,1} - stretch = TRUE - } - - image - { - function = FLAT_BOX - state = INSENSITIVE - file = "ui/null.png" - border = {1,1,1,1} - stretch = TRUE - } - - image - { - function = FLAT_BOX - state = SELECTED - file = "ui/menuitem.png" - border = {1,1,1,1} - stretch = TRUE - } - } -} - -class "GtkTreeView" style "gimp-dark-treeview" - -########################################################### - style "gimp-dark-list-header-style" { #Comment out the ythickness setting below for thicker column headers. #ythickness = 0 - GtkTreeView::odd_row_color = "#828282" - GtkTreeView::even_row_color = "#828282" + GtkTreeView::odd_row_color = "#1f1f1f" + GtkTreeView::even_row_color = "#1f1f1f" # # set custom header text color here @@ -1830,7 +1760,8 @@ class "GtkRange" style "gimp-dark-range-style" style "gimp-dark-spin-scale-style" { - bg[NORMAL] = "#828282" + fg[NORMAL] = "#131313" + bg[NORMAL] = "#1f1f1f" engine "pixmap" { @@ -2194,7 +2125,7 @@ style "kde_hack_1" GtkComboBoxEntry::appears-as-list = 0 GtkComboBoxText::appears-as-list = 0 - color["clr1"] = "#EEEEEE" + color["clr1"] = "#DDDDDD" color["clr2"] = "#FFFFFF" color["clr3"] = "#c1c1c1" color["clr4"] = "#383838" @@ -2203,6 +2134,7 @@ style "kde_hack_1" color["clr7"] = "#3b3b3b" color["clr8"] = "#383838" color["clr9"] = "#4D4D4D" + color["clrA"] = "#303030" fg[NORMAL] = @clr1 fg[PRELIGHT] = @clr2 @@ -2210,7 +2142,7 @@ style "kde_hack_1" fg[SELECTED] = @clr1 fg[INSENSITIVE] = @clr3 - base[NORMAL] = @clr6 + base[NORMAL] = @clrA base[PRELIGHT] = @clr7 base[ACTIVE] = @clr7 base[SELECTED] = @clr7 @@ -2483,4 +2415,172 @@ style "dark-python-console" widget "python-fu-console" style "dark-python-console" +########################################################### + +style "gimp-dark-spin-scale-style" +{ + engine "pixmap" + { + image + { + function = FLAT_BOX + detail = "entry_bg" + state = NORMAL + } + + image + { + function = FLAT_BOX + detail = "entry_bg" + state = ACTIVE + } + + image + { + function = BOX + state = NORMAL + detail = "spinbutton_up" + overlay_file = "ui/arrow-up-small.png" + overlay_stretch = FALSE + } + + image + { + function = BOX + state = PRELIGHT + detail = "spinbutton_up" + overlay_file = "ui/arrow-up-small-prelight.png" + overlay_stretch = FALSE + } + + image + { + function = BOX + state = ACTIVE + detail = "spinbutton_up" + overlay_file = "ui/arrow-up-small-prelight.png" + overlay_stretch = FALSE + } + + image + { + function = BOX + state = INSENSITIVE + detail = "spinbutton_up" + overlay_file = "ui/arrow-up-small-insens.png" + overlay_stretch = FALSE + } + + image + { + function = BOX + state = NORMAL + detail = "spinbutton_down" + overlay_file = "ui/arrow-down-small.png" + overlay_stretch = FALSE + } + + image + { + function = BOX + state = PRELIGHT + detail = "spinbutton_down" + overlay_file = "ui/arrow-down-small-prelight.png" + overlay_stretch = FALSE + } + + image + { + function = BOX + state = ACTIVE + detail = "spinbutton_down" + overlay_file = "ui/arrow-down-small-prelight.png" + overlay_stretch = FALSE + } + + image + { + function = BOX + state = INSENSITIVE + detail = "spinbutton_down" + overlay_file = "ui/arrow-down-small-insens.png" + overlay_stretch = FALSE + } + } +} + +class "GimpSpinScale" style "gimp-dark-spin-scale-style" + +########################################################### + +style "gimp-dark-treeview" = "gimp-dark-default-style" +{ + xthickness = 2 + ythickness = 0 + + GtkTreeView::odd_row_color = "#383838" + GtkTreeView::even_row_color = "#383838" + + # + # set custom text color here + # + + #text[NORMAL] = "#C1C1C1" + #text[NORMAL] = "#C1C1C1" + #text[PRELIGHT] = "#0F0" + #text[SELECTED] = "#0F0" + #text[INSENSITIVE] = "#0F0" + #text[ACTIVE] = "#0F0" + + engine "pixmap" + { + image + { + function = FLAT_BOX + state = ACTIVE + file = "ui/null.png" + border = {1,1,1,1} + stretch = TRUE + } + + image + { + function = FLAT_BOX + state = PRELIGHT + file = "ui/null.png" + border = {1,1,1,1} + stretch = TRUE + } + + image + { + function = FLAT_BOX + state = NORMAL + file = "ui/null.png" + border = {1,1,1,1} + stretch = TRUE + } + + image + { + function = FLAT_BOX + state = INSENSITIVE + file = "ui/null.png" + border = {1,1,1,1} + stretch = TRUE + } + + image + { + function = FLAT_BOX + state = SELECTED + file = "ui/menuitem.png" + border = {1,1,1,1} + stretch = TRUE + } + } +} + +class "GtkTreeView" style "gimp-dark-treeview" + # EOF diff --git a/themes/Dark/ui/arrow-right.png b/themes/Dark/ui/arrow-right.png index ed1a5bcd25..d849d2a11b 100644 Binary files a/themes/Dark/ui/arrow-right.png and b/themes/Dark/ui/arrow-right.png differ diff --git a/themes/Dark/ui/button-default.png b/themes/Dark/ui/button-default.png index ac6dbbe24e..4f08acb27a 100644 Binary files a/themes/Dark/ui/button-default.png and b/themes/Dark/ui/button-default.png differ diff --git a/themes/Dark/ui/button-prelight.png b/themes/Dark/ui/button-prelight.png index f170a3a162..d76eb7de81 100644 Binary files a/themes/Dark/ui/button-prelight.png and b/themes/Dark/ui/button-prelight.png differ diff --git a/themes/Dark/ui/button-pressed.png b/themes/Dark/ui/button-pressed.png index fd0aa560c6..76eb92e3e2 100644 Binary files a/themes/Dark/ui/button-pressed.png and b/themes/Dark/ui/button-pressed.png differ diff --git a/themes/Dark/ui/check1.png b/themes/Dark/ui/check1.png index 0ebec49f53..d9154d51c1 100644 Binary files a/themes/Dark/ui/check1.png and b/themes/Dark/ui/check1.png differ diff --git a/themes/Dark/ui/check2.png b/themes/Dark/ui/check2.png index e533d1ef9a..e04f356e92 100644 Binary files a/themes/Dark/ui/check2.png and b/themes/Dark/ui/check2.png differ diff --git a/themes/Dark/ui/check3.png b/themes/Dark/ui/check3.png index 29c91679a1..a0c01dae88 100644 Binary files a/themes/Dark/ui/check3.png and b/themes/Dark/ui/check3.png differ diff --git a/themes/Dark/ui/combo-entry-border-active-bg.png b/themes/Dark/ui/combo-entry-border-active-bg.png index 0ad498474d..54eb1dd6ec 100644 Binary files a/themes/Dark/ui/combo-entry-border-active-bg.png and b/themes/Dark/ui/combo-entry-border-active-bg.png differ diff --git a/themes/Dark/ui/combo-entry-border-active-notebook.png b/themes/Dark/ui/combo-entry-border-active-notebook.png index c919c752c5..70e6b5e354 100644 Binary files a/themes/Dark/ui/combo-entry-border-active-notebook.png and b/themes/Dark/ui/combo-entry-border-active-notebook.png differ diff --git a/themes/Dark/ui/combo-entry-border-active-rtl-notebook.png b/themes/Dark/ui/combo-entry-border-active-rtl-notebook.png index b509a65ecc..b35f41e6d5 100644 Binary files a/themes/Dark/ui/combo-entry-border-active-rtl-notebook.png and b/themes/Dark/ui/combo-entry-border-active-rtl-notebook.png differ diff --git a/themes/Dark/ui/combo-entry-border-bg.png b/themes/Dark/ui/combo-entry-border-bg.png index 65c3b5e60e..695dbde195 100644 Binary files a/themes/Dark/ui/combo-entry-border-bg.png and b/themes/Dark/ui/combo-entry-border-bg.png differ diff --git a/themes/Dark/ui/combo-entry-border-disabled-bg.png b/themes/Dark/ui/combo-entry-border-disabled-bg.png index 65c3b5e60e..0420afd053 100644 Binary files a/themes/Dark/ui/combo-entry-border-disabled-bg.png and b/themes/Dark/ui/combo-entry-border-disabled-bg.png differ diff --git a/themes/Dark/ui/combo-entry-border-disabled-notebook.png b/themes/Dark/ui/combo-entry-border-disabled-notebook.png index 7419058bf7..bacde7c785 100644 Binary files a/themes/Dark/ui/combo-entry-border-disabled-notebook.png and b/themes/Dark/ui/combo-entry-border-disabled-notebook.png differ diff --git a/themes/Dark/ui/combo-entry-border-disabled-rtl-bg.png b/themes/Dark/ui/combo-entry-border-disabled-rtl-bg.png index 130e7b5d20..90f2fecc06 100644 Binary files a/themes/Dark/ui/combo-entry-border-disabled-rtl-bg.png and b/themes/Dark/ui/combo-entry-border-disabled-rtl-bg.png differ diff --git a/themes/Dark/ui/combo-entry-border-disabled-rtl-notebook.png b/themes/Dark/ui/combo-entry-border-disabled-rtl-notebook.png index 5e074650a9..9053e317f2 100644 Binary files a/themes/Dark/ui/combo-entry-border-disabled-rtl-notebook.png and b/themes/Dark/ui/combo-entry-border-disabled-rtl-notebook.png differ diff --git a/themes/Dark/ui/combo-entry-border-notebook.png b/themes/Dark/ui/combo-entry-border-notebook.png index 7419058bf7..f876adaae6 100644 Binary files a/themes/Dark/ui/combo-entry-border-notebook.png and b/themes/Dark/ui/combo-entry-border-notebook.png differ diff --git a/themes/Dark/ui/combo-entry-border-rtl-bg.png b/themes/Dark/ui/combo-entry-border-rtl-bg.png index ea4649d69a..e7019b9d13 100644 Binary files a/themes/Dark/ui/combo-entry-border-rtl-bg.png and b/themes/Dark/ui/combo-entry-border-rtl-bg.png differ diff --git a/themes/Dark/ui/combo-entry-border-rtl-notebook.png b/themes/Dark/ui/combo-entry-border-rtl-notebook.png index 5e074650a9..e9539a77b9 100644 Binary files a/themes/Dark/ui/combo-entry-border-rtl-notebook.png and b/themes/Dark/ui/combo-entry-border-rtl-notebook.png differ diff --git a/themes/Dark/ui/combo-entry-button-active-rtl.png b/themes/Dark/ui/combo-entry-button-active-rtl.png index 5109b28d61..6960c7e6c3 100644 Binary files a/themes/Dark/ui/combo-entry-button-active-rtl.png and b/themes/Dark/ui/combo-entry-button-active-rtl.png differ diff --git a/themes/Dark/ui/combo-entry-button-active.png b/themes/Dark/ui/combo-entry-button-active.png index e7d1609384..7d45c37d24 100644 Binary files a/themes/Dark/ui/combo-entry-button-active.png and b/themes/Dark/ui/combo-entry-button-active.png differ diff --git a/themes/Dark/ui/combo-entry-button-disabled-rtl.png b/themes/Dark/ui/combo-entry-button-disabled-rtl.png index e67b83b7c2..f40ba99fcc 100644 Binary files a/themes/Dark/ui/combo-entry-button-disabled-rtl.png and b/themes/Dark/ui/combo-entry-button-disabled-rtl.png differ diff --git a/themes/Dark/ui/combo-entry-button-disabled.png b/themes/Dark/ui/combo-entry-button-disabled.png index 71477842ba..8360592d86 100644 Binary files a/themes/Dark/ui/combo-entry-button-disabled.png and b/themes/Dark/ui/combo-entry-button-disabled.png differ diff --git a/themes/Dark/ui/combo-entry-button-rtl.png b/themes/Dark/ui/combo-entry-button-rtl.png index e67b83b7c2..99bdb335b7 100644 Binary files a/themes/Dark/ui/combo-entry-button-rtl.png and b/themes/Dark/ui/combo-entry-button-rtl.png differ diff --git a/themes/Dark/ui/combo-entry-button.png b/themes/Dark/ui/combo-entry-button.png index 71477842ba..cfb9e4db13 100644 Binary files a/themes/Dark/ui/combo-entry-button.png and b/themes/Dark/ui/combo-entry-button.png differ diff --git a/themes/Dark/ui/entry-border-active-bg.png b/themes/Dark/ui/entry-border-active-bg.png index dbabce1798..e7f8079871 100644 Binary files a/themes/Dark/ui/entry-border-active-bg.png and b/themes/Dark/ui/entry-border-active-bg.png differ diff --git a/themes/Dark/ui/entry-border-active-notebook.png b/themes/Dark/ui/entry-border-active-notebook.png index 4b1b9178fd..7f5d86a762 100644 Binary files a/themes/Dark/ui/entry-border-active-notebook.png and b/themes/Dark/ui/entry-border-active-notebook.png differ diff --git a/themes/Dark/ui/entry-border-disabled-bg.png b/themes/Dark/ui/entry-border-disabled-bg.png index 2fb812c627..4f7e3989c2 100644 Binary files a/themes/Dark/ui/entry-border-disabled-bg.png and b/themes/Dark/ui/entry-border-disabled-bg.png differ diff --git a/themes/Dark/ui/entry-border-disabled-notebook.png b/themes/Dark/ui/entry-border-disabled-notebook.png index 2fb812c627..b4bc48ae91 100644 Binary files a/themes/Dark/ui/entry-border-disabled-notebook.png and b/themes/Dark/ui/entry-border-disabled-notebook.png differ diff --git a/themes/Dark/ui/entry-border-fill-active.png b/themes/Dark/ui/entry-border-fill-active.png index a145e47750..58c31aa552 100644 Binary files a/themes/Dark/ui/entry-border-fill-active.png and b/themes/Dark/ui/entry-border-fill-active.png differ diff --git a/themes/Dark/ui/entry-border-fill.png b/themes/Dark/ui/entry-border-fill.png index f6470b1ff7..c9c86cb898 100644 Binary files a/themes/Dark/ui/entry-border-fill.png and b/themes/Dark/ui/entry-border-fill.png differ diff --git a/themes/Dark/ui/entry-border-notebook.png b/themes/Dark/ui/entry-border-notebook.png index e0079278c1..9d494b2461 100644 Binary files a/themes/Dark/ui/entry-border-notebook.png and b/themes/Dark/ui/entry-border-notebook.png differ diff --git a/themes/Dark/ui/ext-bottom.png b/themes/Dark/ui/ext-bottom.png index a18a05cd31..f00813ac55 100644 Binary files a/themes/Dark/ui/ext-bottom.png and b/themes/Dark/ui/ext-bottom.png differ diff --git a/themes/Dark/ui/ext-left.png b/themes/Dark/ui/ext-left.png index 9907c94dd1..4bf69fd4a7 100644 Binary files a/themes/Dark/ui/ext-left.png and b/themes/Dark/ui/ext-left.png differ diff --git a/themes/Dark/ui/extension-bottom.png b/themes/Dark/ui/extension-bottom.png index 3967d0bc13..4ff02e1c29 100644 Binary files a/themes/Dark/ui/extension-bottom.png and b/themes/Dark/ui/extension-bottom.png differ diff --git a/themes/Dark/ui/frame-gap-end.png b/themes/Dark/ui/frame-gap-end.png index 5355136a60..b6b9058fea 100644 Binary files a/themes/Dark/ui/frame-gap-end.png and b/themes/Dark/ui/frame-gap-end.png differ diff --git a/themes/Dark/ui/frame-gap-start.png b/themes/Dark/ui/frame-gap-start.png index ae7b855db2..997c436b15 100644 Binary files a/themes/Dark/ui/frame-gap-start.png and b/themes/Dark/ui/frame-gap-start.png differ diff --git a/themes/Dark/ui/frame.png b/themes/Dark/ui/frame.png index 9ffdbf2431..01be421da4 100644 Binary files a/themes/Dark/ui/frame.png and b/themes/Dark/ui/frame.png differ diff --git a/themes/Dark/ui/gimp-button-default.png b/themes/Dark/ui/gimp-button-default.png index ac6dbbe24e..b75cab969e 100644 Binary files a/themes/Dark/ui/gimp-button-default.png and b/themes/Dark/ui/gimp-button-default.png differ diff --git a/themes/Dark/ui/gimp-button-insensitive.png b/themes/Dark/ui/gimp-button-insensitive.png index 487e99f378..18e38ae73e 100644 Binary files a/themes/Dark/ui/gimp-button-insensitive.png and b/themes/Dark/ui/gimp-button-insensitive.png differ diff --git a/themes/Dark/ui/gimp-button-normal.png b/themes/Dark/ui/gimp-button-normal.png index f4cb29db84..4c5386a25e 100644 Binary files a/themes/Dark/ui/gimp-button-normal.png and b/themes/Dark/ui/gimp-button-normal.png differ diff --git a/themes/Dark/ui/gimp-button-prelight.png b/themes/Dark/ui/gimp-button-prelight.png index e10dd94533..e31593fafa 100644 Binary files a/themes/Dark/ui/gimp-button-prelight.png and b/themes/Dark/ui/gimp-button-prelight.png differ diff --git a/themes/Dark/ui/gimp-button-pressed.png b/themes/Dark/ui/gimp-button-pressed.png index 673117dce8..bbc6956496 100644 Binary files a/themes/Dark/ui/gimp-button-pressed.png and b/themes/Dark/ui/gimp-button-pressed.png differ diff --git a/themes/Dark/ui/gimp-line-h.png b/themes/Dark/ui/gimp-line-h.png index af8d7b9ef4..2d97fe92bf 100644 Binary files a/themes/Dark/ui/gimp-line-h.png and b/themes/Dark/ui/gimp-line-h.png differ diff --git a/themes/Dark/ui/gimp-line-v.png b/themes/Dark/ui/gimp-line-v.png index 8354dcdcf6..c30954195e 100644 Binary files a/themes/Dark/ui/gimp-line-v.png and b/themes/Dark/ui/gimp-line-v.png differ diff --git a/themes/Dark/ui/gimp-menu-line-h.png b/themes/Dark/ui/gimp-menu-line-h.png index 084587880d..34bd7ac4fe 100644 Binary files a/themes/Dark/ui/gimp-menu-line-h.png and b/themes/Dark/ui/gimp-menu-line-h.png differ diff --git a/themes/Dark/ui/list_header-pressed.png b/themes/Dark/ui/list_header-pressed.png index a5322e55e7..1e979cf9a1 100644 Binary files a/themes/Dark/ui/list_header-pressed.png and b/themes/Dark/ui/list_header-pressed.png differ diff --git a/themes/Dark/ui/list_header.png b/themes/Dark/ui/list_header.png index 2cc9d0a89e..81c20fd6b7 100644 Binary files a/themes/Dark/ui/list_header.png and b/themes/Dark/ui/list_header.png differ diff --git a/themes/Dark/ui/menu-arrow.png b/themes/Dark/ui/menu-arrow.png index 61d292d712..f3ebd204da 100644 Binary files a/themes/Dark/ui/menu-arrow.png and b/themes/Dark/ui/menu-arrow.png differ diff --git a/themes/Dark/ui/menuitem.png b/themes/Dark/ui/menuitem.png index 799eb6a354..be5e060b53 100644 Binary files a/themes/Dark/ui/menuitem.png and b/themes/Dark/ui/menuitem.png differ diff --git a/themes/Dark/ui/minus.png b/themes/Dark/ui/minus.png index 5c26241d50..856be6330c 100644 Binary files a/themes/Dark/ui/minus.png and b/themes/Dark/ui/minus.png differ diff --git a/themes/Dark/ui/option1.png b/themes/Dark/ui/option1.png index b20d790726..1706a1a962 100644 Binary files a/themes/Dark/ui/option1.png and b/themes/Dark/ui/option1.png differ diff --git a/themes/Dark/ui/option2.png b/themes/Dark/ui/option2.png index be2c065cba..dbaabf1ac8 100644 Binary files a/themes/Dark/ui/option2.png and b/themes/Dark/ui/option2.png differ diff --git a/themes/Dark/ui/option3.png b/themes/Dark/ui/option3.png index 820b25e0a1..43ee5c5070 100644 Binary files a/themes/Dark/ui/option3.png and b/themes/Dark/ui/option3.png differ diff --git a/themes/Dark/ui/plus.png b/themes/Dark/ui/plus.png index 8c691c7891..546fc520a2 100644 Binary files a/themes/Dark/ui/plus.png and b/themes/Dark/ui/plus.png differ diff --git a/themes/Dark/ui/shadow-in-alt.png b/themes/Dark/ui/shadow-in-alt.png index ea86bc5558..89f504fb82 100644 Binary files a/themes/Dark/ui/shadow-in-alt.png and b/themes/Dark/ui/shadow-in-alt.png differ diff --git a/themes/Dark/ui/slider-h.png b/themes/Dark/ui/slider-h.png index b19c6101ee..61831e8508 100644 Binary files a/themes/Dark/ui/slider-h.png and b/themes/Dark/ui/slider-h.png differ diff --git a/themes/Dark/ui/slider-v.png b/themes/Dark/ui/slider-v.png index 7a2f9575f4..a030f5b780 100644 Binary files a/themes/Dark/ui/slider-v.png and b/themes/Dark/ui/slider-v.png differ diff --git a/themes/Dark/ui/spin-insensitive.png b/themes/Dark/ui/spin-insensitive.png index a6139546c6..590b6ab075 100644 Binary files a/themes/Dark/ui/spin-insensitive.png and b/themes/Dark/ui/spin-insensitive.png differ diff --git a/themes/Dark/ui/spin.png b/themes/Dark/ui/spin.png index 4f0f11932f..99660669b5 100644 Binary files a/themes/Dark/ui/spin.png and b/themes/Dark/ui/spin.png differ diff --git a/themes/Darker/Makefile.am b/themes/Darker/Makefile.am deleted file mode 100644 index 342652fadc..0000000000 --- a/themes/Darker/Makefile.am +++ /dev/null @@ -1,131 +0,0 @@ -## Process this file with automake to produce Makefile.in - -themedatadir = $(gimpdatadir)/themes/04-Darker -themeuidir = $(gimpdatadir)/themes/04-Darker/ui - -themedata_DATA = gtkrc - -themeui_DATA = \ - ui/arrow-down-insens.png \ - ui/arrow-down.png \ - ui/arrow-down-prelight.png \ - ui/arrow-down-small-insens.png \ - ui/arrow-down-small.png \ - ui/arrow-down-small-prelight.png \ - ui/arrow-left-insens.png \ - ui/arrow-left.png \ - ui/arrow-left-prelight.png \ - ui/arrow-right-insens.png \ - ui/arrow-right.png \ - ui/arrow-right-prelight.png \ - ui/arrow-up-insens.png \ - ui/arrow-up.png \ - ui/arrow-up-prelight.png \ - ui/arrow-up-small-insens.png \ - ui/arrow-up-small.png \ - ui/arrow-up-small-prelight.png \ - ui/bar-h.png \ - ui/bar-v.png \ - ui/button-default.png \ - ui/button-insensitive.png \ - ui/button-normal.png \ - ui/button-prelight.png \ - ui/button-pressed.png \ - ui/check1.png \ - ui/check2.png \ - ui/check3.png \ - ui/combo-entry-border-active-bg.png \ - ui/combo-entry-border-active-notebook.png \ - ui/combo-entry-border-active-rtl-notebook.png \ - ui/combo-entry-border-bg.png \ - ui/combo-entry-border-disabled-bg.png \ - ui/combo-entry-border-disabled-notebook.png \ - ui/combo-entry-border-disabled-rtl-bg.png \ - ui/combo-entry-border-disabled-rtl-notebook.png \ - ui/combo-entry-border-notebook.png \ - ui/combo-entry-border-rtl-bg.png \ - ui/combo-entry-border-rtl-notebook.png \ - ui/combo-entry-button-active.png \ - ui/combo-entry-button-active-rtl.png \ - ui/combo-entry-button-disabled.png \ - ui/combo-entry-button-disabled-rtl.png \ - ui/combo-entry-button.png \ - ui/combo-entry-button-rtl.png \ - ui/down.png \ - ui/down-pre.png \ - ui/entry-border-active-bg.png \ - ui/entry-border-active-notebook.png \ - ui/entry-border-disabled-bg.png \ - ui/entry-border-disabled-notebook.png \ - ui/entry-border-fill-active.png \ - ui/entry-border-fill.png \ - ui/entry-border-notebook-null.png \ - ui/entry-border-notebook.png \ - ui/ext-bottom.png \ - ui/extension-bottom.png \ - ui/extension-left.png \ - ui/extension-right.png \ - ui/extension-top.png \ - ui/ext-left.png \ - ui/ext-right.png \ - ui/ext-top.png \ - ui/frame-gap-end.png \ - ui/frame-gap-start.png \ - ui/frame.png \ - ui/gap_bottom.png \ - ui/gap_left.png \ - ui/gap_right.png \ - ui/gap_top.png \ - ui/gimp-arrow-down-insensitive.png \ - ui/gimp-arrow-down-insenstive.png \ - ui/gimp-arrow-down.png \ - ui/gimp-arrow-left.png \ - ui/gimp-arrow-right-dark.png \ - ui/gimp-arrow-right.png \ - ui/gimp-arrow-up.png \ - ui/gimp-button-default.png \ - ui/gimp-button-insensitive.png \ - ui/gimp-button-normal.png \ - ui/gimp-button-prelight.png \ - ui/gimp-button-pressed.png \ - ui/gimp-handle-h.png \ - ui/gimp-handle-v.png \ - ui/gimp-line-h.png \ - ui/gimp-line-v.png \ - ui/gimp-menu-line-h.png \ - ui/gimp-tooltip-bg.png \ - ui/list_header.png \ - ui/list_header-pressed.png \ - ui/menu-arrow.png \ - ui/menu-arrow-prelight.png \ - ui/menubar.png \ - ui/menuitem.png \ - ui/menuitem-prelight.png \ - ui/menu.png \ - ui/minus.png \ - ui/notebook.png \ - ui/null.png \ - ui/option1.png \ - ui/option2.png \ - ui/option3.png \ - ui/plus.png \ - ui/progressbar.png \ - ui/progressbar-trough.png \ - ui/shadow-in-alt.png \ - ui/shadow-in.png \ - ui/shadow-null.png \ - ui/shadow-out.png \ - ui/slider-h.png \ - ui/slider-v.png \ - ui/spin-down-insensitive.png \ - ui/spin-down-normal.png \ - ui/spin-down-pressed.png \ - ui/spin-insensitive.png \ - ui/spin.png \ - ui/spin-up-insensitive.png \ - ui/spin-up-normal.png \ - ui/spin-up-pressed.png \ - ui/toolbar.png \ - ui/transparent.png - -EXTRA_DIST = $(themedata_DATA) $(themeui_DATA) diff --git a/themes/Darker/Makefile.in b/themes/Darker/Makefile.in deleted file mode 100644 index e9bb28dce4..0000000000 --- a/themes/Darker/Makefile.in +++ /dev/null @@ -1,933 +0,0 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2017 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = { \ - if test -z '$(MAKELEVEL)'; then \ - false; \ - elif test -n '$(MAKE_HOST)'; then \ - true; \ - elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ - true; \ - else \ - false; \ - fi; \ -} -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = themes/Darker -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ - $(top_srcdir)/m4macros/intltool.m4 \ - $(top_srcdir)/m4macros/libtool.m4 \ - $(top_srcdir)/m4macros/ltoptions.m4 \ - $(top_srcdir)/m4macros/ltsugar.m4 \ - $(top_srcdir)/m4macros/ltversion.m4 \ - $(top_srcdir)/m4macros/lt~obsolete.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ - $(top_srcdir)/m4macros/ax_compare_version.m4 \ - $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ - $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ - $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ - $(top_srcdir)/m4macros/binreloc.m4 \ - $(top_srcdir)/m4macros/detectcflags.m4 \ - $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(themedatadir)" \ - "$(DESTDIR)$(themeuidir)" -DATA = $(themedata_DATA) $(themeui_DATA) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(srcdir)/Makefile.in -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -AA_LIBS = @AA_LIBS@ -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -ALL_LINGUAS = @ALL_LINGUAS@ -ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_LIBS = @ALSA_LIBS@ -ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPSTREAM_UTIL = @APPSTREAM_UTIL@ -AR = @AR@ -AS = @AS@ -ATK_CFLAGS = @ATK_CFLAGS@ -ATK_LIBS = @ATK_LIBS@ -ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BABL_CFLAGS = @BABL_CFLAGS@ -BABL_LIBS = @BABL_LIBS@ -BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@ -BINRELOC_CFLAGS = @BINRELOC_CFLAGS@ -BINRELOC_LIBS = @BINRELOC_LIBS@ -BUILD_EXEEXT = @BUILD_EXEEXT@ -BUILD_OBJEXT = @BUILD_OBJEXT@ -BZIP2_LIBS = @BZIP2_LIBS@ -CAIRO_CFLAGS = @CAIRO_CFLAGS@ -CAIRO_LIBS = @CAIRO_LIBS@ -CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@ -CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@ -CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@ -CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCAS = @CCAS@ -CCASDEPMODE = @CCASDEPMODE@ -CCASFLAGS = @CCASFLAGS@ -CCDEPMODE = @CCDEPMODE@ -CC_FOR_BUILD = @CC_FOR_BUILD@ -CC_VERSION = @CC_VERSION@ -CFLAGS = @CFLAGS@ -CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ -CPP_FOR_BUILD = @CPP_FOR_BUILD@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DESKTOP_DATADIR = @DESKTOP_DATADIR@ -DLLTOOL = @DLLTOOL@ -DOC_SHOOTER = @DOC_SHOOTER@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -FILE_AA = @FILE_AA@ -FILE_EXR = @FILE_EXR@ -FILE_JP2_LOAD = @FILE_JP2_LOAD@ -FILE_MNG = @FILE_MNG@ -FILE_PDF_SAVE = @FILE_PDF_SAVE@ -FILE_PS = @FILE_PS@ -FILE_WMF = @FILE_WMF@ -FILE_XMC = @FILE_XMC@ -FILE_XPM = @FILE_XPM@ -FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ -FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ -FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ -FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ -FREETYPE_LIBS = @FREETYPE_LIBS@ -GDBUS_CODEGEN = @GDBUS_CODEGEN@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@ -GEGL = @GEGL@ -GEGL_CFLAGS = @GEGL_CFLAGS@ -GEGL_LIBS = @GEGL_LIBS@ -GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GEXIV2_CFLAGS = @GEXIV2_CFLAGS@ -GEXIV2_LIBS = @GEXIV2_LIBS@ -GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@ -GIMP_API_VERSION = @GIMP_API_VERSION@ -GIMP_APP_VERSION = @GIMP_APP_VERSION@ -GIMP_BINARY_AGE = @GIMP_BINARY_AGE@ -GIMP_COMMAND = @GIMP_COMMAND@ -GIMP_DATA_VERSION = @GIMP_DATA_VERSION@ -GIMP_FULL_NAME = @GIMP_FULL_NAME@ -GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@ -GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ -GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ -GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ -GIMP_MKENUMS = @GIMP_MKENUMS@ -GIMP_MODULES = @GIMP_MODULES@ -GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@ -GIMP_PLUGINS = @GIMP_PLUGINS@ -GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@ -GIMP_REAL_VERSION = @GIMP_REAL_VERSION@ -GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@ -GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@ -GIMP_UNSTABLE = @GIMP_UNSTABLE@ -GIMP_USER_VERSION = @GIMP_USER_VERSION@ -GIMP_VERSION = @GIMP_VERSION@ -GIO_CFLAGS = @GIO_CFLAGS@ -GIO_LIBS = @GIO_LIBS@ -GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ -GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ -GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@ -GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_MKENUMS = @GLIB_MKENUMS@ -GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@ -GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@ -GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GOBJECT_QUERY = @GOBJECT_QUERY@ -GREP = @GREP@ -GS_LIBS = @GS_LIBS@ -GTKDOC_CHECK = @GTKDOC_CHECK@ -GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ -GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ -GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ -GTKDOC_MKPDF = @GTKDOC_MKPDF@ -GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ -GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ -GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ -GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ -GTK_WIN32_RECOMMENDED_VERSION = @GTK_WIN32_RECOMMENDED_VERSION@ -GUDEV_CFLAGS = @GUDEV_CFLAGS@ -GUDEV_LIBS = @GUDEV_LIBS@ -HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ -HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ -HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ -HAVE_FINITE = @HAVE_FINITE@ -HAVE_ISFINITE = @HAVE_ISFINITE@ -HAVE_VFORK = @HAVE_VFORK@ -HTML_DIR = @HTML_DIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ -ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@ -ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ -JPEG_LIBS = @JPEG_LIBS@ -LCMS_CFLAGS = @LCMS_CFLAGS@ -LCMS_LIBS = @LCMS_LIBS@ -LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ -LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@ -LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@ -LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@ -LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@ -LIBOBJS = @LIBOBJS@ -LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ -LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LT_VERSION_INFO = @LT_VERSION_INFO@ -LZMA_CFLAGS = @LZMA_CFLAGS@ -LZMA_LIBS = @LZMA_LIBS@ -MAIL = @MAIL@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@ -MIME_INFO_LIBS = @MIME_INFO_LIBS@ -MIME_TYPES = @MIME_TYPES@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -MSGMERGE = @MSGMERGE@ -MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@ -MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@ -NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@ -NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OPENEXR_CFLAGS = @OPENEXR_CFLAGS@ -OPENEXR_LIBS = @OPENEXR_LIBS@ -OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@ -OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@ -OPENJPEG_LIBS = @OPENJPEG_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@ -PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@ -PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@ -PATHSEP = @PATHSEP@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@ -PERL_VERSION = @PERL_VERSION@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POPPLER_CFLAGS = @POPPLER_CFLAGS@ -POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@ -POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@ -POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@ -POPPLER_LIBS = @POPPLER_LIBS@ -POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -PYBIN_PATH = @PYBIN_PATH@ -PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@ -PYCAIRO_LIBS = @PYCAIRO_LIBS@ -PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@ -PYGTK_CFLAGS = @PYGTK_CFLAGS@ -PYGTK_CODEGEN = @PYGTK_CODEGEN@ -PYGTK_DEFSDIR = @PYGTK_DEFSDIR@ -PYGTK_LIBS = @PYGTK_LIBS@ -PYLINK_LIBS = @PYLINK_LIBS@ -PYTHON = @PYTHON@ -PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@ -PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ -PYTHON_INCLUDES = @PYTHON_INCLUDES@ -PYTHON_PLATFORM = @PYTHON_PLATFORM@ -PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_VERSION = @PYTHON_VERSION@ -RANLIB = @RANLIB@ -RECOMMENDED_WIN32_GTK_CFLAGS = @RECOMMENDED_WIN32_GTK_CFLAGS@ -RECOMMENDED_WIN32_GTK_LIBS = @RECOMMENDED_WIN32_GTK_LIBS@ -RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@ -RT_LIBS = @RT_LIBS@ -SCREENSHOT_LIBS = @SCREENSHOT_LIBS@ -SED = @SED@ -SENDMAIL = @SENDMAIL@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SOCKET_LIBS = @SOCKET_LIBS@ -SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@ -SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@ -SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@ -STRIP = @STRIP@ -SVG_CFLAGS = @SVG_CFLAGS@ -SVG_LIBS = @SVG_LIBS@ -SYMPREFIX = @SYMPREFIX@ -TIFF_LIBS = @TIFF_LIBS@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ -WEBKIT_LIBS = @WEBKIT_LIBS@ -WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@ -WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@ -WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@ -WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@ -WEBPMUX_LIBS = @WEBPMUX_LIBS@ -WEBP_CFLAGS = @WEBP_CFLAGS@ -WEBP_LIBS = @WEBP_LIBS@ -WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@ -WEB_PAGE = @WEB_PAGE@ -WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@ -WINDRES = @WINDRES@ -WMF_CFLAGS = @WMF_CFLAGS@ -WMF_CONFIG = @WMF_CONFIG@ -WMF_LIBS = @WMF_LIBS@ -WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ -XDG_EMAIL = @XDG_EMAIL@ -XFIXES_CFLAGS = @XFIXES_CFLAGS@ -XFIXES_LIBS = @XFIXES_LIBS@ -XGETTEXT = @XGETTEXT@ -XGETTEXT_RECOMMENDED_VERSION = @XGETTEXT_RECOMMENDED_VERSION@ -XMC_CFLAGS = @XMC_CFLAGS@ -XMC_LIBS = @XMC_LIBS@ -XMKMF = @XMKMF@ -XMLLINT = @XMLLINT@ -XMU_LIBS = @XMU_LIBS@ -XPM_LIBS = @XPM_LIBS@ -XSLTPROC = @XSLTPROC@ -XVFB_RUN = @XVFB_RUN@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -Z_LIBS = @Z_LIBS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gimpdatadir = @gimpdatadir@ -gimpdir = @gimpdir@ -gimplocaledir = @gimplocaledir@ -gimpplugindir = @gimpplugindir@ -gimpsysconfdir = @gimpsysconfdir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -manpage_gimpdir = @manpage_gimpdir@ -mkdir_p = @mkdir_p@ -ms_librarian = @ms_librarian@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -pkgpyexecdir = @pkgpyexecdir@ -pkgpythondir = @pkgpythondir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -pyexecdir = @pyexecdir@ -pythondir = @pythondir@ -runstatedir = @runstatedir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -themedatadir = $(gimpdatadir)/themes/04-Darker -themeuidir = $(gimpdatadir)/themes/04-Darker/ui -themedata_DATA = gtkrc -themeui_DATA = \ - ui/arrow-down-insens.png \ - ui/arrow-down.png \ - ui/arrow-down-prelight.png \ - ui/arrow-down-small-insens.png \ - ui/arrow-down-small.png \ - ui/arrow-down-small-prelight.png \ - ui/arrow-left-insens.png \ - ui/arrow-left.png \ - ui/arrow-left-prelight.png \ - ui/arrow-right-insens.png \ - ui/arrow-right.png \ - ui/arrow-right-prelight.png \ - ui/arrow-up-insens.png \ - ui/arrow-up.png \ - ui/arrow-up-prelight.png \ - ui/arrow-up-small-insens.png \ - ui/arrow-up-small.png \ - ui/arrow-up-small-prelight.png \ - ui/bar-h.png \ - ui/bar-v.png \ - ui/button-default.png \ - ui/button-insensitive.png \ - ui/button-normal.png \ - ui/button-prelight.png \ - ui/button-pressed.png \ - ui/check1.png \ - ui/check2.png \ - ui/check3.png \ - ui/combo-entry-border-active-bg.png \ - ui/combo-entry-border-active-notebook.png \ - ui/combo-entry-border-active-rtl-notebook.png \ - ui/combo-entry-border-bg.png \ - ui/combo-entry-border-disabled-bg.png \ - ui/combo-entry-border-disabled-notebook.png \ - ui/combo-entry-border-disabled-rtl-bg.png \ - ui/combo-entry-border-disabled-rtl-notebook.png \ - ui/combo-entry-border-notebook.png \ - ui/combo-entry-border-rtl-bg.png \ - ui/combo-entry-border-rtl-notebook.png \ - ui/combo-entry-button-active.png \ - ui/combo-entry-button-active-rtl.png \ - ui/combo-entry-button-disabled.png \ - ui/combo-entry-button-disabled-rtl.png \ - ui/combo-entry-button.png \ - ui/combo-entry-button-rtl.png \ - ui/down.png \ - ui/down-pre.png \ - ui/entry-border-active-bg.png \ - ui/entry-border-active-notebook.png \ - ui/entry-border-disabled-bg.png \ - ui/entry-border-disabled-notebook.png \ - ui/entry-border-fill-active.png \ - ui/entry-border-fill.png \ - ui/entry-border-notebook-null.png \ - ui/entry-border-notebook.png \ - ui/ext-bottom.png \ - ui/extension-bottom.png \ - ui/extension-left.png \ - ui/extension-right.png \ - ui/extension-top.png \ - ui/ext-left.png \ - ui/ext-right.png \ - ui/ext-top.png \ - ui/frame-gap-end.png \ - ui/frame-gap-start.png \ - ui/frame.png \ - ui/gap_bottom.png \ - ui/gap_left.png \ - ui/gap_right.png \ - ui/gap_top.png \ - ui/gimp-arrow-down-insensitive.png \ - ui/gimp-arrow-down-insenstive.png \ - ui/gimp-arrow-down.png \ - ui/gimp-arrow-left.png \ - ui/gimp-arrow-right-dark.png \ - ui/gimp-arrow-right.png \ - ui/gimp-arrow-up.png \ - ui/gimp-button-default.png \ - ui/gimp-button-insensitive.png \ - ui/gimp-button-normal.png \ - ui/gimp-button-prelight.png \ - ui/gimp-button-pressed.png \ - ui/gimp-handle-h.png \ - ui/gimp-handle-v.png \ - ui/gimp-line-h.png \ - ui/gimp-line-v.png \ - ui/gimp-menu-line-h.png \ - ui/gimp-tooltip-bg.png \ - ui/list_header.png \ - ui/list_header-pressed.png \ - ui/menu-arrow.png \ - ui/menu-arrow-prelight.png \ - ui/menubar.png \ - ui/menuitem.png \ - ui/menuitem-prelight.png \ - ui/menu.png \ - ui/minus.png \ - ui/notebook.png \ - ui/null.png \ - ui/option1.png \ - ui/option2.png \ - ui/option3.png \ - ui/plus.png \ - ui/progressbar.png \ - ui/progressbar-trough.png \ - ui/shadow-in-alt.png \ - ui/shadow-in.png \ - ui/shadow-null.png \ - ui/shadow-out.png \ - ui/slider-h.png \ - ui/slider-v.png \ - ui/spin-down-insensitive.png \ - ui/spin-down-normal.png \ - ui/spin-down-pressed.png \ - ui/spin-insensitive.png \ - ui/spin.png \ - ui/spin-up-insensitive.png \ - ui/spin-up-normal.png \ - ui/spin-up-pressed.png \ - ui/toolbar.png \ - ui/transparent.png - -EXTRA_DIST = $(themedata_DATA) $(themeui_DATA) -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu themes/Darker/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu themes/Darker/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-themedataDATA: $(themedata_DATA) - @$(NORMAL_INSTALL) - @list='$(themedata_DATA)'; test -n "$(themedatadir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(themedatadir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(themedatadir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themedatadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(themedatadir)" || exit $$?; \ - done - -uninstall-themedataDATA: - @$(NORMAL_UNINSTALL) - @list='$(themedata_DATA)'; test -n "$(themedatadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(themedatadir)'; $(am__uninstall_files_from_dir) -install-themeuiDATA: $(themeui_DATA) - @$(NORMAL_INSTALL) - @list='$(themeui_DATA)'; test -n "$(themeuidir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(themeuidir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(themeuidir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themeuidir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(themeuidir)" || exit $$?; \ - done - -uninstall-themeuiDATA: - @$(NORMAL_UNINSTALL) - @list='$(themeui_DATA)'; test -n "$(themeuidir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(themeuidir)'; $(am__uninstall_files_from_dir) -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(themedatadir)" "$(DESTDIR)$(themeuidir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-themedataDATA install-themeuiDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-themedataDATA uninstall-themeuiDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - cscopelist-am ctags-am distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip install-themedataDATA install-themeuiDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ - uninstall-am uninstall-themedataDATA uninstall-themeuiDATA - -.PRECIOUS: Makefile - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/themes/Darker/gtkrc b/themes/Darker/gtkrc deleted file mode 100644 index 89d5853595..0000000000 --- a/themes/Darker/gtkrc +++ /dev/null @@ -1,2512 +0,0 @@ -############################################################################ -# -# Darker GIMP Theme -# Version 0.1.6 -# -# Copyright 2015-2016, Benoit Touchette -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -############################################################################ -# -# Special thanks to all the theme creators, specifically: -# -# horst3180 for his excellent Ceti-2 theme. -# Nuclear Napalm, android272, Medhi Abhollahi for their GIMP themes. -# -# Y'all inspired me to create these themes for GIMP. -# -############################################################################ -# -# arrows-(down, left, right, up)*.png from Ceti-2 theme, horst3180 -# frame-gap-*.png from Ceti-2 theme, horst3180 -# gap information from new CS6 II theme, Medhi Abhollahi -# -############################################################################ -# -# KDE: -# -# * For this theme to work under KDE users will need to disable either -# "Apply colors to non-QT applications" or "Apply KDE Colours to Non-KDE -# apps" depending on the version. -# -# Miscellaneous: -# -# * Fonts can be overridden by uncommenting the two font lines below -# -# * Uncomment the gtk-primary-button-warps-slider line to enable warping -# scroll bars. -# -############################################################################ - -gtk-menu-images = 1 -gtk-button-images = 0 -gtk-auto-mnemonics = 1 -#gtk-primary-button-warps-slider = 1 -gtk-toolbar-style = GTK_TOOLBAR_ICONS -gtk-application-prefer-dark-theme = true - -#gtk-font-name = "Sans 11" - -# KDE hack to match gtk/gnome defaults -gtk-button-images = 0 - -style "tdsog-default-style" -{ -# font_name = "Sans 11" - - color["clr1"] = "#EEEEEE" - color["clr2"] = "#DDDDDD" - color["clr3"] = "#C1C1C1" - color["clr4"] = "#222222" - color["clr5"] = "#111111" - color["clr6"] = "#828282" - color["clr7"] = "#3b3b3b" - color["clr8"] = "#222222" - color["clr9"] = "#4D4D4D" - color["clr10"] = "#FFFFFF" - - fg[NORMAL] = @clr1 - fg[PRELIGHT] = @clr10 - fg[ACTIVE] = @clr3 - fg[SELECTED] = @clr2 - fg[INSENSITIVE] = @clr3 - - bg[NORMAL] = @clr4 - bg[PRELIGHT] = @clr4 - bg[ACTIVE] = @clr4 - bg[SELECTED] = @clr9 - bg[INSENSITIVE] = @clr5 - - base[NORMAL] = @clr6 - base[PRELIGHT] = @clr7 - base[ACTIVE] = @clr7 - base[SELECTED] = @clr7 - base[INSENSITIVE] = @clr8 - - text[NORMAL] = @clr1 - text[PRELIGHT] = @clr1 - text[ACTIVE] = @clr1 - text[SELECTED] = @clr1 - text[INSENSITIVE] = @clr9 - - GtkOptionMenu::indicator-size = { 5, 11 } - GtkOptionMenu::indicator-spacing = { 4, 3, 1, 1 } - - GtkScrollbar::has_secondary_backward_stepper = 0 - GtkScrollbar::has_secondary_forward_stepper = 0 - - GtkPaned::handle-size = 2 - GimpDockWindow::default-height = 240 - GimpDock::font-scale = 0.8333 - GimpMenuDock::minimal-width = 200 - GimpDockWindow::menu-preview-size = small-toolbar - GimpToolPalette::tool-icon-size = large-toolbar - GimpToolPalette::button-relief = none - GimpDockbook::tab-border = 0 - GimpDockbook::tab-icon-size = menu - GimpColorNotebook::tab-border = 0 - GimpColorNotebook::tab-icon-size = menu - GimpDeviceEditor::handle-size = 12 - GimpDockable::content-border = 1 - GimpEditor::content-spacing = 1 - GimpEditor::button-spacing = 1 - GimpEditor::button-icon-size = menu - GimpDataEditor::minimal-height = 64 - GimpFrame::label-spacing = 2 - GtkDialog::content-area-border = 0 - GtkDialog::button-spacing = 6 - GtkDialog::action-area-border = 12 - GimpUnitComboBox::appears-as-list = 0 - GtkComboBox::appears-as-list = 0 - GtkComboBoxEntry::appears-as-list = 0 - GtkComboBoxText::appears-as-list = 0 - - # - # To adjust to default button spacing: - # - # Set focus-padding to 2 - # Set focus-line to 1 - # - - GtkButton::focus-line_width = 0 - GtkButton::focus-padding = 0 - - GtkRange::trough-border = 0 - GtkRange::slider-width = 15 - GtkRange::stepper-size = 0 - - GtkScale::slider-length = 14 - GtkScale::slider-width = 14 - GtkScale::trough-border = 0 - GtkScale::trough-side-details = 1 - - GtkVScale::slider_length = 14 - GtkVScale::slider_width = 14 - - GtkHScale::slider_length = 14 - GtkHScale::slider_width = 14 - - GtkScrollbar::trough-border = 0 - GtkScrollbar::activate-slider = 1 - GtkScrollbar::has-backward-stepper = 0 - GtkScrollbar::has-forward-stepper = 0 - GtkScrollbar::min-slider-length = 32 - GtkScrolledWindow::scrollbar-spacing = 0 - GtkScrolledWindow::scrollbars-within-bevel = 0 - - GtkTreeView::expander-size = 13 - GtkExpander::expander-size = 13 - - GtkStatusbar::shadow_type = GTK_SHADOW_NONE - GtkSpinButton::shadow_type = GTK_SHADOW_NONE - GtkMenuBar::shadow-type = GTK_SHADOW_NONE - GtkToolbar::shadow-type = GTK_SHADOW_NONE - GtkList::shadow_type = GTK_SHADOW_NONE - GtkCList::shadow_type = GTK_SHADOW_NONE - GtkComboBox::shadow_type = GTK_SHADOW_NONE - GtkComboBoxEntry::shadow_type = GTK_SHADOW_NONE - GtkScrolledWindow::shadow-type = GTK_SHADOW_NONE - GtkComboBoxText::shadow_type = GTK_SHADOW_NONE - GtkVScale::shadow_type = GTK_SHADOW_NONE - GtkHScale::shadow_type = GTK_SHADOW_NONE - GtkMenuItem::horizontal-padding = 4 - - GtkWidget::tooltip-radius = 2 - GtkWidget::tooltip-alpha = 235 - GtkWidget::new-tooltip-style = 1 - - GtkWindow::resize-grip-height = 0 - GtkWindow::resize-grip-width = 0 - - engine "pixmap" - { - image - { - function = EXPANDER - expander_style = COLLAPSED - file = "ui/plus.png" - } - - image - { - function = EXPANDER - expander_style = EXPANDED - file = "ui/minus.png" - } - - image - { - function = EXPANDER - expander_style = SEMI_EXPANDED - file = "ui/minus.png" - } - - image - { - function = EXPANDER - expander_style = SEMI_COLLAPSED - file = "ui/plus.png" - } - - image - { - function = SHADOW_GAP - file = "ui/shadow-null.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - - image - { - function = RESIZE_GRIP - state = NORMAL - detail = "statusbar" - overlay_file = "ui/null.png" - overlay_border = { 0,0,0,0 } - overlay_stretch = FALSE - } - - image - { - function = HLINE - recolorable = TRUE - file = "ui/gimp-line-h.png" - border = { 0, 0, 1, 1 } - stretch = TRUE - } - - image - { - function = VLINE - recolorable = TRUE - file = "ui/gimp-line-v.png" - border = { 1, 0, 1, 1 } - stretch = TRUE - } - - image - { - function = ARROW - recolorable = TRUE - overlay_file = "ui/gimp-arrow-up.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = UP - } - - image - { - function = ARROW - recolorable = TRUE - overlay_file = "ui/gimp-arrow-down.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = DOWN - } - - image - { - function = ARROW - recolorable = TRUE - overlay_file = "ui/gimp-arrow-left.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = LEFT - } - - image - { - function = ARROW - recolorable = TRUE - overlay_file = "ui/gimp-arrow-right.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = RIGHT - } - - image - { - function = HANDLE - overlay_file = "ui/gimp-handle-h.png" - overlay_stretch = FALSE - orientation = HORIZONTAL - } - - image - { - function = HANDLE - overlay_file = "ui/gimp-handle-v.png" - overlay_stretch = FALSE - orientation = VERTICAL - } - } -} - -class "GtkWidget" style "tdsog-default-style" - -########################################################### - -style "tdsog-tool-dialog-style" = "tdsog-default-style" -{ - GtkDialog::action-area-border = 6 -} - -class "GimpToolDialog" style "tdsog-tool-dialog-style" - -########################################################### - -style "tdsog-grid-view-style" = "tdsog-default-style" -{ - bg[NORMAL] = { 1.0, 1.0, 1.0 } -} - -widget "*GimpContainerGridView*GtkViewport*" style "tdsog-grid-view-style" - -########################################################### - -style "tdsog-dockable-style" = "tdsog-default-style" -{ - GimpFrame::label-bold = 0 - GtkButton::focus-line_width = 1 - GtkButton::focus-padding = 0 -} - -widget "*GimpDockable.*" style "tdsog-dockable-style" - -########################################################### - -style "tdsog-display-style" = "tdsog-default-style" -{ - GimpRuler::font-scale = 0.6444 - GimpUnitComboBox::label-scale = 0.8333 - GimpScaleComboBox::label-scale = 0.8333 - GtkComboBox::arrow-size = 8 - GtkButton::inner-border = { 0, 0, 0, 0 } - GtkButton::focus-line-width = 0 - GtkButton::focus-padding = 0 -} - -widget "*GimpDisplayShell.*" style "tdsog-display-style" - -########################################################### - -style "tdsog-overlay-style" = "gimp-display-style" -{ - GtkButton::focus-line_width = 1 -} - -widget_class "**" style "tdsog-overlay-style" - -########################################################### - -style "tdsog-gtkbutton-style" = "tdsog-default-style" -{ - xthickness = 3 - ythickness = 3 - - engine "pixmap" - { - image - { - function = BOX - detail = "buttondefault" - recolorable = TRUE - file = "ui/gimp-button-default.png" - border = { 8, 8, 8, 8 } - stretch = TRUE - } - - image - { - function = BOX - state = PRELIGHT - recolorable = TRUE - file = "ui/gimp-button-prelight.png" - border = { 8, 8, 8, 8} - stretch = TRUE - } - - image - { - function = BOX - state = ACTIVE - file = "ui/gimp-button-pressed.png" - border = { 8, 8, 8, 8 } - stretch = TRUE - } - - image - { - function = BOX - state = INSENSITIVE - file = "ui/gimp-button-insensitive.png" - border = { 8, 8, 8, 8 } - stretch = TRUE - } - - image - { - function = BOX - file = "ui/gimp-button-normal.png" - border = { 8, 8, 8, 8 } - stretch = TRUE - } - } -} - -class "GtkButton" style "tdsog-gtkbutton-style" - -########################################################### - -style "tdsog-tooltips-style" = "tdsog-default-style" -{ - xthickness = 4 - ythickness = 4 - - bg[NORMAL] = "#383838" - bg[SELECTED] = "#828282" - fg[NORMAL] = "#CBCBCB" -} - -widget "gtk-tooltip*" style "tdsog-tooltips-style" - -########################################################### - -style "tdsog-treeview" = "tdsog-default-style" -{ - xthickness = 2 - ythickness = 0 - - GtkTreeView::odd_row_color = "#828282" - GtkTreeView::even_row_color = "#828282" - - # - # set custom text color here - # - - #text[NORMAL] = "#0F0" - #text[PRELIGHT] = "#0F0" - #text[SELECTED] = "#0F0" - #text[INSENSITIVE] = "#0F0" - #text[ACTIVE] = "#0F0" - - engine "pixmap" - { - image - { - function = FLAT_BOX - state = ACTIVE - file = "ui/null.png" - border = {1,1,1,1} - stretch = TRUE - } - - image - { - function = FLAT_BOX - state = PRELIGHT - file = "ui/null.png" - border = {1,1,1,1} - stretch = TRUE - } - - image - { - function = FLAT_BOX - state = NORMAL - file = "ui/null.png" - border = {1,1,1,1} - stretch = TRUE - } - - image - { - function = FLAT_BOX - state = INSENSITIVE - file = "ui/null.png" - border = {1,1,1,1} - stretch = TRUE - } - - image - { - function = FLAT_BOX - state = SELECTED - file = "ui/menuitem.png" - border = {1,1,1,1} - stretch = TRUE - } - } -} - -class "GtkTreeView" style "tdsog-treeview" - -########################################################### - -style "tdsog-list-header-style" -{ - #Comment out the ythickness setting below for thicker column headers. - #ythickness = 0 - - GtkTreeView::odd_row_color = "#828282" - GtkTreeView::even_row_color = "#828282" - - # - # set custom header text color here - # - - #fg[NORMAL] = "#00F" - #fg[PRELIGHT] = "#00F" - #fg[SELECTED] = "#00F" - #fg[INSENSITIVE] = "#00F" - #fg[ACTIVE] = "#00F" - - # - # set custom text color here - # - - #text[NORMAL] = "#FF0" - #text[PRELIGHT] = "#FF0" - #text[SELECTED] = "#FF0" - #text[INSENSITIVE] = "#FF0" - #text[ACTIVE] = "#FF0" - - engine "pixmap" - { - # This image is used to draw the headers of columns - # in list views when they are not selected. - image - { - function = BOX - recolorable = TRUE - state = NORMAL - file = "ui/list_header.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - - # This image is used to draw the column headers in - # list views when they are clicked. - image - { - function = BOX - recolorable = TRUE - state = PRELIGHT - file = "ui/list_header.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = ACTIVE - file = "ui/list_header-pressed.png" - border = { 2, 2, 2, 2} - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = SELECTED - file = "ui/list_header.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - } -} - -widget_class "*List" style "tdsog-list-header-style" -widget_class "*GtkTree*" style "tdsog-list-header-style" -widget_class "*GtkCList" style "tdsog-list-header-style" - -########################################################### - -style "tdsog-notebook-style" = "tdsog-default-style" -{ - engine "pixmap" - { - image - { - function = EXTENSION - recolorable = TRUE - state = ACTIVE - file = "ui/ext-top.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - gap_side = BOTTOM - } - - image - { - function = EXTENSION - recolorable = TRUE - state = ACTIVE - file = "ui/ext-bottom.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - gap_side = TOP - } - - image - { - function = EXTENSION - recolorable = TRUE - state = ACTIVE - file = "ui/ext-right.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - gap_side = LEFT - } - - image - { - function = EXTENSION - recolorable = TRUE - state = ACTIVE - file = "ui/ext-left.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - gap_side = RIGHT - } - - image - { - function = EXTENSION - recolorable = TRUE - file = "ui/extension-top.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - gap_side = BOTTOM - } - - image - { - function = EXTENSION - recolorable = TRUE - file = "ui/extension-bottom.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - gap_side = TOP - } - - image - { - function = EXTENSION - recolorable = TRUE - file = "ui/extension-left.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - gap_side = RIGHT - } - - image - { - function = EXTENSION - recolorable = TRUE - file = "ui/extension-right.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - gap_side = LEFT - } - - image - { - function = BOX_GAP - recolorable = TRUE - file = "ui/notebook.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - gap_file = "ui/gap_top.png" - gap_border = { 1, 1, 1, 1 } - gap_start_file = "ui/null.png" - gap_end_file = "ui/null.png" - gap_side = TOP - } - - image - { - function = BOX_GAP - recolorable = TRUE - file = "ui/notebook.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - gap_file = "ui/gap_bottom.png" - gap_border = { 2, 1, 1, 1 } - gap_start_file = "ui/null.png" - gap_end_file = "ui/null.png" - gap_side = BOTTOM - } - - image - { - function = BOX_GAP - recolorable = TRUE - file = "ui/notebook.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - gap_file = "ui/gap_left.png" - gap_border = { 1, 1, 2, 2 } - gap_start_file = "ui/null.png" - gap_end_file = "ui/null.png" - gap_side = LEFT - } - - image - { - function = BOX_GAP - recolorable = TRUE - file = "ui/notebook.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - gap_file = "ui/gap_right.png" - gap_border = { 1, 1, 2, 1 } - gap_start_file = "ui/null.png" - gap_end_file = "ui/null.png" - gap_side = RIGHT - } - - image - { - function = BOX - recolorable = TRUE - file = "ui/notebook.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - gap_side = TOP - } - } -} - -class "GtkNotebook" style "tdsog-notebook-style" - -########################################################### - -style "tdsog-menu" = "tdsog-default-style" -{ - # bg[NORMAL] affects menu detachable item - bg[NORMAL] = "#484848" - - fg[NORMAL] = "#CBCBCB" - fg[PRELIGHT] = "#FFFFFF" - fg[INSENSITIVE] = "#C1C1C1" - - engine "pixmap" - { - image - { - function = BOX - recolorable = TRUE - detail = "menu" - file = "ui/menu.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - } - - image - { - function = HLINE - file = "ui/gimp-line-h.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - } - } -} - -class "GtkMenu" style "tdsog-menu" -widget_class "**" style "tdsog-menu" - -########################################################### - -style "tdsog-menu-bar" = "tdsog-default-style" -{ - xthickness = 4 - ythickness = 2 - - fg[NORMAL] = "#EEEEEE" - - engine "pixmap" - { - image - { - function = BOX - file = "ui/menubar.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - } -} - -class "GtkMenuBar" style "tdsog-menu-bar" -widget_class "**" style "tdsog-menu-bar" -widget_class "*.*" style "tdsog-menu-bar" - -########################################################### - -style "tdsog-menu-item" -{ - xthickness = 2 - ythickness = 4 - - bg[NORMAL] = "#484848" - - fg[NORMAL] = "#FFF" - fg[PRELIGHT] = "#FFF" - fg[ACTIVE] = "#FFF" - fg[SELECTED] = "#FFF" - fg[INSENSITIVE] = "#C1C1C1" - - engine "pixmap" - { - image - { - function = BOX - state = PRELIGHT - file = "ui/menuitem-prelight.png" - border = { 1, 0, 1, 0 } - stretch = TRUE - } - - image - { - function = OPTION - shadow = OUT - recolorable = TRUE - overlay_file = "ui/option1.png" - overlay_stretch = FALSE - } - - image - { - function = OPTION - shadow = IN - recolorable = TRUE - overlay_file = "ui/option2.png" - overlay_stretch = FALSE - } - - image - { - function = OPTION - shadow = ETCHED_IN - recolorable = TRUE - overlay_file = "ui/option3.png" - overlay_stretch = FALSE - } - - image - { - function = CHECK - shadow = OUT - recolorable = TRUE - overlay_file = "ui/check1.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - - image - { - function = CHECK - shadow = IN - recolorable = TRUE - overlay_file = "ui/check2.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - - image - { - function = CHECK - shadow = ETCHED_IN - recolorable = TRUE - overlay_file = "ui/check3.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - } -} - -class "GtkMenuItem" style "tdsog-menu-item" -widget_class "**" style "tdsog-menu-item" - -########################################################### - -style "tdsog-item" -{ - xthickness = 4 - - bg[NORMAL] = "#484848" - - fg[NORMAL] = "#FFF" - fg[PRELIGHT] = "#FFF" - fg[ACTIVE] = "#FFF" - fg[SELECTED] = "#FFF" - fg[INSENSITIVE] = "#C1C1C1" - - engine "pixmap" - { - image - { - function = BOX - recolorable = TRUE - file = "ui/button-normal.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - - image - { - function = ARROW - recolorable = TRUE - state = PRELIGHT - overlay_file = "ui/gimp-arrow-right.png" - overlay_stretch = FALSE - arrow_direction = RIGHT - } - - image - { - function = ARROW - state = NORMAL - recolorable = TRUE - overlay_file = "ui/gimp-arrow-right-dark.png" - overlay_stretch = FALSE - arrow_direction = RIGHT - } - } -} - -class "GtkItem" style "tdsog-item" - -########################################################### - - -style "tdsog-entry" = "tdsog-default-style" -{ - GtkWidget::interior_focus = 1 - - engine "pixmap" - { - image - { - function = FLAT_BOX - detail = "entry_bg" - state = NORMAL - overlay_file = "ui/entry-border-fill.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE - } - - image - { - function = FLAT_BOX - detail = "entry_bg" - state = ACTIVE - overlay_file = "ui/entry-border-fill-active.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE - } - - image - { - function = SHADOW - detail = "entry" - file = "ui/shadow-null.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - - image - { - function = FOCUS - state = NORMAL - recolorable = TRUE - file = "ui/shadow-in-alt.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - } - } -} - -class "GtkEntry" style "tdsog-entry" -class "GtkOldEditable" style "tdsog-entry" - -########################################################### - - -style "tdsog-spin-button" = "tdsog-entry" -{ - engine "pixmap" - { - image - { - function = ARROW - } - - image - { - function = BOX - state = NORMAL - detail = "spinbutton_up" - recolorable = TRUE - file = "ui/spin.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - overlay_file = "ui/spin-up-normal.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = PRELIGHT - detail = "spinbutton_up" - recolorable = TRUE - file = "ui/spin.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - overlay_file = "ui/spin-up-normal.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = ACTIVE - detail = "spinbutton_up" - recolorable = TRUE - file = "ui/spin.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - overlay_file = "ui/spin-up-pressed.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = INSENSITIVE - detail = "spinbutton_up" - recolorable = TRUE - file = "ui/spin-insensitive.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - overlay_file = "ui/spin-up-insensitive.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = NORMAL - detail = "spinbutton_down" - recolorable = TRUE - file = "ui/spin.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - overlay_file = "ui/spin-down-normal.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = PRELIGHT - detail = "spinbutton_down" - recolorable = TRUE - file = "ui/spin.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - overlay_file = "ui/spin-down-normal.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = ACTIVE - detail = "spinbutton_down" - recolorable = TRUE - file = "ui/spin.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - overlay_file = "ui/spin-down-pressed.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = INSENSITIVE - detail = "spinbutton_down" - recolorable = TRUE - file = "ui/spin-insensitive.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - overlay_file = "ui/spin-down-insensitive.png" - overlay_stretch = FALSE - } - } -} - -class "GtkSpinButton" style "tdsog-spin-button" - -########################################################### - -style "tdsog-scroll-bar" -{ - GtkRange::trough_border = 0 - GtkVScale::slider_length = 16 - GtkVScale::slider_width = 19 - GtkHScale::slider_length = 17 - GtkHScale::slider_width = 19 - GtkRange::slider_width = 15 - GtkRange::stepper_size = 15 - GtkScrollbar::min_slider_length = 30 - - engine "pixmap" - { - image - { - function = BOX - recolorable = TRUE - detail = "trough" - file = "ui/slider-v.png" - border = { 0,0,39,39} - stretch = TRUE - orientation = VERTICAL - } - - image - { - function = BOX - recolorable = TRUE - detail = "trough" - file = "ui/slider-h.png" - border = { 39,39,0,0 } - stretch = TRUE - orientation = HORIZONTAL - } - - image - { - function = SLIDER - recolorable = TRUE - file = "ui/bar-h.png" - border = { 2,2,2,2 } - stretch = TRUE - orientation = HORIZONTAL - } - - image - { - function = SLIDER - recolorable = TRUE - file = "ui/bar-v.png" - border = { 2,2,2,2 } - stretch = TRUE - orientation = VERTICAL - } - - image - { - function = BOX - recolorable = TRUE - file = "ui/null.png" - border = {0,0,0,0} - stretch = TRUE - } - - image - { - function = ARROW - recolorable = TRUE - state = NORMAL - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = UP - } - - image - { - function = ARROW - recolorable = TRUE - state = NORMAL - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = DOWN - } - - image - { - function = ARROW - recolorable = TRUE - state = NORMAL - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = LEFT - } - - image - { - function = ARROW - recolorable = TRUE - state = NORMAL - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = RIGHT - } - - image - { - function = ARROW - recolorable = TRUE - state = PRELIGHT - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = UP - } - - image - { - function = ARROW - recolorable = TRUE - state = PRELIGHT - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = DOWN - } - - image - { - function = ARROW - recolorable = TRUE - state = PRELIGHT - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = LEFT - } - - image - { - function = ARROW - recolorable = TRUE - state = PRELIGHT - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = RIGHT - } - - image - { - function = ARROW - recolorable = TRUE - state = INSENSITIVE - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = UP - } - - image - { - function = ARROW - recolorable = TRUE - state = INSENSITIVE - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = DOWN - } - - image - { - function = ARROW - recolorable = TRUE - state = INSENSITIVE - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = LEFT - } - - image - { - function = ARROW - recolorable = TRUE - state = INSENSITIVE - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = RIGHT - } - - image - { - function = ARROW - recolorable = TRUE - shadow = IN - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = UP - } - - image - { - function = ARROW - recolorable = TRUE - shadow = IN - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = DOWN - } - - image - { - function = ARROW - recolorable = TRUE - shadow = IN - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = LEFT - } - - image - { - function = ARROW - recolorable = TRUE - shadow = IN - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = RIGHT - } - } -} - -class "GtkScrollbar" style "tdsog-scroll-bar" - -########################################################### - -style "tdsog-radio-button" = "tdsog-default-style" -{ - engine "pixmap" - { - image - { - function = OPTION - shadow = OUT - recolorable = TRUE - overlay_file = "ui/option1.png" - overlay_stretch = FALSE - } - - image - { - function = OPTION - shadow = IN - recolorable = TRUE - overlay_file = "ui/option2.png" - overlay_stretch = FALSE - } - - image - { - function = OPTION - shadow = ETCHED_IN - recolorable = TRUE - overlay_file = "ui/option3.png" - overlay_stretch = FALSE - } - } -} - -class "GtkRadioButton" style "tdsog-radio-button" -class "GtkRadioMenuItem" style "tdsog-radio-button" - -########################################################### - -style "tdsog-check-button" = "tdsog-default-style" -{ - engine "pixmap" - { - image - { - function = CHECK - shadow = OUT - recolorable = TRUE - overlay_file = "ui/check1.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - - image - { - function = CHECK - shadow = IN - recolorable = TRUE - overlay_file = "ui/check2.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - - image - { - function = CHECK - shadow = ETCHED_IN - recolorable = TRUE - overlay_file = "ui/check3.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - } -} - -class "GtkCheckButton" style "tdsog-check-button" -class "GtkCheckMenuItem" style "tdsog-check-button" - -########################################################### - -style "tdsog-progress-bar" = "tdsog-default-style" -{ - xthickness = 1 - ythickness = 1 - - engine "pixmap" - { - image - { - function = BOX - recolorable = TRUE - detail = "bar" - file = "ui/progressbar.png" - border = { 2, 2, 3, 3} - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - detail = "trough" - file = "ui/progressbar-trough.png" - border = { 3, 3, 4, 4} - stretch = TRUE - orientation = HORIZONTAL - } - } -} - -class "GtkProgressBar" style "tdsog-progress-bar" - -########################################################### - -style "tdsog-separator-menu-item" -{ - engine "pixmap" - { - image - { - function = BOX - file = "ui/gimp-menu-line-h.png" - border = { 0, 0, 1, 0 } - stretch = TRUE - } - } -} - -class "GtkSeparatorMenuItem" style "tdsog-separator-menu-item" - -########################################################### - -style "tdsog-notebook-entry-style" -{ - engine "pixmap" - { - image - { - function = SHADOW - detail = "entry" - state = NORMAL - shadow = IN - file = "ui/entry-border-notebook-null.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - - image - { - function = SHADOW - detail = "entry" - state = INSENSITIVE - shadow = IN - file = "ui/entry-border-disabled-notebook.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - - image - { - function = SHADOW - detail = "entry" - state = ACTIVE - file = "ui/entry-border-active-notebook.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - } -} - -widget_class "**" style "tdsog-notebook-entry-style" - -########################################################### - -style "tdsog-notebook-combobox-entry-style" -{ - engine "pixmap" - { - # LTR version - image - { - function = SHADOW - detail = "entry" - state = NORMAL - shadow = IN - file = "ui/combo-entry-border-notebook.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - - image - { - function = SHADOW - detail = "entry" - state = INSENSITIVE - shadow = IN - file = "ui/combo-entry-border-disabled-notebook.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - - image - { - function = SHADOW - detail = "entry" - state = ACTIVE - file = "ui/combo-entry-border-active-notebook.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - - # RTL version - image - { - function = SHADOW - detail = "entry" - state = NORMAL - shadow = IN - file = "ui/combo-entry-border-rtl-notebook.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - - image - { - function = SHADOW - detail = "entry" - state = INSENSITIVE - shadow = IN - file = "ui/combo-entry-border-disabled-rtl-notebook.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - - image - { - function = SHADOW - detail = "entry" - state = ACTIVE - file = "ui/combo-entry-border-active-rtl-notebook.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - } -} - -widget_class "***" style "tdsog-notebook-combobox-entry-style" - -########################################################### - -style "tdsog-combobox-entry-button-style" -{ - xthickness = 6 - - fg[ACTIVE] = "#CBCBCB" - - engine "pixmap" - { - # LTR version - image - { - function = BOX - state = NORMAL - file = "ui/combo-entry-button.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - - image - { - function = BOX - state = PRELIGHT - file = "ui/combo-entry-button.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - - image - { - function = BOX - state = INSENSITIVE - file = "ui/combo-entry-button-disabled.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - - image - { - function = BOX - state = ACTIVE - file = "ui/combo-entry-button-active.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - - # RTL version - image - { - function = BOX - state = NORMAL - file = "ui/combo-entry-button-rtl.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - - image - { - function = BOX - state = PRELIGHT - file = "ui/combo-entry-button-rtl.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - - image - { - function = BOX - state = INSENSITIVE - file = "ui/combo-entry-button-disabled-rtl.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - - image - { - function = BOX - state = ACTIVE - file = "ui/combo-entry-button-active-rtl.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - } -} - -widget_class "**" style "tdsog-combobox-entry-button-style" -widget_class "****" style "tdsog-combobox-entry-button-style" -widget_class "**" style "tdsog-combobox-entry-button-style" - -########################################################### - -style "tdsog-range-style" -{ - engine "pixmap" - { - image - { - function = BOX - detail = "trough" - file = "ui/null.png" - border = { 4, 4, 0, 0 } - stretch = TRUE - orientation = HORIZONTAL - } - - image - { - function = BOX - detail = "trough" - border = { 0, 0, 4, 4 } - file = "ui/null.png" - stretch = TRUE - orientation = VERTICAL - } - - # Horizontal - image - { - function = SLIDER - state = NORMAL - file = "ui/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - orientation = HORIZONTAL - } - - image - { - function = SLIDER - state = PRELIGHT - file = "ui/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - orientation = HORIZONTAL - } - - image - { - function = SLIDER - state = INSENSITIVE - file = "ui/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Vertical - image - { - function = SLIDER - state = NORMAL - file = "ui/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - orientation = VERTICAL - } - - image - { - function = SLIDER - state = PRELIGHT - file = "ui/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - orientation = VERTICAL - } - - image - { - function = SLIDER - state = INSENSITIVE - file = "ui/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - orientation = VERTICAL - } - - # Function below removes the fuglies :) - image - { - function = BOX - file = "ui/transparent.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - } - } -} - -class "GtkRange" style "tdsog-range-style" - -########################################################### - -style "tdsog-spin-scale-style" -{ - bg[NORMAL] = "#828282" - - engine "pixmap" - { - image - { - function = FLAT_BOX - detail = "entry_bg" - state = NORMAL - } - - image - { - function = FLAT_BOX - detail = "entry_bg" - state = ACTIVE - } - - image - { - function = BOX - state = NORMAL - detail = "spinbutton_up" - overlay_file = "ui/arrow-up-small.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = PRELIGHT - detail = "spinbutton_up" - overlay_file = "ui/arrow-up-small-prelight.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = ACTIVE - detail = "spinbutton_up" - overlay_file = "ui/arrow-up-small-prelight.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = INSENSITIVE - detail = "spinbutton_up" - overlay_file = "ui/arrow-up-small-insens.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = NORMAL - detail = "spinbutton_down" - overlay_file = "ui/arrow-down-small.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = PRELIGHT - detail = "spinbutton_down" - overlay_file = "ui/arrow-down-small-prelight.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = ACTIVE - detail = "spinbutton_down" - overlay_file = "ui/arrow-down-small-prelight.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = INSENSITIVE - detail = "spinbutton_down" - overlay_file = "ui/arrow-down-small-insens.png" - overlay_stretch = FALSE - } - } -} - -class "GimpSpinScale" style "tdsog-spin-scale-style" - -########################################################### - -style "tdsog-scrolled-window-style" -{ - xthickness = 1 - ythickness = 1 - - engine "pixmap" - { - image - { - function = SHADOW - file = "ui/frame.png" - border = { 5, 5, 5, 5 } - stretch = TRUE - } - } -} - -class "GtkScrolledWindow" style "tdsog-scrolled-window-style" - -########################################################### - -style "tdsog-frame-style" -{ - xthickness = 1 - ythickness = 1 - - engine "pixmap" - { - image - { - function = SHADOW - file = "ui/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - shadow = IN - } - - image - { - function = SHADOW_GAP - file = "ui/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - gap_start_file = "ui/frame-gap-start.png" - gap_start_border = { 1, 0, 0, 0 } - gap_end_file = "ui/frame-gap-end.png" - gap_end_border = { 0, 1, 0, 0 } - shadow = IN - } - - image - { - function = SHADOW - file = "ui/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - shadow = OUT - } - - image - { - function = SHADOW_GAP - file = "ui/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - gap_start_file = "ui/frame-gap-start.png" - gap_start_border = { 1, 0, 0, 0 } - gap_end_file = "ui/frame-gap-end.png" - gap_end_border = { 0, 1, 0, 0 } - shadow = OUT - } - - image - { - function = SHADOW - file = "ui/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - shadow = ETCHED_IN - } - - image - { - function = SHADOW_GAP - file = "ui/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - gap_start_file = "ui/frame-gap-start.png" - gap_start_border = { 1, 0, 0, 0 } - gap_end_file = "ui/frame-gap-end.png" - gap_end_border = { 0, 1, 0, 0 } - shadow = ETCHED_IN - } - - image - { - function = SHADOW - file = "ui/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - shadow = ETCHED_OUT - } - - image - { - function = SHADOW_GAP - file = "ui/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - gap_start_file = "ui/frame-gap-start.png" - gap_start_border = { 1, 0, 0, 0 } - gap_end_file = "ui/frame-gap-end.png" - gap_end_border = { 0, 1, 0, 0 } - shadow = ETCHED_OUT - } - } -} - -class "GtkFrame" style "tdsog-frame-style" - -########################################################### - -style "tdsog-toolbox-frame-style" -{ - engine "pixmap" - { - image - { - function = SHADOW - } - } -} - -widget_class "**" style "tdsog-toolbox-frame-style" - -########################################################### - -style "tdsog-toolbar-style" -{ - engine "pixmap" - { - image - { - function = BOX - file = "ui/toolbar.png" - stretch = TRUE - border = { 1, 1, 1, 1 } - } - - image - { - function = BOX_GAP - recolorable = TRUE - detail = "handlebox_bin" - file = "ui/gimp-handle-h.png" - border = { 4, 3, 4, 3 } - stretch = FALSE - } - - image - { - function = HANDLE - overlay_file = "ui/gimp-handle-h.png" - overlay_stretch = FALSE - orientation = HORIZONTAL - } - - image - { - function = HANDLE - overlay_file = "ui/gimp-handle-v.png" - overlay_stretch = FALSE - orientation = VERTICAL - } - - image - { - function = VLINE - recolorable = TRUE - file = "ui/null.png" - stretch = TRUE - border = { 1, 1, 1, 1 } - } - - image - { - function = HLINE - recolorable = TRUE - file = "ui/null.png" - stretch = TRUE - border = { 1, 1, 1, 1 } - } - } -} - -class "GtkToolbar" style "tdsog-toolbar-style" -class "*HandleBox*" style "tdsog-toolbar-style" - -########################################################### - -style "tdsog-combobox-separator-style" -{ - xthickness = 0 - ythickness = 0 - GtkWidget::wide-separators = 1 -} - -widget_class "**" style "tdsog-combobox-separator-style" - -########################################################### - -style "tdsog-combobox-button-style" -{ - xthickness = 3 - ythickness = 3 -} - -widget_class "**" style "tdsog-combobox-button-style" - -########################################################### - -style "tdsog-combobox-style" -{ - xthickness = 0 - ythickness = 0 -} - -widget_class "*" style "tdsog-combobox-style" - -########################################################### - -style "tdsog-combobox-style1" -{ - xthickness = 0 - ythickness = 0 - - engine "pixmap" - { - image - { - function = BOX - file = "ui/gimp-button-normal.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - } - } -} - -widget_class "***" style "tdsog-combobox-style1" - -########################################################### - -style "tdsog-button-style" -{ - fg[PRELIGHT] = "#FBFBFB" - fg[ACTIVE] = "#9B9B9B" - fg[NORMAL] = "#CBCBCB" - fg[INSENSITIVE] = "#CBCBCB" -} - -widget_class "**" style "tdsog-button-style" - -########################################################### - -style "kde_hack_1" -{ - GtkComboBox::appears-as-list = 0 - GtkComboBoxEntry::appears-as-list = 0 - GtkComboBoxText::appears-as-list = 0 - - color["clr1"] = "#EEEEEE" - color["clr2"] = "#DDDDDD" - color["clr3"] = "#C1C1C1" - color["clr4"] = "#222222" - color["clr5"] = "#111111" - color["clr6"] = "#828282" - color["clr7"] = "#3b3b3b" - color["clr8"] = "#222222" - color["clr9"] = "#4D4D4D" - color["clr10"] = "#FFFFFF" - - fg[NORMAL] = @clr1 - fg[PRELIGHT] = @clr10 - fg[ACTIVE] = @clr3 - fg[SELECTED] = @clr2 - fg[INSENSITIVE] = @clr3 - - base[NORMAL] = @clr6 - base[PRELIGHT] = @clr7 - base[ACTIVE] = @clr7 - base[SELECTED] = @clr7 - base[INSENSITIVE] = @clr8 - - text[NORMAL] = @clr1 - text[PRELIGHT] = @clr1 - text[ACTIVE] = @clr1 - text[SELECTED] = @clr1 - text[INSENSITIVE] = @clr9 -} - -widget_class "*" style "kde_hack_1" - -########################################################### - -style "kde_hack_2" -{ - bg[NORMAL] = "#222" #Sets canvas BG -} - -widget "*GimpDisplayShell.*" style "kde_hack_2" - -########################################################### - -style "kde_hack_3" -{ - bg[NORMAL] = "#222" -} - -class "GtkFrame" style "kde_hack_3" -widget_class "**" style "kde_hack_3" - -########################################################### - -style "kde_hack_4" -{ - engine "pixmap" - { - image - { - function = OPTION - shadow = OUT - recolorable = TRUE - overlay_file = "ui/option1.png" - overlay_stretch = FALSE - } - - image - { - function = OPTION - shadow = IN - recolorable = TRUE - overlay_file = "ui/option2.png" - overlay_stretch = FALSE - } - - image - { - function = OPTION - shadow = ETCHED_IN - recolorable = TRUE - overlay_file = "ui/option3.png" - overlay_stretch = FALSE - } - - image - { - function = CHECK - shadow = OUT - recolorable = TRUE - overlay_file = "ui/check1.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - - image - { - function = CHECK - shadow = IN - recolorable = TRUE - overlay_file = "ui/check2.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - - image - { - function = CHECK - shadow = ETCHED_IN - recolorable = TRUE - overlay_file = "ui/check3.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - } -} - -widget_class "**" style "kde_hack_4" - -########################################################### - -# KDE Hack 5 -widget_class "**" style "tdsog-toolbar-style" - -########################################################### - -style "kde_hack_6" -{ - engine "pixmap" - { - # This image is used to draw the headers of columns - # in list views when they are not selected. - image - { - function = BOX - recolorable = TRUE - state = NORMAL - file = "ui/list_header.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - - # This image is used to draw the column headers in - # list views when they are clicked. - image - { - function = BOX - recolorable = TRUE - state = PRELIGHT - file = "ui/list_header.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = ACTIVE - file = "ui/list_header-pressed.png" - border = { 2, 2, 2, 2} - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = SELECTED - file = "ui/list_header.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - } -} - -widget_class "***" style "kde_hack_6" - -########################################################### - -# KDE & oxygen-gtk fix for BG -style "tdsog-oxygen-default-style" = "tdsog-default-style" -{ - GtkComboBox::appears-as-list = 0 - GtkComboBoxEntry::appears-as-list = 0 - GtkComboBoxText::appears-as-list = 0 -} - -class "*" style "tdsog-oxygen-default-style" - -########################################################### - -style "tdsog-gtkscale-style" -{ - engine "pixmap" - { - image - { - function = SLIDER - recolorable = TRUE - file = "ui/bar-h.png" - border = { 2,2,2,2 } - stretch = TRUE - orientation = HORIZONTAL - } - - image - { - function = SLIDER - recolorable = TRUE - file = "ui/bar-v.png" - border = { 2,2,2,2 } - stretch = TRUE - orientation = VERTICAL - } - - image - { - function = BOX - recolorable = TRUE - file = "ui/slider-h.png" - border = {0,0,0,0} - stretch = TRUE - orientation = HORIZONTAL - } - - image - { - function = BOX - recolorable = TRUE - file = "ui/slider-v.png" - border = {0,0,0,0} - stretch = TRUE - orientation = VERTICAL - } - } -} - -class "GtkScale" style "tdsog-gtkscale-style" -class "GtkVScale" style "tdsog-gtkscale-style" -class "GtkHScale" style "tdsog-gtkscale-style" -widget_class "*GtkScale*" style "tdsog-gtkscale-style" -widget_class "*GtkVScale*" style "tdsog-gtkscale-style" -widget_class "*GtkHScale*" style "tdsog-gtkscale-style" - -########################################################### - -style "tdsog-overlay-scrollbar" -{ - bg[SELECTED] = "#CCC" - bg[INSENSITIVE] = "#AAA" - bg[ACTIVE] = "#EEE" - bg[NORMAL] = "#666" - bg[PRELIGHT] = "#666" - - fg[NORMAL] = "#EEE" -} - -widget_class "*" style "tdsog-overlay-scrollbar" -widget_class "*" style "tdsog-overlay-scrollbar" - -########################################################### - -# Fix for GMIC/plugins -style "tlsog-plugin-scrolled-window-style" -{ - xthickness = 1 - ythickness = 1 - - engine "pixmap" - { - image - { - function = SHADOW - file = "ui/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - shadow = IN - } - } -} - -widget_class "**" style "tlsog-plugin-scrolled-window-style" - -########################################################### - -# Menu prelight fix for Ubuntu Unity -style "ubuntu-fix-menu-item" -{ - engine "pixmap" - { - image - { - function = BOX - state = PRELIGHT - file = "ui/entry-border-fill-active.png" - border = { 1, 0, 1, 0 } - stretch = TRUE - } - } -} - -widget "GtkMenuItem" style "ubuntu-fix-menu-item" - -########################################################### - -style "dark-python-console" -{ - text[NORMAL] = "#8f8" - text[INSENSITIVE] = "#f88" -} - -widget "python-fu-console" style "dark-python-console" - -# EOF diff --git a/themes/Darker/ui/arrow-down-insens.png b/themes/Darker/ui/arrow-down-insens.png deleted file mode 100644 index e61405c3bb..0000000000 Binary files a/themes/Darker/ui/arrow-down-insens.png and /dev/null differ diff --git a/themes/Darker/ui/arrow-down-prelight.png b/themes/Darker/ui/arrow-down-prelight.png deleted file mode 100644 index 71cae8e764..0000000000 Binary files a/themes/Darker/ui/arrow-down-prelight.png and /dev/null differ diff --git a/themes/Darker/ui/arrow-down-small-insens.png b/themes/Darker/ui/arrow-down-small-insens.png deleted file mode 100644 index c0b9098273..0000000000 Binary files a/themes/Darker/ui/arrow-down-small-insens.png and /dev/null differ diff --git a/themes/Darker/ui/arrow-down-small-prelight.png b/themes/Darker/ui/arrow-down-small-prelight.png deleted file mode 100644 index 9fd15d42fd..0000000000 Binary files a/themes/Darker/ui/arrow-down-small-prelight.png and /dev/null differ diff --git a/themes/Darker/ui/arrow-down-small.png b/themes/Darker/ui/arrow-down-small.png deleted file mode 100644 index 9fd15d42fd..0000000000 Binary files a/themes/Darker/ui/arrow-down-small.png and /dev/null differ diff --git a/themes/Darker/ui/arrow-down.png b/themes/Darker/ui/arrow-down.png deleted file mode 100644 index 71cae8e764..0000000000 Binary files a/themes/Darker/ui/arrow-down.png and /dev/null differ diff --git a/themes/Darker/ui/arrow-left-insens.png b/themes/Darker/ui/arrow-left-insens.png deleted file mode 100644 index 92946e053e..0000000000 Binary files a/themes/Darker/ui/arrow-left-insens.png and /dev/null differ diff --git a/themes/Darker/ui/arrow-left-prelight.png b/themes/Darker/ui/arrow-left-prelight.png deleted file mode 100644 index a8cfb5e334..0000000000 Binary files a/themes/Darker/ui/arrow-left-prelight.png and /dev/null differ diff --git a/themes/Darker/ui/arrow-left.png b/themes/Darker/ui/arrow-left.png deleted file mode 100644 index a8cfb5e334..0000000000 Binary files a/themes/Darker/ui/arrow-left.png and /dev/null differ diff --git a/themes/Darker/ui/arrow-right-insens.png b/themes/Darker/ui/arrow-right-insens.png deleted file mode 100644 index d007d4b7b3..0000000000 Binary files a/themes/Darker/ui/arrow-right-insens.png and /dev/null differ diff --git a/themes/Darker/ui/arrow-right-prelight.png b/themes/Darker/ui/arrow-right-prelight.png deleted file mode 100644 index ed1a5bcd25..0000000000 Binary files a/themes/Darker/ui/arrow-right-prelight.png and /dev/null differ diff --git a/themes/Darker/ui/arrow-right.png b/themes/Darker/ui/arrow-right.png deleted file mode 100644 index ed1a5bcd25..0000000000 Binary files a/themes/Darker/ui/arrow-right.png and /dev/null differ diff --git a/themes/Darker/ui/arrow-up-insens.png b/themes/Darker/ui/arrow-up-insens.png deleted file mode 100644 index fe9ae476ee..0000000000 Binary files a/themes/Darker/ui/arrow-up-insens.png and /dev/null differ diff --git a/themes/Darker/ui/arrow-up-prelight.png b/themes/Darker/ui/arrow-up-prelight.png deleted file mode 100644 index b2898c0652..0000000000 Binary files a/themes/Darker/ui/arrow-up-prelight.png and /dev/null differ diff --git a/themes/Darker/ui/arrow-up-small-insens.png b/themes/Darker/ui/arrow-up-small-insens.png deleted file mode 100644 index 85637dc4ce..0000000000 Binary files a/themes/Darker/ui/arrow-up-small-insens.png and /dev/null differ diff --git a/themes/Darker/ui/arrow-up-small-prelight.png b/themes/Darker/ui/arrow-up-small-prelight.png deleted file mode 100644 index eab1eb6768..0000000000 Binary files a/themes/Darker/ui/arrow-up-small-prelight.png and /dev/null differ diff --git a/themes/Darker/ui/arrow-up-small.png b/themes/Darker/ui/arrow-up-small.png deleted file mode 100644 index eab1eb6768..0000000000 Binary files a/themes/Darker/ui/arrow-up-small.png and /dev/null differ diff --git a/themes/Darker/ui/arrow-up.png b/themes/Darker/ui/arrow-up.png deleted file mode 100644 index a466155122..0000000000 Binary files a/themes/Darker/ui/arrow-up.png and /dev/null differ diff --git a/themes/Darker/ui/bar-h.png b/themes/Darker/ui/bar-h.png deleted file mode 100644 index 11391e3cee..0000000000 Binary files a/themes/Darker/ui/bar-h.png and /dev/null differ diff --git a/themes/Darker/ui/bar-v.png b/themes/Darker/ui/bar-v.png deleted file mode 100644 index 5f6516104e..0000000000 Binary files a/themes/Darker/ui/bar-v.png and /dev/null differ diff --git a/themes/Darker/ui/button-default.png b/themes/Darker/ui/button-default.png deleted file mode 100644 index ac6dbbe24e..0000000000 Binary files a/themes/Darker/ui/button-default.png and /dev/null differ diff --git a/themes/Darker/ui/button-insensitive.png b/themes/Darker/ui/button-insensitive.png deleted file mode 100644 index 1ad7c6e9c6..0000000000 Binary files a/themes/Darker/ui/button-insensitive.png and /dev/null differ diff --git a/themes/Darker/ui/button-normal.png b/themes/Darker/ui/button-normal.png deleted file mode 100644 index 7683841783..0000000000 Binary files a/themes/Darker/ui/button-normal.png and /dev/null differ diff --git a/themes/Darker/ui/button-prelight.png b/themes/Darker/ui/button-prelight.png deleted file mode 100644 index f170a3a162..0000000000 Binary files a/themes/Darker/ui/button-prelight.png and /dev/null differ diff --git a/themes/Darker/ui/button-pressed.png b/themes/Darker/ui/button-pressed.png deleted file mode 100644 index fd0aa560c6..0000000000 Binary files a/themes/Darker/ui/button-pressed.png and /dev/null differ diff --git a/themes/Darker/ui/check1.png b/themes/Darker/ui/check1.png deleted file mode 100644 index 0ebec49f53..0000000000 Binary files a/themes/Darker/ui/check1.png and /dev/null differ diff --git a/themes/Darker/ui/check2.png b/themes/Darker/ui/check2.png deleted file mode 100644 index e533d1ef9a..0000000000 Binary files a/themes/Darker/ui/check2.png and /dev/null differ diff --git a/themes/Darker/ui/check3.png b/themes/Darker/ui/check3.png deleted file mode 100644 index 29c91679a1..0000000000 Binary files a/themes/Darker/ui/check3.png and /dev/null differ diff --git a/themes/Darker/ui/combo-entry-border-active-bg.png b/themes/Darker/ui/combo-entry-border-active-bg.png deleted file mode 100644 index 0ad498474d..0000000000 Binary files a/themes/Darker/ui/combo-entry-border-active-bg.png and /dev/null differ diff --git a/themes/Darker/ui/combo-entry-border-active-notebook.png b/themes/Darker/ui/combo-entry-border-active-notebook.png deleted file mode 100644 index c919c752c5..0000000000 Binary files a/themes/Darker/ui/combo-entry-border-active-notebook.png and /dev/null differ diff --git a/themes/Darker/ui/combo-entry-border-active-rtl-notebook.png b/themes/Darker/ui/combo-entry-border-active-rtl-notebook.png deleted file mode 100644 index b509a65ecc..0000000000 Binary files a/themes/Darker/ui/combo-entry-border-active-rtl-notebook.png and /dev/null differ diff --git a/themes/Darker/ui/combo-entry-border-bg.png b/themes/Darker/ui/combo-entry-border-bg.png deleted file mode 100644 index 65c3b5e60e..0000000000 Binary files a/themes/Darker/ui/combo-entry-border-bg.png and /dev/null differ diff --git a/themes/Darker/ui/combo-entry-border-disabled-bg.png b/themes/Darker/ui/combo-entry-border-disabled-bg.png deleted file mode 100644 index 65c3b5e60e..0000000000 Binary files a/themes/Darker/ui/combo-entry-border-disabled-bg.png and /dev/null differ diff --git a/themes/Darker/ui/combo-entry-border-disabled-notebook.png b/themes/Darker/ui/combo-entry-border-disabled-notebook.png deleted file mode 100644 index 7419058bf7..0000000000 Binary files a/themes/Darker/ui/combo-entry-border-disabled-notebook.png and /dev/null differ diff --git a/themes/Darker/ui/combo-entry-border-disabled-rtl-bg.png b/themes/Darker/ui/combo-entry-border-disabled-rtl-bg.png deleted file mode 100644 index 130e7b5d20..0000000000 Binary files a/themes/Darker/ui/combo-entry-border-disabled-rtl-bg.png and /dev/null differ diff --git a/themes/Darker/ui/combo-entry-border-disabled-rtl-notebook.png b/themes/Darker/ui/combo-entry-border-disabled-rtl-notebook.png deleted file mode 100644 index 5e074650a9..0000000000 Binary files a/themes/Darker/ui/combo-entry-border-disabled-rtl-notebook.png and /dev/null differ diff --git a/themes/Darker/ui/combo-entry-border-notebook.png b/themes/Darker/ui/combo-entry-border-notebook.png deleted file mode 100644 index 7419058bf7..0000000000 Binary files a/themes/Darker/ui/combo-entry-border-notebook.png and /dev/null differ diff --git a/themes/Darker/ui/combo-entry-border-rtl-bg.png b/themes/Darker/ui/combo-entry-border-rtl-bg.png deleted file mode 100644 index ea4649d69a..0000000000 Binary files a/themes/Darker/ui/combo-entry-border-rtl-bg.png and /dev/null differ diff --git a/themes/Darker/ui/combo-entry-border-rtl-notebook.png b/themes/Darker/ui/combo-entry-border-rtl-notebook.png deleted file mode 100644 index 5e074650a9..0000000000 Binary files a/themes/Darker/ui/combo-entry-border-rtl-notebook.png and /dev/null differ diff --git a/themes/Darker/ui/combo-entry-button-active-rtl.png b/themes/Darker/ui/combo-entry-button-active-rtl.png deleted file mode 100644 index 5109b28d61..0000000000 Binary files a/themes/Darker/ui/combo-entry-button-active-rtl.png and /dev/null differ diff --git a/themes/Darker/ui/combo-entry-button-active.png b/themes/Darker/ui/combo-entry-button-active.png deleted file mode 100644 index e7d1609384..0000000000 Binary files a/themes/Darker/ui/combo-entry-button-active.png and /dev/null differ diff --git a/themes/Darker/ui/combo-entry-button-disabled-rtl.png b/themes/Darker/ui/combo-entry-button-disabled-rtl.png deleted file mode 100644 index e67b83b7c2..0000000000 Binary files a/themes/Darker/ui/combo-entry-button-disabled-rtl.png and /dev/null differ diff --git a/themes/Darker/ui/combo-entry-button-disabled.png b/themes/Darker/ui/combo-entry-button-disabled.png deleted file mode 100644 index 71477842ba..0000000000 Binary files a/themes/Darker/ui/combo-entry-button-disabled.png and /dev/null differ diff --git a/themes/Darker/ui/combo-entry-button-rtl.png b/themes/Darker/ui/combo-entry-button-rtl.png deleted file mode 100644 index e67b83b7c2..0000000000 Binary files a/themes/Darker/ui/combo-entry-button-rtl.png and /dev/null differ diff --git a/themes/Darker/ui/combo-entry-button.png b/themes/Darker/ui/combo-entry-button.png deleted file mode 100644 index 71477842ba..0000000000 Binary files a/themes/Darker/ui/combo-entry-button.png and /dev/null differ diff --git a/themes/Darker/ui/down-pre.png b/themes/Darker/ui/down-pre.png deleted file mode 100644 index 88213ec5d2..0000000000 Binary files a/themes/Darker/ui/down-pre.png and /dev/null differ diff --git a/themes/Darker/ui/down.png b/themes/Darker/ui/down.png deleted file mode 100644 index dfb22811b5..0000000000 Binary files a/themes/Darker/ui/down.png and /dev/null differ diff --git a/themes/Darker/ui/entry-border-active-bg.png b/themes/Darker/ui/entry-border-active-bg.png deleted file mode 100644 index dbabce1798..0000000000 Binary files a/themes/Darker/ui/entry-border-active-bg.png and /dev/null differ diff --git a/themes/Darker/ui/entry-border-active-notebook.png b/themes/Darker/ui/entry-border-active-notebook.png deleted file mode 100644 index 4b1b9178fd..0000000000 Binary files a/themes/Darker/ui/entry-border-active-notebook.png and /dev/null differ diff --git a/themes/Darker/ui/entry-border-disabled-bg.png b/themes/Darker/ui/entry-border-disabled-bg.png deleted file mode 100644 index 2fb812c627..0000000000 Binary files a/themes/Darker/ui/entry-border-disabled-bg.png and /dev/null differ diff --git a/themes/Darker/ui/entry-border-disabled-notebook.png b/themes/Darker/ui/entry-border-disabled-notebook.png deleted file mode 100644 index 2fb812c627..0000000000 Binary files a/themes/Darker/ui/entry-border-disabled-notebook.png and /dev/null differ diff --git a/themes/Darker/ui/entry-border-fill-active.png b/themes/Darker/ui/entry-border-fill-active.png deleted file mode 100644 index a145e47750..0000000000 Binary files a/themes/Darker/ui/entry-border-fill-active.png and /dev/null differ diff --git a/themes/Darker/ui/entry-border-fill.png b/themes/Darker/ui/entry-border-fill.png deleted file mode 100644 index f6470b1ff7..0000000000 Binary files a/themes/Darker/ui/entry-border-fill.png and /dev/null differ diff --git a/themes/Darker/ui/entry-border-notebook-null.png b/themes/Darker/ui/entry-border-notebook-null.png deleted file mode 100644 index f821830b86..0000000000 Binary files a/themes/Darker/ui/entry-border-notebook-null.png and /dev/null differ diff --git a/themes/Darker/ui/entry-border-notebook.png b/themes/Darker/ui/entry-border-notebook.png deleted file mode 100644 index e0079278c1..0000000000 Binary files a/themes/Darker/ui/entry-border-notebook.png and /dev/null differ diff --git a/themes/Darker/ui/ext-bottom.png b/themes/Darker/ui/ext-bottom.png deleted file mode 100644 index a18a05cd31..0000000000 Binary files a/themes/Darker/ui/ext-bottom.png and /dev/null differ diff --git a/themes/Darker/ui/ext-left.png b/themes/Darker/ui/ext-left.png deleted file mode 100644 index 9907c94dd1..0000000000 Binary files a/themes/Darker/ui/ext-left.png and /dev/null differ diff --git a/themes/Darker/ui/ext-right.png b/themes/Darker/ui/ext-right.png deleted file mode 100644 index 664c2cf9dc..0000000000 Binary files a/themes/Darker/ui/ext-right.png and /dev/null differ diff --git a/themes/Darker/ui/ext-top.png b/themes/Darker/ui/ext-top.png deleted file mode 100644 index ae254a8798..0000000000 Binary files a/themes/Darker/ui/ext-top.png and /dev/null differ diff --git a/themes/Darker/ui/extension-bottom.png b/themes/Darker/ui/extension-bottom.png deleted file mode 100644 index e4e7fabdd2..0000000000 Binary files a/themes/Darker/ui/extension-bottom.png and /dev/null differ diff --git a/themes/Darker/ui/extension-left.png b/themes/Darker/ui/extension-left.png deleted file mode 100644 index 26a165e091..0000000000 Binary files a/themes/Darker/ui/extension-left.png and /dev/null differ diff --git a/themes/Darker/ui/extension-right.png b/themes/Darker/ui/extension-right.png deleted file mode 100644 index 91a754cdb8..0000000000 Binary files a/themes/Darker/ui/extension-right.png and /dev/null differ diff --git a/themes/Darker/ui/extension-top.png b/themes/Darker/ui/extension-top.png deleted file mode 100644 index 206a222f29..0000000000 Binary files a/themes/Darker/ui/extension-top.png and /dev/null differ diff --git a/themes/Darker/ui/frame-gap-end.png b/themes/Darker/ui/frame-gap-end.png deleted file mode 100644 index 5355136a60..0000000000 Binary files a/themes/Darker/ui/frame-gap-end.png and /dev/null differ diff --git a/themes/Darker/ui/frame-gap-start.png b/themes/Darker/ui/frame-gap-start.png deleted file mode 100644 index ae7b855db2..0000000000 Binary files a/themes/Darker/ui/frame-gap-start.png and /dev/null differ diff --git a/themes/Darker/ui/frame.png b/themes/Darker/ui/frame.png deleted file mode 100644 index 9ffdbf2431..0000000000 Binary files a/themes/Darker/ui/frame.png and /dev/null differ diff --git a/themes/Darker/ui/gap_bottom.png b/themes/Darker/ui/gap_bottom.png deleted file mode 100644 index 3689fad5be..0000000000 Binary files a/themes/Darker/ui/gap_bottom.png and /dev/null differ diff --git a/themes/Darker/ui/gap_left.png b/themes/Darker/ui/gap_left.png deleted file mode 100644 index b5b495f6ba..0000000000 Binary files a/themes/Darker/ui/gap_left.png and /dev/null differ diff --git a/themes/Darker/ui/gap_right.png b/themes/Darker/ui/gap_right.png deleted file mode 100644 index a41ad25884..0000000000 Binary files a/themes/Darker/ui/gap_right.png and /dev/null differ diff --git a/themes/Darker/ui/gap_top.png b/themes/Darker/ui/gap_top.png deleted file mode 100644 index 3b89ae6aad..0000000000 Binary files a/themes/Darker/ui/gap_top.png and /dev/null differ diff --git a/themes/Darker/ui/gimp-arrow-down-insensitive.png b/themes/Darker/ui/gimp-arrow-down-insensitive.png deleted file mode 100644 index 771de6b377..0000000000 Binary files a/themes/Darker/ui/gimp-arrow-down-insensitive.png and /dev/null differ diff --git a/themes/Darker/ui/gimp-arrow-down-insenstive.png b/themes/Darker/ui/gimp-arrow-down-insenstive.png deleted file mode 100644 index 771de6b377..0000000000 Binary files a/themes/Darker/ui/gimp-arrow-down-insenstive.png and /dev/null differ diff --git a/themes/Darker/ui/gimp-arrow-down.png b/themes/Darker/ui/gimp-arrow-down.png deleted file mode 100644 index 23c715f0cc..0000000000 Binary files a/themes/Darker/ui/gimp-arrow-down.png and /dev/null differ diff --git a/themes/Darker/ui/gimp-arrow-left.png b/themes/Darker/ui/gimp-arrow-left.png deleted file mode 100644 index cdbfc2f8c4..0000000000 Binary files a/themes/Darker/ui/gimp-arrow-left.png and /dev/null differ diff --git a/themes/Darker/ui/gimp-arrow-right-dark.png b/themes/Darker/ui/gimp-arrow-right-dark.png deleted file mode 100644 index 99d0404b53..0000000000 Binary files a/themes/Darker/ui/gimp-arrow-right-dark.png and /dev/null differ diff --git a/themes/Darker/ui/gimp-arrow-right.png b/themes/Darker/ui/gimp-arrow-right.png deleted file mode 100644 index 6b890dbe21..0000000000 Binary files a/themes/Darker/ui/gimp-arrow-right.png and /dev/null differ diff --git a/themes/Darker/ui/gimp-arrow-up.png b/themes/Darker/ui/gimp-arrow-up.png deleted file mode 100644 index ff1f03f296..0000000000 Binary files a/themes/Darker/ui/gimp-arrow-up.png and /dev/null differ diff --git a/themes/Darker/ui/gimp-button-default.png b/themes/Darker/ui/gimp-button-default.png deleted file mode 100644 index ac6dbbe24e..0000000000 Binary files a/themes/Darker/ui/gimp-button-default.png and /dev/null differ diff --git a/themes/Darker/ui/gimp-button-insensitive.png b/themes/Darker/ui/gimp-button-insensitive.png deleted file mode 100644 index 487e99f378..0000000000 Binary files a/themes/Darker/ui/gimp-button-insensitive.png and /dev/null differ diff --git a/themes/Darker/ui/gimp-button-normal.png b/themes/Darker/ui/gimp-button-normal.png deleted file mode 100644 index f4cb29db84..0000000000 Binary files a/themes/Darker/ui/gimp-button-normal.png and /dev/null differ diff --git a/themes/Darker/ui/gimp-button-prelight.png b/themes/Darker/ui/gimp-button-prelight.png deleted file mode 100644 index af848eb762..0000000000 Binary files a/themes/Darker/ui/gimp-button-prelight.png and /dev/null differ diff --git a/themes/Darker/ui/gimp-button-pressed.png b/themes/Darker/ui/gimp-button-pressed.png deleted file mode 100644 index 673117dce8..0000000000 Binary files a/themes/Darker/ui/gimp-button-pressed.png and /dev/null differ diff --git a/themes/Darker/ui/gimp-handle-h.png b/themes/Darker/ui/gimp-handle-h.png deleted file mode 100644 index 6e9f5a350a..0000000000 Binary files a/themes/Darker/ui/gimp-handle-h.png and /dev/null differ diff --git a/themes/Darker/ui/gimp-handle-v.png b/themes/Darker/ui/gimp-handle-v.png deleted file mode 100644 index f7d6d6611d..0000000000 Binary files a/themes/Darker/ui/gimp-handle-v.png and /dev/null differ diff --git a/themes/Darker/ui/gimp-line-h.png b/themes/Darker/ui/gimp-line-h.png deleted file mode 100644 index af8d7b9ef4..0000000000 Binary files a/themes/Darker/ui/gimp-line-h.png and /dev/null differ diff --git a/themes/Darker/ui/gimp-line-v.png b/themes/Darker/ui/gimp-line-v.png deleted file mode 100644 index 8354dcdcf6..0000000000 Binary files a/themes/Darker/ui/gimp-line-v.png and /dev/null differ diff --git a/themes/Darker/ui/gimp-menu-line-h.png b/themes/Darker/ui/gimp-menu-line-h.png deleted file mode 100644 index 084587880d..0000000000 Binary files a/themes/Darker/ui/gimp-menu-line-h.png and /dev/null differ diff --git a/themes/Darker/ui/gimp-tooltip-bg.png b/themes/Darker/ui/gimp-tooltip-bg.png deleted file mode 100644 index 00e9acce9e..0000000000 Binary files a/themes/Darker/ui/gimp-tooltip-bg.png and /dev/null differ diff --git a/themes/Darker/ui/list_header-pressed.png b/themes/Darker/ui/list_header-pressed.png deleted file mode 100644 index a5322e55e7..0000000000 Binary files a/themes/Darker/ui/list_header-pressed.png and /dev/null differ diff --git a/themes/Darker/ui/list_header.png b/themes/Darker/ui/list_header.png deleted file mode 100644 index 2cc9d0a89e..0000000000 Binary files a/themes/Darker/ui/list_header.png and /dev/null differ diff --git a/themes/Darker/ui/menu-arrow-prelight.png b/themes/Darker/ui/menu-arrow-prelight.png deleted file mode 100644 index c7837082ca..0000000000 Binary files a/themes/Darker/ui/menu-arrow-prelight.png and /dev/null differ diff --git a/themes/Darker/ui/menu-arrow.png b/themes/Darker/ui/menu-arrow.png deleted file mode 100644 index 61d292d712..0000000000 Binary files a/themes/Darker/ui/menu-arrow.png and /dev/null differ diff --git a/themes/Darker/ui/menu.png b/themes/Darker/ui/menu.png deleted file mode 100644 index e9cbc0a796..0000000000 Binary files a/themes/Darker/ui/menu.png and /dev/null differ diff --git a/themes/Darker/ui/menubar.png b/themes/Darker/ui/menubar.png deleted file mode 100644 index 3918fc0159..0000000000 Binary files a/themes/Darker/ui/menubar.png and /dev/null differ diff --git a/themes/Darker/ui/menuitem-prelight.png b/themes/Darker/ui/menuitem-prelight.png deleted file mode 100644 index a145e47750..0000000000 Binary files a/themes/Darker/ui/menuitem-prelight.png and /dev/null differ diff --git a/themes/Darker/ui/menuitem.png b/themes/Darker/ui/menuitem.png deleted file mode 100644 index 799eb6a354..0000000000 Binary files a/themes/Darker/ui/menuitem.png and /dev/null differ diff --git a/themes/Darker/ui/minus.png b/themes/Darker/ui/minus.png deleted file mode 100644 index 5c26241d50..0000000000 Binary files a/themes/Darker/ui/minus.png and /dev/null differ diff --git a/themes/Darker/ui/notebook.png b/themes/Darker/ui/notebook.png deleted file mode 100644 index 9b685f5e00..0000000000 Binary files a/themes/Darker/ui/notebook.png and /dev/null differ diff --git a/themes/Darker/ui/null.png b/themes/Darker/ui/null.png deleted file mode 100644 index 0c00fdf962..0000000000 Binary files a/themes/Darker/ui/null.png and /dev/null differ diff --git a/themes/Darker/ui/option1.png b/themes/Darker/ui/option1.png deleted file mode 100644 index b20d790726..0000000000 Binary files a/themes/Darker/ui/option1.png and /dev/null differ diff --git a/themes/Darker/ui/option2.png b/themes/Darker/ui/option2.png deleted file mode 100644 index be2c065cba..0000000000 Binary files a/themes/Darker/ui/option2.png and /dev/null differ diff --git a/themes/Darker/ui/option3.png b/themes/Darker/ui/option3.png deleted file mode 100644 index 820b25e0a1..0000000000 Binary files a/themes/Darker/ui/option3.png and /dev/null differ diff --git a/themes/Darker/ui/plus.png b/themes/Darker/ui/plus.png deleted file mode 100644 index 8c691c7891..0000000000 Binary files a/themes/Darker/ui/plus.png and /dev/null differ diff --git a/themes/Darker/ui/progressbar-trough.png b/themes/Darker/ui/progressbar-trough.png deleted file mode 100644 index 9eac1ad182..0000000000 Binary files a/themes/Darker/ui/progressbar-trough.png and /dev/null differ diff --git a/themes/Darker/ui/progressbar.png b/themes/Darker/ui/progressbar.png deleted file mode 100644 index d9daea8e1d..0000000000 Binary files a/themes/Darker/ui/progressbar.png and /dev/null differ diff --git a/themes/Darker/ui/shadow-in-alt.png b/themes/Darker/ui/shadow-in-alt.png deleted file mode 100644 index ea86bc5558..0000000000 Binary files a/themes/Darker/ui/shadow-in-alt.png and /dev/null differ diff --git a/themes/Darker/ui/shadow-in.png b/themes/Darker/ui/shadow-in.png deleted file mode 100644 index 3904476069..0000000000 Binary files a/themes/Darker/ui/shadow-in.png and /dev/null differ diff --git a/themes/Darker/ui/shadow-null.png b/themes/Darker/ui/shadow-null.png deleted file mode 100644 index 7efe5d7748..0000000000 Binary files a/themes/Darker/ui/shadow-null.png and /dev/null differ diff --git a/themes/Darker/ui/shadow-out.png b/themes/Darker/ui/shadow-out.png deleted file mode 100644 index 02c73b1559..0000000000 Binary files a/themes/Darker/ui/shadow-out.png and /dev/null differ diff --git a/themes/Darker/ui/slider-h.png b/themes/Darker/ui/slider-h.png deleted file mode 100644 index b19c6101ee..0000000000 Binary files a/themes/Darker/ui/slider-h.png and /dev/null differ diff --git a/themes/Darker/ui/slider-v.png b/themes/Darker/ui/slider-v.png deleted file mode 100644 index 7a2f9575f4..0000000000 Binary files a/themes/Darker/ui/slider-v.png and /dev/null differ diff --git a/themes/Darker/ui/spin-down-insensitive.png b/themes/Darker/ui/spin-down-insensitive.png deleted file mode 100644 index 9c9747a034..0000000000 Binary files a/themes/Darker/ui/spin-down-insensitive.png and /dev/null differ diff --git a/themes/Darker/ui/spin-down-normal.png b/themes/Darker/ui/spin-down-normal.png deleted file mode 100644 index 5813cbcab9..0000000000 Binary files a/themes/Darker/ui/spin-down-normal.png and /dev/null differ diff --git a/themes/Darker/ui/spin-down-pressed.png b/themes/Darker/ui/spin-down-pressed.png deleted file mode 100644 index df7f1c440f..0000000000 Binary files a/themes/Darker/ui/spin-down-pressed.png and /dev/null differ diff --git a/themes/Darker/ui/spin-insensitive.png b/themes/Darker/ui/spin-insensitive.png deleted file mode 100644 index a6139546c6..0000000000 Binary files a/themes/Darker/ui/spin-insensitive.png and /dev/null differ diff --git a/themes/Darker/ui/spin-up-insensitive.png b/themes/Darker/ui/spin-up-insensitive.png deleted file mode 100644 index 262228f38a..0000000000 Binary files a/themes/Darker/ui/spin-up-insensitive.png and /dev/null differ diff --git a/themes/Darker/ui/spin-up-normal.png b/themes/Darker/ui/spin-up-normal.png deleted file mode 100644 index 7e3c4f5f72..0000000000 Binary files a/themes/Darker/ui/spin-up-normal.png and /dev/null differ diff --git a/themes/Darker/ui/spin-up-pressed.png b/themes/Darker/ui/spin-up-pressed.png deleted file mode 100644 index 603dc9df4a..0000000000 Binary files a/themes/Darker/ui/spin-up-pressed.png and /dev/null differ diff --git a/themes/Darker/ui/spin.png b/themes/Darker/ui/spin.png deleted file mode 100644 index 4f0f11932f..0000000000 Binary files a/themes/Darker/ui/spin.png and /dev/null differ diff --git a/themes/Darker/ui/toolbar.png b/themes/Darker/ui/toolbar.png deleted file mode 100644 index cf6bab9e81..0000000000 Binary files a/themes/Darker/ui/toolbar.png and /dev/null differ diff --git a/themes/Darker/ui/transparent.png b/themes/Darker/ui/transparent.png deleted file mode 100644 index 53d9190a51..0000000000 Binary files a/themes/Darker/ui/transparent.png and /dev/null differ diff --git a/themes/Gray/Makefile.am b/themes/Gray/Makefile.am index 98753f3a8b..d205f63988 100644 --- a/themes/Gray/Makefile.am +++ b/themes/Gray/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in -themedatadir = $(gimpdatadir)/themes/02-Gray -themeuidir = $(gimpdatadir)/themes/02-Gray/ui +themedatadir = $(gimpdatadir)/themes/Gray +themeuidir = $(gimpdatadir)/themes/Gray/ui themedata_DATA = gtkrc diff --git a/themes/Gray/Makefile.in b/themes/Gray/Makefile.in index 76f6793833..258c65665a 100644 --- a/themes/Gray/Makefile.in +++ b/themes/Gray/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -244,7 +245,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -317,6 +318,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -545,6 +547,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -563,8 +566,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -themedatadir = $(gimpdatadir)/themes/02-Gray -themeuidir = $(gimpdatadir)/themes/02-Gray/ui +themedatadir = $(gimpdatadir)/themes/Gray +themeuidir = $(gimpdatadir)/themes/Gray/ui themedata_DATA = gtkrc themeui_DATA = \ ui/arrow-down-insens.png \ diff --git a/themes/Light/Makefile.am b/themes/Light/Makefile.am index 2c4ac9dc79..d999cd0303 100644 --- a/themes/Light/Makefile.am +++ b/themes/Light/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in -themedatadir = $(gimpdatadir)/themes/01-Light -themeuidir = $(gimpdatadir)/themes/01-Light/ui +themedatadir = $(gimpdatadir)/themes/Light +themeuidir = $(gimpdatadir)/themes/Light/ui themedata_DATA = gtkrc diff --git a/themes/Light/Makefile.in b/themes/Light/Makefile.in index 5ffca36eab..dbd48198f7 100644 --- a/themes/Light/Makefile.in +++ b/themes/Light/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -244,7 +245,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -317,6 +318,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -545,6 +547,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -563,8 +566,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -themedatadir = $(gimpdatadir)/themes/01-Light -themeuidir = $(gimpdatadir)/themes/01-Light/ui +themedatadir = $(gimpdatadir)/themes/Light +themeuidir = $(gimpdatadir)/themes/Light/ui themedata_DATA = gtkrc themeui_DATA = \ ui/arrow-down-insens.png \ diff --git a/themes/Lighter/Makefile.am b/themes/Lighter/Makefile.am deleted file mode 100644 index 7a917db8b4..0000000000 --- a/themes/Lighter/Makefile.am +++ /dev/null @@ -1,131 +0,0 @@ -## Process this file with automake to produce Makefile.in - -themedatadir = $(gimpdatadir)/themes/00-Lighter -themeuidir = $(gimpdatadir)/themes/00-Lighter/ui - -themedata_DATA = gtkrc - -themeui_DATA = \ - ui/arrow-down-insens.png \ - ui/arrow-down.png \ - ui/arrow-down-prelight.png \ - ui/arrow-down-small-insens.png \ - ui/arrow-down-small.png \ - ui/arrow-down-small-prelight.png \ - ui/arrow-left-insens.png \ - ui/arrow-left.png \ - ui/arrow-left-prelight.png \ - ui/arrow-right-insens.png \ - ui/arrow-right.png \ - ui/arrow-right-prelight.png \ - ui/arrow-up-insens.png \ - ui/arrow-up.png \ - ui/arrow-up-prelight.png \ - ui/arrow-up-small-insens.png \ - ui/arrow-up-small.png \ - ui/arrow-up-small-prelight.png \ - ui/bar-h.png \ - ui/bar-v.png \ - ui/button-default.png \ - ui/button-insensitive.png \ - ui/button-normal.png \ - ui/button-prelight.png \ - ui/button-pressed.png \ - ui/check1.png \ - ui/check2.png \ - ui/check3.png \ - ui/combo-entry-border-active-bg.png \ - ui/combo-entry-border-active-notebook.png \ - ui/combo-entry-border-active-rtl-notebook.png \ - ui/combo-entry-border-bg.png \ - ui/combo-entry-border-disabled-bg.png \ - ui/combo-entry-border-disabled-notebook.png \ - ui/combo-entry-border-disabled-rtl-bg.png \ - ui/combo-entry-border-disabled-rtl-notebook.png \ - ui/combo-entry-border-notebook.png \ - ui/combo-entry-border-rtl-bg.png \ - ui/combo-entry-border-rtl-notebook.png \ - ui/combo-entry-button-active.png \ - ui/combo-entry-button-active-rtl.png \ - ui/combo-entry-button-disabled.png \ - ui/combo-entry-button-disabled-rtl.png \ - ui/combo-entry-button.png \ - ui/combo-entry-button-rtl.png \ - ui/entry-border-active-bg.png \ - ui/entry-border-active-notebook.png \ - ui/entry-border-disabled-bg.png \ - ui/entry-border-disabled-notebook.png \ - ui/entry-border-fill-active-item.png \ - ui/entry-border-fill-active.png \ - ui/entry-border-fill.png \ - ui/entry-border-notebook-null.png \ - ui/entry-border-notebook.png \ - ui/ext-bottom.png \ - ui/extension-bottom.png \ - ui/extension-left.png \ - ui/extension-right.png \ - ui/extension-top.png \ - ui/ext-left.png \ - ui/ext-right.png \ - ui/ext-top.png \ - ui/frame-gap-end.png \ - ui/frame-gap-start.png \ - ui/frame.png \ - ui/gap_bottom.png \ - ui/gap_left.png \ - ui/gap_right.png \ - ui/gap_top.png \ - ui/gimp-arrow-down-insensitive.png \ - ui/gimp-arrow-down-insenstive.png \ - ui/gimp-arrow-down.png \ - ui/gimp-arrow-left.png \ - ui/gimp-arrow-right-dark.png \ - ui/gimp-arrow-right.png \ - ui/gimp-arrow-right-prelight.png \ - ui/gimp-arrow-up.png \ - ui/gimp-button-default.png \ - ui/gimp-button-insensitive.png \ - ui/gimp-button-normal.png \ - ui/gimp-button-prelight.png \ - ui/gimp-button-pressed.png \ - ui/gimp-handle-h.png \ - ui/gimp-handle-v.png \ - ui/gimp-line-h.png \ - ui/gimp-line-v.png \ - ui/gimp-menu-line-h.png \ - ui/gimp-tooltip-bg.png \ - ui/list_header.png \ - ui/list_header-pressed.png \ - ui/menu-arrow.png \ - ui/menu-arrow-prelight.png \ - ui/menubar.png \ - ui/menuitem.png \ - ui/menu.png \ - ui/minus.png \ - ui/notebook.png \ - ui/null.png \ - ui/option1.png \ - ui/option2.png \ - ui/option3.png \ - ui/plus.png \ - ui/progressbar.png \ - ui/progressbar-trough.png \ - ui/shadow-in-alt.png \ - ui/shadow-in.png \ - ui/shadow-null.png \ - ui/shadow-out.png \ - ui/slider-h.png \ - ui/slider-v.png \ - ui/spin-down-insensitive.png \ - ui/spin-down-normal.png \ - ui/spin-down-pressed.png \ - ui/spin-fill-bg.png \ - ui/spin-insensitive.png \ - ui/spin.png \ - ui/spin-up-insensitive.png \ - ui/spin-up-normal.png \ - ui/spin-up-pressed.png \ - ui/toolbar.png \ - ui/transparent.png - -EXTRA_DIST = $(themedata_DATA) $(themeui_DATA) diff --git a/themes/Lighter/Makefile.in b/themes/Lighter/Makefile.in deleted file mode 100644 index 950af9450e..0000000000 --- a/themes/Lighter/Makefile.in +++ /dev/null @@ -1,933 +0,0 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2017 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = { \ - if test -z '$(MAKELEVEL)'; then \ - false; \ - elif test -n '$(MAKE_HOST)'; then \ - true; \ - elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ - true; \ - else \ - false; \ - fi; \ -} -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = themes/Lighter -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ - $(top_srcdir)/m4macros/intltool.m4 \ - $(top_srcdir)/m4macros/libtool.m4 \ - $(top_srcdir)/m4macros/ltoptions.m4 \ - $(top_srcdir)/m4macros/ltsugar.m4 \ - $(top_srcdir)/m4macros/ltversion.m4 \ - $(top_srcdir)/m4macros/lt~obsolete.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ - $(top_srcdir)/m4macros/ax_compare_version.m4 \ - $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ - $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ - $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ - $(top_srcdir)/m4macros/binreloc.m4 \ - $(top_srcdir)/m4macros/detectcflags.m4 \ - $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(themedatadir)" \ - "$(DESTDIR)$(themeuidir)" -DATA = $(themedata_DATA) $(themeui_DATA) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(srcdir)/Makefile.in -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -AA_LIBS = @AA_LIBS@ -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -ALL_LINGUAS = @ALL_LINGUAS@ -ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_LIBS = @ALSA_LIBS@ -ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPSTREAM_UTIL = @APPSTREAM_UTIL@ -AR = @AR@ -AS = @AS@ -ATK_CFLAGS = @ATK_CFLAGS@ -ATK_LIBS = @ATK_LIBS@ -ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BABL_CFLAGS = @BABL_CFLAGS@ -BABL_LIBS = @BABL_LIBS@ -BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@ -BINRELOC_CFLAGS = @BINRELOC_CFLAGS@ -BINRELOC_LIBS = @BINRELOC_LIBS@ -BUILD_EXEEXT = @BUILD_EXEEXT@ -BUILD_OBJEXT = @BUILD_OBJEXT@ -BZIP2_LIBS = @BZIP2_LIBS@ -CAIRO_CFLAGS = @CAIRO_CFLAGS@ -CAIRO_LIBS = @CAIRO_LIBS@ -CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@ -CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@ -CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@ -CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCAS = @CCAS@ -CCASDEPMODE = @CCASDEPMODE@ -CCASFLAGS = @CCASFLAGS@ -CCDEPMODE = @CCDEPMODE@ -CC_FOR_BUILD = @CC_FOR_BUILD@ -CC_VERSION = @CC_VERSION@ -CFLAGS = @CFLAGS@ -CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ -CPP_FOR_BUILD = @CPP_FOR_BUILD@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DESKTOP_DATADIR = @DESKTOP_DATADIR@ -DLLTOOL = @DLLTOOL@ -DOC_SHOOTER = @DOC_SHOOTER@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -FILE_AA = @FILE_AA@ -FILE_EXR = @FILE_EXR@ -FILE_JP2_LOAD = @FILE_JP2_LOAD@ -FILE_MNG = @FILE_MNG@ -FILE_PDF_SAVE = @FILE_PDF_SAVE@ -FILE_PS = @FILE_PS@ -FILE_WMF = @FILE_WMF@ -FILE_XMC = @FILE_XMC@ -FILE_XPM = @FILE_XPM@ -FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ -FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ -FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ -FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ -FREETYPE_LIBS = @FREETYPE_LIBS@ -GDBUS_CODEGEN = @GDBUS_CODEGEN@ -GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ -GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@ -GEGL = @GEGL@ -GEGL_CFLAGS = @GEGL_CFLAGS@ -GEGL_LIBS = @GEGL_LIBS@ -GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GEXIV2_CFLAGS = @GEXIV2_CFLAGS@ -GEXIV2_LIBS = @GEXIV2_LIBS@ -GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@ -GIMP_API_VERSION = @GIMP_API_VERSION@ -GIMP_APP_VERSION = @GIMP_APP_VERSION@ -GIMP_BINARY_AGE = @GIMP_BINARY_AGE@ -GIMP_COMMAND = @GIMP_COMMAND@ -GIMP_DATA_VERSION = @GIMP_DATA_VERSION@ -GIMP_FULL_NAME = @GIMP_FULL_NAME@ -GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@ -GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ -GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ -GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ -GIMP_MKENUMS = @GIMP_MKENUMS@ -GIMP_MODULES = @GIMP_MODULES@ -GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@ -GIMP_PLUGINS = @GIMP_PLUGINS@ -GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@ -GIMP_REAL_VERSION = @GIMP_REAL_VERSION@ -GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@ -GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@ -GIMP_UNSTABLE = @GIMP_UNSTABLE@ -GIMP_USER_VERSION = @GIMP_USER_VERSION@ -GIMP_VERSION = @GIMP_VERSION@ -GIO_CFLAGS = @GIO_CFLAGS@ -GIO_LIBS = @GIO_LIBS@ -GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ -GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ -GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@ -GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_MKENUMS = @GLIB_MKENUMS@ -GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@ -GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@ -GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GOBJECT_QUERY = @GOBJECT_QUERY@ -GREP = @GREP@ -GS_LIBS = @GS_LIBS@ -GTKDOC_CHECK = @GTKDOC_CHECK@ -GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ -GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ -GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ -GTKDOC_MKPDF = @GTKDOC_MKPDF@ -GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ -GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ -GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ -GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ -GTK_WIN32_RECOMMENDED_VERSION = @GTK_WIN32_RECOMMENDED_VERSION@ -GUDEV_CFLAGS = @GUDEV_CFLAGS@ -GUDEV_LIBS = @GUDEV_LIBS@ -HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ -HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ -HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ -HAVE_FINITE = @HAVE_FINITE@ -HAVE_ISFINITE = @HAVE_ISFINITE@ -HAVE_VFORK = @HAVE_VFORK@ -HTML_DIR = @HTML_DIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ -ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@ -ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ -JPEG_LIBS = @JPEG_LIBS@ -LCMS_CFLAGS = @LCMS_CFLAGS@ -LCMS_LIBS = @LCMS_LIBS@ -LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ -LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@ -LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@ -LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@ -LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@ -LIBOBJS = @LIBOBJS@ -LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ -LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LT_VERSION_INFO = @LT_VERSION_INFO@ -LZMA_CFLAGS = @LZMA_CFLAGS@ -LZMA_LIBS = @LZMA_LIBS@ -MAIL = @MAIL@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@ -MIME_INFO_LIBS = @MIME_INFO_LIBS@ -MIME_TYPES = @MIME_TYPES@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@ -MNG_CFLAGS = @MNG_CFLAGS@ -MNG_LIBS = @MNG_LIBS@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -MSGMERGE = @MSGMERGE@ -MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@ -MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@ -NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@ -NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OPENEXR_CFLAGS = @OPENEXR_CFLAGS@ -OPENEXR_LIBS = @OPENEXR_LIBS@ -OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@ -OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@ -OPENJPEG_LIBS = @OPENJPEG_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@ -PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@ -PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@ -PATHSEP = @PATHSEP@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@ -PERL_VERSION = @PERL_VERSION@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PNG_CFLAGS = @PNG_CFLAGS@ -PNG_LIBS = @PNG_LIBS@ -POFILES = @POFILES@ -POPPLER_CFLAGS = @POPPLER_CFLAGS@ -POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@ -POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@ -POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@ -POPPLER_LIBS = @POPPLER_LIBS@ -POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -PYBIN_PATH = @PYBIN_PATH@ -PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@ -PYCAIRO_LIBS = @PYCAIRO_LIBS@ -PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@ -PYGTK_CFLAGS = @PYGTK_CFLAGS@ -PYGTK_CODEGEN = @PYGTK_CODEGEN@ -PYGTK_DEFSDIR = @PYGTK_DEFSDIR@ -PYGTK_LIBS = @PYGTK_LIBS@ -PYLINK_LIBS = @PYLINK_LIBS@ -PYTHON = @PYTHON@ -PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@ -PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ -PYTHON_INCLUDES = @PYTHON_INCLUDES@ -PYTHON_PLATFORM = @PYTHON_PLATFORM@ -PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_VERSION = @PYTHON_VERSION@ -RANLIB = @RANLIB@ -RECOMMENDED_WIN32_GTK_CFLAGS = @RECOMMENDED_WIN32_GTK_CFLAGS@ -RECOMMENDED_WIN32_GTK_LIBS = @RECOMMENDED_WIN32_GTK_LIBS@ -RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@ -RT_LIBS = @RT_LIBS@ -SCREENSHOT_LIBS = @SCREENSHOT_LIBS@ -SED = @SED@ -SENDMAIL = @SENDMAIL@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SOCKET_LIBS = @SOCKET_LIBS@ -SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@ -SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@ -SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@ -STRIP = @STRIP@ -SVG_CFLAGS = @SVG_CFLAGS@ -SVG_LIBS = @SVG_LIBS@ -SYMPREFIX = @SYMPREFIX@ -TIFF_LIBS = @TIFF_LIBS@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ -WEBKIT_LIBS = @WEBKIT_LIBS@ -WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@ -WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@ -WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@ -WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@ -WEBPMUX_LIBS = @WEBPMUX_LIBS@ -WEBP_CFLAGS = @WEBP_CFLAGS@ -WEBP_LIBS = @WEBP_LIBS@ -WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@ -WEB_PAGE = @WEB_PAGE@ -WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@ -WINDRES = @WINDRES@ -WMF_CFLAGS = @WMF_CFLAGS@ -WMF_CONFIG = @WMF_CONFIG@ -WMF_LIBS = @WMF_LIBS@ -WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ -XDG_EMAIL = @XDG_EMAIL@ -XFIXES_CFLAGS = @XFIXES_CFLAGS@ -XFIXES_LIBS = @XFIXES_LIBS@ -XGETTEXT = @XGETTEXT@ -XGETTEXT_RECOMMENDED_VERSION = @XGETTEXT_RECOMMENDED_VERSION@ -XMC_CFLAGS = @XMC_CFLAGS@ -XMC_LIBS = @XMC_LIBS@ -XMKMF = @XMKMF@ -XMLLINT = @XMLLINT@ -XMU_LIBS = @XMU_LIBS@ -XPM_LIBS = @XPM_LIBS@ -XSLTPROC = @XSLTPROC@ -XVFB_RUN = @XVFB_RUN@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -Z_LIBS = @Z_LIBS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gimpdatadir = @gimpdatadir@ -gimpdir = @gimpdir@ -gimplocaledir = @gimplocaledir@ -gimpplugindir = @gimpplugindir@ -gimpsysconfdir = @gimpsysconfdir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -manpage_gimpdir = @manpage_gimpdir@ -mkdir_p = @mkdir_p@ -ms_librarian = @ms_librarian@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -pkgpyexecdir = @pkgpyexecdir@ -pkgpythondir = @pkgpythondir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -pyexecdir = @pyexecdir@ -pythondir = @pythondir@ -runstatedir = @runstatedir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -themedatadir = $(gimpdatadir)/themes/00-Lighter -themeuidir = $(gimpdatadir)/themes/00-Lighter/ui -themedata_DATA = gtkrc -themeui_DATA = \ - ui/arrow-down-insens.png \ - ui/arrow-down.png \ - ui/arrow-down-prelight.png \ - ui/arrow-down-small-insens.png \ - ui/arrow-down-small.png \ - ui/arrow-down-small-prelight.png \ - ui/arrow-left-insens.png \ - ui/arrow-left.png \ - ui/arrow-left-prelight.png \ - ui/arrow-right-insens.png \ - ui/arrow-right.png \ - ui/arrow-right-prelight.png \ - ui/arrow-up-insens.png \ - ui/arrow-up.png \ - ui/arrow-up-prelight.png \ - ui/arrow-up-small-insens.png \ - ui/arrow-up-small.png \ - ui/arrow-up-small-prelight.png \ - ui/bar-h.png \ - ui/bar-v.png \ - ui/button-default.png \ - ui/button-insensitive.png \ - ui/button-normal.png \ - ui/button-prelight.png \ - ui/button-pressed.png \ - ui/check1.png \ - ui/check2.png \ - ui/check3.png \ - ui/combo-entry-border-active-bg.png \ - ui/combo-entry-border-active-notebook.png \ - ui/combo-entry-border-active-rtl-notebook.png \ - ui/combo-entry-border-bg.png \ - ui/combo-entry-border-disabled-bg.png \ - ui/combo-entry-border-disabled-notebook.png \ - ui/combo-entry-border-disabled-rtl-bg.png \ - ui/combo-entry-border-disabled-rtl-notebook.png \ - ui/combo-entry-border-notebook.png \ - ui/combo-entry-border-rtl-bg.png \ - ui/combo-entry-border-rtl-notebook.png \ - ui/combo-entry-button-active.png \ - ui/combo-entry-button-active-rtl.png \ - ui/combo-entry-button-disabled.png \ - ui/combo-entry-button-disabled-rtl.png \ - ui/combo-entry-button.png \ - ui/combo-entry-button-rtl.png \ - ui/entry-border-active-bg.png \ - ui/entry-border-active-notebook.png \ - ui/entry-border-disabled-bg.png \ - ui/entry-border-disabled-notebook.png \ - ui/entry-border-fill-active-item.png \ - ui/entry-border-fill-active.png \ - ui/entry-border-fill.png \ - ui/entry-border-notebook-null.png \ - ui/entry-border-notebook.png \ - ui/ext-bottom.png \ - ui/extension-bottom.png \ - ui/extension-left.png \ - ui/extension-right.png \ - ui/extension-top.png \ - ui/ext-left.png \ - ui/ext-right.png \ - ui/ext-top.png \ - ui/frame-gap-end.png \ - ui/frame-gap-start.png \ - ui/frame.png \ - ui/gap_bottom.png \ - ui/gap_left.png \ - ui/gap_right.png \ - ui/gap_top.png \ - ui/gimp-arrow-down-insensitive.png \ - ui/gimp-arrow-down-insenstive.png \ - ui/gimp-arrow-down.png \ - ui/gimp-arrow-left.png \ - ui/gimp-arrow-right-dark.png \ - ui/gimp-arrow-right.png \ - ui/gimp-arrow-right-prelight.png \ - ui/gimp-arrow-up.png \ - ui/gimp-button-default.png \ - ui/gimp-button-insensitive.png \ - ui/gimp-button-normal.png \ - ui/gimp-button-prelight.png \ - ui/gimp-button-pressed.png \ - ui/gimp-handle-h.png \ - ui/gimp-handle-v.png \ - ui/gimp-line-h.png \ - ui/gimp-line-v.png \ - ui/gimp-menu-line-h.png \ - ui/gimp-tooltip-bg.png \ - ui/list_header.png \ - ui/list_header-pressed.png \ - ui/menu-arrow.png \ - ui/menu-arrow-prelight.png \ - ui/menubar.png \ - ui/menuitem.png \ - ui/menu.png \ - ui/minus.png \ - ui/notebook.png \ - ui/null.png \ - ui/option1.png \ - ui/option2.png \ - ui/option3.png \ - ui/plus.png \ - ui/progressbar.png \ - ui/progressbar-trough.png \ - ui/shadow-in-alt.png \ - ui/shadow-in.png \ - ui/shadow-null.png \ - ui/shadow-out.png \ - ui/slider-h.png \ - ui/slider-v.png \ - ui/spin-down-insensitive.png \ - ui/spin-down-normal.png \ - ui/spin-down-pressed.png \ - ui/spin-fill-bg.png \ - ui/spin-insensitive.png \ - ui/spin.png \ - ui/spin-up-insensitive.png \ - ui/spin-up-normal.png \ - ui/spin-up-pressed.png \ - ui/toolbar.png \ - ui/transparent.png - -EXTRA_DIST = $(themedata_DATA) $(themeui_DATA) -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu themes/Lighter/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu themes/Lighter/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-themedataDATA: $(themedata_DATA) - @$(NORMAL_INSTALL) - @list='$(themedata_DATA)'; test -n "$(themedatadir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(themedatadir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(themedatadir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themedatadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(themedatadir)" || exit $$?; \ - done - -uninstall-themedataDATA: - @$(NORMAL_UNINSTALL) - @list='$(themedata_DATA)'; test -n "$(themedatadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(themedatadir)'; $(am__uninstall_files_from_dir) -install-themeuiDATA: $(themeui_DATA) - @$(NORMAL_INSTALL) - @list='$(themeui_DATA)'; test -n "$(themeuidir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(themeuidir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(themeuidir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themeuidir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(themeuidir)" || exit $$?; \ - done - -uninstall-themeuiDATA: - @$(NORMAL_UNINSTALL) - @list='$(themeui_DATA)'; test -n "$(themeuidir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(themeuidir)'; $(am__uninstall_files_from_dir) -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(themedatadir)" "$(DESTDIR)$(themeuidir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-themedataDATA install-themeuiDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-themedataDATA uninstall-themeuiDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - cscopelist-am ctags-am distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip install-themedataDATA install-themeuiDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ - uninstall-am uninstall-themedataDATA uninstall-themeuiDATA - -.PRECIOUS: Makefile - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/themes/Lighter/gtkrc b/themes/Lighter/gtkrc deleted file mode 100644 index 11454d3df7..0000000000 --- a/themes/Lighter/gtkrc +++ /dev/null @@ -1,2529 +0,0 @@ -############################################################################ -# -# Lighter GIMP Theme -# -# Version 0.1.6 -# -# Copyright 2015-2016, Benoit Touchette -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -############################################################################ -# -# Special thanks to all the theme creators, specifically: -# -# horst3180 for his excellent Ceti-2 theme. -# Nuclear Napalm, android272, Medhi Abhollahi for their GIMP themes. -# -# Y'all inspired me to create these themes for GIMP. -# -############################################################################ -# -# arrows-(down, left, right, up)*.png from Ceti-2 theme, horst3180 -# frame-gap-*.png from Ceti-2 theme, horst3180 -# gap information from new CS6 II theme, Medhi Abhollahi -# -############################################################################ -# -# KDE: -# -# * For this theme to work under KDE users will need to disable either -# "Apply colors to non-QT applications" or "Apply KDE Colours to Non-KDE -# apps" depending on the version. -# -# Miscellaneous: -# -# * Fonts can be overridden by uncommenting the two font lines below -# -# * Uncomment the gtk-primary-button-warps-slider line to enable warping -# scroll bars. -# -############################################################################ - -gtk-menu-images = 1 -gtk-button-images = 0 -gtk-auto-mnemonics = 1 -#gtk-primary-button-warps-slider = 1 -gtk-toolbar-style = GTK_TOOLBAR_ICONS -gtk-application-prefer-dark-theme = true - -#gtk-font-name = "Sans 11" - -# KDE hack to match gtk/gnome defaults -gtk-button-images = 0 - -style "gimp-light-default-style" -{ -# font_name = "Sans 11" - - color["clr1"] = "#343434" - color["clr2"] = "#222222" - color["clr3"] = "#3E3E3E" - color["clr4"] = "#EEEEEE" - color["clr5"] = "#DDDDDD" - color["clr6"] = "#BDBDBD" - color["clr7"] = "#3b3b3b" - color["clr8"] = "#DDDDDD" - color["clr9"] = "#B2B2B2" - color["clr10"] = "#000000" - - fg[NORMAL] = @clr3 - fg[PRELIGHT] = @clr10 - fg[ACTIVE] = @clr2 - fg[SELECTED] = @clr1 - fg[INSENSITIVE] = @clr3 - - bg[NORMAL] = @clr4 - bg[PRELIGHT] = @clr4 - bg[ACTIVE] = @clr4 - bg[SELECTED] = @clr5 - bg[INSENSITIVE] = @clr5 - - base[NORMAL] = @clr6 - base[PRELIGHT] = @clr7 - base[ACTIVE] = @clr4 - base[SELECTED] = @clr4 - base[INSENSITIVE] = @clr8 - - text[NORMAL] = @clr1 - text[PRELIGHT] = @clr10 - text[ACTIVE] = @clr1 - text[SELECTED] = @clr1 - text[INSENSITIVE] = @clr9 - - GtkOptionMenu::indicator-size = { 5, 11 } - GtkOptionMenu::indicator-spacing = { 4, 3, 1, 1 } - - GtkScrollbar::has_secondary_backward_stepper = 0 - GtkScrollbar::has_secondary_forward_stepper = 0 - - GtkPaned::handle-size = 2 - GimpDockWindow::default-height = 240 - GimpDock::font-scale = 0.8333 - GimpMenuDock::minimal-width = 200 - GimpDockWindow::menu-preview-size = small-toolbar - GimpToolPalette::tool-icon-size = large-toolbar - GimpToolPalette::button-relief = none - GimpDockbook::tab-border = 0 - GimpDockbook::tab-icon-size = menu - GimpColorNotebook::tab-border = 0 - GimpColorNotebook::tab-icon-size = menu - GimpDeviceEditor::handle-size = 12 - GimpDockable::content-border = 1 - GimpEditor::content-spacing = 1 - GimpEditor::button-spacing = 1 - GimpEditor::button-icon-size = menu - GimpDataEditor::minimal-height = 64 - GimpFrame::label-spacing = 2 - GtkDialog::content-area-border = 0 - GtkDialog::button-spacing = 6 - GtkDialog::action-area-border = 12 - GimpUnitComboBox::appears-as-list = 0 - GtkComboBoxEntry::appears-as-list = 0 - GtkComboBoxText::appears-as-list = 0 - GtkComboBox::appears-as-list = 0 - - # - # To adjust to default button spacing: - # - # Set focus-padding to 2 - # Set focus-line to 1 - # - - GtkButton::focus-line_width = 0 - GtkButton::focus-padding = 0 - - GtkRange::trough-border = 0 - GtkRange::slider-width = 15 - GtkRange::stepper-size = 0 - - GtkScale::slider-length = 14 - GtkScale::slider-width = 14 - GtkScale::trough-border = 0 - GtkScale::trough-side-details = 1 - - GtkVScale::slider_length = 14 - GtkVScale::slider_width = 14 - - GtkHScale::slider_length = 14 - GtkHScale::slider_width = 14 - - GtkScrollbar::trough-border = 0 - GtkScrollbar::activate-slider = 1 - GtkScrollbar::has-backward-stepper = 0 - GtkScrollbar::has-forward-stepper = 0 - GtkScrollbar::min-slider-length = 32 - GtkScrolledWindow::scrollbar-spacing = 0 - GtkScrolledWindow::scrollbars-within-bevel = 0 - - GtkTreeView::expander-size = 13 - GtkExpander::expander-size = 13 - - GtkStatusbar::shadow_type = GTK_SHADOW_NONE - GtkSpinButton::shadow_type = GTK_SHADOW_NONE - GtkMenuBar::shadow-type = GTK_SHADOW_NONE - GtkToolbar::shadow-type = GTK_SHADOW_NONE - GtkList::shadow_type = GTK_SHADOW_NONE - GtkCList::shadow_type = GTK_SHADOW_NONE - GtkComboBox::shadow_type = GTK_SHADOW_NONE - GtkComboBoxEntry::shadow_type = GTK_SHADOW_NONE - GtkScrolledWindow::shadow-type = GTK_SHADOW_NONE - GtkVScale::shadow_type = GTK_SHADOW_NONE - GtkHScale::shadow_type = GTK_SHADOW_NONE - GtkMenuItem::horizontal-padding = 4 - - GtkWidget::tooltip-radius = 2 - GtkWidget::tooltip-alpha = 235 - GtkWidget::new-tooltip-style = 1 - - GtkWindow::resize-grip-height = 0 - GtkWindow::resize-grip-width = 0 - - engine "pixmap" - { - image - { - function = EXPANDER - expander_style = COLLAPSED - file = "ui/plus.png" - } - - image - { - function = EXPANDER - expander_style = EXPANDED - file = "ui/minus.png" - } - - image - { - function = EXPANDER - expander_style = SEMI_EXPANDED - file = "ui/minus.png" - } - - image - { - function = EXPANDER - expander_style = SEMI_COLLAPSED - file = "ui/plus.png" - } - - image - { - function = SHADOW_GAP - file = "ui/shadow-null.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - - image - { - function = RESIZE_GRIP - state = NORMAL - detail = "statusbar" - overlay_file = "ui/null.png" - overlay_border = { 0,0,0,0 } - overlay_stretch = FALSE - } - - image - { - function = HLINE - recolorable = TRUE - file = "ui/gimp-line-h.png" - border = { 0, 0, 1, 1 } - stretch = TRUE - } - - image - { - function = VLINE - recolorable = TRUE - file = "ui/gimp-line-v.png" - border = { 1, 0, 1, 1 } - stretch = TRUE - } - - image - { - function = ARROW - recolorable = TRUE - overlay_file = "ui/gimp-arrow-up.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = UP - } - - image - { - function = ARROW - recolorable = TRUE - overlay_file = "ui/gimp-arrow-down.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = DOWN - } - - image - { - function = ARROW - recolorable = TRUE - overlay_file = "ui/gimp-arrow-left.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = LEFT - } - - image - { - function = ARROW - recolorable = TRUE - overlay_file = "ui/gimp-arrow-right.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = RIGHT - } - - image - { - function = HANDLE - overlay_file = "ui/gimp-handle-h.png" - overlay_stretch = FALSE - orientation = HORIZONTAL - } - - image - { - function = HANDLE - overlay_file = "ui/gimp-handle-v.png" - overlay_stretch = FALSE - orientation = VERTICAL - } - } -} - -class "GtkWidget" style "gimp-light-default-style" - -########################################################### - -style "gimp-light-tool-dialog-style" = "gimp-light-default-style" -{ - GtkDialog::action-area-border = 6 -} - -class "GimpToolDialog" style "gimp-light-tool-dialog-style" - -########################################################### - -style "gimp-light-grid-view-style" = "gimp-light-default-style" -{ - bg[NORMAL] = { 1.0, 1.0, 1.0 } -} - -widget "*GimpContainerGridView*GtkViewport*" style "gimp-light-grid-view-style" - -########################################################### - -style "gimp-light-dockable-style" = "gimp-light-default-style" -{ - GimpFrame::label-bold = 0 - GtkButton::focus-line_width = 1 - GtkButton::focus-padding = 0 -} - -widget "*GimpDockable.*" style "gimp-light-dockable-style" - -########################################################### - -style "gimp-light-display-style" = "gimp-light-default-style" -{ - GimpRuler::font-scale = 0.6444 - GimpUnitComboBox::label-scale = 0.8333 - GimpScaleComboBox::label-scale = 0.8333 - GtkComboBox::arrow-size = 8 - GtkButton::inner-border = { 0, 0, 0, 0 } - GtkButton::focus-line-width = 0 - GtkButton::focus-padding = 0 -} - -widget "*GimpDisplayShell.*" style "gimp-light-display-style" - -########################################################### - -style "gimp-light-overlay-style" = "gimp-display-style" -{ - GtkButton::focus-line_width = 1 -} - -widget_class "**" style "gimp-light-overlay-style" - -########################################################### - -style "gimp-light-gtkbutton-style" = "gimp-light-default-style" -{ - xthickness = 3 - ythickness = 3 - - engine "pixmap" - { - image - { - function = BOX - detail = "buttondefault" - recolorable = TRUE - file = "ui/gimp-button-default.png" - border = { 8, 8, 8, 8 } - stretch = TRUE - } - - image - { - function = BOX - state = PRELIGHT - recolorable = TRUE - file = "ui/gimp-button-prelight.png" - border = { 8, 8, 8, 8} - stretch = TRUE - } - - image - { - function = BOX - state = ACTIVE - file = "ui/gimp-button-pressed.png" - border = { 8, 8, 8, 8 } - stretch = TRUE - } - - image - { - function = BOX - state = INSENSITIVE - file = "ui/gimp-button-insensitive.png" - border = { 8, 8, 8, 8 } - stretch = TRUE - } - - image - { - function = BOX - file = "ui/gimp-button-normal.png" - border = { 8, 8, 8, 8 } - stretch = TRUE - } - } -} - -class "GtkButton" style "gimp-light-gtkbutton-style" - -########################################################### - -style "gimp-light-tooltips-style" = "gimp-light-default-style" -{ - xthickness = 4 - ythickness = 4 - - bg[NORMAL] = "#B7B7B7" - bg[SELECTED] = "#666666" - fg[NORMAL] = "#343434" -} - -widget "gtk-tooltip*" style "gimp-light-tooltips-style" - -########################################################### - -style "gimp-light-treeview" = "gimp-light-default-style" -{ - xthickness = 2 - ythickness = 0 - - GtkTreeView::odd_row_color = "#BDBDBD" - GtkTreeView::even_row_color = "#BDBDBD" - - # - # set custom text color here - # - - #text[NORMAL] = "#0F0" - #text[PRELIGHT] = "#0F0" - #text[SELECTED] = "#0F0" - #text[INSENSITIVE] = "#0F0" - #text[ACTIVE] = "#0F0" - - engine "pixmap" - { - image - { - function = FLAT_BOX - state = ACTIVE - file = "ui/null.png" - border = {1,1,1,1} - stretch = TRUE - } - - image - { - function = FLAT_BOX - state = PRELIGHT - file = "ui/null.png" - border = {1,1,1,1} - stretch = TRUE - } - - image - { - function = FLAT_BOX - state = NORMAL - file = "ui/null.png" - border = {1,1,1,1} - stretch = TRUE - } - - image - { - function = FLAT_BOX - state = INSENSITIVE - file = "ui/null.png" - border = {1,1,1,1} - stretch = TRUE - } - - image - { - function = FLAT_BOX - state = SELECTED - file = "ui/menuitem.png" - border = {1,1,1,1} - stretch = TRUE - } - } -} - -class "GtkTreeView" style "gimp-light-treeview" - -########################################################### - -style "gimp-light-list-header-style" -{ - #Comment out the ythickness setting below for thicker column headers. - #ythickness = 0 - - GtkTreeView::odd_row_color = "#BDBDBD" - GtkTreeView::even_row_color = "#BDBDBD" - - # - # set custom header text color here - # - - #fg[NORMAL] = "#00F" - #fg[PRELIGHT] = "#00F" - #fg[SELECTED] = "#00F" - #fg[INSENSITIVE] = "#00F" - #fg[ACTIVE] = "#00F" - - # - # set custom text color here - # - - #text[NORMAL] = "#FF0" - #text[PRELIGHT] = "#FF0" - #text[SELECTED] = "#FF0" - #text[INSENSITIVE] = "#FF0" - #text[ACTIVE] = "#FF0" - - engine "pixmap" - { - # This image is used to draw the headers of columns - # in list views when they are not selected. - image - { - function = BOX - recolorable = TRUE - state = NORMAL - file = "ui/list_header.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - - # This image is used to draw the column headers in - # list views when they are clicked. - image - { - function = BOX - recolorable = TRUE - state = PRELIGHT - file = "ui/list_header.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = ACTIVE - file = "ui/list_header-pressed.png" - border = { 2, 2, 2, 2} - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = SELECTED - file = "ui/list_header.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - } -} - -widget_class "*List" style "gimp-light-list-header-style" -widget_class "*GtkTree*" style "gimp-light-list-header-style" -widget_class "*GtkCList" style "gimp-light-list-header-style" - -########################################################### - -style "gimp-light-notebook-style" = "gimp-light-default-style" -{ - engine "pixmap" - { - image - { - function = EXTENSION - recolorable = TRUE - state = ACTIVE - file = "ui/ext-top.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - gap_side = BOTTOM - } - - image - { - function = EXTENSION - recolorable = TRUE - state = ACTIVE - file = "ui/ext-bottom.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - gap_side = TOP - } - - image - { - function = EXTENSION - recolorable = TRUE - state = ACTIVE - file = "ui/ext-right.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - gap_side = LEFT - } - - image - { - function = EXTENSION - recolorable = TRUE - state = ACTIVE - file = "ui/ext-left.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - gap_side = RIGHT - } - - image - { - function = EXTENSION - recolorable = TRUE - file = "ui/extension-top.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - gap_side = BOTTOM - } - - image - { - function = EXTENSION - recolorable = TRUE - file = "ui/extension-bottom.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - gap_side = TOP - } - - image - { - function = EXTENSION - recolorable = TRUE - file = "ui/extension-left.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - gap_side = RIGHT - } - - image - { - function = EXTENSION - recolorable = TRUE - file = "ui/extension-right.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - gap_side = LEFT - } - - image - { - function = BOX_GAP - recolorable = TRUE - file = "ui/notebook.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - gap_file = "ui/gap_top.png" - gap_border = { 1, 1, 1, 1 } - gap_start_file = "ui/null.png" - gap_end_file = "ui/null.png" - gap_side = TOP - } - - image - { - function = BOX_GAP - recolorable = TRUE - file = "ui/notebook.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - gap_file = "ui/gap_bottom.png" - gap_border = { 2, 1, 1, 1 } - gap_start_file = "ui/null.png" - gap_end_file = "ui/null.png" - gap_side = BOTTOM - } - - image - { - function = BOX_GAP - recolorable = TRUE - file = "ui/notebook.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - gap_file = "ui/gap_left.png" - gap_border = { 1, 1, 2, 2 } - gap_start_file = "ui/null.png" - gap_end_file = "ui/null.png" - gap_side = LEFT - } - - image - { - function = BOX_GAP - recolorable = TRUE - file = "ui/notebook.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - gap_file = "ui/gap_right.png" - gap_border = { 1, 1, 2, 1 } - gap_start_file = "ui/null.png" - gap_end_file = "ui/null.png" - gap_side = RIGHT - } - - image - { - function = BOX - recolorable = TRUE - file = "ui/notebook.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - gap_side = TOP - } - } -} - -class "GtkNotebook" style "gimp-light-notebook-style" - -########################################################### - -style "gimp-light-menu" = "gimp-light-default-style" -{ - # bg[NORMAL] affects menu detachable item - bg[NORMAL] = "#DDDDDD" - - fg[NORMAL] = "#343434" - fg[PRELIGHT] = "#000000" - fg[INSENSITIVE] = "#3E3E3E" - - engine "pixmap" - { - image - { - function = BOX - recolorable = TRUE - detail = "menu" - file = "ui/menu.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - } - - image - { - function = HLINE - file = "ui/gimp-line-h.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - } - } -} - -class "GtkMenu" style "gimp-light-menu" -widget_class "**" style "gimp-light-menu" - -########################################################### - -style "gimp-light-menu-bar" = "gimp-light-default-style" -{ - xthickness = 4 - ythickness = 2 - - fg[NORMAL] = "#343434" - - engine "pixmap" - { - image - { - function = BOX - file = "ui/menubar.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - } -} - -class "GtkMenuBar" style "gimp-light-menu-bar" -widget_class "**" style "gimp-light-menu-bar" -widget_class "*.*" style "gimp-light-menu-bar" - -########################################################### - -style "gimp-light-menu-item" -{ - xthickness = 2 - ythickness = 4 - - bg[NORMAL] = "#CCCCCC" - - fg[NORMAL] = "#343434" - fg[PRELIGHT] = "#FFFFFF" - fg[ACTIVE] = "#343434" - fg[SELECTED] = "#000000" - fg[INSENSITIVE] = "#3E3E3E" - - engine "pixmap" - { - image - { - function = BOX - state = PRELIGHT - file = "ui/entry-border-fill-active.png" - border = { 1, 0, 1, 0 } - stretch = TRUE - } - - image - { - function = OPTION - shadow = OUT - recolorable = TRUE - overlay_file = "ui/option1.png" - overlay_stretch = FALSE - } - - image - { - function = OPTION - shadow = IN - recolorable = TRUE - overlay_file = "ui/option2.png" - overlay_stretch = FALSE - } - - image - { - function = OPTION - shadow = ETCHED_IN - recolorable = TRUE - overlay_file = "ui/option3.png" - overlay_stretch = FALSE - } - - image - { - function = CHECK - shadow = OUT - recolorable = TRUE - overlay_file = "ui/check1.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - - image - { - function = CHECK - shadow = IN - recolorable = TRUE - overlay_file = "ui/check2.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - - image - { - function = CHECK - shadow = ETCHED_IN - recolorable = TRUE - overlay_file = "ui/check3.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - } -} - -class "GtkMenuItem" style "gimp-light-menu-item" -widget_class "**" style "gimp-light-menu-item" - -########################################################### - -style "gimp-light-item" -{ - xthickness = 4 - - bg[NORMAL] = "#CCCCCC" - - fg[NORMAL] = "#343434" - fg[PRELIGHT] = "#FFFFFF" - fg[ACTIVE] = "#343434" - fg[SELECTED] = "#000000" - fg[INSENSITIVE] = "#3E3E3E" - - engine "pixmap" - { - image - { - function = BOX - recolorable = TRUE - file = "ui/button-normal.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - - image - { - function = ARROW - recolorable = TRUE - state = PRELIGHT - overlay_file = "ui/gimp-arrow-right.png" - overlay_stretch = FALSE - arrow_direction = RIGHT - } - - image - { - function = ARROW - state = NORMAL - recolorable = TRUE - overlay_file = "ui/gimp-arrow-right-dark.png" - overlay_stretch = FALSE - arrow_direction = RIGHT - } - } -} - -class "GtkItem" style "gimp-light-item" - -########################################################### - - -style "gimp-light-entry" = "gimp-light-default-style" -{ - GtkWidget::interior_focus = 1 - - #text[ACTIVE] = "#CBCBCB" - #text[SELECTED] = "#343434" - #base[SELECTED] = "#EEE" - - engine "pixmap" - { - image - { - function = FLAT_BOX - detail = "entry_bg" - state = NORMAL - overlay_file = "ui/entry-border-fill.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE - } - - image - { - function = FLAT_BOX - detail = "entry_bg" - state = ACTIVE - overlay_file = "ui/entry-border-fill-active.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE - } - - image - { - function = SHADOW - detail = "entry" - file = "ui/shadow-null.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - - image - { - function = FOCUS - state = NORMAL - recolorable = TRUE - file = "ui/shadow-in-alt.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - } - } -} - -class "GtkEntry" style "gimp-light-entry" -class "GtkOldEditable" style "gimp-light-entry" - -########################################################### - - -style "gimp-light-spin-button" = "gimp-light-entry" -{ - engine "pixmap" - { - image - { - function = ARROW - } - - image - { - function = BOX - state = NORMAL - detail = "spinbutton_up" - recolorable = TRUE - file = "ui/spin.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - overlay_file = "ui/spin-up-normal.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = PRELIGHT - detail = "spinbutton_up" - recolorable = TRUE - file = "ui/spin.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - overlay_file = "ui/spin-up-normal.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = ACTIVE - detail = "spinbutton_up" - recolorable = TRUE - file = "ui/spin.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - overlay_file = "ui/spin-up-pressed.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = INSENSITIVE - detail = "spinbutton_up" - recolorable = TRUE - file = "ui/spin-insensitive.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - overlay_file = "ui/spin-up-insensitive.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = NORMAL - detail = "spinbutton_down" - recolorable = TRUE - file = "ui/spin.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - overlay_file = "ui/spin-down-normal.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = PRELIGHT - detail = "spinbutton_down" - recolorable = TRUE - file = "ui/spin.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - overlay_file = "ui/spin-down-normal.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = ACTIVE - detail = "spinbutton_down" - recolorable = TRUE - file = "ui/spin.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - overlay_file = "ui/spin-down-pressed.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = INSENSITIVE - detail = "spinbutton_down" - recolorable = TRUE - file = "ui/spin-insensitive.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - overlay_file = "ui/spin-down-insensitive.png" - overlay_stretch = FALSE - } - } -} - -class "GtkSpinButton" style "gimp-light-spin-button" - -########################################################### - -style "gimp-light-scroll-bar" -{ - GtkRange::trough_border = 0 - GtkVScale::slider_length = 16 - GtkVScale::slider_width = 19 - GtkHScale::slider_length = 17 - GtkHScale::slider_width = 19 - GtkRange::slider_width = 15 - GtkRange::stepper_size = 15 - GtkScrollbar::min_slider_length = 30 - - engine "pixmap" - { - image - { - function = BOX - recolorable = TRUE - detail = "trough" - file = "ui/slider-v.png" - border = { 0,0,39,39} - stretch = TRUE - orientation = VERTICAL - } - - image - { - function = BOX - recolorable = TRUE - detail = "trough" - file = "ui/slider-h.png" - border = { 39,39,0,0 } - stretch = TRUE - orientation = HORIZONTAL - } - - image - { - function = SLIDER - recolorable = TRUE - file = "ui/bar-h.png" - border = { 2,2,2,2 } - stretch = TRUE - orientation = HORIZONTAL - } - - image - { - function = SLIDER - recolorable = TRUE - file = "ui/bar-v.png" - border = { 2,2,2,2 } - stretch = TRUE - orientation = VERTICAL - } - - image - { - function = BOX - recolorable = TRUE - file = "ui/null.png" - border = {0,0,0,0} - stretch = TRUE - } - - image - { - function = ARROW - recolorable = TRUE - state = NORMAL - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = UP - } - - image - { - function = ARROW - recolorable = TRUE - state = NORMAL - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = DOWN - } - - image - { - function = ARROW - recolorable = TRUE - state = NORMAL - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = LEFT - } - - image - { - function = ARROW - recolorable = TRUE - state = NORMAL - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = RIGHT - } - - image - { - function = ARROW - recolorable = TRUE - state = PRELIGHT - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = UP - } - - image - { - function = ARROW - recolorable = TRUE - state = PRELIGHT - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = DOWN - } - - image - { - function = ARROW - recolorable = TRUE - state = PRELIGHT - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = LEFT - } - - image - { - function = ARROW - recolorable = TRUE - state = PRELIGHT - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = RIGHT - } - - image - { - function = ARROW - recolorable = TRUE - state = INSENSITIVE - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = UP - } - - image - { - function = ARROW - recolorable = TRUE - state = INSENSITIVE - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = DOWN - } - - image - { - function = ARROW - recolorable = TRUE - state = INSENSITIVE - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = LEFT - } - - image - { - function = ARROW - recolorable = TRUE - state = INSENSITIVE - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = RIGHT - } - - image - { - function = ARROW - recolorable = TRUE - shadow = IN - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = UP - } - - image - { - function = ARROW - recolorable = TRUE - shadow = IN - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = DOWN - } - - image - { - function = ARROW - recolorable = TRUE - shadow = IN - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = LEFT - } - - image - { - function = ARROW - recolorable = TRUE - shadow = IN - overlay_file = "ui/null.png" - overlay_border = {0,0,0,0} - overlay_stretch = FALSE - arrow_direction = RIGHT - } - } -} - -class "GtkScrollbar" style "gimp-light-scroll-bar" - -########################################################### - -style "gimp-light-radio-button" = "gimp-light-default-style" -{ - engine "pixmap" - { - image - { - function = OPTION - shadow = OUT - recolorable = TRUE - overlay_file = "ui/option1.png" - overlay_stretch = FALSE - } - - image - { - function = OPTION - shadow = IN - recolorable = TRUE - overlay_file = "ui/option2.png" - overlay_stretch = FALSE - } - - image - { - function = OPTION - shadow = ETCHED_IN - recolorable = TRUE - overlay_file = "ui/option3.png" - overlay_stretch = FALSE - } - } -} - -class "GtkRadioButton" style "gimp-light-radio-button" -class "GtkRadioMenuItem" style "gimp-light-radio-button" - -########################################################### - -style "gimp-light-check-button" = "gimp-light-default-style" -{ - engine "pixmap" - { - image - { - function = CHECK - shadow = OUT - recolorable = TRUE - overlay_file = "ui/check1.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - - image - { - function = CHECK - shadow = IN - recolorable = TRUE - overlay_file = "ui/check2.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - - image - { - function = CHECK - shadow = ETCHED_IN - recolorable = TRUE - overlay_file = "ui/check3.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - } -} - -class "GtkCheckButton" style "gimp-light-check-button" -class "GtkCheckMenuItem" style "gimp-light-check-button" - -########################################################### - -style "gimp-light-progress-bar" = "gimp-light-default-style" -{ - xthickness = 1 - ythickness = 1 - - engine "pixmap" - { - image - { - function = BOX - recolorable = TRUE - detail = "bar" - file = "ui/progressbar.png" - border = { 2, 2, 3, 3} - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - detail = "trough" - file = "ui/progressbar-trough.png" - border = { 3, 3, 4, 4} - stretch = TRUE - orientation = HORIZONTAL - } - } -} - -class "GtkProgressBar" style "gimp-light-progress-bar" - -########################################################### - -style "gimp-light-separator-menu-item" -{ - engine "pixmap" - { - image - { - function = BOX - file = "ui/gimp-menu-line-h.png" - border = { 0, 0, 1, 0 } - stretch = TRUE - } - } -} - -class "GtkSeparatorMenuItem" style "gimp-light-separator-menu-item" - -########################################################### - -style "gimp-light-notebook-entry-style" -{ - #text[SELECTED] = "#343434" - #base[SELECTED] = "#EEE" - - engine "pixmap" - { - image - { - function = SHADOW - detail = "entry" - state = NORMAL - shadow = IN - file = "ui/entry-border-notebook-null.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - - image - { - function = SHADOW - detail = "entry" - state = INSENSITIVE - shadow = IN - file = "ui/entry-border-disabled-notebook.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - - image - { - function = SHADOW - detail = "entry" - state = ACTIVE - file = "ui/entry-border-active-notebook.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - } -} - -widget_class "**" style "gimp-light-notebook-entry-style" - -########################################################### - -style "gimp-light-notebook-combobox-entry-style" -{ - engine "pixmap" - { - # LTR version - image - { - function = SHADOW - detail = "entry" - state = NORMAL - shadow = IN - file = "ui/combo-entry-border-notebook.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - - image - { - function = SHADOW - detail = "entry" - state = INSENSITIVE - shadow = IN - file = "ui/combo-entry-border-disabled-notebook.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - - image - { - function = SHADOW - detail = "entry" - state = ACTIVE - file = "ui/combo-entry-border-active-notebook.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - - # RTL version - image - { - function = SHADOW - detail = "entry" - state = NORMAL - shadow = IN - file = "ui/combo-entry-border-rtl-notebook.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - - image - { - function = SHADOW - detail = "entry" - state = INSENSITIVE - shadow = IN - file = "ui/combo-entry-border-disabled-rtl-notebook.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - - image - { - function = SHADOW - detail = "entry" - state = ACTIVE - file = "ui/combo-entry-border-active-rtl-notebook.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - } -} - -widget_class "***" style "gimp-light-notebook-combobox-entry-style" - -########################################################### - -style "gimp-light-combobox-entry-button-style" -{ - xthickness = 6 - - #text[SELECTED] = "#343434" - #base[SELECTED] = "#EEE" - fg[ACTIVE] = "#343434" - - engine "pixmap" - { - # LTR version - image - { - function = BOX - state = NORMAL - file = "ui/combo-entry-button.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - - image - { - function = BOX - state = PRELIGHT - file = "ui/combo-entry-button.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - - image - { - function = BOX - state = INSENSITIVE - file = "ui/combo-entry-button-disabled.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - - image - { - function = BOX - state = ACTIVE - file = "ui/combo-entry-button-active.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - - # RTL version - image - { - function = BOX - state = NORMAL - file = "ui/combo-entry-button-rtl.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - - image - { - function = BOX - state = PRELIGHT - file = "ui/combo-entry-button-rtl.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - - image - { - function = BOX - state = INSENSITIVE - file = "ui/combo-entry-button-disabled-rtl.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - - image - { - function = BOX - state = ACTIVE - file = "ui/combo-entry-button-active-rtl.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - } -} - -widget_class "**" style "gimp-light-combobox-entry-button-style" -widget_class "****" style "gimp-light-combobox-entry-button-style" -widget_class "**" style "gimp-light-combobox-entry-button-style" - -########################################################### - -style "gimp-light-range-style" -{ - engine "pixmap" - { - image - { - function = BOX - detail = "trough" - file = "ui/null.png" - border = { 4, 4, 0, 0 } - stretch = TRUE - orientation = HORIZONTAL - } - - image - { - function = BOX - detail = "trough" - border = { 0, 0, 4, 4 } - file = "ui/null.png" - stretch = TRUE - orientation = VERTICAL - } - - # Horizontal - image - { - function = SLIDER - state = NORMAL - file = "ui/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - orientation = HORIZONTAL - } - - image - { - function = SLIDER - state = PRELIGHT - file = "ui/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - orientation = HORIZONTAL - } - - image - { - function = SLIDER - state = INSENSITIVE - file = "ui/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Vertical - image - { - function = SLIDER - state = NORMAL - file = "ui/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - orientation = VERTICAL - } - - image - { - function = SLIDER - state = PRELIGHT - file = "ui/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - orientation = VERTICAL - } - - image - { - function = SLIDER - state = INSENSITIVE - file = "ui/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - orientation = VERTICAL - } - - # Function below removes the fuglies :) - image - { - function = BOX - file = "ui/transparent.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - } - } -} - -class "GtkRange" style "gimp-light-range-style" - -########################################################### - -style "gimp-light-spin-scale-style" -{ - bg[NORMAL] = "#BDBDBD" - bg[SELECTED] = "#CCC" - - engine "pixmap" - { - image - { - function = FLAT_BOX - detail = "entry_bg" - state = NORMAL - file = "ui/spin-fill-bg.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - } - - image - { - function = FLAT_BOX - detail = "entry_bg" - state = ACTIVE - file = "ui/spin-fill-bg.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - } - - image - { - function = BOX - state = NORMAL - detail = "spinbutton_up" - overlay_file = "ui/arrow-up-small.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = PRELIGHT - detail = "spinbutton_up" - overlay_file = "ui/arrow-up-small-prelight.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = ACTIVE - detail = "spinbutton_up" - overlay_file = "ui/arrow-up-small-prelight.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = INSENSITIVE - detail = "spinbutton_up" - overlay_file = "ui/arrow-up-small-insens.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = NORMAL - detail = "spinbutton_down" - overlay_file = "ui/arrow-down-small.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = PRELIGHT - detail = "spinbutton_down" - overlay_file = "ui/arrow-down-small-prelight.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = ACTIVE - detail = "spinbutton_down" - overlay_file = "ui/arrow-down-small-prelight.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = INSENSITIVE - detail = "spinbutton_down" - overlay_file = "ui/arrow-down-small-insens.png" - overlay_stretch = FALSE - } - } -} - -class "GimpSpinScale" style "gimp-light-spin-scale-style" -widget "*GimpSpinScale*" style "gimp-light-spin-scale-style" - -########################################################### - -style "gimp-light-scrolled-window-style" -{ - xthickness = 1 - ythickness = 1 - - engine "pixmap" - { - image - { - function = SHADOW - file = "ui/frame.png" - border = { 5, 5, 5, 5 } - stretch = TRUE - } - } -} - -class "GtkScrolledWindow" style "gimp-light-scrolled-window-style" - -########################################################### - -style "gimp-light-frame-style" -{ - xthickness = 1 - ythickness = 1 - - engine "pixmap" - { - image - { - function = SHADOW - file = "ui/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - shadow = IN - } - - image - { - function = SHADOW_GAP - file = "ui/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - gap_start_file = "ui/frame-gap-start.png" - gap_start_border = { 1, 0, 0, 0 } - gap_end_file = "ui/frame-gap-end.png" - gap_end_border = { 0, 1, 0, 0 } - shadow = IN - } - - image - { - function = SHADOW - file = "ui/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - shadow = OUT - } - - image - { - function = SHADOW_GAP - file = "ui/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - gap_start_file = "ui/frame-gap-start.png" - gap_start_border = { 1, 0, 0, 0 } - gap_end_file = "ui/frame-gap-end.png" - gap_end_border = { 0, 1, 0, 0 } - shadow = OUT - } - - image - { - function = SHADOW - file = "ui/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - shadow = ETCHED_IN - } - - image - { - function = SHADOW_GAP - file = "ui/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - gap_start_file = "ui/frame-gap-start.png" - gap_start_border = { 1, 0, 0, 0 } - gap_end_file = "ui/frame-gap-end.png" - gap_end_border = { 0, 1, 0, 0 } - shadow = ETCHED_IN - } - - image - { - function = SHADOW - file = "ui/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - shadow = ETCHED_OUT - } - - image - { - function = SHADOW_GAP - file = "ui/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - gap_start_file = "ui/frame-gap-start.png" - gap_start_border = { 1, 0, 0, 0 } - gap_end_file = "ui/frame-gap-end.png" - gap_end_border = { 0, 1, 0, 0 } - shadow = ETCHED_OUT - } - } -} - -class "GtkFrame" style "gimp-light-frame-style" - -########################################################### - -style "gimp-light-toolbox-frame-style" -{ - engine "pixmap" - { - image - { - function = SHADOW - } - } -} - -widget_class "**" style "gimp-light-toolbox-frame-style" - -########################################################### - -style "gimp-light-toolbar-style" -{ - engine "pixmap" - { - image - { - function = BOX - file = "ui/toolbar.png" - stretch = TRUE - border = { 1, 1, 1, 1 } - } - - image - { - function = BOX_GAP - recolorable = TRUE - detail = "handlebox_bin" - file = "ui/gimp-handle-h.png" - border = { 4, 3, 4, 3 } - stretch = FALSE - } - - image - { - function = HANDLE - overlay_file = "ui/gimp-handle-h.png" - overlay_stretch = FALSE - orientation = HORIZONTAL - } - - image - { - function = HANDLE - overlay_file = "ui/gimp-handle-v.png" - overlay_stretch = FALSE - orientation = VERTICAL - } - - image - { - function = VLINE - recolorable = TRUE - file = "ui/null.png" - stretch = TRUE - border = { 1, 1, 1, 1 } - } - - image - { - function = HLINE - recolorable = TRUE - file = "ui/null.png" - stretch = TRUE - border = { 1, 1, 1, 1 } - } - } -} - -class "GtkToolbar" style "gimp-light-toolbar-style" -class "*HandleBox*" style "gimp-light-toolbar-style" - -########################################################### - -style "gimp-light-combobox-separator-style" -{ - xthickness = 0 - ythickness = 0 - GtkWidget::wide-separators = 1 -} - -widget_class "**" style "gimp-light-combobox-separator-style" - -########################################################### - -style "gimp-light-combobox-button-style" -{ - xthickness = 3 - ythickness = 3 -} - -widget_class "**" style "gimp-light-combobox-button-style" - -########################################################### - -style "gimp-light-combobox-style" -{ - xthickness = 0 - ythickness = 0 -} - -widget_class "*" style "gimp-light-combobox-style" - -########################################################### - -style "gimp-light-combobox-style1" -{ - xthickness = 0 - ythickness = 0 - - engine "pixmap" - { - image - { - function = BOX - file = "ui/gimp-button-normal.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - } - } -} - -widget_class "***" style "gimp-light-combobox-style1" - -########################################################### - -style "gimp-light-button-style" -{ - fg[PRELIGHT] = "#040404" - fg[ACTIVE] = "#DDDDDD" - fg[NORMAL] = "#343434" - fg[INSENSITIVE] = "#343434" -} - -widget_class "*GtkButton*" style "gimp-light-button-style" - -########################################################### - -style "kde_hack_1" -{ - GtkComboBox::appears-as-list = 0 - GtkComboBoxEntry::appears-as-list = 0 - GtkComboBoxText::appears-as-list = 0 - - color["clr1"] = "#343434" - color["clr2"] = "#222222" - color["clr3"] = "#3E3E3E" - color["clr4"] = "#EEEEEE" - color["clr5"] = "#DDDDDD" - color["clr6"] = "#BDBDBD" - color["clr7"] = "#3B3B3B" - color["clr8"] = "#DDDDDD" - color["clr9"] = "#B2B2B2" - color["clr10"] = "#000000" - - fg[NORMAL] = @clr3 - fg[PRELIGHT] = @clr10 - fg[ACTIVE] = @clr2 - fg[SELECTED] = @clr1 - fg[INSENSITIVE] = @clr3 - - base[NORMAL] = @clr6 - base[PRELIGHT] = @clr7 - base[ACTIVE] = @clr4 - base[SELECTED] = @clr4 - base[INSENSITIVE] = @clr8 - - text[NORMAL] = @clr1 - text[PRELIGHT] = @clr10 - text[ACTIVE] = @clr1 - text[SELECTED] = @clr1 - text[INSENSITIVE] = @clr9 -} - -widget_class "*" style "kde_hack_1" - -########################################################### - -style "kde_hack_2" -{ - bg[NORMAL] = "#EEEEEE" #Sets canvas BG -} - -widget "*GimpDisplayShell.*" style "kde_hack_2" - -########################################################### - -style "kde_hack_3" -{ - bg[NORMAL] = "#EEEEEE" -} - -class "GtkFrame" style "kde_hack_3" -widget_class "**" style "kde_hack_3" - -########################################################### - -style "kde_hack_4" -{ - engine "pixmap" - { - image - { - function = OPTION - shadow = OUT - recolorable = TRUE - overlay_file = "ui/option1.png" - overlay_stretch = FALSE - } - - image - { - function = OPTION - shadow = IN - recolorable = TRUE - overlay_file = "ui/option2.png" - overlay_stretch = FALSE - } - - image - { - function = OPTION - shadow = ETCHED_IN - recolorable = TRUE - overlay_file = "ui/option3.png" - overlay_stretch = FALSE - } - - image - { - function = CHECK - shadow = OUT - recolorable = TRUE - overlay_file = "ui/check1.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - - image - { - function = CHECK - shadow = IN - recolorable = TRUE - overlay_file = "ui/check2.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - - image - { - function = CHECK - shadow = ETCHED_IN - recolorable = TRUE - overlay_file = "ui/check3.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - } -} - -widget_class "**" style "kde_hack_4" - -########################################################### - -# KDE Hack 5 -widget_class "**" style "gimp-light-toolbar-style" - -########################################################### - -style "kde_hack_6" -{ - engine "pixmap" - { - # This image is used to draw the headers of columns - # in list views when they are not selected. - image - { - function = BOX - recolorable = TRUE - state = NORMAL - file = "ui/list_header.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - - # This image is used to draw the column headers in - # list views when they are clicked. - image - { - function = BOX - recolorable = TRUE - state = PRELIGHT - file = "ui/list_header.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = ACTIVE - file = "ui/list_header-pressed.png" - border = { 2, 2, 2, 2} - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = SELECTED - file = "ui/list_header.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - } -} - -widget_class "***" style "kde_hack_6" - -########################################################### - -# KDE & oxygen-gtk fix for BG -style "gimp-light-oxygen-default-style" = "gimp-light-default-style" -{ - GtkComboBox::appears-as-list = 0 - GtkComboBoxEntry::appears-as-list = 0 - GtkComboBoxText::appears-as-list = 0 -} - -class "*" style "gimp-light-oxygen-default-style" - -########################################################### - -style "gimp-light-gtkscale-style" -{ - engine "pixmap" - { - image - { - function = SLIDER - recolorable = TRUE - file = "ui/bar-h.png" - border = { 2,2,2,2 } - stretch = TRUE - orientation = HORIZONTAL - } - - image - { - function = SLIDER - recolorable = TRUE - file = "ui/bar-v.png" - border = { 2,2,2,2 } - stretch = TRUE - orientation = VERTICAL - } - - image - { - function = BOX - recolorable = TRUE - file = "ui/slider-h.png" - border = {0,0,0,0} - stretch = TRUE - orientation = HORIZONTAL - } - - image - { - function = BOX - recolorable = TRUE - file = "ui/slider-v.png" - border = {0,0,0,0} - stretch = TRUE - orientation = VERTICAL - } - } -} - -class "GtkScale" style "gimp-light-gtkscale-style" -class "GtkVScale" style "gimp-light-gtkscale-style" -class "GtkHScale" style "gimp-light-gtkscale-style" -widget_class "*GtkScale*" style "gimp-light-gtkscale-style" -widget_class "*GtkVScale*" style "gimp-light-gtkscale-style" -widget_class "*GtkHScale*" style "gimp-light-gtkscale-style" - -########################################################### - -style "tlsog-overlay-scrollbar" -{ - bg[SELECTED] = "#555" - bg[INSENSITIVE] = "#777" - bg[ACTIVE] = "#333" - bg[NORMAL] = "#CCC" - bg[PRELIGHT] = "#CCC" - - fg[NORMAL] = "#333" -} - -widget_class "*" style "tlsog-overlay-scrollbar" -widget_class "*" style "tlsog-overlay-scrollbar" - -########################################################### - -# Fix for GMIC/plugins -style "tlsog-plugin-scrolled-window-style" -{ - xthickness = 1 - ythickness = 1 - - engine "pixmap" - { - image - { - function = SHADOW - file = "ui/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - shadow = IN - } - } -} - -widget_class "**" style "tlsog-plugin-scrolled-window-style" - -########################################################### - -# Menu prelight fix for Ubuntu Unity -style "ubuntu-fix-menu-item" -{ - engine "pixmap" - { - image - { - function = BOX - state = PRELIGHT - file = "ui/entry-border-fill-active.png" - border = { 1, 0, 1, 0 } - stretch = TRUE - } - } -} - -widget "GtkMenuItem" style "ubuntu-fix-menu-item" - -########################################################### - -style "light-python-console" -{ - text[NORMAL] = "#080" - text[INSENSITIVE] = "#800" -} - -widget "python-fu-console" style "light-python-console" - -# EOF diff --git a/themes/Lighter/ui/arrow-down-insens.png b/themes/Lighter/ui/arrow-down-insens.png deleted file mode 100644 index 6789dfd4f2..0000000000 Binary files a/themes/Lighter/ui/arrow-down-insens.png and /dev/null differ diff --git a/themes/Lighter/ui/arrow-down-prelight.png b/themes/Lighter/ui/arrow-down-prelight.png deleted file mode 100644 index 0a0dcd5007..0000000000 Binary files a/themes/Lighter/ui/arrow-down-prelight.png and /dev/null differ diff --git a/themes/Lighter/ui/arrow-down-small-insens.png b/themes/Lighter/ui/arrow-down-small-insens.png deleted file mode 100644 index cda315ff60..0000000000 Binary files a/themes/Lighter/ui/arrow-down-small-insens.png and /dev/null differ diff --git a/themes/Lighter/ui/arrow-down-small-prelight.png b/themes/Lighter/ui/arrow-down-small-prelight.png deleted file mode 100644 index 04f437fb38..0000000000 Binary files a/themes/Lighter/ui/arrow-down-small-prelight.png and /dev/null differ diff --git a/themes/Lighter/ui/arrow-down-small.png b/themes/Lighter/ui/arrow-down-small.png deleted file mode 100644 index fd20c4e483..0000000000 Binary files a/themes/Lighter/ui/arrow-down-small.png and /dev/null differ diff --git a/themes/Lighter/ui/arrow-down.png b/themes/Lighter/ui/arrow-down.png deleted file mode 100644 index 0a0dcd5007..0000000000 Binary files a/themes/Lighter/ui/arrow-down.png and /dev/null differ diff --git a/themes/Lighter/ui/arrow-left-insens.png b/themes/Lighter/ui/arrow-left-insens.png deleted file mode 100644 index 9ac146348a..0000000000 Binary files a/themes/Lighter/ui/arrow-left-insens.png and /dev/null differ diff --git a/themes/Lighter/ui/arrow-left-prelight.png b/themes/Lighter/ui/arrow-left-prelight.png deleted file mode 100644 index 8d72120bb1..0000000000 Binary files a/themes/Lighter/ui/arrow-left-prelight.png and /dev/null differ diff --git a/themes/Lighter/ui/arrow-left.png b/themes/Lighter/ui/arrow-left.png deleted file mode 100644 index 054cb9f151..0000000000 Binary files a/themes/Lighter/ui/arrow-left.png and /dev/null differ diff --git a/themes/Lighter/ui/arrow-right-insens.png b/themes/Lighter/ui/arrow-right-insens.png deleted file mode 100644 index ca65715c37..0000000000 Binary files a/themes/Lighter/ui/arrow-right-insens.png and /dev/null differ diff --git a/themes/Lighter/ui/arrow-right-prelight.png b/themes/Lighter/ui/arrow-right-prelight.png deleted file mode 100644 index 162770fbad..0000000000 Binary files a/themes/Lighter/ui/arrow-right-prelight.png and /dev/null differ diff --git a/themes/Lighter/ui/arrow-right.png b/themes/Lighter/ui/arrow-right.png deleted file mode 100644 index 30687972a9..0000000000 Binary files a/themes/Lighter/ui/arrow-right.png and /dev/null differ diff --git a/themes/Lighter/ui/arrow-up-insens.png b/themes/Lighter/ui/arrow-up-insens.png deleted file mode 100644 index c2a965efbb..0000000000 Binary files a/themes/Lighter/ui/arrow-up-insens.png and /dev/null differ diff --git a/themes/Lighter/ui/arrow-up-prelight.png b/themes/Lighter/ui/arrow-up-prelight.png deleted file mode 100644 index 9fc7978fca..0000000000 Binary files a/themes/Lighter/ui/arrow-up-prelight.png and /dev/null differ diff --git a/themes/Lighter/ui/arrow-up-small-insens.png b/themes/Lighter/ui/arrow-up-small-insens.png deleted file mode 100644 index da9ffcdfce..0000000000 Binary files a/themes/Lighter/ui/arrow-up-small-insens.png and /dev/null differ diff --git a/themes/Lighter/ui/arrow-up-small-prelight.png b/themes/Lighter/ui/arrow-up-small-prelight.png deleted file mode 100644 index efbb600473..0000000000 Binary files a/themes/Lighter/ui/arrow-up-small-prelight.png and /dev/null differ diff --git a/themes/Lighter/ui/arrow-up-small.png b/themes/Lighter/ui/arrow-up-small.png deleted file mode 100644 index efbb600473..0000000000 Binary files a/themes/Lighter/ui/arrow-up-small.png and /dev/null differ diff --git a/themes/Lighter/ui/arrow-up.png b/themes/Lighter/ui/arrow-up.png deleted file mode 100644 index 118a7dc21f..0000000000 Binary files a/themes/Lighter/ui/arrow-up.png and /dev/null differ diff --git a/themes/Lighter/ui/bar-h.png b/themes/Lighter/ui/bar-h.png deleted file mode 100644 index 512540e1f6..0000000000 Binary files a/themes/Lighter/ui/bar-h.png and /dev/null differ diff --git a/themes/Lighter/ui/bar-v.png b/themes/Lighter/ui/bar-v.png deleted file mode 100644 index 32778bedab..0000000000 Binary files a/themes/Lighter/ui/bar-v.png and /dev/null differ diff --git a/themes/Lighter/ui/button-default.png b/themes/Lighter/ui/button-default.png deleted file mode 100644 index 1bec5329e9..0000000000 Binary files a/themes/Lighter/ui/button-default.png and /dev/null differ diff --git a/themes/Lighter/ui/button-insensitive.png b/themes/Lighter/ui/button-insensitive.png deleted file mode 100644 index e889732bc6..0000000000 Binary files a/themes/Lighter/ui/button-insensitive.png and /dev/null differ diff --git a/themes/Lighter/ui/button-normal.png b/themes/Lighter/ui/button-normal.png deleted file mode 100644 index 5b39d782c1..0000000000 Binary files a/themes/Lighter/ui/button-normal.png and /dev/null differ diff --git a/themes/Lighter/ui/button-prelight.png b/themes/Lighter/ui/button-prelight.png deleted file mode 100644 index f6cd413673..0000000000 Binary files a/themes/Lighter/ui/button-prelight.png and /dev/null differ diff --git a/themes/Lighter/ui/button-pressed.png b/themes/Lighter/ui/button-pressed.png deleted file mode 100644 index ae7ead50a0..0000000000 Binary files a/themes/Lighter/ui/button-pressed.png and /dev/null differ diff --git a/themes/Lighter/ui/check1.png b/themes/Lighter/ui/check1.png deleted file mode 100644 index aa33eef236..0000000000 Binary files a/themes/Lighter/ui/check1.png and /dev/null differ diff --git a/themes/Lighter/ui/check2.png b/themes/Lighter/ui/check2.png deleted file mode 100644 index e083728364..0000000000 Binary files a/themes/Lighter/ui/check2.png and /dev/null differ diff --git a/themes/Lighter/ui/check3.png b/themes/Lighter/ui/check3.png deleted file mode 100644 index 18362a6eec..0000000000 Binary files a/themes/Lighter/ui/check3.png and /dev/null differ diff --git a/themes/Lighter/ui/combo-entry-border-active-bg.png b/themes/Lighter/ui/combo-entry-border-active-bg.png deleted file mode 100644 index be2fd03a83..0000000000 Binary files a/themes/Lighter/ui/combo-entry-border-active-bg.png and /dev/null differ diff --git a/themes/Lighter/ui/combo-entry-border-active-notebook.png b/themes/Lighter/ui/combo-entry-border-active-notebook.png deleted file mode 100644 index be2fd03a83..0000000000 Binary files a/themes/Lighter/ui/combo-entry-border-active-notebook.png and /dev/null differ diff --git a/themes/Lighter/ui/combo-entry-border-active-rtl-notebook.png b/themes/Lighter/ui/combo-entry-border-active-rtl-notebook.png deleted file mode 100644 index 6218f2c76c..0000000000 Binary files a/themes/Lighter/ui/combo-entry-border-active-rtl-notebook.png and /dev/null differ diff --git a/themes/Lighter/ui/combo-entry-border-bg.png b/themes/Lighter/ui/combo-entry-border-bg.png deleted file mode 100644 index 8cbdf7cb22..0000000000 Binary files a/themes/Lighter/ui/combo-entry-border-bg.png and /dev/null differ diff --git a/themes/Lighter/ui/combo-entry-border-disabled-bg.png b/themes/Lighter/ui/combo-entry-border-disabled-bg.png deleted file mode 100644 index c2c566525e..0000000000 Binary files a/themes/Lighter/ui/combo-entry-border-disabled-bg.png and /dev/null differ diff --git a/themes/Lighter/ui/combo-entry-border-disabled-notebook.png b/themes/Lighter/ui/combo-entry-border-disabled-notebook.png deleted file mode 100644 index c2c566525e..0000000000 Binary files a/themes/Lighter/ui/combo-entry-border-disabled-notebook.png and /dev/null differ diff --git a/themes/Lighter/ui/combo-entry-border-disabled-rtl-bg.png b/themes/Lighter/ui/combo-entry-border-disabled-rtl-bg.png deleted file mode 100644 index 59018be9ab..0000000000 Binary files a/themes/Lighter/ui/combo-entry-border-disabled-rtl-bg.png and /dev/null differ diff --git a/themes/Lighter/ui/combo-entry-border-disabled-rtl-notebook.png b/themes/Lighter/ui/combo-entry-border-disabled-rtl-notebook.png deleted file mode 100644 index 6218f2c76c..0000000000 Binary files a/themes/Lighter/ui/combo-entry-border-disabled-rtl-notebook.png and /dev/null differ diff --git a/themes/Lighter/ui/combo-entry-border-notebook.png b/themes/Lighter/ui/combo-entry-border-notebook.png deleted file mode 100644 index be2fd03a83..0000000000 Binary files a/themes/Lighter/ui/combo-entry-border-notebook.png and /dev/null differ diff --git a/themes/Lighter/ui/combo-entry-border-rtl-bg.png b/themes/Lighter/ui/combo-entry-border-rtl-bg.png deleted file mode 100644 index 6218f2c76c..0000000000 Binary files a/themes/Lighter/ui/combo-entry-border-rtl-bg.png and /dev/null differ diff --git a/themes/Lighter/ui/combo-entry-border-rtl-notebook.png b/themes/Lighter/ui/combo-entry-border-rtl-notebook.png deleted file mode 100644 index 6218f2c76c..0000000000 Binary files a/themes/Lighter/ui/combo-entry-border-rtl-notebook.png and /dev/null differ diff --git a/themes/Lighter/ui/combo-entry-button-active-rtl.png b/themes/Lighter/ui/combo-entry-button-active-rtl.png deleted file mode 100644 index 5ee4d89e39..0000000000 Binary files a/themes/Lighter/ui/combo-entry-button-active-rtl.png and /dev/null differ diff --git a/themes/Lighter/ui/combo-entry-button-active.png b/themes/Lighter/ui/combo-entry-button-active.png deleted file mode 100644 index 13f13e5a38..0000000000 Binary files a/themes/Lighter/ui/combo-entry-button-active.png and /dev/null differ diff --git a/themes/Lighter/ui/combo-entry-button-disabled-rtl.png b/themes/Lighter/ui/combo-entry-button-disabled-rtl.png deleted file mode 100644 index 46a6881c2a..0000000000 Binary files a/themes/Lighter/ui/combo-entry-button-disabled-rtl.png and /dev/null differ diff --git a/themes/Lighter/ui/combo-entry-button-disabled.png b/themes/Lighter/ui/combo-entry-button-disabled.png deleted file mode 100644 index 80e84f5689..0000000000 Binary files a/themes/Lighter/ui/combo-entry-button-disabled.png and /dev/null differ diff --git a/themes/Lighter/ui/combo-entry-button-rtl.png b/themes/Lighter/ui/combo-entry-button-rtl.png deleted file mode 100644 index 753376fe25..0000000000 Binary files a/themes/Lighter/ui/combo-entry-button-rtl.png and /dev/null differ diff --git a/themes/Lighter/ui/combo-entry-button.png b/themes/Lighter/ui/combo-entry-button.png deleted file mode 100644 index 8613f1516f..0000000000 Binary files a/themes/Lighter/ui/combo-entry-button.png and /dev/null differ diff --git a/themes/Lighter/ui/entry-border-active-bg.png b/themes/Lighter/ui/entry-border-active-bg.png deleted file mode 100644 index ec1d1dcd92..0000000000 Binary files a/themes/Lighter/ui/entry-border-active-bg.png and /dev/null differ diff --git a/themes/Lighter/ui/entry-border-active-notebook.png b/themes/Lighter/ui/entry-border-active-notebook.png deleted file mode 100644 index 42b1bbdecf..0000000000 Binary files a/themes/Lighter/ui/entry-border-active-notebook.png and /dev/null differ diff --git a/themes/Lighter/ui/entry-border-disabled-bg.png b/themes/Lighter/ui/entry-border-disabled-bg.png deleted file mode 100644 index 20aed2c000..0000000000 Binary files a/themes/Lighter/ui/entry-border-disabled-bg.png and /dev/null differ diff --git a/themes/Lighter/ui/entry-border-disabled-notebook.png b/themes/Lighter/ui/entry-border-disabled-notebook.png deleted file mode 100644 index de54253ae0..0000000000 Binary files a/themes/Lighter/ui/entry-border-disabled-notebook.png and /dev/null differ diff --git a/themes/Lighter/ui/entry-border-fill-active-item.png b/themes/Lighter/ui/entry-border-fill-active-item.png deleted file mode 100644 index 454ed111e8..0000000000 Binary files a/themes/Lighter/ui/entry-border-fill-active-item.png and /dev/null differ diff --git a/themes/Lighter/ui/entry-border-fill-active.png b/themes/Lighter/ui/entry-border-fill-active.png deleted file mode 100644 index a235d05e74..0000000000 Binary files a/themes/Lighter/ui/entry-border-fill-active.png and /dev/null differ diff --git a/themes/Lighter/ui/entry-border-fill.png b/themes/Lighter/ui/entry-border-fill.png deleted file mode 100644 index 1a5b772172..0000000000 Binary files a/themes/Lighter/ui/entry-border-fill.png and /dev/null differ diff --git a/themes/Lighter/ui/entry-border-notebook-null.png b/themes/Lighter/ui/entry-border-notebook-null.png deleted file mode 100644 index f821830b86..0000000000 Binary files a/themes/Lighter/ui/entry-border-notebook-null.png and /dev/null differ diff --git a/themes/Lighter/ui/entry-border-notebook.png b/themes/Lighter/ui/entry-border-notebook.png deleted file mode 100644 index 35e35bbee6..0000000000 Binary files a/themes/Lighter/ui/entry-border-notebook.png and /dev/null differ diff --git a/themes/Lighter/ui/ext-bottom.png b/themes/Lighter/ui/ext-bottom.png deleted file mode 100644 index 041221afb5..0000000000 Binary files a/themes/Lighter/ui/ext-bottom.png and /dev/null differ diff --git a/themes/Lighter/ui/ext-left.png b/themes/Lighter/ui/ext-left.png deleted file mode 100644 index ca4decd22e..0000000000 Binary files a/themes/Lighter/ui/ext-left.png and /dev/null differ diff --git a/themes/Lighter/ui/ext-right.png b/themes/Lighter/ui/ext-right.png deleted file mode 100644 index d394153bcf..0000000000 Binary files a/themes/Lighter/ui/ext-right.png and /dev/null differ diff --git a/themes/Lighter/ui/ext-top.png b/themes/Lighter/ui/ext-top.png deleted file mode 100644 index f3b6214cf9..0000000000 Binary files a/themes/Lighter/ui/ext-top.png and /dev/null differ diff --git a/themes/Lighter/ui/extension-bottom.png b/themes/Lighter/ui/extension-bottom.png deleted file mode 100644 index dff231981e..0000000000 Binary files a/themes/Lighter/ui/extension-bottom.png and /dev/null differ diff --git a/themes/Lighter/ui/extension-left.png b/themes/Lighter/ui/extension-left.png deleted file mode 100644 index d54899f543..0000000000 Binary files a/themes/Lighter/ui/extension-left.png and /dev/null differ diff --git a/themes/Lighter/ui/extension-right.png b/themes/Lighter/ui/extension-right.png deleted file mode 100644 index 9c4e429f6d..0000000000 Binary files a/themes/Lighter/ui/extension-right.png and /dev/null differ diff --git a/themes/Lighter/ui/extension-top.png b/themes/Lighter/ui/extension-top.png deleted file mode 100644 index 66b6fa6b68..0000000000 Binary files a/themes/Lighter/ui/extension-top.png and /dev/null differ diff --git a/themes/Lighter/ui/frame-gap-end.png b/themes/Lighter/ui/frame-gap-end.png deleted file mode 100644 index 16f8715aef..0000000000 Binary files a/themes/Lighter/ui/frame-gap-end.png and /dev/null differ diff --git a/themes/Lighter/ui/frame-gap-start.png b/themes/Lighter/ui/frame-gap-start.png deleted file mode 100644 index 27a9503ef4..0000000000 Binary files a/themes/Lighter/ui/frame-gap-start.png and /dev/null differ diff --git a/themes/Lighter/ui/frame.png b/themes/Lighter/ui/frame.png deleted file mode 100644 index caccc3bb90..0000000000 Binary files a/themes/Lighter/ui/frame.png and /dev/null differ diff --git a/themes/Lighter/ui/gap_bottom.png b/themes/Lighter/ui/gap_bottom.png deleted file mode 100644 index a6248f9128..0000000000 Binary files a/themes/Lighter/ui/gap_bottom.png and /dev/null differ diff --git a/themes/Lighter/ui/gap_left.png b/themes/Lighter/ui/gap_left.png deleted file mode 100644 index 3667ca24d3..0000000000 Binary files a/themes/Lighter/ui/gap_left.png and /dev/null differ diff --git a/themes/Lighter/ui/gap_right.png b/themes/Lighter/ui/gap_right.png deleted file mode 100644 index 8169bf6939..0000000000 Binary files a/themes/Lighter/ui/gap_right.png and /dev/null differ diff --git a/themes/Lighter/ui/gap_top.png b/themes/Lighter/ui/gap_top.png deleted file mode 100644 index 4530ca7372..0000000000 Binary files a/themes/Lighter/ui/gap_top.png and /dev/null differ diff --git a/themes/Lighter/ui/gimp-arrow-down-insensitive.png b/themes/Lighter/ui/gimp-arrow-down-insensitive.png deleted file mode 100644 index a68ed099f8..0000000000 Binary files a/themes/Lighter/ui/gimp-arrow-down-insensitive.png and /dev/null differ diff --git a/themes/Lighter/ui/gimp-arrow-down-insenstive.png b/themes/Lighter/ui/gimp-arrow-down-insenstive.png deleted file mode 100644 index a68ed099f8..0000000000 Binary files a/themes/Lighter/ui/gimp-arrow-down-insenstive.png and /dev/null differ diff --git a/themes/Lighter/ui/gimp-arrow-down.png b/themes/Lighter/ui/gimp-arrow-down.png deleted file mode 100644 index 97aab8d4ca..0000000000 Binary files a/themes/Lighter/ui/gimp-arrow-down.png and /dev/null differ diff --git a/themes/Lighter/ui/gimp-arrow-left.png b/themes/Lighter/ui/gimp-arrow-left.png deleted file mode 100644 index 1bd86db8d9..0000000000 Binary files a/themes/Lighter/ui/gimp-arrow-left.png and /dev/null differ diff --git a/themes/Lighter/ui/gimp-arrow-right-dark.png b/themes/Lighter/ui/gimp-arrow-right-dark.png deleted file mode 100644 index 71acb9e486..0000000000 Binary files a/themes/Lighter/ui/gimp-arrow-right-dark.png and /dev/null differ diff --git a/themes/Lighter/ui/gimp-arrow-right-prelight.png b/themes/Lighter/ui/gimp-arrow-right-prelight.png deleted file mode 100644 index f7c3b945f9..0000000000 Binary files a/themes/Lighter/ui/gimp-arrow-right-prelight.png and /dev/null differ diff --git a/themes/Lighter/ui/gimp-arrow-right.png b/themes/Lighter/ui/gimp-arrow-right.png deleted file mode 100644 index 5ca7380585..0000000000 Binary files a/themes/Lighter/ui/gimp-arrow-right.png and /dev/null differ diff --git a/themes/Lighter/ui/gimp-arrow-up.png b/themes/Lighter/ui/gimp-arrow-up.png deleted file mode 100644 index 4df5f4dd1c..0000000000 Binary files a/themes/Lighter/ui/gimp-arrow-up.png and /dev/null differ diff --git a/themes/Lighter/ui/gimp-button-default.png b/themes/Lighter/ui/gimp-button-default.png deleted file mode 100644 index f4c1fa21c9..0000000000 Binary files a/themes/Lighter/ui/gimp-button-default.png and /dev/null differ diff --git a/themes/Lighter/ui/gimp-button-insensitive.png b/themes/Lighter/ui/gimp-button-insensitive.png deleted file mode 100644 index aa9c088e51..0000000000 Binary files a/themes/Lighter/ui/gimp-button-insensitive.png and /dev/null differ diff --git a/themes/Lighter/ui/gimp-button-normal.png b/themes/Lighter/ui/gimp-button-normal.png deleted file mode 100644 index e686fadf01..0000000000 Binary files a/themes/Lighter/ui/gimp-button-normal.png and /dev/null differ diff --git a/themes/Lighter/ui/gimp-button-prelight.png b/themes/Lighter/ui/gimp-button-prelight.png deleted file mode 100644 index 53babb5ed6..0000000000 Binary files a/themes/Lighter/ui/gimp-button-prelight.png and /dev/null differ diff --git a/themes/Lighter/ui/gimp-button-pressed.png b/themes/Lighter/ui/gimp-button-pressed.png deleted file mode 100644 index f06b6a1542..0000000000 Binary files a/themes/Lighter/ui/gimp-button-pressed.png and /dev/null differ diff --git a/themes/Lighter/ui/gimp-handle-h.png b/themes/Lighter/ui/gimp-handle-h.png deleted file mode 100644 index 2423f1ea45..0000000000 Binary files a/themes/Lighter/ui/gimp-handle-h.png and /dev/null differ diff --git a/themes/Lighter/ui/gimp-handle-v.png b/themes/Lighter/ui/gimp-handle-v.png deleted file mode 100644 index ab002f7c63..0000000000 Binary files a/themes/Lighter/ui/gimp-handle-v.png and /dev/null differ diff --git a/themes/Lighter/ui/gimp-line-h.png b/themes/Lighter/ui/gimp-line-h.png deleted file mode 100644 index 9186dbb669..0000000000 Binary files a/themes/Lighter/ui/gimp-line-h.png and /dev/null differ diff --git a/themes/Lighter/ui/gimp-line-v.png b/themes/Lighter/ui/gimp-line-v.png deleted file mode 100644 index c38282e54b..0000000000 Binary files a/themes/Lighter/ui/gimp-line-v.png and /dev/null differ diff --git a/themes/Lighter/ui/gimp-menu-line-h.png b/themes/Lighter/ui/gimp-menu-line-h.png deleted file mode 100644 index 9f697a9312..0000000000 Binary files a/themes/Lighter/ui/gimp-menu-line-h.png and /dev/null differ diff --git a/themes/Lighter/ui/gimp-tooltip-bg.png b/themes/Lighter/ui/gimp-tooltip-bg.png deleted file mode 100644 index effd49dce1..0000000000 Binary files a/themes/Lighter/ui/gimp-tooltip-bg.png and /dev/null differ diff --git a/themes/Lighter/ui/list_header-pressed.png b/themes/Lighter/ui/list_header-pressed.png deleted file mode 100644 index d4823a58a0..0000000000 Binary files a/themes/Lighter/ui/list_header-pressed.png and /dev/null differ diff --git a/themes/Lighter/ui/list_header.png b/themes/Lighter/ui/list_header.png deleted file mode 100644 index 128e714c52..0000000000 Binary files a/themes/Lighter/ui/list_header.png and /dev/null differ diff --git a/themes/Lighter/ui/menu-arrow-prelight.png b/themes/Lighter/ui/menu-arrow-prelight.png deleted file mode 100644 index 183e077eaf..0000000000 Binary files a/themes/Lighter/ui/menu-arrow-prelight.png and /dev/null differ diff --git a/themes/Lighter/ui/menu-arrow.png b/themes/Lighter/ui/menu-arrow.png deleted file mode 100644 index 3fdd709db0..0000000000 Binary files a/themes/Lighter/ui/menu-arrow.png and /dev/null differ diff --git a/themes/Lighter/ui/menu.png b/themes/Lighter/ui/menu.png deleted file mode 100644 index 90523748fc..0000000000 Binary files a/themes/Lighter/ui/menu.png and /dev/null differ diff --git a/themes/Lighter/ui/menubar.png b/themes/Lighter/ui/menubar.png deleted file mode 100644 index 1aaeb83aa9..0000000000 Binary files a/themes/Lighter/ui/menubar.png and /dev/null differ diff --git a/themes/Lighter/ui/menuitem.png b/themes/Lighter/ui/menuitem.png deleted file mode 100644 index 9440c78fa0..0000000000 Binary files a/themes/Lighter/ui/menuitem.png and /dev/null differ diff --git a/themes/Lighter/ui/minus.png b/themes/Lighter/ui/minus.png deleted file mode 100644 index 0ec8c60981..0000000000 Binary files a/themes/Lighter/ui/minus.png and /dev/null differ diff --git a/themes/Lighter/ui/notebook.png b/themes/Lighter/ui/notebook.png deleted file mode 100644 index 09e9a70979..0000000000 Binary files a/themes/Lighter/ui/notebook.png and /dev/null differ diff --git a/themes/Lighter/ui/null.png b/themes/Lighter/ui/null.png deleted file mode 100644 index a5da82acf2..0000000000 Binary files a/themes/Lighter/ui/null.png and /dev/null differ diff --git a/themes/Lighter/ui/option1.png b/themes/Lighter/ui/option1.png deleted file mode 100644 index 76090b7a44..0000000000 Binary files a/themes/Lighter/ui/option1.png and /dev/null differ diff --git a/themes/Lighter/ui/option2.png b/themes/Lighter/ui/option2.png deleted file mode 100644 index db9bcb84b9..0000000000 Binary files a/themes/Lighter/ui/option2.png and /dev/null differ diff --git a/themes/Lighter/ui/option3.png b/themes/Lighter/ui/option3.png deleted file mode 100644 index 16a7e78250..0000000000 Binary files a/themes/Lighter/ui/option3.png and /dev/null differ diff --git a/themes/Lighter/ui/plus.png b/themes/Lighter/ui/plus.png deleted file mode 100644 index 1758593dd8..0000000000 Binary files a/themes/Lighter/ui/plus.png and /dev/null differ diff --git a/themes/Lighter/ui/progressbar-trough.png b/themes/Lighter/ui/progressbar-trough.png deleted file mode 100644 index ad8c2ef681..0000000000 Binary files a/themes/Lighter/ui/progressbar-trough.png and /dev/null differ diff --git a/themes/Lighter/ui/progressbar.png b/themes/Lighter/ui/progressbar.png deleted file mode 100644 index 78cf99c51e..0000000000 Binary files a/themes/Lighter/ui/progressbar.png and /dev/null differ diff --git a/themes/Lighter/ui/shadow-in-alt.png b/themes/Lighter/ui/shadow-in-alt.png deleted file mode 100644 index 0ef56290ee..0000000000 Binary files a/themes/Lighter/ui/shadow-in-alt.png and /dev/null differ diff --git a/themes/Lighter/ui/shadow-in.png b/themes/Lighter/ui/shadow-in.png deleted file mode 100644 index 690b06f0c6..0000000000 Binary files a/themes/Lighter/ui/shadow-in.png and /dev/null differ diff --git a/themes/Lighter/ui/shadow-null.png b/themes/Lighter/ui/shadow-null.png deleted file mode 100644 index 7efe5d7748..0000000000 Binary files a/themes/Lighter/ui/shadow-null.png and /dev/null differ diff --git a/themes/Lighter/ui/shadow-out.png b/themes/Lighter/ui/shadow-out.png deleted file mode 100644 index 380d9c38f3..0000000000 Binary files a/themes/Lighter/ui/shadow-out.png and /dev/null differ diff --git a/themes/Lighter/ui/slider-h.png b/themes/Lighter/ui/slider-h.png deleted file mode 100644 index a58768f088..0000000000 Binary files a/themes/Lighter/ui/slider-h.png and /dev/null differ diff --git a/themes/Lighter/ui/slider-v.png b/themes/Lighter/ui/slider-v.png deleted file mode 100644 index ae579eff39..0000000000 Binary files a/themes/Lighter/ui/slider-v.png and /dev/null differ diff --git a/themes/Lighter/ui/spin-down-insensitive.png b/themes/Lighter/ui/spin-down-insensitive.png deleted file mode 100644 index c2fbd6b153..0000000000 Binary files a/themes/Lighter/ui/spin-down-insensitive.png and /dev/null differ diff --git a/themes/Lighter/ui/spin-down-normal.png b/themes/Lighter/ui/spin-down-normal.png deleted file mode 100644 index f9d6adf6fd..0000000000 Binary files a/themes/Lighter/ui/spin-down-normal.png and /dev/null differ diff --git a/themes/Lighter/ui/spin-down-pressed.png b/themes/Lighter/ui/spin-down-pressed.png deleted file mode 100644 index 9df1f96538..0000000000 Binary files a/themes/Lighter/ui/spin-down-pressed.png and /dev/null differ diff --git a/themes/Lighter/ui/spin-fill-bg.png b/themes/Lighter/ui/spin-fill-bg.png deleted file mode 100644 index e0359d7878..0000000000 Binary files a/themes/Lighter/ui/spin-fill-bg.png and /dev/null differ diff --git a/themes/Lighter/ui/spin-insensitive.png b/themes/Lighter/ui/spin-insensitive.png deleted file mode 100644 index 353a013112..0000000000 Binary files a/themes/Lighter/ui/spin-insensitive.png and /dev/null differ diff --git a/themes/Lighter/ui/spin-up-insensitive.png b/themes/Lighter/ui/spin-up-insensitive.png deleted file mode 100644 index b4a69ff891..0000000000 Binary files a/themes/Lighter/ui/spin-up-insensitive.png and /dev/null differ diff --git a/themes/Lighter/ui/spin-up-normal.png b/themes/Lighter/ui/spin-up-normal.png deleted file mode 100644 index d531bdb5c1..0000000000 Binary files a/themes/Lighter/ui/spin-up-normal.png and /dev/null differ diff --git a/themes/Lighter/ui/spin-up-pressed.png b/themes/Lighter/ui/spin-up-pressed.png deleted file mode 100644 index 4d8f5b650f..0000000000 Binary files a/themes/Lighter/ui/spin-up-pressed.png and /dev/null differ diff --git a/themes/Lighter/ui/spin.png b/themes/Lighter/ui/spin.png deleted file mode 100644 index cf75a8396a..0000000000 Binary files a/themes/Lighter/ui/spin.png and /dev/null differ diff --git a/themes/Lighter/ui/toolbar.png b/themes/Lighter/ui/toolbar.png deleted file mode 100644 index ba09eef677..0000000000 Binary files a/themes/Lighter/ui/toolbar.png and /dev/null differ diff --git a/themes/Lighter/ui/transparent.png b/themes/Lighter/ui/transparent.png deleted file mode 100644 index edb954df3c..0000000000 Binary files a/themes/Lighter/ui/transparent.png and /dev/null differ diff --git a/themes/Makefile.am b/themes/Makefile.am index a6d7ab3ac1..9ad7f4cb96 100644 --- a/themes/Makefile.am +++ b/themes/Makefile.am @@ -1,3 +1,3 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = Darker Dark Gray Light Lighter System +SUBDIRS = Dark Light Gray System diff --git a/themes/Makefile.in b/themes/Makefile.in index 37d65f0763..71b9557f94 100644 --- a/themes/Makefile.in +++ b/themes/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -273,7 +274,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -346,6 +347,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -574,6 +576,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -592,7 +595,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = Darker Dark Gray Light Lighter System +SUBDIRS = Dark Light Gray System all: all-recursive .SUFFIXES: diff --git a/themes/System/Makefile.in b/themes/System/Makefile.in index b7ce1b7dd2..7df07ffaa7 100644 --- a/themes/System/Makefile.in +++ b/themes/System/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -243,7 +244,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -316,6 +317,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -544,6 +546,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ diff --git a/tools/Makefile.am b/tools/Makefile.am index e61b34ad90..117560bb80 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -6,6 +6,8 @@ libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la if PLATFORM_OSX xobjective_c = "-xobjective-c" +xobjective_cxx = "-xobjective-c++" +xnone = "-xnone" endif if OS_WIN32 @@ -59,7 +61,7 @@ invert-svg$(BUILD_EXEEXT): invert-svg.c #compute_svg_viewbox_LDADD = $(SVG_LIBS) # Build tools which must be built for the host platform. -all: invert-svg$(BUILD_EXEEXT) +all-local: invert-svg$(BUILD_EXEEXT) DISTCLEANFILES = invert-svg$(BUILD_EXEEXT) endif @@ -87,9 +89,17 @@ AM_CPPFLAGS = \ -DGIMP_PLUGIN_VERSION=\""$(GIMP_PLUGIN_VERSION)"\" \ -I$(top_srcdir) \ $(GTK_CFLAGS) \ - -I$(includedir) \ + -I$(includedir) + +AM_CFLAGS = \ $(xobjective_c) +AM_CXXFLAGS = \ + $(xobjective_cxx) + +AM_LDFLAGS = \ + $(xnone) + EXTRA_DIST = \ defcheck.py \ gimp-mkenums \ diff --git a/tools/Makefile.in b/tools/Makefile.in index 0fb9400716..e0aab9cf0f 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -104,6 +104,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/ax_compare_version.m4 \ + $(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \ $(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \ $(top_srcdir)/m4macros/ax_prog_perl_version.m4 \ @@ -286,7 +287,7 @@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@ FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ @@ -359,6 +360,7 @@ GUDEV_LIBS = @GUDEV_LIBS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@ +HAVE_CXX11 = @HAVE_CXX11@ HAVE_FINITE = @HAVE_FINITE@ HAVE_ISFINITE = @HAVE_ISFINITE@ HAVE_VFORK = @HAVE_VFORK@ @@ -587,6 +589,7 @@ mandir = @mandir@ manpage_gimpdir = @manpage_gimpdir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ +mypaint_brushes_dir = @mypaint_brushes_dir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -608,6 +611,8 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = subdir-objects libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la @PLATFORM_OSX_TRUE@xobjective_c = "-xobjective-c" +@PLATFORM_OSX_TRUE@xobjective_cxx = "-xobjective-c++" +@PLATFORM_OSX_TRUE@xnone = "-xnone" @OS_WIN32_TRUE@gimp_debug_resume_SOURCES = gimp-debug-resume.c gimptool_@GIMP_TOOL_VERSION@_SOURCES = gimptool.c gimptool_@GIMP_TOOL_VERSION@_LDADD = \ @@ -641,9 +646,17 @@ AM_CPPFLAGS = \ -DGIMP_PLUGIN_VERSION=\""$(GIMP_PLUGIN_VERSION)"\" \ -I$(top_srcdir) \ $(GTK_CFLAGS) \ - -I$(includedir) \ + -I$(includedir) + +AM_CFLAGS = \ $(xobjective_c) +AM_CXXFLAGS = \ + $(xobjective_cxx) + +AM_LDFLAGS = \ + $(xnone) + EXTRA_DIST = \ defcheck.py \ gimp-mkenums \ @@ -883,7 +896,8 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) +@ENABLE_VECTOR_ICONS_FALSE@all-local: +all-am: Makefile $(PROGRAMS) all-local installdirs: for dir in "$(DESTDIR)$(bindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -992,7 +1006,7 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool \ clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ distclean-compile distclean-generic distclean-libtool \ @@ -1024,7 +1038,7 @@ uninstall-am: uninstall-binPROGRAMS #compute_svg_viewbox_LDADD = $(SVG_LIBS) # Build tools which must be built for the host platform. -@ENABLE_VECTOR_ICONS_TRUE@all: invert-svg$(BUILD_EXEEXT) +@ENABLE_VECTOR_ICONS_TRUE@all-local: invert-svg$(BUILD_EXEEXT) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.